@aztec/cli 2.0.3 → 2.1.0-rc.10

package/src/config/network_config.ts

@@ -0,0 +1,102 @@
+import { type NetworkConfig, NetworkConfigMapSchema, type NetworkNames } from '@aztec/foundation/config';
+
+import { readFile } from 'fs/promises';
+import { join } from 'path';
+
+import { cachedFetch } from './cached_fetch.js';
+import { enrichEthAddressVar, enrichVar } from './enrich_env.js';
+
+const DEFAULT_CONFIG_URL =
+  'https://raw.githubusercontent.com/AztecProtocol/networks/refs/heads/main/network_config.json';
+const NETWORK_CONFIG_CACHE_DURATION_MS = 60 * 60 * 1000; // 1 hour
+
+/**
+ * Fetches remote network configuration from GitHub with caching support.
+ * Uses the reusable cachedFetch utility.
+ *
+ * @param networkName - The network name to fetch config for
+ * @param cacheDir - Optional cache directory for storing fetched config
+ * @returns Remote configuration for the specified network, or undefined if not found/error
+ */
+export async function getNetworkConfig(
+  networkName: NetworkNames,
+  cacheDir?: string,
+): Promise<NetworkConfig | undefined> {
+  let url: URL | undefined;
+  const configLocation = process.env.NETWORK_CONFIG_LOCATION || DEFAULT_CONFIG_URL;
+
+  if (!configLocation) {
+    return undefined;
+  }
+
+  try {
+    if (configLocation.includes('://')) {
+      url = new URL(configLocation);
+    } else {
+      url = new URL(`file://${configLocation}`);
+    }
+  } catch {
+    /* no-op */
+  }
+
+  if (!url) {
+    return undefined;
+  }
+
+  try {
+    let rawConfig: any;
+
+    if (url.protocol === 'http:' || url.protocol === 'https:') {
+      rawConfig = await cachedFetch(url.href, {
+        cacheDurationMs: NETWORK_CONFIG_CACHE_DURATION_MS,
+        cacheFile: cacheDir ? join(cacheDir, networkName, 'network_config.json') : undefined,
+      });
+    } else if (url.protocol === 'file:') {
+      rawConfig = JSON.parse(await readFile(url.pathname, 'utf-8'));
+    } else {
+      throw new Error('Unsupported Aztec network config protocol: ' + url.href);
+    }
+
+    if (!rawConfig) {
+      return undefined;
+    }
+
+    const networkConfigMap = NetworkConfigMapSchema.parse(rawConfig);
+    if (networkName in networkConfigMap) {
+      return networkConfigMap[networkName];
+    } else {
+      return undefined;
+    }
+  } catch {
+    return undefined;
+  }
+}
+
+/**
+ * Enriches environment variables with remote network configuration.
+ * This function is called before node config initialization to set env vars
+ * from the remote config, following the same pattern as enrichEnvironmentWithChainConfig().
+ *
+ * @param networkName - The network name to fetch remote config for
+ */
+export async function enrichEnvironmentWithNetworkConfig(networkName: NetworkNames) {
+  if (networkName === 'local') {
+    return; // No remote config for local development
+  }
+
+  const cacheDir = process.env.DATA_DIRECTORY ? join(process.env.DATA_DIRECTORY, 'cache') : undefined;
+  const networkConfig = await getNetworkConfig(networkName, cacheDir);
+
+  if (!networkConfig) {
+    return;
+  }
+
+  enrichVar('BOOTSTRAP_NODES', networkConfig.bootnodes.join(','));
+  enrichVar('L1_CHAIN_ID', String(networkConfig.l1ChainId));
+  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/src/utils/aztec.ts

@@ -57,12 +57,13 @@ export async function deployAztecContracts(
   feeJuicePortalInitialBalance: bigint,
   acceleratedTestDeployments: boolean,
   config: L1ContractsConfig,
+  existingToken: EthAddress | undefined,
   realVerifier: boolean,
   createVerificationJson: string | false,
   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 })
@@ -85,6 +86,7 @@ export async function deployAztecContracts(
       acceleratedTestDeployments,
       feeJuicePortalInitialBalance,
       realVerifier,
+      existingTokenAddress: existingToken,
       ...config,
     },
     config,
@@ -110,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"}

package/dest/cmds/devnet/bootstrap_network.js

