103 totalinvested and totalredeemed are missing in poolsnapshot (#107)

* fix: add missing properties to snapshot

* deploy: update node and query versions

* fix: pool investment and redemptions totals

.github/workflows/deploy.yml

@@ -63,5 +63,5 @@ jobs:
           --projectName="$SUBQL_PROJ_NAME" \
           --ipfsCID="$IPFSCID" \
           --type=primary \
-          --indexerVersion="v1.9.2" \
-          --queryVersion="v1.4.0"
+          --indexerVersion="v1.10.2" \
+          --queryVersion="v1.6.0"

schema.graphql

@@ -33,6 +33,7 @@ type Pool @entity {
 type PoolState @entity {
   id: ID! #poolId
   type: String! @index
+
   #States
   netAssetValue: BigInt!
   totalReserve: BigInt!
@@ -74,6 +75,8 @@ type PoolSnapshot @entity {
   # Aggregated transaction data over the last period
   totalBorrowed_: BigInt
   totalRepaid_: BigInt
+  totalInvested_: BigInt
+  totalRedeemed_: BigInt
   totalNumberOfLoans_: BigInt
 
   # Cumulated transaction data since pool creation
@@ -161,7 +164,6 @@ type Epoch @entity {
   totalRepaid: BigInt!
   totalInvested: BigInt!
   totalRedeemed: BigInt!
-  totalRedeemedCurrency: BigInt!
 
   epochStates: [EpochState] @derivedFrom(field: "epoch")
 

src/mappings/handlers/loansHandlers.ts

@@ -133,7 +133,7 @@ async function _handleLoanClosed(event: SubstrateEvent<LoanCreatedClosedEvent>)
   await loan.close()
   await loan.save()
 
-  const bt = await BorrowerTransactionService.repaid({
+  const bt = await BorrowerTransactionService.closed({
     poolId: poolId.toString(),
     loanId: loanId.toString(),
     address: account.account.id,

src/mappings/handlers/poolsHandlers.ts

@@ -113,6 +113,8 @@ async function _handleEpochExecuted(event: SubstrateEvent<EpochEvent>): Promise<
   await epoch.save()
 
   await poolService.executeEpoch(epochId.toNumber())
+  await poolService.increaseTotalInvested(epoch.epoch.totalInvested)
+  await poolService.increaseTotalRedeemed(epoch.epoch.totalRedeemed)
   await poolService.save()
 
   // Compute and save aggregated order fulfillment
@@ -123,7 +125,7 @@ async function _handleEpochExecuted(event: SubstrateEvent<EpochEvent>): Promise<
     await tranche.updateSupply()
     await tranche.updatePrice(epochState.price)
     await tranche.updateFulfilledInvestOrders(epochState.fulfilledInvestOrders)
-    await tranche.updateFulfilledRedeemOrders(epochState.fulfilledRedeemOrders)
+    await tranche.updateFulfilledRedeemOrders(epochState.fulfilledRedeemOrders, digits)
     await tranche.save()
 
     // Carry over aggregated unfulfilled orders to next epoch

src/mappings/services/epochService.ts

@@ -25,7 +25,6 @@ export class EpochService {
     epoch.totalRepaid = BigInt(0)
     epoch.totalInvested = BigInt(0)
     epoch.totalRedeemed = BigInt(0)
-    epoch.totalRedeemedCurrency = BigInt(0)
 
     const epochStates: EpochState[] = []
     for (const trancheId of trancheIds) {
@@ -85,8 +84,7 @@ export class EpochService {
       )
 
       this.epoch.totalInvested += epochState.fulfilledInvestOrders
-      this.epoch.totalRedeemed += epochState.fulfilledRedeemOrders
-      this.epoch.totalRedeemedCurrency += epochState.fulfilledRedeemOrdersCurrency
+      this.epoch.totalRedeemed += epochState.fulfilledRedeemOrdersCurrency
     }
     return this
   }

src/mappings/services/poolService.ts

@@ -112,6 +112,14 @@ export class PoolService {
     this.poolState.totalEverNumberOfLoans = this.poolState.totalEverNumberOfLoans + BigInt(1)
   }
 
+  public increaseTotalInvested = (currencyAmount: bigint) => {
+    this.poolState.totalInvested_ += currencyAmount
+  }
+
+  public increaseTotalRedeemed = (currencyAmount: bigint) => {
+    this.poolState.totalRedeemed_ += currencyAmount
+  }
+
   public closeEpoch = (epochId: number) => {
     this.pool.lastEpochClosed = epochId
     this.pool.currentEpoch = epochId + 1

src/mappings/services/trancheService.ts

@@ -216,8 +216,12 @@ export class TrancheService {
     return this
   }
 
-  public updateFulfilledRedeemOrders = (amount: bigint) => {
+  public updateFulfilledRedeemOrders = (amount: bigint, digits: number) => {
     this.trancheState.fulfilledRedeemOrders_ = this.trancheState.fulfilledRedeemOrders_ + amount
+    this.trancheState.fulfilledRedeemOrdersCurrency_ = this.computeCurrencyAmount(
+      this.trancheState.fulfilledRedeemOrders_,
+      digits
+    )
     return this
   }