@strkfarm/sdk 2.0.0-dev.18 → 2.0.0-dev.19

package/dist/index.browser.global.js

@@ -94799,7 +94799,9 @@ spurious results.`);
           return null;
         }
         const estimatedUsdcAmount = Math.floor(amount * btcPrice);
+        logger2.info(`${_AvnuAdapter.name}::getQuotesAvnu estimatedUsdcAmount: ${estimatedUsdcAmount}`);
         const targetBtcBig = BigInt(returnFormattedAmount(amount, toTokenDecimals));
+        logger2.info(`${_AvnuAdapter.name}::getQuotesAvnu targetBtcBig: ${targetBtcBig}`);
         let low = BigInt(
           Math.floor(
             estimatedUsdcAmount * 10 ** fromToken.decimals * 0.9
@@ -98397,15 +98399,30 @@ spurious results.`);
         const usdceToken = Global.getDefaultTokens().find(
           (token) => token.symbol === "USDCe"
         );
+        const walletBalance = await new ERC20(this.config).balanceOf(
+          usdceToken.address,
+          WALLET_ADDRESS,
+          usdceToken.decimals
+        );
+        logger2.info(`${_VesuExtendedMultiplierStrategy.name}::moveAssetsToVaultAllocator walletBalance: ${walletBalance.toNumber()}`);
+        const amountToBeTransferred = amount.minimum(walletBalance);
+        logger2.info(`${_VesuExtendedMultiplierStrategy.name}::moveAssetsToVaultAllocator amountToBeTransferred: ${amountToBeTransferred.toNumber()}`);
+        if (amountToBeTransferred.lessThan(0)) {
+          logger2.error(`${_VesuExtendedMultiplierStrategy.name}::moveAssetsToVaultAllocator amountToBeTransferred is less than 0: ${amountToBeTransferred.toNumber()}`);
+          return {
+            calls: [],
+            status: false
+          };
+        }
         const approveCall = new ERC20(this.config).approve(
           usdceToken.address,
           this.metadata.additionalInfo.vaultAllocator,
-          amount
+          amountToBeTransferred
         );
         const transferCall = new ERC20(this.config).transfer(
           usdceToken.address,
           this.metadata.additionalInfo.vaultAllocator,
-          amount
+          amountToBeTransferred
         );
         const proofsInfo = extendedAdapter.getProofsForFromLegacySwap(
           this.getMerkleTree()
@@ -98413,7 +98430,7 @@ spurious results.`);
         const proofGroups = proofsInfo.proofs;
         const call = this.getManageCall(
           proofGroups,
-          await proofsInfo.callConstructor({ amount })
+          await proofsInfo.callConstructor({ amount: amountToBeTransferred })
         );
         return {
           calls: [approveCall, transferCall, call],

package/dist/index.browser.mjs

@@ -30770,7 +30770,9 @@ var AvnuAdapter = class _AvnuAdapter extends BaseAdapter {
         return null;
       }
       const estimatedUsdcAmount = Math.floor(amount * btcPrice);
+      logger.info(`${_AvnuAdapter.name}::getQuotesAvnu estimatedUsdcAmount: ${estimatedUsdcAmount}`);
       const targetBtcBig = BigInt(returnFormattedAmount(amount, toTokenDecimals));
+      logger.info(`${_AvnuAdapter.name}::getQuotesAvnu targetBtcBig: ${targetBtcBig}`);
       let low = BigInt(
         Math.floor(
           estimatedUsdcAmount * 10 ** fromToken.decimals * 0.9
@@ -34371,15 +34373,30 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
       const usdceToken = Global.getDefaultTokens().find(
         (token) => token.symbol === "USDCe"
       );
+      const walletBalance = await new ERC20(this.config).balanceOf(
+        usdceToken.address,
+        WALLET_ADDRESS,
+        usdceToken.decimals
+      );
+      logger.info(`${_VesuExtendedMultiplierStrategy.name}::moveAssetsToVaultAllocator walletBalance: ${walletBalance.toNumber()}`);
+      const amountToBeTransferred = amount.minimum(walletBalance);
+      logger.info(`${_VesuExtendedMultiplierStrategy.name}::moveAssetsToVaultAllocator amountToBeTransferred: ${amountToBeTransferred.toNumber()}`);
+      if (amountToBeTransferred.lessThan(0)) {
+        logger.error(`${_VesuExtendedMultiplierStrategy.name}::moveAssetsToVaultAllocator amountToBeTransferred is less than 0: ${amountToBeTransferred.toNumber()}`);
+        return {
+          calls: [],
+          status: false
+        };
+      }
       const approveCall = new ERC20(this.config).approve(
         usdceToken.address,
         this.metadata.additionalInfo.vaultAllocator,
-        amount
+        amountToBeTransferred
       );
       const transferCall = new ERC20(this.config).transfer(
         usdceToken.address,
         this.metadata.additionalInfo.vaultAllocator,
-        amount
+        amountToBeTransferred
       );
       const proofsInfo = extendedAdapter.getProofsForFromLegacySwap(
         this.getMerkleTree()
@@ -34387,7 +34404,7 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
       const proofGroups = proofsInfo.proofs;
       const call = this.getManageCall(
         proofGroups,
-        await proofsInfo.callConstructor({ amount })
+        await proofsInfo.callConstructor({ amount: amountToBeTransferred })
       );
       return {
         calls: [approveCall, transferCall, call],

package/dist/index.js

@@ -30927,7 +30927,9 @@ var AvnuAdapter = class _AvnuAdapter extends BaseAdapter {
         return null;
       }
       const estimatedUsdcAmount = Math.floor(amount * btcPrice);
+      logger.info(`${_AvnuAdapter.name}::getQuotesAvnu estimatedUsdcAmount: ${estimatedUsdcAmount}`);
       const targetBtcBig = BigInt(returnFormattedAmount(amount, toTokenDecimals));
+      logger.info(`${_AvnuAdapter.name}::getQuotesAvnu targetBtcBig: ${targetBtcBig}`);
       let low = BigInt(
         Math.floor(
           estimatedUsdcAmount * 10 ** fromToken.decimals * 0.9
@@ -34528,15 +34530,30 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
       const usdceToken = Global.getDefaultTokens().find(
         (token) => token.symbol === "USDCe"
       );
+      const walletBalance = await new ERC20(this.config).balanceOf(
+        usdceToken.address,
+        WALLET_ADDRESS,
+        usdceToken.decimals
+      );
+      logger.info(`${_VesuExtendedMultiplierStrategy.name}::moveAssetsToVaultAllocator walletBalance: ${walletBalance.toNumber()}`);
+      const amountToBeTransferred = amount.minimum(walletBalance);
+      logger.info(`${_VesuExtendedMultiplierStrategy.name}::moveAssetsToVaultAllocator amountToBeTransferred: ${amountToBeTransferred.toNumber()}`);
+      if (amountToBeTransferred.lessThan(0)) {
+        logger.error(`${_VesuExtendedMultiplierStrategy.name}::moveAssetsToVaultAllocator amountToBeTransferred is less than 0: ${amountToBeTransferred.toNumber()}`);
+        return {
+          calls: [],
+          status: false
+        };
+      }
       const approveCall = new ERC20(this.config).approve(
         usdceToken.address,
         this.metadata.additionalInfo.vaultAllocator,
-        amount
+        amountToBeTransferred
       );
       const transferCall = new ERC20(this.config).transfer(
         usdceToken.address,
         this.metadata.additionalInfo.vaultAllocator,
-        amount
+        amountToBeTransferred
       );
       const proofsInfo = extendedAdapter.getProofsForFromLegacySwap(
         this.getMerkleTree()
@@ -34544,7 +34561,7 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
       const proofGroups = proofsInfo.proofs;
       const call = this.getManageCall(
         proofGroups,
-        await proofsInfo.callConstructor({ amount })
+        await proofsInfo.callConstructor({ amount: amountToBeTransferred })
       );
       return {
         calls: [approveCall, transferCall, call],

package/dist/index.mjs

@@ -30781,7 +30781,9 @@ var AvnuAdapter = class _AvnuAdapter extends BaseAdapter {
         return null;
       }
       const estimatedUsdcAmount = Math.floor(amount * btcPrice);
+      logger.info(`${_AvnuAdapter.name}::getQuotesAvnu estimatedUsdcAmount: ${estimatedUsdcAmount}`);
       const targetBtcBig = BigInt(returnFormattedAmount(amount, toTokenDecimals));
+      logger.info(`${_AvnuAdapter.name}::getQuotesAvnu targetBtcBig: ${targetBtcBig}`);
       let low = BigInt(
         Math.floor(
           estimatedUsdcAmount * 10 ** fromToken.decimals * 0.9
@@ -34382,15 +34384,30 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
       const usdceToken = Global.getDefaultTokens().find(
         (token) => token.symbol === "USDCe"
       );
+      const walletBalance = await new ERC20(this.config).balanceOf(
+        usdceToken.address,
+        WALLET_ADDRESS,
+        usdceToken.decimals
+      );
+      logger.info(`${_VesuExtendedMultiplierStrategy.name}::moveAssetsToVaultAllocator walletBalance: ${walletBalance.toNumber()}`);
+      const amountToBeTransferred = amount.minimum(walletBalance);
+      logger.info(`${_VesuExtendedMultiplierStrategy.name}::moveAssetsToVaultAllocator amountToBeTransferred: ${amountToBeTransferred.toNumber()}`);
+      if (amountToBeTransferred.lessThan(0)) {
+        logger.error(`${_VesuExtendedMultiplierStrategy.name}::moveAssetsToVaultAllocator amountToBeTransferred is less than 0: ${amountToBeTransferred.toNumber()}`);
+        return {
+          calls: [],
+          status: false
+        };
+      }
       const approveCall = new ERC20(this.config).approve(
         usdceToken.address,
         this.metadata.additionalInfo.vaultAllocator,
-        amount
+        amountToBeTransferred
       );
       const transferCall = new ERC20(this.config).transfer(
         usdceToken.address,
         this.metadata.additionalInfo.vaultAllocator,
-        amount
+        amountToBeTransferred
       );
       const proofsInfo = extendedAdapter.getProofsForFromLegacySwap(
         this.getMerkleTree()
@@ -34398,7 +34415,7 @@ var VesuExtendedMultiplierStrategy = class _VesuExtendedMultiplierStrategy exten
       const proofGroups = proofsInfo.proofs;
       const call = this.getManageCall(
         proofGroups,
-        await proofsInfo.callConstructor({ amount })
+        await proofsInfo.callConstructor({ amount: amountToBeTransferred })
       );
       return {
         calls: [approveCall, transferCall, call],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strkfarm/sdk",
-  "version": "2.0.0-dev.18",
+  "version": "2.0.0-dev.19",
   "description": "STRKFarm TS SDK (Meant for our internal use, but feel free to use it)",
   "typings": "dist/index.d.ts",
   "types": "dist/index.d.ts",

package/src/strategies/universal-adapters/avnu-adapter.ts

@@ -307,8 +307,8 @@ export class AvnuAdapter extends BaseAdapter<DepositParams, WithdrawParams> {
     tolerance: number = 5000
   ): Promise<Quote | null>{
     try {
-      const fromToken = this.config.supportedPositions[0].asset;
-      const toToken = this.config.supportedPositions[1].asset;
+      const fromToken = this.config.supportedPositions[0].asset; //usdc
+      const toToken = this.config.supportedPositions[1].asset; //wbtc
       if(!usdcToBtc) {
         const sellAmount = returnFormattedAmount(amount, toTokenDecimals);
         const params: Record<string, any> = {
@@ -331,7 +331,9 @@ export class AvnuAdapter extends BaseAdapter<DepositParams, WithdrawParams> {
         return null;
       }
       const estimatedUsdcAmount = Math.floor(amount * btcPrice);
+      logger.info(`${AvnuAdapter.name}::getQuotesAvnu estimatedUsdcAmount: ${estimatedUsdcAmount}`);
       const targetBtcBig = BigInt(returnFormattedAmount(amount, toTokenDecimals));
+      logger.info(`${AvnuAdapter.name}::getQuotesAvnu targetBtcBig: ${targetBtcBig}`);
       let low = BigInt(
         Math.floor(
           (estimatedUsdcAmount * 10 ** fromToken.decimals) * 0.9

package/src/strategies/vesu-extended-strategy/vesu-extended-strategy.tsx

@@ -190,15 +190,32 @@ export class VesuExtendedMultiplierStrategy<
       const usdceToken = Global.getDefaultTokens().find(
         (token) => token.symbol === "USDCe"
       )!;
+      const walletBalance = await new ERC20(this.config).balanceOf(
+        usdceToken.address,
+        WALLET_ADDRESS,
+        usdceToken.decimals
+      );
+      logger.info(`${VesuExtendedMultiplierStrategy.name}::moveAssetsToVaultAllocator walletBalance: ${walletBalance.toNumber()}`);
+      const amountToBeTransferred = amount.minimum(walletBalance);
+      logger.info(`${VesuExtendedMultiplierStrategy.name}::moveAssetsToVaultAllocator amountToBeTransferred: ${amountToBeTransferred.toNumber()}`);
+  
+      if (amountToBeTransferred.lessThan(0)) {
+        logger.error(`${VesuExtendedMultiplierStrategy.name}::moveAssetsToVaultAllocator amountToBeTransferred is less than 0: ${amountToBeTransferred.toNumber()}`);
+        return {
+          calls: [],
+          status: false,
+        };
+      }
+
       const approveCall = new ERC20(this.config).approve(
         usdceToken.address,
         this.metadata.additionalInfo.vaultAllocator,
-        amount
+        amountToBeTransferred
       );
       const transferCall = new ERC20(this.config).transfer(
         usdceToken.address,
         this.metadata.additionalInfo.vaultAllocator,
-        amount
+        amountToBeTransferred
       );
       const proofsInfo = extendedAdapter.getProofsForFromLegacySwap(
         this.getMerkleTree()
@@ -206,7 +223,7 @@ export class VesuExtendedMultiplierStrategy<
       const proofGroups = proofsInfo.proofs;
       const call = this.getManageCall(
         proofGroups,
-        await proofsInfo.callConstructor({ amount: amount })
+        await proofsInfo.callConstructor({ amount: amountToBeTransferred })
       );
       return {
         calls: [approveCall, transferCall, call],