fix: proxy factory impl names

hyperlane-xyz · Mar 21, 2024 · c781caf · c781caf
1 parent d224c06
commit c781caf
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 23 deletions.
diff --git a/typescript/cli/src/deploy/warp.ts b/typescript/cli/src/deploy/warp.ts
@@ -151,7 +151,7 @@ async function runBuildConfigStep({
         base.interchainSecurityModule ||
         mergedContractAddrs[baseChainName]?.interchainSecurityModule ||
         mergedContractAddrs[baseChainName]?.multisigIsm,
-      // ismFactory: mergedContractAddrs[baseChainName].routingIsmFactory, // TODO fix when updating from routingIsm
+      // ismFactory: mergedContractAddrs[baseChainName].domainRoutingIsmFactory, // TODO fix when updating from routingIsm
       foreignDeployment: base.foreignDeployment,
       name: baseMetadata.name,
       symbol: baseMetadata.symbol,
@@ -172,7 +172,7 @@ async function runBuildConfigStep({
         synthetic.interchainSecurityModule ||
         mergedContractAddrs[sChainName]?.interchainSecurityModule ||
         mergedContractAddrs[sChainName]?.multisigIsm,
-      // ismFactory: mergedContractAddrs[sChainName].routingIsmFactory, // TODO fix
+      // ismFactory: mergedContractAddrs[sChainName].domainRoutingIsmFactory, // TODO fix
       foreignDeployment: synthetic.foreignDeployment,
     };
   }

diff --git a/typescript/sdk/src/deploy/contracts.ts b/typescript/sdk/src/deploy/contracts.ts
@@ -7,12 +7,13 @@ import {
 } from '@hyperlane-xyz/core';
 
 export const proxyFactoryFactories = {
-  merkleRootMultisigIsmFactory:
+  staticMerkleRootMultisigIsmFactory:
     new StaticMerkleRootMultisigIsmFactory__factory(),
-  messageIdMultisigIsmFactory: new StaticMessageIdMultisigIsmFactory__factory(),
-  aggregationIsmFactory: new StaticAggregationIsmFactory__factory(),
-  aggregationHookFactory: new StaticAggregationHookFactory__factory(),
-  routingIsmFactory: new DomainRoutingIsmFactory__factory(),
+  staticMessageIdMultisigIsmFactory:
+    new StaticMessageIdMultisigIsmFactory__factory(),
+  staticAggregationIsmFactory: new StaticAggregationIsmFactory__factory(),
+  staticAggregationHookFactory: new StaticAggregationHookFactory__factory(),
+  domainRoutingIsmFactory: new DomainRoutingIsmFactory__factory(),
 };
 
 export type ProxyFactoryFactories = typeof proxyFactoryFactories;
@@ -21,9 +22,9 @@ type ProxyFactoryImplementations = Record<keyof ProxyFactoryFactories, string>;
 
 // must match contract names for verification
 export const proxyFactoryImplementations: ProxyFactoryImplementations = {
-  merkleRootMultisigIsmFactory: 'StaticMerkleRootMultisigIsm',
-  messageIdMultisigIsmFactory: 'StaticMessageIdMultisigIsm',
-  aggregationIsmFactory: 'StaticAggregationIsm',
-  aggregationHookFactory: 'StaticAggregationHook',
-  routingIsmFactory: 'DomaingRoutingIsm',
+  staticMerkleRootMultisigIsmFactory: 'StaticMerkleRootMultisigIsm',
+  staticMessageIdMultisigIsmFactory: 'StaticMessageIdMultisigIsm',
+  staticAggregationIsmFactory: 'StaticAggregationIsm',
+  staticAggregationHookFactory: 'StaticAggregationHook',
+  domainRoutingIsmFactory: 'DomaingRoutingIsm',
 };
diff --git a/typescript/sdk/src/hook/HyperlaneHookDeployer.ts b/typescript/sdk/src/hook/HyperlaneHookDeployer.ts
@@ -166,7 +166,7 @@ export class HyperlaneHookDeployer extends HyperlaneDeployer<
     );
     const address = await this.ismFactory.deployStaticAddressSet(
       chain,
-      this.ismFactory.getContracts(chain).aggregationHookFactory,
+      this.ismFactory.getContracts(chain).staticAggregationHookFactory,
       aggregatedHooks,
       this.logger,
     );

diff --git a/typescript/sdk/src/ism/HyperlaneIsmFactory.ts b/typescript/sdk/src/ism/HyperlaneIsmFactory.ts
@@ -210,8 +210,8 @@ export class HyperlaneIsmFactory extends HyperlaneApp<ProxyFactoryFactories> {
     const signer = this.multiProvider.getSigner(destination);
     const multisigIsmFactory =
       config.type === IsmType.MERKLE_ROOT_MULTISIG
-        ? this.getContracts(destination).merkleRootMultisigIsmFactory
-        : this.getContracts(destination).messageIdMultisigIsmFactory;
+        ? this.getContracts(destination).staticMerkleRootMultisigIsmFactory
+        : this.getContracts(destination).staticMessageIdMultisigIsmFactory;
 
     const address = await this.deployStaticAddressSet(
       destination,
@@ -234,7 +234,8 @@ export class HyperlaneIsmFactory extends HyperlaneApp<ProxyFactoryFactories> {
   }): Promise<IRoutingIsm> {
     const { destination, config, mailbox, existingIsmAddress } = params;
     const overrides = this.multiProvider.getTransactionOverrides(destination);
-    const routingIsmFactory = this.getContracts(destination).routingIsmFactory;
+    const domainRoutingIsmFactory =
+      this.getContracts(destination).domainRoutingIsmFactory;
     let routingIsm: DomainRoutingIsm | DefaultFallbackRoutingIsm;
     // filtering out domains which are not part of the multiprovider
     config.domains = objFilter(
@@ -359,7 +360,7 @@ export class HyperlaneIsmFactory extends HyperlaneApp<ProxyFactoryFactories> {
         );
       } else {
         // deploying new domain routing ISM
-        const tx = await routingIsmFactory.deploy(
+        const tx = await domainRoutingIsmFactory.deploy(
           config.owner,
           safeConfigDomains,
           submoduleAddresses,
@@ -371,7 +372,7 @@ export class HyperlaneIsmFactory extends HyperlaneApp<ProxyFactoryFactories> {
         const dispatchLogs = receipt.logs
           .map((log) => {
             try {
-              return routingIsmFactory.interface.parseLog(log);
+              return domainRoutingIsmFactory.interface.parseLog(log);
             } catch (e) {
               return undefined;
             }
@@ -402,8 +403,8 @@ export class HyperlaneIsmFactory extends HyperlaneApp<ProxyFactoryFactories> {
   }): Promise<IAggregationIsm> {
     const { destination, config, origin, mailbox } = params;
     const signer = this.multiProvider.getSigner(destination);
-    const aggregationIsmFactory =
-      this.getContracts(destination).aggregationIsmFactory;
+    const staticAggregationIsmFactory =
+      this.getContracts(destination).staticAggregationIsmFactory;
     const addresses: Address[] = [];
     for (const module of config.modules) {
       const submodule = await this.deploy({
@@ -416,7 +417,7 @@ export class HyperlaneIsmFactory extends HyperlaneApp<ProxyFactoryFactories> {
     }
     const address = await this.deployStaticAddressSet(
       destination,
-      aggregationIsmFactory,
+      staticAggregationIsmFactory,
       addresses,
       params.logger,
       config.threshold,

diff --git a/typescript/sdk/src/ism/utils.ts b/typescript/sdk/src/ism/utils.ts
@@ -192,7 +192,7 @@ export async function moduleMatchesConfig(
     case IsmType.MERKLE_ROOT_MULTISIG: {
       // A MerkleRootMultisigIsm matches if validators and threshold match the config
       const expectedAddress =
-        await contracts.merkleRootMultisigIsmFactory.getAddress(
+        await contracts.staticMerkleRootMultisigIsmFactory.getAddress(
           config.validators.sort(),
           config.threshold,
         );
@@ -202,7 +202,7 @@ export async function moduleMatchesConfig(
     case IsmType.MESSAGE_ID_MULTISIG: {
       // A MessageIdMultisigIsm matches if validators and threshold match the config
       const expectedAddress =
-        await contracts.messageIdMultisigIsmFactory.getAddress(
+        await contracts.staticMessageIdMultisigIsmFactory.getAddress(
           config.validators.sort(),
           config.threshold,
         );