Require multiprovider known chains to match the addresses in MultiPro…

…tocolApp
hyperlane-xyz · Nov 30, 2023 · b0f111d · b0f111d
1 parent 3b44c7d
commit b0f111d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/typescript/infra/scripts/helloworld/utils.ts b/typescript/infra/scripts/helloworld/utils.ts
@@ -128,7 +128,7 @@ export async function getHelloWorldMultiProtocolApp(
     }),
   );
   const app = new HelloMultiProtocolApp(
-    multiProtocolProvider,
+    multiProtocolProvider.intersect(Object.keys(routersAndMailboxes)).result,
     routersAndMailboxes,
   );
 

diff --git a/typescript/sdk/src/app/MultiProtocolApp.ts b/typescript/sdk/src/app/MultiProtocolApp.ts
@@ -6,6 +6,7 @@ import {
   ProtocolType,
   objMap,
   promiseObjAll,
+  symmetricDifference,
 } from '@hyperlane-xyz/utils';
 
 import { ChainMetadata } from '../metadata/chainMetadataTypes';
@@ -120,7 +121,22 @@ export abstract class MultiProtocolApp<
     public readonly addresses: ChainMap<ContractAddrs>,
     public readonly logger = debug('hyperlane:MultiProtocolApp'),
   ) {
-    multiProvider = multiProvider.intersect(Object.keys(addresses)).result;
+    const multiProviderChains = multiProvider.getKnownChainNames();
+    const addressesChains = Object.keys(addresses);
+    const setDifference = symmetricDifference(
+      new Set(multiProviderChains),
+      new Set(addressesChains),
+    );
+    if (setDifference.size > 0) {
+      throw new Error(
+        `MultiProtocolProvider and addresses must have the same chains. Provider chains: ${multiProviderChains.join(
+          ', ',
+        )}. Addresses chains: ${addressesChains.join(
+          ', ',
+        )}. Difference: ${Array.from(setDifference)}`,
+      );
+    }
+
     super(multiProvider.metadata);
   }