diff --git a/Cargo.lock b/Cargo.lock index 7444f6d200..f92cdca122 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2323,6 +2323,7 @@ dependencies = [ [[package]] name = "snarkvm" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "anyhow", "clap", @@ -2349,6 +2350,7 @@ dependencies = [ [[package]] name = "snarkvm-algorithms" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "aleo-std", "anyhow", @@ -2374,6 +2376,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-algorithms", @@ -2387,6 +2390,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-account" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-network", @@ -2397,6 +2401,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-algorithms" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "snarkvm-circuit-types", "snarkvm-console-algorithms", @@ -2406,6 +2411,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-collections" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-types", @@ -2415,6 +2421,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "indexmap", "itertools", @@ -2432,10 +2439,12 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment-witness" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" [[package]] name = "snarkvm-circuit-network" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-collections", @@ -2446,6 +2455,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-program" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-network", @@ -2457,6 +2467,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-address", @@ -2471,6 +2482,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-address" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -2483,6 +2495,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-boolean" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "snarkvm-circuit-environment", "snarkvm-console-types-boolean", @@ -2491,6 +2504,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-field" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -2500,6 +2514,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-group" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -2511,6 +2526,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-integers" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -2521,6 +2537,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-scalar" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -2531,6 +2548,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-string" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -2542,6 +2560,7 @@ dependencies = [ [[package]] name = "snarkvm-compiler" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "anyhow", "colored", @@ -2567,6 +2586,7 @@ dependencies = [ [[package]] name = "snarkvm-console" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "snarkvm-console-account", "snarkvm-console-algorithms", @@ -2579,6 +2599,7 @@ dependencies = [ [[package]] name = "snarkvm-console-account" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "base58", "snarkvm-console-network", @@ -2588,6 +2609,7 @@ dependencies = [ [[package]] name = "snarkvm-console-algorithms" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "blake2s_simd", "smallvec", @@ -2599,6 +2621,7 @@ dependencies = [ [[package]] name = "snarkvm-console-collections" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "aleo-std", "rayon", @@ -2609,6 +2632,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "anyhow", "itertools", @@ -2627,6 +2651,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network-environment" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "anyhow", "bech32", @@ -2643,6 +2668,7 @@ dependencies = [ [[package]] name = "snarkvm-console-program" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "enum_index", "enum_index_derive", @@ -2659,6 +2685,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-address", @@ -2673,6 +2700,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-address" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -2683,6 +2711,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-boolean" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "snarkvm-console-network-environment", ] @@ -2690,6 +2719,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-field" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -2698,6 +2728,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-group" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -2708,6 +2739,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-integers" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -2717,6 +2749,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-scalar" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -2726,6 +2759,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-string" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -2736,6 +2770,7 @@ dependencies = [ [[package]] name = "snarkvm-curves" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "rand", "rustc_version", @@ -2748,6 +2783,7 @@ dependencies = [ [[package]] name = "snarkvm-fields" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "aleo-std", "anyhow", @@ -2764,6 +2800,7 @@ dependencies = [ [[package]] name = "snarkvm-parameters" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "aleo-std", "anyhow", @@ -2786,6 +2823,7 @@ dependencies = [ [[package]] name = "snarkvm-r1cs" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "anyhow", "cfg-if", @@ -2801,6 +2839,7 @@ dependencies = [ [[package]] name = "snarkvm-rest" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "anyhow", "indexmap", @@ -2815,6 +2854,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "aleo-std", "anyhow", @@ -2832,6 +2872,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities-derives" version = "0.9.0" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=b2cee23#b2cee23ef419a62ae0180f3ac256af48d2a57ca7" dependencies = [ "proc-macro2 1.0.43", "quote 1.0.21", diff --git a/Cargo.toml b/Cargo.toml index 0530239edf..a00fee9876 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,9 +49,9 @@ path = "./environment" version = "2.0.2" [dependencies.snarkvm] -path = "../snarkVM" -#git = "https://github.com/AleoHQ/snarkVM.git" -#rev = "69cf3bd" +#path = "../snarkVM" +git = "https://github.com/AleoHQ/snarkVM.git" +rev = "b2cee23" features = ["circuit", "console", "parallel", "rest", "utilities"] [dependencies.aleo-std] diff --git a/environment/Cargo.toml b/environment/Cargo.toml index 59c5cfb3e3..fd6f58a3ee 100644 --- a/environment/Cargo.toml +++ b/environment/Cargo.toml @@ -35,9 +35,9 @@ version = "1.0.144" version = "1" [dependencies.snarkvm] -path = "../../snarkVM" -#git = "https://github.com/AleoHQ/snarkVM.git" -#rev = "1db1f75" +#path = "../../snarkVM" +git = "https://github.com/AleoHQ/snarkVM.git" +rev = "b2cee23" features = ["console", "utilities"] [dependencies.tokio] diff --git a/snarkos/ledger/mod.rs b/snarkos/ledger/mod.rs index 63126f02c1..df860bfb2e 100644 --- a/snarkos/ledger/mod.rs +++ b/snarkos/ledger/mod.rs @@ -86,6 +86,7 @@ impl Ledger { let address = Address::try_from(&view_key)?; // Initialize the additional routes. + #[allow(clippy::let_and_return)] let additional_routes = { // GET /testnet3/node/address let get_node_address = warp::get()