@aztec/ethereum 0.62.0 → 0.63.1

package/dest/config.d.ts

@@ -0,0 +1,17 @@
+import { type ConfigMappingsType } from '@aztec/foundation/config';
+export type L1ContractsConfig = {
+    /** How many seconds an L1 slot lasts. */
+    ethereumSlotDuration: number;
+    /** How many seconds an L2 slots lasts (must be multiple of ethereum slot duration). */
+    aztecSlotDuration: number;
+    /** How many L2 slots an epoch lasts. */
+    aztecEpochDuration: number;
+    /** The target validator committee size. */
+    aztecTargetCommitteeSize: number;
+    /** The number of L2 slots that we can wait for a proof of an epoch to be produced. */
+    aztecEpochProofClaimWindowInL2Slots: number;
+};
+export declare const DefaultL1ContractsConfig: L1ContractsConfig;
+export declare const l1ContractsConfigMappings: ConfigMappingsType<L1ContractsConfig>;
+export declare function getL1ContractsConfigEnvVars(): L1ContractsConfig;
+//# sourceMappingURL=config.d.ts.map

package/dest/config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAA6C,MAAM,0BAA0B,CAAC;AAE9G,MAAM,MAAM,iBAAiB,GAAG;IAC9B,yCAAyC;IACzC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,uFAAuF;IACvF,iBAAiB,EAAE,MAAM,CAAC;IAC1B,wCAAwC;IACxC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,2CAA2C;IAC3C,wBAAwB,EAAE,MAAM,CAAC;IACjC,sFAAsF;IACtF,mCAAmC,EAAE,MAAM,CAAC;CAC7C,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,iBAMtC,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,kBAAkB,CAAC,iBAAiB,CA0B3E,CAAC;AAEF,wBAAgB,2BAA2B,IAAI,iBAAiB,CAE/D"}

package/dest/config.js

@@ -0,0 +1,39 @@
+import { getConfigFromMappings, numberConfigHelper } from '@aztec/foundation/config';
+export const DefaultL1ContractsConfig = {
+    ethereumSlotDuration: 12,
+    aztecSlotDuration: 24,
+    aztecEpochDuration: 16,
+    aztecTargetCommitteeSize: 48,
+    aztecEpochProofClaimWindowInL2Slots: 13,
+};
+export const l1ContractsConfigMappings = {
+    ethereumSlotDuration: {
+        env: 'ETHEREUM_SLOT_DURATION',
+        description: 'How many seconds an L1 slot lasts.',
+        ...numberConfigHelper(DefaultL1ContractsConfig.ethereumSlotDuration),
+    },
+    aztecSlotDuration: {
+        env: 'AZTEC_SLOT_DURATION',
+        description: 'How many seconds an L2 slots lasts (must be multiple of ethereum slot duration).',
+        ...numberConfigHelper(DefaultL1ContractsConfig.aztecSlotDuration),
+    },
+    aztecEpochDuration: {
+        env: 'AZTEC_EPOCH_DURATION',
+        description: `How many L2 slots an epoch lasts (maximum AZTEC_MAX_EPOCH_DURATION).`,
+        ...numberConfigHelper(DefaultL1ContractsConfig.aztecEpochDuration),
+    },
+    aztecTargetCommitteeSize: {
+        env: 'AZTEC_TARGET_COMMITTEE_SIZE',
+        description: 'The target validator committee size.',
+        ...numberConfigHelper(DefaultL1ContractsConfig.aztecTargetCommitteeSize),
+    },
+    aztecEpochProofClaimWindowInL2Slots: {
+        env: 'AZTEC_EPOCH_PROOF_CLAIM_WINDOW_IN_L2_SLOTS',
+        description: 'The number of L2 slots that we can wait for a proof of an epoch to be produced.',
+        ...numberConfigHelper(DefaultL1ContractsConfig.aztecEpochProofClaimWindowInL2Slots),
+    },
+};
+export function getL1ContractsConfigEnvVars() {
+    return getConfigFromMappings(l1ContractsConfigMappings);
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQTJCLHFCQUFxQixFQUFFLGtCQUFrQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFlOUcsTUFBTSxDQUFDLE1BQU0sd0JBQXdCLEdBQXNCO0lBQ3pELG9CQUFvQixFQUFFLEVBQUU7SUFDeEIsaUJBQWlCLEVBQUUsRUFBRTtJQUNyQixrQkFBa0IsRUFBRSxFQUFFO0lBQ3RCLHdCQUF3QixFQUFFLEVBQUU7SUFDNUIsbUNBQW1DLEVBQUUsRUFBRTtDQUN4QyxDQUFDO0FBRUYsTUFBTSxDQUFDLE1BQU0seUJBQXlCLEdBQTBDO0lBQzlFLG9CQUFvQixFQUFFO1FBQ3BCLEdBQUcsRUFBRSx3QkFBd0I7UUFDN0IsV0FBVyxFQUFFLG9DQUFvQztRQUNqRCxHQUFHLGtCQUFrQixDQUFDLHdCQUF3QixDQUFDLG9CQUFvQixDQUFDO0tBQ3JFO0lBQ0QsaUJBQWlCLEVBQUU7UUFDakIsR0FBRyxFQUFFLHFCQUFxQjtRQUMxQixXQUFXLEVBQUUsa0ZBQWtGO1FBQy9GLEdBQUcsa0JBQWtCLENBQUMsd0JBQXdCLENBQUMsaUJBQWlCLENBQUM7S0FDbEU7SUFDRCxrQkFBa0IsRUFBRTtRQUNsQixHQUFHLEVBQUUsc0JBQXNCO1FBQzNCLFdBQVcsRUFBRSxzRUFBc0U7UUFDbkYsR0FBRyxrQkFBa0IsQ0FBQyx3QkFBd0IsQ0FBQyxrQkFBa0IsQ0FBQztLQUNuRTtJQUNELHdCQUF3QixFQUFFO1FBQ3hCLEdBQUcsRUFBRSw2QkFBNkI7UUFDbEMsV0FBVyxFQUFFLHNDQUFzQztRQUNuRCxHQUFHLGtCQUFrQixDQUFDLHdCQUF3QixDQUFDLHdCQUF3QixDQUFDO0tBQ3pFO0lBQ0QsbUNBQW1DLEVBQUU7UUFDbkMsR0FBRyxFQUFFLDRDQUE0QztRQUNqRCxXQUFXLEVBQUUsaUZBQWlGO1FBQzlGLEdBQUcsa0JBQWtCLENBQUMsd0JBQXdCLENBQUMsbUNBQW1DLENBQUM7S0FDcEY7Q0FDRixDQUFDO0FBRUYsTUFBTSxVQUFVLDJCQUEyQjtJQUN6QyxPQUFPLHFCQUFxQixDQUFDLHlCQUF5QixDQUFDLENBQUM7QUFDMUQsQ0FBQyJ9

package/dest/deploy_l1_contracts.d.ts

@@ -5,6 +5,7 @@ import { type DebugLogger } from '@aztec/foundation/log';
 import type { Abi, Narrow } from 'abitype';
 import { type Account, type Chain, type Hex, type HttpTransport, type PublicClient, type WalletClient } from 'viem';
 import { type HDAccount, type PrivateKeyAccount } from 'viem/accounts';
+import { type L1ContractsConfig } from './config.js';
 import { type L1ContractAddresses } from './l1_contract_addresses.js';
 /**
  * Return type of the deployL1Contract function.
@@ -81,47 +82,35 @@ export interface L1ContractArtifactsForDeployment {
      */
     feeJuicePortal: ContractArtifacts;
     /**
-     * Nomismatokopio contract artifacts.
+     * CoinIssuer contract artifacts.
      */
-    nomismatokopio: ContractArtifacts;
+    coinIssuer: ContractArtifacts;
     /**
-     * Sysstia contract artifacts.
+     * RewardDistributor contract artifacts.
      */
-    sysstia: ContractArtifacts;
+    rewardDistributor: ContractArtifacts;
     /**
-     * Gerousia contract artifacts.
+     * GovernanceProposer contract artifacts.
      */
-    gerousia: ContractArtifacts;
+    governanceProposer: ContractArtifacts;
     /**
-     * Apella contract artifacts.
+     * Governance contract artifacts.
      */
-    apella: ContractArtifacts;
+    governance: ContractArtifacts;
 }
 export declare const l1Artifacts: L1ContractArtifactsForDeployment;
