@aztec/cli 3.0.0-nightly.20250908 → 3.0.0-nightly.20250911

package/dest/config/chain_l2_config.js

@@ -0,0 +1,291 @@
+import { DefaultL1ContractsConfig } from '@aztec/ethereum';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { mkdir, readFile, stat, writeFile } from 'fs/promises';
+import path, { dirname, join } from 'path';
+import publicIncludeMetrics from '../../public_include_metric_prefixes.json' with {
+    type: 'json'
+};
+const DefaultSlashConfig = {
+    /** Tally-style slashing */ slasherFlavor: 'tally',
+    /** Allow one round for vetoing */ slashingExecutionDelayInRounds: 1,
+    /** How long for a slash payload to be executed */ slashingLifetimeInRounds: 5,
+    /** Allow 2 rounds to discover faults */ slashingOffsetInRounds: 2,
+    /** No slash vetoer */ slashingVetoer: EthAddress.ZERO,
+    /** Use default slash amounts */ slashAmountSmall: DefaultL1ContractsConfig.slashAmountSmall,
+    slashAmountMedium: DefaultL1ContractsConfig.slashAmountMedium,
+    slashAmountLarge: DefaultL1ContractsConfig.slashAmountLarge,
+    // Slashing stuff
+    slashMinPenaltyPercentage: 0.5,
+    slashMaxPenaltyPercentage: 2.0,
+    slashInactivityTargetPercentage: 0.7,
+    slashInactivityConsecutiveEpochThreshold: 1,
+    slashInactivityPenalty: DefaultL1ContractsConfig.slashAmountSmall,
+    slashPrunePenalty: DefaultL1ContractsConfig.slashAmountSmall,
+    slashDataWithholdingPenalty: DefaultL1ContractsConfig.slashAmountSmall,
+    slashProposeInvalidAttestationsPenalty: DefaultL1ContractsConfig.slashAmountLarge,
+    slashAttestDescendantOfInvalidPenalty: DefaultL1ContractsConfig.slashAmountLarge,
+    slashUnknownPenalty: DefaultL1ContractsConfig.slashAmountSmall,
+    slashBroadcastedInvalidBlockPenalty: DefaultL1ContractsConfig.slashAmountMedium,
+    slashMaxPayloadSize: 50,
+    slashGracePeriodL2Slots: 32 * 2,
+    slashOffenseExpirationRounds: 8,
+    sentinelEnabled: true
+};
+export const stagingIgnitionL2ChainConfig = {
+    l1ChainId: 11155111,
+    testAccounts: true,
+    sponsoredFPC: false,
+    p2pEnabled: true,
+    p2pBootstrapNodes: [],
+    registryAddress: '0xf299347e765cfb27f913bde8e4983fd0f195676f',
+    slashFactoryAddress: '',
+    feeAssetHandlerAddress: '',
+    seqMinTxsPerBlock: 0,
+    seqMaxTxsPerBlock: 0,
+    realProofs: true,
+    snapshotsUrl: 'https://storage.googleapis.com/aztec-testnet/snapshots/staging-ignition/',
+    autoUpdate: 'config-and-version',
+    autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/staging-ignition.json',
+    maxTxPoolSize: 100_000_000,
+    publicIncludeMetrics,
+    publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
+    publicMetricsCollectFrom: [
+        'sequencer'
+    ],
+    ...DefaultL1ContractsConfig,
+    ...DefaultSlashConfig,
+    /** How many seconds an L1 slot lasts. */ ethereumSlotDuration: 12,
+    /** How many seconds an L2 slots lasts (must be multiple of ethereum slot duration). */ aztecSlotDuration: 36,
+    /** How many L2 slots an epoch lasts. */ aztecEpochDuration: 32,
+    /** The target validator committee size. */ aztecTargetCommitteeSize: 48,
+    /** The number of epochs after an epoch ends that proofs are still accepted. */ aztecProofSubmissionEpochs: 1,
+    /** The mana target for the rollup */ manaTarget: 0n,
+    /** The proving cost per mana */ provingCostPerMana: 0n
+};
+export const stagingPublicL2ChainConfig = {
+    l1ChainId: 11155111,
+    testAccounts: false,
+    sponsoredFPC: true,
+    p2pEnabled: true,
+    p2pBootstrapNodes: [],
+    registryAddress: '0x2e48addca360da61e4d6c21ff2b1961af56eb83b',
+    slashFactoryAddress: '0xe19410632fd00695bc5a08dd82044b7b26317742',
+    feeAssetHandlerAddress: '0xb46dc3d91f849999330b6dd93473fa29fc45b076',
+    seqMinTxsPerBlock: 0,
+    seqMaxTxsPerBlock: 20,
+    realProofs: true,
+    snapshotsUrl: 'https://storage.googleapis.com/aztec-testnet/snapshots/staging-public/',
+    autoUpdate: 'config-and-version',
+    autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/staging-public.json',
+    publicIncludeMetrics,
+    publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
+    publicMetricsCollectFrom: [
+        'sequencer'
+    ],
+    maxTxPoolSize: 100_000_000,
+    // Deployment stuff
+    /** How many seconds an L1 slot lasts. */ ethereumSlotDuration: 12,
+    /** How many seconds an L2 slots lasts (must be multiple of ethereum slot duration). */ aztecSlotDuration: 36,
+    /** How many L2 slots an epoch lasts. */ aztecEpochDuration: 32,
+    /** The target validator committee size. */ aztecTargetCommitteeSize: 48,
+    /** The local ejection threshold for a validator. Stricter than ejectionThreshold but local to a specific rollup */ localEjectionThreshold: DefaultL1ContractsConfig.localEjectionThreshold,
+    /** The number of epochs after an epoch ends that proofs are still accepted. */ aztecProofSubmissionEpochs: 1,
+    /** The deposit amount for a validator */ activationThreshold: DefaultL1ContractsConfig.activationThreshold,
+    /** The minimum stake for a validator. */ ejectionThreshold: DefaultL1ContractsConfig.ejectionThreshold,
+    /** The slashing round size */ slashingRoundSizeInEpochs: DefaultL1ContractsConfig.slashingRoundSizeInEpochs,
+    /** Governance proposing round size */ governanceProposerRoundSize: DefaultL1ContractsConfig.governanceProposerRoundSize,
+    /** The mana target for the rollup */ manaTarget: DefaultL1ContractsConfig.manaTarget,
+    /** The proving cost per mana */ provingCostPerMana: DefaultL1ContractsConfig.provingCostPerMana,
+    /** Exit delay for stakers */ exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
+    ...DefaultSlashConfig
+};
+export const testnetL2ChainConfig = {
+    l1ChainId: 11155111,
+    testAccounts: false,
+    sponsoredFPC: true,
+    p2pEnabled: true,
+    p2pBootstrapNodes: [],
+    registryAddress: '0xcfe61b2574984326679cd15c6566fbd4a724f3b4',
+    slashFactoryAddress: '0x58dc5b14f9d3085c9106f5b8208a1026f94614f0',
+    feeAssetHandlerAddress: '0x7abdec6e68ae27c37feb6a77371382a109ec4763',
+    seqMinTxsPerBlock: 0,
+    seqMaxTxsPerBlock: 20,
+    realProofs: true,
+    snapshotsUrl: 'https://storage.googleapis.com/aztec-testnet/snapshots/testnet/',
+    autoUpdate: 'config-and-version',
+    autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/testnet.json',
+    maxTxPoolSize: 100_000_000,
+    publicIncludeMetrics,
+    publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
+    publicMetricsCollectFrom: [
+        'sequencer'
+    ],
+    // Deployment stuff
+    /** How many seconds an L1 slot lasts. */ ethereumSlotDuration: 12,
+    /** How many seconds an L2 slots lasts (must be multiple of ethereum slot duration). */ aztecSlotDuration: 36,
+    /** How many L2 slots an epoch lasts. */ aztecEpochDuration: 32,
+    /** The target validator committee size. */ aztecTargetCommitteeSize: 48,
+    /** The number of epochs after an epoch ends that proofs are still accepted. */ aztecProofSubmissionEpochs: 1,
+    /** The deposit amount for a validator */ activationThreshold: DefaultL1ContractsConfig.activationThreshold,
+    /** The minimum stake for a validator. */ ejectionThreshold: DefaultL1ContractsConfig.ejectionThreshold,
+    /** The local ejection threshold for a validator. Stricter than ejectionThreshold but local to a specific rollup */ localEjectionThreshold: DefaultL1ContractsConfig.localEjectionThreshold,
+    /** The slashing round size */ slashingRoundSizeInEpochs: DefaultL1ContractsConfig.slashingRoundSizeInEpochs,
+    /** Governance proposing round size */ governanceProposerRoundSize: DefaultL1ContractsConfig.governanceProposerRoundSize,
+    /** The mana target for the rollup */ manaTarget: DefaultL1ContractsConfig.manaTarget,
+    /** The proving cost per mana */ provingCostPerMana: DefaultL1ContractsConfig.provingCostPerMana,
+    /** Exit delay for stakers */ exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
+    ...DefaultSlashConfig
+};
+const BOOTNODE_CACHE_DURATION_MS = 60 * 60 * 1000; // 1 hour;
+export async function getBootnodes(networkName, cacheDir) {
+    const cacheFile = cacheDir ? join(cacheDir, networkName, 'bootnodes.json') : undefined;
+    try {
+        if (cacheFile) {
+            const info = await stat(cacheFile);
+            if (info.mtimeMs + BOOTNODE_CACHE_DURATION_MS > Date.now()) {
+                return JSON.parse(await readFile(cacheFile, 'utf-8'))['bootnodes'];
+            }
+        }
+    } catch  {
+    // no-op. Get the remote-file
+    }
+    const url = `http://static.aztec.network/${networkName}/bootnodes.json`;
+    const response = await fetch(url);
+    if (!response.ok) {
+        throw new Error(`Failed to fetch basic contract addresses from ${url}. Check you are using a correct network name.`);
+    }
+    const json = await response.json();
+    try {
+        if (cacheFile) {
+            await mkdir(dirname(cacheFile), {
+                recursive: true
+            });
+            await writeFile(cacheFile, JSON.stringify(json), 'utf-8');
+        }
+    } catch  {
+    // no-op
+    }
+    return json['bootnodes'];
+}
+export async function getL2ChainConfig(networkName, cacheDir) {
+    let config;
+    if (networkName === 'staging-public') {
+        config = {
+            ...stagingPublicL2ChainConfig
+        };
+    } else if (networkName === 'testnet') {
+        config = {
+            ...testnetL2ChainConfig
+        };
+    } else if (networkName === 'staging-ignition') {
+        config = {
+            ...stagingIgnitionL2ChainConfig
+        };
+    }
+    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 enrichVar(envVar, value) {
+    // Don't override
+    if (process.env[envVar] || value === undefined) {
+        return;
+    }
+    process.env[envVar] = value;
+}
+function enrichEthAddressVar(envVar, value) {
+    // EthAddress doesn't like being given empty strings
+    if (value === '') {
+        enrichVar(envVar, EthAddress.ZERO.toString());
+        return;
+    }
+    enrichVar(envVar, value);
+}
+function getDefaultDataDir(networkName) {
+    return path.join(process.env.HOME || '~', '.aztec', networkName, 'data');
+}
+export async 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);
+    if (!config) {
+        throw new Error(`Unknown network name: ${networkName}`);
+    }
+    enrichVar('BOOTSTRAP_NODES', config.p2pBootstrapNodes.join(','));
+    enrichVar('TEST_ACCOUNTS', config.testAccounts.toString());
+    enrichVar('SPONSORED_FPC', config.sponsoredFPC.toString());
+    enrichVar('P2P_ENABLED', config.p2pEnabled.toString());
+    enrichVar('L1_CHAIN_ID', config.l1ChainId.toString());
+    enrichVar('SEQ_MIN_TX_PER_BLOCK', config.seqMinTxsPerBlock.toString());
+    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('P2P_MAX_TX_POOL_SIZE', config.maxTxPoolSize.toString());
+    if (config.autoUpdate) {
+        enrichVar('AUTO_UPDATE', config.autoUpdate?.toString());
+    }
+    if (config.autoUpdateUrl) {
+        enrichVar('AUTO_UPDATE_URL', config.autoUpdateUrl);
+    }
+    if (config.publicIncludeMetrics) {
+        enrichVar('PUBLIC_OTEL_INCLUDE_METRICS', config.publicIncludeMetrics.join(','));
+    }
+    if (config.publicMetricsCollectorUrl) {
+        enrichVar('PUBLIC_OTEL_EXPORTER_OTLP_METRICS_ENDPOINT', config.publicMetricsCollectorUrl);
+    }
+    if (config.publicMetricsCollectFrom) {
+        enrichVar('PUBLIC_OTEL_COLLECT_FROM', config.publicMetricsCollectFrom.join(','));
+    }
+    enrichEthAddressVar('REGISTRY_CONTRACT_ADDRESS', config.registryAddress);
+    enrichEthAddressVar('SLASH_FACTORY_CONTRACT_ADDRESS', config.slashFactoryAddress);
+    enrichEthAddressVar('FEE_ASSET_HANDLER_CONTRACT_ADDRESS', config.feeAssetHandlerAddress);
+    // Deployment stuff
+    enrichVar('ETHEREUM_SLOT_DURATION', config.ethereumSlotDuration.toString());
+    enrichVar('AZTEC_SLOT_DURATION', config.aztecSlotDuration.toString());
+    enrichVar('AZTEC_EPOCH_DURATION', config.aztecEpochDuration.toString());
+    enrichVar('AZTEC_TARGET_COMMITTEE_SIZE', config.aztecTargetCommitteeSize.toString());
+    enrichVar('AZTEC_PROOF_SUBMISSION_EPOCHS', config.aztecProofSubmissionEpochs.toString());
+    enrichVar('AZTEC_ACTIVATION_THRESHOLD', config.activationThreshold.toString());
+    enrichVar('AZTEC_EJECTION_THRESHOLD', config.ejectionThreshold.toString());
+    enrichVar('AZTEC_LOCAL_EJECTION_THRESHOLD', config.localEjectionThreshold.toString());
+    enrichVar('AZTEC_SLASHING_QUORUM', config.slashingQuorum?.toString());
+    enrichVar('AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS', config.slashingRoundSizeInEpochs.toString());
+    enrichVar('AZTEC_GOVERNANCE_PROPOSER_QUORUM', config.governanceProposerQuorum?.toString());
+    enrichVar('AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE', config.governanceProposerRoundSize.toString());
+    enrichVar('AZTEC_MANA_TARGET', config.manaTarget.toString());
+    enrichVar('AZTEC_PROVING_COST_PER_MANA', config.provingCostPerMana.toString());
+    enrichVar('AZTEC_SLASH_AMOUNT_SMALL', config.slashAmountSmall.toString());
+    enrichVar('AZTEC_SLASH_AMOUNT_MEDIUM', config.slashAmountMedium.toString());
+    enrichVar('AZTEC_SLASH_AMOUNT_LARGE', config.slashAmountLarge.toString());
+    enrichVar('AZTEC_SLASHING_LIFETIME_IN_ROUNDS', config.slashingLifetimeInRounds.toString());
+    enrichVar('AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS', config.slashingExecutionDelayInRounds.toString());
+    enrichVar('AZTEC_SLASHING_OFFSET_IN_ROUNDS', config.slashingOffsetInRounds.toString());
+    enrichVar('AZTEC_SLASHER_FLAVOR', config.slasherFlavor);
+    enrichVar('AZTEC_EXIT_DELAY_SECONDS', config.exitDelaySeconds.toString());
+    enrichEthAddressVar('AZTEC_SLASHING_VETOER', config.slashingVetoer.toString());
+    // Slashing
+    enrichVar('SLASH_MIN_PENALTY_PERCENTAGE', config.slashMinPenaltyPercentage.toString());
+    enrichVar('SLASH_MAX_PENALTY_PERCENTAGE', config.slashMaxPenaltyPercentage.toString());
+    enrichVar('SLASH_PRUNE_PENALTY', config.slashPrunePenalty.toString());
+    enrichVar('SLASH_DATA_WITHHOLDING_PENALTY', config.slashDataWithholdingPenalty.toString());
+    enrichVar('SLASH_INACTIVITY_TARGET_PERCENTAGE', config.slashInactivityTargetPercentage.toString());
+    enrichVar('SLASH_INACTIVITY_CONSECUTIVE_EPOCH_THRESHOLD', config.slashInactivityConsecutiveEpochThreshold.toString());
+    enrichVar('SLASH_INACTIVITY_PENALTY', config.slashInactivityPenalty.toString());
+    enrichVar('SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY', config.slashProposeInvalidAttestationsPenalty.toString());
+    enrichVar('SLASH_ATTEST_DESCENDANT_OF_INVALID_PENALTY', config.slashAttestDescendantOfInvalidPenalty.toString());
+    enrichVar('SLASH_UNKNOWN_PENALTY', config.slashUnknownPenalty.toString());
+    enrichVar('SLASH_INVALID_BLOCK_PENALTY', config.slashBroadcastedInvalidBlockPenalty.toString());
+    enrichVar('SLASH_OFFENSE_EXPIRATION_ROUNDS', config.slashOffenseExpirationRounds.toString());
+    enrichVar('SLASH_MAX_PAYLOAD_SIZE', config.slashMaxPayloadSize.toString());
+    enrichVar('SENTINEL_ENABLED', config.sentinelEnabled.toString());
+}

