@aztec/ethereum 0.0.1-commit.6d3c34e → 0.0.1-commit.72dcdcda8

package/dest/test/start_anvil.js

@@ -1,7 +1,7 @@
 import { createLogger } from '@aztec/foundation/log';
 import { makeBackoff, retry } from '@aztec/foundation/retry';
 import { fileURLToPath } from '@aztec/foundation/url';
-import { createAnvil } from '@viem/anvil';
+import { spawn } from 'child_process';
 import { dirname, resolve } from 'path';
 /**
  * Ensures there's a running Anvil instance and returns the RPC URL.
@@ -9,47 +9,146 @@ import { dirname, resolve } from 'path';
     const anvilBinary = resolve(dirname(fileURLToPath(import.meta.url)), '../../', 'scripts/anvil_kill_wrapper.sh');
     const logger = opts.log ? createLogger('ethereum:anvil') : undefined;
     const methodCalls = opts.captureMethodCalls ? [] : undefined;
-    let port;
-    // Start anvil.
-    // We go via a wrapper script to ensure if the parent dies, anvil dies.
+    let detectedPort;
     const anvil = await retry(async ()=>{
-        const anvil = createAnvil({
-            anvilBinary,
-            host: '127.0.0.1',
-            port: opts.port ?? 8545,
-            blockTime: opts.l1BlockTime,
-            stopTimeout: 1000,
-            accounts: opts.accounts ?? 20,
-            gasLimit: 45_000_000n,
-            chainId: opts.chainId ?? 31337
-        });
-        // Listen to the anvil output to get the port.
-        const removeHandler = anvil.on('message', (message)=>{
-            logger?.debug(message.trim());
-            methodCalls?.push(...message.match(/eth_[^\s]+/g) || []);
-            if (port === undefined && message.includes('Listening on')) {
-                port = parseInt(message.match(/Listening on ([^:]+):(\d+)/)[2]);
+        const port = opts.port ?? (process.env.ANVIL_PORT ? parseInt(process.env.ANVIL_PORT) : 8545);
+        const args = [
+            '--host',
+            '127.0.0.1',
+            '--port',
+            String(port),
+            '--accounts',
+            String(opts.accounts ?? 20),
+            '--gas-limit',
+            String(45_000_000),
+            '--chain-id',
+            String(opts.chainId ?? 31337)
+        ];
+        if (opts.l1BlockTime !== undefined) {
+            args.push('--block-time', String(opts.l1BlockTime));
+        }
+        if (opts.hardfork !== undefined) {
+            args.push('--hardfork', opts.hardfork);
+        }
+        const child = spawn(anvilBinary, args, {
+            stdio: [
+                'ignore',
+                'pipe',
+                'pipe'
+            ],
+            env: {
+                ...process.env,
+                RAYON_NUM_THREADS: '1'
             }
         });
-        await anvil.start();
-        if (!logger && !opts.captureMethodCalls) {
-            removeHandler();
+        // Wait for "Listening on" or an early exit.
+        await new Promise((resolve, reject)=>{
+            let stderr = '';
+            const onStdout = (data)=>{
+                const text = data.toString();
+                logger?.debug(text.trim());
+                methodCalls?.push(...text.match(/eth_[^\s]+/g) || []);
+                if (detectedPort === undefined && text.includes('Listening on')) {
+                    const match = text.match(/Listening on ([^:]+):(\d+)/);
+                    if (match) {
+                        detectedPort = parseInt(match[2]);
+                    }
+                }
+                if (detectedPort !== undefined) {
+                    child.stdout?.removeListener('data', onStdout);
+                    child.stderr?.removeListener('data', onStderr);
+                    child.removeListener('close', onClose);
+                    resolve();
+                }
+            };
+            const onStderr = (data)=>{
+                stderr += data.toString();
+                logger?.debug(data.toString().trim());
+            };
+            const onClose = (code)=>{
+                child.stdout?.removeListener('data', onStdout);
+                child.stderr?.removeListener('data', onStderr);
+                reject(new Error(`Anvil exited with code ${code} before listening. stderr: ${stderr}`));
+            };
+            child.stdout?.on('data', onStdout);
+            child.stderr?.on('data', onStderr);
+            child.once('close', onClose);
+        });
+        // Continue piping for logging / method-call capture after startup.
+        if (logger || opts.captureMethodCalls) {
+            child.stdout?.on('data', (data)=>{
+                const text = data.toString();
+                logger?.debug(text.trim());
+                methodCalls?.push(...text.match(/eth_[^\s]+/g) || []);
+            });
+            child.stderr?.on('data', (data)=>{
+                logger?.debug(data.toString().trim());
+            });
+        } else {
+            // Consume streams so the child process doesn't block on full pipe buffers.
+            child.stdout?.resume();
+            child.stderr?.resume();
         }
-        return anvil;
+        return child;
     }, 'Start anvil', makeBackoff([
         5,
         5,
         5
     ]));
-    if (!port) {
+    if (!detectedPort) {
         throw new Error('Failed to start anvil');
     }
-    // Monkeypatch the anvil instance to include the actually assigned port
-    // Object.defineProperty(anvil, 'port', { value: port, writable: false });
+    const port = detectedPort;
+    let status = 'listening';
+    anvil.once('close', ()=>{
+        status = 'idle';
+    });
+    const stop = async ()=>{
+        if (status === 'idle') {
+            return;
+        }
+        await killChild(anvil);
+    };
+    const anvilObj = {
+        port,
+        host: '127.0.0.1',
+        get status () {
+            return status;
+        },
+        stop
+    };
     return {
-        anvil,
+        anvil: anvilObj,
         methodCalls,
-        stop: ()=>anvil.stop(),
+        stop,
         rpcUrl: `http://127.0.0.1:${port}`
     };
 }
+/** Send SIGTERM, wait up to 5 s, then SIGKILL. All timers are always cleared. */ function killChild(child) {
+    return new Promise((resolve)=>{
+        if (child.exitCode !== null || child.killed) {
+            child.stdout?.destroy();
+            child.stderr?.destroy();
+            resolve();
+            return;
+        }
+        let killTimer;
+        const onClose = ()=>{
+            if (killTimer !== undefined) {
+                clearTimeout(killTimer);
+            }
+            // Destroy stdio streams so their PipeWrap handles don't keep the event loop alive.
+            child.stdout?.destroy();
+            child.stderr?.destroy();
+            resolve();
+        };
+        child.once('close', onClose);
+        child.kill('SIGTERM');
+        killTimer = setTimeout(()=>{
+            killTimer = undefined;
+            child.kill('SIGKILL');
+        }, 5000);
+        // Ensure the timer does not prevent Node from exiting.
+        killTimer.unref();
+    });
+}

