@aztec/sequencer-client 0.47.0 → 0.48.0

package/dest/tx_validator/test_utils.js

@@ -1,3 +1,4 @@
+import { computeVarArgsHash } from '@aztec/circuits.js/hash';
 export function patchNonRevertibleFn(tx, index, overrides) {
     return patchFn('endNonRevertibleData', tx, index, overrides);
 }
@@ -7,13 +8,18 @@ export function patchRevertibleFn(tx, index, overrides) {
 function patchFn(where, tx, index, overrides) {
     const fn = tx.enqueuedPublicFunctionCalls.at(-1 * index - 1);
     fn.contractAddress = overrides.address ?? fn.contractAddress;
-    fn.functionSelector = overrides.selector;
+    fn.callContext.functionSelector = overrides.selector;
     fn.args = overrides.args ?? fn.args;
     fn.callContext.msgSender = overrides.msgSender ?? fn.callContext.msgSender;
-    tx.data.forPublic[where].publicCallStack[index] = fn.toCallRequest();
+    tx.enqueuedPublicFunctionCalls[index] = fn;
+    const request = tx.data.forPublic[where].publicCallStack[index];
+    request.item.contractAddress = fn.contractAddress;
+    request.item.callContext = fn.callContext;
+    request.item.argsHash = computeVarArgsHash(fn.args);
+    tx.data.forPublic[where].publicCallStack[index] = request;
     return {
         address: fn.contractAddress,
-        selector: fn.functionSelector,
+        selector: fn.callContext.functionSelector,
     };
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdF91dGlscy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90eF92YWxpZGF0b3IvdGVzdF91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFHQSxNQUFNLFVBQVUsb0JBQW9CLENBQ2xDLEVBQU0sRUFDTixLQUFhLEVBQ2IsU0FBd0c7SUFFeEcsT0FBTyxPQUFPLENBQUMsc0JBQXNCLEVBQUUsRUFBRSxFQUFFLEtBQUssRUFBRSxTQUFTLENBQUMsQ0FBQztBQUMvRCxDQUFDO0FBRUQsTUFBTSxVQUFVLGlCQUFpQixDQUMvQixFQUFNLEVBQ04sS0FBYSxFQUNiLFNBQXdHO0lBRXhHLE9BQU8sT0FBTyxDQUFDLEtBQUssRUFBRSxFQUFFLEVBQUUsS0FBSyxFQUFFLFNBQVMsQ0FBQyxDQUFDO0FBQzlDLENBQUM7QUFFRCxTQUFTLE9BQU8sQ0FDZCxLQUFxQyxFQUNyQyxFQUFNLEVBQ04sS0FBYSxFQUNiLFNBQXdHO0lBRXhHLE1BQU0sRUFBRSxHQUFHLEVBQUUsQ0FBQywyQkFBMkIsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLEdBQUcsS0FBSyxHQUFHLENBQUMsQ0FBRSxDQUFDO0lBQzlELEVBQUUsQ0FBQyxlQUFlLEdBQUcsU0FBUyxDQUFDLE9BQU8sSUFBSSxFQUFFLENBQUMsZUFBZSxDQUFDO0lBQzdELEVBQUUsQ0FBQyxnQkFBZ0IsR0FBRyxTQUFTLENBQUMsUUFBUSxDQUFDO0lBQ3pDLEVBQUUsQ0FBQyxJQUFJLEdBQUcsU0FBUyxDQUFDLElBQUksSUFBSSxFQUFFLENBQUMsSUFBSSxDQUFDO0lBQ3BDLEVBQUUsQ0FBQyxXQUFXLENBQUMsU0FBUyxHQUFHLFNBQVMsQ0FBQyxTQUFTLElBQUksRUFBRSxDQUFDLFdBQVcsQ0FBQyxTQUFTLENBQUM7SUFDM0UsRUFBRSxDQUFDLElBQUksQ0FBQyxTQUFVLENBQUMsS0FBSyxDQUFDLENBQUMsZUFBZSxDQUFDLEtBQUssQ0FBQyxHQUFHLEVBQUUsQ0FBQyxhQUFhLEVBQUUsQ0FBQztJQUV0RSxPQUFPO1FBQ0wsT0FBTyxFQUFFLEVBQUUsQ0FBQyxlQUFlO1FBQzNCLFFBQVEsRUFBRSxFQUFFLENBQUMsZ0JBQWdCO0tBQzlCLENBQUM7QUFDSixDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdF91dGlscy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90eF92YWxpZGF0b3IvdGVzdF91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUU3RCxNQUFNLFVBQVUsb0JBQW9CLENBQ2xDLEVBQU0sRUFDTixLQUFhLEVBQ2IsU0FBd0c7SUFFeEcsT0FBTyxPQUFPLENBQUMsc0JBQXNCLEVBQUUsRUFBRSxFQUFFLEtBQUssRUFBRSxTQUFTLENBQUMsQ0FBQztBQUMvRCxDQUFDO0FBRUQsTUFBTSxVQUFVLGlCQUFpQixDQUMvQixFQUFNLEVBQ04sS0FBYSxFQUNiLFNBQXdHO0lBRXhHLE9BQU8sT0FBTyxDQUFDLEtBQUssRUFBRSxFQUFFLEVBQUUsS0FBSyxFQUFFLFNBQVMsQ0FBQyxDQUFDO0FBQzlDLENBQUM7QUFFRCxTQUFTLE9BQU8sQ0FDZCxLQUFxQyxFQUNyQyxFQUFNLEVBQ04sS0FBYSxFQUNiLFNBQXdHO0lBRXhHLE1BQU0sRUFBRSxHQUFHLEVBQUUsQ0FBQywyQkFBMkIsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLEdBQUcsS0FBSyxHQUFHLENBQUMsQ0FBRSxDQUFDO0lBQzlELEVBQUUsQ0FBQyxlQUFlLEdBQUcsU0FBUyxDQUFDLE9BQU8sSUFBSSxFQUFFLENBQUMsZUFBZSxDQUFDO0lBQzdELEVBQUUsQ0FBQyxXQUFXLENBQUMsZ0JBQWdCLEdBQUcsU0FBUyxDQUFDLFFBQVEsQ0FBQztJQUNyRCxFQUFFLENBQUMsSUFBSSxHQUFHLFNBQVMsQ0FBQyxJQUFJLElBQUksRUFBRSxDQUFDLElBQUksQ0FBQztJQUNwQyxFQUFFLENBQUMsV0FBVyxDQUFDLFNBQVMsR0FBRyxTQUFTLENBQUMsU0FBUyxJQUFJLEVBQUUsQ0FBQyxXQUFXLENBQUMsU0FBUyxDQUFDO0lBQzNFLEVBQUUsQ0FBQywyQkFBMkIsQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUM7SUFFM0MsTUFBTSxPQUFPLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQyxTQUFVLENBQUMsS0FBSyxDQUFDLENBQUMsZUFBZSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ2pFLE9BQU8sQ0FBQyxJQUFJLENBQUMsZUFBZSxHQUFHLEVBQUUsQ0FBQyxlQUFlLENBQUM7SUFDbEQsT0FBTyxDQUFDLElBQUksQ0FBQyxXQUFXLEdBQUcsRUFBRSxDQUFDLFdBQVcsQ0FBQztJQUMxQyxPQUFPLENBQUMsSUFBSSxDQUFDLFFBQVEsR0FBRyxrQkFBa0IsQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDcEQsRUFBRSxDQUFDLElBQUksQ0FBQyxTQUFVLENBQUMsS0FBSyxDQUFDLENBQUMsZUFBZSxDQUFDLEtBQUssQ0FBQyxHQUFHLE9BQU8sQ0FBQztJQUUzRCxPQUFPO1FBQ0wsT0FBTyxFQUFFLEVBQUUsQ0FBQyxlQUFlO1FBQzNCLFFBQVEsRUFBRSxFQUFFLENBQUMsV0FBVyxDQUFDLGdCQUFnQjtLQUMxQyxDQUFDO0FBQ0osQ0FBQyJ9

package/dest/tx_validator/tx_validator_factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tx_validator_factory.d.ts","sourceRoot":"","sources":["../../src/tx_validator/tx_validator_factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,WAAW,EAAE,KAAK,EAAE,EAAE,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxG,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAG1D,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAQ/D,qBAAa,kBAAkB;IAE3B,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,WAAW;gBAFX,YAAY,EAAE,oBAAoB,EAClC,kBAAkB,EAAE,kBAAkB,EACtC,WAAW,EAAE,OAAO;IAG9B,kBAAkB,CAAC,eAAe,EAAE,eAAe,EAAE,cAAc,EAAE,cAAc,EAAE,GAAG,WAAW,CAAC,EAAE,CAAC;IASvG,wBAAwB,IAAI,WAAW,CAAC,WAAW,CAAC;CAGrD"}
+{"version":3,"file":"tx_validator_factory.d.ts","sourceRoot":"","sources":["../../src/tx_validator/tx_validator_factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,WAAW,EAAE,KAAK,EAAE,EAAE,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxG,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAG1D,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAS/D,qBAAa,kBAAkB;IAE3B,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,WAAW;gBAFX,YAAY,EAAE,oBAAoB,EAClC,kBAAkB,EAAE,kBAAkB,EACtC,WAAW,EAAE,OAAO;IAG9B,kBAAkB,CAAC,eAAe,EAAE,eAAe,EAAE,cAAc,EAAE,cAAc,EAAE,GAAG,WAAW,CAAC,EAAE,CAAC;IAUvG,wBAAwB,IAAI,WAAW,CAAC,WAAW,CAAC;CAGrD"}

package/dest/tx_validator/tx_validator_factory.js

@@ -1,6 +1,7 @@
-import { GasTokenAddress } from '@aztec/protocol-contracts/gas-token';
+import { FeeJuiceAddress } from '@aztec/protocol-contracts/fee-juice';
 import { WorldStateDB, WorldStatePublicDB } from '@aztec/simulator';
 import { AggregateTxValidator } from './aggregate_tx_validator.js';
+import { DataTxValidator } from './data_validator.js';
 import { DoubleSpendTxValidator } from './double_spend_validator.js';
 import { GasTxValidator } from './gas_validator.js';
 import { MetadataTxValidator } from './metadata_validator.js';
@@ -12,10 +13,10 @@ export class TxValidatorFactory {
         this.enforceFees = enforceFees;
     }
     validatorForNewTxs(globalVariables, setupAllowList) {
-        return new AggregateTxValidator(new MetadataTxValidator(globalVariables), new DoubleSpendTxValidator(new WorldStateDB(this.merkleTreeDb)), new PhasesTxValidator(this.contractDataSource, setupAllowList), new GasTxValidator(new WorldStatePublicDB(this.merkleTreeDb), GasTokenAddress, this.enforceFees));
+        return new AggregateTxValidator(new DataTxValidator(), new MetadataTxValidator(globalVariables), new DoubleSpendTxValidator(new WorldStateDB(this.merkleTreeDb)), new PhasesTxValidator(this.contractDataSource, setupAllowList), new GasTxValidator(new WorldStatePublicDB(this.merkleTreeDb), FeeJuiceAddress, this.enforceFees));
     }
     validatorForProcessedTxs() {
         return new DoubleSpendTxValidator(new WorldStateDB(this.merkleTreeDb));
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfdmFsaWRhdG9yX2ZhY3RvcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdHhfdmFsaWRhdG9yL3R4X3ZhbGlkYXRvcl9mYWN0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUN0RSxPQUFPLEVBQUUsWUFBWSxFQUFFLGtCQUFrQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFJcEUsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDbkUsT0FBTyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDckUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ3BELE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzlELE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRTFELE1BQU0sT0FBTyxrQkFBa0I7SUFDN0IsWUFDVSxZQUFrQyxFQUNsQyxrQkFBc0MsRUFDdEMsV0FBb0I7UUFGcEIsaUJBQVksR0FBWixZQUFZLENBQXNCO1FBQ2xDLHVCQUFrQixHQUFsQixrQkFBa0IsQ0FBb0I7UUFDdEMsZ0JBQVcsR0FBWCxXQUFXLENBQVM7SUFDM0IsQ0FBQztJQUVKLGtCQUFrQixDQUFDLGVBQWdDLEVBQUUsY0FBZ0M7UUFDbkYsT0FBTyxJQUFJLG9CQUFvQixDQUM3QixJQUFJLG1CQUFtQixDQUFDLGVBQWUsQ0FBQyxFQUN4QyxJQUFJLHNCQUFzQixDQUFDLElBQUksWUFBWSxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsQ0FBQyxFQUMvRCxJQUFJLGlCQUFpQixDQUFDLElBQUksQ0FBQyxrQkFBa0IsRUFBRSxjQUFjLENBQUMsRUFDOUQsSUFBSSxjQUFjLENBQUMsSUFBSSxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLEVBQUUsZUFBZSxFQUFFLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FDakcsQ0FBQztJQUNKLENBQUM7SUFFRCx3QkFBd0I7UUFDdEIsT0FBTyxJQUFJLHNCQUFzQixDQUFDLElBQUksWUFBWSxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDO0lBQ3pFLENBQUM7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfdmFsaWRhdG9yX2ZhY3RvcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdHhfdmFsaWRhdG9yL3R4X3ZhbGlkYXRvcl9mYWN0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUN0RSxPQUFPLEVBQUUsWUFBWSxFQUFFLGtCQUFrQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFJcEUsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDbkUsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3RELE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ3JFLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNwRCxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM5RCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUUxRCxNQUFNLE9BQU8sa0JBQWtCO0lBQzdCLFlBQ1UsWUFBa0MsRUFDbEMsa0JBQXNDLEVBQ3RDLFdBQW9CO1FBRnBCLGlCQUFZLEdBQVosWUFBWSxDQUFzQjtRQUNsQyx1QkFBa0IsR0FBbEIsa0JBQWtCLENBQW9CO1FBQ3RDLGdCQUFXLEdBQVgsV0FBVyxDQUFTO0lBQzNCLENBQUM7SUFFSixrQkFBa0IsQ0FBQyxlQUFnQyxFQUFFLGNBQWdDO1FBQ25GLE9BQU8sSUFBSSxvQkFBb0IsQ0FDN0IsSUFBSSxlQUFlLEVBQUUsRUFDckIsSUFBSSxtQkFBbUIsQ0FBQyxlQUFlLENBQUMsRUFDeEMsSUFBSSxzQkFBc0IsQ0FBQyxJQUFJLFlBQVksQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLENBQUMsRUFDL0QsSUFBSSxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsa0JBQWtCLEVBQUUsY0FBYyxDQUFDLEVBQzlELElBQUksY0FBYyxDQUFDLElBQUksa0JBQWtCLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxFQUFFLGVBQWUsRUFBRSxJQUFJLENBQUMsV0FBVyxDQUFDLENBQ2pHLENBQUM7SUFDSixDQUFDO0lBRUQsd0JBQXdCO1FBQ3RCLE9BQU8sSUFBSSxzQkFBc0IsQ0FBQyxJQUFJLFlBQVksQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQztJQUN6RSxDQUFDO0NBQ0YifQ==

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/sequencer-client",
-  "version": "0.47.0",
+  "version": "0.48.0",
   "type": "module",
   "exports": "./dest/index.js",
   "typedocOptions": {
@@ -24,20 +24,20 @@
     "test:integration:run": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --config jest.integration.config.json"
   },
   "dependencies": {
-    "@aztec/circuit-types": "0.47.0",
-    "@aztec/circuits.js": "0.47.0",
-    "@aztec/ethereum": "0.47.0",
-    "@aztec/foundation": "0.47.0",
-    "@aztec/l1-artifacts": "0.47.0",
-    "@aztec/merkle-tree": "0.47.0",
-    "@aztec/noir-contracts.js": "0.47.0",
-    "@aztec/noir-protocol-circuits-types": "0.47.0",
-    "@aztec/p2p": "0.47.0",
-    "@aztec/protocol-contracts": "0.47.0",
-    "@aztec/simulator": "0.47.0",
-    "@aztec/telemetry-client": "0.47.0",
-    "@aztec/types": "0.47.0",
-    "@aztec/world-state": "0.47.0",
+    "@aztec/circuit-types": "0.48.0",
+    "@aztec/circuits.js": "0.48.0",
+    "@aztec/ethereum": "0.48.0",
+    "@aztec/foundation": "0.48.0",
+    "@aztec/l1-artifacts": "0.48.0",
+    "@aztec/merkle-tree": "0.48.0",
+    "@aztec/noir-contracts.js": "0.48.0",
+    "@aztec/noir-protocol-circuits-types": "0.48.0",
+    "@aztec/p2p": "0.48.0",
+    "@aztec/protocol-contracts": "0.48.0",
+    "@aztec/simulator": "0.48.0",
+    "@aztec/telemetry-client": "0.48.0",
+    "@aztec/types": "0.48.0",
+    "@aztec/world-state": "0.48.0",
     "@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js",
     "@noir-lang/types": "portal:../../noir/packages/types",
     "lodash.chunk": "^4.2.0",

package/src/client/sequencer-client.ts

@@ -1,5 +1,5 @@
 import { type L1ToL2MessageSource, type L2BlockSource } from '@aztec/circuit-types';
-import { type BlockProver } from '@aztec/circuit-types/interfaces';
+import { type ProverClient } from '@aztec/circuit-types/interfaces';
 import { type P2P } from '@aztec/p2p';
 import { PublicProcessorFactory, type SimulationProvider } from '@aztec/simulator';
 import { type TelemetryClient } from '@aztec/telemetry-client';
@@ -37,11 +37,11 @@ export class SequencerClient {
     contractDataSource: ContractDataSource,
     l2BlockSource: L2BlockSource,
     l1ToL2MessageSource: L1ToL2MessageSource,
-    prover: BlockProver,
+    prover: ProverClient,
     simulationProvider: SimulationProvider,
     telemetryClient: TelemetryClient,
   ) {
-    const publisher = getL1Publisher(config);
+    const publisher = getL1Publisher(config, telemetryClient);
     const globalsBuilder = getGlobalVariableBuilder(config);
     const merkleTreeDb = worldStateSynchronizer.getLatest();
 

package/src/config.ts

@@ -1,14 +1,24 @@
 import { type AllowedElement } from '@aztec/circuit-types';
 import { AztecAddress, Fr, FunctionSelector, getContractClassFromArtifact } from '@aztec/circuits.js';
-import { getL1ContractAddressesFromEnv } from '@aztec/ethereum';
+import { type L1ReaderConfig, l1ReaderConfigMappings } from '@aztec/ethereum';
+import {
+  type ConfigMappingsType,
+  booleanConfigHelper,
+  getConfigFromMappings,
+  numberConfigHelper,
+} from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { FPCContract } from '@aztec/noir-contracts.js/FPC';
 import { TokenContractArtifact } from '@aztec/noir-contracts.js/Token';
 import { AuthRegistryAddress } from '@aztec/protocol-contracts/auth-registry';
-import { GasTokenAddress } from '@aztec/protocol-contracts/gas-token';
+import { FeeJuiceAddress } from '@aztec/protocol-contracts/fee-juice';
 
-import { type GlobalReaderConfig } from './global_variable_builder/index.js';
-import { type PublisherConfig, type TxSenderConfig, getTxSenderConfigFromEnv } from './publisher/config.js';
+import {
+  type PublisherConfig,
+  type TxSenderConfig,
+  getPublisherConfigMappings,
+  getTxSenderConfigMappings,
+} from './publisher/config.js';
 import { type SequencerConfig } from './sequencer/config.js';
 
 /** Chain configuration. */
@@ -22,56 +32,107 @@ type ChainConfig = {
 /**
  * Configuration settings for the SequencerClient.
  */
-export type SequencerClientConfig = PublisherConfig &
-  TxSenderConfig &
-  SequencerConfig &
-  GlobalReaderConfig &
-  ChainConfig;
+export type SequencerClientConfig = PublisherConfig & TxSenderConfig & SequencerConfig & L1ReaderConfig & ChainConfig;
+
+export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
+  transactionPollingIntervalMS: {
+    env: 'SEQ_TX_POLLING_INTERVAL_MS',
+    description: 'The number of ms to wait between polling for pending txs.',
+    ...numberConfigHelper(1_000),
+  },
+  maxTxsPerBlock: {
+    env: 'SEQ_MAX_TX_PER_BLOCK',
+    description: 'The maximum number of txs to include in a block.',
+    ...numberConfigHelper(32),
+  },
+  minTxsPerBlock: {
+    env: 'SEQ_MIN_TX_PER_BLOCK',
+    description: 'The minimum number of txs to include in a block.',
+    ...numberConfigHelper(1),
+  },
+  minSecondsBetweenBlocks: {
+    env: 'SEQ_MIN_SECONDS_BETWEEN_BLOCKS',
+    description: 'The minimum number of seconds in-between consecutive blocks.',
+    ...numberConfigHelper(0),
+  },
+  maxSecondsBetweenBlocks: {
+    env: 'SEQ_MAX_SECONDS_BETWEEN_BLOCKS',
+    description:
+      'The maximum number of seconds in-between consecutive blocks. Sequencer will produce a block with less than minTxsPerBlock once this threshold is reached.',
+    ...numberConfigHelper(0),
+  },
+  coinbase: {
+    env: 'COINBASE',
+    parseEnv: (val: string) => EthAddress.fromString(val),
+    description: 'Recipient of block reward.',
+  },
+  feeRecipient: {
+    env: 'FEE_RECIPIENT',
+    parseEnv: (val: string) => AztecAddress.fromString(val),
+    description: 'Address to receive fees.',
+  },
+  acvmWorkingDirectory: {
+    env: 'ACVM_WORKING_DIRECTORY',
+    description: 'The working directory to use for simulation/proving',
+  },
+  acvmBinaryPath: {
+    env: 'ACVM_BINARY_PATH',
+    description: 'The path to the ACVM binary',
+  },
+  allowedInSetup: {
+    env: 'SEQ_ALLOWED_SETUP_FN',
+    parseEnv: (val: string) => parseSequencerAllowList(val),
+    defaultValue: getDefaultAllowedSetupFunctions(),
+    description: 'The list of functions calls allowed to run in setup',
+    printDefault: () =>
+      'AuthRegistry, FeeJuice.increase_public_balance, Token.increase_public_balance, FPC.prepare_fee',
+  },
+  allowedInTeardown: {
+    env: 'SEQ_ALLOWED_TEARDOWN_FN',
+    parseEnv: (val: string) => parseSequencerAllowList(val),
+    defaultValue: getDefaultAllowedTeardownFunctions(),
+    description: 'The list of functions calls allowed to run teardown',
+    printDefault: () => 'FPC.pay_refund, FPC.pay_refund_with_shielded_rebate',
+  },
+  maxBlockSizeInBytes: {
+    env: 'SEQ_MAX_BLOCK_SIZE_IN_BYTES',
+    description: 'Max block size',
+    ...numberConfigHelper(1024 * 1024),
+  },
+  enforceFees: {
+    env: 'ENFORCE_FEES',
+    description: 'Whether to require every tx to have a fee payer',
+    ...booleanConfigHelper(),
+  },
+  sequencerSkipSubmitProofs: {
+    env: 'SEQ_SKIP_SUBMIT_PROOFS',
+    description: 'Temporary flag to skip submitting proofs, so a prover-node takes care of it.',
+    ...booleanConfigHelper(),
+  },
+};
+
+export const chainConfigMappings: ConfigMappingsType<ChainConfig> = {
+  l1ChainId: l1ReaderConfigMappings.l1ChainId,
+  version: {
+    env: 'VERSION',
+    description: 'The version of the rollup.',
+    ...numberConfigHelper(1),
+  },
+};
+
+export const sequencerClientConfigMappings: ConfigMappingsType<SequencerClientConfig> = {
+  ...sequencerConfigMappings,
+  ...getTxSenderConfigMappings('SEQ'),
+  ...getPublisherConfigMappings('SEQ'),
+  ...l1ReaderConfigMappings,
+  ...chainConfigMappings,
+};
 
 /**
  * Creates an instance of SequencerClientConfig out of environment variables using sensible defaults for integration testing if not set.
  */
 export function getConfigEnvVars(): SequencerClientConfig {
-  const {
-    VERSION,
-    SEQ_PUBLISH_RETRY_INTERVAL_MS,
-    SEQ_TX_POLLING_INTERVAL_MS,
-    SEQ_MAX_TX_PER_BLOCK,
-    SEQ_MIN_TX_PER_BLOCK,
-    SEQ_ALLOWED_SETUP_FN,
-    SEQ_ALLOWED_TEARDOWN_FN,
-    SEQ_MAX_BLOCK_SIZE_IN_BYTES,
-    SEQ_SKIP_SUBMIT_PROOFS,
-    COINBASE,
-    FEE_RECIPIENT,
-    ACVM_WORKING_DIRECTORY,
-    ACVM_BINARY_PATH,
-    ENFORCE_FEES = '',
-  } = process.env;
-
-  return {
-    enforceFees: ['1', 'true'].includes(ENFORCE_FEES),
-    version: VERSION ? +VERSION : 1, // 1 is our default version
-    l1PublishRetryIntervalMS: SEQ_PUBLISH_RETRY_INTERVAL_MS ? +SEQ_PUBLISH_RETRY_INTERVAL_MS : 1_000,
-    transactionPollingIntervalMS: SEQ_TX_POLLING_INTERVAL_MS ? +SEQ_TX_POLLING_INTERVAL_MS : 1_000,
-    maxBlockSizeInBytes: SEQ_MAX_BLOCK_SIZE_IN_BYTES ? +SEQ_MAX_BLOCK_SIZE_IN_BYTES : undefined,
-    l1Contracts: getL1ContractAddressesFromEnv(),
-    maxTxsPerBlock: SEQ_MAX_TX_PER_BLOCK ? +SEQ_MAX_TX_PER_BLOCK : 32,
-    minTxsPerBlock: SEQ_MIN_TX_PER_BLOCK ? +SEQ_MIN_TX_PER_BLOCK : 1,
-    sequencerSkipSubmitProofs: ['1', 'true'].includes(SEQ_SKIP_SUBMIT_PROOFS ?? ''),
-    // TODO: undefined should not be allowed for the following 2 values in PROD
-    coinbase: COINBASE ? EthAddress.fromString(COINBASE) : undefined,
-    feeRecipient: FEE_RECIPIENT ? AztecAddress.fromString(FEE_RECIPIENT) : undefined,
-    acvmWorkingDirectory: ACVM_WORKING_DIRECTORY ? ACVM_WORKING_DIRECTORY : undefined,
-    acvmBinaryPath: ACVM_BINARY_PATH ? ACVM_BINARY_PATH : undefined,
-    allowedInSetup: SEQ_ALLOWED_SETUP_FN
-      ? parseSequencerAllowList(SEQ_ALLOWED_SETUP_FN)
-      : getDefaultAllowedSetupFunctions(),
-    allowedInTeardown: SEQ_ALLOWED_TEARDOWN_FN
-      ? parseSequencerAllowList(SEQ_ALLOWED_TEARDOWN_FN)
-      : getDefaultAllowedTeardownFunctions(),
-    ...getTxSenderConfigFromEnv('SEQ'),
-  };
+  return getConfigFromMappings<SequencerClientConfig>(sequencerClientConfigMappings);
 }
 
 /**
@@ -132,7 +193,7 @@ function getDefaultAllowedSetupFunctions(): AllowedElement[] {
     },
     // needed for claiming on the same tx as a spend
     {
-      address: GasTokenAddress,
+      address: FeeJuiceAddress,
       selector: FunctionSelector.fromSignature('_increase_public_balance((Field),Field)'),
     },
     // needed for private transfers via FPC

package/src/global_variable_builder/global_builder.ts

@@ -1,4 +1,10 @@
-import { type AztecAddress, type EthAddress, GasFees, GlobalVariables } from '@aztec/circuits.js';
+import {
+  type AztecAddress,
+  ETHEREUM_SLOT_DURATION,
+  type EthAddress,
+  GasFees,
+  GlobalVariables,
+} from '@aztec/circuits.js';
 import { Fr } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
 
@@ -6,11 +12,6 @@ import { createDebugLogger } from '@aztec/foundation/log';
  * Reads values from L1 state that is used for the global values.
  */
 export interface L1GlobalReader {
-  /**
-   * Fetches the last timestamp that a block was processed by the contract.
-   * @returns The last timestamp that a block was processed by the contract.
-   */
-  getLastTimestamp(): Promise<bigint>;
   /**
    * Fetches the version of the rollup contract.
    * @returns The version of the rollup contract.
@@ -29,10 +30,23 @@ export interface L1GlobalReader {
   getL1CurrentTime(): Promise<bigint>;
 
   /**
-   * Gets the last time L2 was warped as tracked by the rollup contract.
-   * @returns The warped time.
+   * Gets the current slot.
+   * @returns The current slot.
    */
-  getLastWarpedBlockTs(): Promise<bigint>;
+  getCurrentSlot(): Promise<bigint>;
+
+  /**
+   * Get the slot for a specific timestamp.
+   * @param timestamp - The timestamp to get the slot for.
+   */
+  getSlotAt(timestamp: readonly [bigint]): Promise<bigint>;
+
+  /**
+   * Gets the timestamp for a slot
+   * @param slot - The slot to get the timestamp for.
+   * @returns The timestamp for the slot.
+   */
+  getTimestampForSlot(slot: readonly [bigint]): Promise<bigint>;
 }
 
 /**
@@ -69,34 +83,30 @@ export class SimpleTestGlobalVariableBuilder implements GlobalVariableBuilder {
     coinbase: EthAddress,
     feeRecipient: AztecAddress,
   ): Promise<GlobalVariables> {
-    let lastTimestamp = new Fr(await this.reader.getLastTimestamp());
-    const version = new Fr(await this.reader.getVersion());
-    const chainId = new Fr(await this.reader.getChainId());
+    // Not just the current slot, the slot of the next block.
+    const ts = (await this.reader.getL1CurrentTime()) + BigInt(ETHEREUM_SLOT_DURATION);
 
-    // TODO(rahul) - fix #1614. By using the cheatcode warp to modify L2 time,
-    // txs in the next rollup would have same time as the txs in the current rollup (i.e. the rollup that was warped).
-    // So, for now you check if L2 time was warped and if so, serve warpedTime + 1 to txs in the new rollup.
-    // Check if L2 time was warped in the last rollup by checking if current L1 time is same as the warpedTime (stored on the rollup contract).
-    // more details at https://github.com/AztecProtocol/aztec-packages/issues/1614
+    const slot = await this.reader.getSlotAt([ts]);
+    const timestamp = await this.reader.getTimestampForSlot([slot]);
 
-    const currTimestamp = await this.reader.getL1CurrentTime();
-    const rollupWarpTime = await this.reader.getLastWarpedBlockTs();
-    const isLastBlockWarped = rollupWarpTime === currTimestamp;
-    if (isLastBlockWarped) {
-      lastTimestamp = new Fr(lastTimestamp.value + 1n);
-    }
+    const slotFr = new Fr(slot);
+    const timestampFr = new Fr(timestamp);
+
+    const version = new Fr(await this.reader.getVersion());
+    const chainId = new Fr(await this.reader.getChainId());
 
     const gasFees = GasFees.default();
     const globalVariables = new GlobalVariables(
       chainId,
       version,
       blockNumber,
-      lastTimestamp,
+      slotFr,
+      timestampFr,
       coinbase,
       feeRecipient,
       gasFees,
     );
     this.log.debug(`Built global variables for block ${blockNumber}`, globalVariables.toJSON());
-    return new GlobalVariables(chainId, version, blockNumber, lastTimestamp, coinbase, feeRecipient, gasFees);
+    return globalVariables;
   }
 }

package/src/global_variable_builder/index.ts

@@ -1,9 +1,9 @@
-import { type GlobalReaderConfig } from './config.js';
+import { type L1ReaderConfig } from '@aztec/ethereum';
+
 import { type GlobalVariableBuilder, SimpleTestGlobalVariableBuilder } from './global_builder.js';
 import { ViemReader } from './viem-reader.js';
 
 export { SimpleTestGlobalVariableBuilder as SimpleGlobalVariableBuilder } from './global_builder.js';
-export { GlobalReaderConfig } from './config.js';
 export { GlobalVariableBuilder } from './global_builder.js';
 
 /**
@@ -11,6 +11,6 @@ export { GlobalVariableBuilder } from './global_builder.js';
  * @param config - Configuration to initialize the builder.
  * @returns A new instance of the global variable builder.
  */
-export function getGlobalVariableBuilder(config: GlobalReaderConfig): GlobalVariableBuilder {
+export function getGlobalVariableBuilder(config: L1ReaderConfig): GlobalVariableBuilder {
   return new SimpleTestGlobalVariableBuilder(new ViemReader(config));
 }

package/src/global_variable_builder/viem-reader.ts

@@ -1,4 +1,4 @@
-import { createEthereumChain } from '@aztec/ethereum';
+import { type L1ReaderConfig, createEthereumChain } from '@aztec/ethereum';
 import { RollupAbi } from '@aztec/l1-artifacts';
 
 import {
@@ -12,7 +12,6 @@ import {
 } from 'viem';
 import type * as chains from 'viem/chains';
 
-import { type GlobalReaderConfig } from './config.js';
 import { type L1GlobalReader } from './global_builder.js';
 
 /**
@@ -22,10 +21,10 @@ export class ViemReader implements L1GlobalReader {
   private rollupContract: GetContractReturnType<typeof RollupAbi, PublicClient<HttpTransport, chains.Chain>>;
   private publicClient: PublicClient<HttpTransport, chains.Chain>;
 
-  constructor(config: GlobalReaderConfig) {
-    const { rpcUrl, l1ChainId: chainId, l1Contracts } = config;
+  constructor(config: L1ReaderConfig) {
+    const { l1RpcUrl, l1ChainId: chainId, l1Contracts } = config;
 
-    const chain = createEthereumChain(rpcUrl, chainId);
+    const chain = createEthereumChain(l1RpcUrl, chainId);
 
     this.publicClient = createPublicClient({
       chain: chain.chainInfo,
@@ -39,10 +38,6 @@ export class ViemReader implements L1GlobalReader {
     });
   }
 
-  public async getLastTimestamp(): Promise<bigint> {
-    return BigInt(await this.rollupContract.read.lastBlockTs());
-  }
-
   public async getVersion(): Promise<bigint> {
     return BigInt(await this.rollupContract.read.VERSION());
   }
@@ -55,7 +50,15 @@ export class ViemReader implements L1GlobalReader {
     return await Promise.resolve((await this.publicClient.getBlock()).timestamp);
   }
 
-  public async getLastWarpedBlockTs(): Promise<bigint> {
-    return BigInt(await this.rollupContract.read.lastWarpedBlockTs());
+  public async getCurrentSlot(): Promise<bigint> {
+    return BigInt(await this.rollupContract.read.getCurrentSlot());
+  }
+
+  public async getSlotAt(timestamp: readonly [bigint]): Promise<bigint> {
+    return BigInt(await this.rollupContract.read.getSlotAt(timestamp));
+  }
+
+  public async getTimestampForSlot(slot: readonly [bigint]): Promise<bigint> {
+    return BigInt(await this.rollupContract.read.getTimestampForSlot(slot));
   }
 }

package/src/index.ts

@@ -2,6 +2,8 @@ export * from './client/index.js';
 export * from './config.js';
 export * from './publisher/index.js';
 export * from './sequencer/index.js';
+export * from './tx_validator/aggregate_tx_validator.js';
+export * from './tx_validator/data_validator.js';
 
 // Used by the node to simulate public parts of transactions. Should these be moved to a shared library?
 export * from './global_variable_builder/index.js';

package/src/publisher/config.ts

@@ -1,36 +1,20 @@
-import { type L1ContractAddresses, NULL_KEY } from '@aztec/ethereum';
-
-import { type Hex } from 'viem';
+import { type L1ReaderConfig, NULL_KEY } from '@aztec/ethereum';
+import { type ConfigMappingsType, getConfigFromMappings } from '@aztec/foundation/config';
 
 /**
  * The configuration of the rollup transaction publisher.
  */
-export interface TxSenderConfig {
+export type TxSenderConfig = L1ReaderConfig & {
   /**
    * The private key to be used by the publisher.
    */
   publisherPrivateKey: `0x${string}`;
 
-  /**
-   * The RPC Url of the ethereum host.
-   */
-  rpcUrl: string;
-
-  /**
-   * The chain ID of the ethereum host.
-   */
-  l1ChainId: number;
-
   /**
    * The number of confirmations required.
    */
   requiredConfirmations: number;
-
-  /**
-   * The deployed l1 contract addresses
-   */
-  l1Contracts: L1ContractAddresses;
-}
+};
 
 /**
  * Configuration of the L1Publisher.
@@ -42,18 +26,46 @@ export interface PublisherConfig {
   l1PublishRetryIntervalMS: number;
 }
 
-export function getTxSenderConfigFromEnv(scope: 'PROVER' | 'SEQ'): Omit<TxSenderConfig, 'l1Contracts'> {
-  const { ETHEREUM_HOST, L1_CHAIN_ID } = process.env;
+export const getTxSenderConfigMappings: (
+  scope: 'PROVER' | 'SEQ',
+) => ConfigMappingsType<Omit<TxSenderConfig, 'l1Contracts'>> = (scope: 'PROVER' | 'SEQ') => ({
+  l1RpcUrl: {
+    env: 'ETHEREUM_HOST',
+    description: 'The RPC Url of the ethereum host.',
+  },
+  l1ChainId: {
+    env: 'L1_CHAIN_ID',
+    parseEnv: (val: string) => +val,
+    defaultValue: 31337,
+    description: 'The chain ID of the ethereum host.',
+  },
+  publisherPrivateKey: {
+    env: `${scope}_PUBLISHER_PRIVATE_KEY`,
+    description: 'The private key to be used by the publisher.',
+    parseEnv: (val: string) => (val ? `0x${val.replace('0x', '')}` : NULL_KEY),
+    defaultValue: NULL_KEY,
+  },
+  requiredConfirmations: {
+    env: `${scope}_REQUIRED_CONFIRMATIONS`,
+    parseEnv: (val: string) => +val,
+    defaultValue: 1,
+    description: 'The number of confirmations required.',
+  },
+});
 
-  const PUBLISHER_PRIVATE_KEY = process.env[`${scope}_PUBLISHER_PRIVATE_KEY`];
-  const REQUIRED_CONFIRMATIONS = process.env[`${scope}_REQUIRED_CONFIRMATIONS`];
+export function getTxSenderConfigFromEnv(scope: 'PROVER' | 'SEQ'): Omit<TxSenderConfig, 'l1Contracts'> {
+  return getConfigFromMappings(getTxSenderConfigMappings(scope));
+}
 
-  const publisherPrivateKey: Hex = PUBLISHER_PRIVATE_KEY ? `0x${PUBLISHER_PRIVATE_KEY.replace('0x', '')}` : NULL_KEY;
+export const getPublisherConfigMappings: (scope: 'PROVER' | 'SEQ') => ConfigMappingsType<PublisherConfig> = scope => ({
+  l1PublishRetryIntervalMS: {
+    env: `${scope}_PUBLISH_RETRY_INTERVAL_MS`,
+    parseEnv: (val: string) => +val,
+    defaultValue: 1000,
+    description: 'The interval to wait between publish retries.',
+  },
+});
 
-  return {
-    rpcUrl: ETHEREUM_HOST ? ETHEREUM_HOST : '',
-    requiredConfirmations: REQUIRED_CONFIRMATIONS ? +REQUIRED_CONFIRMATIONS : 1,
-    publisherPrivateKey,
-    l1ChainId: L1_CHAIN_ID ? +L1_CHAIN_ID : 31337,
-  };
+export function getPublisherConfigFromEnv(scope: 'PROVER' | 'SEQ'): PublisherConfig {
+  return getConfigFromMappings(getPublisherConfigMappings(scope));
 }

package/src/publisher/index.ts

@@ -1,14 +1,16 @@
+import { type TelemetryClient } from '@aztec/telemetry-client';
+
 import { type PublisherConfig, type TxSenderConfig } from './config.js';
 import { L1Publisher } from './l1-publisher.js';
 import { ViemTxSender } from './viem-tx-sender.js';
 
 export { L1Publisher } from './l1-publisher.js';
-export { PublisherConfig, TxSenderConfig, getTxSenderConfigFromEnv } from './config.js';
+export * from './config.js';
 
 /**
  * Returns a new instance of the L1Publisher.
  * @param config - Configuration to initialize the new instance.
  */
-export function getL1Publisher(config: PublisherConfig & TxSenderConfig): L1Publisher {
-  return new L1Publisher(new ViemTxSender(config), config);
+export function getL1Publisher(config: PublisherConfig & TxSenderConfig, client: TelemetryClient): L1Publisher {
+  return new L1Publisher(new ViemTxSender(config), client, config);
 }