chore: address some visibility warnings (#13728)

Pulls out some changes from #13685

Author: TomAFrench

noir-projects/mock-protocol-circuits/crates/mock-types/src/lib.nr

@@ -1,7 +1,7 @@
-global MAX_COMMITMENTS_PER_CALL: u32 = 2;
-global MAX_COMMITMENTS_PER_TX: u32 = 4;
-global MAX_COMMITMENT_READ_REQUESTS_PER_CALL: u32 = 2;
-global MAX_COMMITMENT_READ_REQUESTS_PER_TX: u32 = 4;
+pub global MAX_COMMITMENTS_PER_CALL: u32 = 2;
+pub global MAX_COMMITMENTS_PER_TX: u32 = 4;
+pub global MAX_COMMITMENT_READ_REQUESTS_PER_CALL: u32 = 2;
+pub global MAX_COMMITMENT_READ_REQUESTS_PER_TX: u32 = 4;
 
 pub use protocol_types::{
     constants::{
@@ -13,13 +13,13 @@ pub use protocol_types::{
     traits::Serialize,
 };
 
-struct TxRequest {
-    number_of_calls: u32,
+pub struct TxRequest {
+    pub number_of_calls: u32,
 }
 
-struct AppPublicInputs {
-    commitments: [Field; MAX_COMMITMENTS_PER_CALL],
-    read_requests: [Field; MAX_COMMITMENT_READ_REQUESTS_PER_CALL],
+pub struct AppPublicInputs {
+    pub commitments: [Field; MAX_COMMITMENTS_PER_CALL],
+    pub read_requests: [Field; MAX_COMMITMENT_READ_REQUESTS_PER_CALL],
 }
 
 impl Default for AppPublicInputs {
@@ -31,10 +31,10 @@ impl Default for AppPublicInputs {
     }
 }
 
-struct PrivateKernelPublicInputs {
-    remaining_calls: u32,
-    commitments: [Field; MAX_COMMITMENTS_PER_TX],
-    read_requests: [Field; MAX_COMMITMENT_READ_REQUESTS_PER_TX],
+pub struct PrivateKernelPublicInputs {
+    pub remaining_calls: u32,
+    pub commitments: [Field; MAX_COMMITMENTS_PER_TX],
+    pub read_requests: [Field; MAX_COMMITMENT_READ_REQUESTS_PER_TX],
 }
 
 impl Default for PrivateKernelPublicInputs {
@@ -47,22 +47,22 @@ impl Default for PrivateKernelPublicInputs {
     }
 }
 
-struct PrivateKernelPublicInputsBuilder {
-    remaining_calls: u32,
-    commitments: BoundedVec<Field, MAX_COMMITMENTS_PER_TX>,
-    read_requests: BoundedVec<Field, MAX_COMMITMENT_READ_REQUESTS_PER_TX>,
+pub struct PrivateKernelPublicInputsBuilder {
+    pub remaining_calls: u32,
+    pub commitments: BoundedVec<Field, MAX_COMMITMENTS_PER_TX>,
+    pub read_requests: BoundedVec<Field, MAX_COMMITMENT_READ_REQUESTS_PER_TX>,
 }
 
 impl PrivateKernelPublicInputsBuilder {
-    fn from_tx(tx: TxRequest) -> Self {
+    pub fn from_tx(tx: TxRequest) -> Self {
         Self {
             remaining_calls: tx.number_of_calls,
             commitments: BoundedVec::new(),
             read_requests: BoundedVec::new(),
         }
     }
 
-    fn from_previous_kernel(prev_kernel_public_inputs: PrivateKernelPublicInputs) -> Self {
+    pub fn from_previous_kernel(prev_kernel_public_inputs: PrivateKernelPublicInputs) -> Self {
         let mut builder = PrivateKernelPublicInputsBuilder {
             remaining_calls: prev_kernel_public_inputs.remaining_calls,
             commitments: BoundedVec::new(),
@@ -81,7 +81,7 @@ impl PrivateKernelPublicInputsBuilder {
         builder
     }
 
-    fn ingest_app_inputs(&mut self, app_inputs: AppPublicInputs) {
+    pub fn ingest_app_inputs(&mut self, app_inputs: AppPublicInputs) {
         for i in 0..MAX_COMMITMENTS_PER_CALL {
             if app_inputs.commitments[i] != 0 {
                 self.commitments.push(app_inputs.commitments[i]);
@@ -97,7 +97,7 @@ impl PrivateKernelPublicInputsBuilder {
         self.remaining_calls -= 1;
     }
 
-    fn finish(self) -> PrivateKernelPublicInputs {
+    pub fn finish(self) -> PrivateKernelPublicInputs {
         PrivateKernelPublicInputs {
             remaining_calls: self.remaining_calls,
             commitments: self.commitments.storage(),
@@ -107,7 +107,7 @@ impl PrivateKernelPublicInputsBuilder {
 }
 
 pub struct KernelPublicInputs {
-    commitments: [Field; MAX_COMMITMENTS_PER_TX],
+    pub commitments: [Field; MAX_COMMITMENTS_PER_TX],
 }
 
 impl Default for KernelPublicInputs {

noir-projects/noir-protocol-circuits/bootstrap.sh

@@ -142,9 +142,19 @@ function compile {
 export -f compile
 
 function build {
+  set -eu
+
+  echo_stderr "Checking libraries for warnings..."
+  parallel -v --line-buffer --tag $NARGO --program-dir {} check --deny-warnings ::: \
+    ./crates/blob \
+    ./crates/parity-lib \
+    ./crates/private-kernel-lib \
+    ./crates/reset-kernel-lib \
+    ./crates/rollup-lib \
+    ./crates/types \
+
   # We allow errors so we can output the joblog.
   set +e
-  set -u
   rm -rf target
   mkdir -p $key_dir
 

noir-projects/noir-protocol-circuits/crates/blob/Nargo.toml

@@ -7,3 +7,4 @@ compiler_version = ">=0.30.0"
 [dependencies]
 bigint = { tag = "v0.6.0", git = "https://github.com/noir-lang/noir-bignum" }
 types = { path = "../types" }
+poseidon = { tag = "v0.1.0", git = "https://github.com/noir-lang/poseidon" }

noir-projects/noir-protocol-circuits/crates/blob/src/blob.nr

@@ -44,7 +44,7 @@ pub fn check_block_blob_sponge(
 
 fn compute_challenge(hashed_blobs_fields: Field, kzg_commitment: BlobCommitment) -> Field {
     let preimage = [hashed_blobs_fields, kzg_commitment.inner[0], kzg_commitment.inner[1]];
-    let challenge = std::hash::poseidon2::Poseidon2::hash(preimage, 3);
+    let challenge = poseidon::poseidon2::Poseidon2::hash(preimage, 3);
     challenge
 }
 
@@ -474,7 +474,7 @@ mod tests {
         let padded_blob_fields = pad_end(blob, 0);
         let hashed_blob = check_block_blob_sponge(padded_blob_fields, sponge_blob);
         let output = evaluate_blob(blob, kzg_commitment_in, hashed_blob);
-        let expected_z = std::hash::poseidon2::Poseidon2::hash(
+        let expected_z = poseidon::poseidon2::Poseidon2::hash(
             [sponge_blob.squeeze(), kzg_commitment_in.inner[0], kzg_commitment_in.inner[1]],
             3,
         );

noir-projects/noir-protocol-circuits/crates/rollup-lib/Nargo.toml

@@ -8,3 +8,4 @@ compiler_version = ">=0.18.0"
 types = { path = "../types" }
 parity_lib = { path = "../parity-lib" }
 blob = { path = "../blob" }
+poseidon = { tag = "v0.1.0", git = "https://github.com/noir-lang/poseidon" }

noir-projects/noir-protocol-circuits/crates/rollup-lib/src/base/private_base_rollup.nr

@@ -409,7 +409,7 @@ mod tests {
             start_public_data_tree: NonEmptyMerkleTree<AVAILABLE_PUBLIC_DATA_LEAVES_FOR_TEST, PUBLIC_DATA_TREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT - AVAILABLE_PUBLIC_DATA_SUBTREE_HEIGHT_FOR_TEST, AVAILABLE_PUBLIC_DATA_SUBTREE_HEIGHT_FOR_TEST>,
         ) -> PublicDataHint {
             let leaf_index = self.fee_payer_balance_leaf_index as Field;
-            let leaf_preimage = self.pre_existing_public_data[leaf_index];
+            let leaf_preimage = self.pre_existing_public_data[leaf_index as u32];
             let membership_witness = MembershipWitness {
                 leaf_index,
                 sibling_path: start_public_data_tree.get_sibling_path(

noir-projects/noir-protocol-circuits/crates/rollup-lib/src/block_root/block_root_rollup_inputs.nr

@@ -49,7 +49,7 @@ pub(crate) mod tests {
         block_root::block_root_rollup_inputs::BlockRootRollupInputs,
         tests::rollup_fixture_builder::RollupFixtureBuilder,
     };
-    use std::hash::poseidon2::Poseidon2;
+    use poseidon::poseidon2::Poseidon2;
     use types::{
         hash::accumulate_sha256, tests::utils::assert_array_eq, utils::arrays::array_concat,
     };

noir-projects/noir-protocol-circuits/crates/rollup-lib/src/block_root/empty_block_root_rollup_inputs.nr

@@ -60,7 +60,7 @@ mod tests {
         },
         tests::rollup_fixture_builder::RollupFixtureBuilder,
     };
-    use std::hash::poseidon2::Poseidon2;
+    use poseidon::poseidon2::Poseidon2;
     use types::{abis::sponge_blob::SpongeBlob, address::EthAddress, tests::utils::assert_array_eq};
 
     pub struct TestBuilder {

noir-projects/noir-protocol-circuits/crates/types/Nargo.toml

@@ -5,4 +5,5 @@ authors = [""]
 compiler_version = ">=0.18.0"
 
 [dependencies]
-sha256 = { tag = "v0.1.2", git = "https://github.com/noir-lang/sha256" }
+sha256 = { tag = "v0.1.3", git = "https://github.com/noir-lang/sha256" }
+poseidon = { tag = "v0.1.0", git = "https://github.com/noir-lang/poseidon" }

noir-projects/noir-protocol-circuits/crates/types/src/abis/avm_circuit_public_inputs.nr

@@ -22,8 +22,6 @@ use crate::{
     utils::reader::Reader,
 };
 
-use std::hash::{poseidon2, poseidon2_permutation};
-
 pub struct AvmCircuitPublicInputs {
     ///////////////////////////////////
     // Inputs.

noir-projects/noir-protocol-circuits/crates/types/src/hash.nr

@@ -234,7 +234,7 @@ pub fn pedersen_hash<let N: u32>(inputs: [Field; N], hash_index: u32) -> Field {
 }
 
 pub fn poseidon2_hash<let N: u32>(inputs: [Field; N]) -> Field {
-    std::hash::poseidon2::Poseidon2::hash(inputs, N)
+    poseidon::poseidon2::Poseidon2::hash(inputs, N)
 }
 
 #[no_predicates]
@@ -256,7 +256,7 @@ pub fn poseidon2_hash_subarray<let N: u32>(input: [Field; N], in_len: u32) -> Fi
     sponge.squeeze()
 }
 
-// NB the below is the same as std::hash::poseidon2::Poseidon2::hash(), but replacing a range check with a bit check,
+// NB the below is the same as poseidon::poseidon2::Poseidon2::hash(), but replacing a range check with a bit check,
 // and absorbing in chunks of 3 below.
 #[no_predicates]
 pub fn poseidon2_cheaper_variable_hash<let N: u32>(input: [Field; N], in_len: u32) -> Field {
@@ -462,7 +462,7 @@ fn poseidon_chunks_matches_fixed() {
         input[i] = 3;
     }
     let sub_chunk_hash = poseidon2_hash_subarray(input, in_len);
-    let fixed_len_hash = std::hash::poseidon2::Poseidon2::hash(fixed_input, fixed_input.len());
+    let fixed_len_hash = poseidon::poseidon2::Poseidon2::hash(fixed_input, fixed_input.len());
     assert(sub_chunk_hash == fixed_len_hash);
 }
 
@@ -474,7 +474,7 @@ fn poseidon_chunks_matches_variable() {
         input[i] = 3;
     }
     let variable_chunk_hash = poseidon2_cheaper_variable_hash(input, in_len);
-    let variable_len_hash = std::hash::poseidon2::Poseidon2::hash(input, in_len);
+    let variable_len_hash = poseidon::poseidon2::Poseidon2::hash(input, in_len);
     assert(variable_chunk_hash == variable_len_hash);
 }
 

noir-projects/noir-protocol-circuits/crates/types/src/public_keys.nr

@@ -6,7 +6,7 @@ use crate::{
     },
     hash::poseidon2_hash_with_separator,
     point::POINT_LENGTH,
-    traits::{Deserialize, Hash, Serialize, ToField},
+    traits::{Deserialize, Hash, Serialize},
 };
 
 use dep::std::embedded_curve_ops::EmbeddedCurvePoint as Point;

noir-projects/noir-protocol-circuits/crates/types/src/tests/merkle_tree_utils.nr

@@ -118,7 +118,7 @@ impl<let SUBTREE_ITEMS: u32, let TREE_HEIGHT: u32, let SUPERTREE_HEIGHT: u32, le
             // TODO(md): far right of this yuck
             left_supertree_branch[i] = merkle_hash(
                 left_supertree_branch[i - 1],
-                zero_hashes[(SUBTREE_HEIGHT as u8) - 1 + (i as u8)],
+                zero_hashes[SUBTREE_HEIGHT - 1 + i],
             );
         }
 
@@ -180,7 +180,7 @@ impl<let SUBTREE_ITEMS: u32, let TREE_HEIGHT: u32, let SUPERTREE_HEIGHT: u32, le
         for i in 1..self.left_supertree_branch.len() {
             self.left_supertree_branch[i] = merkle_hash(
                 self.left_supertree_branch[i - 1],
-                self.zero_hashes[(SUBTREE_HEIGHT as u8) - 1 + (i as u8)],
+                self.zero_hashes[SUBTREE_HEIGHT - 1 + i],
             );
         }
     }