package/dest/config/get_l1_config.d.ts

@@ -0,0 +1,8 @@
+import { type L1ContractAddresses, getL1ContractsConfig } from '@aztec/ethereum';
+import { EthAddress } from '@aztec/foundation/eth-address';
+export declare function getL1Config(registryAddress: EthAddress, l1RpcUrls: string[], l1ChainId: number, rollupVersion?: number | 'canonical'): Promise<{
+    addresses: L1ContractAddresses;
+    config: Awaited<ReturnType<typeof getL1ContractsConfig>>;
+}>;
+export declare function getL1RollupAddressFromEnv(l1RpcUrls: string[], l1ChainId: number): Promise<EthAddress>;
+//# sourceMappingURL=get_l1_config.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"get_l1_config.d.ts","sourceRoot":"","sources":["../../src/config/get_l1_config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,mBAAmB,EAAoB,oBAAoB,EAAmB,MAAM,iBAAiB,CAAC;AACpH,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,wBAAsB,WAAW,CAC/B,eAAe,EAAE,UAAU,EAC3B,SAAS,EAAE,MAAM,EAAE,EACnB,SAAS,EAAE,MAAM,EACjB,aAAa,GAAE,MAAM,GAAG,WAAyB,GAChD,OAAO,CAAC;IAAE,SAAS,EAAE,mBAAmB,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAA;CAAE,CAAC,CAUvG;AAED,wBAAsB,yBAAyB,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,MAAM,uBAOrF"}

