flipmeme-sdk 1.0.15 → 1.0.17

package/dist/index.d.mts

@@ -54,10 +54,21 @@ interface BuyResponse {
     collectionAddress: string;
     nftAddress: string;
     tokenId: string;
+    tokenName: string;
     tokenUri: string;
     price: string;
     is_sold_out: boolean;
     totalSolAmount: string;
+    timestamp: string;
+}
+interface SellResponse {
+    seller: string;
+    collectionAddress: string;
+    nftAddress: string;
+    tokenId: string;
+    price: string;
+    totalSolAmount: string;
+    timestamp: string;
 }
 interface SellParams {
     collectionId: string;
@@ -84,8 +95,8 @@ declare class FlipmemeSDK {
     updateConfig(chainType: BlockchainType, config: EthereumConfig | SolanaConfig): void;
     createCollection(params: CollectionParams): Promise<CreateCollectionResponse>;
     getCollectionPda(): Promise<CollectionInfo>;
-    buy(params: BuyParams): Promise<void>;
-    flipSell(params: SellParams): Promise<void>;
+    buy(params: BuyParams): Promise<BuyResponse[]>;
+    flipSell(params: SellParams): Promise<SellResponse[]>;
     profileSell(data: ProfileSellParams): Promise<void>;
     buyCredit(params: BuyCreditParams): Promise<string>;
     /**For testing */
@@ -126,4 +137,4 @@ declare class FlipmemeSDK {
     getTransactionTest(signature: string): Promise<_solana_web3_js.VersionedTransactionResponse | null>;
 }
 
-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 SolanaConfig, isEthereumConfig, isSolanaConfig };
+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 };

package/dist/index.d.ts

@@ -54,10 +54,21 @@ interface BuyResponse {
     collectionAddress: string;
     nftAddress: string;
     tokenId: string;
+    tokenName: string;
     tokenUri: string;
     price: string;
     is_sold_out: boolean;
     totalSolAmount: string;
+    timestamp: string;
+}
+interface SellResponse {
+    seller: string;
+    collectionAddress: string;
+    nftAddress: string;
+    tokenId: string;
+    price: string;
+    totalSolAmount: string;
+    timestamp: string;
 }
 interface SellParams {
     collectionId: string;
@@ -84,8 +95,8 @@ declare class FlipmemeSDK {
     updateConfig(chainType: BlockchainType, config: EthereumConfig | SolanaConfig): void;
     createCollection(params: CollectionParams): Promise<CreateCollectionResponse>;
     getCollectionPda(): Promise<CollectionInfo>;
-    buy(params: BuyParams): Promise<void>;
-    flipSell(params: SellParams): Promise<void>;
+    buy(params: BuyParams): Promise<BuyResponse[]>;
+    flipSell(params: SellParams): Promise<SellResponse[]>;
     profileSell(data: ProfileSellParams): Promise<void>;
     buyCredit(params: BuyCreditParams): Promise<string>;
     /**For testing */
@@ -126,4 +137,4 @@ declare class FlipmemeSDK {
     getTransactionTest(signature: string): Promise<_solana_web3_js.VersionedTransactionResponse | null>;
 }
 
-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 SolanaConfig, isEthereumConfig, isSolanaConfig };
+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 };

package/dist/index.js

@@ -73,7 +73,7 @@ var EthereumConnector = class {
 };
 
 // src/solana/index.ts
