@huma-finance/widgets 0.0.62-beta.612 → 0.0.62-beta.618

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@huma-finance/widgets",
-  "version": "0.0.62-beta.612+99e0987",
+  "version": "0.0.62-beta.618+0bd4a98",
   "publishConfig": {
     "access": "public"
   },
@@ -21,8 +21,6 @@
   "dependencies": {
     "@apollo/client": "^3.7.2",
     "@coinbase/wallet-sdk": "^3.5.3",
-    "@emotion/react": "^11.5.0",
-    "@emotion/styled": "^11.3.0",
     "@ethersproject/address": "^5.7.0",
     "@ethersproject/bignumber": "^5.6.0",
     "@ethersproject/constants": "^5.7.0",
@@ -30,14 +28,9 @@
     "@ethersproject/experimental": "^5.7.0",
     "@ethersproject/providers": "^5.6.0",
     "@ethersproject/units": "^5.6.0",
-    "@huma-finance/sdk": "^0.0.62-beta.612+99e0987",
-    "@huma-finance/shared": "^0.0.62-beta.612+99e0987",
-    "@huma-finance/web-shared": "^0.0.62-beta.612+99e0987",
-    "@mui/icons-material": "^5.3.0",
-    "@mui/material": "^5.0.6",
-    "@mui/styles": "^5.0.2",
-    "@mui/system": "^5.0.6",
-    "@mui/x-date-pickers": "^5.0.7",
+    "@huma-finance/sdk": "^0.0.62-beta.618+0bd4a98",
+    "@huma-finance/shared": "^0.0.62-beta.618+0bd4a98",
+    "@huma-finance/web-shared": "^0.0.62-beta.618+0bd4a98",
     "@notifi-network/notifi-frontend-client": "^0.91.1",
     "@reduxjs/toolkit": "^1.8.6",
     "@types/utf8": "^3.0.1",
@@ -187,6 +180,13 @@
   },
   "peerDependencies": {
     "@coral-xyz/anchor": "^0.30.1",
+    "@emotion/react": "^11.5.0",
+    "@emotion/styled": "^11.3.0",
+    "@mui/icons-material": "^5.3.0",
+    "@mui/material": "^5.0.6",
+    "@mui/styles": "^5.0.2",
+    "@mui/system": "^5.0.6",
+    "@mui/x-date-pickers": "^5.0.7",
     "@solana/spl-token": "^0.4.8",
     "@solana/wallet-adapter-base": "^0.9.23",
     "@solana/wallet-adapter-react": "^0.15.35",
@@ -200,5 +200,5 @@
   "optionalDependencies": {
     "encoding": "^0.1.13"
   },
-  "gitHead": "99e0987b7a460f47f40d91836af7d44c9744142b"
+  "gitHead": "0bd4a983d62b8318e2f189a22288510eb16e490c"
 }

package/src/components/CreditLine/solanaBorrow/1-ChooseAmount.tsx

