chore: minor changes & refactoring

hyperlane-xyz · Oct 9, 2024 · 8b5afe3 · 8b5afe3
1 parent 9bf46bc
commit 8b5afe3
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 62 deletions.
diff --git a/typescript/cli/local-warp-deploy.sh b/typescript/cli/local-warp-deploy.sh
diff --git a/typescript/cli/local-warp-test.sh b/typescript/cli/local-warp-test.sh
diff --git a/typescript/cli/localCore.sh b/typescript/cli/localCore.sh
diff --git a/typescript/cli/localSendMessage.sh b/typescript/cli/localSendMessage.sh
diff --git a/typescript/sdk/build-sdk-cli.sh b/typescript/sdk/build-sdk-cli.sh
diff --git a/typescript/sdk/src/deploy/EvmModuleDeployer.ts b/typescript/sdk/src/deploy/EvmModuleDeployer.ts
@@ -7,7 +7,7 @@ import {
   TransparentUpgradeableProxy__factory,
 } from '@hyperlane-xyz/core';
 import { buildArtifact as coreBuildArtifact } from '@hyperlane-xyz/core/buildArtifact.js';
-import { Address, rootLogger } from '@hyperlane-xyz/utils';
+import { Address, addBufferToGasLimit, rootLogger } from '@hyperlane-xyz/utils';
 
 import { HyperlaneContracts, HyperlaneFactories } from '../contracts/types.js';
 import { MultiProvider } from '../providers/MultiProvider.js';
@@ -267,6 +267,7 @@ export class EvmModuleDeployer<Factories extends HyperlaneFactories> {
       values,
       threshold,
     );
