feat: Base rollup in noir

circuits/cpp/src/aztec3/circuits/rollup/base/native_base_rollup_circuit.cpp

@@ -57,6 +57,7 @@ AggregationObject aggregate_proofs(BaseRollupInputs const& baseRollupInputs)
 }
 
 /** TODO: implement
+ * This is not being used
  * @brief Get the prover contribution hash object
  *
  * @return NT::fr

yarn-project/end-to-end/src/e2e_p2p_network.test.ts

@@ -79,7 +79,7 @@ describe('e2e_p2p_network', () => {
       await context.pxeService.stop();
     }
     await bootstrapNode.stop();
-  }, 80_000);
+  }, 120_000);
 
   const createBootstrapNode = async () => {
     const peerId = await createLibP2PPeerId();

yarn-project/end-to-end/src/e2e_public_cross_chain_messaging.test.ts

@@ -148,7 +148,7 @@ describe('e2e_public_cross_chain_messaging', () => {
     // ensure funds are gone to owner and not user2.
     await crossChainTestHarness.expectPublicBalanceOnL2(ownerAddress, bridgeAmount + unrelatedMintAmount);
     await crossChainTestHarness.expectPublicBalanceOnL2(user2Wallet.getAddress(), 0n);
-  }, 60_000);
+  }, 90_000);
 
   it("Bridge can't withdraw my funds if I don't give approval", async () => {
     const mintAmountToOwner = 100n;
@@ -163,7 +163,7 @@ describe('e2e_public_cross_chain_messaging', () => {
         .methods.exit_to_l1_public(ethAccount, withdrawAmount, EthAddress.ZERO, nonce)
         .simulate(),
     ).rejects.toThrowError('Assertion failed: Message not authorized by account');
-  });
+  }, 60_000);
 
   it("can't claim funds privately which were intended for public deposit from the token portal", async () => {
     const bridgeAmount = 100n;
@@ -185,5 +185,5 @@ describe('e2e_public_cross_chain_messaging', () => {
         .methods.claim_private(secretHash, bridgeAmount, ethAccount, messageKey, secret)
         .simulate(),
     ).rejects.toThrowError("Cannot satisfy constraint 'l1_to_l2_message_data.message.content == content");
-  });
+  }, 60_000);
 });

yarn-project/end-to-end/src/e2e_sandbox_example.test.ts

@@ -216,5 +216,5 @@ describe('e2e_sandbox_example', () => {
     // check that alice and bob are in registeredAccounts
     expect(registeredAccounts.find(acc => acc.equals(alice))).toBeTruthy();
     expect(registeredAccounts.find(acc => acc.equals(bob))).toBeTruthy();
-  });
+  }, 60_000);
 });

yarn-project/end-to-end/src/guides/dapp_testing.test.ts

@@ -35,7 +35,7 @@ describe('guides/dapp/testing', () => {
         owner = await createAccount(pxe);
         recipient = await createAccount(pxe);
         token = await TokenContract.deploy(owner, owner.getCompleteAddress()).send().deployed();
-      }, 30_000);
+      }, 60_000);
 
       it('increases recipient funds on mint', async () => {
         const recipientAddress = recipient.getAddress();
@@ -145,7 +145,7 @@ describe('guides/dapp/testing', () => {
         // The balances mapping is defined on storage slot 3 and is indexed by user address
         ownerSlot = cheats.aztec.computeSlotInMap(3n, ownerAddress);
         // docs:end:calc-slot
-      }, 60_000);
+      }, 90_000);
 
       it('checks private storage', async () => {
         // docs:start:private-storage
@@ -158,7 +158,7 @@ describe('guides/dapp/testing', () => {
         const balance = values.reduce((sum, current) => sum + current.toBigInt(), 0n);
         expect(balance).toEqual(100n);
         // docs:end:private-storage
-      });
+      }, 30_000);
 
       it('checks public storage', async () => {
         // docs:start:public-storage
@@ -167,7 +167,7 @@ describe('guides/dapp/testing', () => {
         const balance = await pxe.getPublicStorageAt(token.address, ownerPublicBalanceSlot);
         expect(balance!.value).toEqual(100n);
         // docs:end:public-storage
-      });
+      }, 30_000);
 
       it('checks unencrypted logs, [Kinda broken with current implementation]', async () => {
         // docs:start:unencrypted-logs
@@ -180,21 +180,21 @@ describe('guides/dapp/testing', () => {
         const logs = (await pxe.getUnencryptedLogs(filter)).logs;
         expect(Fr.fromBuffer(logs[0].log.data)).toEqual(value);
         // docs:end:unencrypted-logs
-      });
+      }, 30_000);
 
       it('asserts a local transaction simulation fails by calling simulate', async () => {
         // docs:start:local-tx-fails
         const call = token.methods.transfer(owner.getAddress(), recipient.getAddress(), 200n, 0);
         await expect(call.simulate()).rejects.toThrowError(/Balance too low/);
         // docs:end:local-tx-fails
-      });
+      }, 30_000);
 
       it('asserts a local transaction simulation fails by calling send', async () => {
         // docs:start:local-tx-fails-send
         const call = token.methods.transfer(owner.getAddress(), recipient.getAddress(), 200n, 0);
         await expect(call.send().wait()).rejects.toThrowError(/Balance too low/);
         // docs:end:local-tx-fails-send
-      });
+      }, 30_000);
 
       it('asserts a transaction is dropped', async () => {
         // docs:start:tx-dropped
@@ -207,21 +207,21 @@ describe('guides/dapp/testing', () => {
         await call1.send().wait();
         await expect(call2.send().wait()).rejects.toThrowError(/dropped/);
         // docs:end:tx-dropped
-      });
+      }, 30_000);
 
       it('asserts a simulation for a public function call fails', async () => {
         // docs:start:local-pub-fails
         const call = token.methods.transfer_public(owner.getAddress(), recipient.getAddress(), 1000n, 0);
         await expect(call.simulate()).rejects.toThrowError(/Underflow/);
         // docs:end:local-pub-fails
-      });
+      }, 30_000);
 
       it('asserts a transaction with a failing public call is dropped (until we get public reverts)', async () => {
         // docs:start:pub-dropped
         const call = token.methods.transfer_public(owner.getAddress(), recipient.getAddress(), 1000n, 0);
         await expect(call.send({ skipPublicSimulation: true }).wait()).rejects.toThrowError(/dropped/);
         // docs:end:pub-dropped
-      });
+      }, 30_000);
     });
   });
 

yarn-project/end-to-end/src/integration_archiver_l1_to_l2.test.ts

@@ -119,5 +119,5 @@ describe('archiver integration with l1 to l2 messages', () => {
 
     expect((await archiver.getPendingL1ToL2Messages(10)).length).toEqual(0);
     expect(() => archiver.getConfirmedL1ToL2Message(Fr.ZERO)).toThrow();
-  });
+  }, 30_000);
 });

yarn-project/end-to-end/src/sample-dapp/ci/index.test.mjs

@@ -9,5 +9,5 @@ describe('sample-dapp', () => {
     await waitForSandbox();
     await deploy();
     await main();
-  }, 60_000);
+  }, 90_000);
 });

yarn-project/end-to-end/src/sample-dapp/index.test.mjs

@@ -33,6 +33,6 @@ describe('token', () => {
     expect(await token.methods.balance_of_private(recipient.getAddress()).view()).toEqual(0n);
     await token.methods.transfer(owner.getAddress(), recipient.getAddress(), 20n, 0).send().wait();
     expect(await token.methods.balance_of_private(recipient.getAddress()).view()).toEqual(20n);
-  });
+  }, 30_000);
   // docs:end:test
 });

yarn-project/noir-protocol-circuits/src/crates/rollup-lib/src/abis/nullifier_leaf_preimage.nr

@@ -5,12 +5,19 @@ struct NullifierLeafPreimage {
 }
 
 impl NullifierLeafPreimage {
-    // TODO(Kev): Check if this is needed.
-    fn is_empty(self) -> bool {
+    pub fn default() -> Self {
+        NullifierLeafPreimage {
+            leaf_value : 0,
+            next_value : 0,
+            next_index : 0,
+        }
+    }
+
+    pub fn is_empty(self) -> bool {
         (self.leaf_value == 0) & (self.next_index == 0) & (self.next_value == 0)
     }
 
-    fn hash(self) -> Field {
+    pub fn hash(self) -> Field {
         if self.is_empty() {
             0
         } else {