@hyperlane-xyz/helloworld 1.5.3 → 1.5.5-beta0

package/contracts/HelloWorld.sol

@@ -2,7 +2,8 @@
 pragma solidity ^0.8.13;
 
 // ============ External Imports ============
-import {Router} from "@hyperlane-xyz/core/contracts/Router.sol";
+import {Router} from "@hyperlane-xyz/core/contracts/client/Router.sol";
+import {StandardHookMetadata} from "@hyperlane-xyz/core/contracts/hooks/libs/StandardHookMetadata.sol";
 
 /*
  * @title The Hello World App
@@ -42,13 +43,10 @@ contract HelloWorld is Router {
         uint256 handleGasAmount
     );
 
-    constructor(address _mailbox, address _interchainGasPaymaster) {
+    constructor(address _mailbox, address _hook) Router(_mailbox) {
         // Transfer ownership of the contract to deployer
         _transferOwnership(msg.sender);
-        // Set the addresses for the Mailbox and IGP
-        // Alternatively, this could be done later in an initialize method
-        _setMailbox(_mailbox);
-        _setInterchainGasPaymaster(_interchainGasPaymaster);
+        setHook(_hook);
     }
 
     // ============ External functions ============
@@ -65,13 +63,7 @@ contract HelloWorld is Router {
     {
         sent += 1;
         sentTo[_destinationDomain] += 1;
-        _dispatchWithGas(
-            _destinationDomain,
-            bytes(_message),
-            HANDLE_GAS_AMOUNT,
-            msg.value,
-            msg.sender
-        );
+        _dispatch(_destinationDomain, bytes(_message));
         emit SentHelloWorld(
             mailbox.localDomain(),
             _destinationDomain,
@@ -79,7 +71,25 @@ contract HelloWorld is Router {
         );
     }
 
+    /**
+     * @notice Fetches the amount of gas that will be used when a message is
+     * dispatched to the given domain.
+     */
+    function quoteDispatch(uint32 _destinationDomain, bytes calldata _message)
+        external
+        view
+        returns (uint256)
+    {
+        return _quoteDispatch(_destinationDomain, _message);
+    }
+
     // ============ Internal functions ============
