feat: VK tree

.github/workflows/ci.yml

@@ -98,7 +98,11 @@ jobs:
       # prepare images locally, tagged by commit hash
       - name: "Build E2E Image"
         timeout-minutes: 40
-        run: earthly-ci ./yarn-project+export-e2e-test-images
+        run: |
+          earthly-ci \
+          --secret AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }} \
+          --secret AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }} \
+          ./yarn-project+export-e2e-test-images
       # We base our e2e list used in e2e-x86 off the targets in ./yarn-project/end-to-end
       # (Note ARM uses just 2 tests as a smoketest)
       - name: Create list of non-bench end-to-end jobs
@@ -377,7 +381,11 @@ jobs:
       - name: "Format noir-projects"
         working-directory: ./noir-projects/
         timeout-minutes: 40
-        run: earthly-ci --no-output ./+format
+        run: | 
+          earthly-ci --no-output \
+          --secret AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }} \
+          --secret AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }} \
+          ./+format
 
   noir-test:
     needs: [setup, changes]
@@ -430,7 +438,11 @@ jobs:
           concurrency_key: noir-projects-x86
       - name: "Noir Projects"
         timeout-minutes: 40
-        run: earthly-ci --no-output ./noir-projects/+test
+        run: |
+          earthly-ci --no-output \
+          --secret AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }} \
+          --secret AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }} \
+          ./noir-projects/+test
 
   avm-format:
     needs: [setup, changes]
@@ -515,7 +527,14 @@ jobs:
       - name: "Docs Preview"
         if: github.event.number
         timeout-minutes: 40
-        run: earthly-ci --no-output ./docs/+deploy-preview --ENV=staging --PR=${{ github.event.number }} --AZTEC_BOT_COMMENTER_GITHUB_TOKEN=${{ secrets.AZTEC_BOT_GITHUB_TOKEN }} --NETLIFY_AUTH_TOKEN=${{ secrets.NETLIFY_AUTH_TOKEN }} --NETLIFY_SITE_ID=${{ secrets.NETLIFY_SITE_ID }}
+        run: | 
+          earthly-ci --no-output \
+          --secret AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }} \
+          --secret AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }} \
+          ./docs/+deploy-preview --ENV=staging --PR=${{ github.event.number }} \
+          --AZTEC_BOT_COMMENTER_GITHUB_TOKEN=${{ secrets.AZTEC_BOT_GITHUB_TOKEN }} \
+          --NETLIFY_AUTH_TOKEN=${{ secrets.NETLIFY_AUTH_TOKEN }} \
+          --NETLIFY_SITE_ID=${{ secrets.NETLIFY_SITE_ID }}
 
   bb-bench:
     runs-on: ubuntu-20.04
@@ -617,7 +636,10 @@ jobs:
         working-directory: ./noir-projects/
         timeout-minutes: 40
         run: |
-          earthly-ci --artifact +gates-report/gates_report.json
+          earthly-ci \
+          --secret AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }} \
+          --secret AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }} \
+          --artifact +gates-report/gates_report.json 
           mv gates_report.json ../protocol_circuits_report.json
 
       - name: Compare gates reports

l1-contracts/src/core/Rollup.sol

