fix: prioritize fetching successful underlying transactions at fasset-explorer transaction details api

Author: kuco23

packages/fasset-indexer-api/package.json

@@ -20,6 +20,7 @@
     "@nestjs/swagger": "^7.3.1",
     "cache-manager": "^5.1.0",
     "fasset-indexer-core": "workspace:*",
+    "fasset-indexer-xrp": "workspace:*",
     "helmet": "^7.1.0",
     "reflect-metadata": "^0.2.0",
     "rxjs": "^7.8.1"

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

@@ -4,6 +4,7 @@ import * as ExplorerType from "./types"
 import * as SQL from "./utils/raw-sql"
 import { PaymentReference } from "fasset-indexer-core/utils"
 import { EVENTS } from "fasset-indexer-core/config"
+import { XRP_TRANSACTION_SUCCESS_CODE } from 'fasset-indexer-xrp/constants'
 import { unixnow } from "../shared/utils"
 import type { EntityManager, ORM } from "fasset-indexer-core/orm"
 import type { FilterQuery } from "@mikro-orm/core"
@@ -409,10 +410,14 @@ export class ExplorerAnalytics {
     reference: string,
     filters: FilterQuery<Entities.UnderlyingVoutReference> = {}
   ): Promise<Entities.UnderlyingVoutReference | null> {
-    return em.findOne(Entities.UnderlyingVoutReference,
+    const transactions = await em.find(Entities.UnderlyingVoutReference,
       { fasset, reference, ...filters as object },
       { populate: [ 'transaction.block', 'transaction.source', 'transaction.target' ] }
     )
+    if (transactions.length == 0) return null
+    const successful = transactions.filter(x => x.transaction.result == XRP_TRANSACTION_SUCCESS_CODE)
+    if (successful.length > 0) return successful[0]
+    return transactions[0]
   }
 
   protected eventNameToTransactionType(name: string): ExplorerType.TransactionType {

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

@@ -42,9 +42,7 @@ export class ExplorerController {
     @Query('types') types?: string | string[]
   ): Promise<ApiResponse<TransactionsInfo>> {
     if (types != null && typeof types == 'string') types = [types]
-    console.log(types)
     const transactionTypes = types != null ? this.parseTransactionTypes(types as string[]) : undefined
-    console.log(transactionTypes)
     return apiResponse(this.service.transactions(limit, offset, user, agent, start, end, asc, transactionTypes), 200)
   }
 

packages/fasset-indexer-api/tsconfig.json

@@ -16,6 +16,9 @@
   "references": [
     {
       "path": "../fasset-indexer-core"
+    },
+    {
+      "path": "../fasset-indexer-xrp"
     }
   ]
 }

packages/fasset-indexer-xrp/package.json

@@ -8,6 +8,10 @@
         ".": {
             "types": "./dist/src/index.d.ts",
             "default": "./dist/src/index.js"
+        },
+        "./constants": {
+            "types": "./dist/src/config/index.d.ts",
+            "default": "./dist/src/config/index.js"
         }
     },
     "scripts": {

packages/fasset-indexer-xrp/src/config/constants.ts

@@ -2,4 +2,6 @@ export const FIRST_UNHANDLED_XRP_BLOCK_DB_KEY = 'firstUnhandledXrpBlock'
 export const MIN_XRP_BLOCK_NUMBER_DB_KEY = 'minXrpBlockNumber'
 
 export const XRP_BLOCK_HEIGHT_OFFSET = 15
-export const XRP_TIMESTAMP_UNIX_OFFSET = 946684800
+export const XRP_TIMESTAMP_UNIX_OFFSET = 946684800
+
+export const XRP_TRANSACTION_SUCCESS_CODE = 'tesSUCCESS'

packages/fasset-indexer-xrp/src/config/index.ts

@@ -0,0 +1 @@
+export { XRP_TRANSACTION_SUCCESS_CODE } from './constants'

yarn.lock

@@ -3618,6 +3618,7 @@ __metadata:
     "@types/supertest": ^6.0.0
     cache-manager: ^5.1.0
     fasset-indexer-core: "workspace:*"
+    fasset-indexer-xrp: "workspace:*"
     helmet: ^7.1.0
     reflect-metadata: ^0.2.0
     rxjs: ^7.8.1
@@ -3674,7 +3675,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"fasset-indexer-xrp@workspace:packages/fasset-indexer-xrp":
+"fasset-indexer-xrp@workspace:*, fasset-indexer-xrp@workspace:packages/fasset-indexer-xrp":
   version: 0.0.0-use.local
   resolution: "fasset-indexer-xrp@workspace:packages/fasset-indexer-xrp"
   dependencies: