@aztec/ethereum 0.49.2 → 0.51.0

package/dest/deploy_l1_contracts.d.ts

@@ -65,7 +65,7 @@ export interface L1ContractArtifactsForDeployment {
      */
     feeJuice: ContractArtifacts;
     /**
-     * Gas portal contract artifacts. Optional for now as gas is not strictly enforced
+     * Fee juice portal contract artifacts. Optional for now as gas is not strictly enforced
      */
     feeJuicePortal: ContractArtifacts;
 }
@@ -95,6 +95,7 @@ export declare const deployL1Contracts: (rpcUrl: string, account: HDAccount | Pr
     l2FeeJuiceAddress: AztecAddress;
     vkTreeRoot: Fr;
     assumeProvenUntil?: number;
+    salt: number | undefined;
 }) => Promise<DeployL1Contracts>;
 /**
  * Helper function to deploy ETH contracts.
@@ -105,5 +106,5 @@ export declare const deployL1Contracts: (rpcUrl: string, account: HDAccount | Pr
  * @param args - Constructor arguments for the contract.
  * @returns The ETH address the contract was deployed to.
  */
-export declare function deployL1Contract(walletClient: WalletClient<HttpTransport, Chain, Account>, publicClient: PublicClient<HttpTransport, Chain>, abi: Narrow<Abi | readonly unknown[]>, bytecode: Hex, args?: readonly unknown[]): Promise<EthAddress>;
+export declare function deployL1Contract(walletClient: WalletClient<HttpTransport, Chain, Account>, publicClient: PublicClient<HttpTransport, Chain>, abi: Narrow<Abi | readonly unknown[]>, bytecode: Hex, args?: readonly unknown[], maybeSalt?: Hex, logger?: DebugLogger): Promise<EthAddress>;
 //# sourceMappingURL=deploy_l1_contracts.d.ts.map

package/dest/deploy_l1_contracts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy_l1_contracts.d.ts","sourceRoot":"","sources":["../src/deploy_l1_contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,GAAG,EACR,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,YAAY,EAMlB,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,iBAAiB,EAA0C,MAAM,eAAe,CAAC;AAG/G,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEtE;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B;;OAEG;IACH,YAAY,EAAE,YAAY,CAAC,aAAa,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IAC1D;;OAEG;IACH,YAAY,EAAE,YAAY,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;IACjD;;OAEG;IACH,mBAAmB,EAAE,mBAAmB,CAAC;CAC1C,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC,GAAG,GAAG,SAAS,OAAO,EAAE,CAAC,CAAC;IAC9C;;OAEG;IACH,gBAAgB,EAAE,GAAG,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,gCAAgC;IAC/C;;OAEG;IACH,KAAK,EAAE,iBAAiB,CAAC;IACzB;;OAEG;IACH,MAAM,EAAE,iBAAiB,CAAC;IAC1B;;OAEG;IACH,kBAAkB,EAAE,iBAAiB,CAAC;IACtC;;OAEG;IACH,QAAQ,EAAE,iBAAiB,CAAC;IAC5B;;OAEG;IACH,MAAM,EAAE,iBAAiB,CAAC;IAC1B;;OAEG;IACH,QAAQ,EAAE,iBAAiB,CAAC;IAC5B;;OAEG;IACH,cAAc,EAAE,iBAAiB,CAAC;CACnC;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,YAAY,EAAE,YAAY,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;IACjD,YAAY,EAAE,YAAY,CAAC,aAAa,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;CAC3D,CAAC;AAEF;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,MAAM,EACd,+BAA+B,EAAE,MAAM,GAAG,KAAK,MAAM,EAAE,GAAG,SAAS,GAAG,iBAAiB,EACvF,KAAK,GAAE,KAAe,GACrB,SAAS,CAmBX;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,iBAAiB,WACpB,MAAM,WACL,SAAS,GAAG,iBAAiB,SAC/B,KAAK,UACJ,WAAW,qBACA,gCAAgC,QAC7C;IAAE,iBAAiB,EAAE,YAAY,CAAC;IAAC,UAAU,EAAE,EAAE,CAAC;IAAC,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAAE,KACpF,QAAQ,iBAAiB,CAsK3B,CAAC;AAGF;;;;;;;;GAQG;AACH,wBAAsB,gBAAgB,CACpC,YAAY,EAAE,YAAY,CAAC,aAAa,EAAE,KAAK,EAAE,OAAO,CAAC,EACzD,YAAY,EAAE,YAAY,CAAC,aAAa,EAAE,KAAK,CAAC,EAChD,GAAG,EAAE,MAAM,CAAC,GAAG,GAAG,SAAS,OAAO,EAAE,CAAC,EACrC,QAAQ,EAAE,GAAG,EACb,IAAI,GAAE,SAAS,OAAO,EAAO,GAC5B,OAAO,CAAC,UAAU,CAAC,CAkBrB"}
+{"version":3,"file":"deploy_l1_contracts.d.ts","sourceRoot":"","sources":["../src/deploy_l1_contracts.ts"],"names":[],"mappings":"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"}

