feat: finalize *tokenless* HubPool CCTP messages

src/common/abi/HubPool.json

@@ -9,5 +9,24 @@
     ],
     "name": "TokensRelayed",
     "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "target",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "bytes",
+        "name": "message",
+        "type": "bytes"
+      }
+    ],
+    "name": "MessageRelayed",
+    "type": "event"
   }
 ]

src/finalizer/utils/cctp/l1ToL2.ts

@@ -15,10 +15,11 @@ import {
   isEVMSpokePoolClient,
 } from "../../../utils";
 import {
-  AttestedCCTPDepositEvent,
+  AttestedCCTPMessage,
   CCTPMessageStatus,
-  getAttestationsForCCTPDepositEvents,
+  getAttestedCCTPMessages,
   getCctpMessageTransmitter,
+  isDepositForBurnEvent,
 } from "../../../utils/CCTPUtils";
 import { FinalizerPromise, CrossChainMessage } from "../../types";
 
@@ -36,7 +37,7 @@ export async function cctpL1toL2Finalizer(
     to: l1SpokePoolClient.latestHeightSearched,
     maxLookBack: l1SpokePoolClient.eventSearchConfig.maxLookBack,
   };
-  const outstandingDeposits = await getAttestationsForCCTPDepositEvents(
+  const outstandingDeposits = await getAttestedCCTPMessages(
     senderAddresses,
     hubPoolClient.chainId,
     l2SpokePoolClient.chainId,
@@ -77,7 +78,7 @@ export async function cctpL1toL2Finalizer(
  */
 async function generateMultiCallData(
   messageTransmitter: Contract,
-  messages: Pick<AttestedCCTPDepositEvent, "attestation" | "messageBytes">[]
+  messages: Pick<AttestedCCTPMessage, "attestation" | "messageBytes">[]
 ): Promise<Multicall2Call[]> {
   assert(messages.every(({ attestation }) => isDefined(attestation) && attestation !== "PENDING"));
   return Promise.all(
@@ -102,15 +103,26 @@ async function generateMultiCallData(
  * @returns A list of valid withdrawals for a given list of CCTP messages.
  */
 async function generateDepositData(
-  messages: Pick<AttestedCCTPDepositEvent, "amount">[],
+  messages: AttestedCCTPMessage[],
   originationChainId: number,
   destinationChainId: number
 ): Promise<CrossChainMessage[]> {
-  return messages.map((message) => ({
-    l1TokenSymbol: "USDC", // Always USDC b/c that's the only token we support on CCTP
-    amount: convertFromWei(message.amount, TOKEN_SYMBOLS_MAP.USDC.decimals), // Format out to 6 decimal places for USDC
-    type: "deposit",
-    originationChainId,
-    destinationChainId,
-  }));
+  return messages.map((message) => {
+    if (isDepositForBurnEvent(message)) {
+      return {
+        l1TokenSymbol: "USDC", // Always USDC b/c that's the only token we support on CCTP
+        amount: convertFromWei(message.amount, TOKEN_SYMBOLS_MAP.USDC.decimals), // Format out to 6 decimal places for USDC
+        type: "deposit",
+        originationChainId,
+        destinationChainId,
+      };
+    } else {
+      return {
+        type: "misc",
+        miscReason: `Finalization of CCTP crosschain message ${message.log.transactionHash} ; log index ${message.log.logIndex}`,
+        originationChainId,
+        destinationChainId,
+      };
+    }
+  });
 }

src/finalizer/utils/cctp/l2ToL1.ts

@@ -14,9 +14,9 @@ import {
   EventSearchConfig,
 } from "../../../utils";
 import {
-  AttestedCCTPDepositEvent,
+  AttestedCCTPDeposit,
   CCTPMessageStatus,
-  getAttestationsForCCTPDepositEvents,
+  getAttestedCCTPDeposits,
   getCctpMessageTransmitter,
 } from "../../../utils/CCTPUtils";
 import { FinalizerPromise, CrossChainMessage } from "../../types";
@@ -34,7 +34,7 @@ export async function cctpL2toL1Finalizer(
     to: spokePoolClient.latestHeightSearched,
     maxLookBack: spokePoolClient.eventSearchConfig.maxLookBack,
   };
-  const outstandingDeposits = await getAttestationsForCCTPDepositEvents(
+  const outstandingDeposits = await getAttestedCCTPDeposits(
     senderAddresses,
     spokePoolClient.chainId,
     hubPoolClient.chainId,
@@ -76,7 +76,7 @@ export async function cctpL2toL1Finalizer(
  */
 async function generateMultiCallData(
   messageTransmitter: Contract,
-  messages: Pick<AttestedCCTPDepositEvent, "attestation" | "messageBytes">[]
+  messages: Pick<AttestedCCTPDeposit, "attestation" | "messageBytes">[]
 ): Promise<Multicall2Call[]> {
   assert(messages.every((message) => isDefined(message.attestation)));
   return Promise.all(
@@ -101,7 +101,7 @@ async function generateMultiCallData(
  * @returns A list of valid withdrawals for a given list of CCTP messages.
  */
 async function generateWithdrawalData(
-  messages: Pick<AttestedCCTPDepositEvent, "amount">[],
+  messages: Pick<AttestedCCTPDeposit, "amount">[],
   originationChainId: number,
   destinationChainId: number
 ): Promise<CrossChainMessage[]> {