chore(backport-to-V2): L1 backports

barretenberg/sol/foundry.toml

@@ -13,4 +13,14 @@ runs = 2
 
 solc = "0.8.29"
 
+[lint]
+ignore = ["./lib/**"]
+exclude_lints = [
+  # Silencing due to just being style changes
+  "mixed-case-variable",
+  "mixed-case-function",
+  "screaming-snake-case-const",
+  "screaming-snake-case-immutable",
+]
+
 # See more config options https://github.com/foundry-rs/foundry/tree/master/config

barretenberg/sol/src/honk/HonkTypes.sol

@@ -145,6 +145,7 @@ library Honk {
         G1Point kzgQuotient;
     }
 
+    /// forge-lint: disable-next-item(pascal-case-struct)
     struct ZKProof {
         // Pairing point object
         Fr[PAIRING_POINTS_SIZE] pairingPointObject;

barretenberg/sol/src/honk/ZKTranscript.sol

@@ -14,6 +14,7 @@ import {Fr, FrLib} from "./Fr.sol";
 import {bytesToG1Point, bytesToFr} from "./utils.sol";
 
 // ZKTranscript library to generate fiat shamir challenges, the ZK transcript only differest
+/// forge-lint: disable-next-item(pascal-case-struct)
 struct ZKTranscript {
     // Oink
     Honk.RelationParameters relationParameters;

barretenberg/sol/test/base/DifferentialFuzzer.sol

@@ -1,6 +1,5 @@
 pragma solidity >=0.8.21;
 
-import {Vm} from "forge-std/Vm.sol";
 import {strings} from "stringutils/strings.sol";
 import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
 import {TestBase} from "./TestBase.sol";

barretenberg/sol/test/honk/Add2.t.sol

@@ -9,6 +9,7 @@ import {Add2HonkVerifier} from "../../src/honk/instance/Add2Honk.sol";
 import {DifferentialFuzzer} from "../base/DifferentialFuzzer.sol";
 import {IVerifier} from "../../src/interfaces/IVerifier.sol";
 
+/// forge-lint: disable-next-item(unaliased-plain-import)
 import "forge-std/console.sol";
 
 contract Add2HonkTest is TestBaseHonk {

barretenberg/sol/test/honk/Add2ZK.t.sol

@@ -9,6 +9,7 @@ import {Add2HonkZKVerifier} from "../../src/honk/instance/Add2HonkZK.sol";
 import {DifferentialFuzzer} from "../base/DifferentialFuzzer.sol";
 import {IVerifier} from "../../src/interfaces/IVerifier.sol";
 
+/// forge-lint: disable-next-item(unaliased-plain-import)
 import "forge-std/console.sol";
 
 contract Add2HonkZKTest is TestBaseHonkZK {

barretenberg/sol/test/honk/Blake.t.sol

@@ -9,6 +9,7 @@ import {BlakeHonkVerifier} from "../../src/honk/instance/BlakeHonk.sol";
 import {DifferentialFuzzer} from "../base/DifferentialFuzzer.sol";
 import {IVerifier} from "../../src/interfaces/IVerifier.sol";
 
+/// forge-lint: disable-next-item(unaliased-plain-import)
 import "forge-std/console.sol";
 
 contract BlakeHonkTest is TestBaseHonk {

barretenberg/sol/test/honk/BlakeZK.t.sol

@@ -9,6 +9,7 @@ import {BlakeHonkZKVerifier} from "../../src/honk/instance/BlakeHonkZK.sol";
 import {DifferentialFuzzer} from "../base/DifferentialFuzzer.sol";
 import {IVerifier} from "../../src/interfaces/IVerifier.sol";
 
+/// forge-lint: disable-next-item(unaliased-plain-import)
 import "forge-std/console.sol";
 
 contract BlakeHonZKTest is TestBaseHonkZK {

barretenberg/sol/test/honk/Recursive.t.sol

@@ -9,6 +9,7 @@ import {RecursiveHonkVerifier} from "../../src/honk/instance/RecursiveHonk.sol";
 import {DifferentialFuzzer} from "../base/DifferentialFuzzer.sol";
 import {IVerifier} from "../../src/interfaces/IVerifier.sol";
 
+/// forge-lint: disable-next-item(unaliased-plain-import)
 import "forge-std/console.sol";
 
 contract RecursiveHonkTest is TestBaseHonk {

barretenberg/sol/test/honk/RecursiveZK.t.sol

@@ -9,6 +9,7 @@ import {RecursiveHonkZKVerifier} from "../../src/honk/instance/RecursiveHonkZK.s
 import {DifferentialFuzzer} from "../base/DifferentialFuzzer.sol";
 import {IVerifier} from "../../src/interfaces/IVerifier.sol";
 
+/// forge-lint: disable-next-item(unaliased-plain-import)
 import "forge-std/console.sol";
 
 contract RecursiveHonkTest is TestBaseHonkZK {

docs/versioned_docs/version-v2.0.2/aztec/concepts/call_types.md

@@ -103,7 +103,7 @@ Contract functions marked with `#[private]` can only be called privately, and as
 
 Private functions from other contracts can be called either regularly or statically by using the `.call()` and `.static_call` functions. They will also be 'executed' (i.e. proved) in the user's device, and `static_call` will fail if any state changes are attempted (like the EVM's `STATICCALL`).
 
-```rust title="private_call" showLineNumbers 
+```rust title="private_call" showLineNumbers
 let _ = Token::at(stable_coin).burn_private(from, amount, authwit_nonce).call(&mut context);
 ```
 > <sup><sub><a href="https://github.com/AztecProtocol/aztec-packages/blob/v2.0.2/noir-projects/noir-contracts/contracts/app/lending_contract/src/main.nr#L254-L256" target="_blank" rel="noopener noreferrer">Source code: noir-projects/noir-contracts/contracts/app/lending_contract/src/main.nr#L254-L256</a></sub></sup>
@@ -117,7 +117,7 @@ Since public execution can only be performed by the sequencer, public functions
 
 Since the public call is made asynchronously, any return values or side effects are not available during private execution. If the public function fails once executed, the entire transaction is reverted including state changes caused by the private part, such as new notes or nullifiers. Note that this does result in gas being spent, like in the case of the EVM.
 
-```rust title="enqueue_public" showLineNumbers 
+```rust title="enqueue_public" showLineNumbers
 Lending::at(context.this_address())
     ._deposit(AztecAddress::from_field(on_behalf_of), amount, collateral_asset)
     .enqueue(&mut context);
@@ -129,7 +129,7 @@ It is also possible to create public functions that can _only_ be invoked by pri
 
 A common pattern is to enqueue public calls to check some validity condition on public state, e.g. that a deadline has not expired or that some public value is set.
 
-```rust title="enqueueing" showLineNumbers 
+```rust title="enqueueing" showLineNumbers
 Router::at(ROUTER_ADDRESS).check_block_number(operation, value).call(context);
 ```
 > <sup><sub><a href="https://github.com/AztecProtocol/aztec-packages/blob/v2.0.2/noir-projects/noir-contracts/contracts/protocol/router_contract/src/utils.nr#L17-L19" target="_blank" rel="noopener noreferrer">Source code: noir-projects/noir-contracts/contracts/protocol/router_contract/src/utils.nr#L17-L19</a></sub></sup>
@@ -140,15 +140,15 @@ For this reason we've created a canonical router contract which implements some
 
 An example of how a deadline can be checked using the router contract follows:
 
-```rust title="call-check-deadline" showLineNumbers 
+```rust title="call-check-deadline" showLineNumbers
 privately_check_timestamp(Comparator.LT, config.deadline, &mut context);
 ```
 > <sup><sub><a href="https://github.com/AztecProtocol/aztec-packages/blob/v2.0.2/noir-projects/noir-contracts/contracts/app/crowdfunding_contract/src/main.nr#L65-L67" target="_blank" rel="noopener noreferrer">Source code: noir-projects/noir-contracts/contracts/app/crowdfunding_contract/src/main.nr#L65-L67</a></sub></sup>
 
 
 `privately_check_timestamp` and `privately_check_block_number` are helper functions around the call to the router contract:
 
-```rust title="helper_router_functions" showLineNumbers 
+```rust title="helper_router_functions" showLineNumbers
 /// Asserts that the current timestamp in the enqueued public call enqueued by `check_timestamp` satisfies
 /// the `operation` with respect to the `value. Preserves privacy by performing the check via the router contract.
 /// This conceals an address of the calling contract by setting `context.msg_sender` to the router contract address.
@@ -168,7 +168,7 @@ pub fn privately_check_block_number(operation: u8, value: u32, context: &mut Pri
 
 This is what the implementation of the check timestamp functionality looks like:
 
-```rust title="check_timestamp" showLineNumbers 
+```rust title="check_timestamp" showLineNumbers
 /// Asserts that the current timestamp in the enqueued public call satisfies the `operation` with respect
 /// to the `value.
 #[private]
@@ -213,7 +213,7 @@ Since private calls are always run in a user's device, it is not possible to per
 
 Public functions in other contracts can be called both regularly and statically, just like on the EVM.
 
-```rust title="public_call" showLineNumbers 
+```rust title="public_call" showLineNumbers
 Token::at(config.accepted_asset)
     .transfer_in_public(context.msg_sender(), context.this_address(), max_fee, authwit_nonce
         )
@@ -238,7 +238,7 @@ There are three different ways to execute an Aztec contract function using the `
 
 This is used to get a result out of an execution, either private or public. It creates no transaction and spends no gas. The mental model is fairly close to that of [`eth_call`](#eth_call), in that it can be used to call any type of function, simulate its execution and get a result out of it. `simulate` is also the only way to run [utility functions](#utility).
 
-```rust title="public_getter" showLineNumbers 
+```rust title="public_getter" showLineNumbers
 #[public]
 #[view]
 fn get_authorized() -> AztecAddress {
@@ -248,7 +248,7 @@ fn get_authorized() -> AztecAddress {
 > <sup><sub><a href="https://github.com/AztecProtocol/aztec-packages/blob/v2.0.2/noir-projects/noir-contracts/contracts/app/auth_contract/src/main.nr#L42-L50" target="_blank" rel="noopener noreferrer">Source code: noir-projects/noir-contracts/contracts/app/auth_contract/src/main.nr#L42-L50</a></sub></sup>
 
 
-```typescript title="simulate_function" showLineNumbers 
+```typescript title="simulate_function" showLineNumbers
 const balance = await contract.methods.balance_of_public(newAccountAddress).simulate({ from: newAccountAddress });
 expect(balance).toEqual(1n);
 ```
@@ -263,9 +263,10 @@ No correctness is guaranteed on the result of `simulate`! Correct execution is e
 
 This creates and returns a transaction request, which includes proof of correct private execution and side-effects. The request is not broadcast however, and no gas is spent. It is typically used in testing contexts to inspect transaction parameters or to check for execution failure.
 
-```typescript title="local-tx-fails" showLineNumbers 
-const call = token.methods.transfer(recipientAddress, 200n);
-await expect(call.simulate({ from: ownerAddress })).rejects.toThrow(/Balance too low/);
+```typescript title="local-tx-fails" showLineNumbers
+await expect(
+  claimContract.methods.claim(anotherDonationNote, donorAddress).send({ from: unrelatedAddress }).wait(),
+).rejects.toThrow('Note does not belong to the sender');
 ```
 > <sup><sub><a href="https://github.com/AztecProtocol/aztec-packages/blob/v2.0.2/yarn-project/end-to-end/src/guides/dapp_testing.test.ts#L136-L139" target="_blank" rel="noopener noreferrer">Source code: yarn-project/end-to-end/src/guides/dapp_testing.test.ts#L136-L139</a></sub></sup>
 
@@ -274,7 +275,7 @@ await expect(call.simulate({ from: ownerAddress })).rejects.toThrow(/Balance too
 
 This is the same as [`prove`](#prove) except it also broadcasts the transaction and returns a receipt. This is how transactions are sent, getting them to be included in blocks and spending gas. It is similar to [`eth_sendTransaction`](#eth_sendtransaction), except it also performs some work on the user's device, namely the production of the proof for the private part of the transaction.
 
-```typescript title="send_tx" showLineNumbers 
+```typescript title="send_tx" showLineNumbers
 await contract.methods.buy_pack(seed).send({ from: firstPlayer }).wait();
 ```
 > <sup><sub><a href="https://github.com/AztecProtocol/aztec-packages/blob/v2.0.2/yarn-project/end-to-end/src/e2e_card_game.test.ts#L129-L131" target="_blank" rel="noopener noreferrer">Source code: yarn-project/end-to-end/src/e2e_card_game.test.ts#L129-L131</a></sub></sup>

l1-contracts/foundry.toml

@@ -70,5 +70,20 @@ wrap_comments = true
 number_underscore = "thousands"
 override_spacing = false
 
+[lint]
+ignore = ["./lib/**"]
+exclude_lints = [
+  "unused-import", # Mostly in test code
+  "incorrect-shift", # Throws warnings on construction of bitmasks
+
+  "asm-keccak256", # https://github.com/AztecProtocol/aztec-packages/issues/16808
+
+  # Silencing due to just being style changes
+  "mixed-case-variable",
+  "mixed-case-function",
+  "screaming-snake-case-const",
+  "screaming-snake-case-immutable",
+]
+
 [rpc_endpoints]
 mainnet_fork = "https://mainnet.infura.io/v3/9928b52099854248b3a096be07a6b23c"

l1-contracts/script/StakingAssetHandler.s.sol

@@ -57,7 +57,8 @@ contract StakingAssetHandlerScript is Test {
       domain: DOMAIN,
       scope: SCOPE,
       skipBindCheck: false, // DO NOT: skip bind check
-      skipMerkleCheck: true // DO: skip merkle check
+      skipMerkleCheck: true, // DO: skip merkle check
+      validatorsToFlush: 48
     });
 
     vm.startBroadcast(ME);