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

package/dest/contracts/multicall.d.ts

@@ -0,0 +1,21 @@
+import type { Logger } from '@aztec/foundation/log';
+import { type Hex } from 'viem';
+import type { L1BlobInputs, L1TxConfig, L1TxRequest, L1TxUtils } from '../l1_tx_utils/index.js';
+import type { ExtendedViemWalletClient } from '../types.js';
+import { FormattedViemError } from '../utils.js';
+export declare const MULTI_CALL_3_ADDRESS: "0xcA11bde05977b3631167028862bE2a173976CA11";
+export declare class Multicall3 {
+    static forward(requests: L1TxRequest[], l1TxUtils: L1TxUtils, gasConfig: L1TxConfig | undefined, blobConfig: L1BlobInputs | undefined, rollupAddress: Hex, logger: Logger, opts?: {
+        revertOnFailure?: boolean;
+    }): Promise<FormattedViemError | {
+        receipt: import("viem").TransactionReceipt;
+        stats: import("../l1_tx_utils/types.js").TransactionStats | undefined;
+        errorMsg?: undefined;
+    } | {
+        receipt: import("viem").TransactionReceipt;
+        errorMsg: string | undefined;
+        stats?: undefined;
+    }>;
+}
+export declare function deployMulticall3(l1Client: ExtendedViemWalletClient, logger: Logger): Promise<void>;
+//# sourceMappingURL=multicall.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"multicall.d.ts","sourceRoot":"","sources":["../../src/contracts/multicall.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EAAqC,KAAK,GAAG,EAAqC,MAAM,MAAM,CAAC;AAEtG,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAChG,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAmB,MAAM,aAAa,CAAC;AAGlE,eAAO,MAAM,oBAAoB,EAAG,4CAAqD,CAAC;AAE1F,qBAAa,UAAU;WACR,OAAO,CAClB,QAAQ,EAAE,WAAW,EAAE,EACvB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,UAAU,GAAG,SAAS,EACjC,UAAU,EAAE,YAAY,GAAG,SAAS,EACpC,aAAa,EAAE,GAAG,EAClB,MAAM,EAAE,MAAM,EACd,IAAI,GAAE;QAAE,eAAe,CAAC,EAAE,OAAO,CAAA;KAAO;;;;;;;;;CAoG3C;AAED,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,wBAAwB,EAAE,MAAM,EAAE,MAAM,iBA+BxF"}

package/dest/contracts/multicall.js

