@aztec/cli 0.0.0-test.1 → 0.0.1-fake-ceab37513c

package/src/utils/aztec.ts

@@ -1,11 +1,22 @@
-import type { EthAddress, PXE } from '@aztec/aztec.js';
-import { type ContractArtifact, type FunctionArtifact, loadContractArtifact } from '@aztec/aztec.js/abi';
-import type { DeployL1ContractsReturnType, L1ContractsConfig, RollupContract } from '@aztec/ethereum';
-import type { Fr } from '@aztec/foundation/fields';
+import { EthAddress, type PXE } from '@aztec/aztec.js';
+import {
+  type ContractArtifact,
+  type FunctionAbi,
+  FunctionType,
+  getAllFunctionAbis,
+  loadContractArtifact,
+} from '@aztec/aztec.js/abi';
+import {
+  type DeployL1ContractsReturnType,
+  type L1ContractsConfig,
+  type Operator,
+  RollupContract,
+} from '@aztec/ethereum';
+import { SecretValue } from '@aztec/foundation/config';
+import { Fr } from '@aztec/foundation/fields';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 import type { NoirPackageConfig } from '@aztec/foundation/noir';
-import { ProtocolContractAddress, protocolContractTreeRoot } from '@aztec/protocol-contracts';
-import { FunctionType } from '@aztec/stdlib/abi';
+import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
 
 import TOML from '@iarna/toml';
 import { readFile } from 'fs/promises';
@@ -19,8 +30,8 @@ import { encodeArgs } from './encoding.js';
  * @param fnName - Function name to be found.
  * @returns The function's ABI.
  */
