@aztec/cli 0.85.0 → 0.86.0

package/dest/cmds/devnet/bootstrap_network.js

@@ -1,6 +1,6 @@
 import { getInitialTestAccountsManagers } from '@aztec/accounts/testing';
 import { BatchCall, Fr, L1FeeJuicePortalManager, createCompatibleClient, retryUntil, waitForProven } from '@aztec/aztec.js';
-import { createEthereumChain, createL1Clients, deployL1Contract } from '@aztec/ethereum';
+import { createEthereumChain, createExtendedL1Client, deployL1Contract } from '@aztec/ethereum';
 import { getContract } from 'viem';
 import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
 const waitOpts = {
@@ -18,17 +18,17 @@ export async function bootstrapNetwork(pxeUrl, l1Urls, l1ChainId, l1PrivateKey,
     const [accountManager] = await getInitialTestAccountsManagers(pxe);
     await accountManager.register();
     const wallet = await accountManager.getWallet();
-    const l1Clients = createL1Clients(l1Urls, l1PrivateKey ? privateKeyToAccount(l1PrivateKey) : // Note that this account needs to be funded on L1 !
+    const l1Client = createExtendedL1Client(l1Urls, l1PrivateKey ? privateKeyToAccount(l1PrivateKey) : // Note that this account needs to be funded on L1 !
     mnemonicToAccount(l1Mnemonic, {
         addressIndex
     }), createEthereumChain(l1Urls, +l1ChainId).chainInfo);
-    const { erc20Address, portalAddress } = await deployERC20(l1Clients);
+    const { erc20Address, portalAddress } = await deployERC20(l1Client);
     const { token, bridge } = await deployToken(wallet, portalAddress);
-    await initPortal(pxe, l1Clients, erc20Address, portalAddress, bridge.address);
+    await initPortal(pxe, l1Client, erc20Address, portalAddress, bridge.address);
     const fpcAdmin = wallet.getAddress();
     const fpc = await deployFPC(wallet, token.address, fpcAdmin);
     const counter = await deployCounter(wallet);
-    await fundFPC(pxe, counter.address, wallet, l1Clients, fpc.address, debugLog);
+    await fundFPC(pxe, counter.address, wallet, l1Client, fpc.address, debugLog);
     if (json) {
         log(JSON.stringify({
             devCoinL1: erc20Address.toString(),
@@ -73,7 +73,7 @@ export async function bootstrapNetwork(pxeUrl, l1Urls, l1ChainId, l1PrivateKey,
 }
 /**
  * Step 1. Deploy the L1 contracts, but don't initialize
- */ async function deployERC20({ walletClient, publicClient }) {
+ */ async function deployERC20(l1Client) {
     const { TestERC20Abi, TestERC20Bytecode, TokenPortalAbi, TokenPortalBytecode } = await import('@aztec/l1-artifacts');
     const erc20 = {
         contractAbi: TestERC20Abi,
@@ -83,12 +83,12 @@ export async function bootstrapNetwork(pxeUrl, l1Urls, l1ChainId, l1PrivateKey,
         contractAbi: TokenPortalAbi,
         contractBytecode: TokenPortalBytecode
     };
-    const { address: erc20Address } = await deployL1Contract(walletClient, publicClient, erc20.contractAbi, erc20.contractBytecode, [
+    const { address: erc20Address } = await deployL1Contract(l1Client, erc20.contractAbi, erc20.contractBytecode, [
         'DevCoin',
         'DEV',
-        walletClient.account.address
+        l1Client.account.address
     ]);
-    const { address: portalAddress } = await deployL1Contract(walletClient, publicClient, portal.contractAbi, portal.contractBytecode);
+    const { address: portalAddress } = await deployL1Contract(l1Client, portal.contractAbi, portal.contractBytecode);
     return {
         erc20Address,
         portalAddress
@@ -128,20 +128,20 @@ export async function bootstrapNetwork(pxeUrl, l1Urls, l1ChainId, l1PrivateKey,
 }
 /**
  * Step 3. Initialize DevCoin's L1 portal
- */ async function initPortal(pxe, { walletClient, publicClient }, erc20, portal, bridge) {
+ */ async function initPortal(pxe, l1Client, erc20, portal, bridge) {
     const { TokenPortalAbi } = await import('@aztec/l1-artifacts');
     const { l1ContractAddresses: { registryAddress } } = await pxe.getNodeInfo();
     const contract = getContract({
         abi: TokenPortalAbi,
         address: portal.toString(),
-        client: walletClient
+        client: l1Client
     });
     const hash = await contract.write.initialize([
         registryAddress.toString(),
         erc20.toString(),
         bridge.toString()
     ]);
-    await publicClient.waitForTransactionReceipt({
+    await l1Client.waitForTransactionReceipt({
         hash
     });
 }
@@ -174,7 +174,7 @@ async function deployCounter(wallet) {
     return info;
 }
 // NOTE: Disabling for now in order to get devnet running
-async function fundFPC(pxe, counterAddress, wallet, l1Clients, fpcAddress, debugLog) {
+async function fundFPC(pxe, counterAddress, wallet, l1Client, fpcAddress, debugLog) {
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore - Importing noir-contracts.js even in devDeps results in a circular dependency error. Need to ignore because this line doesn't cause an error in a dev environment
     const { FeeJuiceContract } = await import('@aztec/noir-contracts.js/FeeJuice');
@@ -183,7 +183,7 @@ async function fundFPC(pxe, counterAddress, wallet, l1Clients, fpcAddress, debug
     const { CounterContract } = await import('@aztec/noir-contracts.js/Counter');
     const { protocolContractAddresses: { feeJuice } } = await wallet.getPXEInfo();
     const feeJuiceContract = await FeeJuiceContract.at(feeJuice, wallet);
-    const feeJuicePortal = await L1FeeJuicePortalManager.new(wallet, l1Clients.publicClient, l1Clients.walletClient, debugLog);
+    const feeJuicePortal = await L1FeeJuicePortalManager.new(wallet, l1Client, debugLog);
     const { claimAmount, claimSecret, messageLeafIndex, messageHash } = await feeJuicePortal.bridgeTokensPublic(fpcAddress, undefined, true);
     await retryUntil(async ()=>await pxe.isL1ToL2MessageSynced(Fr.fromHexString(messageHash)), 'message sync', 600, 1);
     const counter = await CounterContract.at(counterAddress, wallet);

package/dest/cmds/l1/bridge_erc20.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bridge_erc20.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/bridge_erc20.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,UAAU,EAAqC,MAAM,iBAAiB,CAAC;AAExG,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAI3D,wBAAsB,WAAW,CAC/B,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,YAAY,EACvB,SAAS,EAAE,MAAM,EAAE,EACnB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,UAAU,EACxB,cAAc,EAAE,UAAU,GAAG,SAAS,EACtC,aAAa,EAAE,UAAU,EACzB,eAAe,EAAE,OAAO,EACxB,IAAI,EAAE,OAAO,EACb,IAAI,EAAE,OAAO,EACb,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,iBAuCpB"}
+{"version":3,"file":"bridge_erc20.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/bridge_erc20.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,UAAU,EAAqC,MAAM,iBAAiB,CAAC;AAExG,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAI3D,wBAAsB,WAAW,CAC/B,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,YAAY,EACvB,SAAS,EAAE,MAAM,EAAE,EACnB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,UAAU,EACxB,cAAc,EAAE,UAAU,GAAG,SAAS,EACtC,aAAa,EAAE,UAAU,EACzB,eAAe,EAAE,OAAO,EACxB,IAAI,EAAE,OAAO,EACb,IAAI,EAAE,OAAO,EACb,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,iBAgCpB"}

package/dest/cmds/l1/bridge_erc20.js

@@ -1,12 +1,12 @@
 import { L1ToL2TokenPortalManager } from '@aztec/aztec.js';
-import { createEthereumChain, createL1Clients } from '@aztec/ethereum';
+import { createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
 import { prettyPrintJSON } from '../../utils/commands.js';
 export async function bridgeERC20(amount, recipient, l1RpcUrls, chainId, privateKey, mnemonic, tokenAddress, handlerAddress, portalAddress, privateTransfer, mint, json, log, debugLogger) {
     // Prepare L1 client
     const chain = createEthereumChain(l1RpcUrls, chainId);
-    const { publicClient, walletClient } = createL1Clients(chain.rpcUrls, privateKey ?? mnemonic, chain.chainInfo);
+    const l1Client = createExtendedL1Client(chain.rpcUrls, privateKey ?? mnemonic, chain.chainInfo);
     // Setup portal manager
-    const manager = new L1ToL2TokenPortalManager(portalAddress, tokenAddress, handlerAddress, publicClient, walletClient, debugLogger);
+    const manager = new L1ToL2TokenPortalManager(portalAddress, tokenAddress, handlerAddress, l1Client, debugLogger);
     let claimSecret;
     let messageHash;
     if (privateTransfer) {

package/dest/cmds/l1/deploy_l1_contracts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy_l1_contracts.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/deploy_l1_contracts.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAM3D,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,OAAO,EACrB,0BAA0B,EAAE,OAAO,EACnC,IAAI,EAAE,OAAO,EACb,iBAAiB,EAAE,UAAU,EAAE,EAC/B,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,iBAqDpB"}
+{"version":3,"file":"deploy_l1_contracts.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/deploy_l1_contracts.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAM3D,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,OAAO,EACrB,0BAA0B,EAAE,OAAO,EACnC,IAAI,EAAE,OAAO,EACb,iBAAiB,EAAE,UAAU,EAAE,EAC/B,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,iBAmDpB"}

package/dest/cmds/l1/deploy_l1_contracts.js

@@ -8,8 +8,8 @@ export async function deployL1Contracts(rpcUrls, chainId, privateKey, mnemonic,
     const initialAccounts = testAccounts ? await getInitialTestAccounts() : [];
     const sponsoredFPCAddress = sponsoredFPC ? await getSponsoredFPCAddress() : [];
     const initialFundedAccounts = initialAccounts.map((a)=>a.address).concat(sponsoredFPCAddress);
-    const { genesisBlockHash, genesisArchiveRoot, fundingNeeded } = await getGenesisValues(initialFundedAccounts);
-    const { l1ContractAddresses } = await deployAztecContracts(rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidators, genesisArchiveRoot, genesisBlockHash, fundingNeeded, acceleratedTestDeployments, config, debugLogger);
+    const { genesisArchiveRoot, fundingNeeded } = await getGenesisValues(initialFundedAccounts);
+    const { l1ContractAddresses } = await deployAztecContracts(rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidators, genesisArchiveRoot, fundingNeeded, acceleratedTestDeployments, config, debugLogger);
     if (json) {
         log(JSON.stringify(Object.fromEntries(Object.entries(l1ContractAddresses).map(([k, v])=>[
                 k,
@@ -32,7 +32,6 @@ export async function deployL1Contracts(rpcUrls, chainId, privateKey, mnemonic,
         log(`StakingAssetHandler Address: ${l1ContractAddresses.stakingAssetHandlerAddress?.toString()}`);
         log(`Initial funded accounts: ${initialFundedAccounts.map((a)=>a.toString()).join(', ')}`);
         log(`Initial validators: ${initialValidators.map((a)=>a.toString()).join(', ')}`);
-        log(`Genesis block hash: ${genesisBlockHash.toString()}`);
         log(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
     }
 }

package/dest/cmds/l1/deploy_l1_verifier.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy_l1_verifier.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/deploy_l1_verifier.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAI3D,OAAO,EAAE,KAAK,GAAG,EAAe,MAAM,MAAM,CAAC;AAE7C,wBAAsB,uBAAuB,CAC3C,aAAa,EAAE,GAAG,GAAG,SAAS,EAC9B,UAAU,EAAE,MAAM,EAAE,EACpB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,iBAqCpB;AAED,wBAAsB,kBAAkB,CACtC,aAAa,EAAE,GAAG,GAAG,SAAS,EAC9B,UAAU,EAAE,MAAM,EAAE,EACpB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,iBAmCpB"}
+{"version":3,"file":"deploy_l1_verifier.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/deploy_l1_verifier.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAI3D,OAAO,EAAE,KAAK,GAAG,EAAe,MAAM,MAAM,CAAC;AAE7C,wBAAsB,uBAAuB,CAC3C,aAAa,EAAE,GAAG,GAAG,SAAS,EAC9B,UAAU,EAAE,MAAM,EAAE,EACpB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,iBAgCpB;AAED,wBAAsB,kBAAkB,CACtC,aAAa,EAAE,GAAG,GAAG,SAAS,EAC9B,UAAU,EAAE,MAAM,EAAE,EACpB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,iBAkCpB"}

package/dest/cmds/l1/deploy_l1_verifier.js

@@ -1,10 +1,10 @@
 import { createCompatibleClient } from '@aztec/aztec.js';
-import { createEthereumChain, createL1Clients, deployL1Contract } from '@aztec/ethereum';
+import { createEthereumChain, createExtendedL1Client, deployL1Contract } from '@aztec/ethereum';
 import { HonkVerifierAbi, HonkVerifierBytecode } from '@aztec/l1-artifacts';
 import { InvalidOptionArgumentError } from 'commander';
 import { getContract } from 'viem';
 export async function deployUltraHonkVerifier(rollupAddress, ethRpcUrls, l1ChainId, privateKey, mnemonic, pxeRpcUrl, log, debugLogger) {
-    const { publicClient, walletClient } = createL1Clients(ethRpcUrls, privateKey ?? mnemonic, createEthereumChain(ethRpcUrls, l1ChainId).chainInfo);
+    const extendedClient = createExtendedL1Client(ethRpcUrls, privateKey ?? mnemonic, createEthereumChain(ethRpcUrls, l1ChainId).chainInfo);
     if (!rollupAddress && pxeRpcUrl) {
         const pxe = await createCompatibleClient(pxeRpcUrl, debugLogger);
         const { l1ContractAddresses } = await pxe.getNodeInfo();
@@ -17,9 +17,9 @@ export async function deployUltraHonkVerifier(rollupAddress, ethRpcUrls, l1Chain
     const rollup = getContract({
         abi: RollupAbi,
         address: rollupAddress,
-        client: walletClient
+        client: extendedClient
     });
-    const { address: verifierAddress } = await deployL1Contract(walletClient, publicClient, HonkVerifierAbi, HonkVerifierBytecode);
+    const { address: verifierAddress } = await deployL1Contract(extendedClient, HonkVerifierAbi, HonkVerifierBytecode);
     log(`Deployed honk verifier at ${verifierAddress}`);
     await rollup.write.setEpochVerifier([
         verifierAddress.toString()
@@ -27,9 +27,9 @@ export async function deployUltraHonkVerifier(rollupAddress, ethRpcUrls, l1Chain
     log(`Rollup accepts only real proofs now`);
 }
 export async function deployMockVerifier(rollupAddress, ethRpcUrls, l1ChainId, privateKey, mnemonic, pxeRpcUrl, log, debugLogger) {
-    const { publicClient, walletClient } = createL1Clients(ethRpcUrls, privateKey ?? mnemonic, createEthereumChain(ethRpcUrls, l1ChainId).chainInfo);
+    const extendedClient = createExtendedL1Client(ethRpcUrls, privateKey ?? mnemonic, createEthereumChain(ethRpcUrls, l1ChainId).chainInfo);
     const { MockVerifierAbi, MockVerifierBytecode, RollupAbi } = await import('@aztec/l1-artifacts');
-    const { address: mockVerifierAddress } = await deployL1Contract(walletClient, publicClient, MockVerifierAbi, MockVerifierBytecode);
+    const { address: mockVerifierAddress } = await deployL1Contract(extendedClient, MockVerifierAbi, MockVerifierBytecode);
     log(`Deployed MockVerifier at ${mockVerifierAddress.toString()}`);
     if (!rollupAddress && pxeRpcUrl) {
         const pxe = await createCompatibleClient(pxeRpcUrl, debugLogger);
@@ -42,7 +42,7 @@ export async function deployMockVerifier(rollupAddress, ethRpcUrls, l1ChainId, p
     const rollup = getContract({
         abi: RollupAbi,
         address: rollupAddress,
-        client: walletClient
+        client: extendedClient
     });
     await rollup.write.setEpochVerifier([
         mockVerifierAddress.toString()

package/dest/cmds/l1/deploy_new_rollup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy_new_rollup.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/deploy_new_rollup.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAM3D,wBAAsB,eAAe,CACnC,eAAe,EAAE,UAAU,EAC3B,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,OAAO,EACrB,IAAI,EAAE,OAAO,EACb,iBAAiB,EAAE,UAAU,EAAE,EAC/B,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,iBAgDpB"}
+{"version":3,"file":"deploy_new_rollup.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/deploy_new_rollup.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAM3D,wBAAsB,eAAe,CACnC,eAAe,EAAE,UAAU,EAC3B,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,OAAO,EACrB,IAAI,EAAE,OAAO,EACb,iBAAiB,EAAE,UAAU,EAAE,EAC/B,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,iBA6CpB"}

package/dest/cmds/l1/deploy_new_rollup.js

@@ -8,14 +8,13 @@ export async function deployNewRollup(registryAddress, rpcUrls, chainId, private
     const initialAccounts = testAccounts ? await getInitialTestAccounts() : [];
     const sponsoredFPCAddress = sponsoredFPC ? await getSponsoredFPCAddress() : [];
     const initialFundedAccounts = initialAccounts.map((a)=>a.address).concat(sponsoredFPCAddress);
-    const { genesisBlockHash, genesisArchiveRoot, fundingNeeded } = await getGenesisValues(initialFundedAccounts);
-    const { rollup, slashFactoryAddress } = await deployNewRollupContracts(registryAddress, rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidators, genesisArchiveRoot, genesisBlockHash, fundingNeeded, config, debugLogger);
+    const { genesisArchiveRoot, fundingNeeded } = await getGenesisValues(initialFundedAccounts);
+    const { rollup, slashFactoryAddress } = await deployNewRollupContracts(registryAddress, rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidators, genesisArchiveRoot, fundingNeeded, config, debugLogger);
     if (json) {
         log(JSON.stringify({
             rollupAddress: rollup.address,
             initialFundedAccounts: initialFundedAccounts.map((a)=>a.toString()),
             initialValidators: initialValidators.map((a)=>a.toString()),
-            genesisBlockHash: genesisBlockHash.toString(),
             genesisArchiveRoot: genesisArchiveRoot.toString(),
             slashFactoryAddress: slashFactoryAddress.toString()
         }, null, 2));
@@ -23,7 +22,6 @@ export async function deployNewRollup(registryAddress, rpcUrls, chainId, private
         log(`Rollup Address: ${rollup.address}`);
         log(`Initial funded accounts: ${initialFundedAccounts.map((a)=>a.toString()).join(', ')}`);
         log(`Initial validators: ${initialValidators.map((a)=>a.toString()).join(', ')}`);
-        log(`Genesis block hash: ${genesisBlockHash.toString()}`);
         log(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
         log(`Slash Factory Address: ${slashFactoryAddress.toString()}`);
     }

package/dest/cmds/l1/governance_utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"governance_utils.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/governance_utils.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,wBAAsB,uBAAuB,CAAC,EAC5C,eAAe,EACf,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,aAAa,EACb,SAAS,EACT,MAAM,EACN,WAAW,EACX,IAAI,GACL,EAAE;IACD,eAAe,EAAE,KAAK,MAAM,EAAE,CAAC;IAC/B,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,KAAK,MAAM,EAAE,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,OAAO,CAAC;CACf,iBA0BA;AAED,wBAAsB,eAAe,CAAC,EACpC,cAAc,EACd,eAAe,EACf,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,aAAa,EACb,IAAI,EACJ,WAAW,EACX,GAAG,GACJ,EAAE;IACD,cAAc,EAAE,KAAK,MAAM,EAAE,CAAC;IAC9B,eAAe,EAAE,KAAK,MAAM,EAAE,CAAC;IAC/B,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,EAAE,KAAK,CAAC;IACX,IAAI,EAAE,OAAO,CAAC;CACf,iBAoBA;AAED,wBAAsB,wBAAwB,CAAC,EAC7C,UAAU,EACV,UAAU,EACV,OAAO,EACP,aAAa,EACb,eAAe,EACf,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,aAAa,EACb,WAAW,GACZ,EAAE;IACD,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,OAAO,CAAC;IACvB,eAAe,EAAE,KAAK,MAAM,EAAE,CAAC;IAC/B,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;CACrB,iBAmBA;AAED,wBAAsB,yBAAyB,CAAC,EAC9C,UAAU,EACV,iBAAiB,EACjB,eAAe,EACf,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,aAAa,EACb,WAAW,GACZ,EAAE;IACD,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,eAAe,EAAE,KAAK,MAAM,EAAE,CAAC;IAC/B,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;CACrB,iBAiBA"}
+{"version":3,"file":"governance_utils.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/governance_utils.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,wBAAsB,uBAAuB,CAAC,EAC5C,eAAe,EACf,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,aAAa,EACb,SAAS,EACT,MAAM,EACN,WAAW,EACX,IAAI,GACL,EAAE;IACD,eAAe,EAAE,KAAK,MAAM,EAAE,CAAC;IAC/B,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,KAAK,MAAM,EAAE,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,OAAO,CAAC;CACf,iBA2BA;AAED,wBAAsB,eAAe,CAAC,EACpC,cAAc,EACd,eAAe,EACf,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,aAAa,EACb,IAAI,EACJ,WAAW,EACX,GAAG,GACJ,EAAE;IACD,cAAc,EAAE,KAAK,MAAM,EAAE,CAAC;IAC9B,eAAe,EAAE,KAAK,MAAM,EAAE,CAAC;IAC/B,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,EAAE,KAAK,CAAC;IACX,IAAI,EAAE,OAAO,CAAC;CACf,iBAoBA;AAED,wBAAsB,wBAAwB,CAAC,EAC7C,UAAU,EACV,UAAU,EACV,OAAO,EACP,aAAa,EACb,eAAe,EACf,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,aAAa,EACb,WAAW,GACZ,EAAE;IACD,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,OAAO,CAAC;IACvB,eAAe,EAAE,KAAK,MAAM,EAAE,CAAC;IAC/B,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;CACrB,iBAmBA;AAED,wBAAsB,yBAAyB,CAAC,EAC9C,UAAU,EACV,iBAAiB,EACjB,eAAe,EACf,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,aAAa,EACb,WAAW,GACZ,EAAE;IACD,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,eAAe,EAAE,KAAK,MAAM,EAAE,CAAC;IAC/B,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;CACrB,iBAiBA"}

package/dest/cmds/l1/governance_utils.js

@@ -1,13 +1,13 @@
-import { FeeJuiceContract, GovernanceContract, ProposalState, RegistryContract, createEthereumChain, createL1Clients } from '@aztec/ethereum';
+import { FeeJuiceContract, GovernanceContract, ProposalState, RegistryContract, createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
 export async function depositGovernanceTokens({ registryAddress, rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, recipient, amount, debugLogger, mint }) {
     debugLogger.info(`Depositing ${amount} governance tokens to ${recipient}`);
     const chain = createEthereumChain(rpcUrls, chainId);
-    const { publicClient, walletClient } = createL1Clients(rpcUrls, privateKey ?? mnemonic, chain.chainInfo, mnemonicIndex);
-    const addresses = await RegistryContract.collectAddresses(publicClient, registryAddress, 'canonical');
+    const extendedClient = createExtendedL1Client(rpcUrls, privateKey ?? mnemonic, chain.chainInfo, undefined, mnemonicIndex);
+    const addresses = await RegistryContract.collectAddresses(extendedClient, registryAddress, 'canonical');
     const governanceAddress = addresses.governanceAddress.toString();
     const tokenAddress = addresses.stakingAssetAddress.toString();
-    const feeJuice = new FeeJuiceContract(tokenAddress, publicClient, walletClient);
-    const governance = new GovernanceContract(governanceAddress, publicClient, walletClient);
+    const feeJuice = new FeeJuiceContract(tokenAddress, extendedClient);
+    const governance = new GovernanceContract(governanceAddress, extendedClient);
     if (mint) {
         await feeJuice.mint(recipient, amount);
         debugLogger.info(`Minted ${amount} tokens to ${recipient}`);
@@ -20,13 +20,13 @@ export async function depositGovernanceTokens({ registryAddress, rpcUrls, chainI
 export async function proposeWithLock({ payloadAddress, registryAddress, rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, json, debugLogger, log }) {
     debugLogger.info(`Proposing with lock from ${payloadAddress} to ${registryAddress}`);
     const chain = createEthereumChain(rpcUrls, chainId);
-    const clients = createL1Clients(rpcUrls, privateKey ?? mnemonic, chain.chainInfo, mnemonicIndex);
-    const addresses = await RegistryContract.collectAddresses(clients.publicClient, registryAddress, 'canonical');
+    const client = createExtendedL1Client(rpcUrls, privateKey ?? mnemonic, chain.chainInfo, undefined, mnemonicIndex);
+    const addresses = await RegistryContract.collectAddresses(client, registryAddress, 'canonical');
     const governanceAddress = addresses.governanceAddress.toString();
-    const governance = new GovernanceContract(governanceAddress, clients.publicClient, clients.walletClient);
+    const governance = new GovernanceContract(governanceAddress, client);
     const proposalId = await governance.proposeWithLock({
         payloadAddress,
-        withdrawAddress: clients.walletClient.account.address
+        withdrawAddress: client.account.address
     });
     if (json) {
         log(JSON.stringify({
@@ -40,10 +40,10 @@ export async function proposeWithLock({ payloadAddress, registryAddress, rpcUrls
 export async function voteOnGovernanceProposal({ proposalId, voteAmount, inFavor, waitTilActive, registryAddress, rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, debugLogger }) {
     debugLogger.info(`Voting on proposal ${proposalId} with ${voteAmount ? voteAmount : 'all'} tokens in favor: ${inFavor}`);
     const chain = createEthereumChain(rpcUrls, chainId);
-    const clients = createL1Clients(rpcUrls, privateKey ?? mnemonic, chain.chainInfo, mnemonicIndex);
-    const addresses = await RegistryContract.collectAddresses(clients.publicClient, registryAddress, 'canonical');
+    const client = createExtendedL1Client(rpcUrls, privateKey ?? mnemonic, chain.chainInfo, undefined, mnemonicIndex);
+    const addresses = await RegistryContract.collectAddresses(client, registryAddress, 'canonical');
     const governanceAddress = addresses.governanceAddress.toString();
-    const governance = new GovernanceContract(governanceAddress, clients.publicClient, clients.walletClient);
+    const governance = new GovernanceContract(governanceAddress, client);
     const state = await governance.getProposalState(proposalId);
     if (state !== ProposalState.Active && !waitTilActive) {
         debugLogger.warn(`Proposal is not active, but waitTilActive is false. Not voting.`);
@@ -64,10 +64,10 @@ export async function voteOnGovernanceProposal({ proposalId, voteAmount, inFavor
 export async function executeGovernanceProposal({ proposalId, waitTilExecutable, registryAddress, rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, debugLogger }) {
     debugLogger.info(`Executing proposal ${proposalId}`);
     const chain = createEthereumChain(rpcUrls, chainId);
-    const clients = createL1Clients(rpcUrls, privateKey ?? mnemonic, chain.chainInfo, mnemonicIndex);
-    const addresses = await RegistryContract.collectAddresses(clients.publicClient, registryAddress, 'canonical');
+    const client = createExtendedL1Client(rpcUrls, privateKey ?? mnemonic, chain.chainInfo, undefined, mnemonicIndex);
+    const addresses = await RegistryContract.collectAddresses(client, registryAddress, 'canonical');
     const governanceAddress = addresses.governanceAddress.toString();
-    const governance = new GovernanceContract(governanceAddress, clients.publicClient, clients.walletClient);
+    const governance = new GovernanceContract(governanceAddress, client);
     const state = await governance.getProposalState(proposalId);
     if (state !== ProposalState.Executable && !waitTilExecutable) {
         debugLogger.warn(`Proposal is not executable, but waitTilExecutable is false. Not executing.`);

package/dest/utils/aztec.d.ts

@@ -18,8 +18,8 @@ export declare function getFunctionAbi(artifact: ContractArtifact, fnName: strin
  * @param privateKey - The private key to be used in contract deployment.
  * @param mnemonic - The mnemonic to be used in contract deployment.
  */
-export declare function deployAztecContracts(rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mnemonicIndex: number, salt: number | undefined, initialValidators: EthAddress[], genesisArchiveRoot: Fr, genesisBlockHash: Fr, feeJuicePortalInitialBalance: bigint, acceleratedTestDeployments: boolean, config: L1ContractsConfig, debugLogger: Logger): Promise<DeployL1ContractsReturnType>;
-export declare function deployNewRollupContracts(registryAddress: EthAddress, rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mnemonicIndex: number, salt: number | undefined, initialValidators: EthAddress[], genesisArchiveRoot: Fr, genesisBlockHash: Fr, feeJuicePortalInitialBalance: bigint, config: L1ContractsConfig, logger: Logger): Promise<{
+export declare function deployAztecContracts(rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mnemonicIndex: number, salt: number | undefined, initialValidators: EthAddress[], genesisArchiveRoot: Fr, feeJuicePortalInitialBalance: bigint, acceleratedTestDeployments: boolean, config: L1ContractsConfig, debugLogger: Logger): Promise<DeployL1ContractsReturnType>;
+export declare function deployNewRollupContracts(registryAddress: EthAddress, rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mnemonicIndex: number, salt: number | undefined, initialValidators: EthAddress[], genesisArchiveRoot: Fr, feeJuicePortalInitialBalance: bigint, config: L1ContractsConfig, logger: Logger): Promise<{
     rollup: RollupContract;
     slashFactoryAddress: EthAddress;
 }>;

package/dest/utils/aztec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aztec.d.ts","sourceRoot":"","sources":["../../src/utils/aztec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,KAAK,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EAIjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,2BAA2B,EAChC,KAAK,iBAAiB,EAEtB,cAAc,EACf,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAShE;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,CAMtF;AAED;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,iBAAiB,EAAE,UAAU,EAAE,EAC/B,kBAAkB,EAAE,EAAE,EACtB,gBAAgB,EAAE,EAAE,EACpB,4BAA4B,EAAE,MAAM,EACpC,0BAA0B,EAAE,OAAO,EACnC,MAAM,EAAE,iBAAiB,EACzB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,2BAA2B,CAAC,CA6BtC;AAED,wBAAsB,wBAAwB,CAC5C,eAAe,EAAE,UAAU,EAC3B,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,iBAAiB,EAAE,UAAU,EAAE,EAC/B,kBAAkB,EAAE,EAAE,EACtB,gBAAgB,EAAE,EAAE,EACpB,4BAA4B,EAAE,MAAM,EACpC,MAAM,EAAE,iBAAiB,EACzB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,cAAc,CAAC;IAAC,mBAAmB,EAAE,UAAU,CAAA;CAAE,CAAC,CAoCtE;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAKjE;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,6BA4BpE;AAED;;;;;;;GAOG;AACH,wBAAsB,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,KAAK;;;;GAO3G;AAED;;;;GAIG;AACH,eAAO,MAAM,eAAe,QAAS,MAAM,WAK1C,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAUtE;AAKD;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,oBAAoB,EAAE,MAAM,iBAyB9E"}
+{"version":3,"file":"aztec.d.ts","sourceRoot":"","sources":["../../src/utils/aztec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,KAAK,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EAIjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,2BAA2B,EAChC,KAAK,iBAAiB,EAEtB,cAAc,EACf,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAShE;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,CAMtF;AAED;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,iBAAiB,EAAE,UAAU,EAAE,EAC/B,kBAAkB,EAAE,EAAE,EACtB,4BAA4B,EAAE,MAAM,EACpC,0BAA0B,EAAE,OAAO,EACnC,MAAM,EAAE,iBAAiB,EACzB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,2BAA2B,CAAC,CA4BtC;AAED,wBAAsB,wBAAwB,CAC5C,eAAe,EAAE,UAAU,EAC3B,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,iBAAiB,EAAE,UAAU,EAAE,EAC/B,kBAAkB,EAAE,EAAE,EACtB,4BAA4B,EAAE,MAAM,EACpC,MAAM,EAAE,iBAAiB,EACzB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,cAAc,CAAC;IAAC,mBAAmB,EAAE,UAAU,CAAA;CAAE,CAAC,CAmCtE;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAKjE;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,6BA4BpE;AAED;;;;;;;GAOG;AACH,wBAAsB,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,KAAK;;;;GAO3G;AAED;;;;GAIG;AACH,eAAO,MAAM,eAAe,QAAS,MAAM,WAK1C,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAUtE;AAKD;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,oBAAoB,EAAE,MAAM,iBAyB9E"}

package/dest/utils/aztec.js

@@ -24,7 +24,7 @@ import { encodeArgs } from './encoding.js';
  * @param chainId - The chain ID of the L1 host.
  * @param privateKey - The private key to be used in contract deployment.
  * @param mnemonic - The mnemonic to be used in contract deployment.
- */ export async function deployAztecContracts(rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidators, genesisArchiveRoot, genesisBlockHash, feeJuicePortalInitialBalance, acceleratedTestDeployments, config, debugLogger) {
+ */ export async function deployAztecContracts(rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidators, genesisArchiveRoot, feeJuicePortalInitialBalance, acceleratedTestDeployments, config, debugLogger) {
     const { createEthereumChain, deployL1Contracts } = await import('@aztec/ethereum');
     const { mnemonicToAccount, privateKeyToAccount } = await import('viem/accounts');
     const account = !privateKey ? mnemonicToAccount(mnemonic, {
@@ -36,7 +36,6 @@ import { encodeArgs } from './encoding.js';
         vkTreeRoot: getVKTreeRoot(),
         protocolContractTreeRoot,
         genesisArchiveRoot,
-        genesisBlockHash,
         salt,
         initialValidators,
         acceleratedTestDeployments,
@@ -44,29 +43,28 @@ import { encodeArgs } from './encoding.js';
         ...config
     }, config);
 }
-export async function deployNewRollupContracts(registryAddress, rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidators, genesisArchiveRoot, genesisBlockHash, feeJuicePortalInitialBalance, config, logger) {
-    const { createEthereumChain, deployRollupForUpgrade, createL1Clients } = await import('@aztec/ethereum');
+export async function deployNewRollupContracts(registryAddress, rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidators, genesisArchiveRoot, feeJuicePortalInitialBalance, config, logger) {
+    const { createEthereumChain, deployRollupForUpgrade, createExtendedL1Client } = await import('@aztec/ethereum');
     const { mnemonicToAccount, privateKeyToAccount } = await import('viem/accounts');
     const { getVKTreeRoot } = await import('@aztec/noir-protocol-circuits-types/vk-tree');
     const account = !privateKey ? mnemonicToAccount(mnemonic, {
         addressIndex: mnemonicIndex
     }) : privateKeyToAccount(`${privateKey.startsWith('0x') ? '' : '0x'}${privateKey}`);
     const chain = createEthereumChain(rpcUrls, chainId);
-    const clients = createL1Clients(rpcUrls, account, chain.chainInfo, mnemonicIndex);
+    const client = createExtendedL1Client(rpcUrls, account, chain.chainInfo, undefined, mnemonicIndex);
     if (!initialValidators || initialValidators.length === 0) {
-        const registry = new RegistryContract(clients.publicClient, registryAddress);
-        const rollup = new RollupContract(clients.publicClient, await registry.getCanonicalAddress());
+        const registry = new RegistryContract(client, registryAddress);
+        const rollup = new RollupContract(client, await registry.getCanonicalAddress());
         initialValidators = (await rollup.getAttesters()).map((str)=>EthAddress.fromString(str));
         logger.info('Initializing new rollup with old attesters', {
             initialValidators
         });
     }
-    const { rollup, slashFactoryAddress } = await deployRollupForUpgrade(clients, {
+    const { rollup, slashFactoryAddress } = await deployRollupForUpgrade(client, {
         salt,
         vkTreeRoot: getVKTreeRoot(),
         protocolContractTreeRoot,
         genesisArchiveRoot,
-        genesisBlockHash,
         initialValidators,
         feeJuicePortalInitialBalance,
         ...config

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/cli",
-  "version": "0.85.0",
+  "version": "0.86.0",
   "type": "module",
   "exports": {
     "./contracts": "./dest/cmds/contracts/index.js",
@@ -25,8 +25,6 @@
     "build": "yarn clean && tsc -b",
     "build:dev": "tsc -b --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
-    "formatting": "run -T prettier --check ./src && run -T eslint ./src",
-    "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
   "inherits": [
@@ -67,15 +65,15 @@
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "0.85.0",
-    "@aztec/aztec.js": "0.85.0",
-    "@aztec/constants": "0.85.0",
-    "@aztec/entrypoints": "0.85.0",
-    "@aztec/foundation": "0.85.0",
-    "@aztec/l1-artifacts": "0.85.0",
-    "@aztec/p2p": "0.85.0",
-    "@aztec/stdlib": "0.85.0",
-    "@aztec/world-state": "0.85.0",
+    "@aztec/archiver": "0.86.0",
+    "@aztec/aztec.js": "0.86.0",
+    "@aztec/constants": "0.86.0",
+    "@aztec/entrypoints": "0.86.0",
+    "@aztec/foundation": "0.86.0",
+    "@aztec/l1-artifacts": "0.86.0",
+    "@aztec/p2p": "0.86.0",
+    "@aztec/stdlib": "0.86.0",
+    "@aztec/world-state": "0.86.0",
     "@iarna/toml": "^2.2.5",
     "@libp2p/peer-id-factory": "^3.0.4",
     "commander": "^12.1.0",
@@ -87,9 +85,9 @@
     "viem": "2.23.7"
   },
   "devDependencies": {
-    "@aztec/accounts": "0.85.0",
-    "@aztec/ethereum": "0.85.0",
-    "@aztec/protocol-contracts": "0.85.0",
+    "@aztec/accounts": "0.86.0",
+    "@aztec/ethereum": "0.86.0",
+    "@aztec/protocol-contracts": "0.86.0",
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
     "@types/lodash.chunk": "^4.2.9",
@@ -105,14 +103,14 @@
     "typescript": "^5.0.4"
   },
   "peerDependencies": {
-    "@aztec/accounts": "0.85.0",
-    "@aztec/bb-prover": "0.85.0",
-    "@aztec/ethereum": "0.85.0",
-    "@aztec/l1-artifacts": "0.85.0",
-    "@aztec/noir-contracts.js": "0.85.0",
-    "@aztec/noir-protocol-circuits-types": "0.85.0",
-    "@aztec/protocol-contracts": "0.85.0",
-    "@aztec/stdlib": "0.85.0"
+    "@aztec/accounts": "0.86.0",
+    "@aztec/bb-prover": "0.86.0",
+    "@aztec/ethereum": "0.86.0",
+    "@aztec/l1-artifacts": "0.86.0",
+    "@aztec/noir-contracts.js": "0.86.0",
+    "@aztec/noir-protocol-circuits-types": "0.86.0",
+    "@aztec/protocol-contracts": "0.86.0",
+    "@aztec/stdlib": "0.86.0"
   },
   "files": [
     "dest",

package/src/cmds/devnet/bootstrap_network.ts

@@ -15,9 +15,9 @@ import {
 } from '@aztec/aztec.js';
 import {
   type ContractArtifacts,
-  type L1Clients,
+  type ExtendedViemWalletClient,
   createEthereumChain,
-  createL1Clients,
+  createExtendedL1Client,
   deployL1Contract,
 } from '@aztec/ethereum';
 import type { LogFn, Logger } from '@aztec/foundation/log';
@@ -61,7 +61,7 @@ export async function bootstrapNetwork(
 
   const wallet = await accountManager.getWallet();
 
-  const l1Clients = createL1Clients(
+  const l1Client = createExtendedL1Client(
     l1Urls,
     l1PrivateKey
       ? privateKeyToAccount(l1PrivateKey)
@@ -71,18 +71,18 @@ export async function bootstrapNetwork(
     createEthereumChain(l1Urls, +l1ChainId).chainInfo,
   );
 
-  const { erc20Address, portalAddress } = await deployERC20(l1Clients);
+  const { erc20Address, portalAddress } = await deployERC20(l1Client);
 
   const { token, bridge } = await deployToken(wallet, portalAddress);
 
-  await initPortal(pxe, l1Clients, erc20Address, portalAddress, bridge.address);
+  await initPortal(pxe, l1Client, erc20Address, portalAddress, bridge.address);
 
   const fpcAdmin = wallet.getAddress();
   const fpc = await deployFPC(wallet, token.address, fpcAdmin);
 
   const counter = await deployCounter(wallet);
 
-  await fundFPC(pxe, counter.address, wallet, l1Clients, fpc.address, debugLog);
+  await fundFPC(pxe, counter.address, wallet, l1Client, fpc.address, debugLog);
 
   if (json) {
     log(
@@ -136,7 +136,7 @@ export async function bootstrapNetwork(
 /**
  * Step 1. Deploy the L1 contracts, but don't initialize
  */
-async function deployERC20({ walletClient, publicClient }: L1Clients) {
+async function deployERC20(l1Client: ExtendedViemWalletClient) {
   const { TestERC20Abi, TestERC20Bytecode, TokenPortalAbi, TokenPortalBytecode } = await import('@aztec/l1-artifacts');
 
   const erc20: ContractArtifacts = {
@@ -148,19 +148,12 @@ async function deployERC20({ walletClient, publicClient }: L1Clients) {
     contractBytecode: TokenPortalBytecode,
   };
 
-  const { address: erc20Address } = await deployL1Contract(
-    walletClient,
-    publicClient,
-    erc20.contractAbi,
-    erc20.contractBytecode,
-    ['DevCoin', 'DEV', walletClient.account.address],
-  );
-  const { address: portalAddress } = await deployL1Contract(
-    walletClient,
-    publicClient,
-    portal.contractAbi,
-    portal.contractBytecode,
-  );
+  const { address: erc20Address } = await deployL1Contract(l1Client, erc20.contractAbi, erc20.contractBytecode, [
+    'DevCoin',
+    'DEV',
+    l1Client.account.address,
+  ]);
+  const { address: portalAddress } = await deployL1Contract(l1Client, portal.contractAbi, portal.contractBytecode);
 
   return {
     erc20Address,
@@ -214,7 +207,7 @@ async function deployToken(
  */
 async function initPortal(
   pxe: PXE,
-  { walletClient, publicClient }: L1Clients,
+  l1Client: ExtendedViemWalletClient,
   erc20: EthAddress,
   portal: EthAddress,
   bridge: AztecAddress,
@@ -227,12 +220,12 @@ async function initPortal(
   const contract = getContract({
     abi: TokenPortalAbi,
     address: portal.toString(),
-    client: walletClient,
+    client: l1Client,
   });
 
   const hash = await contract.write.initialize([registryAddress.toString(), erc20.toString(), bridge.toString()]);
 
-  await publicClient.waitForTransactionReceipt({ hash });
+  await l1Client.waitForTransactionReceipt({ hash });
 }
 
 async function deployFPC(
@@ -272,7 +265,7 @@ async function fundFPC(
   pxe: PXE,
   counterAddress: AztecAddress,
   wallet: Wallet,
-  l1Clients: L1Clients,
+  l1Client: ExtendedViemWalletClient,
   fpcAddress: AztecAddress,
   debugLog: Logger,
 ) {
@@ -288,12 +281,7 @@ async function fundFPC(
 
   const feeJuiceContract = await FeeJuiceContract.at(feeJuice, wallet);
 
-  const feeJuicePortal = await L1FeeJuicePortalManager.new(
-    wallet,
-    l1Clients.publicClient,
-    l1Clients.walletClient,
-    debugLog,
-  );
+  const feeJuicePortal = await L1FeeJuicePortalManager.new(wallet, l1Client, debugLog);
 
   const { claimAmount, claimSecret, messageLeafIndex, messageHash } = await feeJuicePortal.bridgeTokensPublic(
     fpcAddress,

package/src/cmds/l1/bridge_erc20.ts

@@ -1,5 +1,5 @@
 import { type AztecAddress, type EthAddress, type Fr, L1ToL2TokenPortalManager } from '@aztec/aztec.js';
-import { createEthereumChain, createL1Clients } from '@aztec/ethereum';
+import { createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 
 import { prettyPrintJSON } from '../../utils/commands.js';
@@ -22,17 +22,10 @@ export async function bridgeERC20(
 ) {
   // Prepare L1 client
   const chain = createEthereumChain(l1RpcUrls, chainId);
-  const { publicClient, walletClient } = createL1Clients(chain.rpcUrls, privateKey ?? mnemonic, chain.chainInfo);
+  const l1Client = createExtendedL1Client(chain.rpcUrls, privateKey ?? mnemonic, chain.chainInfo);
 
   // Setup portal manager
-  const manager = new L1ToL2TokenPortalManager(
-    portalAddress,
-    tokenAddress,
-    handlerAddress,
-    publicClient,
-    walletClient,
-    debugLogger,
-  );
+  const manager = new L1ToL2TokenPortalManager(portalAddress, tokenAddress, handlerAddress, l1Client, debugLogger);
   let claimSecret: Fr;
   let messageHash: `0x${string}`;
   if (privateTransfer) {

package/src/cmds/l1/deploy_l1_contracts.ts

@@ -27,7 +27,7 @@ export async function deployL1Contracts(
   const initialAccounts = testAccounts ? await getInitialTestAccounts() : [];
   const sponsoredFPCAddress = sponsoredFPC ? await getSponsoredFPCAddress() : [];
   const initialFundedAccounts = initialAccounts.map(a => a.address).concat(sponsoredFPCAddress);
-  const { genesisBlockHash, genesisArchiveRoot, fundingNeeded } = await getGenesisValues(initialFundedAccounts);
+  const { genesisArchiveRoot, fundingNeeded } = await getGenesisValues(initialFundedAccounts);
 
   const { l1ContractAddresses } = await deployAztecContracts(
     rpcUrls,
@@ -38,7 +38,6 @@ export async function deployL1Contracts(
     salt,
     initialValidators,
     genesisArchiveRoot,
-    genesisBlockHash,
     fundingNeeded,
     acceleratedTestDeployments,
     config,
@@ -70,7 +69,6 @@ export async function deployL1Contracts(
     log(`StakingAssetHandler Address: ${l1ContractAddresses.stakingAssetHandlerAddress?.toString()}`);
     log(`Initial funded accounts: ${initialFundedAccounts.map(a => a.toString()).join(', ')}`);
     log(`Initial validators: ${initialValidators.map(a => a.toString()).join(', ')}`);
-    log(`Genesis block hash: ${genesisBlockHash.toString()}`);
     log(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
   }
 }

package/src/cmds/l1/deploy_l1_verifier.ts

@@ -1,5 +1,5 @@
 import { createCompatibleClient } from '@aztec/aztec.js';
-import { createEthereumChain, createL1Clients, deployL1Contract } from '@aztec/ethereum';
+import { createEthereumChain, createExtendedL1Client, deployL1Contract } from '@aztec/ethereum';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 import { HonkVerifierAbi, HonkVerifierBytecode } from '@aztec/l1-artifacts';
 
@@ -16,7 +16,7 @@ export async function deployUltraHonkVerifier(
   log: LogFn,
   debugLogger: Logger,
 ) {
-  const { publicClient, walletClient } = createL1Clients(
+  const extendedClient = createExtendedL1Client(
     ethRpcUrls,
     privateKey ?? mnemonic,
     createEthereumChain(ethRpcUrls, l1ChainId).chainInfo,
@@ -37,15 +37,10 @@ export async function deployUltraHonkVerifier(
   const rollup = getContract({
     abi: RollupAbi,
     address: rollupAddress,
-    client: walletClient,
+    client: extendedClient,
   });
 
-  const { address: verifierAddress } = await deployL1Contract(
-    walletClient,
-    publicClient,
-    HonkVerifierAbi,
-    HonkVerifierBytecode,
-  );
+  const { address: verifierAddress } = await deployL1Contract(extendedClient, HonkVerifierAbi, HonkVerifierBytecode);
   log(`Deployed honk verifier at ${verifierAddress}`);
 
   await rollup.write.setEpochVerifier([verifierAddress.toString()]);
@@ -63,7 +58,7 @@ export async function deployMockVerifier(
   log: LogFn,
   debugLogger: Logger,
 ) {
-  const { publicClient, walletClient } = createL1Clients(
+  const extendedClient = createExtendedL1Client(
     ethRpcUrls,
     privateKey ?? mnemonic,
     createEthereumChain(ethRpcUrls, l1ChainId).chainInfo,
@@ -71,8 +66,7 @@ export async function deployMockVerifier(
   const { MockVerifierAbi, MockVerifierBytecode, RollupAbi } = await import('@aztec/l1-artifacts');
 
   const { address: mockVerifierAddress } = await deployL1Contract(
-    walletClient,
-    publicClient,
+    extendedClient,
     MockVerifierAbi,
     MockVerifierBytecode,
   );
@@ -91,7 +85,7 @@ export async function deployMockVerifier(
   const rollup = getContract({
     abi: RollupAbi,
     address: rollupAddress,
-    client: walletClient,
+    client: extendedClient,
   });
 
   await rollup.write.setEpochVerifier([mockVerifierAddress.toString()]);

package/src/cmds/l1/deploy_new_rollup.ts

@@ -27,7 +27,7 @@ export async function deployNewRollup(
   const initialAccounts = testAccounts ? await getInitialTestAccounts() : [];
   const sponsoredFPCAddress = sponsoredFPC ? await getSponsoredFPCAddress() : [];
   const initialFundedAccounts = initialAccounts.map(a => a.address).concat(sponsoredFPCAddress);
-  const { genesisBlockHash, genesisArchiveRoot, fundingNeeded } = await getGenesisValues(initialFundedAccounts);
+  const { genesisArchiveRoot, fundingNeeded } = await getGenesisValues(initialFundedAccounts);
 
   const { rollup, slashFactoryAddress } = await deployNewRollupContracts(
     registryAddress,
@@ -39,7 +39,6 @@ export async function deployNewRollup(
     salt,
     initialValidators,
     genesisArchiveRoot,
-    genesisBlockHash,
     fundingNeeded,
     config,
     debugLogger,
@@ -52,7 +51,6 @@ export async function deployNewRollup(
           rollupAddress: rollup.address,
           initialFundedAccounts: initialFundedAccounts.map(a => a.toString()),
           initialValidators: initialValidators.map(a => a.toString()),
-          genesisBlockHash: genesisBlockHash.toString(),
           genesisArchiveRoot: genesisArchiveRoot.toString(),
           slashFactoryAddress: slashFactoryAddress.toString(),
         },
@@ -64,7 +62,6 @@ export async function deployNewRollup(
     log(`Rollup Address: ${rollup.address}`);
     log(`Initial funded accounts: ${initialFundedAccounts.map(a => a.toString()).join(', ')}`);
     log(`Initial validators: ${initialValidators.map(a => a.toString()).join(', ')}`);
-    log(`Genesis block hash: ${genesisBlockHash.toString()}`);
     log(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
     log(`Slash Factory Address: ${slashFactoryAddress.toString()}`);
   }

package/src/cmds/l1/governance_utils.ts

@@ -4,7 +4,7 @@ import {
   ProposalState,
   RegistryContract,
   createEthereumChain,
-  createL1Clients,
+  createExtendedL1Client,
 } from '@aztec/ethereum';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 
@@ -33,19 +33,20 @@ export async function depositGovernanceTokens({
 }) {
   debugLogger.info(`Depositing ${amount} governance tokens to ${recipient}`);
   const chain = createEthereumChain(rpcUrls, chainId);
-  const { publicClient, walletClient } = createL1Clients(
+  const extendedClient = createExtendedL1Client(
     rpcUrls,
     privateKey ?? mnemonic,
     chain.chainInfo,
+    undefined,
     mnemonicIndex,
   );
 
-  const addresses = await RegistryContract.collectAddresses(publicClient, registryAddress, 'canonical');
+  const addresses = await RegistryContract.collectAddresses(extendedClient, registryAddress, 'canonical');
   const governanceAddress = addresses.governanceAddress.toString();
   const tokenAddress = addresses.stakingAssetAddress.toString();
 
-  const feeJuice = new FeeJuiceContract(tokenAddress, publicClient, walletClient);
-  const governance = new GovernanceContract(governanceAddress, publicClient, walletClient);
+  const feeJuice = new FeeJuiceContract(tokenAddress, extendedClient);
+  const governance = new GovernanceContract(governanceAddress, extendedClient);
   if (mint) {
     await feeJuice.mint(recipient, amount);
     debugLogger.info(`Minted ${amount} tokens to ${recipient}`);
@@ -83,16 +84,16 @@ export async function proposeWithLock({
 }) {
   debugLogger.info(`Proposing with lock from ${payloadAddress} to ${registryAddress}`);
   const chain = createEthereumChain(rpcUrls, chainId);
-  const clients = createL1Clients(rpcUrls, privateKey ?? mnemonic, chain.chainInfo, mnemonicIndex);
+  const client = createExtendedL1Client(rpcUrls, privateKey ?? mnemonic, chain.chainInfo, undefined, mnemonicIndex);
 
-  const addresses = await RegistryContract.collectAddresses(clients.publicClient, registryAddress, 'canonical');
+  const addresses = await RegistryContract.collectAddresses(client, registryAddress, 'canonical');
   const governanceAddress = addresses.governanceAddress.toString();
 
-  const governance = new GovernanceContract(governanceAddress, clients.publicClient, clients.walletClient);
+  const governance = new GovernanceContract(governanceAddress, client);
 
   const proposalId = await governance.proposeWithLock({
     payloadAddress,
-    withdrawAddress: clients.walletClient.account.address,
+    withdrawAddress: client.account.address,
   });
   if (json) {
     log(JSON.stringify({ proposalId: Number(proposalId) }, null, 2));
@@ -131,12 +132,12 @@ export async function voteOnGovernanceProposal({
     `Voting on proposal ${proposalId} with ${voteAmount ? voteAmount : 'all'} tokens in favor: ${inFavor}`,
   );
   const chain = createEthereumChain(rpcUrls, chainId);
-  const clients = createL1Clients(rpcUrls, privateKey ?? mnemonic, chain.chainInfo, mnemonicIndex);
+  const client = createExtendedL1Client(rpcUrls, privateKey ?? mnemonic, chain.chainInfo, undefined, mnemonicIndex);
 
-  const addresses = await RegistryContract.collectAddresses(clients.publicClient, registryAddress, 'canonical');
+  const addresses = await RegistryContract.collectAddresses(client, registryAddress, 'canonical');
   const governanceAddress = addresses.governanceAddress.toString();
 
-  const governance = new GovernanceContract(governanceAddress, clients.publicClient, clients.walletClient);
+  const governance = new GovernanceContract(governanceAddress, client);
   const state = await governance.getProposalState(proposalId);
   if (state !== ProposalState.Active && !waitTilActive) {
     debugLogger.warn(`Proposal is not active, but waitTilActive is false. Not voting.`);
@@ -170,12 +171,12 @@ export async function executeGovernanceProposal({
 }) {
   debugLogger.info(`Executing proposal ${proposalId}`);
   const chain = createEthereumChain(rpcUrls, chainId);
-  const clients = createL1Clients(rpcUrls, privateKey ?? mnemonic, chain.chainInfo, mnemonicIndex);
+  const client = createExtendedL1Client(rpcUrls, privateKey ?? mnemonic, chain.chainInfo, undefined, mnemonicIndex);
 
-  const addresses = await RegistryContract.collectAddresses(clients.publicClient, registryAddress, 'canonical');
+  const addresses = await RegistryContract.collectAddresses(client, registryAddress, 'canonical');
   const governanceAddress = addresses.governanceAddress.toString();
 
-  const governance = new GovernanceContract(governanceAddress, clients.publicClient, clients.walletClient);
+  const governance = new GovernanceContract(governanceAddress, client);
   const state = await governance.getProposalState(proposalId);
   if (state !== ProposalState.Executable && !waitTilExecutable) {
     debugLogger.warn(`Proposal is not executable, but waitTilExecutable is false. Not executing.`);

package/src/utils/aztec.ts

@@ -53,7 +53,6 @@ export async function deployAztecContracts(
   salt: number | undefined,
   initialValidators: EthAddress[],
   genesisArchiveRoot: Fr,
-  genesisBlockHash: Fr,
   feeJuicePortalInitialBalance: bigint,
   acceleratedTestDeployments: boolean,
   config: L1ContractsConfig,
@@ -78,7 +77,6 @@ export async function deployAztecContracts(
       vkTreeRoot: getVKTreeRoot(),
       protocolContractTreeRoot,
       genesisArchiveRoot,
-      genesisBlockHash,
       salt,
       initialValidators,
       acceleratedTestDeployments,
@@ -99,12 +97,11 @@ export async function deployNewRollupContracts(
   salt: number | undefined,
   initialValidators: EthAddress[],
   genesisArchiveRoot: Fr,
-  genesisBlockHash: Fr,
   feeJuicePortalInitialBalance: bigint,
   config: L1ContractsConfig,
   logger: Logger,
 ): Promise<{ rollup: RollupContract; slashFactoryAddress: EthAddress }> {
-  const { createEthereumChain, deployRollupForUpgrade, createL1Clients } = await import('@aztec/ethereum');
+  const { createEthereumChain, deployRollupForUpgrade, createExtendedL1Client } = await import('@aztec/ethereum');
   const { mnemonicToAccount, privateKeyToAccount } = await import('viem/accounts');
   const { getVKTreeRoot } = await import('@aztec/noir-protocol-circuits-types/vk-tree');
 
@@ -112,23 +109,22 @@ export async function deployNewRollupContracts(
     ? mnemonicToAccount(mnemonic!, { addressIndex: mnemonicIndex })
     : privateKeyToAccount(`${privateKey.startsWith('0x') ? '' : '0x'}${privateKey}` as `0x${string}`);
   const chain = createEthereumChain(rpcUrls, chainId);
-  const clients = createL1Clients(rpcUrls, account, chain.chainInfo, mnemonicIndex);
+  const client = createExtendedL1Client(rpcUrls, account, chain.chainInfo, undefined, mnemonicIndex);
 
   if (!initialValidators || initialValidators.length === 0) {
-    const registry = new RegistryContract(clients.publicClient, registryAddress);
-    const rollup = new RollupContract(clients.publicClient, await registry.getCanonicalAddress());
+    const registry = new RegistryContract(client, registryAddress);
+    const rollup = new RollupContract(client, await registry.getCanonicalAddress());
     initialValidators = (await rollup.getAttesters()).map(str => EthAddress.fromString(str));
     logger.info('Initializing new rollup with old attesters', { initialValidators });
   }
 
   const { rollup, slashFactoryAddress } = await deployRollupForUpgrade(
-    clients,
+    client,
     {
       salt,
       vkTreeRoot: getVKTreeRoot(),
       protocolContractTreeRoot,
       genesisArchiveRoot,
-      genesisBlockHash,
       initialValidators,
       feeJuicePortalInitialBalance,
       ...config,