@aztec/ethereum 1.2.1 → 2.0.0-nightly.20250813

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

@@ -1 +1 @@
-{"version":3,"file":"tx_delayer.d.ts","sourceRoot":"","sources":["../../src/test/tx_delayer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAIlE,OAAO,EACL,KAAK,MAAM,EACX,KAAK,GAAG,EAQT,MAAM,MAAM,CAAC;AAEd,OAAO,EAAE,KAAK,UAAU,EAAoB,MAAM,aAAa,CAAC;AAEhE,wBAAgB,cAAc,CAAC,CAAC,SAAS,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,oBAgBxG;AAED,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,oBAuB5G;AAED,MAAM,WAAW,OAAO;IACtB,sDAAsD;IACtD,eAAe,IAAI,GAAG,EAAE,CAAC;IACzB,iDAAiD;IACjD,eAAe,IAAI,GAAG,EAAE,CAAC;IACzB,8EAA8E;IAC9E,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IACxE,wEAAwE;IACxE,yBAAyB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IAC1E,kDAAkD;IAClD,YAAY,IAAI,IAAI,CAAC;CACtB;AAiCD;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,UAAU,EAC9C,MAAM,EAAE,CAAC,EACT,IAAI,EAAE;IAAE,oBAAoB,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GAC9C;IAAE,MAAM,EAAE,CAAC,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CA6EjC"}
+{"version":3,"file":"tx_delayer.d.ts","sourceRoot":"","sources":["../../src/test/tx_delayer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAElE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAG5D,OAAO,EACL,KAAK,MAAM,EACX,KAAK,GAAG,EAQT,MAAM,MAAM,CAAC;AAEd,OAAO,EAAE,KAAK,UAAU,EAAoB,MAAM,aAAa,CAAC;AAEhE,wBAAgB,cAAc,CAAC,CAAC,SAAS,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,oBAgBxG;AAED,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,oBAuB5G;AAED,MAAM,WAAW,OAAO;IACtB,sDAAsD;IACtD,eAAe,IAAI,GAAG,EAAE,CAAC;IACzB,iDAAiD;IACjD,eAAe,IAAI,GAAG,EAAE,CAAC;IACzB,8EAA8E;IAC9E,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IACxE,wEAAwE;IACxE,yBAAyB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IAC1E,kDAAkD;IAClD,YAAY,IAAI,IAAI,CAAC;IACrB;;;;OAIG;IACH,2BAA2B,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;CACzE;AA0CD;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,UAAU,EAC9C,MAAM,EAAE,CAAC,EACT,YAAY,EAAE,YAAY,EAC1B,IAAI,EAAE;IAAE,oBAAoB,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GAC9C;IAAE,MAAM,EAAE,CAAC,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CA0GjC"}

package/dest/test/tx_delayer.js

@@ -35,13 +35,22 @@ export function waitUntilL1Timestamp(client, timestamp, logger) {
     }, `Wait until L1 timestamp ${timestamp}`, 120, 0.1);
 }
 class DelayerImpl {
-    constructor(opts){
+    dateProvider;
+    logger;
+    constructor(dateProvider, opts){
+        this.dateProvider = dateProvider;
+        this.logger = createLogger('ethereum:tx_delayer');
+        this.maxInclusionTimeIntoSlot = undefined;
+        this.nextWait = undefined;
+        this.sentTxHashes = [];
+        this.cancelledTxs = [];
         this.ethereumSlotDuration = BigInt(opts.ethereumSlotDuration);
     }
+    maxInclusionTimeIntoSlot;
     ethereumSlotDuration;
-    nextWait = undefined;
-    sentTxHashes = [];
-    cancelledTxs = [];
+    nextWait;
+    sentTxHashes;
+    cancelledTxs;
     getSentTxHashes() {
         return this.sentTxHashes;
     }
@@ -63,41 +72,72 @@ class DelayerImpl {
             indefinitely: true
         };
     }
+    setMaxInclusionTimeIntoSlot(seconds) {
+        this.maxInclusionTimeIntoSlot = seconds;
+    }
 }
 /**
  * Returns a new client (without modifying the one passed in) with an injected tx delayer.
  * The delayer can be used to hold off the next tx to be sent until a given block number.
  * TODO(#10824): This doesn't play along well with blob txs for some reason.
- */ export function withDelayer(client, opts) {
+ */ export function withDelayer(client, dateProvider, opts) {
     if (!isExtendedClient(client)) {
         throw new Error('withDelayer has to be instantiated with a wallet viem client.');
     }
     const logger = createLogger('ethereum:tx_delayer');
-    const delayer = new DelayerImpl(opts);
+    const delayer = new DelayerImpl(dateProvider, opts);
     const extended = client// Tweak sendRawTransaction so it uses the delay defined in the delayer.
     // Note that this will only work with local accounts (ie accounts for which we have the private key).
     // Transactions signed by the node will not be delayed since they use sendTransaction directly,
     // but we do not use them in our codebase at all.
     .extend((client)=>({
             async sendRawTransaction (...args) {
+                let wait;
+                let txHash;
+                const { serializedTransaction } = args[0];
+                const publicClient = client;
                 if (delayer.nextWait !== undefined) {
+                    // Check if we have been instructed to delay the next tx.
                     const waitUntil = delayer.nextWait;
                     delayer.nextWait = undefined;
                     // Compute the tx hash manually so we emulate sendRawTransaction response
-                    const { serializedTransaction } = args[0];
-                    const txHash = computeTxHash(serializedTransaction);
+                    txHash = computeTxHash(serializedTransaction);
                     // Cancel tx outright if instructed
                     if ('indefinitely' in waitUntil && waitUntil.indefinitely) {
                         logger.info(`Cancelling tx ${txHash}`);
                         delayer.cancelledTxs.push(serializedTransaction);
                         return Promise.resolve(txHash);
                     }
-                    const publicClient = client;
-                    const wait = 'l1BlockNumber' in waitUntil ? waitUntilBlock(publicClient, waitUntil.l1BlockNumber - 1n, logger) : 'l1Timestamp' in waitUntil ? waitUntilL1Timestamp(publicClient, waitUntil.l1Timestamp - delayer.ethereumSlotDuration, logger) : undefined;
+                    // Or wait until the desired block number or timestamp
+                    wait = 'l1BlockNumber' in waitUntil ? waitUntilBlock(publicClient, waitUntil.l1BlockNumber - 1n, logger) : 'l1Timestamp' in waitUntil ? waitUntilL1Timestamp(publicClient, waitUntil.l1Timestamp - delayer.ethereumSlotDuration, logger) : undefined;
                     logger.info(`Delaying tx ${txHash} until ${inspect(waitUntil)}`, {
                         argsLen: args.length,
                         ...omit(parseTransaction(serializedTransaction), 'data', 'sidecars')
                     });
+                } else if (delayer.maxInclusionTimeIntoSlot !== undefined) {
+                    // Check if we need to delay txs sent too close to the end of the slot.
+                    const currentBlock = await publicClient.getBlock({
+                        includeTransactions: false
+                    });
+                    const { timestamp: lastBlockTimestamp, number } = currentBlock;
+                    const now = delayer.dateProvider.now();
+                    txHash = computeTxHash(serializedTransaction);
+                    const logData = {
+                        ...omit(parseTransaction(serializedTransaction), 'data', 'sidecars'),
+                        lastBlockTimestamp,
+                        now,
+                        maxInclusionTimeIntoSlot: delayer.maxInclusionTimeIntoSlot
+                    };
+                    if (now / 1000 - Number(lastBlockTimestamp) > delayer.maxInclusionTimeIntoSlot) {
+                        // If the last block was mined more than `maxInclusionTimeIntoSlot` seconds ago, then we cannot include
+                        // any txs in the current slot, so we delay the tx until the next slot.
+                        logger.info(`Delaying inclusion of tx ${txHash} until the next slot since it was sent too late`, logData);
+                        wait = waitUntilBlock(publicClient, number + 1n, logger);
+                    } else {
+                        logger.debug(`Immediately sending tx ${txHash} as it was received early enough in the slot`, logData);
+                    }
+                }
+                if (wait !== undefined) {
                     // Do not await here so we can return the tx hash immediately as if it had been sent on the spot.
                     // Instead, delay it so it lands on the desired block number or timestamp, assuming anvil will
                     // mine it immediately.
@@ -109,7 +149,7 @@ class DelayerImpl {
                                 computedTxHash: txHash
                             });
                         }
-                        logger.info(`Sent previously delayed tx ${clientTxHash} to land on ${inspect(waitUntil)}`);
+                        logger.info(`Sent previously delayed tx ${clientTxHash}`);
                         delayer.sentTxHashes.push(clientTxHash);
                     }).catch((err)=>logger.error(`Error sending tx after delay`, err));
                     return Promise.resolve(txHash);

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;AAIvF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAEvE,OAAO,KAAK,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE9E,wBAAsB,yBAAyB,CAC7C,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,qBAAqB,CAAC,OAAO,aAAa,EAAE,gBAAgB,CAAC,EACzE,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,iBAAiB,EAC7B,QAAQ,EAAE,wBAAwB,EAClC,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,gBAAgB,EAC9B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IACT,UAAU,EAAE,qBAAqB,CAAC,OAAO,aAAa,EAAE,gBAAgB,CAAC,CAAC;IAC1E,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC,CAyCD"}
+{"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,wBAAwB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAG9E,wBAAsB,yBAAyB,CAC7C,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,qBAAqB,CAAC,OAAO,aAAa,EAAE,gBAAgB,CAAC,EACzE,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,iBAAiB,EAC7B,QAAQ,EAAE,wBAAwB,EAClC,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,gBAAgB,EAC9B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IACT,UAAU,EAAE,qBAAqB,CAAC,OAAO,aAAa,EAAE,gBAAgB,CAAC,CAAC;IAC1E,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC,CAyCD"}

package/dest/test/upgrade_utils.js

@@ -2,8 +2,8 @@ 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';
+import { EthCheatCodes } from './eth_cheat_codes.js';
 export async function executeGovernanceProposal(proposalId, governance, voteAmount, privateKey, l1Client, rpcUrls, logger) {
     const proposal = await governance.read.getProposal([
         proposalId

package/dest/utils.d.ts

@@ -12,6 +12,7 @@ export declare class FormattedViemError extends Error {
     constructor(message: string, metaMessages?: any[]);
 }
 export declare function extractEvent<const TAbi extends Abi | readonly unknown[], TEventName extends ContractEventName<TAbi>, TEventType = DecodeEventLogReturnType<TAbi, TEventName, Hex[], undefined, true>>(logs: Log[], address: Hex, abi: TAbi, eventName: TEventName, filter?: (log: TEventType) => boolean, logger?: Logger): TEventType;
+export declare function tryExtractEvent<const TAbi extends Abi | readonly unknown[], TEventName extends ContractEventName<TAbi>, TEventType = DecodeEventLogReturnType<TAbi, TEventName, Hex[], undefined, true>>(logs: Log[], address: Hex, abi: TAbi, eventName: TEventName, filter?: (log: TEventType) => boolean, logger?: Logger): TEventType | undefined;
 export declare function prettyLogViemErrorMsg(err: any): any;
 /**
  * Formats a Viem error into a FormattedViemError instance.

package/dest/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAGpD,OAAO,EACL,KAAK,GAAG,EAER,KAAK,iBAAiB,EAEtB,KAAK,wBAAwB,EAC7B,KAAK,GAAG,EACR,KAAK,GAAG,EAGT,MAAM,MAAM,CAAC;AAEd,MAAM,WAAW,OAAO;IACtB,WAAW,EAAE,EAAE,CAAC;IAChB,WAAW,EAAE,EAAE,CAAC;IAChB,WAAW,EAAE,GAAG,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,qBAAa,kBAAmB,SAAQ,KAAK;IAC3C,YAAY,CAAC,EAAE,GAAG,EAAE,CAAC;gBAET,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,GAAG,EAAE;CAKlD;AAED,wBAAgB,YAAY,CAC1B,KAAK,CAAC,IAAI,SAAS,GAAG,GAAG,SAAS,OAAO,EAAE,EAC3C,UAAU,SAAS,iBAAiB,CAAC,IAAI,CAAC,EAC1C,UAAU,GAAG,wBAAwB,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,EAE/E,IAAI,EAAE,GAAG,EAAE,EACX,OAAO,EAAE,GAAG,EACZ,GAAG,EAAE,IAAI,EACT,SAAS,EAAE,UAAU,EACrB,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,OAAO,EACrC,MAAM,CAAC,EAAE,MAAM,GACd,UAAU,CAMZ;AA+BD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG,OAW7C;AA0BD;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,GAAE,GAAe,GAAG,kBAAkB,CA8FpF;AA+KD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG,sBAa7C"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAGpD,OAAO,EACL,KAAK,GAAG,EAER,KAAK,iBAAiB,EAEtB,KAAK,wBAAwB,EAC7B,KAAK,GAAG,EACR,KAAK,GAAG,EAGT,MAAM,MAAM,CAAC;AAEd,MAAM,WAAW,OAAO;IACtB,WAAW,EAAE,EAAE,CAAC;IAChB,WAAW,EAAE,EAAE,CAAC;IAChB,WAAW,EAAE,GAAG,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,qBAAa,kBAAmB,SAAQ,KAAK;IAC3C,YAAY,CAAC,EAAE,GAAG,EAAE,CAAC;gBAET,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,GAAG,EAAE;CAKlD;AAED,wBAAgB,YAAY,CAC1B,KAAK,CAAC,IAAI,SAAS,GAAG,GAAG,SAAS,OAAO,EAAE,EAC3C,UAAU,SAAS,iBAAiB,CAAC,IAAI,CAAC,EAC1C,UAAU,GAAG,wBAAwB,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,EAE/E,IAAI,EAAE,GAAG,EAAE,EACX,OAAO,EAAE,GAAG,EACZ,GAAG,EAAE,IAAI,EACT,SAAS,EAAE,UAAU,EACrB,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,OAAO,EACrC,MAAM,CAAC,EAAE,MAAM,GACd,UAAU,CAMZ;AAED,wBAAgB,eAAe,CAC7B,KAAK,CAAC,IAAI,SAAS,GAAG,GAAG,SAAS,OAAO,EAAE,EAC3C,UAAU,SAAS,iBAAiB,CAAC,IAAI,CAAC,EAC1C,UAAU,GAAG,wBAAwB,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,EAE/E,IAAI,EAAE,GAAG,EAAE,EACX,OAAO,EAAE,GAAG,EACZ,GAAG,EAAE,IAAI,EACT,SAAS,EAAE,UAAU,EACrB,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,OAAO,EACrC,MAAM,CAAC,EAAE,MAAM,GACd,UAAU,GAAG,SAAS,CAgBxB;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG,OAW7C;AA0BD;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,GAAE,GAAe,GAAG,kBAAkB,CA8FpF;AA+KD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG,sBAa7C"}

package/dest/utils.js

@@ -15,7 +15,7 @@ export function extractEvent(logs, address, abi, eventName, filter, logger) {
     }
     return event;
 }
-function tryExtractEvent(logs, address, abi, eventName, filter, logger) {
+export function tryExtractEvent(logs, address, abi, eventName, filter, logger) {
     for (const log of logs){
         if (log.address.toLowerCase() === address.toLowerCase()) {
             try {

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "@aztec/ethereum",
-  "version": "1.2.1",
+  "version": "2.0.0-nightly.20250813",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
-    "./eth-cheatcodes": "./dest/eth_cheat_codes.js",
     "./test": "./dest/test/index.js",
     "./contracts": "./dest/contracts/index.js",
     "./deploy-l1-contracts": "./dest/deploy_l1_contracts.js",
@@ -32,9 +31,9 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/blob-lib": "1.2.1",
-    "@aztec/foundation": "1.2.1",
-    "@aztec/l1-artifacts": "1.2.1",
+    "@aztec/blob-lib": "2.0.0-nightly.20250813",
+    "@aztec/foundation": "2.0.0-nightly.20250813",
+    "@aztec/l1-artifacts": "2.0.0-nightly.20250813",
     "@viem/anvil": "^0.0.10",
     "dotenv": "^16.0.3",
     "lodash.pickby": "^4.5.0",
@@ -44,6 +43,7 @@
   },
   "devDependencies": {
     "@jest/globals": "^30.0.0",
+    "@noble/curves": "=1.7.0",
     "@types/jest": "^30.0.0",
     "@types/lodash.pickby": "^4",
     "@types/node": "^22.15.17",

package/src/config.ts

@@ -29,13 +29,19 @@ export type L1ContractsConfig = {
   /** The number of epochs after an epoch ends that proofs are still accepted. */
   aztecProofSubmissionEpochs: number;
   /** The deposit amount for a validator */
-  depositAmount: bigint;
+  activationThreshold: bigint;
   /** The minimum stake for a validator. */
-  minimumStake: bigint;
-  /** The slashing quorum */
+  ejectionThreshold: bigint;
+  /** The slashing quorum, i.e. how many slots must signal for the same payload in a round for it to be submittable to the Slasher */
   slashingQuorum: number;
-  /** The slashing round size */
+  /** The slashing round size, i.e. how many slots are in a round */
   slashingRoundSize: number;
+  /** The slashing lifetime in rounds. I.e., if 1, round N must be submitted before round N + 2 */
+  slashingLifetimeInRounds: number;
+  /** The slashing execution delay in rounds. I.e., if 1, round N may not be submitted until round N + 2 */
+  slashingExecutionDelayInRounds: number;
+  /** The slashing vetoer. May blacklist a payload from being submitted. */
+  slashingVetoer: EthAddress;
   /** Governance proposing quorum */
   governanceProposerQuorum: number;
   /** Governance proposing round size */
@@ -54,10 +60,13 @@ export const DefaultL1ContractsConfig = {
   aztecEpochDuration: 32,
   aztecTargetCommitteeSize: 48,
   aztecProofSubmissionEpochs: 1, // you have a full epoch to submit a proof after the epoch to prove ends
-  depositAmount: BigInt(100e18),
-  minimumStake: BigInt(50e18),
+  activationThreshold: BigInt(100e18),
+  ejectionThreshold: BigInt(50e18),
   slashingQuorum: 101,
   slashingRoundSize: 200,
+  slashingLifetimeInRounds: 5,
+  slashingExecutionDelayInRounds: 0, // round N may be submitted in round N + 1
+  slashingVetoer: EthAddress.ZERO,
   governanceProposerQuorum: 151,
   governanceProposerRoundSize: 300,
   manaTarget: BigInt(1e10),
@@ -74,23 +83,23 @@ const LocalGovernanceConfiguration = {
   votingDuration: 60n * 60n,
   executionDelay: 60n,
   gracePeriod: 60n * 60n * 24n * 7n,
-  quorum: 1n * 10n ** 17n,
-  voteDifferential: 4n * 10n ** 16n,
+  quorum: 1n * 10n ** 17n, // 10%
+  requiredYeaMargin: 4n * 10n ** 16n, // 4%
   minimumVotes: 400n * 10n ** 18n,
 };
 
 const TestnetGovernanceConfiguration = {
   proposeConfig: {
     lockDelay: 60n * 60n * 24n,
-    lockAmount: DefaultL1ContractsConfig.depositAmount * 100n,
+    lockAmount: DefaultL1ContractsConfig.activationThreshold * 100n,
   },
   votingDelay: 60n,
   votingDuration: 60n * 60n,
   executionDelay: 60n * 60n * 24n,
   gracePeriod: 60n * 60n * 24n * 7n,
-  quorum: 3n * 10n ** 17n,
-  voteDifferential: 4n * 10n ** 16n,
-  minimumVotes: DefaultL1ContractsConfig.minimumStake * 200n,
+  quorum: 3n * 10n ** 17n, // 30%
+  requiredYeaMargin: 4n * 10n ** 16n, // 4%
+  minimumVotes: DefaultL1ContractsConfig.ejectionThreshold * 200n,
 };
 
 export const getGovernanceConfiguration = (networkName: NetworkNames) => {
@@ -100,6 +109,23 @@ export const getGovernanceConfiguration = (networkName: NetworkNames) => {
   return LocalGovernanceConfiguration;
 };
 
+const TestnetGSEConfiguration = {
+  activationThreshold: BigInt(100e18),
+  ejectionThreshold: BigInt(50e18),
+};
+
+const LocalGSEConfiguration = {
+  activationThreshold: BigInt(100e18),
+  ejectionThreshold: BigInt(50e18),
+};
+
+export const getGSEConfiguration = (networkName: NetworkNames) => {
+  if (networkName === 'alpha-testnet' || networkName === 'testnet') {
+    return TestnetGSEConfiguration;
+  }
+  return LocalGSEConfiguration;
+};
+
 // Making a default config here as we are only using it thought the deployment
 // and do not expect to be using different setups, so having environment variables
 // for it seems overkill
@@ -107,12 +133,14 @@ const LocalRewardConfig = {
   sequencerBps: 5000,
   rewardDistributor: EthAddress.ZERO.toString(),
   booster: EthAddress.ZERO.toString(),
+  blockReward: BigInt(50e18),
 };
 
 const TestnetRewardConfig = {
   sequencerBps: 5000,
   rewardDistributor: EthAddress.ZERO.toString(),
   booster: EthAddress.ZERO.toString(),
+  blockReward: BigInt(50e18),
 };
 
 export const getRewardConfig = (networkName: NetworkNames) => {
@@ -193,15 +221,15 @@ export const l1ContractsConfigMappings: ConfigMappingsType<L1ContractsConfig> =
     description: 'The number of epochs after an epoch ends that proofs are still accepted.',
     ...numberConfigHelper(DefaultL1ContractsConfig.aztecProofSubmissionEpochs),
   },
-  depositAmount: {
-    env: 'AZTEC_DEPOSIT_AMOUNT',
+  activationThreshold: {
+    env: 'AZTEC_ACTIVATION_THRESHOLD',
     description: 'The deposit amount for a validator',
-    ...bigintConfigHelper(DefaultL1ContractsConfig.depositAmount),
+    ...bigintConfigHelper(DefaultL1ContractsConfig.activationThreshold),
   },
-  minimumStake: {
-    env: 'AZTEC_MINIMUM_STAKE',
+  ejectionThreshold: {
+    env: 'AZTEC_EJECTION_THRESHOLD',
     description: 'The minimum stake for a validator.',
-    ...bigintConfigHelper(DefaultL1ContractsConfig.minimumStake),
+    ...bigintConfigHelper(DefaultL1ContractsConfig.ejectionThreshold),
   },
   slashingQuorum: {
     env: 'AZTEC_SLASHING_QUORUM',
@@ -213,6 +241,22 @@ export const l1ContractsConfigMappings: ConfigMappingsType<L1ContractsConfig> =
     description: 'The slashing round size',
     ...numberConfigHelper(DefaultL1ContractsConfig.slashingRoundSize),
   },
+  slashingLifetimeInRounds: {
+    env: 'AZTEC_SLASHING_LIFETIME_IN_ROUNDS',
+    description: 'The slashing lifetime in rounds',
+    ...numberConfigHelper(DefaultL1ContractsConfig.slashingLifetimeInRounds),
+  },
+  slashingExecutionDelayInRounds: {
+    env: 'AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS',
+    description: 'The slashing execution delay in rounds',
+    ...numberConfigHelper(DefaultL1ContractsConfig.slashingExecutionDelayInRounds),
+  },
+  slashingVetoer: {
+    env: 'AZTEC_SLASHING_VETOER',
+    description: 'The slashing vetoer',
+    parseEnv: (val: string) => EthAddress.fromString(val),
+    defaultValue: DefaultL1ContractsConfig.slashingVetoer,
+  },
   governanceProposerQuorum: {
     env: 'AZTEC_GOVERNANCE_PROPOSER_QUORUM',
     description: 'The governance proposing quorum',

package/src/contracts/empire_base.ts

@@ -1,51 +1,58 @@
+import type { EthAddress } from '@aztec/foundation/eth-address';
 import { Signature } from '@aztec/foundation/eth-signature';
 import { EmpireBaseAbi } from '@aztec/l1-artifacts/EmpireBaseAbi';
 
-import { type Hex, encodeFunctionData, hashTypedData } from 'viem';
+import { type Hex, type TypedDataDefinition, encodeFunctionData } from 'viem';
 
 import type { L1TxRequest } from '../l1_tx_utils.js';
 
 export interface IEmpireBase {
-  getRoundInfo(rollupAddress: Hex, round: bigint): Promise<{ lastVote: bigint; leader: Hex; executed: boolean }>;
+  get address(): EthAddress;
+  getRoundInfo(
+    rollupAddress: Hex,
+    round: bigint,
+  ): Promise<{ lastSignalSlot: bigint; payloadWithMostSignals: Hex; executed: boolean }>;
   computeRound(slot: bigint): Promise<bigint>;
-  createVoteRequest(payload: Hex): L1TxRequest;
-  createVoteRequestWithSignature(
+  createSignalRequest(payload: Hex): L1TxRequest;
+  createSignalRequestWithSignature(
     payload: Hex,
+    round: bigint,
     chainId: number,
     signerAddress: Hex,
-    signer: (msg: Hex) => Promise<Hex>,
+    signer: (msg: TypedDataDefinition) => Promise<Hex>,
   ): Promise<L1TxRequest>;
 }
 
-export function encodeVote(payload: Hex): Hex {
+export function encodeSignal(payload: Hex): Hex {
   return encodeFunctionData({
     abi: EmpireBaseAbi,
-    functionName: 'vote',
+    functionName: 'signal',
     args: [payload],
   });
 }
 
-export function encodeVoteWithSignature(payload: Hex, signature: Signature) {
+export function encodeSignalWithSignature(payload: Hex, signature: Signature) {
   return encodeFunctionData({
     abi: EmpireBaseAbi,
-    functionName: 'voteWithSig',
+    functionName: 'signalWithSig',
     args: [payload, signature.toViemSignature()],
   });
 }
 
 /**
- * Signs a vote proposal using EIP-712 typed data for use with voteWithSig
+ * Signs a signal proposal using EIP-712 typed data for use with signalWithSig
  * @param walletClient - The viem wallet client to sign with
- * @param proposal - The proposal address to vote on
+ * @param payload - The payload address to signal
  * @param verifyingContract - The address of the EmpireBase contract
  * @param chainId - The chain ID where the contract is deployed
  * @param account - The account to sign with (optional if hoisted on wallet client)
  * @returns The EIP-712 signature
  */
-export async function signVoteWithSig(
-  signer: (msg: Hex) => Promise<Hex>,
-  proposal: Hex,
+export async function signSignalWithSig(
+  signer: (msg: TypedDataDefinition) => Promise<Hex>,
+  payload: Hex,
   nonce: bigint,
+  round: bigint,
   verifyingContract: Hex,
   chainId: number,
 ): Promise<Signature> {
@@ -57,17 +64,19 @@ export async function signVoteWithSig(
   };
 
   const types = {
-    Vote: [
-      { name: 'proposal', type: 'address' },
+    Signal: [
+      { name: 'payload', type: 'address' },
       { name: 'nonce', type: 'uint256' },
+      { name: 'round', type: 'uint256' },
     ],
   };
 
   const message = {
-    proposal,
+    payload,
     nonce,
+    round,
   };
 
-  const msg = hashTypedData({ domain, types, primaryType: 'Vote', message });
-  return Signature.fromString(await signer(msg));
+  const typedData = { domain, types, primaryType: 'Signal', message };
+  return Signature.fromString(await signer(typedData));
 }

package/src/contracts/governance.ts

@@ -227,9 +227,9 @@ export class GovernanceContract extends ReadOnlyGovernanceContract {
     }
     logger.info(`Voted [${inFavor ? 'yea' : 'nay'}] on proposal [${proposalId}]`);
     const proposal = await this.getProposal(proposalId);
-    logger.info(`Proposal [${proposalId}] has state [${proposal.state}]`);
+    logger.info(`Proposal [${proposalId}] has cached state [${proposal.cachedState}]`);
     logger.info(`Proposal [${proposalId}] has summedBallot yea [${proposal.summedBallot.yea}]`);
-    logger.info(`Proposal [${proposalId}] has summedBallot nea [${proposal.summedBallot.nea}]`);
+    logger.info(`Proposal [${proposalId}] has summedBallot nay [${proposal.summedBallot.nay}]`);
   }
 
   public async executeProposal({

package/src/contracts/governance_proposer.ts

@@ -2,11 +2,18 @@ import { memoize } from '@aztec/foundation/decorators';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { GovernanceProposerAbi } from '@aztec/l1-artifacts/GovernanceProposerAbi';
 
-import { type GetContractReturnType, type Hex, type TransactionReceipt, encodeFunctionData, getContract } from 'viem';
+import {
+  type GetContractReturnType,
+  type Hex,
+  type TransactionReceipt,
+  type TypedDataDefinition,
+  encodeFunctionData,
+  getContract,
+} from 'viem';
 
 import type { GasPrice, L1TxRequest, L1TxUtils } from '../l1_tx_utils.js';
 import type { ViemClient } from '../types.js';
-import { type IEmpireBase, encodeVote, encodeVoteWithSignature, signVoteWithSig } from './empire_base.js';
+import { type IEmpireBase, encodeSignal, encodeSignalWithSignature, signSignalWithSig } from './empire_base.js';
 import { extractProposalIdFromLogs } from './governance.js';
 
 export class GovernanceProposerContract implements IEmpireBase {
@@ -33,11 +40,11 @@ export class GovernanceProposerContract implements IEmpireBase {
   }
 
   public getQuorumSize(): Promise<bigint> {
-    return this.proposer.read.N();
+    return this.proposer.read.QUORUM_SIZE();
   }
 
   public getRoundSize(): Promise<bigint> {
-    return this.proposer.read.M();
+    return this.proposer.read.ROUND_SIZE();
   }
 
   public computeRound(slot: bigint): Promise<bigint> {
@@ -51,36 +58,37 @@ export class GovernanceProposerContract implements IEmpireBase {
   public async getRoundInfo(
     rollupAddress: Hex,
     round: bigint,
-  ): Promise<{ lastVote: bigint; leader: Hex; executed: boolean }> {
+  ): Promise<{ lastSignalSlot: bigint; payloadWithMostSignals: Hex; executed: boolean }> {
     return await this.proposer.read.getRoundData([rollupAddress, round]);
   }
 
-  public getProposalVotes(rollupAddress: Hex, round: bigint, proposal: Hex): Promise<bigint> {
-    return this.proposer.read.yeaCount([rollupAddress, round, proposal]);
+  public getPayloadSignals(rollupAddress: Hex, round: bigint, payload: Hex): Promise<bigint> {
+    return this.proposer.read.signalCount([rollupAddress, round, payload]);
   }
 
-  public createVoteRequest(payload: Hex): L1TxRequest {
+  public createSignalRequest(payload: Hex): L1TxRequest {
     return {
       to: this.address.toString(),
-      data: encodeVote(payload),
+      data: encodeSignal(payload),
     };
   }
 
-  public async createVoteRequestWithSignature(
+  public async createSignalRequestWithSignature(
     payload: Hex,
+    round: bigint,
     chainId: number,
     signerAddress: Hex,
-    signer: (msg: Hex) => Promise<Hex>,
+    signer: (msg: TypedDataDefinition) => Promise<Hex>,
   ): Promise<L1TxRequest> {
     const nonce = await this.getNonce(signerAddress);
-    const signature = await signVoteWithSig(signer, payload, nonce, this.address.toString(), chainId);
+    const signature = await signSignalWithSig(signer, payload, nonce, round, this.address.toString(), chainId);
     return {
       to: this.address.toString(),
-      data: encodeVoteWithSignature(payload, signature),
+      data: encodeSignalWithSignature(payload, signature),
     };
   }
 
-  public async executeProposal(
+  public async submitRoundWinner(
     round: bigint,
     l1TxUtils: L1TxUtils,
   ): Promise<{
@@ -92,7 +100,7 @@ export class GovernanceProposerContract implements IEmpireBase {
       to: this.address.toString(),
       data: encodeFunctionData({
         abi: this.proposer.abi,
-        functionName: 'executeProposal',
+        functionName: 'submitRoundWinner',
         args: [round],
       }),
     });

package/src/contracts/gse.ts

@@ -0,0 +1,73 @@
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { GSEAbi } from '@aztec/l1-artifacts/GSEAbi';
+
+import type { ProjPointType } from '@noble/curves/abstract/weierstrass';
+import { bn254 } from '@noble/curves/bn254';
+import { type GetContractReturnType, type Hex, getContract } from 'viem';
+
+import type { ViemClient } from '../types.js';
+
+export type RegistrationTuple = {
+  publicKeyInG1: {
+    x: bigint;
+    y: bigint;
+  };
+  publicKeyInG2: {
+    x0: bigint;
+    x1: bigint;
+    y0: bigint;
+    y1: bigint;
+  };
+  proofOfPossession: {
+    x: bigint;
+    y: bigint;
+  };
+};
+
+export class GSEContract {
+  public address: EthAddress;
+  private readonly gse: GetContractReturnType<typeof GSEAbi, ViemClient>;
+
+  constructor(
+    public readonly client: ViemClient,
+    address: Hex | EthAddress,
+  ) {
+    if (address instanceof EthAddress) {
+      address = address.toString();
+    }
+    this.address = EthAddress.fromString(address);
+    this.gse = getContract({ address, abi: GSEAbi, client });
+  }
+
+  public async getRegistrationDigest(publicKey: ProjPointType<bigint>): Promise<ProjPointType<bigint>> {
+    const affinePublicKey = publicKey.toAffine();
+    const g1PointDigest = await this.gse.read.getRegistrationDigest([{ x: affinePublicKey.x, y: affinePublicKey.y }]);
+    return bn254.G1.ProjectivePoint.fromAffine(g1PointDigest);
+  }
+
+  public async makeRegistrationTuple(privateKey: bigint): Promise<RegistrationTuple> {
+    const publicKeyG1 = bn254.G1.ProjectivePoint.BASE.multiply(privateKey);
+    const digest = await this.getRegistrationDigest(publicKeyG1);
+    const signature = digest.multiply(privateKey);
+    const publicKeyG2 = bn254.G2.ProjectivePoint.BASE.multiply(privateKey);
+    const publicKeyG1Affine = publicKeyG1.toAffine();
+    const signatureAffine = signature.toAffine();
+    const publicKeyG2Affine = publicKeyG2.toAffine();
+    return {
+      publicKeyInG1: {
+        x: publicKeyG1Affine.x,
+        y: publicKeyG1Affine.y,
+      },
+      publicKeyInG2: {
+        x0: publicKeyG2Affine.x.c0,
+        x1: publicKeyG2Affine.x.c1,
+        y0: publicKeyG2Affine.y.c0,
+        y1: publicKeyG2Affine.y.c1,
+      },
+      proofOfPossession: {
+        x: signatureAffine.x,
+        y: signatureAffine.y,
+      },
+    };
+  }
+}

package/src/contracts/index.ts

@@ -4,6 +4,7 @@ export * from './fee_asset_handler.js';
 export * from './fee_juice.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';