@@ -0,0 +1,156 @@
+import { toHex as toPaddedHex } from '@aztec/foundation/bigint-buffer';
+import { TimeoutError } from '@aztec/foundation/error';
+import { encodeFunctionData, multicall3Abi } from 'viem';
+import { FormattedViemError, formatViemError } from '../utils.js';
+import { RollupContract } from './rollup.js';
+export const MULTI_CALL_3_ADDRESS = '0xcA11bde05977b3631167028862bE2a173976CA11';
+export class Multicall3 {
+    static async forward(requests, l1TxUtils, gasConfig, blobConfig, rollupAddress, logger, opts = {}) {
+        requests = requests.filter((request)=>request.to !== null);
+        const args = requests.map((r)=>({
+                target: r.to,
+                callData: r.data,
+                allowFailure: !opts.revertOnFailure
+            }));
+        const forwarderFunctionData = {
+            abi: multicall3Abi,
+            functionName: 'aggregate3',
+            args: [
+                args
+            ]
+        };
+        const encodedForwarderData = encodeFunctionData(forwarderFunctionData);
+        try {
+            const { receipt, state } = await l1TxUtils.sendAndMonitorTransaction({
+                to: MULTI_CALL_3_ADDRESS,
+                data: encodedForwarderData
+            }, gasConfig, blobConfig);
+            if (receipt.status === 'success') {
+                const stats = await l1TxUtils.getTransactionStats(receipt.transactionHash);
+                return {
+                    receipt,
+                    stats
+                };
+            } else {
+                logger.error('Forwarder transaction failed', undefined, {
+                    receipt
+                });
+                const args = {
+                    ...forwarderFunctionData,
+                    address: MULTI_CALL_3_ADDRESS
+                };
+                let errorMsg;
+                if (blobConfig) {
+                    const maxFeePerBlobGas = blobConfig.maxFeePerBlobGas ?? state.gasPrice.maxFeePerBlobGas;
+                    if (maxFeePerBlobGas === undefined) {
+                        errorMsg = 'maxFeePerBlobGas is required to get the error message';
+                    } else {
+                        logger.debug('Trying to get error from reverted tx with blob config');
+                        errorMsg = await l1TxUtils.tryGetErrorFromRevertedTx(encodedForwarderData, args, {
+                            blobs: blobConfig.blobs,
+                            kzg: blobConfig.kzg,
+                            maxFeePerBlobGas
+                        }, [
+                            {
+                                address: rollupAddress,
+                                stateDiff: [
+                                    {
+                                        slot: toPaddedHex(RollupContract.checkBlobStorageSlot, true),
+                                        value: toPaddedHex(0n, true)
+                                    }
+                                ]
+                            }
+                        ]);
+                    }
+                } else {
+                    logger.debug('Trying to get error from reverted tx without blob config');
+                    errorMsg = await l1TxUtils.tryGetErrorFromRevertedTx(encodedForwarderData, args, undefined, []);
+                }
+                return {
+                    receipt,
+                    errorMsg
+                };
+            }
+        } catch (err) {
+            if (err instanceof TimeoutError) {
+                throw err;
+            }
+            for (const request of requests){
+                logger.debug('Simulating request', {
+                    request
+                });
+                const result = await l1TxUtils.simulate(request, undefined, [
+                    {
+                        address: rollupAddress,
+                        stateDiff: [
+                            {
+                                slot: toPaddedHex(RollupContract.checkBlobStorageSlot, true),
+                                value: toPaddedHex(0n, true)
+                            }
+                        ]
+                    }
+                ]).catch((err)=>formatViemError(err, request.abi));
+                if (result instanceof FormattedViemError) {
+                    logger.error('Found error in simulation', result, {
+                        to: request.to ?? 'null',
+                        data: request.data
+                    });
+                    return result;
+                }
+            }
+            logger.warn('Failed to get error from reverted tx', {
+                err
+            });
+            throw err;
+        }
+    }
+}
+export async function deployMulticall3(l1Client, logger) {
+    const existing = await l1Client.getCode({
+        address: MULTI_CALL_3_ADDRESS
+    });
+    if (existing && existing !== '0x') {
+        logger.verbose('Multicall3 already deployed', {
+            address: MULTI_CALL_3_ADDRESS
+        });
+        return;
+    }
+    const deployer = '0x05f32b3cc3888453ff71b01135b34ff8e41263f2';
+    const sendEth = await l1Client.sendTransaction({
+        to: deployer,
+        value: 10n ** 17n
+    });
+    logger.info('Sent 0.1 ETH to deployer', {
+        deployer,
+        value: 10n ** 17n
+    });
+    const sendEthReceipt = await l1Client.waitForTransactionReceipt({
+        hash: sendEth
+    });
+    if (sendEthReceipt.status !== 'success') {
+        logger.error('Failed to send ETH to deployer', undefined, {
+            sendEthReceipt
+        });
+        throw new Error('Failed to send ETH to deployer');
+    } else {
+        logger.info('Sent 0.1 ETH to deployer', {
+            deployer,
+            value: 10n ** 17n
+        });
+    }
+    const tx = '0xf90f538085174876e800830f42408080b90f00608060405234801561001057600080fd5b50610ee0806100206000396000f3fe6080604052600436106100f35760003560e01c80634d2301cc1161008a578063a8b0574e11610059578063a8b0574e1461025a578063bce38bd714610275578063c3077fa914610288578063ee82ac5e1461029b57600080fd5b80634d2301cc146101ec57806372425d9d1461022157806382ad56cb1461023457806386d516e81461024757600080fd5b80633408e470116100c65780633408e47014610191578063399542e9146101a45780633e64a696146101c657806342cbb15c146101d957600080fd5b80630f28c97d146100f8578063174dea711461011a578063252dba421461013a57806327e86d6e1461015b575b600080fd5b34801561010457600080fd5b50425b6040519081526020015b60405180910390f35b61012d610128366004610a85565b6102ba565b6040516101119190610bbe565b61014d610148366004610a85565b6104ef565b604051610111929190610bd8565b34801561016757600080fd5b50437fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0140610107565b34801561019d57600080fd5b5046610107565b6101b76101b2366004610c60565b610690565b60405161011193929190610cba565b3480156101d257600080fd5b5048610107565b3480156101e557600080fd5b5043610107565b3480156101f857600080fd5b50610107610207366004610ce2565b73ffffffffffffffffffffffffffffffffffffffff163190565b34801561022d57600080fd5b5044610107565b61012d610242366004610a85565b6106ab565b34801561025357600080fd5b5045610107565b34801561026657600080fd5b50604051418152602001610111565b61012d610283366004610c60565b61085a565b6101b7610296366004610a85565b610a1a565b3480156102a757600080fd5b506101076102b6366004610d18565b4090565b60606000828067ffffffffffffffff8111156102d8576102d8610d31565b60405190808252806020026020018201604052801561031e57816020015b6040805180820190915260008152606060208201528152602001906001900390816102f65790505b5092503660005b8281101561047757600085828151811061034157610341610d60565b6020026020010151905087878381811061035d5761035d610d60565b905060200281019061036f9190610d8f565b6040810135958601959093506103886020850185610ce2565b73ffffffffffffffffffffffffffffffffffffffff16816103ac6060870187610dcd565b6040516103ba929190610e32565b60006040518083038185875af1925050503d80600081146103f7576040519150601f19603f3d011682016040523d82523d6000602084013e6103fc565b606091505b50602080850191909152901515808452908501351761046d577f08c379a000000000000000000000000000000000000000000000000000000000600052602060045260176024527f4d756c746963616c6c333a2063616c6c206661696c656400000000000000000060445260846000fd5b5050600101610325565b508234146104e6576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601a60248201527f4d756c746963616c6c333a2076616c7565206d69736d6174636800000000000060448201526064015b60405180910390fd5b50505092915050565b436060828067ffffffffffffffff81111561050c5761050c610d31565b60405190808252806020026020018201604052801561053f57816020015b606081526020019060019003908161052a5790505b5091503660005b8281101561068657600087878381811061056257610562610d60565b90506020028101906105749190610e42565b92506105836020840184610ce2565b73ffffffffffffffffffffffffffffffffffffffff166105a66020850185610dcd565b6040516105b4929190610e32565b6000604051808303816000865af19150503d80600081146105f1576040519150601f19603f3d011682016040523d82523d6000602084013e6105f6565b606091505b5086848151811061060957610609610d60565b602090810291909101015290508061067d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f4d756c746963616c6c333a2063616c6c206661696c656400000000000000000060448201526064016104dd565b50600101610546565b5050509250929050565b43804060606106a086868661085a565b905093509350939050565b6060818067ffffffffffffffff8111156106c7576106c7610d31565b60405190808252806020026020018201604052801561070d57816020015b6040805180820190915260008152606060208201528152602001906001900390816106e55790505b5091503660005b828110156104e657600084828151811061073057610730610d60565b6020026020010151905086868381811061074c5761074c610d60565b905060200281019061075e9190610e76565b925061076d6020840184610ce2565b73ffffffffffffffffffffffffffffffffffffffff166107906040850185610dcd565b60405161079e929190610e32565b6000604051808303816000865af19150503d80600081146107db576040519150601f19603f3d011682016040523d82523d6000602084013e6107e0565b606091505b506020808401919091529015158083529084013517610851577f08c379a000000000000000000000000000000000000000000000000000000000600052602060045260176024527f4d756c746963616c6c333a2063616c6c206661696c656400000000000000000060445260646000fd5b50600101610714565b6060818067ffffffffffffffff81111561087657610876610d31565b6040519080825280602002602001820160405280156108bc57816020015b6040805180820190915260008152606060208201528152602001906001900390816108945790505b5091503660005b82811015610a105760008482815181106108df576108df610d60565b602002602001015190508686838181106108fb576108fb610d60565b905060200281019061090d9190610e42565b925061091c6020840184610ce2565b73ffffffffffffffffffffffffffffffffffffffff1661093f6020850185610dcd565b60405161094d929190610e32565b6000604051808303816000865af19150503d806000811461098a576040519150601f19603f3d011682016040523d82523d6000602084013e61098f565b606091505b506020830152151581528715610a07578051610a07576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f4d756c746963616c6c333a2063616c6c206661696c656400000000000000000060448201526064016104dd565b506001016108c3565b5050509392505050565b6000806060610a2b60018686610690565b919790965090945092505050565b60008083601f840112610a4b57600080fd5b50813567ffffffffffffffff811115610a6357600080fd5b6020830191508360208260051b8501011115610a7e57600080fd5b9250929050565b60008060208385031215610a9857600080fd5b823567ffffffffffffffff811115610aaf57600080fd5b610abb85828601610a39565b90969095509350505050565b6000815180845260005b81811015610aed57602081850181015186830182015201610ad1565b81811115610aff576000602083870101525b50601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b600082825180855260208086019550808260051b84010181860160005b84811015610bb1578583037fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe001895281518051151584528401516040858501819052610b9d81860183610ac7565b9a86019a9450505090830190600101610b4f565b5090979650505050505050565b602081526000610bd16020830184610b32565b9392505050565b600060408201848352602060408185015281855180845260608601915060608160051b870101935082870160005b82811015610c52577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0888703018452610c40868351610ac7565b95509284019290840190600101610c06565b509398975050505050505050565b600080600060408486031215610c7557600080fd5b83358015158114610c8557600080fd5b9250602084013567ffffffffffffffff811115610ca157600080fd5b610cad86828701610a39565b9497909650939450505050565b838152826020820152606060408201526000610cd96060830184610b32565b95945050505050565b600060208284031215610cf457600080fd5b813573ffffffffffffffffffffffffffffffffffffffff81168114610bd157600080fd5b600060208284031215610d2a57600080fd5b5035919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b600082357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff81833603018112610dc357600080fd5b9190910192915050565b60008083357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe1843603018112610e0257600080fd5b83018035915067ffffffffffffffff821115610e1d57600080fd5b602001915036819003821315610a7e57600080fd5b8183823760009101908152919050565b600082357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc1833603018112610dc357600080fd5b600082357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa1833603018112610dc357600080fdfea2646970667358221220bb2b5c71a328032f97c676ae39a1ec2148d3e5d6f73d95e9b17910152d61f16264736f6c634300080c00331ca0edce47092c0f398cebf3ffc267f05c8e7076e3b89445e0fe50f6332273d4569ba01b0b9d000e19b24c5869b0fc3b22b0d6fa47cd63316875cbbd577d76e6fde086';
+    const deployTx = await l1Client.sendRawTransaction({
+        serializedTransaction: tx
+    });
+    const deployTxReceipt = await l1Client.waitForTransactionReceipt({
+        hash: deployTx
+    });
+    if (deployTxReceipt.status !== 'success') {
+        logger.error('Failed to deploy Multicall3', undefined, {
+            deployTxReceipt
+        });
+        throw new Error('Failed to deploy Multicall3');
+    } else {
+        logger.info('Deployed Multicall3');
+    }
+}

