@aztec/ethereum 0.0.1-commit.7d4e6cd → 0.0.1-commit.8afd444

package/dest/deploy_aztec_l1_contracts.js

@@ -7,11 +7,11 @@ 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, readdirSync, rmSync } from 'fs';
+import { cpSync, existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'fs';
 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';
@@ -110,10 +110,13 @@ function cleanupDeployDir() {
  * A fresh broadcast/ directory is created for deployment outputs.
  */ export function prepareL1ContractsForDeployment() {
     if (preparedDeployDir && existsSync(preparedDeployDir)) {
+        logger.verbose(`Using cached deployment directory: ${preparedDeployDir}`);
         return preparedDeployDir;
     }
     const basePath = getL1ContractsPath();
+    logger.verbose(`Preparing L1 contracts from: ${basePath}`);
     const tempDir = mkdtempSync(join(tmpdir(), '.foundry-deploy-'));
+    logger.verbose(`Created temp directory for deployment: ${tempDir}`);
     preparedDeployDir = tempDir;
     process.on('exit', cleanupDeployDir);
     // Copy all dirs with preserved timestamps (required for forge cache validity)
@@ -127,13 +130,23 @@ function cleanupDeployDir() {
     cpSync(join(basePath, 'src'), join(tempDir, 'src'), copyOpts);
     cpSync(join(basePath, 'script'), join(tempDir, 'script'), copyOpts);
     cpSync(join(basePath, 'generated'), join(tempDir, 'generated'), copyOpts);
-    cpSync(join(basePath, 'foundry.toml'), join(tempDir, 'foundry.toml'));
+    // Kludge: copy test/ to appease forge cache which references test/shouting.t.sol
+    cpSync(join(basePath, 'test'), join(tempDir, 'test'), copyOpts);
     cpSync(join(basePath, 'foundry.lock'), join(tempDir, 'foundry.lock'));
-    for (const file of readdirSync(basePath)){
-        if (file.startsWith('solc-')) {
-            cpSync(join(basePath, file), join(tempDir, file));
-        }
+    // Update foundry.toml to use absolute path to solc binary (avoids copying to noexec tmpfs)
+    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}`);
+        foundryToml = foundryToml.replace(/solc\s*=\s*"\.\/solc-[^"]+"/, `solc = "${absoluteSolcPath}"`);
+        logger.verbose(`Updated solc path in foundry.toml to: ${absoluteSolcPath}`);
     }
+    writeFileSync(join(tempDir, 'foundry.toml'), foundryToml);
     mkdirSync(join(tempDir, 'broadcast'));
     return tempDir;
 }
@@ -216,7 +229,7 @@ function cleanupDeployDir() {
         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 = 12;
+    const MAGIC_ANVIL_BATCH_SIZE = 8;
     // Anvil seems to stall with unbounded batch size. Otherwise no max batch size is desirable.
     const forgeArgs = [
         'script',
@@ -228,10 +241,8 @@ function cleanupDeployDir() {
         '--rpc-url',
         rpcUrl,
         '--broadcast',
-        ...chainId === foundry.id ? [
-            '--batch-size',
-            MAGIC_ANVIL_BATCH_SIZE.toString()
-        ] : [],
+        '--batch-size',
+        MAGIC_ANVIL_BATCH_SIZE.toString(),
         ...shouldVerify ? [
             '--verify'
         ] : []
@@ -306,6 +317,7 @@ export function getDeployAztecL1ContractsEnvVars(args) {
         AZTEC_EJECTION_THRESHOLD: args.ejectionThreshold?.toString(),
         AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: args.governanceProposerRoundSize?.toString(),
         AZTEC_GOVERNANCE_PROPOSER_QUORUM: args.governanceProposerQuorum?.toString(),
+        AZTEC_GOVERNANCE_VOTING_DURATION: args.governanceVotingDuration?.toString(),
         ZKPASSPORT_DOMAIN: args.zkPassportArgs?.zkPassportDomain,
         ZKPASSPORT_SCOPE: args.zkPassportArgs?.zkPassportScope
     };
@@ -330,11 +342,13 @@ export function getDeployRollupForUpgradeEnvVars(args) {
         AZTEC_PROOF_SUBMISSION_EPOCHS: args.aztecProofSubmissionEpochs.toString(),
         AZTEC_LOCAL_EJECTION_THRESHOLD: args.localEjectionThreshold.toString(),
         AZTEC_SLASHING_LIFETIME_IN_ROUNDS: args.slashingLifetimeInRounds.toString(),
+        AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS: args.slashingExecutionDelayInRounds.toString(),
         AZTEC_SLASHING_VETOER: args.slashingVetoer.toString(),
         AZTEC_SLASHING_DISABLE_DURATION: args.slashingDisableDuration.toString(),
         AZTEC_MANA_TARGET: args.manaTarget.toString(),
         AZTEC_EXIT_DELAY_SECONDS: args.exitDelaySeconds.toString(),
         AZTEC_PROVING_COST_PER_MANA: args.provingCostPerMana.toString(),
+        AZTEC_INITIAL_ETH_PER_FEE_ASSET: args.initialEthPerFeeAsset.toString(),
         AZTEC_SLASHER_FLAVOR: args.slasherFlavor,
         AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: args.slashingRoundSizeInEpochs.toString(),
         AZTEC_SLASHING_QUORUM: args.slashingQuorum?.toString(),

package/dest/generated/l1-contracts-defaults.d.ts

@@ -0,0 +1,30 @@
+/** Default L1 contracts configuration values from network-defaults.yml */
+export declare const l1ContractsDefaultEnv: {
+    readonly ETHEREUM_SLOT_DURATION: 12;
+    readonly AZTEC_SLOT_DURATION: 36;
+    readonly AZTEC_EPOCH_DURATION: 32;
+    readonly AZTEC_TARGET_COMMITTEE_SIZE: 48;
+    readonly AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET: 2;
+    readonly AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 2;
+    readonly AZTEC_ACTIVATION_THRESHOLD: 100000000000000000000;
+    readonly AZTEC_EJECTION_THRESHOLD: 50000000000000000000;
+    readonly AZTEC_LOCAL_EJECTION_THRESHOLD: 98000000000000000000;
+    readonly AZTEC_EXIT_DELAY_SECONDS: 172800;
+    readonly AZTEC_INBOX_LAG: 1;
+    readonly AZTEC_PROOF_SUBMISSION_EPOCHS: 1;
+    readonly AZTEC_MANA_TARGET: 100000000;
+    readonly AZTEC_PROVING_COST_PER_MANA: 100;
+    readonly AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000;
+    readonly AZTEC_SLASHER_FLAVOR: "tally";
+    readonly AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4;
+    readonly AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5;
+    readonly AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS: 0;
+    readonly AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2;
+    readonly AZTEC_SLASHING_VETOER: "0x0000000000000000000000000000000000000000";
+    readonly AZTEC_SLASHING_DISABLE_DURATION: 432000;
+    readonly AZTEC_SLASH_AMOUNT_SMALL: 10000000000000000000;
+    readonly AZTEC_SLASH_AMOUNT_MEDIUM: 20000000000000000000;
+    readonly AZTEC_SLASH_AMOUNT_LARGE: 50000000000000000000;
+    readonly AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 300;
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDEtY29udHJhY3RzLWRlZmF1bHRzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZ2VuZXJhdGVkL2wxLWNvbnRyYWN0cy1kZWZhdWx0cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFHQSwwRUFBMEU7QUFDMUUsZUFBTyxNQUFNLHFCQUFxQjs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0NBMkJ4QixDQUFDIn0=

package/dest/generated/l1-contracts-defaults.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"l1-contracts-defaults.d.ts","sourceRoot":"","sources":["../../src/generated/l1-contracts-defaults.ts"],"names":[],"mappings":"AAGA,0EAA0E;AAC1E,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2BxB,CAAC"}

package/dest/generated/l1-contracts-defaults.js

@@ -0,0 +1,30 @@
+// Auto-generated from spartan/environments/network-defaults.yml
+// Do not edit manually - run yarn generate to regenerate
+/** Default L1 contracts configuration values from network-defaults.yml */ export const l1ContractsDefaultEnv = {
+    ETHEREUM_SLOT_DURATION: 12,
+    AZTEC_SLOT_DURATION: 36,
+    AZTEC_EPOCH_DURATION: 32,
+    AZTEC_TARGET_COMMITTEE_SIZE: 48,
+    AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET: 2,
+    AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 2,
+    AZTEC_ACTIVATION_THRESHOLD: 100000000000000000000,
+    AZTEC_EJECTION_THRESHOLD: 50000000000000000000,
+    AZTEC_LOCAL_EJECTION_THRESHOLD: 98000000000000000000,
+    AZTEC_EXIT_DELAY_SECONDS: 172800,
+    AZTEC_INBOX_LAG: 1,
+    AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
+    AZTEC_MANA_TARGET: 100000000,
+    AZTEC_PROVING_COST_PER_MANA: 100,
+    AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
+    AZTEC_SLASHER_FLAVOR: 'tally',
+    AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
+    AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5,
+    AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS: 0,
+    AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
+    AZTEC_SLASHING_VETOER: '0x0000000000000000000000000000000000000000',
+    AZTEC_SLASHING_DISABLE_DURATION: 432000,
+    AZTEC_SLASH_AMOUNT_SMALL: 10000000000000000000,
+    AZTEC_SLASH_AMOUNT_MEDIUM: 20000000000000000000,
+    AZTEC_SLASH_AMOUNT_LARGE: 50000000000000000000,
+    AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 300
+};