feat: add source/target to underlying_transaction table

Author: kuco23

packages/fasset-indexer-core/src/orm/entities/underlying/transaction.ts

@@ -1,6 +1,7 @@
 import { Entity, ManyToOne, PrimaryKey, Property } from "@mikro-orm/core"
 import { UnderlyingBlock } from "./block"
 import { uint256 } from "../../custom/uint"
+import { UnderlyingAddress } from "./address"
 
 
 @Entity()
@@ -18,10 +19,18 @@ export class UnderlyingTransaction {
   @Property({ type: new uint256() })
   value: bigint
 
-  constructor(block: UnderlyingBlock, hash: string, value: bigint) {
+  @ManyToOne({ entity: () => UnderlyingAddress, nullable: true })
+  source?: UnderlyingAddress
+
+  @ManyToOne({ entity: () => UnderlyingAddress, nullable: true })
+  target?: UnderlyingAddress
+
+  constructor(block: UnderlyingBlock, hash: string, value: bigint, source?: UnderlyingAddress, target?: UnderlyingAddress) {
     this.block = block
     this.hash = hash
     this.value = value
+    this.source = source
+    this.target = target
   }
 
 }

packages/fasset-indexer-core/src/orm/utils.ts

@@ -48,7 +48,10 @@ export async function findOrCreateUnderlyingAddress(em: EntityManager, address:
   return underlyingAddress
 }
 
-export async function findOrCreateUnderlyingTransaction(em: EntityManager, hash: string, block: UnderlyingBlock, value: bigint): Promise<UnderlyingTransaction> {
+export async function findOrCreateUnderlyingTransaction(
+  em: EntityManager, hash: string, block: UnderlyingBlock, value: bigint,
+  source: UnderlyingAddress, target?: UnderlyingAddress
+): Promise<UnderlyingTransaction> {
   let underlyingTransaction = await em.findOne(UnderlyingTransaction, { hash })
   if (!underlyingTransaction) {
     underlyingTransaction = new UnderlyingTransaction(block, hash, value)

packages/fasset-indexer-doge/src/indexer/indexer.ts

@@ -88,7 +88,7 @@ export class DogeIndexer {
   private async storeVoutReference(
     em: EntityManager, reference: string, transaction: IDogeTx, address: UnderlyingAddress, block: UnderlyingBlock
   ): Promise<UnderlyingVoutReference> {
-    const tx = await findOrCreateUnderlyingTransaction(em, transaction.hash, block, BigInt(0))
+    const tx = await findOrCreateUnderlyingTransaction(em, transaction.hash, block, BigInt(0), address, undefined)
     const ref = new UnderlyingVoutReference(FAssetType.FDOGE, reference, tx, address, block)
     em.persist(ref)
     return ref

packages/fasset-indexer-xrp/src/client/interface.ts

@@ -20,6 +20,7 @@ export interface IXrpTransaction {
   Sequence: number
   hash: string
   TransactionResult: string
+  Destination?: string
 }
 
 export interface IXrpMemo {

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

@@ -67,9 +67,11 @@ export class XrpIndexer {
         logger.error(`reference but no account present at index ${block.height}`)
         continue
       }
-      const address = await findOrCreateUnderlyingAddress(em, transaction.Account, AddressType.AGENT)
-      const utransaction = await findOrCreateUnderlyingTransaction(em, transaction.hash, block, BigInt(transaction.Amount!))
-      await this.storeReference(em, reference, utransaction, address, block)
+      const source = await findOrCreateUnderlyingAddress(em, transaction.Account, AddressType.AGENT)
+      const target = transaction.Destination == null ? undefined :
+        await findOrCreateUnderlyingAddress(em, transaction.Destination, AddressType.USER)
+      const utransaction = await findOrCreateUnderlyingTransaction(em, transaction.hash, block, BigInt(transaction.Amount!), source, target)
+      await this.storeReference(em, reference, utransaction, source, block)
       break
     }
   }