package/dest/contracts/registry.d.ts

@@ -1,12 +1,14 @@
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { type Hex } from 'viem';
 import type { L1ContractAddresses } from '../l1_contract_addresses.js';
-import type { L1Clients, ViemPublicClient } from '../types.js';
+import type { ViemClient } from '../types.js';
 export declare class RegistryContract {
-    readonly client: L1Clients['publicClient'];
+    readonly client: ViemClient;
     address: EthAddress;
+    private readonly log;
     private readonly registry;
-    constructor(client: L1Clients['publicClient'], address: Hex | EthAddress);
+    constructor(client: ViemClient, address: Hex | EthAddress);
+    getOwner(): Promise<EthAddress>;
     /**
      * Returns the address of the rollup for a given version.
      * @param version - The version of the rollup. 'canonical' can be used to get the canonical address (i.e. the latest version).
@@ -19,6 +21,9 @@ export declare class RegistryContract {
      */
     getCanonicalAddress(): Promise<EthAddress>;
     getGovernanceAddresses(): Promise<Pick<L1ContractAddresses, 'governanceProposerAddress' | 'governanceAddress'>>;
-    static collectAddresses(client: ViemPublicClient, registryAddress: Hex | EthAddress, rollupVersion: number | bigint | 'canonical'): Promise<L1ContractAddresses>;
+    static collectAddresses(client: ViemClient, registryAddress: Hex | EthAddress, rollupVersion: number | bigint | 'canonical'): Promise<L1ContractAddresses>;
+    getNumberOfVersions(): Promise<number>;
+    getRollupVersions(): Promise<bigint[]>;
+    getRewardDistributor(): Promise<EthAddress>;
 }
 //# sourceMappingURL=registry.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/contracts/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAI3D,OAAO,EAGL,KAAK,GAAG,EAIT,MAAM,MAAM,CAAC;AAEd,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAI/D,qBAAa,gBAAgB;aAIC,MAAM,EAAE,SAAS,CAAC,cAAc,CAAC;IAHtD,OAAO,EAAE,UAAU,CAAC;IAC3B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgF;gBAE7E,MAAM,EAAE,SAAS,CAAC,cAAc,CAAC,EAAE,OAAO,EAAE,GAAG,GAAG,UAAU;IAQxF;;;;OAIG;IACU,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;IAiB1F;;;OAGG;IACU,mBAAmB,IAAI,OAAO,CAAC,UAAU,CAAC;IAS1C,sBAAsB,IAAI,OAAO,CAC5C,IAAI,CAAC,mBAAmB,EAAE,2BAA2B,GAAG,mBAAmB,CAAC,CAC7E;WAUmB,gBAAgB,CAClC,MAAM,EAAE,gBAAgB,EACxB,eAAe,EAAE,GAAG,GAAG,UAAU,EACjC,aAAa,EAAE,MAAM,GAAG,MAAM,GAAG,WAAW,GAC3C,OAAO,CAAC,mBAAmB,CAAC;CAwBhC"}
