@aztec/ethereum 0.69.1-devnet → 0.70.0

package/dest/contracts/rollup.d.ts

@@ -1,8 +1,12 @@
+import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { type Hex, type PublicClient } from 'viem';
+import { type DeployL1Contracts } from '../deploy_l1_contracts.js';
 import { type L1ReaderConfig } from '../l1_reader.js';
 export declare class RollupContract {
+    readonly client: PublicClient;
     private readonly rollup;
     constructor(client: PublicClient, address: Hex);
+    get address(): AztecAddress;
     getL1StartBlock(): Promise<bigint>;
     getL1GenesisTime(): Promise<bigint>;
     getBlockNumber(): Promise<bigint>;
@@ -14,6 +18,7 @@ export declare class RollupContract {
     getCurrentEpochCommittee(): Promise<readonly `0x${string}`[]>;
     getCurrentProposer(): Promise<`0x${string}`>;
     getEpochNumber(blockNumber?: bigint): Promise<bigint>;
+    static getFromL1ContractsValues(deployL1ContractsValues: DeployL1Contracts): RollupContract;
     static getFromConfig(config: L1ReaderConfig): RollupContract;
 }
 //# 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":"AAGA,OAAO,EAGL,KAAK,GAAG,EAER,KAAK,YAAY,EAIlB,MAAM,MAAM,CAAC;AAGd,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEtD,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA8E;gBAEzF,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG;IAK9C,eAAe;IAKf,gBAAgB;IAIhB,cAAc;IAId,oBAAoB;IAIpB,aAAa;IAIb,cAAc,CAAC,SAAS,EAAE,MAAM;IAIhC,eAAe,CAAC,SAAS,EAAE,MAAM;IAIjC,oBAAoB;IAIpB,wBAAwB;IAIxB,kBAAkB;IAIZ,cAAc,CAAC,WAAW,CAAC,EAAE,MAAM;IAKzC,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,cAAc;CAQ5C"}
+{"version":3,"file":"rollup.d.ts","sourceRoot":"","sources":["../../src/contracts/rollup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAI/D,OAAO,EAGL,KAAK,GAAG,EAER,KAAK,YAAY,EAIlB,MAAM,MAAM,CAAC;AAEd,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAEnE,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEtD,qBAAa,cAAc;aAGG,MAAM,EAAE,YAAY;IAFhD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA8E;gBAEzE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG;IAI9D,IAAW,OAAO,iBAEjB;IAGD,eAAe;IAKf,gBAAgB;IAIhB,cAAc;IAId,oBAAoB;IAIpB,aAAa;IAIb,cAAc,CAAC,SAAS,EAAE,MAAM;IAIhC,eAAe,CAAC,SAAS,EAAE,MAAM;IAIjC,oBAAoB;IAIpB,wBAAwB;IAIxB,kBAAkB;IAIZ,cAAc,CAAC,WAAW,CAAC,EAAE,MAAM;IAKzC,MAAM,CAAC,wBAAwB,CAAC,uBAAuB,EAAE,iBAAiB;IAQ1E,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,cAAc;CAQ5C"}

package/dest/contracts/rollup.js

@@ -1,4 +1,5 @@
 import { __esDecorate, __runInitializers } from "tslib";
+import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { memoize } from '@aztec/foundation/decorators';
 import { RollupAbi } from '@aztec/l1-artifacts';
 import { createPublicClient, getContract, http, } from 'viem';
@@ -10,9 +11,12 @@ let RollupContract = (() => {
     let _getL1GenesisTime_decorators;
     return _a = class RollupContract {
             constructor(client, address) {
-                this.rollup = __runInitializers(this, _instanceExtraInitializers);
+                this.client = (__runInitializers(this, _instanceExtraInitializers), client);
                 this.rollup = getContract({ address, abi: RollupAbi, client });
             }
+            get address() {
+                return AztecAddress.fromString(this.rollup.address);
+            }
             getL1StartBlock() {
                 return this.rollup.read.L1_BLOCK_AT_GENESIS();
             }
@@ -47,6 +51,10 @@ let RollupContract = (() => {
                 blockNumber ?? (blockNumber = await this.getBlockNumber());
                 return this.rollup.read.getEpochForBlock([BigInt(blockNumber)]);
             }
+            static getFromL1ContractsValues(deployL1ContractsValues) {
+                const { publicClient, l1ContractAddresses: { rollupAddress }, } = deployL1ContractsValues;
+                return new _a(publicClient, rollupAddress.toString());
+            }
             static getFromConfig(config) {
                 const client = createPublicClient({
                     transport: http(config.l1RpcUrl),
@@ -67,4 +75,4 @@ let RollupContract = (() => {
         _a;
 })();
 export { RollupContract };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm9sbHVwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0cy9yb2xsdXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUN2RCxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFFaEQsT0FBTyxFQU1MLGtCQUFrQixFQUNsQixXQUFXLEVBQ1gsSUFBSSxHQUNMLE1BQU0sTUFBTSxDQUFDO0FBRWQsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sc0JBQXNCLENBQUM7SUFHOUMsY0FBYzs7Ozs7c0JBQWQsY0FBYztZQUd6QixZQUFZLE1BQW9CLEVBQUUsT0FBWTtnQkFGN0IsV0FBTSxHQURaLG1EQUFjLENBQzRFO2dCQUduRyxJQUFJLENBQUMsTUFBTSxHQUFHLFdBQVcsQ0FBQyxFQUFFLE9BQU8sRUFBRSxHQUFHLEVBQUUsU0FBUyxFQUFFLE1BQU0sRUFBRSxDQUFDLENBQUM7WUFDakUsQ0FBQztZQUdELGVBQWU7Z0JBQ2IsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxtQkFBbUIsRUFBRSxDQUFDO1lBQ2hELENBQUM7WUFHRCxnQkFBZ0I7Z0JBQ2QsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxZQUFZLEVBQUUsQ0FBQztZQUN6QyxDQUFDO1lBRUQsY0FBYztnQkFDWixPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLHFCQUFxQixFQUFFLENBQUM7WUFDbEQsQ0FBQztZQUVELG9CQUFvQjtnQkFDbEIsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxvQkFBb0IsRUFBRSxDQUFDO1lBQ2pELENBQUM7WUFFRCxhQUFhO2dCQUNYLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsY0FBYyxFQUFFLENBQUM7WUFDM0MsQ0FBQztZQUVELGNBQWMsQ0FBQyxTQUFpQjtnQkFDOUIsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxjQUFjLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDO1lBQ3RELENBQUM7WUFFRCxlQUFlLENBQUMsU0FBaUI7Z0JBQy9CLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsZUFBZSxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQztZQUN2RCxDQUFDO1lBRUQsb0JBQW9CO2dCQUNsQixPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLG9CQUFvQixFQUFFLENBQUM7WUFDakQsQ0FBQztZQUVELHdCQUF3QjtnQkFDdEIsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyx3QkFBd0IsRUFBRSxDQUFDO1lBQ3JELENBQUM7WUFFRCxrQkFBa0I7Z0JBQ2hCLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsa0JBQWtCLEVBQUUsQ0FBQztZQUMvQyxDQUFDO1lBRUQsS0FBSyxDQUFDLGNBQWMsQ0FBQyxXQUFvQjtnQkFDdkMsV0FBVyxLQUFYLFdBQVcsR0FBSyxNQUFNLElBQUksQ0FBQyxjQUFjLEVBQUUsRUFBQztnQkFDNUMsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDbEUsQ0FBQztZQUVELE1BQU0sQ0FBQyxhQUFhLENBQUMsTUFBc0I7Z0JBQ3pDLE1BQU0sTUFBTSxHQUFHLGtCQUFrQixDQUFDO29CQUNoQyxTQUFTLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUM7b0JBQ2hDLEtBQUssRUFBRSxtQkFBbUIsQ0FBQyxNQUFNLENBQUMsUUFBUSxFQUFFLE1BQU0sQ0FBQyxTQUFTLENBQUMsQ0FBQyxTQUFTO2lCQUN4RSxDQUFDLENBQUM7Z0JBQ0gsTUFBTSxPQUFPLEdBQUcsTUFBTSxDQUFDLFdBQVcsQ0FBQyxhQUFhLENBQUMsUUFBUSxFQUFFLENBQUM7Z0JBQzVELE9BQU8sSUFBSSxFQUFjLENBQUMsTUFBTSxFQUFFLE9BQU8sQ0FBQyxDQUFDO1lBQzdDLENBQUM7Ozs7MkNBdERBLE9BQU87NENBS1AsT0FBTztZQUpSLDhMQUFBLGVBQWUsNkRBRWQ7WUFHRCxpTUFBQSxnQkFBZ0IsNkRBRWY7Ozs7O1NBZlUsY0FBYyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm9sbHVwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0cy9yb2xsdXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUMvRCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDdkQsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRWhELE9BQU8sRUFNTCxrQkFBa0IsRUFDbEIsV0FBVyxFQUNYLElBQUksR0FDTCxNQUFNLE1BQU0sQ0FBQztBQUdkLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0lBRzlDLGNBQWM7Ozs7O3NCQUFkLGNBQWM7WUFHekIsWUFBNEIsTUFBb0IsRUFBRSxPQUFZO2dCQUFsQyxXQUFNLElBSHZCLG1EQUFjLEVBR0csTUFBTSxFQUFjO2dCQUM5QyxJQUFJLENBQUMsTUFBTSxHQUFHLFdBQVcsQ0FBQyxFQUFFLE9BQU8sRUFBRSxHQUFHLEVBQUUsU0FBUyxFQUFFLE1BQU0sRUFBRSxDQUFDLENBQUM7WUFDakUsQ0FBQztZQUVELElBQVcsT0FBTztnQkFDaEIsT0FBTyxZQUFZLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUM7WUFDdEQsQ0FBQztZQUdELGVBQWU7Z0JBQ2IsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxtQkFBbUIsRUFBRSxDQUFDO1lBQ2hELENBQUM7WUFHRCxnQkFBZ0I7Z0JBQ2QsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxZQUFZLEVBQUUsQ0FBQztZQUN6QyxDQUFDO1lBRUQsY0FBYztnQkFDWixPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLHFCQUFxQixFQUFFLENBQUM7WUFDbEQsQ0FBQztZQUVELG9CQUFvQjtnQkFDbEIsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxvQkFBb0IsRUFBRSxDQUFDO1lBQ2pELENBQUM7WUFFRCxhQUFhO2dCQUNYLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsY0FBYyxFQUFFLENBQUM7WUFDM0MsQ0FBQztZQUVELGNBQWMsQ0FBQyxTQUFpQjtnQkFDOUIsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxjQUFjLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDO1lBQ3RELENBQUM7WUFFRCxlQUFlLENBQUMsU0FBaUI7Z0JBQy9CLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsZUFBZSxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQztZQUN2RCxDQUFDO1lBRUQsb0JBQW9CO2dCQUNsQixPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLG9CQUFvQixFQUFFLENBQUM7WUFDakQsQ0FBQztZQUVELHdCQUF3QjtnQkFDdEIsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyx3QkFBd0IsRUFBRSxDQUFDO1lBQ3JELENBQUM7WUFFRCxrQkFBa0I7Z0JBQ2hCLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsa0JBQWtCLEVBQUUsQ0FBQztZQUMvQyxDQUFDO1lBRUQsS0FBSyxDQUFDLGNBQWMsQ0FBQyxXQUFvQjtnQkFDdkMsV0FBVyxLQUFYLFdBQVcsR0FBSyxNQUFNLElBQUksQ0FBQyxjQUFjLEVBQUUsRUFBQztnQkFDNUMsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDbEUsQ0FBQztZQUVELE1BQU0sQ0FBQyx3QkFBd0IsQ0FBQyx1QkFBMEM7Z0JBQ3hFLE1BQU0sRUFDSixZQUFZLEVBQ1osbUJBQW1CLEVBQUUsRUFBRSxhQUFhLEVBQUUsR0FDdkMsR0FBRyx1QkFBdUIsQ0FBQztnQkFDNUIsT0FBTyxJQUFJLEVBQWMsQ0FBQyxZQUFZLEVBQUUsYUFBYSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7WUFDcEUsQ0FBQztZQUVELE1BQU0sQ0FBQyxhQUFhLENBQUMsTUFBc0I7Z0JBQ3pDLE1BQU0sTUFBTSxHQUFHLGtCQUFrQixDQUFDO29CQUNoQyxTQUFTLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUM7b0JBQ2hDLEtBQUssRUFBRSxtQkFBbUIsQ0FBQyxNQUFNLENBQUMsUUFBUSxFQUFFLE1BQU0sQ0FBQyxTQUFTLENBQUMsQ0FBQyxTQUFTO2lCQUN4RSxDQUFDLENBQUM7Z0JBQ0gsTUFBTSxPQUFPLEdBQUcsTUFBTSxDQUFDLFdBQVcsQ0FBQyxhQUFhLENBQUMsUUFBUSxFQUFFLENBQUM7Z0JBQzVELE9BQU8sSUFBSSxFQUFjLENBQUMsTUFBTSxFQUFFLE9BQU8sQ0FBQyxDQUFDO1lBQzdDLENBQUM7Ozs7MkNBOURBLE9BQU87NENBS1AsT0FBTztZQUpSLDhMQUFBLGVBQWUsNkRBRWQ7WUFHRCxpTUFBQSxnQkFBZ0IsNkRBRWY7Ozs7O1NBbkJVLGNBQWMifQ==

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/ethereum",
-  "version": "0.69.1-devnet",
+  "version": "0.70.0",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -29,8 +29,8 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/foundation": "0.69.1-devnet",
-    "@aztec/l1-artifacts": "0.69.1-devnet",
+    "@aztec/foundation": "0.70.0",
+    "@aztec/l1-artifacts": "0.70.0",
     "@viem/anvil": "^0.0.10",
     "dotenv": "^16.0.3",
     "tslib": "^2.4.0",

package/src/contracts/rollup.ts

@@ -1,3 +1,4 @@
+import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { memoize } from '@aztec/foundation/decorators';
 import { RollupAbi } from '@aztec/l1-artifacts';
 
@@ -12,16 +13,21 @@ import {
   http,
 } from 'viem';
 
+import { type DeployL1Contracts } from '../deploy_l1_contracts.js';
 import { createEthereumChain } from '../ethereum_chain.js';
 import { type L1ReaderConfig } from '../l1_reader.js';
 
 export class RollupContract {
   private readonly rollup: GetContractReturnType<typeof RollupAbi, PublicClient<HttpTransport, Chain>>;
 
-  constructor(client: PublicClient, address: Hex) {
+  constructor(public readonly client: PublicClient, address: Hex) {
     this.rollup = getContract({ address, abi: RollupAbi, client });
   }
 
+  public get address() {
+    return AztecAddress.fromString(this.rollup.address);
+  }
+
   @memoize
   getL1StartBlock() {
     return this.rollup.read.L1_BLOCK_AT_GENESIS();
@@ -69,6 +75,14 @@ export class RollupContract {
     return this.rollup.read.getEpochForBlock([BigInt(blockNumber)]);
   }
 
+  static getFromL1ContractsValues(deployL1ContractsValues: DeployL1Contracts) {
+    const {
+      publicClient,
+      l1ContractAddresses: { rollupAddress },
+    } = deployL1ContractsValues;
+    return new RollupContract(publicClient, rollupAddress.toString());
+  }
+
   static getFromConfig(config: L1ReaderConfig) {
     const client = createPublicClient({
       transport: http(config.l1RpcUrl),