@@ -45,17 +45,25 @@ contract Rollup is IRollup {
   // See https://github.com/AztecProtocol/aztec-packages/issues/1614
   uint256 public lastWarpedBlockTs;
 
+  bytes32 public vkTreeRoot;
+
   using EnumerableSet for EnumerableSet.AddressSet;
 
   EnumerableSet.AddressSet private sequencers;
 
-  constructor(IRegistry _registry, IAvailabilityOracle _availabilityOracle, IERC20 _gasToken) {
+  constructor(
+    IRegistry _registry,
+    IAvailabilityOracle _availabilityOracle,
+    IERC20 _gasToken,
+    bytes32 _vkTreeRoot
+  ) {
     verifier = new MockVerifier();
     REGISTRY = _registry;
     AVAILABILITY_ORACLE = _availabilityOracle;
     GAS_TOKEN = _gasToken;
     INBOX = new Inbox(address(this), Constants.L1_TO_L2_MSG_SUBTREE_HEIGHT);
     OUTBOX = new Outbox(address(this));
+    vkTreeRoot = _vkTreeRoot;
     VERSION = 1;
   }
 
@@ -85,6 +93,10 @@ contract Rollup is IRollup {
     verifier = IVerifier(_verifier);
   }
 
+  function setVkTreeRoot(bytes32 _vkTreeRoot) external {
+    vkTreeRoot = _vkTreeRoot;
+  }
+
   /**
    * @notice Process an incoming L2 block and progress the state
    * @param _header - The L2 block header
@@ -94,6 +106,7 @@ contract Rollup is IRollup {
   function process(
     bytes calldata _header,
     bytes32 _archive,
+    bytes32 _vkTreeRoot,
     bytes calldata _aggregationObject,
     bytes calldata _proof
   ) external override(IRollup) {
@@ -112,18 +125,24 @@ contract Rollup is IRollup {
       revert Errors.Rollup__InvalidSequencer(msg.sender);
     }
 
+    if (_vkTreeRoot != vkTreeRoot) {
+      revert Errors.Rollup__InvalidVkTreeRoot(vkTreeRoot, _vkTreeRoot);
+    }
+
     bytes32[] memory publicInputs =
-      new bytes32[](2 + Constants.HEADER_LENGTH + Constants.AGGREGATION_OBJECT_LENGTH);
+      new bytes32[](3 + Constants.HEADER_LENGTH + Constants.AGGREGATION_OBJECT_LENGTH);
     // the archive tree root
     publicInputs[0] = _archive;
     // this is the _next_ available leaf in the archive tree
     // normally this should be equal to the block number (since leaves are 0-indexed and blocks 1-indexed)
     // but in yarn-project/merkle-tree/src/new_tree.ts we prefill the tree so that block N is in leaf N
     publicInputs[1] = bytes32(header.globalVariables.blockNumber + 1);
 
+    publicInputs[2] = _vkTreeRoot;
+
     bytes32[] memory headerFields = HeaderLib.toFields(header);
     for (uint256 i = 0; i < headerFields.length; i++) {
-      publicInputs[i + 2] = headerFields[i];
+      publicInputs[i + 3] = headerFields[i];
     }
 
     // the block proof is recursive, which means it comes with an aggregation object
@@ -135,7 +154,7 @@ contract Rollup is IRollup {
       assembly {
         part := calldataload(add(_aggregationObject.offset, mul(i, 32)))
       }
-      publicInputs[i + 2 + Constants.HEADER_LENGTH] = part;
+      publicInputs[i + 3 + Constants.HEADER_LENGTH] = part;
     }
 
     if (!verifier.verify(_proof, publicInputs)) {

l1-contracts/src/core/interfaces/IRollup.sol

@@ -8,6 +8,7 @@ interface IRollup {
   function process(
     bytes calldata _header,
     bytes32 _archive,
+    bytes32 _vkTreeRoot,
     bytes calldata _aggregationObject,
     bytes memory _proof
   ) external;

l1-contracts/src/core/libraries/ConstantsGen.sol

@@ -49,13 +49,12 @@ library Constants {
   uint256 internal constant MAX_UNENCRYPTED_LOGS_PER_TX = 8;
   uint256 internal constant MAX_PUBLIC_DATA_HINTS = 128;
   uint256 internal constant NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP = 16;
-  uint256 internal constant VK_TREE_HEIGHT = 3;
+  uint256 internal constant VK_TREE_HEIGHT = 5;
   uint256 internal constant FUNCTION_TREE_HEIGHT = 5;
   uint256 internal constant NOTE_HASH_TREE_HEIGHT = 32;
   uint256 internal constant PUBLIC_DATA_TREE_HEIGHT = 40;
   uint256 internal constant NULLIFIER_TREE_HEIGHT = 20;
   uint256 internal constant L1_TO_L2_MSG_TREE_HEIGHT = 16;
-  uint256 internal constant ROLLUP_VK_TREE_HEIGHT = 8;
   uint256 internal constant ARTIFACT_FUNCTION_TREE_MAX_HEIGHT = 5;
   uint256 internal constant NULLIFIER_TREE_ID = 0;
   uint256 internal constant NOTE_HASH_TREE_ID = 1;
@@ -71,6 +70,25 @@ library Constants {
   uint256 internal constant PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH = 34;
   uint256 internal constant L1_TO_L2_MSG_SUBTREE_HEIGHT = 4;
   uint256 internal constant L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH = 12;
+  uint256 internal constant PRIVATE_KERNEL_INIT_INDEX = 0;
+  uint256 internal constant PRIVATE_KERNEL_INNER_INDEX = 1;
+  uint256 internal constant PRIVATE_KERNEL_RESET_FULL_INDEX = 2;
+  uint256 internal constant PRIVATE_KERNEL_RESET_BIG_INDEX = 3;
+  uint256 internal constant PRIVATE_KERNEL_RESET_MEDIUM_INDEX = 4;
+  uint256 internal constant PRIVATE_KERNEL_RESET_SMALL_INDEX = 5;
+  uint256 internal constant PRIVATE_KERNEL_TAIL_INDEX = 10;
+  uint256 internal constant PRIVATE_KERNEL_TAIL_TO_PUBLIC_INDEX = 11;
+  uint256 internal constant EMPTY_NESTED_INDEX = 12;
+  uint256 internal constant PRIVATE_KERNEL_EMPTY_INDEX = 13;
+  uint256 internal constant PUBLIC_KERNEL_SETUP_INDEX = 14;
+  uint256 internal constant PUBLIC_KERNEL_APP_LOGIC_INDEX = 15;
+  uint256 internal constant PUBLIC_KERNEL_TEARDOWN_INDEX = 16;
+  uint256 internal constant PUBLIC_KERNEL_TAIL_INDEX = 17;
+  uint256 internal constant BASE_PARITY_INDEX = 18;
+  uint256 internal constant ROOT_PARITY_INDEX = 19;
+  uint256 internal constant BASE_ROLLUP_INDEX = 20;
+  uint256 internal constant MERGE_ROLLUP_INDEX = 21;
+  uint256 internal constant ROOT_ROLLUP_INDEX = 22;
   uint256 internal constant FUNCTION_SELECTOR_NUM_BYTES = 4;
   uint256 internal constant ARGS_HASH_CHUNK_LENGTH = 16;
   uint256 internal constant ARGS_HASH_CHUNK_COUNT = 16;
@@ -142,7 +160,7 @@ library Constants {
   uint256 internal constant SCOPED_ENCRYPTED_LOG_HASH_LENGTH = 5;
   uint256 internal constant NOTE_LOG_HASH_LENGTH = 4;
   uint256 internal constant NOTE_HASH_LENGTH = 2;
-  uint256 internal constant SCOPED_NOTE_HASH_LENGTH = 4;
+  uint256 internal constant SCOPED_NOTE_HASH_LENGTH = 3;
   uint256 internal constant NULLIFIER_LENGTH = 3;
   uint256 internal constant SCOPED_NULLIFIER_LENGTH = 4;
   uint256 internal constant CALLER_CONTEXT_LENGTH = 3;
@@ -164,15 +182,15 @@ library Constants {
   uint256 internal constant VALIDATION_REQUESTS_LENGTH = 1026;
   uint256 internal constant PUBLIC_DATA_UPDATE_REQUEST_LENGTH = 3;
   uint256 internal constant COMBINED_ACCUMULATED_DATA_LENGTH = 333;
-  uint256 internal constant COMBINED_CONSTANT_DATA_LENGTH = 40;
+  uint256 internal constant COMBINED_CONSTANT_DATA_LENGTH = 41;
   uint256 internal constant CALL_REQUEST_LENGTH = 7;
-  uint256 internal constant PRIVATE_ACCUMULATED_DATA_LENGTH = 1152;
-  uint256 internal constant PRIVATE_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 2227;
+  uint256 internal constant PRIVATE_ACCUMULATED_DATA_LENGTH = 1088;
+  uint256 internal constant PRIVATE_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 2164;
   uint256 internal constant PUBLIC_ACCUMULATED_DATA_LENGTH = 983;
-  uint256 internal constant PUBLIC_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 3258;
-  uint256 internal constant KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 383;
-  uint256 internal constant CONSTANT_ROLLUP_DATA_LENGTH = 14;
-  uint256 internal constant BASE_OR_MERGE_PUBLIC_INPUTS_LENGTH = 31;
+  uint256 internal constant PUBLIC_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 3259;
+  uint256 internal constant KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 384;
+  uint256 internal constant CONSTANT_ROLLUP_DATA_LENGTH = 11;
+  uint256 internal constant BASE_OR_MERGE_PUBLIC_INPUTS_LENGTH = 28;
   uint256 internal constant ENQUEUE_PUBLIC_FUNCTION_CALL_RETURN_LENGTH = 9;
   uint256 internal constant GET_NOTES_ORACLE_RETURN_LENGTH = 674;
   uint256 internal constant NOTE_HASHES_NUM_BYTES_PER_BASE_ROLLUP = 2048;

l1-contracts/src/core/libraries/Errors.sol

@@ -47,6 +47,7 @@ library Errors {
   error Rollup__TimestampTooOld(); // 0x72ed9c81
   error Rollup__UnavailableTxs(bytes32 txsHash); // 0x414906c3
   error Rollup__InvalidSequencer(address sequencer); // 0xa127a106
+  error Rollup__InvalidVkTreeRoot(bytes32 expected, bytes32 actual); // 0x0c6bdee9
 
   // Registry
   error Registry__RollupNotRegistered(address rollup); // 0xa1fee4cf

l1-contracts/test/Rollup.t.sol

@@ -40,7 +40,7 @@ contract RollupTest is DecoderBase {
     registry = new Registry();
     availabilityOracle = new AvailabilityOracle();
     portalERC20 = new PortalERC20();
-    rollup = new Rollup(registry, availabilityOracle, IERC20(address(portalERC20)));
+    rollup = new Rollup(registry, availabilityOracle, IERC20(address(portalERC20)), bytes32(0));
     inbox = Inbox(address(rollup.INBOX()));
     outbox = Outbox(address(rollup.OUTBOX()));
 
@@ -85,7 +85,7 @@ contract RollupTest is DecoderBase {
     availabilityOracle.publish(body);
 
     vm.expectRevert(abi.encodeWithSelector(Errors.Rollup__InvalidChainId.selector, 0x420, 31337));
-    rollup.process(header, archive, bytes(""), bytes(""));
+    rollup.process(header, archive, bytes32(0), bytes(""), bytes(""));
   }
 
   function testRevertInvalidVersion() public {
@@ -101,7 +101,7 @@ contract RollupTest is DecoderBase {
     availabilityOracle.publish(body);
 
     vm.expectRevert(abi.encodeWithSelector(Errors.Rollup__InvalidVersion.selector, 0x420, 1));
-    rollup.process(header, archive, bytes(""), bytes(""));
+    rollup.process(header, archive, bytes32(0), bytes(""), bytes(""));
   }
 
   function testRevertTimestampInFuture() public {
@@ -118,7 +118,7 @@ contract RollupTest is DecoderBase {
     availabilityOracle.publish(body);
 
     vm.expectRevert(abi.encodeWithSelector(Errors.Rollup__TimestampInFuture.selector));
-    rollup.process(header, archive, bytes(""), bytes(""));
+    rollup.process(header, archive, bytes32(0), bytes(""), bytes(""));
   }
 
   function testRevertTimestampTooOld() public {
@@ -133,7 +133,28 @@ contract RollupTest is DecoderBase {
     availabilityOracle.publish(body);
 
     vm.expectRevert(abi.encodeWithSelector(Errors.Rollup__TimestampTooOld.selector));
-    rollup.process(header, archive, bytes(""), bytes(""));
+    rollup.process(header, archive, bytes32(0), bytes(""), bytes(""));
+  }
+
+  function testRevertWrongVkTreeRoot() public {
+    bytes32 expectedVkTreeRoot = bytes32(uint256(28));
+    bytes32 actualVkTreeRoot = bytes32(uint256(27));
+
+    rollup.setVkTreeRoot(expectedVkTreeRoot);
+
+    DecoderBase.Data memory data = load("empty_block_0").block;
+    bytes memory header = data.header;
+    bytes32 archive = data.archive;
+    bytes memory body = data.body;
+
+    availabilityOracle.publish(body);
+
+    vm.expectRevert(
+      abi.encodeWithSelector(
+        Errors.Rollup__InvalidVkTreeRoot.selector, expectedVkTreeRoot, actualVkTreeRoot
+      )
+    );
+    rollup.process(header, archive, actualVkTreeRoot, bytes(""), bytes(""));
   }
 
   function _testBlock(string memory name) public {
@@ -153,7 +174,7 @@ contract RollupTest is DecoderBase {
     uint256 toConsume = inbox.toConsume();
 
     vm.record();
-    rollup.process(header, archive, bytes(""), bytes(""));
+    rollup.process(header, archive, bytes32(0), bytes(""), bytes(""));
 
     assertEq(inbox.toConsume(), toConsume + 1, "Message subtree not consumed");
 

l1-contracts/test/portals/TokenPortal.t.sol

@@ -59,7 +59,8 @@ contract TokenPortalTest is Test {
   function setUp() public {
     registry = new Registry();
     portalERC20 = new PortalERC20();
-    rollup = new Rollup(registry, new AvailabilityOracle(), IERC20(address(portalERC20)));
+    rollup =
+      new Rollup(registry, new AvailabilityOracle(), IERC20(address(portalERC20)), bytes32(0));
     inbox = rollup.INBOX();
     outbox = rollup.OUTBOX();
 

l1-contracts/test/portals/UniswapPortal.t.sol

@@ -52,7 +52,8 @@ contract UniswapPortalTest is Test {
 
     registry = new Registry();
     PortalERC20 portalERC20 = new PortalERC20();
-    rollup = new Rollup(registry, new AvailabilityOracle(), IERC20(address(portalERC20)));
+    rollup =
+      new Rollup(registry, new AvailabilityOracle(), IERC20(address(portalERC20)), bytes32(0));
     registry.upgrade(address(rollup), address(rollup.INBOX()), address(rollup.OUTBOX()));
     portalERC20.mint(address(rollup), 1000000);
 

noir-projects/Earthfile

@@ -5,6 +5,8 @@ source:
 
   # Install nargo
   COPY ../noir/+nargo/nargo /usr/bin/nargo
+  # Install bb
+  COPY ../barretenberg/cpp/+preset-release/bin/bb /usr/src/barretenberg/cpp/build/bin/bb
 
   WORKDIR /usr/src/noir-projects
 
@@ -25,6 +27,8 @@ build-contracts:
 
 build-protocol-circuits:
   FROM +source
+  RUN --secret AWS_ACCESS_KEY_ID --secret AWS_SECRET_ACCESS_KEY mkdir -p ~/.aws && \
+      bash -c 'echo -e "[default]\naws_access_key_id=$AWS_ACCESS_KEY_ID\naws_secret_access_key=$AWS_SECRET_ACCESS_KEY" > ~/.aws/credentials'
   RUN cd noir-protocol-circuits && NARGO=nargo ./bootstrap.sh
   SAVE ARTIFACT noir-protocol-circuits