@aztec/stdlib 0.77.0-testnet-ignition.30 → 0.77.1

package/src/tx/tx.ts

@@ -8,13 +8,11 @@ import type { FieldsOf } from '@aztec/foundation/types';
 import { z } from 'zod';
 
 import type { GasSettings } from '../gas/gas_settings.js';
-import { siloContractClassLog } from '../hash/hash.js';
 import type { GetPublicLogsResponse } from '../interfaces/get_logs_response.js';
 import type { L2LogsSource } from '../interfaces/l2_logs_source.js';
 import type { ScopedLogHash } from '../kernel/log_hash.js';
 import { PrivateKernelTailCircuitPublicInputs } from '../kernel/private_kernel_tail_circuit_public_inputs.js';
 import { ContractClassLog } from '../logs/contract_class_log.js';
-import { PrivateLog } from '../logs/private_log.js';
 import { Gossipable } from '../p2p/gossipable.js';
 import { TopicType, createTopicString } from '../p2p/topic_type.js';
 import { ClientIvcProof } from '../proofs/client_ivc_proof.js';
@@ -197,9 +195,11 @@ export class Tx extends Gossipable {
     const contractClassLogs = [];
     for (const log of this.contractClassLogs) {
       const hashedLog = await log.hash();
-      const logHash = logHashes.find(hash => hash.value.equals(hashedLog));
+      const logHash = logHashes.find(
+        hash => hash.value.equals(hashedLog) && hash.contractAddress.equals(log.contractAddress),
+      );
       if (logHash) {
-        contractClassLogs.push(silo ? await siloContractClassLog(log, logHash.contractAddress) : log);
+        contractClassLogs.push(silo ? await log.silo() : log);
       }
     }
     return contractClassLogs;
@@ -238,7 +238,7 @@ export class Tx extends Gossipable {
       nullifierCount: this.data.getNonEmptyNullifiers().length,
       privateLogCount: this.data.getNonEmptyPrivateLogs().length,
       classRegisteredCount: this.data.getNonEmptyContractClassLogsHashes().length,
-      contractClassLogSize: this.data.getNonEmptyContractClassLogsLength(),
+      contractClassLogSize: this.data.getEmittedContractClassLogsLength(),
 
       proofSize: this.clientIvcProof.clientIvcProofBuffer.length,
       size: this.toBuffer().length,
@@ -272,8 +272,8 @@ export class Tx extends Gossipable {
     return (
       this.data.getNonEmptyNoteHashes().length * Fr.SIZE_IN_BYTES +
       this.data.getNonEmptyNullifiers().length * Fr.SIZE_IN_BYTES +
-      this.data.getNonEmptyPrivateLogs().length * PrivateLog.SIZE_IN_BYTES +
-      this.data.getNonEmptyContractClassLogsLength() * Fr.SIZE_IN_BYTES
+      this.data.getEmittedPrivateLogsLength() * Fr.SIZE_IN_BYTES +
+      this.data.getEmittedContractClassLogsLength() * Fr.SIZE_IN_BYTES
     );
   }
 

package/src/tx/tx_effect.ts

@@ -354,15 +354,26 @@ export class TxEffect {
       flattened.push(...this.publicDataWrites.map(w => [w.leafSlot, w.value]).flat());
     }
     if (this.privateLogs.length) {
-      flattened.push(this.toPrefix(PRIVATE_LOGS_PREFIX, this.privateLogs.length * PRIVATE_LOG_SIZE_IN_FIELDS));
-      flattened.push(...this.privateLogs.map(l => l.fields).flat());
+      const totalLogLen = this.privateLogs.reduce(
+        // +1 for length prefix
+        (total, log) => total + (log.getEmittedLength() == 0 ? 0 : log.getEmittedLength() + 1),
+        0,
+      );
+      flattened.push(this.toPrefix(PRIVATE_LOGS_PREFIX, totalLogLen));
+      flattened.push(...this.privateLogs.flatMap(l => [new Fr(l.getEmittedLength()), ...l.getEmittedFields()]));
     }
     if (this.publicLogs.length) {
-      flattened.push(this.toPrefix(PUBLIC_LOGS_PREFIX, this.publicLogs.length * PUBLIC_LOG_SIZE_IN_FIELDS));
-      flattened.push(...this.publicLogs.map(l => l.toFields()).flat());
+      const totalLogLen = this.publicLogs.reduce(
+        // +1 for length prefix
+        (total, log) => total + (log.getEmittedLength() == 0 ? 0 : log.getEmittedLength() + 1),
+        0,
+      );
+      flattened.push(this.toPrefix(PUBLIC_LOGS_PREFIX, totalLogLen));
+      flattened.push(...this.publicLogs.flatMap(l => [new Fr(l.getEmittedLength()), ...l.getEmittedFields()]));
     }
     if (this.contractClassLogs.length) {
       const totalLogLen = this.contractClassLogs.reduce(
+        // +2 for length prefix and contract address
         (total, log) => total + (log.getEmittedLength() == 0 ? 0 : log.getEmittedLength() + 2),
         0,
       );
@@ -435,19 +446,28 @@ export class TxEffect {
           break;
         }
         case PRIVATE_LOGS_PREFIX: {
-          // TODO(Miranda): squash log 0s in a nested loop and add len prefix?
           ensureEmpty(effect.privateLogs);
           const flatPrivateLogs = reader.readFieldArray(length);
-          for (let i = 0; i < length; i += PRIVATE_LOG_SIZE_IN_FIELDS) {
-            effect.privateLogs.push(PrivateLog.fromFields(flatPrivateLogs.slice(i, i + PRIVATE_LOG_SIZE_IN_FIELDS)));
+          let i = 0;
+          while (i < length) {
+            const logLen = flatPrivateLogs[i++].toNumber();
+            const logFields = flatPrivateLogs.slice(i, (i += logLen));
+            effect.privateLogs.push(
+              PrivateLog.fromFields(logFields.concat(new Array(PRIVATE_LOG_SIZE_IN_FIELDS - logLen).fill(Fr.ZERO))),
+            );
           }
           break;
         }
         case PUBLIC_LOGS_PREFIX: {
           ensureEmpty(effect.publicLogs);
           const flatPublicLogs = reader.readFieldArray(length);
-          for (let i = 0; i < length; i += PUBLIC_LOG_SIZE_IN_FIELDS) {
-            effect.publicLogs.push(PublicLog.fromFields(flatPublicLogs.slice(i, i + PUBLIC_LOG_SIZE_IN_FIELDS)));
+          let i = 0;
+          while (i < length) {
+            const logLen = flatPublicLogs[i++].toNumber();
+            const logFields = flatPublicLogs.slice(i, (i += logLen));
+            effect.publicLogs.push(
+              PublicLog.fromFields(logFields.concat(new Array(PUBLIC_LOG_SIZE_IN_FIELDS - logLen).fill(Fr.ZERO))),
+            );
           }
           break;
         }

package/src/tx/tx_receipt.ts

@@ -56,7 +56,7 @@ export class TxReceipt {
         status: z.nativeEnum(TxStatus),
         error: z.string(),
         blockHash: L2BlockHash.schema.optional(),
-        blockNumber: z.number().optional(),
+        blockNumber: z.number().int().nonnegative().optional(),
         transactionFee: schemas.BigInt.optional(),
         debugInfo: DebugInfoSchema.optional(),
       })