+{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/contracts/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAK3D,OAAO,EAA8B,KAAK,GAAG,EAAe,MAAM,MAAM,CAAC;AAEzE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAI9C,qBAAa,gBAAgB;aAOT,MAAM,EAAE,UAAU;IAN7B,OAAO,EAAE,UAAU,CAAC;IAE3B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA+C;IACnE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAwD;gBAG/D,MAAM,EAAE,UAAU,EAClC,OAAO,EAAE,GAAG,GAAG,UAAU;IASd,QAAQ,IAAI,OAAO,CAAC,UAAU,CAAC;IAI5C;;;;OAIG;IACU,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;IAwB1F;;;OAGG;IACU,mBAAmB,IAAI,OAAO,CAAC,UAAU,CAAC;IAI1C,sBAAsB,IAAI,OAAO,CAC5C,IAAI,CAAC,mBAAmB,EAAE,2BAA2B,GAAG,mBAAmB,CAAC,CAC7E;WAUmB,gBAAgB,CAClC,MAAM,EAAE,UAAU,EAClB,eAAe,EAAE,GAAG,GAAG,UAAU,EACjC,aAAa,EAAE,MAAM,GAAG,MAAM,GAAG,WAAW,GAC3C,OAAO,CAAC,mBAAmB,CAAC;IAyBlB,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC;IAKtC,iBAAiB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAWtC,oBAAoB,IAAI,OAAO,CAAC,UAAU,CAAC;CAGzD"}

package/dest/contracts/registry.js

@@ -1,15 +1,18 @@
 import { EthAddress } from '@aztec/foundation/eth-address';
+import { createLogger } from '@aztec/foundation/log';
 import { RegistryAbi } from '@aztec/l1-artifacts/RegistryAbi';
 import { TestERC20Abi } from '@aztec/l1-artifacts/TestERC20Abi';
 import { getContract } from 'viem';
-import { GovernanceContract } from './governance.js';
+import { ReadOnlyGovernanceContract } from './governance.js';
 import { RollupContract } from './rollup.js';
 export class RegistryContract {
     client;
     address;
+    log;
     registry;
     constructor(client, address){
         this.client = client;
+        this.log = createLogger('ethereum:contracts:registry');
         if (address instanceof EthAddress) {
             address = address.toString();
         }
@@ -20,6 +23,9 @@ export class RegistryContract {
             client
         });
     }
+    async getOwner() {
+        return EthAddress.fromString(await this.registry.read.owner());
+    }
     /**
    * Returns the address of the rollup for a given version.
    * @param version - The version of the rollup. 'canonical' can be used to get the canonical address (i.e. the latest version).
@@ -31,33 +37,38 @@ export class RegistryContract {
         if (typeof version === 'number') {
             version = BigInt(version);
         }
-        const snapshot = await this.registry.read.getSnapshot([
-            version
-        ]);
-        const address = EthAddress.fromString(snapshot.rollup);
-        if (address.equals(EthAddress.ZERO)) {
+        try {
+            return EthAddress.fromString(await this.registry.read.getRollup([
+                version
+            ]));
+        } catch  {
+            this.log.warn(`Failed fetching rollup address for version ${version}. Retrying as index.`);
+        }
+        try {
+            const actualVersion = await this.registry.read.getVersion([
+                version
+            ]);
+            const rollupAddress = await this.registry.read.getRollup([
+                actualVersion
+            ]);
+            return EthAddress.fromString(rollupAddress);
+        } catch  {
             throw new Error('Rollup address is undefined');
         }
-        return address;
     }
     /**
    * Returns the canonical address of the rollup.
    * @returns The canonical address of the rollup. If the rollup is not set, throws an error.
    */ async getCanonicalAddress() {
-        const snapshot = await this.registry.read.getCurrentSnapshot();
-        const address = EthAddress.fromString(snapshot.rollup);
-        if (address.equals(EthAddress.ZERO)) {
-            throw new Error('Rollup address is undefined');
-        }
-        return address;
+        return EthAddress.fromString(await this.registry.read.getCanonicalRollup());
     }
     async getGovernanceAddresses() {
         const governanceAddress = await this.registry.read.getGovernance();
-        const governance = new GovernanceContract(governanceAddress, this.client, undefined);
-        const governanceProposer = await governance.getProposer();
+        const governance = new ReadOnlyGovernanceContract(governanceAddress, this.client);
+        const governanceProposerAddress = await governance.getGovernanceProposerAddress();
         return {
             governanceAddress: governance.address,
-            governanceProposerAddress: governanceProposer.address
+            governanceProposerAddress: governanceProposerAddress
         };
     }
     static async collectAddresses(client, registryAddress, rollupVersion) {
@@ -82,4 +93,21 @@ export class RegistryContract {
             coinIssuerAddress: EthAddress.fromString(coinIssuer)
         };
     }
+    async getNumberOfVersions() {
+        const version = await this.registry.read.numberOfVersions();
+        return Number(version);
+    }
+    async getRollupVersions() {
+        const count = await this.getNumberOfVersions();
+        const versions = [];
+        for(let i = 0; i < count; i++){
+            versions.push(await this.registry.read.getVersion([
+                BigInt(i)
+            ]));
+        }
+        return versions;
+    }
+    async getRewardDistributor() {
+        return EthAddress.fromString(await this.registry.read.getRewardDistributor());
+    }
 }

