@aztec-labs/stdlib 6.0.0-rc.2 → 6.0.0-rc.4

package/src/block/l2_block_source.ts

@@ -391,6 +391,21 @@ export interface L2BlockSink {
    *   prefix reference does not match the sink's canonical messages at the block's L1-to-L2 leaf count.
    */
   addBlock(block: L2Block, inboxPrefixRef: InboxMessagePrefixRef): Promise<void>;
+
+  /**
+   * Prunes the proposed blocks of a checkpoint its proposer abandoned before enclosing them in a proposed checkpoint,
+   * instead of leaving them on the local chain until the orphan prune notices that no checkpoint ever came. Removes
+   * every block after `afterBlockNumber`, the block the abandoned checkpoint built on, and notifies subscribers exactly
+   * as an orphan prune does.
+   *
+   * Prunes nothing when the range no longer holds the caller's blocks: when the block after `afterBlockNumber` is not
+   * `firstBlockHash`, or when a proposed or L1 checkpoint already covers it. Also prunes nothing when a checkpoint
+   * proposal for the block's slot has been received, since another proposer may still be proposing these blocks.
+   * @param afterBlockNumber - The parent block of the abandoned checkpoint; it and everything before it are kept.
+   * @param firstBlockHash - The hash of the abandoned checkpoint's first block, as the caller pushed it.
+   * @returns The numbers of the pruned blocks, empty when the guard left the chain untouched.
+   */
+  pruneAbandonedProposedBlocks(afterBlockNumber: BlockNumber, firstBlockHash: BlockHash): Promise<BlockNumber[]>;
 }
 
 /**
@@ -629,8 +644,8 @@ export type InvalidCheckpointDetectedEvent = {
 };
 
 /**
- * Emitted when a local proposed checkpoint is found to disagree with the L1-confirmed
- * checkpoint at the same slot. The slot proposer signed both — equivocation.
+ * Emitted when a local proposed checkpoint is found to disagree with the L1-confirmed checkpoint at the same slot, and
+ * both were signed by the same proposer — equivocation.
  */
 export type CheckpointEquivocationDetectedEvent = {
   type: 'checkpointEquivocationDetected';
@@ -638,6 +653,8 @@ export type CheckpointEquivocationDetectedEvent = {
   checkpointNumber: CheckpointNumber;
   l1ArchiveRoot: Fr;
   proposedArchiveRoot: Fr;
+  /** The proposer whose key signed both the local proposed checkpoint and the L1 checkpoint. */
+  signer: EthAddress;
 };
 
 /**

package/src/block/proposal/attestations_and_signers.ts

@@ -1,5 +1,6 @@
 import type { ViemCommitteeAttestations } from '@aztec-labs/ethereum/contracts';
 import { bufferToHex, hexToBuffer } from '@aztec-labs/foundation/string';
+import { Buffer } from 'buffer';
 import { encodeAbiParameters, parseAbiParameters } from 'viem';
 import { z } from 'zod';
 

package/src/block/proposal/committee_attestation.ts

@@ -3,6 +3,7 @@ import { Buffer32 } from '@aztec-labs/foundation/buffer';
 import { EthAddress } from '@aztec-labs/foundation/eth-address';
 import { Signature } from '@aztec-labs/foundation/eth-signature';
 import { BufferReader, serializeToBuffer } from '@aztec-labs/foundation/serialize';
+import { Buffer } from 'buffer';
 import { z } from 'zod';
 
 export { EthAddress, Signature };

package/src/checkpoint/checkpoint_data.ts

@@ -9,7 +9,8 @@ import {
   CheckpointNumberSchema,
 } from '@aztec-labs/foundation/branded-types';
 import { Fr } from '@aztec-labs/foundation/curves/bn254';
-import { schemas } from '@aztec-labs/foundation/schemas';
+import type { EthAddress } from '@aztec-labs/foundation/eth-address';
+import { optional, schemas } from '@aztec-labs/foundation/schemas';
 import { z } from 'zod';
 
 import { CommitteeAttestation } from '../block/proposal/committee_attestation.js';
@@ -48,6 +49,12 @@ export type StorageEnrichedCheckpointData = {
 export type ProposedOnlyCheckpointData = {
   totalManaUsed: bigint;
   feeAssetPriceModifier: bigint;
+  /**
+   * Address recovered from the signature of the checkpoint proposal this checkpoint came from. Undefined when unknown
+   * (a checkpoint built without a signed proposal, or one stored before signers were recorded), in which case a
+   * divergence from L1 is never attributed to anyone as equivocation.
+   */
+  signer?: EthAddress;
 };
 
 /** Inbox consumption record of a proposed checkpoint, mirroring what `propose` writes for it on L1. */
