@aztec/cli 0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2 → 0.77.0-testnet-ignition.21

package/dest/utils/commands.d.ts

@@ -0,0 +1,143 @@
+import { FunctionSelector } from '@aztec/aztec.js/abi';
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+import { EthAddress } from '@aztec/aztec.js/eth_address';
+import { Fr } from '@aztec/aztec.js/fields';
+import { LogId } from '@aztec/aztec.js/log_id';
+import { TxHash } from '@aztec/aztec.js/tx_hash';
+import type { LogFn } from '@aztec/foundation/log';
+import type { PXE } from '@aztec/stdlib/interfaces/client';
+import { PublicKeys } from '@aztec/stdlib/keys';
+import { type Command, Option } from 'commander';
+/**
+ * If we can successfully resolve 'host.docker.internal', then we are running in a container, and we should treat
+ * localhost as being host.docker.internal.
+ */
+export declare const getLocalhost: () => Promise<string>;
+export declare const LOCALHOST: string;
+export declare const ETHEREUM_HOSTS: string, PRIVATE_KEY: string | undefined, API_KEY: string | undefined, CLI_VERSION: string | undefined;
+export declare function addOptions(program: Command, options: Option[]): Command;
+export declare const makePxeOption: (mandatory: boolean) => Option;
+export declare const pxeOption: Option;
+export declare const l1ChainIdOption: Option;
+export declare const createSecretKeyOption: (description: string, mandatory: boolean, argsParser?: (value: string, previous: Fr) => Fr) => Option;
+export declare const logJson: (log: LogFn) => (obj: object) => void;
+/**
+ * Updates a file in place atomically.
+ * @param filePath - Path to file
+ * @param contents - New contents to write
+ */
+export declare function atomicUpdateFile(filePath: string, contents: string): Promise<void>;
+/**
+ * Utility to select a TX sender either from user input
+ * or from the first account that is found in a PXE instance.
+ * @param pxe - The PXE instance that will be checked for an account.
+ * @param _from - The user input.
+ * @returns An Aztec address. Will throw if one can't be found in either options.
+ */
+export declare function getTxSender(pxe: PXE, _from?: string): Promise<AztecAddress>;
+export declare function parseBigint(bigint: string): bigint | undefined;
+/**
+ * Parses a hex encoded string to an Fr integer
+ * @param str - Hex encoded string
+ * @returns A integer
+ */
+export declare function parseFieldFromHexString(str: string): Fr;
+/**
+ * Parses an AztecAddress from a string.
+ * @param address - A serialized Aztec address
+ * @returns An Aztec address
+ * @throws InvalidArgumentError if the input string is not valid.
+ */
+export declare function parseAztecAddress(address: string): AztecAddress;
+/**
+ * Parses an Ethereum address from a string.
+ * @param address - A serialized Ethereum address
+ * @returns An Ethereum address
+ * @throws InvalidArgumentError if the input string is not valid.
+ */
+export declare function parseEthereumAddress(address: string): EthAddress;
+/**
+ * Parses an AztecAddress from a string.
+ * @param address - A serialized Aztec address
+ * @returns An Aztec address
+ * @throws InvalidArgumentError if the input string is not valid.
+ */
+export declare function parseOptionalAztecAddress(address: string): AztecAddress | undefined;
+/**
+ * Parses an optional log ID string into a LogId object.
+ *
+ * @param logId - The log ID string to parse.
+ * @returns The parsed LogId object, or undefined if the log ID is missing or empty.
+ */
+export declare function parseOptionalLogId(logId: string): LogId | undefined;
+/**
+ * Parses a selector from a string.
+ * @param selector - A serialized selector.
+ * @returns A selector.
+ * @throws InvalidArgumentError if the input string is not valid.
+ */
+export declare function parseOptionalSelector(selector: string): FunctionSelector | undefined;
+/**
+ * Parses a string into an integer or returns undefined if the input is falsy.
+ *
+ * @param value - The string to parse into an integer.
+ * @returns The parsed integer, or undefined if the input string is falsy.
+ * @throws If the input is not a valid integer.
+ */
+export declare function parseOptionalInteger(value: string): number | undefined;
+/**
+ * Parses a TxHash from a string.
+ * @param txHash - A transaction hash
+ * @returns A TxHash instance
+ * @throws InvalidArgumentError if the input string is not valid.
+ */
+export declare function parseTxHash(txHash: string): TxHash;
+/**
+ * Parses an optional TxHash from a string.
+ * Calls parseTxHash internally.
+ * @param txHash - A transaction hash
+ * @returns A TxHash instance, or undefined if the input string is falsy.
+ * @throws InvalidArgumentError if the input string is not valid.
+ */
+export declare function parseOptionalTxHash(txHash: string): TxHash | undefined;
+/**
+ * Parses a public key from a string.
+ * @param publicKey - A public keys object serialised as a string
+ * @returns A PublicKeys instance
+ * @throws InvalidArgumentError if the input string is not valid.
+ */
+export declare function parsePublicKey(publicKey: string): PublicKeys | undefined;
+/**
+ * Parses a partial address from a string.
+ * @param address - A partial address
+ * @returns A Fr instance
+ * @throws InvalidArgumentError if the input string is not valid.
+ */
+export declare function parsePartialAddress(address: string): Fr;
+/**
+ * Parses a secret key from a string.
+ * @param privateKey - A string
+ * @returns A secret key
+ * @throws InvalidArgumentError if the input string is not valid.
+ */
+export declare function parseSecretKey(secretKey: string): Fr;
+/**
+ * Parses a field from a string.
+ * @param field - A string representing the field.
+ * @returns A field.
+ * @throws InvalidArgumentError if the input string is not valid.
+ */
+export declare function parseField(field: string): Fr;
+/**
+ * Parses an array of strings to Frs.
+ * @param fields - An array of strings representing the fields.
+ * @returns An array of Frs.
+ */
+export declare function parseFields(fields: string[]): Fr[];
+/**
+ * Pretty prints an object as JSON
+ * @param data - The object to stringify
+ * @returns A JSON string
+ */
+export declare function prettyPrintJSON(data: Record<string, any>): string;
+//# sourceMappingURL=commands.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../src/utils/commands.ts"],"names":[],"mappings":"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"}

