changes

Author: douglasgalico

.prettierignore

@@ -0,0 +1 @@
+/evm

src/layouts/request.ts

@@ -8,22 +8,6 @@ import { fromHex, toHex } from "viem";
 import { RequestPrefix } from "../types";
 import { hexConversion } from "./conversions";
 
-export const modularMessageRequestLayout = [
-  { name: "chain", binary: "uint", size: 2 },
-  { name: "address", binary: "bytes", size: 32, custom: hexConversion },
-  { name: "sequence", binary: "uint", size: 8 },
-  {
-    name: "payload",
-    binary: "bytes",
-    lengthSize: 4,
-    custom: hexConversion,
-  },
-] as const satisfies Layout;
-
-export type ModularMessageRequest = DeriveType<
-  typeof modularMessageRequestLayout
->;
-
 export const vaaV1RequestLayout = [
   { name: "chain", binary: "uint", size: 2 },
   { name: "address", binary: "bytes", size: 32, custom: hexConversion },
@@ -76,7 +60,6 @@ export const requestLayout = [
     idSize: 4,
     idTag: "prefix",
     layouts: [
-      [[0x45524d31, RequestPrefix.ERM1], modularMessageRequestLayout],
       [[0x45525631, RequestPrefix.ERV1], vaaV1RequestLayout],
       [[0x45524e31, RequestPrefix.ERN1], nttV1RequestLayout],
       [[0x45524331, RequestPrefix.ERC1], cctpV1RequestLayout],

src/mockGuardian.ts

@@ -22,12 +22,12 @@ import { EVM_PRIVATE_KEY } from "./consts";
 import type { ChainConfig } from "./chains";
 
 async function getWormholeMessage(
-  chainConfig: ChainConfig,
+  rpc: string,
   txHash: Hex,
   coreContractAddress: Hex,
-): Promise<Record<string, VAA<"Uint8Array">> | undefined> {
-  console.log(`Mocking guardian signatures for ${chainConfig.rpc} ${txHash}`);
-  const transport = http(chainConfig.rpc);
+): Promise<VAA<"Uint8Array"> | undefined> {
+  console.log(`Mocking guardian signatures for ${rpc} ${txHash}`);
+  const transport = http(rpc);
   const client = createPublicClient({
     chain: anvil,
     transport,
@@ -47,15 +47,14 @@ async function getWormholeMessage(
     abi: CORE_ABI,
     logs: transaction.logs,
   });
-  const transactionVAAs: Record<string, VAA<"Uint8Array">> = {};
 
-  // @TODO - Emitter + Sequence
   for (const topic of topics) {
     if (
       topic.removed === false &&
       isAddressEqual(topic.address, coreContractAddress)
     ) {
       const emitter = topic.args.sender;
+      const paddedEmitter = padHex(emitter, { dir: "left", size: 32 });
       const vaa = createVAA("Uint8Array", {
         guardianSet: guardianSetIndex,
         timestamp: Number(
@@ -78,44 +77,35 @@ async function getWormholeMessage(
         payload: toBytes(topic.args.payload),
       });
 
-      const vaaId = `${chainConfig.wormholeChainId}/${padHex(emitter, { dir: "left", size: 32 }).substring(2)}/${topic.args.sequence.toString()}`;
-
-      transactionVAAs[vaaId] = vaa;
+      const vaaId = `${chainId}/${padHex(emitter, { dir: "left", size: 32 }).substring(2)}/${topic.args.sequence.toString()}`;
+      if (
+        vaaId ===
+        `${chainId}/${paddedEmitter.substring(2)}/${vaa.sequence.toString()}`
+      ) {
+        return vaa;
+      }
     }
   }
-
-  return transactionVAAs;
 }
 
 /**
  * returns a base64 string like a guardian /v1/signed_vaa/
  */
 export async function mockWormhole(
-  chainConfig: ChainConfig,
+  rpc: string,
   txHash: Hex,
   coreContractAddress: Hex,
   vaaId: string,
 ): Promise<string> {
-  const vaas = await getWormholeMessage(
-    chainConfig,
-    txHash,
-    coreContractAddress,
-  );
-  if (!vaas) {
-    throw new Error(`Vaa not found for txHash: ${txHash}.`);
-  }
-
-  console.log(Object.keys(vaas));
-
-  const expectedVaa = vaas[vaaId];
+  const vaa = await getWormholeMessage(rpc, txHash, coreContractAddress);
 
-  if (!expectedVaa) {
-    throw new Error(`Vaa not found for vaa ID: ${vaaId}.`);
+  if (!vaa) {
+    throw new Error(`Vaa not found for txHash: ${txHash} and Vaa ID ${vaaId}`);
   }
 
   const guardianSet = new mocks.MockGuardians(0, [
     EVM_PRIVATE_KEY.substring(2),
   ]);
-  const signedVaa = guardianSet.addSignatures(expectedVaa);
+  const signedVaa = guardianSet.addSignatures(vaa);
   return Buffer.from(serialize(signedVaa)).toString("base64");
 }

src/relay/evm/index.ts

@@ -125,44 +125,6 @@ export const evmHandler: IProtocolHandler = {
     return results;
   },
 
-  getWormholeVaaIds: async (
-    chainConfig: ChainConfig,
-    txHash: Hex,
-  ): Promise<string[]> => {
-    if (!isHex(chainConfig.coreContractAddress)) {
-      throw new Error("Wormhole core contract address invalid, not a Hex");
-    }
-
-    const transport = http(chainConfig.rpc);
-    const client = createPublicClient({
-      chain: anvil,
-      transport,
-    });
-    const transaction = await client.getTransactionReceipt({
-      hash: txHash,
-    });
-
-    const topics = parseEventLogs({
-      eventName: "LogMessagePublished",
-      abi: CORE_ABI,
-      logs: transaction.logs,
-    });
-    const vaaIds: string[] = [];
-
-    for (const topic of topics) {
-      if (
-        topic.removed === false &&
-        isAddressEqual(topic.address, chainConfig.coreContractAddress)
-      ) {
-        const emitter = topic.args.sender;
-        const vaaId = `${chainConfig.wormholeChainId}/${padHex(emitter, { dir: "left", size: 32 }).substring(2)}/${topic.args.sequence.toString()}`;
-        vaaIds.push(vaaId);
-      }
-    }
-
-    return vaaIds;
-  },
-
   relayVAAv1: relayVAAv1,
   relayNTTv1: relayNTTv1,
   getNttTransferMessages: getNttTransferMessages,

src/relay/handler.ts

@@ -18,8 +18,6 @@ export interface IProtocolHandler {
     chainConfig: ChainConfig,
   ): Promise<Array<RequestForExecutionWithId>>;
 
-  getWormholeVaaIds(chainConfig: ChainConfig, txHash: Hex): Promise<string[]>;
-
   relayVAAv1(
     chainConfig: ChainConfig,
     relayRequest: RelayRequestData,

src/relay/relayer.ts

@@ -64,16 +64,13 @@ export const processRelayRequests = async (
 
   switch (prefix) {
     case RequestPrefix.ERV1:
-      const vaaIds = await evmHandler.getWormholeVaaIds(
-        srcChainConfig,
-        relayRequest.txHash,
-      );
+      const vaaId = `${request.chain}/${request.address.substring(2)}/${request.sequence.toString()}`;
 
       const payload = await mockWormhole(
-        srcChainConfig,
+        srcChainConfig.rpc,
         relayRequest.txHash,
         srcChainConfig.coreContractAddress,
-        vaaIds[0]!,
+        vaaId,
       );
       if (!payload) {
         throw new Error("No Vaa found for the transaction.");
@@ -97,7 +94,7 @@ export const processRelayRequests = async (
       for (const message of messages) {
         if (message.type === "wormhole") {
           const payload = await mockWormhole(
-            srcChainConfig,
+            srcChainConfig.rpc,
             relayRequest.txHash,
             srcChainConfig.coreContractAddress,
             message.id,
@@ -119,7 +116,6 @@ export const processRelayRequests = async (
       break;
     case RequestPrefix.ERC2:
     case RequestPrefix.ERC1:
-    case RequestPrefix.ERM1:
     default:
       throw new UnsupportedRelayRequestError(
         `Request of type ${prefix} not supported.`,

src/types.ts

@@ -3,7 +3,6 @@ import type { RequestLayout } from "./layouts/request";
 import type { RequestId } from "./layouts/requestId";
 
 export enum RequestPrefix {
-  ERM1 = "ERM1", // MM
   ERV1 = "ERV1", // VAA_V1
   ERN1 = "ERN1", // NTT_V1
   ERC1 = "ERC1", // CCTP_V1