@@ -83,6 +90,7 @@ export const ProposedCheckpointDataSchema = z.object({
   totalManaUsed: schemas.BigInt,
   feeAssetPriceModifier: schemas.BigInt,
   inboxMsgTotal: schemas.BigInt,
+  signer: optional(schemas.EthAddress),
 });
 
 export const CheckpointDataSchema = z

package/src/config/network-consensus-config.ts

@@ -1,5 +1,6 @@
 import { type L1ContractsConfig, l1ContractsConfigMappings, validateSlotDurations } from '@aztec-labs/ethereum/config';
 import { type EnvVar, pickConfigMappings } from '@aztec-labs/foundation/config';
+import { getEnv } from '@aztec-labs/foundation/config/env';
 
 import { MAX_ATTESTABLE_BLOCKS_PER_CHECKPOINT } from '../deserialization/index.js';
 import type { SequencerConfig } from '../interfaces/configs.js';
@@ -260,7 +261,7 @@ export function validateNetworkConsensusConfig(config: NetworkConsensusConfig):
  */
 export function checkConsensusEnvOverrides(
   networkConfig: Record<string, string | number | boolean>,
-  env: { [key: string]: string | undefined } = process.env,
+  env: { [key: string]: string | undefined } = getEnv(),
   log?: (msg: string) => void,
 ): Record<string, string> {
   const allowOverride = allowsNetworkConfigOverride(env);
@@ -357,7 +358,7 @@ function getProposerTxLimitConflict(
 }
 
 /** Whether the env opts into overriding network-wide consensus values (`ALLOW_OVERRIDING_NETWORK_CONFIG`). */
-export function allowsNetworkConfigOverride(env: { [key: string]: string | undefined } = process.env): boolean {
+export function allowsNetworkConfigOverride(env: { [key: string]: string | undefined } = getEnv()): boolean {
   const value = env.ALLOW_OVERRIDING_NETWORK_CONFIG;
   return value === '1' || value?.toLowerCase() === 'true';
 }

package/src/contract/artifact_hash.ts

@@ -3,6 +3,7 @@ import { Fr, reduceFn } from '@aztec-labs/foundation/curves/bn254';
 import { createLogger } from '@aztec-labs/foundation/log';
 import { numToUInt8 } from '@aztec-labs/foundation/serialize';
 import { MerkleTree, MerkleTreeCalculator } from '@aztec-labs/foundation/trees';
+import { Buffer } from 'buffer';
 import deterministicStringify from 'json-stringify-deterministic';
 
 import {

package/src/contract/complete_address.ts

@@ -2,6 +2,7 @@ import { Fr } from '@aztec-labs/foundation/curves/bn254';
 import { hexSchemaFor } from '@aztec-labs/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec-labs/foundation/serialize';
 import { bufferToHex } from '@aztec-labs/foundation/string';
+import { Buffer } from 'buffer';
 
 import { AztecAddress } from '../aztec-address/index.js';
 import { computeAddress, computePreaddress, deriveKeys } from '../keys/index.js';

package/src/contract/contract_address.ts

@@ -16,7 +16,7 @@ import type { PartialAddress } from './partial_address.js';
  * ```
  * salted_initialization_hash = poseidon2(DOM_SEP__SALTED_INITIALIZATION_HASH, [salt, initialization_hash, deployer, immutables_hash])
  * partial_address = poseidon2(DOM_SEP__PARTIAL_ADDRESS, [contract_class_id, salted_initialization_hash])
- * address = ((poseidon2(DOM_SEP__CONTRACT_ADDRESS_V2, [public_keys_hash, partial_address]) * G) + ivpk_m).x <- the x-coordinate of the address point
+ * address = ((poseidon2(DOM_SEP__CONTRACT_ADDRESS_V3, [public_keys_hash, partial_address]) * G) + ivpk_m).x <- the x-coordinate of the address point
  * ```
  * @param instance - A contract instance for which to calculate the deployment address.
  */

package/src/contract/contract_class.ts

@@ -2,6 +2,7 @@ import { CircuitKind } from '@aztec-foundation/bb.js';
 
 import { vkAsFields } from '@aztec-labs/foundation/crypto/keys';
 import { Fr } from '@aztec-labs/foundation/curves/bn254';
+import { Buffer } from 'buffer';
 
 import { type ContractArtifact, type FunctionArtifact, FunctionSelector, FunctionType } from '../abi/index.js';
 import { hashVK } from '../hash/hash.js';

package/src/contract/contract_class_id.ts

@@ -1,7 +1,7 @@
 import { DomainSeparator, MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS } from '@aztec-labs/constants';
 import { poseidon2HashWithSeparator } from '@aztec-labs/foundation/crypto/poseidon';
 import { Fr } from '@aztec-labs/foundation/curves/bn254';
-import { strict as assert } from 'assert';
+import { assert } from '@aztec-labs/foundation/validation';
 
 import { bufferAsFields } from '../abi/index.js';
 import type { ContractClass } from './interfaces/contract_class.js';

package/src/contract/interfaces/contract_class.ts

@@ -1,5 +1,6 @@
 import { Fr } from '@aztec-labs/foundation/curves/bn254';
 import { schemas, zodFor } from '@aztec-labs/foundation/schemas';
+import { Buffer } from 'buffer';
 import { z } from 'zod';
 
 import { FunctionSelector } from '../../abi/index.js';

package/src/database-version/database_version.ts

@@ -1,5 +1,6 @@
 import { EthAddress } from '@aztec-labs/foundation/eth-address';
 import { jsonParseWithSchema, jsonStringify } from '@aztec-labs/foundation/json-rpc';
+import { Buffer } from 'buffer';
 import { z } from 'zod';
 
 /**

package/src/fees/transaction_fee.ts

@@ -1,5 +1,5 @@
 import type { Fr } from '@aztec-labs/foundation/curves/bn254';
-import { strict as assert } from 'assert';
+import { assert } from '@aztec-labs/foundation/validation';
 
 import type { Gas } from '../gas/gas.js';
 import { GasFees } from '../gas/gas_fees.js';

package/src/file-store/http.ts

@@ -1,6 +1,7 @@
 import { type Logger, createLogger } from '@aztec-labs/foundation/log';
 import { makeBackoff, retry } from '@aztec-labs/foundation/retry';
 import axios, { type AxiosInstance, type AxiosRequestConfig, type AxiosResponse } from 'axios';
+import { Buffer } from 'buffer';
 import { createWriteStream } from 'fs';
 import { mkdir } from 'fs/promises';
 import { dirname } from 'path';

package/src/file-store/memory.ts

@@ -1,3 +1,4 @@
+import { Buffer } from 'buffer';
 import { writeFile } from 'fs/promises';
 import { promisify } from 'util';
 import { gunzip as gunzipCb, gzip as gzipCb } from 'zlib';

package/src/file-store/s3.ts

@@ -5,7 +5,9 @@ import {
   PutObjectCommand,
   S3Client,
 } from '@aws-sdk/client-s3';
+import { getEnv } from '@aztec-labs/foundation/config/env';
 import { type Logger, createLogger } from '@aztec-labs/foundation/log';
+import { Buffer } from 'buffer';
 import { createReadStream, createWriteStream } from 'fs';
 import { mkdir, mkdtemp, stat, unlink } from 'fs/promises';
 import { tmpdir } from 'os';
@@ -37,7 +39,7 @@ export class S3FileStore implements FileStore {
     private readonly log: Logger = createLogger('stdlib:s3-file-store'),
   ) {
     this.endpoint = opts.endpoint;
-    this.region = this.endpoint ? 'auto' : (process.env.AWS_REGION ?? process.env.AWS_DEFAULT_REGION ?? 'us-east-1');
+    this.region = this.endpoint ? 'auto' : (getEnv().AWS_REGION ?? getEnv().AWS_DEFAULT_REGION ?? 'us-east-1');
     this.publicBaseUrl = opts.publicBaseUrl;
 
     const clientOptions: any = {};

package/src/gas/README.md

@@ -208,8 +208,8 @@ itself, before actual teardown consumption is known.
 
 | Constant                        | Value          |
 | ------------------------------- | -------------- |
-| `L1_GAS_PER_CHECKPOINT_PROPOSED` | 500,000       |
-| `L1_GAS_PER_EPOCH_VERIFIED`     | 4,000,000      |
+| `L1_GAS_PER_CHECKPOINT_PROPOSED` | 520,000       |
+| `L1_GAS_PER_EPOCH_VERIFIED`     | 2,500,000      |
 | `BLOBS_PER_CHECKPOINT` (FeeLib) | 3              |
 | `BLOB_GAS_PER_BLOB`             | 2^17           |
 | `MINIMUM_CONGESTION_MULTIPLIER` | 1e9            |

package/src/gas/fee_math.ts

@@ -5,8 +5,8 @@
 
 // Constants matching FeeLib.sol
 export const MINIMUM_CONGESTION_MULTIPLIER = 1_000_000_000n;
-export const L1_GAS_PER_CHECKPOINT_PROPOSED = 500_000n;
-export const L1_GAS_PER_EPOCH_VERIFIED = 4_000_000n;
+export const L1_GAS_PER_CHECKPOINT_PROPOSED = 520_000n;
+export const L1_GAS_PER_EPOCH_VERIFIED = 2_500_000n;
 export const BLOBS_PER_CHECKPOINT = 3n;
 export const BLOB_GAS_PER_BLOB = 2n ** 17n;
 export const MAGIC_CONGESTION_VALUE_MULTIPLIER = 854_700_854n;

package/src/gas/gas.ts

@@ -1,4 +1,5 @@
 import { Fr } from '@aztec-labs/foundation/curves/bn254';
+import { inspect } from '@aztec-labs/foundation/inspect';
 import { schemas } from '@aztec-labs/foundation/schemas';
 import {
   BufferReader,
@@ -8,7 +9,6 @@ import {
   serializeToSink,
 } from '@aztec-labs/foundation/serialize';
 import type { FieldsOf } from '@aztec-labs/foundation/types';
-import { inspect } from 'util';
 import { z } from 'zod';
 
 import type { UInt32 } from '../types/shared.js';

package/src/gas/gas_fees.ts

@@ -1,8 +1,8 @@
 import { Fr } from '@aztec-labs/foundation/curves/bn254';
+import { inspect } from '@aztec-labs/foundation/inspect';
 import { schemas } from '@aztec-labs/foundation/schemas';
 import { BufferReader, BufferSink, FieldReader, serializeToFields } from '@aztec-labs/foundation/serialize';
 import type { FieldsOf } from '@aztec-labs/foundation/types';
-import { inspect } from 'util';
 import { z } from 'zod';
 
 import type { UInt128 } from '../types/shared.js';

package/src/ha-signing/config.ts

@@ -16,6 +16,9 @@ import {
 import type { ZodFor } from '@aztec-labs/foundation/schemas';
 import { z } from 'zod';
 
+/** Default retention for signed duties, in hours. */
+export const DEFAULT_SIGNED_DUTIES_RETENTION_HOURS = 24;
+
 /**
  * Base signing protection configuration shared by both HA (Postgres) and local (LMDB) signers.
  */
@@ -40,7 +43,7 @@ export type BaseSignerConfig = {
   signerCallTimeoutMs?: number;
   /** Maximum age of a stuck duty in ms (defaults to 2x hardcoded Aztec slot duration if not set) */
   maxStuckDutiesAgeMs?: number;
-  /** Optional: clean up old duties after this many hours (disabled if not set) */
+  /** Duty retention in hours from signing start, with a minimum of two slots (defaults to 24). */
   cleanupOldDutiesAfterHours?: number;
 } & Pick<L1ContractAddresses, 'rollupAddress'>;
 
@@ -72,8 +75,9 @@ export const baseSignerConfigMappings: ConfigMappingsType<BaseSignerConfig> = {
   },
   cleanupOldDutiesAfterHours: {
     env: 'VALIDATOR_HA_OLD_DUTIES_MAX_AGE_H',
-    description: 'Optional: clean up old duties after this many hours (disabled if not set)',
-    ...optionalNumberConfigHelper(),
+    description: 'Duty retention in hours from signing start (must be positive; minimum two slots)',
+    defaultValue: DEFAULT_SIGNED_DUTIES_RETENTION_HOURS,
+    parseEnv: (value: string) => z.coerce.number().int().positive().parse(value),
   },
   ...pickL1ContractAddressMappings('rollupAddress'),
 };
@@ -84,7 +88,7 @@ export const BaseSignerConfigSchema = z.object({
   peerSigningTimeoutMs: z.number().min(0),
   signerCallTimeoutMs: z.number().min(0).optional(),
   maxStuckDutiesAgeMs: z.number().min(0).optional(),
-  cleanupOldDutiesAfterHours: z.number().min(0).optional(),
+  cleanupOldDutiesAfterHours: z.number().positive().optional(),
   ...pickL1ContractAddressesSchema('rollupAddress'),
 }) satisfies ZodFor<BaseSignerConfig>;
 

package/src/ha-signing/index.ts

@@ -1,6 +1,7 @@
 export {
   type BaseSignerConfig,
   BaseSignerConfigSchema,
+  DEFAULT_SIGNED_DUTIES_RETENTION_HOURS,
   baseSignerConfigMappings,
   type ValidatorHASignerConfig,
   ValidatorHASignerConfigSchema,

package/src/interfaces/aztec-node-admin.ts

@@ -1,5 +1,6 @@
 import type { L1ContractAddresses } from '@aztec-labs/ethereum/l1-contract-addresses';
 import { createSafeJsonRpcClient, defaultFetch } from '@aztec-labs/foundation/json-rpc/client';
+import { isValidLogLevelSpec } from '@aztec-labs/foundation/log';
 import { z } from 'zod';
 
 import type { ApiSchemaFor } from '../schemas/schemas.js';
@@ -94,6 +95,12 @@ export type AztecNodeAdminConfig = Omit<ValidatorClientFullConfig, keyof L1Contr
     skipIncomingProposals?: boolean;
     // Keep in sync with P2PConfig.preferredPeers (circular dep prevents Pick<P2PConfig, ...> here)
     preferredPeers?: string[];
+    /**
+     * Log level spec in `LOG_LEVEL` env var format (e.g. `info` or `debug;trace:sequencer,p2p`). Setting it updates
+     * all loggers in the node's main thread immediately; worker threads and spawned processes keep their own
+     * configuration. Not persisted: a restart reverts to the `LOG_LEVEL` env var.
+     */
+    logLevel?: string;
   };
 
 export const AztecNodeAdminConfigSchema = SequencerConfigSchema.merge(ProverConfigSchema)
@@ -111,6 +118,7 @@ export const AztecNodeAdminConfigSchema = SequencerConfigSchema.merge(ProverConf
       maxPendingTxCount: z.number(),
       skipIncomingProposals: z.boolean().optional(),
       preferredPeers: z.array(z.string()).optional(),
+      logLevel: z.string().refine(isValidLogLevelSpec, 'Invalid log level spec').optional(),
     }),
   );
 