package/dest/config/get_l1_config.js

@@ -0,0 +1,22 @@
+import { RegistryContract, getL1ContractsConfig, getPublicClient } from '@aztec/ethereum';
+import { EthAddress } from '@aztec/foundation/eth-address';
+export async function getL1Config(registryAddress, l1RpcUrls, l1ChainId, rollupVersion = 'canonical') {
+    const publicClient = getPublicClient({
+        l1RpcUrls,
+        l1ChainId
+    });
+    const addresses = await RegistryContract.collectAddresses(publicClient, registryAddress, rollupVersion);
+    const config = await getL1ContractsConfig(publicClient, addresses);
+    return {
+        addresses,
+        config
+    };
+}
+export async function getL1RollupAddressFromEnv(l1RpcUrls, l1ChainId) {
+    const registryAddress = process.env.REGISTRY_CONTRACT_ADDRESS;
+    if (!registryAddress || !EthAddress.isAddress(registryAddress)) {
+        throw new Error(`Failed to extract registry address`);
+    }
+    const { addresses } = await getL1Config(EthAddress.fromString(registryAddress), l1RpcUrls, l1ChainId);
+    return addresses.rollupAddress;
+}

package/dest/config/index.d.ts

@@ -0,0 +1,3 @@
+export * from './chain_l2_config.js';
+export * from './get_l1_config.js';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC"}

