Prod deploy

packages/examples/package.json

@@ -24,8 +24,10 @@
     "solanaDeclarePayment": "ts-node src/solana/declarePayment.ts",
     "solanaSubmitReceivable": "ts-node src/solana/submitReceivable.ts",
     "solanaFetchReceivable": "ts-node src/solana/fetchReceivable.ts",
+    "solanaFetchAvailableCredit": "ts-node src/solana/fetchAvailableCredit.ts",
     "solanaFetchBorrowerDetails": "ts-node src/solana/fetchBorrowerDetails.ts",
     "solanaDrawdown": "ts-node src/solana/drawdown.ts",
+    "solanaWithdrawYield": "ts-node src/solana/withdrawYield.ts",
     "solanaPayback": "ts-node src/solana/payback.ts",
     "lint-staged": "lint-staged"
   },
@@ -42,12 +44,12 @@
     "@solana/wallet-adapter-react-ui": "^0.9.35",
     "@solana/wallet-adapter-wallets": "^0.19.32",
     "@stellar/freighter-api": "^3.0.0",
-    "@huma-finance/soroban-credit-storage": "0.0.15",
-    "@huma-finance/soroban-huma-config": "0.0.15",
-    "@huma-finance/soroban-pool-storage": "0.0.15",
-    "@huma-finance/soroban-sdk": "^0.0.15",
-    "@huma-finance/soroban-tranche-vault": "0.0.15",
-    "@stellar/stellar-sdk": "^12.3.0",
+    "@huma-finance/soroban-credit-storage": "0.0.18",
+    "@huma-finance/soroban-huma-config": "0.0.18",
+    "@huma-finance/soroban-pool-storage": "0.0.18",
+    "@huma-finance/soroban-sdk": "^0.0.18",
+    "@huma-finance/soroban-tranche-vault": "0.0.18",
+    "@stellar/stellar-sdk": "13.0.0",
     "@coral-xyz/borsh": "^0.30.1",
     "@mui/icons-material": "^5.3.0",
     "@mui/material": "^5.0.6",

packages/examples/src/solana/fetchAvailableCredit.ts

@@ -0,0 +1,48 @@
+import {
+  Connection,
+  Keypair,
+  PublicKey,
+  sendAndConfirmTransaction,
+} from '@solana/web3.js'
+import {
+  AnchorProvider,
+  BN,
+  setProvider,
+  Wallet,
+  web3,
+} from '@coral-xyz/anchor'
+import { POOL_NAME, SolanaChainEnum } from '@huma-finance/shared'
+import { HumaSolanaContext, HumaSolanaProgramHelper } from '@huma-finance/sdk'
+
+require('dotenv').config()
+
+async function main() {
+  const TEST_PRIVATE_KEY = process.env.TEST_PRIVATE_KEY
+  const connection = new Connection(
+    'https://api.devnet.solana.com',
+    'confirmed',
+  )
+
+  const keypair = web3.Keypair.fromSecretKey(
+    Buffer.from(JSON.parse(TEST_PRIVATE_KEY)),
+  )
+  const wallet = new Wallet(keypair)
+  setProvider(new AnchorProvider(connection, wallet))
+
+  const solanaHumaContext = new HumaSolanaContext({
+    publicKey: new PublicKey('4PxkeCBfCCPYWMgV2g9URsMqkp3VR1S5ABuB1ZbrRpVz'),
+    connection: connection,
+    chainId: SolanaChainEnum.SolanaDevnet,
+    poolName: POOL_NAME.ArfCreditPool3Months,
+  })
+
+  const humaSolanaProgramHelper = new HumaSolanaProgramHelper({
+    solanaContext: solanaHumaContext,
+  })
+
+  const data = await humaSolanaProgramHelper.getAvailableCreditForPool()
+
+  console.log(data)
+}
+
+main()

packages/examples/src/solana/withdrawYield.ts

@@ -0,0 +1,46 @@
+import { Connection, Keypair, sendAndConfirmTransaction } from '@solana/web3.js'
+import {
+  AnchorProvider,
+  BN,
+  setProvider,
+  Wallet,
+  web3,
+} from '@coral-xyz/anchor'
+import { POOL_NAME, SolanaChainEnum } from '@huma-finance/shared'
+import { HumaSolanaContext, HumaSolanaProgramHelper } from '@huma-finance/sdk'
+
+require('dotenv').config()
+
+async function main() {
+  const TEST_PRIVATE_KEY = process.env.TEST_PRIVATE_KEY
+  const connection = new Connection(
+    'https://api.devnet.solana.com',
+    'confirmed',
+  )
+
+  const keypair = web3.Keypair.fromSecretKey(
+    Buffer.from(JSON.parse(TEST_PRIVATE_KEY)),
+  )
+  const wallet = new Wallet(keypair)
+  setProvider(new AnchorProvider(connection, wallet))
+
+  const solanaHumaContext = new HumaSolanaContext({
+    publicKey: wallet.publicKey,
+    connection: connection,
+    chainId: SolanaChainEnum.SolanaDevnet,
+    poolName: POOL_NAME.ArfCreditPool3Months,
+  })
+
+  const humaSolanaProgramHelper = new HumaSolanaProgramHelper({
+    solanaContext: solanaHumaContext,
+  })
+
+  const tx = await humaSolanaProgramHelper.buildWithdrawYieldsTransaction()
+
+  console.log(tx)
+
+  const txResult = await sendAndConfirmTransaction(connection, tx, [keypair])
+  console.log(txResult)
+}
+
+main()

