flipmeme-sdk 1.0.5 → 1.0.7

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 import { AnchorProvider } from '@coral-xyz/anchor';
-import { WalletContextState } from '@solana/wallet-adapter-react';
-import { PublicKey } from '@solana/web3.js';
+import { SendTransactionOptions } from '@solana/wallet-adapter-base';
+import { PublicKey, Transaction, VersionedTransaction, Connection, TransactionSignature } from '@solana/web3.js';
 
 declare enum BlockchainType {
     SOLANA = "solana",
@@ -17,7 +17,8 @@ interface EthereumConfig {
 }
 interface SolanaConfig {
     provider: AnchorProvider;
-    solWallet: WalletContextState;
+    wallet: PublicKey;
+    sendTransaction: (transaction: Transaction | VersionedTransaction, connection: Connection, options?: SendTransactionOptions) => Promise<TransactionSignature>;
 }
 interface CollectionParams {
     name: string;
@@ -34,7 +35,6 @@ interface NFTTradingData {
     symbol?: string;
 }
 interface ReserveToken {
-    tokenAddress: string;
     buy: NFTTradingData[] | null;
     mintAndBuy: NFTTradingData[] | null;
 }

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { AnchorProvider } from '@coral-xyz/anchor';
-import { WalletContextState } from '@solana/wallet-adapter-react';
-import { PublicKey } from '@solana/web3.js';
+import { SendTransactionOptions } from '@solana/wallet-adapter-base';
+import { PublicKey, Transaction, VersionedTransaction, Connection, TransactionSignature } from '@solana/web3.js';
 
 declare enum BlockchainType {
     SOLANA = "solana",
@@ -17,7 +17,8 @@ interface EthereumConfig {
 }
 interface SolanaConfig {
     provider: AnchorProvider;
-    solWallet: WalletContextState;
+    wallet: PublicKey;
+    sendTransaction: (transaction: Transaction | VersionedTransaction, connection: Connection, options?: SendTransactionOptions) => Promise<TransactionSignature>;
 }
 interface CollectionParams {
     name: string;
@@ -34,7 +35,6 @@ interface NFTTradingData {
     symbol?: string;
 }
 interface ReserveToken {
-    tokenAddress: string;
     buy: NFTTradingData[] | null;
     mintAndBuy: NFTTradingData[] | null;
 }

package/dist/index.js

@@ -1469,7 +1469,7 @@ var SOLANA_PUBKEYS = {
 };
 
 // src/solana/index.ts
-var import_web35 = require("@solana/web3.js");
+var import_web34 = require("@solana/web3.js");
 var import_bytes = require("@coral-xyz/anchor/dist/cjs/utils/bytes");
 var import_spl_token2 = require("@solana/spl-token");
 var import_bn = require("bn.js");
@@ -1510,21 +1510,8 @@ var masterEditionPda = (mint) => import_web32.PublicKey.findProgramAddressSync(
 )[0];
 
 // src/solana/instructions.ts
-var import_web34 = require("@solana/web3.js");
-var import_spl_token = require("@solana/spl-token");
-
-// src/solana/solana.ts
 var import_web33 = require("@solana/web3.js");
-var QUICKNODE_RPC_ENDPOINT = "https://cosmopolitan-snowy-lake.solana-devnet.quiknode.pro/c5ecc7d6128283ff515091ce2efae962928445f5";
-var getPriorityFee = () => __async(void 0, null, function* () {
-  const solana = new import_web33.Connection(QUICKNODE_RPC_ENDPOINT, "processed");
-  const recentFees = yield solana.getRecentPrioritizationFees();
-  const MIN_FEE = 1e4;
-  const dynamicFee = Math.max(...recentFees.map((fee) => fee.prioritizationFee), MIN_FEE);
-  return dynamicFee;
-});
-
-// src/solana/instructions.ts
+var import_spl_token = require("@solana/spl-token");
 var getTokenChunks = (items, chunkSize) => {
   const tokenChunks = [];
   for (let i = 0; i < items.length; i += chunkSize) {
@@ -1532,25 +1519,12 @@ var getTokenChunks = (items, chunkSize) => {
   }
   return tokenChunks;
 };
-var setUpInstructions = (computeUnits) => __async(void 0, null, function* () {
-  const microLamports = yield getPriorityFee();
-  const instructions = [];
-  const modifyComputeUnits = import_web34.ComputeBudgetProgram.setComputeUnitLimit({
-    units: computeUnits
-  });
-  const addPriorityFee = import_web34.ComputeBudgetProgram.setComputeUnitPrice({
-    microLamports
-    // TODO: get value from Quicknote api
-  });
-  instructions.push(modifyComputeUnits, addPriorityFee);
-  return instructions;
-});
 var getTradingAccounts = (collectionId, userPublicKey, programId, creatorAddress) => __async(void 0, null, function* () {
   const collectionIDBuffer = Buffer.from(collectionId, "base64");
   const collectionIDArray = Array.from(collectionIDBuffer);
   const collectionPda2 = collectionPda(collectionId, programId);
   const nftHolderPda2 = nftHolderPda(userPublicKey, programId);
-  const collectionCreator = creatorAddress && new import_web34.PublicKey(creatorAddress);
+  const collectionCreator = creatorAddress && new import_web33.PublicKey(creatorAddress);
   const getNftAccounts = (tokenId) => __async(void 0, null, function* () {
     const nftPda2 = nftPda(collectionPda2, tokenId, programId);
     const nftHolderAta = yield (0, import_spl_token.getAssociatedTokenAddress)(nftPda2, nftHolderPda2, true);
@@ -1604,7 +1578,7 @@ var SolanaConnector = class {
       const state = yield this.program.account.state.fetch(
         SOLANA_PUBKEYS.STATE_ID
       );
-      const [collectionPda2] = import_web35.PublicKey.findProgramAddressSync(
+      const [collectionPda2] = import_web34.PublicKey.findProgramAddressSync(
         [
           Buffer.from("collection"),
           SOLANA_PUBKEYS.STATE_ID.toBuffer(),
@@ -1628,7 +1602,7 @@ var SolanaConnector = class {
         SOLANA_PUBKEYS.STATE_ID
       );
       const collectionID = state.collectionCount;
-      const [collection] = import_web35.PublicKey.findProgramAddressSync(
+      const [collection] = import_web34.PublicKey.findProgramAddressSync(
         [
           import_bytes.utf8.encode("collection"),
           SOLANA_PUBKEYS.STATE_ID.toBuffer(),
@@ -1636,11 +1610,11 @@ var SolanaConnector = class {
         ],
         this.program.programId
       );
-      const [collectionNftPda] = import_web35.PublicKey.findProgramAddressSync(
+      const [collectionNftPda] = import_web34.PublicKey.findProgramAddressSync(
         [import_bytes.utf8.encode("collection_nft"), collection.toBuffer()],
         this.program.programId
       );
-      const [collectionMetadataPda] = import_web35.PublicKey.findProgramAddressSync(
+      const [collectionMetadataPda] = import_web34.PublicKey.findProgramAddressSync(
         [
           Buffer.from("metadata"),
           SOLANA_PUBKEYS.TOKEN_METADATA_PROGRAM_ID.toBuffer(),
@@ -1648,7 +1622,7 @@ var SolanaConnector = class {
         ],
         SOLANA_PUBKEYS.TOKEN_METADATA_PROGRAM_ID
       );
-      const [masterEditionMetadata] = import_web35.PublicKey.findProgramAddressSync(
+      const [masterEditionMetadata] = import_web34.PublicKey.findProgramAddressSync(
         [
           Buffer.from("metadata"),
           SOLANA_PUBKEYS.TOKEN_METADATA_PROGRAM_ID.toBuffer(),
@@ -1674,28 +1648,28 @@ var SolanaConnector = class {
         //@ts-ignore
         collection,
         collection_nft: collectionNftPda,
-        creator: this.config.solWallet.publicKey,
+        creator: this.config.wallet,
         mpl_core: SOLANA.MPL_CORE_STR,
-        system_program: import_web35.SystemProgram.programId
+        system_program: import_web34.SystemProgram.programId
       }).instruction();
-      const modifyComputeUnits = import_web35.ComputeBudgetProgram.setComputeUnitLimit({
+      const modifyComputeUnits = import_web34.ComputeBudgetProgram.setComputeUnitLimit({
         units: 35e4
       });
-      const addPriorityFee = import_web35.ComputeBudgetProgram.setComputeUnitPrice({
+      const addPriorityFee = import_web34.ComputeBudgetProgram.setComputeUnitPrice({
         microLamports: 1e4
       });
       const blockHash = (yield this.config.provider.connection.getLatestBlockhash()).blockhash;
-      const messageV0 = new import_web35.TransactionMessage({
-        payerKey: this.config.solWallet.publicKey,
+      const messageV0 = new import_web34.TransactionMessage({
+        payerKey: this.config.wallet,
         recentBlockhash: blockHash,
         instructions: [instruction]
       }).compileToV0Message();
-      const versionedTransaction = new import_web35.VersionedTransaction(messageV0);
+      const versionedTransaction = new import_web34.VersionedTransaction(messageV0);
       const result = yield this.config.provider.connection.simulateTransaction(
         versionedTransaction
       );
-      const tx = new import_web35.Transaction().add(modifyComputeUnits).add(addPriorityFee).add(instruction);
-      const txHash = yield this.config.solWallet.sendTransaction(
+      const tx = new import_web34.Transaction().add(modifyComputeUnits).add(addPriorityFee).add(instruction);
+      const txHash = yield this.config.sendTransaction(
         tx,
         this.config.provider.connection
       );
@@ -1710,7 +1684,7 @@ var SolanaConnector = class {
         throw new Error("Program not initialized");
       }
       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) {
+      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);
@@ -1720,7 +1694,7 @@ var SolanaConnector = class {
       if ((_c = reserveToken.buy) == null ? void 0 : _c.length) {
         try {
           const buyInstructionsChunks = yield this.getBuyInstructions(
-            this.config.solWallet.publicKey,
+            this.config.wallet,
             collectionId,
             reserveToken.buy
           );
@@ -1734,7 +1708,7 @@ var SolanaConnector = class {
       if ((_e = reserveToken.mintAndBuy) == null ? void 0 : _e.length) {
         try {
           const mintAndBuyInstructionsChunks = yield this.getMintAndBuyInstructions(
-            this.config.solWallet.publicKey,
+            this.config.wallet,
             collectionId,
             collectionSymbol,
             creatorAddress,
@@ -1773,7 +1747,7 @@ var SolanaConnector = class {
       const sellTokens = (0, import_lodash.sampleSize)(ownedTokens, quantity);
       try {
         instructionsChunks = yield this.getSellInstructions(
-          this.config.solWallet.publicKey,
+          this.config.wallet,
           collectionId,
           sellTokens
         );
@@ -1810,7 +1784,7 @@ var SolanaConnector = class {
         try {
           console.log("items", items);
           instructionsChunks = yield this.getSellInstructions(
-            this.config.solWallet.publicKey,
+            this.config.wallet,
             collectionId,
             items
           );
@@ -1841,14 +1815,14 @@ var SolanaConnector = class {
       if (!this.program) {
         throw new Error("Program not initialized");
       }
-      const transaction = new import_web35.Transaction().add(
-        import_web35.SystemProgram.transfer({
+      const transaction = new import_web34.Transaction().add(
+        import_web34.SystemProgram.transfer({
           fromPubkey: params.adminPubKey,
           toPubkey: SOLANA_PUBKEYS.ADMIN_FOR_CREDIT_BUY,
           lamports: new import_decimal.default(params.amount).mul(10 ** 9).toNumber()
         })
       );
-      return yield this.config.solWallet.sendTransaction(transaction, this.config.provider.connection);
+      return yield this.config.sendTransaction(transaction, this.config.provider.connection);
     });
   }
   //useSenTxn.ts
@@ -1858,18 +1832,17 @@ var SolanaConnector = class {
         console.error("Trade NFT failed: Insufficient data");
         throw new Error("Trade NFT failed: Insufficient data");
       }
-      const transaction = new import_web35.Transaction();
+      const transaction = new import_web34.Transaction();
       instructions.forEach((inx) => transaction.add(inx));
       const { blockhash } = yield this.config.provider.connection.getLatestBlockhash("confirmed");
-      const messageV0 = new import_web35.TransactionMessage({
-        payerKey: this.config.solWallet.publicKey,
+      const messageV0 = new import_web34.TransactionMessage({
+        payerKey: this.config.wallet,
         recentBlockhash: blockhash,
         instructions
       }).compileToV0Message([]);
-      const tx = new import_web35.VersionedTransaction(messageV0);
+      const tx = new import_web34.VersionedTransaction(messageV0);
       const sim = yield this.config.provider.connection.simulateTransaction(tx);
-      console.log(sim, "SS");
-      return yield this.config.solWallet.sendTransaction(tx, this.config.provider.connection);
+      return yield this.config.sendTransaction(tx, this.config.provider.connection);
     });
   }
   getBuyInstructions(userPublicKey, collectionId, tokens) {
@@ -1882,7 +1855,7 @@ var SolanaConnector = class {
       const allInstructionSets = [];
       try {
         for (const chunk of tokenChunks) {
-          const instructions = yield 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,
@@ -1919,7 +1892,7 @@ var SolanaConnector = class {
       );
       try {
         for (const chunk of tokenChunks) {
-          const instructions = yield 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
@@ -1934,11 +1907,11 @@ var SolanaConnector = class {
               mplCore: SOLANA.MPL_CORE_STR,
               nft: nftPda2,
               nftHolder: nftHolderPda2,
-              systemProgram: import_web35.SystemProgram.programId,
-              collectionNft: import_web35.PublicKey.findProgramAddressSync(
+              systemProgram: import_web34.SystemProgram.programId,
+              collectionNft: import_web34.PublicKey.findProgramAddressSync(
                 [
                   Buffer.from("collection_nft"),
-                  new import_web35.PublicKey(collectionPda2).toBuffer()
+                  new import_web34.PublicKey(collectionPda2).toBuffer()
                 ],
                 this.program.programId
               )[0]
@@ -1970,7 +1943,7 @@ var SolanaConnector = class {
       );
       try {
         for (const chunk of tokenChunks) {
-          const instructions = yield 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(
@@ -1982,14 +1955,14 @@ var SolanaConnector = class {
               buyer: userPublicKey,
               program: this.program.programId,
               mplCore: SOLANA.MPL_CORE_STR,
-              systemProgram: import_web35.SystemProgram.programId,
+              systemProgram: import_web34.SystemProgram.programId,
               nft: nftPda2,
               nftHolder: nftHolderPda2,
               collection: collectionPda2,
-              collectionNft: import_web35.PublicKey.findProgramAddressSync(
+              collectionNft: import_web34.PublicKey.findProgramAddressSync(
                 [
                   Buffer.from("collection_nft"),
-                  new import_web35.PublicKey(collectionPda2).toBuffer()
+                  new import_web34.PublicKey(collectionPda2).toBuffer()
                 ],
                 this.program.programId
               )[0],
@@ -2006,6 +1979,29 @@ var SolanaConnector = class {
       }
     });
   }
+  getPriorityFee() {
+    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);
+      return dynamicFee;
+    });
+  }
+  setUpInstructions(computeUnits) {
+    return __async(this, null, function* () {
+      const microLamports = yield this.getPriorityFee();
+      const instructions = [];
+      const modifyComputeUnits = import_web34.ComputeBudgetProgram.setComputeUnitLimit({
+        units: computeUnits
+      });
+      const addPriorityFee = import_web34.ComputeBudgetProgram.setComputeUnitPrice({
+        microLamports
+        // TODO: get value from Quicknote api
+      });
+      instructions.push(modifyComputeUnits, addPriorityFee);
+      return instructions;
+    });
+  }
 };
 
 // src/types.ts
@@ -2018,7 +2014,7 @@ function isEthereumConfig(config) {
   return "chainId" in config;
 }
 function isSolanaConfig(config) {
-  return "solWallet" in config;
+  return "sendTransaction" in config;
 }
 
 // src/main_sdk.ts