Fix Kathy sending from PolygonZkEvm & require MultiProtocolProvider chains to match addresses in MultiProtocolApp

typescript/helloworld/src/multiProtocolApp/evmAdapter.ts

@@ -29,6 +29,7 @@ export class EvmHelloWorldAdapter
     destination: ChainName,
     message: string,
     value: string,
+    sender: Address,
   ): Promise<EthersV5Transaction> {
     const contract = this.getConnectedContract();
     const toDomain = this.multiProvider.getDomainId(destination);
@@ -44,7 +45,14 @@ export class EvmHelloWorldAdapter
     const estimated = await contract.estimateGas.sendHelloWorld(
       toDomain,
       message,
-      { ...transactionOverrides, value: BigNumber.from(value).add(quote) },
+      {
+        ...transactionOverrides,
+        // Some networks, like PolygonZkEvm, require a `from` address
+        // with funds to be specified when estimating gas for a transaction
+        // that provides non-zero `value`.
+        from: sender,
+        value: BigNumber.from(value).add(quote),
+      },
     );
     const gasLimit = estimated.mul(12).div(10);
 

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,
   );
 

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,6 +121,22 @@ export abstract class MultiProtocolApp<
     public readonly addresses: ChainMap<ContractAddrs>,
     public readonly logger = debug('hyperlane:MultiProtocolApp'),
   ) {
+    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);
   }