@@ -55,7 +55,7 @@ export function ChooseAmount({
       decimals,
     )
     const nextStep =
-      borrowAmountBN.gt(new BN(tokenAccount.delegatedAmount)) ||
+      borrowAmountBN.gt(new BN(tokenAccount.delegatedAmount.toString())) ||
       tokenAccount.delegate?.toString() !== sentinel
         ? WIDGET_STEP.ApproveAllowance
         : WIDGET_STEP.Transfer
@@ -63,7 +63,7 @@ export function ChooseAmount({
     dispatch(
       setBorrowInfo({
         borrowAmount: currentAmount,
-        borrowAmountBN,
+        borrowAmountBN: JSON.parse(borrowAmountBN.toString()),
         chargedFees: 0,
         nextStep,
       }),

package/src/components/CreditLine/solanaBorrow/2-ApproveAllowance.tsx

@@ -51,9 +51,11 @@ export function ApproveAllowance({
           new PublicKey(poolInfo.underlyingMint.address),
           new PublicKey(sentinel), // delegate
           publicKey, // owner of the wallet
-          SolanaTokenUtils.parseUnits(
-            '100000000000', // 100 billion
-            poolInfo.underlyingMint.decimals,
+          BigInt(
+            SolanaTokenUtils.parseUnits(
+              '100000000000', // 100 billion
+              poolInfo.underlyingMint.decimals,
+            ).toString(),
           ), // amount
           poolInfo.underlyingMint.decimals,
           undefined, // multiSigners

package/src/components/Lend/solanaAddRedemption/2-ChooseAmount.tsx

@@ -58,8 +58,8 @@ export function ChooseAmount({
 
     return SolanaTokenUtils.formatUnits(
       selectedTranche === 'senior'
-        ? new BN(seniorTokenAccount?.amount)
-        : new BN(juniorTokenAccount?.amount),
+        ? new BN(seniorTokenAccount?.amount?.toString() ?? 0)
+        : new BN(juniorTokenAccount?.amount?.toString() ?? 0),
       mintAccount.decimals,
     )
   }, [
@@ -76,7 +76,7 @@ export function ChooseAmount({
 
     const mintSupplyFormatted = Number(
       SolanaTokenUtils.formatUnits(
-        new BN(mintAccount.supply),
+        new BN(mintAccount.supply.toString()),
         mintAccount.decimals,
       ),
     )
@@ -87,7 +87,7 @@ export function ChooseAmount({
 
     const seniorTrancheAssetsFormatted = Number(
       SolanaTokenUtils.formatUnits(
-        new BN(poolState?.seniorTrancheAssets),
+        new BN(poolState?.seniorTrancheAssets ?? 0),
         mintAccount.decimals,
       ),
     )
@@ -98,7 +98,7 @@ export function ChooseAmount({
 
     const juniorTrancheAssetsFormatted = Number(
       SolanaTokenUtils.formatUnits(
-        new BN(poolState?.juniorTrancheAssets),
+        new BN(poolState?.juniorTrancheAssets ?? 0),
         mintAccount.decimals,
       ),
     )

package/src/components/Lend/solanaAddRedemption/index.tsx

@@ -55,8 +55,12 @@ export function SolanaLendAddRedemption({
 
   useEffect(() => {
     if (!step && !isLoadingLenderAccounts && !isLoadingTokenAccounts) {
-      const seniorTrancheShares = new BN(seniorTokenAccount?.amount)
-      const juniorTrancheShares = new BN(juniorTokenAccount?.amount)
+      const seniorTrancheShares = new BN(
+        seniorTokenAccount?.amount?.toString() ?? 0,
+      )
+      const juniorTrancheShares = new BN(
+        juniorTokenAccount?.amount?.toString() ?? 0,
+      )
 
       if (juniorTrancheShares.gtn(0) && seniorTrancheShares.lten(0)) {
         setSelectedTranche('junior')

package/src/components/Lend/solanaCancelRedemption/index.tsx

@@ -46,10 +46,10 @@ export function SolanaLendCancelRedemption({
   useEffect(() => {
     if (!step && !isLoadingLenderAccounts) {
       const seniorTrancheSharesRequested = new BN(
-        seniorLenderStateAccount?.redemptionRecord.numSharesRequested,
+        seniorLenderStateAccount?.redemptionRecord.numSharesRequested ?? 0,
       )
       const juniorTrancheSharesRequested = new BN(
-        juniorLenderStateAccount?.redemptionRecord.numSharesRequested,
+        juniorLenderStateAccount?.redemptionRecord.numSharesRequested ?? 0,
       )
 
       if (

package/src/components/Lend/solanaSupply/3-ChooseAmount.tsx

@@ -18,7 +18,7 @@ type Props = {
   poolState: SolanaPoolState
   tokenAccount: Account
   selectedTranche: TrancheType | undefined
-  isUniTranche: boolean
+  isUniTranche?: boolean
 }
 
 export function ChooseAmount({
@@ -32,7 +32,7 @@ export function ChooseAmount({
   const { symbol, decimals } = poolInfo.underlyingMint
   const [currentAmount, setCurrentAmount] = useState<number | string>(0)
   const balance = useMemo(
-    () => new BN(tokenAccount.amount),
+    () => new BN(tokenAccount.amount.toString()),
     [tokenAccount.amount],
   )
 
@@ -43,11 +43,13 @@ export function ChooseAmount({
       seniorTrancheAssets,
       juniorTrancheAssets,
     } = poolState
-    const juniorTrancheAssetsBN = new BN(juniorTrancheAssets)
-    const seniorTrancheAssetsBN = new BN(seniorTrancheAssets)
+    const juniorTrancheAssetsBN = new BN(juniorTrancheAssets ?? 0)
+    const seniorTrancheAssetsBN = new BN(seniorTrancheAssets ?? 0)
     const totalDeployedBN = seniorTrancheAssetsBN.add(juniorTrancheAssetsBN)
-    const totalAvailableCapBN = new BN(liquidityCap).sub(totalDeployedBN)
-    const maxSeniorAssetsBN = juniorTrancheAssetsBN.muln(maxSeniorJuniorRatio)
+    const totalAvailableCapBN = new BN(liquidityCap ?? 0).sub(totalDeployedBN)
+    const maxSeniorAssetsBN = juniorTrancheAssetsBN.muln(
+      maxSeniorJuniorRatio ?? 0,
+    )
     let seniorAvailableCapBN = maxSeniorAssetsBN.sub(seniorTrancheAssetsBN)
     seniorAvailableCapBN = seniorAvailableCapBN.gt(totalAvailableCapBN)
       ? totalAvailableCapBN

package/src/components/Lend/solanaSupply/4-Transfer.tsx

@@ -8,13 +8,14 @@ import React, { useCallback, useEffect, useState } from 'react'
 
 import { TOKEN_2022_PROGRAM_ID } from '@solana/spl-token'
 import { useWallet } from '@solana/wallet-adapter-react'
-import { useHumaProgram } from '@huma-finance/web-shared'
+import { useHumaProgram, useLenderAccounts } from '@huma-finance/web-shared'
 import { Transaction } from '@solana/web3.js'
 import { useAppDispatch, useAppSelector } from '../../../hooks/useRedux'
 import { setStep } from '../../../store/widgets.reducers'
 import { WIDGET_STEP } from '../../../store/widgets.store'
 import { selectWidgetState } from '../../../store/widgets.selectors'
 import { SolanaTxSendModal } from '../../SolanaTxSendModal'
+import { LoadingModal } from '../../LoadingModal'
 
 type Props = {
   poolInfo: SolanaPoolInfo
@@ -34,6 +35,13 @@ export function Transfer({
     decimals,
   )
   const [transaction, setTransaction] = useState<Transaction>()
+  const {
+    juniorLenderApprovedAccountPDA,
+    seniorLenderApprovedAccountPDA,
+    seniorLenderStateAccount,
+    juniorLenderStateAccount,
+    loading: isLoadingLenderAccounts,
+  } = useLenderAccounts(poolInfo.chainId, poolInfo.poolName)
   const program = useHumaProgram(poolInfo.chainId)
 
   const handleSuccess = useCallback(() => {
@@ -42,13 +50,43 @@ export function Transfer({
 
   useEffect(() => {
     async function getTx() {
-      if (!publicKey || transaction) {
+      if (!publicKey || transaction || isLoadingLenderAccounts) {
         return
       }
 
+      const tx = new Transaction()
+
       const { underlyingTokenATA, seniorTrancheATA, juniorTrancheATA } =
         getTokenAccounts(poolInfo, publicKey)
-      const tx = await program.methods
+      if (
+        (selectedTranche === 'senior' && !seniorLenderStateAccount) ||
+        (selectedTranche === 'junior' && !juniorLenderStateAccount)
+      ) {
+        const createLenderAccountsTx = await program.methods
+          .createLenderAccounts()
+          .accountsPartial({
+            lender: publicKey,
+            humaConfig: poolInfo.humaConfig,
+            poolConfig: poolInfo.poolConfig,
+            approvedLender:
+              selectedTranche === 'senior'
+                ? seniorLenderApprovedAccountPDA!
+                : juniorLenderApprovedAccountPDA!,
+            trancheMint:
+              selectedTranche === 'senior'
+                ? poolInfo.seniorTrancheMint
+                : poolInfo.juniorTrancheMint,
+            lenderTrancheToken:
+              selectedTranche === 'senior'
+                ? seniorTrancheATA
+                : juniorTrancheATA,
+            tokenProgram: TOKEN_2022_PROGRAM_ID,
+          })
+          .transaction()
+        tx.add(createLenderAccountsTx)
+      }
+
+      const depositTx = await program.methods
         .deposit(supplyBigNumber)
         .accountsPartial({
           depositor: publicKey,
@@ -66,19 +104,29 @@ export function Transfer({
           tokenProgram: TOKEN_2022_PROGRAM_ID,
         })
         .transaction()
+      tx.add(depositTx)
 
       setTransaction(tx)
     }
     getTx()
   }, [
+    isLoadingLenderAccounts,
+    juniorLenderApprovedAccountPDA,
+    juniorLenderStateAccount,
     poolInfo,
     program.methods,
     publicKey,
     selectedTranche,
+    seniorLenderApprovedAccountPDA,
+    seniorLenderStateAccount,
     supplyBigNumber,
     transaction,
   ])
 
+  if (isLoadingLenderAccounts) {
+    return <LoadingModal title='Supply' />
+  }
+
   return (
     <SolanaTxSendModal
       tx={transaction}

package/src/components/Lend/solanaSupply/index.tsx

@@ -40,6 +40,7 @@ export function SolanaLendSupply({
   handleSuccess,
 }: SolanaLendSupplyProps): React.ReactElement | null {
   const dispatch = useDispatch()
+  const { isUniTranche } = poolState
   const {
     seniorLenderApproved,
     juniorLenderApproved,
@@ -47,7 +48,6 @@ export function SolanaLendSupply({
   } = useLenderAccounts(poolInfo.chainId, poolInfo.poolName)
   const [tokenAccount, isLoadingTokenAccount] = useTokenAccount(poolInfo)
   const { step, errorMessage } = useAppSelector(selectWidgetState)
-  const isUniTranche = poolState.maxSeniorJuniorRatio === 0
   const [selectedTranche, setSelectedTranche] = useState<TrancheType>()
 
   useEffect(() => {