package/dest/deploy_l1_contracts.js

@@ -1,5 +1,5 @@
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { createPublicClient, createWalletClient, getAddress, getContract, http, } from 'viem';
+import { concatHex, createPublicClient, createWalletClient, encodeDeployData, getAddress, getContract, getContractAddress, http, numberToHex, padHex, zeroAddress, } from 'viem';
 import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
 import { foundry } from 'viem/chains';
 /**
@@ -49,33 +49,63 @@ export const deployL1Contracts = async (rpcUrl, account, chain, logger, contract
         };
         return await (await fetch(rpcUrl, content)).json();
     };
-    const interval = 12;
-    const res = await rpcCall(rpcUrl, 'anvil_setBlockTimestampInterval', [interval]);
-    if (res.error) {
-        throw new Error(`Error setting block interval: ${res.error.message}`);
+    if (chain.id == foundry.id) {
+        const interval = 12;
+        const res = await rpcCall(rpcUrl, 'anvil_setBlockTimestampInterval', [interval]);
+        if (res.error) {
+            throw new Error(`Error setting block interval: ${res.error.message}`);
+        }
+        logger.info(`Set block interval to ${interval}`);
     }
-    logger.info(`Set block interval to ${interval}`);
-    logger.debug('Deploying contracts...');
-    const walletClient = createWalletClient({
-        account,
-        chain,
-        transport: http(rpcUrl),
-    });
-    const publicClient = createPublicClient({
-        chain,
-        transport: http(rpcUrl),
-    });
-    const registryAddress = await deployL1Contract(walletClient, publicClient, contractsToDeploy.registry.contractAbi, contractsToDeploy.registry.contractBytecode);
+    logger.info(`Deploying contracts from ${account.address.toString()}...`);
+    const walletClient = createWalletClient({ account, chain, transport: http(rpcUrl) });
+    const publicClient = createPublicClient({ chain, transport: http(rpcUrl) });
+    const deployer = new L1Deployer(walletClient, publicClient, args.salt, logger);
+    const registryAddress = await deployer.deploy(contractsToDeploy.registry, [account.address.toString()]);
     logger.info(`Deployed Registry at ${registryAddress}`);
-    const availabilityOracleAddress = await deployL1Contract(walletClient, publicClient, contractsToDeploy.availabilityOracle.contractAbi, contractsToDeploy.availabilityOracle.contractBytecode);
+    const availabilityOracleAddress = await deployer.deploy(contractsToDeploy.availabilityOracle);
     logger.info(`Deployed AvailabilityOracle at ${availabilityOracleAddress}`);
-    const feeJuiceAddress = await deployL1Contract(walletClient, publicClient, contractsToDeploy.feeJuice.contractAbi, contractsToDeploy.feeJuice.contractBytecode);
+    const feeJuiceAddress = await deployer.deploy(contractsToDeploy.feeJuice);
     logger.info(`Deployed Fee Juice at ${feeJuiceAddress}`);
-    const rollupAddress = await deployL1Contract(walletClient, publicClient, contractsToDeploy.rollup.contractAbi, contractsToDeploy.rollup.contractBytecode, [
+    const feeJuicePortalAddress = await deployer.deploy(contractsToDeploy.feeJuicePortal, [account.address.toString()]);
+    logger.info(`Deployed Gas Portal at ${feeJuicePortalAddress}`);
+    const feeJuicePortal = getContract({
+        address: feeJuicePortalAddress.toString(),
+        abi: contractsToDeploy.feeJuicePortal.contractAbi,
+        client: walletClient,
+    });
+    // fund the portal contract with Fee Juice
+    const feeJuice = getContract({
+        address: feeJuiceAddress.toString(),
+        abi: contractsToDeploy.feeJuice.contractAbi,
+        client: walletClient,
+    });
+    // @note  This value MUST match what is in `constants.nr`. It is currently specified here instead of just importing
+    //        because there is circular dependency hell. This is a temporary solution. #3342
+    const FEE_JUICE_INITIAL_MINT = 20000000000;
+    const receipt = await feeJuice.write.mint([feeJuicePortalAddress.toString(), FEE_JUICE_INITIAL_MINT], {});
+    await publicClient.waitForTransactionReceipt({ hash: receipt });
+    logger.info(`Funded fee juice portal contract with Fee Juice`);
+    if ((await feeJuicePortal.read.registry([])) === zeroAddress) {
+        await publicClient.waitForTransactionReceipt({
+            hash: await feeJuicePortal.write.initialize([
+                registryAddress.toString(),
+                feeJuiceAddress.toString(),
+                args.l2FeeJuiceAddress.toString(),
+            ]),
+        });
+        logger.verbose(`Fee juice portal initialized with registry ${registryAddress.toString()}`);
+    }
+    else {
+        logger.verbose(`Fee juice portal is already initialized`);
+    }
+    logger.info(`Initialized Gas Portal at ${feeJuicePortalAddress} to bridge between L1 ${feeJuiceAddress} to L2 ${args.l2FeeJuiceAddress}`);
+    const rollupAddress = await deployer.deploy(contractsToDeploy.rollup, [
         getAddress(registryAddress.toString()),
         getAddress(availabilityOracleAddress.toString()),
-        getAddress(feeJuiceAddress.toString()),
+        getAddress(feeJuicePortalAddress.toString()),
         args.vkTreeRoot.toString(),
+        account.address.toString(),
     ]);
     logger.info(`Deployed Rollup at ${rollupAddress}`);
     // Set initial blocks as proven if requested
@@ -115,32 +145,13 @@ export const deployL1Contracts = async (rpcUrl, account, chain, logger, contract
         abi: contractsToDeploy.registry.contractAbi,
         client: walletClient,
     });
-    await registryContract.write.upgrade([getAddress(rollupAddress.toString())], { account });
-    // this contract remains uninitialized because at this point we don't know the address of the Fee Juice on L2
-    const feeJuicePortalAddress = await deployL1Contract(walletClient, publicClient, contractsToDeploy.feeJuicePortal.contractAbi, contractsToDeploy.feeJuicePortal.contractBytecode);
-    logger.info(`Deployed Gas Portal at ${feeJuicePortalAddress}`);
-    const feeJuicePortal = getContract({
-        address: feeJuicePortalAddress.toString(),
-        abi: contractsToDeploy.feeJuicePortal.contractAbi,
-        client: walletClient,
-    });
-    await publicClient.waitForTransactionReceipt({
-        hash: await feeJuicePortal.write.initialize([
-            registryAddress.toString(),
-            feeJuiceAddress.toString(),
-            args.l2FeeJuiceAddress.toString(),
-        ]),
-    });
-    logger.info(`Initialized Gas Portal at ${feeJuicePortalAddress} to bridge between L1 ${feeJuiceAddress} to L2 ${args.l2FeeJuiceAddress}`);
-    // fund the rollup contract with Fee Juice
-    const feeJuice = getContract({
-        address: feeJuiceAddress.toString(),
-        abi: contractsToDeploy.feeJuice.contractAbi,
-        client: walletClient,
-    });
-    const receipt = await feeJuice.write.mint([rollupAddress.toString(), 100000000000000000000n], {});
-    await publicClient.waitForTransactionReceipt({ hash: receipt });
-    logger.info(`Funded rollup contract with Fee Juice`);
+    if (!(await registryContract.read.isRollupRegistered([getAddress(rollupAddress.toString())]))) {
+        await registryContract.write.upgrade([getAddress(rollupAddress.toString())], { account });
+        logger.verbose(`Upgraded registry contract at ${registryAddress} to rollup ${rollupAddress}`);
+    }
+    else {
+        logger.verbose(`Registry ${registryAddress} has already registered rollup ${rollupAddress}`);
+    }
     const l1Contracts = {
         availabilityOracleAddress,
         rollupAddress,
@@ -156,6 +167,17 @@ export const deployL1Contracts = async (rpcUrl, account, chain, logger, contract
         l1ContractAddresses: l1Contracts,
     };
 };
+class L1Deployer {
+    constructor(walletClient, publicClient, maybeSalt, logger) {
+        this.walletClient = walletClient;
+        this.publicClient = publicClient;
+        this.logger = logger;
+        this.salt = maybeSalt ? padHex(numberToHex(maybeSalt), { size: 32 }) : undefined;
+    }
+    deploy(params, args = []) {
+        return deployL1Contract(this.walletClient, this.publicClient, params.contractAbi, params.contractBytecode, args, this.salt, this.logger);
+    }
+}
 // docs:start:deployL1Contract
 /**
  * Helper function to deploy ETH contracts.
@@ -166,18 +188,36 @@ export const deployL1Contracts = async (rpcUrl, account, chain, logger, contract
  * @param args - Constructor arguments for the contract.
  * @returns The ETH address the contract was deployed to.
  */
