diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 622ee22ed8..0470b29026 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -124,7 +124,7 @@ jobs: uses: actions-rs/cargo@v1 with: command: test - args: --release --all --features ci_skip --no-fail-fast + args: --all --features ci_skip --no-fail-fast test-package: name: Test Package diff --git a/.rusty-hook.toml b/.rusty-hook.toml index 0b18442974..9c57ceedf9 100644 --- a/.rusty-hook.toml +++ b/.rusty-hook.toml @@ -2,4 +2,4 @@ pre-commit = "cargo +nightly clippy && cargo +nightly fmt --all -- --check" [logging] -verbose = false +verbose = true diff --git a/.travis.yml b/.travis.yml index 7916812a54..0962bf1c94 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ before_install: - export RUSTC_WRAPPER="sccache" - | declare -r SSH_FILE="$(mktemp -u $HOME/.ssh/XXXXX)" - openssl aes-256-cbc -K $encrypted_beefc4a47cdc_key -iv $encrypted_beefc4a47cdc_iv -in .travis/travis-snarkos.enc -out $SSH_FILE -d + openssl aes-256-cbc -K $encrypted_beefc4a47cdc_key -iv $encrypted_beefc4a47cdc_iv -in .travis/travis-snarkvm.enc -out $SSH_FILE -d chmod 600 "$SSH_FILE" \ && printf "%s\n" \ "Host github.com" \ diff --git a/Cargo.lock b/Cargo.lock index 3e867a7683..94097f2c4f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -48,6 +48,12 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "anyhow" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee67c11feeac938fae061b232e38e0b6d94f97a9df10e6271319325ac4c56a86" + [[package]] name = "arrayref" version = "0.3.6" @@ -140,7 +146,7 @@ dependencies = [ "cfg-if 0.1.10", "clang-sys", "clap", - "env_logger 0.7.1", + "env_logger", "lazy_static", "lazycell", "log", @@ -380,9 +386,9 @@ dependencies = [ [[package]] name = "console" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a50aab2529019abfabfa93f1e6c41ef392f91fbf179b347a7e96abb524884a08" +checksum = "7cc80946b3480f421c2f17ed1cb841753a371c7c5104f51d507e13f532c856aa" dependencies = [ "encode_unicode", "lazy_static", @@ -391,7 +397,6 @@ dependencies = [ "terminal_size", "unicode-width", "winapi 0.3.9", - "winapi-util", ] [[package]] @@ -630,12 +635,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "dotenv" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" - [[package]] name = "either" version = "1.6.1" @@ -664,20 +663,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" dependencies = [ "atty", - "humantime 1.3.0", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "env_logger" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26ecb66b4bdca6c1409b40fb255eefc2bd4f6d135dab3c3124f80ffa2a9661e" -dependencies = [ - "atty", - "humantime 2.0.1", + "humantime", "log", "regex", "termcolor", @@ -884,6 +870,15 @@ dependencies = [ "slab", ] +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + [[package]] name = "generator" version = "0.6.23" @@ -1037,12 +1032,6 @@ dependencies = [ "quick-error", ] -[[package]] -name = "humantime" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c1ad908cc71012b7bea4d0c53ba96a8cba9962f048fa68d143376143d863b7a" - [[package]] name = "hyper" version = "0.13.9" @@ -1269,8 +1258,6 @@ dependencies = [ "pest", "serde", "serde_json", - "snarkos-errors", - "snarkos-models", ] [[package]] @@ -1296,17 +1283,16 @@ dependencies = [ "rand_xorshift", "serde", "sha2", - "snarkos-algorithms", - "snarkos-curves", - "snarkos-dpc", - "snarkos-errors", - "snarkos-gadgets", - "snarkos-models", - "snarkos-objects", - "snarkos-utilities", + "snarkvm-algorithms", + "snarkvm-curves", + "snarkvm-dpc", + "snarkvm-errors", + "snarkvm-gadgets", + "snarkvm-models", + "snarkvm-objects", + "snarkvm-utilities", "thiserror", "tracing", - "tracing-subscriber", ] [[package]] @@ -1317,11 +1303,11 @@ dependencies = [ "leo-gadgets", "rand", "rand_xorshift", - "snarkos-curves", - "snarkos-errors", - "snarkos-gadgets", - "snarkos-models", - "snarkos-utilities", + "snarkvm-curves", + "snarkvm-errors", + "snarkvm-gadgets", + "snarkvm-models", + "snarkvm-utilities", "thiserror", ] @@ -1332,9 +1318,9 @@ dependencies = [ "criterion", "rand", "rand_xorshift", - "snarkos-errors", - "snarkos-models", - "snarkos-utilities", + "snarkvm-errors", + "snarkvm-models", + "snarkvm-utilities", "thiserror", ] @@ -1373,11 +1359,6 @@ dependencies = [ "pest", "pest-ast", "pest_derive", - "snarkos-algorithms", - "snarkos-curves", - "snarkos-errors", - "snarkos-gadgets", - "snarkos-models", "thiserror", "tracing", ] @@ -1390,8 +1371,6 @@ dependencies = [ "colored", "console", "dirs", - "dotenv", - "env_logger 0.8.2", "from-pest", "lazy_static", "leo-ast", @@ -1410,12 +1389,12 @@ dependencies = [ "self_update", "serde", "serde_json", - "snarkos-algorithms", - "snarkos-curves", - "snarkos-errors", - "snarkos-gadgets", - "snarkos-models", - "snarkos-utilities", + "snarkvm-algorithms", + "snarkvm-curves", + "snarkvm-errors", + "snarkvm-gadgets", + "snarkvm-models", + "snarkvm-utilities", "thiserror", "toml", "tracing", @@ -1433,7 +1412,6 @@ version = "1.0.7" dependencies = [ "lazy_static", "serde", - "serde_json", "thiserror", "toml", "tracing", @@ -1450,14 +1428,14 @@ dependencies = [ "leo-input", "rand", "rand_xorshift", - "snarkos-algorithms", - "snarkos-curves", - "snarkos-dpc", - "snarkos-errors", - "snarkos-models", - "snarkos-objects", - "snarkos-storage", - "snarkos-utilities", + "snarkvm-algorithms", + "snarkvm-curves", + "snarkvm-dpc", + "snarkvm-errors", + "snarkvm-models", + "snarkvm-objects", + "snarkvm-storage", + "snarkvm-utilities", "thiserror", ] @@ -2250,9 +2228,9 @@ dependencies = [ [[package]] name = "rocksdb" -version = "0.13.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12069b106981c6103d3eab7dd1c86751482d0779a520b7c14954c8b586c1e643" +checksum = "23d83c02c429044d58474eaf5ae31e062d0de894e21125b47437ec0edc1397e6" dependencies = [ "libc", "librocksdb-sys", @@ -2452,9 +2430,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.60" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1500e84d27fe482ed1dc791a56eddc2f230046a040fa908c08bda1d9fb615779" +checksum = "4fceb2595057b6891a4ee808f70054bd2d12f0e97f1cbb78689b59f676df325a" dependencies = [ "itoa", "ryu", @@ -2536,10 +2514,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae524f056d7d770e174287294f562e95044c68e88dec909a00d2094805db9d75" [[package]] -name = "snarkos-algorithms" -version = "1.1.4" +name = "snarkvm-algorithms" +version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb07037b1575665f3a727ef444c513b4727dda85378c5eba26b4c881bc3046e8" +checksum = "bdc4273884a3c5b1858e9ccb3dd6d7acfa60c0c38bb4876aeeb3181936dbe5f3" dependencies = [ "blake2", "derivative", @@ -2550,33 +2528,33 @@ dependencies = [ "rayon", "sha2", "smallvec", - "snarkos-errors", - "snarkos-models", - "snarkos-profiler", - "snarkos-utilities", + "snarkvm-errors", + "snarkvm-models", + "snarkvm-profiler", + "snarkvm-utilities", ] [[package]] -name = "snarkos-curves" -version = "1.1.4" +name = "snarkvm-curves" +version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3aee88d337863483d07cd91e5dbc1c12de1375c1a133c49fe18f771924a80d6e" +checksum = "57c0ab5c370fa0e394acc14474ce0ed162ca673e87ac496e733d402b5c71f177" dependencies = [ "derivative", "rand", "rand_xorshift", "rustc_version", "serde", - "snarkos-errors", - "snarkos-models", - "snarkos-utilities", + "snarkvm-errors", + "snarkvm-models", + "snarkvm-utilities", ] [[package]] -name = "snarkos-derives" -version = "1.1.4" +name = "snarkvm-derives" +version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f6ce35f9f73c13e5381c6938747935ca105e22717998489c3e5ddb8c13120d" +checksum = "b74eecab3b4bbcef183819fb414ad3498b6c962f21a41a2afaf73af2822eec98" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", @@ -2584,32 +2562,33 @@ dependencies = [ ] [[package]] -name = "snarkos-dpc" -version = "1.1.4" +name = "snarkvm-dpc" +version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51ecd7bcea91bbae1e636949b32908df2c674b7381387beadde364d6a3af6ad0" +checksum = "2a3bbd6dcb0e100d514fa0f8cfb2fd8e0422660d5d816a47409d8111c536dddc" dependencies = [ + "anyhow", "blake2", "derivative", "hex", "itertools 0.9.0", "rand", - "snarkos-algorithms", - "snarkos-curves", - "snarkos-errors", - "snarkos-gadgets", - "snarkos-models", - "snarkos-objects", - "snarkos-parameters", - "snarkos-profiler", - "snarkos-utilities", + "snarkvm-algorithms", + "snarkvm-curves", + "snarkvm-errors", + "snarkvm-gadgets", + "snarkvm-models", + "snarkvm-objects", + "snarkvm-parameters", + "snarkvm-profiler", + "snarkvm-utilities", ] [[package]] -name = "snarkos-errors" -version = "1.1.4" +name = "snarkvm-errors" +version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df927c3b41badf8a8479dd6b23340e4799bec44abb7a479cb253d912e888a1ca" +checksum = "c7b46326076d2797280a335f6a4c3538e5ba57db37704233e55134b3e1ab2e79" dependencies = [ "base58", "bech32", @@ -2623,43 +2602,46 @@ dependencies = [ ] [[package]] -name = "snarkos-gadgets" -version = "1.1.4" +name = "snarkvm-gadgets" +version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4bded425072f394dacf206323bcd3d2e199d6ec5f7ced3c36fb77f7d22300b" +checksum = "12ec20358b56a972bf280690ace5e5c1ba809e4cd31d31932f0bd15491f9be0d" dependencies = [ "derivative", "digest 0.8.1", "itertools 0.9.0", - "snarkos-algorithms", - "snarkos-curves", - "snarkos-errors", - "snarkos-models", - "snarkos-utilities", + "snarkvm-algorithms", + "snarkvm-curves", + "snarkvm-errors", + "snarkvm-models", + "snarkvm-utilities", ] [[package]] -name = "snarkos-models" -version = "1.1.4" +name = "snarkvm-models" +version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d90d4fd9030e69dcbca1f7eaea3f14c08653f0f06600f42c2022e8cf72f82d" +checksum = "ae6d7532cfc6b888e8566e05e62384c4c7103fa3036555c54b98726fba4bb100" dependencies = [ + "anyhow", "bincode", + "cfg-if 0.1.10", "derivative", + "fxhash", + "indexmap", "itertools 0.9.0", "rand", "rand_xorshift", "serde", - "smallvec", - "snarkos-errors", - "snarkos-utilities", + "snarkvm-errors", + "snarkvm-utilities", ] [[package]] -name = "snarkos-objects" -version = "1.1.4" +name = "snarkvm-objects" +version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5ec3bdfbe179a157d1484e11ec65fdd3d2bf377ad1a7695753c5f613a57a790" +checksum = "cd3ca38c2a7744f4dca2bdae9441da634b06f40f762323c9e361d6a2582f3353" dependencies = [ "base58", "bech32", @@ -2670,63 +2652,65 @@ dependencies = [ "rand", "serde", "sha2", - "snarkos-algorithms", - "snarkos-curves", - "snarkos-errors", - "snarkos-models", - "snarkos-utilities", + "snarkvm-algorithms", + "snarkvm-curves", + "snarkvm-errors", + "snarkvm-models", + "snarkvm-utilities", ] [[package]] -name = "snarkos-parameters" -version = "1.1.4" +name = "snarkvm-parameters" +version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d7634a5cd35a680b81d58dbd842ee38413e81cd9ad6b8317cd93f84c9513c3" +checksum = "02a6590e3860f1dc78335a2ef498b21cffa4655de4cfb7cc9027d29b1093d887" dependencies = [ "curl", "hex", - "snarkos-algorithms", - "snarkos-errors", - "snarkos-models", - "snarkos-utilities", + "snarkvm-algorithms", + "snarkvm-errors", + "snarkvm-models", + "snarkvm-utilities", ] [[package]] -name = "snarkos-profiler" -version = "1.1.4" +name = "snarkvm-profiler" +version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0519c9371650425e332e3971ecfc691fbd1c67e03be15c20aba89ac8242ea2b" +checksum = "ed9ec5eadd049ee06e676070d5402401373fe278a42b515141a9b14ca86a795a" [[package]] -name = "snarkos-storage" -version = "1.1.4" +name = "snarkvm-storage" +version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c31a1de407b5d19365e0463ecf4536725055f7b3c52dbe350e153386303eeea" +checksum = "cbf798e9883014175e2f019f019fc4db1756cf7d57408602315b270b93992258" dependencies = [ + "anyhow", "bincode", "hex", "parking_lot", "rand", "rocksdb", "serde", - "snarkos-algorithms", - "snarkos-errors", - "snarkos-models", - "snarkos-objects", - "snarkos-parameters", - "snarkos-utilities", + "snarkvm-algorithms", + "snarkvm-errors", + "snarkvm-models", + "snarkvm-objects", + "snarkvm-parameters", + "snarkvm-utilities", + "thiserror", ] [[package]] -name = "snarkos-utilities" -version = "1.1.4" +name = "snarkvm-utilities" +version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f6e1ccf791ace8d28266d3067d0bf93e3a0c1beafa472f186f55866fe8a7d73" +checksum = "d78a4a12c67cc013d6a9574f3231aaf915589cebfd38d27d5f8ad24f1be5794f" dependencies = [ "bincode", "rand", - "snarkos-derives", - "snarkos-errors", + "snarkvm-derives", + "snarkvm-errors", ] [[package]] @@ -2830,18 +2814,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e9ae34b84616eedaaf1e9dd6026dbe00dcafa92aa0c8077cb69df1fcfe5e53e" +checksum = "76cc616c6abf8c8928e2fdcc0dbfab37175edd8fb49a4641066ad1364fdab146" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56" +checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", @@ -2937,9 +2921,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75cf45bb0bef80604d001caaec0d09da99611b3c0fd39d3080468875cdb65645" +checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" dependencies = [ "serde", ] diff --git a/Cargo.toml b/Cargo.toml index 99192f1bea..08878cb385 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -68,28 +68,28 @@ version = "1.0.7" path = "./state" version = "1.0.7" -[dependencies.snarkos-algorithms] -version = "1.1.3" +[dependencies.snarkvm-algorithms] +version = "0.0.2" default-features = false -[dependencies.snarkos-curves] -version = "1.1.3" +[dependencies.snarkvm-curves] +version = "0.0.2" default-features = false -[dependencies.snarkos-errors] -version = "1.1.3" +[dependencies.snarkvm-errors] +version = "0.0.2" default-features = false -[dependencies.snarkos-gadgets] -version = "1.1.3" +[dependencies.snarkvm-gadgets] +version = "0.0.2" default-features = false -[dependencies.snarkos-models] -version = "1.1.3" +[dependencies.snarkvm-models] +version = "0.0.2" default-features = false -[dependencies.snarkos-utilities] -version = "1.1.3" +[dependencies.snarkvm-utilities] +version = "0.0.2" [dependencies.clap] version = "2.33.3" @@ -101,13 +101,7 @@ version = "2.0" version = "3.0.1" [dependencies.console] -version = "0.13.0" - -[dependencies.dotenv] -version = "0.15.0" - -[dependencies.env_logger] -version = "0.8" +version = "0.14.0" [dependencies.from-pest] version = "0.3.1" diff --git a/ast/Cargo.toml b/ast/Cargo.toml index d5d5552a26..a632b3bbc2 100644 --- a/ast/Cargo.toml +++ b/ast/Cargo.toml @@ -34,14 +34,6 @@ version = "1.0.7" path = "../input" version = "1.0.7" -[dependencies.snarkos-errors] -version = "1.1.3" -default-features = false - -[dependencies.snarkos-models] -version = "1.1.3" -default-features = false - [dependencies.indexmap] version = "1.6.1" features = [ "serde-1" ] diff --git a/compiler/Cargo.toml b/compiler/Cargo.toml index f05b375767..e8f513870d 100644 --- a/compiler/Cargo.toml +++ b/compiler/Cargo.toml @@ -57,32 +57,32 @@ version = "1.0.7" path = "../type-inference" version = "1.0.7" -[dependencies.snarkos-curves] -version = "1.1.3" +[dependencies.snarkvm-curves] +version = "0.0.2" default-features = false -[dependencies.snarkos-dpc] -version = "1.1.3" +[dependencies.snarkvm-dpc] +version = "0.0.2" default-features = false -[dependencies.snarkos-errors] -version = "1.1.3" +[dependencies.snarkvm-errors] +version = "0.0.2" default-features = false -[dependencies.snarkos-gadgets] -version = "1.1.3" +[dependencies.snarkvm-gadgets] +version = "0.0.2" default-features = false -[dependencies.snarkos-models] -version = "1.1.3" +[dependencies.snarkvm-models] +version = "0.0.2" default-features = false -[dependencies.snarkos-objects] -version = "1.1.3" +[dependencies.snarkvm-objects] +version = "0.0.2" default-features = false -[dependencies.snarkos-utilities] -version = "1.1.3" +[dependencies.snarkvm-utilities] +version = "0.0.2" [dependencies.bincode] version = "1.0" @@ -116,14 +116,11 @@ version = "1.0" [dependencies.tracing] version = "0.1" -[dependencies.tracing-subscriber] -version = "0.2" - [dev-dependencies.num-bigint] version = "0.3" -[dev-dependencies.snarkos-algorithms] -version = "1.1.3" +[dev-dependencies.snarkvm-algorithms] +version = "0.0.2" default-features = false [features] diff --git a/compiler/src/compiler.rs b/compiler/src/compiler.rs index 51e85d1d0f..e878647140 100644 --- a/compiler/src/compiler.rs +++ b/compiler/src/compiler.rs @@ -32,9 +32,9 @@ use leo_state::verify_local_data_commitment; use leo_symbol_table::SymbolTable; use leo_type_inference::TypeInference; -use snarkos_dpc::{base_dpc::instantiated::Components, SystemParameters}; -use snarkos_errors::gadgets::SynthesisError; -use snarkos_models::{ +use snarkvm_dpc::{base_dpc::instantiated::Components, SystemParameters}; +use snarkvm_errors::gadgets::SynthesisError; +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::{ConstraintSynthesizer, ConstraintSystem}, }; @@ -303,7 +303,7 @@ impl> Compiler { pub fn compile_constraints>(self, cs: &mut CS) -> Result { let path = self.main_file_path; - generate_constraints::(cs, self.program, self.program_input, &self.imported_programs).map_err( + generate_constraints::(cs, &self.program, &self.program_input, &self.imported_programs).map_err( |mut error| { error.set_path(&path); @@ -329,11 +329,11 @@ impl> Compiler { /// Calls the internal generate_constraints method with arguments. /// pub fn generate_constraints_helper>( - self, + &self, cs: &mut CS, ) -> Result { - let path = self.main_file_path; - generate_constraints::<_, G, _>(cs, self.program, self.program_input, &self.imported_programs).map_err( + let path = &self.main_file_path; + generate_constraints::<_, G, _>(cs, &self.program, &self.program_input, &self.imported_programs).map_err( |mut error| { error.set_path(&path); error @@ -346,7 +346,7 @@ impl> ConstraintSynthesizer for Compil /// /// Synthesizes the circuit with program input. /// - fn generate_constraints>(self, cs: &mut CS) -> Result<(), SynthesisError> { + fn generate_constraints>(&self, cs: &mut CS) -> Result<(), SynthesisError> { let output_directory = self.output_directory.clone(); let package_name = self.package_name.clone(); let result = self.generate_constraints_helper(cs).map_err(|e| { diff --git a/compiler/src/console/assert.rs b/compiler/src/console/assert.rs index e3df68ba9d..3b946959b3 100644 --- a/compiler/src/console/assert.rs +++ b/compiler/src/console/assert.rs @@ -25,7 +25,7 @@ use crate::{ }; use leo_ast::{Expression, Span, Type}; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::{r1cs::ConstraintSystem, utilities::boolean::Boolean}, }; diff --git a/compiler/src/console/console.rs b/compiler/src/console/console.rs index 652b63d0dc..8035a9238f 100644 --- a/compiler/src/console/console.rs +++ b/compiler/src/console/console.rs @@ -19,7 +19,7 @@ use crate::{errors::ConsoleError, program::ConstrainedProgram, statement::get_indicator_value, GroupType}; use leo_ast::{ConsoleFunction, ConsoleStatement}; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::{r1cs::ConstraintSystem, utilities::boolean::Boolean}, }; diff --git a/compiler/src/console/format.rs b/compiler/src/console/format.rs index 075b2c333f..1c16f46955 100644 --- a/compiler/src/console/format.rs +++ b/compiler/src/console/format.rs @@ -19,7 +19,7 @@ use crate::{errors::ConsoleError, program::ConstrainedProgram, GroupType}; use leo_ast::FormattedString; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::ConstraintSystem, }; diff --git a/compiler/src/constraints/constraints.rs b/compiler/src/constraints/constraints.rs index cc4969f489..4d4e1252e7 100644 --- a/compiler/src/constraints/constraints.rs +++ b/compiler/src/constraints/constraints.rs @@ -30,7 +30,7 @@ use leo_imports::ImportParser; use leo_input::LeoInputParser; use leo_package::inputs::InputPairs; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::{ConstraintSystem, TestConstraintSystem}, }; @@ -38,15 +38,15 @@ use std::path::Path; pub fn generate_constraints, CS: ConstraintSystem>( cs: &mut CS, - program: Program, - input: Input, + program: &Program, + input: &Input, imported_programs: &ImportParser, ) -> Result { let mut resolved_program = ConstrainedProgram::::new(); let program_name = program.get_name(); let main_function_name = new_scope(&program_name, "main"); - resolved_program.store_definitions(&program, imported_programs)?; + resolved_program.store_definitions(program, imported_programs)?; let main = resolved_program.get(&main_function_name).ok_or(CompilerError::NoMain)?; @@ -120,7 +120,7 @@ pub fn generate_test_constraints>( cs, &program_name, test.function, - input, // pass program input into every test + &input, // pass program input into every test ); match (result.is_ok(), cs.is_satisfied()) { diff --git a/compiler/src/definition/definition.rs b/compiler/src/definition/definition.rs index b684eadb75..ca9623ec0c 100644 --- a/compiler/src/definition/definition.rs +++ b/compiler/src/definition/definition.rs @@ -23,7 +23,7 @@ use crate::{ }; use leo_ast::Identifier; -use snarkos_models::curves::{Field, PrimeField}; +use snarkvm_models::curves::{Field, PrimeField}; impl> ConstrainedProgram { pub fn store_definition( diff --git a/compiler/src/definition/definitions.rs b/compiler/src/definition/definitions.rs index f7707302ae..d075c779f5 100644 --- a/compiler/src/definition/definitions.rs +++ b/compiler/src/definition/definitions.rs @@ -25,7 +25,7 @@ use crate::{ use leo_ast::Program; use leo_imports::ImportParser; -use snarkos_models::curves::{Field, PrimeField}; +use snarkvm_models::curves::{Field, PrimeField}; impl> ConstrainedProgram { pub fn store_definitions( diff --git a/compiler/src/errors/expression.rs b/compiler/src/errors/expression.rs index dd615e9b50..aebc0acfbf 100644 --- a/compiler/src/errors/expression.rs +++ b/compiler/src/errors/expression.rs @@ -18,7 +18,7 @@ use crate::errors::{AddressError, BooleanError, FieldError, FunctionError, Group use leo_ast::{ArrayDimensions, Error as FormattedError, Identifier, PositiveNumber, Span}; use leo_core::LeoCorePackageError; -use snarkos_errors::gadgets::SynthesisError; +use snarkvm_errors::gadgets::SynthesisError; use std::path::Path; #[derive(Debug, Error)] diff --git a/compiler/src/errors/value/address.rs b/compiler/src/errors/value/address.rs index c48ae4a993..7d8bcfbf00 100644 --- a/compiler/src/errors/value/address.rs +++ b/compiler/src/errors/value/address.rs @@ -16,7 +16,7 @@ use leo_ast::{Error as FormattedError, Span}; -use snarkos_errors::{gadgets::SynthesisError, objects::account::AccountError}; +use snarkvm_errors::{gadgets::SynthesisError, objects::account::AccountError}; use std::path::Path; #[derive(Debug, Error)] diff --git a/compiler/src/errors/value/boolean.rs b/compiler/src/errors/value/boolean.rs index 1160f38d7a..375c312c7a 100644 --- a/compiler/src/errors/value/boolean.rs +++ b/compiler/src/errors/value/boolean.rs @@ -16,7 +16,7 @@ use leo_ast::{Error as FormattedError, Span}; -use snarkos_errors::gadgets::SynthesisError; +use snarkvm_errors::gadgets::SynthesisError; use std::path::Path; #[derive(Debug, Error)] diff --git a/compiler/src/errors/value/field.rs b/compiler/src/errors/value/field.rs index 5dda86a677..f125f0d8bc 100644 --- a/compiler/src/errors/value/field.rs +++ b/compiler/src/errors/value/field.rs @@ -16,7 +16,7 @@ use leo_ast::{Error as FormattedError, Span}; -use snarkos_errors::gadgets::SynthesisError; +use snarkvm_errors::gadgets::SynthesisError; use std::path::Path; #[derive(Debug, Error)] diff --git a/compiler/src/errors/value/group.rs b/compiler/src/errors/value/group.rs index d03c6b502f..88a4e4c987 100644 --- a/compiler/src/errors/value/group.rs +++ b/compiler/src/errors/value/group.rs @@ -16,7 +16,7 @@ use leo_ast::{Error as FormattedError, Span}; -use snarkos_errors::gadgets::SynthesisError; +use snarkvm_errors::gadgets::SynthesisError; use std::path::Path; #[derive(Debug, Error)] diff --git a/compiler/src/errors/value/integer.rs b/compiler/src/errors/value/integer.rs index 5ff19eb492..e2ce8ec198 100644 --- a/compiler/src/errors/value/integer.rs +++ b/compiler/src/errors/value/integer.rs @@ -17,7 +17,7 @@ use leo_ast::{error::Error as FormattedError, IntegerType, Span, Type}; use leo_gadgets::errors::SignedIntegerError; -use snarkos_errors::gadgets::SynthesisError; +use snarkvm_errors::gadgets::SynthesisError; use std::path::Path; #[derive(Debug, Error)] diff --git a/compiler/src/expression/arithmetic/add.rs b/compiler/src/expression/arithmetic/add.rs index 504a4c99af..a64218c78f 100644 --- a/compiler/src/expression/arithmetic/add.rs +++ b/compiler/src/expression/arithmetic/add.rs @@ -19,7 +19,7 @@ use crate::{errors::ExpressionError, value::ConstrainedValue, GroupType}; use leo_ast::Span; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::ConstraintSystem, }; diff --git a/compiler/src/expression/arithmetic/div.rs b/compiler/src/expression/arithmetic/div.rs index 6120e1ecf3..77a86c10b5 100644 --- a/compiler/src/expression/arithmetic/div.rs +++ b/compiler/src/expression/arithmetic/div.rs @@ -19,7 +19,7 @@ use crate::{errors::ExpressionError, value::ConstrainedValue, GroupType}; use leo_ast::Span; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::ConstraintSystem, }; diff --git a/compiler/src/expression/arithmetic/mul.rs b/compiler/src/expression/arithmetic/mul.rs index 71eea3a663..913c31f19a 100644 --- a/compiler/src/expression/arithmetic/mul.rs +++ b/compiler/src/expression/arithmetic/mul.rs @@ -19,7 +19,7 @@ use crate::{errors::ExpressionError, value::ConstrainedValue, GroupType}; use leo_ast::Span; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::ConstraintSystem, }; diff --git a/compiler/src/expression/arithmetic/negate.rs b/compiler/src/expression/arithmetic/negate.rs index 43c3483713..d7994d14b5 100644 --- a/compiler/src/expression/arithmetic/negate.rs +++ b/compiler/src/expression/arithmetic/negate.rs @@ -19,7 +19,7 @@ use crate::{errors::ExpressionError, value::ConstrainedValue, GroupType}; use leo_ast::Span; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::ConstraintSystem, }; diff --git a/compiler/src/expression/arithmetic/pow.rs b/compiler/src/expression/arithmetic/pow.rs index 403e5f97d2..a48458482f 100644 --- a/compiler/src/expression/arithmetic/pow.rs +++ b/compiler/src/expression/arithmetic/pow.rs @@ -19,7 +19,7 @@ use crate::{errors::ExpressionError, value::ConstrainedValue, GroupType}; use leo_ast::Span; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::ConstraintSystem, }; diff --git a/compiler/src/expression/arithmetic/sub.rs b/compiler/src/expression/arithmetic/sub.rs index a21aea905b..632ed925fb 100644 --- a/compiler/src/expression/arithmetic/sub.rs +++ b/compiler/src/expression/arithmetic/sub.rs @@ -19,7 +19,7 @@ use crate::{errors::ExpressionError, value::ConstrainedValue, GroupType}; use leo_ast::Span; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::ConstraintSystem, }; diff --git a/compiler/src/expression/array/access.rs b/compiler/src/expression/array/access.rs index c6ed908473..1079a46df1 100644 --- a/compiler/src/expression/array/access.rs +++ b/compiler/src/expression/array/access.rs @@ -19,7 +19,7 @@ use crate::{errors::ExpressionError, program::ConstrainedProgram, value::ConstrainedValue, GroupType}; use leo_ast::{Expression, Span, Type}; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::ConstraintSystem, }; diff --git a/compiler/src/expression/array/array.rs b/compiler/src/expression/array/array.rs index 272eefcecc..c52fec00d1 100644 --- a/compiler/src/expression/array/array.rs +++ b/compiler/src/expression/array/array.rs @@ -24,7 +24,7 @@ use crate::{ }; use leo_ast::{ArrayDimensions, Expression, PositiveNumber, Span, SpreadOrExpression, Type}; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::ConstraintSystem, }; diff --git a/compiler/src/expression/array/index.rs b/compiler/src/expression/array/index.rs index 02d361bae5..0c67ed4cdc 100644 --- a/compiler/src/expression/array/index.rs +++ b/compiler/src/expression/array/index.rs @@ -19,7 +19,7 @@ use crate::{errors::ExpressionError, program::ConstrainedProgram, value::ConstrainedValue, GroupType}; use leo_ast::{Expression, IntegerType, Span, Type}; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::ConstraintSystem, }; diff --git a/compiler/src/expression/binary/binary.rs b/compiler/src/expression/binary/binary.rs index fade74bb0b..270e05fb1d 100644 --- a/compiler/src/expression/binary/binary.rs +++ b/compiler/src/expression/binary/binary.rs @@ -19,7 +19,7 @@ use crate::{errors::ExpressionError, program::ConstrainedProgram, value::ConstrainedValue, GroupType}; use leo_ast::{Expression, Span, Type}; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::ConstraintSystem, }; diff --git a/compiler/src/expression/binary/operand.rs b/compiler/src/expression/binary/operand.rs index e9853b8adf..44730d2fea 100644 --- a/compiler/src/expression/binary/operand.rs +++ b/compiler/src/expression/binary/operand.rs @@ -19,7 +19,7 @@ use crate::{errors::ExpressionError, program::ConstrainedProgram, value::ConstrainedValue, GroupType}; use leo_ast::{Expression, Span, Type}; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::ConstraintSystem, }; diff --git a/compiler/src/expression/circuit/access.rs b/compiler/src/expression/circuit/access.rs index 4172c8c476..244fc4512c 100644 --- a/compiler/src/expression/circuit/access.rs +++ b/compiler/src/expression/circuit/access.rs @@ -24,7 +24,7 @@ use crate::{ }; use leo_ast::{Expression, Identifier, Span, Type}; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::ConstraintSystem, }; diff --git a/compiler/src/expression/circuit/circuit.rs b/compiler/src/expression/circuit/circuit.rs index b1e8687a74..09f9c525d6 100644 --- a/compiler/src/expression/circuit/circuit.rs +++ b/compiler/src/expression/circuit/circuit.rs @@ -24,7 +24,7 @@ use crate::{ }; use leo_ast::{CircuitMember, CircuitVariableDefinition, Identifier, Span}; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::ConstraintSystem, }; diff --git a/compiler/src/expression/circuit/static_access.rs b/compiler/src/expression/circuit/static_access.rs index 92c4f58b5b..b10e9d0440 100644 --- a/compiler/src/expression/circuit/static_access.rs +++ b/compiler/src/expression/circuit/static_access.rs @@ -19,7 +19,7 @@ use crate::{errors::ExpressionError, program::ConstrainedProgram, value::ConstrainedValue, GroupType}; use leo_ast::{CircuitMember, Expression, Identifier, Span, Type}; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::ConstraintSystem, }; diff --git a/compiler/src/expression/conditional/conditional.rs b/compiler/src/expression/conditional/conditional.rs index a0b8e5a090..8d55c79741 100644 --- a/compiler/src/expression/conditional/conditional.rs +++ b/compiler/src/expression/conditional/conditional.rs @@ -19,7 +19,7 @@ use crate::{errors::ExpressionError, program::ConstrainedProgram, value::ConstrainedValue, GroupType}; use leo_ast::{Expression, Span, Type}; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::{r1cs::ConstraintSystem, utilities::select::CondSelectGadget}, }; diff --git a/compiler/src/expression/expression.rs b/compiler/src/expression/expression.rs index ec47da8ace..23a7f66da5 100644 --- a/compiler/src/expression/expression.rs +++ b/compiler/src/expression/expression.rs @@ -30,7 +30,7 @@ use crate::{ }; use leo_ast::{expression::*, Expression, Type}; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::ConstraintSystem, }; diff --git a/compiler/src/expression/function/core_circuit.rs b/compiler/src/expression/function/core_circuit.rs index 7e9835f076..5e74cf38cf 100644 --- a/compiler/src/expression/function/core_circuit.rs +++ b/compiler/src/expression/function/core_circuit.rs @@ -18,7 +18,7 @@ use crate::{program::ConstrainedProgram, value::ConstrainedValue, GroupType}; use crate::errors::{ExpressionError, FunctionError}; use leo_ast::{Expression, Span, Type}; use leo_core::call_core_circuit; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::ConstraintSystem, }; diff --git a/compiler/src/expression/function/function.rs b/compiler/src/expression/function/function.rs index e9fc295edb..24f510c2fe 100644 --- a/compiler/src/expression/function/function.rs +++ b/compiler/src/expression/function/function.rs @@ -19,7 +19,7 @@ use crate::{errors::ExpressionError, new_scope, program::ConstrainedProgram, value::ConstrainedValue, GroupType}; use leo_ast::{expression::CircuitMemberAccessExpression, Expression, Span, Type}; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::ConstraintSystem, }; diff --git a/compiler/src/expression/identifier/identifier.rs b/compiler/src/expression/identifier/identifier.rs index 58abdddb30..de30d83912 100644 --- a/compiler/src/expression/identifier/identifier.rs +++ b/compiler/src/expression/identifier/identifier.rs @@ -25,7 +25,7 @@ use crate::{ }; use leo_ast::{Identifier, Type}; -use snarkos_models::curves::{Field, PrimeField}; +use snarkvm_models::curves::{Field, PrimeField}; impl> ConstrainedProgram { /// Enforce a variable expression by getting the resolved value diff --git a/compiler/src/expression/logical/and.rs b/compiler/src/expression/logical/and.rs index b58cdb614f..1000a2b7de 100644 --- a/compiler/src/expression/logical/and.rs +++ b/compiler/src/expression/logical/and.rs @@ -19,7 +19,7 @@ use crate::{errors::BooleanError, value::ConstrainedValue, GroupType}; use leo_ast::Span; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::{r1cs::ConstraintSystem, utilities::boolean::Boolean}, }; diff --git a/compiler/src/expression/logical/not.rs b/compiler/src/expression/logical/not.rs index f40089f982..1401ed99d2 100644 --- a/compiler/src/expression/logical/not.rs +++ b/compiler/src/expression/logical/not.rs @@ -19,7 +19,7 @@ use crate::{errors::BooleanError, value::ConstrainedValue, GroupType}; use leo_ast::Span; -use snarkos_models::curves::{Field, PrimeField}; +use snarkvm_models::curves::{Field, PrimeField}; pub fn evaluate_not>( value: ConstrainedValue, diff --git a/compiler/src/expression/logical/or.rs b/compiler/src/expression/logical/or.rs index 0915d3e77b..d8bce5d7cc 100644 --- a/compiler/src/expression/logical/or.rs +++ b/compiler/src/expression/logical/or.rs @@ -19,7 +19,7 @@ use crate::{errors::BooleanError, value::ConstrainedValue, GroupType}; use leo_ast::Span; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::{r1cs::ConstraintSystem, utilities::boolean::Boolean}, }; diff --git a/compiler/src/expression/relational/eq.rs b/compiler/src/expression/relational/eq.rs index 75f8de4ae9..fc140d9203 100644 --- a/compiler/src/expression/relational/eq.rs +++ b/compiler/src/expression/relational/eq.rs @@ -19,7 +19,7 @@ use crate::{enforce_and, errors::ExpressionError, value::ConstrainedValue, GroupType}; use leo_ast::Span; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::{ r1cs::ConstraintSystem, diff --git a/compiler/src/expression/relational/ge.rs b/compiler/src/expression/relational/ge.rs index c7ebb817d7..9ffdae4f7e 100644 --- a/compiler/src/expression/relational/ge.rs +++ b/compiler/src/expression/relational/ge.rs @@ -20,7 +20,7 @@ use crate::{errors::ExpressionError, value::ConstrainedValue, GroupType}; use leo_ast::Span; use leo_gadgets::bits::ComparatorGadget; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::ConstraintSystem, }; diff --git a/compiler/src/expression/relational/gt.rs b/compiler/src/expression/relational/gt.rs index e7d1283b11..7f7e817660 100644 --- a/compiler/src/expression/relational/gt.rs +++ b/compiler/src/expression/relational/gt.rs @@ -20,7 +20,7 @@ use crate::{errors::ExpressionError, value::ConstrainedValue, GroupType}; use leo_ast::Span; use leo_gadgets::bits::ComparatorGadget; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::ConstraintSystem, }; diff --git a/compiler/src/expression/relational/le.rs b/compiler/src/expression/relational/le.rs index d5794ca9bd..ef615a76b4 100644 --- a/compiler/src/expression/relational/le.rs +++ b/compiler/src/expression/relational/le.rs @@ -20,7 +20,7 @@ use crate::{errors::ExpressionError, value::ConstrainedValue, GroupType}; use leo_ast::Span; use leo_gadgets::bits::ComparatorGadget; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::ConstraintSystem, }; diff --git a/compiler/src/expression/relational/lt.rs b/compiler/src/expression/relational/lt.rs index 17af89b832..f77fdb2a73 100644 --- a/compiler/src/expression/relational/lt.rs +++ b/compiler/src/expression/relational/lt.rs @@ -20,7 +20,7 @@ use crate::{errors::ExpressionError, value::ConstrainedValue, GroupType}; use leo_ast::Span; use leo_gadgets::bits::comparator::EvaluateLtGadget; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::ConstraintSystem, }; diff --git a/compiler/src/expression/tuple/access.rs b/compiler/src/expression/tuple/access.rs index 03cc03ebce..1218cdf15b 100644 --- a/compiler/src/expression/tuple/access.rs +++ b/compiler/src/expression/tuple/access.rs @@ -19,7 +19,7 @@ use crate::{errors::ExpressionError, parse_index, program::ConstrainedProgram, value::ConstrainedValue, GroupType}; use leo_ast::{Expression, PositiveNumber, Span, Type}; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::ConstraintSystem, }; diff --git a/compiler/src/expression/tuple/tuple.rs b/compiler/src/expression/tuple/tuple.rs index b002908a46..358def9bdf 100644 --- a/compiler/src/expression/tuple/tuple.rs +++ b/compiler/src/expression/tuple/tuple.rs @@ -19,7 +19,7 @@ use crate::{errors::ExpressionError, program::ConstrainedProgram, value::ConstrainedValue, GroupType}; use leo_ast::{Expression, Span, Type}; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::ConstraintSystem, }; diff --git a/compiler/src/function/function.rs b/compiler/src/function/function.rs index 4786fb7d5a..18cc1d86dc 100644 --- a/compiler/src/function/function.rs +++ b/compiler/src/function/function.rs @@ -25,7 +25,7 @@ use crate::{ use leo_ast::{Expression, Function, FunctionInput}; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::{r1cs::ConstraintSystem, utilities::boolean::Boolean}, }; diff --git a/compiler/src/function/input/array.rs b/compiler/src/function/input/array.rs index 5158947d0c..78df4e1802 100644 --- a/compiler/src/function/input/array.rs +++ b/compiler/src/function/input/array.rs @@ -28,7 +28,7 @@ use crate::{ use leo_ast::{ArrayDimensions, InputValue, Span, Type}; use crate::errors::ExpressionError; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::ConstraintSystem, }; diff --git a/compiler/src/function/input/function_input.rs b/compiler/src/function/input/function_input.rs index 77624fbfc6..aee14ff3e6 100644 --- a/compiler/src/function/input/function_input.rs +++ b/compiler/src/function/input/function_input.rs @@ -20,7 +20,7 @@ use crate::{errors::FunctionError, program::ConstrainedProgram, value::Constrain use leo_ast::{Expression, Type}; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::ConstraintSystem, }; diff --git a/compiler/src/function/input/input_keyword.rs b/compiler/src/function/input/input_keyword.rs index 3d40090a3f..0f74c35b06 100644 --- a/compiler/src/function/input/input_keyword.rs +++ b/compiler/src/function/input/input_keyword.rs @@ -17,7 +17,7 @@ use crate::{errors::FunctionError, ConstrainedCircuitMember, ConstrainedProgram, ConstrainedValue, GroupType}; use leo_ast::{Identifier, Input, InputKeyword}; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::ConstraintSystem, }; diff --git a/compiler/src/function/input/input_section.rs b/compiler/src/function/input/input_section.rs index c33bc39636..69947906d7 100644 --- a/compiler/src/function/input/input_section.rs +++ b/compiler/src/function/input/input_section.rs @@ -17,7 +17,7 @@ use crate::{errors::FunctionError, ConstrainedCircuitMember, ConstrainedProgram, ConstrainedValue, GroupType}; use leo_ast::{Identifier, InputValue, Parameter}; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::ConstraintSystem, }; diff --git a/compiler/src/function/input/main_function_input.rs b/compiler/src/function/input/main_function_input.rs index 7bed5fc273..0a14a9ac61 100644 --- a/compiler/src/function/input/main_function_input.rs +++ b/compiler/src/function/input/main_function_input.rs @@ -32,7 +32,7 @@ use crate::{ use leo_ast::{InputValue, Span, Type}; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::ConstraintSystem, }; diff --git a/compiler/src/function/input/tuple.rs b/compiler/src/function/input/tuple.rs index 8ad74507d0..db75c63ed0 100644 --- a/compiler/src/function/input/tuple.rs +++ b/compiler/src/function/input/tuple.rs @@ -25,7 +25,7 @@ use crate::{ use leo_ast::{InputValue, Span, Type}; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::ConstraintSystem, }; diff --git a/compiler/src/function/main_function.rs b/compiler/src/function/main_function.rs index a229025fa0..d08faa169f 100644 --- a/compiler/src/function/main_function.rs +++ b/compiler/src/function/main_function.rs @@ -25,7 +25,7 @@ use crate::{ use leo_ast::{Expression, Function, FunctionInput, Identifier, Input}; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::ConstraintSystem, }; @@ -36,7 +36,7 @@ impl> ConstrainedProgram { cs: &mut CS, scope: &str, function: Function, - input: Input, + input: &Input, ) -> Result { let function_name = new_scope(scope, function.get_name()); let registers = input.get_registers(); @@ -47,7 +47,7 @@ impl> ConstrainedProgram { let (input_id, value) = match input_model { FunctionInput::InputKeyword(keyword) => { let input_id = Identifier::new_with_span(&keyword.to_string(), &keyword.span); - let value = self.allocate_input_keyword(cs, keyword, &input)?; + let value = self.allocate_input_keyword(cs, keyword, input)?; (input_id, value) } diff --git a/compiler/src/function/result/result.rs b/compiler/src/function/result/result.rs index 1971dd7c4e..81aa93b55b 100644 --- a/compiler/src/function/result/result.rs +++ b/compiler/src/function/result/result.rs @@ -27,7 +27,7 @@ use crate::{ use leo_ast::{Span, Type}; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::{ r1cs::ConstraintSystem, diff --git a/compiler/src/import/store/core_package.rs b/compiler/src/import/store/core_package.rs index 4eb6b49924..efefe7147a 100644 --- a/compiler/src/import/store/core_package.rs +++ b/compiler/src/import/store/core_package.rs @@ -18,7 +18,7 @@ use crate::{new_scope, ConstrainedProgram, ConstrainedValue, GroupType}; use leo_ast::Package; use leo_core::{CorePackageList, LeoCorePackageError}; -use snarkos_models::curves::{Field, PrimeField}; +use snarkvm_models::curves::{Field, PrimeField}; impl> ConstrainedProgram { pub(crate) fn store_core_package(&mut self, scope: &str, package: Package) -> Result<(), LeoCorePackageError> { diff --git a/compiler/src/import/store/import.rs b/compiler/src/import/store/import.rs index 9c03ae4c11..37f8206505 100644 --- a/compiler/src/import/store/import.rs +++ b/compiler/src/import/store/import.rs @@ -19,7 +19,7 @@ use leo_ast::ImportStatement; use leo_imports::ImportParser; use leo_symbol_table::imported_symbols::ImportedSymbols; -use snarkos_models::curves::{Field, PrimeField}; +use snarkvm_models::curves::{Field, PrimeField}; impl> ConstrainedProgram { pub(crate) fn store_import( diff --git a/compiler/src/import/store/symbol.rs b/compiler/src/import/store/symbol.rs index e20e1e14bb..61b781b8e2 100644 --- a/compiler/src/import/store/symbol.rs +++ b/compiler/src/import/store/symbol.rs @@ -17,7 +17,7 @@ use crate::{errors::ImportError, new_scope, ConstrainedProgram, ConstrainedValue, GroupType}; use leo_ast::{ImportSymbol, Program}; -use snarkos_models::curves::{Field, PrimeField}; +use snarkvm_models::curves::{Field, PrimeField}; impl> ConstrainedProgram { pub(crate) fn store_symbol( diff --git a/compiler/src/output/output_bytes.rs b/compiler/src/output/output_bytes.rs index 8a797dae73..db41582b22 100644 --- a/compiler/src/output/output_bytes.rs +++ b/compiler/src/output/output_bytes.rs @@ -17,7 +17,7 @@ use crate::{errors::OutputBytesError, ConstrainedValue, GroupType, REGISTERS_VARIABLE_NAME}; use leo_ast::{Parameter, Registers, Span}; -use snarkos_models::curves::{Field, PrimeField}; +use snarkvm_models::curves::{Field, PrimeField}; use serde::{Deserialize, Serialize}; diff --git a/compiler/src/program/program.rs b/compiler/src/program/program.rs index 75f36f4677..e97ac49370 100644 --- a/compiler/src/program/program.rs +++ b/compiler/src/program/program.rs @@ -18,7 +18,7 @@ use crate::{value::ConstrainedValue, GroupType}; -use snarkos_models::curves::{Field, PrimeField}; +use snarkvm_models::curves::{Field, PrimeField}; use indexmap::IndexMap; diff --git a/compiler/src/statement/assign/assign.rs b/compiler/src/statement/assign/assign.rs index 1dd1c4ac15..da95bde369 100644 --- a/compiler/src/statement/assign/assign.rs +++ b/compiler/src/statement/assign/assign.rs @@ -26,7 +26,7 @@ use crate::{ }; use leo_ast::{AssignOperation, AssignStatement, AssigneeAccess, Span}; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::{ r1cs::ConstraintSystem, diff --git a/compiler/src/statement/assign/assignee.rs b/compiler/src/statement/assign/assignee.rs index 8a2dfdf9c1..deac8ba26a 100644 --- a/compiler/src/statement/assign/assignee.rs +++ b/compiler/src/statement/assign/assignee.rs @@ -26,7 +26,7 @@ use crate::{ }; use leo_ast::{Assignee, AssigneeAccess, Identifier, PositiveNumber, Span}; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::ConstraintSystem, }; diff --git a/compiler/src/statement/block/block.rs b/compiler/src/statement/block/block.rs index b716852041..68fdb6177c 100644 --- a/compiler/src/statement/block/block.rs +++ b/compiler/src/statement/block/block.rs @@ -19,7 +19,7 @@ use crate::{program::ConstrainedProgram, GroupType, IndicatorAndConstrainedValue, StatementResult}; use leo_ast::{Block, Type}; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::{r1cs::ConstraintSystem, utilities::boolean::Boolean}, }; diff --git a/compiler/src/statement/conditional/conditional.rs b/compiler/src/statement/conditional/conditional.rs index caa5d1f917..1dd761da5d 100644 --- a/compiler/src/statement/conditional/conditional.rs +++ b/compiler/src/statement/conditional/conditional.rs @@ -26,7 +26,7 @@ use crate::{ }; use leo_ast::{ConditionalStatement, Type}; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::{r1cs::ConstraintSystem, utilities::boolean::Boolean}, }; diff --git a/compiler/src/statement/definition/definition.rs b/compiler/src/statement/definition/definition.rs index aedb1acc97..326ee69276 100644 --- a/compiler/src/statement/definition/definition.rs +++ b/compiler/src/statement/definition/definition.rs @@ -19,7 +19,7 @@ use crate::{errors::StatementError, program::ConstrainedProgram, ConstrainedValue, GroupType}; use leo_ast::{Declare, DefinitionStatement, Span, VariableName}; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::ConstraintSystem, }; diff --git a/compiler/src/statement/iteration/iteration.rs b/compiler/src/statement/iteration/iteration.rs index 7273fb6c59..c446029368 100644 --- a/compiler/src/statement/iteration/iteration.rs +++ b/compiler/src/statement/iteration/iteration.rs @@ -27,7 +27,7 @@ use crate::{ }; use leo_ast::{IterationStatement, Type}; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::{ r1cs::ConstraintSystem, diff --git a/compiler/src/statement/return_/return_.rs b/compiler/src/statement/return_/return_.rs index bf57dbe58c..bb2450350d 100644 --- a/compiler/src/statement/return_/return_.rs +++ b/compiler/src/statement/return_/return_.rs @@ -19,7 +19,7 @@ use crate::{errors::StatementError, program::ConstrainedProgram, value::ConstrainedValue, GroupType}; use leo_ast::{ReturnStatement, Span, Type}; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::ConstraintSystem, }; diff --git a/compiler/src/statement/statement.rs b/compiler/src/statement/statement.rs index 90fdba9c9b..5156df84b3 100644 --- a/compiler/src/statement/statement.rs +++ b/compiler/src/statement/statement.rs @@ -19,7 +19,7 @@ use crate::{errors::StatementError, program::ConstrainedProgram, value::ConstrainedValue, GroupType}; use leo_ast::{Statement, Type}; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::{r1cs::ConstraintSystem, utilities::boolean::Boolean}, }; diff --git a/compiler/src/value/address/address.rs b/compiler/src/value/address/address.rs index 95566475b0..7f63cdfde6 100644 --- a/compiler/src/value/address/address.rs +++ b/compiler/src/value/address/address.rs @@ -17,9 +17,9 @@ use crate::{errors::AddressError, ConstrainedValue, GroupType}; use leo_ast::{InputValue, Span}; -use snarkos_dpc::base_dpc::instantiated::Components; -use snarkos_errors::gadgets::SynthesisError; -use snarkos_models::{ +use snarkvm_dpc::base_dpc::instantiated::Components; +use snarkvm_errors::gadgets::SynthesisError; +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::{ r1cs::{Assignment, ConstraintSystem}, @@ -32,8 +32,8 @@ use snarkos_models::{ }, }, }; -use snarkos_objects::account::AccountAddress; -use snarkos_utilities::ToBytes; +use snarkvm_objects::account::AccountAddress; +use snarkvm_utilities::ToBytes; use std::{borrow::Borrow, str::FromStr}; /// A public address diff --git a/compiler/src/value/boolean/input.rs b/compiler/src/value/boolean/input.rs index d35661f112..f09eea9460 100644 --- a/compiler/src/value/boolean/input.rs +++ b/compiler/src/value/boolean/input.rs @@ -19,8 +19,8 @@ use crate::{errors::BooleanError, value::ConstrainedValue, GroupType}; use leo_ast::{InputValue, Span}; -use snarkos_errors::gadgets::SynthesisError; -use snarkos_models::{ +use snarkvm_errors::gadgets::SynthesisError; +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::{ r1cs::ConstraintSystem, diff --git a/compiler/src/value/field/field_type.rs b/compiler/src/value/field/field_type.rs index 39146ae593..372cf8bacf 100644 --- a/compiler/src/value/field/field_type.rs +++ b/compiler/src/value/field/field_type.rs @@ -19,8 +19,8 @@ use crate::errors::FieldError; use leo_ast::Span; -use snarkos_errors::gadgets::SynthesisError; -use snarkos_models::{ +use snarkvm_errors::gadgets::SynthesisError; +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::{ curves::{FieldGadget, FpGadget}, diff --git a/compiler/src/value/field/input.rs b/compiler/src/value/field/input.rs index a498b25345..12674b151a 100644 --- a/compiler/src/value/field/input.rs +++ b/compiler/src/value/field/input.rs @@ -19,8 +19,8 @@ use crate::{errors::FieldError, value::ConstrainedValue, FieldType, GroupType}; use leo_ast::{InputValue, Span}; -use snarkos_errors::gadgets::SynthesisError; -use snarkos_models::{ +use snarkvm_errors::gadgets::SynthesisError; +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::{r1cs::ConstraintSystem, utilities::alloc::AllocGadget}, }; diff --git a/compiler/src/value/group/group_type.rs b/compiler/src/value/group/group_type.rs index c80a6a8325..00ebc44f9c 100644 --- a/compiler/src/value/group/group_type.rs +++ b/compiler/src/value/group/group_type.rs @@ -19,7 +19,7 @@ use crate::errors::GroupError; use leo_ast::{GroupValue, Span}; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, One}, gadgets::{ r1cs::ConstraintSystem, diff --git a/compiler/src/value/group/input.rs b/compiler/src/value/group/input.rs index 2ff04b6095..d1cbd7c06f 100644 --- a/compiler/src/value/group/input.rs +++ b/compiler/src/value/group/input.rs @@ -19,8 +19,8 @@ use crate::{errors::GroupError, ConstrainedValue, GroupType}; use leo_ast::{GroupValue, InputValue, Span}; -use snarkos_errors::gadgets::SynthesisError; -use snarkos_models::{ +use snarkvm_errors::gadgets::SynthesisError; +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::ConstraintSystem, }; diff --git a/compiler/src/value/group/targets/edwards_bls12.rs b/compiler/src/value/group/targets/edwards_bls12.rs index 7a1ab306dc..0102d859ac 100644 --- a/compiler/src/value/group/targets/edwards_bls12.rs +++ b/compiler/src/value/group/targets/edwards_bls12.rs @@ -17,13 +17,13 @@ use crate::{errors::GroupError, GroupType}; use leo_ast::{GroupCoordinate, GroupTuple, GroupValue, Span}; -use snarkos_curves::{ +use snarkvm_curves::{ edwards_bls12::{EdwardsAffine, EdwardsParameters, Fq}, templates::twisted_edwards_extended::GroupAffine, }; -use snarkos_errors::gadgets::SynthesisError; -use snarkos_gadgets::curves::edwards_bls12::EdwardsBlsGadget; -use snarkos_models::{ +use snarkvm_errors::gadgets::SynthesisError; +use snarkvm_gadgets::curves::edwards_bls12::EdwardsBlsGadget; +use snarkvm_models::{ curves::{AffineCurve, Fp256, One, TEModelParameters, Zero}, gadgets::{ curves::{FieldGadget, FpGadget, GroupGadget}, diff --git a/compiler/src/value/implicit/implicit.rs b/compiler/src/value/implicit/implicit.rs index d72c9f4648..bb8398ad87 100644 --- a/compiler/src/value/implicit/implicit.rs +++ b/compiler/src/value/implicit/implicit.rs @@ -19,7 +19,7 @@ use crate::{errors::ValueError, value::ConstrainedValue, GroupType}; use leo_ast::{Span, Type}; -use snarkos_models::curves::{Field, PrimeField}; +use snarkvm_models::curves::{Field, PrimeField}; pub fn enforce_number_implicit>( expected_type: Option, diff --git a/compiler/src/value/integer/integer.rs b/compiler/src/value/integer/integer.rs index 13f8170a04..c9f2323275 100644 --- a/compiler/src/value/integer/integer.rs +++ b/compiler/src/value/integer/integer.rs @@ -23,8 +23,8 @@ use leo_gadgets::{ signed_integer::*, }; -use snarkos_errors::gadgets::SynthesisError; -use snarkos_models::{ +use snarkvm_errors::gadgets::SynthesisError; +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::{ r1cs::ConstraintSystem, diff --git a/compiler/src/value/integer/macros.rs b/compiler/src/value/integer/macros.rs index 3d7018f8d1..dbe4dd0099 100644 --- a/compiler/src/value/integer/macros.rs +++ b/compiler/src/value/integer/macros.rs @@ -16,7 +16,7 @@ use leo_gadgets::signed_integer::*; -use snarkos_models::gadgets::utilities::{ +use snarkvm_models::gadgets::utilities::{ boolean::Boolean, uint::{UInt128, UInt16, UInt32, UInt64, UInt8}, }; diff --git a/compiler/src/value/value.rs b/compiler/src/value/value.rs index 3ce1b12e67..64c344cacd 100644 --- a/compiler/src/value/value.rs +++ b/compiler/src/value/value.rs @@ -29,8 +29,8 @@ use crate::{ use leo_ast::{ArrayDimensions, Circuit, Function, GroupValue, Identifier, Span, Type}; use leo_core::Value; -use snarkos_errors::gadgets::SynthesisError; -use snarkos_models::{ +use snarkvm_errors::gadgets::SynthesisError; +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::{ r1cs::ConstraintSystem, diff --git a/compiler/tests/core/packages/unstable/blake2s/mod.rs b/compiler/tests/core/packages/unstable/blake2s/mod.rs index 7bef75b1c4..db8877fd21 100644 --- a/compiler/tests/core/packages/unstable/blake2s/mod.rs +++ b/compiler/tests/core/packages/unstable/blake2s/mod.rs @@ -27,8 +27,8 @@ use leo_ast::InputValue; use leo_input::types::{IntegerType, U8Type, UnsignedIntegerType}; use rand::{Rng, SeedableRng}; use rand_xorshift::XorShiftRng; -use snarkos_algorithms::prf::blake2s::Blake2s as B2SPRF; -use snarkos_models::algorithms::PRF; +use snarkvm_algorithms::prf::blake2s::Blake2s as B2SPRF; +use snarkvm_models::algorithms::PRF; #[test] fn test_arguments_length_fail() { @@ -70,7 +70,7 @@ fn test_blake2s_random() { let mut message = [0u8; 32]; rng.fill(&mut message); - // Use snarkos-algorithms blake2s evaluate to get expected value + // Use snarkvm-algorithms blake2s evaluate to get expected value let expected = B2SPRF::evaluate(&seed, &message).unwrap().to_vec(); // Create program input values for seed, message, and expected values diff --git a/compiler/tests/field/mod.rs b/compiler/tests/field/mod.rs index fa57001223..9219a8beab 100644 --- a/compiler/tests/field/mod.rs +++ b/compiler/tests/field/mod.rs @@ -17,8 +17,8 @@ use crate::{assert_satisfied, expect_compiler_error, generate_main_input, parse_program}; use leo_ast::InputValue; -use snarkos_curves::edwards_bls12::Fq; -use snarkos_utilities::bytes::ToBytes; +use snarkvm_curves::edwards_bls12::Fq; +use snarkvm_utilities::bytes::ToBytes; use num_bigint::BigUint; use rand::{Rng, SeedableRng}; diff --git a/compiler/tests/group/mod.rs b/compiler/tests/group/mod.rs index ca383a33e3..9cb54cea76 100644 --- a/compiler/tests/group/mod.rs +++ b/compiler/tests/group/mod.rs @@ -25,7 +25,7 @@ use crate::{ }; use leo_ast::{GroupCoordinate, GroupTuple, GroupValue, InputValue, Span}; -use snarkos_curves::edwards_bls12::EdwardsAffine; +use snarkvm_curves::edwards_bls12::EdwardsAffine; use rand::{Rng, SeedableRng}; use rand_xorshift::XorShiftRng; diff --git a/compiler/tests/mod.rs b/compiler/tests/mod.rs index 52e50e9188..7f20a94217 100644 --- a/compiler/tests/mod.rs +++ b/compiler/tests/mod.rs @@ -46,8 +46,8 @@ use leo_compiler::{ }; use leo_input::types::{IntegerType, U32Type, UnsignedIntegerType}; -use snarkos_curves::edwards_bls12::Fq; -use snarkos_models::gadgets::r1cs::TestConstraintSystem; +use snarkvm_curves::edwards_bls12::Fq; +use snarkvm_models::gadgets::r1cs::TestConstraintSystem; use std::path::PathBuf; diff --git a/core/Cargo.toml b/core/Cargo.toml index caf4e91625..b570b29374 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -25,20 +25,20 @@ version = "1.0.7" path = "../gadgets" version = "1.0.7" -[dependencies.snarkos-errors] -version = "1.1.3" +[dependencies.snarkvm-errors] +version = "0.0.2" default-features = false -[dependencies.snarkos-gadgets] -version = "1.1.3" +[dependencies.snarkvm-gadgets] +version = "0.0.2" default-features = false -[dependencies.snarkos-models] -version = "1.1.3" +[dependencies.snarkvm-models] +version = "0.0.2" default-features = false -[dependencies.snarkos-utilities] -version = "1.1.3" +[dependencies.snarkvm-utilities] +version = "0.0.2" [dependencies.rand] version = "0.7" @@ -51,9 +51,9 @@ default-features = false [dependencies.thiserror] version = "1.0" -[dev-dependencies.snarkos-utilities] -version = "1.1.3" +[dev-dependencies.snarkvm-utilities] +version = "0.0.2" -[dev-dependencies.snarkos-curves] -version = "1.1.3" +[dev-dependencies.snarkvm-curves] +version = "0.0.2" default-features = false diff --git a/core/src/errors/core_circuit.rs b/core/src/errors/core_circuit.rs index ce394e18de..1882b016e8 100644 --- a/core/src/errors/core_circuit.rs +++ b/core/src/errors/core_circuit.rs @@ -17,7 +17,7 @@ use crate::Value; use leo_ast::{Error as FormattedError, Span}; -use snarkos_errors::gadgets::SynthesisError; +use snarkvm_errors::gadgets::SynthesisError; use std::path::Path; diff --git a/core/src/lib.rs b/core/src/lib.rs index 67533ae4a5..d8b39b5f30 100644 --- a/core/src/lib.rs +++ b/core/src/lib.rs @@ -29,7 +29,7 @@ pub use self::types::*; use crate::CoreCircuit; use leo_ast::Span; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::ConstraintSystem, }; diff --git a/core/src/packages/unstable/blake2s.rs b/core/src/packages/unstable/blake2s.rs index fa47bc2eef..c958718997 100644 --- a/core/src/packages/unstable/blake2s.rs +++ b/core/src/packages/unstable/blake2s.rs @@ -34,8 +34,8 @@ use leo_ast::{ Statement, Type, }; -use snarkos_gadgets::algorithms::prf::Blake2sGadget; -use snarkos_models::{ +use snarkvm_gadgets::algorithms::prf::Blake2sGadget; +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::{ algorithms::PRFGadget, @@ -191,8 +191,8 @@ fn check_array_bytes(value: Value, size: usize, span: Span) -> Result #[cfg(test)] mod tests { use super::*; - use snarkos_curves::bls12_377::Fr; - use snarkos_models::gadgets::{ + use snarkvm_curves::bls12_377::Fr; + use snarkvm_models::gadgets::{ r1cs::TestConstraintSystem, utilities::{boolean::Boolean, uint::UInt8}, }; diff --git a/core/src/types/core_circuit.rs b/core/src/types/core_circuit.rs index b098db3970..6e21c6667c 100644 --- a/core/src/types/core_circuit.rs +++ b/core/src/types/core_circuit.rs @@ -17,7 +17,7 @@ use crate::{CoreCircuitError, Value}; use leo_ast::{Circuit, Identifier, Span}; -use snarkos_models::{ +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::r1cs::ConstraintSystem, }; diff --git a/core/src/types/value.rs b/core/src/types/value.rs index 0113e14cc2..d950bd3550 100644 --- a/core/src/types/value.rs +++ b/core/src/types/value.rs @@ -16,7 +16,7 @@ use leo_gadgets::signed_integer::*; -use snarkos_models::gadgets::utilities::{boolean::Boolean, uint::*}; +use snarkvm_models::gadgets::utilities::{boolean::Boolean, uint::*}; use std::fmt; /// An intermediate value format that can be converted into a `ConstrainedValue` for the compiler diff --git a/gadgets/Cargo.toml b/gadgets/Cargo.toml index 6a8fdd9d73..e0493f35ce 100644 --- a/gadgets/Cargo.toml +++ b/gadgets/Cargo.toml @@ -17,16 +17,16 @@ include = [ "Cargo.toml", "src", "README.md", "LICENSE.md" ] license = "GPL-3.0" edition = "2018" -[dependencies.snarkos-errors] -version = "1.1.3" +[dependencies.snarkvm-errors] +version = "0.0.2" default-features = false -[dependencies.snarkos-models] -version = "1.1.3" +[dependencies.snarkvm-models] +version = "0.0.2" default-features = false -[dependencies.snarkos-utilities] -version = "1.1.3" +[dependencies.snarkvm-utilities] +version = "0.0.2" [dependencies.rand] version = "0.7" @@ -39,9 +39,6 @@ default-features = false [dependencies.thiserror] version = "1.0" -[dev-dependencies.snarkos-utilities] -version = "1.1.3" - [dev-dependencies.criterion] version = "0.3" diff --git a/gadgets/benches/integer_arithmetic.rs b/gadgets/benches/integer_arithmetic.rs index e0f4d3e151..104a952576 100644 --- a/gadgets/benches/integer_arithmetic.rs +++ b/gadgets/benches/integer_arithmetic.rs @@ -16,7 +16,7 @@ use leo_gadgets::{arithmetic::*, Int128, Int16, Int32, Int64, Int8}; -use snarkos_models::gadgets::{ +use snarkvm_models::gadgets::{ r1cs::{ConstraintSystem, Fr, TestConstraintSystem}, utilities::alloc::AllocGadget, }; diff --git a/gadgets/src/arithmetic/add.rs b/gadgets/src/arithmetic/add.rs index 2702e4d5f5..63deb68995 100644 --- a/gadgets/src/arithmetic/add.rs +++ b/gadgets/src/arithmetic/add.rs @@ -14,8 +14,8 @@ // You should have received a copy of the GNU General Public License // along with the Leo library. If not, see . -use snarkos_errors::gadgets::SynthesisError; -use snarkos_models::{ +use snarkvm_errors::gadgets::SynthesisError; +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::{ r1cs::ConstraintSystem, diff --git a/gadgets/src/arithmetic/div.rs b/gadgets/src/arithmetic/div.rs index 18328f6e38..3094d529a2 100644 --- a/gadgets/src/arithmetic/div.rs +++ b/gadgets/src/arithmetic/div.rs @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with the Leo library. If not, see . -use snarkos_models::{curves::Field, gadgets::r1cs::ConstraintSystem}; +use snarkvm_models::{curves::Field, gadgets::r1cs::ConstraintSystem}; /// Returns division of `self` / `other` in the constraint system. pub trait Div diff --git a/gadgets/src/arithmetic/mul.rs b/gadgets/src/arithmetic/mul.rs index 0cb7068232..f2f56aef64 100644 --- a/gadgets/src/arithmetic/mul.rs +++ b/gadgets/src/arithmetic/mul.rs @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with the Leo library. If not, see . -use snarkos_models::{curves::Field, gadgets::r1cs::ConstraintSystem}; +use snarkvm_models::{curves::Field, gadgets::r1cs::ConstraintSystem}; /// Returns multiplication of `self` * `other` in the constraint system. pub trait Mul diff --git a/gadgets/src/arithmetic/neg.rs b/gadgets/src/arithmetic/neg.rs index a35f474f46..2279ee9f54 100644 --- a/gadgets/src/arithmetic/neg.rs +++ b/gadgets/src/arithmetic/neg.rs @@ -16,8 +16,8 @@ use crate::bits::RippleCarryAdder; -use snarkos_errors::gadgets::SynthesisError; -use snarkos_models::{ +use snarkvm_errors::gadgets::SynthesisError; +use snarkvm_models::{ curves::Field, gadgets::{r1cs::ConstraintSystem, utilities::boolean::Boolean}, }; diff --git a/gadgets/src/arithmetic/pow.rs b/gadgets/src/arithmetic/pow.rs index a6b5d6f572..d17b8bea02 100644 --- a/gadgets/src/arithmetic/pow.rs +++ b/gadgets/src/arithmetic/pow.rs @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with the Leo library. If not, see . -use snarkos_models::{curves::Field, gadgets::r1cs::ConstraintSystem}; +use snarkvm_models::{curves::Field, gadgets::r1cs::ConstraintSystem}; /// Returns exponentiation of `self` ** `other` in the constraint system. pub trait Pow diff --git a/gadgets/src/arithmetic/sub.rs b/gadgets/src/arithmetic/sub.rs index 53174a26e2..f7f5e7dbed 100644 --- a/gadgets/src/arithmetic/sub.rs +++ b/gadgets/src/arithmetic/sub.rs @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with the Leo library. If not, see . -use snarkos_models::{curves::Field, gadgets::r1cs::ConstraintSystem}; +use snarkvm_models::{curves::Field, gadgets::r1cs::ConstraintSystem}; /// Returns subtraction of `self` - `other` in the constraint system. pub trait Sub diff --git a/gadgets/src/bits/adder.rs b/gadgets/src/bits/adder.rs index f12549abb9..7616592fc6 100644 --- a/gadgets/src/bits/adder.rs +++ b/gadgets/src/bits/adder.rs @@ -14,8 +14,8 @@ // You should have received a copy of the GNU General Public License // along with the Leo library. If not, see . -use snarkos_errors::gadgets::SynthesisError; -use snarkos_models::{ +use snarkvm_errors::gadgets::SynthesisError; +use snarkvm_models::{ curves::Field, gadgets::{r1cs::ConstraintSystem, utilities::boolean::Boolean}, }; diff --git a/gadgets/src/bits/comparator.rs b/gadgets/src/bits/comparator.rs index df48fe10ce..e14d3dda82 100644 --- a/gadgets/src/bits/comparator.rs +++ b/gadgets/src/bits/comparator.rs @@ -14,8 +14,8 @@ // You should have received a copy of the GNU General Public License // along with the Leo library. If not, see . -use snarkos_errors::gadgets::SynthesisError; -use snarkos_models::{ +use snarkvm_errors::gadgets::SynthesisError; +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::{ r1cs::ConstraintSystem, diff --git a/gadgets/src/bits/rca.rs b/gadgets/src/bits/rca.rs index 8b51197dd9..9c07c78bf9 100644 --- a/gadgets/src/bits/rca.rs +++ b/gadgets/src/bits/rca.rs @@ -16,8 +16,8 @@ use crate::{bits::FullAdder, signed_integer::*}; -use snarkos_errors::gadgets::SynthesisError; -use snarkos_models::{ +use snarkvm_errors::gadgets::SynthesisError; +use snarkvm_models::{ curves::{Field, PrimeField}, gadgets::{r1cs::ConstraintSystem, utilities::boolean::Boolean}, }; diff --git a/gadgets/src/bits/sign_extend.rs b/gadgets/src/bits/sign_extend.rs index 4bdede76d8..44791ca41b 100644 --- a/gadgets/src/bits/sign_extend.rs +++ b/gadgets/src/bits/sign_extend.rs @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with the Leo library. If not, see . -use snarkos_models::gadgets::utilities::boolean::Boolean; +use snarkvm_models::gadgets::utilities::boolean::Boolean; use std::iter; diff --git a/gadgets/src/errors/signed_integer.rs b/gadgets/src/errors/signed_integer.rs index 0fef69fba7..318ca70217 100644 --- a/gadgets/src/errors/signed_integer.rs +++ b/gadgets/src/errors/signed_integer.rs @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with the Leo library. If not, see . -use snarkos_errors::gadgets::SynthesisError; +use snarkvm_errors::gadgets::SynthesisError; #[derive(Debug, Error)] pub enum SignedIntegerError { diff --git a/gadgets/src/signed_integer/arithmetic/add.rs b/gadgets/src/signed_integer/arithmetic/add.rs index b4d4e8671c..1ef982f1c1 100644 --- a/gadgets/src/signed_integer/arithmetic/add.rs +++ b/gadgets/src/signed_integer/arithmetic/add.rs @@ -26,7 +26,7 @@ use crate::{ Int8, }; -use snarkos_models::{ +use snarkvm_models::{ curves::{fp_parameters::FpParameters, PrimeField}, gadgets::{ r1cs::{Assignment, ConstraintSystem, LinearCombination}, diff --git a/gadgets/src/signed_integer/arithmetic/div.rs b/gadgets/src/signed_integer/arithmetic/div.rs index 2d12584bd6..f185062c4a 100644 --- a/gadgets/src/signed_integer/arithmetic/div.rs +++ b/gadgets/src/signed_integer/arithmetic/div.rs @@ -25,7 +25,7 @@ use crate::{ Int64, Int8, }; -use snarkos_models::{ +use snarkvm_models::{ curves::PrimeField, gadgets::{ r1cs::ConstraintSystem, diff --git a/gadgets/src/signed_integer/arithmetic/mul.rs b/gadgets/src/signed_integer/arithmetic/mul.rs index 214b5d0982..620e3ea491 100644 --- a/gadgets/src/signed_integer/arithmetic/mul.rs +++ b/gadgets/src/signed_integer/arithmetic/mul.rs @@ -25,7 +25,7 @@ use crate::{ Int64, Int8, }; -use snarkos_models::{ +use snarkvm_models::{ curves::{FpParameters, PrimeField}, gadgets::{ r1cs::{Assignment, ConstraintSystem, LinearCombination}, diff --git a/gadgets/src/signed_integer/arithmetic/neg.rs b/gadgets/src/signed_integer/arithmetic/neg.rs index c81daa7baa..fdcc89dd77 100644 --- a/gadgets/src/signed_integer/arithmetic/neg.rs +++ b/gadgets/src/signed_integer/arithmetic/neg.rs @@ -16,7 +16,7 @@ use crate::{arithmetic::Neg, errors::SignedIntegerError, signed_integer::*}; -use snarkos_models::{curves::PrimeField, gadgets::r1cs::ConstraintSystem}; +use snarkvm_models::{curves::PrimeField, gadgets::r1cs::ConstraintSystem}; macro_rules! neg_int_impl { ($($gadget: ident)*) => ($( diff --git a/gadgets/src/signed_integer/arithmetic/pow.rs b/gadgets/src/signed_integer/arithmetic/pow.rs index dc90b34bbe..1b9174b218 100644 --- a/gadgets/src/signed_integer/arithmetic/pow.rs +++ b/gadgets/src/signed_integer/arithmetic/pow.rs @@ -25,7 +25,7 @@ use crate::{ Int8, }; -use snarkos_models::{ +use snarkvm_models::{ curves::PrimeField, gadgets::{ r1cs::ConstraintSystem, diff --git a/gadgets/src/signed_integer/arithmetic/sub.rs b/gadgets/src/signed_integer/arithmetic/sub.rs index cc1bf41139..9d24638762 100644 --- a/gadgets/src/signed_integer/arithmetic/sub.rs +++ b/gadgets/src/signed_integer/arithmetic/sub.rs @@ -23,7 +23,7 @@ use crate::{ Int64, Int8, }; -use snarkos_models::{curves::PrimeField, gadgets::r1cs::ConstraintSystem}; +use snarkvm_models::{curves::PrimeField, gadgets::r1cs::ConstraintSystem}; macro_rules! sub_int_impl { ($($gadget: ident)*) => ($( diff --git a/gadgets/src/signed_integer/int_impl.rs b/gadgets/src/signed_integer/int_impl.rs index cb90ea2099..45dcdd0b24 100644 --- a/gadgets/src/signed_integer/int_impl.rs +++ b/gadgets/src/signed_integer/int_impl.rs @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with the Leo library. If not, see . -use snarkos_models::gadgets::utilities::boolean::Boolean; +use snarkvm_models::gadgets::utilities::boolean::Boolean; use std::fmt::Debug; diff --git a/gadgets/src/signed_integer/relational/cmp.rs b/gadgets/src/signed_integer/relational/cmp.rs index 1d02ec166d..1735d08844 100644 --- a/gadgets/src/signed_integer/relational/cmp.rs +++ b/gadgets/src/signed_integer/relational/cmp.rs @@ -23,8 +23,8 @@ use crate::{ Int8, }; -use snarkos_errors::gadgets::SynthesisError; -use snarkos_models::{ +use snarkvm_errors::gadgets::SynthesisError; +use snarkvm_models::{ curves::PrimeField, gadgets::{ r1cs::ConstraintSystem, diff --git a/gadgets/src/signed_integer/relational/eq.rs b/gadgets/src/signed_integer/relational/eq.rs index d783deb340..4c0b488e46 100644 --- a/gadgets/src/signed_integer/relational/eq.rs +++ b/gadgets/src/signed_integer/relational/eq.rs @@ -16,8 +16,8 @@ use crate::{Int, Int128, Int16, Int32, Int64, Int8}; -use snarkos_errors::gadgets::SynthesisError; -use snarkos_models::{ +use snarkvm_errors::gadgets::SynthesisError; +use snarkvm_models::{ curves::PrimeField, gadgets::{ r1cs::ConstraintSystem, diff --git a/gadgets/src/signed_integer/utilities/alloc.rs b/gadgets/src/signed_integer/utilities/alloc.rs index b47016a10b..ad8be3afa7 100644 --- a/gadgets/src/signed_integer/utilities/alloc.rs +++ b/gadgets/src/signed_integer/utilities/alloc.rs @@ -17,8 +17,8 @@ use crate::{Int, Int128, Int16, Int32, Int64, Int8}; use core::{borrow::Borrow, iter}; -use snarkos_errors::gadgets::SynthesisError; -use snarkos_models::{ +use snarkvm_errors::gadgets::SynthesisError; +use snarkvm_models::{ curves::Field, gadgets::{ r1cs::ConstraintSystem, diff --git a/gadgets/src/signed_integer/utilities/eq.rs b/gadgets/src/signed_integer/utilities/eq.rs index 9a854819c5..7094421f97 100644 --- a/gadgets/src/signed_integer/utilities/eq.rs +++ b/gadgets/src/signed_integer/utilities/eq.rs @@ -16,8 +16,8 @@ use crate::signed_integer::*; -use snarkos_errors::gadgets::SynthesisError; -use snarkos_models::{ +use snarkvm_errors::gadgets::SynthesisError; +use snarkvm_models::{ curves::PrimeField, gadgets::{ r1cs::ConstraintSystem, diff --git a/gadgets/src/signed_integer/utilities/select.rs b/gadgets/src/signed_integer/utilities/select.rs index 7a5f8932a0..0a7b202a1e 100644 --- a/gadgets/src/signed_integer/utilities/select.rs +++ b/gadgets/src/signed_integer/utilities/select.rs @@ -16,8 +16,8 @@ use crate::signed_integer::*; -use snarkos_errors::gadgets::SynthesisError; -use snarkos_models::{ +use snarkvm_errors::gadgets::SynthesisError; +use snarkvm_models::{ curves::PrimeField, gadgets::{ r1cs::{Assignment, ConstraintSystem}, diff --git a/gadgets/tests/signed_integer/i128.rs b/gadgets/tests/signed_integer/i128.rs index 42711ecb26..bdbd17532d 100644 --- a/gadgets/tests/signed_integer/i128.rs +++ b/gadgets/tests/signed_integer/i128.rs @@ -16,7 +16,7 @@ use leo_gadgets::{arithmetic::*, Int128}; -use snarkos_models::{ +use snarkvm_models::{ curves::{One, Zero}, gadgets::{ r1cs::{ConstraintSystem, Fr, TestConstraintSystem}, diff --git a/gadgets/tests/signed_integer/i16.rs b/gadgets/tests/signed_integer/i16.rs index c03e553e75..442ccb590d 100644 --- a/gadgets/tests/signed_integer/i16.rs +++ b/gadgets/tests/signed_integer/i16.rs @@ -16,7 +16,7 @@ use leo_gadgets::{arithmetic::*, Int16}; -use snarkos_models::{ +use snarkvm_models::{ curves::{One, Zero}, gadgets::{ r1cs::{ConstraintSystem, Fr, TestConstraintSystem}, diff --git a/gadgets/tests/signed_integer/i32.rs b/gadgets/tests/signed_integer/i32.rs index 167ec9e675..72bc3d99e5 100644 --- a/gadgets/tests/signed_integer/i32.rs +++ b/gadgets/tests/signed_integer/i32.rs @@ -16,7 +16,7 @@ use leo_gadgets::{arithmetic::*, Int32}; -use snarkos_models::{ +use snarkvm_models::{ curves::{One, Zero}, gadgets::{ r1cs::{ConstraintSystem, Fr, TestConstraintSystem}, diff --git a/gadgets/tests/signed_integer/i64.rs b/gadgets/tests/signed_integer/i64.rs index 86f370e780..6723c13842 100644 --- a/gadgets/tests/signed_integer/i64.rs +++ b/gadgets/tests/signed_integer/i64.rs @@ -16,7 +16,7 @@ use leo_gadgets::{arithmetic::*, Int64}; -use snarkos_models::{ +use snarkvm_models::{ curves::{One, Zero}, gadgets::{ r1cs::{ConstraintSystem, Fr, TestConstraintSystem}, diff --git a/gadgets/tests/signed_integer/i8.rs b/gadgets/tests/signed_integer/i8.rs index 4f6ba035d8..aa15b9549d 100644 --- a/gadgets/tests/signed_integer/i8.rs +++ b/gadgets/tests/signed_integer/i8.rs @@ -16,7 +16,7 @@ use leo_gadgets::{arithmetic::*, Int8}; -use snarkos_models::{ +use snarkvm_models::{ curves::{One, Zero}, gadgets::{ r1cs::{ConstraintSystem, Fr, TestConstraintSystem}, diff --git a/input/Cargo.toml b/input/Cargo.toml index 85c9dc196b..56a0346807 100644 --- a/input/Cargo.toml +++ b/input/Cargo.toml @@ -17,26 +17,6 @@ include = [ "Cargo.toml", "src", "README.md", "LICENSE.md" ] license = "GPL-3.0" edition = "2018" -[dependencies.snarkos-algorithms] -version = "1.1.3" -default-features = false - -[dependencies.snarkos-curves] -version = "1.1.3" -default-features = false - -[dependencies.snarkos-errors] -version = "1.1.3" -default-features = false - -[dependencies.snarkos-gadgets] -version = "1.1.3" -default-features = false - -[dependencies.snarkos-models] -version = "1.1.3" -default-features = false - [dependencies.from-pest] version = "0.3.1" diff --git a/leo/commands/build.rs b/leo/commands/build.rs index 57c45dcca9..a51f0ca4ce 100644 --- a/leo/commands/build.rs +++ b/leo/commands/build.rs @@ -28,8 +28,8 @@ use leo_package::{ source::{LibraryFile, MainFile, LIBRARY_FILENAME, MAIN_FILENAME, SOURCE_DIRECTORY_NAME}, }; -use snarkos_curves::{bls12_377::Bls12_377, edwards_bls12::Fq}; -use snarkos_models::gadgets::r1cs::ConstraintSystem; +use snarkvm_curves::{bls12_377::Bls12_377, edwards_bls12::Fq}; +use snarkvm_models::gadgets::r1cs::ConstraintSystem; use clap::ArgMatches; use std::{convert::TryFrom, env::current_dir, time::Instant}; diff --git a/leo/commands/prove.rs b/leo/commands/prove.rs index 37b9d8bd83..71eb4df9d5 100644 --- a/leo/commands/prove.rs +++ b/leo/commands/prove.rs @@ -17,9 +17,9 @@ use crate::{cli::*, cli_types::*, commands::SetupCommand, errors::CLIError}; use leo_package::{outputs::ProofFile, root::Manifest}; -use snarkos_algorithms::snark::groth16::{Groth16, PreparedVerifyingKey, Proof}; -use snarkos_curves::bls12_377::{Bls12_377, Fr}; -use snarkos_models::algorithms::SNARK; +use snarkvm_algorithms::snark::groth16::{Groth16, PreparedVerifyingKey, Proof}; +use snarkvm_curves::bls12_377::{Bls12_377, Fr}; +use snarkvm_models::algorithms::SNARK; use clap::ArgMatches; use rand::thread_rng; @@ -62,7 +62,7 @@ impl CLI for ProveCommand { let start = Instant::now(); let rng = &mut thread_rng(); - let program_proof = Groth16::>::prove(¶meters, program, rng)?; + let program_proof = Groth16::>::prove(¶meters, &program, rng)?; // Finish the timer let end = start.elapsed().as_millis(); diff --git a/leo/commands/run.rs b/leo/commands/run.rs index 14b3e759fa..29e3dce217 100644 --- a/leo/commands/run.rs +++ b/leo/commands/run.rs @@ -17,9 +17,9 @@ use crate::{cli::*, cli_types::*, commands::ProveCommand, errors::CLIError}; use leo_compiler::{compiler::Compiler, group::targets::edwards_bls12::EdwardsGroupType}; -use snarkos_algorithms::snark::groth16::Groth16; -use snarkos_curves::bls12_377::{Bls12_377, Fr}; -use snarkos_models::algorithms::SNARK; +use snarkvm_algorithms::snark::groth16::Groth16; +use snarkvm_curves::bls12_377::{Bls12_377, Fr}; +use snarkvm_models::algorithms::SNARK; use clap::ArgMatches; use std::time::Instant; diff --git a/leo/commands/setup.rs b/leo/commands/setup.rs index 3e90c939e2..d85d70e1b9 100644 --- a/leo/commands/setup.rs +++ b/leo/commands/setup.rs @@ -27,9 +27,9 @@ use leo_package::{ source::{MAIN_FILENAME, SOURCE_DIRECTORY_NAME}, }; -use snarkos_algorithms::snark::groth16::{Groth16, Parameters, PreparedVerifyingKey, VerifyingKey}; -use snarkos_curves::bls12_377::{Bls12_377, Fr}; -use snarkos_models::algorithms::snark::SNARK; +use snarkvm_algorithms::snark::groth16::{Groth16, Parameters, PreparedVerifyingKey, VerifyingKey}; +use snarkvm_curves::bls12_377::{Bls12_377, Fr}; +use snarkvm_models::algorithms::snark::SNARK; use clap::ArgMatches; use rand::thread_rng; @@ -85,7 +85,7 @@ impl CLI for SetupCommand { // Run the program setup operation let rng = &mut thread_rng(); let (proving_key, prepared_verifying_key) = - Groth16::, Vec>::setup(program.clone(), rng).unwrap(); + Groth16::, Vec>::setup(&program, rng).unwrap(); // End the timer let end = setup_start.elapsed().as_millis(); diff --git a/leo/commands/test.rs b/leo/commands/test.rs index c96eecf1ba..e1b53e4e19 100644 --- a/leo/commands/test.rs +++ b/leo/commands/test.rs @@ -27,7 +27,7 @@ use leo_package::{ source::{LibraryFile, MainFile, LIBRARY_FILENAME, MAIN_FILENAME, SOURCE_DIRECTORY_NAME}, }; -use snarkos_curves::edwards_bls12::Fq; +use snarkvm_curves::edwards_bls12::Fq; use clap::ArgMatches; use std::{convert::TryFrom, env::current_dir, time::Instant}; diff --git a/leo/errors/cli.rs b/leo/errors/cli.rs index 3dbb264514..a2b6de693d 100644 --- a/leo/errors/cli.rs +++ b/leo/errors/cli.rs @@ -93,7 +93,7 @@ pub enum CLIError { RunError(RunError), #[error("{}", _0)] - SNARKError(snarkos_errors::algorithms::snark::SNARKError), + SNARKError(snarkvm_errors::algorithms::snark::SNARKError), #[error("{}", _0)] SourceDirectoryError(SourceDirectoryError), @@ -184,17 +184,17 @@ impl From for CLIError { } } -impl From for CLIError { - fn from(error: snarkos_errors::algorithms::snark::SNARKError) -> Self { +impl From for CLIError { + fn from(error: snarkvm_errors::algorithms::snark::SNARKError) -> Self { tracing::error!("{}\n", error); - CLIError::Crate("snarkos_errors", error.to_string()) + CLIError::Crate("snarkvm_errors", error.to_string()) } } -impl From for CLIError { - fn from(error: snarkos_errors::gadgets::SynthesisError) -> Self { +impl From for CLIError { + fn from(error: snarkvm_errors::gadgets::SynthesisError) -> Self { tracing::error!("{}\n", error); - CLIError::Crate("snarkos_errors", error.to_string()) + CLIError::Crate("snarkvm_errors", error.to_string()) } } diff --git a/leo/synthesizer/circuit_synthesizer.rs b/leo/synthesizer/circuit_synthesizer.rs index 0bdd6e7897..2ace963321 100644 --- a/leo/synthesizer/circuit_synthesizer.rs +++ b/leo/synthesizer/circuit_synthesizer.rs @@ -14,8 +14,8 @@ // You should have received a copy of the GNU General Public License // along with the Leo library. If not, see . -use snarkos_errors::gadgets::SynthesisError; -use snarkos_models::{ +use snarkvm_errors::gadgets::SynthesisError; +use snarkvm_models::{ curves::{Field, PairingEngine}, gadgets::r1cs::{ConstraintSystem, Index, LinearCombination, Variable}, }; @@ -39,7 +39,7 @@ impl ConstraintSystem for CircuitSynthesizer { where F: FnOnce() -> Result, A: FnOnce() -> AR, - AR: Into, + AR: AsRef, { let index = self.aux_assignment.len(); self.aux_assignment.push(f()?); @@ -51,7 +51,7 @@ impl ConstraintSystem for CircuitSynthesizer { where F: FnOnce() -> Result, A: FnOnce() -> AR, - AR: Into, + AR: AsRef, { let index = self.input_assignment.len(); self.input_assignment.push(f()?); @@ -62,7 +62,7 @@ impl ConstraintSystem for CircuitSynthesizer { fn enforce(&mut self, _: A, a: LA, b: LB, c: LC) where A: FnOnce() -> AR, - AR: Into, + AR: AsRef, LA: FnOnce(LinearCombination) -> LinearCombination, LB: FnOnce(LinearCombination) -> LinearCombination, LC: FnOnce(LinearCombination) -> LinearCombination, @@ -82,7 +82,7 @@ impl ConstraintSystem for CircuitSynthesizer { fn push_namespace(&mut self, _: N) where - NR: Into, + NR: AsRef, N: FnOnce() -> NR, { // Do nothing; we don't care about namespaces in this context. diff --git a/leo/synthesizer/serialized_circuit.rs b/leo/synthesizer/serialized_circuit.rs index 182cda2e4b..94ce4ea104 100644 --- a/leo/synthesizer/serialized_circuit.rs +++ b/leo/synthesizer/serialized_circuit.rs @@ -16,9 +16,9 @@ use crate::synthesizer::{CircuitSynthesizer, SerializedField, SerializedIndex}; -use snarkos_curves::bls12_377::Bls12_377; -use snarkos_errors::curves::FieldError; -use snarkos_models::{ +use snarkvm_curves::bls12_377::Bls12_377; +use snarkvm_errors::curves::FieldError; +use snarkvm_models::{ curves::PairingEngine, gadgets::r1cs::{ConstraintSystem, Index}, }; diff --git a/leo/synthesizer/serialized_field.rs b/leo/synthesizer/serialized_field.rs index 80c25d8471..1c59e99267 100644 --- a/leo/synthesizer/serialized_field.rs +++ b/leo/synthesizer/serialized_field.rs @@ -14,8 +14,8 @@ // You should have received a copy of the GNU General Public License // along with the Leo library. If not, see . -use snarkos_errors::curves::FieldError; -use snarkos_models::curves::{Field, Fp256, Fp256Parameters}; +use snarkvm_errors::curves::FieldError; +use snarkvm_models::curves::{Field, Fp256, Fp256Parameters}; use num_bigint::BigUint; use serde::{Deserialize, Serialize}; diff --git a/leo/synthesizer/serialized_index.rs b/leo/synthesizer/serialized_index.rs index 88246be695..76a05cced4 100644 --- a/leo/synthesizer/serialized_index.rs +++ b/leo/synthesizer/serialized_index.rs @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with the Leo library. If not, see . -use snarkos_models::gadgets::r1cs::Index; +use snarkvm_models::gadgets::r1cs::Index; use serde::{Deserialize, Serialize}; diff --git a/package/Cargo.toml b/package/Cargo.toml index edeaddf76a..644eb2ae25 100644 --- a/package/Cargo.toml +++ b/package/Cargo.toml @@ -21,9 +21,6 @@ edition = "2018" version = "1.0" features = [ "derive" ] -[dependencies.serde_json] -version = "1.0" - [dependencies.thiserror] version = "1.0" diff --git a/package/README.md b/package/README.md new file mode 100644 index 0000000000..c1fbeead31 --- /dev/null +++ b/package/README.md @@ -0,0 +1,5 @@ +# leo-package + +This module defines the structure of a Leo project package. + +Each file in this directory mirrors a corresponding file generated in a new Leo project package. diff --git a/package/src/root/readme.rs b/package/src/root/readme.rs index d06c6b3fe9..7f35c1762f 100644 --- a/package/src/root/readme.rs +++ b/package/src/root/readme.rs @@ -58,6 +58,29 @@ impl README { } fn template(&self) -> String { - format!("# {}\n", self.package_name) + format!( + r"# {} + +## Build Guide + +To compile this Leo program, run: +```bash +leo build +``` + +To test this Leo program, run: +```bash +leo test +``` + +## Development + +To output the number of constraints, run: +```bash +leo build -d +``` +", + self.package_name + ) } } diff --git a/state/Cargo.toml b/state/Cargo.toml index c3d5405f06..807aa225e6 100644 --- a/state/Cargo.toml +++ b/state/Cargo.toml @@ -25,32 +25,32 @@ version = "1.0.7" path = "../ast" version = "1.0.7" -[dependencies.snarkos-algorithms] -version = "1.1.3" +[dependencies.snarkvm-algorithms] +version = "0.0.2" default-features = false -[dependencies.snarkos-curves] -version = "1.1.3" +[dependencies.snarkvm-curves] +version = "0.0.2" default-features = false -[dependencies.snarkos-dpc] -version = "1.1.3" +[dependencies.snarkvm-dpc] +version = "0.0.2" default-features = false -[dependencies.snarkos-errors] -version = "1.1.3" +[dependencies.snarkvm-errors] +version = "0.0.2" default-features = false -[dependencies.snarkos-models] -version = "1.1.3" +[dependencies.snarkvm-models] +version = "0.0.2" default-features = false -[dependencies.snarkos-objects] -version = "1.1.3" +[dependencies.snarkvm-objects] +version = "0.0.2" default-features = false -[dependencies.snarkos-utilities] -version = "1.1.3" +[dependencies.snarkvm-utilities] +version = "0.0.2" [dependencies.indexmap] version = "1.6.1" @@ -65,5 +65,5 @@ version = "0.2" [dependencies.thiserror] version = "1.0" -[dev-dependencies.snarkos-storage] -version = "1.1.4" +[dev-dependencies.snarkvm-storage] +version = "0.0.2" diff --git a/state/src/errors/dpc_record_values.rs b/state/src/errors/dpc_record_values.rs index 39aa9c558e..56e7ed07fd 100644 --- a/state/src/errors/dpc_record_values.rs +++ b/state/src/errors/dpc_record_values.rs @@ -16,7 +16,7 @@ use crate::InputValueError; -use snarkos_errors::objects::account::AccountError; +use snarkvm_errors::objects::account::AccountError; use std::{num::ParseIntError, str::ParseBoolError}; diff --git a/state/src/errors/local_data_commitment.rs b/state/src/errors/local_data_commitment.rs index 6f3c954cb1..f5539b01ae 100644 --- a/state/src/errors/local_data_commitment.rs +++ b/state/src/errors/local_data_commitment.rs @@ -16,7 +16,7 @@ use crate::{RecordVerificationError, StateLeafValuesError, StateValuesError}; -use snarkos_errors::algorithms::{CommitmentError, MerkleError}; +use snarkvm_errors::algorithms::{CommitmentError, MerkleError}; use std::io::Error as IOError; diff --git a/state/src/errors/record_commitment.rs b/state/src/errors/record_commitment.rs index 3ca813f277..a919dce2d1 100644 --- a/state/src/errors/record_commitment.rs +++ b/state/src/errors/record_commitment.rs @@ -16,7 +16,7 @@ use crate::DPCRecordValuesError; -use snarkos_errors::algorithms::CommitmentError; +use snarkvm_errors::algorithms::CommitmentError; use std::io::Error as IOError; diff --git a/state/src/local_data_commitment/local_data_commitment.rs b/state/src/local_data_commitment/local_data_commitment.rs index 3e7c69d9ad..0615c71f21 100644 --- a/state/src/local_data_commitment/local_data_commitment.rs +++ b/state/src/local_data_commitment/local_data_commitment.rs @@ -17,16 +17,16 @@ use crate::{verify_record_commitment, LocalDataVerificationError, StateLeafValues, StateValues}; use leo_ast::Input as AstInput; -use snarkos_algorithms::commitment_tree::CommitmentMerklePath; -use snarkos_dpc::base_dpc::{ +use snarkvm_algorithms::commitment_tree::CommitmentMerklePath; +use snarkvm_dpc::base_dpc::{ instantiated::{Components, LocalDataCRH, LocalDataCommitment}, parameters::SystemParameters, }; -use snarkos_models::{ +use snarkvm_models::{ algorithms::{CommitmentScheme, CRH}, dpc::DPCComponents, }; -use snarkos_utilities::{bytes::ToBytes, to_bytes, FromBytes}; +use snarkvm_utilities::{bytes::ToBytes, to_bytes, FromBytes}; use std::convert::TryFrom; diff --git a/state/src/record_commitment/dpc_record_values.rs b/state/src/record_commitment/dpc_record_values.rs index 12ae7b84fc..3ee90d8779 100644 --- a/state/src/record_commitment/dpc_record_values.rs +++ b/state/src/record_commitment/dpc_record_values.rs @@ -17,8 +17,8 @@ use crate::{utilities::*, DPCRecordValuesError}; use leo_ast::Record as AstRecord; -use snarkos_dpc::base_dpc::instantiated::Components; -use snarkos_objects::AccountAddress; +use snarkvm_dpc::base_dpc::instantiated::Components; +use snarkvm_objects::AccountAddress; use std::{convert::TryFrom, str::FromStr}; diff --git a/state/src/record_commitment/record_commitment.rs b/state/src/record_commitment/record_commitment.rs index 3dd4ea69e0..24e730ab86 100644 --- a/state/src/record_commitment/record_commitment.rs +++ b/state/src/record_commitment/record_commitment.rs @@ -17,12 +17,12 @@ use crate::{DPCRecordValues, RecordVerificationError}; use leo_ast::Record as AstRecord; -use snarkos_dpc::base_dpc::{ +use snarkvm_dpc::base_dpc::{ instantiated::{Components, RecordCommitment}, parameters::SystemParameters, }; -use snarkos_models::algorithms::CommitmentScheme; -use snarkos_utilities::{bytes::ToBytes, to_bytes, FromBytes}; +use snarkvm_models::algorithms::CommitmentScheme; +use snarkvm_utilities::{bytes::ToBytes, to_bytes, FromBytes}; use std::convert::TryFrom; diff --git a/state/tests/test_verify_local_data_commitment.rs b/state/tests/test_verify_local_data_commitment.rs index 83dc69a46b..7df7f58357 100644 --- a/state/tests/test_verify_local_data_commitment.rs +++ b/state/tests/test_verify_local_data_commitment.rs @@ -18,19 +18,19 @@ use leo_ast::Input; use leo_input::LeoInputParser; use leo_state::verify_local_data_commitment; -use snarkos_dpc::base_dpc::{instantiated::*, record_payload::RecordPayload, DPC}; -use snarkos_models::{ +use snarkvm_dpc::base_dpc::{instantiated::*, record_payload::RecordPayload, DPC}; +use snarkvm_models::{ algorithms::{CommitmentScheme, CRH}, dpc::Record, objects::AccountScheme, }; -use snarkos_objects::Account; -use snarkos_utilities::{bytes::ToBytes, to_bytes}; +use snarkvm_objects::Account; +use snarkvm_utilities::{bytes::ToBytes, to_bytes}; use rand::{Rng, SeedableRng}; use rand_xorshift::XorShiftRng; -use snarkos_models::dpc::DPCScheme; -use snarkos_storage::Ledger; +use snarkvm_models::dpc::DPCScheme; +use snarkvm_storage::Ledger; // TODO (Collin): Update input to reflect new parameter ordering. #[test] @@ -98,14 +98,14 @@ fn test_generate_values_from_dpc() { let payload: [u8; 32] = rng.gen(); let old_record = DPC::generate_record( - &system_parameters, - &sn_nonce, - &dummy_account.address, + system_parameters.clone(), + sn_nonce, + dummy_account.address, false, value, - &RecordPayload::from_bytes(&payload), - &noop_program_id, - &noop_program_id, + RecordPayload::from_bytes(&payload), + noop_program_id.clone(), + noop_program_id.clone(), &mut rng, ) .unwrap(); @@ -137,16 +137,16 @@ fn test_generate_values_from_dpc() { let memo = [0u8; 32]; let context = >::execute_offline( - &system_parameters, - &old_records, - &old_account_private_keys, - &new_record_owners, + system_parameters.clone(), + old_records, + old_account_private_keys, + new_record_owners, &new_is_dummy_flags, &new_values, - &new_payloads, - &new_birth_program_ids, - &new_death_program_ids, - &memo, + new_payloads, + new_birth_program_ids, + new_death_program_ids, + memo, network_id, &mut rng, ) diff --git a/state/tests/test_verify_record_commitment.rs b/state/tests/test_verify_record_commitment.rs index 0a148a407f..98fc1543c4 100644 --- a/state/tests/test_verify_record_commitment.rs +++ b/state/tests/test_verify_record_commitment.rs @@ -18,7 +18,7 @@ use leo_ast::Input; use leo_input::LeoInputParser; use leo_state::verify_record_commitment; -use snarkos_dpc::base_dpc::instantiated::*; +use snarkvm_dpc::base_dpc::instantiated::*; use rand::SeedableRng; use rand_xorshift::XorShiftRng;