fix: fix tracked-agent-backing query

Author: kuco23

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

@@ -7,7 +7,7 @@ import { fassetToUsdPrice } from "./utils/prices"
 import { SharedAnalytics } from "./shared"
 import { AgentStatistics } from "./statistics"
 import { MAX_BIPS, PRICE_FACTOR } from "../config/constants"
-import { COLLATERAL_POOL_PORTFOLIO_SQL } from "./utils/raw-sql"
+import { COLLATERAL_POOL_PORTFOLIO_SQL, UNDERLYING_AGENT_BALANCE } from "./utils/raw-sql"
 import type {
   AmountResult,
   TimeSeries, Timespan, FAssetTimeSeries, FAssetTimespan,
@@ -103,7 +103,7 @@ export class DashboardAnalytics extends SharedAnalytics {
     return this.convertOrmResultToFAssetValueResult(settings, 'lotSizeAmg')
   }
 
-  async trackedUnderlyingBacking(): Promise<FAssetValueResult> {
+  async trackedAgentUnderlyingBacking(): Promise<FAssetValueResult> {
     return this.trackedAgentBackingAt(this.orm.em.fork(), unixnow())
   }
 
@@ -497,22 +497,9 @@ export class DashboardAnalytics extends SharedAnalytics {
   }
 
   protected async trackedAgentBackingAt(em: EntityManager, timestamp: number): Promise<FAssetValueResult> {
-    const knex = em.getKnex()
-    const subquery = em.createQueryBuilder(Entities.UnderlyingBalanceChanged, 'ubc')
-      .select(['ubc.fasset', 'ubc.agentVault', raw('max(ubc.balance_uba) as agent_balance')])
-      .join('ubc.evmLog', 'el')
-      .join('el.block', 'bl')
-      .where({ 'bl.timestamp': { $lt: timestamp } })
-      .groupBy(['ubc.fasset', 'ubc.agentVault'])
-      .getKnexQuery()
-    const mainquery = knex
-      .from(knex.raw('(?) as sub', [subquery]))
-      .select(['sub.fasset', knex.raw('sum(sub.agent_balance) as total_agent_balance')])
-      .groupBy('sub.fasset')
-    const { sql, bindings } = mainquery.toSQL()
-    const result = await em.getConnection().execute(sql, bindings as any) as {
-      fasset: FAssetType, total_agent_balance: string }[]
-    return this.convertOrmResultToFAssetValueResult(result, 'total_agent_balance')
+    const res = await em.getConnection('read').execute(UNDERLYING_AGENT_BALANCE, [timestamp]) as {
+      fasset: FAssetType, total_balance: string }[]
+    return this.convertOrmResultToFAssetValueResult(res, 'total_balance')
   }
 
   protected async coreVaultInflowAt(em: EntityManager, timestamp: number): Promise<FAssetValueResult> {

packages/fasset-indexer-api/src/analytics/utils/raw-sql.ts

@@ -83,3 +83,18 @@ left join underlying_vout_reference dvr on rr.payment_reference = dvr.reference
 left join redemption_default rd on rd.redemption_requested_evm_log_id = rr.evm_log_id
 where rr.fasset=${FAssetType.FDOGE} and eb.timestamp > ? and dvr.id is null and rd.evm_log_id is null
 limit ?`
+
+// postgres-specific query
+export const UNDERLYING_AGENT_BALANCE = `
+SELECT t.fasset, SUM(t.balance_uba) AS total_balance FROM (
+  SELECT DISTINCT ON (ubc.fasset, ubc.agent_vault_address_id)
+    ubc.fasset, ubc.agent_vault_address_id, ubc.balance_uba, el.block_index
+  FROM underlying_balance_changed ubc
+  JOIN evm_log el ON ubc.evm_log_id = el.id
+  JOIN evm_block eb ON el.block_index = eb.index
+  WHERE eb.timestamp <= ?
+  ORDER BY ubc.fasset, ubc.agent_vault_address_id, el.block_index DESC
+) t
+GROUP BY t.fasset
+ORDER BY t.fasset
+`

packages/fasset-indexer-api/src/controllers/dashboard.controller.ts

@@ -64,10 +64,10 @@ export class DashboardController {
     return apiResponse(this.service.redemptionDefault(id, FAssetType[fasset]), 200)
   }
 
-  @Get('/tracked-underlying-backing?')
+  @Get('/total-tracked-underlying-agent-backing?')
   @ApiOperation({ summary: 'Total underlying assets tracked by the contracts' })
   getTrackedUnderlyingBacking(): Promise<ApiResponse<FAssetValueResult>>{
-    return apiResponse(this.service.trackedUnderlyingBacking(), 200)
+    return apiResponse(this.service.trackedAgentUnderlyingBacking(), 200)
   }
 
   //////////////////////////////////////////////////////////////////////