package/dest/config/index.js

@@ -0,0 +1,2 @@
+export * from './chain_l2_config.js';
+export * from './get_l1_config.js';

package/dest/utils/setup_contracts.d.ts

@@ -1,5 +1,5 @@
-import { AztecAddress, type PXE, type WaitForProvenOpts } from '@aztec/aztec.js';
+import { type PXE } from '@aztec/aztec.js';
 import type { LogFn } from '@aztec/foundation/log';
-export declare function getSponsoredFPCAddress(): Promise<AztecAddress>;
-export declare function setupSponsoredFPC(pxe: PXE, log: LogFn, waitOpts?: import("@aztec/aztec.js").WaitOpts, waitForProvenOptions?: WaitForProvenOpts): Promise<void>;
+export declare function getSponsoredFPCAddress(): Promise<import("@aztec/aztec.js").AztecAddress>;
+export declare function setupSponsoredFPC(pxe: PXE, log: LogFn): Promise<void>;
 //# sourceMappingURL=setup_contracts.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"setup_contracts.d.ts","sourceRoot":"","sources":["../../src/utils/setup_contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGZ,KAAK,GAAG,EAGR,KAAK,iBAAiB,EAGvB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AASnD,wBAAsB,sBAAsB,0BAM3C;AAED,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,KAAK,EACV,QAAQ,qCAAkB,EAC1B,oBAAoB,CAAC,EAAE,iBAAiB,iBAuBzC"}
