@hyperlane-xyz/sdk 1.5.3 → 1.5.5-beta0

package/dist/gas/HyperlaneIgpChecker.js

@@ -14,20 +14,12 @@ class HyperlaneIgpChecker extends HyperlaneAppChecker_1.HyperlaneAppChecker {
         await this.checkBytecodes(chain);
         await this.checkOverheadInterchainGasPaymaster(chain);
         await this.checkInterchainGasPaymaster(chain);
-        const config = this.configMap[chain];
-        if (config.upgrade) {
-            await this.checkUpgrade(chain, config.upgrade);
-        }
     }
     async checkDomainOwnership(chain) {
         const config = this.configMap[chain];
         const ownableOverrides = {
             storageGasOracle: config.oracleKey,
         };
-        if (config.upgrade) {
-            const timelockController = this.app.getAddresses(chain).timelockController;
-            ownableOverrides['proxyAdmin'] = timelockController;
-        }
         await super.checkOwnership(chain, config.owner, ownableOverrides);
     }
     async checkBytecodes(chain) {
@@ -38,7 +30,7 @@ class HyperlaneIgpChecker extends HyperlaneAppChecker_1.HyperlaneAppChecker {
             bytecode_1.BytecodeHash.INTERCHAIN_GAS_PAYMASTER_BYTECODE_HASH,
             bytecode_1.BytecodeHash.OWNER_INITIALIZABLE_INTERCHAIN_GAS_PAYMASTER_BYTECODE_HASH,
         ]);
