@aztec/ethereum 0.0.0-test.1 → 0.0.1-commit.21caa21

package/dest/contracts/governance.js

@@ -1,9 +1,9 @@
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { sleep } from '@aztec/foundation/sleep';
-import { GovernanceAbi } from '@aztec/l1-artifacts';
-import { encodeFunctionData, getContract } from 'viem';
-import { L1TxUtils } from '../l1_tx_utils.js';
-import { GovernanceProposerContract } from './governance_proposer.js';
+import { GovernanceAbi } from '@aztec/l1-artifacts/GovernanceAbi';
+import { encodeFunctionData, getContract, parseEventLogs } from 'viem';
+import { createL1TxUtilsFromViemWallet } from '../l1_tx_utils/index.js';
+import { isExtendedClient } from '../types.js';
 // NOTE: Must be kept in sync with DataStructures.ProposalState in l1-contracts
 export var ProposalState = /*#__PURE__*/ function(ProposalState) {
     ProposalState[ProposalState["Pending"] = 0] = "Pending";
@@ -16,90 +16,52 @@ export var ProposalState = /*#__PURE__*/ function(ProposalState) {
     ProposalState[ProposalState["Expired"] = 7] = "Expired";
     return ProposalState;
 }({});
-export class GovernanceContract {
-    publicClient;
-    walletClient;
-    publicGovernance;
-    walletGovernance;
-    constructor(address, publicClient, walletClient){
-        this.publicClient = publicClient;
-        this.walletClient = walletClient;
-        this.publicGovernance = getContract({
+export function extractProposalIdFromLogs(logs) {
+    const parsedLogs = parseEventLogs({
+        abi: GovernanceAbi,
+        logs: logs,
+        eventName: 'Proposed'
+    });
+    if (parsedLogs.length === 0) {
+        throw new Error('Proposal log not found');
+    }
+    return parsedLogs[0].args.proposalId;
+}
+export class ReadOnlyGovernanceContract {
+    client;
+    governanceContract;
+    constructor(address, client){
+        this.client = client;
+        this.governanceContract = getContract({
             address,
             abi: GovernanceAbi,
-            client: publicClient
+            client: client
         });
-        this.walletGovernance = walletClient ? getContract({
-            address,
-            abi: GovernanceAbi,
-            client: walletClient
-        }) : undefined;
     }
     get address() {
-        return EthAddress.fromString(this.publicGovernance.address);
+        return EthAddress.fromString(this.governanceContract.address);
     }
-    async getProposer() {
-        const governanceProposerAddress = EthAddress.fromString(await this.publicGovernance.read.governanceProposer());
-        return new GovernanceProposerContract(this.publicClient, governanceProposerAddress.toString());
+    async getGovernanceProposerAddress() {
+        return EthAddress.fromString(await this.governanceContract.read.governanceProposer());
     }
-    async getGovernanceAddresses() {
-        const governanceProposer = await this.getProposer();
-        const [rollupAddress, registryAddress] = await Promise.all([
-            governanceProposer.getRollupAddress(),
-            governanceProposer.getRegistryAddress()
-        ]);
-        return {
-            governanceAddress: this.address,
-            rollupAddress,
-            registryAddress,
-            governanceProposerAddress: governanceProposer.address
-        };
+    getConfiguration() {
+        return this.governanceContract.read.getConfiguration();
     }
     getProposal(proposalId) {
-        return this.publicGovernance.read.getProposal([
+        return this.governanceContract.read.getProposal([
             proposalId
         ]);
     }
     async getProposalState(proposalId) {
-        const state = await this.publicGovernance.read.getProposalState([
+        const state = await this.governanceContract.read.getProposalState([
             proposalId
         ]);
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison
         if (state < 0 || state > 7) {
             throw new Error(`Invalid proposal state: ${state}`);
         }
         return state;
     }
-    assertWalletGovernance() {
-        if (!this.walletGovernance) {
-            throw new Error('Wallet client is required for this operation');
-        }
-        return this.walletGovernance;
-    }
-    async deposit(onBehalfOf, amount) {
-        const walletGovernance = this.assertWalletGovernance();
-        const depositTx = await walletGovernance.write.deposit([
-            onBehalfOf,
-            amount
-        ]);
-        await this.publicClient.waitForTransactionReceipt({
-            hash: depositTx
-        });
-    }
-    async proposeWithLock({ payloadAddress, withdrawAddress }) {
-        const walletGovernance = this.assertWalletGovernance();
-        const proposeTx = await walletGovernance.write.proposeWithLock([
-            payloadAddress,
-            withdrawAddress
-        ]);
-        const receipt = await this.publicClient.waitForTransactionReceipt({
-            hash: proposeTx
-        });
-        if (receipt.status !== 'success') {
-            throw new Error(`Proposal failed: ${receipt.status}`);
-        }
-        const proposalId = Number(receipt.logs[1].topics[1]);
-        return proposalId;
-    }
     async awaitProposalActive({ proposalId, logger }) {
         const state = await this.getProposalState(proposalId);
         if (state === 1) {
@@ -109,7 +71,7 @@ export class GovernanceContract {
         } else {
             const proposal = await this.getProposal(proposalId);
             const startOfActive = proposal.creation + proposal.config.votingDelay;
-            const block = await this.publicClient.getBlock();
+            const block = await this.client.getBlock();
             // Add 12 seconds to the time to make sure we don't vote too early
             const secondsToActive = Number(startOfActive - block.timestamp) + 12;
             const now = new Date();
@@ -135,7 +97,7 @@ export class GovernanceContract {
         } else {
             const proposal = await this.getProposal(proposalId);
             const startOfExecutable = proposal.creation + proposal.config.votingDelay + proposal.config.votingDuration + proposal.config.executionDelay;
-            const block = await this.publicClient.getBlock();
+            const block = await this.client.getBlock();
             const secondsToExecutable = Number(startOfExecutable - block.timestamp) + 12;
             const now = new Date();
             logger.info(`
@@ -146,17 +108,57 @@ export class GovernanceContract {
             await sleep(secondsToExecutable * 1000);
         }
     }
+}
+export class GovernanceContract extends ReadOnlyGovernanceContract {
+    client;
+    governanceContract;
+    constructor(address, client){
+        if (address instanceof EthAddress) {
+            address = address.toString();
+        }
+        super(address, client), this.client = client;
+        if (!isExtendedClient(client)) {
+            throw new Error('GovernanceContract has to be instantiated with a wallet client.');
+        }
+        this.governanceContract = getContract({
+            address,
+            abi: GovernanceAbi,
+            client
+        });
+    }
+    async deposit(onBehalfOf, amount) {
+        const depositTx = await this.governanceContract.write.deposit([
+            onBehalfOf,
+            amount
+        ]);
+        await this.client.waitForTransactionReceipt({
+            hash: depositTx
+        });
+    }
+    async proposeWithLock({ payloadAddress, withdrawAddress }) {
+        const proposeTx = await this.governanceContract.write.proposeWithLock([
+            payloadAddress,
+            withdrawAddress
+        ]);
+        const receipt = await this.client.waitForTransactionReceipt({
+            hash: proposeTx
+        });
+        if (receipt.status !== 'success') {
+            throw new Error(`Proposal failed: ${receipt.status}`);
+        }
+        return extractProposalIdFromLogs(receipt.logs);
+    }
     async getPower() {
-        const walletGovernance = this.assertWalletGovernance();
-        const now = await this.publicClient.getBlock();
-        return walletGovernance.read.powerAt([
-            this.walletClient.account.address,
+        const now = await this.client.getBlock();
+        return this.governanceContract.read.powerAt([
+            this.client.account.address,
             now.timestamp
         ]);
     }
     async vote({ proposalId, voteAmount, inFavor, retries = 10, logger }) {
-        const walletGovernance = this.assertWalletGovernance();
-        const l1TxUtils = new L1TxUtils(this.publicClient, this.walletClient, logger);
+        const l1TxUtils = createL1TxUtilsFromViemWallet(this.client, {
+            logger
+        });
         const retryDelaySeconds = 12;
         voteAmount = voteAmount ?? await this.getPower();
         let success = false;
@@ -173,7 +175,7 @@ export class GovernanceContract {
                 };
                 const encodedVoteData = encodeFunctionData(voteFunctionData);
                 const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
-                    to: walletGovernance.address,
+                    to: this.governanceContract.address,
                     data: encodedVoteData
                 });
                 if (receipt.status === 'success') {
@@ -182,7 +184,7 @@ export class GovernanceContract {
                 } else {
                     const args = {
                         ...voteFunctionData,
-                        address: walletGovernance.address
+                        address: this.governanceContract.address
                     };
                     const errorMsg = await l1TxUtils.tryGetErrorFromRevertedTx(encodedVoteData, args, undefined, []);
                     logger.error(`Error voting on proposal ${proposalId}: ${errorMsg}`);
@@ -198,13 +200,14 @@ export class GovernanceContract {
         }
         logger.info(`Voted [${inFavor ? 'yea' : 'nay'}] on proposal [${proposalId}]`);
         const proposal = await this.getProposal(proposalId);
-        logger.info(`Proposal [${proposalId}] has state [${proposal.state}]`);
+        logger.info(`Proposal [${proposalId}] has cached state [${proposal.cachedState}]`);
         logger.info(`Proposal [${proposalId}] has summedBallot yea [${proposal.summedBallot.yea}]`);
-        logger.info(`Proposal [${proposalId}] has summedBallot nea [${proposal.summedBallot.nea}]`);
+        logger.info(`Proposal [${proposalId}] has summedBallot nay [${proposal.summedBallot.nay}]`);
     }
     async executeProposal({ proposalId, retries = 10, logger }) {
-        const walletGovernance = this.assertWalletGovernance();
-        const l1TxUtils = new L1TxUtils(this.publicClient, this.walletClient, logger);
+        const l1TxUtils = createL1TxUtilsFromViemWallet(this.client, {
+            logger
+        });
         const retryDelaySeconds = 12;
         let success = false;
         for(let i = 0; i < retries; i++){
@@ -218,7 +221,7 @@ export class GovernanceContract {
                 };
                 const encodedExecuteData = encodeFunctionData(executeFunctionData);
                 const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
-                    to: walletGovernance.address,
+                    to: this.governanceContract.address,
                     data: encodedExecuteData
                 });
                 if (receipt.status === 'success') {
@@ -227,7 +230,7 @@ export class GovernanceContract {
                 } else {
                     const args = {
                         ...executeFunctionData,
-                        address: walletGovernance.address
+                        address: this.governanceContract.address
                     };
                     const errorMsg = await l1TxUtils.tryGetErrorFromRevertedTx(encodedExecuteData, args, undefined, []);
                     logger.error(`Error executing proposal ${proposalId}: ${errorMsg}`);

package/dest/contracts/governance_proposer.d.ts

@@ -1,28 +1,31 @@
+import { SlotNumber } from '@aztec/foundation/branded-types';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { type Hex, type TransactionReceipt } from 'viem';
-import type { GasPrice, L1TxRequest, L1TxUtils } from '../l1_tx_utils.js';
-import type { ViemPublicClient } from '../types.js';
+import { type Hex, type TransactionReceipt, type TypedDataDefinition } from 'viem';
+import type { L1TxRequest, L1TxUtils } from '../l1_tx_utils/index.js';
+import type { ViemClient } from '../types.js';
 import { type IEmpireBase } from './empire_base.js';
 export declare class GovernanceProposerContract implements IEmpireBase {
-    readonly client: ViemPublicClient;
+    readonly client: ViemClient;
     private readonly proposer;
-    constructor(client: ViemPublicClient, address: Hex);
+    constructor(client: ViemClient, address: Hex | EthAddress);
     get address(): EthAddress;
     getRollupAddress(): Promise<EthAddress>;
     getRegistryAddress(): Promise<EthAddress>;
     getQuorumSize(): Promise<bigint>;
     getRoundSize(): Promise<bigint>;
-    computeRound(slot: bigint): Promise<bigint>;
+    getInstance(): Promise<`0x${string}`>;
+    computeRound(slot: SlotNumber): Promise<bigint>;
     getRoundInfo(rollupAddress: Hex, round: bigint): Promise<{
-        lastVote: bigint;
-        leader: Hex;
+        lastSignalSlot: SlotNumber;
+        payloadWithMostSignals: Hex;
         executed: boolean;
     }>;
-    getProposalVotes(rollupAddress: Hex, round: bigint, proposal: Hex): Promise<bigint>;
-    createVoteRequest(payload: Hex): L1TxRequest;
-    executeProposal(round: bigint, l1TxUtils: L1TxUtils): Promise<{
+    getPayloadSignals(rollupAddress: Hex, round: bigint, payload: Hex): Promise<bigint>;
+    createSignalRequest(payload: Hex): L1TxRequest;
+    createSignalRequestWithSignature(payload: Hex, slot: SlotNumber, chainId: number, signerAddress: Hex, signer: (msg: TypedDataDefinition) => Promise<Hex>): Promise<L1TxRequest>;
+    submitRoundWinner(round: bigint, l1TxUtils: L1TxUtils): Promise<{
         receipt: TransactionReceipt;
-        gasPrice: GasPrice;
+        proposalId: bigint;
     }>;
 }
-//# sourceMappingURL=governance_proposer.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ292ZXJuYW5jZV9wcm9wb3Nlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0cy9nb3Zlcm5hbmNlX3Byb3Bvc2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUU3RCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFHM0QsT0FBTyxFQUVMLEtBQUssR0FBRyxFQUNSLEtBQUssa0JBQWtCLEVBQ3ZCLEtBQUssbUJBQW1CLEVBR3pCLE1BQU0sTUFBTSxDQUFDO0FBRWQsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLFNBQVMsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3RFLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUM5QyxPQUFPLEVBQUUsS0FBSyxXQUFXLEVBQThELE1BQU0sa0JBQWtCLENBQUM7QUFHaEgscUJBQWEsMEJBQTJCLFlBQVcsV0FBVzthQUkxQyxNQUFNLEVBQUUsVUFBVTtJQUhwQyxPQUFPLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBa0U7SUFFM0YsWUFDa0IsTUFBTSxFQUFFLFVBQVUsRUFDbEMsT0FBTyxFQUFFLEdBQUcsR0FBRyxVQUFVLEVBTTFCO0lBRUQsSUFBVyxPQUFPLGVBRWpCO0lBRVksZ0JBQWdCLHdCQUU1QjtJQUdZLGtCQUFrQix3QkFFOUI7SUFFTSxhQUFhLElBQUksT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUV0QztJQUVNLFlBQVksSUFBSSxPQUFPLENBQUMsTUFBTSxDQUFDLENBRXJDO0lBRU0sV0FBVywyQkFFakI7SUFFTSxZQUFZLENBQUMsSUFBSSxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBRXJEO0lBRVksWUFBWSxDQUN2QixhQUFhLEVBQUUsR0FBRyxFQUNsQixLQUFLLEVBQUUsTUFBTSxHQUNaLE9BQU8sQ0FBQztRQUFFLGNBQWMsRUFBRSxVQUFVLENBQUM7UUFBQyxzQkFBc0IsRUFBRSxHQUFHLENBQUM7UUFBQyxRQUFRLEVBQUUsT0FBTyxDQUFBO0tBQUUsQ0FBQyxDQU96RjtJQUVNLGlCQUFpQixDQUFDLGFBQWEsRUFBRSxHQUFHLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsR0FBRyxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FFekY7SUFFTSxtQkFBbUIsQ0FBQyxPQUFPLEVBQUUsR0FBRyxHQUFHLFdBQVcsQ0FLcEQ7SUFFWSxnQ0FBZ0MsQ0FDM0MsT0FBTyxFQUFFLEdBQUcsRUFDWixJQUFJLEVBQUUsVUFBVSxFQUNoQixPQUFPLEVBQUUsTUFBTSxFQUNmLGFBQWEsRUFBRSxHQUFHLEVBQ2xCLE1BQU0sRUFBRSxDQUFDLEdBQUcsRUFBRSxtQkFBbUIsS0FBSyxPQUFPLENBQUMsR0FBRyxDQUFDLEdBQ2pELE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FhdEI7SUFFWSxpQkFBaUIsQ0FDNUIsS0FBSyxFQUFFLE1BQU0sRUFDYixTQUFTLEVBQUUsU0FBUyxHQUNuQixPQUFPLENBQUM7UUFDVCxPQUFPLEVBQUUsa0JBQWtCLENBQUM7UUFDNUIsVUFBVSxFQUFFLE1BQU0sQ0FBQztLQUNwQixDQUFDLENBV0Q7Q0FDRiJ9

package/dest/contracts/governance_proposer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"governance_proposer.d.ts","sourceRoot":"","sources":["../../src/contracts/governance_proposer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,EAA8B,KAAK,GAAG,EAAE,KAAK,kBAAkB,EAAmC,MAAM,MAAM,CAAC;AAEtH,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC1E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,KAAK,WAAW,EAAc,MAAM,kBAAkB,CAAC;AAEhE,qBAAa,0BAA2B,YAAW,WAAW;aAGhC,MAAM,EAAE,gBAAgB;IAFpD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAwE;gBAErE,MAAM,EAAE,gBAAgB,EAAE,OAAO,EAAE,GAAG;IAIlE,IAAW,OAAO,eAEjB;IAEY,gBAAgB;IAKhB,kBAAkB;IAIxB,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAIhC,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAI/B,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIrC,YAAY,CACvB,aAAa,EAAE,GAAG,EAClB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,GAAG,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAA;KAAE,CAAC;IASzD,gBAAgB,CAAC,aAAa,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IAInF,iBAAiB,CAAC,OAAO,EAAE,GAAG,GAAG,WAAW;IAO5C,eAAe,CACpB,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC;QACT,OAAO,EAAE,kBAAkB,CAAC;QAC5B,QAAQ,EAAE,QAAQ,CAAC;KACpB,CAAC;CAUH"}
+{"version":3,"file":"governance_proposer.d.ts","sourceRoot":"","sources":["../../src/contracts/governance_proposer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE7D,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,EAEL,KAAK,GAAG,EACR,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EAGzB,MAAM,MAAM,CAAC;AAEd,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,KAAK,WAAW,EAA8D,MAAM,kBAAkB,CAAC;AAGhH,qBAAa,0BAA2B,YAAW,WAAW;aAI1C,MAAM,EAAE,UAAU;IAHpC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkE;IAE3F,YACkB,MAAM,EAAE,UAAU,EAClC,OAAO,EAAE,GAAG,GAAG,UAAU,EAM1B;IAED,IAAW,OAAO,eAEjB;IAEY,gBAAgB,wBAE5B;IAGY,kBAAkB,wBAE9B;IAEM,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC,CAEtC;IAEM,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,CAErC;IAEM,WAAW,2BAEjB;IAEM,YAAY,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAErD;IAEY,YAAY,CACvB,aAAa,EAAE,GAAG,EAClB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC;QAAE,cAAc,EAAE,UAAU,CAAC;QAAC,sBAAsB,EAAE,GAAG,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAA;KAAE,CAAC,CAOzF;IAEM,iBAAiB,CAAC,aAAa,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,CAEzF;IAEM,mBAAmB,CAAC,OAAO,EAAE,GAAG,GAAG,WAAW,CAKpD;IAEY,gCAAgC,CAC3C,OAAO,EAAE,GAAG,EACZ,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,GAAG,EAClB,MAAM,EAAE,CAAC,GAAG,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,GACjD,OAAO,CAAC,WAAW,CAAC,CAatB;IAEY,iBAAiB,CAC5B,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC;QACT,OAAO,EAAE,kBAAkB,CAAC;QAC5B,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC,CAWD;CACF"}

package/dest/contracts/governance_proposer.js

@@ -4,16 +4,21 @@ function _ts_decorate(decorators, target, key, desc) {
     else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
+import { SlotNumber } from '@aztec/foundation/branded-types';
 import { memoize } from '@aztec/foundation/decorators';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { GovernanceProposerAbi } from '@aztec/l1-artifacts';
+import { GovernanceProposerAbi } from '@aztec/l1-artifacts/GovernanceProposerAbi';
 import { encodeFunctionData, getContract } from 'viem';
-import { encodeVote } from './empire_base.js';
+import { encodeSignal, encodeSignalWithSignature, signSignalWithSig } from './empire_base.js';
+import { extractProposalIdFromLogs } from './governance.js';
 export class GovernanceProposerContract {
     client;
     proposer;
     constructor(client, address){
         this.client = client;
+        if (address instanceof EthAddress) {
+            address = address.toString();
+        }
         this.proposer = getContract({
             address,
             abi: GovernanceProposerAbi,
@@ -30,51 +35,66 @@ export class GovernanceProposerContract {
         return EthAddress.fromString(await this.proposer.read.REGISTRY());
     }
     getQuorumSize() {
-        return this.proposer.read.N();
+        return this.proposer.read.QUORUM_SIZE();
     }
     getRoundSize() {
-        return this.proposer.read.M();
+        return this.proposer.read.ROUND_SIZE();
+    }
+    getInstance() {
+        return this.proposer.read.getInstance();
     }
     computeRound(slot) {
         return this.proposer.read.computeRound([
-            slot
+            BigInt(slot)
         ]);
     }
     async getRoundInfo(rollupAddress, round) {
-        const roundInfo = await this.proposer.read.rounds([
+        const result = await this.proposer.read.getRoundData([
             rollupAddress,
             round
         ]);
         return {
-            lastVote: roundInfo[0],
-            leader: roundInfo[1],
-            executed: roundInfo[2]
+            lastSignalSlot: SlotNumber.fromBigInt(result.lastSignalSlot),
+            payloadWithMostSignals: result.payloadWithMostSignals,
+            executed: result.executed
         };
     }
-    getProposalVotes(rollupAddress, round, proposal) {
-        return this.proposer.read.yeaCount([
+    getPayloadSignals(rollupAddress, round, payload) {
+        return this.proposer.read.signalCount([
             rollupAddress,
             round,
-            proposal
+            payload
         ]);
     }
-    createVoteRequest(payload) {
+    createSignalRequest(payload) {
         return {
             to: this.address.toString(),
-            data: encodeVote(payload)
+            data: encodeSignal(payload)
         };
     }
-    executeProposal(round, l1TxUtils) {
-        return l1TxUtils.sendAndMonitorTransaction({
+    async createSignalRequestWithSignature(payload, slot, chainId, signerAddress, signer) {
+        const signature = await signSignalWithSig(signer, payload, slot, await this.getInstance(), this.address.toString(), chainId);
+        return {
+            to: this.address.toString(),
+            data: encodeSignalWithSignature(payload, signature)
+        };
+    }
+    async submitRoundWinner(round, l1TxUtils) {
+        const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
             to: this.address.toString(),
             data: encodeFunctionData({
                 abi: this.proposer.abi,
-                functionName: 'executeProposal',
+                functionName: 'submitRoundWinner',
                 args: [
                     round
                 ]
             })
         });
+        const proposalId = extractProposalIdFromLogs(receipt.logs);
+        return {
+            receipt,
+            proposalId
+        };
     }
 }
 _ts_decorate([

package/dest/contracts/gse.d.ts

@@ -0,0 +1,32 @@
+import { EthAddress } from '@aztec/foundation/eth-address';
+import type { ProjPointType } from '@noble/curves/abstract/weierstrass';
+import { type Hex } from 'viem';
+import type { ViemClient } from '../types.js';
+export type RegistrationTuple = {
+    publicKeyInG1: {
+        x: bigint;
+        y: bigint;
+    };
+    publicKeyInG2: {
+        x0: bigint;
+        x1: bigint;
+        y0: bigint;
+        y1: bigint;
+    };
+    proofOfPossession: {
+        x: bigint;
+        y: bigint;
+    };
+};
+export declare class GSEContract {
+    readonly client: ViemClient;
+    address: EthAddress;
+    private readonly gse;
+    constructor(client: ViemClient, address: Hex | EthAddress);
+    getOwner(): Promise<EthAddress>;
+    getGovernance(): Promise<EthAddress>;
+    getAttestersFromIndicesAtTime(instance: Hex | EthAddress, ts: bigint, indices: bigint[]): Promise<readonly `0x${string}`[]>;
+    getRegistrationDigest(publicKey: ProjPointType<bigint>): Promise<ProjPointType<bigint>>;
+    makeRegistrationTuple(privateKey: bigint): Promise<RegistrationTuple>;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ3NlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3RzL2dzZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFHM0QsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sb0NBQW9DLENBQUM7QUFFeEUsT0FBTyxFQUE4QixLQUFLLEdBQUcsRUFBZSxNQUFNLE1BQU0sQ0FBQztBQUV6RSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFFOUMsTUFBTSxNQUFNLGlCQUFpQixHQUFHO0lBQzlCLGFBQWEsRUFBRTtRQUNiLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDVixDQUFDLEVBQUUsTUFBTSxDQUFDO0tBQ1gsQ0FBQztJQUNGLGFBQWEsRUFBRTtRQUNiLEVBQUUsRUFBRSxNQUFNLENBQUM7UUFDWCxFQUFFLEVBQUUsTUFBTSxDQUFDO1FBQ1gsRUFBRSxFQUFFLE1BQU0sQ0FBQztRQUNYLEVBQUUsRUFBRSxNQUFNLENBQUM7S0FDWixDQUFDO0lBQ0YsaUJBQWlCLEVBQUU7UUFDakIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztRQUNWLENBQUMsRUFBRSxNQUFNLENBQUM7S0FDWCxDQUFDO0NBQ0gsQ0FBQztBQUVGLHFCQUFhLFdBQVc7YUFLSixNQUFNLEVBQUUsVUFBVTtJQUo3QixPQUFPLEVBQUUsVUFBVSxDQUFDO0lBQzNCLE9BQU8sQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFtRDtJQUV2RSxZQUNrQixNQUFNLEVBQUUsVUFBVSxFQUNsQyxPQUFPLEVBQUUsR0FBRyxHQUFHLFVBQVUsRUFPMUI7SUFFWSxRQUFRLElBQUksT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQUUzQztJQUVZLGFBQWEsSUFBSSxPQUFPLENBQUMsVUFBVSxDQUFDLENBRWhEO0lBRUQsNkJBQTZCLENBQUMsUUFBUSxFQUFFLEdBQUcsR0FBRyxVQUFVLEVBQUUsRUFBRSxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLHFDQUt0RjtJQUVZLHFCQUFxQixDQUFDLFNBQVMsRUFBRSxhQUFhLENBQUMsTUFBTSxDQUFDLEdBQUcsT0FBTyxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUluRztJQUVZLHFCQUFxQixDQUFDLFVBQVUsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLGlCQUFpQixDQUFDLENBd0JqRjtDQUNGIn0=

package/dest/contracts/gse.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"gse.d.ts","sourceRoot":"","sources":["../../src/contracts/gse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAExE,OAAO,EAA8B,KAAK,GAAG,EAAe,MAAM,MAAM,CAAC;AAEzE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C,MAAM,MAAM,iBAAiB,GAAG;IAC9B,aAAa,EAAE;QACb,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;KACX,CAAC;IACF,aAAa,EAAE;QACb,EAAE,EAAE,MAAM,CAAC;QACX,EAAE,EAAE,MAAM,CAAC;QACX,EAAE,EAAE,MAAM,CAAC;QACX,EAAE,EAAE,MAAM,CAAC;KACZ,CAAC;IACF,iBAAiB,EAAE;QACjB,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;KACX,CAAC;CACH,CAAC;AAEF,qBAAa,WAAW;aAKJ,MAAM,EAAE,UAAU;IAJ7B,OAAO,EAAE,UAAU,CAAC;IAC3B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAmD;IAEvE,YACkB,MAAM,EAAE,UAAU,EAClC,OAAO,EAAE,GAAG,GAAG,UAAU,EAO1B;IAEY,QAAQ,IAAI,OAAO,CAAC,UAAU,CAAC,CAE3C;IAEY,aAAa,IAAI,OAAO,CAAC,UAAU,CAAC,CAEhD;IAED,6BAA6B,CAAC,QAAQ,EAAE,GAAG,GAAG,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,qCAKtF;IAEY,qBAAqB,CAAC,SAAS,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAInG;IAEY,qBAAqB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAwBjF;CACF"}

package/dest/contracts/gse.js

@@ -0,0 +1,72 @@
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { GSEAbi } from '@aztec/l1-artifacts/GSEAbi';
+import { bn254 } from '@noble/curves/bn254';
+import { getContract } from 'viem';
+export class GSEContract {
+    client;
+    address;
+    gse;
+    constructor(client, address){
+        this.client = client;
+        if (address instanceof EthAddress) {
+            address = address.toString();
+        }
+        this.address = EthAddress.fromString(address);
+        this.gse = getContract({
+            address,
+            abi: GSEAbi,
+            client
+        });
+    }
+    async getOwner() {
+        return EthAddress.fromString(await this.gse.read.owner());
+    }
+    async getGovernance() {
+        return EthAddress.fromString(await this.gse.read.getGovernance());
+    }
+    getAttestersFromIndicesAtTime(instance, ts, indices) {
+        if (instance instanceof EthAddress) {
+            instance = instance.toString();
+        }
+        return this.gse.read.getAttestersFromIndicesAtTime([
+            instance,
+            ts,
+            indices
+        ]);
+    }
+    async getRegistrationDigest(publicKey) {
+        const affinePublicKey = publicKey.toAffine();
+        const g1PointDigest = await this.gse.read.getRegistrationDigest([
+            {
+                x: affinePublicKey.x,
+                y: affinePublicKey.y
+            }
+        ]);
+        return bn254.G1.ProjectivePoint.fromAffine(g1PointDigest);
+    }
+    async makeRegistrationTuple(privateKey) {
+        const publicKeyG1 = bn254.G1.ProjectivePoint.BASE.multiply(privateKey);
+        const digest = await this.getRegistrationDigest(publicKeyG1);
+        const signature = digest.multiply(privateKey);
+        const publicKeyG2 = bn254.G2.ProjectivePoint.BASE.multiply(privateKey);
+        const publicKeyG1Affine = publicKeyG1.toAffine();
+        const signatureAffine = signature.toAffine();
+        const publicKeyG2Affine = publicKeyG2.toAffine();
+        return {
+            publicKeyInG1: {
+                x: publicKeyG1Affine.x,
+                y: publicKeyG1Affine.y
+            },
+            publicKeyInG2: {
+                x0: publicKeyG2Affine.x.c0,
+                x1: publicKeyG2Affine.x.c1,
+                y0: publicKeyG2Affine.y.c0,
+                y1: publicKeyG2Affine.y.c1
+            },
+            proofOfPossession: {
+                x: signatureAffine.x,
+                y: signatureAffine.y
+            }
+        };
+    }
+}

package/dest/contracts/inbox.d.ts

@@ -0,0 +1,26 @@
+import { Buffer16 } from '@aztec/foundation/buffer';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { InboxAbi } from '@aztec/l1-artifacts/InboxAbi';
+import { type BlockTag, type GetContractReturnType, type Hex } from 'viem';
+import type { DeployL1ContractsReturnType } from '../deploy_l1_contracts.js';
+import type { L1ReaderConfig } from '../l1_reader.js';
+import type { ViemClient } from '../types.js';
+export declare class InboxContract {
+    readonly client: ViemClient;
+    private readonly inbox;
+    static getFromL1ContractsValues(deployL1ContractsValues: DeployL1ContractsReturnType): InboxContract;
+    static getFromConfig(config: L1ReaderConfig): InboxContract;
+    constructor(client: ViemClient, address: Hex | EthAddress);
+    get address(): `0x${string}`;
+    getContract(): GetContractReturnType<typeof InboxAbi, ViemClient>;
+    getState(opts?: {
+        blockTag?: BlockTag;
+        blockNumber?: bigint;
+    }): Promise<InboxContractState>;
+}
+export type InboxContractState = {
+    totalMessagesInserted: bigint;
+    messagesRollingHash: Buffer16;
+    treeInProgress: bigint;
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5ib3guZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdHMvaW5ib3gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ3BELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUMzRCxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFFeEQsT0FBTyxFQUFFLEtBQUssUUFBUSxFQUFFLEtBQUsscUJBQXFCLEVBQUUsS0FBSyxHQUFHLEVBQWUsTUFBTSxNQUFNLENBQUM7QUFHeEYsT0FBTyxLQUFLLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUM3RSxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUN0RCxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFHOUMscUJBQWEsYUFBYTthQWtCTixNQUFNLEVBQUUsVUFBVTtJQWpCcEMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQXFEO0lBRTNFLE1BQU0sQ0FBQyx3QkFBd0IsQ0FBQyx1QkFBdUIsRUFBRSwyQkFBMkIsaUJBTW5GO0lBRUQsTUFBTSxDQUFDLGFBQWEsQ0FBQyxNQUFNLEVBQUUsY0FBYyxpQkFJMUM7SUFFRCxZQUNrQixNQUFNLEVBQUUsVUFBVSxFQUNsQyxPQUFPLEVBQUUsR0FBRyxHQUFHLFVBQVUsRUFNMUI7SUFFRCxJQUFXLE9BQU8sa0JBRWpCO0lBRU0sV0FBVyxJQUFJLHFCQUFxQixDQUFDLE9BQU8sUUFBUSxFQUFFLFVBQVUsQ0FBQyxDQUV2RTtJQUVZLFFBQVEsQ0FBQyxJQUFJLEdBQUU7UUFBRSxRQUFRLENBQUMsRUFBRSxRQUFRLENBQUM7UUFBQyxXQUFXLENBQUMsRUFBRSxNQUFNLENBQUE7S0FBTyxHQUFHLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxDQVEzRztDQUNGO0FBRUQsTUFBTSxNQUFNLGtCQUFrQixHQUFHO0lBQy9CLHFCQUFxQixFQUFFLE1BQU0sQ0FBQztJQUM5QixtQkFBbUIsRUFBRSxRQUFRLENBQUM7SUFDOUIsY0FBYyxFQUFFLE1BQU0sQ0FBQztDQUN4QixDQUFDIn0=

package/dest/contracts/inbox.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"inbox.d.ts","sourceRoot":"","sources":["../../src/contracts/inbox.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAExD,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,qBAAqB,EAAE,KAAK,GAAG,EAAe,MAAM,MAAM,CAAC;AAGxF,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,2BAA2B,CAAC;AAC7E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAG9C,qBAAa,aAAa;aAkBN,MAAM,EAAE,UAAU;IAjBpC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAqD;IAE3E,MAAM,CAAC,wBAAwB,CAAC,uBAAuB,EAAE,2BAA2B,iBAMnF;IAED,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,cAAc,iBAI1C;IAED,YACkB,MAAM,EAAE,UAAU,EAClC,OAAO,EAAE,GAAG,GAAG,UAAU,EAM1B;IAED,IAAW,OAAO,kBAEjB;IAEM,WAAW,IAAI,qBAAqB,CAAC,OAAO,QAAQ,EAAE,UAAU,CAAC,CAEvE;IAEY,QAAQ,CAAC,IAAI,GAAE;QAAE,QAAQ,CAAC,EAAE,QAAQ,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAO,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAQ3G;CACF;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,mBAAmB,EAAE,QAAQ,CAAC;IAC9B,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC"}

package/dest/contracts/inbox.js

@@ -0,0 +1,45 @@
+import { Buffer16 } from '@aztec/foundation/buffer';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { InboxAbi } from '@aztec/l1-artifacts/InboxAbi';
+import { getContract } from 'viem';
+import { getPublicClient } from '../client.js';
+import { checkBlockTag } from './utils.js';
+export class InboxContract {
+    client;
+    inbox;
+    static getFromL1ContractsValues(deployL1ContractsValues) {
+        const { l1Client, l1ContractAddresses: { inboxAddress } } = deployL1ContractsValues;
+        return new InboxContract(l1Client, inboxAddress.toString());
+    }
+    static getFromConfig(config) {
+        const client = getPublicClient(config);
+        const address = config.l1Contracts.inboxAddress.toString();
+        return new InboxContract(client, address);
+    }
+    constructor(client, address){
+        this.client = client;
+        if (address instanceof EthAddress) {
+            address = address.toString();
+        }
+        this.inbox = getContract({
+            address,
+            abi: InboxAbi,
+            client
+        });
+    }
+    get address() {
+        return this.inbox.address;
+    }
+    getContract() {
+        return this.inbox;
+    }
+    async getState(opts = {}) {
+        await checkBlockTag(opts.blockNumber, this.client);
+        const state = await this.inbox.read.getState(opts);
+        return {
+            totalMessagesInserted: state.totalMessagesInserted,
+            messagesRollingHash: Buffer16.fromString(state.rollingHash),
+            treeInProgress: state.inProgress
+        };
+    }
+}

package/dest/contracts/index.d.ts

@@ -1,9 +1,15 @@
 export * from './empire_base.js';
+export * from './errors.js';
+export * from './fee_asset_handler.js';
 export * from './fee_juice.js';
-export * from './forwarder.js';
 export * from './governance.js';
 export * from './governance_proposer.js';
+export * from './gse.js';
+export * from './inbox.js';
+export * from './multicall.js';
 export * from './registry.js';
 export * from './rollup.js';
-export * from './slashing_proposer.js';
-//# sourceMappingURL=index.d.ts.map
+export * from './empire_slashing_proposer.js';
+export * from './tally_slashing_proposer.js';
+export * from './slasher_contract.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxrQkFBa0IsQ0FBQztBQUNqQyxjQUFjLGFBQWEsQ0FBQztBQUM1QixjQUFjLHdCQUF3QixDQUFDO0FBQ3ZDLGNBQWMsZ0JBQWdCLENBQUM7QUFDL0IsY0FBYyxpQkFBaUIsQ0FBQztBQUNoQyxjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLGNBQWMsVUFBVSxDQUFDO0FBQ3pCLGNBQWMsWUFBWSxDQUFDO0FBQzNCLGNBQWMsZ0JBQWdCLENBQUM7QUFDL0IsY0FBYyxlQUFlLENBQUM7QUFDOUIsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYywrQkFBK0IsQ0FBQztBQUM5QyxjQUFjLDhCQUE4QixDQUFDO0FBQzdDLGNBQWMsdUJBQXVCLENBQUMifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/contracts/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,0BAA0B,CAAC;AACzC,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,wBAAwB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/contracts/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,wBAAwB,CAAC;AACvC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,0BAA0B,CAAC;AACzC,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,+BAA+B,CAAC;AAC9C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC"}