feat!: call stack validation optimisation.

yarn-project/acir-simulator/src/acvm/serialize.ts

@@ -147,8 +147,8 @@ export function toACVMPublicInputs(publicInputs: PrivateCircuitPublicInputs): AC
     ...publicInputs.newCommitments.map(toACVMField),
     ...publicInputs.newNullifiers.map(toACVMField),
     ...publicInputs.nullifiedCommitments.map(toACVMField),
-    ...publicInputs.privateCallStack.map(toACVMField),
-    ...publicInputs.publicCallStack.map(toACVMField),
+    ...publicInputs.privateCallStackHashes.map(toACVMField),
+    ...publicInputs.publicCallStackHashes.map(toACVMField),
     ...publicInputs.newL2ToL1Msgs.map(toACVMField),
     ...publicInputs.encryptedLogsHash.map(toACVMField),
     ...publicInputs.unencryptedLogsHash.map(toACVMField),

yarn-project/acir-simulator/src/client/private_execution.test.ts

@@ -14,7 +14,6 @@ import {
   TxContext,
 } from '@aztec/circuits.js';
 import {
-  computeCallStackItemHash,
   computeCommitmentNonce,
   computeSecretMessageHash,
   computeVarArgsHash,
@@ -371,8 +370,8 @@ describe('Private Execution test suite', () => {
       expect(result.nestedExecutions[0].callStackItem.publicInputs.returnValues[0]).toEqual(new Fr(privateIncrement));
 
       // check that Aztec.nr calculated the call stack item hash like cpp does
-      const expectedCallStackItemHash = computeCallStackItemHash(result.nestedExecutions[0].callStackItem);
-      expect(result.callStackItem.publicInputs.privateCallStack[0]).toEqual(expectedCallStackItemHash);
+      const expectedCallStackItemHash = result.nestedExecutions[0].callStackItem.hash();
+      expect(result.callStackItem.publicInputs.privateCallStackHashes[0]).toEqual(expectedCallStackItemHash);
     });
   });
 
@@ -557,11 +556,11 @@ describe('Private Execution test suite', () => {
         sideEffectCounter: 0,
       });
 
-      const publicCallRequestHash = computeCallStackItemHash(publicCallRequest.toPublicCallStackItem());
+      const publicCallRequestHash = publicCallRequest.toPublicCallStackItem().hash();
 
       expect(result.enqueuedPublicFunctionCalls).toHaveLength(1);
       expect(result.enqueuedPublicFunctionCalls[0]).toEqual(publicCallRequest);
-      expect(result.callStackItem.publicInputs.publicCallStack[0]).toEqual(publicCallRequestHash);
+      expect(result.callStackItem.publicInputs.publicCallStackHashes[0]).toEqual(publicCallRequestHash);
     });
   });
 

yarn-project/bootstrap.sh

@@ -22,8 +22,7 @@ for package in "@aztec/foundation" "@aztec/noir-compiler"; do
   yarn workspace $package build
 done
 
-# Run remake bindings before building Aztec.nr contracts or l1 contracts as they depend on files created by it.
-yarn workspace @aztec/circuits.js remake-bindings
+# Run remake constants before building Aztec.nr contracts or l1 contracts as they depend on files created by it.
 yarn workspace @aztec/circuits.js remake-constants
 
 (cd noir-contracts && ./bootstrap.sh)

yarn-project/circuits.js/package.json

@@ -23,7 +23,6 @@
     "clean": "rm -rf ./dest .tsbuildinfo",
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
     "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
-    "remake-bindings": "DEBUG=wasm ts-node-esm src/cbind/circuits.in.ts && prettier -w src/cbind/circuits.gen.ts",
     "remake-constants": "ts-node-esm src/cbind/constants.in.ts && prettier -w src/cbind/constants.gen.ts",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests"
   },

yarn-project/circuits.js/src/abis/abis.test.ts

@@ -20,7 +20,6 @@ import {
 } from '../tests/factories.js';
 import {
   computeBlockHashWithGlobals,
-  computeCallStackItemHash,
   computeCommitmentNonce,
   computeCompleteAddress,
   computeContractAddressFromPartial,
@@ -29,6 +28,8 @@ import {
   computeFunctionSelector,
   computeFunctionTreeRoot,
   computeGlobalsHash,
+  computePrivateCallStackItemHash,
+  computePublicCallStackItemHash,
   computePublicDataTreeIndex,
   computePublicDataTreeValue,
   computeSecretMessageHash,
@@ -209,13 +210,13 @@ describe('abis wasm bindings', () => {
 
   it('compute private call stack item hash', () => {
     const item = makePrivateCallStackItem();
-    const hash = computeCallStackItemHash(item);
+    const hash = computePrivateCallStackItemHash(item);
     expect(hash).toMatchSnapshot();
   });
 
   it('compute public call stack item hash', () => {
     const item = makePublicCallStackItem();
-    const hash = computeCallStackItemHash(item);
+    const hash = computePublicCallStackItemHash(item);
     expect(hash).toMatchSnapshot();
   });
 

yarn-project/circuits.js/src/abis/abis.ts

@@ -490,21 +490,6 @@ function computeContractDeploymentDataHash(data: ContractDeploymentData): Fr {
   );
 }
 
-/**
- * Computes a call stack item hash.
- * @param callStackItem - The call stack item.
- * @returns The call stack item hash.
- */
-export function computeCallStackItemHash(callStackItem: PrivateCallStackItem | PublicCallStackItem): Fr {
-  if (callStackItem instanceof PrivateCallStackItem) {
-    return computePrivateCallStackItemHash(callStackItem);
-  } else if (callStackItem instanceof PublicCallStackItem) {
-    return computePublicCallStackItemHash(callStackItem);
-  } else {
-    throw new Error(`Unexpected call stack item type`);
-  }
-}
-
 /**
  *
  */
@@ -536,8 +521,8 @@ function computePrivateInputsHash(input: PrivateCircuitPublicInputs) {
     ...input.newCommitments.map(fr => fr.toBuffer()),
     ...input.newNullifiers.map(fr => fr.toBuffer()),
     ...input.nullifiedCommitments.map(fr => fr.toBuffer()),
-    ...input.privateCallStack.map(fr => fr.toBuffer()),
-    ...input.publicCallStack.map(fr => fr.toBuffer()),
+    ...input.privateCallStackHashes.map(fr => fr.toBuffer()),
+    ...input.publicCallStackHashes.map(fr => fr.toBuffer()),
     ...input.newL2ToL1Msgs.map(fr => fr.toBuffer()),
     ...input.encryptedLogsHash.map(fr => fr.toBuffer()),
     ...input.unencryptedLogsHash.map(fr => fr.toBuffer()),
@@ -605,7 +590,7 @@ function computePublicInputsHash(input: PublicCircuitPublicInputs) {
     ...input.returnValues.map(fr => fr.toBuffer()),
     ...input.contractStorageUpdateRequests.map(computeContractStorageUpdateRequestHash),
     ...input.contractStorageReads.map(computeContractStorageReadsHash),
-    ...input.publicCallStack.map(fr => fr.toBuffer()),
+    ...input.publicCallStackHashes.map(fr => fr.toBuffer()),
     ...input.newCommitments.map(fr => fr.toBuffer()),
     ...input.newNullifiers.map(fr => fr.toBuffer()),
     ...input.newL2ToL1Msgs.map(fr => fr.toBuffer()),