@aztec/ethereum 0.0.1-commit.3100065 → 0.0.1-commit.330febf

package/dest/deploy_aztec_l1_contracts.js

@@ -4,10 +4,10 @@ import { EthAddress } from '@aztec/foundation/eth-address';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
 import { createLogger } from '@aztec/foundation/log';
 import { promiseWithResolvers } from '@aztec/foundation/promise';
-import { fileURLToPath } from '@aztec/foundation/url';
 import { bn254 } from '@noble/curves/bn254';
 import { spawn } from 'child_process';
 import { cpSync, existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'fs';
+import { createRequire } from 'node:module';
 import { tmpdir } from 'os';
 import { dirname, join, resolve } from 'path';
 import readline from 'readline';
@@ -17,7 +17,9 @@ import { createExtendedL1Client } from './client.js';
 import { assertValidSlotDurations } from './config.js';
 import { deployMulticall3 } from './contracts/multicall.js';
 import { RollupContract } from './contracts/rollup.js';
+import { resolveFoundryBinary } from './foundry_binary.js';
 const logger = createLogger('ethereum:deploy_aztec_l1_contracts');
+const require = createRequire(import.meta.url);
 const JSON_DEPLOY_RESULT_PREFIX = 'JSON DEPLOY RESULT:';
 /**
  * Runs a process and parses JSON deploy results from stdout.
@@ -82,11 +84,11 @@ const JSON_DEPLOY_RESULT_PREFIX = 'JSON DEPLOY RESULT:';
 }
 // Covers an edge where where we may have a cached BlobLib that is not meant for production.
 // Despite the profile apparently sometimes cached code remains (so says Lasse after his ignition-monorepo arc).
-async function maybeForgeForceProductionBuild(l1ContractsPath, script, chainId) {
+async function maybeForgeForceProductionBuild(forgeBin, l1ContractsPath, script, chainId) {
     if (chainId === mainnet.id) {
         logger.info(`Recompiling ${script} with production profile for mainnet deployment`);
         logger.info('This may take a minute but ensures production BlobLib is used.');
-        await runProcess('forge', [
+        await runProcess(forgeBin, [
             'build',
             script,
             '--force'
@@ -96,14 +98,12 @@ async function maybeForgeForceProductionBuild(l1ContractsPath, script, chainId)
     }
 }
 /**
- * Gets the path to the l1-contracts foundry artifacts directory.
- * These are copied from l1-contracts to yarn-project/l1-artifacts/l1-contracts
- * during build to make yarn-project self-contained.
+ * Gets the path to the l1-contracts foundry artifacts directory bundled inside @aztec/l1-artifacts.
+ * Resolved through the package (its "." export -> dest/index.js) so it works whether the package is
+ * linked via portal (monorepo) or installed under node_modules (published npm) — resolution follows
+ * the symlink in the portal case. The bundled foundry subtree sits alongside dest/, at <pkg>/l1-contracts.
  */ export function getL1ContractsPath() {
-    const currentDir = dirname(fileURLToPath(import.meta.url));
-    // Go up from yarn-project/ethereum/dest to yarn-project, then to l1-artifacts/l1-contracts
-    const l1ContractsPath = resolve(currentDir, '..', '..', 'l1-artifacts', 'l1-contracts');
-    return l1ContractsPath;
+    return resolve(dirname(require.resolve('@aztec/l1-artifacts')), '..', 'l1-contracts');
 }
 // Cached deployment directory
 let preparedDeployDir;
@@ -237,8 +237,9 @@ function cleanupDeployDir() {
     }
     // Use foundry-artifacts from l1-artifacts package
     const l1ContractsPath = prepareL1ContractsForDeployment();
+    const forgeBin = resolveFoundryBinary('forge');
     const FORGE_SCRIPT = 'script/deploy/DeployAztecL1Contracts.s.sol';
-    await maybeForgeForceProductionBuild(l1ContractsPath, FORGE_SCRIPT, chainId);
+    await maybeForgeForceProductionBuild(forgeBin, l1ContractsPath, FORGE_SCRIPT, chainId);
     // Verify contracts on Etherscan when on mainnet/sepolia and ETHERSCAN_API_KEY is available.
     const isVerifiableChain = chainId === mainnet.id || chainId === sepolia.id;
     const shouldVerify = isVerifiableChain && !!process.env.ETHERSCAN_API_KEY;
@@ -259,6 +260,8 @@ function cleanupDeployDir() {
         ] : []
     ];
     const forgeEnv = {
+        // Resolved forge binary picked up by forge_broadcast.js, so it works without forge on PATH.
+        FORGE_BIN: forgeBin,
         // Env vars required by l1-contracts/script/deploy/DeploymentConfiguration.sol.
         NETWORK: getActiveNetworkName(),
         FOUNDRY_PROFILE: chainId === mainnet.id ? 'production' : undefined,
@@ -368,7 +371,12 @@ export function getDeployRollupForUpgradeEnvVars(args) {
         AZTEC_SLASHING_OFFSET_IN_ROUNDS: args.slashingOffsetInRounds.toString(),
         AZTEC_SLASH_AMOUNT_SMALL: args.slashAmountSmall.toString(),
         AZTEC_SLASH_AMOUNT_MEDIUM: args.slashAmountMedium.toString(),
-        AZTEC_SLASH_AMOUNT_LARGE: args.slashAmountLarge.toString()
+        AZTEC_SLASH_AMOUNT_LARGE: args.slashAmountLarge.toString(),
+        AZTEC_ENTRY_QUEUE_BOOTSTRAP_VALIDATOR_SET_SIZE: args.entryQueueBootstrapValidatorSetSize.toString(),
+        AZTEC_ENTRY_QUEUE_BOOTSTRAP_FLUSH_SIZE: args.entryQueueBootstrapFlushSize.toString(),
+        AZTEC_ENTRY_QUEUE_FLUSH_SIZE_MIN: args.entryQueueFlushSizeMin.toString(),
+        AZTEC_ENTRY_QUEUE_FLUSH_SIZE_QUOTIENT: args.entryQueueFlushSizeQuotient.toString(),
+        AZTEC_ENTRY_QUEUE_MAX_FLUSH_SIZE: args.entryQueueMaxFlushSize.toString()
     };
 }
 /**
@@ -376,8 +384,9 @@ export function getDeployRollupForUpgradeEnvVars(args) {
  */ export const deployRollupForUpgrade = async (privateKey, rpcUrl, chainId, registryAddress, args)=>{
     // Use foundry-artifacts from l1-artifacts package
     const l1ContractsPath = prepareL1ContractsForDeployment();
+    const forgeBin = resolveFoundryBinary('forge');
     const FORGE_SCRIPT = 'script/deploy/DeployRollupForUpgrade.s.sol';
-    await maybeForgeForceProductionBuild(l1ContractsPath, FORGE_SCRIPT, chainId);
+    await maybeForgeForceProductionBuild(forgeBin, l1ContractsPath, FORGE_SCRIPT, chainId);
     const scriptPath = join(getL1ContractsPath(), 'scripts', 'forge_broadcast.js');
     const forgeArgs = [
         FORGE_SCRIPT,
@@ -389,6 +398,8 @@ export function getDeployRollupForUpgradeEnvVars(args) {
         rpcUrl
     ];
     const forgeEnv = {
+        // Resolved forge binary picked up by forge_broadcast.js, so it works without forge on PATH.
+        FORGE_BIN: forgeBin,
         FOUNDRY_PROFILE: chainId === mainnet.id ? 'production' : undefined,
         // Env vars required by l1-contracts/script/deploy/RollupConfiguration.sol.
         REGISTRY_ADDRESS: registryAddress.toString(),

package/dest/foundry_binary.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Locate a Foundry binary (`anvil`, `forge`, ...) without relying on the caller's PATH. Order:
+ *   1. `$<NAME>_BIN` (e.g. `$ANVIL_BIN`, `$FORGE_BIN`) — explicit override, e.g. for CI with a pinned
+ *      version. Throws if set but not pointing at an executable, instead of silently falling back.
+ *   2. `~/.aztec/current/internal-bin/<name>` — where aztec-up installs it.
+ *   3. `~/.aztec/current/bin/aztec-<name>` — the publicly-exposed symlink.
+ *   4. `~/.foundry/bin/<name>` — standalone foundryup install.
+ *   5. `command -v <name>` — anything else on PATH.
+ *
+ * Throws with a directive message if none work.
+ */
+export declare function resolveFoundryBinary(name: string): string;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm91bmRyeV9iaW5hcnkuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9mb3VuZHJ5X2JpbmFyeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFjQTs7Ozs7Ozs7OztHQVVHO0FBQ0gsd0JBQWdCLG9CQUFvQixDQUFDLElBQUksRUFBRSxNQUFNLEdBQUcsTUFBTSxDQStCekQifQ==

package/dest/foundry_binary.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"foundry_binary.d.ts","sourceRoot":"","sources":["../src/foundry_binary.ts"],"names":[],"mappings":"AAcA;;;;;;;;;;GAUG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CA+BzD"}

package/dest/foundry_binary.js

@@ -0,0 +1,52 @@
+import { spawnSync } from 'child_process';
+import { accessSync, constants } from 'fs';
+import { homedir } from 'os';
+import { join } from 'path';
+function isExecutable(path) {
+    try {
+        accessSync(path, constants.X_OK);
+        return true;
+    } catch  {
+        return false;
+    }
+}
+/**
+ * Locate a Foundry binary (`anvil`, `forge`, ...) without relying on the caller's PATH. Order:
+ *   1. `$<NAME>_BIN` (e.g. `$ANVIL_BIN`, `$FORGE_BIN`) — explicit override, e.g. for CI with a pinned
+ *      version. Throws if set but not pointing at an executable, instead of silently falling back.
+ *   2. `~/.aztec/current/internal-bin/<name>` — where aztec-up installs it.
+ *   3. `~/.aztec/current/bin/aztec-<name>` — the publicly-exposed symlink.
+ *   4. `~/.foundry/bin/<name>` — standalone foundryup install.
+ *   5. `command -v <name>` — anything else on PATH.
+ *
+ * Throws with a directive message if none work.
+ */ export function resolveFoundryBinary(name) {
+    const envVar = `${name.toUpperCase()}_BIN`;
+    const envBin = process.env[envVar];
+    if (envBin) {
+        if (!isExecutable(envBin)) {
+            throw new Error(`$${envVar} is set to ${envBin}, which does not exist or is not executable.`);
+        }
+        return envBin;
+    }
+    const candidates = [
+        join(homedir(), '.aztec', 'current', 'internal-bin', name),
+        join(homedir(), '.aztec', 'current', 'bin', `aztec-${name}`),
+        join(homedir(), '.foundry', 'bin', name)
+    ];
+    for (const path of candidates){
+        if (isExecutable(path)) {
+            return path;
+        }
+    }
+    const which = spawnSync('sh', [
+        '-c',
+        `command -v ${name}`
+    ], {
+        encoding: 'utf8'
+    });
+    if (which.status === 0 && which.stdout.trim()) {
+        return which.stdout.trim();
+    }
+    throw new Error(`${name} binary not found. Tried $${envVar}, ~/.aztec/current/internal-bin/${name}, ` + `~/.aztec/current/bin/aztec-${name}, ~/.foundry/bin/${name}, and $PATH. ` + `Install via \`aztec-up\` or set ${envVar} to a working binary.`);
+}