From ae1e4b32e37ac87418a79c47c6d5d235a63c24b3 Mon Sep 17 00:00:00 2001 From: derpy-duck <115193320+derpy-duck@users.noreply.github.com> Date: Mon, 30 Oct 2023 14:25:40 -0400 Subject: [PATCH] base is domain 6 (#3471) * base is domain 6 * explicit CCTP domain to name mapping --- sdk/js/src/relayer/consts.ts | 17 ++++++++++------- sdk/js/src/relayer/relayer/helpers.ts | 8 ++++---- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/sdk/js/src/relayer/consts.ts b/sdk/js/src/relayer/consts.ts index fd0811402..2beac3b24 100644 --- a/sdk/js/src/relayer/consts.ts +++ b/sdk/js/src/relayer/consts.ts @@ -242,10 +242,13 @@ export const getWormscanAPI = (_network: Network) => { } }; -export const CCTP_DOMAIN_TO_NAME = [ - "ethereum", - "avalanche", - "optimism", - "arbitrum", - "base", -]; +export const getNameFromCCTPDomain = ( + domain: number +): ChainName | undefined => { + if (domain === 0) return "ethereum"; + else if (domain === 1) return "avalanche"; + else if (domain === 2) return "optimism"; + else if (domain === 3) return "arbitrum"; + else if (domain === 6) return "base"; + else return undefined; +}; diff --git a/sdk/js/src/relayer/relayer/helpers.ts b/sdk/js/src/relayer/relayer/helpers.ts index b37badccb..0a2a581e6 100644 --- a/sdk/js/src/relayer/relayer/helpers.ts +++ b/sdk/js/src/relayer/relayer/helpers.ts @@ -16,7 +16,7 @@ import { getWormholeRelayerAddress, getCircleAPI, getWormscanAPI, - CCTP_DOMAIN_TO_NAME, + getNameFromCCTPDomain, } from "../consts"; import { parseWormholeRelayerPayloadType, @@ -82,9 +82,9 @@ export function printChain(chainId: number) { } export function printCCTPDomain(domain: number) { - if (domain >= CCTP_DOMAIN_TO_NAME.length) + if (getNameFromCCTPDomain(domain) === undefined) throw Error(`Invalid cctp domain: ${domain}`); - return `${CCTP_DOMAIN_TO_NAME[domain]} (Domain ${domain})`; + return `${getNameFromCCTPDomain(domain)} (Domain ${domain})`; } export const estimatedAttestationTimeInSeconds = ( @@ -536,7 +536,7 @@ export async function getCCTPMessageLogURL( ); const MessageSentTopic = ethers.utils.keccak256("MessageSent(bytes)"); try { - if (CCTP_DOMAIN_TO_NAME[cctpKey.domain] === sourceChain) { + if (getNameFromCCTPDomain(cctpKey.domain) === sourceChain) { const cctpLogFilter = (log: ethers.providers.Log) => { return ( log.topics[0] === DepositForBurnTopic &&