ProvableHQ/leo
1
1
Fork 0
mirror of https://github.com/ProvableHQ/leo.git synced 2024-12-26 03:33:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:AleoHQ/leo into ast-cleanup

Browse Source
This commit is contained in:
collin 2021-01-05 13:09:41 -05:00
commit fea8bb6d1e
145 changed files with 459 additions and 490 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View File

@ -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

2
.rusty-hook.toml
View File

@ -2,4 +2,4 @@
pre-commit = "cargo +nightly clippy && cargo +nightly fmt --all -- --check"
[logging]
verbose = false
verbose = true

2
.travis.yml
View File

@ -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" \

300
Cargo.lock generated
View File

@ -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",
]

32
Cargo.toml
View File

@ -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"

8
ast/Cargo.toml
View File

@ -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" ]

35
compiler/Cargo.toml
View File

@ -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]

16
compiler/src/compiler.rs
View File

@ -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<F: Field + PrimeField, G: GroupType<F>> Compiler<F, G> {
pub fn compile_constraints<CS: ConstraintSystem<F>>(self, cs: &mut CS) -> Result<OutputBytes, CompilerError> {
let path = self.main_file_path;
generate_constraints::<F, G, CS>(cs, self.program, self.program_input, &self.imported_programs).map_err(
generate_constraints::<F, G, CS>(cs, &self.program, &self.program_input, &self.imported_programs).map_err(
|mut error| {
error.set_path(&path);
@ -329,11 +329,11 @@ impl<F: Field + PrimeField, G: GroupType<F>> Compiler<F, G> {
/// Calls the internal generate_constraints method with arguments.
///
pub fn generate_constraints_helper<CS: ConstraintSystem<F>>(
self,
&self,
cs: &mut CS,
) -> Result<OutputBytes, CompilerError> {
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<F: Field + PrimeField, G: GroupType<F>> ConstraintSynthesizer<F> for Compil
///
/// Synthesizes the circuit with program input.
///
fn generate_constraints<CS: ConstraintSystem<F>>(self, cs: &mut CS) -> Result<(), SynthesisError> {
fn generate_constraints<CS: ConstraintSystem<F>>(&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| {

2
compiler/src/console/assert.rs
View File

@ -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},
};

2
compiler/src/console/console.rs
View File

@ -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},
};

2
compiler/src/console/format.rs
View File

@ -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,
};

10
compiler/src/constraints/constraints.rs
View File

@ -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<F: Field + PrimeField, G: GroupType<F>, CS: ConstraintSystem<F>>(
cs: &mut CS,
program: Program,
input: Input,
program: &Program,
input: &Input,
imported_programs: &ImportParser,
) -> Result<OutputBytes, CompilerError> {
let mut resolved_program = ConstrainedProgram::<F, G>::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<F: Field + PrimeField, G: GroupType<F>>(
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()) {

2
compiler/src/definition/definition.rs
View File

@ -23,7 +23,7 @@ use crate::{
};
use leo_ast::Identifier;
use snarkos_models::curves::{Field, PrimeField};
use snarkvm_models::curves::{Field, PrimeField};
impl<F: Field + PrimeField, G: GroupType<F>> ConstrainedProgram<F, G> {
pub fn store_definition(

2
compiler/src/definition/definitions.rs
View File

@ -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<F: Field + PrimeField, G: GroupType<F>> ConstrainedProgram<F, G> {
pub fn store_definitions(

2
compiler/src/errors/expression.rs
View File

@ -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)]

2
compiler/src/errors/value/address.rs
View File

@ -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)]

2
compiler/src/errors/value/boolean.rs
View File

@ -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)]

2
compiler/src/errors/value/field.rs
View File

@ -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)]

2
compiler/src/errors/value/group.rs
View File

@ -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)]

2
compiler/src/errors/value/integer.rs
View File

@ -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)]

2
compiler/src/expression/arithmetic/add.rs
View File

@ -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,
};

2
compiler/src/expression/arithmetic/div.rs
View File

@ -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,
};

2
compiler/src/expression/arithmetic/mul.rs
View File

@ -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,
};

2
compiler/src/expression/arithmetic/negate.rs
View File

@ -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,
};

2
compiler/src/expression/arithmetic/pow.rs
View File

@ -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,
};

2
compiler/src/expression/arithmetic/sub.rs
View File

@ -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,
};

