@huma-finance/widgets 0.0.62-beta.636 → 0.0.62-beta.637

package/dist/index.js

@@ -4,7 +4,7 @@ import { useTheme, css, Box, Typography, Tooltip, Button, Dialog, Slider, Input,
 import { useAtom, Provider as Provider$2 } from 'jotai';
 import React, { useCallback, useState, useEffect, useMemo, useRef } from 'react';
 import { useSelector, useDispatch, Provider } from 'react-redux';
-import { supportedChainId, isTxFailed, getExplorerUrl, openInNewTab, TxStateType, decodeLogs, ERC20_ABI, downScale, formatMoney, POOL_NAME, POOL_TYPE, getERC20Contract, checkIsDev, EAService, EARejectionError, EARejectMessage, EARejectReason, timeUtil, formatNumber, doesChainSupportNotifi, CreditState, isEmpty, CreditStateV2, upScale, toBigNumber, TRANSFER_ABI, FirstLossCoverIndex, combineStyles, timestampToLL, getTrancheAssetsAndShares, IdentityService, CHAINS, configUtil, IdentityServiceV2, IdentityVerificationStatusV2, CampaignService, CAMPAIGN_REFERENCE_CODE, KYC_PROVIDER, CHAIN_TYPE, formatAmount, getTrancheVaultContractV2, getTrancheRedemptionStatusV2, getPoolContractV2, CURRENCY_CODE, SuperfluidPoolProcessor_ABI, PoolMap, SolanaTokenUtils, getSolanaExplorerUrl, getTokenAccounts, getSentinelAddress, getCreditAccounts, ChainEnum, getBlockchainConfigFromChain } from '@huma-finance/shared';
+import { supportedChainId, isTxFailed, getExplorerUrl, openInNewTab, TxStateType, decodeLogs, ERC20_ABI, downScale, formatMoney, POOL_NAME, POOL_TYPE, getERC20Contract, checkIsDev, EAService, EARejectionError, EARejectMessage, EARejectReason, timeUtil, formatNumber, doesChainSupportNotifi, CreditState, isEmpty, CreditStateV2, upScale, toBigNumber, TRANSFER_ABI, FirstLossCoverIndex, combineStyles, timestampToLL, getTrancheAssetsAndShares, IdentityService, CHAINS, configUtil, IdentityServiceV2, IdentityVerificationStatusV2, CampaignService, CAMPAIGN_REFERENCE_CODE, KYC_PROVIDER, CHAIN_TYPE, formatAmount, getTrancheVaultContractV2, getTrancheRedemptionStatusV2, getPoolContractV2, CURRENCY_CODE, SuperfluidPoolProcessor_ABI, PoolMap, SOLANA_CHAIN_INFO, SolanaTokenUtils, getSolanaExplorerUrl, getTokenAccounts, getSentinelAddress, getCreditAccounts, ChainEnum, getBlockchainConfigFromChain } from '@huma-finance/shared';
 import { useWeb3React } from '@web3-react/core';
 import ErrorOutlineIcon from '@mui/icons-material/ErrorOutline';
 import { useResetAtom } from 'jotai/utils';
@@ -27,7 +27,7 @@ import { drawdownWithReceivable, HumaContext, HumaReceivableFactory, makePayment
 import moment from 'moment';
 import { getAddress } from '@ethersproject/address';
 import { BN } from '@coral-xyz/anchor';
-import { TOKEN_2022_PROGRAM_ID, getAccount, TokenAccountNotFoundError, TokenInvalidAccountOwnerError, createAssociatedTokenAccountInstruction, ASSOCIATED_TOKEN_PROGRAM_ID, createApproveCheckedInstruction } from '@solana/spl-token';
+import { TOKEN_2022_PROGRAM_ID, TOKEN_PROGRAM_ID, getAccount, TokenAccountNotFoundError, TokenInvalidAccountOwnerError, createAssociatedTokenAccountInstruction, ASSOCIATED_TOKEN_PROGRAM_ID, createApproveCheckedInstruction } from '@solana/spl-token';
 import { useWallet, useConnection } from '@solana/wallet-adapter-react';
 import { Transaction, PublicKey } from '@solana/web3.js';
 import { arrayify } from '@ethersproject/bytes';
@@ -5509,6 +5509,7 @@ function PersonaEvaluation(_ref) {
     campaign,
     pointsTestnetExperience,
     chainType,
+    chainSpecificData,
     changeTranche,
     handleClose
   } = _ref;
@@ -5549,9 +5550,9 @@ function PersonaEvaluation(_ref) {
     try {
       isActionOngoingRef.current = true;
       setLoadingType('approveLender');
-      await IdentityServiceV2.approveLender(account, chainId, poolInfo.juniorTrancheVault, isDev);
+      await IdentityServiceV2.approveLender(account, chainId, poolInfo.juniorTrancheVault, isDev, chainSpecificData);
       if (!isUniTranche) {
-        await IdentityServiceV2.approveLender(account, chainId, poolInfo.seniorTrancheVault, isDev);
+        await IdentityServiceV2.approveLender(account, chainId, poolInfo.seniorTrancheVault, isDev, chainSpecificData);
       }
       if (isUniTranche) {
         changeTranche('junior');
@@ -5563,7 +5564,7 @@ function PersonaEvaluation(_ref) {
       isActionOngoingRef.current = false;
       setLoadingType(undefined);
     }
-  }, [account, chainId, changeTranche, dispatch, isDev, isUniTranche, poolInfo.juniorTrancheVault, poolInfo.seniorTrancheVault]);
+  }, [account, chainId, chainSpecificData, changeTranche, dispatch, isDev, isUniTranche, poolInfo.juniorTrancheVault, poolInfo.seniorTrancheVault]);
   const checkVerificationStatus = useCallback(async () => {
     if (isActionOngoingRef.current || isKYCResumedRef.current) {
       return;
@@ -8582,6 +8583,7 @@ function Evaluation(_ref) {
     handleClose
   } = _ref;
   if ((_poolInfo$KYC = poolInfo.KYC) !== null && _poolInfo$KYC !== void 0 && _poolInfo$KYC.Persona) {
+    const solanChainInfo = SOLANA_CHAIN_INFO[poolInfo.chainId];
     return jsx(PersonaEvaluation, {
       poolInfo: {
         KYC: poolInfo.KYC,
@@ -8592,6 +8594,10 @@ function Evaluation(_ref) {
       isUniTranche: isUniTranche,
       pointsTestnetExperience: pointsTestnetExperience,
       campaign: campaign,
+      chainSpecificData: {
+        huma_program_id: solanChainInfo.poolProgram,
+        pool_id: poolInfo.poolId
+      },
       chainType: CHAIN_TYPE.SOLANA,
       changeTranche: changeTranche
     });
@@ -8846,12 +8852,13 @@ function Transfer$4(_ref) {
         seniorTrancheATA,
         juniorTrancheATA
       } = getTokenAccounts(poolInfo, publicKey);
+      const approvedLender = selectedTranche === 'senior' ? seniorLenderApprovedAccountPDA : juniorLenderApprovedAccountPDA;
       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,
+          approvedLender,
           trancheMint: selectedTranche === 'senior' ? poolInfo.seniorTrancheMint : poolInfo.juniorTrancheMint,
           lenderTrancheToken: selectedTranche === 'senior' ? seniorTrancheATA : juniorTrancheATA,
           tokenProgram: TOKEN_2022_PROGRAM_ID
@@ -8859,6 +8866,7 @@ function Transfer$4(_ref) {
         tx.add(createLenderAccountsTx);
       }
       const depositTx = await program.methods.deposit(supplyBigNumber).accountsPartial({
+        approvedLender,
         depositor: publicKey,
         poolConfig: poolInfo.poolConfig,
         underlyingMint: poolInfo.underlyingMint.address,
@@ -8867,7 +8875,7 @@ function Transfer$4(_ref) {
         depositorUnderlyingToken: underlyingTokenATA,
         depositorTrancheToken: selectedTranche === 'senior' ? seniorTrancheATA : juniorTrancheATA,
         humaConfig: poolInfo.humaConfig,
-        tokenProgram: TOKEN_2022_PROGRAM_ID
+        underlyingTokenProgram: TOKEN_PROGRAM_ID
       }).transaction();
       tx.add(depositTx);
       setTransaction(tx);
@@ -9835,14 +9843,14 @@ function Transfer$1(_ref) {
       // Create user token account if it doesn't exist
       let tokenAccount;
       try {
-        tokenAccount = await getAccount(connection, underlyingTokenATA, undefined, TOKEN_2022_PROGRAM_ID);
+        tokenAccount = await getAccount(connection, underlyingTokenATA, undefined, TOKEN_PROGRAM_ID);
       } catch (error) {
         // TokenAccountNotFoundError can be possible if the associated address has already received some lamports,
         // becoming a system account. Assuming program derived addressing is safe, this is the only case for the
         // TokenInvalidAccountOwnerError in this code path.
         if (error instanceof TokenAccountNotFoundError || error instanceof TokenInvalidAccountOwnerError) {
           // As this isn't atomic, it's possible others can create associated accounts meanwhile.
-          tx.add(createAssociatedTokenAccountInstruction(publicKey, underlyingTokenATA, publicKey, new PublicKey(poolInfo.underlyingMint.address), TOKEN_2022_PROGRAM_ID, ASSOCIATED_TOKEN_PROGRAM_ID));
+          tx.add(createAssociatedTokenAccountInstruction(publicKey, underlyingTokenATA, publicKey, new PublicKey(poolInfo.underlyingMint.address), TOKEN_PROGRAM_ID, ASSOCIATED_TOKEN_PROGRAM_ID));
         }
       }
 
@@ -9859,7 +9867,7 @@ function Transfer$1(_ref) {
         // amount
         poolInfo.underlyingMint.decimals, undefined,
         // multiSigners
-        TOKEN_2022_PROGRAM_ID));
+        TOKEN_PROGRAM_ID));
       }
       const {
         creditConfigAccount,
@@ -9877,7 +9885,7 @@ function Transfer$1(_ref) {
         underlyingMint: poolInfo.underlyingMint.address,
         poolUnderlyingToken: poolInfo.poolUnderlyingTokenAccount,
         borrowerUnderlyingToken: underlyingTokenATA,
-        tokenProgram: TOKEN_2022_PROGRAM_ID
+        tokenProgram: TOKEN_PROGRAM_ID
       }).transaction();
       tx.add(programTx);
       setTransaction(tx);
@@ -10057,7 +10065,7 @@ function Transfer(_ref) {
         underlyingMint: poolInfo.underlyingMint.address,
         poolUnderlyingToken: poolInfo.poolUnderlyingTokenAccount,
         borrowerUnderlyingToken: underlyingTokenATA,
-        tokenProgram: TOKEN_2022_PROGRAM_ID
+        tokenProgram: TOKEN_PROGRAM_ID
       }).transaction();
       setTransaction(tx);
     }