bet-test-sdk 1.0.4 → 1.0.6

package/README.md

@@ -84,6 +84,14 @@ const createAndBuyToken = async (sdk, testAccount) => {
 };
 
 const buyTokens = async (sdk, testAccount, mint) => {
+  const curveStateAccount = await sdk.getCurveStateAccount(mint)
+  if (curveStateAccount) {
+    console.log(
+      "mint does not exist",
+      mint.toBase58()
+    );
+    return;
+  }
   const buyResults = await sdk.buy(
     testAccount,
     mint,

package/dist/browser/index.js

@@ -3,7 +3,7 @@ import * as borsh from '@coral-xyz/borsh';
 import { struct as struct$1, publicKey as publicKey$3, u64 as u64$1, u8 as u8$1, bool } from '@coral-xyz/borsh';
 import { getAssociatedTokenAddress, getAccount, createAssociatedTokenAccountInstruction, getAssociatedTokenAddressSync } from '@solana/spl-token';
 
-const PROGRAM_ID = "7MTnCi4Q3LeF2ZnfXykdemNmib5Jv2SXvNoUFQ4PLS77";
+const PROGRAM_ID = "E3zXK7VRyn39uuyshkQCriRXUAsR1KKQXaJ55KyDW4bp";
 const BET_API = "https://dev-jeffery.openhub.network/api";
 const BET_STATE_SEED = "bet-state";
 const CURVE_STATE_SEED = "curve-state";
@@ -19086,7 +19086,7 @@ class BetState {
     }
 }
 
-var address = "7MTnCi4Q3LeF2ZnfXykdemNmib5Jv2SXvNoUFQ4PLS77";
+var address = "E3zXK7VRyn39uuyshkQCriRXUAsR1KKQXaJ55KyDW4bp";
 var metadata = {
 	name: "bet",
 	version: "0.1.0",
@@ -20089,7 +20089,7 @@ var instructions = [
 			},
 			{
 				name: "dynamic_amm_program",
-				address: "7MTnCi4Q3LeF2ZnfXykdemNmib5Jv2SXvNoUFQ4PLS77"
+				address: "E3zXK7VRyn39uuyshkQCriRXUAsR1KKQXaJ55KyDW4bp"
 			}
 		],
 		args: [
@@ -21811,36 +21811,22 @@ class BetSDK {
         this.connection = this.program.provider.connection;
     }
     async createAndBuy(creator, migrateType, createTokenMetadata, buyAmountSol, slippageBasisPoints = 500n, priorityFees, commitment = DEFAULT_COMMITMENT, finality = DEFAULT_FINALITY) {
-        let mintKeyPair;
-        try {
-            const request = await fetch(`${BET_API}/token/mint-pair`, {
-                method: "GET",
-                credentials: 'same-origin'
-            });
-            if (request.status === 500) {
-                // Try to get more error details
-                const errorText = await request.text();
-                throw new Error(`Server error (500): ${errorText || 'No error details available'}`);
-            }
-            if (!request.ok) {
-                throw new Error(`HTTP error! status: ${request.status}`);
-            }
-            const responseJson = await request.json();
-            if (!responseJson) {
-                throw new Error('Empty response received from server');
-            }
-            if (responseJson.code == 0) {
-                const privateKey = bs58$1.decode(responseJson.data.privateKey);
-                mintKeyPair = Keypair.fromSecretKey(privateKey);
-            }
-            else {
-                throw new Error(responseJson.msg);
-            }
-        }
-        catch (error) {
-            console.error('Error in createTokenMetadata', error);
-            throw error;
-        }
+        const { newTx, mintKeyPair } = await this.getCreateAndBuyInstructions(creator, migrateType, createTokenMetadata, buyAmountSol, slippageBasisPoints, commitment);
+        let createResults = await sendTx(this.connection, newTx, creator.publicKey, [creator, mintKeyPair], priorityFees, commitment, finality);
+        return createResults;
+    }
+    async buy(buyer, mint, buyAmountSol, slippageBasisPoints = 500n, priorityFees, commitment = DEFAULT_COMMITMENT, finality = DEFAULT_FINALITY) {
+        let buyTx = await this.getBuyInstructionsBySolAmount(buyer.publicKey, mint, buyAmountSol, slippageBasisPoints, commitment);
+        let buyResults = await sendTx(this.connection, buyTx, buyer.publicKey, [buyer], priorityFees, commitment, finality);
+        return buyResults;
+    }
+    async sell(seller, mint, sellTokenAmount, slippageBasisPoints = 500n, priorityFees, commitment = DEFAULT_COMMITMENT, finality = DEFAULT_FINALITY) {
+        let sellTx = await this.getSellInstructionsByTokenAmount(seller.publicKey, mint, sellTokenAmount, slippageBasisPoints);
+        let sellResults = await sendTx(this.connection, sellTx, seller.publicKey, [seller], priorityFees, commitment, finality);
+        return sellResults;
+    }
+    async getCreateAndBuyInstructions(creator, migrateType, createTokenMetadata, buyAmountSol, slippageBasisPoints = 500n, commitment = DEFAULT_COMMITMENT) {
+        let mintKeyPair = await this.createMint();
         let tokenMetadata = await this.createTokenMetadata(createTokenMetadata);
         let createTx = await this.getCreateInstructions(creator.publicKey, createTokenMetadata.name, createTokenMetadata.symbol, tokenMetadata.data, migrateType, mintKeyPair);
         let newTx = new Transaction().add(createTx);
@@ -21850,24 +21836,15 @@ class BetSDK {
         }
         if (buyAmountSol > 0) {
             const buyAmount = getInitialBuyPrice(buyAmountSol);
-            // console.log("buyAmount:", buyAmount);
             const buyAmountWithSlippage = calculateWithSlippageBuy(buyAmountSol, slippageBasisPoints);
-            console.log("buyAmountWithSlippage:", buyAmountWithSlippage);
+            // console.log("buyAmountWithSlippage:", buyAmountWithSlippage);
             const buyTx = await this.getBuyInstructions(creator.publicKey, mintKeyPair.publicKey, buyAmount, buyAmountWithSlippage);
             newTx.add(buyTx);
         }
-        let createResults = await sendTx(this.connection, newTx, creator.publicKey, [creator, mintKeyPair], priorityFees, commitment, finality);
-        return createResults;
-    }
-    async buy(buyer, mint, buyAmountSol, slippageBasisPoints = 500n, priorityFees, commitment = DEFAULT_COMMITMENT, finality = DEFAULT_FINALITY) {
-        let buyTx = await this.getBuyInstructionsBySolAmount(buyer.publicKey, mint, buyAmountSol, slippageBasisPoints, commitment);
-        let buyResults = await sendTx(this.connection, buyTx, buyer.publicKey, [buyer], priorityFees, commitment, finality);
-        return buyResults;
-    }
-    async sell(seller, mint, sellTokenAmount, slippageBasisPoints = 500n, priorityFees, commitment = DEFAULT_COMMITMENT, finality = DEFAULT_FINALITY) {
-        let sellTx = await this.getSellInstructionsByTokenAmount(seller.publicKey, mint, sellTokenAmount, slippageBasisPoints);
-        let sellResults = await sendTx(this.connection, sellTx, seller.publicKey, [seller], priorityFees, commitment, finality);
-        return sellResults;
+        return {
+            newTx,
+            mintKeyPair
+        };
     }
     //create token instructions
     async getCreateInstructions(creator, name, symbol, uri, migrateType, mintKeyPair) {
@@ -21999,6 +21976,36 @@ class BetSDK {
         ], this.program.programId);
         return configState;
     }
+    async createMint() {
+        try {
+            const request = await fetch(`${BET_API}/token/mint-pair`, {
+                method: "GET",
+                credentials: 'same-origin'
+            });
+            if (request.status === 500) {
+                // Try to get more error details
+                const errorText = await request.text();
+                throw new Error(`Server error (500): ${errorText || 'No error details available'}`);
+            }
+            if (!request.ok) {
+                throw new Error(`HTTP error! status: ${request.status}`);
+            }
+            const responseJson = await request.json();
+            if (!responseJson) {
+                throw new Error('Empty response received from server');
+            }
+            if (responseJson.code == 0 && responseJson.data) {
+                return Keypair.fromSecretKey(bs58$1.decode(responseJson.data.privateKey));
+            }
+            else {
+                throw new Error(responseJson.msg);
+            }
+        }
+        catch (error) {
+            console.error('Error in createTokenMetadata', error);
+            throw error;
+        }
+    }
     async createTokenMetadata(create) {
         // Validate file
         if (!(create.file instanceof Blob)) {