@aztec/ethereum 3.0.0-devnet.2 → 3.0.0-devnet.20251212

package/dest/deploy_l1_contracts.js

@@ -1,11 +1,12 @@
 import { L1_TO_L2_MSG_SUBTREE_HEIGHT } from '@aztec/constants';
+import { SlotNumber } from '@aztec/foundation/branded-types';
 import { getActiveNetworkName } from '@aztec/foundation/config';
-import { keccak256String } from '@aztec/foundation/crypto';
+import { keccak256String } from '@aztec/foundation/crypto/keccak';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
 import { createLogger } from '@aztec/foundation/log';
 import { DateProvider } from '@aztec/foundation/timer';
-import { mkdir, writeFile } from 'fs/promises';
+import fs from 'fs';
 import chunk from 'lodash.chunk';
 import { concatHex, encodeAbiParameters, encodeDeployData, encodeFunctionData, getAddress, getContract, getContractAddress, numberToHex, padHex } from 'viem';
 import { foundry } from 'viem/chains';
@@ -123,6 +124,26 @@ export const deploySharedContracts = async (l1Client, deployer, args, logger)=>{
         ]);
         feeAssetAddress = deployedFee.address;
         logger.verbose(`Deployed Fee Asset at ${feeAssetAddress}`);
+        // Mint a tiny bit of tokens to satisfy coin-issuer constraints
+        const { txHash } = await deployer.sendTransaction({
+            to: feeAssetAddress.toString(),
+            data: encodeFunctionData({
+                abi: FeeAssetArtifact.contractAbi,
+                functionName: 'mint',
+                args: [
+                    l1Client.account.address,
+                    1n * 10n ** 18n
+                ]
+            })
+        }, {
+            // contract may not have been deployed yet (CREATE2 returns address before mining),
+            // which causes gas estimation to fail. Hardcode to 100k which is plenty for ERC20 mint.
+            gasLimit: 100_000n
+        });
+        await l1Client.waitForTransactionReceipt({
+            hash: txHash
+        });
+        logger.verbose(`Minted tiny bit of tokens to satisfy coin-issuer constraints in ${txHash}`);
         const deployedStaking = await deployer.deploy(StakingAssetArtifact, [
             'Staking',
             'STK',
@@ -193,11 +214,16 @@ export const deploySharedContracts = async (l1Client, deployer, args, logger)=>{
         logger.verbose(`Set governance on GSE in ${txHash}`);
         txHashes.push(txHash);
     }
+    logger.verbose(`Waiting for deployments to complete`);
+    await deployer.waitForDeployments();
     const coinIssuerAddress = (await deployer.deploy(CoinIssuerArtifact, [
         feeAssetAddress.toString(),
         2n * 10n ** 17n,
         l1Client.account.address
-    ])).address;
+    ], {
+        gasLimit: 1_000_000n,
+        noSimulation: true
+    })).address;
     logger.verbose(`Deployed CoinIssuer at ${coinIssuerAddress}`);
     logger.verbose(`Waiting for deployments to complete`);
     await deployer.waitForDeployments();