+    const signer = multiProvider.getSigner(chain);
     const code = await multiProvider.getProvider(chain).getCode(address);
     if (code === '0x') {
       logger.debug(
@@ -275,15 +276,14 @@ export class EvmModuleDeployer<Factories extends HyperlaneFactories> {
       const overrides = multiProvider.getTransactionOverrides(chain);
 
       // estimate gas
-      // const estimatedGas = await factory.estimateGas['deploy(address[],uint8)'](
-      //   values,
-      //   threshold,
-      //   overrides,
-      // );
+      const estimatedGas = await factory
+        .connect(signer)
+        .estimateGas['deploy(address[],uint8)'](values, threshold, overrides);
 
       // add 10% buffer
       const hash = await factory['deploy(address[],uint8)'](values, threshold, {
         ...overrides,
+        gasLimit: addBufferToGasLimit(estimatedGas),
       });
 
       await multiProvider.handleTx(chain, hash);

diff --git a/typescript/sdk/src/deploy/HyperlaneDeployer.ts b/typescript/sdk/src/deploy/HyperlaneDeployer.ts
@@ -409,7 +409,7 @@ export abstract class HyperlaneDeployer<
     );
 
     const { protocol } = this.multiProvider.getChainMetadata(chain);
-
+    const signer = this.multiProvider.getSigner(chain);
     const artifact = getArtifactByContractName(contractName);
 
     const contract = await this.multiProvider.handleDeploy(
@@ -436,32 +436,15 @@ export abstract class HyperlaneDeployer<
 
         const overrides = this.multiProvider.getTransactionOverrides(chain);
 
-        let enhancedOverrides;
-        if (protocol === ProtocolType.ZKSync) {
-          this.logger.info('Skipping gas estimation on ZKSync...');
-
-          // deploy with 10% buffer on gas limit
-          enhancedOverrides = {
-            // TODO: zksync gas estimation
-            ...overrides,
-          };
-        } else {
-          // Estimate gas for the initialize transaction
-          const estimatedGas = await contract.estimateGas.initialize(
-            ...initializeArgs,
-          );
-
-          // deploy with 10% buffer on gas limit
-          enhancedOverrides = {
-            gasLimit: addBufferToGasLimit(estimatedGas),
-            ...overrides,
-          };
-        }
+        // Estimate gas for the initialize transaction
+        const estimatedGas = await contract
+          .connect(signer)
+          .estimateGas.initialize(...initializeArgs);
 
-        const initTx = await contract.initialize(
-          ...initializeArgs,
-          enhancedOverrides,
-        );
+        const initTx = await contract.initialize(...initializeArgs, {
+          ...overrides,
+          gasLimit: addBufferToGasLimit(estimatedGas),
+        });
         this.logger.info(`Contract ${contractName} initialized`);
         const receipt = await this.multiProvider.handleTx(chain, initTx);
 

diff --git a/typescript/sdk/src/ism/EvmIsmModule.ts b/typescript/sdk/src/ism/EvmIsmModule.ts
@@ -26,6 +26,7 @@ import {
   Address,
   Domain,
   ProtocolType,
+  addBufferToGasLimit,
   assert,
   deepEquals,
   eqAddress,
@@ -586,12 +587,12 @@ export class EvmIsmModule extends HyperlaneModule<
     );
 
     // estimate gas
-    // const estimatedGas = await domainRoutingIsmFactory.estimateGas.deploy(
-    //   owner,
-    //   domainIds,
-    //   submoduleAddresses,
-    //   overrides,
-    // );
+    const estimatedGas = await domainRoutingIsmFactory.estimateGas.deploy(
+      owner,
+      domainIds,
+      submoduleAddresses,
+      overrides,
+    );
 
     // deploying new domain routing ISM, add 10% buffer
     const tx = await domainRoutingIsmFactory.deploy(
@@ -600,6 +601,7 @@ export class EvmIsmModule extends HyperlaneModule<
       submoduleAddresses,
       {
         ...overrides,
+        gasLimit: addBufferToGasLimit(estimatedGas),
       },
     );
 

diff --git a/typescript/sdk/src/providers/MultiProvider.ts b/typescript/sdk/src/providers/MultiProvider.ts
@@ -10,7 +10,13 @@ import {
 import { Logger } from 'pino';
 import * as zk from 'zksync-ethers';
 
-import { Address, ProtocolType, pick, rootLogger } from '@hyperlane-xyz/utils';
+import {
+  Address,
+  ProtocolType,
+  addBufferToGasLimit,
+  pick,
+  rootLogger,
+} from '@hyperlane-xyz/utils';
 
 import { testChainMetadata, testChains } from '../consts/testChains.js';
 import { ChainMetadataManager } from '../metadata/ChainMetadataManager.js';
@@ -343,19 +349,25 @@ export class MultiProvider<MetaExt = {}> extends ChainMetadataManager<MetaExt> {
     const signer = this.getSigner(chainNameOrId);
 
     if (protocol === ProtocolType.ZKSync) {
+      // Handle deployment for ZKSync protocol
       const deployer = new ZKDeployer(signer as zk.Wallet);
 
-      contract = await deployer.deploy(artifact, params);
+      const estimatedGas = await deployer.estimateDeployGas(artifact, params);
+
+      contract = await deployer.deploy(artifact, params, {
+        gasLimit: addBufferToGasLimit(estimatedGas),
+        ...overrides,
+      });
 
       this.logger.trace(
         `Contract deployed at ${contract.address} on ${chainNameOrId}:`,
       );
     } else {
       const contractFactory = factory.connect(signer);
       const deployTx = contractFactory.getDeployTransaction(...params);
-      const gasEstimated = await signer.estimateGas(deployTx);
+      const estimatedGas = await signer.estimateGas(deployTx);
       contract = await contractFactory.deploy(...params, {
-        gasLimit: gasEstimated.mul(2), // 10% buffer
+        gasLimit: addBufferToGasLimit(estimatedGas), // 10% buffer
         ...overrides,
       });
 

diff --git a/typescript/sdk/src/providers/transactionFeeEstimators.ts b/typescript/sdk/src/providers/transactionFeeEstimators.ts
@@ -235,7 +235,6 @@ export function estimateTransactionFee({
   sender: Address;
   senderPubKey?: HexString;
 }): Promise<TransactionFeeEstimate> {
-  console.log({ type: transaction.type });
   if (
     transaction.type === ProviderType.EthersV5 &&
     provider.type === ProviderType.EthersV5