@aztec/stdlib 0.0.1-commit.03f7ef2 → 0.0.1-commit.1142ef1

package/dest/tx/tx.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tx.d.ts","sourceRoot":"","sources":["../../src/tx/tx.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tx.d.ts","sourceRoot":"","sources":["../../src/tx/tx.ts"],"names":[],"mappings":"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"}

package/dest/tx/tx.js

@@ -13,7 +13,8 @@ import { PublicCallRequestWithCalldata } from './public_call_request_with_callda
 import { TxHash } from './tx_hash.js';
 /**
  * The interface of an L2 transaction.
- */ export class Tx extends Gossipable {
+ */ // docs:start:tx_class
+export class Tx extends Gossipable {
     txHash;
     data;
     chonkProof;
@@ -21,19 +22,27 @@ import { TxHash } from './tx_hash.js';
     publicFunctionCalldata;
     static p2pTopic = TopicType.tx;
     calldataMap;
-    constructor(/** Identifier of the tx */ txHash, /**
+    constructor(/**
+     * Identifier of the tx.
+     * It's a hash of the public inputs of the tx's proof.
+     * This claimed hash is reconciled against the tx's public inputs (`this.data`) in data_validator.ts.
+     */ txHash, /**
      * Output of the private kernel circuit for this tx.
      */ data, /**
      * Proof from the private kernel circuit.
      */ chonkProof, /**
      * Contract class log fields emitted from the tx.
      * Their order should match the order of the log hashes returned from `this.data.getNonEmptyContractClassLogsHashes`.
-     * It's checked in data_validator.ts
+     * This claimed data is reconciled against a hash of this data (that is contained within
+     * the tx's public inputs (`this.data`)), in data_validator.ts.
      */ contractClassLogFields, /**
      * An array of calldata for the enqueued public function calls and the teardown function call.
+     * This claimed data is reconciled against hashes of this data (that are contained within
+     * the tx's public inputs (`this.data`)), in data_validator.ts.
      */ publicFunctionCalldata){
         super(), this.txHash = txHash, this.data = data, this.chonkProof = chonkProof, this.contractClassLogFields = contractClassLogFields, this.publicFunctionCalldata = publicFunctionCalldata;
     }
+    // docs:end:tx_class
     // Gossipable method
     generateP2PMessageIdentifier() {
         return Promise.resolve(new Buffer32(this.getTxHash().toBuffer()));

package/dest/tx/tx_effect.d.ts

@@ -109,4 +109,4 @@ export declare class TxEffect {
      */
     static fromString(str: string): TxEffect;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfZWZmZWN0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdHgvdHhfZWZmZWN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxLQUFLLFVBQVUsRUFDZixLQUFLLGFBQWEsRUFJbkIsTUFBTSwwQkFBMEIsQ0FBQztBQVNsQyxPQUFPLEVBQUUsS0FBSyxRQUFRLEVBQTZCLE1BQU0seUJBQXlCLENBQUM7QUFFbkYsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBVyxNQUFNLDJCQUEyQixDQUFDO0FBQ2pFLE9BQU8sRUFBRSxZQUFZLEVBQXlELE1BQU0sNkJBQTZCLENBQUM7QUFHbEgsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUcvQixPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDOUQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ25ELE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ2pFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUNwRCxPQUFPLEVBQWtCLFNBQVMsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRWxFLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFdEMscUJBQWEsUUFBUTtJQUtWLFVBQVUsRUFBRSxVQUFVO0lBSXRCLE1BQU0sRUFBRSxNQUFNO0lBSWQsY0FBYyxFQUFFLEVBQUU7SUFJbEIsVUFBVSxFQUFFLEVBQUUsRUFBRTtJQUloQixVQUFVLEVBQUUsRUFBRSxFQUFFO0lBS2hCLFVBQVUsRUFBRSxFQUFFLEVBQUU7SUFJaEIsZ0JBQWdCLEVBQUUsZUFBZSxFQUFFO0lBSW5DLFdBQVcsRUFBRSxVQUFVLEVBQUU7SUFJekIsVUFBVSxFQUFFLFNBQVMsRUFBRTtJ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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfZWZmZWN0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdHgvdHhfZWZmZWN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxLQUFLLFVBQVUsRUFDZixLQUFLLGFBQWEsRUFJbkIsTUFBTSwwQkFBMEIsQ0FBQztBQVNsQyxPQUFPLEVBQUUsS0FBSyxRQUFRLEVBQTZCLE1BQU0seUJBQXlCLENBQUM7QUFFbkYsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBVyxNQUFNLDJCQUEyQixDQUFDO0FBQ2pFLE9BQU8sRUFBRSxZQUFZLEVBQXlELE1BQU0sNkJBQTZCLENBQUM7QUFHbEgsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUcvQixPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDOUQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ25ELE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ2pFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUNwRCxPQUFPLEVBQWtCLFNBQVMsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRWxFLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFdEMscUJBQWEsUUFBUTtJQUtWLFVBQVUsRUFBRSxVQUFVO0lBSXRCLE1BQU0sRUFBRSxNQUFNO0lBSWQsY0FBYyxFQUFFLEVBQUU7SUFJbEIsVUFBVSxFQUFFLEVBQUUsRUFBRTtJQUloQixVQUFVLEVBQUUsRUFBRSxFQUFFO0lBS2hCLFVBQVUsRUFBRSxFQUFFLEVBQUU7SUFJaEIsZ0JBQWdCLEVBQUUsZUFBZSxFQUFFO0lBSW5DLFdBQVcsRUFBRSxVQUFVLEVBQUU7SUFJekIsVUFBVSxFQUFFLFNBQVMsRUFBRTtJ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

package/dest/tx/tx_effect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tx_effect.d.ts","sourceRoot":"","sources":["../../src/tx/tx_effect.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tx_effect.d.ts","sourceRoot":"","sources":["../../src/tx/tx_effect.ts"],"names":[],"mappings":"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"}

package/dest/tx/tx_effect.js

@@ -1,3 +1,4 @@
+var _computedKey;
 import { decodeTxBlobData, encodeTxBlobData, getNumTxBlobFields } from '@aztec/blob-lib/encoding';
 import { MAX_CONTRACT_CLASS_LOGS_PER_TX, MAX_L2_TO_L1_MSGS_PER_TX, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_PRIVATE_LOGS_PER_TX, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX } from '@aztec/constants';
 import { makeTuple, makeTupleAsync } from '@aztec/foundation/array';
@@ -15,6 +16,7 @@ import { PrivateLog } from '../logs/private_log.js';
 import { FlatPublicLogs, PublicLog } from '../logs/public_log.js';
 import { computeTxOutHash } from '../messaging/out_hash.js';
 import { TxHash } from './tx_hash.js';
+_computedKey = inspect.custom;
 export class TxEffect {
     revertCode;
     txHash;
@@ -134,7 +136,9 @@ export class TxEffect {
     }
     static async random({ numNoteHashes, numNullifiers, numL2ToL1Msgs, numPublicDataWrites, numPrivateLogs, numPublicCallsPerTx = 3, numPublicLogsPerCall = 1, numContractClassLogs, maxEffects } = {}) {
         const count = (max, num)=>num ?? Math.min(maxEffects ?? randomInt(max), max);
-        return new TxEffect(RevertCode.random(), TxHash.random(), new Fr(Math.floor(Math.random() * 100_000)), makeTuple(count(MAX_NOTE_HASHES_PER_TX, numNoteHashes), Fr.random), makeTuple(count(MAX_NULLIFIERS_PER_TX, numNullifiers), Fr.random), makeTuple(count(MAX_L2_TO_L1_MSGS_PER_TX, numL2ToL1Msgs), Fr.random), makeTuple(count(MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, numPublicDataWrites), PublicDataWrite.random), makeTuple(count(MAX_PRIVATE_LOGS_PER_TX, numPrivateLogs), ()=>PrivateLog.random()), await Promise.all(new Array(numPublicCallsPerTx * numPublicLogsPerCall).fill(null).map(()=>PublicLog.random())), await makeTupleAsync(count(MAX_CONTRACT_CLASS_LOGS_PER_TX, numContractClassLogs), ContractClassLog.random));
+        // Every tx effect must have at least 1 nullifier (the first nullifier is used for log indexing)
+        const countNullifiers = (max, num)=>Math.max(1, count(max, num));
+        return new TxEffect(RevertCode.random(), TxHash.random(), new Fr(Math.floor(Math.random() * 100_000)), makeTuple(count(MAX_NOTE_HASHES_PER_TX, numNoteHashes), Fr.random), makeTuple(countNullifiers(MAX_NULLIFIERS_PER_TX, numNullifiers), Fr.random), makeTuple(count(MAX_L2_TO_L1_MSGS_PER_TX, numL2ToL1Msgs), Fr.random), makeTuple(count(MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, numPublicDataWrites), PublicDataWrite.random), makeTuple(count(MAX_PRIVATE_LOGS_PER_TX, numPrivateLogs), ()=>PrivateLog.random()), await Promise.all(new Array(numPublicCallsPerTx * numPublicLogsPerCall).fill(null).map(()=>PublicLog.random())), await makeTupleAsync(count(MAX_CONTRACT_CLASS_LOGS_PER_TX, numContractClassLogs), ContractClassLog.random));
     }
     static empty() {
         return new TxEffect(RevertCode.OK, TxHash.zero(), Fr.ZERO, [], [], [], [], [], [], []);
@@ -230,7 +234,7 @@ export class TxEffect {
             contractClassLogs: z.array(ContractClassLog.schema)
         }).transform(TxEffect.from);
     }
-    [inspect.custom]() {
+    [_computedKey]() {
         return `TxEffect {
       revertCode: ${this.revertCode.getCode()},
       txHash: ${this.txHash},

package/dest/tx/tx_execution_request.d.ts

@@ -89,4 +89,4 @@ export declare class TxExecutionRequest {
     static random(): Promise<TxExecutionRequest>;
     [inspect.custom](): string;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfZXhlY3V0aW9uX3JlcXVlc3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90eC90eF9leGVjdXRpb25fcmVxdWVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLFlBQVksRUFBcUIsTUFBTSw2QkFBNkIsQ0FBQztBQUU5RSxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV4RCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBRy9CLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQy9ELE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUM5RCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDekQsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFXLE1BQU0scUJBQXFCLENBQUM7QUFFM0QsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUV2QyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDbEQsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQzVDLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUU1Qzs7R0FFRztBQUNILHFCQUFhLGtCQUFrQjtJQUtwQixNQUFNLEVBQUUsWUFBWTtJQUlwQixnQkFBZ0IsRUFBRSxnQkFBZ0I7SUFLbEMsaUJBQWlCLEVBQUUsRUFBRTtJQUlyQixTQUFTLEVBQUUsU0FBUztJQU1wQixXQUFXLEVBQUUsWUFBWSxFQUFFO0lBSzNCLGFBQWEsRUFBRSxXQUFXLEVBQUU7SUFJNUIsUUFBUSxFQUFFLE9BQU8sRUFBRTtJQUtuQixJQUFJO0lBckNiO0lBQ0U7O09BRUc7SUFDSSxNQUFNLEVBQUUsWUFBWTtJQUMzQjs7T0FFRztJQUNJLGdCQUFnQixFQUFFLGdCQUFnQjtJQUN6Qzs7O09BR0c7SUFDSSxpQkFBaUIsRUFBRSxFQUFFO0lBQzVCOztPQUVHO0lBQ0ksU0FBUyxFQUFFLFNBQVM7SUFDM0I7Ozs7T0FJRztJQUNJLFdBQVcsRUFBRSxZQUFZLEVBQUU7SUFDbEM7OztPQUdHO0lBQ0ksYUFBYSxFQUFFLFdBQVcsRUFBRTtJQUNuQzs7T0FFRztJQUNJLFFBQVEsRUFBRSxPQUFPLEVBQUU7SUFDMUI7OztPQUdHO0lBQ0ksSUFBSSxLQUFjLEVBQ3ZCO0lBRUosTUFBTSxLQUFLLE1BQU0sSUFBSSxNQUFNLENBQUMsa0JBQWtCLENBQUMsQ0FhOUM7SUFFRCxXQUFXLElBQUksU0FBUyxDQVN2QjtJQUVELE1BQU0sQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxrQkFBa0IsQ0FBQywwR0FXcEQ7SUFFRCxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsa0JBQWtCLENBQUMsR0FBRyxrQkFBa0IsQ0FFcEU7SUFFRDs7O09BR0c7SUFDSCxRQUFRLDRCQVdQO0lBRUQ7OztPQUdHO0lBQ0gsUUFBUSxrQkFFUDtJQUVEOzs7O09BSUc7SUFDSCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxHQUFHLGtCQUFrQixDQVluRTtJQUVEOzs7O09BSUc7SUFDSCxNQUFNLENBQUMsVUFBVSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsa0JBQWtCLENBRWpEO0lBRUQsT0FBYSxNQUFNLGdDQWNsQjtJQUVELENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxXQUVmO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfZXhlY3V0aW9uX3JlcXVlc3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90eC90eF9leGVjdXRpb25fcmVxdWVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLFlBQVksRUFBcUIsTUFBTSw2QkFBNkIsQ0FBQztBQUU5RSxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV4RCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBRy9CLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQy9ELE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUM5RCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDekQsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFXLE1BQU0scUJBQXFCLENBQUM7QUFFM0QsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUV2QyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDbEQsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQzVDLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUU1Qzs7R0FFRztBQUVILHFCQUFhLGtCQUFrQjtJQUtwQixNQUFNLEVBQUUsWUFBWTtJQUlwQixnQkFBZ0IsRUFBRSxnQkFBZ0I7SUFLbEMsaUJBQWlCLEVBQUUsRUFBRTtJQUlyQixTQUFTLEVBQUUsU0FBUztJQU1wQixXQUFXLEVBQUUsWUFBWSxFQUFFO0lBSzNCLGFBQWEsRUFBRSxXQUFXLEVBQUU7SUFJNUIsUUFBUSxFQUFFLE9BQU8sRUFBRTtJQUtuQixJQUFJO0lBckNiO0lBQ0U7O09BRUc7SUFDSSxNQUFNLEVBQUUsWUFBWTtJQUMzQjs7T0FFRztJQUNJLGdCQUFnQixFQUFFLGdCQUFnQjtJQUN6Qzs7O09BR0c7SUFDSSxpQkFBaUIsRUFBRSxFQUFFO0lBQzVCOztPQUVHO0lBQ0ksU0FBUyxFQUFFLFNBQVM7SUFDM0I7Ozs7T0FJRztJQUNJLFdBQVcsRUFBRSxZQUFZLEVBQUU7SUFDbEM7OztPQUdHO0lBQ0ksYUFBYSxFQUFFLFdBQVcsRUFBRTtJQUNuQzs7T0FFRztJQUNJLFFBQVEsRUFBRSxPQUFPLEVBQUU7SUFDMUI7OztPQUdHO0lBQ0ksSUFBSSxLQUFjLEVBQ3ZCO0lBR0osTUFBTSxLQUFLLE1BQU0sSUFBSSxNQUFNLENBQUMsa0JBQWtCLENBQUMsQ0FhOUM7SUFFRCxXQUFXLElBQUksU0FBUyxDQVN2QjtJQUVELE1BQU0sQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxrQkFBa0IsQ0FBQywwR0FXcEQ7SUFFRCxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsa0JBQWtCLENBQUMsR0FBRyxrQkFBa0IsQ0FFcEU7SUFFRDs7O09BR0c7SUFDSCxRQUFRLDRCQVdQO0lBRUQ7OztPQUdHO0lBQ0gsUUFBUSxrQkFFUDtJQUVEOzs7O09BSUc7SUFDSCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxHQUFHLGtCQUFrQixDQVluRTtJQUVEOzs7O09BSUc7SUFDSCxNQUFNLENBQUMsVUFBVSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsa0JBQWtCLENBRWpEO0lBRUQsT0FBYSxNQUFNLGdDQWNsQjtJQUVELENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxXQUVmO0NBQ0YifQ==

package/dest/tx/tx_execution_request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tx_execution_request.d.ts","sourceRoot":"","sources":["../../src/tx/tx_execution_request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAG/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,qBAAqB,CAAC;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C;;GAEG;AACH,qBAAa,kBAAkB;IAKpB,MAAM,EAAE,YAAY;IAIpB,gBAAgB,EAAE,gBAAgB;IAKlC,iBAAiB,EAAE,EAAE;IAIrB,SAAS,EAAE,SAAS;IAMpB,WAAW,EAAE,YAAY,EAAE;IAK3B,aAAa,EAAE,WAAW,EAAE;IAI5B,QAAQ,EAAE,OAAO,EAAE;IAKnB,IAAI;IArCb;IACE;;OAEG;IACI,MAAM,EAAE,YAAY;IAC3B;;OAEG;IACI,gBAAgB,EAAE,gBAAgB;IACzC;;;OAGG;IACI,iBAAiB,EAAE,EAAE;IAC5B;;OAEG;IACI,SAAS,EAAE,SAAS;IAC3B;;;;OAIG;IACI,WAAW,EAAE,YAAY,EAAE;IAClC;;;OAGG;IACI,aAAa,EAAE,WAAW,EAAE;IACnC;;OAEG;IACI,QAAQ,EAAE,OAAO,EAAE;IAC1B;;;OAGG;IACI,IAAI,KAAc,EACvB;IAEJ,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,kBAAkB,CAAC,CAa9C;IAED,WAAW,IAAI,SAAS,CASvB;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,kBAAkB,CAAC,0GAWpD;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,kBAAkB,CAAC,GAAG,kBAAkB,CAEpE;IAED;;;OAGG;IACH,QAAQ,4BAWP;IAED;;;OAGG;IACH,QAAQ,kBAEP;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,kBAAkB,CAYnE;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,CAEjD;IAED,OAAa,MAAM,gCAclB;IAED,CAAC,OAAO,CAAC,MAAM,CAAC,WAEf;CACF"}
+{"version":3,"file":"tx_execution_request.d.ts","sourceRoot":"","sources":["../../src/tx/tx_execution_request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAG/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,qBAAqB,CAAC;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C;;GAEG;AAEH,qBAAa,kBAAkB;IAKpB,MAAM,EAAE,YAAY;IAIpB,gBAAgB,EAAE,gBAAgB;IAKlC,iBAAiB,EAAE,EAAE;IAIrB,SAAS,EAAE,SAAS;IAMpB,WAAW,EAAE,YAAY,EAAE;IAK3B,aAAa,EAAE,WAAW,EAAE;IAI5B,QAAQ,EAAE,OAAO,EAAE;IAKnB,IAAI;IArCb;IACE;;OAEG;IACI,MAAM,EAAE,YAAY;IAC3B;;OAEG;IACI,gBAAgB,EAAE,gBAAgB;IACzC;;;OAGG;IACI,iBAAiB,EAAE,EAAE;IAC5B;;OAEG;IACI,SAAS,EAAE,SAAS;IAC3B;;;;OAIG;IACI,WAAW,EAAE,YAAY,EAAE;IAClC;;;OAGG;IACI,aAAa,EAAE,WAAW,EAAE;IACnC;;OAEG;IACI,QAAQ,EAAE,OAAO,EAAE;IAC1B;;;OAGG;IACI,IAAI,KAAc,EACvB;IAGJ,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,kBAAkB,CAAC,CAa9C;IAED,WAAW,IAAI,SAAS,CASvB;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,kBAAkB,CAAC,0GAWpD;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,kBAAkB,CAAC,GAAG,kBAAkB,CAEpE;IAED;;;OAGG;IACH,QAAQ,4BAWP;IAED;;;OAGG;IACH,QAAQ,kBAEP;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,kBAAkB,CAYnE;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,CAEjD;IAED,OAAa,MAAM,gCAclB;IAED,CAAC,OAAO,CAAC,MAAM,CAAC,WAEf;CACF"}

package/dest/tx/tx_execution_request.js

@@ -1,3 +1,4 @@
+var _computedKey;
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
@@ -13,9 +14,11 @@ import { FunctionData } from './function_data.js';
 import { HashedValues } from './hashed_values.js';
 import { TxContext } from './tx_context.js';
 import { TxRequest } from './tx_request.js';
+_computedKey = inspect.custom;
 /**
  * Request to execute a transaction. Similar to TxRequest, but has the full args.
- */ export class TxExecutionRequest {
+ */ // docs:start:tx_execution_request_class
+export class TxExecutionRequest {
     origin;
     functionSelector;
     firstCallArgsHash;
@@ -55,6 +58,7 @@ import { TxRequest } from './tx_request.js';
         this.capsules = capsules;
         this.salt = salt;
     }
+    // docs:end:tx_execution_request_class
     static get schema() {
         return z.object({
             origin: schemas.AztecAddress,
@@ -128,7 +132,7 @@ import { TxRequest } from './tx_request.js';
             ])
         ], Fr.random());
     }
-    [inspect.custom]() {
+    [_computedKey]() {
         return `TxExecutionRequest(${this.origin} called ${this.functionSelector})`;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/stdlib",
-  "version": "0.0.1-commit.03f7ef2",
+  "version": "0.0.1-commit.1142ef1",
   "type": "module",
   "inherits": [
     "../package.common.json",
@@ -77,13 +77,13 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.892.0",
-    "@aztec/bb.js": "0.0.1-commit.03f7ef2",
-    "@aztec/blob-lib": "0.0.1-commit.03f7ef2",
-    "@aztec/constants": "0.0.1-commit.03f7ef2",
-    "@aztec/ethereum": "0.0.1-commit.03f7ef2",
-    "@aztec/foundation": "0.0.1-commit.03f7ef2",
-    "@aztec/l1-artifacts": "0.0.1-commit.03f7ef2",
-    "@aztec/noir-noirc_abi": "0.0.1-commit.03f7ef2",
+    "@aztec/bb.js": "0.0.1-commit.1142ef1",
+    "@aztec/blob-lib": "0.0.1-commit.1142ef1",
+    "@aztec/constants": "0.0.1-commit.1142ef1",
+    "@aztec/ethereum": "0.0.1-commit.1142ef1",
+    "@aztec/foundation": "0.0.1-commit.1142ef1",
+    "@aztec/l1-artifacts": "0.0.1-commit.1142ef1",
+    "@aztec/noir-noirc_abi": "0.0.1-commit.1142ef1",
     "@google-cloud/storage": "^7.15.0",
     "axios": "^1.12.0",
     "json-stringify-deterministic": "1.0.12",

package/src/abi/contract_artifact.ts

@@ -1,5 +1,14 @@
 import { jsonParseWithSchema, jsonStringify } from '@aztec/foundation/json-rpc';
 
+import {
+  AZTEC_INITIALIZER_ATTRIBUTE,
+  AZTEC_ONLY_SELF_ATTRIBUTE,
+  AZTEC_PRIVATE_ATTRIBUTE,
+  AZTEC_PUBLIC_ATTRIBUTE,
+  AZTEC_UTILITY_ATTRIBUTE,
+  AZTEC_VIEW_ATTRIBUTE,
+  type NoirCompiledContract,
+} from '../noir/index.js';
 import {
   type ABIParameter,
   type ABIParameterVisibility,
@@ -14,16 +23,7 @@ import {
   type IntegerValue,
   type StructValue,
   type TypedStructFieldValue,
-} from '../abi/index.js';
-import {
-  AZTEC_INITIALIZER_ATTRIBUTE,
-  AZTEC_ONLY_SELF_ATTRIBUTE,
-  AZTEC_PRIVATE_ATTRIBUTE,
-  AZTEC_PUBLIC_ATTRIBUTE,
-  AZTEC_UTILITY_ATTRIBUTE,
-  AZTEC_VIEW_ATTRIBUTE,
-  type NoirCompiledContract,
-} from '../noir/index.js';
+} from './abi.js';
 
 /**
  * Serializes a contract artifact to a buffer for storage.

package/src/block/attestation_info.ts

@@ -1,9 +1,9 @@
 import { recoverAddress } from '@aztec/foundation/crypto/secp256k1-signer';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 
+import { Checkpoint } from '../checkpoint/checkpoint.js';
 import { ConsensusPayload } from '../p2p/consensus_payload.js';
 import { SignatureDomainSeparator, getHashedSignaturePayloadEthSignedMessage } from '../p2p/signature_utils.js';
-import type { L2Block } from './l2_block.js';
 import type { CommitteeAttestation } from './proposal/committee_attestation.js';
 
 /**
@@ -29,14 +29,14 @@ export type AttestationInfo =
     };
 
 /**
- * Extracts attestation information from a published L2 block.
+ * Extracts attestation information from a published checkpoint.
  * Returns info for each attestation, preserving array indices.
  */
-export function getAttestationInfoFromPublishedL2Block(block: {
+export function getAttestationInfoFromPublishedCheckpoint(block: {
   attestations: CommitteeAttestation[];
-  block: L2Block;
+  checkpoint: Checkpoint;
 }): AttestationInfo[] {
-  const payload = ConsensusPayload.fromBlock(block.block);
+  const payload = ConsensusPayload.fromCheckpoint(block.checkpoint);
   return getAttestationInfoFromPayload(payload, block.attestations);
 }
 
@@ -44,7 +44,10 @@ export function getAttestationInfoFromPayload(
   payload: ConsensusPayload,
   attestations: CommitteeAttestation[],
 ): AttestationInfo[] {
-  const hashedPayload = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.blockAttestation);
+  const hashedPayload = getHashedSignaturePayloadEthSignedMessage(
+    payload,
+    SignatureDomainSeparator.checkpointAttestation,
+  );
 
   return attestations.map(attestation => {
     // If signature is empty, check if we have an address directly

package/src/block/l2_block.ts

@@ -101,7 +101,7 @@ export class L2Block {
 
     return new L2Block(
       makeAppendOnlyTreeSnapshot(l2BlockNum + 1),
-      makeL2BlockHeader(0, l2BlockNum, slotNumber ?? l2BlockNum, {}, inHash),
+      makeL2BlockHeader(0, l2BlockNum, slotNumber ?? l2BlockNum, { inHash }),
       body,
     );
   }
@@ -151,13 +151,13 @@ export class L2Block {
     return this.header.toBlockHeader();
   }
 
-  public toL2Block() {
+  public toL2Block(args: { checkpointNumber?: CheckpointNumber; indexWithinCheckpoint?: number } = {}): L2BlockNew {
     return new L2BlockNew(
       this.archive,
       this.getBlockHeader(),
       this.body,
-      CheckpointNumber.fromBlockNumber(this.number),
-      0, // indexWithinCheckpoint
+      args?.checkpointNumber ?? CheckpointNumber.fromBlockNumber(this.number),
+      args?.indexWithinCheckpoint ?? 0,
     );
   }
 
@@ -175,7 +175,8 @@ export class L2Block {
     const block = checkpoint.blocks.at(-1)!;
     const header = new L2BlockHeader(
       new AppendOnlyTreeSnapshot(checkpointHeader.lastArchiveRoot, block.number),
-      checkpointHeader.contentCommitment,
+      checkpointHeader.blobsHash,
+      checkpointHeader.inHash,
       block.header.state,
       block.header.globalVariables,
       block.header.totalFees,

package/src/block/l2_block_code_to_purge.ts

@@ -7,7 +7,6 @@ import type { FieldsOf } from '@aztec/foundation/types';
 import { AztecAddress } from '../aztec-address/index.js';
 import { GasFees } from '../gas/gas_fees.js';
 import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
-import { ContentCommitment } from '../tx/content_commitment.js';
 import { GlobalVariables } from '../tx/global_variables.js';
 import { PartialStateReference } from '../tx/partial_state_reference.js';
 import { StateReference } from '../tx/state_reference.js';
@@ -18,12 +17,12 @@ export function makeL2BlockHeader(
   blockNumber?: number,
   slotNumber?: number,
   overrides: Partial<FieldsOf<L2BlockHeader>> = {},
-  inHash?: Fr,
 ) {
   return new L2BlockHeader(
     makeAppendOnlyTreeSnapshot(seed + 0x100),
-    overrides?.contentCommitment ?? makeContentCommitment(seed + 0x200, inHash),
-    overrides?.state ?? makeStateReference(seed + 0x600),
+    overrides.blobsHash ?? new Fr(seed + 0x200),
+    overrides.inHash ?? new Fr(seed + 0x300),
+    overrides.state ?? makeStateReference(seed + 0x600),
     makeGlobalVariables((seed += 0x700), {
       ...(blockNumber ? { blockNumber: BlockNumber(blockNumber) } : {}),
       ...(slotNumber ? { slotNumber: SlotNumber(slotNumber) } : {}),
@@ -44,13 +43,6 @@ export function makeAppendOnlyTreeSnapshot(seed = 1): AppendOnlyTreeSnapshot {
   return new AppendOnlyTreeSnapshot(new Fr(seed), seed);
 }
 
-/**
- * Makes content commitment
- */
-function makeContentCommitment(seed = 0, inHash?: Fr): ContentCommitment {
-  return new ContentCommitment(new Fr(seed + 0x100), inHash ?? new Fr(seed + 0x200), new Fr(seed + 0x300));
-}
-
 /**
  * Makes arbitrary state reference.
  * @param seed - The seed to use for generating the state reference.

package/src/block/l2_block_header.ts

@@ -10,7 +10,7 @@ import { z } from 'zod';
 
 import { CheckpointHeader } from '../rollup/checkpoint_header.js';
 import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
-import { BlockHeader, ContentCommitment, GlobalVariables, StateReference } from '../tx/index.js';
+import { BlockHeader, GlobalVariables, StateReference } from '../tx/index.js';
 
 /**
  * TO BE DELETED
@@ -25,8 +25,8 @@ export class L2BlockHeader {
   constructor(
     /** Snapshot of archive before the block is applied. */
     public lastArchive: AppendOnlyTreeSnapshot,
-    /** Hash of the body of an L2 block. */
-    public contentCommitment: ContentCommitment,
+    public blobsHash: Fr,
+    public inHash: Fr,
     /** State reference. */
     public state: StateReference,
     /** Global variables of an L2 block. */
@@ -45,7 +45,8 @@ export class L2BlockHeader {
     return z
       .object({
         lastArchive: AppendOnlyTreeSnapshot.schema,
-        contentCommitment: ContentCommitment.schema,
+        blobsHash: schemas.Fr,
+        inHash: schemas.Fr,
         state: StateReference.schema,
         globalVariables: GlobalVariables.schema,
         totalFees: schemas.Fr,
@@ -59,7 +60,8 @@ export class L2BlockHeader {
   static getFields(fields: FieldsOf<L2BlockHeader>) {
     return [
       fields.lastArchive,
-      fields.contentCommitment,
+      fields.blobsHash,
+      fields.inHash,
       fields.state,
       fields.globalVariables,
       fields.totalFees,
@@ -84,7 +86,8 @@ export class L2BlockHeader {
   getSize() {
     return (
       this.lastArchive.getSize() +
-      this.contentCommitment.getSize() +
+      this.blobsHash.size +
+      this.inHash.size +
       this.state.getSize() +
       this.globalVariables.getSize() +
       this.totalFees.size +
@@ -111,7 +114,8 @@ export class L2BlockHeader {
 
     return new L2BlockHeader(
       reader.readObject(AppendOnlyTreeSnapshot),
-      reader.readObject(ContentCommitment),
+      reader.readObject(Fr),
+      reader.readObject(Fr),
       reader.readObject(StateReference),
       reader.readObject(GlobalVariables),
       reader.readObject(Fr),
@@ -126,7 +130,8 @@ export class L2BlockHeader {
 
     return new L2BlockHeader(
       AppendOnlyTreeSnapshot.fromFields(reader),
-      ContentCommitment.fromFields(reader),
+      reader.readField(),
+      reader.readField(),
       StateReference.fromFields(reader),
       GlobalVariables.fromFields(reader),
       reader.readField(),
@@ -139,7 +144,8 @@ export class L2BlockHeader {
   static empty(fields: Partial<FieldsOf<L2BlockHeader>> = {}) {
     return L2BlockHeader.from({
       lastArchive: AppendOnlyTreeSnapshot.empty(),
-      contentCommitment: ContentCommitment.empty(),
+      blobsHash: Fr.ZERO,
+      inHash: Fr.ZERO,
       state: StateReference.empty(),
       globalVariables: GlobalVariables.empty(),
       totalFees: Fr.ZERO,
@@ -153,7 +159,8 @@ export class L2BlockHeader {
   isEmpty(): boolean {
     return (
       this.lastArchive.isEmpty() &&
-      this.contentCommitment.isEmpty() &&
+      this.blobsHash.isZero() &&
+      this.inHash.isZero() &&
       this.state.isEmpty() &&
       this.globalVariables.isEmpty() &&
       this.totalFees.isZero() &&
@@ -179,7 +186,8 @@ export class L2BlockHeader {
     return new CheckpointHeader(
       this.lastArchive.root,
       this.blockHeadersHash,
-      this.contentCommitment,
+      this.blobsHash,
+      this.inHash,
       this.globalVariables.slotNumber,
       this.globalVariables.timestamp,
       this.globalVariables.coinbase,
@@ -203,7 +211,8 @@ export class L2BlockHeader {
   toInspect() {
     return {
       lastArchive: this.lastArchive.root.toString(),
-      contentCommitment: this.contentCommitment.toInspect(),
+      blobsHash: this.blobsHash.toString(),
+      inHash: this.inHash.toString(),
       state: this.state.toInspect(),
       globalVariables: this.globalVariables.toInspect(),
       totalFees: this.totalFees.toBigInt(),
@@ -216,9 +225,8 @@ export class L2BlockHeader {
   [inspect.custom]() {
     return `L2BlockHeader {
   lastArchive: ${inspect(this.lastArchive)},
-  contentCommitment.blobsHash: ${inspect(this.contentCommitment.blobsHash)},
-  contentCommitment.inHash: ${inspect(this.contentCommitment.inHash)},
-  contentCommitment.outHash: ${inspect(this.contentCommitment.outHash)},
+  blobsHash: ${inspect(this.blobsHash)},
+  inHash: ${inspect(this.inHash)},
   state.l1ToL2MessageTree: ${inspect(this.state.l1ToL2MessageTree)},
   state.noteHashTree: ${inspect(this.state.partial.noteHashTree)},
   state.nullifierTree: ${inspect(this.state.partial.nullifierTree)},
@@ -233,12 +241,13 @@ export class L2BlockHeader {
 
   public equals(other: this): boolean {
     return (
-      this.contentCommitment.equals(other.contentCommitment) &&
+      this.lastArchive.equals(other.lastArchive) &&
+      this.blobsHash.equals(other.blobsHash) &&
+      this.inHash.equals(other.inHash) &&
       this.state.equals(other.state) &&
       this.globalVariables.equals(other.globalVariables) &&
       this.totalFees.equals(other.totalFees) &&
       this.totalManaUsed.equals(other.totalManaUsed) &&
-      this.lastArchive.equals(other.lastArchive) &&
       this.spongeBlobHash.equals(other.spongeBlobHash) &&
       this.blockHeadersHash.equals(other.blockHeadersHash)
     );

package/src/block/l2_block_new.ts

@@ -11,9 +11,13 @@ import { BlockHeader } from '../tx/block_header.js';
 import { Body } from './body.js';
 import type { L2BlockInfo } from './l2_block_info.js';
 
+// TODO(palla/mbps): Delete the existing `L2Block` class and rename this to `L2Block`.
+// TODO(palla/mbps): Consider moving the checkpointNumber and indexWithinCheckpoint to the header:
+// if the blockNumber is there, why not these as well? Consider whether they should be part of the
+// circuits structs though.
+
 /**
  * An L2 block with a header and a body.
- * TODO: Delete the existing `L2Block` class and rename this to `L2Block`.
  */
 export class L2BlockNew {
   constructor(