solendprotocol · DaSichuan · Dec 7, 2022 · Dec 7, 2022
diff --git a/solend-sdk/src/instructions/borrowObligationLiquidity.ts b/solend-sdk/src/instructions/borrowObligationLiquidity.ts
@@ -4,7 +4,7 @@ import { TOKEN_PROGRAM_ID } from "@solana/spl-token";
 import * as Layout from "../utils/layout";
 import { LendingInstruction } from "./instruction";
 
-const BufferLayout = require('buffer-layout');
+const BufferLayout = require("buffer-layout");
 
 /// Borrow liquidity from a reserve by depositing collateral tokens. Requires a refreshed
 /// obligation and reserve.

diff --git a/solend-sdk/src/instructions/depositObligationCollateral.ts b/solend-sdk/src/instructions/depositObligationCollateral.ts
@@ -4,7 +4,7 @@ import { TOKEN_PROGRAM_ID } from "@solana/spl-token";
 import * as Layout from "../utils/layout";
 import { LendingInstruction } from "./instruction";
 
-const BufferLayout = require('buffer-layout');
+const BufferLayout = require("buffer-layout");
 
 /// Deposit collateral to an obligation. Requires a refreshed reserve.
 ///

diff --git a/solend-sdk/src/instructions/depositReserveLiquidity.ts b/solend-sdk/src/instructions/depositReserveLiquidity.ts
@@ -4,7 +4,7 @@ import BN from "bn.js";
 import * as Layout from "../utils/layout";
 import { LendingInstruction } from "./instruction";
 
-const BufferLayout = require('buffer-layout');
+const BufferLayout = require("buffer-layout");
 
 /// Deposit liquidity into a reserve in exchange for collateral. Collateral represents a share
 /// of the reserve liquidity pool.

diff --git a/solend-sdk/src/instructions/depositReserveLiquidityAndObligationCollateral.ts b/solend-sdk/src/instructions/depositReserveLiquidityAndObligationCollateral.ts
@@ -4,7 +4,7 @@ import BN from "bn.js";
 import * as Layout from "../utils/layout";
 import { LendingInstruction } from "./instruction";
 
