Merge branch 'feat/init-stdlib' into feat/multiplexer

zksecurity · Oct 25, 2024 · 753f358 · 753f358
2 parents 45af223 + 34cf5c4
commit 753f358
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/snarkjs.sh b/.github/workflows/snarkjs.sh
@@ -9,6 +9,10 @@ fi
 DIR_PATH=$1
 CURVE=$2
 
+# Init stdlib in .noname/release/src/stdlib instead of downloading
+echo "Overriding stdlib in .noname/release/src/stdlib..."
+mkdir -p ~/.noname/release/src/stdlib/ && cp -r /app/noname/src/stdlib/* ~/.noname/release/src/stdlib/
+
 # Ensure the circuit directory exists and is initialized
 echo "Initializing a new Noname package..."
 noname new --path circuit_noname

diff --git a/src/cli/packages.rs b/src/cli/packages.rs
@@ -7,6 +7,8 @@ use camino::Utf8PathBuf as PathBuf;
 use miette::{Context, IntoDiagnostic, Result};
 use serde::{Deserialize, Serialize};
 
+use crate::stdlib::STDLIB_DIRECTORY;
+
 use super::{
     manifest::{read_manifest, Manifest},
     NONAME_DIRECTORY, PACKAGE_DIRECTORY, RELEASE_DIRECTORY,
@@ -248,7 +250,7 @@ pub(crate) fn path_to_stdlib() -> PathBuf {
         .expect("invalid UTF8 path");
     let noname_dir = home_dir.join(NONAME_DIRECTORY);
 
-    noname_dir.join(RELEASE_DIRECTORY).join("src/stdlib/native")
+    noname_dir.join(RELEASE_DIRECTORY).join(STDLIB_DIRECTORY)
 }
 
 /// download package from github
@@ -278,7 +280,7 @@ pub fn download_stdlib() -> Result<()> {
     // Hardcoded repository details and target branch
     let repo_owner = "zksecurity";
     let repo_name = "noname";
-    let target_branch = "release";
+    let target_branch = "main";
     let repo_url = format!(
         "https://github.com/{owner}/{repo}.git",
         owner = repo_owner,

diff --git a/src/stdlib/mod.rs b/src/stdlib/mod.rs
@@ -100,10 +100,6 @@ pub fn init_stdlib_dep<B: Backend>(
     for lib in libs {
         let module = UserRepo::new(&format!("std/{}", lib));
         let prefix_stdlib = Path::new(path_prefix);
-        println!(
-            "Loading stdlib: {}",
-            prefix_stdlib.join(format!("{lib}/lib.no")).display()
-        );
         let code = std::fs::read_to_string(prefix_stdlib.join(format!("{lib}/lib.no"))).unwrap();
         node_id =
             typecheck_next_file(tast, Some(module), sources, lib.to_string(), code, 0).unwrap();

diff --git a/src/stdlib/native/bits/lib.no b/src/stdlib/native/bits/lib.no
@@ -1,5 +1,6 @@
 hint fn nth_bit(value: Field, const nth: Field) -> Field;
 
+// Convert a bit array to a Field
 fn from_bits(bits: [Bool; LEN]) -> Field {
     let mut lc1 = 0;
     let mut e2 = 1;
@@ -12,6 +13,7 @@ fn from_bits(bits: [Bool; LEN]) -> Field {
     return lc1;
 }
 
+// Convert a Field to a bit array
 fn to_bits(const LEN: Field, value: Field) -> [Bool; LEN] {
     let mut bits = [false; LEN];
     let mut lc1 = 0;