package/src/interfaces/configs.ts

@@ -102,6 +102,11 @@ export interface SequencerConfig {
   injectUnrecoverableSignatureAttestation?: boolean;
   /** Inject a non-proposer attestation slot in yParity (v ∈ {0, 1}) form in the packed L1 tuple (for testing only) */
   injectYParityAttestation?: boolean;
+  /**
+   * Publish the checkpoint with a fake attestation first, then invalidate it and publish it again with the collected
+   * attestations within the same slot (for testing only)
+   */
+  republishAfterFakeAttestation?: boolean;
   /** Whether to run in fisherman mode: builds blocks on every slot for validation without publishing */
   fishermanMode?: boolean;
   /** Shuffle attestation ordering to create invalid ordering (for testing only) */
@@ -185,6 +190,7 @@ export const SequencerConfigSchema = zodFor<SequencerConfig>()(
     injectHighSValueAttestation: z.boolean().optional(),
     injectUnrecoverableSignatureAttestation: z.boolean().optional(),
     injectYParityAttestation: z.boolean().optional(),
+    republishAfterFakeAttestation: z.boolean().optional(),
     fishermanMode: z.boolean().optional(),
     shuffleAttestationOrdering: z.boolean().optional(),
     blockDurationMs: z.number().positive().optional(),

package/src/kernel/claimed_length_array.ts

@@ -1,4 +1,5 @@
 import type { Fr } from '@aztec-labs/foundation/curves/bn254';
+import { inspect } from '@aztec-labs/foundation/inspect';
 import {
   BufferReader,
   FieldReader,
@@ -7,7 +8,6 @@ import {
   serializeToBuffer,
   serializeToFields,
 } from '@aztec-labs/foundation/serialize';
-import { inspect } from 'util';
 
 export class ClaimedLengthArray<T extends Serializable, N extends number> {
   constructor(

package/src/kernel/hints/transient_data_squashing_hint.ts

@@ -1,6 +1,6 @@
 import { Fr } from '@aztec-labs/foundation/curves/bn254';
+import { inspect } from '@aztec-labs/foundation/inspect';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec-labs/foundation/serialize';
-import { inspect } from 'util';
 
 export class TransientDataSquashingHint {
   constructor(

package/src/kernel/log_hash.ts

@@ -1,7 +1,7 @@
 import { Fr } from '@aztec-labs/foundation/curves/bn254';
+import { inspect } from '@aztec-labs/foundation/inspect';
 import { BufferReader, BufferSink, FieldReader, serializeToSink } from '@aztec-labs/foundation/serialize';
 import type { FieldsOf } from '@aztec-labs/foundation/types';
-import { inspect } from 'util';
 
 import { AztecAddress } from '../aztec-address/index.js';
 

package/src/kernel/private_log_data.ts

@@ -1,8 +1,8 @@
 import { PRIVATE_LOG_DATA_LENGTH } from '@aztec-labs/constants';
 import type { Fr } from '@aztec-labs/foundation/curves/bn254';
+import { inspect } from '@aztec-labs/foundation/inspect';
 import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec-labs/foundation/serialize';
 import type { FieldsOf } from '@aztec-labs/foundation/types';
-import { inspect } from 'util';
 
 import { AztecAddress } from '../aztec-address/index.js';
 import { PrivateLog } from '../logs/private_log.js';

package/src/kernel/private_to_avm_accumulated_data.ts

@@ -7,6 +7,7 @@ import {
 import { type FieldsOf, makeTuple } from '@aztec-labs/foundation/array';
 import { arraySerializedSizeOfNonEmpty } from '@aztec-labs/foundation/collection';
 import { Fr } from '@aztec-labs/foundation/curves/bn254';
+import { inspect } from '@aztec-labs/foundation/inspect';
 import { schemas } from '@aztec-labs/foundation/schemas';
 import {
   BufferReader,
@@ -17,7 +18,6 @@ import {
   serializeToFields,
   serializeToSink,
 } from '@aztec-labs/foundation/serialize';
-import { inspect } from 'util';
 import { z } from 'zod';
 
 import { ScopedL2ToL1Message } from '../messaging/l2_to_l1_message.js';

package/src/kernel/private_to_public_accumulated_data.ts

@@ -10,6 +10,7 @@ import {
 import { type FieldsOf, makeTuple } from '@aztec-labs/foundation/array';
 import { arraySerializedSizeOfNonEmpty } from '@aztec-labs/foundation/collection';
 import { Fr } from '@aztec-labs/foundation/curves/bn254';
+import { inspect } from '@aztec-labs/foundation/inspect';
 import {
   BufferReader,
   BufferSink,
@@ -18,7 +19,6 @@ import {
   serializeToFields,
   serializeToSink,
 } from '@aztec-labs/foundation/serialize';
-import { inspect } from 'util';
 
 import { PrivateLog } from '../logs/private_log.js';
 import { ScopedL2ToL1Message } from '../messaging/l2_to_l1_message.js';

package/src/kernel/private_to_rollup_accumulated_data.ts

@@ -9,6 +9,7 @@ import {
 import { type FieldsOf, makeTuple } from '@aztec-labs/foundation/array';
 import { arraySerializedSizeOfNonEmpty } from '@aztec-labs/foundation/collection';
 import { Fr } from '@aztec-labs/foundation/curves/bn254';
+import { inspect } from '@aztec-labs/foundation/inspect';
 import { bufferSchemaFor } from '@aztec-labs/foundation/schemas';
 import {
   BufferReader,
@@ -18,7 +19,6 @@ import {
   serializeToSink,
 } from '@aztec-labs/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec-labs/foundation/string';
-import { inspect } from 'util';
 
 import { PrivateLog } from '../logs/private_log.js';
 import { ScopedL2ToL1Message } from '../messaging/l2_to_l1_message.js';

package/src/kernel/private_validation_requests.ts

@@ -3,9 +3,9 @@ import {
   MAX_NOTE_HASH_READ_REQUESTS_PER_TX,
   MAX_NULLIFIER_READ_REQUESTS_PER_TX,
 } from '@aztec-labs/constants';
+import { inspect } from '@aztec-labs/foundation/inspect';
 import { BufferReader, serializeToBuffer } from '@aztec-labs/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec-labs/foundation/string';
-import { inspect } from 'util';
 
 import { ScopedKeyValidationRequestAndSeparator } from '../kernel/hints/scoped_key_validation_request_and_separator.js';
 import { ClaimedLengthArray, ClaimedLengthArrayFromBuffer } from './claimed_length_array.js';

package/src/kernel/public_call_request.ts

@@ -1,5 +1,6 @@
 import { COUNTED_PUBLIC_CALL_REQUEST_LENGTH, PUBLIC_CALL_REQUEST_LENGTH } from '@aztec-labs/constants';
 import { Fr } from '@aztec-labs/foundation/curves/bn254';
+import { inspect } from '@aztec-labs/foundation/inspect';
 import { schemas } from '@aztec-labs/foundation/schemas';
 import {
   BufferReader,
@@ -9,7 +10,6 @@ import {
   serializeToSink,
 } from '@aztec-labs/foundation/serialize';
 import type { FieldsOf } from '@aztec-labs/foundation/types';
-import { inspect } from 'util';
 import { z } from 'zod';
 
 import { AztecAddress } from '../aztec-address/index.js';

package/src/keys/derivation.ts

@@ -51,12 +51,12 @@ export function deriveMasterFallbackSecretKey(secretKey: Fr): GrumpkinScalar {
 }
 
 export function computePreaddress(publicKeysHash: Fr, partialAddress: Fr) {
-  return poseidon2HashWithSeparator([publicKeysHash, partialAddress], DomainSeparator.CONTRACT_ADDRESS_V2);
+  return poseidon2HashWithSeparator([publicKeysHash, partialAddress], DomainSeparator.CONTRACT_ADDRESS_V3);
 }
 
 export async function computeAddress(publicKeys: PublicKeys, partialAddress: Fr): Promise<AztecAddress> {
   // Given public keys and a partial address, we can compute our address in the following steps.
-  // 1. preaddress = poseidon2([publicKeysHash, partialAddress], DomainSeparator.CONTRACT_ADDRESS_V2);
+  // 1. preaddress = poseidon2([publicKeysHash, partialAddress], DomainSeparator.CONTRACT_ADDRESS_V3);
   // 2. addressPoint = (preaddress * G) + ivpk_m
   // 3. address = addressPoint.x
   const preaddress = await computePreaddress(await publicKeys.hash(), partialAddress);

package/src/keys/public_keys.ts

@@ -14,6 +14,7 @@ import { schemas } from '@aztec-labs/foundation/schemas';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec-labs/foundation/serialize';
 import { bufferToHex, withoutHexPrefix } from '@aztec-labs/foundation/string';
 import type { FieldsOf } from '@aztec-labs/foundation/types';
+import { Buffer } from 'buffer';
 import { z } from 'zod';
 
 import { PublicKey, hashPublicKey } from './public_key.js';

package/src/logs/contract_class_log.ts

@@ -1,6 +1,7 @@
 import { CONTRACT_CLASS_LOG_LENGTH, CONTRACT_CLASS_LOG_SIZE_IN_FIELDS } from '@aztec-labs/constants';
 import { poseidon2Hash } from '@aztec-labs/foundation/crypto/poseidon';
 import { Fr } from '@aztec-labs/foundation/curves/bn254';
+import { inspect } from '@aztec-labs/foundation/inspect';
 import { schemas } from '@aztec-labs/foundation/schemas';
 import {
   BufferReader,
@@ -10,7 +11,6 @@ import {
   serializeToSink,
 } from '@aztec-labs/foundation/serialize';
 import type { FieldsOf } from '@aztec-labs/foundation/types';
-import { inspect } from 'util';
 import { z } from 'zod';
 
 import { AztecAddress } from '../aztec-address/index.js';

package/src/logs/log_cursor.ts

@@ -1,5 +1,6 @@
 import { BlockNumber, BlockNumberSchema } from '@aztec-labs/foundation/branded-types';
 import { BufferReader, numToUInt32BE } from '@aztec-labs/foundation/serialize';
+import { Buffer } from 'buffer';
 import { z } from 'zod';
 
 import { schemas } from '../schemas/schemas.js';

package/src/logs/private_log.ts

@@ -2,6 +2,7 @@ import { PRIVATE_LOG_LENGTH, PRIVATE_LOG_SIZE_IN_FIELDS } from '@aztec-labs/cons
 import { type FieldsOf, makeTuple } from '@aztec-labs/foundation/array';
 import { padArrayEnd } from '@aztec-labs/foundation/collection';
 import { Fr } from '@aztec-labs/foundation/curves/bn254';
+import { inspect } from '@aztec-labs/foundation/inspect';
 import { schemas } from '@aztec-labs/foundation/schemas';
 import {
   BufferReader,
@@ -11,7 +12,6 @@ import {
   serializeToFields,
   serializeToSink,
 } from '@aztec-labs/foundation/serialize';
-import { inspect } from 'util';
 import { z } from 'zod';
 
 export class PrivateLog {

package/src/logs/public_log.ts

@@ -1,9 +1,9 @@
 import { FLAT_PUBLIC_LOGS_PAYLOAD_LENGTH, PUBLIC_LOG_HEADER_LENGTH } from '@aztec-labs/constants';
 import type { FieldsOf } from '@aztec-labs/foundation/array';
 import { Fr } from '@aztec-labs/foundation/curves/bn254';
+import { inspect } from '@aztec-labs/foundation/inspect';
 import { type ZodFor, schemas } from '@aztec-labs/foundation/schemas';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec-labs/foundation/serialize';
-import { inspect } from 'util';
 import { z } from 'zod';
 
 import { AztecAddress } from '../aztec-address/index.js';