@hypurrquant/defi-cli 1.0.4 → 1.0.6

package/dist/index.js

@@ -227,7 +227,7 @@ var init_dist = __esm({
       aggregators;
       effectiveRpcUrl() {
         const chainEnv = this.name.toUpperCase().replace(/ /g, "_") + "_RPC_URL";
-        return process.env[chainEnv] ?? process.env["HYPEREVM_RPC_URL"] ?? this.rpc_url;
+        return process.env[chainEnv] ?? this.rpc_url;
       }
     };
     ProtocolCategory = /* @__PURE__ */ ((ProtocolCategory2) => {
@@ -5617,6 +5617,9 @@ var init_dist2 = __esm({
       "function borrowRatePerBlock() external view returns (uint256)",
       "function totalSupply() external view returns (uint256)",
       "function totalBorrows() external view returns (uint256)",
+      "function balanceOf(address account) external view returns (uint256)",
+      "function exchangeRateStored() external view returns (uint256)",
+      "function borrowBalanceStored(address account) external view returns (uint256)",
       "function mint(uint256 mintAmount) external returns (uint256)",
       "function redeem(uint256 redeemTokens) external returns (uint256)",
       "function borrow(uint256 borrowAmount) external returns (uint256)",
@@ -5732,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}`);
           }),
@@ -5740,29 +5743,62 @@ 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
         };
       }
-      async getUserPosition(_user) {
-        throw DefiError.unsupported(
-          `[${this.protocolName}] User position requires querying individual vToken balances`
-        );
+      async getUserPosition(user) {
+        if (!this.rpcUrl) throw DefiError.rpcError("No RPC URL configured");
+        const client = createPublicClient13({ transport: http13(this.rpcUrl) });
+        const ERC20_ABI42 = parseAbi17([
+          "function symbol() external view returns (string)"
+        ]);
+        const supplies = [];
+        const borrows = [];
+        await Promise.all(this.vTokenCandidates.map(async (vtoken) => {
+          try {
+            const [vtokenBal, rate, borrowed, underlying] = await Promise.all([
+              client.readContract({ address: vtoken, abi: CTOKEN_ABI, functionName: "balanceOf", args: [user] }),
+              client.readContract({ address: vtoken, abi: CTOKEN_ABI, functionName: "exchangeRateStored" }),
+              client.readContract({ address: vtoken, abi: CTOKEN_ABI, functionName: "borrowBalanceStored", args: [user] }),
+              client.readContract({ address: vtoken, abi: CTOKEN_ABI, functionName: "underlying" }).catch(() => null)
+            ]);
+            if (vtokenBal === 0n && borrowed === 0n) return;
+            const assetAddr = underlying ?? vtoken;
+            const symbol = await client.readContract({
+              address: assetAddr,
+              abi: ERC20_ABI42,
+              functionName: "symbol"
+            }).catch(() => "?");
+            const supplyUnderlying = vtokenBal * rate / 10n ** 18n;
+            if (supplyUnderlying > 0n) supplies.push({ asset: assetAddr, symbol, amount: supplyUnderlying });
+            if (borrowed > 0n) borrows.push({ asset: assetAddr, symbol, amount: borrowed });
+          } catch {
+          }
+        }));
+        return {
+          protocol: this.protocolName,
+          user,
+          supplies,
+          borrows
+        };
       }
     };
     COMET_ABI = parseAbi18([
@@ -5772,6 +5808,8 @@ var init_dist2 = __esm({
       "function getBorrowRate(uint256 utilization) external view returns (uint64)",
       "function totalSupply() external view returns (uint256)",
       "function totalBorrow() external view returns (uint256)",
+      "function balanceOf(address account) external view returns (uint256)",
+      "function borrowBalanceOf(address account) external view returns (uint256)",
       "function supply(address asset, uint256 amount) external",
       "function withdraw(address asset, uint256 amount) external"
     ]);
@@ -5902,10 +5940,30 @@ var init_dist2 = __esm({
           total_borrow: totalBorrow
         };
       }
-      async getUserPosition(_user) {
-        throw DefiError.unsupported(
-          `[${this.protocolName}] User position requires querying Comet balanceOf + borrowBalanceOf`
-        );
+      async getUserPosition(user) {
+        if (!this.rpcUrl) throw DefiError.rpcError("No RPC URL configured");
+        const client = createPublicClient14({ transport: http14(this.rpcUrl) });
+        const ERC20_ABI42 = parseAbi18([
+          "function symbol() external view returns (string)"
+        ]);
+        const [supplyBal, borrowBal, baseToken] = await Promise.all([
+          client.readContract({ address: this.comet, abi: COMET_ABI, functionName: "balanceOf", args: [user] }).catch(() => 0n),
+          client.readContract({ address: this.comet, abi: COMET_ABI, functionName: "borrowBalanceOf", args: [user] }).catch(() => 0n),
+          client.readContract({ address: this.comet, abi: COMET_ABI, functionName: "baseToken" })
+        ]);
+        const baseSymbol = await client.readContract({
+          address: baseToken,
+          abi: ERC20_ABI42,
+          functionName: "symbol"
+        }).catch(() => "?");
+        const supplies = supplyBal > 0n ? [{ asset: baseToken, symbol: baseSymbol, amount: supplyBal }] : [];
+        const borrows = borrowBal > 0n ? [{ asset: baseToken, symbol: baseSymbol, amount: borrowBal }] : [];
+        return {
+          protocol: this.protocolName,
+          user,
+          supplies,
+          borrows
+        };
       }
     };
     EULER_VAULT_ABI = parseAbi19([
@@ -11510,15 +11568,19 @@ function registerSetup(program2) {
         }
       }
       console.log(pc2.cyan(pc2.bold("\n  RPC URLs")) + pc2.gray(" (press Enter to use public defaults)"));
-      const hyperevmRpc = await ask(rl, "  HyperEVM RPC URL: ");
-      if (hyperevmRpc) {
-        newEnv.HYPEREVM_RPC_URL = hyperevmRpc;
-        console.log(`  ${pc2.green("OK")} HyperEVM RPC set`);
-      }
-      const mantleRpc = await ask(rl, "  Mantle RPC URL: ");
-      if (mantleRpc) {
-        newEnv.MANTLE_RPC_URL = mantleRpc;
-        console.log(`  ${pc2.green("OK")} Mantle RPC set`);
+      const rpcPrompts = [
+        { env: "HYPEREVM_RPC_URL", label: "HyperEVM" },
+        { env: "MANTLE_RPC_URL", label: "Mantle" },
+        { env: "BASE_RPC_URL", label: "Base" },
+        { env: "BNB_RPC_URL", label: "BNB" },
+        { env: "MONAD_RPC_URL", label: "Monad" }
+      ];
+      for (const { env, label } of rpcPrompts) {
+        const value = await ask(rl, `  ${label} RPC URL: `);
+        if (value) {
+          newEnv[env] = value;
+          console.log(`  ${pc2.green("OK")} ${label} RPC set`);
+        }
       }
       const finalEnv = { ...existing, ...newEnv };
       writeEnvFile(finalEnv);
@@ -11530,11 +11592,16 @@ function registerSetup(program2) {
       if (finalEnv.DEFI_PRIVATE_KEY) {
         console.log(`  Key:     ${pc2.green("configured")}`);
       }
-      if (finalEnv.HYPEREVM_RPC_URL) {
-        console.log(`  HyperEVM RPC: ${pc2.gray(finalEnv.HYPEREVM_RPC_URL)}`);
-      }
-      if (finalEnv.MANTLE_RPC_URL) {
-        console.log(`  Mantle RPC:   ${pc2.gray(finalEnv.MANTLE_RPC_URL)}`);
+      const rpcSummary = [
+        ["HYPEREVM_RPC_URL", "HyperEVM RPC"],
+        ["MANTLE_RPC_URL", "Mantle RPC  "],
+        ["BASE_RPC_URL", "Base RPC    "],
+        ["BNB_RPC_URL", "BNB RPC     "],
+        ["MONAD_RPC_URL", "Monad RPC   "]
+      ];
+      for (const [k, label] of rpcSummary) {
+        const v = finalEnv[k];
+        if (v) console.log(`  ${label}: ${pc2.gray(v)}`);
       }
       console.log(pc2.bold(pc2.white("\n  Next steps:")));
       console.log(`    ${pc2.green("defi portfolio")}          view balances & positions`);