-var import_anchor = require("@coral-xyz/anchor");
+var import_anchor2 = require("@coral-xyz/anchor");
 
 // src/solana/idls/flipmeme.json
 var flipmeme_default = {
@@ -1471,6 +1471,9 @@ var SOLANA_PUBKEYS = {
   EVENT_AUTHORITY_ID: new import_web3.PublicKey(SOLANA.EVENT_AUTHORITY_ID_STR),
   ADMIN_FOR_CREDIT_BUY: new import_web3.PublicKey(SOLANA.ADMIN_FOR_CREDIT_BUY_STR)
 };
+var SDK_SOLANA_CONFIG = {
+  CHUNK_SIZE: 20
+};
 
 // src/solana/index.ts
 var import_web34 = require("@solana/web3.js");
@@ -1561,16 +1564,62 @@ var import_lodash = require("lodash");
 var import_decimal = __toESM(require("decimal.js"));
 
 // src/solana/analyze.ts
-function analyzeBuyTransaction(transactionData) {
-  return __async(this, null, function* () {
-    var _a, _b, _c;
-    console.log("log Messages", (_a = transactionData.meta) == null ? void 0 : _a.logMessages, "log Messages");
-    const eventLogs = (_c = (_b = transactionData.meta) == null ? void 0 : _b.logMessages) == null ? void 0 : _c.filter(
-      (log) => log.includes("Program data:")
-    );
-    console.log("eventLogs", eventLogs);
-    return [];
-  });
+var import_anchor = require("@coral-xyz/anchor");
+function analyzeBuyTransaction(program, transactionData) {
+  var _a;
+  let instructions = (_a = transactionData.meta) == null ? void 0 : _a.innerInstructions;
+  let buyResponse = [];
+  if (instructions) {
+    for (const instruction of instructions) {
+      for (const subInstruction of instruction.instructions) {
+        let rawData = import_anchor.utils.bytes.bs58.decode(subInstruction.data);
+        const base64Data = import_anchor.utils.bytes.base64.encode(rawData.subarray(8));
+        let decodedData = program.coder.events.decode(base64Data);
+        if ((decodedData == null ? void 0 : decodedData.name) === "mintEvent") {
+          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(),
+            price: decodedData.data.price.toString(),
+            is_sold_out: decodedData.data.isSoldOut,
+            totalSolAmount: decodedData.data.totalSol.toString(),
+            timestamp: decodedData.data.timestamp.toString()
+          });
+        }
+      }
+    }
+  }
+  return buyResponse;
+}
+function analyzeSellTransaction(program, transactionData) {
+  var _a;
+  let instructions = (_a = transactionData.meta) == null ? void 0 : _a.innerInstructions;
+  let sellResponse = [];
+  if (instructions) {
+    for (const instruction of instructions) {
+      for (const subInstruction of instruction.instructions) {
+        let rawData = import_anchor.utils.bytes.bs58.decode(subInstruction.data);
+        const base64Data = import_anchor.utils.bytes.base64.encode(rawData.subarray(8));
+        let decodedData = program.coder.events.decode(base64Data);
+        if ((decodedData == null ? void 0 : decodedData.name) === "sellEvent") {
+          sellResponse.push({
+            seller: decodedData.data.seller.toString(),
+            collectionAddress: decodedData.data.collection.toString(),
+            nftAddress: decodedData.data.nft.toString(),
+            tokenId: decodedData.data.tokenId.toString(),
+            price: decodedData.data.price.toString(),
+            totalSolAmount: decodedData.data.totalSol.toString(),
+            timestamp: decodedData.data.timestamp.toString()
+          });
+        }
+      }
+    }
+  }
+  console.log("sellResponse", sellResponse);
+  return sellResponse;
 }
 
 // src/solana/index.ts
@@ -1582,7 +1631,7 @@ var SolanaConnector = class {
   }
   setFlipmemeProgram() {
     return __async(this, null, function* () {
-      let program = new import_anchor.Program(flipmeme_default, this.config.provider);
+      let program = new import_anchor2.Program(flipmeme_default, this.config.provider);
       this.program = program;
     });
   }
@@ -1691,11 +1740,19 @@ var SolanaConnector = class {
       if (!this.program) {
         throw new Error("Program not initialized");
       }
-      const { collectionId, collectionSymbol, creatorAddress, quantity, reserveToken } = params;
+      const {
+        collectionId,
+        collectionSymbol,
+        creatorAddress,
+        quantity,
+        reserveToken
+      } = 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 stateAccount = yield this.program.account.state.fetch(SOLANA_PUBKEYS.STATE_ID);
+      const stateAccount = yield this.program.account.state.fetch(
+        SOLANA_PUBKEYS.STATE_ID
+      );
       const successTxns = [];
       const failedItems = [];
       const instructionsChunks = [];
@@ -1730,11 +1787,16 @@ var SolanaConnector = class {
           console.error("Failed to getMintAndBuyInstructions", { error });
         }
       }