-export function getFunctionArtifact(artifact: ContractArtifact, fnName: string): FunctionArtifact {
-  const fn = artifact.functions.find(({ name }) => name === fnName);
+export function getFunctionAbi(artifact: ContractArtifact, fnName: string): FunctionAbi {
+  const fn = getAllFunctionAbis(artifact).find(({ name }) => name === fnName);
   if (!fn) {
     throw Error(`Function ${fnName} not found in contract ABI.`);
   }
@@ -41,11 +52,14 @@ export async function deployAztecContracts(
   mnemonic: string,
   mnemonicIndex: number,
   salt: number | undefined,
-  initialValidators: EthAddress[],
+  initialValidators: Operator[],
   genesisArchiveRoot: Fr,
-  genesisBlockHash: Fr,
+  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');
@@ -53,29 +67,33 @@ export async function deployAztecContracts(
 
   const account = !privateKey
     ? mnemonicToAccount(mnemonic!, { addressIndex: mnemonicIndex })
-    : privateKeyToAccount(`${privateKey.startsWith('0x') ? '' : '0x'}${privateKey}` as `0x${string}`);
+    : privateKeyToAccount(addLeadingHex(privateKey));
   const chain = createEthereumChain(rpcUrls, chainId);
 
   const { getVKTreeRoot } = await import('@aztec/noir-protocol-circuits-types/vk-tree');
 
-  return await deployL1Contracts(
+  const result = await deployL1Contracts(
     chain.rpcUrls,
     account,
     chain.chainInfo,
     debugLogger,
     {
-      l2FeeJuiceAddress: ProtocolContractAddress.FeeJuice.toField(),
       vkTreeRoot: getVKTreeRoot(),
       protocolContractTreeRoot,
       genesisArchiveRoot,
-      genesisBlockHash,
       salt,
       initialValidators,
       acceleratedTestDeployments,
+      feeJuicePortalInitialBalance,
+      realVerifier,
+      existingTokenAddress: existingToken,
       ...config,
     },
     config,
+    createVerificationJson,
   );
+
+  return result;
 }
 
 export async function deployNewRollupContracts(
@@ -86,40 +104,59 @@ export async function deployNewRollupContracts(
   mnemonic: string,
   mnemonicIndex: number,
   salt: number | undefined,
-  initialValidators: EthAddress[],
+  initialValidators: Operator[],
   genesisArchiveRoot: Fr,
-  genesisBlockHash: Fr,
+  feeJuicePortalInitialBalance: bigint,
   config: L1ContractsConfig,
+  realVerifier: boolean,
+  createVerificationJson: string | false,
   logger: Logger,
-): Promise<{ payloadAddress: EthAddress; rollup: RollupContract }> {
-  const { createEthereumChain, deployRollupAndPeriphery, createL1Clients } = await import('@aztec/ethereum');
+): Promise<{ rollup: RollupContract; slashFactoryAddress: EthAddress }> {
+  const { createEthereumChain, deployRollupForUpgrade, createExtendedL1Client } = await import('@aztec/ethereum');
   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 })
-    : privateKeyToAccount(`${privateKey.startsWith('0x') ? '' : '0x'}${privateKey}` as `0x${string}`);
+    : privateKeyToAccount(addLeadingHex(privateKey));
   const chain = createEthereumChain(rpcUrls, chainId);
-  const clients = createL1Clients(rpcUrls, account, chain.chainInfo, mnemonicIndex);
+  const client = createExtendedL1Client(rpcUrls, account, chain.chainInfo, undefined, mnemonicIndex);
+
+  if (!initialValidators || initialValidators.length === 0) {
+    // initialize the new rollup with Amin's validator address.
+    const aminAddressString = '0x3b218d0F26d15B36C715cB06c949210a0d630637';
+    const amin = EthAddress.fromString(aminAddressString);
 
-  const { payloadAddress, rollup } = await deployRollupAndPeriphery(
-    clients,
+    initialValidators = [
+      {
+        attester: amin,
+        withdrawer: amin,
+        // No secrets here. The actual keys are not currently used.
+        bn254SecretKey: new SecretValue(Fr.fromHexString(aminAddressString).toBigInt()),
+      },
+    ];
+    logger.info('Initializing new rollup with old attesters', { initialValidators });
+  }
+
+  const { rollup, slashFactoryAddress } = await deployRollupForUpgrade(
+    client,
     {
       salt,
       vkTreeRoot: getVKTreeRoot(),
       protocolContractTreeRoot,
-      l2FeeJuiceAddress: ProtocolContractAddress.FeeJuice.toField(),
       genesisArchiveRoot,
-      genesisBlockHash,
       initialValidators,
+      feeJuicePortalInitialBalance,
+      realVerifier,
       ...config,
     },
     registryAddress,
     logger,
     config,
+    createVerificationJson,
   );
 
-  return { payloadAddress, rollup };
+  return { rollup, slashFactoryAddress };
 }
 
 /**
@@ -178,7 +215,7 @@ export async function getContractArtifact(fileDir: string, log: LogFn) {
  */
 export async function prepTx(contractFile: string, functionName: string, _functionArgs: string[], log: LogFn) {
   const contractArtifact = await getContractArtifact(contractFile, log);
-  const functionArtifact = getFunctionArtifact(contractArtifact, functionName);
+  const functionArtifact = getFunctionAbi(contractArtifact, functionName);
   const functionArgs = encodeArgs(_functionArgs, functionArtifact.parameters);
   const isPrivate = functionArtifact.functionType === FunctionType.PRIVATE;
 
@@ -190,7 +227,7 @@ export async function prepTx(contractFile: string, functionName: string, _functi
  * @param hex - A hex string
  * @returns A new string with leading 0x removed
  */
-export const stripLeadingHex = (hex: string) => {
+export const stripLeadingHex = (hex: string): string => {
   if (hex.length > 2 && hex.startsWith('0x')) {
     return hex.substring(2);
   }
@@ -198,6 +235,18 @@ export const stripLeadingHex = (hex: string) => {
 };
 
 /**
+ * Adds a leading 0x to a hex string. If a leading 0x is already present the string is returned unchanged.
+ * @param hex - A hex string
+ * @returns A new string with leading 0x added
+ */
+export const addLeadingHex = (hex: string): `0x${string}` => {
+  if (hex.length > 2 && hex.startsWith('0x')) {
+    return hex as `0x${string}`;
+  }
+  return `0x${hex}`;
+};
+
+/*
  * Pretty prints Nargo.toml contents to a string
  * @param config - Nargo.toml contents
  * @returns The Nargo.toml contents as a string

package/src/utils/commands.ts

@@ -22,7 +22,7 @@ export const getLocalhost = () =>
     .catch(() => 'localhost');
 
 export const LOCALHOST = await getLocalhost();
-export const { ETHEREUM_HOSTS = `http://${LOCALHOST}:8545`, PRIVATE_KEY, API_KEY, CLI_VERSION } = process.env;
+export const { ETHEREUM_HOSTS = `http://${LOCALHOST}:8545`, PRIVATE_KEY, MNEMONIC, API_KEY, CLI_VERSION } = process.env;
 
 export function addOptions(program: Command, options: Option[]) {
   options.forEach(option => program.addOption(option));
@@ -287,7 +287,7 @@ export function parsePublicKey(publicKey: string): PublicKeys | undefined {
   }
   try {
     return PublicKeys.fromString(publicKey);
-  } catch (err) {
+  } catch {
     throw new InvalidArgumentError(`Invalid public key: ${publicKey}`);
   }
 }
@@ -301,7 +301,7 @@ export function parsePublicKey(publicKey: string): PublicKeys | undefined {
 export function parsePartialAddress(address: string): Fr {
   try {
     return Fr.fromHexString(address);
-  } catch (err) {
+  } catch {
     throw new InvalidArgumentError(`Invalid partial address: ${address}`);
   }
 }
@@ -315,7 +315,7 @@ export function parsePartialAddress(address: string): Fr {
 export function parseSecretKey(secretKey: string): Fr {
   try {
     return Fr.fromHexString(secretKey);
-  } catch (err) {
+  } catch {
     throw new InvalidArgumentError(`Invalid encryption secret key: ${secretKey}`);
   }
 }
@@ -348,7 +348,7 @@ export function parseField(field: string): Fr {
     }
 
     return new Fr(BigInt(field));
-  } catch (err) {
+  } catch {
     throw new InvalidArgumentError(`Invalid field: ${field}`);
   }
 }

package/src/utils/encoding.ts

@@ -35,7 +35,7 @@ function encodeArg(arg: string, abiType: AbiType, name: string): any {
     let res: bigint;
     try {
       res = BigInt(arg);
-    } catch (err) {
+    } catch {
       throw new Error(
         `Invalid value passed for ${name}. Could not parse ${arg} as a${kind === 'integer' ? 'n' : ''} ${kind}.`,
       );

package/src/utils/github.ts

@@ -1,3 +1,2 @@
 export const GITHUB_OWNER = 'AztecProtocol';
 export const GITHUB_REPO = 'aztec-packages';
-export const GITHUB_TAG_PREFIX = 'aztec-packages';

package/src/utils/index.ts

@@ -2,3 +2,4 @@ export * from './commands.js';
 export * from './aztec.js';
 export * from './encoding.js';
 export * from './github.js';
+export * from './setup_contracts.js';

package/src/utils/inspect.ts

@@ -3,7 +3,7 @@ import type { LogFn } from '@aztec/foundation/log';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { siloNullifier } from '@aztec/stdlib/hash';
 import type { PXE } from '@aztec/stdlib/interfaces/client';
-import { type ExtendedNote, NoteStatus } from '@aztec/stdlib/note';
+import type { ExtendedNote } from '@aztec/stdlib/note';
 import type { TxHash } from '@aztec/stdlib/tx';
 
 export async function inspectBlock(pxe: PXE, blockNumber: number, log: LogFn, opts: { showTxs?: boolean } = {}) {
@@ -18,11 +18,11 @@ export async function inspectBlock(pxe: PXE, blockNumber: number, log: LogFn, op
   log(` Total fees: ${block.header.totalFees.toBigInt()}`);
   log(` Total mana used: ${block.header.totalManaUsed.toBigInt()}`);
   log(
-    ` Fee per gas unit: DA=${block.header.globalVariables.gasFees.feePerDaGas.toBigInt()} L2=${block.header.globalVariables.gasFees.feePerL2Gas.toBigInt()}`,
+    ` Fee per gas unit: DA=${block.header.globalVariables.gasFees.feePerDaGas} L2=${block.header.globalVariables.gasFees.feePerL2Gas}`,
   );
   log(` Coinbase: ${block.header.globalVariables.coinbase}`);
   log(` Fee recipient: ${block.header.globalVariables.feeRecipient}`);
-  log(` Timestamp: ${new Date(block.header.globalVariables.timestamp.toNumber() * 500)}`);
+  log(` Timestamp: ${new Date(Number(block.header.globalVariables.timestamp) * 500)}`);
   if (opts.showTxs) {
     log(``);
     const artifactMap = await getKnownArtifacts(pxe);
@@ -40,11 +40,7 @@ export async function inspectTx(
   log: LogFn,
   opts: { includeBlockInfo?: boolean; artifactMap?: ArtifactMap } = {},
 ) {
-  const [receipt, effectsInBlock, getNotes] = await Promise.all([
-    pxe.getTxReceipt(txHash),
-    pxe.getTxEffect(txHash),
-    pxe.getNotes({ txHash, status: NoteStatus.ACTIVE_OR_NULLIFIED }),
-  ]);
+  const [receipt, effectsInBlock] = await Promise.all([pxe.getTxReceipt(txHash), pxe.getTxEffect(txHash)]);
   // Base tx data
   log(`Tx ${txHash.toString()}`);
   log(` Status: ${receipt.status} ${effectsInBlock ? `(${effectsInBlock.data.revertCode.getDescription()})` : ''}`);
@@ -88,12 +84,9 @@ export async function inspectTx(
   const notes = effects.noteHashes;
   if (notes.length > 0) {
     log(' Created notes:');
-    log(`  Total: ${notes.length}. Found: ${getNotes.length}.`);
-    if (getNotes.length) {
-      log('  Found notes:');
-      for (const note of getNotes) {
-        inspectNote(note, artifactMap, log);
-      }
+    log(`  Total: ${notes.length}`);
+    for (const note of notes) {
+      log(`  Note hash: ${note.toShortString()}`);
     }
   }
 
@@ -103,8 +96,10 @@ export async function inspectTx(
   if (nullifierCount > 0) {
     log(' Nullifiers:');
     for (const nullifier of effects.nullifiers) {
-      const [note] = await pxe.getNotes({ siloedNullifier: nullifier });
       const deployed = deployNullifiers[nullifier.toString()];
+      const note = deployed
+        ? (await pxe.getNotes({ siloedNullifier: nullifier, contractAddress: deployed }))[0]
+        : undefined;
       const initialized = initNullifiers[nullifier.toString()];
       const registered = classNullifiers[nullifier.toString()];
       if (nullifier.toBuffer().equals(txHash.toBuffer())) {
@@ -142,9 +137,8 @@ export async function inspectTx(
 function inspectNote(note: ExtendedNote, artifactMap: ArtifactMap, log: LogFn, text = 'Note') {
   const artifact = artifactMap[note.contractAddress.toString()];
   const contract = artifact?.name ?? note.contractAddress.toString();
-  const type = artifact?.notes[note.noteTypeId.toString()]?.typ ?? note.noteTypeId.toField().toShortString();
-  log(`  ${text} type ${type} at ${contract}`);
-  log(`    Owner: ${toFriendlyAddress(note.owner, artifactMap)}`);
+  log(`  ${text} at ${contract}`);
+  log(`    Recipient: ${toFriendlyAddress(note.recipient, artifactMap)}`);
   for (const field of note.note.items) {
     log(`    ${field.toString()}`);
   }
@@ -161,19 +155,18 @@ function toFriendlyAddress(address: AztecAddress, artifactMap: ArtifactMap) {
 
 async function getKnownNullifiers(pxe: PXE, artifactMap: ArtifactMap) {
   const knownContracts = await pxe.getContracts();
-  const deployerAddress = ProtocolContractAddress.ContractInstanceDeployer;
-  const registererAddress = ProtocolContractAddress.ContractClassRegisterer;
+  const deployerAddress = ProtocolContractAddress.ContractInstanceRegistry;
+  const classRegistryAddress = ProtocolContractAddress.ContractClassRegistry;
   const initNullifiers: Record<string, AztecAddress> = {};
   const deployNullifiers: Record<string, AztecAddress> = {};
   const classNullifiers: Record<string, string> = {};
   for (const contract of knownContracts) {
-    initNullifiers[siloNullifier(contract, contract.toField()).toString()] = contract;
-    deployNullifiers[siloNullifier(deployerAddress, contract.toField()).toString()] = contract;
+    initNullifiers[(await siloNullifier(contract, contract.toField())).toString()] = contract;
+    deployNullifiers[(await siloNullifier(deployerAddress, contract.toField())).toString()] = contract;
   }
   for (const artifact of Object.values(artifactMap)) {
-    classNullifiers[
-      siloNullifier(registererAddress, artifact.classId).toString()
-    ] = `${artifact.name}Class<${artifact.classId}>`;
+    classNullifiers[(await siloNullifier(classRegistryAddress, artifact.classId)).toString()] =
+      `${artifact.name}Class<${artifact.classId}>`;
   }
   return { initNullifiers, deployNullifiers, classNullifiers };
 }

package/src/utils/setup_contracts.ts

@@ -0,0 +1,58 @@
+import {
+  AztecAddress,
+  DefaultWaitOpts,
+  Fr,
+  type PXE,
+  SignerlessWallet,
+  SponsoredFeePaymentMethod,
+  type WaitForProvenOpts,
+  getContractInstanceFromInstantiationParams,
+  waitForProven,
+} from '@aztec/aztec.js';
+import { SPONSORED_FPC_SALT } from '@aztec/constants';
+import { DefaultMultiCallEntrypoint } from '@aztec/entrypoints/multicall';
+import type { LogFn } from '@aztec/foundation/log';
+
+async function getSponsoredFPCContract() {
+  // 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 { SponsoredFPCContract } = await import('@aztec/noir-contracts.js/SponsoredFPC');
+  return SponsoredFPCContract;
+}
+
+export async function getSponsoredFPCAddress() {
+  const SponsoredFPCContract = await getSponsoredFPCContract();
+  const sponsoredFPCInstance = await getContractInstanceFromInstantiationParams(SponsoredFPCContract.artifact, {
+    salt: new Fr(SPONSORED_FPC_SALT),
+  });
+  return sponsoredFPCInstance.address;
+}
+
+export async function setupSponsoredFPC(
+  pxe: PXE,
+  log: LogFn,
+  waitOpts = DefaultWaitOpts,
+  waitForProvenOptions?: WaitForProvenOpts,
+) {
+  const SponsoredFPCContract = await getSponsoredFPCContract();
+  const address = await getSponsoredFPCAddress();
+  const paymentMethod = new SponsoredFeePaymentMethod(address);
+  const { l1ChainId: chainId, rollupVersion } = await pxe.getNodeInfo();
+
+  const deployer = new SignerlessWallet(pxe, new DefaultMultiCallEntrypoint(chainId, rollupVersion));
+
+  const deployTx = SponsoredFPCContract.deploy(deployer).send({
+    from: AztecAddress.ZERO,
+    contractAddressSalt: new Fr(SPONSORED_FPC_SALT),
+    universalDeploy: true,
+    fee: { paymentMethod },
+  });
+
+  const deployed = await deployTx.deployed(waitOpts);
+
+  if (waitForProvenOptions !== undefined) {
+    await waitForProven(pxe, await deployTx.getReceipt(), waitForProvenOptions);
+  }
+
+  log(`SponsoredFPC: ${deployed.address}`);
+}

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":"AAqBA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAiB3D,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,iBA4EjB"}

package/dest/cmds/devnet/bootstrap_network.js

@@ -1,196 +0,0 @@
-import { getDeployedTestAccountsWallets } from '@aztec/accounts/testing';
-import { BatchCall, Fr, L1FeeJuicePortalManager, createCompatibleClient, retryUntil } from '@aztec/aztec.js';
-import { FEE_FUNDING_FOR_TESTER_ACCOUNT } from '@aztec/constants';
-import { createEthereumChain, createL1Clients, deployL1Contract } from '@aztec/ethereum';
-import { getContract } from 'viem';
-import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
-const waitOpts = {
-    timeout: 120,
-    provenTimeout: 4800,
-    interval: 1
-};
-export async function bootstrapNetwork(pxeUrl, l1Urls, l1ChainId, l1PrivateKey, l1Mnemonic, addressIndex, json, log, debugLog) {
-    const pxe = await createCompatibleClient(pxeUrl, debugLog);
-    const [wallet] = await getDeployedTestAccountsWallets(pxe);
-    const l1Clients = createL1Clients(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(l1Clients);
-    const { token, bridge } = await deployToken(wallet, portalAddress);
-    await initPortal(pxe, l1Clients, erc20Address, portalAddress, bridge.address);
-    const fpcAdmin = wallet.getAddress();
-    const fpc = await deployFPC(wallet, token.address, fpcAdmin);
-    const counter = await deployCounter(wallet);
-    await fundFPC(counter.address, wallet, l1Clients, 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({ walletClient, publicClient }) {
-    const { TestERC20Abi, TestERC20Bytecode, TokenPortalAbi, TokenPortalBytecode } = await import('@aztec/l1-artifacts');
-    const erc20 = {
-        contractAbi: TestERC20Abi,
-        contractBytecode: TestERC20Bytecode
-    };
-    const portal = {
-        contractAbi: TokenPortalAbi,
-        contractBytecode: TokenPortalBytecode
-    };
-    const { address: erc20Address } = await deployL1Contract(walletClient, publicClient, erc20.contractAbi, erc20.contractBytecode, [
-        'DevCoin',
-        'DEV',
-        walletClient.account.address
-    ]);
-    const { address: portalAddress } = await deployL1Contract(walletClient, publicClient, portal.contractAbi, portal.contractBytecode);
-    return {
-        erc20Address,
-        portalAddress
-    };
-}
-/**
- * Step 2. Deploy the L2 contracts
- */ async function deployToken(wallet, 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, wallet.getAddress(), 'DevCoin', 'DEV', 18).send({
-        universalDeploy: true
-    }).deployed(waitOpts);
-    const bridge = await TokenBridgeContract.deploy(wallet, devCoin.address, l1Portal).send({
-        universalDeploy: true
-    }).deployed(waitOpts);
-    await new BatchCall(wallet, [
-        await devCoin.methods.set_minter(bridge.address, true).request(),
-        await devCoin.methods.set_admin(bridge.address).request()
-    ]).send().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, { walletClient, publicClient }, 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: walletClient
-    });
-    const hash = await contract.write.initialize([
-        registryAddress.toString(),
-        erc20.toString(),
-        bridge.toString()
-    ]);
-    await publicClient.waitForTransactionReceipt({
-        hash
-    });
-}
-async function deployFPC(wallet, 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({
-        universalDeploy: true
-    }).deployed(waitOpts);
-    const info = {
-        address: fpc.address,
-        initHash: fpc.instance.initializationHash,
-        salt: fpc.instance.salt
-    };
-    return info;
-}
-async function deployCounter(wallet) {
-    // 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-contracts.js/Counter');
-    const counter = await CounterContract.deploy(wallet, 1, wallet.getAddress()).send({
-        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(counterAddress, wallet, l1Clients, 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-contracts.js/Counter');
-    const { protocolContractAddresses: { feeJuice } } = await wallet.getPXEInfo();
-    const feeJuiceContract = await FeeJuiceContract.at(feeJuice, wallet);
-    const feeJuicePortal = await L1FeeJuicePortalManager.new(wallet, l1Clients.publicClient, l1Clients.walletClient, debugLog);
-    const amount = FEE_FUNDING_FOR_TESTER_ACCOUNT;
-    const { claimAmount, claimSecret, messageLeafIndex, messageHash } = await feeJuicePortal.bridgeTokensPublic(fpcAddress, amount, true);
-    await retryUntil(async ()=>await wallet.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(), 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/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);
-    }
-}