feat: store pending rewards (#68)

* feat: account for accrued to treasury

* fix: explicitly add Pool abi

* fix: store in reserveHistory

* feat: update mapping on v3 to account for unclaimed

* fix: move poolconfig tot he actual pool

* fix: add config to mapping

* fix: split flashloan fee

* fix: add portal fee to schema

* fix: track backing fee

* track unbacked fee split as well

Author: sakulstra

package-lock.json

@@ -2,9 +2,6 @@ type Protocol @entity {
   # just 1 for now
   id: ID!
   pools: [Pool!]! @derivedFrom(field: "protocol")
-  bridgeProtocolFee: BigInt
-  flashloanPremiumTotal: BigInt
-  flashloanPremiumToProtocol: BigInt
 }
 
 # service entity, when we receiving an event we should wknow which pool is it
@@ -26,6 +23,10 @@ type Pool @entity {
   proxyPriceProvider: Bytes
   lastUpdateTimestamp: Int!
 
+  bridgeProtocolFee: BigInt
+  flashloanPremiumTotal: BigInt
+  flashloanPremiumToProtocol: BigInt
+
   reserves: [Reserve!]! @derivedFrom(field: "pool")
   supplyHistory: [Supply!]! @derivedFrom(field: "pool")
   mintUnbackedHistory: [MintUnbacked!]! @derivedFrom(field: "pool")
@@ -266,6 +267,8 @@ type FlashLoan @entity {
   target: Bytes!
   amount: BigInt!
   totalFee: BigInt!
+  lpFee: BigInt!
+  protocolFee: BigInt!
   #protocolFee: BigInt!
   initiator: User!
   timestamp: Int!
@@ -324,6 +327,8 @@ type BackUnbacked @entity {
   backer: User!
   amount: BigInt!
   fee: BigInt!
+  lpFee: BigInt!
+  protocolFee: BigInt!
   timestamp: Int!
 }
 
@@ -380,6 +385,7 @@ type ReserveParamsHistoryItem @entity {
   priceInEth: BigInt!
   priceInUsd: BigDecimal!
   timestamp: Int!
+  accruedToTreasury: BigInt!
   totalScaledVariableDebt: BigInt!
   totalCurrentVariableDebt: BigInt!
   totalPrincipalStableDebt: BigInt!
@@ -392,8 +398,12 @@ type ReserveParamsHistoryItem @entity {
   lifetimeBorrows: BigInt! # default: 0
   lifetimeLiquidated: BigInt! # default: 0
   lifetimeFlashLoans: BigInt!
-  lifetimeFlashLoanPremium: BigInt!
+  lifetimeFlashLoanPremium: BigInt! #deprecated
+  lifetimeFlashLoanLPPremium: BigInt!
+  lifetimeFlashLoanProtocolPremium: BigInt!
   lifetimeReserveFactorAccrued: BigInt!
+  lifetimePortalLPFee: BigInt!
+  lifetimePortalProtocolFee: BigInt!
   lifetimeSuppliersInterestEarned: BigInt!
   # lifetimeStableDebFeeCollected: BigInt!
   # lifetimeVariableDebtFeeCollected: BigInt!
@@ -531,6 +541,7 @@ type Reserve @entity {
   totalCurrentVariableDebt: BigInt! # default: 0
   totalSupplies: BigInt! # default: 0
   liquidityRate: BigInt! # suppliers interest
+  accruedToTreasury: BigInt!
   averageStableRate: BigInt!
   variableBorrowRate: BigInt!
   stableBorrowRate: BigInt!
@@ -571,7 +582,11 @@ type Reserve @entity {
   lifetimeBorrows: BigInt! # default: 0
   lifetimeLiquidated: BigInt! # default: 0
   lifetimeFlashLoans: BigInt! # default: 0
-  lifetimeFlashLoanPremium: BigInt! # default: 0
+  lifetimeFlashLoanPremium: BigInt! # deprecated
+  lifetimeFlashLoanLPPremium: BigInt! # default: 0
+  lifetimeFlashLoanProtocolPremium: BigInt!
+  lifetimePortalLPFee: BigInt!
+  lifetimePortalProtocolFee: BigInt!
   lifetimeSuppliersInterestEarned: BigInt!
   lifetimeReserveFactorAccrued: BigInt!
   # lifetimeStableDebFeeCollected: BigInt!

schemas/v3.schema.graphql

@@ -228,6 +228,11 @@ export function getOrInitReserve(underlyingAsset: Bytes, event: ethereum.Event):
     reserve.lifetimeLiquidated = zeroBI();
     reserve.lifetimeFlashLoans = zeroBI();
     reserve.lifetimeFlashLoanPremium = zeroBI();
+    reserve.lifetimeFlashLoanLPPremium = zeroBI();
+    reserve.lifetimeFlashLoanProtocolPremium = zeroBI();
+
+    reserve.lifetimePortalLPFee = zeroBI();
+    reserve.lifetimePortalProtocolFee = zeroBI();
 
     reserve.stableDebtLastUpdateTimestamp = 0;
     reserve.lastUpdateTimestamp = 0;
@@ -340,6 +345,10 @@ export function getOrInitReserveParamsHistoryItem(
     reserveParamsHistoryItem.lifetimeLiquidated = zeroBI();
     reserveParamsHistoryItem.lifetimeFlashLoans = zeroBI();
     reserveParamsHistoryItem.lifetimeFlashLoanPremium = zeroBI();
+    reserveParamsHistoryItem.lifetimeFlashLoanLPPremium = zeroBI();
+    reserveParamsHistoryItem.lifetimeFlashLoanProtocolPremium = zeroBI();
+    reserveParamsHistoryItem.lifetimePortalLPFee = zeroBI();
+    reserveParamsHistoryItem.lifetimePortalProtocolFee = zeroBI();
     reserveParamsHistoryItem.lifetimeReserveFactorAccrued = zeroBI();
     reserveParamsHistoryItem.lifetimeDepositorsInterestEarned = zeroBI();
     // reserveParamsHistoryItem.lifetimeStableDebFeeCollected = zeroBI();

src/helpers/initializers.ts

@@ -12,6 +12,7 @@ import {
   ChainlinkAggregator,
   ContractToPoolMapping,
   Protocol,
+  Pool,
 } from '../../../generated/schema';
 import {
   PRICE_ORACLE_ASSET_PLATFORM_SIMPLE,
@@ -182,6 +183,7 @@ export function getOrInitReserve(underlyingAsset: Bytes, event: ethereum.Event):
     reserve.totalCurrentVariableDebt = zeroBI();
     reserve.totalPrincipalStableDebt = zeroBI();
     reserve.totalSupplies = zeroBI();
+    reserve.accruedToTreasury = zeroBI();
 
     reserve.isPaused = false;
     reserve.isDropped = false;
@@ -198,6 +200,8 @@ export function getOrInitReserve(underlyingAsset: Bytes, event: ethereum.Event):
     reserve.lifetimeLiquidated = zeroBI();
     reserve.lifetimeFlashLoans = zeroBI();
     reserve.lifetimeFlashLoanPremium = zeroBI();
+    reserve.lifetimeFlashLoanLPPremium = zeroBI();
+    reserve.lifetimeFlashLoanProtocolPremium = zeroBI();
 
     reserve.stableDebtLastUpdateTimestamp = 0;
     reserve.lastUpdateTimestamp = 0;
@@ -263,6 +267,7 @@ export function getOrInitReserveParamsHistoryItem(
     reserveParamsHistoryItem.liquidityIndex = zeroBI();
     reserveParamsHistoryItem.liquidityRate = zeroBI();
     reserveParamsHistoryItem.totalLiquidity = zeroBI();
+    reserveParamsHistoryItem.accruedToTreasury = zeroBI();
     reserveParamsHistoryItem.totalATokenSupply = zeroBI();
     reserveParamsHistoryItem.availableLiquidity = zeroBI();
     reserveParamsHistoryItem.totalLiquidityAsCollateral = zeroBI();
@@ -282,6 +287,8 @@ export function getOrInitReserveParamsHistoryItem(
     reserveParamsHistoryItem.lifetimeLiquidated = zeroBI();
     reserveParamsHistoryItem.lifetimeFlashLoans = zeroBI();
     reserveParamsHistoryItem.lifetimeFlashLoanPremium = zeroBI();
+    reserveParamsHistoryItem.lifetimeFlashLoanLPPremium = zeroBI();
+    reserveParamsHistoryItem.lifetimeFlashLoanProtocolPremium = zeroBI();
     reserveParamsHistoryItem.lifetimeReserveFactorAccrued = zeroBI();
     reserveParamsHistoryItem.lifetimeSuppliersInterestEarned = zeroBI();
     // reserveParamsHistoryItem.lifetimeStableDebFeeCollected = zeroBI();

src/helpers/v3/initializers.ts

@@ -13,7 +13,7 @@ import {
   PoolConfigurator as PoolConfiguratorContract,
 } from '../../../generated/templates';
 import { createMapContractToPool, getOrInitPriceOracle } from '../../helpers/v3/initializers';
-import { Pool } from '../../../generated/schema';
+import { ContractToPoolMapping, Pool } from '../../../generated/schema';
 
 let POOL_COMPONENTS = [
   'poolDataProvider',
@@ -47,6 +47,14 @@ function genericAddressProviderUpdate(
   }
   pool.lastUpdateTimestamp = event.block.timestamp.toI32();
   pool.save();
+  if (component == 'poolConfigurator') {
+    const configuratorMapping = ContractToPoolMapping.load(newAddress.toHexString());
+    if (!configuratorMapping) {
+      const mapping = new ContractToPoolMapping(newAddress.toHexString());
+      mapping.pool = poolAddress;
+      mapping.save();
+    }
+  }
 }
 
 export function handleProxyCreated(event: ProxyCreated): void {

src/mapping/lending-pool-address-provider/v3.ts

@@ -11,7 +11,7 @@ import {
   getOrInitSubToken,
   getOrInitReserve,
   getOrInitReserveConfigurationHistoryItem,
-  getProtocol,
+  getPoolByContract,
 } from '../../helpers/v3/initializers';
 import { Bytes, Address, ethereum, log, BigInt } from '@graphprotocol/graph-ts';
 import {
@@ -43,7 +43,7 @@ import {
 } from '../../../generated/templates/PoolConfigurator/PoolConfigurator';
 import { DefaultReserveInterestRateStrategy } from '../../../generated/templates/PoolConfigurator/DefaultReserveInterestRateStrategy';
 
-import { EModeCategory, Reserve } from '../../../generated/schema';
+import { EModeCategory, Pool, Reserve } from '../../../generated/schema';
 import { zeroAddress, zeroBI } from '../../utils/converters';
 
 export function saveReserve(reserve: Reserve, event: ethereum.Event): void {
@@ -231,23 +231,26 @@ export function handleDebtCeilingChanged(event: DebtCeilingChanged): void {
 }
 
 export function handleBridgeProtocolFeeUpdated(event: BridgeProtocolFeeUpdated): void {
-  let protocol = getProtocol();
-  protocol.bridgeProtocolFee = event.params.newBridgeProtocolFee;
-  protocol.save();
+  let poolId = getPoolByContract(event);
+  let pool = Pool.load(poolId) as Pool;
+  pool.bridgeProtocolFee = event.params.newBridgeProtocolFee;
+  pool.save();
 }
 
 export function handleFlashloanPremiumTotalUpdated(event: FlashloanPremiumTotalUpdated): void {
-  let protocol = getProtocol();
-  protocol.flashloanPremiumTotal = event.params.newFlashloanPremiumTotal;
-  protocol.save();
+  let poolId = getPoolByContract(event);
+  let pool = Pool.load(poolId) as Pool;
+  pool.flashloanPremiumTotal = event.params.newFlashloanPremiumTotal;
+  pool.save();
 }
 
 export function handleFlashloanPremiumToProtocolUpdated(
   event: FlashloanPremiumToProtocolUpdated
 ): void {
-  let protocol = getProtocol();
-  protocol.flashloanPremiumToProtocol = event.params.newFlashloanPremiumToProtocol;
-  protocol.save();
+  let poolId = getPoolByContract(event);
+  let pool = Pool.load(poolId) as Pool;
+  pool.flashloanPremiumToProtocol = event.params.newFlashloanPremiumToProtocol;
+  pool.save();
 }
 
 export function handleBorrowableInIsolationChanged(event: BorrowableInIsolationChanged): void {

src/mapping/lending-pool-configurator/v3.ts

@@ -1,4 +1,4 @@
-import { BigInt } from '@graphprotocol/graph-ts';
+import { BigInt, log } from '@graphprotocol/graph-ts';
 import {
   Borrow,
   Supply,
@@ -22,6 +22,7 @@ import {
   getOrInitReserve,
   getOrInitUser,
   getOrInitUserReserve,
+  getPoolByContract,
 } from '../../helpers/v3/initializers';
 import {
   Borrow as BorrowAction,
@@ -38,6 +39,7 @@ import {
   UserEModeSet as UserEModeSetAction,
   MintedToTreasury as MintedToTreasuryAction,
   IsolationModeTotalDebtUpdated as IsolationModeTotalDebtUpdatedAction,
+  Pool,
 } from '../../../generated/schema';
 import { getHistoryEntityId } from '../../utils/id-generation';
 import { calculateGrowth } from '../../helpers/math';
@@ -212,13 +214,28 @@ export function handleLiquidationCall(event: LiquidationCall): void {
 export function handleFlashLoan(event: FlashLoan): void {
   let initiator = getOrInitUser(event.params.initiator);
   let poolReserve = getOrInitReserve(event.params.asset, event);
+  let poolId = getPoolByContract(event);
+  let pool = Pool.load(poolId) as Pool;
 
   let premium = event.params.premium;
-
+  let premiumToProtocol = premium
+    .times(pool.flashloanPremiumToProtocol as BigInt)
+    .plus(BigInt.fromI32(5000))
+    .div(BigInt.fromI32(10000));
+  let premiumToLP = premium.minus(premiumToProtocol);
+  log.error('premium {},{},{}', [
+    premium.toString(),
+    premiumToProtocol.toString(),
+    premiumToLP.toString(),
+  ]);
   poolReserve.availableLiquidity = poolReserve.availableLiquidity.plus(premium);
 
   poolReserve.lifetimeFlashLoans = poolReserve.lifetimeFlashLoans.plus(event.params.amount);
   poolReserve.lifetimeFlashLoanPremium = poolReserve.lifetimeFlashLoanPremium.plus(premium);
+  poolReserve.lifetimeFlashLoanLPPremium = poolReserve.lifetimeFlashLoanLPPremium.plus(premiumToLP);
+  poolReserve.lifetimeFlashLoanProtocolPremium = poolReserve.lifetimeFlashLoanProtocolPremium.plus(
+    premiumToProtocol
+  );
   poolReserve.totalATokenSupply = poolReserve.totalATokenSupply.plus(premium);
 
   poolReserve.save();
@@ -229,6 +246,8 @@ export function handleFlashLoan(event: FlashLoan): void {
   flashLoan.target = event.params.target;
   flashLoan.initiator = initiator.id;
   flashLoan.totalFee = premium;
+  flashLoan.lpFee = premiumToLP;
+  flashLoan.protocolFee = premiumToProtocol;
   flashLoan.amount = event.params.amount;
   flashLoan.timestamp = event.block.timestamp.toI32();
   flashLoan.save();
@@ -326,6 +345,21 @@ export function handleBackUnbacked(event: BackUnbacked): void {
   let userReserve = getOrInitUserReserve(backer, event.params.reserve, event);
   let amount = event.params.amount;
 
+  let poolId = getPoolByContract(event);
+  let pool = Pool.load(poolId) as Pool;
+
+  let premium = event.params.fee;
+  let premiumToProtocol = premium
+    .times(pool.bridgeProtocolFee as BigInt)
+    .plus(BigInt.fromI32(5000))
+    .div(BigInt.fromI32(10000));
+  let premiumToLP = premium.minus(premiumToProtocol);
+  poolReserve.lifetimePortalLPFee = poolReserve.lifetimePortalLPFee.plus(premiumToLP);
+  poolReserve.lifetimePortalProtocolFee = poolReserve.lifetimePortalProtocolFee.plus(
+    premiumToProtocol
+  );
+  poolReserve.save();
+
   let backUnbacked = new BackUnbackedAction(getHistoryEntityId(event));
   backUnbacked.pool = poolReserve.pool;
   backUnbacked.backer = userReserve.user;
@@ -334,6 +368,8 @@ export function handleBackUnbacked(event: BackUnbacked): void {
   backUnbacked.amount = amount;
   backUnbacked.timestamp = event.block.timestamp.toI32();
   backUnbacked.fee = event.params.fee;
+  backUnbacked.lpFee = premiumToLP;
+  backUnbacked.protocolFee = premiumToProtocol;
 
   backUnbacked.save();
 }

src/mapping/lending-pool/v3.ts

@@ -1,3 +1,4 @@
+import { Pool } from '../../../generated/templates/Pool/Pool';
 import {
   BalanceTransfer,
   Mint as ATokenMint,
@@ -19,6 +20,7 @@ import {
   STokenBalanceHistoryItem,
   UserReserve,
   Reserve,
+  Pool as PoolSchema,
   StableTokenDelegatedAllowance,
   VariableTokenDelegatedAllowance,
 } from '../../../generated/schema';
@@ -29,10 +31,11 @@ import {
   getOrInitUser,
   getPriceOracleAsset,
   getOrInitReserveParamsHistoryItem,
+  getPoolByContract,
 } from '../../helpers/v3/initializers';
 import { zeroBI } from '../../utils/converters';
 import { calculateUtilizationRate } from '../../helpers/reserve-logic';
-import { Address, BigInt, ethereum, log } from '@graphprotocol/graph-ts';
+import { Address, BigInt, Bytes, ethereum, log } from '@graphprotocol/graph-ts';
 import { rayDiv, rayMul } from '../../helpers/math';
 import { getHistoryEntityId } from '../../utils/id-generation';
 
@@ -105,6 +108,9 @@ function saveReserve(reserve: Reserve, event: ethereum.Event): void {
   reserveParamsHistoryItem.lifetimeWithdrawals = reserve.lifetimeWithdrawals;
   reserveParamsHistoryItem.lifetimeLiquidated = reserve.lifetimeLiquidated;
   reserveParamsHistoryItem.lifetimeFlashLoanPremium = reserve.lifetimeFlashLoanPremium;
+  reserveParamsHistoryItem.lifetimeFlashLoanLPPremium = reserve.lifetimeFlashLoanLPPremium;
+  reserveParamsHistoryItem.lifetimeFlashLoanProtocolPremium =
+    reserve.lifetimeFlashLoanProtocolPremium;
   reserveParamsHistoryItem.lifetimeFlashLoans = reserve.lifetimeFlashLoans;
   // reserveParamsHistoryItem.lifetimeStableDebFeeCollected = reserve.lifetimeStableDebFeeCollected;
   // reserveParamsHistoryItem.lifetimeVariableDebtFeeCollected = reserve.lifetimeVariableDebtFeeCollected;
@@ -122,6 +128,7 @@ function saveReserve(reserve: Reserve, event: ethereum.Event): void {
   reserveParamsHistoryItem.liquidityRate = reserve.liquidityRate;
   reserveParamsHistoryItem.totalATokenSupply = reserve.totalATokenSupply;
   reserveParamsHistoryItem.averageStableBorrowRate = reserve.averageStableRate;
+  reserveParamsHistoryItem.accruedToTreasury = reserve.accruedToTreasury;
   let priceOracleAsset = getPriceOracleAsset(reserve.price);
   reserveParamsHistoryItem.priceInEth = priceOracleAsset.priceInEth;
 
@@ -169,6 +176,23 @@ function tokenMint(event: ethereum.Event, onBehalf: Address, value: BigInt, inde
   let aToken = getOrInitSubToken(event.address);
   let poolReserve = getOrInitReserve(aToken.underlyingAssetAddress, event);
   poolReserve.totalATokenSupply = poolReserve.totalATokenSupply.plus(value);
+  let poolId = getPoolByContract(event);
+  let pool = PoolSchema.load(poolId);
+  if (pool && pool.pool) {
+    let poolContract = Pool.bind(Address.fromString((pool.pool as Bytes).toHexString()));
+    const reserveData = poolContract.try_getReserveData(
+      Address.fromString(aToken.underlyingAssetAddress.toHexString())
+    );
+    if (!reserveData.reverted) {
+      poolReserve.accruedToTreasury = reserveData.value.accruedToTreasury;
+    } else {
+      log.error('error reading reserveData. Pool: {}, Underlying: {}', [
+        (pool.pool as Bytes).toHexString(),
+        aToken.underlyingAssetAddress.toHexString(),
+      ]);
+    }
+  }
+
   // Check if we are minting to treasury for mainnet and polygon
   if (
     onBehalf.toHexString() != '0xB2289E329D2F85F1eD31Adbb30eA345278F21bcf'.toLowerCase() &&