+      let buyResponse = [];
       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);
+          (_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,
@@ -1746,9 +1808,9 @@ var SolanaConnector = class {
             maxSupportedTransactionVersion: 0
           });
           if (transactionData) {
-            analyzeBuyTransaction(transactionData);
+            let itemBuyResponse = yield analyzeBuyTransaction(this.program, transactionData);
+            buyResponse.push(...itemBuyResponse);
           }
-          console.log("transactionData", transactionData);
         } catch (e) {
           failedItems.push(...items);
           (_h = params.notify) == null ? void 0 : _h.onFailed(failedItems, quantity);
@@ -1756,6 +1818,7 @@ var SolanaConnector = class {
           throw e;
         }
       }
+      return buyResponse;
     });
   }
   //useFlip.ts
@@ -1780,11 +1843,30 @@ var SolanaConnector = class {
       }
       const successTxns = [];
       const failedItems = [];
+      let sellResponse = [];
       for (const [instructions, items] of instructionsChunks) {
         try {
-          const { signature } = yield this.sendTxn(instructions);
+          const { signature, latestBlockhash } = yield this.sendTxn(instructions);
           successTxns.push({ items, signature });
-          notify == null ? void 0 : notify.onSuccess(successTxns.map((txn) => txn.items).flat(), quantity, signature);
+          notify == null ? void 0 : notify.onSuccess(
+            successTxns.map((txn) => txn.items).flat(),
+            quantity,
+            signature
+          );
+          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) {
           failedItems.push(...items);
           notify == null ? void 0 : notify.onFailed(failedItems, quantity);
@@ -1792,6 +1874,7 @@ var SolanaConnector = class {
           throw e;
         }
       }
+      return sellResponse;
     });
   }
   //useFlipProfile.ts
@@ -1821,7 +1904,11 @@ var SolanaConnector = class {
           try {
             const { signature } = yield this.sendTxn(instructions);
             successTxns.push({ items: items2, signature });
-            (_b = data.notify) == null ? void 0 : _b.onSuccess(successTxns.map((txn) => txn.items).flat(), items2.length, signature);
+            (_b = data.notify) == null ? void 0 : _b.onSuccess(
+              successTxns.map((txn) => txn.items).flat(),
+              items2.length,
+              signature
+            );
           } catch (e) {
             failedItems.push(...items2);
             (_c = data.notify) == null ? void 0 : _c.onFailed(failedItems, items2.length);
@@ -1844,7 +1931,10 @@ var SolanaConnector = class {
           lamports: new import_decimal.default(params.amount).mul(10 ** 9).toNumber()
         })
       );
-      return yield this.config.sendTransaction(transaction, this.config.provider.connection);
+      return yield this.config.sendTransaction(
+        transaction,
+        this.config.provider.connection
+      );
     });
   }
   //for testing
@@ -1853,7 +1943,9 @@ var SolanaConnector = class {
       if (!this.program) {
         throw new Error("Program not initialized");
       }
-      const state = yield this.program.account.state.fetch(SOLANA_PUBKEYS.STATE_ID);
+      const state = yield this.program.account.state.fetch(
+        SOLANA_PUBKEYS.STATE_ID
+      );
       return state;
     });
   }
@@ -1863,8 +1955,13 @@ var SolanaConnector = class {
       if (!this.program) {
         throw new Error("Program not initialized");
       }
-      const collectionAddress = yield collectionPda(collectionId, this.program.programId);
-      const collectionInfo = yield this.program.account.collection.fetch(collectionAddress);
+      const collectionAddress = yield collectionPda(
+        collectionId,
+        this.program.programId
+      );
+      const collectionInfo = yield this.program.account.collection.fetch(
+        collectionAddress
+      );
       return { collectionInfo, collectionAddress };
     });
   }
