@hyperlane-xyz/sdk 1.5.3 → 1.5.5-beta0

package/dist/router/HyperlaneRouterDeployer.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HyperlaneRouterDeployer = void 0;
-const ethers_1 = require("ethers");
 const core_1 = require("@hyperlane-xyz/core");
 const utils_1 = require("@hyperlane-xyz/utils");
 const contracts_1 = require("../contracts/contracts");
@@ -15,43 +14,41 @@ class HyperlaneRouterDeployer extends HyperlaneDeployer_1.HyperlaneDeployer {
         for (const [local, config] of Object.entries(configMap)) {
             this.logger(`Checking config for ${local}...`);
             const signerOrProvider = this.multiProvider.getSignerOrProvider(local);
-            const localIgp = core_1.IInterchainGasPaymaster__factory.connect(config.interchainGasPaymaster, signerOrProvider);
             const localMailbox = core_1.Mailbox__factory.connect(config.mailbox, signerOrProvider);
-            let localIsm;
-            if (!config.interchainSecurityModule ||
-                config.interchainSecurityModule === ethers_1.ethers.constants.AddressZero) {
-                localIsm = await localMailbox.defaultIsm();
-            }
-            else {
-                localIsm = config.interchainSecurityModule;
-            }
+            const localHook = core_1.IPostDispatchHook__factory.connect(config.hook ?? (await localMailbox.defaultHook()), signerOrProvider);
+            const deployer = await this.multiProvider.getSignerAddress(local);
             const remotes = Object.keys(configMap).filter((c) => c !== local);
             for (const remote of remotes) {
-                this.logger(`Checking origin ${remote}...`);
-                // Try to confirm that the IGP supports delivery to all remotes
+                const origin = this.multiProvider.getDomainId(local);
+                const destination = this.multiProvider.getDomainId(remote);
+                const message = (0, utils_1.formatMessage)(0, 0, origin, deployer, destination, deployer, '');
+                // Try to confirm that the hook supports delivery to all remotes
+                this.logger(`Checking ${local} => ${remote} hook...`);
                 try {
-                    await localIgp.quoteGasPayment(this.multiProvider.getDomainId(remote), 1);
+                    await localHook.quoteDispatch('', message);
                 }
                 catch (e) {
-                    throw new Error(`The specified or default IGP with address ${localIgp.address} on ` +
+                    throw new Error(`The specified or default hook with address ${localHook.address} on ` +
                         `${local} is not configured to deliver messages to ${remote}, ` +
                         `did you mean to specify a different one?`);
                 }
+                const localIsm = config.interchainSecurityModule ?? (await localMailbox.defaultIsm());
                 // Try to confirm that the specified or default ISM can verify messages to all remotes
                 const canVerify = await (0, HyperlaneIsmFactory_1.moduleCanCertainlyVerify)(localIsm, this.multiProvider, remote, local);
                 if (!canVerify) {
-                    throw new Error(`The specified or default ISM with address ${localIsm} on ${local} ` +
+                    const ismString = JSON.stringify(localIsm);
+                    throw new Error(`The specified or default ISM ${ismString} on ${local} ` +
                         `cannot verify messages from ${remote}, did you forget to ` +
                         `specify an ISM, or mean to specify a different one?`);
                 }
             }
         }
     }
-    async initConnectionClients(contractsMap, configMap) {
+    async initMailboxClients(contractsMap, configMap) {
         for (const chain of Object.keys(contractsMap)) {
             const contracts = contractsMap[chain];
             const config = configMap[chain];
-            await super.initConnectionClient(chain, this.router(contracts), config);
+            await super.initMailboxClient(chain, this.router(contracts), config);
         }
     }
     async enrollRemoteRouters(deployedContractsMap, _, foreignRouters = {}) {
@@ -102,7 +99,7 @@ class HyperlaneRouterDeployer extends HyperlaneDeployer_1.HyperlaneDeployer {
         const foreignDeployments = (0, utils_1.objFilter)((0, utils_1.objMap)(configMap, (_, config) => config.foreignDeployment), (_chainName, foreignDeployment) => foreignDeployment !== undefined);
         const deployedContractsMap = await super.deploy(configMapToDeploy);
         await this.enrollRemoteRouters(deployedContractsMap, configMap, foreignDeployments);
-        await this.initConnectionClients(deployedContractsMap, configMap);
+        await this.initMailboxClients(deployedContractsMap, configMap);
         await this.transferOwnership(deployedContractsMap, configMap);
         this.logger(`Finished deploying router contracts for all chains.`);
         return deployedContractsMap;

package/dist/router/HyperlaneRouterDeployer.js.map

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

package/dist/router/ProxiedRouterChecker.js

@@ -14,7 +14,7 @@ class ProxiedRouterChecker extends HyperlaneRouterChecker_1.HyperlaneRouterCheck
         return super.checkOwnership(chain, config.owner, ownableOverrides);
     }
     async checkChain(chain) {
-        await super.checkHyperlaneConnectionClient(chain);
+        await super.checkMailboxClient(chain);
         await super.checkEnrolledRouters(chain);
         await this.checkProxiedContracts(chain);
         await this.checkOwnership(chain);

package/dist/router/ProxiedRouterChecker.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProxiedRouterChecker.js","sourceRoot":"","sources":["../../src/router/ProxiedRouterChecker.ts"],"names":[],"mappings":";;;AAEA,qEAAkE;AAIlE,MAAsB,oBAIpB,SAAQ,+CAA8C;IACtD,KAAK,CAAC,cAAc,CAAC,KAAgB;QACnC,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACrC,IAAI,gBAAgB,GAAG,EAAE,CAAC;QAC1B,IAAI,MAAM,CAAC,QAAQ,EAAE;YACnB,gBAAgB,GAAG;gBACjB,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,kBAAkB;aAC5D,CAAC;SACH;QAED,OAAO,KAAK,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;IACrE,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,KAAgB;QAC/B,MAAM,KAAK,CAAC,8BAA8B,CAAC,KAAK,CAAC,CAAC;QAClD,MAAM,KAAK,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;QACxC,MAAM,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;QACxC,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC;CACF;AAvBD,oDAuBC"}
+{"version":3,"file":"ProxiedRouterChecker.js","sourceRoot":"","sources":["../../src/router/ProxiedRouterChecker.ts"],"names":[],"mappings":";;;AAEA,qEAAkE;AAIlE,MAAsB,oBAIpB,SAAQ,+CAA8C;IACtD,KAAK,CAAC,cAAc,CAAC,KAAgB;QACnC,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACrC,IAAI,gBAAgB,GAAG,EAAE,CAAC;QAC1B,IAAI,MAAM,CAAC,QAAQ,EAAE;YACnB,gBAAgB,GAAG;gBACjB,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,kBAAkB;aAC5D,CAAC;SACH;QAED,OAAO,KAAK,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;IACrE,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,KAAgB;QAC/B,MAAM,KAAK,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;QACtC,MAAM,KAAK,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;QACxC,MAAM,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;QACxC,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC;CACF;AAvBD,oDAuBC"}

package/dist/router/RouterApps.d.ts

@@ -1,18 +1,12 @@
-import debug from 'debug';
 import type { BigNumber } from 'ethers';
 import { GasRouter, Router } from '@hyperlane-xyz/core';
 import { Address } from '@hyperlane-xyz/utils';
 import { HyperlaneApp } from '../app/HyperlaneApp';
-import { HyperlaneContracts, HyperlaneContractsMap, HyperlaneFactories } from '../contracts/types';
-import { MultiProvider } from '../providers/MultiProvider';
+import { HyperlaneContracts, HyperlaneFactories } from '../contracts/types';
 import { ChainMap, ChainName } from '../types';
 export { Router } from '@hyperlane-xyz/core';
 export declare abstract class RouterApp<Factories extends HyperlaneFactories> extends HyperlaneApp<Factories> {
-    readonly foreignDeployments: ChainMap<Address>;
-    constructor(contractsMap: HyperlaneContractsMap<Factories>, multiProvider: MultiProvider, logger?: debug.Debugger, foreignDeployments?: ChainMap<Address>);
     abstract router(contracts: HyperlaneContracts<Factories>): Router;
-    routerAddress(chainName: string): Address;
-    remoteChains(chainName: string): string[];
     getSecurityModules(): Promise<ChainMap<Address>>;
     getOwners(): Promise<ChainMap<Address>>;
 }

package/dist/router/RouterApps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RouterApps.d.ts","sourceRoot":"","sources":["../../src/router/RouterApps.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAExC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EACL,OAAO,EAIR,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE/C,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAE7C,8BAAsB,SAAS,CAC7B,SAAS,SAAS,kBAAkB,CACpC,SAAQ,YAAY,CAAC,SAAS,CAAC;IAK7B,QAAQ,CAAC,kBAAkB,EAAE,QAAQ,CAAC,OAAO,CAAC;gBAH9C,YAAY,EAAE,qBAAqB,CAAC,SAAS,CAAC,EAC9C,aAAa,EAAE,aAAa,EAC5B,MAAM,CAAC,EAAE,KAAK,CAAC,QAAQ,EACd,kBAAkB,GAAE,QAAQ,CAAC,OAAO,CAAM;IAKrD,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,kBAAkB,CAAC,SAAS,CAAC,GAAG,MAAM;IAEjE,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAUhC,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE;IAOlD,kBAAkB,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAQhD,SAAS,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;CAKxC;AAED,8BAAsB,YAAY,CAChC,SAAS,SAAS,kBAAkB,EACpC,CAAC,SAAS,SAAS,CACnB,SAAQ,SAAS,CAAC,SAAS,CAAC;IAC5B,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,kBAAkB,CAAC,SAAS,CAAC,GAAG,CAAC;IAEtD,eAAe,CACnB,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,SAAS,GACrB,OAAO,CAAC,SAAS,CAAC;CAKtB"}
+{"version":3,"file":"RouterApps.d.ts","sourceRoot":"","sources":["../../src/router/RouterApps.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAExC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,OAAO,EAAyB,MAAM,sBAAsB,CAAC;AAEtE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAC5E,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE/C,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAE7C,8BAAsB,SAAS,CAC7B,SAAS,SAAS,kBAAkB,CACpC,SAAQ,YAAY,CAAC,SAAS,CAAC;IAC/B,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,kBAAkB,CAAC,SAAS,CAAC,GAAG,MAAM;IAEjE,kBAAkB,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAQhD,SAAS,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;CAKxC;AAED,8BAAsB,YAAY,CAChC,SAAS,SAAS,kBAAkB,EACpC,CAAC,SAAS,SAAS,CACnB,SAAQ,SAAS,CAAC,SAAS,CAAC;IAC5B,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,kBAAkB,CAAC,SAAS,CAAC,GAAG,CAAC;IAEtD,eAAe,CACnB,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,SAAS,GACrB,OAAO,CAAC,SAAS,CAAC;CAKtB"}

package/dist/router/RouterApps.js

@@ -4,23 +4,6 @@ exports.GasRouterApp = exports.RouterApp = void 0;
 const utils_1 = require("@hyperlane-xyz/utils");
 const HyperlaneApp_1 = require("../app/HyperlaneApp");
 class RouterApp extends HyperlaneApp_1.HyperlaneApp {
-    constructor(contractsMap, multiProvider, logger, foreignDeployments = {}) {
-        super(contractsMap, multiProvider, logger);
-        this.foreignDeployments = foreignDeployments;
-    }
-    routerAddress(chainName) {
-        if (this.multiProvider.getChainMetadata(chainName).protocol ===
-            utils_1.ProtocolType.Ethereum) {
-            return this.router(this.contractsMap[chainName]).address;
-        }
-        return this.foreignDeployments[chainName];
-    }
-    remoteChains(chainName) {
-        return [
-            ...super.remoteChains(chainName),
-            ...Object.keys(this.foreignDeployments),
-        ].filter((chain) => chain !== chainName);
-    }
     getSecurityModules() {
         return (0, utils_1.promiseObjAll)((0, utils_1.objMap)(this.chainMap, (_, contracts) => this.router(contracts).interchainSecurityModule()));
     }

package/dist/router/RouterApps.js.map

@@ -1 +1 @@
-{"version":3,"file":"RouterApps.js","sourceRoot":"","sources":["../../src/router/RouterApps.ts"],"names":[],"mappings":";;;AAIA,gDAK8B;AAE9B,sDAAmD;AAWnD,MAAsB,SAEpB,SAAQ,2BAAuB;IAC/B,YACE,YAA8C,EAC9C,aAA4B,EAC5B,MAAuB,EACd,qBAAwC,EAAE;QAEnD,KAAK,CAAC,YAAY,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;QAFlC,uBAAkB,GAAlB,kBAAkB,CAAwB;IAGrD,CAAC;IAID,aAAa,CAAC,SAAiB;QAC7B,IACE,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,QAAQ;YACvD,oBAAY,CAAC,QAAQ,EACrB;YACA,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC;SAC1D;QACD,OAAO,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAC5C,CAAC;IAEQ,YAAY,CAAC,SAAiB;QACrC,OAAO;YACL,GAAG,KAAK,CAAC,YAAY,CAAC,SAAS,CAAC;YAChC,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC;SACxC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC;IAC3C,CAAC;IAED,kBAAkB;QAChB,OAAO,IAAA,qBAAa,EAClB,IAAA,cAAM,EAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,CACrC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,wBAAwB,EAAE,CAClD,CACF,CAAC;IACJ,CAAC;IAED,SAAS;QACP,OAAO,IAAA,qBAAa,EAClB,IAAA,cAAM,EAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,CAAC,CACxE,CAAC;IACJ,CAAC;CACF;AA5CD,8BA4CC;AAED,MAAsB,YAGpB,SAAQ,SAAoB;IAG5B,KAAK,CAAC,eAAe,CACnB,MAAiB,EACjB,WAAsB;QAEtB,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,eAAe,CACrD,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,WAAW,CAAC,CAC5C,CAAC;IACJ,CAAC;CACF;AAdD,oCAcC"}
+{"version":3,"file":"RouterApps.js","sourceRoot":"","sources":["../../src/router/RouterApps.ts"],"names":[],"mappings":";;;AAGA,gDAAsE;AAEtE,sDAAmD;AAMnD,MAAsB,SAEpB,SAAQ,2BAAuB;IAG/B,kBAAkB;QAChB,OAAO,IAAA,qBAAa,EAClB,IAAA,cAAM,EAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,CACrC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,wBAAwB,EAAE,CAClD,CACF,CAAC;IACJ,CAAC;IAED,SAAS;QACP,OAAO,IAAA,qBAAa,EAClB,IAAA,cAAM,EAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,CAAC,CACxE,CAAC;IACJ,CAAC;CACF;AAlBD,8BAkBC;AAED,MAAsB,YAGpB,SAAQ,SAAoB;IAG5B,KAAK,CAAC,eAAe,CACnB,MAAiB,EACjB,WAAsB;QAEtB,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,eAAe,CACrD,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,WAAW,CAAC,CAC5C,CAAC;IACJ,CAAC;CACF;AAdD,oCAcC"}

package/dist/router/types.d.ts

@@ -1,4 +1,4 @@
-import { HyperlaneConnectionClient, ProxyAdmin__factory, Router, TimelockController__factory } from '@hyperlane-xyz/core';
+import { MailboxClient, ProxyAdmin__factory, TimelockController__factory } from '@hyperlane-xyz/core';
 import type { Address } from '@hyperlane-xyz/utils';
 import { HyperlaneFactories } from '../contracts/types';
 import { UpgradeConfig } from '../deploy/proxy';
@@ -13,7 +13,7 @@ export type OwnableConfig = {
 export type ForeignDeploymentConfig = {
     foreignDeployment?: Address;
 };
-export type RouterConfig = ConnectionClientConfig & OwnableConfig & ForeignDeploymentConfig;
+export type RouterConfig = MailboxClientConfig & OwnableConfig & ForeignDeploymentConfig;
 export type ProxiedRouterConfig = RouterConfig & Partial<UpgradeConfig>;
 export type GasConfig = {
     gas: number;
@@ -24,31 +24,22 @@ export type ProxiedFactories = HyperlaneFactories & {
     timelockController: TimelockController__factory;
 };
 export declare const proxiedFactories: ProxiedFactories;
-export type ConnectionClientConfig = {
+type HookConfig = Address;
+export type MailboxClientConfig = {
     mailbox: Address;
-    interchainGasPaymaster: Address;
-    interchainSecurityModule?: Address | IsmConfig;
+    hook?: HookConfig;
+    interchainSecurityModule?: IsmConfig;
 };
-export declare enum ConnectionClientViolationType {
-    InterchainSecurityModule = "ConnectionClientIsm",
-    Mailbox = "ConnectionClientMailbox",
-    InterchainGasPaymaster = "ConnectionClientIgp"
+export declare enum ClientViolationType {
+    InterchainSecurityModule = "ClientIsm",
+    Mailbox = "ClientMailbox",
+    Hook = "ClientHook"
 }
-export interface ConnectionClientViolation extends CheckerViolation {
-    type: ConnectionClientViolationType;
-    contract: HyperlaneConnectionClient;
-    actual: string;
-    expected: string;
-    description?: string;
-}
-export declare enum RouterViolationType {
-    EnrolledRouter = "EnrolledRouter"
-}
-export interface RouterViolation extends CheckerViolation {
-    type: RouterViolationType.EnrolledRouter;
-    remoteChain: string;
-    contract: Router;
+export interface ClientViolation extends CheckerViolation {
+    type: ClientViolationType;
+    contract: MailboxClient;
     actual: string;
     expected: string;
 }
+export {};
 //# sourceMappingURL=types.d.ts.map

package/dist/router/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/router/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,EACzB,mBAAmB,EACnB,MAAM,EACN,2BAA2B,EAC5B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,sBAAsB,GAC/C,aAAa,GACb,uBAAuB,CAAC;AAE1B,MAAM,MAAM,mBAAmB,GAAG,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAExE,MAAM,MAAM,SAAS,GAAG;IACtB,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,YAAY,GAAG,SAAS,CAAC;AAEvD,MAAM,MAAM,gBAAgB,GAAG,kBAAkB,GAAG;IAClD,UAAU,EAAE,mBAAmB,CAAC;IAChC,kBAAkB,EAAE,2BAA2B,CAAC;CACjD,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,gBAG9B,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,OAAO,EAAE,OAAO,CAAC;IACjB,sBAAsB,EAAE,OAAO,CAAC;IAChC,wBAAwB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAChD,CAAC;AAEF,oBAAY,6BAA6B;IACvC,wBAAwB,wBAAwB;IAChD,OAAO,4BAA4B;IACnC,sBAAsB,wBAAwB;CAC/C;AAED,MAAM,WAAW,yBAA0B,SAAQ,gBAAgB;IACjE,IAAI,EAAE,6BAA6B,CAAC;IACpC,QAAQ,EAAE,yBAAyB,CAAC;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,oBAAY,mBAAmB;IAC7B,cAAc,mBAAmB;CAClC;AAED,MAAM,WAAW,eAAgB,SAAQ,gBAAgB;IACvD,IAAI,EAAE,mBAAmB,CAAC,cAAc,CAAC;IACzC,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/router/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,mBAAmB,EACnB,2BAA2B,EAC5B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,mBAAmB,GAC5C,aAAa,GACb,uBAAuB,CAAC;AAE1B,MAAM,MAAM,mBAAmB,GAAG,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAExE,MAAM,MAAM,SAAS,GAAG;IACtB,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,YAAY,GAAG,SAAS,CAAC;AAEvD,MAAM,MAAM,gBAAgB,GAAG,kBAAkB,GAAG;IAClD,UAAU,EAAE,mBAAmB,CAAC;IAChC,kBAAkB,EAAE,2BAA2B,CAAC;CACjD,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,gBAG9B,CAAC;AAGF,KAAK,UAAU,GAAG,OAAO,CAAC;AAE1B,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,wBAAwB,CAAC,EAAE,SAAS,CAAC;CACtC,CAAC;AAEF,oBAAY,mBAAmB;IAC7B,wBAAwB,cAAc;IACtC,OAAO,kBAAkB;IACzB,IAAI,eAAe;CACpB;AAED,MAAM,WAAW,eAAgB,SAAQ,gBAAgB;IACvD,IAAI,EAAE,mBAAmB,CAAC;IAC1B,QAAQ,EAAE,aAAa,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB"}

package/dist/router/types.js

@@ -1,19 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RouterViolationType = exports.ConnectionClientViolationType = exports.proxiedFactories = void 0;
+exports.ClientViolationType = exports.proxiedFactories = void 0;
 const core_1 = require("@hyperlane-xyz/core");
 exports.proxiedFactories = {
     proxyAdmin: new core_1.ProxyAdmin__factory(),
     timelockController: new core_1.TimelockController__factory(),
 };
-var ConnectionClientViolationType;
-(function (ConnectionClientViolationType) {
-    ConnectionClientViolationType["InterchainSecurityModule"] = "ConnectionClientIsm";
-    ConnectionClientViolationType["Mailbox"] = "ConnectionClientMailbox";
-    ConnectionClientViolationType["InterchainGasPaymaster"] = "ConnectionClientIgp";
-})(ConnectionClientViolationType || (exports.ConnectionClientViolationType = ConnectionClientViolationType = {}));
-var RouterViolationType;
-(function (RouterViolationType) {
-    RouterViolationType["EnrolledRouter"] = "EnrolledRouter";
-})(RouterViolationType || (exports.RouterViolationType = RouterViolationType = {}));
+var ClientViolationType;
+(function (ClientViolationType) {
+    ClientViolationType["InterchainSecurityModule"] = "ClientIsm";
+    ClientViolationType["Mailbox"] = "ClientMailbox";
+    ClientViolationType["Hook"] = "ClientHook";
+})(ClientViolationType || (exports.ClientViolationType = ClientViolationType = {}));
 //# sourceMappingURL=types.js.map

package/dist/router/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/router/types.ts"],"names":[],"mappings":";;;AAAA,8CAK6B;AAqChB,QAAA,gBAAgB,GAAqB;IAChD,UAAU,EAAE,IAAI,0BAAmB,EAAE;IACrC,kBAAkB,EAAE,IAAI,kCAA2B,EAAE;CACtD,CAAC;AAQF,IAAY,6BAIX;AAJD,WAAY,6BAA6B;IACvC,iFAAgD,CAAA;IAChD,oEAAmC,CAAA;IACnC,+EAA8C,CAAA;AAChD,CAAC,EAJW,6BAA6B,6CAA7B,6BAA6B,QAIxC;AAUD,IAAY,mBAEX;AAFD,WAAY,mBAAmB;IAC7B,wDAAiC,CAAA;AACnC,CAAC,EAFW,mBAAmB,mCAAnB,mBAAmB,QAE9B"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/router/types.ts"],"names":[],"mappings":";;;AAAA,8CAI6B;AAqChB,QAAA,gBAAgB,GAAqB;IAChD,UAAU,EAAE,IAAI,0BAAmB,EAAE;IACrC,kBAAkB,EAAE,IAAI,kCAA2B,EAAE;CACtD,CAAC;AAWF,IAAY,mBAIX;AAJD,WAAY,mBAAmB;IAC7B,6DAAsC,CAAA;IACtC,gDAAyB,CAAA;IACzB,0CAAmB,CAAA;AACrB,CAAC,EAJW,mBAAmB,mCAAnB,mBAAmB,QAI9B"}

package/dist/test/testUtils.d.ts

@@ -4,13 +4,11 @@ import { CoreFactories } from '../core/contracts';
 import { CoreConfig } from '../core/types';
 import { IgpFactories } from '../gas/contracts';
 import { CoinGeckoInterface, CoinGeckoResponse, CoinGeckoSimpleInterface, CoinGeckoSimplePriceParams } from '../gas/token-prices';
-import { MultiProvider } from '../providers/MultiProvider';
 import { RouterConfig } from '../router/types';
 import { ChainMap, ChainName } from '../types';
 export declare function randomInt(max: number, min?: number): number;
 export declare function randomAddress(): Address;
 export declare function createRouterConfigMap(owner: Address, coreContracts: HyperlaneContractsMap<CoreFactories>, igpContracts: HyperlaneContractsMap<IgpFactories>): ChainMap<RouterConfig>;
-export declare function deployTestIgpsAndGetRouterConfig(multiProvider: MultiProvider, owner: Address, coreContracts: HyperlaneContractsMap<CoreFactories>): Promise<ChainMap<RouterConfig>>;
 export declare function testCoreConfig(chains: ChainName[]): ChainMap<CoreConfig>;
 export declare class MockCoinGecko implements CoinGeckoInterface {
     private tokenPrices;

package/dist/test/testUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"testUtils.d.ts","sourceRoot":"","sources":["../../src/test/testUtils.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAU,MAAM,sBAAsB,CAAC;AAGvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EACL,kBAAkB,EAClB,iBAAiB,EACjB,wBAAwB,EACxB,0BAA0B,EAC3B,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE/C,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,SAAI,GAAG,MAAM,CAEtD;AAED,wBAAgB,aAAa,IAAI,OAAO,CAEvC;AAED,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,OAAO,EACd,aAAa,EAAE,qBAAqB,CAAC,aAAa,CAAC,EACnD,YAAY,EAAE,qBAAqB,CAAC,YAAY,CAAC,GAChD,QAAQ,CAAC,YAAY,CAAC,CASxB;AAED,wBAAsB,gCAAgC,CACpD,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,OAAO,EACd,aAAa,EAAE,qBAAqB,CAAC,aAAa,CAAC,GAClD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAejC;AAKD,wBAAgB,cAAc,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,QAAQ,CAAC,UAAU,CAAC,CAqCxE;AAGD,qBAAa,aAAc,YAAW,kBAAkB;IAEtD,OAAO,CAAC,WAAW,CAAyB;IAE5C,OAAO,CAAC,IAAI,CAA0B;;IAOtC,KAAK,CAAC,MAAM,EAAE,0BAA0B,GAAG,iBAAiB;IAkB5D,IAAI,MAAM,IAAI,wBAAwB,CAErC;IAED,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAKpD,OAAO,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,GAAG,IAAI;CAI/C"}
+{"version":3,"file":"testUtils.d.ts","sourceRoot":"","sources":["../../src/test/testUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAU,MAAM,sBAAsB,CAAC;AAGvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EACL,kBAAkB,EAClB,iBAAiB,EACjB,wBAAwB,EACxB,0BAA0B,EAC3B,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE/C,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,SAAI,GAAG,MAAM,CAEtD;AAED,wBAAgB,aAAa,IAAI,OAAO,CAEvC;AAED,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,OAAO,EACd,aAAa,EAAE,qBAAqB,CAAC,aAAa,CAAC,EACnD,YAAY,EAAE,qBAAqB,CAAC,YAAY,CAAC,GAChD,QAAQ,CAAC,YAAY,CAAC,CASxB;AAKD,wBAAgB,cAAc,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,QAAQ,CAAC,UAAU,CAAC,CA+CxE;AAGD,qBAAa,aAAc,YAAW,kBAAkB;IAEtD,OAAO,CAAC,WAAW,CAAyB;IAE5C,OAAO,CAAC,IAAI,CAA0B;;IAOtC,KAAK,CAAC,MAAM,EAAE,0BAA0B,GAAG,iBAAiB;IAkB5D,IAAI,MAAM,IAAI,wBAAwB,CAErC;IAED,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAKpD,OAAO,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,GAAG,IAAI;CAI/C"}

package/dist/test/testUtils.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MockCoinGecko = exports.testCoreConfig = exports.deployTestIgpsAndGetRouterConfig = exports.createRouterConfigMap = exports.randomAddress = exports.randomInt = void 0;
+exports.MockCoinGecko = exports.testCoreConfig = exports.createRouterConfigMap = exports.randomAddress = exports.randomInt = void 0;
 const ethers_1 = require("ethers");
-const core_1 = require("@hyperlane-xyz/core");
 const utils_1 = require("@hyperlane-xyz/utils");
 const chainMetadata_1 = require("../consts/chainMetadata");
-const types_1 = require("../ism/types");
+const types_1 = require("../hook/types");
+const types_2 = require("../ism/types");
 function randomInt(max, min = 0) {
     return Math.floor(Math.random() * (max - min)) + min;
 }
@@ -24,26 +24,11 @@ function createRouterConfigMap(owner, coreContracts, igpContracts) {
     });
 }
 exports.createRouterConfigMap = createRouterConfigMap;
-async function deployTestIgpsAndGetRouterConfig(multiProvider, owner, coreContracts) {
-    const igps = {};
-    for (const chain of multiProvider.getKnownChainNames()) {
-        const factory = new core_1.TestInterchainGasPaymaster__factory(multiProvider.getSigner(chain));
-        igps[chain] = await factory.deploy(owner);
-    }
-    return (0, utils_1.objMap)(coreContracts, (chain, contracts) => {
-        return {
-            owner,
-            mailbox: contracts.mailbox.address,
-            interchainGasPaymaster: igps[chain].address,
-        };
-    });
-}
-exports.deployTestIgpsAndGetRouterConfig = deployTestIgpsAndGetRouterConfig;
 const nonZeroAddress = ethers_1.ethers.constants.AddressZero.replace('00', '01');
 // dummy config as TestInbox and TestOutbox do not use deployed ISM
 function testCoreConfig(chains) {
     const multisigIsm = {
-        type: types_1.ModuleType.MERKLE_ROOT_MULTISIG,
+        type: types_2.ModuleType.MERKLE_ROOT_MULTISIG,
         validators: [nonZeroAddress],
         threshold: 1,
     };
@@ -52,12 +37,22 @@ function testCoreConfig(chains) {
         {
             owner: nonZeroAddress,
             defaultIsm: {
-                type: types_1.ModuleType.ROUTING,
+                type: types_2.ModuleType.ROUTING,
                 owner: nonZeroAddress,
                 domains: Object.fromEntries(chains
                     .filter((c) => c !== local)
                     .map((remote) => [remote, multisigIsm])),
             },
+            defaultHook: {
+                type: types_1.HookType.MERKLE_TREE,
+            },
+            requiredHook: {
+                type: types_1.HookType.PROTOCOL_FEE,
+                maxProtocolFee: ethers_1.ethers.utils.parseUnits('1', 'gwei'),
+                protocolFee: ethers_1.BigNumber.from(1),
+                beneficiary: nonZeroAddress,
+                owner: nonZeroAddress,
+            },
         },
     ]));
     // test partial timelock config

package/dist/test/testUtils.js.map

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

package/dist/token/adapters/EvmTokenAdapter.d.ts

@@ -0,0 +1,65 @@
+/// <reference types="node" />
+import { PopulatedTransaction } from 'ethers';
+import { ERC20, HypERC20 } from '@hyperlane-xyz/core';
+import { Address, Domain } from '@hyperlane-xyz/utils';
+import { BaseEvmAdapter } from '../../app/MultiProtocolApp';
+import { MultiProtocolProvider } from '../../providers/MultiProtocolProvider';
+import { ChainName } from '../../types';
+import { MinimalTokenMetadata } from '../config';
+import { IHypTokenAdapter, ITokenAdapter, TransferParams, TransferRemoteParams } from './ITokenAdapter';
+export declare class EvmNativeTokenAdapter extends BaseEvmAdapter implements ITokenAdapter {
+    getBalance(address: Address): Promise<string>;
+    getMetadata(): Promise<MinimalTokenMetadata>;
+    populateApproveTx(_params: TransferParams): Promise<PopulatedTransaction>;
+    populateTransferTx({ weiAmountOrId, recipient, }: TransferParams): Promise<PopulatedTransaction>;
+}
+export declare class EvmTokenAdapter<T extends ERC20 = ERC20> extends EvmNativeTokenAdapter implements ITokenAdapter {
+    readonly chainName: ChainName;
+    readonly multiProvider: MultiProtocolProvider;
+    readonly addresses: {
+        token: Address;
+    };
+    readonly contractFactory: any;
+    readonly contract: T;
+    constructor(chainName: ChainName, multiProvider: MultiProtocolProvider, addresses: {
+        token: Address;
+    }, contractFactory?: any);
+    getBalance(address: Address): Promise<string>;
+    getMetadata(isNft?: boolean): Promise<MinimalTokenMetadata>;
+    populateApproveTx({ weiAmountOrId, recipient, }: TransferParams): Promise<PopulatedTransaction>;
+    populateTransferTx({ weiAmountOrId, recipient, }: TransferParams): Promise<PopulatedTransaction>;
+}
+export declare class EvmHypSyntheticAdapter<T extends HypERC20 = HypERC20> extends EvmTokenAdapter<T> implements IHypTokenAdapter {
+    readonly chainName: ChainName;
+    readonly multiProvider: MultiProtocolProvider;
+    readonly addresses: {
+        token: Address;
+    };
+    readonly contractFactory: any;
+    constructor(chainName: ChainName, multiProvider: MultiProtocolProvider, addresses: {
+        token: Address;
+    }, contractFactory?: any);
+    getDomains(): Promise<Domain[]>;
+    getRouterAddress(domain: Domain): Promise<Buffer>;
+    getAllRouters(): Promise<Array<{
+        domain: Domain;
+        address: Buffer;
+    }>>;
+    quoteGasPayment(destination: Domain): Promise<string>;
+    populateTransferRemoteTx({ weiAmountOrId, destination, recipient, txValue, }: TransferRemoteParams): Promise<PopulatedTransaction>;
+}
+export declare class EvmHypCollateralAdapter extends EvmHypSyntheticAdapter implements IHypTokenAdapter {
+    readonly chainName: ChainName;
+    readonly multiProvider: MultiProtocolProvider;
+    readonly addresses: {
+        token: Address;
+    };
+    readonly contractFactory: any;
+    constructor(chainName: ChainName, multiProvider: MultiProtocolProvider, addresses: {
+        token: Address;
+    }, contractFactory?: any);
+    getMetadata(): Promise<MinimalTokenMetadata>;
+    populateApproveTx(_params: TransferParams): Promise<PopulatedTransaction>;
+    populateTransferTx(_params: TransferParams): Promise<PopulatedTransaction>;
+}
+//# sourceMappingURL=EvmTokenAdapter.d.ts.map

package/dist/token/adapters/EvmTokenAdapter.d.ts.map

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

package/dist/token/adapters/EvmTokenAdapter.js

@@ -0,0 +1,119 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EvmHypCollateralAdapter = exports.EvmHypSyntheticAdapter = exports.EvmTokenAdapter = exports.EvmNativeTokenAdapter = void 0;
+const ethers_1 = require("ethers");
+const core_1 = require("@hyperlane-xyz/core");
+const utils_1 = require("@hyperlane-xyz/utils");
+const MultiProtocolApp_1 = require("../../app/MultiProtocolApp");
+// Interacts with native currencies
+class EvmNativeTokenAdapter extends MultiProtocolApp_1.BaseEvmAdapter {
+    async getBalance(address) {
+        const balance = await this.getProvider().getBalance(address);
+        return balance.toString();
+    }
+    async getMetadata() {
+        // TODO get metadata from chainMetadata config
+        throw new Error('Metadata not available to native tokens');
+    }
+    async populateApproveTx(_params) {
+        throw new Error('Approve not required for native tokens');
+    }
+    async populateTransferTx({ weiAmountOrId, recipient, }) {
+        const value = ethers_1.BigNumber.from(weiAmountOrId);
+        return { value, to: recipient };
+    }
+}
+exports.EvmNativeTokenAdapter = EvmNativeTokenAdapter;
+// Interacts with ERC20/721 contracts
+class EvmTokenAdapter extends EvmNativeTokenAdapter {
+    constructor(chainName, multiProvider, addresses, contractFactory = core_1.ERC20__factory) {
+        super(chainName, multiProvider, addresses);
+        this.chainName = chainName;
+        this.multiProvider = multiProvider;
+        this.addresses = addresses;
+        this.contractFactory = contractFactory;
+        this.contract = contractFactory.connect(addresses.token, this.getProvider());
+    }
+    async getBalance(address) {
+        const balance = await this.contract.balanceOf(address);
+        return balance.toString();
+    }
+    async getMetadata(isNft) {
+        const [decimals, symbol, name] = await Promise.all([
+            isNft ? 0 : this.contract.decimals(),
+            this.contract.symbol(),
+            this.contract.name(),
+        ]);
+        return { decimals, symbol, name };
+    }
+    populateApproveTx({ weiAmountOrId, recipient, }) {
+        return this.contract.populateTransaction.approve(recipient, weiAmountOrId);
+    }
+    populateTransferTx({ weiAmountOrId, recipient, }) {
+        return this.contract.populateTransaction.transfer(recipient, weiAmountOrId);
+    }
+}
+exports.EvmTokenAdapter = EvmTokenAdapter;
+// Interacts with Hyp Synthetic token contracts (aka 'HypTokens')
+class EvmHypSyntheticAdapter extends EvmTokenAdapter {
+    constructor(chainName, multiProvider, addresses, contractFactory = core_1.HypERC20__factory) {
+        super(chainName, multiProvider, addresses, contractFactory);
+        this.chainName = chainName;
+        this.multiProvider = multiProvider;
+        this.addresses = addresses;
+        this.contractFactory = contractFactory;
+    }
+    getDomains() {
+        return this.contract.domains();
+    }
+    async getRouterAddress(domain) {
+        const routerAddressesAsBytes32 = await this.contract.routers(domain);
+        // Evm addresses will be padded with 12 bytes
+        if (routerAddressesAsBytes32.startsWith('0x000000000000000000000000')) {
+            return Buffer.from((0, utils_1.strip0x)((0, utils_1.bytes32ToAddress)(routerAddressesAsBytes32)), 'hex');
+            // Otherwise leave the address unchanged
+        }
+        else {
+            return Buffer.from((0, utils_1.strip0x)(routerAddressesAsBytes32), 'hex');
+        }
+    }
+    async getAllRouters() {
+        const domains = await this.getDomains();
+        const routers = await Promise.all(domains.map((d) => this.getRouterAddress(d)));
+        return domains.map((d, i) => ({ domain: d, address: routers[i] }));
+    }
+    async quoteGasPayment(destination) {
+        const gasPayment = await this.contract.quoteGasPayment(destination);
+        return gasPayment.toString();
+    }
+    populateTransferRemoteTx({ weiAmountOrId, destination, recipient, txValue, }) {
+        const recipBytes32 = (0, utils_1.addressToBytes32)((0, utils_1.addressToByteHexString)(recipient));
+        return this.contract.populateTransaction.transferRemote(destination, recipBytes32, weiAmountOrId, {
+            // Note, typically the value is the gas payment as quoted by IGP
+            value: txValue,
+        });
+    }
+}
+exports.EvmHypSyntheticAdapter = EvmHypSyntheticAdapter;
+// Interacts with HypCollateral and HypNative contracts
+class EvmHypCollateralAdapter extends EvmHypSyntheticAdapter {
+    constructor(chainName, multiProvider, addresses, contractFactory = core_1.HypERC20Collateral__factory) {
+        super(chainName, multiProvider, addresses, contractFactory);
+        this.chainName = chainName;
+        this.multiProvider = multiProvider;
+        this.addresses = addresses;
+        this.contractFactory = contractFactory;
+    }
+    getMetadata() {
+        // TODO pass through metadata from wrapped token or chainMetadata config
+        throw new Error('Metadata not available for HypCollateral/HypNative contract.');
+    }
+    populateApproveTx(_params) {
+        throw new Error('Approve not applicable to HypCollateral/HypNative contract.');
+    }
+    populateTransferTx(_params) {
+        throw new Error('Local transfer not supported for HypCollateral/HypNative contract.');
+    }
+}
+exports.EvmHypCollateralAdapter = EvmHypCollateralAdapter;
+//# sourceMappingURL=EvmTokenAdapter.js.map

package/dist/token/adapters/EvmTokenAdapter.js.map

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