-const BufferLayout = require('buffer-layout');
+const BufferLayout = require("buffer-layout");
 
 /// Deposit liquidity into a reserve in exchange for collateral, and deposit the collateral as well.
 export const depositReserveLiquidityAndObligationCollateralInstruction = (

diff --git a/solend-sdk/src/instructions/flashBorrowReserveLiquidity.ts b/solend-sdk/src/instructions/flashBorrowReserveLiquidity.ts
@@ -9,7 +9,7 @@ import BN from "bn.js";
 import * as Layout from "../utils/layout";
 import { LendingInstruction } from "./instruction";
 
-const BufferLayout = require('buffer-layout');
+const BufferLayout = require("buffer-layout");
 
 export const flashBorrowReserveLiquidityInstruction = (
   liquidityAmount: number | BN,

diff --git a/solend-sdk/src/instructions/flashRepayReserveLiquidity.ts b/solend-sdk/src/instructions/flashRepayReserveLiquidity.ts
@@ -8,7 +8,7 @@ import BN from "bn.js";
 import * as Layout from "../utils/layout";
 import { LendingInstruction } from "./instruction";
 
-const BufferLayout = require('buffer-layout');
+const BufferLayout = require("buffer-layout");
 
 export const flashRepayReserveLiquidityInstruction = (
   liquidityAmount: number | BN,

diff --git a/solend-sdk/src/instructions/initLendingMarket.ts b/solend-sdk/src/instructions/initLendingMarket.ts
@@ -7,7 +7,7 @@ import {
 import * as Layout from "../utils/layout";
 import { LendingInstruction } from "./instruction";
 
-const BufferLayout = require('buffer-layout');
+const BufferLayout = require("buffer-layout");
 
 export const initLendingMarketInstruction = (
   owner: PublicKey,

diff --git a/solend-sdk/src/instructions/initObligation.ts b/solend-sdk/src/instructions/initObligation.ts
@@ -6,7 +6,7 @@ import {
 } from "@solana/web3.js";
 import { LendingInstruction } from "./instruction";
 
-const BufferLayout = require('buffer-layout');
+const BufferLayout = require("buffer-layout");
 
 /// Initializes a new lending market obligation.
 ///

diff --git a/solend-sdk/src/instructions/initReserve.ts b/solend-sdk/src/instructions/initReserve.ts
@@ -9,7 +9,7 @@ import * as Layout from "../utils/layout";
 import { ReserveConfig, ReserveConfigLayout } from "../state";
 import { LendingInstruction } from "./instruction";
 
-const BufferLayout = require('buffer-layout');
+const BufferLayout = require("buffer-layout");
 
 export const initReserveInstruction = (
   liquidityAmount: number | BN,

diff --git a/solend-sdk/src/instructions/redeemReserveCollateral.ts b/solend-sdk/src/instructions/redeemReserveCollateral.ts
@@ -4,7 +4,7 @@ import BN from "bn.js";
 import * as Layout from "../utils/layout";
 import { LendingInstruction } from "./instruction";
 
-const BufferLayout = require('buffer-layout');
+const BufferLayout = require("buffer-layout");
 
 /// Redeem collateral from a reserve in exchange for liquidity.
 ///

diff --git a/solend-sdk/src/instructions/refreshReserve.ts b/solend-sdk/src/instructions/refreshReserve.ts
@@ -1,7 +1,7 @@
 import { PublicKey, TransactionInstruction } from "@solana/web3.js";
 import { LendingInstruction } from "./instruction";
 
-const BufferLayout = require('buffer-layout');
+const BufferLayout = require("buffer-layout");
 
 /// Accrue interest and update market price of liquidity on a reserve.
 ///

diff --git a/solend-sdk/src/instructions/repayObligationLiquidity.ts b/solend-sdk/src/instructions/repayObligationLiquidity.ts
@@ -4,7 +4,7 @@ import { TOKEN_PROGRAM_ID } from "@solana/spl-token";
 import * as Layout from "../utils/layout";
 import { LendingInstruction } from "./instruction";
 
-const BufferLayout = require('buffer-layout');
+const BufferLayout = require("buffer-layout");
 
 /// Repay borrowed liquidity to a reserve. Requires a refreshed obligation and reserve.
 ///

diff --git a/solend-sdk/src/instructions/syncNative.ts b/solend-sdk/src/instructions/syncNative.ts
@@ -2,7 +2,7 @@ import { PublicKey, TransactionInstruction } from "@solana/web3.js";
 import { TOKEN_PROGRAM_ID } from "@solana/spl-token";
 import { TokenInstruction } from "./instruction";
 
-const BufferLayout = require('buffer-layout');
+const BufferLayout = require("buffer-layout");
 
 const dataLayout = BufferLayout.struct([BufferLayout.u8("instruction")]);
 

diff --git a/solend-sdk/src/instructions/updateReserveConfig.ts b/solend-sdk/src/instructions/updateReserveConfig.ts
@@ -3,7 +3,7 @@ import { ReserveConfig } from "../state/reserve";
 import * as Layout from "../utils/layout";
 import { LendingInstruction } from "./instruction";
 
-const BufferLayout = require('buffer-layout');
+const BufferLayout = require("buffer-layout");
 
 /// Updates a reserves config and a reserve price oracle pubkeys
 ///

diff --git a/solend-sdk/src/instructions/withdrawObligationCollateral.ts b/solend-sdk/src/instructions/withdrawObligationCollateral.ts
@@ -4,7 +4,7 @@ import BN from "bn.js";
 import * as Layout from "../utils/layout";
 import { LendingInstruction } from "./instruction";
 
-const BufferLayout = require('buffer-layout');
+const BufferLayout = require("buffer-layout");
 
 /// Withdraw collateral from an obligation. Requires a refreshed obligation and reserve.
 ///

diff --git a/solend-sdk/src/instructions/withdrawObligationCollateralAndRedeemReserveLiquidity.ts b/solend-sdk/src/instructions/withdrawObligationCollateralAndRedeemReserveLiquidity.ts
@@ -4,7 +4,7 @@ import BN from "bn.js";
 import * as Layout from "../utils/layout";
 import { LendingInstruction } from "./instruction";
 
-const BufferLayout = require('buffer-layout');
+const BufferLayout = require("buffer-layout");
 
 /// Redeem collateral from a reserve in exchange for liquidity.
 export const withdrawObligationCollateralAndRedeemReserveLiquidity = (

diff --git a/solend-sdk/src/state/lastUpdate.ts b/solend-sdk/src/state/lastUpdate.ts
@@ -1,7 +1,7 @@
 import BN from "bn.js";
 import * as Layout from "../utils/layout";
 
-const BufferLayout = require('buffer-layout');
+const BufferLayout = require("buffer-layout");
 
 export const LastUpdateLayout: typeof BufferLayout.Structure =
   BufferLayout.struct(

diff --git a/solend-sdk/src/state/lendingMarket.ts b/solend-sdk/src/state/lendingMarket.ts
@@ -1,7 +1,7 @@
 import { AccountInfo, PublicKey } from "@solana/web3.js";
 import * as Layout from "../utils/layout";
 
-const BufferLayout = require('buffer-layout');
+const BufferLayout = require("buffer-layout");
 
 export interface LendingMarket {
   version: number;

diff --git a/solend-sdk/src/state/obligation.ts b/solend-sdk/src/state/obligation.ts
@@ -3,7 +3,7 @@ import BN from "bn.js";
 import * as Layout from "../utils/layout";
 import { LastUpdate, LastUpdateLayout } from "./lastUpdate";
 
-const BufferLayout = require('buffer-layout');
+const BufferLayout = require("buffer-layout");
 
 export interface Obligation {
   version: number;

diff --git a/solend-sdk/src/state/reserve.ts b/solend-sdk/src/state/reserve.ts
@@ -4,7 +4,7 @@ import { Buffer } from "buffer";
 import * as Layout from "../utils/layout";
 import { LastUpdate, LastUpdateLayout } from "./lastUpdate";
 
-const BufferLayout = require('buffer-layout');
+const BufferLayout = require("buffer-layout");
 
 export interface Reserve {
   version: number;
@@ -53,6 +53,7 @@ export interface ReserveConfig {
   feeReceiver?: PublicKey;
   protocolLiquidationFee: number;
   protocolTakeRate: number;
+  accumulatedProtocolFeesWads: string;
 }
 
 export const ReserveConfigLayout = BufferLayout.struct(
@@ -77,6 +78,7 @@ export const ReserveConfigLayout = BufferLayout.struct(
     Layout.publicKey("feeReceiver"),
     BufferLayout.u8("protocolLiquidationFee"),
     BufferLayout.u8("protocolTakeRate"),
+    Layout.uint128("accumulatedProtocolFeesWads"),
   ],
   "config"
 );
@@ -102,7 +104,6 @@ export const ReserveLayout: typeof BufferLayout.Structure = BufferLayout.struct(
         Layout.uint64("availableAmount"),
         Layout.uint128("borrowedAmountWads"),
         Layout.uint128("cumulativeBorrowRateWads"),
-        Layout.uint128("accumulatedProtocolFeesWads"),
         Layout.uint128("marketPrice"),
       ],
       "liquidity"

diff --git a/solend-sdk/src/utils/layout.ts b/solend-sdk/src/utils/layout.ts
@@ -1,7 +1,7 @@
 import { PublicKey } from "@solana/web3.js";
 import BN from "bn.js";
 
-const BufferLayout = require('buffer-layout');
+const BufferLayout = require("buffer-layout");
 
 /**
  * Layout for a public key