2
compiler/src/expression/array/access.rs
View File

@ -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,
};

2
compiler/src/expression/array/array.rs
View File

@ -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,
};

2
compiler/src/expression/array/index.rs
View File

@ -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,
};

2
compiler/src/expression/binary/binary.rs
View File

@ -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,
};

2
compiler/src/expression/binary/operand.rs
View File

@ -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,
};

2
compiler/src/expression/circuit/access.rs
View File

@ -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,
};

2
compiler/src/expression/circuit/circuit.rs
View File

@ -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,
};

2
compiler/src/expression/circuit/static_access.rs
View File

@ -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,
};

2
compiler/src/expression/conditional/conditional.rs
View File

@ -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},
};

2
compiler/src/expression/expression.rs
View File

@ -30,7 +30,7 @@ use crate::{
};
use leo_ast::{expression::*, Expression, Type};
use snarkos_models::{
use snarkvm_models::{
curves::{Field, PrimeField},
gadgets::r1cs::ConstraintSystem,
};

2
compiler/src/expression/function/core_circuit.rs
View File

@ -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,
};

2
compiler/src/expression/function/function.rs
View File

@ -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,
};

2
compiler/src/expression/identifier/identifier.rs
View File

@ -25,7 +25,7 @@ use crate::{
};
use leo_ast::{Identifier, Type};
use snarkos_models::curves::{Field, PrimeField};
use snarkvm_models::curves::{Field, PrimeField};
impl<F: Field + PrimeField, G: GroupType<F>> ConstrainedProgram<F, G> {
/// Enforce a variable expression by getting the resolved value

2
compiler/src/expression/logical/and.rs
View File

@ -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},
};

2
compiler/src/expression/logical/not.rs
View File

@ -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<F: Field + PrimeField, G: GroupType<F>>(
value: ConstrainedValue<F, G>,

2
compiler/src/expression/logical/or.rs
View File

@ -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},
};

2
compiler/src/expression/relational/eq.rs
View File

@ -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,

2
compiler/src/expression/relational/ge.rs
View File

@ -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,
};

2
compiler/src/expression/relational/gt.rs
View File

@ -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,
};

2
compiler/src/expression/relational/le.rs
View File

@ -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,
};

2
compiler/src/expression/relational/lt.rs
View File

@ -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,
};

2
compiler/src/expression/tuple/access.rs
View File

@ -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,
};

2
compiler/src/expression/tuple/tuple.rs
View File

@ -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,
};

2
compiler/src/function/function.rs
View File

@ -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},
};

2
compiler/src/function/input/array.rs
View File

@ -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,
};

2
compiler/src/function/input/function_input.rs
View File

@ -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,
};

2
compiler/src/function/input/input_keyword.rs
View File

@ -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,
};

2
compiler/src/function/input/input_section.rs
View File

@ -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,
};

2
compiler/src/function/input/main_function_input.rs
View File

