@aztec/stdlib 0.86.0-starknet.1 → 0.87.0

package/src/kernel/log_hash.ts

@@ -1,42 +1,49 @@
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import type { FieldsOf } from '@aztec/foundation/types';
 
 import { inspect } from 'util';
 
 import { AztecAddress } from '../aztec-address/index.js';
-import type { Ordered } from './utils/interfaces.js';
 
-export class LogHash implements Ordered {
-  constructor(public value: Fr, public counter: number, public length: number) {}
+export class LogHash {
+  constructor(
+    public value: Fr,
+    public length: number,
+  ) {}
+
+  static from(fields: FieldsOf<LogHash>) {
+    return new LogHash(fields.value, fields.length);
+  }
 
   toFields(): Fr[] {
-    return [this.value, new Fr(this.counter), new Fr(this.length)];
+    return [this.value, new Fr(this.length)];
   }
 
   static fromFields(fields: Fr[] | FieldReader) {
     const reader = FieldReader.asReader(fields);
-    return new LogHash(reader.readField(), reader.readU32(), reader.readU32());
+    return new LogHash(reader.readField(), reader.readU32());
   }
 
   isEmpty() {
-    return this.value.isZero() && !this.length && !this.counter;
+    return this.value.isZero() && !this.length;
   }
 
   static empty() {
-    return new LogHash(Fr.zero(), 0, 0);
+    return new LogHash(Fr.zero(), 0);
   }
 
   toBuffer(): Buffer {
-    return serializeToBuffer(this.value, this.counter, this.length);
+    return serializeToBuffer(this.value, this.length);
   }
 
   static fromBuffer(buffer: Buffer | BufferReader) {
     const reader = BufferReader.asReader(buffer);
-    return new LogHash(Fr.fromBuffer(reader), reader.readNumber(), reader.readNumber());
+    return new LogHash(Fr.fromBuffer(reader), reader.readNumber());
   }
 
   toString(): string {
-    return `value=${this.value} counter=${this.counter} length=${this.length}`;
+    return `value=${this.value} length=${this.length}`;
   }
 
   scope(contractAddress: AztecAddress) {
@@ -48,13 +55,45 @@ export class LogHash implements Ordered {
   }
 }
 
-export class ScopedLogHash implements Ordered {
-  constructor(public logHash: LogHash, public contractAddress: AztecAddress) {}
+export class CountedLogHash {
+  constructor(
+    public logHash: LogHash,
+    public counter: number,
+  ) {}
+
+  toFields(): Fr[] {
+    return [...this.logHash.toFields(), new Fr(this.counter)];
+  }
+
+  static fromFields(fields: Fr[] | FieldReader) {
+    const reader = FieldReader.asReader(fields);
+    return new CountedLogHash(reader.readObject(LogHash), reader.readU32());
+  }
+
+  isEmpty() {
+    return this.logHash.isEmpty() && !this.counter;
+  }
+
+  static empty() {
+    return new CountedLogHash(LogHash.empty(), 0);
+  }
 
-  get counter() {
-    return this.logHash.counter;
+  toBuffer(): Buffer {
+    return serializeToBuffer(this.logHash, this.counter);
   }
 
+  static fromBuffer(buffer: Buffer | BufferReader) {
+    const reader = BufferReader.asReader(buffer);
+    return new CountedLogHash(LogHash.fromBuffer(reader), reader.readNumber());
+  }
+}
+
+export class ScopedLogHash {
+  constructor(
+    public logHash: LogHash,
+    public contractAddress: AztecAddress,
+  ) {}
+
   get value() {
     return this.logHash.value;
   }
@@ -89,3 +128,36 @@ export class ScopedLogHash implements Ordered {
     return `logHash=${this.logHash} contractAddress=${this.contractAddress}`;
   }
 }
+
+export class ScopedCountedLogHash {
+  constructor(
+    public inner: CountedLogHash,
+    public contractAddress: AztecAddress,
+  ) {}
+
+  toFields(): Fr[] {
+    return [...this.inner.toFields(), this.contractAddress.toField()];
+  }
+
+  static fromFields(fields: Fr[] | FieldReader) {
+    const reader = FieldReader.asReader(fields);
+    return new ScopedCountedLogHash(reader.readObject(CountedLogHash), AztecAddress.fromField(reader.readField()));
+  }
+
+  toBuffer(): Buffer {
+    return serializeToBuffer(this.inner, this.contractAddress);
+  }
+
+  static fromBuffer(buffer: Buffer | BufferReader) {
+    const reader = BufferReader.asReader(buffer);
+    return new ScopedCountedLogHash(CountedLogHash.fromBuffer(reader), AztecAddress.fromBuffer(reader));
+  }
+
+  isEmpty() {
+    return this.inner.isEmpty() && this.contractAddress.isZero();
+  }
+
+  static empty() {
+    return new ScopedCountedLogHash(CountedLogHash.empty(), AztecAddress.ZERO);
+  }
+}

package/src/kernel/note_hash.ts

@@ -5,7 +5,10 @@ import { AztecAddress } from '../aztec-address/index.js';
 import type { Ordered } from './utils/interfaces.js';
 
 export class NoteHash {
-  constructor(public value: Fr, public counter: number) {}
+  constructor(
+    public value: Fr,
+    public counter: number,
+  ) {}
 
   toFields(): Fr[] {
     return [this.value, new Fr(this.counter)];
@@ -43,7 +46,10 @@ export class NoteHash {
 }
 
 export class ScopedNoteHash implements Ordered {
-  constructor(public noteHash: NoteHash, public contractAddress: AztecAddress) {}
+  constructor(
+    public noteHash: NoteHash,
+    public contractAddress: AztecAddress,
+  ) {}
 
   get counter() {
     return this.noteHash.counter;

package/src/kernel/nullifier.ts

@@ -5,7 +5,11 @@ import { AztecAddress } from '../aztec-address/index.js';
 import type { Ordered } from './utils/interfaces.js';
 
 export class Nullifier implements Ordered {
-  constructor(public value: Fr, public counter: number, public noteHash: Fr) {}
+  constructor(
+    public value: Fr,
+    public counter: number,
+    public noteHash: Fr,
+  ) {}
 
   toFields(): Fr[] {
     return [this.value, new Fr(this.counter), this.noteHash];
@@ -43,7 +47,10 @@ export class Nullifier implements Ordered {
 }
 
 export class ScopedNullifier implements Ordered {
-  constructor(public nullifier: Nullifier, public contractAddress: AztecAddress) {}
+  constructor(
+    public nullifier: Nullifier,
+    public contractAddress: AztecAddress,
+  ) {}
 
   get counter() {
     return this.nullifier.counter;

package/src/kernel/private_accumulated_data.ts

@@ -12,7 +12,7 @@ import { BufferReader, type Tuple, serializeToBuffer } from '@aztec/foundation/s
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 
 import { ScopedL2ToL1Message } from '../messaging/l2_to_l1_message.js';
-import { ScopedLogHash } from './log_hash.js';
+import { ScopedCountedLogHash } from './log_hash.js';
 import { ScopedNoteHash } from './note_hash.js';
 import { ScopedNullifier } from './nullifier.js';
 import { PrivateCallRequest } from './private_call_request.js';
@@ -45,7 +45,7 @@ export class PrivateAccumulatedData {
      * Accumulated contract class logs from all the previous kernel iterations.
      * Note: Truncated to 31 bytes to fit in Fr.
      */
-    public contractClassLogsHashes: Tuple<ScopedLogHash, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>,
+    public contractClassLogsHashes: Tuple<ScopedCountedLogHash, typeof MAX_CONTRACT_CLASS_LOGS_PER_TX>,
     /**
      * Accumulated public call requests from all the previous kernel iterations.
      */
@@ -84,7 +84,7 @@ export class PrivateAccumulatedData {
       reader.readArray(MAX_NULLIFIERS_PER_TX, ScopedNullifier),
       reader.readArray(MAX_L2_TO_L1_MSGS_PER_TX, ScopedL2ToL1Message),
       reader.readArray(MAX_PRIVATE_LOGS_PER_TX, ScopedPrivateLogData),
-      reader.readArray(MAX_CONTRACT_CLASS_LOGS_PER_TX, ScopedLogHash),
+      reader.readArray(MAX_CONTRACT_CLASS_LOGS_PER_TX, ScopedCountedLogHash),
       reader.readArray(MAX_ENQUEUED_CALLS_PER_TX, CountedPublicCallRequest),
       reader.readArray(MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX, PrivateCallRequest),
     );
@@ -105,7 +105,7 @@ export class PrivateAccumulatedData {
       makeTuple(MAX_NULLIFIERS_PER_TX, ScopedNullifier.empty),
       makeTuple(MAX_L2_TO_L1_MSGS_PER_TX, ScopedL2ToL1Message.empty),
       makeTuple(MAX_PRIVATE_LOGS_PER_TX, ScopedPrivateLogData.empty),
-      makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, ScopedLogHash.empty),
+      makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_TX, ScopedCountedLogHash.empty),
       makeTuple(MAX_ENQUEUED_CALLS_PER_TX, CountedPublicCallRequest.empty),
       makeTuple(MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX, PrivateCallRequest.empty),
     );

package/src/kernel/private_call_request.ts

@@ -94,6 +94,6 @@ export class PrivateCallRequest {
   }
 
   toString() {
-    return `PrivateCallRequest(callContext: ${this.callContext}, argsHash: ${this.argsHash}, returnsHash: ${this.returnsHash}, startSideEffectCounter: ${this.startSideEffectCounter}, endSideEffectCounter: ${this.endSideEffectCounter})`;
+    return `PrivateCallRequest(contractAddress: ${this.callContext.contractAddress}, selector: ${this.callContext.functionSelector}, msgSender: ${this.callContext.msgSender}, isStatic: ${this.callContext.isEmpty},  argsHash: ${this.argsHash}, returnsHash: ${this.returnsHash}, startSideEffectCounter: ${this.startSideEffectCounter}, endSideEffectCounter: ${this.endSideEffectCounter})`;
   }
 }

package/src/kernel/private_circuit_public_inputs.ts

@@ -24,7 +24,7 @@ import {
 import type { FieldsOf } from '@aztec/foundation/types';
 
 import { KeyValidationRequestAndGenerator } from '../kernel/hints/key_validation_request_and_generator.js';
-import { LogHash } from '../kernel/log_hash.js';
+import { CountedLogHash } from '../kernel/log_hash.js';
 import { PrivateCallRequest } from '../kernel/private_call_request.js';
 import { PrivateLogData } from '../kernel/private_log_data.js';
 import { L2ToL1Message } from '../messaging/l2_to_l1_message.js';
@@ -113,7 +113,7 @@ export class PrivateCircuitPublicInputs {
     /**
      * Hash of the contract class logs emitted in this function call.
      */
-    public contractClassLogsHashes: Tuple<LogHash, typeof MAX_CONTRACT_CLASS_LOGS_PER_CALL>,
+    public contractClassLogsHashes: Tuple<CountedLogHash, typeof MAX_CONTRACT_CLASS_LOGS_PER_CALL>,
     /**
      * The side effect counter at the start of this call.
      */
@@ -169,7 +169,7 @@ export class PrivateCircuitPublicInputs {
       reader.readObject(PublicCallRequest),
       reader.readArray(MAX_L2_TO_L1_MSGS_PER_CALL, L2ToL1Message),
       reader.readArray(MAX_PRIVATE_LOGS_PER_CALL, PrivateLogData),
-      reader.readArray(MAX_CONTRACT_CLASS_LOGS_PER_CALL, LogHash),
+      reader.readArray(MAX_CONTRACT_CLASS_LOGS_PER_CALL, CountedLogHash),
       reader.readObject(Fr),
       reader.readObject(Fr),
       reader.readObject(BlockHeader),
@@ -196,7 +196,7 @@ export class PrivateCircuitPublicInputs {
       reader.readObject(PublicCallRequest),
       reader.readArray(MAX_L2_TO_L1_MSGS_PER_CALL, L2ToL1Message),
       reader.readArray(MAX_PRIVATE_LOGS_PER_CALL, PrivateLogData),
-      reader.readArray(MAX_CONTRACT_CLASS_LOGS_PER_CALL, LogHash),
+      reader.readArray(MAX_CONTRACT_CLASS_LOGS_PER_CALL, CountedLogHash),
       reader.readField(),
       reader.readField(),
       reader.readObject(BlockHeader),
@@ -226,7 +226,7 @@ export class PrivateCircuitPublicInputs {
       PublicCallRequest.empty(),
       makeTuple(MAX_L2_TO_L1_MSGS_PER_CALL, L2ToL1Message.empty),
       makeTuple(MAX_PRIVATE_LOGS_PER_CALL, PrivateLogData.empty),
-      makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_CALL, LogHash.empty),
+      makeTuple(MAX_CONTRACT_CLASS_LOGS_PER_CALL, CountedLogHash.empty),
       Fr.ZERO,
       Fr.ZERO,
       BlockHeader.empty(),

package/src/kernel/private_kernel_tail_circuit_public_inputs.ts

@@ -4,8 +4,10 @@ import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import { AztecAddress } from '../aztec-address/index.js';
 import { Gas } from '../gas/gas.js';
+import type { PrivateLog } from '../logs/index.js';
 import { TxConstantData } from '../tx/tx_constant_data.js';
 import { RollupValidationRequests } from './hints/rollup_validation_requests.js';
+import type { ScopedLogHash } from './log_hash.js';
 import { PrivateToPublicAccumulatedData } from './private_to_public_accumulated_data.js';
 import { PrivateToPublicKernelCircuitPublicInputs } from './private_to_public_kernel_circuit_public_inputs.js';
 import { PrivateToRollupAccumulatedData } from './private_to_rollup_accumulated_data.js';
@@ -254,11 +256,20 @@ export class PrivateKernelTailCircuitPublicInputs {
   }
 
   getEmittedContractClassLogsLength() {
-    return this.getNonEmptyContractClassLogsHashes().reduce((total, log) => total + log.logHash.length, 0);
+    const accumulateLengths = (logHashes: ScopedLogHash[]) =>
+      logHashes.reduce((acc, log) => acc + log.logHash.length, 0);
+    return this.forPublic
+      ? accumulateLengths(this.forPublic.nonRevertibleAccumulatedData.contractClassLogsHashes) +
+          accumulateLengths(this.forPublic.revertibleAccumulatedData.contractClassLogsHashes)
+      : accumulateLengths(this.forRollup!.end.contractClassLogsHashes);
   }
 
   getEmittedPrivateLogsLength() {
-    return this.getNonEmptyPrivateLogs().reduce((total, log) => total + log.getEmittedLength(), 0);
+    const accumulateLengths = (logs: PrivateLog[]) => logs.reduce((acc, log) => acc + log.emittedLength, 0);
+    return this.forPublic
+      ? accumulateLengths(this.forPublic.nonRevertibleAccumulatedData.privateLogs) +
+          accumulateLengths(this.forPublic.revertibleAccumulatedData.privateLogs)
+      : accumulateLengths(this.forRollup!.end.privateLogs);
   }
 
   static fromBuffer(buffer: Buffer | BufferReader): PrivateKernelTailCircuitPublicInputs {

package/src/kernel/private_log_data.ts

@@ -10,7 +10,11 @@ import { PrivateLog } from '../logs/private_log.js';
 import type { UInt32 } from '../types/shared.js';
 
 export class PrivateLogData {
-  constructor(public log: PrivateLog, public noteHashCounter: UInt32, public counter: UInt32) {}
+  constructor(
+    public log: PrivateLog,
+    public noteHashCounter: UInt32,
+    public counter: UInt32,
+  ) {}
 
   static from(fields: FieldsOf<PrivateLogData>): PrivateLogData {
     return new PrivateLogData(...PrivateLogData.getFields(fields));
@@ -54,7 +58,7 @@ export class PrivateLogData {
 
   [inspect.custom]() {
     return `PrivateLogData {
-      log: ${this.log}
+      log: ${this.log.fields}
       noteHashCounter: ${this.noteHashCounter}
       counter: ${this.counter}
     }`;
@@ -62,7 +66,10 @@ export class PrivateLogData {
 }
 
 export class ScopedPrivateLogData {
-  constructor(public inner: PrivateLogData, public contractAddress: AztecAddress) {}
+  constructor(
+    public inner: PrivateLogData,
+    public contractAddress: AztecAddress,
+  ) {}
 
   static from(fields: FieldsOf<ScopedPrivateLogData>): ScopedPrivateLogData {
     return new ScopedPrivateLogData(...ScopedPrivateLogData.getFields(fields));
@@ -100,7 +107,9 @@ export class ScopedPrivateLogData {
 
   [inspect.custom]() {
     return `ScopedPrivateLogData {
-      inner: ${this.inner}
+      inner.counter: ${this.inner.counter}
+      inner.noteHashCounter: ${this.inner.noteHashCounter}
+      inner.log: ${this.inner.log.fields}
       contractAddress: ${this.contractAddress}
     }`;
   }

package/src/kernel/private_to_avm_accumulated_data.ts

@@ -122,7 +122,11 @@ export class PrivateToAvmAccumulatedData {
 }
 
 export class PrivateToAvmAccumulatedDataArrayLengths {
-  constructor(public noteHashes: UInt32, public nullifiers: UInt32, public l2ToL1Msgs: UInt32) {}
+  constructor(
+    public noteHashes: UInt32,
+    public nullifiers: UInt32,
+    public l2ToL1Msgs: UInt32,
+  ) {}
 
   static get schema() {
     return z
@@ -150,6 +154,10 @@ export class PrivateToAvmAccumulatedDataArrayLengths {
     return new this(reader.readU32(), reader.readU32(), reader.readU32());
   }
 
+  toFields() {
+    return [this.noteHashes, this.nullifiers, this.l2ToL1Msgs];
+  }
+
   static from(fields: FieldsOf<PrivateToAvmAccumulatedDataArrayLengths>) {
     return new PrivateToAvmAccumulatedDataArrayLengths(...PrivateToAvmAccumulatedDataArrayLengths.getFields(fields));
   }

package/src/kernel/private_validation_requests.ts

@@ -134,7 +134,7 @@ export class PrivateValidationRequests {
     .filter(x => !x.isEmpty())
     .map(h => inspect(h))
     .join(', ')}],
-  splitCounter: ${this.splitCounter}
+  splitCounter: ${this.splitCounter.getSize()}
   `;
   }
 }

package/src/kernel/public_call_request.ts

@@ -124,7 +124,10 @@ export class PublicCallRequest {
 }
 
 export class CountedPublicCallRequest {
-  constructor(public inner: PublicCallRequest, public counter: UInt32) {}
+  constructor(
+    public inner: PublicCallRequest,
+    public counter: UInt32,
+  ) {}
 
   getSize() {
     return this.isEmpty() ? 0 : this.toBuffer().length;

package/src/keys/public_keys.ts

@@ -143,7 +143,7 @@ export class PublicKeys {
 
   toNoirStruct() {
     // We need to use lowercase identifiers as those are what the noir interface expects
-    // eslint-disable-next-line camelcase
+
     return {
       // TODO(#6337): Directly dump account.publicKeys here
       /* eslint-disable camelcase */