@alphafi/alphafi-sdk 0.0.55 → 0.0.58

package/dist/esm/transactions/zapDeposit.js

@@ -51,7 +51,7 @@ options) {
                 inAmount: new BN(inputCoinAmount),
                 slippage: slippage,
             };
-            const result = await zapSwap(swapOptionsI2B, txb);
+            const result = await zapSwap(swapOptionsI2B, txb, poolName);
             if (result) {
                 amountB = result.amountOut;
                 txb = result.tx;
@@ -84,7 +84,7 @@ options) {
                 inAmount: new BN(inputCoinAmount),
                 slippage: slippage,
             };
-            const result = await zapSwap(swapOptionsI2A, txb);
+            const result = await zapSwap(swapOptionsI2A, txb, poolName);
             if (result) {
                 amountA = result.amountOut;
                 txb = result.tx;
@@ -106,7 +106,7 @@ options) {
             inAmount: new BN(amount1),
             slippage: slippage,
         };
-        const ratioQuote = await zapGetQuote(swapGateway, swapOptions);
+        const ratioQuote = await zapGetQuote(swapGateway, swapOptions, poolName);
         if (ratioQuote === undefined) {
             console.error("Error fetching ratioQuote for zap");
             return undefined;
@@ -134,7 +134,7 @@ options) {
             slippage: slippage,
         };
         if (inputCoinName === coinTypeA) {
-            const result = await zapSwap(swapOptionsI2B, txb);
+            const result = await zapSwap(swapOptionsI2B, txb, poolName);
             if (result) {
                 amountB = result.amountOut;
                 txb = result.tx;
@@ -153,7 +153,7 @@ options) {
             }
         }
         else if (inputCoinName === coinTypeB) {
-            const result = await zapSwap(swapOptionsI2A, txb);
+            const result = await zapSwap(swapOptionsI2A, txb, poolName);
             if (result) {
                 amountA = result.amountOut;
                 txb = result.tx;
@@ -172,7 +172,7 @@ options) {
             }
         }
         else {
-            let result = await zapSwap(swapOptionsI2A, txb);
+            let result = await zapSwap(swapOptionsI2A, txb, poolName);
             if (result) {
                 amountA = result.amountOut;
                 txb = result.tx;
@@ -180,7 +180,7 @@ options) {
                     coin1 = result.coinOut;
                 }
             }