package/dest/contracts/rollup.d.ts

@@ -1,75 +1,167 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { EthAddress } from '@aztec/foundation/eth-address';
 import type { ViemSignature } from '@aztec/foundation/eth-signature';
-import { type Account, type Hex } from 'viem';
+import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
+import { type Account, type GetContractReturnType, type Hex, type StateOverride, type WatchContractEventReturnType } from 'viem';
 import type { DeployL1ContractsReturnType } from '../deploy_l1_contracts.js';
 import type { L1ContractAddresses } from '../l1_contract_addresses.js';
 import type { L1ReaderConfig } from '../l1_reader.js';
-import type { ViemPublicClient } from '../types.js';
-import { SlashingProposerContract } from './slashing_proposer.js';
-export type L1RollupContractAddresses = Pick<L1ContractAddresses, 'rollupAddress' | 'inboxAddress' | 'outboxAddress' | 'feeJuicePortalAddress' | 'feeJuiceAddress' | 'stakingAssetAddress' | 'rewardDistributorAddress' | 'slashFactoryAddress'>;
+import type { L1TxRequest, L1TxUtils } from '../l1_tx_utils/index.js';
+import type { ViemClient } from '../types.js';
+import { EmpireSlashingProposerContract } from './empire_slashing_proposer.js';
+import { SlasherContract } from './slasher_contract.js';
+import { TallySlashingProposerContract } from './tally_slashing_proposer.js';
+export type ViemCommitteeAttestation = {
+    addr: `0x${string}`;
+    signature: ViemSignature;
+};
+export type ViemCommitteeAttestations = {
+    signatureIndices: `0x${string}`;
+    signaturesOrAddresses: `0x${string}`;
+};
+export type L1RollupContractAddresses = Pick<L1ContractAddresses, 'rollupAddress' | 'inboxAddress' | 'outboxAddress' | 'feeJuicePortalAddress' | 'feeJuiceAddress' | 'stakingAssetAddress' | 'rewardDistributorAddress' | 'slashFactoryAddress' | 'gseAddress'>;
 export type EpochProofPublicInputArgs = {
     previousArchive: `0x${string}`;
     endArchive: `0x${string}`;
-    previousBlockHash: `0x${string}`;
-    endBlockHash: `0x${string}`;
-    endTimestamp: bigint;
-    outHash: `0x${string}`;
     proverId: `0x${string}`;
 };