@ -32,7 +32,7 @@ use crate::{
use leo_ast::{InputValue, Span, Type};
use snarkos_models::{
use snarkvm_models::{
curves::{Field, PrimeField},
gadgets::r1cs::ConstraintSystem,
};

2
compiler/src/function/input/tuple.rs
View File

@ -25,7 +25,7 @@ use crate::{
use leo_ast::{InputValue, Span, Type};
use snarkos_models::{
use snarkvm_models::{
curves::{Field, PrimeField},
gadgets::r1cs::ConstraintSystem,
};

6
compiler/src/function/main_function.rs
View File

@ -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<F: Field + PrimeField, G: GroupType<F>> ConstrainedProgram<F, G> {
cs: &mut CS,
scope: &str,
function: Function,
input: Input,
input: &Input,
) -> Result<OutputBytes, FunctionError> {
let function_name = new_scope(scope, function.get_name());
let registers = input.get_registers();
@ -47,7 +47,7 @@ impl<F: Field + PrimeField, G: GroupType<F>> ConstrainedProgram<F, G> {
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)
}

2
compiler/src/function/result/result.rs
View File

@ -27,7 +27,7 @@ use crate::{
use leo_ast::{Span, Type};
use snarkos_models::{
use snarkvm_models::{
curves::{Field, PrimeField},
gadgets::{
r1cs::ConstraintSystem,

2
compiler/src/import/store/core_package.rs
View File

@ -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<F: Field + PrimeField, G: GroupType<F>> ConstrainedProgram<F, G> {
pub(crate) fn store_core_package(&mut self, scope: &str, package: Package) -> Result<(), LeoCorePackageError> {

2
compiler/src/import/store/import.rs
View File

@ -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<F: Field + PrimeField, G: GroupType<F>> ConstrainedProgram<F, G> {
pub(crate) fn store_import(

2
compiler/src/import/store/symbol.rs
View File

@ -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<F: Field + PrimeField, G: GroupType<F>> ConstrainedProgram<F, G> {
pub(crate) fn store_symbol(

2
compiler/src/output/output_bytes.rs
View File

@ -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};

2
compiler/src/program/program.rs
View File

@ -18,7 +18,7 @@
use crate::{value::ConstrainedValue, GroupType};
use snarkos_models::curves::{Field, PrimeField};
use snarkvm_models::curves::{Field, PrimeField};
use indexmap::IndexMap;

2
compiler/src/statement/assign/assign.rs
View File

@ -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,

2
compiler/src/statement/assign/assignee.rs
View File

@ -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,
};

2
compiler/src/statement/block/block.rs
View File

@ -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},
};

2
compiler/src/statement/conditional/conditional.rs
View File

@ -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},
};

2
compiler/src/statement/definition/definition.rs
View File

@ -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,
};

2
compiler/src/statement/iteration/iteration.rs
View File

@ -27,7 +27,7 @@ use crate::{
};
use leo_ast::{IterationStatement, Type};
use snarkos_models::{
use snarkvm_models::{
curves::{Field, PrimeField},
gadgets::{
r1cs::ConstraintSystem,

2
compiler/src/statement/return_/return_.rs
View File

@ -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,
};

2
compiler/src/statement/statement.rs
View File

@ -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},
};

10
compiler/src/value/address/address.rs
View File

@ -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

4
compiler/src/value/boolean/input.rs
View File

@ -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,

4
compiler/src/value/field/field_type.rs
View File

@ -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},

4
compiler/src/value/field/input.rs
View File

@ -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},
};

2
compiler/src/value/group/group_type.rs
View File

@ -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,

4
compiler/src/value/group/input.rs
View File

@ -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,
};

8
compiler/src/value/group/targets/edwards_bls12.rs
View File

@ -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},

2
compiler/src/value/implicit/implicit.rs
View File

@ -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<F: Field + PrimeField, G: GroupType<F>>(
expected_type: Option<Type>,

4
compiler/src/value/integer/integer.rs
View File

@ -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,

2
compiler/src/value/integer/macros.rs
View File

@ -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},
};

4
compiler/src/value/value.rs
View File

@ -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,

6
compiler/tests/core/packages/unstable/blake2s/mod.rs
View File

@ -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

4
compiler/tests/field/mod.rs
View File

@ -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};

2
compiler/tests/group/mod.rs
View File

@ -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;

4
compiler/tests/mod.rs
View File

@ -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;

24
core/Cargo.toml
View File

@ -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

2
core/src/errors/core_circuit.rs
View File

@ -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;

2
core/src/lib.rs
View File

@ -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,
};

8
core/src/packages/unstable/blake2s.rs
View File

@ -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<Vec<UInt8>
#[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},
};

2
core/src/types/core_circuit.rs
View File

@ -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,
};

2
core/src/types/value.rs
View File

@ -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

15
gadgets/Cargo.toml
View File

@ -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"

2
gadgets/benches/integer_arithmetic.rs
View File

@ -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,
};

4
gadgets/src/arithmetic/add.rs
View File

@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
use snarkos_errors::gadgets::SynthesisError;
use snarkos_models::{
use snarkvm_errors::gadgets::SynthesisError;
use snarkvm_models::{
curves::{Field, PrimeField},
gadgets::{
r1cs::ConstraintSystem,

2
gadgets/src/arithmetic/div.rs
View File

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
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<F: Field, Rhs = Self>

2
gadgets/src/arithmetic/mul.rs
View File

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
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<F: Field, Rhs = Self>

4
gadgets/src/arithmetic/neg.rs
View File

@ -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},
};

2
gadgets/src/arithmetic/pow.rs
View File

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
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<F: Field, Rhs = Self>

2
gadgets/src/arithmetic/sub.rs
View File

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
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<F: Field, Rhs = Self>

Some files were not shown because too many files have changed in this diff Show More