@alphafi/alphafi-sdk 0.0.106 → 0.0.107

package/dist/cjs/transactions/zapDeposit.js

@@ -6,7 +6,7 @@ const transactions_1 = require("@mysten/sui/transactions");
 const maps_js_1 = require("../common/maps.js");
 const coins_js_1 = require("../common/coins.js");
 const deposit_js_1 = require("./deposit.js");
-const _7k_js_1 = require("./7k.js");
+const cetusSwap_js_1 = require("./cetusSwap.js");
 const decimal_js_1 = require("decimal.js");
 const client_js_1 = require("../sui-sdk/client.js");
 const constants_js_1 = require("../common/constants.js");
@@ -18,7 +18,7 @@ async function zapDepositTxb(inputCoinAmount, isInputA, poolName, slippage, // 1
 address) {
     const tx = new transactions_1.Transaction();
     const suiClient = (0, client_js_1.getSuiClient)();
-    const swapGateway = new _7k_js_1.SevenKGateway();
+    const cetusSwap = new cetusSwap_js_1.CetusSwap("mainnet");
     const [coinTypeA, coinTypeB] = maps_js_1.poolInfo[poolName].assetTypes;
     const coinObject = await getCoinObject(isInputA ? coinTypeA : coinTypeB, tx, suiClient, address);
     const investor = (await (0, getReceipts_js_1.getInvestor)(poolName, true));
@@ -69,20 +69,20 @@ address) {
     let [amountA, amountB] = (await (0, deposit_js_1.getAmounts)(poolName, isInputA, inputCoinAmount.toString())).map((a) => new decimal_js_1.Decimal(a));
     // convert coinA of the initial ratio to coinB to get the ratio in terms of 1 coin i.e. coinB
     if (isInputA) {
-        const quoteResponse = await swapGateway.getQuote(coinTypeA, coinTypeB, amountA.toString(), [maps_js_1.poolInfo[poolName].parentPoolId]);
+        const quoteResponse = await cetusSwap.getCetusSwapQuote(coinTypeA, coinTypeB, amountA.toString());
         if (!quoteResponse) {
             console.error("Error fetching quote for zap");
             return undefined;
         }
-        amountA = new decimal_js_1.Decimal(quoteResponse.returnAmountWithDecimal);
+        amountA = new decimal_js_1.Decimal(quoteResponse.amountOut.toString());
     }
     else {
-        const quoteResponse = await swapGateway.getQuote(coinTypeB, coinTypeA, amountB.toString(), [maps_js_1.poolInfo[poolName].parentPoolId]);
+        const quoteResponse = await cetusSwap.getCetusSwapQuote(coinTypeB, coinTypeA, amountB.toString());
         if (!quoteResponse) {
             console.error("Error fetching quote for zap");
             return undefined;
         }
-        amountB = new decimal_js_1.Decimal(quoteResponse.returnAmountWithDecimal);
+        amountB = new decimal_js_1.Decimal(quoteResponse.amountOut.toString());
     }
     // get input coin and handle how much of input coin needs to be swapped
     const totalAmount = amountA.add(amountB);
@@ -91,7 +91,7 @@ address) {
         inputCoinToType2 = new decimal_js_1.Decimal(inputCoinAmount.toString())
             .mul(amountB)
             .div(totalAmount)
-            // .mul(amountA.mul(slippage).div(totalAmount).add(1))
+            .mul(amountA.mul(slippage).div(totalAmount).add(1))
             .floor();
         const [coinIn] = tx.splitCoins(coinObject, [
             inputCoinToType2.floor().toString(),
@@ -125,7 +125,7 @@ address) {
         inputCoinToType1 = new decimal_js_1.Decimal(inputCoinAmount.toString())
             .mul(amountA)
             .div(totalAmount)
-            // .mul(amountB.mul(slippage).div(totalAmount).add(1))
+            .mul(amountB.mul(slippage).div(totalAmount).add(1))
             .floor();
         const [coinIn] = tx.splitCoins(coinObject, [
             inputCoinToType1.floor().toString(),
@@ -160,7 +160,7 @@ address) {
     return tx;
 }
 async function zapDepositQuoteTxb(inputCoinAmount, isInputA, poolName, slippage) {
-    const swapGateway = new _7k_js_1.SevenKGateway();
+    const cetusSwap = new cetusSwap_js_1.CetusSwap("mainnet");
     const [coinTypeA, coinTypeB] = maps_js_1.poolInfo[poolName].assetTypes;
     const investor = (await (0, getReceipts_js_1.getInvestor)(poolName, true));
     const parentPool = await (0, getReceipts_js_1.getParentPool)(poolName, true);
@@ -180,11 +180,11 @@ async function zapDepositQuoteTxb(inputCoinAmount, isInputA, poolName, slippage)
     }
     if (current_tick_index >= upper_tick) {
         if (isInputA) {
-            const quoteResponse = await swapGateway.getQuote(coinTypeA, coinTypeB, inputCoinAmount.toString(), [maps_js_1.poolInfo[poolName].parentPoolId]);
+            const quoteResponse = await cetusSwap.getCetusSwapQuote(coinTypeA, coinTypeB, inputCoinAmount.toString());
             if (!quoteResponse) {
                 throw new Error("Error fetching quote for zap");
             }
-            return ["0", quoteResponse.returnAmountWithDecimal];
+            return ["0", quoteResponse.amountOut.toString()];
         }
         else {
             return ["0", inputCoinAmount.toString()];
@@ -195,31 +195,31 @@ async function zapDepositQuoteTxb(inputCoinAmount, isInputA, poolName, slippage)
             return [inputCoinAmount.toString(), "0"];
         }
         else {
-            const quoteResponse = await swapGateway.getQuote(coinTypeB, coinTypeA, inputCoinAmount.toString(), [maps_js_1.poolInfo[poolName].parentPoolId]);
+            const quoteResponse = await cetusSwap.getCetusSwapQuote(coinTypeB, coinTypeA, inputCoinAmount.toString());
             if (!quoteResponse) {
                 throw new Error("Error fetching quote for zap");
             }
-            return [quoteResponse.returnAmountWithDecimal, "0"];
+            return [quoteResponse.amountOut.toString(), "0"];
         }
     }
     // get inital ratio in terms of 2 coins
     let [amountA, amountB] = (await (0, deposit_js_1.getAmounts)(poolName, isInputA, inputCoinAmount.toString())).map((a) => new decimal_js_1.Decimal(a));
     // convert coinA of the initial ratio to coinB to get the ratio in terms of 1 coin i.e. coinB
     if (isInputA) {
-        const quoteResponse = await swapGateway.getQuote(coinTypeA, coinTypeB, amountA.toString(), [maps_js_1.poolInfo[poolName].parentPoolId]);
+        const quoteResponse = await cetusSwap.getCetusSwapQuote(coinTypeA, coinTypeB, amountA.toString());
         if (!quoteResponse) {
             console.error("Error fetching quote for zap");
             return undefined;
         }
-        amountA = new decimal_js_1.Decimal(quoteResponse.returnAmountWithDecimal);
+        amountA = new decimal_js_1.Decimal(quoteResponse.amountOut.toString());
     }
     else {
-        const quoteResponse = await swapGateway.getQuote(coinTypeB, coinTypeA, amountB.toString(), [maps_js_1.poolInfo[poolName].parentPoolId]);
+        const quoteResponse = await cetusSwap.getCetusSwapQuote(coinTypeB, coinTypeA, amountB.toString());
         if (!quoteResponse) {
             console.error("Error fetching quote for zap");
             return undefined;
         }
-        amountB = new decimal_js_1.Decimal(quoteResponse.returnAmountWithDecimal);
+        amountB = new decimal_js_1.Decimal(quoteResponse.amountOut.toString());
     }
     // get input coin and handle how much of input coin needs to be swapped
     const totalAmount = amountA.add(amountB);
@@ -228,13 +228,13 @@ async function zapDepositQuoteTxb(inputCoinAmount, isInputA, poolName, slippage)
         inputCoinToType2 = new decimal_js_1.Decimal(inputCoinAmount.toString())
             .mul(amountB)
             .div(totalAmount)
-            // .mul(amountA.mul(slippage).div(totalAmount).add(1))
+            .mul(amountA.mul(slippage).div(totalAmount).add(1))
             .floor();
-        const quoteResponse = await swapGateway.getQuote(coinTypeA, coinTypeB, inputCoinToType2.toString(), [maps_js_1.poolInfo[poolName].parentPoolId]);
+        const quoteResponse = await cetusSwap.getCetusSwapQuote(coinTypeA, coinTypeB, inputCoinToType2.toString());
         if (!quoteResponse) {
             throw new Error("Error fetching quote for zap");
         }
-        const slippageReducedAmount = new decimal_js_1.Decimal(quoteResponse.returnAmountWithDecimal)
+        const slippageReducedAmount = new decimal_js_1.Decimal(quoteResponse.amountOut.toString())
             .mul(new decimal_js_1.Decimal(1).sub(slippage))
             .floor();
         [inputCoinToType1, inputCoinToType2] = (await (0, deposit_js_1.getAmounts)(poolName, false, slippageReducedAmount.toString(), false)).map((a) => new decimal_js_1.Decimal(a));
@@ -243,20 +243,20 @@ async function zapDepositQuoteTxb(inputCoinAmount, isInputA, poolName, slippage)
         inputCoinToType1 = new decimal_js_1.Decimal(inputCoinAmount.toString())
             .mul(amountA)
             .div(totalAmount)
-            // .mul(amountB.mul(slippage).div(totalAmount).add(1))
+            .mul(amountB.mul(slippage).div(totalAmount).add(1))
             .floor();
-        const quoteResponse = await swapGateway.getQuote(coinTypeB, coinTypeA, inputCoinToType1.toString(), [maps_js_1.poolInfo[poolName].parentPoolId]);
+        const quoteResponse = await cetusSwap.getCetusSwapQuote(coinTypeB, coinTypeA, inputCoinToType1.toString());
         if (!quoteResponse) {
             throw new Error("Error fetching quote for zap");
         }
-        const slippageReducedAmount = new decimal_js_1.Decimal(quoteResponse.returnAmountWithDecimal)
+        const slippageReducedAmount = new decimal_js_1.Decimal(quoteResponse.amountOut.toString())
             .mul(new decimal_js_1.Decimal(1).sub(slippage))
             .floor();
         [inputCoinToType1, inputCoinToType2] = (await (0, deposit_js_1.getAmounts)(poolName, true, slippageReducedAmount.toString(), false)).map((a) => new decimal_js_1.Decimal(a));
     }
     return [
-        inputCoinToType1.mul(0.9995).floor().toString(),
-        inputCoinToType2.mul(0.9995).floor().toString(),
+        inputCoinToType1.floor().toString(),
+        inputCoinToType2.floor().toString(),
     ];
 }
 async function getCoinObject(coinType, tx, suiClient, address) {
@@ -288,16 +288,17 @@ async function getCoinObject(coinType, tx, suiClient, address) {
     return coin;
 }
 async function zapSwap(params) {
-    const swapGateway = new _7k_js_1.SevenKGateway();
-    const quoteResponse = await swapGateway.getQuote(params.tokenIn, params.tokenOut, params.amountIn, [maps_js_1.poolInfo[params.poolName].parentPoolId]);
+    const cetusSwap = new cetusSwap_js_1.CetusSwap("mainnet");
+    const quoteResponse = await cetusSwap.getCetusSwapQuote(params.tokenIn, params.tokenOut, params.amountIn);
     if (!quoteResponse) {
         throw new Error("Error fetching quote for zap");
     }
-    const coinOut = await swapGateway.getTransactionBlock(params.tx, params.address, quoteResponse, params.slippage, params.coinIn);
+    // Pass the existing transaction to ensure all operations are in the same transaction
+    const { coinOut } = await cetusSwap.cetusSwapTokensTxb(quoteResponse, params.slippage, params.coinIn, params.address, params.tx);
     if (!coinOut) {
         throw new Error("Error getting transaction block for zap");
     }
-    const slippageReducedAmount = new decimal_js_1.Decimal(quoteResponse.returnAmountWithDecimal)
+    const slippageReducedAmount = new decimal_js_1.Decimal(quoteResponse.amountOut.toString())
         .mul(new decimal_js_1.Decimal(1).sub(params.slippage))
         .floor();
     const [returnCoinOut] = params.tx.splitCoins(coinOut, [
@@ -967,7 +968,7 @@ const depositBluefinType1Txb = async (txb, someReceipt, poolName, depositCoinA,
                 txb.object(poolinfo.investorId),
                 txb.object((0, constants_js_1.getConf)().ALPHA_4_VERSION),
                 txb.object((0, constants_js_1.getConf)().BLUEFIN_GLOBAL_CONFIG),
-                txb.object((0, constants_js_1.getConf)().BLUEFIN_SUIUSDT_USDC_POOL),
+                txb.object(poolinfo.parentPoolId),
                 txb.object((0, constants_js_1.getConf)().BLUEFIN_BLUE_SUI_POOL),
                 txb.object(maps_js_1.bluefinPoolMap["SUI-USDC"]),
                 txb.object((0, constants_js_1.getConf)().LST_INFO),
@@ -994,7 +995,7 @@ const depositBluefinType1Txb = async (txb, someReceipt, poolName, depositCoinA,
                 txb.object(poolinfo.investorId),
                 txb.object((0, constants_js_1.getConf)().BLUEFIN_GLOBAL_CONFIG),
                 txb.object((0, constants_js_1.getConf)().CETUS_GLOBAL_CONFIG_ID),
-                txb.object((0, constants_js_1.getConf)().BLUEFIN_SUIUSDT_USDC_POOL),
+                txb.object(poolinfo.parentPoolId),
                 txb.object((0, constants_js_1.getConf)().BLUEFIN_BLUE_SUI_POOL),
                 txb.object(maps_js_1.cetusPoolMap["USDC-SUIUSDT"]),
                 txb.object(maps_js_1.cetusPoolMap["USDC-SUI"]),