-export interface DeployL1ContractsArgs {
-    /**
-     * The address of the L2 Fee Juice contract.
-     */
+export interface DeployL1ContractsArgs extends L1ContractsConfig {
+    /** The address of the L2 Fee Juice contract. */
     l2FeeJuiceAddress: AztecAddress;
-    /**
-     * The vk tree root.
-     */
+    /** The vk tree root. */
     vkTreeRoot: Fr;
-    /**
-     * The protocol contract tree root.
-     */
+    /** The protocol contract tree root. */
     protocolContractTreeRoot: Fr;
-    /**
-     * The block number to assume proven through.
-     */
+    /** The block number to assume proven through. */
     assumeProvenThrough?: number;
-    /**
-     * The salt for CREATE2 deployment.
-     */
+    /** The salt for CREATE2 deployment. */
     salt: number | undefined;
-    /**
-     * The initial validators for the rollup contract.
-     */
+    /** The initial validators for the rollup contract. */
     initialValidators?: EthAddress[];
 }
 export type L1Clients = {

package/dest/deploy_l1_contracts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy_l1_contracts.d.ts","sourceRoot":"","sources":["../src/deploy_l1_contracts.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"deploy_l1_contracts.d.ts","sourceRoot":"","sources":["../src/deploy_l1_contracts.ts"],"names":[],"mappings":"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"}

package/dest/deploy_l1_contracts.js

@@ -1,5 +1,5 @@
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { ApellaAbi, ApellaBytecode, FeeJuicePortalAbi, FeeJuicePortalBytecode, GerousiaAbi, GerousiaBytecode, InboxAbi, InboxBytecode, NomismatokopioAbi, NomismatokopioBytecode, OutboxAbi, OutboxBytecode, RegistryAbi, RegistryBytecode, RollupAbi, RollupBytecode, RollupLinkReferences, SysstiaAbi, SysstiaBytecode, TestERC20Abi, TestERC20Bytecode, TxsDecoderAbi, TxsDecoderBytecode, } from '@aztec/l1-artifacts';
+import { CoinIssuerAbi, CoinIssuerBytecode, FeeJuicePortalAbi, FeeJuicePortalBytecode, GovernanceAbi, GovernanceBytecode, GovernanceProposerAbi, GovernanceProposerBytecode, InboxAbi, InboxBytecode, OutboxAbi, OutboxBytecode, RegistryAbi, RegistryBytecode, RewardDistributorAbi, RewardDistributorBytecode, RollupAbi, RollupBytecode, RollupLinkReferences, TestERC20Abi, TestERC20Bytecode, TxsDecoderAbi, TxsDecoderBytecode, } from '@aztec/l1-artifacts';
 import { concatHex, createPublicClient, createWalletClient, encodeDeployData, getAddress, getContract, getContractAddress, http, numberToHex, padHex, } from 'viem';
 import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
 import { foundry } from 'viem/chains';
@@ -38,21 +38,21 @@ export const l1Artifacts = {
         contractAbi: FeeJuicePortalAbi,
         contractBytecode: FeeJuicePortalBytecode,
     },
-    sysstia: {
-        contractAbi: SysstiaAbi,
-        contractBytecode: SysstiaBytecode,
+    rewardDistributor: {
+        contractAbi: RewardDistributorAbi,
+        contractBytecode: RewardDistributorBytecode,
     },
-    nomismatokopio: {
-        contractAbi: NomismatokopioAbi,
-        contractBytecode: NomismatokopioBytecode,
+    coinIssuer: {
+        contractAbi: CoinIssuerAbi,
+        contractBytecode: CoinIssuerBytecode,
     },
-    gerousia: {
-        contractAbi: GerousiaAbi,
-        contractBytecode: GerousiaBytecode,
+    governanceProposer: {
+        contractAbi: GovernanceProposerAbi,
+        contractBytecode: GovernanceProposerBytecode,
     },
-    apella: {
-        contractAbi: ApellaAbi,
-        contractBytecode: ApellaBytecode,
+    governance: {
+        contractAbi: GovernanceAbi,
+        contractBytecode: GovernanceBytecode,
     },
 };
 /**
@@ -102,12 +102,11 @@ export const deployL1Contracts = async (rpcUrl, account, chain, logger, args) =>
         return await (await fetch(rpcUrl, content)).json();
     };
     if (isAnvilTestChain(chain.id)) {
-        const interval = 12; // @todo  #8084
-        const res = await rpcCall('anvil_setBlockTimestampInterval', [interval]);
+        const res = await rpcCall('anvil_setBlockTimestampInterval', [args.ethereumSlotDuration]);
         if (res.error) {
             throw new Error(`Error setting block interval: ${res.error.message}`);
         }
-        logger.info(`Set block interval to ${interval}`);
+        logger.info(`Set block interval to ${args.ethereumSlotDuration}`);
     }
     logger.info(`Deploying contracts from ${account.address.toString()}...`);
     const walletClient = createWalletClient({ account, chain, transport: http(rpcUrl) });
@@ -122,29 +121,29 @@ export const deployL1Contracts = async (rpcUrl, account, chain, logger, args) =>
     // @note These numbers are just chosen to make testing simple.
     const quorumSize = 6n;
     const roundSize = 10n;
-    const gerousiaAddress = await govDeployer.deploy(l1Artifacts.gerousia, [
+    const governanceProposerAddress = await govDeployer.deploy(l1Artifacts.governanceProposer, [
         registryAddress.toString(),
         quorumSize,
         roundSize,
     ]);
-    logger.info(`Deployed Gerousia at ${gerousiaAddress}`);
-    const apellaAddress = await govDeployer.deploy(l1Artifacts.apella, [
+    logger.info(`Deployed GovernanceProposer at ${governanceProposerAddress}`);
+    const governanceAddress = await govDeployer.deploy(l1Artifacts.governance, [
         feeJuiceAddress.toString(),
-        gerousiaAddress.toString(),
+        governanceProposerAddress.toString(),
     ]);
-    logger.info(`Deployed Apella at ${apellaAddress}`);
-    const nomismatokopioAddress = await govDeployer.deploy(l1Artifacts.nomismatokopio, [
+    logger.info(`Deployed Governance at ${governanceAddress}`);
+    const coinIssuerAddress = await govDeployer.deploy(l1Artifacts.coinIssuer, [
         feeJuiceAddress.toString(),
         1n * 10n ** 18n, // @todo  #8084
-        apellaAddress.toString(),
+        governanceAddress.toString(),
     ]);
-    logger.info(`Deployed Nomismatokopio at ${nomismatokopioAddress}`);
-    const sysstiaAddress = await govDeployer.deploy(l1Artifacts.sysstia, [
+    logger.info(`Deployed CoinIssuer at ${coinIssuerAddress}`);
+    const rewardDistributorAddress = await govDeployer.deploy(l1Artifacts.rewardDistributor, [
         feeJuiceAddress.toString(),
         registryAddress.toString(),
-        apellaAddress.toString(),
+        governanceAddress.toString(),
     ]);
-    logger.info(`Deployed Sysstia at ${sysstiaAddress}`);
+    logger.info(`Deployed RewardDistributor at ${rewardDistributorAddress}`);
     await govDeployer.waitForDeployments();
     logger.info(`All governance contracts deployed`);
     const deployer = new L1Deployer(walletClient, publicClient, args.salt, logger);
@@ -154,15 +153,22 @@ export const deployL1Contracts = async (rpcUrl, account, chain, logger, args) =>
         args.l2FeeJuiceAddress.toString(),
     ]);
     logger.info(`Deployed Fee Juice Portal at ${feeJuicePortalAddress}`);
+    const rollupArgs = {
+        aztecSlotDuration: args.aztecSlotDuration,
+        aztecEpochDuration: args.aztecEpochDuration,
+        targetCommitteeSize: args.aztecTargetCommitteeSize,
+        aztecEpochProofClaimWindowInL2Slots: args.aztecEpochProofClaimWindowInL2Slots,
+    };
     const rollupAddress = await deployer.deploy(l1Artifacts.rollup, [
         feeJuicePortalAddress.toString(),
-        sysstiaAddress.toString(),
+        rewardDistributorAddress.toString(),
         args.vkTreeRoot.toString(),
         args.protocolContractTreeRoot.toString(),
         account.address.toString(),
         args.initialValidators?.map(v => v.toString()) ?? [],
+        rollupArgs,
     ]);
-    logger.info(`Deployed Rollup at ${rollupAddress}`);
+    logger.info(`Deployed Rollup at ${rollupAddress}`, rollupArgs);
     await deployer.waitForDeployments();
     logger.info(`All core contracts deployed`);
     const feeJuicePortal = getContract({
@@ -186,7 +192,7 @@ export const deployL1Contracts = async (rpcUrl, account, chain, logger, args) =>
     //        because there is circular dependency hell. This is a temporary solution. #3342
     // @todo  #8084
     // fund the portal contract with Fee Juice
-    const FEE_JUICE_INITIAL_MINT = 20000000000;
+    const FEE_JUICE_INITIAL_MINT = 200000000000000;
     const mintTxHash = await feeJuice.write.mint([feeJuicePortalAddress.toString(), FEE_JUICE_INITIAL_MINT], {});
     // @note  This is used to ensure we fully wait for the transaction when running against a real chain
     //        otherwise we execute subsequent transactions too soon
@@ -246,12 +252,12 @@ export const deployL1Contracts = async (rpcUrl, account, chain, logger, args) =>
     else {
         logger.verbose(`Registry ${registryAddress} has already registered rollup ${rollupAddress}`);
     }
-    // If the owner is not the Apella contract, transfer ownership to the Apella contract
-    if ((await registryContract.read.owner([])) !== getAddress(apellaAddress.toString())) {
-        const transferOwnershipTxHash = await registryContract.write.transferOwnership([getAddress(apellaAddress.toString())], {
+    // If the owner is not the Governance contract, transfer ownership to the Governance contract
+    if ((await registryContract.read.owner([])) !== getAddress(governanceAddress.toString())) {
+        const transferOwnershipTxHash = await registryContract.write.transferOwnership([getAddress(governanceAddress.toString())], {
             account,
         });
-        logger.verbose(`Transferring the ownership of the registry contract at ${registryAddress} to the Apella ${apellaAddress} in tx ${transferOwnershipTxHash}`);
+        logger.verbose(`Transferring the ownership of the registry contract at ${registryAddress} to the Governance ${governanceAddress} in tx ${transferOwnershipTxHash}`);
         txHashes.push(transferOwnershipTxHash);
     }
     // Wait for all actions to be mined
@@ -264,10 +270,10 @@ export const deployL1Contracts = async (rpcUrl, account, chain, logger, args) =>
         outboxAddress,
         feeJuiceAddress,
         feeJuicePortalAddress,
-        nomismatokopioAddress,
-        sysstiaAddress,
-        gerousiaAddress,
-        apellaAddress,
+        coinIssuerAddress,
+        rewardDistributorAddress,
+        governanceProposerAddress,
+        governanceAddress,
     };
     return {
         walletClient,
@@ -392,4 +398,4 @@ export async function deployL1Contract(walletClient, publicClient, abi, bytecode
     return { address: EthAddress.fromString(address), txHash };
 }
 // docs:end:deployL1Contract
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"deploy_l1_contracts.js","sourceRoot":"","sources":["../src/deploy_l1_contracts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,EACL,SAAS,EACT,cAAc,EACd,iBAAiB,EACjB,sBAAsB,EACtB,WAAW,EACX,gBAAgB,EAChB,QAAQ,EACR,aAAa,EACb,iBAAiB,EACjB,sBAAsB,EACtB,SAAS,EACT,cAAc,EACd,WAAW,EACX,gBAAgB,EAChB,SAAS,EACT,cAAc,EACd,oBAAoB,EACpB,UAAU,EACV,eAAe,EACf,YAAY,EACZ,iBAAiB,EACjB,aAAa,EACb,kBAAkB,GACnB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAOL,SAAS,EACT,kBAAkB,EAClB,kBAAkB,EAClB,gBAAgB,EAChB,UAAU,EACV,WAAW,EACX,kBAAkB,EAClB,IAAI,EACJ,WAAW,EACX,MAAM,GACP,MAAM,MAAM,CAAC;AACd,OAAO,EAA0C,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAC/G,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAmGvD,MAAM,CAAC,MAAM,WAAW,GAAqC;IAC3D,QAAQ,EAAE;QACR,WAAW,EAAE,WAAW;QACxB,gBAAgB,EAAE,gBAAgB;KACnC;IACD,KAAK,EAAE;QACL,WAAW,EAAE,QAAQ;QACrB,gBAAgB,EAAE,aAAa;KAChC;IACD,MAAM,EAAE;QACN,WAAW,EAAE,SAAS;QACtB,gBAAgB,EAAE,cAAc;KACjC;IACD,MAAM,EAAE;QACN,WAAW,EAAE,SAAS;QACtB,gBAAgB,EAAE,cAAc;QAChC,SAAS,EAAE;YACT,cAAc,EAAE,oBAAoB;YACpC,WAAW,EAAE;gBACX,UAAU,EAAE;oBACV,WAAW,EAAE,aAAa;oBAC1B,gBAAgB,EAAE,kBAAkB;iBACrC;aACF;SACF;KACF;IACD,QAAQ,EAAE;QACR,WAAW,EAAE,YAAY;QACzB,gBAAgB,EAAE,iBAAiB;KACpC;IACD,cAAc,EAAE;QACd,WAAW,EAAE,iBAAiB;QAC9B,gBAAgB,EAAE,sBAAsB;KACzC;IACD,OAAO,EAAE;QACP,WAAW,EAAE,UAAU;QACvB,gBAAgB,EAAE,eAAe;KAClC;IACD,cAAc,EAAE;QACd,WAAW,EAAE,iBAAiB;QAC9B,gBAAgB,EAAE,sBAAsB;KACzC;IACD,QAAQ,EAAE;QACR,WAAW,EAAE,WAAW;QACxB,gBAAgB,EAAE,gBAAgB;KACnC;IACD,MAAM,EAAE;QACN,WAAW,EAAE,SAAS;QACtB,gBAAgB,EAAE,cAAc;KACjC;CACF,CAAC;AAkCF;;;;;;GAMG;AACH,MAAM,UAAU,eAAe,CAC7B,MAAc,EACd,+BAAuF,EACvF,QAAe,OAAO;IAEtB,MAAM,SAAS,GACb,OAAO,+BAA+B,KAAK,QAAQ;QACjD,CAAC,CAAC,+BAA+B,CAAC,UAAU,CAAC,IAAI,CAAC;YAChD,CAAC,CAAC,mBAAmB,CAAC,+BAAgD,CAAC;YACvE,CAAC,CAAC,iBAAiB,CAAC,+BAA+B,CAAC;QACtD,CAAC,CAAC,+BAA+B,CAAC;IAEtC,MAAM,YAAY,GAAG,kBAAkB,CAAC;QACtC,OAAO,EAAE,SAAS;QAClB,KAAK;QACL,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC;KACxB,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,kBAAkB,CAAC;QACtC,KAAK;QACL,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC;KACxB,CAAC,CAAC;IAEH,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC;AACxC,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,EACpC,MAAc,EACd,OAAsC,EACtC,KAAY,EACZ,MAAmB,EACnB,IAA2B,EACC,EAAE;IAC9B,4FAA4F;IAC5F,8EAA8E;IAC9E,6DAA6D;IAC7D,MAAM,OAAO,GAAG,KAAK,EAAE,MAAc,EAAE,MAAa,EAAE,EAAE;QACtD,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC5C,MAAM,OAAO,GAAG;YACd,IAAI,EAAE,gCAAgC,MAAM,gBAAgB,YAAY,YAAY;YACpF,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;SAChD,CAAC;QACF,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACrD,CAAC,CAAC;IACF,IAAI,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC;QAC/B,MAAM,QAAQ,GAAG,EAAE,CAAC,CAAC,eAAe;QACpC,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,iCAAiC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;QACzE,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,iCAAiC,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QACxE,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,yBAAyB,QAAQ,EAAE,CAAC,CAAC;IACnD,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,4BAA4B,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IAEzE,MAAM,YAAY,GAAG,kBAAkB,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACrF,MAAM,YAAY,GAAG,kBAAkB,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC5E,mBAAmB;IACnB,MAAM,WAAW,GAAG,IAAI,UAAU,CAAC,YAAY,EAAE,YAAY,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAElF,MAAM,eAAe,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;IACrG,MAAM,CAAC,IAAI,CAAC,wBAAwB,eAAe,EAAE,CAAC,CAAC;IAEvD,MAAM,eAAe,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IACvE,MAAM,CAAC,IAAI,CAAC,yBAAyB,eAAe,EAAE,CAAC,CAAC;IAExD,eAAe;IACf,8DAA8D;IAC9D,MAAM,UAAU,GAAG,EAAE,CAAC;IACtB,MAAM,SAAS,GAAG,GAAG,CAAC;IACtB,MAAM,eAAe,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE;QACrE,eAAe,CAAC,QAAQ,EAAE;QAC1B,UAAU;QACV,SAAS;KACV,CAAC,CAAC;IACH,MAAM,CAAC,IAAI,CAAC,wBAAwB,eAAe,EAAE,CAAC,CAAC;IAEvD,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE;QACjE,eAAe,CAAC,QAAQ,EAAE;QAC1B,eAAe,CAAC,QAAQ,EAAE;KAC3B,CAAC,CAAC;IACH,MAAM,CAAC,IAAI,CAAC,sBAAsB,aAAa,EAAE,CAAC,CAAC;IAEnD,MAAM,qBAAqB,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,WAAW,CAAC,cAAc,EAAE;QACjF,eAAe,CAAC,QAAQ,EAAE;QAC1B,EAAE,GAAG,GAAG,IAAI,GAAG,EAAE,eAAe;QAChC,aAAa,CAAC,QAAQ,EAAE;KACzB,CAAC,CAAC;IACH,MAAM,CAAC,IAAI,CAAC,8BAA8B,qBAAqB,EAAE,CAAC,CAAC;IAEnE,MAAM,cAAc,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE;QACnE,eAAe,CAAC,QAAQ,EAAE;QAC1B,eAAe,CAAC,QAAQ,EAAE;QAC1B,aAAa,CAAC,QAAQ,EAAE;KACzB,CAAC,CAAC;IACH,MAAM,CAAC,IAAI,CAAC,uBAAuB,cAAc,EAAE,CAAC,CAAC;IAErD,MAAM,WAAW,CAAC,kBAAkB,EAAE,CAAC;IACvC,MAAM,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;IAEjD,MAAM,QAAQ,GAAG,IAAI,UAAU,CAAC,YAAY,EAAE,YAAY,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAE/E,MAAM,qBAAqB,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,cAAc,EAAE;QAC9E,eAAe,CAAC,QAAQ,EAAE;QAC1B,eAAe,CAAC,QAAQ,EAAE;QAC1B,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE;KAClC,CAAC,CAAC;IACH,MAAM,CAAC,IAAI,CAAC,gCAAgC,qBAAqB,EAAE,CAAC,CAAC;IAErE,MAAM,aAAa,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE;QAC9D,qBAAqB,CAAC,QAAQ,EAAE;QAChC,cAAc,CAAC,QAAQ,EAAE;QACzB,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE;QAC1B,IAAI,CAAC,wBAAwB,CAAC,QAAQ,EAAE;QACxC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE;QAC1B,IAAI,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE;KACrD,CAAC,CAAC;IACH,MAAM,CAAC,IAAI,CAAC,sBAAsB,aAAa,EAAE,CAAC,CAAC;IAEnD,MAAM,QAAQ,CAAC,kBAAkB,EAAE,CAAC;IACpC,MAAM,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;IAE3C,MAAM,cAAc,GAAG,WAAW,CAAC;QACjC,OAAO,EAAE,qBAAqB,CAAC,QAAQ,EAAE;QACzC,GAAG,EAAE,WAAW,CAAC,cAAc,CAAC,WAAW;QAC3C,MAAM,EAAE,YAAY;KACrB,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,WAAW,CAAC;QAC3B,OAAO,EAAE,eAAe,CAAC,QAAQ,EAAE;QACnC,GAAG,EAAE,WAAW,CAAC,QAAQ,CAAC,WAAW;QACrC,MAAM,EAAE,YAAY;KACrB,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,WAAW,CAAC;QACzB,OAAO,EAAE,UAAU,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;QAC7C,GAAG,EAAE,WAAW,CAAC,MAAM,CAAC,WAAW;QACnC,MAAM,EAAE,YAAY;KACrB,CAAC,CAAC;IAEH,8BAA8B;IAC9B,MAAM,QAAQ,GAAU,EAAE,CAAC;IAE3B,mHAAmH;IACnH,wFAAwF;IACxF,eAAe;IACf,0CAA0C;IAC1C,MAAM,sBAAsB,GAAG,WAAW,CAAC;IAC3C,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,qBAAqB,CAAC,QAAQ,EAAE,EAAE,sBAAsB,CAAC,EAAE,EAAS,CAAC,CAAC;IAEpH,oGAAoG;IACpG,+DAA+D;IAC/D,MAAM,YAAY,CAAC,yBAAyB,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;IACnE,MAAM,CAAC,IAAI,CAAC,uDAAuD,UAAU,EAAE,CAAC,CAAC;IAEjF,IAAI,CAAC,CAAC,MAAM,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;QACjD,MAAM,gBAAgB,GAAG,MAAM,cAAc,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QACnE,QAAQ,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAChC,MAAM,CAAC,OAAO,CAAC,uCAAuC,gBAAgB,EAAE,CAAC,CAAC;IAC5E,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,OAAO,CAAC,yCAAyC,CAAC,CAAC;IAC5D,CAAC;IAED,MAAM,CAAC,IAAI,CACT,mCAAmC,qBAAqB,yBAAyB,eAAe,UAAU,IAAI,CAAC,iBAAiB,EAAE,CACnI,CAAC;IAEF,IAAI,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC;QAC/B,gHAAgH;QAChH,kHAAkH;QAClH,IAAI,CAAC;YACH,uBAAuB;YACvB,MAAM,WAAW,GAAG,CAAC,MAAM,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAW,CAAC;YAErE,IAAI,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,CAAC;gBAC/B,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC9D,MAAM,OAAO,CAAC,2BAA2B,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;gBACjD,MAAM,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;gBACnC,MAAM,WAAW,GAAG,CAAC,MAAM,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAW,CAAC;gBAErE,IAAI,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,CAAC;oBAC/B,MAAM,IAAI,KAAK,CAAC,uCAAuC,WAAW,EAAE,CAAC,CAAC;gBACxE,CAAC;gBACD,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;YAClC,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,EAAE,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC;IAED,4CAA4C;IAC5C,IAAI,IAAI,CAAC,mBAAmB,IAAI,IAAI,CAAC,mBAAmB,GAAG,CAAC,EAAE,CAAC;QAC7D,MAAM,MAAM,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;QACtG,MAAM,CAAC,IAAI,CAAC,oCAAoC,IAAI,CAAC,mBAAmB,EAAE,CAAC,CAAC;IAC9E,CAAC;IAED,qHAAqH;IACrH,MAAM,YAAY,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC,MAAM,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAQ,CAAC,CAAC;IACjF,MAAM,CAAC,IAAI,CAAC,sBAAsB,YAAY,EAAE,CAAC,CAAC;IAElD,MAAM,aAAa,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC,MAAM,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAQ,CAAC,CAAC;IACnF,MAAM,CAAC,IAAI,CAAC,uBAAuB,aAAa,EAAE,CAAC,CAAC;IAEpD,oFAAoF;IACpF,MAAM,gBAAgB,GAAG,WAAW,CAAC;QACnC,OAAO,EAAE,UAAU,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC;QAC/C,GAAG,EAAE,WAAW,CAAC,QAAQ,CAAC,WAAW;QACrC,MAAM,EAAE,YAAY;KACrB,CAAC,CAAC;IACH,IAAI,CAAC,CAAC,MAAM,gBAAgB,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9F,MAAM,aAAa,GAAG,MAAM,gBAAgB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;QAChH,MAAM,CAAC,OAAO,CACZ,kCAAkC,eAAe,cAAc,aAAa,UAAU,aAAa,EAAE,CACtG,CAAC;QACF,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC/B,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,OAAO,CAAC,YAAY,eAAe,kCAAkC,aAAa,EAAE,CAAC,CAAC;IAC/F,CAAC;IAED,qFAAqF;IACrF,IAAI,CAAC,MAAM,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,KAAK,UAAU,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC;QACrF,MAAM,uBAAuB,GAAG,MAAM,gBAAgB,CAAC,KAAK,CAAC,iBAAiB,CAC5E,CAAC,UAAU,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC,EACtC;YACE,OAAO;SACR,CACF,CAAC;QACF,MAAM,CAAC,OAAO,CACZ,0DAA0D,eAAe,kBAAkB,aAAa,UAAU,uBAAuB,EAAE,CAC5I,CAAC;QACF,QAAQ,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;IACzC,CAAC;IAED,mCAAmC;IACnC,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,yBAAyB,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;IACpG,MAAM,CAAC,OAAO,CAAC,oDAAoD,CAAC,CAAC;IAErE,MAAM,WAAW,GAAwB;QACvC,aAAa;QACb,eAAe;QACf,YAAY;QACZ,aAAa;QACb,eAAe;QACf,qBAAqB;QACrB,qBAAqB;QACrB,cAAc;QACd,eAAe;QACf,aAAa;KACd,CAAC;IAEF,OAAO;QACL,YAAY;QACZ,YAAY;QACZ,mBAAmB,EAAE,WAAW;KACjC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,UAAU;IAGd,YACU,YAAyD,EACzD,YAAgD,EACxD,SAA6B,EACrB,MAAmB;QAHnB,iBAAY,GAAZ,YAAY,CAA6C;QACzD,iBAAY,GAAZ,YAAY,CAAoC;QAEhD,WAAM,GAAN,MAAM,CAAa;QALrB,aAAQ,GAAU,EAAE,CAAC;QAO3B,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACnF,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,MAAyB,EAAE,OAA2B,EAAE;QACnE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,gBAAgB,CAChD,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,YAAY,EACjB,MAAM,CAAC,WAAW,EAClB,MAAM,CAAC,gBAAgB,EACvB,IAAI,EACJ,IAAI,CAAC,IAAI,EACT,MAAM,CAAC,SAAS,EAChB,IAAI,CAAC,MAAM,CACZ,CAAC;QACF,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC7B,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,kBAAkB;QACtB,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,yBAAyB,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;IAChH,CAAC;CACF;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,eAAe,CAC7B,QAAgB,EAChB,YAAoB,EACpB,MAAc,EACd,IAA6C;IAE7C,MAAM,KAAK,GAAG;QACZ,QAAQ,EAAE,UAAU;QACpB,OAAO,EAAE;YACP,CAAC,QAAQ,CAAC,EAAE;gBACV,OAAO,EAAE,MAAM;aAChB;SACF;QACD,QAAQ,EAAE;YACR,2BAA2B;YAC3B,SAAS,EAAE;gBACT,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,GAAG;aACV;YACD,UAAU,EAAE,QAAQ;YACpB,eAAe,EAAE;gBACf,GAAG,EAAE;oBACH,GAAG,EAAE,CAAC,qBAAqB,EAAE,KAAK,CAAC;iBACpC;aACF;SACF;KACF,CAAC;IAEF,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAE/D,MAAM,GAAG,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC;IACzD,MAAM,QAAQ,GAAkB,KAAK,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;IAEpG,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC;AAC3B,CAAC;AAED,8BAA8B;AAC9B;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,YAAyD,EACzD,YAAgD,EAChD,GAAqC,EACrC,QAAa,EACb,OAA2B,EAAE,EAC7B,SAAe,EACf,SAAqB,EACrB,MAAoB;IAEpB,IAAI,MAAM,GAAoB,SAAS,CAAC;IACxC,IAAI,OAAO,GAA2B,SAAS,CAAC;IAEhD,IAAI,SAAS,EAAE,CAAC;QACd,8DAA8D;QAE9D,MAAM,YAAY,GAA+B,EAAE,CAAC;QAEpD,KAAK,MAAM,WAAW,IAAI,SAAS,EAAE,WAAW,EAAE,CAAC;YACjD,MAAM,GAAG,GAAG,SAAS,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;YAE/C,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,gBAAgB,CACxC,YAAY,EACZ,YAAY,EACZ,GAAG,CAAC,WAAW,EACf,GAAG,CAAC,gBAAgB,EACpB,EAAE,EACF,SAAS,EACT,SAAS,EACT,MAAM,CACP,CAAC;YAEF,KAAK,MAAM,OAAO,IAAI,SAAS,CAAC,cAAc,EAAE,CAAC;gBAC/C,KAAK,MAAM,CAAC,IAAI,SAAS,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC;oBAClD,MAAM,KAAK,GAAG,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;oBACpE,MAAM,MAAM,GAAG,CAAC,GAAG,SAAS,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;oBAElE,MAAM,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,CAAC,CAAC;oBACxD,YAAY,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC;gBACpC,CAAC;YACH,CAAC;QACH,CAAC;QAED,MAAM,YAAY,GAAG,CAAC,CAAS,EAAE,EAAE;YACjC,OAAO,CAAC,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC,CAAC,4BAA4B;QAC/E,CAAC,CAAC;QAEF,KAAK,MAAM,SAAS,IAAI,YAAY,EAAE,CAAC;YACrC,MAAM,WAAW,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAChE,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE,GAAG,CAAC,EAAE,WAAW,CAAQ,CAAC;QAC5F,CAAC;IACH,CAAC;IAED,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;QAC7C,MAAM,QAAQ,GAAQ,4CAA4C,CAAC;QACnE,MAAM,QAAQ,GAAG,gBAAgB,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;QAC3D,OAAO,GAAG,kBAAkB,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;QAC9F,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QAE7D,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;YAChD,MAAM,GAAG,MAAM,YAAY,CAAC,eAAe,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC;YACjG,MAAM,EAAE,OAAO,CAAC,gCAAgC,IAAI,eAAe,OAAO,UAAU,MAAM,EAAE,CAAC,CAAC;QAChG,CAAC;aAAM,CAAC;YACN,MAAM,EAAE,OAAO,CAAC,sDAAsD,IAAI,eAAe,OAAO,EAAE,CAAC,CAAC;QACtG,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,GAAG,MAAM,YAAY,CAAC,cAAc,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;QACpE,MAAM,EAAE,OAAO,CAAC,4BAA4B,MAAM,EAAE,CAAC,CAAC;QACtD,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,yBAAyB,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,eAAe,EAAE,GAAG,EAAE,CAAC,CAAC;QACrG,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC;QAClC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CACb,yCAAyC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,CAC1E,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAC5C,EAAE,CACJ,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,UAAU,CAAC,UAAU,CAAC,OAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;AAC9D,CAAC;AACD,4BAA4B"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"deploy_l1_contracts.js","sourceRoot":"","sources":["../src/deploy_l1_contracts.ts"],"names":[],"mappings":"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"}

package/dest/index.d.ts

@@ -4,4 +4,5 @@ export * from './l1_contract_addresses.js';
 export * from './l1_reader.js';
 export * from './ethereum_chain.js';
 export * from './utils.js';
+export * from './config.js';
 //# sourceMappingURL=index.d.ts.map

package/dest/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,0BAA0B,CAAC;AACzC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC;AACpC,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,0BAA0B,CAAC;AACzC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC;AACpC,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC"}

package/dest/index.js

@@ -4,4 +4,5 @@ export * from './l1_contract_addresses.js';
 export * from './l1_reader.js';
 export * from './ethereum_chain.js';
 export * from './utils.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxnQkFBZ0IsQ0FBQztBQUMvQixjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLGNBQWMsNEJBQTRCLENBQUM7QUFDM0MsY0FBYyxnQkFBZ0IsQ0FBQztBQUMvQixjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsWUFBWSxDQUFDIn0=
+export * from './config.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxnQkFBZ0IsQ0FBQztBQUMvQixjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLGNBQWMsNEJBQTRCLENBQUM7QUFDM0MsY0FBYyxnQkFBZ0IsQ0FBQztBQUMvQixjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsWUFBWSxDQUFDO0FBQzNCLGNBQWMsYUFBYSxDQUFDIn0=

package/dest/l1_contract_addresses.d.ts

@@ -1,16 +1,50 @@
 import { type ConfigMappingsType } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
+import { type ZodFor } from '@aztec/foundation/schemas';
+import { z } from 'zod';
 /**
  * The names of the current L1 contract addresses.
  * NOTE: When changing this list, make sure to update CLI & CI scripts accordingly.
  * For reference: https://github.com/AztecProtocol/aztec-packages/pull/5553
  */
-export declare const l1ContractsNames: readonly ["rollupAddress", "registryAddress", "inboxAddress", "outboxAddress", "feeJuiceAddress", "feeJuicePortalAddress", "nomismatokopioAddress", "sysstiaAddress", "gerousiaAddress", "apellaAddress"];
-/**
- * Provides the directory of current L1 contract addresses
- */
+export declare const L1ContractsNames: readonly ["rollupAddress", "registryAddress", "inboxAddress", "outboxAddress", "feeJuiceAddress", "feeJuicePortalAddress", "coinIssuerAddress", "rewardDistributorAddress", "governanceProposerAddress", "governanceAddress"];
+/** Provides the directory of current L1 contract addresses */
 export type L1ContractAddresses = {
-    [K in (typeof l1ContractsNames)[number]]: EthAddress;
+    [K in (typeof L1ContractsNames)[number]]: EthAddress;
 };
+export declare const L1ContractAddressesSchema: z.ZodObject<{
+    rollupAddress: ZodFor<EthAddress>;
+    registryAddress: ZodFor<EthAddress>;
+    inboxAddress: ZodFor<EthAddress>;
+    outboxAddress: ZodFor<EthAddress>;
+    feeJuiceAddress: ZodFor<EthAddress>;
+    feeJuicePortalAddress: ZodFor<EthAddress>;
+    coinIssuerAddress: ZodFor<EthAddress>;
+    rewardDistributorAddress: ZodFor<EthAddress>;
+    governanceProposerAddress: ZodFor<EthAddress>;
+    governanceAddress: ZodFor<EthAddress>;
+}, "strip", z.ZodTypeAny, {
+    rollupAddress: EthAddress;
+    registryAddress: EthAddress;
+    inboxAddress: EthAddress;
+    outboxAddress: EthAddress;
+    feeJuiceAddress: EthAddress;
+    feeJuicePortalAddress: EthAddress;
+    coinIssuerAddress: EthAddress;
+    rewardDistributorAddress: EthAddress;
+    governanceProposerAddress: EthAddress;
+    governanceAddress: EthAddress;
+}, {
+    rollupAddress?: any;
+    registryAddress?: any;
+    inboxAddress?: any;
+    outboxAddress?: any;
+    feeJuiceAddress?: any;
+    feeJuicePortalAddress?: any;
+    coinIssuerAddress?: any;
+    rewardDistributorAddress?: any;
+    governanceProposerAddress?: any;
+    governanceAddress?: any;
+}>;
 export declare const l1ContractAddressesMapping: ConfigMappingsType<L1ContractAddresses>;
 //# sourceMappingURL=l1_contract_addresses.d.ts.map

package/dest/l1_contract_addresses.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"l1_contract_addresses.d.ts","sourceRoot":"","sources":["../src/l1_contract_addresses.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,2MAWnB,CAAC;AAEX;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG;KAC/B,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,GAAG,UAAU;CACrD,CAAC;AAIF,eAAO,MAAM,0BAA0B,EAAE,kBAAkB,CAAC,mBAAmB,CAmD9E,CAAC"}
+{"version":3,"file":"l1_contract_addresses.d.ts","sourceRoot":"","sources":["../src/l1_contract_addresses.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,2BAA2B,CAAC;AAEjE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,+NAWnB,CAAC;AAEX,8DAA8D;AAC9D,MAAM,MAAM,mBAAmB,GAAG;KAC/B,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,GAAG,UAAU;CACrD,CAAC;AAEF,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAWE,CAAC;AAIzC,eAAO,MAAM,0BAA0B,EAAE,kBAAkB,CAAC,mBAAmB,CAmD9E,CAAC"}

package/dest/l1_contract_addresses.js

@@ -1,21 +1,35 @@
 import { EthAddress } from '@aztec/foundation/eth-address';
+import { schemas } from '@aztec/foundation/schemas';
+import { z } from 'zod';
 /**
  * The names of the current L1 contract addresses.
  * NOTE: When changing this list, make sure to update CLI & CI scripts accordingly.
  * For reference: https://github.com/AztecProtocol/aztec-packages/pull/5553
  */
-export const l1ContractsNames = [
+export const L1ContractsNames = [
     'rollupAddress',
     'registryAddress',
     'inboxAddress',
     'outboxAddress',
     'feeJuiceAddress',
     'feeJuicePortalAddress',
-    'nomismatokopioAddress',
-    'sysstiaAddress',
-    'gerousiaAddress',
-    'apellaAddress',
+    'coinIssuerAddress',
+    'rewardDistributorAddress',
+    'governanceProposerAddress',
+    'governanceAddress',
 ];
+export const L1ContractAddressesSchema = z.object({
+    rollupAddress: schemas.EthAddress,
+    registryAddress: schemas.EthAddress,
+    inboxAddress: schemas.EthAddress,
+    outboxAddress: schemas.EthAddress,
+    feeJuiceAddress: schemas.EthAddress,
+    feeJuicePortalAddress: schemas.EthAddress,
+    coinIssuerAddress: schemas.EthAddress,
+    rewardDistributorAddress: schemas.EthAddress,
+    governanceProposerAddress: schemas.EthAddress,
+    governanceAddress: schemas.EthAddress,
+});
 const parseEnv = (val) => EthAddress.fromString(val);
 export const l1ContractAddressesMapping = {
     rollupAddress: {
@@ -48,25 +62,25 @@ export const l1ContractAddressesMapping = {
         description: 'The deployed L1 Fee Juice portal contract address.',
         parseEnv,
     },
-    nomismatokopioAddress: {
-        env: 'NOMISMATOKOPIO_CONTRACT_ADDRESS',
-        description: 'The deployed L1 nomismatokopio contract address',
+    coinIssuerAddress: {
+        env: 'COIN_ISSUER_CONTRACT_ADDRESS',
+        description: 'The deployed L1 coinIssuer contract address',
         parseEnv,
     },
-    sysstiaAddress: {
-        env: 'SYSSTIA_CONTRACT_ADDRESS',
-        description: 'The deployed L1 sysstia contract address',
+    rewardDistributorAddress: {
+        env: 'REWARD_DISTRIBUTOR_CONTRACT_ADDRESS',
+        description: 'The deployed L1 rewardDistributor contract address',
         parseEnv,
     },
-    gerousiaAddress: {
-        env: 'GEROUSIA_CONTRACT_ADDRESS',
-        description: 'The deployed L1 gerousia contract address',
+    governanceProposerAddress: {
+        env: 'GOVERNANCE_PROPOSER_CONTRACT_ADDRESS',
+        description: 'The deployed L1 governanceProposer contract address',
         parseEnv,
     },
-    apellaAddress: {
-        env: 'APELLA_CONTRACT_ADDRESS',
-        description: 'The deployed L1 apella contract address',
+    governanceAddress: {
+        env: 'GOVERNANCE_CONTRACT_ADDRESS',
+        description: 'The deployed L1 governance contract address',
         parseEnv,
     },
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfY29udHJhY3RfYWRkcmVzc2VzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2wxX2NvbnRyYWN0X2FkZHJlc3Nlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFM0Q7Ozs7R0FJRztBQUNILE1BQU0sQ0FBQyxNQUFNLGdCQUFnQixHQUFHO0lBQzlCLGVBQWU7SUFDZixpQkFBaUI7SUFDakIsY0FBYztJQUNkLGVBQWU7SUFDZixpQkFBaUI7SUFDakIsdUJBQXVCO0lBQ3ZCLHVCQUF1QjtJQUN2QixnQkFBZ0I7SUFDaEIsaUJBQWlCO0lBQ2pCLGVBQWU7Q0FDUCxDQUFDO0FBU1gsTUFBTSxRQUFRLEdBQUcsQ0FBQyxHQUFXLEVBQUUsRUFBRSxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLENBQUM7QUFFN0QsTUFBTSxDQUFDLE1BQU0sMEJBQTBCLEdBQTRDO0lBQ2pGLGFBQWEsRUFBRTtRQUNiLEdBQUcsRUFBRSx5QkFBeUI7UUFDOUIsV0FBVyxFQUFFLDBDQUEwQztRQUN2RCxRQUFRO0tBQ1Q7SUFDRCxlQUFlLEVBQUU7UUFDZixHQUFHLEVBQUUsMkJBQTJCO1FBQ2hDLFdBQVcsRUFBRSw0Q0FBNEM7UUFDekQsUUFBUTtLQUNUO0lBQ0QsWUFBWSxFQUFFO1FBQ1osR0FBRyxFQUFFLHdCQUF3QjtRQUM3QixXQUFXLEVBQUUseUNBQXlDO1FBQ3RELFFBQVE7S0FDVDtJQUNELGFBQWEsRUFBRTtRQUNiLEdBQUcsRUFBRSx5QkFBeUI7UUFDOUIsV0FBVyxFQUFFLDBDQUEwQztRQUN2RCxRQUFRO0tBQ1Q7SUFDRCxlQUFlLEVBQUU7UUFDZixHQUFHLEVBQUUsNEJBQTRCO1FBQ2pDLFdBQVcsRUFBRSw2Q0FBNkM7UUFDMUQsUUFBUTtLQUNUO0lBQ0QscUJBQXFCLEVBQUU7UUFDckIsR0FBRyxFQUFFLG1DQUFtQztRQUN4QyxXQUFXLEVBQUUsb0RBQW9EO1FBQ2pFLFFBQVE7S0FDVDtJQUNELHFCQUFxQixFQUFFO1FBQ3JCLEdBQUcsRUFBRSxpQ0FBaUM7UUFDdEMsV0FBVyxFQUFFLGlEQUFpRDtRQUM5RCxRQUFRO0tBQ1Q7SUFDRCxjQUFjLEVBQUU7UUFDZCxHQUFHLEVBQUUsMEJBQTBCO1FBQy9CLFdBQVcsRUFBRSwwQ0FBMEM7UUFDdkQsUUFBUTtLQUNUO0lBQ0QsZUFBZSxFQUFFO1FBQ2YsR0FBRyxFQUFFLDJCQUEyQjtRQUNoQyxXQUFXLEVBQUUsMkNBQTJDO1FBQ3hELFFBQVE7S0FDVDtJQUNELGFBQWEsRUFBRTtRQUNiLEdBQUcsRUFBRSx5QkFBeUI7UUFDOUIsV0FBVyxFQUFFLHlDQUF5QztRQUN0RCxRQUFRO0tBQ1Q7Q0FDRixDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfY29udHJhY3RfYWRkcmVzc2VzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2wxX2NvbnRyYWN0X2FkZHJlc3Nlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDM0QsT0FBTyxFQUFlLE9BQU8sRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRWpFLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEI7Ozs7R0FJRztBQUNILE1BQU0sQ0FBQyxNQUFNLGdCQUFnQixHQUFHO0lBQzlCLGVBQWU7SUFDZixpQkFBaUI7SUFDakIsY0FBYztJQUNkLGVBQWU7SUFDZixpQkFBaUI7SUFDakIsdUJBQXVCO0lBQ3ZCLG1CQUFtQjtJQUNuQiwwQkFBMEI7SUFDMUIsMkJBQTJCO0lBQzNCLG1CQUFtQjtDQUNYLENBQUM7QUFPWCxNQUFNLENBQUMsTUFBTSx5QkFBeUIsR0FBRyxDQUFDLENBQUMsTUFBTSxDQUFDO0lBQ2hELGFBQWEsRUFBRSxPQUFPLENBQUMsVUFBVTtJQUNqQyxlQUFlLEVBQUUsT0FBTyxDQUFDLFVBQVU7SUFDbkMsWUFBWSxFQUFFLE9BQU8sQ0FBQyxVQUFVO0lBQ2hDLGFBQWEsRUFBRSxPQUFPLENBQUMsVUFBVTtJQUNqQyxlQUFlLEVBQUUsT0FBTyxDQUFDLFVBQVU7SUFDbkMscUJBQXFCLEVBQUUsT0FBTyxDQUFDLFVBQVU7SUFDekMsaUJBQWlCLEVBQUUsT0FBTyxDQUFDLFVBQVU7SUFDckMsd0JBQXdCLEVBQUUsT0FBTyxDQUFDLFVBQVU7SUFDNUMseUJBQXlCLEVBQUUsT0FBTyxDQUFDLFVBQVU7SUFDN0MsaUJBQWlCLEVBQUUsT0FBTyxDQUFDLFVBQVU7Q0FDdEMsQ0FBdUMsQ0FBQztBQUV6QyxNQUFNLFFBQVEsR0FBRyxDQUFDLEdBQVcsRUFBRSxFQUFFLENBQUMsVUFBVSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUU3RCxNQUFNLENBQUMsTUFBTSwwQkFBMEIsR0FBNEM7SUFDakYsYUFBYSxFQUFFO1FBQ2IsR0FBRyxFQUFFLHlCQUF5QjtRQUM5QixXQUFXLEVBQUUsMENBQTBDO1FBQ3ZELFFBQVE7S0FDVDtJQUNELGVBQWUsRUFBRTtRQUNmLEdBQUcsRUFBRSwyQkFBMkI7UUFDaEMsV0FBVyxFQUFFLDRDQUE0QztRQUN6RCxRQUFRO0tBQ1Q7SUFDRCxZQUFZLEVBQUU7UUFDWixHQUFHLEVBQUUsd0JBQXdCO1FBQzdCLFdBQVcsRUFBRSx5Q0FBeUM7UUFDdEQsUUFBUTtLQUNUO0lBQ0QsYUFBYSxFQUFFO1FBQ2IsR0FBRyxFQUFFLHlCQUF5QjtRQUM5QixXQUFXLEVBQUUsMENBQTBDO1FBQ3ZELFFBQVE7S0FDVDtJQUNELGVBQWUsRUFBRTtRQUNmLEdBQUcsRUFBRSw0QkFBNEI7UUFDakMsV0FBVyxFQUFFLDZDQUE2QztRQUMxRCxRQUFRO0tBQ1Q7SUFDRCxxQkFBcUIsRUFBRTtRQUNyQixHQUFHLEVBQUUsbUNBQW1DO1FBQ3hDLFdBQVcsRUFBRSxvREFBb0Q7UUFDakUsUUFBUTtLQUNUO0lBQ0QsaUJBQWlCLEVBQUU7UUFDakIsR0FBRyxFQUFFLDhCQUE4QjtRQUNuQyxXQUFXLEVBQUUsNkNBQTZDO1FBQzFELFFBQVE7S0FDVDtJQUNELHdCQUF3QixFQUFFO1FBQ3hCLEdBQUcsRUFBRSxxQ0FBcUM7UUFDMUMsV0FBVyxFQUFFLG9EQUFvRDtRQUNqRSxRQUFRO0tBQ1Q7SUFDRCx5QkFBeUIsRUFBRTtRQUN6QixHQUFHLEVBQUUsc0NBQXNDO1FBQzNDLFdBQVcsRUFBRSxxREFBcUQ7UUFDbEUsUUFBUTtLQUNUO0lBQ0QsaUJBQWlCLEVBQUU7UUFDakIsR0FBRyxFQUFFLDZCQUE2QjtRQUNsQyxXQUFXLEVBQUUsNkNBQTZDO1FBQzFELFFBQVE7S0FDVDtDQUNGLENBQUMifQ==

package/dest/l1_reader.d.ts

@@ -1,24 +1,14 @@
 import { type ConfigMappingsType } from '@aztec/foundation/config';
 import { type L1ContractAddresses } from './l1_contract_addresses.js';
-/**
- * Configuration of the L1GlobalReader.
- */
+/** Configuration of the L1GlobalReader. */
 export interface L1ReaderConfig {
-    /**
-     * The RPC Url of the ethereum host.
-     */
+    /** The RPC Url of the ethereum host. */
     l1RpcUrl: string;
-    /**
-     * The chain ID of the ethereum host.
-     */
+    /** The chain ID of the ethereum host. */
     l1ChainId: number;
-    /**
-     * The deployed l1 contract addresses
-     */
+    /** The deployed l1 contract addresses */
     l1Contracts: L1ContractAddresses;
-    /**
-     * The polling interval viem uses in ms
-     */
+    /** The polling interval viem uses in ms */
     viemPollingIntervalMS: number;
 }
 export declare const l1ReaderConfigMappings: ConfigMappingsType<L1ReaderConfig>;

package/dest/l1_reader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"l1_reader.d.ts","sourceRoot":"","sources":["../src/l1_reader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAAsB,MAAM,0BAA0B,CAAC;AAEvF,OAAO,EAAE,KAAK,mBAAmB,EAA8B,MAAM,4BAA4B,CAAC;AAElG;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,WAAW,EAAE,mBAAmB,CAAC;IACjC;;OAEG;IACH,qBAAqB,EAAE,MAAM,CAAC;CAC/B;AAED,eAAO,MAAM,sBAAsB,EAAE,kBAAkB,CAAC,cAAc,CAqBrE,CAAC"}
+{"version":3,"file":"l1_reader.d.ts","sourceRoot":"","sources":["../src/l1_reader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAAsB,MAAM,0BAA0B,CAAC;AAEvF,OAAO,EAAE,KAAK,mBAAmB,EAA8B,MAAM,4BAA4B,CAAC;AAElG,2CAA2C;AAC3C,MAAM,WAAW,cAAc;IAC7B,wCAAwC;IACxC,QAAQ,EAAE,MAAM,CAAC;IACjB,yCAAyC;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,yCAAyC;IACzC,WAAW,EAAE,mBAAmB,CAAC;IACjC,2CAA2C;IAC3C,qBAAqB,EAAE,MAAM,CAAC;CAC/B;AAED,eAAO,MAAM,sBAAsB,EAAE,kBAAkB,CAAC,cAAc,CAqBrE,CAAC"}

package/dest/l1_reader.js

@@ -22,4 +22,4 @@ export const l1ReaderConfigMappings = {
         ...numberConfigHelper(1000),
     },
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfcmVhZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2wxX3JlYWRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQTJCLGtCQUFrQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFdkYsT0FBTyxFQUE0QiwwQkFBMEIsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBeUJsRyxNQUFNLENBQUMsTUFBTSxzQkFBc0IsR0FBdUM7SUFDeEUsUUFBUSxFQUFFO1FBQ1IsR0FBRyxFQUFFLGVBQWU7UUFDcEIsV0FBVyxFQUFFLG1DQUFtQztLQUNqRDtJQUNELFNBQVMsRUFBRTtRQUNULEdBQUcsRUFBRSxhQUFhO1FBQ2xCLFFBQVEsRUFBRSxDQUFDLEdBQVcsRUFBRSxFQUFFLENBQUMsQ0FBQyxHQUFHO1FBQy9CLFlBQVksRUFBRSxLQUFLO1FBQ25CLFdBQVcsRUFBRSxvQ0FBb0M7S0FDbEQ7SUFDRCxxQ0FBcUM7SUFDckMsV0FBVyxFQUFFO1FBQ1gsV0FBVyxFQUFFLG9DQUFvQztRQUNqRCxZQUFZLEVBQUUsMEJBQTBCO0tBQ3pDO0lBQ0QscUJBQXFCLEVBQUU7UUFDckIsR0FBRyxFQUFFLG9DQUFvQztRQUN6QyxXQUFXLEVBQUUsc0NBQXNDO1FBQ25ELEdBQUcsa0JBQWtCLENBQUMsSUFBSyxDQUFDO0tBQzdCO0NBQ0YsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfcmVhZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2wxX3JlYWRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQTJCLGtCQUFrQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFdkYsT0FBTyxFQUE0QiwwQkFBMEIsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBY2xHLE1BQU0sQ0FBQyxNQUFNLHNCQUFzQixHQUF1QztJQUN4RSxRQUFRLEVBQUU7UUFDUixHQUFHLEVBQUUsZUFBZTtRQUNwQixXQUFXLEVBQUUsbUNBQW1DO0tBQ2pEO0lBQ0QsU0FBUyxFQUFFO1FBQ1QsR0FBRyxFQUFFLGFBQWE7UUFDbEIsUUFBUSxFQUFFLENBQUMsR0FBVyxFQUFFLEVBQUUsQ0FBQyxDQUFDLEdBQUc7UUFDL0IsWUFBWSxFQUFFLEtBQUs7UUFDbkIsV0FBVyxFQUFFLG9DQUFvQztLQUNsRDtJQUNELHFDQUFxQztJQUNyQyxXQUFXLEVBQUU7UUFDWCxXQUFXLEVBQUUsb0NBQW9DO1FBQ2pELFlBQVksRUFBRSwwQkFBMEI7S0FDekM7SUFDRCxxQkFBcUIsRUFBRTtRQUNyQixHQUFHLEVBQUUsb0NBQW9DO1FBQ3pDLFdBQVcsRUFBRSxzQ0FBc0M7UUFDbkQsR0FBRyxrQkFBa0IsQ0FBQyxJQUFLLENBQUM7S0FDN0I7Q0FDRixDQUFDIn0=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/ethereum",
-  "version": "0.62.0",
+  "version": "0.63.1",
   "type": "module",
   "exports": "./dest/index.js",
   "typedocOptions": {
@@ -24,11 +24,12 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/foundation": "0.62.0",
-    "@aztec/l1-artifacts": "0.62.0",
+    "@aztec/foundation": "0.63.1",
+    "@aztec/l1-artifacts": "0.63.1",
     "dotenv": "^16.0.3",
     "tslib": "^2.4.0",
-    "viem": "^2.7.15"
+    "viem": "^2.7.15",
+    "zod": "^3.23.8"
   },
   "devDependencies": {
     "@jest/globals": "^29.5.0",

package/src/config.ts

@@ -0,0 +1,54 @@
+import { type ConfigMappingsType, getConfigFromMappings, numberConfigHelper } from '@aztec/foundation/config';
+
+export type L1ContractsConfig = {
+  /** How many seconds an L1 slot lasts. */
+  ethereumSlotDuration: number;
+  /** How many seconds an L2 slots lasts (must be multiple of ethereum slot duration). */
+  aztecSlotDuration: number;
+  /** How many L2 slots an epoch lasts. */
+  aztecEpochDuration: number;
+  /** The target validator committee size. */
+  aztecTargetCommitteeSize: number;
+  /** The number of L2 slots that we can wait for a proof of an epoch to be produced. */
+  aztecEpochProofClaimWindowInL2Slots: number;
+};
+
+export const DefaultL1ContractsConfig: L1ContractsConfig = {
+  ethereumSlotDuration: 12,
+  aztecSlotDuration: 24,
+  aztecEpochDuration: 16,
+  aztecTargetCommitteeSize: 48,
+  aztecEpochProofClaimWindowInL2Slots: 13,
+};
+
+export const l1ContractsConfigMappings: ConfigMappingsType<L1ContractsConfig> = {
+  ethereumSlotDuration: {
+    env: 'ETHEREUM_SLOT_DURATION',
+    description: 'How many seconds an L1 slot lasts.',
+    ...numberConfigHelper(DefaultL1ContractsConfig.ethereumSlotDuration),
+  },
+  aztecSlotDuration: {
+    env: 'AZTEC_SLOT_DURATION',
+    description: 'How many seconds an L2 slots lasts (must be multiple of ethereum slot duration).',
+    ...numberConfigHelper(DefaultL1ContractsConfig.aztecSlotDuration),
+  },
+  aztecEpochDuration: {
+    env: 'AZTEC_EPOCH_DURATION',
+    description: `How many L2 slots an epoch lasts (maximum AZTEC_MAX_EPOCH_DURATION).`,
+    ...numberConfigHelper(DefaultL1ContractsConfig.aztecEpochDuration),
+  },
+  aztecTargetCommitteeSize: {
+    env: 'AZTEC_TARGET_COMMITTEE_SIZE',
+    description: 'The target validator committee size.',
+    ...numberConfigHelper(DefaultL1ContractsConfig.aztecTargetCommitteeSize),
+  },
+  aztecEpochProofClaimWindowInL2Slots: {
+    env: 'AZTEC_EPOCH_PROOF_CLAIM_WINDOW_IN_L2_SLOTS',
+    description: 'The number of L2 slots that we can wait for a proof of an epoch to be produced.',
+    ...numberConfigHelper(DefaultL1ContractsConfig.aztecEpochProofClaimWindowInL2Slots),
+  },
+};
+
+export function getL1ContractsConfigEnvVars(): L1ContractsConfig {
+  return getConfigFromMappings(l1ContractsConfigMappings);
+}

package/src/deploy_l1_contracts.ts

@@ -3,25 +3,25 @@ import { EthAddress } from '@aztec/foundation/eth-address';
 import { type Fr } from '@aztec/foundation/fields';
 import { type DebugLogger } from '@aztec/foundation/log';
 import {
-  ApellaAbi,
-  ApellaBytecode,
+  CoinIssuerAbi,
+  CoinIssuerBytecode,
   FeeJuicePortalAbi,
   FeeJuicePortalBytecode,
-  GerousiaAbi,
-  GerousiaBytecode,
+  GovernanceAbi,
+  GovernanceBytecode,
+  GovernanceProposerAbi,
+  GovernanceProposerBytecode,
   InboxAbi,
   InboxBytecode,
-  NomismatokopioAbi,
-  NomismatokopioBytecode,
   OutboxAbi,
   OutboxBytecode,
   RegistryAbi,
   RegistryBytecode,
+  RewardDistributorAbi,
+  RewardDistributorBytecode,
   RollupAbi,
   RollupBytecode,
   RollupLinkReferences,
-  SysstiaAbi,
-  SysstiaBytecode,
   TestERC20Abi,
   TestERC20Bytecode,
   TxsDecoderAbi,
@@ -50,6 +50,7 @@ import {
 import { type HDAccount, type PrivateKeyAccount, mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
 import { foundry } from 'viem/chains';
 
+import { type L1ContractsConfig } from './config.js';
 import { isAnvilTestChain } from './ethereum_chain.js';
 import { type L1ContractAddresses } from './l1_contract_addresses.js';
 
@@ -132,21 +133,21 @@ export interface L1ContractArtifactsForDeployment {
    */
   feeJuicePortal: ContractArtifacts;
   /**
-   * Nomismatokopio contract artifacts.
+   * CoinIssuer contract artifacts.
    */
-  nomismatokopio: ContractArtifacts;
+  coinIssuer: ContractArtifacts;
   /**
-   * Sysstia contract artifacts.
+   * RewardDistributor contract artifacts.
    */
-  sysstia: ContractArtifacts;
+  rewardDistributor: ContractArtifacts;
   /**
-   * Gerousia contract artifacts.
+   * GovernanceProposer contract artifacts.
    */
-  gerousia: ContractArtifacts;
+  governanceProposer: ContractArtifacts;
   /**
-   * Apella contract artifacts.
+   * Governance contract artifacts.
    */
-  apella: ContractArtifacts;
+  governance: ContractArtifacts;
 }
 
 export const l1Artifacts: L1ContractArtifactsForDeployment = {
@@ -183,48 +184,36 @@ export const l1Artifacts: L1ContractArtifactsForDeployment = {
     contractAbi: FeeJuicePortalAbi,
     contractBytecode: FeeJuicePortalBytecode,
   },
-  sysstia: {
-    contractAbi: SysstiaAbi,
-    contractBytecode: SysstiaBytecode,
+  rewardDistributor: {
+    contractAbi: RewardDistributorAbi,
+    contractBytecode: RewardDistributorBytecode,
   },
-  nomismatokopio: {
-    contractAbi: NomismatokopioAbi,
-    contractBytecode: NomismatokopioBytecode,
+  coinIssuer: {
+    contractAbi: CoinIssuerAbi,
+    contractBytecode: CoinIssuerBytecode,
   },
-  gerousia: {
-    contractAbi: GerousiaAbi,
-    contractBytecode: GerousiaBytecode,
+  governanceProposer: {
+    contractAbi: GovernanceProposerAbi,
+    contractBytecode: GovernanceProposerBytecode,
   },
-  apella: {
-    contractAbi: ApellaAbi,
-    contractBytecode: ApellaBytecode,
+  governance: {
+    contractAbi: GovernanceAbi,
+    contractBytecode: GovernanceBytecode,
   },
 };
 
-export interface DeployL1ContractsArgs {
-  /**
-   * The address of the L2 Fee Juice contract.
-   */
+export interface DeployL1ContractsArgs extends L1ContractsConfig {
+  /** The address of the L2 Fee Juice contract. */
   l2FeeJuiceAddress: AztecAddress;
-  /**
-   * The vk tree root.
-   */
+  /** The vk tree root. */
   vkTreeRoot: Fr;
-  /**
-   * The protocol contract tree root.
-   */
+  /** The protocol contract tree root. */
   protocolContractTreeRoot: Fr;
-  /**
-   * The block number to assume proven through.
-   */
+  /** The block number to assume proven through. */
   assumeProvenThrough?: number;
-  /**
-   * The salt for CREATE2 deployment.
-   */
+  /** The salt for CREATE2 deployment. */
   salt: number | undefined;
-  /**
-   * The initial validators for the rollup contract.
-   */
+  /** The initial validators for the rollup contract. */
   initialValidators?: EthAddress[];
 }
 
@@ -294,12 +283,11 @@ export const deployL1Contracts = async (
     return await (await fetch(rpcUrl, content)).json();
   };
   if (isAnvilTestChain(chain.id)) {
-    const interval = 12; // @todo  #8084
-    const res = await rpcCall('anvil_setBlockTimestampInterval', [interval]);
+    const res = await rpcCall('anvil_setBlockTimestampInterval', [args.ethereumSlotDuration]);
     if (res.error) {
       throw new Error(`Error setting block interval: ${res.error.message}`);
     }
-    logger.info(`Set block interval to ${interval}`);
+    logger.info(`Set block interval to ${args.ethereumSlotDuration}`);
   }
 
   logger.info(`Deploying contracts from ${account.address.toString()}...`);
@@ -319,32 +307,32 @@ export const deployL1Contracts = async (
   // @note These numbers are just chosen to make testing simple.
   const quorumSize = 6n;
   const roundSize = 10n;
-  const gerousiaAddress = await govDeployer.deploy(l1Artifacts.gerousia, [
+  const governanceProposerAddress = await govDeployer.deploy(l1Artifacts.governanceProposer, [
     registryAddress.toString(),
     quorumSize,
     roundSize,
   ]);
-  logger.info(`Deployed Gerousia at ${gerousiaAddress}`);
+  logger.info(`Deployed GovernanceProposer at ${governanceProposerAddress}`);
 
-  const apellaAddress = await govDeployer.deploy(l1Artifacts.apella, [
+  const governanceAddress = await govDeployer.deploy(l1Artifacts.governance, [
     feeJuiceAddress.toString(),
-    gerousiaAddress.toString(),
+    governanceProposerAddress.toString(),
   ]);
-  logger.info(`Deployed Apella at ${apellaAddress}`);
+  logger.info(`Deployed Governance at ${governanceAddress}`);
 
-  const nomismatokopioAddress = await govDeployer.deploy(l1Artifacts.nomismatokopio, [
+  const coinIssuerAddress = await govDeployer.deploy(l1Artifacts.coinIssuer, [
     feeJuiceAddress.toString(),
     1n * 10n ** 18n, // @todo  #8084
-    apellaAddress.toString(),
+    governanceAddress.toString(),
   ]);
-  logger.info(`Deployed Nomismatokopio at ${nomismatokopioAddress}`);
+  logger.info(`Deployed CoinIssuer at ${coinIssuerAddress}`);
 
-  const sysstiaAddress = await govDeployer.deploy(l1Artifacts.sysstia, [
+  const rewardDistributorAddress = await govDeployer.deploy(l1Artifacts.rewardDistributor, [
     feeJuiceAddress.toString(),
     registryAddress.toString(),
-    apellaAddress.toString(),
+    governanceAddress.toString(),
   ]);
-  logger.info(`Deployed Sysstia at ${sysstiaAddress}`);
+  logger.info(`Deployed RewardDistributor at ${rewardDistributorAddress}`);
 
   await govDeployer.waitForDeployments();
   logger.info(`All governance contracts deployed`);
@@ -358,15 +346,22 @@ export const deployL1Contracts = async (
   ]);
   logger.info(`Deployed Fee Juice Portal at ${feeJuicePortalAddress}`);
 
+  const rollupArgs = {
+    aztecSlotDuration: args.aztecSlotDuration,
+    aztecEpochDuration: args.aztecEpochDuration,
+    targetCommitteeSize: args.aztecTargetCommitteeSize,
+    aztecEpochProofClaimWindowInL2Slots: args.aztecEpochProofClaimWindowInL2Slots,
+  };
   const rollupAddress = await deployer.deploy(l1Artifacts.rollup, [
     feeJuicePortalAddress.toString(),
-    sysstiaAddress.toString(),
+    rewardDistributorAddress.toString(),
     args.vkTreeRoot.toString(),
     args.protocolContractTreeRoot.toString(),
     account.address.toString(),
     args.initialValidators?.map(v => v.toString()) ?? [],
+    rollupArgs,
   ]);
-  logger.info(`Deployed Rollup at ${rollupAddress}`);
+  logger.info(`Deployed Rollup at ${rollupAddress}`, rollupArgs);
 
   await deployer.waitForDeployments();
   logger.info(`All core contracts deployed`);
@@ -396,7 +391,7 @@ export const deployL1Contracts = async (
   //        because there is circular dependency hell. This is a temporary solution. #3342
   // @todo  #8084
   // fund the portal contract with Fee Juice
-  const FEE_JUICE_INITIAL_MINT = 20000000000;
+  const FEE_JUICE_INITIAL_MINT = 200000000000000;
   const mintTxHash = await feeJuice.write.mint([feeJuicePortalAddress.toString(), FEE_JUICE_INITIAL_MINT], {} as any);
 
   // @note  This is used to ensure we fully wait for the transaction when running against a real chain
@@ -468,16 +463,16 @@ export const deployL1Contracts = async (
     logger.verbose(`Registry ${registryAddress} has already registered rollup ${rollupAddress}`);
   }
 
-  // If the owner is not the Apella contract, transfer ownership to the Apella contract
-  if ((await registryContract.read.owner([])) !== getAddress(apellaAddress.toString())) {
+  // If the owner is not the Governance contract, transfer ownership to the Governance contract
+  if ((await registryContract.read.owner([])) !== getAddress(governanceAddress.toString())) {
     const transferOwnershipTxHash = await registryContract.write.transferOwnership(
-      [getAddress(apellaAddress.toString())],
+      [getAddress(governanceAddress.toString())],
       {
         account,
       },
     );
     logger.verbose(
-      `Transferring the ownership of the registry contract at ${registryAddress} to the Apella ${apellaAddress} in tx ${transferOwnershipTxHash}`,
+      `Transferring the ownership of the registry contract at ${registryAddress} to the Governance ${governanceAddress} in tx ${transferOwnershipTxHash}`,
     );
     txHashes.push(transferOwnershipTxHash);
   }
@@ -493,10 +488,10 @@ export const deployL1Contracts = async (
     outboxAddress,
     feeJuiceAddress,
     feeJuicePortalAddress,
-    nomismatokopioAddress,
-    sysstiaAddress,
-    gerousiaAddress,
-    apellaAddress,
+    coinIssuerAddress,
+    rewardDistributorAddress,
+    governanceProposerAddress,
+    governanceAddress,
   };
 
   return {

package/src/index.ts

@@ -4,3 +4,4 @@ export * from './l1_contract_addresses.js';
 export * from './l1_reader.js';
 export * from './ethereum_chain.js';
 export * from './utils.js';
+export * from './config.js';

package/src/l1_contract_addresses.ts

@@ -1,31 +1,45 @@
 import { type ConfigMappingsType } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
+import { type ZodFor, schemas } from '@aztec/foundation/schemas';
+
+import { z } from 'zod';
 
 /**
  * The names of the current L1 contract addresses.
  * NOTE: When changing this list, make sure to update CLI & CI scripts accordingly.
  * For reference: https://github.com/AztecProtocol/aztec-packages/pull/5553
  */
-export const l1ContractsNames = [
+export const L1ContractsNames = [
   'rollupAddress',
   'registryAddress',
   'inboxAddress',
   'outboxAddress',
   'feeJuiceAddress',
   'feeJuicePortalAddress',
-  'nomismatokopioAddress',
-  'sysstiaAddress',
-  'gerousiaAddress',
-  'apellaAddress',
+  'coinIssuerAddress',
+  'rewardDistributorAddress',
+  'governanceProposerAddress',
+  'governanceAddress',
 ] as const;
 
-/**
- * Provides the directory of current L1 contract addresses
- */
+/** Provides the directory of current L1 contract addresses */
 export type L1ContractAddresses = {
-  [K in (typeof l1ContractsNames)[number]]: EthAddress;
+  [K in (typeof L1ContractsNames)[number]]: EthAddress;
 };
 
+export const L1ContractAddressesSchema = z.object({
+  rollupAddress: schemas.EthAddress,
+  registryAddress: schemas.EthAddress,
+  inboxAddress: schemas.EthAddress,
+  outboxAddress: schemas.EthAddress,
+  feeJuiceAddress: schemas.EthAddress,
+  feeJuicePortalAddress: schemas.EthAddress,
+  coinIssuerAddress: schemas.EthAddress,
+  rewardDistributorAddress: schemas.EthAddress,
+  governanceProposerAddress: schemas.EthAddress,
+  governanceAddress: schemas.EthAddress,
+}) satisfies ZodFor<L1ContractAddresses>;
+
 const parseEnv = (val: string) => EthAddress.fromString(val);
 
 export const l1ContractAddressesMapping: ConfigMappingsType<L1ContractAddresses> = {
@@ -59,24 +73,24 @@ export const l1ContractAddressesMapping: ConfigMappingsType<L1ContractAddresses>
     description: 'The deployed L1 Fee Juice portal contract address.',
     parseEnv,
   },
-  nomismatokopioAddress: {
-    env: 'NOMISMATOKOPIO_CONTRACT_ADDRESS',
-    description: 'The deployed L1 nomismatokopio contract address',
+  coinIssuerAddress: {
+    env: 'COIN_ISSUER_CONTRACT_ADDRESS',
+    description: 'The deployed L1 coinIssuer contract address',
     parseEnv,
   },
-  sysstiaAddress: {
-    env: 'SYSSTIA_CONTRACT_ADDRESS',
-    description: 'The deployed L1 sysstia contract address',
+  rewardDistributorAddress: {
+    env: 'REWARD_DISTRIBUTOR_CONTRACT_ADDRESS',
+    description: 'The deployed L1 rewardDistributor contract address',
     parseEnv,
   },
-  gerousiaAddress: {
-    env: 'GEROUSIA_CONTRACT_ADDRESS',
-    description: 'The deployed L1 gerousia contract address',
+  governanceProposerAddress: {
+    env: 'GOVERNANCE_PROPOSER_CONTRACT_ADDRESS',
+    description: 'The deployed L1 governanceProposer contract address',
     parseEnv,
   },
-  apellaAddress: {
-    env: 'APELLA_CONTRACT_ADDRESS',
-    description: 'The deployed L1 apella contract address',
+  governanceAddress: {
+    env: 'GOVERNANCE_CONTRACT_ADDRESS',
+    description: 'The deployed L1 governance contract address',
     parseEnv,
   },
 };

package/src/l1_reader.ts

@@ -2,26 +2,15 @@ import { type ConfigMappingsType, numberConfigHelper } from '@aztec/foundation/c
 
 import { type L1ContractAddresses, l1ContractAddressesMapping } from './l1_contract_addresses.js';
 
-/**
- * Configuration of the L1GlobalReader.
- */
+/** Configuration of the L1GlobalReader. */
 export interface L1ReaderConfig {
-  /**
-   * The RPC Url of the ethereum host.
-   */
+  /** The RPC Url of the ethereum host. */
   l1RpcUrl: string;
-  /**
-   * The chain ID of the ethereum host.
-   */
+  /** The chain ID of the ethereum host. */
   l1ChainId: number;
-
-  /**
-   * The deployed l1 contract addresses
-   */
+  /** The deployed l1 contract addresses */
   l1Contracts: L1ContractAddresses;
-  /**
-   * The polling interval viem uses in ms
-   */
+  /** The polling interval viem uses in ms */
   viemPollingIntervalMS: number;
 }