+    function _metadata(
+        uint32 /*_destinationDomain*/
+    ) internal view override returns (bytes memory) {
+        return
+            StandardHookMetadata.formatMetadata(HANDLE_GAS_AMOUNT, msg.sender);
+    }
 
     /**
      * @notice Handles a message from a remote router.

package/dist/hardhat.config.js

@@ -22,7 +22,7 @@ module.exports = {
     typechain: {
         outDir: './src/types',
         target: 'ethers-v5',
-        alwaysGenerateOverloads: false, // should overloads with full signatures like deposit(uint256) be generated always, even if there are no overloads?
+        alwaysGenerateOverloads: true,
     },
 };
 //# sourceMappingURL=hardhat.config.js.map

package/dist/hardhat.config.js.map

@@ -1 +1 @@
-{"version":3,"file":"hardhat.config.js","sourceRoot":"","sources":["../hardhat.config.ts"],"names":[],"mappings":";;AAAA,qCAAmC;AACnC,qCAAmC;AACnC,8BAA4B;AAC5B,gCAA8B;AAC9B,6BAA2B;AAE3B;;GAEG;AACH,MAAM,CAAC,OAAO,GAAG;IACf,QAAQ,EAAE;QACR,SAAS,EAAE;YACT;gBACE,OAAO,EAAE,QAAQ;aAClB;SACF;KACF;IACD,WAAW,EAAE;QACX,QAAQ,EAAE,KAAK;KAChB;IACD,SAAS,EAAE;QACT,MAAM,EAAE,aAAa;QACrB,MAAM,EAAE,WAAW;QACnB,uBAAuB,EAAE,KAAK,EAAE,mHAAmH;KACpJ;CACF,CAAC"}
+{"version":3,"file":"hardhat.config.js","sourceRoot":"","sources":["../hardhat.config.ts"],"names":[],"mappings":";;AAAA,qCAAmC;AACnC,qCAAmC;AACnC,8BAA4B;AAC5B,gCAA8B;AAC9B,6BAA2B;AAE3B;;GAEG;AACH,MAAM,CAAC,OAAO,GAAG;IACf,QAAQ,EAAE;QACR,SAAS,EAAE;YACT;gBACE,OAAO,EAAE,QAAQ;aAClB;SACF;KACF;IACD,WAAW,EAAE;QACX,QAAQ,EAAE,KAAK;KAChB;IACD,SAAS,EAAE;QACT,MAAM,EAAE,aAAa;QACrB,MAAM,EAAE,WAAW;QACnB,uBAAuB,EAAE,IAAI;KAC9B;CACF,CAAC"}

package/dist/src/app/app.d.ts

@@ -1,12 +1,11 @@
 import { BigNumber, ethers } from 'ethers';
 import { ChainMap, ChainName, HyperlaneContracts, HyperlaneContractsMap, HyperlaneCore, MultiProvider, RouterApp } from '@hyperlane-xyz/sdk';
-import { Address } from '@hyperlane-xyz/utils';
 import { HelloWorld } from '../types';
 import { HelloWorldFactories } from './contracts';
 import { StatCounts } from './types';
 export declare class HelloWorldApp extends RouterApp<HelloWorldFactories> {
     readonly core: HyperlaneCore;
-    constructor(core: HyperlaneCore, contractsMap: HyperlaneContractsMap<HelloWorldFactories>, multiProvider: MultiProvider, foreignDeployments?: ChainMap<Address>);
+    constructor(core: HyperlaneCore, contractsMap: HyperlaneContractsMap<HelloWorldFactories>, multiProvider: MultiProvider);
     router(contracts: HyperlaneContracts<HelloWorldFactories>): HelloWorld;
     sendHelloWorld(from: ChainName, to: ChainName, message: string, value: BigNumber): Promise<ethers.ContractReceipt>;
     waitForMessageReceipt(receipt: ethers.ContractReceipt): Promise<ethers.ContractReceipt[]>;

package/dist/src/app/app.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../../src/app/app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE3C,OAAO,EACL,QAAQ,EACR,SAAS,EACT,kBAAkB,EAClB,qBAAqB,EACrB,aAAa,EACb,aAAa,EACb,SAAS,EACV,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAS,MAAM,sBAAsB,CAAC;AAEtD,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAEtC,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAErC,qBAAa,aAAc,SAAQ,SAAS,CAAC,mBAAmB,CAAC;aAE7C,IAAI,EAAE,aAAa;gBAAnB,IAAI,EAAE,aAAa,EACnC,YAAY,EAAE,qBAAqB,CAAC,mBAAmB,CAAC,EACxD,aAAa,EAAE,aAAa,EAC5B,kBAAkB,GAAE,QAAQ,CAAC,OAAO,CAAM;IAK5C,MAAM,CAAC,SAAS,EAAE,kBAAkB,CAAC,mBAAmB,CAAC,GAAG,UAAU;IAIhE,cAAc,CAClB,IAAI,EAAE,SAAS,EACf,EAAE,EAAE,SAAS,EACb,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,SAAS,GACf,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC;IA4B5B,qBAAqB,CACzB,OAAO,EAAE,MAAM,CAAC,eAAe,GAC9B,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;IAI9B,uBAAuB,CAC3B,OAAO,EAAE,MAAM,CAAC,eAAe,GAC9B,OAAO,CAAC,IAAI,CAAC;IAIV,YAAY,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC;IAWjE,KAAK,IAAI,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;CAcvD"}
+{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../../src/app/app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE3C,OAAO,EACL,QAAQ,EACR,SAAS,EACT,kBAAkB,EAClB,qBAAqB,EACrB,aAAa,EACb,aAAa,EACb,SAAS,EACV,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAEtC,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAErC,qBAAa,aAAc,SAAQ,SAAS,CAAC,mBAAmB,CAAC;aAE7C,IAAI,EAAE,aAAa;gBAAnB,IAAI,EAAE,aAAa,EACnC,YAAY,EAAE,qBAAqB,CAAC,mBAAmB,CAAC,EACxD,aAAa,EAAE,aAAa;IAK9B,MAAM,CAAC,SAAS,EAAE,kBAAkB,CAAC,mBAAmB,CAAC,GAAG,UAAU;IAIhE,cAAc,CAClB,IAAI,EAAE,SAAS,EACf,EAAE,EAAE,SAAS,EACb,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,SAAS,GACf,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC;IA6B5B,qBAAqB,CACzB,OAAO,EAAE,MAAM,CAAC,eAAe,GAC9B,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;IAI9B,uBAAuB,CAC3B,OAAO,EAAE,MAAM,CAAC,eAAe,GAC9B,OAAO,CAAC,IAAI,CAAC;IAIV,YAAY,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC;IAWjE,KAAK,IAAI,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;CAcvD"}

package/dist/src/app/app.js

@@ -4,8 +4,8 @@ exports.HelloWorldApp = void 0;
 const sdk_1 = require("@hyperlane-xyz/sdk");
 const utils_1 = require("@hyperlane-xyz/utils");
 class HelloWorldApp extends sdk_1.RouterApp {
-    constructor(core, contractsMap, multiProvider, foreignDeployments = {}) {
-        super(contractsMap, multiProvider, undefined, foreignDeployments);
+    constructor(core, contractsMap, multiProvider) {
+        super(contractsMap, multiProvider);
         this.core = core;
     }
     router(contracts) {
@@ -18,10 +18,11 @@ class HelloWorldApp extends sdk_1.RouterApp {
         // apply gas buffer due to https://github.com/hyperlane-xyz/hyperlane-monorepo/issues/634
         const estimated = await sender.estimateGas.sendHelloWorld(toDomain, message, { ...transactionOverrides, value });
         const gasLimit = estimated.mul(12).div(10);
+        const quote = await sender.quoteDispatch(toDomain, message);
         const tx = await sender.sendHelloWorld(toDomain, message, {
             ...transactionOverrides,
             gasLimit,
-            value,
+            value: value.add(quote),
         });
         (0, utils_1.debug)('Sending hello message', {
             from,

package/dist/src/app/app.js.map

@@ -1 +1 @@
-{"version":3,"file":"app.js","sourceRoot":"","sources":["../../../src/app/app.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"app.js","sourceRoot":"","sources":["../../../src/app/app.ts"],"names":[],"mappings":"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"}

package/dist/src/deploy/deploy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../src/deploy/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,kBAAkB,EAClB,mBAAmB,EACnB,uBAAuB,EACvB,aAAa,EACd,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,mBAAmB,EAAuB,MAAM,kBAAkB,CAAC;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAEtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,qBAAa,kBAAmB,SAAQ,uBAAuB,CAC7D,gBAAgB,EAChB,mBAAmB,CACpB;IAGG,QAAQ,CAAC,UAAU,CAAC;gBADpB,aAAa,EAAE,aAAa,EACnB,UAAU,CAAC,iCAAqB;IAK3C,MAAM,CAAC,SAAS,EAAE,kBAAkB,CAAC,mBAAmB,CAAC,GAAG,UAAU;IAMhE,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,gBAAgB;;;CASjE"}
+{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../src/deploy/deploy.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,SAAS,EACT,kBAAkB,EAClB,mBAAmB,EACnB,uBAAuB,EACvB,aAAa,EACd,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,mBAAmB,EAAuB,MAAM,kBAAkB,CAAC;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAEtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,qBAAa,kBAAmB,SAAQ,uBAAuB,CAC7D,gBAAgB,EAChB,mBAAmB,CACpB;IAGG,QAAQ,CAAC,UAAU,CAAC;gBADpB,aAAa,EAAE,aAAa,EACnB,UAAU,CAAC,iCAAqB;IAK3C,MAAM,CAAC,SAAS,EAAE,kBAAkB,CAAC,mBAAmB,CAAC,GAAG,UAAU;IAMhE,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,gBAAgB;;;CASjE"}

package/dist/src/deploy/deploy.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HelloWorldDeployer = void 0;
+const ethers_1 = require("ethers");
 const sdk_1 = require("@hyperlane-xyz/sdk");
 const contracts_1 = require("../app/contracts");
 class HelloWorldDeployer extends sdk_1.HyperlaneRouterDeployer {
@@ -16,7 +17,7 @@ class HelloWorldDeployer extends sdk_1.HyperlaneRouterDeployer {
     async deployContracts(chain, config) {
         const router = await this.deployContract(chain, 'router', [
             config.mailbox,
-            config.interchainGasPaymaster,
+            config.hook ?? ethers_1.ethers.constants.AddressZero,
         ]);
         return {
             router,

package/dist/src/deploy/deploy.js.map

@@ -1 +1 @@
-{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../src/deploy/deploy.ts"],"names":[],"mappings":";;;AAAA,4CAM4B;AAE5B,gDAA4E;AAK5E,MAAa,kBAAmB,SAAQ,6BAGvC;IACC,YACE,aAA4B,EACnB,UAAgC;QAEzC,KAAK,CAAC,aAAa,EAAE,+BAAmB,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;QAFjD,eAAU,GAAV,UAAU,CAAsB;IAG3C,CAAC;IAED,MAAM,CAAC,SAAkD;QACvD,OAAO,SAAS,CAAC,MAAM,CAAC;IAC1B,CAAC;IAED,+CAA+C;IAC/C,mEAAmE;IACnE,KAAK,CAAC,eAAe,CAAC,KAAgB,EAAE,MAAwB;QAC9D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,QAAQ,EAAE;YACxD,MAAM,CAAC,OAAO;YACd,MAAM,CAAC,sBAAsB;SAC9B,CAAC,CAAC;QACH,OAAO;YACL,MAAM;SACP,CAAC;IACJ,CAAC;CACF;AA1BD,gDA0BC"}
+{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../src/deploy/deploy.ts"],"names":[],"mappings":";;;AAAA,mCAAgC;AAEhC,4CAM4B;AAE5B,gDAA4E;AAK5E,MAAa,kBAAmB,SAAQ,6BAGvC;IACC,YACE,aAA4B,EACnB,UAAgC;QAEzC,KAAK,CAAC,aAAa,EAAE,+BAAmB,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;QAFjD,eAAU,GAAV,UAAU,CAAsB;IAG3C,CAAC;IAED,MAAM,CAAC,SAAkD;QACvD,OAAO,SAAS,CAAC,MAAM,CAAC;IAC1B,CAAC;IAED,+CAA+C;IAC/C,mEAAmE;IACnE,KAAK,CAAC,eAAe,CAAC,KAAgB,EAAE,MAAwB;QAC9D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,QAAQ,EAAE;YACxD,MAAM,CAAC,OAAO;YACd,MAAM,CAAC,IAAI,IAAI,eAAM,CAAC,SAAS,CAAC,WAAW;SAC5C,CAAC,CAAC;QACH,OAAO;YACL,MAAM;SACP,CAAC;IACJ,CAAC;CACF;AA1BD,gDA0BC"}

package/dist/src/multiProtocolApp/evmAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"evmAdapter.d.ts","sourceRoot":"","sources":["../../../src/multiProtocolApp/evmAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,mBAAmB,EACnB,gBAAgB,EAChB,qBAAqB,EAEtB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAE/C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAuB,MAAM,UAAU,CAAC;AAE3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAE7C,qBAAa,oBACX,SAAQ,gBACR,YAAW,kBAAkB;aAGX,SAAS,EAAE,SAAS;aACpB,aAAa,EAAE,qBAAqB;aACpC,SAAS,EAAE;QAAE,MAAM,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,OAAO,CAAA;KAAE;gBAFhD,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,qBAAqB,EACpC,SAAS,EAAE;QAAE,MAAM,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,OAAO,CAAA;KAAE;IAK5D,mBAAmB,CACvB,WAAW,EAAE,SAAS,EACtB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,mBAAmB,CAAC;IA2BzB,YAAY,CAChB,WAAW,EAAE,SAAS,EACtB,kBAAkB,EAAE,OAAO,GAC1B,OAAO,CAAC,UAAU,CAAC;IAeb,oBAAoB,IAAI,UAAU;CAM5C"}
+{"version":3,"file":"evmAdapter.d.ts","sourceRoot":"","sources":["../../../src/multiProtocolApp/evmAdapter.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,SAAS,EACT,mBAAmB,EACnB,gBAAgB,EAChB,qBAAqB,EAEtB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAE/C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAuB,MAAM,UAAU,CAAC;AAE3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAE7C,qBAAa,oBACX,SAAQ,gBACR,YAAW,kBAAkB;aAGX,SAAS,EAAE,SAAS;aACpB,aAAa,EAAE,qBAAqB;aACpC,SAAS,EAAE;QAAE,MAAM,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,OAAO,CAAA;KAAE;gBAFhD,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,qBAAqB,EACpC,SAAS,EAAE;QAAE,MAAM,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,OAAO,CAAA;KAAE;IAK5D,mBAAmB,CACvB,WAAW,EAAE,SAAS,EACtB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,mBAAmB,CAAC;IA+BzB,YAAY,CAChB,WAAW,EAAE,SAAS,EACtB,kBAAkB,EAAE,OAAO,GAC1B,OAAO,CAAC,UAAU,CAAC;IAeb,oBAAoB,IAAI,UAAU;CAM5C"}

package/dist/src/multiProtocolApp/evmAdapter.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EvmHelloWorldAdapter = void 0;
+const ethers_1 = require("ethers");
 const sdk_1 = require("@hyperlane-xyz/sdk");
 const types_1 = require("../types");
 class EvmHelloWorldAdapter extends sdk_1.EvmRouterAdapter {
@@ -14,13 +15,14 @@ class EvmHelloWorldAdapter extends sdk_1.EvmRouterAdapter {
         const contract = this.getConnectedContract();
         const toDomain = this.multiProvider.getDomainId(destination);
         const { transactionOverrides } = this.multiProvider.getChainMetadata(this.chainName);
+        const quote = await contract.callStatic.quoteDispatch(toDomain, ethers_1.ethers.utils.toUtf8Bytes(message));
         // apply gas buffer due to https://github.com/hyperlane-xyz/hyperlane-monorepo/issues/634
-        const estimated = await contract.estimateGas.sendHelloWorld(toDomain, message, { ...transactionOverrides, value });
+        const estimated = await contract.estimateGas.sendHelloWorld(toDomain, message, { ...transactionOverrides, value: ethers_1.BigNumber.from(value).add(quote) });
         const gasLimit = estimated.mul(12).div(10);
         const tx = await contract.populateTransaction.sendHelloWorld(toDomain, message, {
             ...transactionOverrides,
             gasLimit,
-            value,
+            value: ethers_1.BigNumber.from(value).add(quote),
         });
         return { transaction: tx, type: sdk_1.ProviderType.EthersV5 };
     }

package/dist/src/multiProtocolApp/evmAdapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"evmAdapter.js","sourceRoot":"","sources":["../../../src/multiProtocolApp/evmAdapter.ts"],"names":[],"mappings":";;;AAAA,4CAM4B;AAI5B,oCAA2D;AAI3D,MAAa,oBACX,SAAQ,sBAAgB;IAGxB,YACkB,SAAoB,EACpB,aAAoC,EACpC,SAAgD;QAEhE,KAAK,CAAC,SAAS,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;QAJ3B,cAAS,GAAT,SAAS,CAAW;QACpB,kBAAa,GAAb,aAAa,CAAuB;QACpC,cAAS,GAAT,SAAS,CAAuC;IAGlE,CAAC;IAED,KAAK,CAAC,mBAAmB,CACvB,WAAsB,EACtB,OAAe,EACf,KAAa;QAEb,MAAM,QAAQ,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC7C,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAC7D,MAAM,EAAE,oBAAoB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAClE,IAAI,CAAC,SAAS,CACf,CAAC;QAEF,yFAAyF;QACzF,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,WAAW,CAAC,cAAc,CACzD,QAAQ,EACR,OAAO,EACP,EAAE,GAAG,oBAAoB,EAAE,KAAK,EAAE,CACnC,CAAC;QACF,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAE3C,MAAM,EAAE,GAAG,MAAM,QAAQ,CAAC,mBAAmB,CAAC,cAAc,CAC1D,QAAQ,EACR,OAAO,EACP;YACE,GAAG,oBAAoB;YACvB,QAAQ;YACR,KAAK;SACN,CACF,CAAC;QACF,OAAO,EAAE,WAAW,EAAE,EAAE,EAAE,IAAI,EAAE,kBAAY,CAAC,QAAQ,EAAE,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,WAAsB,EACtB,kBAA2B;QAE3B,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACpE,MAAM,iBAAiB,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QACtE,MAAM,cAAc,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC;QACnD,MAAM,IAAI,GAAG,MAAM,cAAc,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;QAC5D,MAAM,mBAAmB,GACvB,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;QACtD,MAAM,mBAAmB,GAAG,2BAAmB,CAAC,OAAO,CACrD,kBAAkB,EAClB,mBAAmB,CACpB,CAAC;QACF,MAAM,QAAQ,GAAG,MAAM,mBAAmB,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAChE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC;IAClE,CAAC;IAEQ,oBAAoB;QAC3B,OAAO,2BAAmB,CAAC,OAAO,CAChC,IAAI,CAAC,SAAS,CAAC,MAAM,EACrB,IAAI,CAAC,WAAW,EAAE,CACnB,CAAC;IACJ,CAAC;CACF;AAnED,oDAmEC"}
+{"version":3,"file":"evmAdapter.js","sourceRoot":"","sources":["../../../src/multiProtocolApp/evmAdapter.ts"],"names":[],"mappings":";;;AAAA,mCAA2C;AAE3C,4CAM4B;AAI5B,oCAA2D;AAI3D,MAAa,oBACX,SAAQ,sBAAgB;IAGxB,YACkB,SAAoB,EACpB,aAAoC,EACpC,SAAgD;QAEhE,KAAK,CAAC,SAAS,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;QAJ3B,cAAS,GAAT,SAAS,CAAW;QACpB,kBAAa,GAAb,aAAa,CAAuB;QACpC,cAAS,GAAT,SAAS,CAAuC;IAGlE,CAAC;IAED,KAAK,CAAC,mBAAmB,CACvB,WAAsB,EACtB,OAAe,EACf,KAAa;QAEb,MAAM,QAAQ,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC7C,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAC7D,MAAM,EAAE,oBAAoB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAClE,IAAI,CAAC,SAAS,CACf,CAAC;QAEF,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,UAAU,CAAC,aAAa,CACnD,QAAQ,EACR,eAAM,CAAC,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CAClC,CAAC;QACF,yFAAyF;QACzF,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,WAAW,CAAC,cAAc,CACzD,QAAQ,EACR,OAAO,EACP,EAAE,GAAG,oBAAoB,EAAE,KAAK,EAAE,kBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CACrE,CAAC;QACF,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAE3C,MAAM,EAAE,GAAG,MAAM,QAAQ,CAAC,mBAAmB,CAAC,cAAc,CAC1D,QAAQ,EACR,OAAO,EACP;YACE,GAAG,oBAAoB;YACvB,QAAQ;YACR,KAAK,EAAE,kBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC;SACxC,CACF,CAAC;QACF,OAAO,EAAE,WAAW,EAAE,EAAE,EAAE,IAAI,EAAE,kBAAY,CAAC,QAAQ,EAAE,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,WAAsB,EACtB,kBAA2B;QAE3B,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACpE,MAAM,iBAAiB,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QACtE,MAAM,cAAc,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC;QACnD,MAAM,IAAI,GAAG,MAAM,cAAc,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;QAC5D,MAAM,mBAAmB,GACvB,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;QACtD,MAAM,mBAAmB,GAAG,2BAAmB,CAAC,OAAO,CACrD,kBAAkB,EAClB,mBAAmB,CACpB,CAAC;QACF,MAAM,QAAQ,GAAG,MAAM,mBAAmB,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAChE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC;IAClE,CAAC;IAEQ,oBAAoB;QAC3B,OAAO,2BAAmB,CAAC,OAAO,CAChC,IAAI,CAAC,SAAS,CAAC,MAAM,EACrB,IAAI,CAAC,WAAW,EAAE,CACnB,CAAC;IACJ,CAAC;CACF;AAvED,oDAuEC"}

package/dist/src/scripts/check.js

@@ -14,9 +14,8 @@ async function check() {
     const multiProvider = new sdk_1.MultiProvider(config_1.prodConfigs);
     const contractsMap = (0, sdk_1.attachContractsMap)(deploymentAddresses, contracts_1.helloWorldFactories);
     const core = sdk_1.HyperlaneCore.fromEnvironment('testnet', multiProvider);
-    const igp = sdk_1.HyperlaneIgp.fromEnvironment('testnet', multiProvider);
     const app = new app_1.HelloWorldApp(core, contractsMap, multiProvider);
-    const config = (0, sdk_1.createRouterConfigMap)(ownerAddress, core.contractsMap, igp.contractsMap);
+    const config = core.getRouterConfig(ownerAddress);
     console.info('Starting check');
     const helloWorldChecker = new check_1.HelloWorldChecker(multiProvider, app, config);
     await helloWorldChecker.check();

package/dist/src/scripts/check.js.map

@@ -1 +1 @@
-{"version":3,"file":"check.js","sourceRoot":"","sources":["../../../src/scripts/check.ts"],"names":[],"mappings":";;AAAA,4CAM4B;AAE5B,oCAA2C;AAC3C,gDAAuD;AACvD,2CAAoD;AACpD,6CAA+C;AAE/C,iEAAiE;AACjE,MAAM,mBAAmB,GAAG,EAAE,CAAC;AAE/B,kCAAkC;AAClC,MAAM,YAAY,GAAG,UAAU,CAAC;AAEhC,KAAK,UAAU,KAAK;IAClB,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;IACpC,MAAM,aAAa,GAAG,IAAI,mBAAa,CAAC,oBAAW,CAAC,CAAC;IAErD,MAAM,YAAY,GAAG,IAAA,wBAAkB,EACrC,mBAAmB,EACnB,+BAAmB,CACpB,CAAC;IAEF,MAAM,IAAI,GAAG,mBAAa,CAAC,eAAe,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;IACrE,MAAM,GAAG,GAAG,kBAAY,CAAC,eAAe,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;IACnE,MAAM,GAAG,GAAG,IAAI,mBAAa,CAAC,IAAI,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;IACjE,MAAM,MAAM,GAAG,IAAA,2BAAqB,EAClC,YAAY,EACZ,IAAI,CAAC,YAAY,EACjB,GAAG,CAAC,YAAY,CACjB,CAAC;IAEF,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAC/B,MAAM,iBAAiB,GAAG,IAAI,yBAAiB,CAAC,aAAa,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;IAC5E,MAAM,iBAAiB,CAAC,KAAK,EAAE,CAAC;IAChC,iBAAiB,CAAC,WAAW,EAAE,CAAC;AAClC,CAAC;AAED,KAAK,EAAE;KACJ,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;KAC1C,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC"}
+{"version":3,"file":"check.js","sourceRoot":"","sources":["../../../src/scripts/check.ts"],"names":[],"mappings":";;AAAA,4CAI4B;AAE5B,oCAA2C;AAC3C,gDAAuD;AACvD,2CAAoD;AACpD,6CAA+C;AAE/C,iEAAiE;AACjE,MAAM,mBAAmB,GAAG,EAAE,CAAC;AAE/B,kCAAkC;AAClC,MAAM,YAAY,GAAG,UAAU,CAAC;AAEhC,KAAK,UAAU,KAAK;IAClB,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;IACpC,MAAM,aAAa,GAAG,IAAI,mBAAa,CAAC,oBAAW,CAAC,CAAC;IAErD,MAAM,YAAY,GAAG,IAAA,wBAAkB,EACrC,mBAAmB,EACnB,+BAAmB,CACpB,CAAC;IAEF,MAAM,IAAI,GAAG,mBAAa,CAAC,eAAe,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;IACrE,MAAM,GAAG,GAAG,IAAI,mBAAa,CAAC,IAAI,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;IACjE,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;IAElD,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAC/B,MAAM,iBAAiB,GAAG,IAAI,yBAAiB,CAAC,aAAa,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;IAC5E,MAAM,iBAAiB,CAAC,KAAK,EAAE,CAAC;IAChC,iBAAiB,CAAC,WAAW,EAAE,CAAC;AAClC,CAAC;AAED,KAAK,EAAE;KACJ,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;KAC1C,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC"}

package/dist/src/scripts/deploy.js

@@ -11,8 +11,7 @@ async function main() {
     const multiProvider = new sdk_1.MultiProvider(config_1.prodConfigs);
     multiProvider.setSharedSigner(signer);
     const core = sdk_1.HyperlaneCore.fromEnvironment('testnet', multiProvider);
-    const igp = sdk_1.HyperlaneIgp.fromEnvironment('testnet', multiProvider);
-    const config = (0, sdk_1.createRouterConfigMap)(signer.address, core.contractsMap, igp.contractsMap);
+    const config = core.getRouterConfig(signer.address);
     const deployer = new deploy_1.HelloWorldDeployer(multiProvider);
     const chainToContracts = await deployer.deploy(config);
     const addresses = (0, sdk_1.serializeContractsMap)(chainToContracts);

package/dist/src/scripts/deploy.js.map

@@ -1 +1 @@
-{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../src/scripts/deploy.ts"],"names":[],"mappings":";;AAAA,mCAAgC;AAEhC,4CAM4B;AAE5B,6CAA+C;AAC/C,6CAAsD;AAEtD,KAAK,UAAU,IAAI;IACjB,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAC/B,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC,wCAAwC,CAAC,CAAC;IAEpE,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;IACpC,MAAM,aAAa,GAAG,IAAI,mBAAa,CAAC,oBAAW,CAAC,CAAC;IACrD,aAAa,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IAEtC,MAAM,IAAI,GAAG,mBAAa,CAAC,eAAe,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;IACrE,MAAM,GAAG,GAAG,kBAAY,CAAC,eAAe,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;IACnE,MAAM,MAAM,GAAG,IAAA,2BAAqB,EAClC,MAAM,CAAC,OAAO,EACd,IAAI,CAAC,YAAY,EACjB,GAAG,CAAC,YAAY,CACjB,CAAC;IAEF,MAAM,QAAQ,GAAG,IAAI,2BAAkB,CAAC,aAAa,CAAC,CAAC;IACvD,MAAM,gBAAgB,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACvD,MAAM,SAAS,GAAG,IAAA,2BAAqB,EAAC,gBAAgB,CAAC,CAAC;IAC1D,OAAO,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;IACzC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC;AAC1C,CAAC;AAED,IAAI,EAAE;KACH,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;KAC3C,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC"}
+{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../src/scripts/deploy.ts"],"names":[],"mappings":";;AAAA,mCAAgC;AAEhC,4CAI4B;AAE5B,6CAA+C;AAC/C,6CAAsD;AAEtD,KAAK,UAAU,IAAI;IACjB,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAC/B,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC,wCAAwC,CAAC,CAAC;IAEpE,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;IACpC,MAAM,aAAa,GAAG,IAAI,mBAAa,CAAC,oBAAW,CAAC,CAAC;IACrD,aAAa,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IAEtC,MAAM,IAAI,GAAG,mBAAa,CAAC,eAAe,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;IACrE,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAEpD,MAAM,QAAQ,GAAG,IAAI,2BAAkB,CAAC,aAAa,CAAC,CAAC;IACvD,MAAM,gBAAgB,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACvD,MAAM,SAAS,GAAG,IAAA,2BAAqB,EAAC,gBAAgB,CAAC,CAAC;IAC1D,OAAO,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;IACzC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC;AAC1C,CAAC;AAED,IAAI,EAAE;KACH,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;KAC3C,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC"}

package/dist/src/test/deploy.test.js

@@ -18,7 +18,7 @@ describe('deploy', async () => {
         multiProvider = sdk_1.MultiProvider.createTestMultiProvider({ signer });
         const coreDeployer = new sdk_1.TestCoreDeployer(multiProvider);
         core = await coreDeployer.deployApp();
-        config = await (0, sdk_1.deployTestIgpsAndGetRouterConfig)(multiProvider, signer.address, core.contractsMap);
+        config = core.getRouterConfig(signer.address);
         deployer = new deploy_1.HelloWorldDeployer(multiProvider);
     });
     it('deploys', async () => {

package/dist/src/test/deploy.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"deploy.test.js","sourceRoot":"","sources":["../../../src/test/deploy.test.ts"],"names":[],"mappings":";;AAAA,qCAAmC;AACnC,qCAAiC;AAEjC,4CAO4B;AAE5B,oCAA2C;AAE3C,2CAAoD;AAEpD,6CAAsD;AAEtD,QAAQ,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;IAC5B,IAAI,aAA4B,CAAC;IACjC,IAAI,IAAiB,CAAC;IACtB,IAAI,MAAkC,CAAC;IACvC,IAAI,QAA4B,CAAC;IACjC,IAAI,SAAqD,CAAC;IAC1D,IAAI,GAAkB,CAAC;IAEvB,MAAM,CAAC,KAAK,IAAI,EAAE;QAChB,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,gBAAM,CAAC,UAAU,EAAE,CAAC;QAC3C,aAAa,GAAG,mBAAa,CAAC,uBAAuB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;QAElE,MAAM,YAAY,GAAG,IAAI,sBAAgB,CAAC,aAAa,CAAC,CAAC;QACzD,IAAI,GAAG,MAAM,YAAY,CAAC,SAAS,EAAE,CAAC;QACtC,MAAM,GAAG,MAAM,IAAA,sCAAgC,EAC7C,aAAa,EACb,MAAM,CAAC,OAAO,EACd,IAAI,CAAC,YAAY,CAClB,CAAC;QACF,QAAQ,GAAG,IAAI,2BAAkB,CAAC,aAAa,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE;QACvB,SAAS,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE;QAC1B,SAAS,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC1C,GAAG,GAAG,IAAI,mBAAa,CAAC,IAAI,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;QACtB,MAAM,OAAO,GAAG,IAAI,yBAAiB,CAAC,aAAa,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;QAClE,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;QACtB,OAAO,CAAC,WAAW,EAAE,CAAC;IACxB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"deploy.test.js","sourceRoot":"","sources":["../../../src/test/deploy.test.ts"],"names":[],"mappings":";;AAAA,qCAAmC;AACnC,qCAAiC;AAEjC,4CAM4B;AAE5B,oCAA2C;AAE3C,2CAAoD;AAEpD,6CAAsD;AAEtD,QAAQ,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;IAC5B,IAAI,aAA4B,CAAC;IACjC,IAAI,IAAiB,CAAC;IACtB,IAAI,MAAkC,CAAC;IACvC,IAAI,QAA4B,CAAC;IACjC,IAAI,SAAqD,CAAC;IAC1D,IAAI,GAAkB,CAAC;IAEvB,MAAM,CAAC,KAAK,IAAI,EAAE;QAChB,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,gBAAM,CAAC,UAAU,EAAE,CAAC;QAC3C,aAAa,GAAG,mBAAa,CAAC,uBAAuB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;QAElE,MAAM,YAAY,GAAG,IAAI,sBAAgB,CAAC,aAAa,CAAC,CAAC;QACzD,IAAI,GAAG,MAAM,YAAY,CAAC,SAAS,EAAE,CAAC;QACtC,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC9C,QAAQ,GAAG,IAAI,2BAAkB,CAAC,aAAa,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE;QACvB,SAAS,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE;QAC1B,SAAS,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC1C,GAAG,GAAG,IAAI,mBAAa,CAAC,IAAI,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;QACtB,MAAM,OAAO,GAAG,IAAI,yBAAiB,CAAC,aAAa,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;QAClE,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;QACtB,OAAO,CAAC,WAAW,EAAE,CAAC;IACxB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/src/test/helloworld.test.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const chai_1 = require("chai");
 const hardhat_1 = require("hardhat");
 const sdk_1 = require("@hyperlane-xyz/sdk");
+const utils_1 = require("@hyperlane-xyz/utils");
 const deploy_1 = require("../deploy/deploy");
-const types_1 = require("../types");
 describe('HelloWorld', async () => {
     const localChain = sdk_1.Chains.test1;
     const remoteChain = sdk_1.Chains.test2;
@@ -13,39 +13,37 @@ describe('HelloWorld', async () => {
     let signer;
     let local;
     let remote;
-    let localIgp;
     let multiProvider;
     let coreApp;
     let config;
     before(async () => {
         [signer] = await hardhat_1.ethers.getSigners();
         multiProvider = sdk_1.MultiProvider.createTestMultiProvider({ signer });
+        coreApp = await new sdk_1.TestCoreDeployer(multiProvider).deployApp();
+        config = coreApp.getRouterConfig(signer.address);
         localDomain = multiProvider.getDomainId(localChain);
         remoteDomain = multiProvider.getDomainId(remoteChain);
-        const coreDeployer = new sdk_1.TestCoreDeployer(multiProvider);
-        const coreContractsMaps = await coreDeployer.deploy();
-        coreApp = new sdk_1.TestCoreApp(coreContractsMaps, multiProvider);
-        config = await (0, sdk_1.deployTestIgpsAndGetRouterConfig)(multiProvider, signer.address, coreContractsMaps);
     });
     beforeEach(async () => {
         const helloWorld = new deploy_1.HelloWorldDeployer(multiProvider);
         const contracts = await helloWorld.deploy(config);
         local = contracts[localChain].router;
         remote = contracts[remoteChain].router;
-        localIgp = types_1.IInterchainGasPaymaster__factory.connect(config[localChain].interchainGasPaymaster, multiProvider.getProvider(localChain));
         // The all counts start empty
         (0, chai_1.expect)(await local.sent()).to.equal(0);
         (0, chai_1.expect)(await local.received()).to.equal(0);
         (0, chai_1.expect)(await remote.sent()).to.equal(0);
         (0, chai_1.expect)(await remote.received()).to.equal(0);
     });
-    async function quoteGasPayment(fromRouter, destinationDomain, igp) {
-        const handleGasAmount = await fromRouter.HANDLE_GAS_AMOUNT();
-        return igp.quoteGasPayment(destinationDomain, handleGasAmount);
+    async function quoteGasPayment(body) {
+        return coreApp
+            .getContracts(localChain)
+            .mailbox['quoteDispatch(uint32,bytes32,bytes)'](remoteDomain, (0, utils_1.addressToBytes32)(remote.address), Buffer.from(body));
     }
     it('sends a message', async () => {
-        await (0, chai_1.expect)(local.sendHelloWorld(remoteDomain, 'Hello', {
-            value: await quoteGasPayment(local, remoteDomain, localIgp),
+        const body = 'Hello';
+        await (0, chai_1.expect)(local.sendHelloWorld(remoteDomain, body, {
+            value: await quoteGasPayment(body),
         })).to.emit(local, 'SentHelloWorld');
         // The sent counts are correct
         (0, chai_1.expect)(await local.sent()).to.equal(1);
@@ -54,13 +52,15 @@ describe('HelloWorld', async () => {
         (0, chai_1.expect)(await local.received()).to.equal(0);
     });
     it('reverts if there is insufficient payment', async () => {
-        await (0, chai_1.expect)(local.sendHelloWorld(remoteDomain, 'Hello', {
+        const body = 'Hello';
+        await (0, chai_1.expect)(local.sendHelloWorld(remoteDomain, body, {
             value: 0,
-        })).to.be.revertedWith('insufficient interchain gas payment');
+        })).to.be.revertedWith('StaticProtocolFee: insufficient protocol fee');
     });
     it('handles a message', async () => {
-        await local.sendHelloWorld(remoteDomain, 'World', {
-            value: await quoteGasPayment(local, remoteDomain, localIgp),
+        const body = 'World';
+        await local.sendHelloWorld(remoteDomain, body, {
+            value: await quoteGasPayment(body),
         });
         // Mock processing of the message by Hyperlane
         await coreApp.processOutboundMessages(localChain);

package/dist/src/test/helloworld.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"helloworld.test.js","sourceRoot":"","sources":["../../../src/test/helloworld.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"helloworld.test.js","sourceRoot":"","sources":["../../../src/test/helloworld.test.ts"],"names":[],"mappings":"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"}