Adapt synapseCCTP, add check to synapseBridge

packages/sdk-router/src/router/synapseCCTPRouter.ts

@@ -9,6 +9,7 @@ import { SynapseCCTPRouter as SynapseCCTPRouterContract } from '../typechain/Syn
 import { Router } from './router'
 import { Query, narrowToCCTPRouterQuery, reduceToQuery } from './query'
 import cctpAbi from '../abi/SynapseCCTP.json'
+import { getMatchingTxLog } from '../utils/logs'
 import { BigintIsh } from '../constants'
 import {
   BridgeToken,
@@ -30,6 +31,9 @@ export class SynapseCCTPRouter extends Router {
   private readonly routerContract: SynapseCCTPRouterContract
   private cctpContractCache: Contract | undefined
 
+  // All possible events emitted by the SynapseCCTP contract in the origin transaction
+  private readonly originEvents = ['CircleRequestSent']
+
   constructor(chainId: number, provider: Provider, address: string) {
     // Parent constructor throws if chainId or provider are undefined
     super(chainId, provider)
@@ -122,27 +126,12 @@ export class SynapseCCTPRouter extends Router {
    */
   public async getBridgeID(txHash: string): Promise<string> {
     const cctpContract = await this.getCctpContract()
-    // Extract the CircleRequestSent event topic
-    // We know it always exists as we are using the correct ABI
-    const circleRequestSentTopic = cctpContract.interface.getEventTopic(
-      Object.values(cctpContract.interface.events).find(
-        (event) => event.name === 'CircleRequestSent'
-      )!
+    const cctpLog = await getMatchingTxLog(
+      this.provider,
+      txHash,
+      cctpContract,
+      this.originEvents
     )
-    // Iterate through logs to find CircleRequestSent event emitted by SynapseCCTP in the provided tx
-    const txReceipt = await this.provider.getTransactionReceipt(txHash)
-    if (!txReceipt) {
-      throw new Error('Failed to get transaction receipt')
-    }
-    const cctpLog = txReceipt.logs.find((log) => {
-      return (
-        log.address === cctpContract.address &&
-        log.topics[0] === circleRequestSentTopic
-      )
-    })
-    if (!cctpLog) {
-      throw new Error('CircleRequestSent log not found')
-    }
     // RequestID always exists in the log as we are using the correct ABI
     const parsedLog = cctpContract.interface.parseLog(cctpLog)
     return parsedLog.args.requestID

packages/sdk-router/src/router/synapseRouter.ts

@@ -25,6 +25,7 @@ import {
   reduceToFeeConfig,
   reduceToPoolToken,
 } from './types'
+import { getMatchingTxLog } from '../utils/logs'
 
 /**
  * Wraps [tokens, lpToken] returned by the SynapseRouter contract into a PoolInfo object.
@@ -60,6 +61,16 @@ export class SynapseRouter extends Router {
   private readonly routerContract: SynapseRouterContract
   private bridgeContractCache: Contract | undefined
 
+  // All possible events emitted by the SynapseBridge contract in the origin transaction (in alphabetical order)
+  private readonly originEvents = [
+    'TokenDeposit',
+    'TokenDepositAndSwap',
+    'TokenRedeem',
+    'TokenRedeemAndRemove',
+    'TokenRedeemAndSwap',
+    'TokenRedeemV2',
+  ]
+
   constructor(chainId: number, provider: Provider, address: string) {
     // Parent constructor throws if chainId or provider are undefined
     super(chainId, provider)
@@ -142,6 +153,15 @@ export class SynapseRouter extends Router {
    * @inheritdoc Router.getBridgeID
    */
   public async getBridgeID(txHash: string): Promise<string> {
+    // Check that the transaction hash refers to an origin transaction
+    const bridgeContract = await this.getBridgeContract()
+    await getMatchingTxLog(
+      this.provider,
+      txHash,
+      bridgeContract,
+      this.originEvents
+    )
+    // Once we know the transaction is an origin transaction, we can calculate the bridge ID
     return solidityKeccak256(['string'], [txHash])
   }