+{"version":3,"file":"setup_contracts.d.ts","sourceRoot":"","sources":["../../src/utils/setup_contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAM,KAAK,GAAG,EAA8C,MAAM,iBAAiB,CAAC;AAE3F,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AASnD,wBAAsB,sBAAsB,oDAM3C;AAED,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,iBAQ3D"}

package/dest/utils/setup_contracts.js

@@ -1,6 +1,5 @@
-import { AztecAddress, DefaultWaitOpts, Fr, SignerlessWallet, SponsoredFeePaymentMethod, getContractInstanceFromInstantiationParams, waitForProven } from '@aztec/aztec.js';
+import { Fr, getContractInstanceFromInstantiationParams } from '@aztec/aztec.js';
 import { SPONSORED_FPC_SALT } from '@aztec/constants';
-import { DefaultMultiCallEntrypoint } from '@aztec/entrypoints/multicall';
 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
@@ -14,23 +13,14 @@ export async function getSponsoredFPCAddress() {
     });
     return sponsoredFPCInstance.address;
 }
-export async function setupSponsoredFPC(pxe, log, waitOpts = DefaultWaitOpts, waitForProvenOptions) {
+export async function setupSponsoredFPC(pxe, log) {
     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 sponsoredFPCInstance = await getContractInstanceFromInstantiationParams(SponsoredFPCContract.artifact, {
+        salt: new Fr(SPONSORED_FPC_SALT)
+    });
+    await pxe.registerContract({
+        instance: sponsoredFPCInstance,
+        artifact: SponsoredFPCContract.artifact
     });
-    const deployed = await deployTx.deployed(waitOpts);
-    if (waitForProvenOptions !== undefined) {
-        await waitForProven(pxe, await deployTx.getReceipt(), waitForProvenOptions);
-    }
-    log(`SponsoredFPC: ${deployed.address}`);
+    log(`SponsoredFPC: ${sponsoredFPCInstance.address}`);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/cli",
-  "version": "3.0.0-nightly.20250908",
+  "version": "3.0.0-nightly.20250911",
   "type": "module",
   "exports": {
     "./contracts": "./dest/cmds/contracts/index.js",
@@ -12,7 +12,8 @@
     "./misc": "./dest/cmds/misc/index.js",
     "./setup-contracts": "./dest/cmds/misc/setup_contracts.js",
     "./utils": "./dest/utils/index.js",
-    "./inspect": "./dest/utils/inspect.js"
+    "./inspect": "./dest/utils/inspect.js",
+    "./config": "./dest/config/index.js"
   },
   "typedocOptions": {
     "entryPoints": [
@@ -69,16 +70,20 @@
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "3.0.0-nightly.20250908",
-    "@aztec/aztec.js": "3.0.0-nightly.20250908",
-    "@aztec/constants": "3.0.0-nightly.20250908",
-    "@aztec/entrypoints": "3.0.0-nightly.20250908",
-    "@aztec/ethereum": "3.0.0-nightly.20250908",
-    "@aztec/foundation": "3.0.0-nightly.20250908",
-    "@aztec/l1-artifacts": "3.0.0-nightly.20250908",
-    "@aztec/p2p": "3.0.0-nightly.20250908",
-    "@aztec/stdlib": "3.0.0-nightly.20250908",
-    "@aztec/world-state": "3.0.0-nightly.20250908",
+    "@aztec/accounts": "3.0.0-nightly.20250911",
+    "@aztec/archiver": "3.0.0-nightly.20250911",
+    "@aztec/aztec.js": "3.0.0-nightly.20250911",
+    "@aztec/constants": "3.0.0-nightly.20250911",
+    "@aztec/entrypoints": "3.0.0-nightly.20250911",
+    "@aztec/ethereum": "3.0.0-nightly.20250911",
+    "@aztec/foundation": "3.0.0-nightly.20250911",
+    "@aztec/l1-artifacts": "3.0.0-nightly.20250911",
+    "@aztec/node-lib": "3.0.0-nightly.20250911",
+    "@aztec/p2p": "3.0.0-nightly.20250911",
+    "@aztec/protocol-contracts": "3.0.0-nightly.20250911",
+    "@aztec/stdlib": "3.0.0-nightly.20250911",
+    "@aztec/test-wallet": "3.0.0-nightly.20250911",
+    "@aztec/world-state": "3.0.0-nightly.20250911",
     "@iarna/toml": "^2.2.5",
     "@libp2p/peer-id-factory": "^3.0.4",
     "commander": "^12.1.0",
@@ -90,8 +95,6 @@
     "viem": "2.23.7"
   },
   "devDependencies": {
-    "@aztec/accounts": "3.0.0-nightly.20250908",
-    "@aztec/protocol-contracts": "3.0.0-nightly.20250908",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/lodash.chunk": "^4.2.9",
@@ -107,15 +110,15 @@
     "typescript": "^5.3.3"
   },
   "peerDependencies": {
-    "@aztec/accounts": "3.0.0-nightly.20250908",
-    "@aztec/bb-prover": "3.0.0-nightly.20250908",
-    "@aztec/ethereum": "3.0.0-nightly.20250908",
-    "@aztec/l1-artifacts": "3.0.0-nightly.20250908",
-    "@aztec/noir-contracts.js": "3.0.0-nightly.20250908",
-    "@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20250908",
-    "@aztec/noir-test-contracts.js": "3.0.0-nightly.20250908",
-    "@aztec/protocol-contracts": "3.0.0-nightly.20250908",
-    "@aztec/stdlib": "3.0.0-nightly.20250908"
+    "@aztec/accounts": "3.0.0-nightly.20250911",
+    "@aztec/bb-prover": "3.0.0-nightly.20250911",
+    "@aztec/ethereum": "3.0.0-nightly.20250911",
+    "@aztec/l1-artifacts": "3.0.0-nightly.20250911",
+    "@aztec/noir-contracts.js": "3.0.0-nightly.20250911",
+    "@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20250911",
+    "@aztec/noir-test-contracts.js": "3.0.0-nightly.20250911",
+    "@aztec/protocol-contracts": "3.0.0-nightly.20250911",
+    "@aztec/stdlib": "3.0.0-nightly.20250911"
   },
   "files": [
     "dest",

package/src/cmds/devnet/bootstrap_network.ts

@@ -1,4 +1,4 @@
-import { getInitialTestAccountsManagers } from '@aztec/accounts/testing';
+import { getInitialTestAccountsData } from '@aztec/accounts/testing';
 import {
   AztecAddress,
   BatchCall,
@@ -21,6 +21,7 @@ import {
   deployL1Contract,
 } from '@aztec/ethereum';
 import type { LogFn, Logger } from '@aztec/foundation/log';
+import { TestWallet } from '@aztec/test-wallet';
 
 import { getContract } from 'viem';
 import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
@@ -53,14 +54,18 @@ export async function bootstrapNetwork(
   debugLog: Logger,
 ) {
   const pxe = await createCompatibleClient(pxeUrl, debugLog);
+  const wallet = new TestWallet(pxe);
 
   // 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 [accountData] = await getInitialTestAccountsData();
+  const accountManager = await wallet.createSchnorrAccount(
+    accountData.secret,
+    accountData.salt,
+    accountData.signingKey,
+  );
 
-  const wallet = await accountManager.getWallet();
-  const defaultAccountAddress = wallet.getAddress();
+  const defaultAccountAddress = accountManager.getAddress();
 
   const l1Client = createExtendedL1Client(
     l1Urls,
@@ -78,7 +83,7 @@ export async function bootstrapNetwork(
 
   await initPortal(pxe, l1Client, erc20Address, portalAddress, bridge.address);
 
-  const fpcAdmin = wallet.getAddress();
+  const fpcAdmin = defaultAccountAddress;
   const fpc = await deployFPC(wallet, defaultAccountAddress, token.address, fpcAdmin);
 
   const counter = await deployCounter(wallet, defaultAccountAddress);
@@ -285,11 +290,11 @@ async function fundFPC(
   const { CounterContract } = await import('@aztec/noir-test-contracts.js/Counter');
   const {
     protocolContractAddresses: { feeJuice },
-  } = await wallet.getPXEInfo();
+  } = await pxe.getNodeInfo();
 
   const feeJuiceContract = await FeeJuiceContract.at(feeJuice, wallet);
 
-  const feeJuicePortal = await L1FeeJuicePortalManager.new(wallet, l1Client, debugLog);
+  const feeJuicePortal = await L1FeeJuicePortalManager.new(pxe, l1Client, debugLog);
 
   const { claimAmount, claimSecret, messageLeafIndex, messageHash } = await feeJuicePortal.bridgeTokensPublic(
     fpcAddress,
@@ -305,8 +310,8 @@ async function fundFPC(
 
   // 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);
+  await counter.methods.increment(defaultAccountAddress).send({ from: defaultAccountAddress }).wait(waitOpts);
+  await counter.methods.increment(defaultAccountAddress).send({ from: defaultAccountAddress }).wait(waitOpts);
 
   debugLog.info('Claiming FPC');
 

package/src/cmds/infrastructure/index.ts

@@ -12,17 +12,9 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
     .option('--testAccounts', 'Deploy funded test accounts.')
     .option('--sponsoredFPC', 'Deploy a sponsored FPC.')
     .option('--json', 'Output the contract addresses in JSON format')
-    .option('--skipProofWait', "Don't wait for proofs to land.")
     .action(async options => {
       const { setupL2Contracts } = await import('./setup_l2_contract.js');
-      await setupL2Contracts(
-        options.rpcUrl,
-        options.testAccounts,
-        options.sponsoredFPC,
-        options.json,
-        options.skipProofWait,
-        log,
-      );
+      await setupL2Contracts(options.rpcUrl, options.testAccounts, options.sponsoredFPC, options.json, log);
     });
 
   program

package/src/cmds/infrastructure/setup_l2_contract.ts

@@ -1,8 +1,9 @@
-import { type InitialAccountData, deployFundedSchnorrAccounts, getInitialTestAccounts } from '@aztec/accounts/testing';
-import { type AztecAddress, type WaitForProvenOpts, type WaitOpts, createPXEClient, makeFetch } from '@aztec/aztec.js';
+import { getInitialTestAccountsData } from '@aztec/accounts/testing';
+import { AccountManager, type AztecAddress, type WaitOpts, createPXEClient, makeFetch } from '@aztec/aztec.js';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
 import type { LogFn } from '@aztec/foundation/log';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
+import { TestWallet, deployFundedSchnorrAccounts } from '@aztec/test-wallet';
 
 import { setupSponsoredFPC } from '../../utils/setup_contracts.js';
 
@@ -11,41 +12,33 @@ export async function setupL2Contracts(
   testAccounts: boolean,
   sponsoredFPC: boolean,
   json: boolean,
-  skipProofWait: boolean,
   log: LogFn,
 ) {
   const waitOpts: WaitOpts = {
     timeout: 180,
     interval: 1,
   };
-  const waitForProvenOptions: WaitForProvenOpts | undefined = !skipProofWait
-    ? {
-        provenTimeout: 600,
-      }
-    : undefined;
   log('setupL2Contracts: Wait options' + jsonStringify(waitOpts));
-  if (waitForProvenOptions) {
-    log('setupL2Contracts: Wait for proven options' + jsonStringify(waitForProvenOptions));
-  }
   log('setupL2Contracts: Creating PXE client...');
   const pxe = createPXEClient(rpcUrl, {}, makeFetch([1, 1, 1, 1, 1], false));
+  const wallet = new TestWallet(pxe);
 
-  let deployedAccounts: InitialAccountData[] = [];
+  let deployedAccountManagers: AccountManager[] = [];
   if (testAccounts) {
     log('setupL2Contracts: Deploying test accounts...');
-    deployedAccounts = await getInitialTestAccounts();
-    await deployFundedSchnorrAccounts(pxe, deployedAccounts, waitOpts);
+    const initialAccountsData = await getInitialTestAccountsData();
+    deployedAccountManagers = await deployFundedSchnorrAccounts(wallet, initialAccountsData, waitOpts);
   }
 
   if (sponsoredFPC) {
     log('setupL2Contracts: Setting up sponsored FPC...');
-    await setupSponsoredFPC(pxe, log, waitOpts, waitForProvenOptions);
+    await setupSponsoredFPC(pxe, log);
   }
 
   if (json) {
     const toPrint: Record<string, AztecAddress> = { ...ProtocolContractAddress };
-    deployedAccounts.forEach((a, i) => {
-      toPrint[`testAccount${i}`] = a.address;
+    deployedAccountManagers.forEach((a, i) => {
+      toPrint[`testAccount${i}`] = a.getAddress();
     });
     log(JSON.stringify(toPrint, null, 2));
   }

package/src/cmds/l1/deploy_l1_contracts.ts

@@ -1,4 +1,4 @@
-import { getInitialTestAccounts } from '@aztec/accounts/testing';
+import { getInitialTestAccountsData } from '@aztec/accounts/testing';
 import { type EthAddress, Fr } from '@aztec/aztec.js';
 import { getL1ContractsConfigEnvVars } from '@aztec/ethereum';
 import { SecretValue } from '@aztec/foundation/config';
@@ -27,7 +27,7 @@ export async function deployL1Contracts(
 ) {
   const config = getL1ContractsConfigEnvVars();
 
-  const initialAccounts = testAccounts ? await getInitialTestAccounts() : [];
+  const initialAccounts = testAccounts ? await getInitialTestAccountsData() : [];
   const sponsoredFPCAddress = sponsoredFPC ? await getSponsoredFPCAddress() : [];
   const initialFundedAccounts = initialAccounts.map(a => a.address).concat(sponsoredFPCAddress);
   const { genesisArchiveRoot, fundingNeeded } = await getGenesisValues(initialFundedAccounts);