@@ -1,216 +0,0 @@
-import { getInitialTestAccountsManagers } from '@aztec/accounts/testing';
-import { BatchCall, Fr, L1FeeJuicePortalManager, createCompatibleClient, retryUntil, waitForProven } from '@aztec/aztec.js';
-import { createEthereumChain, createExtendedL1Client, deployL1Contract } from '@aztec/ethereum';
-import { getContract } from 'viem';
-import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
-const waitOpts = {
-    timeout: 120,
-    interval: 1
-};
-const provenWaitOpts = {
-    provenTimeout: 4800,
-    interval: 1
-};
-export async function bootstrapNetwork(pxeUrl, l1Urls, l1ChainId, l1PrivateKey, l1Mnemonic, addressIndex, json, log, debugLog) {
-    const pxe = await createCompatibleClient(pxeUrl, debugLog);
-    // We assume here that the initial test accounts were prefunded with deploy-l1-contracts, and deployed with setup-l2-contracts
-    // so all we need to do is register them to our pxe.
-    const [accountManager] = await getInitialTestAccountsManagers(pxe);
-    await accountManager.register();
-    const wallet = await accountManager.getWallet();
-    const defaultAccountAddress = wallet.getAddress();
-    const l1Client = createExtendedL1Client(l1Urls, l1PrivateKey ? privateKeyToAccount(l1PrivateKey) : // Note that this account needs to be funded on L1 !
-    mnemonicToAccount(l1Mnemonic, {
-        addressIndex
-    }), createEthereumChain(l1Urls, +l1ChainId).chainInfo);
-    const { erc20Address, portalAddress } = await deployERC20(l1Client);
-    const { token, bridge } = await deployToken(wallet, defaultAccountAddress, portalAddress);
-    await initPortal(pxe, l1Client, erc20Address, portalAddress, bridge.address);
-    const fpcAdmin = wallet.getAddress();
-    const fpc = await deployFPC(wallet, defaultAccountAddress, token.address, fpcAdmin);
-    const counter = await deployCounter(wallet, defaultAccountAddress);
-    await fundFPC(pxe, counter.address, wallet, defaultAccountAddress, l1Client, fpc.address, debugLog);
-    if (json) {
-        log(JSON.stringify({
-            devCoinL1: erc20Address.toString(),
-            devCoinPortalL1: portalAddress.toString(),
-            devCoin: {
-                address: token.address.toString(),
-                initHash: token.initHash.toString(),
-                salt: token.salt.toString()
-            },
-            devCoinBridge: {
-                address: bridge.address.toString(),
-                initHash: bridge.initHash.toString(),
-                salt: bridge.salt.toString()
-            },
-            devCoinFpc: {
-                address: fpc.address.toString(),
-                initHash: fpc.initHash.toString(),
-                salt: fpc.salt.toString()
-            },
-            counter: {
-                address: counter.address.toString(),
-                initHash: counter.initHash.toString(),
-                salt: counter.salt.toString()
-            }
-        }, null, 2));
-    } else {
-        log(`DevCoin L1: ${erc20Address}`);
-        log(`DevCoin L1 Portal: ${portalAddress}`);
-        log(`DevCoin L2: ${token.address}`);
-        log(`DevCoin L2 init hash: ${token.initHash}`);
-        log(`DevCoin L2 salt: ${token.salt}`);
-        log(`DevCoin L2 Bridge: ${bridge.address}`);
-        log(`DevCoin L2 Bridge init hash: ${bridge.initHash}`);
-        log(`DevCoin L2 Bridge salt: ${bridge.salt}`);
-        log(`DevCoin FPC: ${fpc.address}`);
-        log(`DevCoin FPC init hash: ${fpc.initHash}`);
-        log(`DevCoin FPC salt: ${fpc.salt}`);
-        log(`Counter: ${counter.address}`);
-        log(`Counter init hash: ${counter.initHash}`);
-        log(`Counter salt: ${counter.salt}`);
-    }
-}
-/**
- * Step 1. Deploy the L1 contracts, but don't initialize
- */ async function deployERC20(l1Client) {
-    const { TestERC20Abi, TestERC20Bytecode, TokenPortalAbi, TokenPortalBytecode } = await import('@aztec/l1-artifacts');
-    const erc20 = {
-        name: 'TestERC20',
-        contractAbi: TestERC20Abi,
-        contractBytecode: TestERC20Bytecode
-    };
-    const portal = {
-        name: 'TokenPortal',
-        contractAbi: TokenPortalAbi,
-        contractBytecode: TokenPortalBytecode
-    };
-    const { address: erc20Address } = await deployL1Contract(l1Client, erc20.contractAbi, erc20.contractBytecode, [
-        'DevCoin',
-        'DEV',
-        l1Client.account.address
-    ]);
-    const { address: portalAddress } = await deployL1Contract(l1Client, portal.contractAbi, portal.contractBytecode);
-    return {
-        erc20Address,
-        portalAddress
-    };
-}
-/**
- * Step 2. Deploy the L2 contracts
- */ async function deployToken(wallet, defaultAccountAddress, l1Portal) {
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore - Importing noir-contracts.js even in devDeps results in a circular dependency error. Need to ignore because this line doesn't cause an error in a dev environment
-    const { TokenContract } = await import('@aztec/noir-contracts.js/Token');
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore - Importing noir-contracts.js even in devDeps results in a circular dependency error. Need to ignore because this line doesn't cause an error in a dev environment
-    const { TokenBridgeContract } = await import('@aztec/noir-contracts.js/TokenBridge');
-    const devCoin = await TokenContract.deploy(wallet, defaultAccountAddress, 'DevCoin', 'DEV', 18).send({
-        from: defaultAccountAddress,
-        universalDeploy: true
-    }).deployed(waitOpts);
-    const bridge = await TokenBridgeContract.deploy(wallet, devCoin.address, l1Portal).send({
-        from: defaultAccountAddress,
-        universalDeploy: true
-    }).deployed(waitOpts);
-    await new BatchCall(wallet, [
-        devCoin.methods.set_minter(bridge.address, true),
-        devCoin.methods.set_admin(bridge.address)
-    ]).send({
-        from: defaultAccountAddress
-    }).wait(waitOpts);
-    return {
-        token: {
-            address: devCoin.address,
-            initHash: devCoin.instance.initializationHash,
-            salt: devCoin.instance.salt
-        },
-        bridge: {
-            address: bridge.address,
-            initHash: bridge.instance.initializationHash,
-            salt: bridge.instance.salt
-        }
-    };
-}
-/**
- * Step 3. Initialize DevCoin's L1 portal
- */ async function initPortal(pxe, l1Client, erc20, portal, bridge) {
-    const { TokenPortalAbi } = await import('@aztec/l1-artifacts');
-    const { l1ContractAddresses: { registryAddress } } = await pxe.getNodeInfo();
-    const contract = getContract({
-        abi: TokenPortalAbi,
-        address: portal.toString(),
-        client: l1Client
-    });
-    const hash = await contract.write.initialize([
-        registryAddress.toString(),
-        erc20.toString(),
-        bridge.toString()
-    ]);
-    await l1Client.waitForTransactionReceipt({
-        hash
-    });
-}
-async function deployFPC(wallet, defaultAccountAddress, tokenAddress, admin) {
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore - Importing noir-contracts.js even in devDeps results in a circular dependency error. Need to ignore because this line doesn't cause an error in a dev environment
-    const { FPCContract } = await import('@aztec/noir-contracts.js/FPC');
-    const fpc = await FPCContract.deploy(wallet, tokenAddress, admin).send({
-        from: defaultAccountAddress,
-        universalDeploy: true
-    }).deployed(waitOpts);
-    const info = {
-        address: fpc.address,
-        initHash: fpc.instance.initializationHash,
-        salt: fpc.instance.salt
-    };
-    return info;
-}
-async function deployCounter(wallet, defaultAccountAddress) {
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore - Importing noir-contracts.js even in devDeps results in a circular dependency error. Need to ignore because this line doesn't cause an error in a dev environment
-    const { CounterContract } = await import('@aztec/noir-test-contracts.js/Counter');
-    const counter = await CounterContract.deploy(wallet, 1, defaultAccountAddress).send({
-        from: defaultAccountAddress,
-        universalDeploy: true
-    }).deployed(waitOpts);
-    const info = {
-        address: counter.address,
-        initHash: counter.instance.initializationHash,
-        salt: counter.instance.salt
-    };
-    return info;
-}
-// NOTE: Disabling for now in order to get devnet running
-async function fundFPC(pxe, counterAddress, wallet, defaultAccountAddress, l1Client, fpcAddress, debugLog) {
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore - Importing noir-contracts.js even in devDeps results in a circular dependency error. Need to ignore because this line doesn't cause an error in a dev environment
-    const { FeeJuiceContract } = await import('@aztec/noir-contracts.js/FeeJuice');
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore - Importing noir-contracts.js even in devDeps results in a circular dependency error. Need to ignore because this line doesn't cause an error in a dev environment
-    const { CounterContract } = await import('@aztec/noir-test-contracts.js/Counter');
-    const { protocolContractAddresses: { feeJuice } } = await wallet.getPXEInfo();
-    const feeJuiceContract = await FeeJuiceContract.at(feeJuice, wallet);
-    const feeJuicePortal = await L1FeeJuicePortalManager.new(wallet, l1Client, debugLog);
-    const { claimAmount, claimSecret, messageLeafIndex, messageHash } = await feeJuicePortal.bridgeTokensPublic(fpcAddress, undefined, true);
-    await retryUntil(async ()=>await pxe.isL1ToL2MessageSynced(Fr.fromHexString(messageHash)), 'message sync', 600, 1);
-    const counter = await CounterContract.at(counterAddress, wallet);
-    debugLog.info('Incrementing Counter');
-    // TODO (alexg) remove this once sequencer builds blocks continuously
-    // advance the chain
-    await counter.methods.increment(wallet.getAddress()).send({
-        from: defaultAccountAddress
-    }).wait(waitOpts);
-    await counter.methods.increment(wallet.getAddress()).send({
-        from: defaultAccountAddress
-    }).wait(waitOpts);
-    debugLog.info('Claiming FPC');
-    const receipt = await feeJuiceContract.methods.claim(fpcAddress, claimAmount, claimSecret, messageLeafIndex).send({
-        from: defaultAccountAddress
-    }).wait({
-        ...waitOpts
-    });
-    await waitForProven(pxe, receipt, provenWaitOpts);
-    debugLog.info('Finished claiming FPC');
-}

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

