feat: add underlying minter addresses endpoint to statistics

Author: kuco23

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

@@ -8,7 +8,7 @@ import {
 import { SharedAnalytics } from "./shared"
 import { weightedAverage } from "./utils/weighted-average"
 import { FAssetPriceLoader } from "./utils/prices"
-import { LIQUIDATION_DURATION_SQL, MINTED_BY_UNDERLYING_ADDRESS, REDEEMED_BY_UNDERLYING_ADDRESS } from "./utils/raw-sql"
+import * as SQL from "./utils/raw-sql"
 import { FAssetValueResult } from "./types"
 
 
@@ -74,7 +74,7 @@ export class AgentStatistics extends SharedAnalytics {
 
   async liquidationDurationWA(vault: string, now: number, delta: number, lim: number): Promise<[bigint, number]> {
     const result = await this.orm.em.getConnection('read')
-      .execute(LIQUIDATION_DURATION_SQL, [vault, vault, now - delta, lim]) as { timestamp: number, diff: string }[]
+      .execute(SQL.LIQUIDATION_DURATION_SQL, [vault, vault, now - delta, lim]) as { timestamp: number, diff: string }[]
     const timespan = result.map(r => ({ timestamp: r.timestamp, value: BigInt(r.diff) }))
     return [weightedAverage(timespan, now, delta), timespan.length]
   }
@@ -151,15 +151,21 @@ export class AgentStatistics extends SharedAnalytics {
     return weightedAverage(timespan, now, delta)
   }
 
-  async mintedByUnderlyingAddressDuring(address: string, start: number, end: number): Promise<any> {
+  async mintedByUnderlyingAddressDuring(address: string, start: number, end: number): Promise<FAssetValueResult> {
     const em = this.orm.em.fork()
-    const r = await em.execute(MINTED_BY_UNDERLYING_ADDRESS, [address, start, end]) as { fasset: FAssetType, val: string }[]
+    const r = await em.execute(SQL.MINTED_BY_UNDERLYING_ADDRESS, [address, start, end]) as { fasset: FAssetType, val: string }[]
     return this.convertOrmResultToFAssetValueResult(r, 'val')
   }
 
-  async redeemedByUnderlyingAddressDuring(address: string, start: number, end: number): Promise<any> {
+  async redeemedByUnderlyingAddressDuring(address: string, start: number, end: number): Promise<FAssetValueResult> {
     const em = this.orm.em.fork()
-    const r = await em.execute(REDEEMED_BY_UNDERLYING_ADDRESS, [address, start, end]) as { fasset: FAssetType, val: string }[]
+    const r = await em.execute(SQL.REDEEMED_BY_UNDERLYING_ADDRESS, [address, start, end]) as { fasset: FAssetType, val: string }[]
     return this.convertOrmResultToFAssetValueResult(r, 'val')
   }
+
+  async underlyingMinterAddresses(address: string): Promise<string[]> {
+    const em = this.orm.em.fork()
+    const minters = await em.execute(SQL.UNDERLYING_MINTERS, [address]) as { address: string }[]
+    return minters.map(({ address }) => address)
+  }
 }

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

@@ -214,4 +214,12 @@ SELECT rp.fasset, SUM(ut.value) as val FROM redemption_performed rp
   JOIN underlying_block ub ON ub.height = ut.block_height
   WHERE ua.text = ? AND ub.timestamp >= ? AND ub.timestamp < ?
   GROUP BY rp.fasset
-`
+`
+
+export const UNDERLYING_MINTERS = `
+SELECT DISTINCT ua.text as address FROM minting_executed me
+  JOIN collateral_reserved cr ON cr.evm_log_id = me.collateral_reserved_evm_log_id
+  JOIN evm_address ea ON ea.id = cr.minter_id
+  JOIN underlying_reference ur ON ur.reference = cr.payment_reference
+  JOIN underlying_address ua ON ua.id = ur.address_id
+  WHERE ea.hex = ?`

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

@@ -4,7 +4,7 @@ import { unixnow } from "../shared/utils"
 import { ApiResponse, apiResponse } from "../shared/api-response"
 import { StatisticsService } from "../services/statistics.service"
 import { DashboardService } from "../services/dashboard.service"
-import type { FAssetTimeSeries, StatisticAverage } from "../analytics/types"
+import type { FAssetTimeSeries, FAssetValueResult, StatisticAverage } from "../analytics/types"
 
 const STAT_LIMIT = 100
 const DELTA = 60 * 60 * 24 * 7 // one week
@@ -102,7 +102,7 @@ export class StatisticsController {
     @Query('user') user: string,
     @Query('startTime', ParseIntPipe) start: number,
     @Query('endtime', ParseIntPipe) end: number,
-  ): Promise<ApiResponse<any>> {
+  ): Promise<ApiResponse<FAssetValueResult>> {
     return apiResponse(this.service.mintedByUnderlyingAddressDuring(user, start, end), 200)
   }
 
@@ -112,10 +112,18 @@ export class StatisticsController {
     @Query('user') user: string,
     @Query('startTime', ParseIntPipe) start: number,
     @Query('endtime', ParseIntPipe) end: number,
-  ): Promise<ApiResponse<any>> {
+  ): Promise<ApiResponse<FAssetValueResult>> {
     return apiResponse(this.service.redeemedByUnderlyingAddressDuring(user, start, end), 200)
   }
 
+  @Get('/underlying-minter-addresses?')
+  @ApiOperation({ summary: 'Underlying addresses that the given user address minted from' })
+  getUnderlyingMinterAddresses(
+    @Query('user') user: string
+  ): Promise<ApiResponse<string[]>> {
+    return apiResponse(this.service.underlyingMinterAddresses(user), 200)
+  }
+
   protected async structureReturn(prms: Promise<[bigint, number]>, now: number): Promise<StatisticAverage> {
     return prms.then(([avg, num]) => ({
       average: avg,