@aztec/cli 2.1.0-rc.1 → 2.1.0-rc.10

package/dest/cmds/infrastructure/sequencers.js

@@ -1,8 +1,8 @@
 import { Fr, createCompatibleClient } from '@aztec/aztec.js';
 import { GSEContract, RollupContract, createEthereumChain, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
 import { RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';
-import { createPublicClient, createWalletClient, fallback, getContract, http } from 'viem';
-import { mnemonicToAccount } from 'viem/accounts';
+import { createPublicClient, createWalletClient, fallback, getContract, http } from '@spalladino/viem';
+import { mnemonicToAccount } from '@spalladino/viem/accounts';
 export async function sequencers(opts) {
     const { command, who: maybeWho, mnemonic, bn254SecretKey, rpcUrl, l1RpcUrls, chainId, log, debugLogger } = opts;
     const client = await createCompatibleClient(rpcUrl, debugLogger);

package/dest/cmds/l1/create_l1_account.js

@@ -1,4 +1,4 @@
-import { generatePrivateKey, privateKeyToAccount } from 'viem/accounts';
+import { generatePrivateKey, privateKeyToAccount } from '@spalladino/viem/accounts';
 import { prettyPrintJSON } from '../../utils/commands.js';
 export function createL1Account(json, log) {
     const privateKey = generatePrivateKey();

package/dest/cmds/l1/get_l1_addresses.js

@@ -1,5 +1,5 @@
 import { RegistryContract, createEthereumChain } from '@aztec/ethereum';
-import { createPublicClient, fallback, http } from 'viem';
+import { createPublicClient, fallback, http } from '@spalladino/viem';
 export async function getL1Addresses(registryAddress, rollupVersion, rpcUrls, chainId, json, log) {
     const chain = createEthereumChain(rpcUrls, chainId);
     const publicClient = createPublicClient({

package/dest/cmds/l1/get_l1_balance.js

@@ -1,6 +1,6 @@
 import { createEthereumChain } from '@aztec/ethereum';
 import { TestERC20Abi } from '@aztec/l1-artifacts';
-import { createPublicClient, fallback, getContract, http } from 'viem';
+import { createPublicClient, fallback, getContract, http } from '@spalladino/viem';
 import { prettyPrintJSON } from '../../utils/commands.js';
 export async function getL1Balance(who, token, l1RpcUrls, chainId, json, log) {
     const chain = createEthereumChain(l1RpcUrls, chainId);

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,KAAK,OAAO,EAAU,MAAM,WAAW,CAAC;AAcjD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAa3D,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,WAkhB/E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,KAAK,OAAO,EAAU,MAAM,WAAW,CAAC;AAcjD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAa3D,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,WAkf/E"}

package/dest/cmds/l1/index.js

@@ -194,23 +194,5 @@ export function injectCommands(program, log, debugLogger) {
         const { advanceEpoch } = await import('./advance_epoch.js');
         await advanceEpoch(options.l1RpcUrls, options.rpcUrl, log);
     });
-    program.command('prover-stats', {
-        hidden: true
-    }).addOption(l1RpcUrlsOption).addOption(l1ChainIdOption).option('--start-block <number>', 'The L1 block number to start from', parseBigint, 1n).option('--end-block <number>', 'The last L1 block number to query', parseBigint).option('--batch-size <number>', 'The number of blocks to query in each batch', parseBigint, 100n).option('--proving-timeout <number>', 'Cutoff for proving time to consider a block', parseBigint).option('--l1-rollup-address <string>', 'Address of the rollup contract (required if node URL is not set)').option('--node-url <string>', 'JSON RPC URL of an Aztec node to retrieve the rollup contract address (required if L1 rollup address is not set)').option('--raw-logs', 'Output raw logs instead of aggregated stats').action(async (options)=>{
-        const { proverStats } = await import('./prover_stats.js');
-        const { l1RpcUrls, chainId, l1RollupAddress, startBlock, endBlock, batchSize, nodeUrl, provingTimeout, rawLogs } = options;
-        await proverStats({
-            l1RpcUrls,
-            chainId,
-            l1RollupAddress,
-            startBlock,
-            endBlock,
-            batchSize,
-            nodeUrl,
-            provingTimeout,
-            rawLogs,
-            log
-        });
-    });
     return program;
 }

package/dest/cmds/l1/prover_stats.js

@@ -5,9 +5,9 @@ import { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
 import { RollupAbi } from '@aztec/l1-artifacts';
 import { createAztecNodeClient } from '@aztec/stdlib/interfaces/client';
+import { createPublicClient, fallback, getAbiItem, getAddress, http } from '@spalladino/viem';
 import chunk from 'lodash.chunk';
 import groupBy from 'lodash.groupby';
-import { createPublicClient, fallback, getAbiItem, getAddress, http } from 'viem';
 export async function proverStats(opts) {
     const debugLog = createLogger('cli:prover_stats');
     const { startBlock, chainId, l1RpcUrls, l1RollupAddress, batchSize, nodeUrl, provingTimeout, endBlock, rawLogs, log } = opts;

package/dest/cmds/l1/trigger_seed_snapshot.js

@@ -1,6 +1,6 @@
 import { createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
 import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
-import { getContract } from 'viem';
+import { getContract } from '@spalladino/viem';
 export async function triggerSeedSnapshot({ rpcUrls, chainId, privateKey, mnemonic, rollupAddress, log }) {
     const chain = createEthereumChain(rpcUrls, chainId);
     const client = createExtendedL1Client(rpcUrls, privateKey ?? mnemonic, chain.chainInfo);

package/dest/cmds/l1/update_l1_validators.js

@@ -2,8 +2,8 @@ import { GSEContract, RollupContract, createEthereumChain, createExtendedL1Clien
 import { EthCheatCodes } from '@aztec/ethereum/test';
 import { RollupAbi, StakingAssetHandlerAbi } from '@aztec/l1-artifacts';
 import { ZkPassportProofParams } from '@aztec/stdlib/zkpassport';
-import { encodeFunctionData, formatEther, getContract } from 'viem';
-import { generatePrivateKey, mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
+import { encodeFunctionData, formatEther, getContract } from '@spalladino/viem';
+import { generatePrivateKey, mnemonicToAccount, privateKeyToAccount } from '@spalladino/viem/accounts';
 import { addLeadingHex } from '../../utils/aztec.js';
 export function generateL1Account() {
     const privateKey = generatePrivateKey();
@@ -34,7 +34,9 @@ export async function addL1Validator({ rpcUrls, chainId, privateKey, mnemonic, a
     const gseAddress = await rollup.read.getGSE();
     const gse = new GSEContract(l1Client, gseAddress);
     const registrationTuple = await gse.makeRegistrationTuple(blsSecretKey);
-    const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, debugLogger);
+    const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, {
+        logger: debugLogger
+    });
     const proofParamsObj = ZkPassportProofParams.fromBuffer(proofParams);
     const merkleProofArray = merkleProof.map((proof)=>addLeadingHex(proof));
     const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
@@ -88,7 +90,9 @@ export async function addL1ValidatorViaRollup({ rpcUrls, chainId, privateKey, mn
     const gseAddress = await rollup.read.getGSE();
     const gse = new GSEContract(l1Client, gseAddress);
     const registrationTuple = await gse.makeRegistrationTuple(blsSecretKey);
-    const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, debugLogger);
+    const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, {
+        logger: debugLogger
+    });
     const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
         to: rollupAddress.toString(),
         data: encodeFunctionData({
@@ -128,7 +132,9 @@ export async function removeL1Validator({ rpcUrls, chainId, privateKey, mnemonic
     const account = getAccount(privateKey, mnemonic);
     const chain = createEthereumChain(rpcUrls, chainId);
     const l1Client = createExtendedL1Client(rpcUrls, account, chain.chainInfo);
-    const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, debugLogger);
+    const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, {
+        logger: debugLogger
+    });
     dualLog(`Removing validator ${validatorAddress.toString()} from rollup ${rollupAddress.toString()}`);
     const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
         to: rollupAddress.toString(),
@@ -148,7 +154,9 @@ export async function pruneRollup({ rpcUrls, chainId, privateKey, mnemonic, roll
     const account = getAccount(privateKey, mnemonic);
     const chain = createEthereumChain(rpcUrls, chainId);
     const l1Client = createExtendedL1Client(rpcUrls, account, chain.chainInfo);
-    const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, debugLogger);
+    const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, {
+        logger: debugLogger
+    });
     dualLog(`Trying prune`);
     const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
         to: rollupAddress.toString(),
@@ -208,7 +216,7 @@ export async function debugRollup({ rpcUrls, chainId, rollupAddress, log }) {
     log(`Committee: ${committee?.map((v)=>v.toString()).join(', ')}`);
     const archive = await rollup.archive();
     log(`Archive: ${archive}`);
-    const epochNum = await rollup.getEpochNumber();
+    const epochNum = await rollup.getCurrentEpochNumber();
     log(`Current epoch: ${epochNum}`);
     const slot = await rollup.getSlotNumber();
     log(`Current slot: ${slot}`);

package/dest/config/chain_l2_config.d.ts

@@ -12,7 +12,7 @@ export type L2ChainConfig = L1ContractsConfig & Pick<P2PConfig, 'txPoolDeleteTxs
     seqMinTxsPerBlock: number;
     seqMaxTxsPerBlock: number;
     realProofs: boolean;
-    snapshotsUrl: string;
+    snapshotsUrls: string[];
     autoUpdate: SharedNodeConfig['autoUpdate'];
     autoUpdateUrl?: string;
     maxTxPoolSize: number;

package/dest/config/chain_l2_config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chain_l2_config.d.ts","sourceRoot":"","sources":["../../src/config/chain_l2_config.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnF,OAAO,KAAK,EAAU,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAErE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAWrE,MAAM,MAAM,aAAa,GAAG,iBAAiB,GAC3C,IAAI,CAAC,SAAS,EAAE,2BAA2B,CAAC,GAC5C,IAAI,CAAC,aAAa,EAAE,sBAAsB,GAAG,uBAAuB,CAAC,GAAG;IACtE,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC;IAIpC,WAAW,EAAE,MAAM,CAAC;IACpB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,uBAAuB,EAAE,MAAM,CAAC;IAGhC,eAAe,EAAE,OAAO,CAAC;CAC1B,CAAC;AA+CJ,eAAO,MAAM,4BAA4B,EAAE,aA+E1C,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,aAmDxC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aAsDlC,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,aA+EnC,CAAC;AAIF,wBAAsB,YAAY,CAAC,WAAW,EAAE,YAAY,EAAE,QAAQ,CAAC,EAAE,MAAM,gBAQ9E;AAED,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,YAAY,EACzB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAoBpC;AAMD,wBAAsB,gCAAgC,CAAC,WAAW,EAAE,YAAY,iBA4F/E"}
+{"version":3,"file":"chain_l2_config.d.ts","sourceRoot":"","sources":["../../src/config/chain_l2_config.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnF,OAAO,KAAK,EAAU,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAErE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAarE,MAAM,MAAM,aAAa,GAAG,iBAAiB,GAC3C,IAAI,CAAC,SAAS,EAAE,2BAA2B,CAAC,GAC5C,IAAI,CAAC,aAAa,EAAE,sBAAsB,GAAG,uBAAuB,CAAC,GAAG;IACtE,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,UAAU,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC;IAIpC,WAAW,EAAE,MAAM,CAAC;IACpB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,uBAAuB,EAAE,MAAM,CAAC;IAGhC,eAAe,EAAE,OAAO,CAAC;CAC1B,CAAC;AA+CJ,eAAO,MAAM,4BAA4B,EAAE,aA+E1C,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,aAmDxC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aAsDlC,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,aA+EnC,CAAC;AAIF,wBAAsB,YAAY,CAAC,WAAW,EAAE,YAAY,EAAE,QAAQ,CAAC,EAAE,MAAM,gBAQ9E;AAED,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,YAAY,EACzB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAoBpC;AAMD,wBAAsB,gCAAgC,CAAC,WAAW,EAAE,YAAY,iBA4F/E"}

package/dest/config/chain_l2_config.js

@@ -6,6 +6,7 @@ import publicIncludeMetrics from '../../public_include_metric_prefixes.json' wit
 };
 import { cachedFetch } from './cached_fetch.js';
 import { enrichEthAddressVar, enrichVar } from './enrich_env.js';
+const SNAPSHOTS_URL = 'https://aztec-labs-snapshots.com';
 const defaultDBMapSizeKb = 128 * 1_024 * 1_024; // 128 GB
 const tbMapSizeKb = 1_024 * 1_024 * 1_024; // 1 TB
 const DefaultSlashConfig = {
@@ -52,7 +53,9 @@ export const stagingIgnitionL2ChainConfig = {
     seqMinTxsPerBlock: 0,
     seqMaxTxsPerBlock: 0,
     realProofs: true,
-    snapshotsUrl: 'https://storage.googleapis.com/aztec-testnet/snapshots/staging-ignition/',
+    snapshotsUrls: [
+        `${SNAPSHOTS_URL}/staging-ignition/`
+    ],
     autoUpdate: 'config-and-version',
     autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/staging-ignition.json',
     maxTxPoolSize: 100_000_000,
@@ -116,7 +119,9 @@ export const stagingPublicL2ChainConfig = {
     seqMinTxsPerBlock: 0,
     seqMaxTxsPerBlock: 20,
     realProofs: true,
-    snapshotsUrl: 'https://storage.googleapis.com/aztec-testnet/snapshots/staging-public/',
+    snapshotsUrls: [
+        `${SNAPSHOTS_URL}/staging-public/`
+    ],
     autoUpdate: 'config-and-version',
     autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/staging-public.json',
     publicIncludeMetrics,
@@ -153,7 +158,9 @@ export const testnetL2ChainConfig = {
     seqMinTxsPerBlock: 0,
     seqMaxTxsPerBlock: 20,
     realProofs: true,
-    snapshotsUrl: 'https://storage.googleapis.com/aztec-testnet/snapshots/testnet/',
+    snapshotsUrls: [
+        `${SNAPSHOTS_URL}/testnet/`
+    ],
     autoUpdate: 'config-and-version',
     autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/testnet.json',
     maxTxPoolSize: 100_000_000,
@@ -193,7 +200,9 @@ export const ignitionL2ChainConfig = {
     seqMinTxsPerBlock: 0,
     seqMaxTxsPerBlock: 0,
     realProofs: true,
-    snapshotsUrl: 'https://storage.googleapis.com/aztec-testnet/snapshots/ignition/',
+    snapshotsUrls: [
+        `${SNAPSHOTS_URL}/ignition/`
+    ],
     autoUpdate: 'notify',
     autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/ignition.json',
     maxTxPoolSize: 100_000_000,
@@ -308,7 +317,7 @@ export async function enrichEnvironmentWithChainConfig(networkName) {
     enrichVar('SEQ_MAX_TX_PER_BLOCK', config.seqMaxTxsPerBlock.toString());
     enrichVar('PROVER_REAL_PROOFS', config.realProofs.toString());
     enrichVar('PXE_PROVER_ENABLED', config.realProofs.toString());
-    enrichVar('SYNC_SNAPSHOTS_URL', config.snapshotsUrl);
+    enrichVar('SYNC_SNAPSHOTS_URLS', config.snapshotsUrls.join(','));
     enrichVar('P2P_MAX_TX_POOL_SIZE', config.maxTxPoolSize.toString());
     enrichVar('DATA_STORE_MAP_SIZE_KB', config.dbMapSizeKb.toString());
     enrichVar('ARCHIVER_STORE_MAP_SIZE_KB', config.archiverStoreMapSizeKb.toString());

package/dest/config/network_config.js

@@ -71,7 +71,7 @@ const NETWORK_CONFIG_CACHE_DURATION_MS = 60 * 60 * 1000; // 1 hour
     }
     enrichVar('BOOTSTRAP_NODES', networkConfig.bootnodes.join(','));
     enrichVar('L1_CHAIN_ID', String(networkConfig.l1ChainId));
-    enrichVar('SYNC_SNAPSHOTS_URL', networkConfig.snapshots.join(','));
+    enrichVar('SYNC_SNAPSHOTS_URLS', networkConfig.snapshots.join(','));
     enrichEthAddressVar('REGISTRY_CONTRACT_ADDRESS', networkConfig.registryAddress.toString());
     if (networkConfig.feeAssetHandlerAddress) {
         enrichEthAddressVar('FEE_ASSET_HANDLER_CONTRACT_ADDRESS', networkConfig.feeAssetHandlerAddress.toString());

package/dest/utils/aztec.js

@@ -27,7 +27,7 @@ import { encodeArgs } from './encoding.js';
  * @param mnemonic - The mnemonic to be used in contract deployment.
  */ export async function deployAztecContracts(rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidators, genesisArchiveRoot, feeJuicePortalInitialBalance, acceleratedTestDeployments, config, existingToken, realVerifier, createVerificationJson, debugLogger) {
     const { createEthereumChain, deployL1Contracts } = await import('@aztec/ethereum');
-    const { mnemonicToAccount, privateKeyToAccount } = await import('viem/accounts');
+    const { mnemonicToAccount, privateKeyToAccount } = await import('@spalladino/viem/accounts');
     const account = !privateKey ? mnemonicToAccount(mnemonic, {
         addressIndex: mnemonicIndex
     }) : privateKeyToAccount(addLeadingHex(privateKey));
@@ -49,7 +49,7 @@ import { encodeArgs } from './encoding.js';
 }
 export async function deployNewRollupContracts(registryAddress, rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidators, genesisArchiveRoot, feeJuicePortalInitialBalance, config, realVerifier, logger) {
     const { createEthereumChain, deployRollupForUpgrade, createExtendedL1Client } = await import('@aztec/ethereum');
-    const { mnemonicToAccount, privateKeyToAccount } = await import('viem/accounts');
+    const { mnemonicToAccount, privateKeyToAccount } = await import('@spalladino/viem/accounts');
     const { getVKTreeRoot } = await import('@aztec/noir-protocol-circuits-types/vk-tree');
     const account = !privateKey ? mnemonicToAccount(mnemonic, {
         addressIndex: mnemonicIndex

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/cli",
-  "version": "2.1.0-rc.1",
+  "version": "2.1.0-rc.10",
   "type": "module",
   "exports": {
     "./contracts": "./dest/cmds/contracts/index.js",
@@ -70,30 +70,30 @@
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "2.1.0-rc.1",
-    "@aztec/aztec.js": "2.1.0-rc.1",
-    "@aztec/constants": "2.1.0-rc.1",
-    "@aztec/entrypoints": "2.1.0-rc.1",
-    "@aztec/ethereum": "2.1.0-rc.1",
-    "@aztec/foundation": "2.1.0-rc.1",
-    "@aztec/l1-artifacts": "2.1.0-rc.1",
-    "@aztec/node-lib": "2.1.0-rc.1",
-    "@aztec/p2p": "2.1.0-rc.1",
-    "@aztec/stdlib": "2.1.0-rc.1",
-    "@aztec/world-state": "2.1.0-rc.1",
+    "@aztec/archiver": "2.1.0-rc.10",
+    "@aztec/aztec.js": "2.1.0-rc.10",
+    "@aztec/constants": "2.1.0-rc.10",
+    "@aztec/entrypoints": "2.1.0-rc.10",
+    "@aztec/ethereum": "2.1.0-rc.10",
+    "@aztec/foundation": "2.1.0-rc.10",
+    "@aztec/l1-artifacts": "2.1.0-rc.10",
+    "@aztec/node-lib": "2.1.0-rc.10",
+    "@aztec/p2p": "2.1.0-rc.10",
+    "@aztec/stdlib": "2.1.0-rc.10",
+    "@aztec/world-state": "2.1.0-rc.10",
     "@iarna/toml": "^2.2.5",
     "@libp2p/peer-id-factory": "^3.0.4",
+    "@spalladino/viem": "2.38.2-eip7594.0",
     "commander": "^12.1.0",
     "lodash.chunk": "^4.2.0",
     "lodash.groupby": "^4.6.0",
     "semver": "^7.5.4",
     "source-map-support": "^0.5.21",
-    "tslib": "^2.4.0",
-    "viem": "2.23.7"
+    "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@aztec/accounts": "2.1.0-rc.1",
-    "@aztec/protocol-contracts": "2.1.0-rc.1",
+    "@aztec/accounts": "2.1.0-rc.10",
+    "@aztec/protocol-contracts": "2.1.0-rc.10",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/lodash.chunk": "^4.2.9",
@@ -109,15 +109,15 @@
     "typescript": "^5.3.3"
   },
   "peerDependencies": {
-    "@aztec/accounts": "2.1.0-rc.1",
-    "@aztec/bb-prover": "2.1.0-rc.1",
-    "@aztec/ethereum": "2.1.0-rc.1",
-    "@aztec/l1-artifacts": "2.1.0-rc.1",
-    "@aztec/noir-contracts.js": "2.1.0-rc.1",
-    "@aztec/noir-protocol-circuits-types": "2.1.0-rc.1",
-    "@aztec/noir-test-contracts.js": "2.1.0-rc.1",
-    "@aztec/protocol-contracts": "2.1.0-rc.1",
-    "@aztec/stdlib": "2.1.0-rc.1"
+    "@aztec/accounts": "2.1.0-rc.10",
+    "@aztec/bb-prover": "2.1.0-rc.10",
+    "@aztec/ethereum": "2.1.0-rc.10",
+    "@aztec/l1-artifacts": "2.1.0-rc.10",
+    "@aztec/noir-contracts.js": "2.1.0-rc.10",
+    "@aztec/noir-protocol-circuits-types": "2.1.0-rc.10",
+    "@aztec/noir-test-contracts.js": "2.1.0-rc.10",
+    "@aztec/protocol-contracts": "2.1.0-rc.10",
+    "@aztec/stdlib": "2.1.0-rc.10"
   },
   "files": [
     "dest",

package/src/cmds/infrastructure/sequencers.ts

@@ -3,8 +3,8 @@ import { GSEContract, RollupContract, createEthereumChain, getL1ContractsConfigE
 import type { LogFn, Logger } from '@aztec/foundation/log';
 import { RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';
 
-import { createPublicClient, createWalletClient, fallback, getContract, http } from 'viem';
-import { mnemonicToAccount } from 'viem/accounts';
+import { createPublicClient, createWalletClient, fallback, getContract, http } from '@spalladino/viem';
+import { mnemonicToAccount } from '@spalladino/viem/accounts';
 
 export async function sequencers(opts: {
   command: 'list' | 'add' | 'remove' | 'who-next' | 'flush';

package/src/cmds/l1/create_l1_account.ts

@@ -1,6 +1,6 @@
 import type { LogFn } from '@aztec/foundation/log';
 
-import { generatePrivateKey, privateKeyToAccount } from 'viem/accounts';
+import { generatePrivateKey, privateKeyToAccount } from '@spalladino/viem/accounts';
 
 import { prettyPrintJSON } from '../../utils/commands.js';
 

package/src/cmds/l1/get_l1_addresses.ts

@@ -2,7 +2,7 @@ import { EthAddress } from '@aztec/aztec.js';
 import { RegistryContract, type ViemPublicClient, createEthereumChain } from '@aztec/ethereum';
 import type { LogFn } from '@aztec/foundation/log';
 
-import { createPublicClient, fallback, http } from 'viem';
+import { createPublicClient, fallback, http } from '@spalladino/viem';
 
 export async function getL1Addresses(
   registryAddress: EthAddress,

package/src/cmds/l1/get_l1_balance.ts

@@ -3,7 +3,7 @@ import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { LogFn } from '@aztec/foundation/log';
 import { TestERC20Abi } from '@aztec/l1-artifacts';
 
-import { createPublicClient, fallback, getContract, http } from 'viem';
+import { createPublicClient, fallback, getContract, http } from '@spalladino/viem';
 
 import { prettyPrintJSON } from '../../utils/commands.js';
 

package/src/cmds/l1/index.ts

@@ -525,37 +525,5 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
       await advanceEpoch(options.l1RpcUrls, options.rpcUrl, log);
     });
 
-  program
-    .command('prover-stats', { hidden: true })
-    .addOption(l1RpcUrlsOption)
-    .addOption(l1ChainIdOption)
-    .option('--start-block <number>', 'The L1 block number to start from', parseBigint, 1n)
-    .option('--end-block <number>', 'The last L1 block number to query', parseBigint)
-    .option('--batch-size <number>', 'The number of blocks to query in each batch', parseBigint, 100n)
-    .option('--proving-timeout <number>', 'Cutoff for proving time to consider a block', parseBigint)
-    .option('--l1-rollup-address <string>', 'Address of the rollup contract (required if node URL is not set)')
-    .option(
-      '--node-url <string>',
-      'JSON RPC URL of an Aztec node to retrieve the rollup contract address (required if L1 rollup address is not set)',
-    )
-    .option('--raw-logs', 'Output raw logs instead of aggregated stats')
-    .action(async options => {
-      const { proverStats } = await import('./prover_stats.js');
-      const { l1RpcUrls, chainId, l1RollupAddress, startBlock, endBlock, batchSize, nodeUrl, provingTimeout, rawLogs } =
-        options;
-      await proverStats({
-        l1RpcUrls,
-        chainId,
-        l1RollupAddress,
-        startBlock,
-        endBlock,
-        batchSize,
-        nodeUrl,
-        provingTimeout,
-        rawLogs,
-        log,
-      });
-    });
-
   return program;
 }

package/src/cmds/l1/prover_stats.ts

@@ -6,9 +6,9 @@ import { type LogFn, type Logger, createLogger } from '@aztec/foundation/log';
 import { RollupAbi } from '@aztec/l1-artifacts';
 import { createAztecNodeClient } from '@aztec/stdlib/interfaces/client';
 
+import { createPublicClient, fallback, getAbiItem, getAddress, http } from '@spalladino/viem';
 import chunk from 'lodash.chunk';
 import groupBy from 'lodash.groupby';
-import { createPublicClient, fallback, getAbiItem, getAddress, http } from 'viem';
 
 export async function proverStats(opts: {
   l1RpcUrls: string[];

package/src/cmds/l1/trigger_seed_snapshot.ts

@@ -2,7 +2,7 @@ import { createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
 import type { LogFn } from '@aztec/foundation/log';
 import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
 
-import { getContract } from 'viem';
+import { getContract } from '@spalladino/viem';
 
 import type { RollupCommandArgs } from './update_l1_validators.js';
 

package/src/cmds/l1/update_l1_validators.ts

@@ -14,8 +14,8 @@ import type { LogFn, Logger } from '@aztec/foundation/log';
 import { RollupAbi, StakingAssetHandlerAbi } from '@aztec/l1-artifacts';
 import { ZkPassportProofParams } from '@aztec/stdlib/zkpassport';
 
-import { encodeFunctionData, formatEther, getContract } from 'viem';
-import { generatePrivateKey, mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
+import { encodeFunctionData, formatEther, getContract } from '@spalladino/viem';
+import { generatePrivateKey, mnemonicToAccount, privateKeyToAccount } from '@spalladino/viem/accounts';
 
 import { addLeadingHex } from '../../utils/aztec.js';
 
@@ -96,7 +96,7 @@ export async function addL1Validator({
 
   const registrationTuple = await gse.makeRegistrationTuple(blsSecretKey);
 
-  const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, debugLogger);
+  const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, { logger: debugLogger });
   const proofParamsObj = ZkPassportProofParams.fromBuffer(proofParams);
   const merkleProofArray = merkleProof.map(proof => addLeadingHex(proof));
 
@@ -172,7 +172,7 @@ export async function addL1ValidatorViaRollup({
 
   const registrationTuple = await gse.makeRegistrationTuple(blsSecretKey);
 
-  const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, debugLogger);
+  const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, { logger: debugLogger });
 
   const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
     to: rollupAddress.toString(),
@@ -219,7 +219,7 @@ export async function removeL1Validator({
   const account = getAccount(privateKey, mnemonic);
   const chain = createEthereumChain(rpcUrls, chainId);
   const l1Client = createExtendedL1Client(rpcUrls, account, chain.chainInfo);
-  const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, debugLogger);
+  const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, { logger: debugLogger });
 
   dualLog(`Removing validator ${validatorAddress.toString()} from rollup ${rollupAddress.toString()}`);
   const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
@@ -246,7 +246,7 @@ export async function pruneRollup({
   const account = getAccount(privateKey, mnemonic);
   const chain = createEthereumChain(rpcUrls, chainId);
   const l1Client = createExtendedL1Client(rpcUrls, account, chain.chainInfo);
-  const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, debugLogger);
+  const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, { logger: debugLogger });
 
   dualLog(`Trying prune`);
   const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
@@ -308,7 +308,7 @@ export async function debugRollup({ rpcUrls, chainId, rollupAddress, log }: Roll
   log(`Committee: ${committee?.map(v => v.toString()).join(', ')}`);
   const archive = await rollup.archive();
   log(`Archive: ${archive}`);
-  const epochNum = await rollup.getEpochNumber();
+  const epochNum = await rollup.getCurrentEpochNumber();
   log(`Current epoch: ${epochNum}`);
   const slot = await rollup.getSlotNumber();
   log(`Current slot: ${slot}`);

package/src/config/chain_l2_config.ts

@@ -11,6 +11,8 @@ import publicIncludeMetrics from '../../public_include_metric_prefixes.json' wit
 import { cachedFetch } from './cached_fetch.js';
 import { enrichEthAddressVar, enrichVar } from './enrich_env.js';
 
+const SNAPSHOTS_URL = 'https://aztec-labs-snapshots.com';
+
 const defaultDBMapSizeKb = 128 * 1_024 * 1_024; // 128 GB
 const tbMapSizeKb = 1_024 * 1_024 * 1_024; // 1 TB
 
@@ -25,7 +27,7 @@ export type L2ChainConfig = L1ContractsConfig &
     seqMinTxsPerBlock: number;
     seqMaxTxsPerBlock: number;
     realProofs: boolean;
-    snapshotsUrl: string;
+    snapshotsUrls: string[];
     autoUpdate: SharedNodeConfig['autoUpdate'];
     autoUpdateUrl?: string;
     maxTxPoolSize: number;
@@ -99,7 +101,7 @@ export const stagingIgnitionL2ChainConfig: L2ChainConfig = {
   seqMinTxsPerBlock: 0,
   seqMaxTxsPerBlock: 0,
   realProofs: true,
-  snapshotsUrl: 'https://storage.googleapis.com/aztec-testnet/snapshots/staging-ignition/',
+  snapshotsUrls: [`${SNAPSHOTS_URL}/staging-ignition/`],
   autoUpdate: 'config-and-version',
   autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/staging-ignition.json',
   maxTxPoolSize: 100_000_000, // 100MB
@@ -180,7 +182,7 @@ export const stagingPublicL2ChainConfig: L2ChainConfig = {
   seqMinTxsPerBlock: 0,
   seqMaxTxsPerBlock: 20,
   realProofs: true,
-  snapshotsUrl: 'https://storage.googleapis.com/aztec-testnet/snapshots/staging-public/',
+  snapshotsUrls: [`${SNAPSHOTS_URL}/staging-public/`],
   autoUpdate: 'config-and-version',
   autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/staging-public.json',
   publicIncludeMetrics,
@@ -233,7 +235,7 @@ export const testnetL2ChainConfig: L2ChainConfig = {
   seqMinTxsPerBlock: 0,
   seqMaxTxsPerBlock: 20,
   realProofs: true,
-  snapshotsUrl: 'https://storage.googleapis.com/aztec-testnet/snapshots/testnet/',
+  snapshotsUrls: [`${SNAPSHOTS_URL}/testnet/`],
   autoUpdate: 'config-and-version',
   autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/testnet.json',
   maxTxPoolSize: 100_000_000, // 100MB
@@ -289,7 +291,7 @@ export const ignitionL2ChainConfig: L2ChainConfig = {
   seqMinTxsPerBlock: 0,
   seqMaxTxsPerBlock: 0,
   realProofs: true,
-  snapshotsUrl: 'https://storage.googleapis.com/aztec-testnet/snapshots/ignition/',
+  snapshotsUrls: [`${SNAPSHOTS_URL}/ignition/`],
   autoUpdate: 'notify',
   autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/ignition.json',
   maxTxPoolSize: 100_000_000, // 100MB
@@ -424,7 +426,7 @@ export async function enrichEnvironmentWithChainConfig(networkName: NetworkNames
   enrichVar('SEQ_MAX_TX_PER_BLOCK', config.seqMaxTxsPerBlock.toString());
   enrichVar('PROVER_REAL_PROOFS', config.realProofs.toString());
   enrichVar('PXE_PROVER_ENABLED', config.realProofs.toString());
-  enrichVar('SYNC_SNAPSHOTS_URL', config.snapshotsUrl);
+  enrichVar('SYNC_SNAPSHOTS_URLS', config.snapshotsUrls.join(','));
   enrichVar('P2P_MAX_TX_POOL_SIZE', config.maxTxPoolSize.toString());
 
   enrichVar('DATA_STORE_MAP_SIZE_KB', config.dbMapSizeKb.toString());

package/src/config/network_config.ts

@@ -93,7 +93,7 @@ export async function enrichEnvironmentWithNetworkConfig(networkName: NetworkNam
 
   enrichVar('BOOTSTRAP_NODES', networkConfig.bootnodes.join(','));
   enrichVar('L1_CHAIN_ID', String(networkConfig.l1ChainId));
-  enrichVar('SYNC_SNAPSHOTS_URL', networkConfig.snapshots.join(','));
+  enrichVar('SYNC_SNAPSHOTS_URLS', networkConfig.snapshots.join(','));
 
   enrichEthAddressVar('REGISTRY_CONTRACT_ADDRESS', networkConfig.registryAddress.toString());
   if (networkConfig.feeAssetHandlerAddress) {

package/src/utils/aztec.ts

@@ -63,7 +63,7 @@ export async function deployAztecContracts(
   debugLogger: Logger,
 ): Promise<DeployL1ContractsReturnType> {
   const { createEthereumChain, deployL1Contracts } = await import('@aztec/ethereum');
-  const { mnemonicToAccount, privateKeyToAccount } = await import('viem/accounts');
+  const { mnemonicToAccount, privateKeyToAccount } = await import('@spalladino/viem/accounts');
 
   const account = !privateKey
     ? mnemonicToAccount(mnemonic!, { addressIndex: mnemonicIndex })
@@ -112,7 +112,7 @@ export async function deployNewRollupContracts(
   logger: Logger,
 ): Promise<{ rollup: RollupContract; slashFactoryAddress: EthAddress }> {
   const { createEthereumChain, deployRollupForUpgrade, createExtendedL1Client } = await import('@aztec/ethereum');
-  const { mnemonicToAccount, privateKeyToAccount } = await import('viem/accounts');
+  const { mnemonicToAccount, privateKeyToAccount } = await import('@spalladino/viem/accounts');
   const { getVKTreeRoot } = await import('@aztec/noir-protocol-circuits-types/vk-tree');
 
   const account = !privateKey

package/dest/cmds/devnet/bootstrap_network.d.ts

@@ -1,3 +0,0 @@
-import type { LogFn, Logger } from '@aztec/foundation/log';
-export declare function bootstrapNetwork(pxeUrl: string, l1Urls: string[], l1ChainId: string, l1PrivateKey: `0x${string}` | undefined, l1Mnemonic: string, addressIndex: number, json: boolean, log: LogFn, debugLog: Logger): Promise<void>;
-//# sourceMappingURL=bootstrap_network.d.ts.map

package/dest/cmds/devnet/bootstrap_network.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"bootstrap_network.d.ts","sourceRoot":"","sources":["../../../src/cmds/devnet/bootstrap_network.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAqB3D,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EAAE,EAChB,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,KAAK,MAAM,EAAE,GAAG,SAAS,EACvC,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,OAAO,EACb,GAAG,EAAE,KAAK,EACV,QAAQ,EAAE,MAAM,iBAkFjB"}