-export async function deployL1Contract(walletClient, publicClient, abi, bytecode, args = []) {
-    const hash = await walletClient.deployContract({
-        abi,
-        bytecode,
-        args,
-    });
-    const receipt = await publicClient.waitForTransactionReceipt({ hash, pollingInterval: 100 });
-    const contractAddress = receipt.contractAddress;
-    if (!contractAddress) {
-        throw new Error(`No contract address found in receipt: ${JSON.stringify(receipt, (_, val) => typeof val === 'bigint' ? String(val) : val)}`);
+export async function deployL1Contract(walletClient, publicClient, abi, bytecode, args = [], maybeSalt, logger) {
+    if (maybeSalt) {
+        const salt = padHex(maybeSalt, { size: 32 });
+        const deployer = '0x4e59b44847b379578588920cA78FbF26c0B4956C';
+        const calldata = encodeDeployData({ abi, bytecode, args });
+        const address = getContractAddress({ from: deployer, salt, bytecode: calldata, opcode: 'CREATE2' });
+        const existing = await publicClient.getBytecode({ address });
+        if (existing === undefined || existing === '0x') {
+            const hash = await walletClient.sendTransaction({
+                to: deployer,
+                data: concatHex([salt, calldata]),
+            });
+            logger?.verbose(`Deploying contract with salt ${salt} to address ${address} in tx ${hash}`);
+            await publicClient.waitForTransactionReceipt({ hash, pollingInterval: 100 });
+        }
+        else {
+            logger?.verbose(`Skipping existing deployment of contract with salt ${salt} to address ${address}`);
+        }
+        return EthAddress.fromString(address);
+    }
+    else {
+        const hash = await walletClient.deployContract({ abi, bytecode, args });
+        logger?.verbose(`Deploying contract in tx ${hash}`);
+        const receipt = await publicClient.waitForTransactionReceipt({ hash, pollingInterval: 100 });
+        const contractAddress = receipt.contractAddress;
+        if (!contractAddress) {
+            throw new Error(`No contract address found in receipt: ${JSON.stringify(receipt, (_, val) => typeof val === 'bigint' ? String(val) : val)}`);
+        }
+        return EthAddress.fromString(contractAddress);
     }
-    return EthAddress.fromString(receipt.contractAddress);
 }
 // docs:end:deployL1Contract
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"deploy_l1_contracts.js","sourceRoot":"","sources":["../src/deploy_l1_contracts.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"deploy_l1_contracts.js","sourceRoot":"","sources":["../src/deploy_l1_contracts.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/ethereum",
-  "version": "0.49.2",
+  "version": "0.51.0",
   "type": "module",
   "exports": "./dest/index.js",
   "typedocOptions": {
@@ -24,7 +24,7 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/foundation": "0.49.2",
+    "@aztec/foundation": "0.51.0",
     "dotenv": "^16.0.3",
     "tslib": "^2.4.0",
     "viem": "^2.7.15"

package/src/deploy_l1_contracts.ts

@@ -11,11 +11,17 @@ import {
   type HttpTransport,
   type PublicClient,
   type WalletClient,
+  concatHex,
   createPublicClient,
   createWalletClient,
+  encodeDeployData,
   getAddress,
   getContract,
+  getContractAddress,
   http,
+  numberToHex,
+  padHex,
+  zeroAddress,
 } from 'viem';
 import { type HDAccount, type PrivateKeyAccount, mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
 import { foundry } from 'viem/chains';
@@ -83,7 +89,7 @@ export interface L1ContractArtifactsForDeployment {
    */
   feeJuice: ContractArtifacts;
   /**
-   * Gas portal contract artifacts. Optional for now as gas is not strictly enforced
+   * Fee juice portal contract artifacts. Optional for now as gas is not strictly enforced
    */
   feeJuicePortal: ContractArtifacts;
 }
@@ -141,7 +147,7 @@ export const deployL1Contracts = async (
   chain: Chain,
   logger: DebugLogger,
   contractsToDeploy: L1ContractArtifactsForDeployment,
-  args: { l2FeeJuiceAddress: AztecAddress; vkTreeRoot: Fr; assumeProvenUntil?: number },
+  args: { l2FeeJuiceAddress: AztecAddress; vkTreeRoot: Fr; assumeProvenUntil?: number; salt: number | undefined },
 ): Promise<DeployL1Contracts> => {
   // We are assuming that you are running this on a local anvil node which have 1s block times
   // To align better with actual deployment, we update the block interval to 12s
@@ -155,62 +161,79 @@ export const deployL1Contracts = async (
     };
     return await (await fetch(rpcUrl, content)).json();
   };
-  const interval = 12;
-  const res = await rpcCall(rpcUrl, 'anvil_setBlockTimestampInterval', [interval]);
-  if (res.error) {
-    throw new Error(`Error setting block interval: ${res.error.message}`);
+  if (chain.id == foundry.id) {
+    const interval = 12;
+    const res = await rpcCall(rpcUrl, 'anvil_setBlockTimestampInterval', [interval]);
+    if (res.error) {
+      throw new Error(`Error setting block interval: ${res.error.message}`);
+    }
+    logger.info(`Set block interval to ${interval}`);
   }
-  logger.info(`Set block interval to ${interval}`);
 
-  logger.debug('Deploying contracts...');
+  logger.info(`Deploying contracts from ${account.address.toString()}...`);
 
-  const walletClient = createWalletClient({
-    account,
-    chain,
-    transport: http(rpcUrl),
-  });
-  const publicClient = createPublicClient({
-    chain,
-    transport: http(rpcUrl),
-  });
+  const walletClient = createWalletClient({ account, chain, transport: http(rpcUrl) });
+  const publicClient = createPublicClient({ chain, transport: http(rpcUrl) });
+  const deployer = new L1Deployer(walletClient, publicClient, args.salt, logger);
 
-  const registryAddress = await deployL1Contract(
-    walletClient,
-    publicClient,
-    contractsToDeploy.registry.contractAbi,
-    contractsToDeploy.registry.contractBytecode,
-  );
+  const registryAddress = await deployer.deploy(contractsToDeploy.registry, [account.address.toString()]);
   logger.info(`Deployed Registry at ${registryAddress}`);
 
-  const availabilityOracleAddress = await deployL1Contract(
-    walletClient,
-    publicClient,
-    contractsToDeploy.availabilityOracle.contractAbi,
-    contractsToDeploy.availabilityOracle.contractBytecode,
-  );
+  const availabilityOracleAddress = await deployer.deploy(contractsToDeploy.availabilityOracle);
   logger.info(`Deployed AvailabilityOracle at ${availabilityOracleAddress}`);
 
-  const feeJuiceAddress = await deployL1Contract(
-    walletClient,
-    publicClient,
-    contractsToDeploy.feeJuice.contractAbi,
-    contractsToDeploy.feeJuice.contractBytecode,
-  );
+  const feeJuiceAddress = await deployer.deploy(contractsToDeploy.feeJuice);
 
   logger.info(`Deployed Fee Juice at ${feeJuiceAddress}`);
 
-  const rollupAddress = await deployL1Contract(
-    walletClient,
-    publicClient,
-    contractsToDeploy.rollup.contractAbi,
-    contractsToDeploy.rollup.contractBytecode,
-    [
-      getAddress(registryAddress.toString()),
-      getAddress(availabilityOracleAddress.toString()),
-      getAddress(feeJuiceAddress.toString()),
-      args.vkTreeRoot.toString(),
-    ],
+  const feeJuicePortalAddress = await deployer.deploy(contractsToDeploy.feeJuicePortal, [account.address.toString()]);
+
+  logger.info(`Deployed Gas Portal at ${feeJuicePortalAddress}`);
+
+  const feeJuicePortal = getContract({
+    address: feeJuicePortalAddress.toString(),
+    abi: contractsToDeploy.feeJuicePortal.contractAbi,
+    client: walletClient,
+  });
+
+  // fund the portal contract with Fee Juice
+  const feeJuice = getContract({
+    address: feeJuiceAddress.toString(),
+    abi: contractsToDeploy.feeJuice.contractAbi,
+    client: walletClient,
+  });
+
+  // @note  This value MUST match what is in `constants.nr`. It is currently specified here instead of just importing
+  //        because there is circular dependency hell. This is a temporary solution. #3342
+  const FEE_JUICE_INITIAL_MINT = 20000000000;
+  const receipt = await feeJuice.write.mint([feeJuicePortalAddress.toString(), FEE_JUICE_INITIAL_MINT], {} as any);
+  await publicClient.waitForTransactionReceipt({ hash: receipt });
+  logger.info(`Funded fee juice portal contract with Fee Juice`);
+
+  if ((await feeJuicePortal.read.registry([])) === zeroAddress) {
+    await publicClient.waitForTransactionReceipt({
+      hash: await feeJuicePortal.write.initialize([
+        registryAddress.toString(),
+        feeJuiceAddress.toString(),
+        args.l2FeeJuiceAddress.toString(),
+      ]),
+    });
+    logger.verbose(`Fee juice portal initialized with registry ${registryAddress.toString()}`);
+  } else {
+    logger.verbose(`Fee juice portal is already initialized`);
+  }
+
+  logger.info(
+    `Initialized Gas Portal at ${feeJuicePortalAddress} to bridge between L1 ${feeJuiceAddress} to L2 ${args.l2FeeJuiceAddress}`,
   );
+
+  const rollupAddress = await deployer.deploy(contractsToDeploy.rollup, [
+    getAddress(registryAddress.toString()),
+    getAddress(availabilityOracleAddress.toString()),
+    getAddress(feeJuicePortalAddress.toString()),
+    args.vkTreeRoot.toString(),
+    account.address.toString(),
+  ]);
   logger.info(`Deployed Rollup at ${rollupAddress}`);
 
   // Set initial blocks as proven if requested
@@ -253,45 +276,12 @@ export const deployL1Contracts = async (
     abi: contractsToDeploy.registry.contractAbi,
     client: walletClient,
   });
-  await registryContract.write.upgrade([getAddress(rollupAddress.toString())], { account });
-
-  // this contract remains uninitialized because at this point we don't know the address of the Fee Juice on L2
-  const feeJuicePortalAddress = await deployL1Contract(
-    walletClient,
-    publicClient,
-    contractsToDeploy.feeJuicePortal.contractAbi,
-    contractsToDeploy.feeJuicePortal.contractBytecode,
-  );
-
-  logger.info(`Deployed Gas Portal at ${feeJuicePortalAddress}`);
-
-  const feeJuicePortal = getContract({
-    address: feeJuicePortalAddress.toString(),
-    abi: contractsToDeploy.feeJuicePortal.contractAbi,
-    client: walletClient,
-  });
-
-  await publicClient.waitForTransactionReceipt({
-    hash: await feeJuicePortal.write.initialize([
-      registryAddress.toString(),
-      feeJuiceAddress.toString(),
-      args.l2FeeJuiceAddress.toString(),
-    ]),
-  });
-
-  logger.info(
-    `Initialized Gas Portal at ${feeJuicePortalAddress} to bridge between L1 ${feeJuiceAddress} to L2 ${args.l2FeeJuiceAddress}`,
-  );
-
-  // fund the rollup contract with Fee Juice
-  const feeJuice = getContract({
-    address: feeJuiceAddress.toString(),
-    abi: contractsToDeploy.feeJuice.contractAbi,
-    client: walletClient,
-  });
-  const receipt = await feeJuice.write.mint([rollupAddress.toString(), 100000000000000000000n], {} as any);
-  await publicClient.waitForTransactionReceipt({ hash: receipt });
-  logger.info(`Funded rollup contract with Fee Juice`);
+  if (!(await registryContract.read.isRollupRegistered([getAddress(rollupAddress.toString())]))) {
+    await registryContract.write.upgrade([getAddress(rollupAddress.toString())], { account });
+    logger.verbose(`Upgraded registry contract at ${registryAddress} to rollup ${rollupAddress}`);
+  } else {
+    logger.verbose(`Registry ${registryAddress} has already registered rollup ${rollupAddress}`);
+  }
 
   const l1Contracts: L1ContractAddresses = {
     availabilityOracleAddress,
@@ -310,6 +300,33 @@ export const deployL1Contracts = async (
   };
 };
 
+class L1Deployer {
+  private salt: Hex | undefined;
+  constructor(
+    private walletClient: WalletClient<HttpTransport, Chain, Account>,
+    private publicClient: PublicClient<HttpTransport, Chain>,
+    maybeSalt: number | undefined,
+    private logger: DebugLogger,
+  ) {
+    this.salt = maybeSalt ? padHex(numberToHex(maybeSalt), { size: 32 }) : undefined;
+  }
+
+  deploy(
+    params: { contractAbi: Narrow<Abi | readonly unknown[]>; contractBytecode: Hex },
+    args: readonly unknown[] = [],
+  ): Promise<EthAddress> {
+    return deployL1Contract(
+      this.walletClient,
+      this.publicClient,
+      params.contractAbi,
+      params.contractBytecode,
+      args,
+      this.salt,
+      this.logger,
+    );
+  }
+}
+
 // docs:start:deployL1Contract
 /**
  * Helper function to deploy ETH contracts.
@@ -326,23 +343,40 @@ export async function deployL1Contract(
   abi: Narrow<Abi | readonly unknown[]>,
   bytecode: Hex,
   args: readonly unknown[] = [],
+  maybeSalt?: Hex,
+  logger?: DebugLogger,
 ): Promise<EthAddress> {
-  const hash = await walletClient.deployContract({
-    abi,
-    bytecode,
-    args,
-  });
-
-  const receipt = await publicClient.waitForTransactionReceipt({ hash, pollingInterval: 100 });
-  const contractAddress = receipt.contractAddress;
-  if (!contractAddress) {
-    throw new Error(
-      `No contract address found in receipt: ${JSON.stringify(receipt, (_, val) =>
-        typeof val === 'bigint' ? String(val) : val,
-      )}`,
-    );
+  if (maybeSalt) {
+    const salt = padHex(maybeSalt, { size: 32 });
+    const deployer: Hex = '0x4e59b44847b379578588920cA78FbF26c0B4956C';
+    const calldata = encodeDeployData({ abi, bytecode, args });
+    const address = getContractAddress({ from: deployer, salt, bytecode: calldata, opcode: 'CREATE2' });
+    const existing = await publicClient.getBytecode({ address });
+
+    if (existing === undefined || existing === '0x') {
+      const hash = await walletClient.sendTransaction({
+        to: deployer,
+        data: concatHex([salt, calldata]),
+      });
+      logger?.verbose(`Deploying contract with salt ${salt} to address ${address} in tx ${hash}`);
+      await publicClient.waitForTransactionReceipt({ hash, pollingInterval: 100 });
+    } else {
+      logger?.verbose(`Skipping existing deployment of contract with salt ${salt} to address ${address}`);
+    }
+    return EthAddress.fromString(address);
+  } else {
+    const hash = await walletClient.deployContract({ abi, bytecode, args });
+    logger?.verbose(`Deploying contract in tx ${hash}`);
+    const receipt = await publicClient.waitForTransactionReceipt({ hash, pollingInterval: 100 });
+    const contractAddress = receipt.contractAddress;
+    if (!contractAddress) {
+      throw new Error(
+        `No contract address found in receipt: ${JSON.stringify(receipt, (_, val) =>
+          typeof val === 'bigint' ? String(val) : val,
+        )}`,
+      );
+    }
+    return EthAddress.fromString(contractAddress);
   }
-
-  return EthAddress.fromString(receipt.contractAddress!);
 }
 // docs:end:deployL1Contract