@@ -1,4 +0,0 @@
-import type { EthAddress } from '@aztec/foundation/eth-address';
-import type { LogFn } from '@aztec/foundation/log';
-export declare function dripFaucet(faucetUrl: string, asset: string, account: EthAddress, json: boolean, log: LogFn): Promise<void>;
-//# sourceMappingURL=faucet.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"faucet.d.ts","sourceRoot":"","sources":["../../../src/cmds/devnet/faucet.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAInD,wBAAsB,UAAU,CAC9B,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,UAAU,EACnB,IAAI,EAAE,OAAO,EACb,GAAG,EAAE,KAAK,GACT,OAAO,CAAC,IAAI,CAAC,CAqBf"}

package/dest/cmds/devnet/faucet.js

@@ -1,26 +0,0 @@
-import { prettyPrintJSON } from '../../utils/commands.js';
-export async function dripFaucet(faucetUrl, asset, account, json, log) {
-    const url = new URL(`/drip/${account.toString()}`, faucetUrl);
-    url.searchParams.set('asset', asset);
-    const res = await fetch(url);
-    if (res.status === 200) {
-        if (json) {
-            log(prettyPrintJSON({
-                ok: true
-            }));
-        } else {
-            log(`Dripped ${asset} for ${account.toString()}`);
-        }
-    } else {
-        if (json) {
-            log(prettyPrintJSON({
-                ok: false
-            }));
-        } else if (res.status === 429) {
-            log(`Rate limited when dripping ${asset} for ${account.toString()}`);
-        } else {
-            log(`Failed to drip ${asset} for ${account.toString()}`);
-        }
-        process.exit(1);
-    }
-}

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