packages/huma-sdk/src/helpers/solana/HumaSolanaProgramHelper.ts

@@ -1,4 +1,4 @@
-import { BN } from '@coral-xyz/anchor'
+import { BN, utils } from '@coral-xyz/anchor'
 import {
   getCreditAccounts,
   getHumaProgram,
@@ -11,6 +11,7 @@ import {
   createApproveCheckedInstruction,
   createAssociatedTokenAccountInstruction,
   getAccount,
+  TOKEN_2022_PROGRAM_ID,
   TOKEN_PROGRAM_ID,
   TokenAccountNotFoundError,
 } from '@solana/spl-token'
@@ -33,6 +34,42 @@ export class HumaSolanaProgramHelper {
     this.#solanaContext = solanaContext
   }
 
+  async getAvailableCreditForPool(): Promise<BN> {
+    const { chainId, poolName } = this.#solanaContext
+    const poolInfo = getSolanaPoolInfo(chainId, poolName)
+
+    if (!poolInfo) {
+      throw new Error('Could not find pool')
+    }
+
+    const accountInfo = await this.getAccountInfo()
+    if (accountInfo === null) {
+      throw new Error('Could not get account info for this pool.')
+    }
+
+    const tokenAccount = await getAccount(
+      this.#solanaContext.connection,
+      new PublicKey(poolInfo.poolUnderlyingTokenAccount),
+      undefined,
+      TOKEN_PROGRAM_ID,
+    )
+
+    const { creditConfig, creditState } = accountInfo
+    const principalAmount = creditState.creditRecord.unbilledPrincipal
+      .add(creditState.creditRecord.nextDue)
+      .sub(creditState.creditRecord.yieldDue)
+      .add(creditState.dueDetail.principalPastDue)
+    const unusedCredit = creditConfig.creditLimit.sub(principalAmount)
+    const poolTokenBalanceBN = new BN(tokenAccount.amount.toString())
+    // Set available credit to the minimum of the pool balance or the credit available amount,
+    // since both are upper bounds on the amount of credit that can be borrowed.
+    // If either is negative, cap the available credit to 0.
+    const creditAvailable = unusedCredit.lt(poolTokenBalanceBN)
+      ? unusedCredit
+      : poolTokenBalanceBN
+    return creditAvailable.ltn(0) ? new BN(0) : creditAvailable
+  }
+
   async buildSubmitReceivableTransaction(
     referenceId: string,
   ): Promise<Transaction> {
@@ -91,6 +128,100 @@ export class HumaSolanaProgramHelper {
     return tx
   }
 
+  async buildWithdrawYieldsTransaction(): Promise<Transaction> {
+    const { publicKey, connection, chainId, poolName } = this.#solanaContext
+    const program = getHumaProgram(chainId, connection)
+    const poolInfo = getSolanaPoolInfo(chainId, poolName)
+
+    if (!poolInfo) {
+      throw new Error('Could not find pool')
+    }
+
+    const tx: Transaction = new Transaction()
+
+    const { underlyingTokenATA, seniorTrancheATA, juniorTrancheATA } =
+      getTokenAccounts(poolInfo, publicKey)
+    const [juniorYieldDistributingLenderAccount] =
+      PublicKey.findProgramAddressSync(
+        [
+          utils.bytes.utf8.encode('yield_distributing_lender'),
+          new PublicKey(poolInfo.juniorTrancheMint).toBuffer(),
+          publicKey.toBuffer(),
+        ],
+        program.programId,
+      )
+    const programTx = await program.methods
+      .withdrawYields()
+      .accountsPartial({
+        lender: publicKey,
+        humaConfig: poolInfo.humaConfig,
+        poolConfig: poolInfo.poolConfig,
+        yieldDistributingLender: juniorYieldDistributingLenderAccount,
+        underlyingMint: poolInfo.underlyingMint.address,
+        poolUnderlyingToken: poolInfo.poolUnderlyingTokenAccount,
+        lenderUnderlyingToken: underlyingTokenATA,
+        trancheMint: poolInfo.juniorTrancheMint,
+        lenderTrancheToken: juniorTrancheATA,
+        underlyingTokenProgram: TOKEN_PROGRAM_ID,
+        trancheTokenProgram: TOKEN_2022_PROGRAM_ID,
+      })
+      .transaction()
+    const txAccounts: PublicKey[] = [
+      publicKey,
+      new PublicKey(poolInfo.humaConfig),
+      new PublicKey(poolInfo.poolConfig),
+      juniorYieldDistributingLenderAccount,
+      new PublicKey(poolInfo.underlyingMint.address),
+      new PublicKey(poolInfo.poolUnderlyingTokenAccount),
+      underlyingTokenATA,
+      new PublicKey(poolInfo.juniorTrancheMint),
+      juniorTrancheATA,
+      TOKEN_PROGRAM_ID,
+      TOKEN_2022_PROGRAM_ID,
+    ]
+    tx.add(programTx)
+
+    if (poolInfo.seniorTrancheMint) {
+      const [seniorYieldDistributingLenderAccount] =
+        PublicKey.findProgramAddressSync(
+          [
+            utils.bytes.utf8.encode('yield_distributing_lender'),
+            new PublicKey(poolInfo.seniorTrancheMint).toBuffer(),
+            publicKey.toBuffer(),
+          ],
+          program.programId,
+        )
+      const programTx = await program.methods
+        .withdrawYields()
+        .accountsPartial({
+          lender: publicKey,
+          humaConfig: poolInfo.humaConfig,
+          poolConfig: poolInfo.poolConfig,
+          yieldDistributingLender: seniorYieldDistributingLenderAccount,
+          underlyingMint: poolInfo.underlyingMint.address,
+          poolUnderlyingToken: poolInfo.poolUnderlyingTokenAccount,
+          lenderUnderlyingToken: underlyingTokenATA,
+          trancheMint: poolInfo.seniorTrancheMint,
+          lenderTrancheToken: seniorTrancheATA,
+          underlyingTokenProgram: TOKEN_PROGRAM_ID,
+          trancheTokenProgram: TOKEN_2022_PROGRAM_ID,
+        })
+        .transaction()
+      txAccounts.push(
+        ...[
+          seniorYieldDistributingLenderAccount,
+          new PublicKey(poolInfo.seniorTrancheMint),
+          seniorTrancheATA,
+        ],
+      )
+      tx.add(programTx)
+    }
+
+    await buildOptimalTransaction(tx, txAccounts, this.#solanaContext)
+
+    return tx
+  }
+
   async buildDrawdownTransaction(amount: BN): Promise<Transaction> {
     const { publicKey, connection, chainId, poolName } = this.#solanaContext
     const program = getHumaProgram(chainId, connection)
@@ -306,7 +437,36 @@ export class HumaSolanaProgramHelper {
   }
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  async getAccountInfo(): Promise<any> {
+  async getAccountInfo(): Promise<{
+    creditConfig: {
+      creditLimit: BN
+      committedAmount: BN
+      numPeriods: number
+      yieldBps: number
+    }
+    creditState: {
+      creditRecord: {
+        status: unknown
+        nextDue: BN
+        yieldDue: BN
+        nextDueDate: BN
+        totalPastDue: BN
+        missedPeriods: number
+        remainingPeriods: number
+        unbilledPrincipal: BN
+      }
+      dueDetail: {
+        paid: BN
+        accrued: BN
+        lateFee: BN
+        committed: BN
+        yieldPastDue: BN
+        principalPastDue: BN
+        lateFeeUpdatedDate: BN
+      }
+      receivableAvailableCredits: BN
+    }
+  } | null> {
     const { publicKey, chainId, poolName } = this.#solanaContext
     const program = getHumaProgram(chainId, this.#solanaContext.connection)
     const poolInfo = getSolanaPoolInfo(chainId, poolName)

packages/huma-sdk/src/services/ReceivableService.ts

@@ -1,6 +1,7 @@
 import { TransactionResponse } from '@ethersproject/providers'
 import { BigNumberish, ethers, Overrides } from 'ethers'
 import {
+  isValidHttpUrl,
   POOL_NAME,
   POOL_TYPE,
   PoolContractMap,
@@ -445,7 +446,7 @@ async function loadReceivablesOfOwnerWithMetadata<T>(
   }
 
   const fetchMetadata = async (rwrInfoBase: RealWorldReceivableInfoBase) => {
-    if (!rwrInfoBase.tokenURI) {
+    if (!isValidHttpUrl(rwrInfoBase.tokenURI) || !rwrInfoBase.tokenURI) {
       return null
     }
     return ARWeaveService.fetchMetadataFromUrl(rwrInfoBase.tokenURI)