Merge branch 'flare-deploy'

Author: kuco23

configs/dashboard.json

@@ -43,6 +43,14 @@
         "ClaimedReward",
         "PaidOut",
         "Transfer",
-        "SettingChanged"
+        "SettingChanged",
+        "CPClaimedReward",
+        "CPEntered",
+        "CPExited",
+        "CPFeeDebtChanged",
+        "CPFeeDebtPaid",
+        "CPFeesWithdrawn",
+        "CPPaidOut",
+        "CPSelfCloseExited"
       ]
 }

configs/everything.json

@@ -63,6 +63,14 @@
         "EscrowFinished",
         "CustodianAddressUpdated",
         "SettingsUpdated",
-        "SettingChanged"
+        "SettingChanged",
+        "CPClaimedReward",
+        "CPEntered",
+        "CPExited",
+        "CPFeeDebtChanged",
+        "CPFeeDebtPaid",
+        "CPFeesWithdrawn",
+        "CPPaidOut",
+        "CPSelfCloseExited"
       ]
 }

packages/fasset-indexer-api/src/analytics/dashboard.ts

@@ -3,12 +3,16 @@ import { ContractLookup, FAsset, FAssetType, FASSETS } from "fasset-indexer-core
 import {
   EvmAddress, EvmBlock, EvmLog, ERC20Transfer, MintingExecuted,
   RedemptionDefault, RedemptionPerformed, RedemptionRequested,
-  CollateralPoolEntered, CollateralPoolExited,
   LiquidationPerformed, TokenBalance, AgentVaultInfo,
   FAssetEventBound, CoreVaultRedemptionRequested,
   ReturnFromCoreVaultConfirmed, TransferToCoreVaultSuccessful,
   AssetManagerSettings,
-  TransferToCoreVaultStarted
+  TransferToCoreVaultStarted,
+  CPClaimedReward,
+  CPEntered,
+  CPExited,
+  CPSelfCloseExited,
+  CPFeesWithdrawn
 } from "fasset-indexer-core/entities"
 import { EVENTS } from "fasset-indexer-core/config"
 import { fassetToUsdPrice } from "./utils/prices"
@@ -173,9 +177,11 @@ export class DashboardAnalytics extends SharedAnalytics {
 
   async poolTransactionsCount(): Promise<AmountResult> {
     const em = this.orm.em.fork()
-    const entered = await em.count(CollateralPoolEntered)
-    const exited = await em.count(CollateralPoolExited)
-    return { amount: entered + exited }
+    const entered = await em.count(CPEntered)
+    const exited = await em.count(CPExited)
+    const claimed = await em.count(CPClaimedReward)
+    const selfCloseExited = await em.count(CPSelfCloseExited)
+    return { amount: entered + exited + claimed + selfCloseExited }
   }
 
   async bestCollateralPools(n: number, minTotalPoolNatWei: bigint, now: number, delta: number, lim: number): Promise<FAssetCollateralPoolScore> {
@@ -410,10 +416,10 @@ export class DashboardAnalytics extends SharedAnalytics {
 
   private async totalClaimedPoolFeesAt(pool?: string, user?: string, timestamp?: number): Promise<FAssetValueResult> {
     const enteredFees = await this.filterEnterOrExitQueryBy(
-      this.orm.em.fork().createQueryBuilder(CollateralPoolExited, 'cpe')
-        .select(['cpe.fasset', raw('sum(cpe.received_fasset_fees_uba) as fees')])
-        .groupBy('cpe.fasset'),
-      'cpe', pool, user, timestamp
+      this.orm.em.fork().createQueryBuilder(CPFeesWithdrawn, 'cpfw')
+        .select(['cpfw.fasset', raw('sum(cpfw.withdrawn_fees_uba) as fees')])
+        .groupBy('cpfw.fasset'),
+      'cpfw', pool, user, timestamp
     ).execute() as { fasset: number, fees: bigint }[]
     return this.convertOrmResultToFAssetValueResult(enteredFees, 'fees')
   }

packages/fasset-indexer-api/src/analytics/shared.ts

@@ -1,7 +1,7 @@
 import { SelectQueryBuilder, ORM, raw } from "fasset-indexer-core/orm"
 import {
-  CollateralPoolEntered, CollateralPoolExited,
-  MintingExecuted, RedemptionRequested, LiquidationPerformed
+  MintingExecuted, RedemptionRequested, LiquidationPerformed,
+  CPExited, CPEntered, CPSelfCloseExited
 } from "fasset-indexer-core/entities"
 
 
@@ -12,12 +12,13 @@ export abstract class SharedAnalytics {
     const entered = await this.poolCollateralEnteredAt(pool, user, timestamp)
     if (entered === BigInt(0)) return BigInt(0)
     const exited = await this.poolCollateralExitedAt(pool, user, timestamp)
-    return entered - exited
+    const selfCloseExited = await this.poolCollateralSelfCloseExitedAt(pool, user, timestamp)
+    return entered - exited - selfCloseExited
   }
 
   protected async poolCollateralEnteredAt(pool?: string, user?: string, timestamp?: number): Promise<bigint> {
     const enteredCollateral = await this.filterEnterOrExitQueryBy(
-      this.orm.em.fork().createQueryBuilder(CollateralPoolEntered, 'cpe')
+      this.orm.em.fork().createQueryBuilder(CPEntered, 'cpe')
         .select([raw('sum(cpe.amount_nat_wei) as collateral')]),
       'cpe', pool, user, timestamp
     ).execute() as { collateral: bigint }[]
@@ -26,13 +27,22 @@ export abstract class SharedAnalytics {
 
   protected async poolCollateralExitedAt(pool?: string, user?: string, timestamp?: number): Promise<bigint> {
     const exitedCollateral = await this.filterEnterOrExitQueryBy(
-      this.orm.em.fork().createQueryBuilder(CollateralPoolExited, 'cpe')
+      this.orm.em.fork().createQueryBuilder(CPExited, 'cpe')
         .select([raw('sum(cpe.received_nat_wei) as collateral')]),
       'cpe', pool, user, timestamp
     ).execute() as { collateral: bigint }[]
     return BigInt(exitedCollateral[0]?.collateral || 0)
   }
 
+  protected async poolCollateralSelfCloseExitedAt(pool?: string, user?: string, timestamp?: number): Promise<bigint> {
+    const selfCloseExitedCollateral = await this.filterEnterOrExitQueryBy(
+      this.orm.em.fork().createQueryBuilder(CPSelfCloseExited, 'cpsce')
+        .select([raw('sum(cpsce.received_nat_wei) as collateral')]),
+        'cpsce', pool, user, timestamp
+      ).execute() as { collateral: bigint }[]
+    return BigInt(selfCloseExitedCollateral[0]?.collateral || 0)
+  }
+
   protected async backedFAssets(vault: string): Promise<bigint> {
     const em = this.orm.em.fork()
     const minted = await em.createQueryBuilder(MintingExecuted, 'me')

packages/fasset-indexer-api/src/analytics/statistics.ts

@@ -144,4 +144,3 @@ export class AgentStatistics extends SharedAnalytics {
     return weightedAverage(timespan, now, delta)
   }
 }
-

packages/fasset-indexer-core/chain/artifacts/IAssetManager.json

@@ -3,6 +3,11 @@
     "contractName": "IAssetManager",
     "sourceName": "contracts/userInterfaces/IAssetManager.sol",
     "abi": [
+      {
+        "inputs": [],
+        "name": "InvalidAgentVaultAddress",
+        "type": "error"
+      },
       {
         "anonymous": false,
         "inputs": [