@aztec/sequencer-client 0.28.1 → 0.30.0

package/dest/sequencer/tx_validator.js

@@ -0,0 +1,125 @@
+var _TxValidator_instances, _TxValidator_log, _TxValidator_globalVariables, _TxValidator_nullifierSource, _TxValidator_publicStateSource, _TxValidator_gasPortalAddress, _TxValidator_validateMetadata, _TxValidator_validateNullifiers, _TxValidator_validateFee;
+import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
+import { Tx } from '@aztec/circuit-types';
+import { Fr } from '@aztec/circuits.js';
+import { pedersenHash } from '@aztec/foundation/crypto';
+import { createDebugLogger } from '@aztec/foundation/log';
+import { getCanonicalGasTokenAddress } from '@aztec/protocol-contracts/gas-token';
+import { AbstractPhaseManager, PublicKernelPhase } from './abstract_phase_manager.js';
+// prefer symbols over booleans so it's clear what the intention is
+// vs returning true/false is tied to the function name
+// eg. isDoubleSpend vs isValidChain assign different meanings to booleans
+const VALID_TX = Symbol('valid_tx');
+const INVALID_TX = Symbol('invalid_tx');
+// the storage slot associated with "storage.balances"
+const GAS_TOKEN_BALANCES_SLOT = new Fr(1);
+export class TxValidator {
+    constructor(nullifierSource, publicStateSource, gasPortalAddress, globalVariables, log = createDebugLogger('aztec:sequencer:tx_validator')) {
+        _TxValidator_instances.add(this);
+        _TxValidator_log.set(this, void 0);
+        _TxValidator_globalVariables.set(this, void 0);
+        _TxValidator_nullifierSource.set(this, void 0);
+        _TxValidator_publicStateSource.set(this, void 0);
+        _TxValidator_gasPortalAddress.set(this, void 0);
+        __classPrivateFieldSet(this, _TxValidator_nullifierSource, nullifierSource, "f");
+        __classPrivateFieldSet(this, _TxValidator_globalVariables, globalVariables, "f");
+        __classPrivateFieldSet(this, _TxValidator_publicStateSource, publicStateSource, "f");
+        __classPrivateFieldSet(this, _TxValidator_gasPortalAddress, gasPortalAddress, "f");
+        __classPrivateFieldSet(this, _TxValidator_log, log, "f");
+    }
+    /**
+     * Validates a list of transactions.
+     * @param txs - The transactions to validate.
+     * @returns A tuple of valid and invalid transactions.
+     */
+    async validateTxs(txs) {
+        const validTxs = [];
+        const invalidTxs = [];
+        const thisBlockNullifiers = new Set();
+        for (const tx of txs) {
+            if (__classPrivateFieldGet(this, _TxValidator_instances, "m", _TxValidator_validateMetadata).call(this, tx) === INVALID_TX) {
+                invalidTxs.push(tx);
+                continue;
+            }
+            if ((await __classPrivateFieldGet(this, _TxValidator_instances, "m", _TxValidator_validateNullifiers).call(this, tx, thisBlockNullifiers)) === INVALID_TX) {
+                invalidTxs.push(tx);
+                continue;
+            }
+            // skip already processed transactions
+            if (tx instanceof Tx && (await __classPrivateFieldGet(this, _TxValidator_instances, "m", _TxValidator_validateFee).call(this, tx)) === INVALID_TX) {
+                invalidTxs.push(tx);
+                continue;
+            }
+            validTxs.push(tx);
+        }
+        return [validTxs, invalidTxs];
+    }
+}
+_TxValidator_log = new WeakMap(), _TxValidator_globalVariables = new WeakMap(), _TxValidator_nullifierSource = new WeakMap(), _TxValidator_publicStateSource = new WeakMap(), _TxValidator_gasPortalAddress = new WeakMap(), _TxValidator_instances = new WeakSet(), _TxValidator_validateMetadata = function _TxValidator_validateMetadata(tx) {
+    if (!tx.data.constants.txContext.chainId.equals(__classPrivateFieldGet(this, _TxValidator_globalVariables, "f").chainId)) {
+        __classPrivateFieldGet(this, _TxValidator_log, "f").warn(`Rejecting tx ${Tx.getHash(tx)} because of incorrect chain ${tx.data.constants.txContext.chainId.toString()} != ${__classPrivateFieldGet(this, _TxValidator_globalVariables, "f").chainId.toString()}`);
+        return INVALID_TX;
+    }
+    return VALID_TX;
+}, _TxValidator_validateNullifiers = 
+/**
+ * It looks for duplicate nullifiers:
+ * - in the same transaction
+ * - in the same block
+ * - in the nullifier tree
+ *
+ * Nullifiers prevent double spends in a private context.
+ *
+ * @param tx - The transaction.
+ * @returns Whether this is a problematic double spend that the L1 contract would reject.
+ */
+async function _TxValidator_validateNullifiers(tx, thisBlockNullifiers) {
+    const newNullifiers = [...tx.data.endNonRevertibleData.newNullifiers, ...tx.data.end.newNullifiers]
+        .filter(x => !x.isEmpty())
+        .map(x => x.value.toBigInt());
+    // Ditch this tx if it has repeated nullifiers
+    const uniqueNullifiers = new Set(newNullifiers);
+    if (uniqueNullifiers.size !== newNullifiers.length) {
+        __classPrivateFieldGet(this, _TxValidator_log, "f").warn(`Rejecting tx ${Tx.getHash(tx)} for emitting duplicate nullifiers`);
+        return INVALID_TX;
+    }
+    for (const nullifier of newNullifiers) {
+        if (thisBlockNullifiers.has(nullifier)) {
+            __classPrivateFieldGet(this, _TxValidator_log, "f").warn(`Rejecting tx ${Tx.getHash(tx)} for repeating a nullifier in the same block`);
+            return INVALID_TX;
+        }
+        thisBlockNullifiers.add(nullifier);
+    }
+    const nullifierIndexes = await Promise.all(newNullifiers.map(n => __classPrivateFieldGet(this, _TxValidator_nullifierSource, "f").getNullifierIndex(new Fr(n))));
+    const hasDuplicates = nullifierIndexes.some(index => index !== undefined);
+    if (hasDuplicates) {
+        __classPrivateFieldGet(this, _TxValidator_log, "f").warn(`Rejecting tx ${Tx.getHash(tx)} for repeating nullifiers present in state trees`);
+        return INVALID_TX;
+    }
+    return VALID_TX;
+}, _TxValidator_validateFee = async function _TxValidator_validateFee(tx) {
+    if (!tx.data.needsTeardown) {
+        // TODO check if fees are mandatory and reject this tx
+        __classPrivateFieldGet(this, _TxValidator_log, "f").debug(`Tx ${Tx.getHash(tx)} doesn't pay for gas`);
+        return VALID_TX;
+    }
+    const { 
+    // TODO what if there's more than one function call?
+    // if we're to enshrine that teardown = 1 function call, then we should turn this into a single function call
+    [PublicKernelPhase.TEARDOWN]: [teardownFn], } = AbstractPhaseManager.extractEnqueuedPublicCallsByPhase(tx.data, tx.enqueuedPublicFunctionCalls);
+    if (!teardownFn) {
+        __classPrivateFieldGet(this, _TxValidator_log, "f").warn(`Rejecting tx ${Tx.getHash(tx)} because it should pay for gas but has no enqueued teardown function call`);
+        return INVALID_TX;
+    }
+    // TODO(#1204) if a generator index is used for the derived storage slot of a map, update it here as well
+    const slot = pedersenHash([GAS_TOKEN_BALANCES_SLOT.toBuffer(), teardownFn.callContext.msgSender.toBuffer()]);
+    const gasBalance = await __classPrivateFieldGet(this, _TxValidator_publicStateSource, "f").storageRead(getCanonicalGasTokenAddress(__classPrivateFieldGet(this, _TxValidator_gasPortalAddress, "f")), slot);
+    // TODO(#5004) calculate fee needed based on tx limits and gas prices
+    const gasAmountNeeded = new Fr(1);
+    if (gasBalance.lt(gasAmountNeeded)) {
+        __classPrivateFieldGet(this, _TxValidator_log, "f").warn(`Rejecting tx ${Tx.getHash(tx)} because it should pay for gas but has insufficient balance ${gasBalance.toShortString()} < ${gasAmountNeeded.toShortString()}`);
+        return INVALID_TX;
+    }
+    return VALID_TX;
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfdmFsaWRhdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlcXVlbmNlci90eF92YWxpZGF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDMUMsT0FBTyxFQUE0QixFQUFFLEVBQW1CLE1BQU0sb0JBQW9CLENBQUM7QUFDbkYsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ3hELE9BQU8sRUFBVSxpQkFBaUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ2xFLE9BQU8sRUFBRSwyQkFBMkIsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBRWxGLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBYXRGLG1FQUFtRTtBQUNuRSx1REFBdUQ7QUFDdkQsMEVBQTBFO0FBQzFFLE1BQU0sUUFBUSxHQUFHLE1BQU0sQ0FBQyxVQUFVLENBQUMsQ0FBQztBQUNwQyxNQUFNLFVBQVUsR0FBRyxNQUFNLENBQUMsWUFBWSxDQUFDLENBQUM7QUFJeEMsc0RBQXNEO0FBQ3RELE1BQU0sdUJBQXVCLEdBQUcsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFFMUMsTUFBTSxPQUFPLFdBQVc7SUFPdEIsWUFDRSxlQUFnQyxFQUNoQyxpQkFBb0MsRUFDcEMsZ0JBQTRCLEVBQzVCLGVBQWdDLEVBQ2hDLEdBQUcsR0FBRyxpQkFBaUIsQ0FBQyw4QkFBOEIsQ0FBQzs7UUFYekQsbUNBQWE7UUFDYiwrQ0FBa0M7UUFDbEMsK0NBQWtDO1FBQ2xDLGlEQUFzQztRQUN0QyxnREFBOEI7UUFTNUIsdUJBQUEsSUFBSSxnQ0FBb0IsZUFBZSxNQUFBLENBQUM7UUFDeEMsdUJBQUEsSUFBSSxnQ0FBb0IsZUFBZSxNQUFBLENBQUM7UUFDeEMsdUJBQUEsSUFBSSxrQ0FBc0IsaUJBQWlCLE1BQUEsQ0FB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

package/dest/simulator/public_executor.d.ts

@@ -1,17 +1,15 @@
 /// <reference types="node" resolution-mode="require"/>
-import { ContractDataSource, L1ToL2MessageSource, NullifierMembershipWitness, Tx } from '@aztec/circuit-types';
+import { L1ToL2MessageSource, NullifierMembershipWitness, Tx } from '@aztec/circuit-types';
 import { AztecAddress, EthAddress, Fr, FunctionSelector, L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/circuits.js';
 import { CommitmentsDB, MessageLoadOracleInputs, PublicContractsDB, PublicStateDB } from '@aztec/simulator';
-import { ContractInstanceWithAddress } from '@aztec/types/contracts';
+import { ContractClassPublic, ContractDataSource, ContractInstanceWithAddress } from '@aztec/types/contracts';
 import { MerkleTreeOperations } from '@aztec/world-state';
 /**
  * Implements the PublicContractsDB using a ContractDataSource.
  * Progressively records contracts in transaction as they are processed in a block.
  */
 export declare class ContractsDataSourcePublicDB implements PublicContractsDB {
-    #private;
     private db;
-    private cache;
     private instanceCache;
     private classCache;
     private log;
@@ -27,8 +25,8 @@ export declare class ContractsDataSourcePublicDB implements PublicContractsDB {
      */
     removeNewContracts(tx: Tx): Promise<void>;
     getContractInstance(address: AztecAddress): Promise<ContractInstanceWithAddress | undefined>;
+    getContractClass(contractClassId: Fr): Promise<ContractClassPublic | undefined>;
     getBytecode(address: AztecAddress, selector: FunctionSelector): Promise<Buffer | undefined>;
-    getIsInternal(address: AztecAddress, selector: FunctionSelector): Promise<boolean | undefined>;
     getPortalContractAddress(address: AztecAddress): Promise<EthAddress | undefined>;
 }
 /**

package/dest/simulator/public_executor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"public_executor.d.ts","sourceRoot":"","sources":["../../src/simulator/public_executor.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,kBAAkB,EAElB,mBAAmB,EAEnB,0BAA0B,EAC1B,EAAE,EAEH,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,YAAY,EAGZ,UAAU,EACV,EAAE,EACF,gBAAgB,EAChB,wBAAwB,EAIzB,MAAM,oBAAoB,CAAC;AAK5B,OAAO,EAAE,aAAa,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAC5G,OAAO,EAAuB,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAC1F,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE1D;;;GAGG;AACH,qBAAa,2BAA4B,YAAW,iBAAiB;;IAOvD,OAAO,CAAC,EAAE;IANtB,OAAO,CAAC,KAAK,CAA2C;IACxD,OAAO,CAAC,aAAa,CAAkD;IACvE,OAAO,CAAC,UAAU,CAA0C;IAE5D,OAAO,CAAC,GAAG,CAA8D;gBAErD,EAAE,EAAE,kBAAkB;IAE1C;;;OAGG;IACI,eAAe,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB7C;;;OAGG;IACI,kBAAkB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAcnC,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC;IAInG,WAAW,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAK3F,aAAa,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;IAK9F,wBAAwB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;CA+BvF;AAED;;GAEG;AACH,qBAAa,kBAAmB,YAAW,aAAa;IAK1C,OAAO,CAAC,EAAE;IAJtB,OAAO,CAAC,mBAAmB,CAA8B;IACzD,OAAO,CAAC,sBAAsB,CAA8B;IAC5D,OAAO,CAAC,qBAAqB,CAA8B;gBAEvC,EAAE,EAAE,oBAAoB;IAE5C;;;;;OAKG;IACU,WAAW,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;IA4BvE;;;;;OAKG;IACI,YAAY,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAMlF;;;OAGG;IACH,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAYvB;;;OAGG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAMvC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAO3B,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;CAItC;AAED;;GAEG;AACH,qBAAa,YAAa,YAAW,aAAa;IACpC,OAAO,CAAC,EAAE;IAAwB,OAAO,CAAC,mBAAmB;gBAArD,EAAE,EAAE,oBAAoB,EAAU,mBAAmB,EAAE,mBAAmB;IAEjF,0CAA0C,CACrD,SAAS,EAAE,EAAE,GACZ,OAAO,CAAC,0BAA0B,GAAG,SAAS,CAAC;IAqBrC,0BAA0B,CACrC,QAAQ,EAAE,EAAE,GACX,OAAO,CAAC,uBAAuB,CAAC,OAAO,wBAAwB,CAAC,CAAC;IAYvD,kBAAkB,CAAC,UAAU,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAI/D,iBAAiB,CAAC,SAAS,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAG3E"}
+{"version":3,"file":"public_executor.d.ts","sourceRoot":"","sources":["../../src/simulator/public_executor.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,mBAAmB,EAEnB,0BAA0B,EAC1B,EAAE,EAEH,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,YAAY,EAGZ,UAAU,EACV,EAAE,EACF,gBAAgB,EAChB,wBAAwB,EAIzB,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,aAAa,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAC5G,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAC9G,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE1D;;;GAGG;AACH,qBAAa,2BAA4B,YAAW,iBAAiB;IAMvD,OAAO,CAAC,EAAE;IALtB,OAAO,CAAC,aAAa,CAAkD;IACvE,OAAO,CAAC,UAAU,CAA0C;IAE5D,OAAO,CAAC,GAAG,CAA8D;gBAErD,EAAE,EAAE,kBAAkB;IAE1C;;;OAGG;IACI,eAAe,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB7C;;;OAGG;IACI,kBAAkB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAYnC,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC;IAI5F,gBAAgB,CAAC,eAAe,EAAE,EAAE,GAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC;IAItF,WAAW,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAY3F,wBAAwB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;CAIvF;AAED;;GAEG;AACH,qBAAa,kBAAmB,YAAW,aAAa;IAK1C,OAAO,CAAC,EAAE;IAJtB,OAAO,CAAC,mBAAmB,CAA8B;IACzD,OAAO,CAAC,sBAAsB,CAA8B;IAC5D,OAAO,CAAC,qBAAqB,CAA8B;gBAEvC,EAAE,EAAE,oBAAoB;IAE5C;;;;;OAKG;IACU,WAAW,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;IA4BvE;;;;;OAKG;IACI,YAAY,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAMlF;;;OAGG;IACH,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAYvB;;;OAGG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAMvC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAO3B,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;CAItC;AAED;;GAEG;AACH,qBAAa,YAAa,YAAW,aAAa;IACpC,OAAO,CAAC,EAAE;IAAwB,OAAO,CAAC,mBAAmB;gBAArD,EAAE,EAAE,oBAAoB,EAAU,mBAAmB,EAAE,mBAAmB;IAEjF,0CAA0C,CACrD,SAAS,EAAE,EAAE,GACZ,OAAO,CAAC,0BAA0B,GAAG,SAAS,CAAC;IAqBrC,0BAA0B,CACrC,QAAQ,EAAE,EAAE,GACX,OAAO,CAAC,uBAAuB,CAAC,OAAO,wBAAwB,CAAC,CAAC;IAYvD,kBAAkB,CAAC,UAAU,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAI/D,iBAAiB,CAAC,SAAS,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAG3E"}

package/dest/simulator/public_executor.js

@@ -1,11 +1,8 @@
-var _ContractsDataSourcePublicDB_instances, _ContractsDataSourcePublicDB_getContract, _ContractsDataSourcePublicDB_makeExtendedContractDataFor;
-import { __classPrivateFieldGet } from "tslib";
-import { ExtendedContractData, MerkleTreeId, NullifierMembershipWitness, UnencryptedL2Log, } from '@aztec/circuit-types';
+import { MerkleTreeId, NullifierMembershipWitness, UnencryptedL2Log, } from '@aztec/circuit-types';
 import { ContractClassRegisteredEvent, ContractInstanceDeployedEvent, Fr, } from '@aztec/circuits.js';
 import { computePublicDataTreeLeafSlot } from '@aztec/circuits.js/hash';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { ClassRegistererAddress } from '@aztec/protocol-contracts/class-registerer';
-import { InstanceDeployerAddress } from '@aztec/protocol-contracts/instance-deployer';
 import { MessageLoadOracleInputs } from '@aztec/simulator';
 /**
  * Implements the PublicContractsDB using a ContractDataSource.
@@ -13,9 +10,7 @@ import { MessageLoadOracleInputs } from '@aztec/simulator';
  */
 export class ContractsDataSourcePublicDB {
     constructor(db) {
-        _ContractsDataSourcePublicDB_instances.add(this);
         this.db = db;
-        this.cache = new Map();
         this.instanceCache = new Map();
         this.classCache = new Map();
         this.log = createDebugLogger('aztec:sequencer:contracts-data-source');
@@ -31,7 +26,7 @@ export class ContractsDataSourcePublicDB {
             this.log(`Adding class ${e.contractClassId.toString()} to public execution contract cache`);
             this.classCache.set(e.contractClassId.toString(), e.toContractClassPublic());
         });
-        ContractInstanceDeployedEvent.fromLogs(logs, InstanceDeployerAddress).forEach(e => {
+        ContractInstanceDeployedEvent.fromLogs(logs).forEach(e => {
             this.log(`Adding instance ${e.address.toString()} with class ${e.contractClassId.toString()} to public execution contract cache`);
             this.instanceCache.set(e.address.toString(), e.toContractInstance());
         });
@@ -47,42 +42,31 @@ export class ContractsDataSourcePublicDB {
         // wouldn't that accidentally remove the contract added on the first one?
         const logs = tx.unencryptedLogs.unrollLogs().map(UnencryptedL2Log.fromBuffer);
         ContractClassRegisteredEvent.fromLogs(logs, ClassRegistererAddress).forEach(e => this.classCache.delete(e.contractClassId.toString()));
-        ContractInstanceDeployedEvent.fromLogs(logs, InstanceDeployerAddress).forEach(e => this.instanceCache.delete(e.address.toString()));
+        ContractInstanceDeployedEvent.fromLogs(logs).forEach(e => this.instanceCache.delete(e.address.toString()));
         return Promise.resolve();
     }
     async getContractInstance(address) {
         return this.instanceCache.get(address.toString()) ?? (await this.db.getContract(address));
     }
-    async getBytecode(address, selector) {
-        const contract = await __classPrivateFieldGet(this, _ContractsDataSourcePublicDB_instances, "m", _ContractsDataSourcePublicDB_getContract).call(this, address);
-        return contract?.getPublicFunction(selector)?.bytecode;
+    async getContractClass(contractClassId) {
+        return this.classCache.get(contractClassId.toString()) ?? (await this.db.getContractClass(contractClassId));
     }
-    async getIsInternal(address, selector) {
-        const contract = await __classPrivateFieldGet(this, _ContractsDataSourcePublicDB_instances, "m", _ContractsDataSourcePublicDB_getContract).call(this, address);
-        return contract?.getPublicFunction(selector)?.isInternal;
+    async getBytecode(address, selector) {
+        const instance = await this.getContractInstance(address);
+        if (!instance) {
+            throw new Error(`Contract ${address.toString()} not found`);
+        }
+        const contractClass = await this.getContractClass(instance.contractClassId);
+        if (!contractClass) {
+            throw new Error(`Contract class ${instance.contractClassId.toString()} for ${address.toString()} not found`);
+        }
+        return contractClass.publicFunctions.find(f => f.selector.equals(selector))?.bytecode;
     }
     async getPortalContractAddress(address) {
-        const contract = await __classPrivateFieldGet(this, _ContractsDataSourcePublicDB_instances, "m", _ContractsDataSourcePublicDB_getContract).call(this, address);
-        return contract?.contractData.portalContractAddress;
+        const contract = await this.getContractInstance(address);
+        return contract?.portalContractAddress;
     }
 }
-_ContractsDataSourcePublicDB_instances = new WeakSet(), _ContractsDataSourcePublicDB_getContract = async function _ContractsDataSourcePublicDB_getContract(address) {
-    return (this.cache.get(address.toString()) ??
-        (await __classPrivateFieldGet(this, _ContractsDataSourcePublicDB_instances, "m", _ContractsDataSourcePublicDB_makeExtendedContractDataFor).call(this, address)) ??
-        (await this.db.getExtendedContractData(address)));
-}, _ContractsDataSourcePublicDB_makeExtendedContractDataFor = async function _ContractsDataSourcePublicDB_makeExtendedContractDataFor(address) {
-    const instance = this.instanceCache.get(address.toString());
-    if (!instance) {
-        return undefined;
-    }
-    const contractClass = this.classCache.get(instance.contractClassId.toString()) ??
-        (await this.db.getContractClass(instance.contractClassId));
-    if (!contractClass) {
-        this.log.warn(`Contract class ${instance.contractClassId.toString()} for address ${address.toString()} not found`);
-        return undefined;
-    }
-    return ExtendedContractData.fromClassAndInstance(contractClass, instance);
-};
 /**
  * Implements the PublicStateDB using a world-state database.
  */
@@ -202,4 +186,4 @@ export class WorldStateDB {
         return await this.db.findLeafIndex(MerkleTreeId.NULLIFIER_TREE, nullifier.toBuffer());
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"public_executor.js","sourceRoot":"","sources":["../../src/simulator/public_executor.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"public_executor.js","sourceRoot":"","sources":["../../src/simulator/public_executor.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/sequencer-client",
-  "version": "0.28.1",
+  "version": "0.30.0",
   "type": "module",
   "exports": "./dest/index.js",
   "typedocOptions": {
@@ -21,18 +21,18 @@
     "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.28.1",
-    "@aztec/circuits.js": "0.28.1",
-    "@aztec/ethereum": "0.28.1",
-    "@aztec/foundation": "0.28.1",
-    "@aztec/l1-artifacts": "0.28.1",
-    "@aztec/merkle-tree": "0.28.1",
-    "@aztec/noir-protocol-circuits-types": "0.28.1",
-    "@aztec/p2p": "0.28.1",
-    "@aztec/protocol-contracts": "0.28.1",
-    "@aztec/simulator": "0.28.1",
-    "@aztec/types": "0.28.1",
-    "@aztec/world-state": "0.28.1",
+    "@aztec/circuit-types": "0.30.0",
+    "@aztec/circuits.js": "0.30.0",
+    "@aztec/ethereum": "0.30.0",
+    "@aztec/foundation": "0.30.0",
+    "@aztec/l1-artifacts": "0.30.0",
+    "@aztec/merkle-tree": "0.30.0",
+    "@aztec/noir-protocol-circuits-types": "0.30.0",
+    "@aztec/p2p": "0.30.0",
+    "@aztec/protocol-contracts": "0.30.0",
+    "@aztec/simulator": "0.30.0",
+    "@aztec/types": "0.30.0",
+    "@aztec/world-state": "0.30.0",
     "@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js",
     "@noir-lang/types": "portal:../../noir/packages/types",
     "lodash.chunk": "^4.2.0",

package/src/block_builder/index.ts

@@ -13,14 +13,8 @@ export interface BlockBuilder {
    * Note that the number of txs need to be a power of two.
    * @param globalVariables - Global variables to include in the block.
    * @param txs - Processed txs to include.
-   * @param newModelL1ToL2Messages - L1 to L2 messages emitted by the new inbox.
-   * @param newL1ToL2Messages - L1 to L2 messages to be part of the block.
+   * @param l1ToL2Messages - L1 to L2 messages to be part of the block.
    * @returns The new L2 block along with its proof from the root circuit.
    */
-  buildL2Block(
-    globalVariables: GlobalVariables,
-    txs: ProcessedTx[],
-    newModelL1ToL2Messages: Fr[], // TODO(#4492): Rename this when purging the old inbox
-    newL1ToL2Messages: Fr[], // TODO(#4492): Nuke this when purging the old inbox
-  ): Promise<[L2Block, Proof]>;
+  buildL2Block(globalVariables: GlobalVariables, txs: ProcessedTx[], l1ToL2Messages: Fr[]): Promise<[L2Block, Proof]>;
 }

package/src/block_builder/solo_block_builder.ts

@@ -89,32 +89,28 @@ export class SoloBlockBuilder implements BlockBuilder {
    * Builds an L2 block with the given number containing the given txs, updating state trees.
    * @param globalVariables - Global variables to be used in the block.
    * @param txs - Processed transactions to include in the block.
-   * @param newModelL1ToL2Messages - L1 to L2 messages emitted by the new inbox.
-   * @param newL1ToL2Messages - L1 to L2 messages to be part of the block.
+   * @param l1ToL2Messages - L1 to L2 messages to be part of the block.
    * @param timestamp - Timestamp of the block.
    * @returns The new L2 block and a correctness proof as returned by the root rollup circuit.
    */
   public async buildL2Block(
     globalVariables: GlobalVariables,
     txs: ProcessedTx[],
-    newModelL1ToL2Messages: Fr[], // TODO(#4492): Rename this when purging the old inbox
-    newL1ToL2Messages: Fr[],
+    l1ToL2Messages: Fr[],
   ): Promise<[L2Block, Proof]> {
     // Check txs are good for processing by checking if all the tree snapshots in header are non-empty
     this.validateTxs(txs);
 
+    // We pad the messages as the circuits expect that.
+    const l1ToL2MessagesPadded = padArrayEnd(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
+
     // We fill the tx batch with empty txs, we process only one tx at a time for now
-    const [circuitsOutput, proof] = await this.runCircuits(
-      globalVariables,
-      txs,
-      newModelL1ToL2Messages,
-      newL1ToL2Messages,
-    );
+    const [circuitsOutput, proof] = await this.runCircuits(globalVariables, txs, l1ToL2MessagesPadded);
 
     // Collect all new nullifiers, commitments, and contracts from all txs in this block
     const txEffects: TxEffect[] = txs.map(tx => toTxEffect(tx));
 
-    const blockBody = new Body(padArrayEnd(newL1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP), txEffects);
+    const blockBody = new Body(l1ToL2MessagesPadded, txEffects);
 
     const l2Block = L2Block.fromFields({
       archive: circuitsOutput.archive,
@@ -160,8 +156,7 @@ export class SoloBlockBuilder implements BlockBuilder {
   protected async runCircuits(
     globalVariables: GlobalVariables,
     txs: ProcessedTx[],
-    newModelL1ToL2Messages: Fr[], // TODO(#4492): Rename this when purging the old inbox
-    newL1ToL2Messages: Fr[], // TODO(#4492): Nuke this when purging the old inbox
+    l1ToL2Messages: Tuple<Fr, typeof NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP>,
   ): Promise<[RootRollupPublicInputs, Proof]> {
     // Check that the length of the array of txs is a power of two
     // See https://graphics.stanford.edu/~seander/bithacks.html#DetermineIfPowerOf2
@@ -170,16 +165,13 @@ export class SoloBlockBuilder implements BlockBuilder {
     }
 
     // BASE PARITY CIRCUIT (run in parallel)
+    // Note: In the future we will want to cache the results of empty base and root parity circuits so that we don't
+    // have to run them. (It will most likely be quite common that some base parity circuits will be "empty")
     let baseParityInputs: BaseParityInputs[] = [];
     let elapsedBaseParityOutputsPromise: Promise<[number, RootParityInput[]]>;
     {
-      const newModelL1ToL2MessagesTuple = padArrayEnd(
-        newModelL1ToL2Messages,
-        Fr.ZERO,
-        NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
-      );
       baseParityInputs = Array.from({ length: NUM_BASE_PARITY_PER_ROOT_PARITY }, (_, i) =>
-        BaseParityInputs.fromSlice(newModelL1ToL2MessagesTuple, i),
+        BaseParityInputs.fromSlice(l1ToL2Messages, i),
       );
 
       const baseParityOutputs: Promise<RootParityInput>[] = [];
@@ -189,9 +181,6 @@ export class SoloBlockBuilder implements BlockBuilder {
       elapsedBaseParityOutputsPromise = elapsed(() => Promise.all(baseParityOutputs));
     }
 
-    // padArrayEnd throws if the array is already full. Otherwise it pads till we reach the required size
-    const newL1ToL2MessagesTuple = padArrayEnd(newL1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
-
     // BASE ROLLUP CIRCUIT (run in parallel)
     let elapsedBaseRollupOutputsPromise: Promise<[number, [BaseOrMergeRollupPublicInputs, Proof][]]>;
     const baseRollupInputs: BaseRollupInputs[] = [];
@@ -302,7 +291,7 @@ export class SoloBlockBuilder implements BlockBuilder {
       outputSize: rootParityOutput.toBuffer().length,
     } satisfies CircuitSimulationStats);
 
-    return this.rootRollupCircuit(mergeOutputLeft, mergeOutputRight, rootParityOutput, newL1ToL2MessagesTuple);
+    return this.rootRollupCircuit(mergeOutputLeft, mergeOutputRight, rootParityOutput, l1ToL2Messages);
   }
 
   protected async baseParityCircuit(inputs: BaseParityInputs): Promise<RootParityInput> {
@@ -365,15 +354,15 @@ export class SoloBlockBuilder implements BlockBuilder {
     left: [BaseOrMergeRollupPublicInputs, Proof],
     right: [BaseOrMergeRollupPublicInputs, Proof],
     l1ToL2Roots: RootParityInput,
-    newL1ToL2Messages: Tuple<Fr, typeof NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP>,
+    l1ToL2Messages: Tuple<Fr, typeof NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP>,
   ): Promise<[RootRollupPublicInputs, Proof]> {
     this.debug(`Running root rollup circuit`);
-    const rootInput = await this.getRootRollupInput(...left, ...right, l1ToL2Roots, newL1ToL2Messages);
+    const rootInput = await this.getRootRollupInput(...left, ...right, l1ToL2Roots, l1ToL2Messages);
 
-    // Update the local trees to include the new l1 to l2 messages
+    // Update the local trees to include the l1 to l2 messages
     await this.db.appendLeaves(
       MerkleTreeId.L1_TO_L2_MESSAGE_TREE,
-      newL1ToL2Messages.map(m => m.toBuffer()),
+      l1ToL2Messages.map(m => m.toBuffer()),
     );
 
     // Simulate and get proof for the root circuit
@@ -690,8 +679,8 @@ export class SoloBlockBuilder implements BlockBuilder {
     const newPublicDataReadsPreimages: Tuple<PublicDataTreeLeafPreimage, typeof MAX_PUBLIC_DATA_READS_PER_TX> =
       makeTuple(MAX_PUBLIC_DATA_READS_PER_TX, () => PublicDataTreeLeafPreimage.empty());
 
-    for (const i in tx.data.combinedData.publicDataReads) {
-      const leafSlot = tx.data.combinedData.publicDataReads[i].leafSlot.value;
+    for (const i in tx.data.validationRequests.publicDataReads) {
+      const leafSlot = tx.data.validationRequests.publicDataReads[i].leafSlot.value;
       const lowLeafResult = await this.db.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot);
       if (!lowLeafResult) {
         throw new Error(`Public data tree should have one initial leaf`);

package/src/client/sequencer-client.ts

@@ -1,6 +1,7 @@
-import { ContractDataSource, L1ToL2MessageSource, L2BlockSource } from '@aztec/circuit-types';
+import { L1ToL2MessageSource, L2BlockSource } from '@aztec/circuit-types';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { P2P } from '@aztec/p2p';
+import { ContractDataSource } from '@aztec/types/contracts';
 import { WorldStateSynchronizer } from '@aztec/world-state';
 
 import * as fs from 'fs/promises';
@@ -94,6 +95,7 @@ export class SequencerClient {
       l1ToL2MessageSource,
       publicProcessorFactory,
       config,
+      config.l1Contracts.gasPortalAddress,
     );
 
     await sequencer.start();

package/src/config.ts

@@ -45,6 +45,8 @@ export function getConfigEnvVars(): SequencerClientConfig {
     REGISTRY_CONTRACT_ADDRESS,
     INBOX_CONTRACT_ADDRESS,
     OUTBOX_CONTRACT_ADDRESS,
+    GAS_TOKEN_CONTRACT_ADDRESS,
+    GAS_PORTAL_CONTRACT_ADDRESS,
     COINBASE,
     FEE_RECIPIENT,
     ACVM_WORKING_DIRECTORY,
@@ -63,6 +65,10 @@ export function getConfigEnvVars(): SequencerClientConfig {
     registryAddress: REGISTRY_CONTRACT_ADDRESS ? EthAddress.fromString(REGISTRY_CONTRACT_ADDRESS) : EthAddress.ZERO,
     inboxAddress: INBOX_CONTRACT_ADDRESS ? EthAddress.fromString(INBOX_CONTRACT_ADDRESS) : EthAddress.ZERO,
     outboxAddress: OUTBOX_CONTRACT_ADDRESS ? EthAddress.fromString(OUTBOX_CONTRACT_ADDRESS) : EthAddress.ZERO,
+    gasTokenAddress: GAS_TOKEN_CONTRACT_ADDRESS ? EthAddress.fromString(GAS_TOKEN_CONTRACT_ADDRESS) : EthAddress.ZERO,
+    gasPortalAddress: GAS_PORTAL_CONTRACT_ADDRESS
+      ? EthAddress.fromString(GAS_PORTAL_CONTRACT_ADDRESS)
+      : EthAddress.ZERO,
   };
 
   return {

package/src/sequencer/abstract_phase_manager.ts

@@ -11,14 +11,13 @@ import {
   MAX_NEW_L2_TO_L1_MSGS_PER_CALL,
   MAX_NEW_NOTE_HASHES_PER_CALL,
   MAX_NEW_NULLIFIERS_PER_CALL,
-  MAX_NON_REVERTIBLE_PUBLIC_DATA_READS_PER_TX,
   MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
   MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL,
   MAX_NULLIFIER_READ_REQUESTS_PER_CALL,
   MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL,
   MAX_PUBLIC_DATA_READS_PER_CALL,
+  MAX_PUBLIC_DATA_READS_PER_TX,
   MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL,
-  MAX_REVERTIBLE_PUBLIC_DATA_READS_PER_TX,
   MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
   MembershipWitness,
   PrivateKernelTailCircuitPublicInputs,
@@ -291,15 +290,14 @@ export abstract class AbstractPhaseManager {
     const previousKernel = this.getPreviousKernelData(previousOutput, previousProof);
 
     if (this.phase === PublicKernelPhase.TAIL) {
-      const { endNonRevertibleData, end } = previousOutput;
+      const { validationRequests, endNonRevertibleData, end } = previousOutput;
       const nullifierReadRequestHints = await this.hintsBuilder.getNullifierReadRequestHints(
-        endNonRevertibleData.nullifierReadRequests,
-        end.nullifierReadRequests,
+        validationRequests.nullifierReadRequests,
         endNonRevertibleData.newNullifiers,
         end.newNullifiers,
       );
       const nullifierNonExistentReadRequestHints = await this.hintsBuilder.getNullifierNonExistentReadRequestHints(
-        endNonRevertibleData.nullifierNonExistentReadRequests,
+        validationRequests.nullifierNonExistentReadRequests,
         endNonRevertibleData.newNullifiers,
         end.newNullifiers,
       );
@@ -479,9 +477,8 @@ function patchPublicStorageActionOrdering(
   execResult: PublicExecutionResult,
   phase: PublicKernelPhase,
 ) {
-  const { publicDataReads, publicDataUpdateRequests } = PhaseIsRevertible[phase]
-    ? publicInputs.end
-    : publicInputs.endNonRevertibleData;
+  const { publicDataUpdateRequests } = PhaseIsRevertible[phase] ? publicInputs.end : publicInputs.endNonRevertibleData;
+  const { publicDataReads } = publicInputs.validationRequests;
 
   // Convert ContractStorage* objects to PublicData* objects and sort them in execution order.
   // Note, this only pulls simulated reads/writes from the current phase,
@@ -518,14 +515,14 @@ function patchPublicStorageActionOrdering(
 
   const numReadsInKernel = arrayNonEmptyLength(publicDataReads, f => f.isEmpty());
   const numReadsBeforeThisEnqueuedCall = numReadsInKernel - simPublicDataReads.length;
-  publicInputs[effectSet].publicDataReads = padArrayEnd(
+  publicInputs.validationRequests.publicDataReads = padArrayEnd(
     [
       // do not mess with items from previous top/enqueued calls in kernel output
-      ...publicInputs[effectSet].publicDataReads.slice(0, numReadsBeforeThisEnqueuedCall),
+      ...publicInputs.validationRequests.publicDataReads.slice(0, numReadsBeforeThisEnqueuedCall),
       ...simPublicDataReads,
     ],
     PublicDataRead.empty(),
-    PhaseIsRevertible[phase] ? MAX_REVERTIBLE_PUBLIC_DATA_READS_PER_TX : MAX_NON_REVERTIBLE_PUBLIC_DATA_READS_PER_TX,
+    MAX_PUBLIC_DATA_READS_PER_TX,
   );
 
   const numUpdatesInKernel = arrayNonEmptyLength(publicDataUpdateRequests, f => f.isEmpty());

package/src/sequencer/hints_builder.ts

@@ -13,7 +13,6 @@ import {
   buildNullifierNonExistentReadRequestHints,
   buildNullifierReadRequestHints,
   concatAccumulatedData,
-  mergeAccumulatedData,
 } from '@aztec/circuits.js';
 import { Tuple } from '@aztec/foundation/serialize';
 import { MerkleTreeOperations } from '@aztec/world-state';
@@ -22,18 +21,13 @@ export class HintsBuilder {
   constructor(private db: MerkleTreeOperations) {}
 
   getNullifierReadRequestHints(
-    nullifierReadRequestsNonRevertible: Tuple<ReadRequestContext, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>,
-    nullifierReadRequestsRevertible: Tuple<ReadRequestContext, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>,
+    nullifierReadRequests: Tuple<ReadRequestContext, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>,
     nullifiersNonRevertible: Tuple<SideEffectLinkedToNoteHash, typeof MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX>,
     nullifiersRevertible: Tuple<SideEffectLinkedToNoteHash, typeof MAX_REVERTIBLE_NULLIFIERS_PER_TX>,
   ) {
     return buildNullifierReadRequestHints(
       this,
-      mergeAccumulatedData(
-        MAX_NULLIFIER_READ_REQUESTS_PER_TX,
-        nullifierReadRequestsNonRevertible,
-        nullifierReadRequestsRevertible,
-      ),
+      nullifierReadRequests,
       concatAccumulatedData(MAX_NEW_NULLIFIERS_PER_TX, nullifiersNonRevertible, nullifiersRevertible),
     );
   }