@hypurrquant/defi-cli 1.0.5 → 1.0.7

package/dist/index.js

@@ -5735,7 +5735,7 @@ var init_dist2 = __esm({
             total_borrow: 0n
           };
         }
-        const [supplyRate, borrowRate, totalSupply, totalBorrows] = await Promise.all([
+        const [supplyRate, borrowRate, totalSupplyVtoken, totalBorrows, exchangeRate] = await Promise.all([
           client.readContract({ address: vtoken, abi: CTOKEN_ABI, functionName: "supplyRatePerBlock" }).catch((e) => {
             throw DefiError.rpcError(`[${this.protocolName}] supplyRatePerBlock failed: ${e}`);
           }),
@@ -5743,22 +5743,24 @@ var init_dist2 = __esm({
             throw DefiError.rpcError(`[${this.protocolName}] borrowRatePerBlock failed: ${e}`);
           }),
           client.readContract({ address: vtoken, abi: CTOKEN_ABI, functionName: "totalSupply" }).catch(() => 0n),
-          client.readContract({ address: vtoken, abi: CTOKEN_ABI, functionName: "totalBorrows" }).catch(() => 0n)
+          client.readContract({ address: vtoken, abi: CTOKEN_ABI, functionName: "totalBorrows" }).catch(() => 0n),
+          client.readContract({ address: vtoken, abi: CTOKEN_ABI, functionName: "exchangeRateStored" }).catch(() => 0n)
         ]);
         const supplyPerBlock = Number(supplyRate) / 1e18;
         const borrowPerBlock = Number(borrowRate) / 1e18;
         const supplyApy = supplyPerBlock * BSC_BLOCKS_PER_YEAR * 100;
         const borrowApy = borrowPerBlock * BSC_BLOCKS_PER_YEAR * 100;
-        const supplyF = Number(totalSupply);
+        const totalSupplyUnderlying = exchangeRate > 0n ? totalSupplyVtoken * exchangeRate / 10n ** 18n : totalSupplyVtoken;
+        const supplyF = Number(totalSupplyUnderlying);
         const borrowF = Number(totalBorrows);
-        const utilization = supplyF > 0 ? borrowF / supplyF * 100 : 0;
+        const utilization = supplyF > 0 ? Math.round(borrowF / supplyF * 1e4) / 100 : 0;
         return {
           protocol: this.protocolName,
           asset,
           supply_apy: supplyApy,
           borrow_variable_apy: borrowApy,
           utilization,
-          total_supply: totalSupply,
+          total_supply: totalSupplyUnderlying,
           total_borrow: totalBorrows
         };
       }
@@ -11092,6 +11094,14 @@ function registerBridge(parent, getOpts) {
         }
         const amountUsdc = Number(BigInt(opts.amount)) / 1e6;
         const { fee, maxFeeSubunits } = await getCctpFeeEstimate(srcDomain, dstDomain, amountUsdc);
+        if (BigInt(opts.amount) <= maxFeeSubunits) {
+          printOutput({
+            error: `CCTP: amount ${opts.amount} (${amountUsdc} USDC) is below the minimum bridge fee of ${maxFeeSubunits} (${fee} USDC). Increase --amount.`,
+            minimum_amount_wei: maxFeeSubunits.toString(),
+            minimum_amount_usdc: fee
+          }, getOpts());
+          return;
+        }
         const recipientPadded = `0x${"0".repeat(24)}${recipient.replace("0x", "").toLowerCase()}`;
         const { encodeFunctionData: encodeFunctionData30, parseAbi: parseAbi34 } = await import("viem");
         const tokenMessengerAbi = parseAbi34([