option to include additional interest in net rate and yield calculati…

…ons (#76)

* option to include xalgo staking apr in net rate and yield calculations

* fix import

* subtract xalgo staking apr if borrow

* generalise

* fix changeset comment

.changeset/dirty-waves-sell.md

@@ -0,0 +1,5 @@
+---
+"@folks-finance/algorand-sdk": patch
+---
+
+option to include additional interest in net rate and yield calculations

src/lend/loan.ts

@@ -26,6 +26,7 @@ import { getOraclePrices, prepareRefreshPricesInOracleAdapter } from "./oracle";
 import { getEscrows, loanLocalState, userLoanInfo } from "./utils";
 
 import type {
+  AssetsAdditionalInterest,
   LoanInfo,
   LoanLocalState,
   LPToken,
@@ -146,6 +147,7 @@ async function retrieveLoanLocalState(
  * @param poolManagerAppId - pool manager application to query about
  * @param oracle - oracle to query
  * @param userAddr - account address for the user
+ * @param additionalInterests - optional additional interest to consider in loan net rate/yield
  * @returns Promise<UserLoanInfo[]> user loans infos
  */
 async function retrieveUserLoansInfo(
@@ -154,6 +156,7 @@ async function retrieveUserLoansInfo(
   poolManagerAppId: number,
   oracle: Oracle,
   userAddr: string,
+  additionalInterests?: AssetsAdditionalInterest,
 ): Promise<UserLoanInfo[]> {
   const userLoanInfos: UserLoanInfo[] = [];
 
@@ -178,7 +181,10 @@ async function retrieveUserLoansInfo(
     );
     if (state === undefined) throw Error(`Could not find loan ${loanAppId} in escrow ${escrowAddr}`);
     const localState = loanLocalState(state, loanAppId, escrowAddr);
-    userLoanInfos.push({ ...userLoanInfo(localState, poolManagerInfo, loanInfo, oraclePrices), currentRound });
+    userLoanInfos.push({
+      ...userLoanInfo(localState, poolManagerInfo, loanInfo, oraclePrices, additionalInterests),
+      currentRound,
+    });
   }
 
   return userLoanInfos;
@@ -193,6 +199,7 @@ async function retrieveUserLoansInfo(
  * @param poolManagerAppId - pool manager application to query about
  * @param oracle - oracle to query
  * @param escrowAddr - account address for the loan escrow
+ * @param additionalInterests - optional additional interest to consider in loan net rate/yield
  * @returns Promise<UserLoanInfo> user loan info
  */
 async function retrieveUserLoanInfo(
@@ -201,6 +208,7 @@ async function retrieveUserLoanInfo(
   poolManagerAppId: number,
   oracle: Oracle,
   escrowAddr: string,
+  additionalInterests?: AssetsAdditionalInterest,
 ): Promise<UserLoanInfo> {
   // get all prerequisites
   const loanInfoReq = retrieveLoanInfo(client, loanAppId);
@@ -212,7 +220,7 @@ async function retrieveUserLoanInfo(
   const { currentRound, localState: state } = await getAccountApplicationLocalState(client, loanAppId, escrowAddr);
   if (state === undefined) throw Error(`Could not find loan ${loanAppId} in escrow ${escrowAddr}`);
   const localState = loanLocalState(state, loanAppId, escrowAddr);
-  return { ...userLoanInfo(localState, poolInfo, loanInfo, oraclePrices), currentRound };
+  return { ...userLoanInfo(localState, poolInfo, loanInfo, oraclePrices, additionalInterests), currentRound };
 }
 
 /**

src/lend/types.ts

@@ -339,6 +339,13 @@ interface UserLoanInfo {
   liquidationMargin: bigint; // 4 d.p.
 }
 
+interface AssetAdditionalInterest {
+  rateBps: bigint; // 4 d.p.
+  yieldBps: bigint; // 4 d.p.
+}
+
+type AssetsAdditionalInterest = Partial<Record<number, AssetAdditionalInterest>>; // assetId -> interest
+
 interface Oracle {
   oracle0AppId: number;
   oracle1AppId?: number;
@@ -397,6 +404,8 @@ export {
   UserLoanInfoCollateral,
   UserLoanInfoBorrow,
   UserLoanInfo,
+  AssetAdditionalInterest,
+  AssetsAdditionalInterest,
   Oracle,
   OraclePrice,
   OraclePrices,

src/lend/utils.ts

@@ -1,6 +1,15 @@
 import { encodeAddress, getApplicationAddress } from "algosdk";
 
-import { compoundEverySecond, maximum, mulScale, ONE_10_DP, ONE_16_DP, ONE_4_DP, SECONDS_IN_YEAR } from "../math-lib";
+import {
+  compoundEverySecond,
+  maximum,
+  mulScale,
+  ONE_10_DP,
+  ONE_12_DP,
+  ONE_16_DP,
+  ONE_4_DP,
+  SECONDS_IN_YEAR,
+} from "../math-lib";
 import { enc, fromIntToByteHex, getParsedValueFromState, parseUint64s, unixTime } from "../utils";
 
 import {
@@ -15,6 +24,7 @@ import {
 } from "./formulae";
 
 import type {
+  AssetsAdditionalInterest,
   DepositStakingInfo,
   DepositStakingProgramInfo,
   LoanInfo,
@@ -359,13 +369,15 @@ export function loanLocalState(state: TealKeyValue[], loanAppId: number, escrowA
  * @param poolManagerInfo - pool manager info which is returned by retrievePoolManagerInfo function
  * @param loanInfo - loan info which is returned by retrieveLoanInfo function
  * @param oraclePrices - oracle prices which is returned by getOraclePrices function
+ * @param additionalInterests - optional additional interest to consider in loan net rate/yield
  * @returns Promise<UserLoansInfo> user loans info
  */
 export function userLoanInfo(
   localState: LoanLocalState,
   poolManagerInfo: PoolManagerInfo,
   loanInfo: LoanInfo,
   oraclePrices: OraclePrices,
+  additionalInterests?: AssetsAdditionalInterest,
 ): UserLoanInfo {
   const { pools: poolManagerPools } = poolManagerInfo;
   const { pools: loanPools } = loanInfo;
@@ -403,6 +415,14 @@ export function userLoanInfo(
     netRate += balanceValue * depositInterestRate;
     netYield += balanceValue * depositInterestYield;
 
+    // add additional interests if specified
+    if (additionalInterests && additionalInterests[assetId]) {
+      const { rateBps, yieldBps } = additionalInterests[assetId];
+      // multiply by 1e12 to standardise at 16 d.p.
+      netRate += balanceValue * rateBps * ONE_12_DP;
+      netYield += balanceValue * yieldBps * ONE_12_DP;
+    }
+
     collaterals.push({
       poolAppId,
       assetId,
@@ -463,6 +483,14 @@ export function userLoanInfo(
     netRate -= borrowBalanceValue * interestRate;
     netYield -= borrowBalanceValue * interestYield;
 
+    // subtracts additional interests if specified
+    if (additionalInterests && additionalInterests[assetId]) {
+      const { rateBps, yieldBps } = additionalInterests[assetId];
+      // multiply by 1e12 to standardise at 16 d.p.
+      netRate -= borrowBalanceValue * rateBps * ONE_12_DP;
+      netYield -= borrowBalanceValue * yieldBps * ONE_12_DP;
+    }
+
     borrows.push({
       poolAppId,
       assetId,

src/math-lib.ts

@@ -4,6 +4,7 @@ const HOURS_IN_YEAR = BigInt(365 * 24);
 const ONE_2_DP = BigInt(1e2);
 const ONE_4_DP = BigInt(1e4);
 const ONE_10_DP = BigInt(1e10);
+const ONE_12_DP = BigInt(1e12);
 const ONE_14_DP = BigInt(1e14);
 const ONE_16_DP = BigInt(1e16);
 
@@ -81,6 +82,7 @@ export {
   HOURS_IN_YEAR,
   ONE_16_DP,
   ONE_14_DP,
+  ONE_12_DP,
   ONE_10_DP,
   ONE_4_DP,
   ONE_2_DP,