@aztec/simulator 0.60.0 → 0.62.0

package/src/public/side_effect_trace.ts

@@ -1,11 +1,13 @@
 import { PublicExecutionRequest, UnencryptedFunctionL2Logs, UnencryptedL2Log } from '@aztec/circuit-types';
 import {
+  AvmContractBytecodeHints,
   AvmContractInstanceHint,
   AvmExecutionHints,
   AvmExternalCallHint,
   AvmKeyValueHint,
   AztecAddress,
   CallContext,
+  type ContractClassIdPreimage,
   type ContractInstanceWithAddress,
   ContractStorageRead,
   ContractStorageUpdateRequest,
@@ -27,6 +29,7 @@ import {
   Nullifier,
   type PublicInnerCallRequest,
   ReadRequest,
+  SerializableContractInstance,
   TreeLeafReadRequest,
 } from '@aztec/circuits.js';
 import { Fr } from '@aztec/foundation/fields';
@@ -42,7 +45,7 @@ import { type PublicSideEffectTraceInterface } from './side_effect_trace_interfa
 export type TracedContractInstance = { exists: boolean } & ContractInstanceWithAddress;
 
 export class PublicSideEffectTrace implements PublicSideEffectTraceInterface {
-  public logger = createDebugLogger('aztec:public_side_effect_trace');
+  public log = createDebugLogger('aztec:public_side_effect_trace');
 
   /** The side effect counter increments with every call to the trace. */
   private sideEffectCounter: number; // kept as number until finalized for efficiency
@@ -90,8 +93,6 @@ export class PublicSideEffectTrace implements PublicSideEffectTraceInterface {
     this.sideEffectCounter++;
   }
 
-  // TODO(dbanks12): checks against tx-wide limit need access to parent trace's length
-
   public tracePublicStorageRead(contractAddress: Fr, slot: Fr, value: Fr, _exists: boolean, _cached: boolean) {
     // NOTE: exists and cached are unused for now but may be used for optimizations or kernel hints later
     if (this.contractStorageReads.length >= MAX_PUBLIC_DATA_READS_PER_TX) {
@@ -103,7 +104,7 @@ export class PublicSideEffectTrace implements PublicSideEffectTraceInterface {
     this.avmCircuitHints.storageValues.items.push(
       new AvmKeyValueHint(/*key=*/ new Fr(this.sideEffectCounter), /*value=*/ value),
     );
-    this.logger.debug(`SLOAD cnt: ${this.sideEffectCounter} val: ${value} slot: ${slot}`);
+    this.log.debug(`SLOAD cnt: ${this.sideEffectCounter} val: ${value} slot: ${slot}`);
     this.incrementSideEffectCounter();
   }
 
@@ -114,7 +115,7 @@ export class PublicSideEffectTrace implements PublicSideEffectTraceInterface {
     this.contractStorageUpdateRequests.push(
       new ContractStorageUpdateRequest(slot, value, this.sideEffectCounter, contractAddress),
     );
-    this.logger.debug(`SSTORE cnt: ${this.sideEffectCounter} val: ${value} slot: ${slot}`);
+    this.log.debug(`SSTORE cnt: ${this.sideEffectCounter} val: ${value} slot: ${slot}`);
     this.incrementSideEffectCounter();
   }
 
@@ -136,7 +137,7 @@ export class PublicSideEffectTrace implements PublicSideEffectTraceInterface {
       throw new SideEffectLimitReachedError('note hash', MAX_NOTE_HASHES_PER_TX);
     }
     this.noteHashes.push(new NoteHash(noteHash, this.sideEffectCounter));
-    this.logger.debug(`NEW_NOTE_HASH cnt: ${this.sideEffectCounter}`);
+    this.log.debug(`NEW_NOTE_HASH cnt: ${this.sideEffectCounter}`);
     this.incrementSideEffectCounter();
   }
 
@@ -161,7 +162,7 @@ export class PublicSideEffectTrace implements PublicSideEffectTraceInterface {
     this.avmCircuitHints.nullifierExists.items.push(
       new AvmKeyValueHint(/*key=*/ new Fr(this.sideEffectCounter), /*value=*/ new Fr(exists ? 1 : 0)),
     );
-    this.logger.debug(`NULLIFIER_EXISTS cnt: ${this.sideEffectCounter}`);
+    this.log.debug(`NULLIFIER_EXISTS cnt: ${this.sideEffectCounter}`);
     this.incrementSideEffectCounter();
   }
 
@@ -171,7 +172,7 @@ export class PublicSideEffectTrace implements PublicSideEffectTraceInterface {
       throw new SideEffectLimitReachedError('nullifier', MAX_NULLIFIERS_PER_TX);
     }
     this.nullifiers.push(new Nullifier(nullifier, this.sideEffectCounter, /*noteHash=*/ Fr.ZERO));
-    this.logger.debug(`NEW_NULLIFIER cnt: ${this.sideEffectCounter}`);
+    this.log.debug(`NEW_NULLIFIER cnt: ${this.sideEffectCounter}`);
     this.incrementSideEffectCounter();
   }
 
@@ -194,7 +195,7 @@ export class PublicSideEffectTrace implements PublicSideEffectTraceInterface {
     }
     const recipientAddress = EthAddress.fromField(recipient);
     this.newL2ToL1Messages.push(new L2ToL1Message(recipientAddress, content, this.sideEffectCounter));
-    this.logger.debug(`NEW_L2_TO_L1_MSG cnt: ${this.sideEffectCounter}`);
+    this.log.debug(`NEW_L2_TO_L1_MSG cnt: ${this.sideEffectCounter}`);
     this.incrementSideEffectCounter();
   }
 
@@ -212,18 +213,21 @@ export class PublicSideEffectTrace implements PublicSideEffectTraceInterface {
     // This length is for charging DA and is checked on-chain - has to be length of log preimage + 4 bytes.
     // The .length call also has a +4 but that is unrelated
     this.unencryptedLogsHashes.push(new LogHash(basicLogHash, this.sideEffectCounter, new Fr(ulog.length + 4)));
-    this.logger.debug(`NEW_UNENCRYPTED_LOG cnt: ${this.sideEffectCounter}`);
+    this.log.debug(`NEW_UNENCRYPTED_LOG cnt: ${this.sideEffectCounter}`);
     this.incrementSideEffectCounter();
   }
 
-  public traceGetContractInstance(instance: TracedContractInstance) {
+  public traceGetContractInstance(
+    contractAddress: Fr,
+    exists: boolean,
+    instance: SerializableContractInstance = SerializableContractInstance.default(),
+  ) {
     this.enforceLimitOnNullifierChecks('(contract address nullifier from GETCONTRACTINSTANCE)');
-    // TODO(dbanks12): should emit a nullifier read request
 
     this.avmCircuitHints.contractInstances.items.push(
       new AvmContractInstanceHint(
-        instance.address,
-        new Fr(instance.exists ? 1 : 0),
+        contractAddress,
+        exists,
         instance.salt,
         instance.deployer,
         instance.contractClassId,
@@ -231,10 +235,44 @@ export class PublicSideEffectTrace implements PublicSideEffectTraceInterface {
         instance.publicKeys,
       ),
     );
-    this.logger.debug(`CONTRACT_INSTANCE cnt: ${this.sideEffectCounter}`);
+    this.log.debug(`CONTRACT_INSTANCE cnt: ${this.sideEffectCounter}`);
     this.incrementSideEffectCounter();
   }
 
+  // This tracing function gets called everytime we start simulation/execution.
+  // This happens both when starting a new top-level trace and the start of every nested trace
+  // We use this to collect the AvmContractBytecodeHints
+  public traceGetBytecode(
+    contractAddress: Fr,
+    exists: boolean,
+    bytecode: Buffer = Buffer.alloc(0),
+    contractInstance: SerializableContractInstance = SerializableContractInstance.default(),
+    contractClass: ContractClassIdPreimage = {
+      artifactHash: Fr.zero(),
+      privateFunctionsRoot: Fr.zero(),
+      publicBytecodeCommitment: Fr.zero(),
+    },
+  ) {
+    const instance = new AvmContractInstanceHint(
+      contractAddress,
+      exists,
+      contractInstance.salt,
+      contractInstance.deployer,
+      contractInstance.contractClassId,
+      contractInstance.initializationHash,
+      contractInstance.publicKeys,
+    );
+    // We need to deduplicate the contract instances based on addresses
+    this.avmCircuitHints.contractBytecodeHints.items.push(
+      new AvmContractBytecodeHints(bytecode, instance, contractClass),
+    );
+    this.log.debug(
+      `Bytecode retrieval for contract execution traced: exists=${exists}, instance=${JSON.stringify(
+        contractInstance,
+      )}`,
+    );
+  }
+
   /**
    * Trace a nested call.
    * Accept some results from a finished nested call's trace into this one.
@@ -288,6 +326,7 @@ export class PublicSideEffectTrace implements PublicSideEffectTraceInterface {
         result.returnValues,
         gasUsed,
         result.endSideEffectCounter,
+        nestedEnvironment.address,
       ),
     );
   }

package/src/public/side_effect_trace_interface.ts

@@ -1,9 +1,8 @@
-import { type Gas } from '@aztec/circuits.js';
+import { type ContractClassIdPreimage, type Gas, type SerializableContractInstance } from '@aztec/circuits.js';
 import { type Fr } from '@aztec/foundation/fields';
 
 import { type AvmContractCallResult } from '../avm/avm_contract_call_result.js';
 import { type AvmExecutionEnvironment } from '../avm/avm_execution_environment.js';
-import { type TracedContractInstance } from './side_effect_trace.js';
 
 export interface PublicSideEffectTraceInterface {
   fork(): PublicSideEffectTraceInterface;
@@ -18,8 +17,14 @@ export interface PublicSideEffectTraceInterface {
   traceL1ToL2MessageCheck(contractAddress: Fr, msgHash: Fr, msgLeafIndex: Fr, exists: boolean): void;
   traceNewL2ToL1Message(contractAddress: Fr, recipient: Fr, content: Fr): void;
   traceUnencryptedLog(contractAddress: Fr, log: Fr[]): void;
-  // TODO(dbanks12): odd that getContractInstance is a one-off in that it accepts an entire object instead of components
-  traceGetContractInstance(instance: TracedContractInstance): void;
+  traceGetContractInstance(contractAddress: Fr, exists: boolean, instance?: SerializableContractInstance): void;
+  traceGetBytecode(
+    contractAddress: Fr,
+    exists: boolean,
+    bytecode?: Buffer,
+    contractInstance?: SerializableContractInstance,
+    contractClass?: ContractClassIdPreimage,
+  ): void;
   traceNestedCall(
     /** The trace of the nested call. */
     nestedCallTrace: PublicSideEffectTraceInterface,

package/src/test/utils.ts

@@ -1,5 +1,5 @@
 import { L1Actor, L1ToL2Message, L2Actor } from '@aztec/circuit-types';
-import { type AztecAddress, EthAddress, type Fr } from '@aztec/circuits.js';
+import { type AztecAddress, EthAddress, Fr } from '@aztec/circuits.js';
 import { computeSecretHash } from '@aztec/circuits.js/hash';
 import { sha256ToField } from '@aztec/foundation/crypto';
 
@@ -16,6 +16,7 @@ export const buildL1ToL2Message = (
   contentPreimage: Fr[],
   targetContract: AztecAddress,
   secret: Fr,
+  msgIndex: Fr | number,
 ) => {
   // Write the selector into a buffer.
   const selectorBuf = Buffer.from(selector, 'hex');
@@ -23,5 +24,11 @@ export const buildL1ToL2Message = (
   const content = sha256ToField([selectorBuf, ...contentPreimage]);
   const secretHash = computeSecretHash(secret);
 
-  return new L1ToL2Message(new L1Actor(EthAddress.random(), 1), new L2Actor(targetContract, 1), content, secretHash);
+  return new L1ToL2Message(
+    new L1Actor(EthAddress.random(), 1),
+    new L2Actor(targetContract, 1),
+    content,
+    secretHash,
+    new Fr(msgIndex),
+  );
 };

package/dest/client/test_utils.d.ts

@@ -1,9 +0,0 @@
-import { Fr } from '@aztec/circuits.js';
-/**
- * Computes a note hiding point as is done by the default implementation injected by macros.
- * @param storageSlot - The slot to which the note was inserted.
- * @param noteContent - The note content (e.g. note.items).
- * @returns A note hash.
- */
-export declare function computeNoteHash(storageSlot: Fr, noteContent: Fr[]): Fr;
-//# sourceMappingURL=test_utils.d.ts.map

package/dest/client/test_utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"test_utils.d.ts","sourceRoot":"","sources":["../../src/client/test_utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAM,EAAE,EAAS,MAAM,oBAAoB,CAAC;AAsCnD;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,WAAW,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,GAAG,EAAE,CAYtE"}

package/dest/client/test_utils.js

@@ -1,27 +0,0 @@
-import { Fq, Fr, Point } from '@aztec/circuits.js';
-import { Grumpkin } from '@aztec/circuits.js/barretenberg';
-// Copied over from `noir-projects/aztec-nr/aztec/src/generators.nr`
-const GENERATORS = [
-    new Point(new Fr(0x30426e64aee30e998c13c8ceecda3a77807dbead52bc2f3bf0eae851b4b710c1n), new Fr(0x113156a068f603023240c96b4da5474667db3b8711c521c748212a15bc034ea6n), false),
-    new Point(new Fr(0x2825c79cc6a5cbbeef7d6a8f1b6a12b312aa338440aefeb4396148c89147c049n), new Fr(0x129bfd1da54b7062d6b544e7e36b90736350f6fba01228c41c72099509f5701en), false),
-    new Point(new Fr(0x0edb1e293c3ce91bfc04e3ceaa50d2c541fa9d091c72eb403efb1cfa2cb3357fn), new Fr(0x1341d675fa030ece3113ad53ca34fd13b19b6e9762046734f414824c4d6ade35n), false),
-    new Point(new Fr(0x0e0dad2250583f2a9f0acb04ededf1701b85b0393cae753fe7e14b88af81cb52n), new Fr(0x0973b02c5caac339ee4ad5dab51329920f7bf1b6a07e1dabe5df67040b300962n), false),
-    new Point(new Fr(0x2f3342e900e8c488a28931aae68970738fdc68afde2910de7b320c00c902087dn), new Fr(0x1bf958dc63cb09d59230603a0269ae86d6f92494da244910351f1132df20fc08n), false),
-];
-const G_SLOT = new Point(new Fr(0x041223147b680850dc82e8a55a952d4df20256fe0593d949a9541ca00f0abf15n), new Fr(0x0a8c72e60d0e60f5d804549d48f3044d06140b98ed717a9b532af630c1530791n), false);
-/**
- * Computes a note hiding point as is done by the default implementation injected by macros.
- * @param storageSlot - The slot to which the note was inserted.
- * @param noteContent - The note content (e.g. note.items).
- * @returns A note hash.
- */
-export function computeNoteHash(storageSlot, noteContent) {
-    const grumpkin = new Grumpkin();
-    const noteHidingPointBeforeSlotting = noteContent
-        .slice(1)
-        .reduce((acc, item, i) => grumpkin.add(acc, grumpkin.mul(GENERATORS[i + 1], new Fq(item.toBigInt()))), grumpkin.mul(GENERATORS[0], new Fq(noteContent[0].toBigInt())));
-    const slotPoint = grumpkin.mul(G_SLOT, new Fq(storageSlot.toBigInt()));
-    const noteHidingPoint = grumpkin.add(noteHidingPointBeforeSlotting, slotPoint);
-    return noteHidingPoint.x;
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdF91dGlscy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jbGllbnQvdGVzdF91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxLQUFLLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNuRCxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFM0Qsb0VBQW9FO0FBQ3BFLE1BQU0sVUFBVSxHQUFHO0lBQ2pCLElBQUksS0FBSyxDQUNQLElBQUksRUFBRSxDQUFDLG1FQUFtRSxDQUFDLEVBQzNFLElBQUksRUFBRSxDQUFDLG1FQUFtRSxDQUFDLEVBQzNFLEtBQUssQ0FDTjtJQUNELElBQUksS0FBSyxDQUNQLElBQUksRUFBRSxDQUFDLG1FQUFtRSxDQUFDLEVBQzNFLElBQUksRUFBRSxDQUFDLG1FQUFtRSxDQUFDLEVBQzNFLEtBQUssQ0FDTjtJQUNELElBQUksS0FBSyxDQUNQLElBQUksRUFBRSxDQUFDLG1FQUFtRSxDQUFDLEVBQzNFLElBQUksRUFBRSxDQUFDLG1FQUFtRSxDQUFDLEVBQzNFLEtBQUssQ0FDTjtJQUNELElBQUksS0FBSyxDQUNQLElBQUksRUFBRSxDQUFDLG1FQUFtRSxDQUFDLEVBQzNFLElBQUksRUFBRSxDQUFDLG1FQUFtRSxDQUFDLEVBQzNFLEtBQUssQ0FDTjtJQUNELElBQUksS0FBSyxDQUNQLElBQUksRUFBRSxDQUFDLG1FQUFtRSxDQUFDLEVBQzNFLElBQUksRUFBRSxDQUFDLG1FQUFtRSxDQUFDLEVBQzNFLEtBQUssQ0FDTjtDQUNGLENBQUM7QUFFRixNQUFNLE1BQU0sR0FBRyxJQUFJLEtBQUssQ0FDdEIsSUFBSSxFQUFFLENBQUMsbUVBQW1FLENBQUMsRUFDM0UsSUFBSSxFQUFFLENBQUMsbUVBQW1FLENBQUMsRUFDM0UsS0FBSyxDQUNOLENBQUM7QUFFRjs7Ozs7R0FLRztBQUNILE1BQU0sVUFBVSxlQUFlLENBQUMsV0FBZSxFQUFFLFdBQWlCO0lBQ2hFLE1BQU0sUUFBUSxHQUFHLElBQUksUUFBUSxFQUFFLENBQUM7SUFDaEMsTUFBTSw2QkFBNkIsR0FBRyxXQUFXO1NBQzlDLEtBQUssQ0FBQyxDQUFDLENBQUM7U0FDUixNQUFNLENBQ0wsQ0FBQyxHQUFHLEVBQUUsSUFBSSxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsUUFBUSxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFLElBQUksRUFBRSxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFDN0YsUUFBUSxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLEVBQUUsSUFBSSxFQUFFLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUMsQ0FDL0QsQ0FBQztJQUVKLE1BQU0sU0FBUyxHQUFHLFFBQVEsQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLElBQUksRUFBRSxDQUFDLFdBQVcsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDLENBQUM7SUFDdkUsTUFBTSxlQUFlLEdBQUcsUUFBUSxDQUFDLEdBQUcsQ0FBQyw2QkFBNkIsRUFBRSxTQUFTLENBQUMsQ0FBQztJQUMvRSxPQUFPLGVBQWUsQ0FBQyxDQUFDLENBQUM7QUFDM0IsQ0FBQyJ9

package/dest/common/side_effect_counter.d.ts

@@ -1,10 +0,0 @@
-/**
- * Keep track of the number of side effects across execution contexts.
- */
-export declare class SideEffectCounter {
-    private value;
-    constructor(value?: number);
-    current(): number;
-    count(): number;
-}
-//# sourceMappingURL=side_effect_counter.d.ts.map

package/dest/common/side_effect_counter.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"side_effect_counter.d.ts","sourceRoot":"","sources":["../../src/common/side_effect_counter.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,qBAAa,iBAAiB;IAChB,OAAO,CAAC,KAAK;gBAAL,KAAK,SAAI;IAG7B,OAAO;IAIP,KAAK;CAKN"}

package/dest/common/side_effect_counter.js

@@ -1,18 +0,0 @@
-/**
- * Keep track of the number of side effects across execution contexts.
- */
-export class SideEffectCounter {
-    constructor(value = 0) {
-        this.value = value;
-    }
-    // TODO(alexg) remove this once public side effect counters is fully accounted for on Noir side
-    current() {
-        return this.value;
-    }
-    count() {
-        const value = this.value;
-        this.value++;
-        return value;
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2lkZV9lZmZlY3RfY291bnRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb21tb24vc2lkZV9lZmZlY3RfY291bnRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7R0FFRztBQUNILE1BQU0sT0FBTyxpQkFBaUI7SUFDNUIsWUFBb0IsUUFBUSxDQUFDO1FBQVQsVUFBSyxHQUFMLEtBQUssQ0FBSTtJQUFHLENBQUM7SUFFakMsK0ZBQStGO0lBQy9GLE9BQU87UUFDTCxPQUFPLElBQUksQ0FBQyxLQUFLLENBQUM7SUFDcEIsQ0FBQztJQUVELEtBQUs7UUFDSCxNQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDO1FBQ3pCLElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUNiLE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQztDQUNGIn0=

package/dest/rollup/index.d.ts

@@ -1,2 +0,0 @@
-export * from './rollup.js';
-//# sourceMappingURL=index.d.ts.map

package/dest/rollup/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/rollup/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC"}

package/dest/rollup/index.js

@@ -1,2 +0,0 @@
-export * from './rollup.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcm9sbHVwL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsYUFBYSxDQUFDIn0=

package/dest/rollup/rollup.d.ts

@@ -1,101 +0,0 @@
-import { type BaseOrMergeRollupPublicInputs, type BaseParityInputs, type BaseRollupInputs, type BlockMergeRollupInputs, type BlockRootOrBlockMergePublicInputs, type BlockRootRollupInputs, type MergeRollupInputs, type ParityPublicInputs, type RootParityInputs, type RootRollupInputs, type RootRollupPublicInputs } from '@aztec/circuits.js';
-import { type SimulationProvider } from '../providers/simulation_provider.js';
-/**
- * Circuit simulator for the rollup circuits.
- */
-export interface RollupSimulator {
-    /**
-     * Simulates the base parity circuit from its inputs.
-     * @param inputs - Inputs to the circuit.
-     * @returns The public inputs of the parity circuit.
-     */
-    baseParityCircuit(inputs: BaseParityInputs): Promise<ParityPublicInputs>;
-    /**
-     * Simulates the root parity circuit from its inputs.
-     * @param inputs - Inputs to the circuit.
-     * @returns The public inputs of the parity circuit.
-     */
-    rootParityCircuit(inputs: RootParityInputs): Promise<ParityPublicInputs>;
-    /**
-     * Simulates the base rollup circuit from its inputs.
-     * @param input - Inputs to the circuit.
-     * @returns The public inputs as outputs of the simulation.
-     */
-    baseRollupCircuit(input: BaseRollupInputs): Promise<BaseOrMergeRollupPublicInputs>;
-    /**
-     * Simulates the merge rollup circuit from its inputs.
-     * @param input - Inputs to the circuit.
-     * @returns The public inputs as outputs of the simulation.
-     */
-    mergeRollupCircuit(input: MergeRollupInputs): Promise<BaseOrMergeRollupPublicInputs>;
-    /**
-     * Simulates the block root rollup circuit from its inputs.
-     * @param input - Inputs to the circuit.
-     * @returns The public inputs as outputs of the simulation.
-     */
-    blockRootRollupCircuit(input: BlockRootRollupInputs): Promise<BlockRootOrBlockMergePublicInputs>;
-    /**
-     * Simulates the block merge rollup circuit from its inputs.
-     * @param input - Inputs to the circuit.
-     * @returns The public inputs as outputs of the simulation.
-     */
-    blockMergeRollupCircuit(input: BlockMergeRollupInputs): Promise<BlockRootOrBlockMergePublicInputs>;
-    /**
-     * Simulates the root rollup circuit from its inputs.
-     * @param input - Inputs to the circuit.
-     * @returns The public inputs as outputs of the simulation.
-     */
-    rootRollupCircuit(input: RootRollupInputs): Promise<RootRollupPublicInputs>;
-}
-/**
- * Implements the rollup circuit simulator.
- */
-export declare class RealRollupCircuitSimulator implements RollupSimulator {
-    private simulationProvider;
-    private log;
-    private wasmSimulator;
-    constructor(simulationProvider: SimulationProvider);
-    /**
-     * Simulates the base parity circuit from its inputs.
-     * @param inputs - Inputs to the circuit.
-     * @returns The public inputs of the parity circuit.
-     */
-    baseParityCircuit(inputs: BaseParityInputs): Promise<ParityPublicInputs>;
-    /**
-     * Simulates the root parity circuit from its inputs.
-     * @param inputs - Inputs to the circuit.
-     * @returns The public inputs of the parity circuit.
-     */
-    rootParityCircuit(inputs: RootParityInputs): Promise<ParityPublicInputs>;
-    /**
-     * Simulates the base rollup circuit from its inputs.
-     * @param input - Inputs to the circuit.
-     * @returns The public inputs as outputs of the simulation.
-     */
-    baseRollupCircuit(input: BaseRollupInputs): Promise<BaseOrMergeRollupPublicInputs>;
-    /**
-     * Simulates the merge rollup circuit from its inputs.
-     * @param input - Inputs to the circuit.
-     * @returns The public inputs as outputs of the simulation.
-     */
-    mergeRollupCircuit(input: MergeRollupInputs): Promise<BaseOrMergeRollupPublicInputs>;
-    /**
-     * Simulates the block root rollup circuit from its inputs.
-     * @param input - Inputs to the circuit.
-     * @returns The public inputs as outputs of the simulation.
-     */
-    blockRootRollupCircuit(input: BlockRootRollupInputs): Promise<BlockRootOrBlockMergePublicInputs>;
-    /**
-     * Simulates the block merge rollup circuit from its inputs.
-     * @param input - Inputs to the circuit.
-     * @returns The public inputs as outputs of the simulation.
-     */
-    blockMergeRollupCircuit(input: BlockMergeRollupInputs): Promise<BlockRootOrBlockMergePublicInputs>;
-    /**
-     * Simulates the root rollup circuit from its inputs.
-     * @param input - Inputs to the circuit.
-     * @returns The public inputs as outputs of the simulation.
-     */
-    rootRollupCircuit(input: RootRollupInputs): Promise<RootRollupPublicInputs>;
-}
-//# sourceMappingURL=rollup.d.ts.map

package/dest/rollup/rollup.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"rollup.d.ts","sourceRoot":"","sources":["../../src/rollup/rollup.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,6BAA6B,EAClC,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,KAAK,sBAAsB,EAC3B,KAAK,iCAAiC,EACtC,KAAK,qBAAqB,EAC1B,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,KAAK,sBAAsB,EAC5B,MAAM,oBAAoB,CAAC;AAsB5B,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAE9E;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B;;;;OAIG;IACH,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACzE;;;;OAIG;IACH,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACzE;;;;OAIG;IACH,iBAAiB,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAC;IACnF;;;;OAIG;IACH,kBAAkB,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAC;IACrF;;;;OAIG;IACH,sBAAsB,CAAC,KAAK,EAAE,qBAAqB,GAAG,OAAO,CAAC,iCAAiC,CAAC,CAAC;IACjG;;;;OAIG;IACH,uBAAuB,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO,CAAC,iCAAiC,CAAC,CAAC;IACnG;;;;OAIG;IACH,iBAAiB,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;CAC7E;AAED;;GAEG;AACH,qBAAa,0BAA2B,YAAW,eAAe;IAMpD,OAAO,CAAC,kBAAkB;IALtC,OAAO,CAAC,GAAG,CAA+C;IAG1D,OAAO,CAAC,aAAa,CAAsC;gBAEvC,kBAAkB,EAAE,kBAAkB;IAE1D;;;;OAIG;IACU,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAarF;;;;OAIG;IACU,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAarF;;;;OAIG;IACU,iBAAiB,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,6BAA6B,CAAC;IAa/F;;;;OAIG;IACU,kBAAkB,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,6BAA6B,CAAC;IAajG;;;;OAIG;IACU,sBAAsB,CAAC,KAAK,EAAE,qBAAqB,GAAG,OAAO,CAAC,iCAAiC,CAAC;IAa7G;;;;OAIG;IACU,uBAAuB,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO,CAAC,iCAAiC,CAAC;IAa/G;;;;OAIG;IACU,iBAAiB,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,sBAAsB,CAAC;CAkBzF"}

package/dest/rollup/rollup.js

@@ -1,100 +0,0 @@
-import { createDebugLogger } from '@aztec/foundation/log';
-import { elapsed } from '@aztec/foundation/timer';
-import { SimulatedServerCircuitArtifacts, convertBaseParityInputsToWitnessMap, convertBaseParityOutputsFromWitnessMap, convertBlockMergeRollupInputsToWitnessMap, convertBlockMergeRollupOutputsFromWitnessMap, convertBlockRootRollupInputsToWitnessMap, convertBlockRootRollupOutputsFromWitnessMap, convertMergeRollupInputsToWitnessMap, convertMergeRollupOutputsFromWitnessMap, convertRootParityInputsToWitnessMap, convertRootParityOutputsFromWitnessMap, convertRootRollupInputsToWitnessMap, convertRootRollupOutputsFromWitnessMap, convertSimulatedBaseRollupInputsToWitnessMap, convertSimulatedBaseRollupOutputsFromWitnessMap, } from '@aztec/noir-protocol-circuits-types';
-import { WASMSimulator } from '../providers/acvm_wasm.js';
-/**
- * Implements the rollup circuit simulator.
- */
-export class RealRollupCircuitSimulator {
-    constructor(simulationProvider) {
-        this.simulationProvider = simulationProvider;
-        this.log = createDebugLogger('aztec:rollup-simulator');
-        // Some circuits are so small it is faster to use WASM
-        this.wasmSimulator = new WASMSimulator();
-    }
-    /**
-     * Simulates the base parity circuit from its inputs.
-     * @param inputs - Inputs to the circuit.
-     * @returns The public inputs of the parity circuit.
-     */
-    async baseParityCircuit(inputs) {
-        const witnessMap = convertBaseParityInputsToWitnessMap(inputs);
-        const witness = await this.simulationProvider.simulateCircuit(witnessMap, SimulatedServerCircuitArtifacts.BaseParityArtifact);
-        const result = convertBaseParityOutputsFromWitnessMap(witness);
-        return Promise.resolve(result);
-    }
-    /**
-     * Simulates the root parity circuit from its inputs.
-     * @param inputs - Inputs to the circuit.
-     * @returns The public inputs of the parity circuit.
-     */
-    async rootParityCircuit(inputs) {
-        const witnessMap = convertRootParityInputsToWitnessMap(inputs);
-        const witness = await this.simulationProvider.simulateCircuit(witnessMap, SimulatedServerCircuitArtifacts.RootParityArtifact);
-        const result = convertRootParityOutputsFromWitnessMap(witness);
-        return Promise.resolve(result);
-    }
-    /**
-     * Simulates the base rollup circuit from its inputs.
-     * @param input - Inputs to the circuit.
-     * @returns The public inputs as outputs of the simulation.
-     */
-    async baseRollupCircuit(input) {
-        const witnessMap = convertSimulatedBaseRollupInputsToWitnessMap(input);
-        const witness = await this.simulationProvider.simulateCircuit(witnessMap, SimulatedServerCircuitArtifacts.BaseRollupArtifact);
-        const result = convertSimulatedBaseRollupOutputsFromWitnessMap(witness);
-        return Promise.resolve(result);
-    }
-    /**
-     * Simulates the merge rollup circuit from its inputs.
-     * @param input - Inputs to the circuit.
-     * @returns The public inputs as outputs of the simulation.
-     */
-    async mergeRollupCircuit(input) {
-        const witnessMap = convertMergeRollupInputsToWitnessMap(input);
-        const witness = await this.wasmSimulator.simulateCircuit(witnessMap, SimulatedServerCircuitArtifacts.MergeRollupArtifact);
-        const result = convertMergeRollupOutputsFromWitnessMap(witness);
-        return result;
-    }
-    /**
-     * Simulates the block root rollup circuit from its inputs.
-     * @param input - Inputs to the circuit.
-     * @returns The public inputs as outputs of the simulation.
-     */
-    async blockRootRollupCircuit(input) {
-        const witnessMap = convertBlockRootRollupInputsToWitnessMap(input);
-        const witness = await this.wasmSimulator.simulateCircuit(witnessMap, SimulatedServerCircuitArtifacts.BlockRootRollupArtifact);
-        const result = convertBlockRootRollupOutputsFromWitnessMap(witness);
-        return Promise.resolve(result);
-    }
-    /**
-     * Simulates the block merge rollup circuit from its inputs.
-     * @param input - Inputs to the circuit.
-     * @returns The public inputs as outputs of the simulation.
-     */
-    async blockMergeRollupCircuit(input) {
-        const witnessMap = convertBlockMergeRollupInputsToWitnessMap(input);
-        const witness = await this.wasmSimulator.simulateCircuit(witnessMap, SimulatedServerCircuitArtifacts.BlockMergeRollupArtifact);
-        const result = convertBlockMergeRollupOutputsFromWitnessMap(witness);
-        return Promise.resolve(result);
-    }
-    /**
-     * Simulates the root rollup circuit from its inputs.
-     * @param input - Inputs to the circuit.
-     * @returns The public inputs as outputs of the simulation.
-     */
-    async rootRollupCircuit(input) {
-        const witnessMap = convertRootRollupInputsToWitnessMap(input);
-        const [duration, witness] = await elapsed(() => this.wasmSimulator.simulateCircuit(witnessMap, SimulatedServerCircuitArtifacts.RootRollupArtifact));
-        const result = convertRootRollupOutputsFromWitnessMap(witness);
-        this.log.debug(`Simulated root rollup circuit`, {
-            eventName: 'circuit-simulation',
-            circuitName: 'root-rollup',
-            duration,
-            inputSize: input.toBuffer().length,
-            outputSize: result.toBuffer().length,
-        });
-        return result;
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm9sbHVwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3JvbGx1cC9yb2xsdXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBY0EsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDMUQsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ2xELE9BQU8sRUFDTCwrQkFBK0IsRUFDL0IsbUNBQW1DLEVBQ25DLHNDQUFzQyxFQUN0Qyx5Q0FBeUMsRUFDekMsNENBQTRDLEVBQzVDLHdDQUF3QyxFQUN4QywyQ0FBMkMsRUFDM0Msb0NBQW9DLEVBQ3BDLHVDQUF1QyxFQUN2QyxtQ0FBbUMsRUFDbkMsc0NBQXNDLEVBQ3RDLG1DQUFtQyxFQUNuQyxzQ0FBc0MsRUFDdEMsNENBQTRDLEVBQzVDLCtDQUErQyxHQUNoRCxNQUFNLHFDQUFxQyxDQUFDO0FBRTdDLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQW1EMUQ7O0dBRUc7QUFDSCxNQUFNLE9BQU8sMEJBQTBCO0lBTXJDLFlBQW9CLGtCQUFzQztRQUF0Qyx1QkFBa0IsR0FBbEIsa0JBQWtCLENBQW9CO1FBTGxELFFBQUcsR0FBRyxpQkFBaUIsQ0FBQyx3QkFBd0IsQ0FBQyxDQUFDO1FBRTFELHNEQUFzRDtRQUM5QyxrQkFBYSxHQUFrQixJQUFJLGFBQWEsRUFBRSxDQUFDO0lBRUUsQ0FBQztJQUU5RDs7OztPQUlHO0lBQ0ksS0FBSyxDQUFDLGlCQUFpQixDQUFDLE1BQXdCO1FBQ3JELE1BQU0sVUFBVSxHQUFHLG1DQUFtQyxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBRS9ELE1BQU0sT0FBTyxHQUFHLE1BQU0sSUFBSSxDQUFDLGtCQUFrQixDQUFDLGVBQWUsQ0FDM0QsVUFBVSxFQUNWLCtCQUErQixDQUFDLGtCQUFrQixDQUNuRCxDQUFDO1FBRUYsTUFBTSxNQUFNLEdBQUcsc0NBQXNDLENBQUMsT0FBTyxDQUFDLENB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

package/src/client/test_utils.ts

@@ -1,57 +0,0 @@
-import { Fq, Fr, Point } from '@aztec/circuits.js';
-import { Grumpkin } from '@aztec/circuits.js/barretenberg';
-
-// Copied over from `noir-projects/aztec-nr/aztec/src/generators.nr`
-const GENERATORS = [
-  new Point(
-    new Fr(0x30426e64aee30e998c13c8ceecda3a77807dbead52bc2f3bf0eae851b4b710c1n),
-    new Fr(0x113156a068f603023240c96b4da5474667db3b8711c521c748212a15bc034ea6n),
-    false,
-  ),
-  new Point(
-    new Fr(0x2825c79cc6a5cbbeef7d6a8f1b6a12b312aa338440aefeb4396148c89147c049n),
-    new Fr(0x129bfd1da54b7062d6b544e7e36b90736350f6fba01228c41c72099509f5701en),
-    false,
-  ),
-  new Point(
-    new Fr(0x0edb1e293c3ce91bfc04e3ceaa50d2c541fa9d091c72eb403efb1cfa2cb3357fn),
-    new Fr(0x1341d675fa030ece3113ad53ca34fd13b19b6e9762046734f414824c4d6ade35n),
-    false,
-  ),
-  new Point(
-    new Fr(0x0e0dad2250583f2a9f0acb04ededf1701b85b0393cae753fe7e14b88af81cb52n),
-    new Fr(0x0973b02c5caac339ee4ad5dab51329920f7bf1b6a07e1dabe5df67040b300962n),
-    false,
-  ),
-  new Point(
-    new Fr(0x2f3342e900e8c488a28931aae68970738fdc68afde2910de7b320c00c902087dn),
-    new Fr(0x1bf958dc63cb09d59230603a0269ae86d6f92494da244910351f1132df20fc08n),
-    false,
-  ),
-];
-
-const G_SLOT = new Point(
-  new Fr(0x041223147b680850dc82e8a55a952d4df20256fe0593d949a9541ca00f0abf15n),
-  new Fr(0x0a8c72e60d0e60f5d804549d48f3044d06140b98ed717a9b532af630c1530791n),
-  false,
-);
-
-/**
- * Computes a note hiding point as is done by the default implementation injected by macros.
- * @param storageSlot - The slot to which the note was inserted.
- * @param noteContent - The note content (e.g. note.items).
- * @returns A note hash.
- */
-export function computeNoteHash(storageSlot: Fr, noteContent: Fr[]): Fr {
-  const grumpkin = new Grumpkin();
-  const noteHidingPointBeforeSlotting = noteContent
-    .slice(1)
-    .reduce(
-      (acc, item, i) => grumpkin.add(acc, grumpkin.mul(GENERATORS[i + 1], new Fq(item.toBigInt()))),
-      grumpkin.mul(GENERATORS[0], new Fq(noteContent[0].toBigInt())),
-    );
-
-  const slotPoint = grumpkin.mul(G_SLOT, new Fq(storageSlot.toBigInt()));
-  const noteHidingPoint = grumpkin.add(noteHidingPointBeforeSlotting, slotPoint);
-  return noteHidingPoint.x;
-}

package/src/common/side_effect_counter.ts

@@ -1,17 +0,0 @@
-/**
- * Keep track of the number of side effects across execution contexts.
- */
-export class SideEffectCounter {
-  constructor(private value = 0) {}
-
-  // TODO(alexg) remove this once public side effect counters is fully accounted for on Noir side
-  current() {
-    return this.value;
-  }
-
-  count() {
-    const value = this.value;
-    this.value++;
-    return value;
-  }
-}

package/src/rollup/index.ts

@@ -1 +0,0 @@
-export * from './rollup.js';