Merge pull request #56 from solendprotocol/fix-rate-limiter-calc

Fix rate limiter calc
solendprotocol · Aug 2, 2023 · df622fe · df622fe
2 parents 405daa6 + fa0fbe0
commit df622fe
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 21 deletions.
diff --git a/solend-lite/src/components/InterestGraph/InterestGraph.tsx b/solend-lite/src/components/InterestGraph/InterestGraph.tsx
@@ -115,7 +115,6 @@ function InterestGraph({ reserve }: { reserve: ReserveType }): ReactElement {
  </XAxis>
  <YAxis
  type='number'
- domain={[0, 100]}
  style={{
  fontSize: 12,
  }}

diff --git a/solend-lite/src/components/TransactionTakeover/ReserveStats/ReserveStats.tsx b/solend-lite/src/components/TransactionTakeover/ReserveStats/ReserveStats.tsx
@@ -172,7 +172,7 @@ function ReserveStats({
  }}
  >
  {showGraph && (
- <Box h={168} cursor='pointer' onClick={() => setShowGraph(false)}>
+ <Box h={192} cursor='pointer' onClick={() => setShowGraph(false)}>
  <Flex justify='center'>
  <Text variant='caption' color='secondary'>
  Interest rate curve
@@ -211,14 +211,13 @@ function ReserveStats({
  />
  <Metric
  row
- label='Target borrow APR'
- value={formatPercent(reserve.targetBorrowApr)}
- tooltip='When utilization is equal to the target utilization, borrow APR will be this value.'
+ label='Current borrow APR'
+ value={formatPercent(reserve.borrowInterest)}
  />
  <Metric
  row
- label='Current borrow APR'
- value={formatPercent(reserve.borrowInterest)}
+ label='Min borrow APR'
+ value={formatPercent(reserve.minBorrowApr)}
  />
  <Metric
  row
@@ -228,18 +227,24 @@ function ReserveStats({
  />
  <Metric
  row
- label='Max borrow APR'
- value={formatPercent(
- reserve.maxBorrowApr,
- )}
- tooltip='Maximum possible borrow APR.'
+ label='Target borrow APR'
+ value={formatPercent(reserve.targetBorrowApr)}
+ tooltip='When utilization is equal to the target utilization, borrow APR will be this value.'
  />
  <Metric
  row
  label='Max utilization'
  value={formatPercent(reserve.maxUtilizationRate)}
  tooltip='When utilization goes above this value, borrows and withdraws will not be possible.'
  />
+ <Metric
+ row
+ label='Max borrow APR'
+ value={formatPercent(
+ reserve.maxBorrowApr,
+ )}
+ tooltip='Maximum possible borrow APR.'
+ />
  <Metric
  row
  label='Supermax borrow APR'
@@ -296,7 +301,7 @@ function ReserveStats({
  <Metric
  row
  label='Max close LTV'
- value={formatPercent(reserve.liquidationThreshold)}
+ value={formatPercent(reserve.maxLiquidationThreshold)}
  tooltip='Max close Loan-to-value (LTV) is the ratio at which the max liquidation penalty occurs.'
  />
  <Metric
@@ -307,7 +312,7 @@ function ReserveStats({
  <Metric
  row
  label='Max liquidation penalty'
- value={<>{formatPercent(reserve.protocolLiquidationFee)}</>}
+ value={<>{formatPercent(reserve.maxLiquidationPenalty)}</>}
  tooltip='Liquidation penalty increases past close LTV until max close LTV, where max liquidation penalty occurs.'
  />
  <Metric

diff --git a/solend-sdk/package.json b/solend-sdk/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@solendprotocol/solend-sdk",
- "version": "0.6.25",
+ "version": "0.6.32",
  "private": true,
  "main": "src/index.ts",
  "module": "src/index.ts",
@@ -27,6 +27,7 @@
  "@solana/buffer-layout": "^4.0.0",
  "@solana/spl-token": "^0.3.6",
  "@solana/web3.js": "=1.76.0",
+ "@solendprotocol/solend-sdk": "^0.6.31",
  "@solflare-wallet/utl-sdk": "^1.4.0",
  "@types/bn.js": "^5.1.1",
  "axios": "^0.24.0",

diff --git a/solend-sdk/src/core/utils/obligations.ts b/solend-sdk/src/core/utils/obligations.ts
@@ -85,7 +85,7 @@ export function formatObligation(
  reserveAddress,
  amount,
  amountUsd,
- weightedAmountUsd: reserve.borrowWeight.multipliedBy(amountUsd)
+ weightedAmountUsd: new BigNumber(reserve.borrowWeight).multipliedBy(amountUsd)
  };
  });
 

diff --git a/solend-sdk/src/core/utils/utils.ts b/solend-sdk/src/core/utils/utils.ts
@@ -67,7 +67,7 @@ export const remainingOutflow = (
  const curOutflow = prevWeight.times(
  previousQuantity.plus(currentQuantity),
  );
- outflow = maxOutflow.plus(curOutflow);
+ outflow = maxOutflow.minus(curOutflow);
  } else if (windowStart.plus(windowDuration).isEqualTo(curSlotStart)) {
  const curOutflow = prevWeight.times(currentQuantity);
  outflow = maxOutflow.minus(curOutflow);

diff --git a/solend-sdk/src/instructions/updateReserveConfig.ts b/solend-sdk/src/instructions/updateReserveConfig.ts
@@ -39,6 +39,7 @@ export const updateReserveConfig = (
  BufferLayout.u8("minBorrowRate"),
  BufferLayout.u8("optimalBorrowRate"),
  BufferLayout.u8("maxBorrowRate"),
+ Layout.uint64("superMaxBorrowRate"),
  Layout.uint64("borrowFeeWad"),
  Layout.uint64("flashLoanFeeWad"),
  BufferLayout.u8("hostFeePercentage"),
@@ -56,6 +57,7 @@ export const updateReserveConfig = (
  ]);
 
  const data = Buffer.alloc(dataLayout.span);
+
  dataLayout.encode(
  {
  instruction: LendingInstruction.UpdateReserveConfig,
@@ -73,6 +75,7 @@ export const updateReserveConfig = (
  depositLimit: reserveConfig.depositLimit,
  borrowLimit: reserveConfig.borrowLimit,
  feeReceiver: reserveConfig.feeReceiver,
+ superMaxBorrowRate: reserveConfig.superMaxBorrowRate,
  protocolLiquidationFee: reserveConfig.protocolLiquidationFee,
  protocolTakeRate: reserveConfig.protocolTakeRate,
  addedBorrowWeightBPS: reserveConfig.addedBorrowWeightBPS,

diff --git a/solend-sdk/src/state/index.ts b/solend-sdk/src/state/index.ts
@@ -2,3 +2,4 @@ export * from "./lastUpdate";
 export * from "./lendingMarket";
 export * from "./reserve";
 export * from "./obligation";
+export * from './rateLimiter';
diff --git a/solend-sdk/src/state/reserve.ts b/solend-sdk/src/state/reserve.ts
@@ -64,7 +64,7 @@ export interface ReserveConfig {
  protocolLiquidationFee: number;
  protocolTakeRate: number;
  addedBorrowWeightBPS: BN;
- borrowWeight: BigNumber;
+ borrowWeight: number;
  reserveType: AssetType;
 }
 
@@ -148,7 +148,7 @@ export const ReserveLayout: typeof BufferLayout.Structure = BufferLayout.struct(
  Layout.uint128("liquiditySmoothedMarketPrice"),
  BufferLayout.u8("reserveType"),
  BufferLayout.u8("maxUtilizationRate"),
- BufferLayout.u8("superMaxBorrowRate"),
+ Layout.uint64("superMaxBorrowRate"),
  BufferLayout.u8("maxLiquidationBonus"),
  BufferLayout.u8("maxLiquidationThreshold"),
  BufferLayout.blob(138, "padding"),
@@ -192,7 +192,7 @@ function decodeReserve(buffer: Buffer): Reserve {
  minBorrowRate: reserve.minBorrowRate,
  optimalBorrowRate: reserve.optimalBorrowRate,
  maxBorrowRate: reserve.maxBorrowRate,
- superMaxBorrowRate: Math.max(reserve.superMaxBorrowRate, reserve.maxBorrowRate),
+ superMaxBorrowRate: Math.max(reserve.superMaxBorrowRate.toNumber(), reserve.maxBorrowRate),
  fees: {
  borrowFeeWad: reserve.borrowFeeWad,
  flashLoanFeeWad: reserve.flashLoanFeeWad,
@@ -207,7 +207,7 @@ function decodeReserve(buffer: Buffer): Reserve {
  addedBorrowWeightBPS: reserve.addedBorrowWeightBPS,
  borrowWeight: new BigNumber(reserve.addedBorrowWeightBPS.toString())
  .dividedBy(new BigNumber(10000))
- .plus(new BigNumber(1)),
+ .plus(new BigNumber(1)).toNumber(),
  reserveType:
  reserve.reserveType == 0 ? AssetType.Regular : AssetType.Isolated,
  },