-            result = await zapSwap(swapOptionsI2B, txb);
+            result = await zapSwap(swapOptionsI2B, txb, poolName);
             if (result) {
                 amountB = result.amountOut;
                 txb = result.tx;
@@ -201,8 +201,8 @@ options) {
         txb.transferObjects([feeCoinA, feeCoinB], fee_address);
         const pool1 = doubleAssetPoolCoinMap[poolName].coin1;
         const pool2 = doubleAssetPoolCoinMap[poolName].coin2;
-        amountA = (Number(amountA) * 0.999).toString();
-        amountB = (Number(amountB) * 0.999).toString();
+        amountA = (Number(amountA) * 0.995).toString();
+        amountB = (Number(amountB) * 0.995).toString();
         if (poolInfo[poolName].parentProtocolName === "CETUS") {
             if (pool1 === "CETUS" && pool2 === "SUI") {
                 txb = await depositCetusSuiTxb(amountA, amountB, poolName, { address }, txb, coin1, coin2);
@@ -237,7 +237,7 @@ options) {
     txb.setGasBudget(100000000);
     return txb;
 }
-async function zapGetQuote(swapGateway, swapOptions) {
+async function zapGetQuote(swapGateway, swapOptions, poolName) {
     if (swapOptions.pair.coinA.name === "SUI" &&
         swapOptions.pair.coinB.name === "STSUI") {
         const exchangeRate = new Decimal(await stSuiExchangeRate());
@@ -251,7 +251,9 @@ async function zapGetQuote(swapGateway, swapOptions) {
         return amount.mul(exchangeRate).toString();
     }
     else {
-        const quoteResponse = await swapGateway.getQuote(swapOptions);
+        const quoteResponse = await swapGateway.getQuote(swapOptions, [
+            poolInfo[poolName].parentPoolId,
+        ]);
         if (quoteResponse) {
             return quoteResponse.returnAmountWithDecimal
                 ? quoteResponse.returnAmountWithDecimal
@@ -259,10 +261,9 @@ async function zapGetQuote(swapGateway, swapOptions) {
         }
     }
 }
-async function zapSwap(swapOptions, txb) {
+async function zapSwap(swapOptions, txb, poolName) {
     if (swapOptions.pair.coinA.name === "SUI" &&
         swapOptions.pair.coinB.name === "STSUI") {
-        console.log("mintTx called");
         const result = await mintTx(swapOptions.inAmount ? swapOptions.inAmount.toString() : "0", txb);
         return {
             tx: result.tx,
@@ -273,14 +274,14 @@ async function zapSwap(swapOptions, txb) {
     }
     else if (swapOptions.pair.coinA.name === "STSUI" &&
         swapOptions.pair.coinB.name === "SUI") {
-        console.log("redeemTx called");
         const result = await redeemTx(swapOptions.inAmount ? swapOptions.inAmount.toString() : "0", txb, { address: swapOptions.senderAddress });
         return result;
     }
     else {
-        console.log("7k swap", swapOptions);
         const swapGateway = new SevenKGateway();
-        const quoteResponse = await swapGateway.getQuote(swapOptions);
+        const quoteResponse = await swapGateway.getQuote(swapOptions, [
+            poolInfo[poolName].parentPoolId,
+        ]);
         if (quoteResponse) {
             const result = await swapGateway.getTransactionBlock(swapOptions, quoteResponse, txb);
             return {
@@ -590,7 +591,7 @@ const depositBluefinSuiFirstTxb = async (amountA, amountB, poolName, options, tr
                     txb.object(getConf().BLUEFIN_GLOBAL_CONFIG),
                     txb.object(getConf().CETUS_GLOBAL_CONFIG_ID),
                     txb.object(getConf().BLUEFIN_SUI_USDC_POOL),
-                    txb.object(getConf().BLUEFIN_BLUE_SUI_POOL_AUTOCOMPOUND),
+                    txb.object(getConf().BLUEFIN_BLUE_SUI_POOL),
                     txb.object(cetusPoolMap["USDC-SUI"]),
                     txb.object(getConf().CLOCK_PACKAGE_ID),
                 ],
@@ -617,7 +618,7 @@ const depositBluefinSuiFirstTxb = async (amountA, amountB, poolName, options, tr
                     txb.object(getConf().BLUEFIN_GLOBAL_CONFIG),
                     txb.object(getConf().CETUS_GLOBAL_CONFIG_ID),
                     txb.object(getConf().BLUEFIN_SUI_BUCK_POOL),
-                    txb.object(getConf().BLUEFIN_BLUE_SUI_POOL_AUTOCOMPOUND),
+                    txb.object(getConf().BLUEFIN_BLUE_SUI_POOL),
                     txb.object(cetusPoolMap["BUCK-SUI"]),
                     txb.object(getConf().CLOCK_PACKAGE_ID),
                 ],
@@ -644,7 +645,7 @@ const depositBluefinSuiFirstTxb = async (amountA, amountB, poolName, options, tr
                     txb.object(getConf().BLUEFIN_GLOBAL_CONFIG),
                     txb.object(getConf().CETUS_GLOBAL_CONFIG_ID),
                     txb.object(getConf().BLUEFIN_SUI_AUSD_POOL),
-                    txb.object(getConf().BLUEFIN_BLUE_SUI_POOL_AUTOCOMPOUND),
+                    txb.object(getConf().BLUEFIN_BLUE_SUI_POOL),
                     txb.object(cetusPoolMap["AUSD-SUI"]),
                     txb.object(getConf().CLOCK_PACKAGE_ID),
                 ],
@@ -670,7 +671,7 @@ const depositBluefinSuiFirstTxb = async (amountA, amountB, poolName, options, tr
                     txb.object(getConf().BLUEFIN_GLOBAL_CONFIG),
                     txb.object(getConf().CETUS_GLOBAL_CONFIG_ID),
                     txb.object(getConf().BLUEFIN_SUI_USDC_POOL),
-                    txb.object(getConf().BLUEFIN_BLUE_SUI_POOL_AUTOCOMPOUND),
+                    txb.object(getConf().BLUEFIN_BLUE_SUI_POOL),
                     txb.object(cetusPoolMap["USDC-SUI"]),
                     txb.object(getConf().CLOCK_PACKAGE_ID),
                 ],
@@ -740,7 +741,7 @@ const depositBluefinType1Txb = async (amountA, amountB, poolName, options, trans
                     txb.object(getConf().BLUEFIN_GLOBAL_CONFIG),
                     txb.object(getConf().CETUS_GLOBAL_CONFIG_ID),
                     txb.object(getConf().BLUEFIN_USDT_USDC_POOL),
-                    txb.object(getConf().BLUEFIN_BLUE_SUI_POOL_AUTOCOMPOUND),
+                    txb.object(getConf().BLUEFIN_BLUE_SUI_POOL),
                     txb.object(cetusPoolMap["USDC-USDT"]),
                     txb.object(cetusPoolMap["USDC-SUI"]),
                     txb.object(getConf().CLOCK_PACKAGE_ID),
@@ -768,7 +769,7 @@ const depositBluefinType1Txb = async (amountA, amountB, poolName, options, trans
                     txb.object(getConf().BLUEFIN_GLOBAL_CONFIG),
                     txb.object(getConf().CETUS_GLOBAL_CONFIG_ID),
                     txb.object(getConf().BLUEFIN_AUSD_USDC_POOL),
-                    txb.object(getConf().BLUEFIN_BLUE_SUI_POOL_AUTOCOMPOUND),
+                    txb.object(getConf().BLUEFIN_BLUE_SUI_POOL),
                     txb.object(cetusPoolMap["USDC-AUSD"]),
                     txb.object(cetusPoolMap["USDC-SUI"]),
                     txb.object(getConf().CLOCK_PACKAGE_ID),
@@ -796,7 +797,7 @@ const depositBluefinType1Txb = async (amountA, amountB, poolName, options, trans
                     txb.object(getConf().BLUEFIN_GLOBAL_CONFIG),
                     txb.object(getConf().CETUS_GLOBAL_CONFIG_ID),
                     txb.object(getConf().BLUEFIN_WBTC_USDC_POOL),
-                    txb.object(getConf().BLUEFIN_BLUE_SUI_POOL_AUTOCOMPOUND),
+                    txb.object(getConf().BLUEFIN_BLUE_SUI_POOL),
                     txb.object(cetusPoolMap["USDC-WBTC"]),
                     txb.object(cetusPoolMap["USDC-SUI"]),
                     txb.object(getConf().CLOCK_PACKAGE_ID),
@@ -824,7 +825,7 @@ const depositBluefinType1Txb = async (amountA, amountB, poolName, options, trans
                     txb.object(getConf().BLUEFIN_GLOBAL_CONFIG),
                     txb.object(getConf().CETUS_GLOBAL_CONFIG_ID),
                     txb.object(getConf().BLUEFIN_SEND_USDC_POOL),
-                    txb.object(getConf().BLUEFIN_BLUE_SUI_POOL_AUTOCOMPOUND),
+                    txb.object(getConf().BLUEFIN_BLUE_SUI_POOL),
                     txb.object(cetusPoolMap["USDC-SEND"]),
                     txb.object(cetusPoolMap["USDC-SUI"]),
                     txb.object(getConf().CLOCK_PACKAGE_ID),
@@ -852,7 +853,7 @@ const depositBluefinType1Txb = async (amountA, amountB, poolName, options, trans
                     txb.object(getConf().BLUEFIN_GLOBAL_CONFIG),
                     txb.object(getConf().CETUS_GLOBAL_CONFIG_ID),
                     txb.object(getConf().BLUEFIN_STSUI_USDC_POOL),
-                    txb.object(getConf().BLUEFIN_BLUE_SUI_POOL_AUTOCOMPOUND),
+                    txb.object(getConf().BLUEFIN_BLUE_SUI_POOL),
                     txb.object(cetusPoolMap["USDC-STSUI"]),
                     txb.object(cetusPoolMap["USDC-SUI"]),
                     txb.object(getConf().CLOCK_PACKAGE_ID),
@@ -879,7 +880,7 @@ const depositBluefinType1Txb = async (amountA, amountB, poolName, options, trans
                     txb.object(getConf().BLUEFIN_GLOBAL_CONFIG),
                     txb.object(getConf().CETUS_GLOBAL_CONFIG_ID),
                     txb.object(getConf().BLUEFIN_USDT_USDC_POOL),
-                    txb.object(getConf().BLUEFIN_BLUE_SUI_POOL_AUTOCOMPOUND),
+                    txb.object(getConf().BLUEFIN_BLUE_SUI_POOL),
                     txb.object(cetusPoolMap["USDC-USDT"]),
                     txb.object(cetusPoolMap["USDC-SUI"]),
                     txb.object(getConf().CLOCK_PACKAGE_ID),
@@ -907,7 +908,7 @@ const depositBluefinType1Txb = async (amountA, amountB, poolName, options, trans
                     txb.object(getConf().BLUEFIN_GLOBAL_CONFIG),
                     txb.object(getConf().CETUS_GLOBAL_CONFIG_ID),
                     txb.object(getConf().BLUEFIN_SUIUSDT_USDC_POOL),
-                    txb.object(getConf().BLUEFIN_BLUE_SUI_POOL_AUTOCOMPOUND),
+                    txb.object(getConf().BLUEFIN_BLUE_SUI_POOL),
                     txb.object(cetusPoolMap["USDC-SUIUSDT"]),
                     txb.object(cetusPoolMap["USDC-SUI"]),
                     txb.object(getConf().CLOCK_PACKAGE_ID),
@@ -934,7 +935,7 @@ const depositBluefinType1Txb = async (amountA, amountB, poolName, options, trans
                     txb.object(getConf().BLUEFIN_GLOBAL_CONFIG),
                     txb.object(getConf().CETUS_GLOBAL_CONFIG_ID),
                     txb.object(getConf().BLUEFIN_SUIUSDT_USDC_POOL),
-                    txb.object(getConf().BLUEFIN_BLUE_SUI_POOL_AUTOCOMPOUND),
+                    txb.object(getConf().BLUEFIN_BLUE_SUI_POOL),
                     txb.object(cetusPoolMap["USDC-SUIUSDT"]),
                     txb.object(cetusPoolMap["USDC-SUI"]),
                     txb.object(getConf().CLOCK_PACKAGE_ID),
@@ -961,7 +962,7 @@ const depositBluefinType1Txb = async (amountA, amountB, poolName, options, trans
                     txb.object(getConf().BLUEFIN_GLOBAL_CONFIG),
                     txb.object(getConf().CETUS_GLOBAL_CONFIG_ID),
                     txb.object(getConf().BLUEFIN_DEEP_BLUE_POOL),
-                    txb.object(getConf().BLUEFIN_BLUE_SUI_POOL_AUTOCOMPOUND),
+                    txb.object(getConf().BLUEFIN_BLUE_SUI_POOL),
                     txb.object(cetusPoolMap["BLUE-DEEP"]),
                     txb.object(cetusPoolMap["BLUE-SUI"]),
                     txb.object(getConf().CLOCK_PACKAGE_ID),
@@ -1032,7 +1033,7 @@ const depositBluefinType2Txb = async (amountA, amountB, poolName, options, trans
                     txb.object(getConf().BLUEFIN_GLOBAL_CONFIG),
                     txb.object(getConf().CETUS_GLOBAL_CONFIG_ID),
                     txb.object(getConf().BLUEFIN_ALPHA_USDC_POOL),
-                    txb.object(getConf().BLUEFIN_BLUE_SUI_POOL_AUTOCOMPOUND),
+                    txb.object(getConf().BLUEFIN_BLUE_SUI_POOL),
                     txb.object(cetusPoolMap["ALPHA-USDC"]),
                     txb.object(cetusPoolMap["USDC-SUI"]),
                     txb.object(getConf().CLOCK_PACKAGE_ID),
@@ -1060,7 +1061,7 @@ const depositBluefinType2Txb = async (amountA, amountB, poolName, options, trans
                     txb.object(getConf().BLUEFIN_GLOBAL_CONFIG),
                     txb.object(getConf().CETUS_GLOBAL_CONFIG_ID),
                     txb.object(getConf().BLUEFIN_NAVX_VSUI_POOL),
-                    txb.object(getConf().BLUEFIN_BLUE_SUI_POOL_AUTOCOMPOUND),
+                    txb.object(getConf().BLUEFIN_BLUE_SUI_POOL),
                     txb.object(cetusPoolMap["NAVX-VSUI"]),
                     txb.object(cetusPoolMap["VSUI-SUI"]),
                     txb.object(getConf().CLOCK_PACKAGE_ID),
@@ -1301,6 +1302,56 @@ const depositBluefinSuiSecondTxb = async (amountA, amountB, poolName, options, t
                 ],
             });
         }
+        else if (poolName === "BLUEFIN-AUTOBALANCE-DEEP-SUI") {
+            txb.moveCall({
+                target: `${poolinfo.packageId}::alphafi_bluefin_sui_second_pool::user_deposit`,
+                typeArguments: [
+                    coinsList[pool1].type,
+                    coinsList[pool2].type,
+                    coinsList["BLUE"].type,
+                ],
+                arguments: [
+                    txb.object(getConf().ALPHA_BLUEFIN_AUTOBALANCE_VERSION),
+                    someReceipt,
+                    txb.object(poolinfo.poolId),
+                    depositCoinA,
+                    depositCoinB,
+                    txb.object(getConf().ALPHA_DISTRIBUTOR),
+                    txb.object(poolinfo.investorId),
+                    txb.object(getConf().BLUEFIN_GLOBAL_CONFIG),
+                    txb.object(getConf().CETUS_GLOBAL_CONFIG_ID),
+                    txb.object(getConf().BLUEFIN_DEEP_SUI_POOL),
+                    txb.object(getConf().BLUEFIN_BLUE_SUI_POOL),
+                    txb.object(cetusPoolMap["DEEP-SUI"]),
+                    txb.object(getConf().CLOCK_PACKAGE_ID),
+                ],
+            });
+        }
+        else if (poolName === "BLUEFIN-AUTOBALANCE-BLUE-SUI") {
+            txb.moveCall({
+                target: `${poolinfo.packageId}::alphafi_bluefin_sui_second_pool::user_deposit`,
+                typeArguments: [
+                    coinsList[pool1].type,
+                    coinsList[pool2].type,
+                    coinsList["DEEP"].type,
+                ],
+                arguments: [
+                    txb.object(getConf().ALPHA_BLUEFIN_AUTOBALANCE_VERSION),
+                    someReceipt,
+                    txb.object(poolinfo.poolId),
+                    depositCoinA,
+                    depositCoinB,
+                    txb.object(getConf().ALPHA_DISTRIBUTOR),
+                    txb.object(poolinfo.investorId),
+                    txb.object(getConf().BLUEFIN_GLOBAL_CONFIG),
+                    txb.object(getConf().CETUS_GLOBAL_CONFIG_ID),
+                    txb.object(getConf().BLUEFIN_BLUE_SUI_POOL),
+                    txb.object(getConf().BLUEFIN_DEEP_SUI_POOL),
+                    txb.object(cetusPoolMap["BLUE-SUI"]),
+                    txb.object(getConf().CLOCK_PACKAGE_ID),
+                ],
+            });
+        }
         txb.transferObjects([coin1Arg, coin2Arg], address);
     }
     else {
@@ -1364,7 +1415,7 @@ const depositBluefinStsuiTxb = async (amountA, amountB, poolName, options, trans
                     txb.object(getConf().BLUEFIN_GLOBAL_CONFIG),
                     txb.object(getConf().CETUS_GLOBAL_CONFIG_ID),
                     txb.object(getConf().BLUEFIN_STSUI_USDC_POOL),
-                    txb.object(getConf().BLUEFIN_BLUE_SUI_POOL_AUTOCOMPOUND),
+                    txb.object(getConf().BLUEFIN_BLUE_SUI_POOL),
                     txb.object(cetusPoolMap["USDC-SUI"]),
                     txb.object(bluefinPoolMap["SUI-USDC"]),
                     txb.object(getConf().LST_INFO),
@@ -1394,7 +1445,7 @@ const depositBluefinStsuiTxb = async (amountA, amountB, poolName, options, trans
                     txb.object(getConf().BLUEFIN_GLOBAL_CONFIG),
                     txb.object(getConf().CETUS_GLOBAL_CONFIG_ID),
                     txb.object(getConf().BLUEFIN_ALPHA_STSUI_POOL),
-                    txb.object(getConf().BLUEFIN_BLUE_SUI_POOL_AUTOCOMPOUND),
+                    txb.object(getConf().BLUEFIN_BLUE_SUI_POOL),
                     txb.object(cetusPoolMap["ALPHA-SUI"]),
                     txb.object(bluefinPoolMap["SUI-ALPHA"]),
                     txb.object(getConf().LST_INFO),
@@ -1432,7 +1483,7 @@ export async function getZapAmounts(inputCoinAmount, inputCoinName, poolName, sl
             inAmount: new BN(amount1),
             slippage: slippage,
         };
-        const ratioQuote = await zapGetQuote(swapGateway, swapOptions);
+        const ratioQuote = await zapGetQuote(swapGateway, swapOptions, poolName);
         if (ratioQuote) {
             const amount1InCoinType2 = Number(ratioQuote);
             const totalAmount = amount2 + amount1InCoinType2;
@@ -1458,16 +1509,16 @@ export async function getZapAmounts(inputCoinAmount, inputCoinName, poolName, sl
                 slippage: slippage,
             };
             if (inputCoinName === coinTypeA) {
-                amountB = await zapGetQuote(swapGateway, swapOptionsI2B);
+                amountB = await zapGetQuote(swapGateway, swapOptionsI2B, poolName);
                 amountA = inputAmountToType1.toString();
             }
             else if (inputCoinName === coinTypeB) {
-                amountA = await zapGetQuote(swapGateway, swapOptionsI2A);
+                amountA = await zapGetQuote(swapGateway, swapOptionsI2A, poolName);
                 amountB = inputAmountToType2.toString();
             }
             else {
-                amountA = await zapGetQuote(swapGateway, swapOptionsI2A);
-                amountB = await zapGetQuote(swapGateway, swapOptionsI2B);
+                amountA = await zapGetQuote(swapGateway, swapOptionsI2A, poolName);
+                amountB = await zapGetQuote(swapGateway, swapOptionsI2B, poolName);
             }
             if (amountA && amountB) {
                 const [coin1Price, coin2Price] = await getLatestPrices([