@aztec/cli 0.0.1-commit.b655e406 → 0.0.1-commit.c7c42ec

package/dest/config/chain_l2_config.js

@@ -1,4 +1,4 @@
-import { DefaultL1ContractsConfig } from '@aztec/ethereum';
+import { DefaultL1ContractsConfig } from '@aztec/ethereum/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import path from 'path';
 import publicIncludeMetrics from '../../public_include_metric_prefixes.json' with {
@@ -37,7 +37,7 @@ const DefaultSlashConfig = {
     slashExecuteRoundsLookBack: 4
 };
 const DefaultNetworkDBMapSizeConfig = {
-    dbMapSizeKb: defaultDBMapSizeKb,
+    dataStoreMapSizeKb: defaultDBMapSizeKb,
     archiverStoreMapSizeKb: tbMapSizeKb,
     noteHashTreeMapSizeKb: tbMapSizeKb,
     nullifierTreeMapSizeKb: tbMapSizeKb,
@@ -49,26 +49,32 @@ export const stagingIgnitionL2ChainConfig = {
     sponsoredFPC: false,
     disableTransactions: true,
     p2pEnabled: true,
-    p2pBootstrapNodes: [],
-    seqMinTxsPerBlock: 0,
-    seqMaxTxsPerBlock: 0,
+    bootstrapNodes: [],
+    minTxsPerBlock: 0,
+    maxTxsPerBlock: 0,
+    buildCheckpointIfEmpty: true,
     realProofs: true,
     snapshotsUrls: [
         `${SNAPSHOTS_URL}/staging-ignition/`
     ],
     autoUpdate: 'config-and-version',
     autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/staging-ignition.json',
-    maxTxPoolSize: 100_000_000,
+    maxPendingTxCount: 0,
+    publicMetricsOptOut: false,
     publicIncludeMetrics,
     publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
     publicMetricsCollectFrom: [
         'sequencer'
     ],
+    txPoolDeleteTxsAfterReorg: false,
+    blobAllowEmptySources: true,
     /** How many seconds an L1 slot lasts. */ ethereumSlotDuration: 12,
     /** How many seconds an L2 slots lasts (must be multiple of ethereum slot duration). */ aztecSlotDuration: 72,
     /** How many L2 slots an epoch lasts. */ aztecEpochDuration: 32,
     /** The target validator committee size. */ aztecTargetCommitteeSize: 24,
-    /** The number of epochs to lag behind the current epoch for validator selection. */ lagInEpochs: 2,
+    /** The number of epochs to lag behind the current epoch for validator selection. */ lagInEpochsForValidatorSet: 2,
+    /** The number of epochs to lag behind the current epoch for randao selection. */ lagInEpochsForRandao: 2,
+    /** The number of checkpoints to lag in the inbox (prevents sequencer DOS attacks). */ inboxLag: 1,
     /** The number of epochs after an epoch ends that proofs are still accepted. */ aztecProofSubmissionEpochs: 1,
     /** How many sequencers must agree with a slash for it to be executed. */ slashingQuorum: 65,
     slashingRoundSizeInEpochs: 4,
@@ -114,27 +120,32 @@ export const stagingPublicL2ChainConfig = {
     sponsoredFPC: true,
     disableTransactions: false,
     p2pEnabled: true,
-    p2pBootstrapNodes: [],
-    seqMinTxsPerBlock: 0,
-    seqMaxTxsPerBlock: 20,
+    bootstrapNodes: [],
+    minTxsPerBlock: 0,
+    maxTxsPerBlock: 20,
+    buildCheckpointIfEmpty: true,
     realProofs: true,
     snapshotsUrls: [
         `${SNAPSHOTS_URL}/staging-public/`
     ],
     autoUpdate: 'config-and-version',
     autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/staging-public.json',
+    publicMetricsOptOut: false,
     publicIncludeMetrics,
     publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
     publicMetricsCollectFrom: [
         'sequencer'
     ],
-    maxTxPoolSize: 100_000_000,
+    maxPendingTxCount: 1_000,
+    txPoolDeleteTxsAfterReorg: true,
     // 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 to lag behind the current epoch for validator selection. */ lagInEpochs: DefaultL1ContractsConfig.lagInEpochs,
+    /** The number of epochs to lag behind the current epoch for validator selection. */ lagInEpochsForValidatorSet: DefaultL1ContractsConfig.lagInEpochsForValidatorSet,
+    /** The number of epochs to lag behind the current epoch for randao selection. */ lagInEpochsForRandao: DefaultL1ContractsConfig.lagInEpochsForRandao,
+    /** The number of checkpoints to lag in the inbox (prevents sequencer DOS attacks). */ inboxLag: DefaultL1ContractsConfig.inboxLag,
     /** 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,
@@ -153,25 +164,30 @@ export const nextNetL2ChainConfig = {
     sponsoredFPC: true,
     p2pEnabled: true,
     disableTransactions: false,
-    p2pBootstrapNodes: [],
-    seqMinTxsPerBlock: 0,
-    seqMaxTxsPerBlock: 8,
+    bootstrapNodes: [],
+    minTxsPerBlock: 0,
+    maxTxsPerBlock: 8,
+    buildCheckpointIfEmpty: true,
     realProofs: true,
     snapshotsUrls: [],
     autoUpdate: 'config-and-version',
     autoUpdateUrl: '',
+    publicMetricsOptOut: true,
     publicIncludeMetrics,
     publicMetricsCollectorUrl: '',
     publicMetricsCollectFrom: [
         ''
     ],
-    maxTxPoolSize: 100_000_000,
+    maxPendingTxCount: 1_000,
+    txPoolDeleteTxsAfterReorg: false,
     // 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 to lag behind the current epoch for validator selection. */ lagInEpochs: DefaultL1ContractsConfig.lagInEpochs,
+    /** The number of epochs to lag behind the current epoch for validator selection. */ lagInEpochsForValidatorSet: DefaultL1ContractsConfig.lagInEpochsForValidatorSet,
+    /** The number of epochs to lag behind the current epoch for randao selection. */ lagInEpochsForRandao: DefaultL1ContractsConfig.lagInEpochsForRandao,
+    /** The number of checkpoints to lag in the inbox (prevents sequencer DOS attacks). */ inboxLag: DefaultL1ContractsConfig.inboxLag,
     /** 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,
@@ -190,59 +206,64 @@ export const testnetL2ChainConfig = {
     sponsoredFPC: true,
     p2pEnabled: true,
     disableTransactions: true,
-    p2pBootstrapNodes: [],
-    seqMinTxsPerBlock: 0,
-    seqMaxTxsPerBlock: 0,
+    bootstrapNodes: [],
+    minTxsPerBlock: 0,
+    maxTxsPerBlock: 20,
+    buildCheckpointIfEmpty: true,
     realProofs: true,
     snapshotsUrls: [
         `${SNAPSHOTS_URL}/testnet/`
     ],
     autoUpdate: 'config-and-version',
     autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/testnet.json',
-    maxTxPoolSize: 100_000_000,
+    maxPendingTxCount: 5_000,
+    publicMetricsOptOut: false,
     publicIncludeMetrics,
     publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
     publicMetricsCollectFrom: [
         'sequencer'
     ],
+    txPoolDeleteTxsAfterReorg: true,
     skipArchiverInitialSync: true,
     blobAllowEmptySources: true,
     /** How many seconds an L1 slot lasts. */ ethereumSlotDuration: 12,
     /** How many seconds an L2 slots lasts (must be multiple of ethereum slot duration). */ aztecSlotDuration: 72,
     /** How many L2 slots an epoch lasts. */ aztecEpochDuration: 32,
-    /** The target validator committee size. */ aztecTargetCommitteeSize: 24,
-    /** The number of epochs to lag behind the current epoch for validator selection. */ lagInEpochs: 2,
+    /** The target validator committee size. */ aztecTargetCommitteeSize: 48,
+    /** The number of epochs to lag behind the current epoch for validator selection. */ lagInEpochsForValidatorSet: 2,
+    /** The number of epochs to lag behind the current epoch for randao selection. */ lagInEpochsForRandao: 2,
+    /** The number of checkpoints to lag in the inbox (prevents sequencer DOS attacks). */ inboxLag: 1,
     /** The number of epochs after an epoch ends that proofs are still accepted. */ aztecProofSubmissionEpochs: 1,
-    // This is a diff from mainnet: we have 2-strikes you're out, rather than 3 on mainnet.
-    localEjectionThreshold: 198_000n * 10n ** 18n,
-    /** How many sequencers must agree with a slash for it to be executed. */ slashingQuorum: 65,
-    slashingRoundSizeInEpochs: 4,
-    slashingExecutionDelayInRounds: 28,
-    slashingLifetimeInRounds: 34,
-    slashingVetoer: EthAddress.fromString('0xBbB4aF368d02827945748b28CD4b2D42e4A37480'),
+    // This is a diff from mainnet: we have 1-strike you're out, rather than 3 on mainnet.
+    localEjectionThreshold: 199_000n * 10n ** 18n,
+    /** How many sequencers must agree with a slash for it to be executed. */ slashingQuorum: 33,
+    slashingRoundSizeInEpochs: 2,
+    slashingExecutionDelayInRounds: 2,
+    slashingLifetimeInRounds: 5,
+    slashingVetoer: EthAddress.fromString('0xdfe19Da6a717b7088621d8bBB66be59F2d78e924'),
     slashingOffsetInRounds: 2,
-    slashingDisableDuration: 259_200,
+    slashingDisableDuration: 5 * 24 * 60 * 60,
     slasherFlavor: 'tally',
-    slashAmountSmall: 2_000n * 10n ** 18n,
-    slashAmountMedium: 2_000n * 10n ** 18n,
-    slashAmountLarge: 2_000n * 10n ** 18n,
-    /** The mana target for the rollup */ manaTarget: 0n,
-    /** The proving cost per mana */ provingCostPerMana: 0n,
+    slashAmountSmall: 10_000n * 10n ** 18n,
+    slashAmountMedium: 50_000n * 10n ** 18n,
+    slashAmountLarge: 200_000n * 10n ** 18n,
+    /** The mana target for the rollup */ manaTarget: 150_000_000n,
+    /** The proving cost per mana */ provingCostPerMana: 100n,
     exitDelaySeconds: 4 * 24 * 60 * 60,
     activationThreshold: 200_000n * 10n ** 18n,
     ejectionThreshold: 100_000n * 10n ** 18n,
-    governanceProposerRoundSize: 300,
-    governanceProposerQuorum: 151,
+    governanceProposerRoundSize: 100,
+    governanceProposerQuorum: 60,
     // Node slashing config
     slashInactivityTargetPercentage: 0.8,
     slashInactivityConsecutiveEpochThreshold: 2,
-    slashInactivityPenalty: 2_000n * 10n ** 18n,
+    slashInactivityPenalty: 10_000n * 10n ** 18n,
     slashPrunePenalty: 0n,
     slashDataWithholdingPenalty: 0n,
-    slashProposeInvalidAttestationsPenalty: 2_000n * 10n ** 18n,
-    slashAttestDescendantOfInvalidPenalty: 2_000n * 10n ** 18n,
-    slashUnknownPenalty: 2_000n * 10n ** 18n,
-    slashBroadcastedInvalidBlockPenalty: 2_000n * 10n ** 18n,
+    slashProposeInvalidAttestationsPenalty: 10_000n * 10n ** 18n,
+    slashAttestDescendantOfInvalidPenalty: 10_000n * 10n ** 18n,
+    slashUnknownPenalty: 10_000n * 10n ** 18n,
+    slashBroadcastedInvalidBlockPenalty: 10_000n * 10n ** 18n,
     slashGracePeriodL2Slots: 1_200,
     slashOffenseExpirationRounds: 8,
     slashMinPenaltyPercentage: 0.5,
@@ -253,38 +274,44 @@ export const testnetL2ChainConfig = {
     ...DefaultNetworkDBMapSizeConfig
 };
 export const mainnetL2ChainConfig = {
+    txPoolDeleteTxsAfterReorg: true,
+    disableTransactions: true,
     l1ChainId: 1,
     testAccounts: false,
     sponsoredFPC: false,
     p2pEnabled: true,
-    disableTransactions: true,
-    p2pBootstrapNodes: [],
-    seqMinTxsPerBlock: 0,
-    seqMaxTxsPerBlock: 0,
+    bootstrapNodes: [],
+    minTxsPerBlock: 0,
+    maxTxsPerBlock: 0,
+    buildCheckpointIfEmpty: true,
     realProofs: true,
     snapshotsUrls: [
         `${SNAPSHOTS_URL}/mainnet/`
     ],
     autoUpdate: 'notify',
     autoUpdateUrl: 'https://storage.googleapis.com/aztec-mainnet/auto-update/mainnet.json',
-    maxTxPoolSize: 100_000_000,
+    maxPendingTxCount: 0,
+    publicMetricsOptOut: true,
     publicIncludeMetrics,
     publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
     publicMetricsCollectFrom: [
         'sequencer'
     ],
+    blobAllowEmptySources: true,
     /** How many seconds an L1 slot lasts. */ ethereumSlotDuration: 12,
     /** How many seconds an L2 slots lasts (must be multiple of ethereum slot duration). */ aztecSlotDuration: 72,
     /** How many L2 slots an epoch lasts. */ aztecEpochDuration: 32,
     /** The target validator committee size. */ aztecTargetCommitteeSize: 24,
-    /** The number of epochs to lag behind the current epoch for validator selection. */ lagInEpochs: 2,
+    /** The number of epochs to lag behind the current epoch for validator selection. */ lagInEpochsForValidatorSet: 2,
+    /** The number of epochs to lag behind the current epoch for randao selection. */ lagInEpochsForRandao: 2,
+    /** The number of checkpoints to lag in the inbox (prevents sequencer DOS attacks). */ inboxLag: 1,
     /** The number of epochs after an epoch ends that proofs are still accepted. */ aztecProofSubmissionEpochs: 1,
     localEjectionThreshold: 196_000n * 10n ** 18n,
     /** How many sequencers must agree with a slash for it to be executed. */ slashingQuorum: 65,
     slashingRoundSizeInEpochs: 4,
     slashingExecutionDelayInRounds: 28,
     slashingLifetimeInRounds: 34,
-    slashingVetoer: EthAddress.ZERO,
+    slashingVetoer: EthAddress.fromString('0xBbB4aF368d02827945748b28CD4b2D42e4A37480'),
     slashingOffsetInRounds: 2,
     slashingDisableDuration: 259_200,
     slasherFlavor: 'tally',
@@ -323,25 +350,30 @@ export const devnetL2ChainConfig = {
     sponsoredFPC: true,
     p2pEnabled: true,
     disableTransactions: false,
-    p2pBootstrapNodes: [],
-    seqMinTxsPerBlock: 0,
-    seqMaxTxsPerBlock: 8,
+    bootstrapNodes: [],
+    minTxsPerBlock: 0,
+    maxTxsPerBlock: 8,
+    buildCheckpointIfEmpty: true,
     realProofs: false,
     snapshotsUrls: [],
     autoUpdate: 'config-and-version',
     autoUpdateUrl: '',
+    publicMetricsOptOut: true,
     publicIncludeMetrics,
     publicMetricsCollectorUrl: '',
     publicMetricsCollectFrom: [
         ''
     ],
-    maxTxPoolSize: 100_000_000,
+    maxPendingTxCount: 1_000,
+    txPoolDeleteTxsAfterReorg: true,
     // 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: 8,
     /** The target validator committee size. */ aztecTargetCommitteeSize: 1,
-    /** The number of epochs to lag behind the current epoch for validator selection. */ lagInEpochs: 1,
+    /** The number of epochs to lag behind the current epoch for validator selection. */ lagInEpochsForValidatorSet: 1,
+    /** The number of epochs to lag behind the current epoch for randao selection. */ lagInEpochsForRandao: 1,
+    /** The number of checkpoints to lag in the inbox (prevents sequencer DOS attacks). */ inboxLag: DefaultL1ContractsConfig.inboxLag,
     /** 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,
@@ -386,7 +418,7 @@ export function getL2ChainConfig(networkName) {
 function getDefaultDataDir(networkName) {
     return path.join(process.env.HOME || '~', '.aztec', networkName, 'data');
 }
-export function enrichEnvironmentWithChainConfig(networkName) {
+export function enrichEnvironmentWithChainName(networkName) {
     if (networkName === 'local') {
         return;
     }
@@ -395,18 +427,28 @@ export function enrichEnvironmentWithChainConfig(networkName) {
     if (!config) {
         throw new Error(`Unknown network name: ${networkName}`);
     }
-    enrichVar('BOOTSTRAP_NODES', config.p2pBootstrapNodes.join(','));
+    enrichEnvironmentWithChainConfig(config);
+}
+export function enrichEnvironmentWithChainConfig(config) {
+    enrichVar('BOOTSTRAP_NODES', config.bootstrapNodes.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('SEQ_MIN_TX_PER_BLOCK', config.minTxsPerBlock.toString());
+    enrichVar('SEQ_MAX_TX_PER_BLOCK', config.maxTxsPerBlock.toString());
+    if (config.blockDurationMs !== undefined) {
+        enrichVar('SEQ_BLOCK_DURATION_MS', config.blockDurationMs.toString());
+    }
+    if (config.buildCheckpointIfEmpty !== undefined) {
+        enrichVar('SEQ_BUILD_CHECKPOINT_IF_EMPTY', config.buildCheckpointIfEmpty.toString());
+    }
     enrichVar('PROVER_REAL_PROOFS', config.realProofs.toString());
     enrichVar('PXE_PROVER_ENABLED', config.realProofs.toString());
     enrichVar('SYNC_SNAPSHOTS_URLS', config.snapshotsUrls.join(','));
-    enrichVar('P2P_MAX_TX_POOL_SIZE', config.maxTxPoolSize.toString());
-    enrichVar('DATA_STORE_MAP_SIZE_KB', config.dbMapSizeKb.toString());
+    enrichVar('P2P_MAX_PENDING_TX_COUNT', config.maxPendingTxCount.toString());
+    enrichVar('P2P_TX_POOL_DELETE_TXS_AFTER_REORG', config.txPoolDeleteTxsAfterReorg.toString());
+    enrichVar('DATA_STORE_MAP_SIZE_KB', config.dataStoreMapSizeKb.toString());
     enrichVar('ARCHIVER_STORE_MAP_SIZE_KB', config.archiverStoreMapSizeKb.toString());
     enrichVar('NOTE_HASH_TREE_MAP_SIZE_KB', config.noteHashTreeMapSizeKb.toString());
     enrichVar('NULLIFIER_TREE_MAP_SIZE_KB', config.nullifierTreeMapSizeKb.toString());
@@ -432,11 +474,15 @@ export function enrichEnvironmentWithChainConfig(networkName) {
     if (config.publicMetricsCollectFrom) {
         enrichVar('PUBLIC_OTEL_COLLECT_FROM', config.publicMetricsCollectFrom.join(','));
     }
+    enrichVar('PUBLIC_OTEL_OPT_OUT', config.publicMetricsOptOut.toString());
     // 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_LAG_IN_EPOCHS_FOR_VALIDATOR_SET', config.lagInEpochsForValidatorSet.toString());
+    enrichVar('AZTEC_LAG_IN_EPOCHS_FOR_RANDAO', config.lagInEpochsForRandao.toString());
+    enrichVar('AZTEC_INBOX_LAG', config.inboxLag.toString());
     enrichVar('AZTEC_PROOF_SUBMISSION_EPOCHS', config.aztecProofSubmissionEpochs.toString());
     enrichVar('AZTEC_ACTIVATION_THRESHOLD', config.activationThreshold.toString());
     enrichVar('AZTEC_EJECTION_THRESHOLD', config.ejectionThreshold.toString());
@@ -454,6 +500,7 @@ export function enrichEnvironmentWithChainConfig(networkName) {
     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_SLASHING_DISABLE_DURATION', config.slashingDisableDuration.toString());
     enrichVar('AZTEC_EXIT_DELAY_SECONDS', config.exitDelaySeconds.toString());
     enrichEthAddressVar('AZTEC_SLASHING_VETOER', config.slashingVetoer.toString());
     // Slashing
@@ -470,6 +517,8 @@ export function enrichEnvironmentWithChainConfig(networkName) {
     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('SLASH_GRACE_PERIOD_L2_SLOTS', config.slashGracePeriodL2Slots.toString());
+    enrichVar('SLASH_EXECUTE_ROUNDS_LOOK_BACK', config.slashExecuteRoundsLookBack.toString());
     enrichVar('SENTINEL_ENABLED', config.sentinelEnabled.toString());
     enrichVar('TRANSACTIONS_DISABLED', config.disableTransactions.toString());
 }

package/dest/config/enrich_env.d.ts

@@ -1,4 +1,4 @@
 import type { EnvVar } from '@aztec/foundation/config';
 export declare function enrichVar(envVar: EnvVar, value: string | undefined): void;
 export declare function enrichEthAddressVar(envVar: EnvVar, value: string): void;
-//# sourceMappingURL=enrich_env.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW5yaWNoX2Vudi5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbmZpZy9lbnJpY2hfZW52LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRXZELHdCQUFnQixTQUFTLENBQUMsTUFBTSxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsTUFBTSxHQUFHLFNBQVMsUUFNbEU7QUFFRCx3QkFBZ0IsbUJBQW1CLENBQUMsTUFBTSxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsTUFBTSxRQUdoRSJ9

package/dest/config/get_l1_config.d.ts

@@ -1,8 +1,9 @@
-import { type L1ContractAddresses, getL1ContractsConfig } from '@aztec/ethereum';
+import type { L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
+import { getL1ContractsConfig } from '@aztec/ethereum/queries';
 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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0X2wxX2NvbmZpZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbmZpZy9nZXRfbDFfY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFDakYsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDL0QsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRTNELHdCQUFzQixXQUFXLENBQy9CLGVBQWUsRUFBRSxVQUFVLEVBQzNCLFNBQVMsRUFBRSxNQUFNLEVBQUUsRUFDbkIsU0FBUyxFQUFFLE1BQU0sRUFDakIsYUFBYSxHQUFFLE1BQU0sR0FBRyxXQUF5QixHQUNoRCxPQUFPLENBQUM7SUFBRSxTQUFTLEVBQUUsbUJBQW1CLENBQUM7SUFBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLFVBQVUsQ0FBQyxPQUFPLG9CQUFvQixDQUFDLENBQUMsQ0FBQTtDQUFFLENBQUMsQ0FVdkc7QUFFRCx3QkFBc0IseUJBQXlCLENBQUMsU0FBUyxFQUFFLE1BQU0sRUFBRSxFQUFFLFNBQVMsRUFBRSxNQUFNLHVCQU9yRiJ9

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

@@ -1 +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"}
+{"version":3,"file":"get_l1_config.d.ts","sourceRoot":"","sources":["../../src/config/get_l1_config.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAC/D,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

@@ -1,4 +1,6 @@
-import { RegistryContract, getL1ContractsConfig, getPublicClient } from '@aztec/ethereum';
+import { getPublicClient } from '@aztec/ethereum/client';
+import { RegistryContract } from '@aztec/ethereum/contracts';
+import { getL1ContractsConfig } from '@aztec/ethereum/queries';
 import { EthAddress } from '@aztec/foundation/eth-address';
 export async function getL1Config(registryAddress, l1RpcUrls, l1ChainId, rollupVersion = 'canonical') {
     const publicClient = getPublicClient({

package/dest/config/index.d.ts

@@ -2,4 +2,4 @@ export * from './cached_fetch.js';
 export * from './chain_l2_config.js';
 export * from './get_l1_config.js';
 export * from './network_config.js';
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb25maWcvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxtQkFBbUIsQ0FBQztBQUNsQyxjQUFjLHNCQUFzQixDQUFDO0FBQ3JDLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsY0FBYyxxQkFBcUIsQ0FBQyJ9

package/dest/config/network_config.d.ts

@@ -1,11 +1,12 @@
 import { type NetworkConfig, type NetworkNames } from '@aztec/foundation/config';
 /**
  * Fetches remote network configuration from GitHub with caching support.
- * Uses the reusable cachedFetch utility.
+ * Uses the reusable cachedFetch utility. Falls back to metadata.aztec.network if the default URL fails.
  *
  * @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
+ * @returns Remote configuration for the specified network, or undefined if network not found in config
+ * @throws Error if both primary and fallback URLs fail to fetch
  */
 export declare function getNetworkConfig(networkName: NetworkNames, cacheDir?: string): Promise<NetworkConfig | undefined>;
 /**
@@ -14,6 +15,8 @@ export declare function getNetworkConfig(networkName: NetworkNames, cacheDir?: s
  * from the remote config, following the same pattern as enrichEnvironmentWithChainConfig().
  *
  * @param networkName - The network name to fetch remote config for
+ * @throws Error if network config fetch fails (network errors, parse errors, etc.)
+ * Does not throw if the network simply doesn't exist in the config - just returns without enriching
  */
 export declare function enrichEnvironmentWithNetworkConfig(networkName: NetworkNames): Promise<void>;
-//# sourceMappingURL=network_config.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmV0d29ya19jb25maWcuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb25maWcvbmV0d29ya19jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssYUFBYSxFQUEwQixLQUFLLFlBQVksRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBYXpHOzs7Ozs7OztHQVFHO0FBQ0gsd0JBQXNCLGdCQUFnQixDQUNwQyxXQUFXLEVBQUUsWUFBWSxFQUN6QixRQUFRLENBQUMsRUFBRSxNQUFNLEdBQ2hCLE9BQU8sQ0FBQyxhQUFhLEdBQUcsU0FBUyxDQUFDLENBOEJwQztBQXVERDs7Ozs7Ozs7R0FRRztBQUNILHdCQUFzQixrQ0FBa0MsQ0FBQyxXQUFXLEVBQUUsWUFBWSxpQkEyQmpGIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"network_config.d.ts","sourceRoot":"","sources":["../../src/config/network_config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAA0B,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAYzG;;;;;;;GAOG;AACH,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,YAAY,EACzB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAiDpC;AAED;;;;;;GAMG;AACH,wBAAsB,kCAAkC,CAAC,WAAW,EAAE,YAAY,iBAoBjF"}
+{"version":3,"file":"network_config.d.ts","sourceRoot":"","sources":["../../src/config/network_config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAA0B,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAazG;;;;;;;;GAQG;AACH,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,YAAY,EACzB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CA8BpC;AAuDD;;;;;;;;GAQG;AACH,wBAAsB,kCAAkC,CAAC,WAAW,EAAE,YAAY,iBA2BjF"}

package/dest/config/network_config.js

@@ -4,20 +4,52 @@ 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 FALLBACK_CONFIG_URL = 'https://metadata.aztec.network/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.
+ * Uses the reusable cachedFetch utility. Falls back to metadata.aztec.network if the default URL fails.
  *
  * @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
+ * @returns Remote configuration for the specified network, or undefined if network not found in config
+ * @throws Error if both primary and fallback URLs fail to fetch
  */ export async function getNetworkConfig(networkName, cacheDir) {
-    let url;
+    // Try with the primary URL (env var or default)
     const configLocation = process.env.NETWORK_CONFIG_LOCATION || DEFAULT_CONFIG_URL;
-    if (!configLocation) {
-        return undefined;
+    let primaryError;
+    let config;
+    // First try the primary config location
+    try {
+        config = await fetchNetworkConfigFromUrl(configLocation, networkName, cacheDir);
+    } catch (error) {
+        primaryError = error;
     }
+    // If primary fails and we were using the default URL, try the fallback
+    if (!config && configLocation === DEFAULT_CONFIG_URL) {
+        try {
+            config = await fetchNetworkConfigFromUrl(FALLBACK_CONFIG_URL, networkName, cacheDir);
+        } catch  {
+            // Both failed - throw the primary error
+            if (primaryError) {
+                throw primaryError;
+            }
+        }
+    } else if (primaryError) {
+        // Primary failed and no fallback to try
+        throw primaryError;
+    }
+    return config;
+}
+/**
+ * Helper function to fetch network config from a specific URL.
+ * @param configLocation - The URL or file path to fetch from
+ * @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 network not found in config, or undefined if URL invalid
+ * @throws Error if fetch/parse fails
+ */ async function fetchNetworkConfigFromUrl(configLocation, networkName, cacheDir) {
+    let url;
     try {
         if (configLocation.includes('://')) {
             url = new URL(configLocation);
@@ -29,28 +61,24 @@ const NETWORK_CONFIG_CACHE_DURATION_MS = 60 * 60 * 1000; // 1 hour
     if (!url) {
         return undefined;
     }
-    try {
-        let rawConfig;
-        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  {
+    let rawConfig;
+    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;
     }
 }
@@ -60,6 +88,8 @@ const NETWORK_CONFIG_CACHE_DURATION_MS = 60 * 60 * 1000; // 1 hour
  * from the remote config, following the same pattern as enrichEnvironmentWithChainConfig().
  *
  * @param networkName - The network name to fetch remote config for
+ * @throws Error if network config fetch fails (network errors, parse errors, etc.)
+ * Does not throw if the network simply doesn't exist in the config - just returns without enriching
  */ export async function enrichEnvironmentWithNetworkConfig(networkName) {
     if (networkName === 'local') {
         return; // No remote config for local development
@@ -67,7 +97,7 @@ const NETWORK_CONFIG_CACHE_DURATION_MS = 60 * 60 * 1000; // 1 hour
     const cacheDir = process.env.DATA_DIRECTORY ? join(process.env.DATA_DIRECTORY, 'cache') : undefined;
     const networkConfig = await getNetworkConfig(networkName, cacheDir);
     if (!networkConfig) {
-        return;
+        return; // Network not found in config, continue without enriching
     }
     enrichVar('BOOTSTRAP_NODES', networkConfig.bootnodes.join(','));
     enrichVar('L1_CHAIN_ID', String(networkConfig.l1ChainId));
@@ -76,4 +106,10 @@ const NETWORK_CONFIG_CACHE_DURATION_MS = 60 * 60 * 1000; // 1 hour
     if (networkConfig.feeAssetHandlerAddress) {
         enrichEthAddressVar('FEE_ASSET_HANDLER_CONTRACT_ADDRESS', networkConfig.feeAssetHandlerAddress.toString());
     }
+    if (networkConfig.blobFileStoreUrls?.length) {
+        enrichVar('BLOB_FILE_STORE_URLS', networkConfig.blobFileStoreUrls.join(','));
+    }
+    if (networkConfig.blockDurationMs !== undefined) {
+        enrichVar('SEQ_BLOCK_DURATION_MS', String(networkConfig.blockDurationMs));
+    }
 }

package/dest/utils/aztec.d.ts

@@ -1,8 +1,10 @@
 import { type ContractArtifact, type FunctionAbi } from '@aztec/aztec.js/abi';
 import { EthAddress } from '@aztec/aztec.js/addresses';
-import { type DeployL1ContractsReturnType, type L1ContractsConfig, type Operator, RollupContract } from '@aztec/ethereum';
-import { Fr } from '@aztec/foundation/fields';
-import type { LogFn, Logger } from '@aztec/foundation/log';
+import type { L1ContractsConfig } from '@aztec/ethereum/config';
+import { RollupContract } from '@aztec/ethereum/contracts';
+import type { Operator } from '@aztec/ethereum/deploy-aztec-l1-contracts';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { type LogFn } from '@aztec/foundation/log';
 import type { NoirPackageConfig } from '@aztec/foundation/noir';
 /**
  * Helper to get an ABI function or throw error if it doesn't exist.
@@ -11,15 +13,7 @@ import type { NoirPackageConfig } from '@aztec/foundation/noir';
  * @returns The function's ABI.
  */
 export declare function getFunctionAbi(artifact: ContractArtifact, fnName: string): FunctionAbi;
-/**
- * Function to execute the 'deployRollupContracts' command.
- * @param rpcUrls - The RPC URL of the ethereum node.
- * @param chainId - The chain ID of the L1 host.
- * @param privateKey - The private key to be used in contract deployment.
- * @param mnemonic - The mnemonic to be used in contract deployment.
- */
-export declare function deployAztecContracts(rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mnemonicIndex: number, salt: number | undefined, initialValidators: Operator[], genesisArchiveRoot: Fr, feeJuicePortalInitialBalance: bigint, acceleratedTestDeployments: boolean, config: L1ContractsConfig, existingToken: EthAddress | undefined, realVerifier: boolean, createVerificationJson: string | false, debugLogger: Logger): Promise<DeployL1ContractsReturnType>;
-export declare function deployNewRollupContracts(registryAddress: EthAddress, rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mnemonicIndex: number, salt: number | undefined, initialValidators: Operator[], genesisArchiveRoot: Fr, feeJuicePortalInitialBalance: bigint, config: L1ContractsConfig, realVerifier: boolean, createVerificationJson: string | false, logger: Logger): Promise<{
+export declare function deployNewRollupContracts(registryAddress: EthAddress, rpcUrls: string[], privateKey: string | undefined, chainId: number, mnemonic: string, mnemonicIndex: number, initialValidators: Operator[], genesisArchiveRoot: Fr, feeJuicePortalInitialBalance: bigint, config: L1ContractsConfig, realVerifier: boolean): Promise<{
     rollup: RollupContract;
     slashFactoryAddress: EthAddress;
 }>;
@@ -60,4 +54,4 @@ export declare const stripLeadingHex: (hex: string) => string;
  */
 export declare const addLeadingHex: (hex: string) => `0x${string}`;
 export declare function prettyPrintNargoToml(config: NoirPackageConfig): string;
-//# sourceMappingURL=aztec.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXp0ZWMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9henRlYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsS0FBSyxnQkFBZ0IsRUFDckIsS0FBSyxXQUFXLEVBSWpCLE1BQU0scUJBQXFCLENBQUM7QUFDN0IsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3ZELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDaEUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLDJDQUEyQyxDQUFDO0FBRTFFLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsS0FBSyxLQUFLLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQVdoRTs7Ozs7R0FLRztBQUNILHdCQUFnQixjQUFjLENBQUMsUUFBUSxFQUFFLGdCQUFnQixFQUFFLE1BQU0sRUFBRSxNQUFNLEdBQUcsV0FBVyxDQU10RjtBQUVELHdCQUFzQix3QkFBd0IsQ0FDNUMsZUFBZSxFQUFFLFVBQVUsRUFDM0IsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUNqQixVQUFVLEVBQUUsTUFBTSxHQUFHLFNBQVMsRUFDOUIsT0FBTyxFQUFFLE1BQU0sRUFDZixRQUFRLEVBQUUsTUFBTSxFQUNoQixhQUFhLEVBQUUsTUFBTSxFQUNyQixpQkFBaUIsRUFBRSxRQUFRLEVBQUUsRUFDN0Isa0JBQWtCLEVBQUUsRUFBRSxFQUN0Qiw0QkFBNEIsRUFBRSxNQUFNLEVBQ3BDLE1BQU0sRUFBRSxpQkFBaUIsRUFDekIsWUFBWSxFQUFFLE9BQU8sR0FDcEIsT0FBTyxDQUFDO0lBQUUsTUFBTSxFQUFFLGNBQWMsQ0FBQztJQUFDLG1CQUFtQixFQUFFLFVBQVUsQ0FBQTtDQUFFLENBQUMsQ0FnRHRFO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQXNCLHVCQUF1QixJQUFJLE9BQU8sQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUtqRTtBQUVEOzs7O0dBSUc7QUFDSCx3QkFBc0IsbUJBQW1CLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxHQUFHLEVBQUUsS0FBSyw2QkE0QnBFO0FBRUQ7Ozs7Ozs7R0FPRztBQUNILHdCQUFzQixNQUFNLENBQUMsWUFBWSxFQUFFLE1BQU0sRUFBRSxZQUFZLEVBQUUsTUFBTSxFQUFFLGFBQWEsRUFBRSxNQUFNLEVBQUUsRUFBRSxHQUFHLEVBQUUsS0FBSzs7OztHQU8zRztBQUVEOzs7O0dBSUc7QUFDSCxlQUFPLE1BQU0sZUFBZSx5QkFLM0IsQ0FBQztBQUVGOzs7O0dBSUc7QUFDSCxlQUFPLE1BQU0sYUFBYSxnQ0FLekIsQ0FBQztBQU9GLHdCQUFnQixvQkFBb0IsQ0FBQyxNQUFNLEVBQUUsaUJBQWlCLEdBQUcsTUFBTSxDQVV0RSJ9