234-Track-accrued-interest-per-period (#242)

* feat: track accrued interest per period
Fixes #234

* chore: use default dictionaries

* chore: fix sepolia for demo

* ci: update deployment to demo-multichain

.github/workflows/deploy.yml

@@ -17,7 +17,7 @@ jobs:
     name: Deploy to SubQL (EMBRIO)
     strategy:
       matrix:
-        chainId: [development, demo]
+        chainId: [demo]
     uses: ./.github/workflows/subql_deploy_workflow.yaml
     with:
       chainId: ${{ matrix.chainId }}
@@ -34,7 +34,7 @@ jobs:
     name: Deploy to SubQL Multichain (EMBRIO)
     strategy:
       matrix:
-        chainId: [centrifuge]
+        chainId: [demo, centrifuge]
     uses: ./.github/workflows/subql_multi_deploy_workflow.yaml
     with:
       chainId: ${{ matrix.chainId }}

chains-evm/eth/centrifuge.yaml

@@ -1,7 +1,7 @@
 network:
   chainId: '1' # Ethereum Mainnet
   endpoint: 'https://eth.api.onfinality.io/ws?apikey=${ONFINALITY_API_KEY}'
-  dictionary: 'https://gx.api.subquery.network/sq/subquery/eth-dictionary'
+  #dictionary: 'https://gx.api.subquery.network/sq/subquery/eth-dictionary'
 dataSources:
   - kind: ethereum/Runtime
     startBlock: 18721030

chains-evm/eth/demo.yaml

@@ -1,9 +1,8 @@
 network:
-  chainId: '5' #Ethereum Goerli
-  endpoint: "https://eth-goerli.api.onfinality.io/ws?apikey=${ONFINALITY_API_KEY}"
-  dictionary: "https://dict-tyk.subquery.network/query/eth-goerli"
+  chainId: '11155111' #Ethereum Sepolia
+  endpoint: "https://eth-sepolia.api.onfinality.io/ws?apikey=${ONFINALITY_API_KEY}"
 dataSources:
   - kind: ethereum/Runtime
-    startBlock: 10055835
+    startBlock: 5232630
     options:
-      address: '0x53c155d44C03CC28f892f90aA0C442850716D75F'
+      address: '0x5c8657b827a138D52a4e3f03683A28B1FaD86893'

schema.graphql

@@ -54,6 +54,7 @@ type Pool @entity {
   sumDebtOverdue: BigInt
   sumDebtWrittenOffByPeriod: BigInt
   deltaPortfolioValuationByPeriod: BigInt
+  sumInterestAccruedByPeriod: BigInt
 
   sumChargedAmountByPeriod: BigInt
   sumAccruedAmountByPeriod: BigInt
@@ -102,6 +103,7 @@ type PoolSnapshot @entity {
   sumDebtOverdue: BigInt
   sumDebtWrittenOffByPeriod: BigInt
   deltaPortfolioValuationByPeriod: BigInt
+  sumInterestAccruedByPeriod: BigInt
 
   sumChargedAmountByPeriod: BigInt
   sumAccruedAmountByPeriod: BigInt
@@ -390,6 +392,8 @@ type Asset @entity {
   borrowedAmountByPeriod: BigInt
   repaidAmountByPeriod: BigInt
 
+  interestAccruedByPeriod: BigInt
+
   writeOffIndex: Int
   writtenOffPercentageByPeriod: BigInt
   writtenOffAmountByPeriod: BigInt
@@ -421,6 +425,8 @@ type AssetSnapshot @entity {
   borrowedAmountByPeriod: BigInt
   repaidAmountByPeriod: BigInt
 
+  interestAccruedByPeriod: BigInt
+
   writtenOffPercentageByPeriod: BigInt
   writtenOffAmountByPeriod: BigInt
   penaltyInterestRatePerSec: BigInt

src/mappings/handlers/blockHandlers.ts

@@ -65,8 +65,8 @@ async function _handleBlock(block: SubstrateBlock): Promise<void> {
       for (const loanId in activeLoanData) {
         const loan = await AssetService.getById(pool.id, loanId)
         await loan.updateActiveAssetData(activeLoanData[loanId])
+        await pool.increaseInterestAccrued(loan.interestAccruedByPeriod)
         await loan.save()
-
         if (loan.actualMaturityDate < block.timestamp) pool.increaseDebtOverdue(loan.outstandingDebt)
       }
 

src/mappings/services/assetService.ts

@@ -48,6 +48,7 @@ export class AssetService extends Asset {
     asset.repaidAmountByPeriod = BigInt(0)
     asset.writtenOffPercentageByPeriod = BigInt(0)
     asset.writtenOffAmountByPeriod = BigInt(0)
+    asset.interestAccruedByPeriod = BigInt(0)
 
     return asset
   }
@@ -98,8 +99,12 @@ export class AssetService extends Asset {
   }
 
   public async updateActiveAssetData(activeAssetData: ActiveLoanData[keyof ActiveLoanData]) {
+    const oldOutstaidingInterest = this.outstandingInterest
+    const oldTotalRepaidInterest = this.totalRepaidInterest
     Object.assign(this, activeAssetData)
-    logger.info(`Updating outstanding debt for asset: ${this.id} to ${this.outstandingDebt.toString()}`)
+    const deltaRepaidInterestAmount = this.totalRepaid - oldTotalRepaidInterest
+    this.interestAccruedByPeriod = this.outstandingInterest - oldOutstaidingInterest + deltaRepaidInterestAmount
+    logger.info(`Updated outstanding debt for asset: ${this.id} to ${this.outstandingDebt.toString()}`)
   }
 
   public async updateItemMetadata() {

src/mappings/services/poolService.ts

@@ -69,6 +69,7 @@ export class PoolService extends Pool {
     this.sumAccruedAmountByPeriod = BigInt(0)
     this.sumPaidAmountByPeriod = BigInt(0)
     this.deltaPortfolioValuationByPeriod = BigInt(0)
+    this.sumInterestAccruedByPeriod = BigInt(0)
 
     this.sumBorrowedAmount = BigInt(0)
     this.sumRepaidAmount = BigInt(0)
@@ -261,6 +262,11 @@ export class PoolService extends Pool {
     this.sumDebtWrittenOffByPeriod += amount
   }
 
+  public increaseInterestAccrued(amount: bigint) {
+    logger.info(`Increasing interestAccrued by ${amount}`)
+    this.sumInterestAccruedByPeriod += amount
+  }
+
   public async getTranches() {
     const poolResponse = await api.query.poolSystem.pool<Option<PoolDetails>>(this.id)
     logger.info(`Fetching tranches for pool: ${this.id}`)