Change transfer ID creation

src/evmIndexer/evmIndexer.ts

@@ -3,15 +3,20 @@ The Licensed Work is (c) 2024 Sygma
 SPDX-License-Identifier: LGPL-3.0-only
 */
 import type { Context } from "../evmProcessor";
-import type { Transfer } from "../model";
-import { Account, Deposit, Execution, Fee, TransferStatus } from "../model";
+import {
+  Transfer,
+  Account,
+  Deposit,
+  Execution,
+  Fee,
+  TransferStatus,
+} from "../model";
 
 import type {
   DecodedDepositLog,
   DecodedFailedHandlerExecution,
   DecodedProposalExecutionLog,
 } from "./evmTypes";
-import { getUpdatedTransfer } from "./utils";
 
 export async function processDeposits(
   ctx: Context,
@@ -45,7 +50,7 @@ export async function processDeposits(
       handlerResponse: d.handlerResponse,
     });
 
-    const transfer = await getUpdatedTransfer(ctx, {
+    const transfer = new Transfer({
       id: d.id,
       depositNonce: d.depositNonce,
       amount: d.amount,
@@ -85,7 +90,7 @@ export async function processExecutions(
       txHash: e.txHash,
     });
 
-    const transfer = await getUpdatedTransfer(ctx, {
+    const transfer = new Transfer({
       id: e.id,
       depositNonce: e.depositNonce,
       amount: null,
@@ -122,7 +127,7 @@ export async function processFailedExecutions(
       txHash: e.txHash,
     });
 
-    const transfer = await getUpdatedTransfer(ctx, {
+    const transfer = new Transfer({
       id: e.id,
       depositNonce: e.depositNonce,
       amount: null,

src/evmIndexer/utils/index.ts

@@ -15,8 +15,8 @@ import { AbiCoder, Contract, ethers, formatUnits } from "ethers";
 import * as FeeHandlerRouter from "../../abi/FeeHandlerRouter.json";
 import * as bridge from "../../abi/bridge";
 import type { Domain } from "../../config";
-import type { Context, Log } from "../../evmProcessor";
-import { Transfer } from "../../model";
+import type { Log } from "../../evmProcessor";
+import { generateTransferID } from "../../utils";
 import { logger } from "../../utils/logger";
 import type {
   DecodedDepositLog,
@@ -55,7 +55,11 @@ export async function parseDeposit(
   const transaction = assertNotNull(log.transaction, "Missing transaction");
 
   return {
-    id: log.id,
+    id: generateTransferID(
+      event.depositNonce.toString(),
+      fromDomain.id.toString(),
+      event.destinationDomainID.toString(),
+    ),
     blockNumber: log.block.height,
     depositNonce: event.depositNonce,
     toDomainID: event.destinationDomainID,
@@ -66,7 +70,7 @@ export async function parseDeposit(
       resourceType,
       substrateRpcUrlConfig,
     ),
-    fromDomainID: Number(fromDomain.id),
+    fromDomainID: fromDomain.id,
     resourceID: resource.resourceId,
     txHash: transaction.hash,
     timestamp: new Date(log.block.timestamp),
@@ -206,14 +210,18 @@ export function parseProposalExecution(
   const transaction = assertNotNull(log.transaction, "Missing transaction");
 
   return {
-    id: log.id,
+    id: generateTransferID(
+      event.depositNonce.toString(),
+      event.originDomainID.toString(),
+      toDomain.id.toString(),
+    ),
     blockNumber: log.block.height,
     from: log.transaction!.from,
     depositNonce: event.depositNonce,
     txHash: transaction.hash,
     timestamp: new Date(log.block.timestamp),
     fromDomainID: event.originDomainID,
-    toDomainID: Number(toDomain.id),
+    toDomainID: toDomain.id,
   };
 }
 
@@ -225,7 +233,11 @@ export function parseFailedHandlerExecution(
   const transaction = assertNotNull(log.transaction, "Missing transaction");
 
   return {
-    id: log.id,
+    id: generateTransferID(
+      event.depositNonce.toString(),
+      event.originDomainID.toString(),
+      toDomain.id.toString(),
+    ),
     fromDomainID: event.originDomainID,
     toDomainID: toDomain.id,
     depositNonce: event.depositNonce,
@@ -301,23 +313,3 @@ function getContract(
       return new Contract(contractAddress, FeeHandlerRouter.abi, provider);
   }
 }
-
-export async function getUpdatedTransfer(
-  ctx: Context,
-  transferValues: Partial<Transfer>,
-): Promise<Transfer> {
-  const transfer = await ctx.store.findOne(Transfer, {
-    where: {
-      depositNonce: transferValues.depositNonce!,
-      fromDomainID: transferValues.fromDomainID!,
-      toDomainID: transferValues.toDomainID!,
-    },
-  });
-
-  if (!transfer) {
-    return new Transfer(transferValues);
-  } else {
-    Object.assign(transfer, transferValues);
-    return transfer;
-  }
-}

src/utils/index.ts

@@ -29,3 +29,11 @@ export async function initDatabase(): Promise<DataSource> {
   await dataSource.initialize();
   return dataSource;
 }
+
+export function generateTransferID(
+  depositNonce: string,
+  fromDomainID: string,
+  toDomainID: string,
+): string {
+  return depositNonce + "-" + fromDomainID + "-" + toDomainID;
+}