@@ -207,14 +233,15 @@ export const deploySharedContracts = async (l1Client, deployer, args, logger)=>{
     let zkPassportVerifierAddress = undefined;
     // Only if not on mainnet will we deploy the handlers, and only when we control the token
     if (l1Client.chain.id !== 1 && !args.existingTokenAddress) {
-        /* -------------------------------------------------------------------------- */ /*                          CHEAT CODES START HERE                            */ /* -------------------------------------------------------------------------- */ feeAssetHandlerAddress = (await deployer.deploy(FeeAssetHandlerArtifact, [
+        /* -------------------------------------------------------------------------- */ /*                          CHEAT CODES START HERE                            */ /* -------------------------------------------------------------------------- */ const deployedFeeAssetHandler = await deployer.deploy(FeeAssetHandlerArtifact, [
             l1Client.account.address,
             feeAssetAddress.toString(),
             BigInt(1000n * 10n ** 18n)
-        ])).address;
+        ]);
+        feeAssetHandlerAddress = deployedFeeAssetHandler.address;
         logger.verbose(`Deployed FeeAssetHandler at ${feeAssetHandlerAddress}`);
-        // Only if we are "fresh" will we be adding as a minter, otherwise above will simply get same address
-        if (needToSetGovernance) {
+        // Only add as minter if this is a new deployment (not reusing existing handler from failed previous run)
+        if (!deployedFeeAssetHandler.existed) {
             const { txHash } = await deployer.sendTransaction({
                 to: feeAssetAddress.toString(),
                 data: encodeFunctionData({
@@ -284,8 +311,8 @@ export const deploySharedContracts = async (l1Client, deployer, args, logger)=>{
     const registry = new RegistryContract(l1Client, registryAddress);
     /* -------------------------------------------------------------------------- */ /*                      FUND REWARD DISTRIBUTOR START                         */ /* -------------------------------------------------------------------------- */ const rewardDistributorAddress = await registry.getRewardDistributor();
     if (!args.existingTokenAddress) {
-        const blockReward = getRewardConfig(networkName).blockReward;
-        const funding = blockReward * 200000n;
+        const checkpointReward = getRewardConfig(networkName).checkpointReward;
+        const funding = checkpointReward * 200000n;
         const { txHash: fundRewardDistributorTxHash } = await deployer.sendTransaction({
             to: feeAssetAddress.toString(),
             data: encodeFunctionData({
@@ -534,7 +561,7 @@ const getZkPassportVerifierAddress = async (deployer, args)=>{
         const date = new Date();
         const formattedDate = date.toISOString().slice(2, 19).replace(/[-T:]/g, '');
         // Ensure the verification output directory exists
-        await mkdir(outputDirectory, {
+        await fs.promises.mkdir(outputDirectory, {
             recursive: true
         });
         const suffix = filenameSuffix ? `-${filenameSuffix}` : '';
@@ -545,7 +572,7 @@ const getZkPassportVerifierAddress = async (deployer, args)=>{
             network: networkName,
             records: deployer.verificationRecords
         };
-        await writeFile(verificationOutputPath, JSON.stringify(verificationData, null, 2));
+        await fs.promises.writeFile(verificationOutputPath, JSON.stringify(verificationData, null, 2));
         logger.info(`Wrote L1 verification data to ${verificationOutputPath}`);
     } catch (e) {
         logger.warn(`Failed to write L1 verification data file: ${String(e)}`);
@@ -628,7 +655,8 @@ function slasherFlavorToSolidityEnum(flavor) {
         aztecSlotDuration: BigInt(args.aztecSlotDuration),
         aztecEpochDuration: BigInt(args.aztecEpochDuration),
         targetCommitteeSize: BigInt(args.aztecTargetCommitteeSize),
-        lagInEpochs: BigInt(args.lagInEpochs),
+        lagInEpochsForValidatorSet: BigInt(args.lagInEpochsForValidatorSet),
+        lagInEpochsForRandao: BigInt(args.lagInEpochsForRandao),
         aztecProofSubmissionEpochs: BigInt(args.aztecProofSubmissionEpochs),
         slashingQuorum: BigInt(args.slashingQuorum ?? args.slashingRoundSizeInEpochs * args.aztecEpochDuration / 2 + 1),
         slashingRoundSize: BigInt(args.slashingRoundSizeInEpochs * args.aztecEpochDuration),
@@ -1133,8 +1161,8 @@ export const cheat_initializeFeeAssetHandler = async (extendedClient, deployer,
         try {
             // Need to get the time
             const currentSlot = await rollup.getSlotNumber();
-            if (BigInt(currentSlot) === 0n) {
-                const ts = Number(await rollup.getTimestampForSlot(1n));
+            if (currentSlot === 0) {
+                const ts = Number(await rollup.getTimestampForSlot(SlotNumber(1)));
                 await rpcCall('evm_setNextBlockTimestamp', [
                     ts
                 ]);
@@ -1142,7 +1170,7 @@ export const cheat_initializeFeeAssetHandler = async (extendedClient, deployer,
                     1
                 ]);
                 const currentSlot = await rollup.getSlotNumber();
-                if (BigInt(currentSlot) !== 1n) {
+                if (currentSlot !== 1) {
                     throw new Error(`Error jumping time: current slot is ${currentSlot}`);
                 }
                 logger.info(`Jumped to slot 1`);
@@ -1205,7 +1233,8 @@ export class L1Deployer {
                 logger: this.logger,
                 l1TxUtils: this.l1TxUtils,
                 acceleratedTestDeployments: this.acceleratedTestDeployments,
-                gasLimit: opts.gasLimit
+                gasLimit: opts.gasLimit,
+                noSimulation: opts.noSimulation
             });
             if (txHash) {
                 this.txHashes.push(txHash);
@@ -1283,7 +1312,7 @@ export class L1Deployer {
     let txHash = undefined;
     let resultingAddress = undefined;
     const deployedLibraries = [];
-    const { salt: saltFromOpts, libraries, logger, gasLimit, acceleratedTestDeployments } = opts;
+    const { salt: saltFromOpts, libraries, logger, gasLimit, acceleratedTestDeployments, noSimulation } = opts;
     let { l1TxUtils } = opts;
     if (!l1TxUtils) {
         const config = getL1TxUtilsConfigEnvVars();
@@ -1376,26 +1405,28 @@ export class L1Deployer {
             address: resultingAddress
         });
         if (existing === undefined || existing === '0x') {
-            try {
-                await l1TxUtils.simulate({
-                    to: DEPLOYER_ADDRESS,
-                    data: concatHex([
-                        salt,
-                        calldata
-                    ]),
-                    gas: gasLimit
-                });
-            } catch (err) {
-                logger?.error(`Failed to simulate deployment tx using universal deployer`, err);
-                await l1TxUtils.simulate({
-                    to: null,
-                    data: encodeDeployData({
-                        abi,
-                        bytecode,
-                        args
-                    }),
-                    gas: gasLimit
-                });
+            if (!noSimulation) {
+                try {
+                    await l1TxUtils.simulate({
+                        to: DEPLOYER_ADDRESS,
+                        data: concatHex([
+                            salt,
+                            calldata
+                        ]),
+                        gas: gasLimit
+                    });
+                } catch (err) {
+                    logger?.error(`Failed to simulate deployment tx using universal deployer`, err);
+                    await l1TxUtils.simulate({
+                        to: null,
+                        data: encodeDeployData({
+                            abi,
+                            bytecode,
+                            args
+                        }),
+                        gas: gasLimit
+                    });
+                }
             }
             const res = await l1TxUtils.sendTransaction({
                 to: DEPLOYER_ADDRESS,

package/dest/eth-signer/eth-signer.d.ts

@@ -18,4 +18,4 @@ export interface EthSigner {
     /** Sign a transaction */
     signTransaction(transaction: TransactionSerializable): Promise<Signature>;
 }
-//# sourceMappingURL=eth-signer.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXRoLXNpZ25lci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2V0aC1zaWduZXIvZXRoLXNpZ25lci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7R0FFRztBQUNILE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRWpFLE9BQU8sS0FBSyxFQUFFLHVCQUF1QixFQUFFLG1CQUFtQixFQUFFLE1BQU0sTUFBTSxDQUFDO0FBRXpFOztHQUVHO0FBQ0gsTUFBTSxXQUFXLFNBQVM7SUFDeEIsMkNBQTJDO0lBQzNDLFFBQVEsQ0FBQyxPQUFPLEVBQUUsVUFBVSxDQUFDO0lBRTdCLG1FQUFtRTtJQUNuRSxXQUFXLENBQUMsT0FBTyxFQUFFLFFBQVEsR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7SUFFbkQsb0NBQW9DO0lBQ3BDLGFBQWEsQ0FBQyxTQUFTLEVBQUUsbUJBQW1CLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBRWxFLHlCQUF5QjtJQUN6QixlQUFlLENBQUMsV0FBVyxFQUFFLHVCQUF1QixHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQztDQUMzRSJ9

package/dest/eth-signer/index.d.ts

@@ -1,2 +1,2 @@
 export * from './eth-signer.js';
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ldGgtc2lnbmVyL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsaUJBQWlCLENBQUMifQ==

package/dest/forwarder_proxy.d.ts

@@ -0,0 +1,32 @@
+import { EthAddress } from '@aztec/foundation/eth-address';
+import type { Logger } from '@aztec/foundation/log';
+import type { ExtendedViemWalletClient } from './types.js';
+export declare const FORWARDER_SOLIDITY_SOURCE = "\ncontract ForwarderProxy {\n  function forward(address target, bytes calldata data) external payable returns (bytes memory) {\n    (bool success, bytes memory result) = target.call{value: msg.value}(data);\n    require(success, \"call failed\");\n    return result;\n  }\n}";
+export declare const FORWARDER_ABI: readonly [{
+    readonly inputs: readonly [{
+        readonly internalType: "address";
+        readonly name: "target";
+        readonly type: "address";
+    }, {
+        readonly internalType: "bytes";
+        readonly name: "data";
+        readonly type: "bytes";
+    }];
+    readonly name: "forward";
+    readonly outputs: readonly [{
+        readonly internalType: "bytes";
+        readonly name: "";
+        readonly type: "bytes";
+    }];
+    readonly stateMutability: "payable";
+    readonly type: "function";
+}];
+export declare const FORWARDER_BYTECODE: `0x${string}`;
+/**
+ * Deploys the forwarder proxy contract to L1.
+ * @param client - The L1 client to use for deployment
+ * @param logger - Optional logger
+ * @returns The deployed forwarder contract address
+ */
+export declare function deployForwarderProxy(client: ExtendedViemWalletClient, logger?: Logger): Promise<EthAddress>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9yd2FyZGVyX3Byb3h5LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvZm9yd2FyZGVyX3Byb3h5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUMzRCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQVFwRCxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUUzRCxlQUFPLE1BQU0seUJBQXlCLHVSQU9wQyxDQUFDO0FBRUgsZUFBTyxNQUFNLGFBQWE7Ozs7Ozs7Ozs7Ozs7Ozs7OztFQXlCaEIsQ0FBQztBQUVYLGVBQU8sTUFBTSxrQkFBa0IsZUFDbzZELENBQUM7QUFRcDhEOzs7OztHQUtHO0FBQ0gsd0JBQXNCLG9CQUFvQixDQUFDLE1BQU0sRUFBRSx3QkFBd0IsRUFBRSxNQUFNLENBQUMsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQVVqSCJ9

package/dest/forwarder_proxy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"forwarder_proxy.d.ts","sourceRoot":"","sources":["../src/forwarder_proxy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAQpD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAE3D,eAAO,MAAM,yBAAyB,uRAOpC,CAAC;AAEH,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;EAyBhB,CAAC;AAEX,eAAO,MAAM,kBAAkB,eACo6D,CAAC;AAQp8D;;;;;GAKG;AACH,wBAAsB,oBAAoB,CAAC,MAAM,EAAE,wBAAwB,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAUjH"}

package/dest/forwarder_proxy.js

@@ -0,0 +1,93 @@
+/* eslint-disable no-console */ import { createLogger } from '@aztec/foundation/log';
+import { DateProvider } from '@aztec/foundation/timer';
+import { extractChain } from 'viem';
+import { anvil, mainnet, sepolia } from 'viem/chains';
+import { L1Deployer } from './deploy_l1_contracts.js';
+export const FORWARDER_SOLIDITY_SOURCE = `
+contract ForwarderProxy {
+  function forward(address target, bytes calldata data) external payable returns (bytes memory) {
+    (bool success, bytes memory result) = target.call{value: msg.value}(data);
+    require(success, "call failed");
+    return result;
+  }
+}`;
+export const FORWARDER_ABI = [
+    {
+        inputs: [
+            {
+                internalType: 'address',
+                name: 'target',
+                type: 'address'
+            },
+            {
+                internalType: 'bytes',
+                name: 'data',
+                type: 'bytes'
+            }
+        ],
+        name: 'forward',
+        outputs: [
+            {
+                internalType: 'bytes',
+                name: '',
+                type: 'bytes'
+            }
+        ],
+        stateMutability: 'payable',
+        type: 'function'
+    }
+];
+export const FORWARDER_BYTECODE = '0x6080604052348015600e575f5ffd5b506103bf8061001c5f395ff3fe60806040526004361061001d575f3560e01c80636fadcf7214610021575b5f5ffd5b61003b600480360381019061003691906101d0565b610051565b604051610048919061029d565b60405180910390f35b60605f5f8573ffffffffffffffffffffffffffffffffffffffff1634868660405161007d9291906102f9565b5f6040518083038185875af1925050503d805f81146100b7576040519150601f19603f3d011682016040523d82523d5f602084013e6100bc565b606091505b509150915081610101576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016100f89061036b565b60405180910390fd5b80925050509392505050565b5f5ffd5b5f5ffd5b5f73ffffffffffffffffffffffffffffffffffffffff82169050919050565b5f61013e82610115565b9050919050565b61014e81610134565b8114610158575f5ffd5b50565b5f8135905061016981610145565b92915050565b5f5ffd5b5f5ffd5b5f5ffd5b5f5f83601f8401126101905761018f61016f565b5b8235905067ffffffffffffffff8111156101ad576101ac610173565b5b6020830191508360018202830111156101c9576101c8610177565b5b9250929050565b5f5f5f604084860312156101e7576101e661010d565b5b5f6101f48682870161015b565b935050602084013567ffffffffffffffff81111561021557610214610111565b5b6102218682870161017b565b92509250509250925092565b5f81519050919050565b5f82825260208201905092915050565b8281835e5f83830152505050565b5f601f19601f8301169050919050565b5f61026f8261022d565b6102798185610237565b9350610289818560208601610247565b61029281610255565b840191505092915050565b5f6020820190508181035f8301526102b58184610265565b905092915050565b5f81905092915050565b828183375f83830152505050565b5f6102e083856102bd565b93506102ed8385846102c7565b82840190509392505050565b5f6103058284866102d5565b91508190509392505050565b5f82825260208201905092915050565b7f63616c6c206661696c65640000000000000000000000000000000000000000005f82015250565b5f610355600b83610311565b915061036082610321565b602082019050919050565b5f6020820190508181035f83015261038281610349565b905091905056fea26469706673582212209a1c8cf638cf1569450a731ef9457b862f9e153b0a46e5555429bcf4dffd999564736f6c634300081e0033';
+const FORWARDER_ARTIFACT = {
+    name: 'Forwarder',
+    contractAbi: FORWARDER_ABI,
+    contractBytecode: FORWARDER_BYTECODE
+};
+/**
+ * Deploys the forwarder proxy contract to L1.
+ * @param client - The L1 client to use for deployment
+ * @param logger - Optional logger
+ * @returns The deployed forwarder contract address
+ */ export async function deployForwarderProxy(client, logger) {
+    const log = logger ?? createLogger('ethereum:forwarder');
+    const nonce = await client.getTransactionCount({
+        address: client.account.address
+    });
+    const deployer = new L1Deployer(client, nonce, new DateProvider(), false, log, undefined, false);
+    log.info('Deploying forwarder proxy contract');
+    const deployment = await deployer.deploy(FORWARDER_ARTIFACT, []);
+    log.info(`Forwarder proxy deployed at ${deployment.address.toString()}`);
+    return deployment.address;
+}
+/**
+ * Main function for deploying the forwarder proxy from command line.
+ * Usage: node forwarder_proxy.js <private_key> <rpc_url>
+ */ async function main() {
+    const args = process.argv.slice(2);
+    if (args.length < 3) {
+        console.error('Usage: node forwarder_proxy.js <private_key> <rpc_url> <chain_id>');
+        process.exit(1);
+    }
+    const [privateKey, rpcUrl, chainId] = args;
+    // Dynamic import to avoid pulling in dependencies at module load time
+    const { createExtendedL1Client } = await import('./client.js');
+    const client = createExtendedL1Client([
+        rpcUrl
+    ], privateKey.startsWith('0x') ? privateKey : `0x${privateKey}`, extractChain({
+        chains: [
+            mainnet,
+            sepolia,
+            anvil
+        ],
+        id: parseInt(chainId)
+    }));
+    const address = await deployForwarderProxy(client);
+    console.log(`Forwarder proxy deployed at: ${address.toString()}`);
+}
+// Only run main if this is the entry point
+if (import.meta.url === `file://${process.argv[1]}`) {
+    main().catch((err)=>{
+        console.error('Failed to deploy forwarder proxy:', err);
+        process.exit(1);
+    });
+}