-        await this.checkBytecode(chain, 'OverheadIGP', contracts.defaultIsmInterchainGasPaymaster.address, [bytecode_1.BytecodeHash.OVERHEAD_IGP_BYTECODE_HASH], (bytecode) => 
+        await this.checkBytecode(chain, 'InterchainGasPaymaster', contracts.interchainGasPaymaster.address, [bytecode_1.BytecodeHash.OVERHEAD_IGP_BYTECODE_HASH], (bytecode) => 
         // Remove the address of the wrapped IGP from the bytecode
         bytecode.replaceAll(ethers_1.utils.defaultAbiCoder
             .encode(['address'], [contracts.interchainGasPaymaster.address])
@@ -46,7 +38,7 @@ class HyperlaneIgpChecker extends HyperlaneAppChecker_1.HyperlaneAppChecker {
     }
     async checkOverheadInterchainGasPaymaster(local) {
         const coreContracts = this.app.getContracts(local);
-        const defaultIsmIgp = coreContracts.defaultIsmInterchainGasPaymaster;
+        const defaultIsmIgp = coreContracts.interchainGasPaymaster;
         // Construct the violation, updating the actual & expected
         // objects as violations are found.
         // A single violation is used so that only a single `setDestinationGasOverheads`
@@ -61,13 +53,9 @@ class HyperlaneIgpChecker extends HyperlaneAppChecker_1.HyperlaneAppChecker {
         };
         const remotes = this.app.remoteChains(local);
         for (const remote of remotes) {
-            let expectedOverhead = this.configMap[local].overhead[remote];
-            if (!expectedOverhead) {
-                this.app.logger(`No overhead configured for ${local} -> ${remote}, defaulting to 0`);
-                expectedOverhead = 0;
-            }
+            const expectedOverhead = this.configMap[local].overhead[remote];
             const remoteId = this.multiProvider.getDomainId(remote);
-            const existingOverhead = await defaultIsmIgp.destinationGasOverhead(remoteId);
+            const existingOverhead = await defaultIsmIgp.destinationGasLimit(remoteId, 0);
             if (!existingOverhead.eq(expectedOverhead)) {
                 const remoteChain = remote;
                 overheadViolation.actual[remoteChain] = existingOverhead;
@@ -94,17 +82,13 @@ class HyperlaneIgpChecker extends HyperlaneAppChecker_1.HyperlaneAppChecker {
             actual: {},
             expected: {},
         };
-        // In addition to all remote chains on the app, which are just Ethereum chains,
-        // also consider what the config says about non-Ethereum chains.
-        const remotes = new Set([
-            ...this.app.remoteChains(local),
-            ...Object.keys(this.configMap[local].gasOracleType),
-        ]);
+        const remotes = this.app.remoteChains(local);
         for (const remote of remotes) {
             const remoteId = this.multiProvider.getDomainId(remote);
-            const actualGasOracle = await igp.gasOracles(remoteId);
+            const destinationGasConfigs = await igp.destinationGasConfigs(remoteId);
+            const actualGasOracle = destinationGasConfigs.gasOracle;
             const expectedGasOracle = this.getGasOracleAddress(local, remote);
-            if (!(0, utils_1.eqAddress)(actualGasOracle, expectedGasOracle)) {
+            if ((0, utils_1.eqAddress)(actualGasOracle, expectedGasOracle)) {
                 const remoteChain = remote;
                 gasOraclesViolation.actual[remoteChain] = actualGasOracle;
                 gasOraclesViolation.expected[remoteChain] = expectedGasOracle;
@@ -116,7 +100,7 @@ class HyperlaneIgpChecker extends HyperlaneAppChecker_1.HyperlaneAppChecker {
         }
         const actualBeneficiary = await igp.beneficiary();
         const expectedBeneficiary = this.configMap[local].beneficiary;
-        if (!(0, utils_1.eqAddress)(actualBeneficiary, expectedBeneficiary)) {
+        if ((0, utils_1.eqAddress)(actualBeneficiary, expectedBeneficiary)) {
             const violation = {
                 type: 'InterchainGasPaymaster',
                 subType: types_1.IgpViolationType.Beneficiary,
@@ -132,8 +116,7 @@ class HyperlaneIgpChecker extends HyperlaneAppChecker_1.HyperlaneAppChecker {
         const config = this.configMap[local];
         const gasOracleType = config.gasOracleType[remote];
         if (!gasOracleType) {
-            this.app.logger(`No gas oracle for local ${local} and remote ${remote}, defaulting to zero address`);
-            return ethers_1.ethers.constants.AddressZero;
+            throw Error(`Expected gas oracle type for local ${local} and remote ${remote}`);
         }
         const coreContracts = this.app.getContracts(local);
         switch (gasOracleType) {

package/dist/gas/HyperlaneIgpChecker.js.map

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

package/dist/gas/HyperlaneIgpDeployer.d.ts

@@ -1,16 +1,14 @@
-import { InterchainGasPaymaster, OverheadIgp, ProxyAdmin, StorageGasOracle } from '@hyperlane-xyz/core';
-import { Address } from '@hyperlane-xyz/utils';
+import { InterchainGasPaymaster, ProxyAdmin, StorageGasOracle } from '@hyperlane-xyz/core';
 import { HyperlaneContracts } from '../contracts/types';
 import { HyperlaneDeployer } from '../deploy/HyperlaneDeployer';
 import { MultiProvider } from '../providers/MultiProvider';
 import { ChainName } from '../types';
 import { IgpFactories } from './contracts';
-import { IgpConfig, OverheadIgpConfig } from './types';
-export declare class HyperlaneIgpDeployer extends HyperlaneDeployer<OverheadIgpConfig, IgpFactories> {
+import { IgpConfig } from './types';
+export declare class HyperlaneIgpDeployer extends HyperlaneDeployer<IgpConfig, IgpFactories> {
     constructor(multiProvider: MultiProvider);
     deployInterchainGasPaymaster(chain: ChainName, proxyAdmin: ProxyAdmin, storageGasOracle: StorageGasOracle, config: IgpConfig): Promise<InterchainGasPaymaster>;
-    deployOverheadIgp(chain: ChainName, interchainGasPaymasterAddress: Address, config: OverheadIgpConfig): Promise<OverheadIgp>;
     deployStorageGasOracle(chain: ChainName): Promise<StorageGasOracle>;
-    deployContracts(chain: ChainName, config: OverheadIgpConfig): Promise<HyperlaneContracts<IgpFactories>>;
+    deployContracts(chain: ChainName, config: IgpConfig): Promise<HyperlaneContracts<IgpFactories>>;
 }
 //# sourceMappingURL=HyperlaneIgpDeployer.d.ts.map

package/dist/gas/HyperlaneIgpDeployer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HyperlaneIgpDeployer.d.ts","sourceRoot":"","sources":["../../src/gas/HyperlaneIgpDeployer.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,sBAAsB,EACtB,WAAW,EACX,UAAU,EACV,gBAAgB,EAGjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAa,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,OAAO,EAAE,YAAY,EAAgB,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAEvD,qBAAa,oBAAqB,SAAQ,iBAAiB,CACzD,iBAAiB,EACjB,YAAY,CACb;gBACa,aAAa,EAAE,aAAa;IAMlC,4BAA4B,CAChC,KAAK,EAAE,SAAS,EAChB,UAAU,EAAE,UAAU,EACtB,gBAAgB,EAAE,gBAAgB,EAClC,MAAM,EAAE,SAAS,GAChB,OAAO,CAAC,sBAAsB,CAAC;IAqC5B,iBAAiB,CACrB,KAAK,EAAE,SAAS,EAChB,6BAA6B,EAAE,OAAO,EACtC,MAAM,EAAE,iBAAiB,GACxB,OAAO,CAAC,WAAW,CAAC;IAqCjB,sBAAsB,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAInE,eAAe,CACnB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,iBAAiB,GACxB,OAAO,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;CAyD7C"}
+{"version":3,"file":"HyperlaneIgpDeployer.d.ts","sourceRoot":"","sources":["../../src/gas/HyperlaneIgpDeployer.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,sBAAsB,EACtB,UAAU,EACV,gBAAgB,EACjB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,OAAO,EAAE,YAAY,EAAgB,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEpC,qBAAa,oBAAqB,SAAQ,iBAAiB,CACzD,SAAS,EACT,YAAY,CACb;gBACa,aAAa,EAAE,aAAa;IAMlC,4BAA4B,CAChC,KAAK,EAAE,SAAS,EAChB,UAAU,EAAE,UAAU,EACtB,gBAAgB,EAAE,gBAAgB,EAClC,MAAM,EAAE,SAAS,GAChB,OAAO,CAAC,sBAAsB,CAAC;IA2C5B,sBAAsB,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAInE,eAAe,CACnB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,SAAS,GAChB,OAAO,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;CA4B7C"}

package/dist/gas/HyperlaneIgpDeployer.js

@@ -5,8 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HyperlaneIgpDeployer = void 0;
 const debug_1 = __importDefault(require("debug"));
-const ethers_1 = require("ethers");
-const core_1 = require("@hyperlane-xyz/core");
 const utils_1 = require("@hyperlane-xyz/utils");
 const HyperlaneDeployer_1 = require("../deploy/HyperlaneDeployer");
 const contracts_1 = require("./contracts");
@@ -20,41 +18,28 @@ class HyperlaneIgpDeployer extends HyperlaneDeployer_1.HyperlaneDeployer {
         const owner = config.owner;
         const beneficiary = config.beneficiary;
         const igp = await this.deployProxiedContract(chain, 'interchainGasPaymaster', proxyAdmin.address, [], [owner, beneficiary]);
-        const gasOracleConfigsToSet = [];
+        const gasParamsToSet = [];
         const remotes = Object.keys(config.gasOracleType);
         for (const remote of remotes) {
             const remoteId = this.multiProvider.getDomainId(remote);
-            const currentGasOracle = await igp.gasOracles(remoteId);
-            if (!(0, utils_1.eqAddress)(currentGasOracle, storageGasOracle.address)) {
-                gasOracleConfigsToSet.push({
+            const newGasOverhead = config.overhead[remote];
+            const currentGasConfig = await igp.destinationGasConfigs(remoteId);
+            if (!(0, utils_1.eqAddress)(currentGasConfig.gasOracle, storageGasOracle.address) ||
+                !currentGasConfig.gasOverhead.eq(newGasOverhead)) {
+                gasParamsToSet.push({
                     remoteDomain: remoteId,
-                    gasOracle: storageGasOracle.address,
+                    config: {
+                        gasOverhead: newGasOverhead,
+                        gasOracle: storageGasOracle.address,
+                    },
                 });
             }
         }
-        if (gasOracleConfigsToSet.length > 0) {
-            await this.runIfOwner(chain, igp, async () => this.multiProvider.handleTx(chain, igp.setGasOracles(gasOracleConfigsToSet)));
+        if (gasParamsToSet.length > 0) {
+            await this.runIfOwner(chain, igp, async () => this.multiProvider.handleTx(chain, igp.setDestinationGasConfigs(gasParamsToSet)));
         }
         return igp;
     }
-    async deployOverheadIgp(chain, interchainGasPaymasterAddress, config) {
-        const overheadInterchainGasPaymaster = await this.deployContract(chain, 'defaultIsmInterchainGasPaymaster', [interchainGasPaymasterAddress]);
-        // Only set gas overhead configs if they differ from what's on chain
-        const configs = [];
-        const remotes = Object.keys(config.overhead);
-        for (const remote of remotes) {
-            const remoteDomain = this.multiProvider.getDomainId(remote);
-            const gasOverhead = config.overhead[remote];
-            const existingOverhead = await overheadInterchainGasPaymaster.destinationGasOverhead(remoteDomain);
-            if (!existingOverhead.eq(gasOverhead)) {
-                configs.push({ domain: remoteDomain, gasOverhead });
-            }
-        }
-        if (configs.length > 0) {
-            await this.runIfOwner(chain, overheadInterchainGasPaymaster, () => this.multiProvider.handleTx(chain, overheadInterchainGasPaymaster.setDestinationGasOverheads(configs, this.multiProvider.getTransactionOverrides(chain))));
-        }
-        return overheadInterchainGasPaymaster;
-    }
     async deployStorageGasOracle(chain) {
         return this.deployContract(chain, 'storageGasOracle', []);
     }
@@ -62,23 +47,9 @@ class HyperlaneIgpDeployer extends HyperlaneDeployer_1.HyperlaneDeployer {
         // NB: To share ProxyAdmins with HyperlaneCore, ensure the ProxyAdmin
         // is loaded into the contract cache.
         const proxyAdmin = await this.deployContract(chain, 'proxyAdmin', []);
-        let timelockController;
-        if (config.upgrade) {
-            timelockController = await this.deployTimelock(chain, config.upgrade.timelock);
-            await this.transferOwnershipOfContracts(chain, timelockController.address, { proxyAdmin });
-        }
-        else {
-            // mock this for consistent serialization
-            timelockController = core_1.TimelockController__factory.connect(ethers_1.ethers.constants.AddressZero, this.multiProvider.getProvider(chain));
-            await this.transferOwnershipOfContracts(chain, config.owner, {
-                proxyAdmin,
-            });
-        }
         const storageGasOracle = await this.deployStorageGasOracle(chain);
         const interchainGasPaymaster = await this.deployInterchainGasPaymaster(chain, proxyAdmin, storageGasOracle, config);
-        const overheadIgp = await this.deployOverheadIgp(chain, interchainGasPaymaster.address, config);
         await this.transferOwnershipOfContracts(chain, config.owner, {
-            overheadIgp,
             interchainGasPaymaster,
         });
         // Configure oracle key for StorageGasOracle separately to keep 'hot'
@@ -88,10 +59,8 @@ class HyperlaneIgpDeployer extends HyperlaneDeployer_1.HyperlaneDeployer {
         });
         return {
             proxyAdmin,
-            timelockController,
             storageGasOracle,
             interchainGasPaymaster,
-            defaultIsmInterchainGasPaymaster: overheadIgp,
         };
     }
 }

package/dist/gas/HyperlaneIgpDeployer.js.map

@@ -1 +1 @@
-{"version":3,"file":"HyperlaneIgpDeployer.js","sourceRoot":"","sources":["../../src/gas/HyperlaneIgpDeployer.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,mCAAgC;AAEhC,8CAO6B;AAC7B,gDAA0D;AAG1D,mEAAgE;AAIhE,2CAAyD;AAGzD,MAAa,oBAAqB,SAAQ,qCAGzC;IACC,YAAY,aAA4B;QACtC,KAAK,CAAC,aAAa,EAAE,wBAAY,EAAE;YACjC,MAAM,EAAE,IAAA,eAAK,EAAC,uBAAuB,CAAC;SACvC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,4BAA4B,CAChC,KAAgB,EAChB,UAAsB,EACtB,gBAAkC,EAClC,MAAiB;QAEjB,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;QAC3B,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;QACvC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAC1C,KAAK,EACL,wBAAwB,EACxB,UAAU,CAAC,OAAO,EAClB,EAAE,EACF,CAAC,KAAK,EAAE,WAAW,CAAC,CACrB,CAAC;QAEF,MAAM,qBAAqB,GACzB,EAAE,CAAC;QAEL,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QAClD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YACxD,MAAM,gBAAgB,GAAG,MAAM,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;YACxD,IAAI,CAAC,IAAA,iBAAS,EAAC,gBAAgB,EAAE,gBAAgB,CAAC,OAAO,CAAC,EAAE;gBAC1D,qBAAqB,CAAC,IAAI,CAAC;oBACzB,YAAY,EAAE,QAAQ;oBACtB,SAAS,EAAE,gBAAgB,CAAC,OAAO;iBACpC,CAAC,CAAC;aACJ;SACF;QAED,IAAI,qBAAqB,CAAC,MAAM,GAAG,CAAC,EAAE;YACpC,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,IAAI,EAAE,CAC3C,IAAI,CAAC,aAAa,CAAC,QAAQ,CACzB,KAAK,EACL,GAAG,CAAC,aAAa,CAAC,qBAAqB,CAAC,CACzC,CACF,CAAC;SACH;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED,KAAK,CAAC,iBAAiB,CACrB,KAAgB,EAChB,6BAAsC,EACtC,MAAyB;QAEzB,MAAM,8BAA8B,GAAG,MAAM,IAAI,CAAC,cAAc,CAC9D,KAAK,EACL,kCAAkC,EAClC,CAAC,6BAA6B,CAAC,CAChC,CAAC;QAEF,oEAAoE;QACpE,MAAM,OAAO,GAAqC,EAAE,CAAC;QACrD,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC7C,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YAC5D,MAAM,WAAW,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAC5C,MAAM,gBAAgB,GACpB,MAAM,8BAA8B,CAAC,sBAAsB,CACzD,YAAY,CACb,CAAC;YACJ,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,WAAW,CAAC,EAAE;gBACrC,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,CAAC,CAAC;aACrD;SACF;QAED,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YACtB,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,8BAA8B,EAAE,GAAG,EAAE,CAChE,IAAI,CAAC,aAAa,CAAC,QAAQ,CACzB,KAAK,EACL,8BAA8B,CAAC,0BAA0B,CACvD,OAAO,EACP,IAAI,CAAC,aAAa,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAClD,CACF,CACF,CAAC;SACH;QAED,OAAO,8BAA8B,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,KAAgB;QAC3C,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,kBAAkB,EAAE,EAAE,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,KAAgB,EAChB,MAAyB;QAEzB,qEAAqE;QACrE,qCAAqC;QACrC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,YAAY,EAAE,EAAE,CAAC,CAAC;QACtE,IAAI,kBAAsC,CAAC;QAC3C,IAAI,MAAM,CAAC,OAAO,EAAE;YAClB,kBAAkB,GAAG,MAAM,IAAI,CAAC,cAAc,CAC5C,KAAK,EACL,MAAM,CAAC,OAAO,CAAC,QAAQ,CACxB,CAAC;YACF,MAAM,IAAI,CAAC,4BAA4B,CACrC,KAAK,EACL,kBAAkB,CAAC,OAAO,EAC1B,EAAE,UAAU,EAAE,CACf,CAAC;SACH;aAAM;YACL,yCAAyC;YACzC,kBAAkB,GAAG,kCAA2B,CAAC,OAAO,CACtD,eAAM,CAAC,SAAS,CAAC,WAAW,EAC5B,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,KAAK,CAAC,CACtC,CAAC;YACF,MAAM,IAAI,CAAC,4BAA4B,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE;gBAC3D,UAAU;aACX,CAAC,CAAC;SACJ;QAED,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;QAClE,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,4BAA4B,CACpE,KAAK,EACL,UAAU,EACV,gBAAgB,EAChB,MAAM,CACP,CAAC;QACF,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAC9C,KAAK,EACL,sBAAsB,CAAC,OAAO,EAC9B,MAAM,CACP,CAAC;QACF,MAAM,IAAI,CAAC,4BAA4B,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE;YAC3D,WAAW;YACX,sBAAsB;SACvB,CAAC,CAAC;QAEH,qEAAqE;QACrE,wCAAwC;QACxC,MAAM,IAAI,CAAC,4BAA4B,CAAC,KAAK,EAAE,MAAM,CAAC,SAAS,EAAE;YAC/D,gBAAgB;SACjB,CAAC,CAAC;QAEH,OAAO;YACL,UAAU;YACV,kBAAkB;YAClB,gBAAgB;YAChB,sBAAsB;YACtB,gCAAgC,EAAE,WAAW;SAC9C,CAAC;IACJ,CAAC;CACF;AA7JD,oDA6JC"}
+{"version":3,"file":"HyperlaneIgpDeployer.js","sourceRoot":"","sources":["../../src/gas/HyperlaneIgpDeployer.ts"],"names":[],"mappings":"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"}

package/dist/gas/contracts.d.ts

@@ -1,10 +1,8 @@
-import { InterchainGasPaymaster__factory, OverheadIgp__factory, StorageGasOracle__factory } from '@hyperlane-xyz/core';
+import { InterchainGasPaymaster__factory, ProxyAdmin__factory, StorageGasOracle__factory } from '@hyperlane-xyz/core';
 export declare const igpFactories: {
-    proxyAdmin: import("@hyperlane-xyz/core").ProxyAdmin__factory;
-    timelockController: import("@hyperlane-xyz/core").TimelockController__factory;
     interchainGasPaymaster: InterchainGasPaymaster__factory;
-    defaultIsmInterchainGasPaymaster: OverheadIgp__factory;
     storageGasOracle: StorageGasOracle__factory;
+    proxyAdmin: ProxyAdmin__factory;
 };
 export type IgpFactories = typeof igpFactories;
 //# sourceMappingURL=contracts.d.ts.map

package/dist/gas/contracts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contracts.d.ts","sourceRoot":"","sources":["../../src/gas/contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,+BAA+B,EAC/B,oBAAoB,EACpB,yBAAyB,EAC1B,MAAM,qBAAqB,CAAC;AAI7B,eAAO,MAAM,YAAY;;;;;;CAKxB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,OAAO,YAAY,CAAC"}
+{"version":3,"file":"contracts.d.ts","sourceRoot":"","sources":["../../src/gas/contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,+BAA+B,EAC/B,mBAAmB,EACnB,yBAAyB,EAC1B,MAAM,qBAAqB,CAAC;AAE7B,eAAO,MAAM,YAAY;;;;CAIxB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,OAAO,YAAY,CAAC"}

package/dist/gas/contracts.js

@@ -2,11 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.igpFactories = void 0;
 const core_1 = require("@hyperlane-xyz/core");
-const types_1 = require("../router/types");
 exports.igpFactories = {
     interchainGasPaymaster: new core_1.InterchainGasPaymaster__factory(),
-    defaultIsmInterchainGasPaymaster: new core_1.OverheadIgp__factory(),
     storageGasOracle: new core_1.StorageGasOracle__factory(),
-    ...types_1.proxiedFactories,
+    proxyAdmin: new core_1.ProxyAdmin__factory(),
 };
 //# sourceMappingURL=contracts.js.map

package/dist/gas/contracts.js.map

@@ -1 +1 @@
-{"version":3,"file":"contracts.js","sourceRoot":"","sources":["../../src/gas/contracts.ts"],"names":[],"mappings":";;;AAAA,8CAI6B;AAE7B,2CAAmD;AAEtC,QAAA,YAAY,GAAG;IAC1B,sBAAsB,EAAE,IAAI,sCAA+B,EAAE;IAC7D,gCAAgC,EAAE,IAAI,2BAAoB,EAAE;IAC5D,gBAAgB,EAAE,IAAI,gCAAyB,EAAE;IACjD,GAAG,wBAAgB;CACpB,CAAC"}
+{"version":3,"file":"contracts.js","sourceRoot":"","sources":["../../src/gas/contracts.ts"],"names":[],"mappings":";;;AAAA,8CAI6B;AAEhB,QAAA,YAAY,GAAG;IAC1B,sBAAsB,EAAE,IAAI,sCAA+B,EAAE;IAC7D,gBAAgB,EAAE,IAAI,gCAAyB,EAAE;IACjD,UAAU,EAAE,IAAI,0BAAmB,EAAE;CACtC,CAAC"}

package/dist/gas/types.d.ts

@@ -1,7 +1,6 @@
 import { BigNumber } from 'ethers';
-import { InterchainGasPaymaster, OverheadIgp } from '@hyperlane-xyz/core';
+import { InterchainGasPaymaster } from '@hyperlane-xyz/core';
 import type { Address } from '@hyperlane-xyz/utils';
-import { UpgradeConfig } from '../deploy/proxy';
 import type { CheckerViolation } from '../deploy/types';
 import { ChainMap } from '../types';
 export declare enum GasOracleContractType {
@@ -12,9 +11,6 @@ export type IgpConfig = {
     beneficiary: Address;
     gasOracleType: ChainMap<GasOracleContractType>;
     oracleKey: Address;
-    upgrade?: UpgradeConfig;
-};
-export type OverheadIgpConfig = IgpConfig & {
     overhead: ChainMap<number>;
 };
 export declare enum IgpViolationType {
@@ -40,7 +36,7 @@ export interface IgpGasOraclesViolation extends IgpViolation {
 }
 export interface IgpOverheadViolation extends IgpViolation {
     subType: IgpViolationType.Overhead;
-    contract: OverheadIgp;
+    contract: InterchainGasPaymaster;
     actual: ChainMap<BigNumber>;
     expected: ChainMap<BigNumber>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/gas/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEnC,OAAO,EAAE,sBAAsB,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAC1E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpC,oBAAY,qBAAqB;IAC/B,gBAAgB,qBAAqB;CACtC;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,EAAE,OAAO,CAAC;IACf,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,EAAE,QAAQ,CAAC,qBAAqB,CAAC,CAAC;IAC/C,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,aAAa,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,SAAS,GAAG;IAC1C,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;CAC5B,CAAC;AAEF,oBAAY,gBAAgB;IAC1B,WAAW,gBAAgB;IAC3B,UAAU,eAAe;IACzB,QAAQ,aAAa;CACtB;AAED,MAAM,WAAW,YAAa,SAAQ,gBAAgB;IACpD,IAAI,EAAE,wBAAwB,CAAC;IAC/B,OAAO,EAAE,gBAAgB,CAAC;CAC3B;AAED,MAAM,WAAW,uBAAwB,SAAQ,YAAY;IAC3D,OAAO,EAAE,gBAAgB,CAAC,WAAW,CAAC;IACtC,QAAQ,EAAE,sBAAsB,CAAC;IACjC,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,sBAAuB,SAAQ,YAAY;IAC1D,OAAO,EAAE,gBAAgB,CAAC,UAAU,CAAC;IACrC,QAAQ,EAAE,sBAAsB,CAAC;IACjC,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC1B,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;CAC7B;AAED,MAAM,WAAW,oBAAqB,SAAQ,YAAY;IACxD,OAAO,EAAE,gBAAgB,CAAC,QAAQ,CAAC;IACnC,QAAQ,EAAE,WAAW,CAAC;IACtB,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;IAC5B,QAAQ,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;CAC/B"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/gas/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEnC,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpC,oBAAY,qBAAqB;IAC/B,gBAAgB,qBAAqB;CACtC;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,EAAE,OAAO,CAAC;IACf,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,EAAE,QAAQ,CAAC,qBAAqB,CAAC,CAAC;IAC/C,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;CAC5B,CAAC;AAEF,oBAAY,gBAAgB;IAC1B,WAAW,gBAAgB;IAC3B,UAAU,eAAe;IACzB,QAAQ,aAAa;CACtB;AAED,MAAM,WAAW,YAAa,SAAQ,gBAAgB;IACpD,IAAI,EAAE,wBAAwB,CAAC;IAC/B,OAAO,EAAE,gBAAgB,CAAC;CAC3B;AAED,MAAM,WAAW,uBAAwB,SAAQ,YAAY;IAC3D,OAAO,EAAE,gBAAgB,CAAC,WAAW,CAAC;IACtC,QAAQ,EAAE,sBAAsB,CAAC;IACjC,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,sBAAuB,SAAQ,YAAY;IAC1D,OAAO,EAAE,gBAAgB,CAAC,UAAU,CAAC;IACrC,QAAQ,EAAE,sBAAsB,CAAC;IACjC,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC1B,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;CAC7B;AAED,MAAM,WAAW,oBAAqB,SAAQ,YAAY;IACxD,OAAO,EAAE,gBAAgB,CAAC,QAAQ,CAAC;IACnC,QAAQ,EAAE,sBAAsB,CAAC;IACjC,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;IAC5B,QAAQ,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;CAC/B"}

package/dist/gas/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/gas/types.ts"],"names":[],"mappings":";;;AASA,IAAY,qBAEX;AAFD,WAAY,qBAAqB;IAC/B,8DAAqC,CAAA;AACvC,CAAC,EAFW,qBAAqB,qCAArB,qBAAqB,QAEhC;AAcD,IAAY,gBAIX;AAJD,WAAY,gBAAgB;IAC1B,+CAA2B,CAAA;IAC3B,6CAAyB,CAAA;IACzB,yCAAqB,CAAA;AACvB,CAAC,EAJW,gBAAgB,gCAAhB,gBAAgB,QAI3B"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/gas/types.ts"],"names":[],"mappings":";;;AAQA,IAAY,qBAEX;AAFD,WAAY,qBAAqB;IAC/B,8DAAqC,CAAA;AACvC,CAAC,EAFW,qBAAqB,qCAArB,qBAAqB,QAEhC;AAUD,IAAY,gBAIX;AAJD,WAAY,gBAAgB;IAC1B,+CAA2B,CAAA;IAC3B,6CAAyB,CAAA;IACzB,yCAAqB,CAAA;AACvB,CAAC,EAJW,gBAAgB,gCAAhB,gBAAgB,QAI3B"}

package/dist/hook/HyperlaneHookDeployer.d.ts

@@ -1,17 +1,35 @@
-import { OptimismISM, OptimismMessageHook, TestRecipient } from '@hyperlane-xyz/core';
-import { Address } from '@hyperlane-xyz/utils';
-import { HyperlaneContracts, HyperlaneContractsMap } from '../contracts/types';
+import { StaticProtocolFee } from '@hyperlane-xyz/core';
+import { HyperlaneContracts } from '../contracts/types';
+import { CoreAddresses } from '../core/contracts';
 import { HyperlaneDeployer } from '../deploy/HyperlaneDeployer';
+import { HyperlaneIgpDeployer } from '../gas/HyperlaneIgpDeployer';
+import { IgpFactories } from '../gas/contracts';
+import { HyperlaneIsmFactory } from '../ism/HyperlaneIsmFactory';
 import { MultiProvider } from '../providers/MultiProvider';
 import { ChainMap, ChainName } from '../types';
 import { HookFactories } from './contracts';
-import { HookConfig } from './types';
+import { AggregationHookConfig, HookConfig, IgpHookConfig, ProtocolFeeHookConfig } from './types';
 export declare class HyperlaneHookDeployer extends HyperlaneDeployer<HookConfig, HookFactories> {
-    constructor(multiProvider: MultiProvider);
-    deploy(configMap: ChainMap<HookConfig>): Promise<HyperlaneContractsMap<HookFactories>>;
-    deployContracts(chain: ChainName, hookConfig: HookConfig): Promise<HyperlaneContracts<HookFactories>>;
-    deployOptimismISM(chain: ChainName, nativeBridge: Address): Promise<OptimismISM>;
-    deployTestRecipient(chain: ChainName, ism: Address): Promise<TestRecipient>;
-    deployOptimismMessageHook(chain: ChainName, destinationDomain: number, nativeBridge: Address, optimismISM: Address): Promise<OptimismMessageHook>;
+    readonly core: ChainMap<Partial<CoreAddresses>>;
+    readonly ismFactory: HyperlaneIsmFactory;
+    readonly igpDeployer: HyperlaneIgpDeployer;
+    constructor(multiProvider: MultiProvider, core: ChainMap<Partial<CoreAddresses>>, ismFactory: HyperlaneIsmFactory, igpDeployer?: HyperlaneIgpDeployer);
+    cacheAddressesMap(addressesMap: ChainMap<CoreAddresses>): void;
+    deployContracts(chain: ChainName, config: HookConfig, coreAddresses?: Partial<import("../contracts/types").HyperlaneAddresses<{
+        validatorAnnounce: import("@hyperlane-xyz/core").ValidatorAnnounce__factory;
+        proxyAdmin: import("@hyperlane-xyz/core").ProxyAdmin__factory;
+        mailbox: import("@hyperlane-xyz/core").Mailbox__factory;
+    }>>): Promise<HyperlaneContracts<HookFactories>>;
+    deployProtocolFee(chain: ChainName, config: ProtocolFeeHookConfig): Promise<StaticProtocolFee>;
+    deployIgp(chain: ChainName, config: IgpHookConfig, coreAddresses?: Partial<import("../contracts/types").HyperlaneAddresses<{
+        validatorAnnounce: import("@hyperlane-xyz/core").ValidatorAnnounce__factory;
+        proxyAdmin: import("@hyperlane-xyz/core").ProxyAdmin__factory;
+        mailbox: import("@hyperlane-xyz/core").Mailbox__factory;
+    }>>): Promise<HyperlaneContracts<IgpFactories>>;
+    deployAggregation(chain: ChainName, config: AggregationHookConfig, coreAddresses?: Partial<import("../contracts/types").HyperlaneAddresses<{
+        validatorAnnounce: import("@hyperlane-xyz/core").ValidatorAnnounce__factory;
+        proxyAdmin: import("@hyperlane-xyz/core").ProxyAdmin__factory;
+        mailbox: import("@hyperlane-xyz/core").Mailbox__factory;
+    }>>): Promise<HyperlaneContracts<HookFactories>>;
 }
 //# sourceMappingURL=HyperlaneHookDeployer.d.ts.map

package/dist/hook/HyperlaneHookDeployer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HyperlaneHookDeployer.d.ts","sourceRoot":"","sources":["../../src/hook/HyperlaneHookDeployer.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,WAAW,EAEX,mBAAmB,EAEnB,aAAa,EAEd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAoB,MAAM,sBAAsB,CAAC;AAEjE,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC/E,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAG/C,OAAO,EAAE,aAAa,EAAiB,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAErC,qBAAa,qBAAsB,SAAQ,iBAAiB,CAC1D,UAAU,EACV,aAAa,CACd;gBACa,aAAa,EAAE,aAAa;IAMlC,MAAM,CACV,SAAS,EAAE,QAAQ,CAAC,UAAU,CAAC,GAC9B,OAAO,CAAC,qBAAqB,CAAC,aAAa,CAAC,CAAC;IA4C1C,eAAe,CACnB,KAAK,EAAE,SAAS,EAChB,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;IAoCvC,iBAAiB,CACrB,KAAK,EAAE,SAAS,EAChB,YAAY,EAAE,OAAO,GACpB,OAAO,CAAC,WAAW,CAAC;IAajB,mBAAmB,CACvB,KAAK,EAAE,SAAS,EAChB,GAAG,EAAE,OAAO,GACX,OAAO,CAAC,aAAa,CAAC;IAWnB,yBAAyB,CAC7B,KAAK,EAAE,SAAS,EAChB,iBAAiB,EAAE,MAAM,EACzB,YAAY,EAAE,OAAO,EACrB,WAAW,EAAE,OAAO,GACnB,OAAO,CAAC,mBAAmB,CAAC;CAgBhC"}
+{"version":3,"file":"HyperlaneHookDeployer.d.ts","sourceRoot":"","sources":["../../src/hook/HyperlaneHookDeployer.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,iBAAiB,EAClB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE/C,OAAO,EAAE,aAAa,EAAiB,MAAM,aAAa,CAAC;AAC3D,OAAO,EACL,qBAAqB,EACrB,UAAU,EAEV,aAAa,EACb,qBAAqB,EACtB,MAAM,SAAS,CAAC;AAEjB,qBAAa,qBAAsB,SAAQ,iBAAiB,CAC1D,UAAU,EACV,aAAa,CACd;IAGG,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAC/C,QAAQ,CAAC,UAAU,EAAE,mBAAmB;IACxC,QAAQ,CAAC,WAAW;gBAHpB,aAAa,EAAE,aAAa,EACnB,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,EACtC,UAAU,EAAE,mBAAmB,EAC/B,WAAW,uBAA0C;IAOhE,iBAAiB,CAAC,YAAY,EAAE,QAAQ,CAAC,aAAa,CAAC,GAAG,IAAI;IAKxD,eAAe,CACnB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,UAAU,EAClB,aAAa;;;;OAAmB,GAC/B,OAAO,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;IAqBvC,iBAAiB,CACrB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,iBAAiB,CAAC;IASvB,SAAS,CACb,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,aAAa,EACrB,aAAa;;;;OAAmB,GAC/B,OAAO,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;IAatC,iBAAiB,CACrB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,qBAAqB,EAC7B,aAAa;;;;OAAmB,GAC/B,OAAO,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;CAuB9C"}

package/dist/hook/HyperlaneHookDeployer.js

@@ -6,91 +6,72 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HyperlaneHookDeployer = void 0;
 const debug_1 = __importDefault(require("debug"));
 const core_1 = require("@hyperlane-xyz/core");
-const utils_1 = require("@hyperlane-xyz/utils");
 const HyperlaneDeployer_1 = require("../deploy/HyperlaneDeployer");
-const config_1 = require("./config");
+const HyperlaneIgpDeployer_1 = require("../gas/HyperlaneIgpDeployer");
 const contracts_1 = require("./contracts");
+const types_1 = require("./types");
 class HyperlaneHookDeployer extends HyperlaneDeployer_1.HyperlaneDeployer {
-    constructor(multiProvider) {
+    constructor(multiProvider, core, ismFactory, igpDeployer = new HyperlaneIgpDeployer_1.HyperlaneIgpDeployer(multiProvider)) {
         super(multiProvider, contracts_1.hookFactories, {
             logger: (0, debug_1.default)('hyperlane:HookDeployer'),
         });
+        this.core = core;
+        this.ismFactory = ismFactory;
+        this.igpDeployer = igpDeployer;
     }
-    async deploy(configMap) {
-        let ismContracts;
-        let hookContracts;
-        // Process ISM configs first
-        for (const [chain, config] of Object.entries(configMap)) {
-            if ((0, config_1.isISMConfig)(config)) {
-                ismContracts = await this.deployContracts(chain, config);
+    cacheAddressesMap(addressesMap) {
+        this.igpDeployer.cacheAddressesMap(addressesMap);
+        super.cacheAddressesMap(addressesMap);
+    }
+    async deployContracts(chain, config, coreAddresses = this.core[chain]) {
+        // other simple hooks can go here
+        if (config.type === types_1.HookType.MERKLE_TREE) {
+            const mailbox = coreAddresses.mailbox;
+            if (!mailbox) {
+                throw new Error(`Mailbox address is required for ${config.type}`);
             }
+            const hook = await this.deployContract(chain, config.type, [mailbox]);
+            return { [config.type]: hook };
         }
-        // Ensure ISM contracts have been deployed
-        if (!ismContracts || !ismContracts?.optimismISM) {
-            throw new Error('ISM contracts not deployed');
+        else if (config.type === types_1.HookType.INTERCHAIN_GAS_PAYMASTER) {
+            return this.deployIgp(chain, config, coreAddresses);
         }
-        // Then process hook configs
-        for (const [chain, config] of Object.entries(configMap)) {
-            if ((0, config_1.isHookConfig)(config)) {
-                config.remoteIsm = ismContracts.optimismISM.address;
-                this.logger(`Remote ISM address set as ${config.remoteIsm}`);
-                hookContracts = await this.deployContracts(chain, config);
-            }
+        else if (config.type === types_1.HookType.AGGREGATION) {
+            return this.deployAggregation(chain, config, coreAddresses);
         }
-        // Ensure hook contracts have been deployed
-        if (!hookContracts || !hookContracts?.optimismMessageHook) {
-            throw new Error('Hook contracts not deployed');
+        else if (config.type === types_1.HookType.PROTOCOL_FEE) {
+            const hook = await this.deployProtocolFee(chain, config);
+            return { [config.type]: hook };
         }
-        const hookAddress = hookContracts.optimismMessageHook.address;
-        this.logger(`Setting hook address ${hookAddress} for OptimismISM`);
-        await ismContracts.optimismISM.setOptimismHook(hookAddress);
-        const deployedContractMap = {
-            optimismISM: ismContracts.optimismISM,
-            testRecipient: ismContracts.testRecipient,
-            optimismMessageHook: hookContracts.optimismMessageHook,
-        };
-        return deployedContractMap;
+        throw new Error(`Unexpected hook type: ${JSON.stringify(config)}`);
     }
-    async deployContracts(chain, hookConfig) {
-        let optimismISM, optimismMessageHook, testRecipient;
-        this.logger(`Deploying ${hookConfig.hookContractType} on ${chain}`);
-        if ((0, config_1.isISMConfig)(hookConfig)) {
-            optimismISM = await this.deployOptimismISM(chain, hookConfig.nativeBridge);
-            testRecipient = await this.deployTestRecipient(chain, optimismISM.address);
-            this.logger(`Deployed test recipient on ${chain} at ${(0, utils_1.addressToBytes32)(testRecipient.address)}`);
-            return {
-                optimismISM,
-                testRecipient,
-            };
-        }
-        else if ((0, config_1.isHookConfig)(hookConfig)) {
-            optimismMessageHook = await this.deployOptimismMessageHook(chain, hookConfig.destinationDomain, hookConfig.nativeBridge, hookConfig.remoteIsm);
-            return {
-                optimismMessageHook,
-            };
-        }
-        return {};
+    async deployProtocolFee(chain, config) {
+        return this.deployContract(chain, types_1.HookType.PROTOCOL_FEE, [
+            config.maxProtocolFee,
+            config.protocolFee,
+            config.beneficiary,
+            config.owner,
+        ]);
     }
-    async deployOptimismISM(chain, nativeBridge) {
-        const signer = this.multiProvider.getSigner(chain);
-        const optimismISM = await new core_1.OptimismISM__factory(signer).deploy(nativeBridge);
-        await this.multiProvider.handleTx(chain, optimismISM.deployTransaction);
-        this.logger(`Deployed OptimismISM on ${chain} at ${optimismISM.address}`);
-        return optimismISM;
-    }
-    async deployTestRecipient(chain, ism) {
-        const signer = this.multiProvider.getSigner(chain);
-        const testRecipient = await new core_1.TestRecipient__factory(signer).deploy();
-        await this.multiProvider.handleTx(chain, testRecipient.deployTransaction);
-        await testRecipient.setInterchainSecurityModule(ism);
-        return testRecipient;
+    async deployIgp(chain, config, coreAddresses = this.core[chain]) {
+        if (coreAddresses.proxyAdmin) {
+            this.igpDeployer.writeCache(chain, 'proxyAdmin', coreAddresses.proxyAdmin);
+        }
+        const igpContracts = await this.igpDeployer.deployContracts(chain, config);
+        this.addDeployedContracts(chain, igpContracts);
+        return igpContracts;
     }
-    async deployOptimismMessageHook(chain, destinationDomain, nativeBridge, optimismISM) {
-        const signer = this.multiProvider.getSigner(chain);
-        const optimismMessageHook = await new core_1.OptimismMessageHook__factory(signer).deploy(destinationDomain, nativeBridge, optimismISM);
-        await this.multiProvider.handleTx(chain, optimismMessageHook.deployTransaction);
-        this.logger(`Deployed OptimismMessageHook on ${chain} at ${optimismMessageHook.address}`);
-        return optimismMessageHook;
+    async deployAggregation(chain, config, coreAddresses = this.core[chain]) {
+        const aggregatedHooks = [];
+        let hooks = {};
+        for (const hookConfig of config.hooks) {
+            const subhooks = await this.deployContracts(chain, hookConfig, coreAddresses);
+            aggregatedHooks.push(subhooks[hookConfig.type].address);
+            hooks = { ...hooks, ...subhooks };
+        }
+        const address = await this.ismFactory.deployStaticAddressSet(chain, this.ismFactory.getContracts(chain).aggregationHookFactory, aggregatedHooks);
+        hooks[types_1.HookType.AGGREGATION] = core_1.StaticAggregationHook__factory.connect(address, this.multiProvider.getSignerOrProvider(chain));
+        return hooks;
     }
 }
 exports.HyperlaneHookDeployer = HyperlaneHookDeployer;

package/dist/hook/HyperlaneHookDeployer.js.map

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