package/dest/test/upgrade_utils.js

@@ -3,13 +3,13 @@ import { GovernanceAbi } from '@aztec/l1-artifacts/GovernanceAbi';
 import { TestERC20Abi as StakingAssetAbi } from '@aztec/l1-artifacts/TestERC20Abi';
 import { getContract } from 'viem';
 import { extractProposalIdFromLogs } from '../contracts/governance.js';
-import { createL1TxUtilsFromViemWallet } from '../l1_tx_utils/index.js';
+import { createL1TxUtils } from '../l1_tx_utils/index.js';
 import { EthCheatCodes } from './eth_cheat_codes.js';
 export async function executeGovernanceProposal(proposalId, governance, voteAmount, privateKey, l1Client, rpcUrls, logger) {
     const proposal = await governance.read.getProposal([
         proposalId
     ]);
-    const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client);
+    const l1TxUtils = createL1TxUtils(l1Client);
     const waitL1Block = async ()=>{
         await l1TxUtils.sendAndMonitorTransaction({
             to: l1Client.account.address,

package/dest/utils.d.ts

@@ -14,6 +14,7 @@ export declare class FormattedViemError extends Error {
 export declare function extractEvent<const TAbi extends Abi | readonly unknown[], TEventName extends ContractEventName<TAbi>, TEventType = DecodeEventLogReturnType<TAbi, TEventName, Hex[], undefined, true>>(logs: Log[], address: Hex, abi: TAbi, eventName: TEventName, filter?: (log: TEventType) => boolean, logger?: Logger): TEventType;
 export declare function tryExtractEvent<const TAbi extends Abi | readonly unknown[], TEventName extends ContractEventName<TAbi>, TEventType = DecodeEventLogReturnType<TAbi, TEventName, Hex[], undefined, true>>(logs: Log[], address: Hex, abi: TAbi, eventName: TEventName, filter?: (log: TEventType) => boolean, logger?: Logger): TEventType | undefined;
 export declare function prettyLogViemErrorMsg(err: any): any;
+export declare function mergeAbis(abis: Abi[]): Abi;
 /**
  * Formats a Viem error into a FormattedViemError instance.
  * @param error - The error to format.
@@ -34,4 +35,4 @@ export declare function isBlobTransaction(tx: FormattedTransaction): tx is Forma
  * Calculates a percentile from an array of bigints
  */
 export declare function calculatePercentile(values: bigint[], percentile: number): bigint;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUdwRCxPQUFPLEVBQ0wsS0FBSyxHQUFHLEVBRVIsS0FBSyxpQkFBaUIsRUFFdEIsS0FBSyx3QkFBd0IsRUFDN0IsS0FBSyxvQkFBb0IsRUFDekIsS0FBSyxHQUFHLEVBQ1IsS0FBSyxHQUFHLEVBR1QsTUFBTSxNQUFNLENBQUM7QUFFZCxNQUFNLFdBQVcsT0FBTztJQUN0QixXQUFXLEVBQUUsRUFBRSxDQUFDO0lBQ2hCLFdBQVcsRUFBRSxFQUFFLENBQUM7SUFDaEIsV0FBVyxFQUFFLEdBQUcsQ0FBQztJQUNqQixnQkFBZ0IsRUFBRSxNQUFNLENBQUM7Q0FDMUI7QUFFRCxxQkFBYSxrQkFBbUIsU0FBUSxLQUFLO0lBQzNDLFlBQVksQ0FBQyxFQUFFLEdBQUcsRUFBRSxDQUFDO0lBRXJCLFlBQVksT0FBTyxFQUFFLE1BQU0sRUFBRSxZQUFZLENBQUMsRUFBRSxHQUFHLEVBQUUsRUFJaEQ7Q0FDRjtBQUVELHdCQUFnQixZQUFZLENBQzFCLEtBQUssQ0FBQyxJQUFJLFNBQVMsR0FBRyxHQUFHLFNBQVMsT0FBTyxFQUFFLEVBQzNDLFVBQVUsU0FBUyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsRUFDMUMsVUFBVSxHQUFHLHdCQUF3QixDQUFDLElBQUksRUFBRSxVQUFVLEVBQUUsR0FBRyxFQUFFLEVBQUUsU0FBUyxFQUFFLElBQUksQ0FBQyxFQUUvRSxJQUFJLEVBQUUsR0FBRyxFQUFFLEVBQ1gsT0FBTyxFQUFFLEdBQUcsRUFDWixHQUFHLEVBQUUsSUFBSSxFQUNULFNBQVMsRUFBRSxVQUFVLEVBQ3JCLE1BQU0sQ0FBQyxFQUFFLENBQUMsR0FBRyxFQUFFLFVBQVUsS0FBSyxPQUFPLEVBQ3JDLE1BQU0sQ0FBQyxFQUFFLE1BQU0sR0FDZCxVQUFVLENBTVo7QUFFRCx3QkFBZ0IsZUFBZSxDQUM3QixLQUFLLENBQUMsSUFBSSxTQUFTLEdBQUcsR0FBRyxTQUFTLE9BQU8sRUFBRSxFQUMzQyxVQUFVLFNBQVMsaUJBQWlCLENBQUMsSUFBSSxDQUFDLEVBQzFDLFVBQVUsR0FBRyx3QkFBd0IsQ0FBQyxJQUFJLEVBQUUsVUFBVSxFQUFFLEdBQUcsRUFBRSxFQUFFLFNBQVMsRUFBRSxJQUFJLENBQUMsRUFFL0UsSUFBSSxFQUFFLEdBQUcsRUFBRSxFQUNYLE9BQU8sRUFBRSxHQUFHLEVBQ1osR0FBRyxFQUFFLElBQUksRUFDVCxTQUFTLEVBQUUsVUFBVSxFQUNyQixNQUFNLENBQUMsRUFBRSxDQUFDLEdBQUcsRUFBRSxVQUFVLEtBQUssT0FBTyxFQUNyQyxNQUFNLENBQUMsRUFBRSxNQUFNLEdBQ2QsVUFBVSxHQUFHLFNBQVMsQ0FnQnhCO0FBRUQsd0JBQWdCLHFCQUFxQixDQUFDLEdBQUcsRUFBRSxHQUFHLE9BVzdDO0FBMEJEOzs7OztHQUtHO0FBQ0gsd0JBQWdCLGVBQWUsQ0FBQyxLQUFLLEVBQUUsR0FBRyxFQUFFLEdBQUcsR0FBRSxHQUFlLEdBQUcsa0JBQWtCLENBd0VwRjtBQXlCRCx3QkFBZ0IscUJBQXFCLENBQUMsR0FBRyxFQUFFLEdBQUcsc0JBYTdDO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQWdCLGlCQUFpQixDQUFDLEVBQUUsRUFBRSxvQkFBb0IsR0FBRyxFQUFFLElBQUksb0JBQW9CLEdBQUc7SUFDeEYsZ0JBQWdCLEVBQUUsTUFBTSxDQUFDO0lBQ3pCLG1CQUFtQixFQUFFLFNBQVMsR0FBRyxFQUFFLENBQUM7Q0FDckMsQ0FPQTtBQUVEOztHQUVHO0FBQ0gsd0JBQWdCLG1CQUFtQixDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsRUFBRSxVQUFVLEVBQUUsTUFBTSxHQUFHLE1BQU0sQ0FPaEYifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUdwRCxPQUFPLEVBQ0wsS0FBSyxHQUFHLEVBR1IsS0FBSyxpQkFBaUIsRUFFdEIsS0FBSyx3QkFBd0IsRUFDN0IsS0FBSyxvQkFBb0IsRUFDekIsS0FBSyxHQUFHLEVBQ1IsS0FBSyxHQUFHLEVBR1QsTUFBTSxNQUFNLENBQUM7QUFHZCxNQUFNLFdBQVcsT0FBTztJQUN0QixXQUFXLEVBQUUsRUFBRSxDQUFDO0lBQ2hCLFdBQVcsRUFBRSxFQUFFLENBQUM7SUFDaEIsV0FBVyxFQUFFLEdBQUcsQ0FBQztJQUNqQixnQkFBZ0IsRUFBRSxNQUFNLENBQUM7Q0FDMUI7QUFFRCxxQkFBYSxrQkFBbUIsU0FBUSxLQUFLO0lBQzNDLFlBQVksQ0FBQyxFQUFFLEdBQUcsRUFBRSxDQUFDO0lBRXJCLFlBQVksT0FBTyxFQUFFLE1BQU0sRUFBRSxZQUFZLENBQUMsRUFBRSxHQUFHLEVBQUUsRUFJaEQ7Q0FDRjtBQUVELHdCQUFnQixZQUFZLENBQzFCLEtBQUssQ0FBQyxJQUFJLFNBQVMsR0FBRyxHQUFHLFNBQVMsT0FBTyxFQUFFLEVBQzNDLFVBQVUsU0FBUyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsRUFDMUMsVUFBVSxHQUFHLHdCQUF3QixDQUFDLElBQUksRUFBRSxVQUFVLEVBQUUsR0FBRyxFQUFFLEVBQUUsU0FBUyxFQUFFLElBQUksQ0FBQyxFQUUvRSxJQUFJLEVBQUUsR0FBRyxFQUFFLEVBQ1gsT0FBTyxFQUFFLEdBQUcsRUFDWixHQUFHLEVBQUUsSUFBSSxFQUNULFNBQVMsRUFBRSxVQUFVLEVBQ3JCLE1BQU0sQ0FBQyxFQUFFLENBQUMsR0FBRyxFQUFFLFVBQVUsS0FBSyxPQUFPLEVBQ3JDLE1BQU0sQ0FBQyxFQUFFLE1BQU0sR0FDZCxVQUFVLENBTVo7QUFFRCx3QkFBZ0IsZUFBZSxDQUM3QixLQUFLLENBQUMsSUFBSSxTQUFTLEdBQUcsR0FBRyxTQUFTLE9BQU8sRUFBRSxFQUMzQyxVQUFVLFNBQVMsaUJBQWlCLENBQUMsSUFBSSxDQUFDLEVBQzFDLFVBQVUsR0FBRyx3QkFBd0IsQ0FBQyxJQUFJLEVBQUUsVUFBVSxFQUFFLEdBQUcsRUFBRSxFQUFFLFNBQVMsRUFBRSxJQUFJLENBQUMsRUFFL0UsSUFBSSxFQUFFLEdBQUcsRUFBRSxFQUNYLE9BQU8sRUFBRSxHQUFHLEVBQ1osR0FBRyxFQUFFLElBQUksRUFDVCxTQUFTLEVBQUUsVUFBVSxFQUNyQixNQUFNLENBQUMsRUFBRSxDQUFDLEdBQUcsRUFBRSxVQUFVLEtBQUssT0FBTyxFQUNyQyxNQUFNLENBQUMsRUFBRSxNQUFNLEdBQ2QsVUFBVSxHQUFHLFNBQVMsQ0FnQnhCO0FBRUQsd0JBQWdCLHFCQUFxQixDQUFDLEdBQUcsRUFBRSxHQUFHLE9BVzdDO0FBRUQsd0JBQWdCLFNBQVMsQ0FBQyxJQUFJLEVBQUUsR0FBRyxFQUFFLEdBQUcsR0FBRyxDQWUxQztBQTRERDs7Ozs7R0FLRztBQUNILHdCQUFnQixlQUFlLENBQUMsS0FBSyxFQUFFLEdBQUcsRUFBRSxHQUFHLEdBQUUsR0FBZSxHQUFHLGtCQUFrQixDQXdFcEY7QUF5QkQsd0JBQWdCLHFCQUFxQixDQUFDLEdBQUcsRUFBRSxHQUFHLHNCQWE3QztBQUVEOzs7R0FHRztBQUNILHdCQUFnQixpQkFBaUIsQ0FBQyxFQUFFLEVBQUUsb0JBQW9CLEdBQUcsRUFBRSxJQUFJLG9CQUFvQixHQUFHO0lBQ3hGLGdCQUFnQixFQUFFLE1BQU0sQ0FBQztJQUN6QixtQkFBbUIsRUFBRSxTQUFTLEdBQUcsRUFBRSxDQUFDO0NBQ3JDLENBT0E7QUFFRDs7R0FFRztBQUNILHdCQUFnQixtQkFBbUIsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLEVBQUUsVUFBVSxFQUFFLE1BQU0sR0FBRyxNQUFNLENBT2hGIn0=

package/dest/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAGpD,OAAO,EACL,KAAK,GAAG,EAER,KAAK,iBAAiB,EAEtB,KAAK,wBAAwB,EAC7B,KAAK,oBAAoB,EACzB,KAAK,GAAG,EACR,KAAK,GAAG,EAGT,MAAM,MAAM,CAAC;AAEd,MAAM,WAAW,OAAO;IACtB,WAAW,EAAE,EAAE,CAAC;IAChB,WAAW,EAAE,EAAE,CAAC;IAChB,WAAW,EAAE,GAAG,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,qBAAa,kBAAmB,SAAQ,KAAK;IAC3C,YAAY,CAAC,EAAE,GAAG,EAAE,CAAC;IAErB,YAAY,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,GAAG,EAAE,EAIhD;CACF;AAED,wBAAgB,YAAY,CAC1B,KAAK,CAAC,IAAI,SAAS,GAAG,GAAG,SAAS,OAAO,EAAE,EAC3C,UAAU,SAAS,iBAAiB,CAAC,IAAI,CAAC,EAC1C,UAAU,GAAG,wBAAwB,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,EAE/E,IAAI,EAAE,GAAG,EAAE,EACX,OAAO,EAAE,GAAG,EACZ,GAAG,EAAE,IAAI,EACT,SAAS,EAAE,UAAU,EACrB,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,OAAO,EACrC,MAAM,CAAC,EAAE,MAAM,GACd,UAAU,CAMZ;AAED,wBAAgB,eAAe,CAC7B,KAAK,CAAC,IAAI,SAAS,GAAG,GAAG,SAAS,OAAO,EAAE,EAC3C,UAAU,SAAS,iBAAiB,CAAC,IAAI,CAAC,EAC1C,UAAU,GAAG,wBAAwB,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,EAE/E,IAAI,EAAE,GAAG,EAAE,EACX,OAAO,EAAE,GAAG,EACZ,GAAG,EAAE,IAAI,EACT,SAAS,EAAE,UAAU,EACrB,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,OAAO,EACrC,MAAM,CAAC,EAAE,MAAM,GACd,UAAU,GAAG,SAAS,CAgBxB;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG,OAW7C;AA0BD;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,GAAE,GAAe,GAAG,kBAAkB,CAwEpF;AAyBD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG,sBAa7C;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,oBAAoB,GAAG,EAAE,IAAI,oBAAoB,GAAG;IACxF,gBAAgB,EAAE,MAAM,CAAC;IACzB,mBAAmB,EAAE,SAAS,GAAG,EAAE,CAAC;CACrC,CAOA;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAOhF"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAGpD,OAAO,EACL,KAAK,GAAG,EAGR,KAAK,iBAAiB,EAEtB,KAAK,wBAAwB,EAC7B,KAAK,oBAAoB,EACzB,KAAK,GAAG,EACR,KAAK,GAAG,EAGT,MAAM,MAAM,CAAC;AAGd,MAAM,WAAW,OAAO;IACtB,WAAW,EAAE,EAAE,CAAC;IAChB,WAAW,EAAE,EAAE,CAAC;IAChB,WAAW,EAAE,GAAG,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,qBAAa,kBAAmB,SAAQ,KAAK;IAC3C,YAAY,CAAC,EAAE,GAAG,EAAE,CAAC;IAErB,YAAY,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,GAAG,EAAE,EAIhD;CACF;AAED,wBAAgB,YAAY,CAC1B,KAAK,CAAC,IAAI,SAAS,GAAG,GAAG,SAAS,OAAO,EAAE,EAC3C,UAAU,SAAS,iBAAiB,CAAC,IAAI,CAAC,EAC1C,UAAU,GAAG,wBAAwB,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,EAE/E,IAAI,EAAE,GAAG,EAAE,EACX,OAAO,EAAE,GAAG,EACZ,GAAG,EAAE,IAAI,EACT,SAAS,EAAE,UAAU,EACrB,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,OAAO,EACrC,MAAM,CAAC,EAAE,MAAM,GACd,UAAU,CAMZ;AAED,wBAAgB,eAAe,CAC7B,KAAK,CAAC,IAAI,SAAS,GAAG,GAAG,SAAS,OAAO,EAAE,EAC3C,UAAU,SAAS,iBAAiB,CAAC,IAAI,CAAC,EAC1C,UAAU,GAAG,wBAAwB,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,EAE/E,IAAI,EAAE,GAAG,EAAE,EACX,OAAO,EAAE,GAAG,EACZ,GAAG,EAAE,IAAI,EACT,SAAS,EAAE,UAAU,EACrB,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,OAAO,EACrC,MAAM,CAAC,EAAE,MAAM,GACd,UAAU,GAAG,SAAS,CAgBxB;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG,OAW7C;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,GAAG,CAe1C;AA4DD;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,GAAE,GAAe,GAAG,kBAAkB,CAwEpF;AAyBD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG,sBAa7C;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,oBAAoB,GAAG,EAAE,IAAI,oBAAoB,GAAG;IACxF,gBAAgB,EAAE,MAAM,CAAC;IACzB,mBAAmB,EAAE,SAAS,GAAG,EAAE,CAAC;CACrC,CAOA;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAOhF"}

package/dest/utils.js

@@ -1,5 +1,6 @@
 import { ErrorsAbi } from '@aztec/l1-artifacts/ErrorsAbi';
 import { BaseError, ContractFunctionRevertedError, decodeErrorResult, decodeEventLog } from 'viem';
+import { formatAbiItem, formatAbiParams } from 'viem/utils';
 export class FormattedViemError extends Error {
     metaMessages;
     constructor(message, metaMessages){
@@ -46,6 +47,51 @@ export function prettyLogViemErrorMsg(err) {
     }
     return err?.message ?? err;
 }
+export function mergeAbis(abis) {
+    let merged = [];
+    const seen = new Set();
+    for (const abi of abis){
+        for (const item of abi){
+            const key = getAbiItemKey(item);
+            if (!seen.has(key)) {
+                seen.add(key);
+                merged = [
+                    ...merged,
+                    item
+                ];
+            }
+        }
+    }
+    return merged;
+}
+function getAbiItemKey(item) {
+    if (item.type === 'function') {
+        const signature = formatAbiItem(item);
+        const outputs = formatAbiParams(item.outputs);
+        const stateMutability = typeof item.stateMutability === 'string' ? item.stateMutability : '';
+        return `function:${signature}:${outputs}:${stateMutability}`;
+    }
+    if (item.type === 'event') {
+        const signature = formatAbiItem(item);
+        const indexed = (item.inputs ?? []).map((input)=>input.indexed ? '1' : '0').join('');
+        const anonymous = item.anonymous ? 'anonymous' : 'not-anonymous';
+        return `event:${signature}:${indexed}:${anonymous}`;
+    }
+    if (item.type === 'error') {
+        const signature = formatAbiItem(item);
+        return `error:${signature}`;
+    }
+    if (item.type === 'constructor') {
+        const inputs = formatAbiParams(item.inputs);
+        const stateMutability = typeof item.stateMutability === 'string' ? item.stateMutability : '';
+        return `constructor::${inputs}:${stateMutability}`;
+    }
+    if (item.type === 'fallback' || item.type === 'receive') {
+        const stateMutability = typeof item.stateMutability === 'string' ? item.stateMutability : '';
+        return `${item.type}:::${stateMutability}`;
+    }
+    return 'unknown';
+}
 function getNestedErrorData(error) {
     // If nothing, bail
     if (!error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/ethereum",
-  "version": "0.0.1-commit.6d3c34e",
+  "version": "0.0.1-commit.72dcdcda8",
   "type": "module",
   "exports": {
     "./account": "./dest/account.js",
@@ -40,7 +40,8 @@
     "build": "yarn clean && ../scripts/tsc.sh",
     "build:dev": "../scripts/tsc.sh --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
-    "start:dev": "concurrently -k \"tsgo -b -w\" \"nodemon --watch dest --exec yarn start\"",
+    "generate": "./scripts/generate.sh",
+    "start:dev": "concurrently -k \"../scripts/tsc.sh --watch\" \"nodemon --watch dest --exec yarn start\"",
     "start": "node ./dest/index.js",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}",
     "proposer-address": "node ./dest/cli/forwarder_address.js"
@@ -49,11 +50,10 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/blob-lib": "0.0.1-commit.6d3c34e",
-    "@aztec/constants": "0.0.1-commit.6d3c34e",
-    "@aztec/foundation": "0.0.1-commit.6d3c34e",
-    "@aztec/l1-artifacts": "0.0.1-commit.6d3c34e",
-    "@viem/anvil": "^0.0.10",
+    "@aztec/blob-lib": "0.0.1-commit.72dcdcda8",
+    "@aztec/constants": "0.0.1-commit.72dcdcda8",
+    "@aztec/foundation": "0.0.1-commit.72dcdcda8",
+    "@aztec/l1-artifacts": "0.0.1-commit.72dcdcda8",
     "dotenv": "^16.0.3",
     "lodash.chunk": "^4.2.0",
     "lodash.pickby": "^4.5.0",
@@ -67,8 +67,7 @@
     "@types/jest": "^30.0.0",
     "@types/lodash.pickby": "^4",
     "@types/node": "^22.15.17",
-    "@typescript/native-preview": "7.0.0-dev.20251126.1",
-    "@viem/anvil": "^0.0.10",
+    "@typescript/native-preview": "7.0.0-dev.20260113.1",
     "get-port": "^7.1.0",
     "jest": "^30.0.0",
     "jest-mock-extended": "^4.0.0",

package/src/config.ts

@@ -1,15 +1,17 @@
 import {
   type ConfigMappingsType,
-  // type NetworkNames,
   bigintConfigHelper,
   booleanConfigHelper,
   enumConfigHelper,
   getConfigFromMappings,
+  getDefaultConfig,
   numberConfigHelper,
+  omitConfigMappings,
   optionalNumberConfigHelper,
 } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
 
+import { l1ContractsDefaultEnv } from './generated/l1-contracts-defaults.js';
 import { type L1TxUtilsConfig, l1TxUtilsConfigMappings } from './l1_tx_utils/config.js';
 
 export type GenesisStateConfig = {
@@ -68,124 +70,108 @@ export type L1ContractsConfig = {
   governanceProposerQuorum?: number;
   /** Governance proposing round size */
   governanceProposerRoundSize: number;
+  /** Governance voting duration in seconds (only for local/devnet/next-net, default 3600) */
+  governanceVotingDuration?: number;
   /** The mana target for the rollup */
   manaTarget: bigint;
   /** The proving cost per mana */
   provingCostPerMana: bigint;
+  /** The initial ETH per fee asset price (with 1e12 precision) */
+  initialEthPerFeeAsset: bigint;
   /** The number of seconds to wait for an exit */
   exitDelaySeconds: number;
 } & L1TxUtilsConfig;
 
-export const DefaultL1ContractsConfig = {
-  ethereumSlotDuration: 12,
-  aztecSlotDuration: 36,
-  aztecEpochDuration: 32,
-  aztecTargetCommitteeSize: 48,
-  lagInEpochsForValidatorSet: 2,
-  lagInEpochsForRandao: 2, // For PROD, this value should be > lagInEpochsForValidatorSet
-  inboxLag: 1, // Default inbox lag to prevent sequencer DOS attacks
-  aztecProofSubmissionEpochs: 1, // you have a full epoch to submit a proof after the epoch to prove ends
-  activationThreshold: 100n * 10n ** 18n,
-  ejectionThreshold: 50n * 10n ** 18n,
-  localEjectionThreshold: 98n * 10n ** 18n,
-  slashAmountSmall: 10n * 10n ** 18n,
-  slashAmountMedium: 20n * 10n ** 18n,
-  slashAmountLarge: 50n * 10n ** 18n,
-  slashingRoundSizeInEpochs: 4,
-  slashingLifetimeInRounds: 5,
-  slashingExecutionDelayInRounds: 0, // round N may be submitted in round N + 1
-  slashingVetoer: EthAddress.ZERO,
-  governanceProposerRoundSize: 300,
-  manaTarget: BigInt(100e6),
-  provingCostPerMana: BigInt(100),
-  exitDelaySeconds: 2 * 24 * 60 * 60,
-  slasherFlavor: 'tally' as const,
-  slashingOffsetInRounds: 2,
-  slashingDisableDuration: 5 * 24 * 60 * 60, // 5 days in seconds
-} satisfies L1ContractsConfig;
-
+/**
+ * Config mappings for L1ContractsConfig.
+ * Default values come from generated l1-contracts-defaults.json (source: defaults.yml).
+ * Real deployments use forge scripts which require explicit env vars (vm.envUint).
+ */
 export const l1ContractsConfigMappings: ConfigMappingsType<L1ContractsConfig> = {
   ethereumSlotDuration: {
     env: 'ETHEREUM_SLOT_DURATION',
     description: 'How many seconds an L1 slot lasts.',
-    ...numberConfigHelper(DefaultL1ContractsConfig.ethereumSlotDuration),
+    ...numberConfigHelper(l1ContractsDefaultEnv.ETHEREUM_SLOT_DURATION),
   },
   aztecSlotDuration: {
     env: 'AZTEC_SLOT_DURATION',
     description: 'How many seconds an L2 slots lasts (must be multiple of ethereum slot duration).',
-    ...numberConfigHelper(DefaultL1ContractsConfig.aztecSlotDuration),
+    ...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_SLOT_DURATION),
   },
   aztecEpochDuration: {
     env: 'AZTEC_EPOCH_DURATION',
-    description: `How many L2 slots an epoch lasts (maximum AZTEC_MAX_EPOCH_DURATION).`,
-    ...numberConfigHelper(DefaultL1ContractsConfig.aztecEpochDuration),
+    description: `How many L2 slots an epoch lasts (maximum MAX_CHECKPOINTS_PER_EPOCH).`,
+    ...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_EPOCH_DURATION),
   },
   aztecTargetCommitteeSize: {
     env: 'AZTEC_TARGET_COMMITTEE_SIZE',
     description: 'The target validator committee size.',
-    ...numberConfigHelper(DefaultL1ContractsConfig.aztecTargetCommitteeSize),
+    ...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_TARGET_COMMITTEE_SIZE),
   },
   lagInEpochsForValidatorSet: {
     env: 'AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET',
     description: 'The number of epochs to lag behind the current epoch for validator selection.',
-    ...numberConfigHelper(DefaultL1ContractsConfig.lagInEpochsForValidatorSet),
+    ...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET),
   },
   lagInEpochsForRandao: {
     env: 'AZTEC_LAG_IN_EPOCHS_FOR_RANDAO',
     description: 'The number of epochs to lag behind the current epoch for randao selection.',
-    ...numberConfigHelper(DefaultL1ContractsConfig.lagInEpochsForRandao),
+    ...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_LAG_IN_EPOCHS_FOR_RANDAO),
   },
   inboxLag: {
     env: 'AZTEC_INBOX_LAG',
     description: 'The number of checkpoints to lag in the inbox (prevents sequencer DOS attacks).',
-    ...numberConfigHelper(DefaultL1ContractsConfig.inboxLag),
+    ...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_INBOX_LAG),
   },
   aztecProofSubmissionEpochs: {
     env: 'AZTEC_PROOF_SUBMISSION_EPOCHS',
     description: 'The number of epochs after an epoch ends that proofs are still accepted.',
-    ...numberConfigHelper(DefaultL1ContractsConfig.aztecProofSubmissionEpochs),
+    ...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_PROOF_SUBMISSION_EPOCHS),
   },
   activationThreshold: {
     env: 'AZTEC_ACTIVATION_THRESHOLD',
     description: 'The deposit amount for a validator',
-    ...bigintConfigHelper(DefaultL1ContractsConfig.activationThreshold),
+    ...bigintConfigHelper(BigInt(l1ContractsDefaultEnv.AZTEC_ACTIVATION_THRESHOLD)),
   },
   ejectionThreshold: {
     env: 'AZTEC_EJECTION_THRESHOLD',
     description: 'The minimum stake for a validator.',
-    ...bigintConfigHelper(DefaultL1ContractsConfig.ejectionThreshold),
+    ...bigintConfigHelper(BigInt(l1ContractsDefaultEnv.AZTEC_EJECTION_THRESHOLD)),
   },
   localEjectionThreshold: {
     env: 'AZTEC_LOCAL_EJECTION_THRESHOLD',
     description:
       'The local ejection threshold for a validator. Stricter than ejectionThreshold but local to a specific rollup',
-    ...bigintConfigHelper(DefaultL1ContractsConfig.localEjectionThreshold),
+    ...bigintConfigHelper(BigInt(l1ContractsDefaultEnv.AZTEC_LOCAL_EJECTION_THRESHOLD)),
   },
   slashingOffsetInRounds: {
     env: 'AZTEC_SLASHING_OFFSET_IN_ROUNDS',
     description:
       'How many slashing rounds back we slash (ie when slashing in round N, we slash for offenses committed during epochs of round N-offset)',
-    ...numberConfigHelper(DefaultL1ContractsConfig.slashingOffsetInRounds),
+    ...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_SLASHING_OFFSET_IN_ROUNDS),
   },
   slasherFlavor: {
     env: 'AZTEC_SLASHER_FLAVOR',
     description: 'Type of slasher proposer (empire, tally, or none)',
-    ...enumConfigHelper(['empire', 'tally', 'none'] as const, DefaultL1ContractsConfig.slasherFlavor),
+    ...enumConfigHelper(
+      ['empire', 'tally', 'none'] as const,
+      l1ContractsDefaultEnv.AZTEC_SLASHER_FLAVOR as 'empire' | 'tally' | 'none',
+    ),
   },
   slashAmountSmall: {
     env: 'AZTEC_SLASH_AMOUNT_SMALL',
     description: 'Small slashing amount for light offenses',
-    ...bigintConfigHelper(DefaultL1ContractsConfig.slashAmountSmall),
+    ...bigintConfigHelper(BigInt(l1ContractsDefaultEnv.AZTEC_SLASH_AMOUNT_SMALL)),
   },
   slashAmountMedium: {
     env: 'AZTEC_SLASH_AMOUNT_MEDIUM',
     description: 'Medium slashing amount for moderate offenses',
-    ...bigintConfigHelper(DefaultL1ContractsConfig.slashAmountMedium),
+    ...bigintConfigHelper(BigInt(l1ContractsDefaultEnv.AZTEC_SLASH_AMOUNT_MEDIUM)),
   },
   slashAmountLarge: {
     env: 'AZTEC_SLASH_AMOUNT_LARGE',
     description: 'Large slashing amount for severe offenses',
-    ...bigintConfigHelper(DefaultL1ContractsConfig.slashAmountLarge),
+    ...bigintConfigHelper(BigInt(l1ContractsDefaultEnv.AZTEC_SLASH_AMOUNT_LARGE)),
   },
   slashingQuorum: {
     env: 'AZTEC_SLASHING_QUORUM',
@@ -195,28 +181,28 @@ export const l1ContractsConfigMappings: ConfigMappingsType<L1ContractsConfig> =
   slashingRoundSizeInEpochs: {
     env: 'AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS',
     description: 'The slashing round size',
-    ...numberConfigHelper(DefaultL1ContractsConfig.slashingRoundSizeInEpochs),
+    ...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS),
   },
   slashingLifetimeInRounds: {
     env: 'AZTEC_SLASHING_LIFETIME_IN_ROUNDS',
     description: 'The slashing lifetime in rounds',
-    ...numberConfigHelper(DefaultL1ContractsConfig.slashingLifetimeInRounds),
+    ...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_SLASHING_LIFETIME_IN_ROUNDS),
   },
   slashingExecutionDelayInRounds: {
     env: 'AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS',
     description: 'The slashing execution delay in rounds',
-    ...numberConfigHelper(DefaultL1ContractsConfig.slashingExecutionDelayInRounds),
+    ...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS),
   },
   slashingVetoer: {
     env: 'AZTEC_SLASHING_VETOER',
     description: 'The slashing vetoer',
     parseEnv: (val: string) => EthAddress.fromString(val),
-    defaultValue: DefaultL1ContractsConfig.slashingVetoer,
+    defaultValue: EthAddress.fromString(l1ContractsDefaultEnv.AZTEC_SLASHING_VETOER),
   },
   slashingDisableDuration: {
     env: 'AZTEC_SLASHING_DISABLE_DURATION',
     description: 'How long slashing can be disabled for in seconds when vetoer disables it',
-    ...numberConfigHelper(DefaultL1ContractsConfig.slashingDisableDuration),
+    ...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_SLASHING_DISABLE_DURATION),
   },
   governanceProposerQuorum: {
     env: 'AZTEC_GOVERNANCE_PROPOSER_QUORUM',
@@ -226,26 +212,42 @@ export const l1ContractsConfigMappings: ConfigMappingsType<L1ContractsConfig> =
   governanceProposerRoundSize: {
     env: 'AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE',
     description: 'The governance proposing round size',
-    ...numberConfigHelper(DefaultL1ContractsConfig.governanceProposerRoundSize),
+    ...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE),
+  },
+  governanceVotingDuration: {
+    env: 'AZTEC_GOVERNANCE_VOTING_DURATION',
+    description: 'Governance voting duration in seconds (only for local/devnet/next-net)',
+    ...numberConfigHelper(3600), // 1 hour default, not in generated defaults as it's deployment-time only
   },
   manaTarget: {
     env: 'AZTEC_MANA_TARGET',
     description: 'The mana target for the rollup',
-    ...bigintConfigHelper(DefaultL1ContractsConfig.manaTarget),
+    ...bigintConfigHelper(BigInt(l1ContractsDefaultEnv.AZTEC_MANA_TARGET)),
   },
   provingCostPerMana: {
     env: 'AZTEC_PROVING_COST_PER_MANA',
     description: 'The proving cost per mana',
-    ...bigintConfigHelper(DefaultL1ContractsConfig.provingCostPerMana),
+    ...bigintConfigHelper(BigInt(l1ContractsDefaultEnv.AZTEC_PROVING_COST_PER_MANA)),
+  },
+  initialEthPerFeeAsset: {
+    env: 'AZTEC_INITIAL_ETH_PER_FEE_ASSET',
+    description: 'The initial ETH per fee asset price (with 1e12 precision)',
+    ...bigintConfigHelper(BigInt(l1ContractsDefaultEnv.AZTEC_INITIAL_ETH_PER_FEE_ASSET)),
   },
   exitDelaySeconds: {
     env: 'AZTEC_EXIT_DELAY_SECONDS',
     description: 'The delay before a validator can exit the set',
-    ...numberConfigHelper(DefaultL1ContractsConfig.exitDelaySeconds),
+    ...numberConfigHelper(l1ContractsDefaultEnv.AZTEC_EXIT_DELAY_SECONDS),
   },
-  ...l1TxUtilsConfigMappings,
+  ...omitConfigMappings(l1TxUtilsConfigMappings, ['ethereumSlotDuration']),
 };
 
+/**
+ * Default L1 contracts configuration derived from l1ContractsConfigMappings.
+ * Source of truth: spartan/environments/defaults.yml -> defaults.l1-contracts
+ */
+export const DefaultL1ContractsConfig = getDefaultConfig(l1ContractsConfigMappings);
+
 export const genesisStateConfigMappings: ConfigMappingsType<GenesisStateConfig> = {
   testAccounts: {
     env: 'TEST_ACCOUNTS',