@aztec/cli 2.1.0-rc.13 → 2.1.0-rc.16

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 '@spalladino/viem';
-import { mnemonicToAccount } from '@spalladino/viem/accounts';
+import { createPublicClient, createWalletClient, fallback, getContract, http } from 'viem';
+import { mnemonicToAccount } from '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 '@spalladino/viem/accounts';
+import { generatePrivateKey, privateKeyToAccount } from '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 '@spalladino/viem';
+import { createPublicClient, fallback, http } from '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 '@spalladino/viem';
+import { createPublicClient, fallback, getContract, http } from '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/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 '@spalladino/viem';
+import { getContract } from '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 '@spalladino/viem';
-import { generatePrivateKey, mnemonicToAccount, privateKeyToAccount } from '@spalladino/viem/accounts';
+import { encodeFunctionData, formatEther, getContract } from 'viem';
+import { generatePrivateKey, mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
 import { addLeadingHex } from '../../utils/aztec.js';
 export function generateL1Account() {
     const privateKey = generatePrivateKey();

package/dest/config/chain_l2_config.d.ts

@@ -30,7 +30,6 @@ export declare const stagingIgnitionL2ChainConfig: L2ChainConfig;
 export declare const stagingPublicL2ChainConfig: L2ChainConfig;
 export declare const testnetL2ChainConfig: L2ChainConfig;
 export declare const ignitionL2ChainConfig: L2ChainConfig;
-export declare function getBootnodes(networkName: NetworkNames, cacheDir?: string): Promise<any>;
-export declare function getL2ChainConfig(networkName: NetworkNames, cacheDir?: string): Promise<L2ChainConfig | undefined>;
-export declare function enrichEnvironmentWithChainConfig(networkName: NetworkNames): Promise<void>;
+export declare function getL2ChainConfig(networkName: NetworkNames): L2ChainConfig | undefined;
+export declare function enrichEnvironmentWithChainConfig(networkName: NetworkNames): void;
 //# sourceMappingURL=chain_l2_config.d.ts.map

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;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"}
+{"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,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAE7D,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;AAYrE,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;AAEF,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,YAAY,GAAG,aAAa,GAAG,SAAS,CAYrF;AAMD,wBAAgB,gCAAgC,CAAC,WAAW,EAAE,YAAY,QA2FzE"}

package/dest/config/chain_l2_config.js

@@ -1,10 +1,9 @@
 import { DefaultL1ContractsConfig } from '@aztec/ethereum';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import path, { join } from 'path';
+import path from 'path';
 import publicIncludeMetrics from '../../public_include_metric_prefixes.json' with {
     type: 'json'
 };
-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
@@ -257,16 +256,7 @@ export const ignitionL2ChainConfig = {
     slashExecuteRoundsLookBack: 4,
     ...DefaultNetworkDBMapSizeConfig
 };
-const BOOTNODE_CACHE_DURATION_MS = 60 * 60 * 1000; // 1 hour;
-export async function getBootnodes(networkName, cacheDir) {
-    const url = `http://static.aztec.network/${networkName}/bootnodes.json`;
-    const data = await cachedFetch(url, {
-        cacheDurationMs: BOOTNODE_CACHE_DURATION_MS,
-        cacheFile: cacheDir ? join(cacheDir, networkName, 'bootnodes.json') : undefined
-    });
-    return data?.bootnodes;
-}
-export async function getL2ChainConfig(networkName, cacheDir) {
+export function getL2ChainConfig(networkName) {
     let config;
     if (networkName === 'staging-public') {
         config = {
@@ -285,26 +275,17 @@ export async function getL2ChainConfig(networkName, cacheDir) {
             ...ignitionL2ChainConfig
         };
     }
-    if (!config) {
-        return undefined;
-    }
-    // If the bootnodes are not set, get them from the network
-    const bootnodeKey = 'BOOTSTRAP_NODES';
-    if (!process.env[bootnodeKey]) {
-        config.p2pBootstrapNodes = await getBootnodes(networkName, cacheDir);
-    }
     return config;
 }
 function getDefaultDataDir(networkName) {
     return path.join(process.env.HOME || '~', '.aztec', networkName, 'data');
 }
-export async function enrichEnvironmentWithChainConfig(networkName) {
+export function enrichEnvironmentWithChainConfig(networkName) {
     if (networkName === 'local') {
         return;
     }
     enrichVar('DATA_DIRECTORY', getDefaultDataDir(networkName));
-    const cacheDir = process.env.DATA_DIRECTORY ? join(process.env.DATA_DIRECTORY, 'cache') : undefined;
-    const config = await getL2ChainConfig(networkName, cacheDir);
+    const config = getL2ChainConfig(networkName);
     if (!config) {
         throw new Error(`Unknown network name: ${networkName}`);
     }

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('@spalladino/viem/accounts');
+    const { mnemonicToAccount, privateKeyToAccount } = await import('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('@spalladino/viem/accounts');
+    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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/cli",
-  "version": "2.1.0-rc.13",
+  "version": "2.1.0-rc.16",
   "type": "module",
   "exports": {
     "./contracts": "./dest/cmds/contracts/index.js",
@@ -70,30 +70,30 @@
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "2.1.0-rc.13",
-    "@aztec/aztec.js": "2.1.0-rc.13",
-    "@aztec/constants": "2.1.0-rc.13",
-    "@aztec/entrypoints": "2.1.0-rc.13",
-    "@aztec/ethereum": "2.1.0-rc.13",
-    "@aztec/foundation": "2.1.0-rc.13",
-    "@aztec/l1-artifacts": "2.1.0-rc.13",
-    "@aztec/node-lib": "2.1.0-rc.13",
-    "@aztec/p2p": "2.1.0-rc.13",
-    "@aztec/stdlib": "2.1.0-rc.13",
-    "@aztec/world-state": "2.1.0-rc.13",
+    "@aztec/archiver": "2.1.0-rc.16",
+    "@aztec/aztec.js": "2.1.0-rc.16",
+    "@aztec/constants": "2.1.0-rc.16",
+    "@aztec/entrypoints": "2.1.0-rc.16",
+    "@aztec/ethereum": "2.1.0-rc.16",
+    "@aztec/foundation": "2.1.0-rc.16",
+    "@aztec/l1-artifacts": "2.1.0-rc.16",
+    "@aztec/node-lib": "2.1.0-rc.16",
+    "@aztec/p2p": "2.1.0-rc.16",
+    "@aztec/stdlib": "2.1.0-rc.16",
+    "@aztec/world-state": "2.1.0-rc.16",
     "@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"
+    "tslib": "^2.4.0",
+    "viem": "npm:@spalladino/viem@2.38.2-eip7594.0"
   },
   "devDependencies": {
-    "@aztec/accounts": "2.1.0-rc.13",
-    "@aztec/protocol-contracts": "2.1.0-rc.13",
+    "@aztec/accounts": "2.1.0-rc.16",
+    "@aztec/protocol-contracts": "2.1.0-rc.16",
     "@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.13",
-    "@aztec/bb-prover": "2.1.0-rc.13",
-    "@aztec/ethereum": "2.1.0-rc.13",
-    "@aztec/l1-artifacts": "2.1.0-rc.13",
-    "@aztec/noir-contracts.js": "2.1.0-rc.13",
-    "@aztec/noir-protocol-circuits-types": "2.1.0-rc.13",
-    "@aztec/noir-test-contracts.js": "2.1.0-rc.13",
-    "@aztec/protocol-contracts": "2.1.0-rc.13",
-    "@aztec/stdlib": "2.1.0-rc.13"
+    "@aztec/accounts": "2.1.0-rc.16",
+    "@aztec/bb-prover": "2.1.0-rc.16",
+    "@aztec/ethereum": "2.1.0-rc.16",
+    "@aztec/l1-artifacts": "2.1.0-rc.16",
+    "@aztec/noir-contracts.js": "2.1.0-rc.16",
+    "@aztec/noir-protocol-circuits-types": "2.1.0-rc.16",
+    "@aztec/noir-test-contracts.js": "2.1.0-rc.16",
+    "@aztec/protocol-contracts": "2.1.0-rc.16",
+    "@aztec/stdlib": "2.1.0-rc.16"
   },
   "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 '@spalladino/viem';
-import { mnemonicToAccount } from '@spalladino/viem/accounts';
+import { createPublicClient, createWalletClient, fallback, getContract, http } from 'viem';
+import { mnemonicToAccount } from '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 '@spalladino/viem/accounts';
+import { generatePrivateKey, privateKeyToAccount } from '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 '@spalladino/viem';
+import { createPublicClient, fallback, http } from '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 '@spalladino/viem';
+import { createPublicClient, fallback, getContract, http } from 'viem';
 
 import { prettyPrintJSON } from '../../utils/commands.js';
 

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 '@spalladino/viem';
+import { getContract } from '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 '@spalladino/viem';
-import { generatePrivateKey, mnemonicToAccount, privateKeyToAccount } from '@spalladino/viem/accounts';
+import { encodeFunctionData, formatEther, getContract } from 'viem';
+import { generatePrivateKey, mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
 
 import { addLeadingHex } from '../../utils/aztec.js';
 

package/src/config/chain_l2_config.ts

@@ -1,14 +1,13 @@
 import { DefaultL1ContractsConfig, type L1ContractsConfig } from '@aztec/ethereum';
-import type { EnvVar, NetworkNames } from '@aztec/foundation/config';
+import type { NetworkNames } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import type { SharedNodeConfig } from '@aztec/node-lib/config';
 import type { P2PConfig } from '@aztec/p2p/config';
 import type { SlasherConfig } from '@aztec/stdlib/interfaces/server';
 
-import path, { join } from 'path';
+import path from 'path';
 
 import publicIncludeMetrics from '../../public_include_metric_prefixes.json' with { type: 'json' };
-import { cachedFetch } from './cached_fetch.js';
 import { enrichEthAddressVar, enrichVar } from './enrich_env.js';
 
 const SNAPSHOTS_URL = 'https://aztec-labs-snapshots.com';
@@ -363,22 +362,7 @@ export const ignitionL2ChainConfig: L2ChainConfig = {
   ...DefaultNetworkDBMapSizeConfig,
 };
 
-const BOOTNODE_CACHE_DURATION_MS = 60 * 60 * 1000; // 1 hour;
-
-export async function getBootnodes(networkName: NetworkNames, cacheDir?: string) {
-  const url = `http://static.aztec.network/${networkName}/bootnodes.json`;
-  const data = await cachedFetch(url, {
-    cacheDurationMs: BOOTNODE_CACHE_DURATION_MS,
-    cacheFile: cacheDir ? join(cacheDir, networkName, 'bootnodes.json') : undefined,
-  });
-
-  return data?.bootnodes;
-}
-
-export async function getL2ChainConfig(
-  networkName: NetworkNames,
-  cacheDir?: string,
-): Promise<L2ChainConfig | undefined> {
+export function getL2ChainConfig(networkName: NetworkNames): L2ChainConfig | undefined {
   let config: L2ChainConfig | undefined;
   if (networkName === 'staging-public') {
     config = { ...stagingPublicL2ChainConfig };
@@ -389,14 +373,6 @@ export async function getL2ChainConfig(
   } else if (networkName === 'ignition') {
     config = { ...ignitionL2ChainConfig };
   }
-  if (!config) {
-    return undefined;
-  }
-  // If the bootnodes are not set, get them from the network
-  const bootnodeKey: EnvVar = 'BOOTSTRAP_NODES';
-  if (!process.env[bootnodeKey]) {
-    config.p2pBootstrapNodes = await getBootnodes(networkName, cacheDir);
-  }
   return config;
 }
 
@@ -404,14 +380,13 @@ function getDefaultDataDir(networkName: NetworkNames): string {
   return path.join(process.env.HOME || '~', '.aztec', networkName, 'data');
 }
 
-export async function enrichEnvironmentWithChainConfig(networkName: NetworkNames) {
+export function enrichEnvironmentWithChainConfig(networkName: NetworkNames) {
   if (networkName === 'local') {
     return;
   }
 
   enrichVar('DATA_DIRECTORY', getDefaultDataDir(networkName));
-  const cacheDir = process.env.DATA_DIRECTORY ? join(process.env.DATA_DIRECTORY, 'cache') : undefined;
-  const config = await getL2ChainConfig(networkName, cacheDir);
+  const config = getL2ChainConfig(networkName);
 
   if (!config) {
     throw new Error(`Unknown network name: ${networkName}`);

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('@spalladino/viem/accounts');
+  const { mnemonicToAccount, privateKeyToAccount } = await import('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('@spalladino/viem/accounts');
+  const { mnemonicToAccount, privateKeyToAccount } = await import('viem/accounts');
   const { getVKTreeRoot } = await import('@aztec/noir-protocol-circuits-types/vk-tree');
 
   const account = !privateKey