Pw/fix end to end test

bootstrap.sh

@@ -58,6 +58,7 @@ PROJECTS=(
   "yarn-project/kernel-prover:yarn build"
   "yarn-project/aztec-rpc:yarn build"
   "yarn-project/aztec.js:yarn build"
+  "yarn-project/noir-contracts:yarn build"
 )
 
 for E in "${PROJECTS[@]}"; do

yarn-project/acir-simulator/package.json

@@ -29,6 +29,7 @@
     "rootDir": "./src"
   },
   "dependencies": {
+    "@aztec/circuits.js": "workspace:^",
     "tslib": "^2.4.0"
   },
   "devDependencies": {

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

@@ -1,4 +1,4 @@
-import { AztecAddress, CallContext, ContractDeploymentData } from './circuits.js';
+import { AztecAddress, CallContext, ContractDeploymentData } from '@aztec/circuits.js';
 import { NoteLoadOracleInputs } from './db_oracle.js';
 
 export interface ACIRCallback {

yarn-project/acir-simulator/src/db_oracle.ts

@@ -1,4 +1,4 @@
-import { AztecAddress, EthAddress } from './circuits.js';
+import { AztecAddress, EthAddress, PrivateCircuitPublicInputs } from '@aztec/circuits.js';
 
 export interface NoteLoadOracleInputs {
   note: Buffer;
@@ -14,3 +14,11 @@ export interface DBOracle {
   getProvingKey(contractAddress: AztecAddress, functionSelector: string): Promise<Buffer>;
   getPortalContractAddress(contractAddress: AztecAddress): Promise<EthAddress>;
 }
+
+export class PrivateCallStackItem {
+  constructor(
+    public readonly contractAddress: AztecAddress,
+    public readonly functionSelector: number,
+    public readonly publicInputs: PrivateCircuitPublicInputs,
+  ) {}
+}

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

@@ -2,11 +2,20 @@ import { ExecutionPreimages } from './acvm.js';
 import {
   CallContext,
   PrivateCircuitPublicInputs,
-  TxRequest,
   EthAddress,
-  PrivateCallStackItem,
   OldTreeRoots,
-} from './circuits.js';
+  Fr,
+  ARGS_LENGTH,
+  EMITTED_EVENTS_LENGTH,
+  NEW_COMMITMENTS_LENGTH,
+  NEW_NULLIFIERS_LENGTH,
+  PRIVATE_CALL_STACK_LENGTH,
+  PUBLIC_CALL_STACK_LENGTH,
+  L1_MSG_STACK_LENGTH,
+  RETURN_VALUES_LENGTH,
+  TxRequest,
+} from '@aztec/circuits.js';
+import { PrivateCallStackItem } from './db_oracle.js';
 
 export interface ExecutionResult {
   // Needed for prover
@@ -36,19 +45,25 @@ export class AcirSimulator {
       portalContractAddress,
       false,
       false,
-      request.functionData.isContructor,
+      request.functionData.isConstructor,
     );
 
+    const randomFields = (num: number) => {
+      return Array(num)
+        .fill(0)
+        .map(() => new Fr(0));
+    };
+
     const publicInputs = new PrivateCircuitPublicInputs(
       callContext,
-      request.args,
-      [], // returnValues,
-      [], // emittedEvents,
-      [], // newCommitments,
-      [], // newNullifiers,
-      [], // privateCallStack,
-      [], // publicCallStack,
-      [], // l1MsgStack,
+      request.args.concat(randomFields(ARGS_LENGTH - request.args.length)),
+      randomFields(RETURN_VALUES_LENGTH), // returnValues,
+      randomFields(EMITTED_EVENTS_LENGTH), // emittedEvents,
+      randomFields(NEW_COMMITMENTS_LENGTH), // newCommitments,
+      randomFields(NEW_NULLIFIERS_LENGTH), // newNullifiers,
+      randomFields(PRIVATE_CALL_STACK_LENGTH), // privateCallStack,
+      randomFields(PUBLIC_CALL_STACK_LENGTH), // publicCallStack,
+      randomFields(L1_MSG_STACK_LENGTH), // l1MsgStack,
       oldRoots.privateDataTreeRoot,
       oldRoots.nullifierTreeRoot,
       oldRoots.contractTreeRoot,

yarn-project/acir-simulator/tsconfig.dest.json

@@ -1,4 +1,9 @@
 {
   "extends": ".",
-  "exclude": ["**/*.test.*", "**/fixtures/*"]
+  "exclude": ["**/*.test.*", "**/fixtures/*"],
+  "references": [
+    {
+      "path": "../circuits.js/tsconfig.dest.json"
+    }
+  ]
 }

yarn-project/acir-simulator/tsconfig.json

@@ -5,5 +5,10 @@
     "rootDir": "src",
     "tsBuildInfoFile": ".tsbuildinfo"
   },
+  "references": [
+    {
+      "path": "../circuits.js/tsconfig.dest.json"
+    }
+  ],
   "include": ["src"]
 }

yarn-project/archiver/src/archiver/archiver.ts

@@ -224,7 +224,7 @@ export class Archiver implements L2BlockSource {
     if (from > this.l2Blocks.length) {
       return Promise.resolve([]);
     }
-    const startIndex = from - 1;
+    const startIndex = from - INITIAL_ROLLUP_ID;
     const endIndex = startIndex + take;
     return Promise.resolve(this.l2Blocks.slice(startIndex, endIndex));
   }

yarn-project/aztec-node/src/aztec-node/fixtures.ts

@@ -29,27 +29,6 @@ import { AztecAddress, randomBytes } from '@aztec/foundation';
 import { Rollup, Yeeter } from '@aztec/l1-contracts';
 import { Tx } from '@aztec/tx';
 
-// REFACTOR: Move deployment logic to l1-contracts package, and refactor it out of other integration tests (archiver, sequencer)
-export const deployRollupContract = async (provider: WalletProvider, ethRpc: EthereumRpc) => {
-  const deployAccount = provider.getAccount(0);
-  const contract = new Rollup(ethRpc, undefined, { from: deployAccount, gas: 1000000 });
-  await contract.deploy().send().getReceipt();
-  return contract.address;
-};
-
-export const deployYeeterContract = async (provider: WalletProvider, ethRpc: EthereumRpc) => {
-  const deployAccount = provider.getAccount(0);
-  const contract = new Yeeter(ethRpc, undefined, { from: deployAccount, gas: 1000000 });
-  await contract.deploy().send().getReceipt();
-  return contract.address;
-};
-
-export const createProvider = (host: string, mnemonic: string, accounts: number) => {
-  const walletProvider = WalletProvider.fromHost(host);
-  walletProvider.addAccountsFromMnemonic(mnemonic, accounts);
-  return walletProvider;
-};
-
 // REFACTOR: Use @aztec/circuit.js/factories where possible
 export const createCircuitEthAddress = () => {
   return new CircuitEthAddress(randomBytes(20));

yarn-project/aztec-rpc/src/account_state/account_state.ts

@@ -1,6 +1,5 @@
+import { AztecAddress } from '@aztec/circuits.js';
 import { TxHash } from '@aztec/tx';
-
-import { AztecAddress } from '../circuits.js';
 import { Database } from '../database/index.js';
 
 export class AccountState {