refactor: rename deployL1ContractsWithForgeAndAccount to deployL1Contracts

Removes the alias and directly names the function deployL1Contracts
as the main entry point for L1 contract deployment.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <[email protected]>

Author: ludamad

docs/design/NETWORK_UPGRADE_IMPLEMENTATION_ROADMAP.md

@@ -27,7 +27,7 @@ import {
 import { TestWallet, deployFundedSchnorrAccounts } from '@aztec/test-wallet/server';
 import { getGenesisValues } from '@aztec/world-state/testing';
 
-import { type HDAccount, type PrivateKeyAccount, createPublicClient, fallback, http as httpViemTransport } from 'viem';
+import { type HDAccount, type Hex, createPublicClient, fallback, http as httpViemTransport } from 'viem';
 import { mnemonicToAccount, privateKeyToAddress } from 'viem/accounts';
 import { foundry } from 'viem/chains';
 
@@ -48,7 +48,7 @@ const localAnvil = foundry;
  */
 export async function deployContractsToL1(
   aztecNodeConfig: AztecNodeConfig,
-  hdAccount: HDAccount | PrivateKeyAccount,
+  hdAccount: HDAccount | Hex,
   contractDeployLogger = logger,
   opts: {
     assumeProvenThroughBlockNumber?: number;

docs/design/NETWORK_UPGRADE_INFRASTRUCTURE_CONSOLIDATION.md

@@ -62,16 +62,19 @@ export async function deployAztecContracts(
   debugLogger: Logger,
 ): Promise<DeployL1ContractsReturnType> {
   const { createEthereumChain, deployL1Contracts } = await import('@aztec/ethereum');
-  const { mnemonicToAccount, privateKeyToAccount } = await import('viem/accounts');
+  const { mnemonicToAccount } = await import('viem/accounts');
 
-  const account = !privateKey
+  // For Forge deployment, we need to pass either an HDAccount (from mnemonic)
+  // or a raw private key hex string. We can't use PrivateKeyAccount because
+  // viem doesn't expose the private key from it.
+  const accountOrPrivateKey = !privateKey
     ? mnemonicToAccount(mnemonic!, { addressIndex: mnemonicIndex })
-    : privateKeyToAccount(addLeadingHex(privateKey));
+    : (addLeadingHex(privateKey) as `0x${string}`);
   const chain = createEthereumChain(rpcUrls, chainId);
 
   const { getVKTreeRoot } = await import('@aztec/noir-protocol-circuits-types/vk-tree');
 
-  const result = await deployL1Contracts(chain.rpcUrls, account, chain.chainInfo, debugLogger, {
+  const result = await deployL1Contracts(chain.rpcUrls, accountOrPrivateKey, chain.chainInfo, debugLogger, {
     vkTreeRoot: getVKTreeRoot().toString() as `0x${string}`,
     protocolContractsHash: protocolContractsHash.toString() as `0x${string}`,
     genesisArchiveRoot: genesisArchiveRoot.toString() as `0x${string}`,

l1-contracts/script/deploy/REQUIREMENTS.md

@@ -156,7 +156,7 @@ describe('L1Publisher integration', () => {
     config.l1RpcUrls = [rpcUrl];
 
     deployerAccount = privateKeyToAccount(deployerPK);
-    ({ l1ContractAddresses, l1Client } = await setupL1Contracts(config.l1RpcUrls, deployerAccount, logger, {
+    ({ l1ContractAddresses, l1Client } = await setupL1Contracts(config.l1RpcUrls, deployerPK, logger, {
       aztecTargetCommitteeSize: 0,
       slasherFlavor: 'none',
       ...deployL1ContractsArgs,

yarn-project/aztec/src/local-network/local-network.ts

@@ -134,7 +134,7 @@ describe('L1Publisher integration', () => {
     deployerAccount = privateKeyToAccount(deployerPK);
     ({ l1ContractAddresses, l1Client } = await setupL1Contracts(
       config.l1RpcUrls,
-      deployerAccount,
+      deployerPK,
       logger,
       {
         aztecTargetCommitteeSize: 0,

yarn-project/cli/src/utils/aztec.ts

@@ -3,17 +3,24 @@ import { type DeployL1ContractsArgs, deployL1Contracts } from '@aztec/ethereum';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
 import { protocolContractsHash } from '@aztec/protocol-contracts';
 
-import type { Chain, HDAccount, Hex, PrivateKeyAccount } from 'viem';
+import type { Chain, HDAccount, Hex } from 'viem';
 import { foundry } from 'viem/chains';
 
 export { deployAndInitializeTokenAndBridgeContracts } from '../shared/cross_chain_test_harness.js';
 
 /**
  * Sets up L1 contracts for end-to-end tests using Forge scripts.
+ *
+ * @param l1RpcUrls - Array of RPC URLs
+ * @param account - HDAccount (from mnemonicToAccount) or raw private key hex string.
+ *                  Note: PrivateKeyAccount is NOT supported - pass the raw hex string instead.
+ * @param logger - Logger instance
+ * @param args - Partial deployment arguments
+ * @param chain - Ethereum chain (defaults to foundry/anvil)
  */
 export const setupL1Contracts = async (
   l1RpcUrls: string[],
-  account: HDAccount | PrivateKeyAccount,
+  account: HDAccount | Hex,
   logger: Logger,
   args: Partial<DeployL1ContractsArgs> = {},
   chain: Chain = foundry,

yarn-project/end-to-end/src/e2e_l1_publisher/e2e_l1_publisher.test.ts

@@ -402,24 +402,27 @@ export async function setup(
       await ethCheatCodes.warp(opts.l1StartTime, { resetBlockInterval: true });
     }
 
-    let publisherPrivKey = undefined;
+    let publisherPrivKeyHex: `0x${string}` | undefined = undefined;
     let publisherHdAccount = undefined;
 
     if (opts.l1PublisherKey && opts.l1PublisherKey.getValue() && opts.l1PublisherKey.getValue() != NULL_KEY) {
-      publisherHdAccount = privateKeyToAccount(opts.l1PublisherKey.getValue());
+      publisherPrivKeyHex = opts.l1PublisherKey.getValue();
+      publisherHdAccount = privateKeyToAccount(publisherPrivKeyHex);
     } else if (
       config.publisherPrivateKeys &&
       config.publisherPrivateKeys.length > 0 &&
       config.publisherPrivateKeys[0].getValue() != NULL_KEY
     ) {
-      publisherHdAccount = privateKeyToAccount(config.publisherPrivateKeys[0].getValue());
+      publisherPrivKeyHex = config.publisherPrivateKeys[0].getValue();
+      publisherHdAccount = privateKeyToAccount(publisherPrivKeyHex);
     } else if (!MNEMONIC) {
       throw new Error(`Mnemonic not provided and no publisher private key`);
     } else {
       publisherHdAccount = mnemonicToAccount(MNEMONIC, { addressIndex: 0 });
       const publisherPrivKeyRaw = publisherHdAccount.getHdKey().privateKey;
-      publisherPrivKey = publisherPrivKeyRaw === null ? null : Buffer.from(publisherPrivKeyRaw);
-      config.publisherPrivateKeys = [new SecretValue(`0x${publisherPrivKey!.toString('hex')}` as const)];
+      const publisherPrivKey = publisherPrivKeyRaw === null ? null : Buffer.from(publisherPrivKeyRaw);
+      publisherPrivKeyHex = `0x${publisherPrivKey!.toString('hex')}` as `0x${string}`;
+      config.publisherPrivateKeys = [new SecretValue(publisherPrivKeyHex)];
     }
 
     config.coinbase = EthAddress.fromString(publisherHdAccount.address);
@@ -451,7 +454,7 @@ export async function setup(
       opts.deployL1ContractsValues ??
       (await setupL1Contracts(
         config.l1RpcUrls,
-        publisherHdAccount!,
+        publisherPrivKeyHex!,
         logger,
         {
           ...opts,