From 06c780e721192cb8bf041e755e8370ed60cb0f75 Mon Sep 17 00:00:00 2001
From: Konsta Purtsi <konsta@arado.fi>
Date: Sun, 8 Dec 2024 17:10:39 +0200
Subject: [PATCH] feat: Combine PoolState into one endpoint

---
 contracts/loan_pool/src/contract.rs          | 10 ++++++++
 contracts/loan_pool/src/dto.rs               |  9 ++++++++
 contracts/loan_pool/src/lib.rs               |  1 +
 src/components/AssetsModal/AssetsModal.tsx   | 10 ++++----
 src/components/AssetsModal/PositionsView.tsx |  2 +-
 src/components/WalletCard/LoansModal.tsx     |  2 +-
 src/contexts/pool-context.tsx                | 24 ++++++++++++--------
 src/pages/_borrow/BorrowModal/BorrowStep.tsx |  4 ++--
 src/pages/_borrow/BorrowableAsset.tsx        |  4 +++-
 src/pages/_lend/LendableAsset.tsx            |  4 ++--
 10 files changed, 48 insertions(+), 22 deletions(-)
 create mode 100644 contracts/loan_pool/src/dto.rs

diff --git a/contracts/loan_pool/src/contract.rs b/contracts/loan_pool/src/contract.rs
index 283aa7b..5976617 100644
--- a/contracts/loan_pool/src/contract.rs
+++ b/contracts/loan_pool/src/contract.rs
@@ -1,3 +1,4 @@
+use crate::dto::PoolState;
 use crate::interest::{self, get_interest};
 use crate::pool::Currency;
 use crate::positions;
@@ -223,6 +224,15 @@ impl LoanPoolContract {
         interest::get_interest(e)
     }
 
+    pub fn get_pool_state(e: Env) -> PoolState {
+        PoolState {
+            total_balance: pool::read_total_balance(&e),
+            available_balance: pool::read_available_balance(&e),
+            total_shares: pool::read_total_shares(&e),
+            annual_interest_rate: interest::get_interest(e),
+        }
+    }
+
     pub fn increase_liabilities(e: Env, user: Address, amount: i128) {
         let loan_manager_addr = pool::read_loan_manager_addr(&e);
         loan_manager_addr.require_auth();
diff --git a/contracts/loan_pool/src/dto.rs b/contracts/loan_pool/src/dto.rs
new file mode 100644
index 0000000..b06118d
--- /dev/null
+++ b/contracts/loan_pool/src/dto.rs
@@ -0,0 +1,9 @@
+use soroban_sdk::contracttype;
+
+#[contracttype]
+pub struct PoolState {
+    pub total_balance: i128,
+    pub available_balance: i128,
+    pub total_shares: i128,
+    pub annual_interest_rate: i128,
+}
diff --git a/contracts/loan_pool/src/lib.rs b/contracts/loan_pool/src/lib.rs
index fe7fb24..94df465 100644
--- a/contracts/loan_pool/src/lib.rs
+++ b/contracts/loan_pool/src/lib.rs
@@ -2,6 +2,7 @@
 #![allow(clippy::unused_unit)]
 
 mod contract;
+mod dto;
 mod interest;
 mod pool;
 mod positions;
diff --git a/src/components/AssetsModal/AssetsModal.tsx b/src/components/AssetsModal/AssetsModal.tsx
index 364dc6f..35b609f 100644
--- a/src/components/AssetsModal/AssetsModal.tsx
+++ b/src/components/AssetsModal/AssetsModal.tsx
@@ -53,12 +53,12 @@ const AssetsModal = ({ modalId, onClose }: AssetsModalProps) => {
         ) : (
           <WithdrawView ticker={tickerToWithdraw} onBack={handleBackClicked} onSuccess={handleWithdrawSuccess} />
         )}
-        <form method="dialog" className="modal-backdrop">
-          <button type="button" onClick={handleClose}>
-            close
-          </button>
-        </form>
       </div>
+      <form method="dialog" className="modal-backdrop">
+        <button type="button" onClick={handleClose}>
+          close
+        </button>
+      </form>
     </dialog>
   );
 };
