@aztec/ethereum 0.82.3 → 0.83.0

package/dest/index.d.ts.map

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

package/dest/index.js

@@ -11,3 +11,4 @@ export * from './types.js';
 export * from './contracts/index.js';
 export * from './queries.js';
 export * from './client.js';
+export * from './account.js';

package/dest/l1_contract_addresses.d.ts

@@ -13,6 +13,7 @@ export type L1ContractAddresses = {
 } & {
     slashFactoryAddress?: EthAddress | undefined;
     feeAssetHandlerAddress?: EthAddress | undefined;
+    stakingAssetHandlerAddress?: EthAddress | undefined;
 };
 export declare const L1ContractAddressesSchema: z.ZodObject<{
     rollupAddress: z.ZodType<EthAddress, any, string>;
@@ -28,6 +29,7 @@ export declare const L1ContractAddressesSchema: z.ZodObject<{
     governanceAddress: z.ZodType<EthAddress, any, string>;
     slashFactoryAddress: z.ZodOptional<z.ZodType<EthAddress, any, string>>;
     feeAssetHandlerAddress: z.ZodOptional<z.ZodType<EthAddress, any, string>>;
+    stakingAssetHandlerAddress: z.ZodOptional<z.ZodType<EthAddress, any, string>>;
 }, "strip", z.ZodTypeAny, {
     rollupAddress: EthAddress;
     registryAddress: EthAddress;
@@ -42,6 +44,7 @@ export declare const L1ContractAddressesSchema: z.ZodObject<{
     stakingAssetAddress: EthAddress;
     slashFactoryAddress?: EthAddress | undefined;
     feeAssetHandlerAddress?: EthAddress | undefined;
+    stakingAssetHandlerAddress?: EthAddress | undefined;
 }, {
     rollupAddress: string;
     registryAddress: string;
@@ -56,6 +59,7 @@ export declare const L1ContractAddressesSchema: z.ZodObject<{
     stakingAssetAddress: string;
     slashFactoryAddress?: string | undefined;
     feeAssetHandlerAddress?: string | undefined;
+    stakingAssetHandlerAddress?: string | undefined;
 }>;
 export declare const l1ContractAddressesMapping: ConfigMappingsType<L1ContractAddresses>;
 //# sourceMappingURL=l1_contract_addresses.d.ts.map

package/dest/l1_contract_addresses.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"l1_contract_addresses.d.ts","sourceRoot":"","sources":["../src/l1_contract_addresses.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,sPAYnB,CAAC;AAEX,8DAA8D;AAC9D,MAAM,MAAM,mBAAmB,GAAG;KAC/B,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,GAAG,UAAU;CACrD,GAAG;IAAE,mBAAmB,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;IAAC,sBAAsB,CAAC,EAAE,UAAU,GAAG,SAAS,CAAA;CAAE,CAAC;AAEtG,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAcE,CAAC;AAIzC,eAAO,MAAM,0BAA0B,EAAE,kBAAkB,CAAC,mBAAmB,CAkE9E,CAAC"}
+{"version":3,"file":"l1_contract_addresses.d.ts","sourceRoot":"","sources":["../src/l1_contract_addresses.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,sPAYnB,CAAC;AAEX,8DAA8D;AAC9D,MAAM,MAAM,mBAAmB,GAAG;KAC/B,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,GAAG,UAAU;CACrD,GAAG;IACF,mBAAmB,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;IAC7C,sBAAsB,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;IAChD,0BAA0B,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;CACrD,CAAC;AAEF,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAeE,CAAC;AAIzC,eAAO,MAAM,0BAA0B,EAAE,kBAAkB,CAAC,mBAAmB,CAuE9E,CAAC"}

package/dest/l1_contract_addresses.js

@@ -31,7 +31,8 @@ export const L1ContractAddressesSchema = z.object({
     governanceProposerAddress: schemas.EthAddress,
     governanceAddress: schemas.EthAddress,
     slashFactoryAddress: schemas.EthAddress.optional(),
-    feeAssetHandlerAddress: schemas.EthAddress.optional()
+    feeAssetHandlerAddress: schemas.EthAddress.optional(),
+    stakingAssetHandlerAddress: schemas.EthAddress.optional()
 });
 const parseEnv = (val)=>EthAddress.fromString(val);
 export const l1ContractAddressesMapping = {
@@ -99,5 +100,10 @@ export const l1ContractAddressesMapping = {
         env: 'FEE_ASSET_HANDLER_CONTRACT_ADDRESS',
         description: 'The deployed L1 feeAssetHandler contract address',
         parseEnv
+    },
+    stakingAssetHandlerAddress: {
+        env: 'STAKING_ASSET_HANDLER_CONTRACT_ADDRESS',
+        description: 'The deployed L1 stakingAssetHandler contract address',
+        parseEnv
     }
 };

package/dest/queries.d.ts

@@ -9,6 +9,7 @@ export declare function getL1ContractsConfig(publicClient: ViemPublicClient, add
 }): Promise<Omit<L1ContractsConfig, 'ethereumSlotDuration'> & {
     l1StartBlock: bigint;
     l1GenesisTime: bigint;
+    rollupVersion: number;
 }>;
 export type L2BlockProposedEvent = {
     versionedBlobHashes: readonly Hex[];

package/dest/queries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queries.d.ts","sourceRoot":"","sources":["../src/queries.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAGhE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAEhC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAIrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEnD,qDAAqD;AACrD,wBAAsB,oBAAoB,CACxC,YAAY,EAAE,gBAAgB,EAC9B,SAAS,EAAE;IAAE,iBAAiB,EAAE,UAAU,CAAC;IAAC,aAAa,CAAC,EAAE,UAAU,CAAA;CAAE,GACvE,OAAO,CAAC,IAAI,CAAC,iBAAiB,EAAE,sBAAsB,CAAC,GAAG;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE,CAAC,CAqD5G;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,mBAAmB,EAAE,SAAS,GAAG,EAAE,CAAC;IACpC,OAAO,EAAE,GAAG,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,GAAG,EACZ,aAAa,CAAC,EAAE,UAAU,GACzB,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAUjC"}
+{"version":3,"file":"queries.d.ts","sourceRoot":"","sources":["../src/queries.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAGhE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAEhC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAIrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEnD,qDAAqD;AACrD,wBAAsB,oBAAoB,CACxC,YAAY,EAAE,gBAAgB,EAC9B,SAAS,EAAE;IAAE,iBAAiB,EAAE,UAAU,CAAC;IAAC,aAAa,CAAC,EAAE,UAAU,CAAA;CAAE,GACvE,OAAO,CACR,IAAI,CAAC,iBAAiB,EAAE,sBAAsB,CAAC,GAAG;IAChD,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;CACvB,CACF,CAwDA;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,mBAAmB,EAAE,SAAS,GAAG,EAAE,CAAC;IACpC,OAAO,EAAE,GAAG,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,GAAG,EACZ,aAAa,CAAC,EAAE,UAAU,GACzB,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAUjC"}

package/dest/queries.js

@@ -9,7 +9,7 @@ import { RollupContract } from './contracts/rollup.js';
     const rollupAddress = addresses.rollupAddress ?? await governanceProposer.getRollupAddress();
     const rollup = new RollupContract(publicClient, rollupAddress.toString());
     const slasherProposer = await rollup.getSlashingProposer();
-    const [l1StartBlock, l1GenesisTime, aztecEpochDuration, aztecProofSubmissionWindow, aztecSlotDuration, aztecTargetCommitteeSize, minimumStake, governanceProposerQuorum, governanceProposerRoundSize, slashingQuorum, slashingRoundSize, manaTarget, provingCostPerMana] = await Promise.all([
+    const [l1StartBlock, l1GenesisTime, aztecEpochDuration, aztecProofSubmissionWindow, aztecSlotDuration, aztecTargetCommitteeSize, minimumStake, governanceProposerQuorum, governanceProposerRoundSize, slashingQuorum, slashingRoundSize, manaTarget, provingCostPerMana, rollupVersion] = await Promise.all([
         rollup.getL1StartBlock(),
         rollup.getL1GenesisTime(),
         rollup.getEpochDuration(),
@@ -22,7 +22,8 @@ import { RollupContract } from './contracts/rollup.js';
         slasherProposer.getQuorumSize(),
         slasherProposer.getRoundSize(),
         rollup.getManaTarget(),
-        rollup.getProvingCostPerMana()
+        rollup.getProvingCostPerMana(),
+        rollup.getVersion()
     ]);
     return {
         l1StartBlock,
@@ -37,7 +38,8 @@ import { RollupContract } from './contracts/rollup.js';
         slashingQuorum: Number(slashingQuorum),
         slashingRoundSize: Number(slashingRoundSize),
         manaTarget: manaTarget,
-        provingCostPerMana: provingCostPerMana
+        provingCostPerMana: provingCostPerMana,
+        rollupVersion: Number(rollupVersion)
     };
 }
 export async function getL2BlockProposalEvents(client, blockId, rollupAddress) {

package/dest/test/start_anvil.d.ts

@@ -3,6 +3,7 @@ import { type Anvil } from '@viem/anvil';
  * Ensures there's a running Anvil instance and returns the RPC URL.
  */
 export declare function startAnvil(opts?: {
+    port?: number;
     l1BlockTime?: number;
 }): Promise<{
     anvil: Anvil;

package/dest/test/start_anvil.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start_anvil.d.ts","sourceRoot":"","sources":["../../src/test/start_anvil.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,KAAK,EAAe,MAAM,aAAa,CAAC;AAGtD;;GAEG;AACH,wBAAsB,UAAU,CAC9B,IAAI,GAAE;IACJ,WAAW,CAAC,EAAE,MAAM,CAAC;CACjB,GACL,OAAO,CAAC;IAAE,KAAK,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAAC,CAsCtE"}
+{"version":3,"file":"start_anvil.d.ts","sourceRoot":"","sources":["../../src/test/start_anvil.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,KAAK,EAAe,MAAM,aAAa,CAAC;AAGtD;;GAEG;AACH,wBAAsB,UAAU,CAC9B,IAAI,GAAE;IACJ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;CACjB,GACL,OAAO,CAAC;IAAE,KAAK,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAAC,CAuCtE"}

package/dest/test/start_anvil.js

@@ -12,7 +12,8 @@ import { dirname, resolve } from 'path';
     const anvil = await retry(async ()=>{
         const anvil = createAnvil({
             anvilBinary,
-            port: 0,
+            host: '127.0.0.1',
+            port: opts.port ?? 8545,
             blockTime: opts.l1BlockTime,
             stopTimeout: 1000
         });
@@ -34,10 +35,7 @@ import { dirname, resolve } from 'path';
         throw new Error('Failed to start anvil');
     }
     // Monkeypatch the anvil instance to include the actually assigned port
-    Object.defineProperty(anvil, 'port', {
-        value: port,
-        writable: false
-    });
+    // Object.defineProperty(anvil, 'port', { value: port, writable: false });
     return {
         anvil,
         stop: ()=>anvil.stop(),

package/dest/test/upgrade_utils.d.ts

@@ -7,5 +7,6 @@ export declare function executeGovernanceProposal(proposalId: bigint, governance
 export declare function createGovernanceProposal(payloadAddress: `0x${string}`, addresses: L1ContractAddresses, privateKey: PrivateKeyAccount, publicClient: L1Clients['publicClient'], logger: Logger): Promise<{
     governance: GetContractReturnType<typeof GovernanceAbi, L1Clients['publicClient']>;
     voteAmount: bigint;
+    proposalId: bigint;
 }>;
 //# sourceMappingURL=upgrade_utils.d.ts.map

package/dest/test/upgrade_utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upgrade_utils.d.ts","sourceRoot":"","sources":["../../src/test/upgrade_utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAGlE,OAAO,EAAE,KAAK,qBAAqB,EAAE,KAAK,iBAAiB,EAAe,MAAM,MAAM,CAAC;AAGvF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAEvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,wBAAsB,yBAAyB,CAC7C,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,qBAAqB,CAAC,OAAO,aAAa,EAAE,SAAS,CAAC,cAAc,CAAC,CAAC,EAClF,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,iBAAiB,EAC7B,YAAY,EAAE,SAAS,CAAC,cAAc,CAAC,EACvC,YAAY,EAAE,SAAS,CAAC,cAAc,CAAC,EACvC,OAAO,EAAE,MAAM,EAAE,EACjB,MAAM,EAAE,MAAM,iBAmCf;AAED,wBAAsB,wBAAwB,CAC5C,cAAc,EAAE,KAAK,MAAM,EAAE,EAC7B,SAAS,EAAE,mBAAmB,EAC9B,UAAU,EAAE,iBAAiB,EAC7B,YAAY,EAAE,SAAS,CAAC,cAAc,CAAC,EACvC,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,UAAU,EAAE,qBAAqB,CAAC,OAAO,aAAa,EAAE,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAAC,CAqCrH"}
+{"version":3,"file":"upgrade_utils.d.ts","sourceRoot":"","sources":["../../src/test/upgrade_utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAGlE,OAAO,EAAE,KAAK,qBAAqB,EAAE,KAAK,iBAAiB,EAAe,MAAM,MAAM,CAAC;AAIvF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAEvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,wBAAsB,yBAAyB,CAC7C,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,qBAAqB,CAAC,OAAO,aAAa,EAAE,SAAS,CAAC,cAAc,CAAC,CAAC,EAClF,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,iBAAiB,EAC7B,YAAY,EAAE,SAAS,CAAC,cAAc,CAAC,EACvC,YAAY,EAAE,SAAS,CAAC,cAAc,CAAC,EACvC,OAAO,EAAE,MAAM,EAAE,EACjB,MAAM,EAAE,MAAM,iBAmCf;AAED,wBAAsB,wBAAwB,CAC5C,cAAc,EAAE,KAAK,MAAM,EAAE,EAC7B,SAAS,EAAE,mBAAmB,EAC9B,UAAU,EAAE,iBAAiB,EAC7B,YAAY,EAAE,SAAS,CAAC,cAAc,CAAC,EACvC,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IACT,UAAU,EAAE,qBAAqB,CAAC,OAAO,aAAa,EAAE,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC;IACnF,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC,CAyCD"}

package/dest/test/upgrade_utils.js

@@ -1,6 +1,7 @@
 import { GovernanceAbi } from '@aztec/l1-artifacts/GovernanceAbi';
 import { TestERC20Abi as StakingAssetAbi } from '@aztec/l1-artifacts/TestERC20Abi';
 import { getContract } from 'viem';
+import { extractProposalIdFromLogs } from '../contracts/governance.js';
 import { EthCheatCodes } from '../eth_cheat_codes.js';
 import { L1TxUtils } from '../l1_tx_utils.js';
 export async function executeGovernanceProposal(proposalId, governance, voteAmount, privateKey, publicClient, walletClient, rpcUrls, logger) {
@@ -90,14 +91,20 @@ export async function createGovernanceProposal(payloadAddress, addresses, privat
         hash: depositTx
     });
     logger.info(`Deposited tokens`);
-    await governance.write.proposeWithLock([
+    const proposeTx = await governance.write.proposeWithLock([
         payloadAddress,
         privateKey.address
     ], {
         account: privateKey
     });
+    const receipt = await publicClient.waitForTransactionReceipt({
+        hash: proposeTx
+    });
+    logger.info(`Proposed upgrade`);
+    const proposalId = extractProposalIdFromLogs(receipt.logs);
     return {
         governance,
-        voteAmount
+        voteAmount,
+        proposalId
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/ethereum",
-  "version": "0.82.3",
+  "version": "0.83.0",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -27,15 +27,16 @@
     "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
     "start:dev": "tsc-watch -p tsconfig.json --onSuccess 'yarn start'",
     "start": "node ./dest/index.js",
-    "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
+    "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}",
+    "proposer-address": "node ./dest/cli/forwarder_address.js"
   },
   "inherits": [
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/blob-lib": "0.82.3",
-    "@aztec/foundation": "0.82.3",
-    "@aztec/l1-artifacts": "0.82.3",
+    "@aztec/blob-lib": "0.83.0",
+    "@aztec/foundation": "0.83.0",
+    "@aztec/l1-artifacts": "0.83.0",
     "@viem/anvil": "^0.0.10",
     "dotenv": "^16.0.3",
     "tslib": "^2.4.0",

package/src/account.ts

@@ -0,0 +1,5 @@
+import { privateKeyToAccount } from 'viem/accounts';
+
+export function getAddressFromPrivateKey(privateKey: `0x${string}`): `0x${string}` {
+  return privateKeyToAccount(privateKey).address;
+}

package/src/cli/forwarder_address.ts

@@ -0,0 +1,12 @@
+import { ForwarderContract } from '../contracts/index.js';
+
+const ownerAddress = process.argv[2];
+if (!ownerAddress) {
+  process.stderr.write('Please provide an owner address as an argument\n');
+  process.exit(1);
+}
+
+// Ensure the address starts with 0x
+const formattedAddress = ownerAddress.startsWith('0x') ? ownerAddress : `0x${ownerAddress}`;
+const address = ForwarderContract.expectedAddress(formattedAddress as `0x${string}`);
+process.stdout.write(`${address}\n`);

package/src/config.ts

@@ -1,12 +1,20 @@
 import {
   type ConfigMappingsType,
   bigintConfigHelper,
+  booleanConfigHelper,
   getConfigFromMappings,
   numberConfigHelper,
 } from '@aztec/foundation/config';
 
 import { type L1TxUtilsConfig, l1TxUtilsConfigMappings } from './l1_tx_utils.js';
 
+export type GenesisStateConfig = {
+  /** Whether to populate the genesis state with initial fee juice for the test accounts */
+  testAccounts: boolean;
+  /** Whether to populate the genesis state with initial fee juice for the sponsored FPC */
+  sponsoredFPC: boolean;
+};
+
 export type L1ContractsConfig = {
   /** How many seconds an L1 slot lasts. */
   ethereumSlotDuration: number;
@@ -45,7 +53,7 @@ export const DefaultL1ContractsConfig = {
   slashingRoundSize: 10,
   governanceProposerQuorum: 6,
   governanceProposerRoundSize: 10,
-  manaTarget: BigInt(100e6),
+  manaTarget: BigInt(1e10),
   provingCostPerMana: BigInt(100),
 } satisfies L1ContractsConfig;
 
@@ -114,6 +122,23 @@ export const l1ContractsConfigMappings: ConfigMappingsType<L1ContractsConfig> =
   ...l1TxUtilsConfigMappings,
 };
 
+export const genesisStateConfigMappings: ConfigMappingsType<GenesisStateConfig> = {
+  testAccounts: {
+    env: 'TEST_ACCOUNTS',
+    description: 'Whether to populate the genesis state with initial fee juice for the test accounts.',
+    ...booleanConfigHelper(false),
+  },
+  sponsoredFPC: {
+    env: 'SPONSORED_FPC',
+    description: 'Whether to populate the genesis state with initial fee juice for the sponsored FPC.',
+    ...booleanConfigHelper(false),
+  },
+};
+
 export function getL1ContractsConfigEnvVars(): L1ContractsConfig {
   return getConfigFromMappings(l1ContractsConfigMappings);
 }
+
+export function getGenesisStateConfigEnvVars(): GenesisStateConfig {
+  return getConfigFromMappings(genesisStateConfigMappings);
+}

package/src/contracts/forwarder.ts

@@ -11,7 +11,7 @@ import {
   getContract,
 } from 'viem';
 
-import { deployL1Contract } from '../deploy_l1_contracts.js';
+import { deployL1Contract, getExpectedAddress } from '../deploy_l1_contracts.js';
 import type { L1BlobInputs, L1GasConfig, L1TxRequest, L1TxUtils } from '../l1_tx_utils.js';
 import type { L1Clients, ViemPublicClient, ViemWalletClient } from '../types.js';
 import { RollupContract } from './rollup.js';
@@ -23,6 +23,11 @@ export class ForwarderContract {
     this.forwarder = getContract({ address, abi: ForwarderAbi, client });
   }
 
+  static expectedAddress(owner: Hex) {
+    const { address } = getExpectedAddress(ForwarderAbi, ForwarderBytecode, [owner], owner);
+    return address;
+  }
+
   static async create(
     owner: Hex,
     walletClient: ViemWalletClient,

package/src/contracts/registry.ts

@@ -42,12 +42,11 @@ export class RegistryContract {
       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 (e) {
       throw new Error('Rollup address is undefined');
     }
-    return address;
   }
 
   /**
@@ -55,12 +54,7 @@ export class RegistryContract {
    * @returns The canonical address of the rollup. If the rollup is not set, throws an error.
    */
   public async getCanonicalAddress(): Promise<EthAddress> {
-    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());
   }
 
   public async getGovernanceAddresses(): Promise<
@@ -108,4 +102,19 @@ export class RegistryContract {
     const version = await this.registry.read.numberOfVersions();
     return Number(version);
   }
+
+  public async getRollupVersions(): Promise<bigint[]> {
+    const count = await this.getNumberOfVersions();
+
+    const versions: bigint[] = [];
+    for (let i = 0; i < count; i++) {
+      versions.push(await this.registry.read.getVersion([BigInt(i)]));
+    }
+
+    return versions;
+  }
+
+  public async getRewardDistributor(): Promise<EthAddress> {
+    return EthAddress.fromString(await this.registry.read.getRewardDistributor());
+  }
 }

package/src/contracts/rollup.ts

@@ -140,6 +140,11 @@ export class RollupContract {
     return this.rollup.read.getManaLimit();
   }
 
+  @memoize
+  getVersion() {
+    return this.rollup.read.getVersion();
+  }
+
   getSlasher() {
     return this.rollup.read.getSlasher();
   }
@@ -185,6 +190,10 @@ export class RollupContract {
     return this.rollup.read.getCurrentSampleSeed();
   }
 
+  getCurrentEpoch() {
+    return this.rollup.read.getCurrentEpoch();
+  }
+
   async getCurrentEpochCommittee() {
     const { result } = await this.client.simulateContract({
       address: this.address,
@@ -276,6 +285,10 @@ export class RollupContract {
     };
   }
 
+  public async getFeeJuicePortal() {
+    return EthAddress.fromString(await this.rollup.read.getFeeAssetPortal());
+  }
+
   public async getEpochNumberForSlotNumber(slotNumber: bigint): Promise<bigint> {
     return await this.rollup.read.getEpochAtSlot([slotNumber]);
   }
@@ -360,10 +373,6 @@ export class RollupContract {
     return this.rollup.read.getManaBaseFeeAt([timestamp, inFeeAsset]);
   }
 
-  getVersion() {
-    return this.rollup.read.getVersion();
-  }
-
   getSlotAt(timestamp: bigint) {
     return this.rollup.read.getSlotAt([timestamp]);
   }