Try/catch L1 contract deploy

Author: spalladino

yarn-project/cli/src/cmds/devnet/bootstrap_network.ts

@@ -140,10 +140,12 @@ async function deployERC20(l1Client: ExtendedViemWalletClient) {
   const { TestERC20Abi, TestERC20Bytecode, TokenPortalAbi, TokenPortalBytecode } = await import('@aztec/l1-artifacts');
 
   const erc20: ContractArtifacts = {
+    name: 'TestERC20',
     contractAbi: TestERC20Abi,
     contractBytecode: TestERC20Bytecode,
   };
   const portal: ContractArtifacts = {
+    name: 'TokenPortal',
     contractAbi: TokenPortalAbi,
     contractBytecode: TokenPortalBytecode,
   };

yarn-project/ethereum/src/deploy_l1_contracts.ts

@@ -62,6 +62,7 @@ import {
   getL1TxUtilsConfigEnvVars,
 } from './l1_tx_utils.js';
 import type { ExtendedViemWalletClient } from './types.js';
+import { formatViemError } from './utils.js';
 import { ZK_PASSPORT_SCOPE, ZK_PASSPORT_SUB_SCOPE, ZK_PASSPORT_VERIFIER_ADDRESS } from './zkPassportVerifierAddress.js';
 
 export const DEPLOYER_ADDRESS: Hex = '0x4e59b44847b379578588920cA78FbF26c0B4956C';
@@ -103,6 +104,10 @@ export interface Libraries {
  * Contract artifacts
  */
 export interface ContractArtifacts {
+  /**
+   * The contract name.
+   */
+  name: string;
   /**
    * The contract abi.
    */
@@ -155,7 +160,7 @@ export const deploySharedContracts = async (
   args: DeployL1ContractsArgs,
   logger: Logger,
 ) => {
-  logger.info(`Deploying shared contracts. Network configration: ${networkName}`);
+  logger.info(`Deploying shared contracts for network configration: ${networkName}`);
 
   const txHashes: Hex[] = [];
 
@@ -998,21 +1003,27 @@ export class L1Deployer {
   }
 
   async deploy(params: ContractArtifacts, args: readonly unknown[] = []): Promise<EthAddress> {
-    const { txHash, address } = await deployL1Contract(
-      this.client,
-      params.contractAbi,
-      params.contractBytecode,
-      args,
-      this.salt,
-      params.libraries,
-      this.logger,
-      this.l1TxUtils,
-      this.acceleratedTestDeployments,
-    );
-    if (txHash) {
-      this.txHashes.push(txHash);
+    this.logger.debug(`Deploying ${params.name} contract`, { args });
+    try {
+      const { txHash, address } = await deployL1Contract(
+        this.client,
+        params.contractAbi,
+        params.contractBytecode,
+        args,
+        this.salt,
+        params.libraries,
+        this.logger,
+        this.l1TxUtils,
+        this.acceleratedTestDeployments,
+      );
+      if (txHash) {
+        this.txHashes.push(txHash);
+      }
+      this.logger.debug(`Deployed ${params.name} at ${address}`, { args });
+      return address;
+    } catch (error) {
+      throw new Error(`Failed to deploy ${params.name}`, { cause: formatViemError(error) });
     }
-    return address;
   }
 
   async waitForDeployments(): Promise<void> {

yarn-project/ethereum/src/l1_artifacts.ts

@@ -49,35 +49,42 @@ import {
 import type { Hex } from 'viem';
 
 export const RegistryArtifact = {
+  name: 'Registry',
   contractAbi: RegistryAbi,
   contractBytecode: RegistryBytecode as Hex,
 };
 
 export const InboxArtifact = {
+  name: 'Inbox',
   contractAbi: InboxAbi,
   contractBytecode: InboxBytecode as Hex,
 };
 
 export const OutboxArtifact = {
+  name: 'Outbox',
   contractAbi: OutboxAbi,
   contractBytecode: OutboxBytecode as Hex,
 };
 
 export const RollupArtifact = {
+  name: 'Rollup',
   contractAbi: RollupAbi,
   contractBytecode: RollupBytecode as Hex,
   libraries: {
     linkReferences: RollupLinkReferences,
     libraryCode: {
       ValidatorSelectionLib: {
+        name: 'ValidatorSelectionLib',
         contractAbi: ValidatorSelectionLibAbi,
         contractBytecode: ValidatorSelectionLibBytecode as Hex,
       },
       ExtRollupLib: {
+        name: 'ExtRollupLib',
         contractAbi: ExtRollupLibAbi,
         contractBytecode: ExtRollupLibBytecode as Hex,
       },
       ExtRollupLib2: {
+        name: 'ExtRollupLib2',
         contractAbi: ExtRollupLib2Abi,
         contractBytecode: ExtRollupLib2Bytecode as Hex,
       },
@@ -86,82 +93,98 @@ export const RollupArtifact = {
 };
 
 export const StakingAssetArtifact = {
+  name: 'StakingAsset',
   contractAbi: TestERC20Abi,
   contractBytecode: TestERC20Bytecode as Hex,
 };
 
 export const FeeAssetArtifact = {
+  name: 'FeeAsset',
   contractAbi: TestERC20Abi,
   contractBytecode: TestERC20Bytecode as Hex,
 };
 
 export const FeeJuicePortalArtifact = {
+  name: 'FeeJuicePortal',
   contractAbi: FeeJuicePortalAbi,
   contractBytecode: FeeJuicePortalBytecode as Hex,
 };
 
 export const RewardDistributorArtifact = {
+  name: 'RewardDistributor',
   contractAbi: RewardDistributorAbi,
   contractBytecode: RewardDistributorBytecode as Hex,
 };
 
 export const CoinIssuerArtifact = {
+  name: 'CoinIssuer',
   contractAbi: CoinIssuerAbi,
   contractBytecode: CoinIssuerBytecode as Hex,
 };
 
 export const GovernanceProposerArtifact = {
+  name: 'GovernanceProposer',
   contractAbi: GovernanceProposerAbi,
   contractBytecode: GovernanceProposerBytecode as Hex,
 };
 
 export const GovernanceArtifact = {
+  name: 'Governance',
   contractAbi: GovernanceAbi,
   contractBytecode: GovernanceBytecode as Hex,
 };
 
 export const SlashFactoryArtifact = {
+  name: 'SlashFactory',
   contractAbi: SlashFactoryAbi,
   contractBytecode: SlashFactoryBytecode as Hex,
 };
 
 export const RegisterNewRollupVersionPayloadArtifact = {
+  name: 'RegisterNewRollupVersionPayload',
   contractAbi: RegisterNewRollupVersionPayloadAbi,
   contractBytecode: RegisterNewRollupVersionPayloadBytecode as Hex,
 };
 
 export const FeeAssetHandlerArtifact = {
+  name: 'FeeAssetHandler',
   contractAbi: FeeAssetHandlerAbi,
   contractBytecode: FeeAssetHandlerBytecode as Hex,
 };
 
 export const StakingAssetHandlerArtifact = {
+  name: 'StakingAssetHandler',
   contractAbi: StakingAssetHandlerAbi,
   contractBytecode: StakingAssetHandlerBytecode as Hex,
 };
 
 export const MultiAdderArtifact = {
+  name: 'MultiAdder',
   contractAbi: MultiAdderAbi,
   contractBytecode: MultiAdderBytecode as Hex,
 };
 
 export const GSEArtifact = {
+  name: 'GSE',
   contractAbi: GSEAbi,
   contractBytecode: GSEBytecode as Hex,
 };
 
 // Verifier artifacts
 export const HonkVerifierArtifact = {
+  name: 'HonkVerifier',
   contractAbi: HonkVerifierAbi,
   contractBytecode: HonkVerifierBytecode as Hex,
 };
 
 export const MockVerifierArtifact = {
+  name: 'MockVerifier',
   contractAbi: MockVerifierAbi,
   contractBytecode: MockVerifierBytecode as Hex,
 };
 
 export const MockZkPassportVerifierArtifact = {
+  name: 'MockZkPassportVerifier',
   contractAbi: MockZKPassportVerifierAbi,
   contractBytecode: MockZKPassportVerifierBytecode as Hex,
 };