bet-test-sdk 1.1.6 → 1.1.7

package/README.md

@@ -61,6 +61,7 @@ const createAndBuyToken = async (sdk, testAccount) => {
     file: await fs.openAsBlob("example/basic/test.jpg"),
     migrateDex: MigrateDex.Meteora,
     twitter: "https://example.x.com",
+    createdOn: "https://test.bet.com",
     telegram: "https://example.t.me",
     discord: "https://example.discord.com",
     website: "https://www.example.com",
@@ -72,7 +73,7 @@ const createAndBuyToken = async (sdk, testAccount) => {
     BigInt(0.0001 * LAMPORTS_PER_SOL),
     SLIPPAGE_BASIS_POINTS,
     {
-      unitLimit: 550000,
+      unitLimit: 500000,
       unitPrice: 250000,
     }
   );
@@ -99,7 +100,7 @@ const buyTokens = async (sdk, testAccount, mint) => {
     BigInt(0.001 * LAMPORTS_PER_SOL),
     SLIPPAGE_BASIS_POINTS,
     {
-      unitLimit: 550000,
+      unitLimit: 500000,
       unitPrice: 250000,
     },
   );
@@ -127,7 +128,7 @@ const sellTokens = async (sdk, testAccount, mint) => {
       BigInt(currentSPLBalance * Math.pow(10, DEFAULT_DECIMALS)),
       SLIPPAGE_BASIS_POINTS,
       {
-        unitLimit: 550000,
+        unitLimit: 500000,
         unitPrice: 250000,
       }
     );

package/dist/browser/index.js

@@ -20,6 +20,7 @@ const DEFAULT_CURVE_INITIALIZE_SUPPLY = 1_000_000_000_000_000;
 const REACH_CURVE_SOL_AMOUNT = 85_000_000_000;
 const DEFAULT_DECIMALS = 6;
 const FEE_BASIS_POINTS = 100n;
+const DENOMINATOR = 10000n;
 
 var commonjsGlobal$1 = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
@@ -15888,7 +15889,7 @@ const DEFAULT_FINALITY = "finalized";
 // token amount => token amount
 // sol amount => sol amount
 const calculateWithSlippage = (amount, basisPoints) => {
-    return amount - (amount * basisPoints) / 10000n;
+    return amount - (amount * basisPoints) / DENOMINATOR;
 };
 async function sendTx(connection, tx, payer, signers, priorityFees, commitment = DEFAULT_COMMITMENT, finality = DEFAULT_FINALITY) {
     let newTx = new Transaction();
@@ -16026,13 +16027,14 @@ class CurveState {
         this.realSolReserves = realSolReserves;
         this.realTokenReserves = realTokenReserves;
     }
-    getBuyPrice(amount, isCompted) {
-        if (isCompted) {
-            throw new Error("Curve is isCompted");
+    getBuyPrice(amount, isCompleted) {
+        if (isCompleted) {
+            throw new Error("Curve is completed");
         }
         if (amount <= 0n) {
             return 0n;
         }
+        amount = amount * (DENOMINATOR - FEE_BASIS_POINTS) / DENOMINATOR;
         // Calculate the product of virtual reserves
         let n = this.virtualSolReserves * this.virtualTokenReserves;
         // Calculate the new virtual sol reserves after the purchase
@@ -16044,8 +16046,8 @@ class CurveState {
         // Return the minimum of the calculated tokens and real token reserves
         return s < this.realTokenReserves ? s : this.realTokenReserves;
     }
-    getSellPrice(amount, feeBasisPoints, isCompted) {
-        if (isCompted) {
+    getSellPrice(amount, feeBasisPoints, isCompleted) {
+        if (isCompleted) {
             throw new Error("Curve is complete");
         }
         if (amount <= 0n) {
@@ -16054,7 +16056,7 @@ class CurveState {
         // Calculate the proportional amount of virtual sol reserves to be received
         let n = (amount * this.virtualSolReserves) / (this.virtualTokenReserves + amount);
         // Calculate the fee amount in the same units
-        let a = (n * feeBasisPoints) / 10000n;
+        let a = (n * feeBasisPoints) / DENOMINATOR;
         // Return the net amount after deducting the fee
         return n - a;
     }
@@ -16079,7 +16081,7 @@ class CurveState {
         let totalSellValue = (solTokens * this.virtualSolReserves) /
             (this.virtualTokenReserves - solTokens) +
             1n;
-        let fee = (totalSellValue * feeBasisPoints) / 10000n;
+        let fee = (totalSellValue * feeBasisPoints) / DENOMINATOR;
         return totalSellValue + fee;
     }
     static fromBuffer(buffer) {
@@ -16087,13 +16089,13 @@ class CurveState {
             u64$1("discriminator"),
             u64$1("initReservedToken"),
             u64$1("supply"),
-            u64$1("virtualTokenReserves"),
             u64$1("virtualSolReserves"),
+            u64$1("virtualTokenReserves"),
             u64$1("realSolReserves"),
             u64$1("realTokenReserves"),
         ]);
         let value = structure.decode(buffer);
-        return new CurveState(BigInt(value.discriminator), BigInt(value.initReservedToken), BigInt(value.supply), BigInt(value.virtualTokenReserves), BigInt(value.virtualSolReserves), BigInt(value.realSolReserves), BigInt(value.realTokenReserves));
+        return new CurveState(BigInt(value.discriminator), BigInt(value.initReservedToken), BigInt(value.supply), BigInt(value.virtualSolReserves), BigInt(value.virtualTokenReserves), BigInt(value.realSolReserves), BigInt(value.realTokenReserves));
     }
 }
 
@@ -21876,8 +21878,8 @@ class BetSDK {
         if (!curveState) {
             throw new Error(`Curve state account not found: ${mint.toBase58()}`);
         }
-        const isComplete = betState.isCompted;
-        let minSolOutput = curveState.getSellPrice(sellTokenAmount, FEE_BASIS_POINTS, isComplete);
+        const isCompleted = betState.isCompted;
+        let minSolOutput = curveState.getSellPrice(sellTokenAmount, FEE_BASIS_POINTS, isCompleted);
         let minSolOutputWithSlippage = calculateWithSlippage(minSolOutput, slippageBasisPoints);
         return await this.getSellInstructions(seller, mint, sellTokenAmount, minSolOutputWithSlippage);
     }
@@ -22030,6 +22032,7 @@ class BetSDK {
         if (amount <= 0n) {
             return 0n;
         }
+        amount = amount * (DENOMINATOR - FEE_BASIS_POINTS) / DENOMINATOR;
         const initVirtualSol = new BigNumber(DEFAULT_CURVE_INITIALIZE_VITUAL_SOL_TOKEN);
         const initVirtualToken = new BigNumber(DEFAULT_CURVE_INITIALIZE_VITUAL_RESERVED_TOKEN);
         const initRealReservedToken = new BigNumber(DEFAULT_CURVE_INITIALIZE_INIT_RESERVED_TOKEN);
@@ -22052,46 +22055,56 @@ class BetSDK {
         }
         let shouldOutTokens = curveStateAccount.getBuyPrice(solAmountIn, false);
         if (slippageBasisPoints) {
-            shouldOutTokens -= (shouldOutTokens * slippageBasisPoints) / 10000n;
+            shouldOutTokens -= (shouldOutTokens * slippageBasisPoints) / DENOMINATOR;
         }
         return shouldOutTokens;
     }
     // Buy: Fixed token amount out, estimated sol amount in
     async getMinSolAmountIn(mint, tokenAmountOut, slippageBasisPoints) {
+        if (tokenAmountOut <= 0) {
+            return 0n;
+        }
         const curveStateAccount = await this.getValidCurveState(mint);
         if (!curveStateAccount) {
             return 0n;
         }
-        let shouldOutTokens = tokenAmountOut > curveStateAccount.virtualTokenReserves - curveStateAccount.realTokenReserves
-            ? curveStateAccount.virtualTokenReserves - curveStateAccount.realTokenReserves
+        let shouldOutTokens = tokenAmountOut > curveStateAccount.realTokenReserves
+            ? curveStateAccount.realTokenReserves
             : tokenAmountOut;
         let minSolAmountIn = (shouldOutTokens * curveStateAccount.virtualSolReserves) /
             (curveStateAccount.virtualTokenReserves - shouldOutTokens) +
             1n;
+        let fee = (minSolAmountIn * FEE_BASIS_POINTS) / DENOMINATOR;
         if (slippageBasisPoints) {
-            minSolAmountIn += (minSolAmountIn * slippageBasisPoints) / 10000n;
+            minSolAmountIn += (minSolAmountIn * slippageBasisPoints) / DENOMINATOR;
         }
-        let fee = (minSolAmountIn * FEE_BASIS_POINTS) / 10000n;
         return minSolAmountIn + fee;
     }
     // Sell: Fixed token amount in, estimated sol amount out
     async getSolAmountOut(mint, tokenAmountIn, slippageBasisPoints) {
+        if (tokenAmountIn <= 0) {
+            return 0n;
+        }
         const curveStateAccount = await this.getValidCurveState(mint);
         if (!curveStateAccount) {
             return 0n;
         }
         let shouldOutTokens = curveStateAccount.getSellPrice(tokenAmountIn, FEE_BASIS_POINTS, false);
         if (slippageBasisPoints) {
-            shouldOutTokens -= (shouldOutTokens * slippageBasisPoints) / 10000n;
+            shouldOutTokens -= (shouldOutTokens * slippageBasisPoints) / DENOMINATOR;
         }
         return shouldOutTokens;
     }
     // Sell: Fixed sol amount out, estimated token amount in
     async getMinTokenAmountIn(mint, solAmountOut, slippageBasisPoints) {
+        if (solAmountOut <= 0) {
+            return 0n;
+        }
         const curveStateAccount = await this.getValidCurveState(mint);
         if (!curveStateAccount) {
             return 0n;
         }
+        solAmountOut = solAmountOut * (DENOMINATOR - FEE_BASIS_POINTS) / DENOMINATOR;
         let shouldOutSols = solAmountOut > curveStateAccount.virtualSolReserves - curveStateAccount.realSolReserves
             ? curveStateAccount.virtualSolReserves - curveStateAccount.realSolReserves
             : solAmountOut;
@@ -22099,10 +22112,9 @@ class BetSDK {
             (curveStateAccount.virtualSolReserves - shouldOutSols) +
             1n;
         if (slippageBasisPoints) {
-            minTokenAmountIn += (minTokenAmountIn * slippageBasisPoints) / 10000n;
+            minTokenAmountIn += (minTokenAmountIn * slippageBasisPoints) / DENOMINATOR;
         }
-        let fee = (minTokenAmountIn * FEE_BASIS_POINTS) / 10000n;
-        return minTokenAmountIn + fee;
+        return minTokenAmountIn;
     }
     async getValidCurveState(mint) {
         const curveStateAccount = await this.getCurveStateAccount(mint);
@@ -22206,5 +22218,5 @@ class AMM {
     }
 }
 
-export { AMM, APP_CONFIG_SEED, BET_API, BET_STATE_SEED, BetSDK, BetState, CURVE_STATE_SEED, CurveState, DEFAULT_COMMITMENT, DEFAULT_CURVE_INITIALIZE_INIT_RESERVED_TOKEN, DEFAULT_CURVE_INITIALIZE_SUPPLY, DEFAULT_CURVE_INITIALIZE_TOKEN_DEMICAL, DEFAULT_CURVE_INITIALIZE_VITUAL_RESERVED_TOKEN, DEFAULT_CURVE_INITIALIZE_VITUAL_SOL_TOKEN, DEFAULT_DECIMALS, DEFAULT_FINALITY, FEE_BASIS_POINTS, FEE_RECIVED_ACCOUNT_SEED, FEE_STORE_SEED, MigrateDex, MigrateType, POOL_SEED, PROGRAM_ID, REACH_CURVE_SOL_AMOUNT, TOKEN_ACCOUNT_DATA, TOKEN_MINT_AUTHORITY_SEED, buildVersionedTx, calculateWithSlippage, getTxDetails, sendTx, toCompleteEvent, toCreateEvent, toTradeEvent };
+export { AMM, APP_CONFIG_SEED, BET_API, BET_STATE_SEED, BetSDK, BetState, CURVE_STATE_SEED, CurveState, DEFAULT_COMMITMENT, DEFAULT_CURVE_INITIALIZE_INIT_RESERVED_TOKEN, DEFAULT_CURVE_INITIALIZE_SUPPLY, DEFAULT_CURVE_INITIALIZE_TOKEN_DEMICAL, DEFAULT_CURVE_INITIALIZE_VITUAL_RESERVED_TOKEN, DEFAULT_CURVE_INITIALIZE_VITUAL_SOL_TOKEN, DEFAULT_DECIMALS, DEFAULT_FINALITY, DENOMINATOR, FEE_BASIS_POINTS, FEE_RECIVED_ACCOUNT_SEED, FEE_STORE_SEED, MigrateDex, MigrateType, POOL_SEED, PROGRAM_ID, REACH_CURVE_SOL_AMOUNT, TOKEN_ACCOUNT_DATA, TOKEN_MINT_AUTHORITY_SEED, buildVersionedTx, calculateWithSlippage, getTxDetails, sendTx, toCompleteEvent, toCreateEvent, toTradeEvent };
 //# sourceMappingURL=index.js.map