@@ -1,4 +0,0 @@
-import type { LogFn, Logger } from '@aztec/foundation/log';
-import type { Command } from 'commander';
-export declare function injectCommands(program: Command, log: LogFn, debugLogger: Logger): Command;
-//# sourceMappingURL=index.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmds/devnet/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIzC,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,WAqD/E"}

package/dest/cmds/devnet/index.js

@@ -1,14 +0,0 @@
-import { ETHEREUM_HOSTS, l1ChainIdOption, parseEthereumAddress, pxeOption } from '../../utils/commands.js';
-export function injectCommands(program, log, debugLogger) {
-    program.command('bootstrap-network').description('Bootstrap a new network').addOption(pxeOption).addOption(l1ChainIdOption).requiredOption('--l1-rpc-urls <string>', 'List of Ethereum host URLs. Chain identifiers localhost and testnet can be used (comma separated)', (arg)=>arg.split(','), [
-        ETHEREUM_HOSTS
-    ]).option('--l1-private-key <string>', 'The private key to use for deployment', process.env.PRIVATE_KEY).option('-m, --mnemonic <string>', '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.l1RpcUrls, options[l1ChainIdOption.attributeName()], options.l1PrivateKey, options.mnemonic, options.addressIndex, options.json, log, debugLogger);
-    });
-    program.command('drip-faucet').description('Drip the faucet').requiredOption('-u, --faucet-url <string>', 'Url of the faucet', 'http://localhost:8082').requiredOption('-t, --token <string>', 'The asset to drip', 'eth').requiredOption('-a, --address <string>', 'The Ethereum address to drip to', parseEthereumAddress).option('--json', 'Output the result as JSON').action(async (options)=>{
-        const { dripFaucet } = await import('./faucet.js');
-        await dripFaucet(options.faucetUrl, options.token, options.address, options.json, log);
-    });
-    return program;
-}