@aztec/ethereum 0.0.1-commit.c80b6263 → 0.0.1-commit.cf93bcc56

package/dest/deploy_aztec_l1_contracts.js

@@ -11,7 +11,7 @@ import { cpSync, existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, write
 import { tmpdir } from 'os';
 import { dirname, join, resolve } from 'path';
 import readline from 'readline';
-import { foundry, mainnet, sepolia } from 'viem/chains';
+import { mainnet, sepolia } from 'viem/chains';
 import { createEthereumChain, isAnvilTestChain } from './chain.js';
 import { createExtendedL1Client } from './client.js';
 import { deployMulticall3 } from './contracts/multicall.js';
@@ -19,9 +19,9 @@ import { RollupContract } from './contracts/rollup.js';
 const logger = createLogger('ethereum:deploy_aztec_l1_contracts');
 const JSON_DEPLOY_RESULT_PREFIX = 'JSON DEPLOY RESULT:';
 /**
- * Runs a process with the given command, arguments, and environment.
- * If the process outputs a line starting with JSON_DEPLOY_RESULT_PREFIX,
- * the JSON is parsed and returned.
+ * Runs a process and parses JSON deploy results from stdout.
+ * Lines starting with JSON_DEPLOY_RESULT_PREFIX are parsed and returned.
+ * All other stdout goes to logger.info, stderr goes to logger.warn.
  */ function runProcess(command, args, env, cwd) {
     const { promise, resolve, reject } = promiseWithResolvers();
     const proc = spawn(command, args, {
@@ -37,27 +37,42 @@ const JSON_DEPLOY_RESULT_PREFIX = 'JSON DEPLOY RESULT:';
         ]
     });
     let result;
+    let parseError;
+    let settled = false;
     readline.createInterface({
         input: proc.stdout
     }).on('line', (line)=>{
         const trimmedLine = line.trim();
         if (trimmedLine.startsWith(JSON_DEPLOY_RESULT_PREFIX)) {
             const jsonStr = trimmedLine.slice(JSON_DEPLOY_RESULT_PREFIX.length).trim();
-            // TODO(AD): should this be a zod parse?
-            result = JSON.parse(jsonStr);
+            try {
+                result = JSON.parse(jsonStr);
+            } catch  {
+                parseError = new Error(`Failed to parse deploy result JSON: ${jsonStr.slice(0, 200)}`);
+            }
         } else {
             logger.info(line);
         }
     });
     readline.createInterface({
         input: proc.stderr
-    }).on('line', logger.error.bind(logger));
+    }).on('line', logger.warn.bind(logger));
     proc.on('error', (error)=>{
+        if (settled) {
+            return;
+        }
+        settled = true;
         reject(new Error(`Failed to spawn ${command}: ${error.message}`));
     });
     proc.on('close', (code)=>{
+        if (settled) {
+            return;
+        }
+        settled = true;
         if (code !== 0) {
-            reject(new Error(`${command} exited with code ${code}. See logs for details.\n`));
+            reject(new Error(`${command} exited with code ${code}`));
+        } else if (parseError) {
+            reject(parseError);
         } else {
             resolve(result);
         }
@@ -137,6 +152,9 @@ function cleanupDeployDir() {
     const foundryTomlPath = join(basePath, 'foundry.toml');
     let foundryToml = readFileSync(foundryTomlPath, 'utf-8');
     const solcPathMatch = foundryToml.match(/solc\s*=\s*"\.\/solc-([^"]+)"/);
+    // Did we find a hardcoded solc path that we need to make absolute?
+    // This code path happens in CI currently as we bundle solc there to avoid race conditions when
+    // downloading solc.
     if (solcPathMatch) {
         const solcVersion = solcPathMatch[1];
         const absoluteSolcPath = join(basePath, `solc-${solcVersion}`);
@@ -225,11 +243,8 @@ function cleanupDeployDir() {
     if (isVerifiableChain && !process.env.ETHERSCAN_API_KEY) {
         logger.warn(`Deploying to chain ${chainId} (${chainId === mainnet.id ? 'mainnet' : 'sepolia'}) without ETHERSCAN_API_KEY. ` + `Contracts will NOT be verified on Etherscan. Set ETHERSCAN_API_KEY environment variable to enable verification.`);
     }
-    // From heuristic testing. More caused issues with anvil.
-    const MAGIC_ANVIL_BATCH_SIZE = 8;
-    // Anvil seems to stall with unbounded batch size. Otherwise no max batch size is desirable.
+    const scriptPath = join(getL1ContractsPath(), 'scripts', 'forge_broadcast.js');
     const forgeArgs = [
-        'script',
         FORGE_SCRIPT,
         '--sig',
         'run()',
@@ -237,11 +252,6 @@ function cleanupDeployDir() {
         privateKey,
         '--rpc-url',
         rpcUrl,
-        '--broadcast',
-        ...chainId === foundry.id ? [
-            '--batch-size',
-            MAGIC_ANVIL_BATCH_SIZE.toString()
-        ] : [],
         ...shouldVerify ? [
             '--verify'
         ] : []
@@ -252,7 +262,10 @@ function cleanupDeployDir() {
         FOUNDRY_PROFILE: chainId === mainnet.id ? 'production' : undefined,
         ...getDeployAztecL1ContractsEnvVars(args)
     };
-    const result = await runProcess('forge', forgeArgs, forgeEnv, l1ContractsPath);
+    const result = await runProcess(process.execPath, [
+        scriptPath,
+        ...forgeArgs
+    ], forgeEnv, l1ContractsPath);
     if (!result) {
         throw new Error('Forge script did not output deployment result');
     }
@@ -364,16 +377,15 @@ export function getDeployRollupForUpgradeEnvVars(args) {
     const l1ContractsPath = prepareL1ContractsForDeployment();
     const FORGE_SCRIPT = 'script/deploy/DeployRollupForUpgrade.s.sol';
     await maybeForgeForceProductionBuild(l1ContractsPath, FORGE_SCRIPT, chainId);
+    const scriptPath = join(getL1ContractsPath(), 'scripts', 'forge_broadcast.js');
     const forgeArgs = [
-        'script',
         FORGE_SCRIPT,
         '--sig',
         'run()',
         '--private-key',
         privateKey,
         '--rpc-url',
-        rpcUrl,
-        '--broadcast'
+        rpcUrl
     ];
     const forgeEnv = {
         FOUNDRY_PROFILE: chainId === mainnet.id ? 'production' : undefined,
@@ -382,7 +394,10 @@ export function getDeployRollupForUpgradeEnvVars(args) {
         NETWORK: getActiveNetworkName(),
         ...getDeployRollupForUpgradeEnvVars(args)
     };
-    const result = await runProcess('forge', forgeArgs, forgeEnv, l1ContractsPath);
+    const result = await runProcess(process.execPath, [
+        scriptPath,
+        ...forgeArgs
+    ], forgeEnv, l1ContractsPath);
     if (!result) {
         throw new Error('Forge script did not output deployment result');
     }

package/dest/deploy_l1_contract.js

@@ -5,7 +5,7 @@ import { concatHex, encodeAbiParameters, encodeDeployData, getContractAddress, n
 import { DEPLOYER_ADDRESS } from './deploy_aztec_l1_contracts.js';
 import { RegisterNewRollupVersionPayloadArtifact } from './l1_artifacts.js';
 import { getL1TxUtilsConfigEnvVars } from './l1_tx_utils/config.js';
-import { createL1TxUtilsFromViemWallet } from './l1_tx_utils/factory.js';
+import { createL1TxUtils } from './l1_tx_utils/factory.js';
 import { formatViemError } from './utils.js';
 export class L1Deployer {
     client;
@@ -28,7 +28,7 @@ export class L1Deployer {
         this.salt = maybeSalt ? padHex(numberToHex(maybeSalt), {
             size: 32
         }) : undefined;
-        this.l1TxUtils = createL1TxUtilsFromViemWallet(this.client, {
+        this.l1TxUtils = createL1TxUtils(this.client, {
             logger: this.logger,
             dateProvider
         }, {
@@ -130,7 +130,7 @@ export class L1Deployer {
     let { l1TxUtils } = opts;
     if (!l1TxUtils) {
         const config = getL1TxUtilsConfigEnvVars();
-        l1TxUtils = createL1TxUtilsFromViemWallet(extendedClient, {
+        l1TxUtils = createL1TxUtils(extendedClient, {
             logger
         }, {
             ...config,