From dea4bc3e1f4a30e6daa82a4dd67d7602acde1503 Mon Sep 17 00:00:00 2001
From: mj52951 <matija.jelavic@chainsafe.io>
Date: Fri, 12 Jul 2024 12:35:57 +0200
Subject: [PATCH] Fix domain naming

---
 src/config/index.ts           |  7 ++-----
 src/evmIndexer/utils/index.ts | 14 +++++++-------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/config/index.ts b/src/config/index.ts
index 3ac227a..3e7eb29 100644
--- a/src/config/index.ts
+++ b/src/config/index.ts
@@ -6,9 +6,9 @@ import { ApiPromise, WsProvider } from "@polkadot/api";
 import {
   EvmResource,
   FeeHandler,
-  Network,
   ResourceType,
   SubstrateResource,
+  Domain as DomainSDK,
 } from "@buildwithsygma/sygma-sdk-core";
 import { logger } from "../utils/logger";
 
@@ -31,10 +31,7 @@ export type SharedConfig = {
   domains: Array<Domain>;
 };
 
-export type Domain = {
-  id: number;
-  name: string;
-  type: Network;
+export type Domain = DomainSDK & {
   bridge: string;
   feeRouter: string;
   feeHandlers: Array<FeeHandler>;
diff --git a/src/evmIndexer/utils/index.ts b/src/evmIndexer/utils/index.ts
index 745ebac..b9a559f 100644
--- a/src/evmIndexer/utils/index.ts
+++ b/src/evmIndexer/utils/index.ts
@@ -28,7 +28,7 @@ import {
   DepositType,
   FeeData,
 } from "../evmTypes";
-import { Domain as DomainConfig } from "../../config";
+import { Domain } from "../../config";
 import { logger } from "../../utils/logger";
 import { Transfer } from "../../model";
 import * as FeeHandlerRouter from "../../abi/FeeHandlerRouter.json";
@@ -47,8 +47,8 @@ type FeeDataResponse = {
 
 export async function parseDeposit(
   log: Log,
-  fromDomain: DomainConfig,
-  toDomain: DomainConfig,
+  fromDomain: Domain,
+  toDomain: Domain,
   provider: Provider,
   substrateRpcUrlConfig: Map<number, ApiPromise>
 ): Promise<DecodedDepositLog> {
@@ -96,7 +96,7 @@ export async function parseDeposit(
 
 export function parseDestination(
   hexData: BytesLike,
-  domain: DomainConfig,
+  domain: Domain,
   resourceType: string,
   substrateRpcUrlConfig: Map<number, ApiPromise>
 ): string {
@@ -209,7 +209,7 @@ function decodeAmountsOrTokenId(
 
 export function parseProposalExecution(
   log: Log,
-  toDomain: DomainConfig
+  toDomain: Domain
 ): DecodedProposalExecutionLog {
   const event = bridge.events.ProposalExecution.decode(log);
   const transaction = assertNotNull(log.transaction, "Missing transaction");
@@ -228,7 +228,7 @@ export function parseProposalExecution(
 
 export function parseFailedHandlerExecution(
   log: Log,
-  toDomain: DomainConfig
+  toDomain: Domain
 ): DecodedFailedHandlerExecution {
   const event = bridge.events.FailedHandlerExecution.decode(log);
   const transaction = assertNotNull(log.transaction, "Missing transaction");
@@ -249,7 +249,7 @@ export function parseFailedHandlerExecution(
 
 export async function getFee(
   log: Log,
-  fromDomain: DomainConfig,
+  fromDomain: Domain,
   provider: Provider
 ): Promise<FeeData> {
   try {