@@ -1886,7 +1983,10 @@ var SolanaConnector = class {
       const tx = new import_web34.VersionedTransaction(messageV0);
       const sim = yield this.config.provider.connection.simulateTransaction(tx);
       console.log("simulation result == ", sim);
-      const signature = yield this.config.sendTransaction(tx, this.config.provider.connection);
+      const signature = yield this.config.sendTransaction(
+        tx,
+        this.config.provider.connection
+      );
       return {
         signature,
         latestBlockhash
@@ -1898,12 +1998,14 @@ var SolanaConnector = class {
       if (!this.program) {
         throw new Error("Program not initialized");
       }
-      const chunkSize = 1;
+      const chunkSize = SDK_SOLANA_CONFIG.CHUNK_SIZE;
       const tokenChunks = getTokenChunks(tokens, chunkSize);
       const allInstructionSets = [];
       try {
         for (const chunk of tokenChunks) {
-          const instructions = yield this.setUpInstructions(25e4 * chunk.length);
+          const instructions = yield this.setUpInstructions(
+            25e4 * chunk.length
+          );
           for (const token of chunk) {
             const instruction = yield this.program.methods.buy(token.tokenId).accounts({
               state: SOLANA_PUBKEYS.STATE_ID,
@@ -1932,7 +2034,7 @@ var SolanaConnector = class {
         userPublicKey,
         this.program.programId
       );
-      const chunkSize = 1;
+      const chunkSize = SDK_SOLANA_CONFIG.CHUNK_SIZE;
       const tokenChunks = getTokenChunks(tokens, chunkSize);
       const allInstructionSets = [];
       const state = yield this.program.account.state.fetch(
@@ -1940,7 +2042,9 @@ var SolanaConnector = class {
       );
       try {
         for (const chunk of tokenChunks) {
-          const instructions = yield this.setUpInstructions(25e4 * chunk.length);
+          const instructions = yield this.setUpInstructions(
+            25e4 * chunk.length
+          );
           for (const token of chunk) {
             const { nftHolderPda: nftHolderPda2, collectionPda: collectionPda2, nftPda: nftPda2 } = yield getNftAccounts(
               token.tokenId
@@ -1980,7 +2084,7 @@ var SolanaConnector = class {
       if (!this.program) {
         throw new Error("Program not initialized");
       }
-      const chunkSize = 1;
+      const chunkSize = SDK_SOLANA_CONFIG.CHUNK_SIZE;
       const tokenChunks = getTokenChunks(tokens, chunkSize);
       const allInstructionSets = [];
       const { getNftAccounts } = yield getTradingAccounts(
@@ -1991,7 +2095,9 @@ var SolanaConnector = class {
       );
       try {
         for (const chunk of tokenChunks) {
-          const instructions = yield this.setUpInstructions(35e4 * chunk.length);
+          const instructions = yield this.setUpInstructions(
+            35e4 * chunk.length
+          );
           for (const token of chunk) {
             const { name, tokenURI, tokenId } = token;
             const { nftPda: nftPda2, collectionPda: collectionPda2, nftHolderPda: nftHolderPda2 } = yield getNftAccounts(
@@ -2031,7 +2137,10 @@ var SolanaConnector = class {
     return __async(this, null, function* () {
       const recentFees = yield this.config.provider.connection.getRecentPrioritizationFees();
       const MIN_FEE = 1e4;
-      const dynamicFee = Math.max(...recentFees.map((fee) => fee.prioritizationFee), MIN_FEE);
+      const dynamicFee = Math.max(
+        ...recentFees.map((fee) => fee.prioritizationFee),
+        MIN_FEE
+      );
       return dynamicFee;
     });
   }
@@ -2052,12 +2161,15 @@ var SolanaConnector = class {
   }
   getTransactionTest(signature) {
     return __async(this, null, function* () {
-      const transaction = yield this.config.provider.connection.getTransaction(signature, {
-        commitment: "confirmed",
-        maxSupportedTransactionVersion: 0
-      });
-      if (transaction) {
-        analyzeBuyTransaction(transaction);
+      const transaction = yield this.config.provider.connection.getTransaction(
+        signature,
+        {
+          commitment: "confirmed",
+          maxSupportedTransactionVersion: 0
+        }
+      );
+      if (transaction && this.program) {
+        analyzeBuyTransaction(this.program, transaction);
       }
       return transaction;
     });