package/dest/utils/commands.js

@@ -4,7 +4,7 @@ import { EthAddress } from '@aztec/aztec.js/eth_address';
 import { Fr } from '@aztec/aztec.js/fields';
 import { LogId } from '@aztec/aztec.js/log_id';
 import { TxHash } from '@aztec/aztec.js/tx_hash';
-import { PublicKeys } from '@aztec/circuits.js/types';
+import { PublicKeys } from '@aztec/stdlib/keys';
 import { CommanderError, InvalidArgumentError, Option } from 'commander';
 import { lookup } from 'dns/promises';
 import { rename, writeFile } from 'fs/promises';
@@ -13,7 +13,7 @@ import { rename, writeFile } from 'fs/promises';
  * localhost as being host.docker.internal.
  */ export const getLocalhost = ()=>lookup('host.docker.internal').then(()=>'host.docker.internal').catch(()=>'localhost');
 export const LOCALHOST = await getLocalhost();
-export const { ETHEREUM_HOST = `http://${LOCALHOST}:8545`, PRIVATE_KEY, API_KEY, CLI_VERSION } = process.env;
+export const { ETHEREUM_HOSTS = `http://${LOCALHOST}:8545`, PRIVATE_KEY, API_KEY, CLI_VERSION } = process.env;
 export function addOptions(program, options) {
     options.forEach((option)=>program.addOption(option));
     return program;

package/dest/utils/encoding.d.ts

@@ -0,0 +1,15 @@
+import type { ABIParameter, StructType } from '@aztec/stdlib/abi';
+/**
+ * Parses a hex string into an ABI struct type.
+ * @param str - The encoded hex string.
+ * @param abiType - The ABI Struct type.
+ * @returns An object in the ABI struct type's format.
+ */
+export declare function parseStructString(str: string, abiType: StructType): any;
+/**
+ * Tries to encode function args to their equivalent TS type.
+ * @param args - An array of function's / constructor's args.
+ * @returns The encoded array.
+ */
+export declare function encodeArgs(args: any[], params: ABIParameter[]): any[];
+//# sourceMappingURL=encoding.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"encoding.d.ts","sourceRoot":"","sources":["../../src/utils/encoding.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAW,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE3E;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,OAcjE;AA4ED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,SAY7D"}

package/dest/utils/encoding.js

@@ -1,4 +1,3 @@
-import { isU128Struct } from '@aztec/foundation/abi';
 import { Fr } from '@aztec/foundation/fields';
 /**
  * Parses a hex string into an ABI struct type.
@@ -78,19 +77,13 @@ import { Fr } from '@aztec/foundation/fields';
             throw Error(`Array passed for arg ${name}. Expected a struct.`);
         }
         const res = {};
-        if (isU128Struct(abiType)) {
-            // When dealing with U128 we don't expect to receive limbs from the user but instead just a normal number.
-            // Also encoder.ts expects a normal number so we just return it as such.
-            return obj;
-        } else {
-            for (const field of abiType.fields){
-                // Remove field name from list as it's present
-                const arg = obj[field.name];
-                if (!arg) {
-                    throw Error(`Expected field ${field.name} not found in struct ${name}.`);
-                }
-                res[field.name] = encodeArg(obj[field.name], field.type, field.name);
+        for (const field of abiType.fields){
+            // Remove field name from list as it's present
+            const arg = obj[field.name];
+            if (!arg) {
+                throw Error(`Expected field ${field.name} not found in struct ${name}.`);
             }
+            res[field.name] = encodeArg(obj[field.name], field.type, field.name);
         }
         return res;
     }

package/dest/utils/github.d.ts

@@ -0,0 +1,4 @@
+export declare const GITHUB_OWNER = "AztecProtocol";
+export declare const GITHUB_REPO = "aztec-packages";
+export declare const GITHUB_TAG_PREFIX = "aztec-packages";
+//# sourceMappingURL=github.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"github.d.ts","sourceRoot":"","sources":["../../src/utils/github.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,kBAAkB,CAAC;AAC5C,eAAO,MAAM,WAAW,mBAAmB,CAAC;AAC5C,eAAO,MAAM,iBAAiB,mBAAmB,CAAC"}

package/dest/utils/index.d.ts

@@ -0,0 +1,5 @@
+export * from './commands.js';
+export * from './aztec.js';
+export * from './encoding.js';
+export * from './github.js';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC;AAC3B,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC"}

package/dest/utils/inspect.d.ts

@@ -0,0 +1,17 @@
+import type { ContractArtifact, Fr } from '@aztec/aztec.js';
+import type { LogFn } from '@aztec/foundation/log';
+import type { PXE } from '@aztec/stdlib/interfaces/client';
+import type { TxHash } from '@aztec/stdlib/tx';
+export declare function inspectBlock(pxe: PXE, blockNumber: number, log: LogFn, opts?: {
+    showTxs?: boolean;
+}): Promise<void>;
+export declare function inspectTx(pxe: PXE, txHash: TxHash, log: LogFn, opts?: {
+    includeBlockInfo?: boolean;
+    artifactMap?: ArtifactMap;
+}): Promise<void>;
+type ArtifactMap = Record<string, ContractArtifactWithClassId>;
+type ContractArtifactWithClassId = ContractArtifact & {
+    classId: Fr;
+};
+export {};
+//# sourceMappingURL=inspect.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"inspect.d.ts","sourceRoot":"","sources":["../../src/utils/inspect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAgB,gBAAgB,EAAE,EAAE,EAAE,MAAM,iBAAiB,CAAC;AAC1E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AAE3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C,wBAAsB,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAO,iBA0B7G;AAED,wBAAsB,SAAS,CAC7B,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,KAAK,EACV,IAAI,GAAE;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAAC,WAAW,CAAC,EAAE,WAAW,CAAA;CAAO,iBAmGrE;AAyCD,KAAK,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,2BAA2B,CAAC,CAAC;AAC/D,KAAK,2BAA2B,GAAG,gBAAgB,GAAG;IAAE,OAAO,EAAE,EAAE,CAAA;CAAE,CAAC"}

package/dest/utils/inspect.js

@@ -1,6 +1,6 @@
-import { NoteStatus } from '@aztec/circuit-types';
-import { siloNullifier } from '@aztec/circuits.js/hash';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
+import { siloNullifier } from '@aztec/stdlib/hash';
+import { NoteStatus } from '@aztec/stdlib/note';
 export async function inspectBlock(pxe, blockNumber, log, opts = {}) {
     const block = await pxe.getBlock(blockNumber);
     if (!block) {
@@ -158,7 +158,7 @@ async function getKnownArtifacts(pxe) {
     const knownContractAddresses = await pxe.getContracts();
     const knownContracts = (await Promise.all(knownContractAddresses.map((contractAddress)=>pxe.getContractMetadata(contractAddress)))).map((contractMetadata)=>contractMetadata.contractInstance);
     const classIds = [
-        ...new Set(knownContracts.map((contract)=>contract?.contractClassId))
+        ...new Set(knownContracts.map((contract)=>contract?.currentContractClassId))
     ];
     const knownArtifacts = (await Promise.all(classIds.map((classId)=>classId ? pxe.getContractClassMetadata(classId) : undefined))).map((contractClassMetadata)=>contractClassMetadata ? {
             ...contractClassMetadata.artifact,
@@ -167,7 +167,7 @@ async function getKnownArtifacts(pxe) {
     const map = {};
     for (const instance of knownContracts){
         if (instance) {
-            const artifact = knownArtifacts.find((a)=>a?.classId?.equals(instance.contractClassId));
+            const artifact = knownArtifacts.find((a)=>a?.classId?.equals(instance.currentContractClassId));
             if (artifact) {
                 map[instance.address.toString()] = artifact;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/cli",
-  "version": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
+  "version": "0.77.0-testnet-ignition.21",
   "type": "module",
   "exports": {
     "./contracts": "./dest/cmds/contracts/index.js",
@@ -61,18 +61,20 @@
     "reporters": [
       "default"
     ],
-    "testTimeout": 30000,
+    "testTimeout": 120000,
     "setupFiles": [
       "../../foundation/src/jest/setup.mjs"
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
-    "@aztec/aztec.js": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
-    "@aztec/circuit-types": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
-    "@aztec/foundation": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
-    "@aztec/l1-artifacts": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
-    "@aztec/types": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
+    "@aztec/archiver": "0.77.0-testnet-ignition.21",
+    "@aztec/aztec.js": "0.77.0-testnet-ignition.21",
+    "@aztec/constants": "0.77.0-testnet-ignition.21",
+    "@aztec/foundation": "0.77.0-testnet-ignition.21",
+    "@aztec/l1-artifacts": "0.77.0-testnet-ignition.21",
+    "@aztec/p2p": "0.77.0-testnet-ignition.21",
+    "@aztec/stdlib": "0.77.0-testnet-ignition.21",
+    "@aztec/world-state": "0.77.0-testnet-ignition.21",
     "@iarna/toml": "^2.2.5",
     "@libp2p/peer-id-factory": "^3.0.4",
     "commander": "^12.1.0",
@@ -84,10 +86,9 @@
     "viem": "2.22.8"
   },
   "devDependencies": {
-    "@aztec/accounts": "workspace:^",
-    "@aztec/circuits.js": "workspace:^",
-    "@aztec/ethereum": "workspace:^",
-    "@aztec/protocol-contracts": "workspace:^",
+    "@aztec/accounts": "0.77.0-testnet-ignition.21",
+    "@aztec/ethereum": "0.77.0-testnet-ignition.21",
+    "@aztec/protocol-contracts": "0.77.0-testnet-ignition.21",
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
     "@types/lodash.chunk": "^4.2.9",
@@ -103,14 +104,14 @@
     "typescript": "^5.0.4"
   },
   "peerDependencies": {
-    "@aztec/accounts": "workspace:^",
-    "@aztec/bb-prover": "workspace:^",
-    "@aztec/circuits.js": "workspace:^",
-    "@aztec/ethereum": "workspace:^",
-    "@aztec/l1-artifacts": "workspace:^",
-    "@aztec/noir-contracts.js": "workspace:^",
-    "@aztec/noir-protocol-circuits-types": "workspace:^",
-    "@aztec/protocol-contracts": "workspace:^"
+    "@aztec/accounts": "0.77.0-testnet-ignition.21",
+    "@aztec/bb-prover": "0.77.0-testnet-ignition.21",
+    "@aztec/ethereum": "0.77.0-testnet-ignition.21",
+    "@aztec/l1-artifacts": "0.77.0-testnet-ignition.21",
+    "@aztec/noir-contracts.js": "0.77.0-testnet-ignition.21",
+    "@aztec/noir-protocol-circuits-types": "0.77.0-testnet-ignition.21",
+    "@aztec/protocol-contracts": "0.77.0-testnet-ignition.21",
+    "@aztec/stdlib": "0.77.0-testnet-ignition.21"
   },
   "files": [
     "dest",

package/src/cmds/contracts/index.ts

@@ -1,6 +1,6 @@
-import { type LogFn, type Logger } from '@aztec/foundation/log';
+import type { LogFn, Logger } from '@aztec/foundation/log';
 
-import { type Command } from 'commander';
+import type { Command } from 'commander';
 
 export function injectCommands(program: Command, log: LogFn, debugLogger: Logger) {
   program

package/src/cmds/contracts/inspect_contract.ts

@@ -1,18 +1,18 @@
-import { getContractClassFromArtifact } from '@aztec/circuits.js';
+import { sha256 } from '@aztec/foundation/crypto';
+import type { LogFn, Logger } from '@aztec/foundation/log';
 import {
   type FunctionArtifact,
   FunctionSelector,
   decodeFunctionSignature,
   decodeFunctionSignatureWithParameterNames,
-} from '@aztec/foundation/abi';
-import { sha256 } from '@aztec/foundation/crypto';
-import { type LogFn, type Logger } from '@aztec/foundation/log';
+} from '@aztec/stdlib/abi';
+import { getContractClassFromArtifact } from '@aztec/stdlib/contract';
 
 import { getContractArtifact } from '../../utils/aztec.js';
 
 export async function inspectContract(contractArtifactFile: string, debugLogger: Logger, log: LogFn) {
   const contractArtifact = await getContractArtifact(contractArtifactFile, log);
-  const contractFns = contractArtifact.functions.filter(f => f.name !== 'compute_note_hash_and_optionally_a_nullifier');
+  const contractFns = contractArtifact.functions;
   if (contractFns.length === 0) {
     log(`No functions found for contract ${contractArtifact.name}`);
   }

package/src/cmds/contracts/parse_parameter_struct.ts

@@ -1,6 +1,6 @@
-import { type StructType } from '@aztec/foundation/abi';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
-import { type LogFn } from '@aztec/foundation/log';
+import type { LogFn } from '@aztec/foundation/log';
+import type { StructType } from '@aztec/stdlib/abi';
 
 import { getContractArtifact } from '../../utils/aztec.js';
 import { parseStructString } from '../../utils/encoding.js';

package/src/cmds/devnet/bootstrap_network.ts

@@ -1,6 +1,9 @@
-import { getSchnorrAccount } from '@aztec/accounts/schnorr';
+import { getDeployedTestAccountsWallets } from '@aztec/accounts/testing';
 import {
+  AztecAddress,
   BatchCall,
+  EthAddress,
+  Fr,
   L1FeeJuicePortalManager,
   type PXE,
   type WaitOpts,
@@ -8,7 +11,7 @@ import {
   createCompatibleClient,
   retryUntil,
 } from '@aztec/aztec.js';
-import { type AztecAddress, type EthAddress, FEE_FUNDING_FOR_TESTER_ACCOUNT, Fq, Fr } from '@aztec/circuits.js';
+import { FEE_FUNDING_FOR_TESTER_ACCOUNT } from '@aztec/constants';
 import {
   type ContractArtifacts,
   type L1Clients,
@@ -16,10 +19,10 @@ import {
   createL1Clients,
   deployL1Contract,
 } from '@aztec/ethereum';
-import { type LogFn, type Logger } from '@aztec/foundation/log';
+import type { LogFn, Logger } from '@aztec/foundation/log';
 
 import { getContract } from 'viem';
-import { privateKeyToAccount } from 'viem/accounts';
+import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
 
 type ContractDeploymentInfo = {
   address: AztecAddress;
@@ -35,24 +38,27 @@ const waitOpts: WaitOpts = {
 
 export async function bootstrapNetwork(
   pxeUrl: string,
-  l1Url: string,
+  l1Urls: string[],
   l1ChainId: string,
   l1PrivateKey: `0x${string}` | undefined,
   l1Mnemonic: string,
+  addressIndex: number,
   json: boolean,
   log: LogFn,
   debugLog: Logger,
 ) {
   const pxe = await createCompatibleClient(pxeUrl, debugLog);
 
-  // setup a one-off account contract
-  const account = await getSchnorrAccount(pxe, Fr.random(), Fq.random(), Fr.random());
-  const wallet = await account.deploy().getWallet();
+  const [wallet] = await getDeployedTestAccountsWallets(pxe);
 
   const l1Clients = createL1Clients(
-    l1Url,
-    l1PrivateKey ? privateKeyToAccount(l1PrivateKey) : l1Mnemonic,
-    createEthereumChain(l1Url, +l1ChainId).chainInfo,
+    l1Urls,
+    l1PrivateKey
+      ? privateKeyToAccount(l1PrivateKey)
+      : // We need to use a different account that the main "deployer" account because the "deployer" account creates transactions that send blobs.
+        // Note that this account needs to be funded on L1 !
+        mnemonicToAccount(l1Mnemonic, { addressIndex }),
+    createEthereumChain(l1Urls, +l1ChainId).chainInfo,
   );
 
   const { erc20Address, portalAddress } = await deployERC20(l1Clients);
@@ -65,7 +71,7 @@ export async function bootstrapNetwork(
   const fpc = await deployFPC(wallet, token.address, fpcAdmin);
 
   const counter = await deployCounter(wallet);
-  // NOTE: Disabling for now in order to get devnet running
+
   await fundFPC(counter.address, wallet, l1Clients, fpc.address, debugLog);
 
   if (json) {
@@ -294,13 +300,19 @@ async function fundFPC(
 
   const counter = await CounterContract.at(counterAddress, wallet);
 
+  debugLog.info('Incrementing Counter');
+
   // TODO (alexg) remove this once sequencer builds blocks continuously
   // advance the chain
   await counter.methods.increment(wallet.getAddress(), wallet.getAddress()).send().wait(waitOpts);
   await counter.methods.increment(wallet.getAddress(), wallet.getAddress()).send().wait(waitOpts);
 
+  debugLog.info('Claiming FPC');
+
   await feeJuiceContract.methods
     .claim(fpcAddress, claimAmount, claimSecret, messageLeafIndex)
     .send()
     .wait({ ...waitOpts, proven: true });
+
+  debugLog.info('Finished claiming FPC');
 }

package/src/cmds/devnet/faucet.ts

@@ -1,5 +1,5 @@
-import { type EthAddress } from '@aztec/circuits.js';
-import { type LogFn } from '@aztec/foundation/log';
+import type { EthAddress } from '@aztec/foundation/eth-address';
+import type { LogFn } from '@aztec/foundation/log';
 
 import { prettyPrintJSON } from '../../utils/commands.js';
 

package/src/cmds/devnet/index.ts

@@ -1,8 +1,8 @@
-import { type LogFn, type Logger } from '@aztec/foundation/log';
+import type { LogFn, Logger } from '@aztec/foundation/log';
 
-import { type Command } from 'commander';
+import type { Command } from 'commander';
 
-import { ETHEREUM_HOST, l1ChainIdOption, parseEthereumAddress, pxeOption } from '../../utils/commands.js';
+import { ETHEREUM_HOSTS, l1ChainIdOption, parseEthereumAddress, pxeOption } from '../../utils/commands.js';
 
 export function injectCommands(program: Command, log: LogFn, debugLogger: Logger) {
   program
@@ -10,10 +10,11 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
     .description('Bootstrap a new network')
     .addOption(pxeOption)
     .addOption(l1ChainIdOption)
-    .requiredOption(
-      '--l1-rpc-url <string>',
-      'Url of the ethereum host. Chain identifiers localhost and testnet can be used',
-      ETHEREUM_HOST,
+    .requiredOption<string[]>(
+      '--l1-rpc-urls <string>',
+      'List of Ethereum host URLs. Chain identifiers localhost and testnet can be used (comma separated)',
+      (arg: string) => arg.split(','),
+      [ETHEREUM_HOSTS],
     )
     .option('--l1-private-key <string>', 'The private key to use for deployment', process.env.PRIVATE_KEY)
     .option(
@@ -21,15 +22,22 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
       'The mnemonic to use in deployment',
       'test test test test test test test test test test test junk',
     )
+    .option(
+      '-ai, --address-index <number>',
+      'The address index to use when calculating an address',
+      arg => BigInt(arg),
+      0n,
+    )
     .option('--json', 'Output the result as JSON')
     .action(async options => {
       const { bootstrapNetwork } = await import('./bootstrap_network.js');
       await bootstrapNetwork(
         options[pxeOption.attributeName()],
-        options.l1RpcUrl,
+        options.l1RpcUrls,
         options[l1ChainIdOption.attributeName()],
         options.l1PrivateKey,
         options.mnemonic,
+        options.addressIndex,
         options.json,
         log,
         debugLogger,

package/src/cmds/infrastructure/index.ts

@@ -1,20 +1,20 @@
-import { type LogFn, type Logger } from '@aztec/foundation/log';
+import type { LogFn, Logger } from '@aztec/foundation/log';
 
-import { type Command } from 'commander';
+import type { Command } from 'commander';
 
-import { ETHEREUM_HOST, l1ChainIdOption, parseOptionalInteger, pxeOption } from '../../utils/commands.js';
+import { ETHEREUM_HOSTS, l1ChainIdOption, parseOptionalInteger, pxeOption } from '../../utils/commands.js';
 
 export function injectCommands(program: Command, log: LogFn, debugLogger: Logger) {
   program
     .command('setup-protocol-contracts')
     .description('Bootstrap the blockchain by initializing all the protocol contracts')
     .addOption(pxeOption)
-    .addOption(l1ChainIdOption)
+    .option('--testAccounts', 'Deploy funded test accounts.')
     .option('--json', 'Output the contract addresses in JSON format')
     .option('--skipProofWait', "Don't wait for proofs to land.")
     .action(async options => {
-      const { setupProtocolContracts } = await import('./setup_protocol_contract.js');
-      await setupProtocolContracts(options.rpcUrl, options.l1ChainId, options.json, options.skipProofWait, log);
+      const { setupL2Contracts } = await import('./setup_l2_contract.js');
+      await setupL2Contracts(options.rpcUrl, options.testAccounts, options.json, options.skipProofWait, log);
     });
 
   program
@@ -22,10 +22,11 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
     .argument('<command>', 'Command to run: list, add, remove, who-next')
     .argument('[who]', 'Who to add/remove')
     .description('Manages or queries registered sequencers on the L1 rollup contract.')
-    .requiredOption(
-      '--l1-rpc-url <string>',
-      'Url of the ethereum host. Chain identifiers localhost and testnet can be used',
-      ETHEREUM_HOST,
+    .requiredOption<string[]>(
+      '--l1-rpc-urls <string>',
+      'List of Ethereum host URLs. Chain identifiers localhost and testnet can be used (comma separated)',
+      (arg: string) => arg.split(','),
+      [ETHEREUM_HOSTS],
     )
     .option(
       '-m, --mnemonic <string>',
@@ -42,7 +43,7 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
         who,
         mnemonic: options.mnemonic,
         rpcUrl: options.rpcUrl,
-        l1RpcUrl: options.l1RpcUrl,
+        l1RpcUrls: options.l1RpcUrls.split(','),
         chainId: options.l1ChainId,
         blockNumber: options.blockNumber,
         log,