+export type ViemHeader = {
+    lastArchiveRoot: `0x${string}`;
+    contentCommitment: ViemContentCommitment;
+    slotNumber: bigint;
+    timestamp: bigint;
+    coinbase: `0x${string}`;
+    feeRecipient: `0x${string}`;
+    gasFees: ViemGasFees;
+    totalManaUsed: bigint;
+};
+export type ViemContentCommitment = {
+    blobsHash: `0x${string}`;
+    inHash: `0x${string}`;
+    outHash: `0x${string}`;
+};
+export type ViemGasFees = {
+    feePerDaGas: bigint;
+    feePerL2Gas: bigint;
+};
+export type ViemStateReference = {
+    l1ToL2MessageTree: ViemAppendOnlyTreeSnapshot;
+    partialStateReference: ViemPartialStateReference;
+};
+export type ViemPartialStateReference = {
+    noteHashTree: ViemAppendOnlyTreeSnapshot;
+    nullifierTree: ViemAppendOnlyTreeSnapshot;
+    publicDataTree: ViemAppendOnlyTreeSnapshot;
+};
+export type ViemAppendOnlyTreeSnapshot = {
+    root: `0x${string}`;
+    nextAvailableLeafIndex: number;
+};
+export declare enum SlashingProposerType {
+    None = 0,
+    Tally = 1,
+    Empire = 2
+}
 export declare class RollupContract {
-    readonly client: ViemPublicClient;
+    readonly client: ViemClient;
     private readonly rollup;
+    private static cachedStfStorageSlot;
     static get checkBlobStorageSlot(): bigint;
+    static get stfStorageSlot(): Hex;
     static getFromL1ContractsValues(deployL1ContractsValues: DeployL1ContractsReturnType): RollupContract;
     static getFromConfig(config: L1ReaderConfig): RollupContract;
-    constructor(client: ViemPublicClient, address: Hex | EthAddress);
+    constructor(client: ViemClient, address: Hex | EthAddress);
+    getGSE(): Promise<`0x${string}`>;
     get address(): `0x${string}`;
-    getSlashingProposer(): Promise<SlashingProposerContract>;
+    getContract(): GetContractReturnType<typeof RollupAbi, ViemClient>;
+    getSlashingProposer(): Promise<EmpireSlashingProposerContract | TallySlashingProposerContract | undefined>;
     getL1StartBlock(): Promise<bigint>;
     getL1GenesisTime(): Promise<bigint>;
-    getProofSubmissionWindow(): Promise<bigint>;
+    getProofSubmissionEpochs(): Promise<bigint>;
     getEpochDuration(): Promise<bigint>;
     getSlotDuration(): Promise<bigint>;
     getTargetCommitteeSize(): Promise<bigint>;
-    getMinimumStake(): Promise<bigint>;
+    getEjectionThreshold(): Promise<bigint>;
+    getLocalEjectionThreshold(): Promise<bigint>;
+    getLagInEpochs(): Promise<bigint>;
+    getActivationThreshold(): Promise<bigint>;
+    getExitDelay(): Promise<bigint>;
+    getManaTarget(): Promise<bigint>;
+    getProvingCostPerMana(): Promise<bigint>;
+    getProvingCostPerManaInFeeAsset(): Promise<bigint>;
+    getManaLimit(): Promise<bigint>;
+    getVersion(): Promise<bigint>;
+    getGenesisArchiveTreeRoot(): Promise<`0x${string}`>;
+    /**
+     * Returns rollup constants used for epoch queries.
+     * Return type is `L1RollupConstants` which is defined in stdlib,
+     * so we cant reference it until we move this contract to that package.
+     */
+    getRollupConstants(): Promise<{
+        l1StartBlock: bigint;
+        l1GenesisTime: bigint;
+        slotDuration: number;
+        epochDuration: number;
+        proofSubmissionEpochs: number;
+    }>;
+    getSlasherAddress(): Promise<`0x${string}`>;
+    /**
+     * Returns a SlasherContract instance for interacting with the slasher contract.
+     */
+    getSlasherContract(): Promise<SlasherContract | undefined>;
+    getOwner(): Promise<`0x${string}`>;
+    getActiveAttesterCount(): Promise<bigint>;
     getSlashingProposerAddress(): Promise<EthAddress>;
+    getBlockReward(): Promise<bigint>;
     getBlockNumber(): Promise<bigint>;
     getProvenBlockNumber(): Promise<bigint>;
     getSlotNumber(): Promise<bigint>;
-    getCommitteeAt(timestamp: bigint): Promise<readonly `0x${string}`[]>;
+    getL1FeesAt(timestamp: bigint): Promise<{
+        baseFee: bigint;
+        blobFee: bigint;
+    }>;
+    getFeeAssetPerEth(): Promise<bigint>;
+    getCommitteeAt(timestamp: bigint): Promise<readonly `0x${string}`[] | undefined>;
     getSampleSeedAt(timestamp: bigint): Promise<bigint>;
     getCurrentSampleSeed(): Promise<bigint>;
-    getCurrentEpochCommittee(): Promise<readonly `0x${string}`[]>;
+    getCurrentEpoch(): Promise<bigint>;
+    getCurrentEpochCommittee(): Promise<readonly `0x${string}`[] | undefined>;
     getCurrentProposer(): Promise<`0x${string}`>;
     getProposerAt(timestamp: bigint): Promise<`0x${string}`>;
-    getBlock(blockNumber: bigint): Promise<{
+    getBlock(blockNumber: bigint | number): Promise<{
+        archive: `0x${string}`;
+        headerHash: `0x${string}`;
+        blobCommitmentsHash: `0x${string}`;
+        attestationsHash: `0x${string}`;
+        payloadDigest: `0x${string}`;
+        slotNumber: bigint;
         feeHeader: {
             excessMana: bigint;
             manaUsed: bigint;
             feeAssetPriceNumerator: bigint;
             congestionCost: bigint;
-            provingCost: bigint;
+            proverCost: bigint;
         };
-        archive: `0x${string}`;
-        blockHash: `0x${string}`;
-        slotNumber: bigint;
     }>;
     getTips(): Promise<{
         pendingBlockNumber: bigint;
         provenBlockNumber: bigint;
     }>;
     getTimestampForSlot(slot: bigint): Promise<bigint>;
-    getEpochNumber(blockNumber?: bigint): Promise<bigint>;
+    getEntryQueueLength(): Promise<bigint>;
+    getAvailableValidatorFlushes(): Promise<bigint>;
+    getNextFlushableEpoch(): Promise<bigint>;
+    getCurrentEpochNumber(): Promise<bigint>;
+    getEpochNumberForBlock(blockNumber: bigint): Promise<bigint>;
     getRollupAddresses(): Promise<L1RollupContractAddresses>;
+    getFeeJuicePortal(): Promise<EthAddress>;
     getEpochNumberForSlotNumber(slotNumber: bigint): Promise<bigint>;
-    getEpochProofPublicInputs(args: readonly [bigint, bigint, EpochProofPublicInputArgs, readonly `0x${string}`[], `0x${string}`, `0x${string}`]): Promise<readonly `0x${string}`[]>;
+    getEpochProofPublicInputs(args: readonly [bigint, bigint, EpochProofPublicInputArgs, readonly `0x${string}`[], `0x${string}`]): Promise<readonly `0x${string}`[]>;
     validateHeader(args: readonly [
+        ViemHeader,
+        ViemCommitteeAttestations,
+        `0x${string}`[],
+        ViemSignature,
         `0x${string}`,
-        ViemSignature[],
-        `0x${string}`,
-        bigint,
         `0x${string}`,
         {
             ignoreDA: boolean;
@@ -85,8 +177,89 @@ export declare class RollupContract {
      * @return [slot, blockNumber] - If you can propose, the L2 slot number and L2 block number of the next Ethereum block,
      * @throws otherwise
      */
-    canProposeAtNextEthBlock(archive: Buffer, account: `0x${string}` | Account, slotDuration: bigint | number): Promise<[bigint, bigint]>;
+    canProposeAtNextEthBlock(archive: Buffer, account: `0x${string}` | Account, slotDuration: bigint | number, opts?: {
+        forcePendingBlockNumber?: number;
+    }): Promise<{
+        slot: bigint;
+        blockNumber: bigint;
+        timeOfNextL1Slot: bigint;
+    }>;
+    /**
+     * Returns a state override that sets the pending block number to the specified value. Useful for simulations.
+     * Requires querying the current state of the contract to get the current proven block number, as they are both
+     * stored in the same slot. If the argument is undefined, it returns an empty override.
+     */
+    makePendingBlockNumberOverride(forcePendingBlockNumber: number | undefined): Promise<StateOverride>;
+    /** Creates a request to Rollup#invalidateBadAttestation to be simulated or sent */
+    buildInvalidateBadAttestationRequest(blockNumber: number, attestationsAndSigners: ViemCommitteeAttestations, committee: EthAddress[], invalidIndex: number): L1TxRequest;
+    /** Creates a request to Rollup#invalidateInsufficientAttestations to be simulated or sent */
+    buildInvalidateInsufficientAttestationsRequest(blockNumber: number, attestationsAndSigners: ViemCommitteeAttestations, committee: EthAddress[]): L1TxRequest;
     /** Calls getHasSubmitted directly. Returns whether the given prover has submitted a proof with the given length for the given epoch. */
-    getHasSubmittedProof(epochNumber: number, numberOfBlocksInEpoch: number, prover: EthAddress): Promise<boolean>;
+    getHasSubmittedProof(epochNumber: number, numberOfBlocksInEpoch: number, prover: Hex | EthAddress): Promise<boolean>;
+    getManaBaseFeeAt(timestamp: bigint, inFeeAsset: boolean): Promise<bigint>;
+    getSlotAt(timestamp: bigint): Promise<bigint>;
+    status(blockNumber: bigint, options?: {
+        blockNumber?: bigint;
+    }): Promise<readonly [bigint, `0x${string}`, bigint, `0x${string}`, `0x${string}`, bigint]>;
+    canPruneAtTime(timestamp: bigint, options?: {
+        blockNumber?: bigint;
+    }): Promise<boolean>;
+    archive(): Promise<`0x${string}`>;
+    archiveAt(blockNumber: bigint): Promise<`0x${string}`>;
+    getSequencerRewards(address: Hex | EthAddress): Promise<bigint>;
+    getSpecificProverRewardsForEpoch(epoch: bigint, prover: Hex | EthAddress): Promise<bigint>;
+    getAttesters(): Promise<`0x${string}`[]>;
+    getAttesterView(address: Hex | EthAddress): Promise<{
+        status: number;
+        effectiveBalance: bigint;
+        exit: {
+            withdrawalId: bigint;
+            amount: bigint;
+            exitableAt: bigint;
+            recipientOrWithdrawer: `0x${string}`;
+            isRecipient: boolean;
+            exists: boolean;
+        };
+        config: {
+            publicKey: {
+                x: bigint;
+                y: bigint;
+            };
+            withdrawer: `0x${string}`;
+        };
+    }>;
+    getStatus(address: Hex | EthAddress): Promise<number>;
+    getBlobCommitmentsHash(blockNumber: bigint): Promise<`0x${string}`>;
+    getCurrentBlobCommitmentsHash(): Promise<`0x${string}`>;
+    getStakingAsset(): Promise<`0x${string}`>;
+    getRewardConfig(): Promise<{
+        rewardDistributor: `0x${string}`;
+        sequencerBps: number;
+        booster: `0x${string}`;
+        blockReward: bigint;
+    }>;
+    setupEpoch(l1TxUtils: L1TxUtils): Promise<{
+        receipt: import("viem").TransactionReceipt;
+        state: import("../l1_tx_utils/types.js").L1TxState;
+    }>;
+    vote(l1TxUtils: L1TxUtils, proposalId: bigint): Promise<{
+        receipt: import("viem").TransactionReceipt;
+        state: import("../l1_tx_utils/types.js").L1TxState;
+    }>;
+    listenToSlasherChanged(callback: (args: {
+        oldSlasher: `0x${string}`;
+        newSlasher: `0x${string}`;
+    }) => unknown): WatchContractEventReturnType;
+    listenToBlockInvalidated(callback: (args: {
+        blockNumber: bigint;
+    }) => unknown): WatchContractEventReturnType;
+    getSlashEvents(l1BlockHash: Hex): Promise<{
+        amount: bigint;
+        attester: EthAddress;
+    }[]>;
+    listenToSlash(callback: (args: {
+        amount: bigint;
+        attester: EthAddress;
+    }) => unknown): WatchContractEventReturnType;
 }
 //# sourceMappingURL=rollup.d.ts.map

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

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