upd: market reserves -> multicall + core instance -> og + stability lib + pvpFee

Author: DevTeaLeaf

package.json

@@ -1,7 +1,7 @@
 {
   "name": "stability-ui",
   "type": "module",
-  "version": "0.11.44-alpha",
+  "version": "0.11.45-alpha",
   "scripts": {
     "dev": "astro dev",
     "start": "astro dev",
@@ -18,7 +18,7 @@
     "@astrojs/tailwind": "6.0.2",
     "@astrojs/vercel": "8.2.10",
     "@nanostores/react": "^0.7.1",
-    "@stabilitydao/stability": "=0.57.2",
+    "@stabilitydao/stability": "=0.58.1",
     "@tanstack/query-sync-storage-persister": "^5.22.2",
     "@tanstack/react-query": "^5.22.2",
     "@tanstack/react-query-persist-client": "^5.22.2",

public/ogs/markets/Core_Instance.png

@@ -18,11 +18,15 @@ import { useVestingData } from "./hooks";
 
 import { getInitialStateFromUrl } from "./functions";
 
+import { daos } from "@stabilitydao/stability";
+
 import { DAOSectionTypes } from "@types";
 
 const DAO = (): JSX.Element => {
   const { data: vestingData, isLoading } = useVestingData("146");
 
+  const stabilityDAO = daos?.find(({ name }) => name === "Stability");
+
   const { section } = getInitialStateFromUrl();
 
   const [activeSection, setActiveSection] = useState(section);
@@ -72,7 +76,9 @@ const DAO = (): JSX.Element => {
                   <span className="text-[#97979A] text-[16px] leading-5 font-medium">
                     xSTBL instant exit fee
                   </span>
-                  <span className="font-semibold">80%</span>
+                  <span className="font-semibold">
+                    {stabilityDAO?.params?.pvpFee}%
+                  </span>
                 </div>
                 <div className="flex items-center justify-between">
                   <span className="text-[#97979A] text-[16px] leading-5 font-medium">

src/modules/DAO/index.tsx

@@ -2,9 +2,9 @@ import { useEffect } from "react";
 
 import { useStore } from "@nanostores/react";
 
-import { formatUnits } from "viem";
+import { formatUnits, erc20Abi, Abi } from "viem";
 
-import { getBalance, getAllowance, getTokenData } from "@utils";
+import { getTokenData } from "@utils";
 
 import { web3clients, AaveProtocolDataProviderABI, AavePoolABI } from "@web3";
 
@@ -76,22 +76,65 @@ export const useUserReservesData = (market: TMarket): TResult => {
         availableBorrowsBase = Number(formatUnits(userData[2], 8));
         liquidationThreshold = Number(userData[3]) / 10000;
       } catch (err) {
-        console.warn("Failed to get availableBorrowsBase:", err);
+        console.warn("Failed to get user account data:", err);
       }
 
+      const contracts = market.reserves.flatMap((asset) => {
+        const address = asset.address as TAddress;
+        const aToken = asset.aToken as TAddress;
+
+        const calls = [
+          {
+            address: aToken,
+            abi: erc20Abi,
+            functionName: "balanceOf",
+            args: [$account],
+          },
+          {
+            address,
+            abi: erc20Abi,
+            functionName: "balanceOf",
+            args: [$account],
+          },
+          {
+            address,
+            abi: erc20Abi,
+            functionName: "allowance",
+            args: [$account, pool],
+          },
+        ];
+
+        if (asset.isBorrowable) {
+          calls.push({
+            address: provider,
+            abi: AaveProtocolDataProviderABI as Abi,
+            functionName: "getUserReserveData",
+            args: [address, $account],
+          });
+        }
+
+        return calls;
+      });
+
+      const results = await client.multicall({
+        contracts,
+        allowFailure: false,
+      });
+
+      let index = 0;
+
       for (const asset of market.reserves) {
         const address = asset.address as TAddress;
-        const aTokenAddress = asset.aToken as TAddress;
-        const priceUSD = Number(asset.price);
         const decimals = getTokenData(address)?.decimals ?? 18;
+        const priceUSD = Number(asset.price);
 
-        const rawATokenBalance = await getBalance(
-          client,
-          aTokenAddress,
-          $account
-        );
+        const rawATokenBalance = results[index++] as bigint;
+        const rawBalance = results[index++] as bigint;
+        const rawAllowance = results[index++] as bigint;
 
         const withdraw = formatUnits(rawATokenBalance, decimals);
+        const balance = formatUnits(rawBalance, decimals);
+        const allowance = formatUnits(rawAllowance, decimals);
 
         let maxWithdraw = "0";
 
@@ -114,7 +157,7 @@ export const useUserReservesData = (market: TMarket): TResult => {
             let _maxWithdraw = withdraw;
 
             if (maxWithdrawTokens < Number(withdraw)) {
-              maxWithdrawTokens *= 0.998999; // * for safe amount
+              maxWithdrawTokens *= 0.998999;
               _maxWithdraw = maxWithdrawTokens.toString();
             }
 
@@ -124,68 +167,38 @@ export const useUserReservesData = (market: TMarket): TResult => {
           }
         }
 
-        const [rawBalance, rawAllowance] = await Promise.all([
-          getBalance(client, address, $account),
-          getAllowance(client, address, $account, pool),
-        ]);
-
-        const balance = formatUnits(rawBalance, decimals);
-        const allowance = formatUnits(rawAllowance, decimals);
-
         const reserveData: any = {
           supply: { balance, allowance },
           withdraw: { balance: withdraw, maxWithdraw },
         };
 
         if (asset.isBorrowable) {
-          const tokenPrice = Number(asset.price);
+          const userReserveData = results[index++] as bigint[];
+          const rawVariableDebt = userReserveData[2];
+
+          const repayBalance = formatUnits(rawVariableDebt, decimals);
+
           let borrow = { balance: "0", maxBorrow: "0" };
 
-          if (availableBorrowsBase > 0 && tokenPrice > 0) {
+          if (availableBorrowsBase > 0 && priceUSD > 0) {
             const rawAmount =
-              (availableBorrowsBase / tokenPrice) * 10 ** decimals;
+              (availableBorrowsBase / priceUSD) * 10 ** decimals;
 
             const safeAmount = BigInt(Math.floor(rawAmount * 0.999999));
-
             const maxBorrow = formatUnits(safeAmount, decimals);
 
-            const availableToBorrow = Number(asset?.availableToBorrow) ?? 0;
-
-            const canBorrow = String(
-              Math.min(availableToBorrow, Number(maxBorrow))
-            );
+            const availableToBorrow = Number(asset.availableToBorrow) || 0;
 
             borrow = {
-              balance: canBorrow,
+              balance: String(Math.min(availableToBorrow, Number(maxBorrow))),
               maxBorrow,
             };
           }
 
           reserveData.borrow = borrow;
-
-          const userReserveData = (await client.readContract({
-            address: provider,
-            abi: AaveProtocolDataProviderABI,
-            functionName: "getUserReserveData",
-            args: [address, $account],
-          })) as bigint[];
-
-          const rawVariableDebt = userReserveData[2];
-
-          const repayBalance = formatUnits(rawVariableDebt, decimals);
-
-          const rawRepayAllowance = await getAllowance(
-            client,
-            address,
-            $account,
-            pool
-          );
-
-          const repayAllowance = formatUnits(rawRepayAllowance, decimals);
-
           reserveData.repay = {
             balance: repayBalance,
-            allowance: repayAllowance,
+            allowance,
           };
         }
 

src/modules/Market/hooks/useUserReservesData.ts

@@ -16,13 +16,17 @@ import { sonicClient, ERC20ABI, IXSTBLABI, wagmiConfig } from "@web3";
 
 import { STABILITY_TOKENS } from "@constants";
 
+import { daos } from "@stabilitydao/stability";
+
 import type { TAddress } from "@types";
 
 const InstantExit: React.FC = () => {
   const $connected = useStore(connected);
   const $account = useStore(account);
   const $lastTx = useStore(lastTx);
 
+  const stabilityDAO = daos?.find(({ name }) => name === "Stability");
+
   const input = useRef<HTMLInputElement>(null);
 
   const [balance, setBalance] = useState("0");
@@ -126,8 +130,9 @@ const InstantExit: React.FC = () => {
           Instant Exit
         </span>
         <span className="text-[16px] leafing-6 font-medium text-[#97979A]">
-          Instantly exit to STBL, incurring a 80% penalty. This process cannot
-          be reverted, all forfeited STBL is streamed back to stakers.
+          Instantly exit to STBL, incurring a {stabilityDAO?.params?.pvpFee}%
+          penalty. This process cannot be reverted, all forfeited STBL is
+          streamed back to stakers.
         </span>
       </div>
       <div className="flex flex-col justify-between gap-4">

src/modules/Staking/components/ExitForms/InstantExit.tsx

@@ -18,13 +18,19 @@ import { account, connected, lastTx } from "@store";
 
 import { STABILITY_TOKENS } from "@constants";
 
+import { daos } from "@stabilitydao/stability";
+
 import type { TAddress, TVestPeriod } from "@types";
 
 const VestedExit: React.FC = () => {
   const $connected = useStore(connected);
   const $account = useStore(account);
   const $lastTx = useStore(lastTx);
 
+  const stabilityDAO = daos?.find(({ name }) => name === "Stability");
+
+  const ratio = (100 - Number(stabilityDAO?.params?.pvpFee)) / 100;
+
   const input = useRef<HTMLInputElement>(null);
   const dropDownRef = useRef<HTMLDivElement>(null);
 
@@ -280,8 +286,8 @@ const VestedExit: React.FC = () => {
 
         <span className="text-[16px] leafing-6 font-medium text-[#97979A]">
           Redeem xSTBL over a vesting period. Choose a minimum vest of 15 days
-          (1:0.5 ratio) to maximum vest of 6 months (1:1 ratio). You can cancel
-          the vest in the first 14 days.
+          (1:{ratio} ratio) to maximum vest of 6 months (1:1 ratio). You can
+          cancel the vest in the first 14 days.
         </span>
       </div>
       <div>

src/modules/Staking/components/ExitForms/VestedExit.tsx

@@ -4,10 +4,9 @@ import Layout from '@layouts/Layout.astro';
 import { Market } from "@modules"
 ---
 
-<!-- todo: change img -->
 <Layout 
   title="Core Instance Market"
-  img="/ogs/markets/Brunch_gen2.png"
+  img="/ogs/markets/Core_Instance.png"
   metaTitle="Core Instance Market"
   metaUrl="https://stability.farm/lending/1/Core-Instance"
   metaDescription="Non-custodial liquidity market"

src/pages/lending/1/Core-Instance.astro

@@ -2013,10 +2013,10 @@
   resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz#821f8442f4175d8f0467b9daf26e3a18e2d02af2"
   integrity sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==
 
-"@stabilitydao/stability@=0.57.2":
-  version "0.57.2"
-  resolved "https://registry.yarnpkg.com/@stabilitydao/stability/-/stability-0.57.2.tgz#436a5bf99326c591ab29e36096d559e72f6f31f9"
-  integrity sha512-XxgNt9Vhviggmaeg1vlCtJ54HueheTUNgvB9pf4vbzUpij5SBCCHyQAGZ4M27mttfXtwClJ01ueJc1Skm5JSyA==
+"@stabilitydao/stability@=0.58.1":
+  version "0.58.1"
+  resolved "https://registry.yarnpkg.com/@stabilitydao/stability/-/stability-0.58.1.tgz#2e15a8ae244538c84364af4a774308ad8ae96c11"
+  integrity sha512-uEQhaA8VpT5j2oK0lVjrwAY6UYPf137fTnH7c9gf9Pm7s9+J4/ye00BNBH5V0wL9noj2DAraNHgaSB2AIGZYyQ==
 
 "@stablelib/aead@^1.0.1":
   version "1.0.1"