@aztec/simulator 1.2.0 → 2.0.0-nightly.20250813

package/dest/public/side_effect_trace.js

@@ -74,14 +74,17 @@ export class SideEffectArrayLengths {
         forkedTrace.alreadyMergedIntoParent = true;
         this.sideEffectCounter = forkedTrace.sideEffectCounter;
         this.uniqueClassIds.acceptAndMerge(forkedTrace.uniqueClassIds);
-        // Accept even if reverted, since the user already paid for the writes
-        this.writtenPublicDataSlots = new Set(forkedTrace.writtenPublicDataSlots);
         if (!reverted) {
             this.publicDataWrites.push(...forkedTrace.publicDataWrites);
             this.noteHashes.push(...forkedTrace.noteHashes);
             this.nullifiers.push(...forkedTrace.nullifiers);
             this.l2ToL1Messages.push(...forkedTrace.l2ToL1Messages);
             this.publicLogs.push(...forkedTrace.publicLogs);
+            this.userPublicDataWritesLength += forkedTrace.userPublicDataWritesLength;
+            this.protocolPublicDataWritesLength += forkedTrace.protocolPublicDataWritesLength;
+            for (const slot of forkedTrace.writtenPublicDataSlots){
+                this.writtenPublicDataSlots.add(slot);
+            }
         }
     }
     getCounter() {
@@ -94,16 +97,19 @@ export class SideEffectArrayLengths {
         return this.previousSideEffectArrayLengths.noteHashes + this.noteHashes.length;
     }
     async tracePublicStorageWrite(contractAddress, slot, value, protocolWrite) {
-        if (protocolWrite) {
-            if (this.protocolPublicDataWritesLength + this.previousSideEffectArrayLengths.protocolPublicDataWrites >= PROTOCOL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX) {
-                throw new SideEffectLimitReachedError('protocol public data (contract storage) write', PROTOCOL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX);
-            }
-            this.protocolPublicDataWritesLength++;
-        } else {
-            if (this.userPublicDataWritesLength + this.previousSideEffectArrayLengths.publicDataWrites >= MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX) {
-                throw new SideEffectLimitReachedError('public data (contract storage) write', MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX);
+        // Only increment counts if the storage slot has not been written to before.
+        if (this.isStorageCold(contractAddress, slot)) {
+            if (protocolWrite) {
+                if (this.protocolPublicDataWritesLength + this.previousSideEffectArrayLengths.protocolPublicDataWrites >= PROTOCOL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX) {
+                    throw new SideEffectLimitReachedError('protocol public data (contract storage) write', PROTOCOL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX);
+                }
+                this.protocolPublicDataWritesLength++;
+            } else {
+                if (this.userPublicDataWritesLength + this.previousSideEffectArrayLengths.publicDataWrites >= MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX) {
+                    throw new SideEffectLimitReachedError('public data (contract storage) write', MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX);
+                }
+                this.userPublicDataWritesLength++;
             }
-            this.userPublicDataWritesLength++;
         }
         const leafSlot = await computePublicDataTreeLeafSlot(contractAddress, slot);
         this.publicDataWrites.push(new PublicDataUpdateRequest(leafSlot, value, this.sideEffectCounter));

package/dest/public/state_manager/state_manager.d.ts

@@ -78,7 +78,7 @@ export declare class PublicPersistableStateManager {
      * @param leafIndex - the leaf index being checked
      * @returns true if the note hash exists at the given leaf index, false otherwise
      */
-    checkNoteHashExists(contractAddress: AztecAddress, noteHash: Fr, leafIndex: Fr): Promise<boolean>;
+    checkNoteHashExists(contractAddress: AztecAddress, noteHash: Fr, leafIndex: bigint): Promise<boolean>;
     /**
      * Write a raw note hash, silo it and make it unique, then trace the write.
      * @param noteHash - the unsiloed note hash to write

package/dest/public/state_manager/state_manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"state_manager.d.ts","sourceRoot":"","sources":["../../../src/public/state_manager/state_manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"state_manager.d.ts","sourceRoot":"","sources":["../../../src/public/state_manager/state_manager.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAI9C,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,iCAAiC,EAA+B,MAAM,wBAAwB,CAAC;AAC7G,OAAO,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AAGtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAIlD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AACnF,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AAEtE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,mCAAmC,CAAC;AACxF,OAAO,EAA2B,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD;;;;;;;;GAQG;AACH,qBAAa,6BAA6B;IAOtC,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAb7B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA2C;IAE/D,sDAAsD;IACtD,OAAO,CAAC,uBAAuB,CAAS;gBAGrB,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,0BAA0B,EACvC,KAAK,EAAE,8BAA8B,EACrC,cAAc,EAAE,EAAE,EAAE,0BAA0B;IAC9C,SAAS,EAAE,MAAM,EAAE,+BAA+B;IAClD,kBAAkB,GAAE,OAAe,EACnC,aAAa,GAAE,aAA0C,EACzD,UAAU,GAAE,gBAAgD;IAG/E;;OAEG;WACW,MAAM,CAClB,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,0BAA0B,EACvC,KAAK,EAAE,8BAA8B,EACrC,kBAAkB,EAAE,OAAO,YAAQ,EACnC,cAAc,EAAE,EAAE,EAClB,SAAS,EAAE,MAAM,GAChB,6BAA6B;IAWhC;;OAEG;IACU,IAAI;IAcjB;;OAEG;IACU,KAAK,CAAC,WAAW,EAAE,6BAA6B;IAI7D;;OAEG;IACU,MAAM,CAAC,WAAW,EAAE,6BAA6B;YAIhD,MAAM;IAmBpB;;;;;;OAMG;IACU,YAAY,CAAC,eAAe,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,aAAa,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAc5G,aAAa,CAAC,eAAe,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO;IAItE;;;;;;OAMG;IACU,WAAW,CAAC,eAAe,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;IAc9E;;;;;;;OAOG;IACU,mBAAmB,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IASlH;;;OAGG;IACU,aAAa,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAMtF;;;OAGG;IACU,mBAAmB,CAAC,cAAc,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAMnE;;;OAGG;IACU,mBAAmB,CAAC,cAAc,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAQnE;;;;;OAKG;IACU,oBAAoB,CAAC,eAAe,EAAE,YAAY,EAAE,SAAS,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAejG;;;;OAIG;IACU,cAAc,CAAC,eAAe,EAAE,YAAY,EAAE,SAAS,EAAE,EAAE;IAMxE;;;OAGG;IACU,oBAAoB,CAAC,eAAe,EAAE,EAAE;IAsBrD;;;;;OAKG;IACU,wBAAwB,CAAC,OAAO,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAStF;;;;;OAKG;IACI,kBAAkB,CAAC,eAAe,EAAE,YAAY,EAAE,SAAS,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE;IAKnF;;;OAGG;IACI,wBAAwB,CAAC,aAAa,EAAE,mBAAmB;IAQlE;;;;OAIG;IACI,cAAc,CAAC,eAAe,EAAE,YAAY,EAAE,GAAG,EAAE,EAAE,EAAE;IAK9D;;;;OAIG;IACU,mBAAmB,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,4BAA4B,GAAG,SAAS,CAAC;YAkCpG,8BAA8B;IA0D5C;;;;OAIG;IACU,gBAAgB,CAAC,OAAO,EAAE,EAAE,GAAG,OAAO,CAAC,iCAAiC,GAAG,SAAS,CAAC;IA4BlG;;OAEG;IACU,WAAW,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAiBvE,0BAA0B,CAAC,cAAc,EAAE,uBAAuB,GAAG,OAAO,CAAC,MAAM,CAAC;IAIpF,OAAO,CAAC,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIpE,gBAAgB,IAAI,OAAO,CAAC,aAAa,CAAC;CAGxD"}

package/dest/public/state_manager/state_manager.js

@@ -1,12 +1,12 @@
-import { CANONICAL_AUTH_REGISTRY_ADDRESS, DEPLOYER_CONTRACT_ADDRESS, FEE_JUICE_ADDRESS, MULTI_CALL_ENTRYPOINT_ADDRESS, REGISTERER_CONTRACT_ADDRESS, ROUTER_ADDRESS } from '@aztec/constants';
+import { CANONICAL_AUTH_REGISTRY_ADDRESS, CONTRACT_CLASS_REGISTRY_CONTRACT_ADDRESS, CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS, FEE_JUICE_ADDRESS, MULTI_CALL_ENTRYPOINT_ADDRESS, ROUTER_ADDRESS } from '@aztec/constants';
 import { poseidon2Hash } from '@aztec/foundation/crypto';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
 import { createLogger } from '@aztec/foundation/log';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { SerializableContractInstance } from '@aztec/stdlib/contract';
+import { DelayedPublicMutableValues, DelayedPublicMutableValuesWithHash } from '@aztec/stdlib/delayed-public-mutable';
 import { computeNoteHashNonce, computeUniqueNoteHash, siloNoteHash, siloNullifier } from '@aztec/stdlib/hash';
-import { SharedMutableValues, SharedMutableValuesWithHash } from '@aztec/stdlib/shared-mutable';
 import { strict as assert } from 'assert';
 import { getPublicFunctionDebugName } from '../debug_fn_name.js';
 import { NullifierCollisionError, NullifierManager } from './nullifiers.js';
@@ -123,7 +123,7 @@ import { PublicStorage } from './public_storage.js';
    * @param leafIndex - the leaf index being checked
    * @returns true if the note hash exists at the given leaf index, false otherwise
    */ async checkNoteHashExists(contractAddress, noteHash, leafIndex) {
-        const gotLeafValue = await this.treesDB.getNoteHash(leafIndex.toBigInt());
+        const gotLeafValue = await this.treesDB.getNoteHash(leafIndex);
         const exists = gotLeafValue !== undefined && gotLeafValue.equals(noteHash);
         this.log.trace(`noteHashes(${contractAddress})@${noteHash} ?? leafIndex: ${leafIndex} | gotLeafValue: ${gotLeafValue}, exists: ${exists}.`);
         return Promise.resolve(exists);
@@ -253,7 +253,7 @@ import { PublicStorage } from './public_storage.js';
             return instance;
         }
         // This will decide internally whether to check the nullifier tree or not depending on doMerkleOperations.
-        const nullifierExistsInTree = await this.checkNullifierExists(AztecAddress.fromNumber(DEPLOYER_CONTRACT_ADDRESS), contractAddress.toField());
+        const nullifierExistsInTree = await this.checkNullifierExists(AztecAddress.fromNumber(CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS), contractAddress.toField());
         assert(exists == nullifierExistsInTree, `Contract instance for address ${contractAddress} in DB: ${exists} != nullifier tree: ${nullifierExistsInTree}. This is a bug!`);
         // All that is left is tocheck that the contract updatability information is correct.
         // That is, that the current and original contract class ids are correct.
@@ -267,19 +267,19 @@ import { PublicStorage } from './public_storage.js';
         // All failures are fatal and the simulation is not expected to be provable.
         if (this.doMerkleOperations) {
             // Conceptually, we want to do the following:
-            // * Read a SharedMutable at the contract update slot.
-            // * Obtain the expected current class id from the SharedMutable, at the current block.
+            // * Read a DelayedPublicMutable at the contract update slot.
+            // * Obtain the expected current class id from the DelayedPublicMutable, at the current block.
             // * if expectedId == 0 then currentClassId should be original contract class id
             // * if expectedId != 0 then currentClassId should be expectedId
             //
-            // However, we will also be checking the hash of the shared mutable values.
+            // However, we will also be checking the hash of the delayed public mutable values.
             // This is a bit of a leak of information, since the circuit will use it to prove
-            // one public read insted of N of the shared mutable values.
-            const { sharedMutableSlot, sharedMutableHashSlot } = await SharedMutableValuesWithHash.getContractUpdateSlots(instance.address);
-            const readDeployerStorage = async (storageSlot)=>await this.readStorage(ProtocolContractAddress.ContractInstanceDeployer, storageSlot);
-            const hash = await readDeployerStorage(sharedMutableHashSlot);
-            const sharedMutableValues = await SharedMutableValues.readFromTree(sharedMutableSlot, readDeployerStorage);
-            const preImage = sharedMutableValues.toFields();
+            // one public read insted of N of the delayed public mutable values.
+            const { delayedPublicMutableSlot, delayedPublicMutableHashSlot } = await DelayedPublicMutableValuesWithHash.getContractUpdateSlots(instance.address);
+            const readDeployerStorage = async (storageSlot)=>await this.readStorage(ProtocolContractAddress.ContractInstanceRegistry, storageSlot);
+            const hash = await readDeployerStorage(delayedPublicMutableHashSlot);
+            const delayedPublicMutableValues = await DelayedPublicMutableValues.readFromTree(delayedPublicMutableSlot, readDeployerStorage);
+            const preImage = delayedPublicMutableValues.toFields();
             // 1) update never scheduled: hash == 0 and preimage should be empty (but poseidon2hash(preimage) will not be 0s)
             if (hash.isZero()) {
                 assert(preImage.every((f)=>f.isZero()), `Found updatability hash 0 but preimage is not empty for contract instance ${instance.address}.`);
@@ -288,9 +288,9 @@ import { PublicStorage } from './public_storage.js';
             }
             // 2) At this point we know that the hash is not zero and this means that an update has at some point been scheduled.
             const computedHash = await poseidon2Hash(preImage);
-            assert(hash.equals(computedHash), `Shared mutable values hash mismatch for contract instance ${instance.address}. Expected: ${hash}, computed: ${computedHash}`);
+            assert(hash.equals(computedHash), `Delayed public mutable values hash mismatch for contract instance ${instance.address}. Expected: ${hash}, computed: ${computedHash}`);
             // We now check that, depending on the current block, the current class id is correct.
-            const expectedClassIdRaw = sharedMutableValues.svc.getCurrentAt(this.timestamp).at(0);
+            const expectedClassIdRaw = delayedPublicMutableValues.svc.getCurrentAt(this.timestamp).at(0);
             const expectedClassId = expectedClassIdRaw.isZero() ? instance.originalContractClassId : expectedClassIdRaw;
             assert(instance.currentContractClassId.equals(expectedClassId), `Current class id mismatch
         for contract instance ${instance.address}. Expected: ${expectedClassId}, current: ${instance.currentContractClassId}`);
@@ -345,5 +345,5 @@ import { PublicStorage } from './public_storage.js';
     }
 }
 function contractAddressIsCanonical(contractAddress) {
-    return contractAddress.equals(AztecAddress.fromNumber(CANONICAL_AUTH_REGISTRY_ADDRESS)) || contractAddress.equals(AztecAddress.fromNumber(DEPLOYER_CONTRACT_ADDRESS)) || contractAddress.equals(AztecAddress.fromNumber(REGISTERER_CONTRACT_ADDRESS)) || contractAddress.equals(AztecAddress.fromNumber(MULTI_CALL_ENTRYPOINT_ADDRESS)) || contractAddress.equals(AztecAddress.fromNumber(FEE_JUICE_ADDRESS)) || contractAddress.equals(AztecAddress.fromNumber(ROUTER_ADDRESS));
+    return contractAddress.equals(AztecAddress.fromNumber(CANONICAL_AUTH_REGISTRY_ADDRESS)) || contractAddress.equals(AztecAddress.fromNumber(CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS)) || contractAddress.equals(AztecAddress.fromNumber(CONTRACT_CLASS_REGISTRY_CONTRACT_ADDRESS)) || contractAddress.equals(AztecAddress.fromNumber(MULTI_CALL_ENTRYPOINT_ADDRESS)) || contractAddress.equals(AztecAddress.fromNumber(FEE_JUICE_ADDRESS)) || contractAddress.equals(AztecAddress.fromNumber(ROUTER_ADDRESS));
 }

package/dest/public/test_executor_metrics.d.ts

@@ -11,17 +11,27 @@ export interface PublicTxMetrics {
     totalDurationMs: number;
     manaUsed: number;
     totalInstructionsExecuted: number;
-    txHashMs: number | undefined;
     nonRevertiblePrivateInsertionsUs: number | undefined;
     revertiblePrivateInsertionsUs: number | undefined;
     enqueuedCalls: PublicEnqueuedCallMetrics[];
     revertedCode: RevertCode | undefined;
+    proverSimulationStepMs: number | undefined;
+    proverProvingStepMs: number | undefined;
+    proverTraceGenerationStepMs: number | undefined;
+    traceGenerationInteractionsMs: number | undefined;
+    traceGenerationTracesMs: number | undefined;
+    provingSumcheckMs: number | undefined;
+    provingPcsMs: number | undefined;
+    provingLogDerivativeInverseMs: number | undefined;
+    provingLogDerivativeInverseCommitmentsMs: number | undefined;
+    provingWireCommitmentsMs: number | undefined;
 }
 export declare enum PublicTxMetricsFilter {
     ALL = 0,
     TOTALS = 1,
     DURATIONS = 2,
-    INSTRUCTIONS = 3
+    INSTRUCTIONS = 3,
+    PROVING = 4
 }
 export declare class TestExecutorMetrics implements ExecutorMetricsInterface {
     #private;
@@ -34,8 +44,8 @@ export declare class TestExecutorMetrics implements ExecutorMetricsInterface {
     stopRecordingTxSimulation(txLabel: string, revertedCode?: RevertCode): void;
     recordEnqueuedCallSimulation(fnName: string, durationMs: number, manaUsed: number, totalInstructionsExecuted: number): void;
     recordEnqueuedCallSimulationFailure(fnName: string, durationMs: number, manaUsed: number, totalInstructionsExecuted: number): void;
-    recordTxHashComputation(durationMs: number): void;
     recordPrivateEffectsInsertion(durationUs: number, type: 'revertible' | 'non-revertible'): void;
+    recordProverMetrics(txLabel: string, metrics: Partial<PublicTxMetrics>): void;
     prettyPrint(filter?: PublicTxMetricsFilter): void;
     toPrettyString(filter?: PublicTxMetricsFilter): string;
     toJSON(indent?: number): string;

package/dest/public/test_executor_metrics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test_executor_metrics.d.ts","sourceRoot":"","sources":["../../src/public/test_executor_metrics.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAIpD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAEhF,MAAM,WAAW,yBAAyB;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,yBAAyB,EAAE,MAAM,CAAC;IAClC,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,eAAe;IAC9B,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,yBAAyB,EAAE,MAAM,CAAC;IAClC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,gCAAgC,EAAE,MAAM,GAAG,SAAS,CAAC;IACrD,6BAA6B,EAAE,MAAM,GAAG,SAAS,CAAC;IAClD,aAAa,EAAE,yBAAyB,EAAE,CAAC;IAC3C,YAAY,EAAE,UAAU,GAAG,SAAS,CAAC;CACtC;AAWD,oBAAY,qBAAqB;IAC/B,GAAG,IAAA;IACH,MAAM,IAAA;IACN,SAAS,IAAA;IACT,YAAY,IAAA;CACb;AAED,qBAAa,mBAAoB,YAAW,wBAAwB;;IAClE,OAAO,CAAC,MAAM,CAAS;IAEvB,OAAO,CAAC,SAAS,CAA2C;IAC5D,OAAO,CAAC,cAAc,CAAqB;IAC3C,OAAO,CAAC,OAAO,CAAoB;;IAMnC,0BAA0B,CAAC,OAAO,EAAE,MAAM;IAiB1C,yBAAyB,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,UAAU;IAkBpE,4BAA4B,CAC1B,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,yBAAyB,EAAE,MAAM;IAKnC,mCAAmC,CACjC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,yBAAyB,EAAE,MAAM;IAuBnC,uBAAuB,CAAC,UAAU,EAAE,MAAM;IAO1C,6BAA6B,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,GAAG,gBAAgB;IAkBvF,WAAW,CAAC,MAAM,GAAE,qBAAiD;IAIrE,cAAc,CAAC,MAAM,GAAE,qBAAiD;IAqExE,MAAM,CAAC,MAAM,SAAI;IAIjB,2BAA2B,CAAC,MAAM,SAAI;CAoCvC"}
+{"version":3,"file":"test_executor_metrics.d.ts","sourceRoot":"","sources":["../../src/public/test_executor_metrics.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAIpD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAEhF,MAAM,WAAW,yBAAyB;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,yBAAyB,EAAE,MAAM,CAAC;IAClC,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,eAAe;IAE9B,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,yBAAyB,EAAE,MAAM,CAAC;IAClC,gCAAgC,EAAE,MAAM,GAAG,SAAS,CAAC;IACrD,6BAA6B,EAAE,MAAM,GAAG,SAAS,CAAC;IAClD,aAAa,EAAE,yBAAyB,EAAE,CAAC;IAC3C,YAAY,EAAE,UAAU,GAAG,SAAS,CAAC;IAErC,sBAAsB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3C,mBAAmB,EAAE,MAAM,GAAG,SAAS,CAAC;IACxC,2BAA2B,EAAE,MAAM,GAAG,SAAS,CAAC;IAEhD,6BAA6B,EAAE,MAAM,GAAG,SAAS,CAAC;IAClD,uBAAuB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5C,iBAAiB,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,6BAA6B,EAAE,MAAM,GAAG,SAAS,CAAC;IAClD,wCAAwC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7D,wBAAwB,EAAE,MAAM,GAAG,SAAS,CAAC;CAC9C;AAWD,oBAAY,qBAAqB;IAC/B,GAAG,IAAA;IACH,MAAM,IAAA;IACN,SAAS,IAAA;IACT,YAAY,IAAA;IACZ,OAAO,IAAA;CACR;AA2BD,qBAAa,mBAAoB,YAAW,wBAAwB;;IAClE,OAAO,CAAC,MAAM,CAAS;IAEvB,OAAO,CAAC,SAAS,CAA2C;IAC5D,OAAO,CAAC,cAAc,CAAqB;IAC3C,OAAO,CAAC,OAAO,CAAoB;;IAMnC,0BAA0B,CAAC,OAAO,EAAE,MAAM;IAQ1C,yBAAyB,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,UAAU;IAkBpE,4BAA4B,CAC1B,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,yBAAyB,EAAE,MAAM;IAKnC,mCAAmC,CACjC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,yBAAyB,EAAE,MAAM;IAuBnC,6BAA6B,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,GAAG,gBAAgB;IAkBvF,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC;IAYtE,WAAW,CAAC,MAAM,GAAE,qBAAiD;IAIrE,cAAc,CAAC,MAAM,GAAE,qBAAiD;IAwGxE,MAAM,CAAC,MAAM,SAAI;IAIjB,2BAA2B,CAAC,MAAM,SAAI;CA6FvC"}

package/dest/public/test_executor_metrics.js

@@ -15,8 +15,33 @@ export var PublicTxMetricsFilter = /*#__PURE__*/ function(PublicTxMetricsFilter)
     PublicTxMetricsFilter[PublicTxMetricsFilter["TOTALS"] = 1] = "TOTALS";
     PublicTxMetricsFilter[PublicTxMetricsFilter["DURATIONS"] = 2] = "DURATIONS";
     PublicTxMetricsFilter[PublicTxMetricsFilter["INSTRUCTIONS"] = 3] = "INSTRUCTIONS";
+    PublicTxMetricsFilter[PublicTxMetricsFilter["PROVING"] = 4] = "PROVING";
     return PublicTxMetricsFilter;
 }({});
+function createEmptyTxMetrics() {
+    return {
+        // TS simulation
+        totalDurationMs: 0,
+        manaUsed: 0,
+        totalInstructionsExecuted: 0,
+        nonRevertiblePrivateInsertionsUs: undefined,
+        revertiblePrivateInsertionsUs: undefined,
+        enqueuedCalls: [],
+        revertedCode: undefined,
+        // Proving
+        proverSimulationStepMs: undefined,
+        proverProvingStepMs: undefined,
+        proverTraceGenerationStepMs: undefined,
+        // Proving (detail)
+        traceGenerationInteractionsMs: undefined,
+        traceGenerationTracesMs: undefined,
+        provingSumcheckMs: undefined,
+        provingPcsMs: undefined,
+        provingLogDerivativeInverseMs: undefined,
+        provingLogDerivativeInverseCommitmentsMs: undefined,
+        provingWireCommitmentsMs: undefined
+    };
+}
 export class TestExecutorMetrics {
     logger;
     // tx label -> tx metrics
@@ -29,16 +54,7 @@ export class TestExecutorMetrics {
     startRecordingTxSimulation(txLabel) {
         assert(!this.currentTxLabel, 'Cannot start recording tx simulation when another is live');
         assert(!this.txMetrics.has(txLabel), 'Cannot start recording metrics for tx with duplicate label');
-        this.txMetrics.set(txLabel, {
-            totalDurationMs: 0,
-            manaUsed: 0,
-            totalInstructionsExecuted: 0,
-            txHashMs: undefined,
-            nonRevertiblePrivateInsertionsUs: undefined,
-            revertiblePrivateInsertionsUs: undefined,
-            enqueuedCalls: [],
-            revertedCode: undefined
-        });
+        this.txMetrics.set(txLabel, createEmptyTxMetrics());
         this.currentTxLabel = txLabel;
         this.txTimer = new Timer();
     }
@@ -72,12 +88,6 @@ export class TestExecutorMetrics {
             reverted
         });
     }
-    recordTxHashComputation(durationMs) {
-        assert(this.currentTxLabel, 'Cannot record tx hash computation time when no tx is live');
-        const txMetrics = this.txMetrics.get(this.currentTxLabel);
-        assert(txMetrics.txHashMs === undefined, 'Cannot RE-record tx hash computation time');
-        txMetrics.txHashMs = durationMs;
-    }
     recordPrivateEffectsInsertion(durationUs, type) {
         assert(this.currentTxLabel, 'Cannot record private effects insertion when no tx is live');
         const txMetrics = this.txMetrics.get(this.currentTxLabel);
@@ -89,6 +99,17 @@ export class TestExecutorMetrics {
             txMetrics.nonRevertiblePrivateInsertionsUs = durationUs;
         }
     }
+    recordProverMetrics(txLabel, metrics) {
+        if (!this.txMetrics.has(txLabel)) {
+            this.txMetrics.set(txLabel, createEmptyTxMetrics());
+        }
+        const txMetrics = this.txMetrics.get(txLabel);
+        for (const [key, value] of Object.entries(metrics)){
+            if (key in txMetrics) {
+                txMetrics[key] = value;
+            }
+        }
+    }
     prettyPrint(filter = 0) {
         this.logger.info(this.toPrettyString(filter));
     }
@@ -111,11 +132,46 @@ export class TestExecutorMetrics {
                 pretty += `${INDENT0}Total instructions executed: ${fmtNum(txMetrics.totalInstructionsExecuted)}\n`;
             }
             if (filter === 2 || filter === 0) {
-                pretty += `${INDENT0}Tx hash computation: ${fmtNum(txMetrics.txHashMs, 'ms')}\n`;
                 pretty += `${INDENT0}Private insertions:\n`;
                 pretty += `${INDENT1}Non-revertible: ${fmtNum(txMetrics.nonRevertiblePrivateInsertionsUs / 1_000, 'ms')}\n`;
                 pretty += `${INDENT1}Revertible: ${fmtNum(txMetrics.revertiblePrivateInsertionsUs / 1_000, 'ms')}\n`;
             }
+            if (filter === 4 || filter === 0) {
+                let provingPretty = '';
+                if (txMetrics.proverSimulationStepMs !== undefined) {
+                    provingPretty += `${INDENT1}Simulation (all): ${fmtNum(txMetrics.proverSimulationStepMs, 'ms')}\n`;
+                }
+                if (txMetrics.proverProvingStepMs !== undefined) {
+                    provingPretty += `${INDENT1}Proving (all): ${fmtNum(txMetrics.proverProvingStepMs, 'ms')}\n`;
+                }
+                if (txMetrics.proverTraceGenerationStepMs !== undefined) {
+                    provingPretty += `${INDENT1}Trace generation (all): ${fmtNum(txMetrics.proverTraceGenerationStepMs, 'ms')}\n`;
+                }
+                if (txMetrics.traceGenerationInteractionsMs !== undefined) {
+                    provingPretty += `${INDENT1}Trace generation interactions: ${fmtNum(txMetrics.traceGenerationInteractionsMs, 'ms')}\n`;
+                }
+                if (txMetrics.traceGenerationTracesMs !== undefined) {
+                    provingPretty += `${INDENT1}Trace generation traces: ${fmtNum(txMetrics.traceGenerationTracesMs, 'ms')}\n`;
+                }
+                if (txMetrics.provingSumcheckMs !== undefined) {
+                    provingPretty += `${INDENT1}Sumcheck: ${fmtNum(txMetrics.provingSumcheckMs, 'ms')}\n`;
+                }
+                if (txMetrics.provingPcsMs !== undefined) {
+                    provingPretty += `${INDENT1}PCS: ${fmtNum(txMetrics.provingPcsMs, 'ms')}\n`;
+                }
+                if (txMetrics.provingLogDerivativeInverseMs !== undefined) {
+                    provingPretty += `${INDENT1}Log derivative inverse: ${fmtNum(txMetrics.provingLogDerivativeInverseMs, 'ms')}\n`;
+                }
+                if (txMetrics.provingLogDerivativeInverseCommitmentsMs !== undefined) {
+                    provingPretty += `${INDENT1}Log derivative inverse commitments: ${fmtNum(txMetrics.provingLogDerivativeInverseCommitmentsMs, 'ms')}\n`;
+                }
+                if (txMetrics.provingWireCommitmentsMs !== undefined) {
+                    provingPretty += `${INDENT1}Wire commitments: ${fmtNum(txMetrics.provingWireCommitmentsMs, 'ms')}\n`;
+                }
+                if (provingPretty.length > 0) {
+                    pretty += `${INDENT0}Proving:\n${provingPretty}`;
+                }
+            }
             if (filter !== 1) {
                 // totals exclude enqueued calls
                 pretty += this.#enqueuedCallsToPrettyString(txMetrics, filter);
@@ -153,38 +209,94 @@ export class TestExecutorMetrics {
         return JSON.stringify(Object.fromEntries(this.txMetrics.entries()), null, indent);
     }
     toGithubActionBenchmarkJSON(indent = 2) {
+        const metricsInfo = {
+            totalInstructionsExecuted: {
+                name: 'totalInstructionsExecuted',
+                unit: '#instructions',
+                category: 3
+            },
+            totalDurationMs: {
+                name: 'totalDurationMs',
+                unit: 'ms',
+                category: 2
+            },
+            manaUsed: {
+                name: 'manaUsed',
+                unit: 'mana',
+                category: 1
+            },
+            nonRevertiblePrivateInsertionsUs: {
+                name: 'nonRevertiblePrivateInsertionsUs',
+                unit: 'us',
+                category: 2
+            },
+            revertiblePrivateInsertionsUs: {
+                name: 'revertiblePrivateInsertionsUs',
+                unit: 'us',
+                category: 2
+            },
+            proverSimulationStepMs: {
+                name: 'proverSimulationStepMs',
+                unit: 'ms',
+                category: 4
+            },
+            proverProvingStepMs: {
+                name: 'proverProvingStepMs',
+                unit: 'ms',
+                category: 4
+            },
+            proverTraceGenerationStepMs: {
+                name: 'proverTraceGenerationStepMs',
+                unit: 'ms',
+                category: 4
+            },
+            traceGenerationInteractionsMs: {
+                name: 'traceGenerationInteractionsMs',
+                unit: 'ms',
+                category: 4
+            },
+            traceGenerationTracesMs: {
+                name: 'traceGenerationTracesMs',
+                unit: 'ms',
+                category: 4
+            },
+            provingSumcheckMs: {
+                name: 'provingSumcheckMs',
+                unit: 'ms',
+                category: 4
+            },
+            provingPcsMs: {
+                name: 'provingPcsMs',
+                unit: 'ms',
+                category: 4
+            },
+            provingLogDerivativeInverseMs: {
+                name: 'provingLogDerivativeInverseMs',
+                unit: 'ms',
+                category: 4
+            },
+            provingLogDerivativeInverseCommitmentsMs: {
+                name: 'provingLogDerivativeInverseCommitmentsMs',
+                unit: 'ms',
+                category: 4
+            },
+            provingWireCommitmentsMs: {
+                name: 'provingWireCommitmentsMs',
+                unit: 'ms',
+                category: 4
+            }
+        };
         const data = [];
         for (const [txLabel, txMetrics] of this.txMetrics.entries()){
-            data.push({
-                name: `${txLabel}/totalInstructionsExecuted`,
-                value: txMetrics.totalInstructionsExecuted,
-                unit: '#instructions'
-            });
-            data.push({
-                name: `${txLabel}/totalDurationMs`,
-                value: txMetrics.totalDurationMs,
-                unit: 'ms'
-            });
-            data.push({
-                name: `${txLabel}/manaUsed`,
-                value: txMetrics.manaUsed,
-                unit: 'mana'
-            });
-            data.push({
-                name: `${txLabel}/txHashMs`,
-                value: txMetrics.txHashMs,
-                unit: 'ms'
-            });
-            data.push({
-                name: `${txLabel}/nonRevertiblePrivateInsertionsUs`,
-                value: txMetrics.nonRevertiblePrivateInsertionsUs,
-                unit: 'us'
-            });
-            data.push({
-                name: `${txLabel}/revertiblePrivateInsertionsUs`,
-                value: txMetrics.revertiblePrivateInsertionsUs,
-                unit: 'us'
-            });
+            for (const [key, value] of Object.entries(txMetrics)){
+                if (value !== undefined && key in metricsInfo) {
+                    data.push({
+                        name: `${txLabel}/${metricsInfo[key].name}`,
+                        value: value,
+                        unit: metricsInfo[key].unit
+                    });
+                }
+            }
         }
         return JSON.stringify(data, null, indent);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/simulator",
-  "version": "1.2.0",
+  "version": "2.0.0-nightly.20250813",
   "type": "module",
   "exports": {
     "./server": "./dest/server.js",
@@ -63,25 +63,25 @@
     ]
   },
   "dependencies": {
-    "@aztec/constants": "1.2.0",
-    "@aztec/foundation": "1.2.0",
-    "@aztec/noir-acvm_js": "1.2.0",
-    "@aztec/noir-noirc_abi": "1.2.0",
-    "@aztec/noir-protocol-circuits-types": "1.2.0",
-    "@aztec/noir-types": "1.2.0",
-    "@aztec/protocol-contracts": "1.2.0",
-    "@aztec/stdlib": "1.2.0",
-    "@aztec/telemetry-client": "1.2.0",
-    "@aztec/world-state": "1.2.0",
+    "@aztec/constants": "2.0.0-nightly.20250813",
+    "@aztec/foundation": "2.0.0-nightly.20250813",
+    "@aztec/noir-acvm_js": "2.0.0-nightly.20250813",
+    "@aztec/noir-noirc_abi": "2.0.0-nightly.20250813",
+    "@aztec/noir-protocol-circuits-types": "2.0.0-nightly.20250813",
+    "@aztec/noir-types": "2.0.0-nightly.20250813",
+    "@aztec/protocol-contracts": "2.0.0-nightly.20250813",
+    "@aztec/stdlib": "2.0.0-nightly.20250813",
+    "@aztec/telemetry-client": "2.0.0-nightly.20250813",
+    "@aztec/world-state": "2.0.0-nightly.20250813",
     "lodash.clonedeep": "^4.5.0",
     "lodash.merge": "^4.6.2",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@aztec/kv-store": "1.2.0",
-    "@aztec/merkle-tree": "1.2.0",
-    "@aztec/noir-contracts.js": "1.2.0",
-    "@aztec/noir-test-contracts.js": "1.2.0",
+    "@aztec/kv-store": "2.0.0-nightly.20250813",
+    "@aztec/merkle-tree": "2.0.0-nightly.20250813",
+    "@aztec/noir-contracts.js": "2.0.0-nightly.20250813",
+    "@aztec/noir-test-contracts.js": "2.0.0-nightly.20250813",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/lodash.clonedeep": "^4.5.7",

package/src/private/circuit_recording/circuit_recorder.ts

@@ -159,11 +159,11 @@ export class CircuitRecorder {
         throw new Error(`Oracle method ${name} not found when setting up recording callback`);
       }
 
-      const isExternalCall = (name as keyof ACIRCallback) === 'callPrivateFunction';
+      const isExternalCall = (name as keyof ACIRCallback) === 'privateCallPrivateFunction';
 
       recordingCallback[name as keyof ACIRCallback] = (...args: ForeignCallInput[]): ReturnType<typeof fn> => {
         const timer = new Timer();
-        // If we're entering another circuit via `callPrivateFunction`, we increase the stack depth and set the
+        // If we're entering another circuit via `privateCallPrivateFunction`, we increase the stack depth and set the
         // newCircuit variable to ensure we are creating a new recording object.
         if (isExternalCall) {
           this.stackDepth++;

package/src/public/avm/fixtures/base_avm_simulation_tester.ts

@@ -1,4 +1,4 @@
-import { DEPLOYER_CONTRACT_ADDRESS } from '@aztec/constants';
+import { CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
@@ -95,7 +95,7 @@ export abstract class BaseAvmSimulationTester {
 
   private async insertContractAddressNullifier(contractAddress: AztecAddress) {
     const contractAddressNullifier = await siloNullifier(
-      AztecAddress.fromNumber(DEPLOYER_CONTRACT_ADDRESS),
+      AztecAddress.fromNumber(CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS),
       contractAddress.toField(),
     );
     await this.merkleTrees.sequentialInsert(MerkleTreeId.NULLIFIER_TREE, [contractAddressNullifier.toBuffer()]);

package/src/public/avm/fixtures/utils.ts

@@ -1,4 +1,4 @@
-import { DEPLOYER_CONTRACT_ADDRESS } from '@aztec/constants';
+import { CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 import {
   type ContractArtifact,
@@ -141,7 +141,7 @@ export async function createContractClassAndInstance(
         });
 
   const contractAddressNullifier = await siloNullifier(
-    AztecAddress.fromNumber(DEPLOYER_CONTRACT_ADDRESS),
+    AztecAddress.fromNumber(CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS),
     contractInstance.address.toField(),
   );
 

package/src/public/avm/opcodes/accrued_substate.ts

@@ -36,11 +36,12 @@ export class NoteHashExists extends Instruction {
     );
     const operands = [this.noteHashOffset, this.leafIndexOffset, this.existsOffset];
     const [noteHashOffset, leafIndexOffset, existsOffset] = addressing.resolve(operands, memory);
-    memory.checkTags(TypeTag.FIELD, noteHashOffset, leafIndexOffset);
+    memory.checkTag(TypeTag.FIELD, noteHashOffset);
+    memory.checkTag(TypeTag.UINT64, leafIndexOffset);
 
     // Note that this instruction accepts any type in memory, and converts to Field.
     const noteHash = memory.get(noteHashOffset).toFr();
-    const leafIndex = memory.get(leafIndexOffset).toFr();
+    const leafIndex = memory.get(leafIndexOffset).toBigInt();
 
     const exists = await context.persistableState.checkNoteHashExists(context.environment.address, noteHash, leafIndex);
     memory.set(existsOffset, exists ? new Uint1(1) : new Uint1(0));
@@ -198,7 +199,9 @@ export class L1ToL2MessageExists extends Instruction {
 
     const operands = [this.msgHashOffset, this.msgLeafIndexOffset, this.existsOffset];
     const [msgHashOffset, msgLeafIndexOffset, existsOffset] = addressing.resolve(operands, memory);
-    memory.checkTags(TypeTag.FIELD, msgHashOffset, msgLeafIndexOffset);
+
+    memory.checkTag(TypeTag.FIELD, msgHashOffset);
+    memory.checkTag(TypeTag.UINT64, msgLeafIndexOffset);
 
     const msgHash = memory.get(msgHashOffset).toFr();
     const msgLeafIndex = memory.get(msgLeafIndexOffset).toFr();

package/src/public/avm/opcodes/comparators.ts

@@ -15,7 +15,7 @@ abstract class ComparatorInstruction extends ThreeOperandInstruction {
 
     const operands = [this.aOffset, this.bOffset, this.dstOffset];
     const [aOffset, bOffset, dstOffset] = addressing.resolve(operands, memory);
-    memory.checkTagsAreSame(aOffset, bOffset);
+    memory.checkTagsAreSame(aOffset, bOffset); // Brillig semantic enforces that tags match.
 
     const a = memory.get(aOffset);
     const b = memory.get(bOffset);

package/src/public/avm/opcodes/environment_getters.ts

@@ -1,5 +1,5 @@
 import type { AvmContext } from '../avm_context.js';
-import { Field, Uint32, Uint64, Uint128 } from '../avm_memory_types.js';
+import { Field, Uint1, Uint32, Uint64, Uint128 } from '../avm_memory_types.js';
 import { InstructionExecutionError } from '../errors.js';
 import { Opcode, OperandType } from '../serialization/instruction_serialization.js';
 import { Addressing } from './addressing_mode.js';
@@ -13,8 +13,8 @@ export enum EnvironmentVariable {
   VERSION,
   BLOCKNUMBER,
   TIMESTAMP,
-  FEEPERL2GAS,
-  FEEPERDAGAS,
+  BASEFEEPERL2GAS,
+  BASEFEEPERDAGAS,
   ISSTATICCALL,
   L2GASLEFT,
   DAGASLEFT,
@@ -36,16 +36,16 @@ function getValue(e: EnvironmentVariable, ctx: AvmContext) {
       return new Uint32(ctx.environment.globals.blockNumber);
     case EnvironmentVariable.TIMESTAMP:
       return new Uint64(ctx.environment.globals.timestamp);
-    case EnvironmentVariable.FEEPERL2GAS:
+    case EnvironmentVariable.BASEFEEPERL2GAS:
       return new Uint128(ctx.environment.globals.gasFees.feePerL2Gas);
-    case EnvironmentVariable.FEEPERDAGAS:
+    case EnvironmentVariable.BASEFEEPERDAGAS:
       return new Uint128(ctx.environment.globals.gasFees.feePerDaGas);
     case EnvironmentVariable.ISSTATICCALL:
-      return new Field(ctx.environment.isStaticCall ? 1 : 0);
+      return new Uint1(ctx.environment.isStaticCall ? 1 : 0);
     case EnvironmentVariable.L2GASLEFT:
-      return new Field(ctx.machineState.l2GasLeft);
+      return new Uint32(ctx.machineState.l2GasLeft);
     case EnvironmentVariable.DAGASLEFT:
-      return new Field(ctx.machineState.daGasLeft);
+      return new Uint32(ctx.machineState.daGasLeft);
     default:
       throw new Error(`Unknown environment variable ${e}`);
   }