diff --git a/src/components/AssetsModal/PositionsView.tsx b/src/components/AssetsModal/PositionsView.tsx
index 131f06c..05d2fd7 100644
--- a/src/components/AssetsModal/PositionsView.tsx
+++ b/src/components/AssetsModal/PositionsView.tsx
@@ -80,7 +80,7 @@ const TableRow = ({ receivables, ticker, onWithdraw }: TableRowProps) => {
         <p className="text-lg font-semibold leading-5">{formatAmount(receivables)}</p>
         <p className="text-base">{!isNil(price) && toDollarsFormatted(price, receivables)}</p>
       </td>
-      <td className="text-lg font-semibold">{pool && formatAPY(pool.apr)}</td>
+      <td className="text-lg font-semibold">{pool && formatAPY(pool.annualInterestRate)}</td>
       <td>
         <Button onClick={handleWithdrawClick}>Withdraw</Button>
       </td>
diff --git a/src/components/WalletCard/LoansModal.tsx b/src/components/WalletCard/LoansModal.tsx
index ec2b22f..db6dc23 100644
--- a/src/components/WalletCard/LoansModal.tsx
+++ b/src/components/WalletCard/LoansModal.tsx
@@ -104,7 +104,7 @@ const TableRow = ({ liabilities, ticker }: TableRowProps) => {
         <p className="text-lg font-semibold leading-5">{formatAmount(liabilities)}</p>
         <p className="text-base">{!isNil(price) && toDollarsFormatted(price, liabilities)}</p>
       </td>
-      <td className="text-lg font-semibold">{pool ? formatAPR(pool.apr) : null}</td>
+      <td className="text-lg font-semibold">{pool ? formatAPR(pool.annualInterestRate) : null}</td>
       <td>
         {isRepaying ? (
           <Button disabled>
diff --git a/src/contexts/pool-context.tsx b/src/contexts/pool-context.tsx
index 7898750..09ac1c8 100644
--- a/src/contexts/pool-context.tsx
+++ b/src/contexts/pool-context.tsx
@@ -11,7 +11,8 @@ export type PriceRecord = {
 export type PoolState = {
   totalBalance: bigint;
   availableBalance: bigint;
-  apr: bigint;
+  totalShares: bigint;
+  annualInterestRate: bigint;
 };
 
 export type PoolRecord = {
@@ -27,7 +28,7 @@ export type PoolContext = {
 const Context = createContext<PoolContext>({
   prices: null,
   pools: null,
-  refetchPools: () => {},
+  refetchPools: () => {  },
 });
 
 const fetchAllPrices = async (): Promise<PriceRecord> => {
@@ -51,14 +52,6 @@ const fetchPriceData = async (ticker: string): Promise<bigint> => {
   }
 };
 
-const fetchPoolState = async (ticker: SupportedCurrency): Promise<PoolState> => {
-  const { contractClient } = CURRENCY_BINDINGS[ticker];
-  const { result: totalBalance } = await contractClient.get_contract_balance();
-  const { result: availableBalance } = await contractClient.get_available_balance();
-  const { result: apr } = await contractClient.get_interest();
-  return { totalBalance, availableBalance, apr };
-};
-
 const fetchPools = async (): Promise<PoolRecord> => {
   const [XLM, wBTC, wETH, USDC, EURC] = await Promise.all([
     fetchPoolState('XLM'),
@@ -70,6 +63,17 @@ const fetchPools = async (): Promise<PoolRecord> => {
   return { XLM, wBTC, wETH, USDC, EURC };
 };
 
+const fetchPoolState = async (ticker: SupportedCurrency): Promise<PoolState> => {
+  const { contractClient } = CURRENCY_BINDINGS[ticker];
+  const { result } = await contractClient.get_pool_state();
+  return {
+    totalBalance: result.total_balance,
+    availableBalance: result.available_balance,
+    totalShares: result.total_shares,
+    annualInterestRate: result.annual_interest_rate,
+  };
+};
+
 export const PoolProvider = ({ children }: PropsWithChildren) => {
   const [prices, setPrices] = useState<PriceRecord | null>(null);
   const [pools, setPools] = useState<PoolRecord | null>(null);
diff --git a/src/pages/_borrow/BorrowModal/BorrowStep.tsx b/src/pages/_borrow/BorrowModal/BorrowStep.tsx
index 2ac10aa..f6f8330 100644
--- a/src/pages/_borrow/BorrowModal/BorrowStep.tsx
+++ b/src/pages/_borrow/BorrowModal/BorrowStep.tsx
@@ -32,7 +32,7 @@ export const BorrowStep = ({ onClose, currency }: BorrowStepProps) => {
 
   if (!pools || !prices || !walletBalances) return null;
 
-  const { apr, availableBalance } = pools[ticker];
+  const { annualInterestRate, availableBalance } = pools[ticker];
 
   const collateralOptions: SupportedCurrency[] = CURRENCY_BINDINGS_ARR.filter((c) => c.ticker !== ticker).map(
     ({ ticker }) => ticker,
@@ -146,7 +146,7 @@ export const BorrowStep = ({ onClose, currency }: BorrowStepProps) => {
         collateral, causing you to lose some of your collateral.
       </p>
       <p className="my-4">The interest rate changes as the amount of assets borrowed from the pools changes.</p>
-      <p className="my-4">The annual interest rate is currently {formatAPR(apr)}.</p>
+      <p className="my-4">The annual interest rate is currently {formatAPR(annualInterestRate)}.</p>
 
       <p className="font-bold mb-2 mt-6">Amount to borrow</p>
       <CryptoAmountSelector
diff --git a/src/pages/_borrow/BorrowableAsset.tsx b/src/pages/_borrow/BorrowableAsset.tsx
index 4d888b0..41fab90 100644
--- a/src/pages/_borrow/BorrowableAsset.tsx
+++ b/src/pages/_borrow/BorrowableAsset.tsx
@@ -70,7 +70,9 @@ export const BorrowableAsset = ({ currency }: BorrowableAssetCardProps) => {
       </td>
 
       <td>
-        <p className="text-xl font-semibold leading-6">{pool ? formatAPR(pool.apr) : <Loading size="xs" />}</p>
+        <p className="text-xl font-semibold leading-6">
+          {pool ? formatAPR(pool.annualInterestRate) : <Loading size="xs" />}
+        </p>
       </td>
 
       <td>
diff --git a/src/pages/_lend/LendableAsset.tsx b/src/pages/_lend/LendableAsset.tsx
index 4b77373..647df4a 100644
--- a/src/pages/_lend/LendableAsset.tsx
+++ b/src/pages/_lend/LendableAsset.tsx
@@ -57,13 +57,13 @@ export const LendableAsset = ({ currency }: LendableAssetProps) => {
       </td>
 
       <td>
-        <p className="text-xl font-semibold leading-6">{pool ? formatAPY(pool.apr) : <Loading size="xs" />}</p>
+        <p className="text-xl font-semibold leading-6">{pool ? formatAPY(pool.annualInterestRate) : <Loading size="xs" />}</p>
       </td>
 
       <td className="pr-0">
         {isPoor ? (
           <div className="tooltip" data-tip={!wallet ? 'Connect a wallet first' : 'Not enough funds'}>
-            <Button disabled={true} onClick={() => {}}>
+            <Button disabled={true} onClick={() => { }}>
               Deposit
             </Button>
           </div>