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

package/dest/contracts/index.js

@@ -1,8 +1,14 @@
 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';
+export * from './empire_slashing_proposer.js';
+export * from './tally_slashing_proposer.js';
+export * from './slasher_contract.js';

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;
+    } | {
+        stats?: undefined;
+        receipt: import("viem").TransactionReceipt;
+        errorMsg: string | undefined;
+    }>;
+}
+export declare function deployMulticall3(l1Client: ExtendedViemWalletClient, logger: Logger): Promise<void>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXVsdGljYWxsLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3RzL211bHRpY2FsbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVwRCxPQUFPLEVBQXFDLEtBQUssR0FBRyxFQUFxQyxNQUFNLE1BQU0sQ0FBQztBQUV0RyxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsVUFBVSxFQUFFLFdBQVcsRUFBRSxTQUFTLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNoRyxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUM1RCxPQUFPLEVBQUUsa0JBQWtCLEVBQW1CLE1BQU0sYUFBYSxDQUFDO0FBR2xFLGVBQU8sTUFBTSxvQkFBb0IsOENBQXdELENBQUM7QUFFMUYscUJBQWEsVUFBVTtJQUNyQixPQUFhLE9BQU8sQ0FDbEIsUUFBUSxFQUFFLFdBQVcsRUFBRSxFQUN2QixTQUFTLEVBQUUsU0FBUyxFQUNwQixTQUFTLEVBQUUsVUFBVSxHQUFHLFNBQVMsRUFDakMsVUFBVSxFQUFFLFlBQVksR0FBRyxTQUFTLEVBQ3BDLGFBQWEsRUFBRSxHQUFHLEVBQ2xCLE1BQU0sRUFBRSxNQUFNLEVBQ2QsSUFBSSxHQUFFO1FBQUUsZUFBZSxDQUFDLEVBQUUsT0FBTyxDQUFBO0tBQU87Ozs7Ozs7O09BbUd6QztDQUNGO0FBRUQsd0JBQXNCLGdCQUFnQixDQUFDLFFBQVEsRUFBRSx3QkFBd0IsRUFBRSxNQUFNLEVBQUUsTUFBTSxpQkErQnhGIn0=

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,8CAAwD,CAAC;AAE1F,qBAAa,UAAU;IACrB,OAAa,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;;;;;;;;OAmGzC;CACF;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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVnaXN0cnkuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdHMvcmVnaXN0cnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBSzNELE9BQU8sRUFBOEIsS0FBSyxHQUFHLEVBQWUsTUFBTSxNQUFNLENBQUM7QUFFekUsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUN2RSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFJOUMscUJBQWEsZ0JBQWdCO2FBT1QsTUFBTSxFQUFFLFVBQVU7SUFON0IsT0FBTyxFQUFFLFVBQVUsQ0FBQztJQUUzQixPQUFPLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBK0M7SUFDbkUsT0FBTyxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQXdEO0lBRWpGLFlBQ2tCLE1BQU0sRUFBRSxVQUFVLEVBQ2xDLE9BQU8sRUFBRSxHQUFHLEdBQUcsVUFBVSxFQU8xQjtJQUVZLFFBQVEsSUFBSSxPQUFPLENBQUMsVUFBVSxDQUFDLENBRTNDO0lBRUQ7Ozs7T0FJRztJQUNVLGdCQUFnQixDQUFDLE9BQU8sRUFBRSxNQUFNLEdBQUcsTUFBTSxHQUFHLFdBQVcsR0FBRyxPQUFPLENBQUMsVUFBVSxDQUFDLENBc0J6RjtJQUVEOzs7T0FHRztJQUNVLG1CQUFtQixJQUFJLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FFdEQ7SUFFWSxzQkFBc0IsSUFBSSxPQUFPLENBQzVDLElBQUksQ0FBQyxtQkFBbUIsRUFBRSwyQkFBMkIsR0FBRyxtQkFBbUIsQ0FBQyxDQUM3RSxDQVFBO0lBRUQsT0FBb0IsZ0JBQWdCLENBQ2xDLE1BQU0sRUFBRSxVQUFVLEVBQ2xCLGVBQWUsRUFBRSxHQUFHLEdBQUcsVUFBVSxFQUNqQyxhQUFhLEVBQUUsTUFBTSxHQUFHLE1BQU0sR0FBRyxXQUFXLEdBQzNDLE9BQU8sQ0FBQyxtQkFBbUIsQ0FBQyxDQXVCOUI7SUFFWSxtQkFBbUIsSUFBSSxPQUFPLENBQUMsTUFBTSxDQUFDLENBR2xEO0lBRVksaUJBQWlCLElBQUksT0FBTyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBU2xEO0lBRVksb0JBQW9CLElBQUksT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQUV2RDtDQUNGIn0=

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;IAEjF,YACkB,MAAM,EAAE,UAAU,EAClC,OAAO,EAAE,GAAG,GAAG,UAAU,EAO1B;IAEY,QAAQ,IAAI,OAAO,CAAC,UAAU,CAAC,CAE3C;IAED;;;;OAIG;IACU,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC,CAsBzF;IAED;;;OAGG;IACU,mBAAmB,IAAI,OAAO,CAAC,UAAU,CAAC,CAEtD;IAEY,sBAAsB,IAAI,OAAO,CAC5C,IAAI,CAAC,mBAAmB,EAAE,2BAA2B,GAAG,mBAAmB,CAAC,CAC7E,CAQA;IAED,OAAoB,gBAAgB,CAClC,MAAM,EAAE,UAAU,EAClB,eAAe,EAAE,GAAG,GAAG,UAAU,EACjC,aAAa,EAAE,MAAM,GAAG,MAAM,GAAG,WAAW,GAC3C,OAAO,CAAC,mBAAmB,CAAC,CAuB9B;IAEY,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC,CAGlD;IAEY,iBAAiB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CASlD;IAEY,oBAAoB,IAAI,OAAO,CAAC,UAAU,CAAC,CAEvD;CACF"}

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());
+    }
 }