From 0425a92c2b8824a4755e7443ebae3fd4763c98c7 Mon Sep 17 00:00:00 2001 From: collin <16715212+collinc97@users.noreply.github.com> Date: Tue, 11 Jan 2022 16:22:34 -0800 Subject: [PATCH] feature: update to latest snarkvm rev --- Cargo.lock | 943 ++++++++++++++++---------- Cargo.toml | 21 +- compiler/Cargo.toml | 26 +- compiler/src/compiler.rs | 23 +- compiler/src/expression/expression.rs | 42 +- compiler/src/prelude/mod.rs | 16 +- compiler/src/value/address/address.rs | 34 +- errors/Cargo.toml | 2 +- leo/commands/prove.rs | 2 +- leo/commands/run.rs | 9 +- leo/commands/setup.rs | 8 +- state/Cargo.toml | 14 +- synthesizer/Cargo.toml | 12 +- 13 files changed, 689 insertions(+), 463 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9f55fc6fdb..ae4a5ad265 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -38,9 +38,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43bb833f0bf979d8475d38fbf09ed3b8a55e1885fe93ad3f93239fc6a4f17b98" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ "getrandom 0.2.3", "once_cell", @@ -57,12 +57,55 @@ dependencies = [ ] [[package]] -name = "ansi_term" -version = "0.11.0" +name = "aleo-std" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +checksum = "064ec11ce34a1748bbbae0fd9111e6cdcb2aa9eae714852da81eaa7cf864fc72" dependencies = [ - "winapi 0.3.9", + "aleo-std-storage", + "aleo-std-time", + "aleo-std-timed", + "aleo-std-timer", +] + +[[package]] +name = "aleo-std-storage" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "503e2538d5158b869bc9c30c9754f9a23f4210987008014a9f118db99f22c217" +dependencies = [ + "dirs", +] + +[[package]] +name = "aleo-std-time" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7065e071b26763f3e5b1b5a587828227562365bee84fdd2629361ea0a08bfc8d" +dependencies = [ + "proc-macro2 0.4.30", + "quote 0.6.13", + "syn 0.15.44", +] + +[[package]] +name = "aleo-std-timed" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b85aed1b7ca965b6613d14ab243c746316180401cbb9ba3b2cb22bff16fc08f" +dependencies = [ + "proc-macro2 1.0.36", + "quote 1.0.14", + "syn 1.0.85", +] + +[[package]] +name = "aleo-std-timer" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23bed34621f0713d3e750b59acdd3961a8950650fa7615b7cb40e6bc062a1d0b" +dependencies = [ + "colored", ] [[package]] @@ -76,15 +119,21 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.45" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee10e43ae4a853c0a3591d4e2ada1719e553be18199d9da9d4a83f5927c2f5c7" +checksum = "84450d0b4a8bd1ba4144ce8ce718fbc5d071358b1e5384bace6536b3d1f2d5b3" + +[[package]] +name = "arrayref" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" [[package]] name = "arrayvec" -version = "0.5.2" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] name = "assert_cmd" @@ -134,9 +183,9 @@ dependencies = [ [[package]] name = "base58" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5024ee8015f02155eee35c711107ddd9a9bf3cb689cf2a9089c97e79b6e1ae83" +checksum = "6107fe1be6682a68940da878d9e9f5e90ca5745b3dec9fd1bb393c8777d4f581" [[package]] name = "base64" @@ -161,15 +210,15 @@ dependencies = [ [[package]] name = "bitflags" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitvec" -version = "0.19.5" +version = "0.19.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" +checksum = "55f93d0ef3363c364d5976646a38f04cf67cfe1d4c8d160cdea02cab2c116b33" dependencies = [ "funty", "radium", @@ -179,15 +228,26 @@ dependencies = [ [[package]] name = "blake2" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a5720225ef5daecf08657f23791354e1685a8c91a4c60c7f3d3b2892f978f4" +checksum = "0a4e37d16930f5459780f5621038b6382b9bb37c19016f39fb6b5808d831f174" dependencies = [ "crypto-mac", "digest 0.9.0", "opaque-debug 0.3.0", ] +[[package]] +name = "blake2s_simd" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db539cc2b5f6003621f1cd9ef92d7ded8ea5232c7de0f9faa2de251cd98730d4" +dependencies = [ + "arrayref", + "arrayvec", + "constant_time_eq", +] + [[package]] name = "block-buffer" version = "0.7.3" @@ -206,7 +266,16 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", +] + +[[package]] +name = "block-buffer" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1d36a02058e76b040de25a4464ba1c80935655595b661505c8b39b664828b95" +dependencies = [ + "generic-array 0.14.5", ] [[package]] @@ -220,9 +289,9 @@ dependencies = [ [[package]] name = "bstr" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90682c8d613ad3373e66de8c6411e0ae2ab2571e879d2efbf73558cc66f21279" +checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" dependencies = [ "lazy_static", "memchr", @@ -232,9 +301,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.7.0" +version = "3.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631" +checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899" [[package]] name = "byte-tools" @@ -250,9 +319,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" +checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" [[package]] name = "bzip2" @@ -286,9 +355,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.69" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2" +checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee" [[package]] name = "cfg-if" @@ -312,7 +381,6 @@ dependencies = [ "num-integer", "num-traits", "serde", - "time", "winapi 0.3.9", ] @@ -327,11 +395,11 @@ dependencies = [ [[package]] name = "clap" -version = "2.33.3" +version = "2.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ - "ansi_term 0.11.0", + "ansi_term", "atty", "bitflags", "strsim", @@ -378,10 +446,16 @@ dependencies = [ ] [[package]] -name = "core-foundation" -version = "0.9.1" +name = "constant_time_eq" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" + +[[package]] +name = "core-foundation" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3" dependencies = [ "core-foundation-sys", "libc", @@ -389,9 +463,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] name = "cpufeatures" @@ -404,9 +478,9 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.2.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" +checksum = "738c290dfaea84fc1ca15ad9c168d083b05a714e1efddd8edaab678dc28d2836" dependencies = [ "cfg-if 1.0.0", ] @@ -422,7 +496,7 @@ dependencies = [ "clap", "criterion-plot", "csv", - "itertools 0.10.1", + "itertools 0.10.3", "lazy_static", "num-traits", "oorandom", @@ -444,14 +518,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d00996de9f2f7559f7f4dc286073197f83e92256a59ed395f9aac01fe717da57" dependencies = [ "cast", - "itertools 0.10.1", + "itertools 0.10.3", ] [[package]] name = "crossbeam-channel" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" +checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -459,9 +533,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" +checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" dependencies = [ "cfg-if 1.0.0", "crossbeam-epoch", @@ -470,9 +544,9 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" +checksum = "97242a70df9b89a65d0b6df3c4bf5b9ce03c5b7309019777fbde37e7537f8762" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -483,21 +557,30 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" +checksum = "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120" dependencies = [ "cfg-if 1.0.0", "lazy_static", ] +[[package]] +name = "crypto-common" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683d6b536309245c849479fba3da410962a43ed8e51c26b729208ec0ac2798d0" +dependencies = [ + "generic-array 0.14.5", +] + [[package]] name = "crypto-mac" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", "subtle", ] @@ -509,7 +592,7 @@ checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" dependencies = [ "bstr", "csv-core", - "itoa", + "itoa 0.4.8", "ryu", "serde", ] @@ -525,9 +608,9 @@ dependencies = [ [[package]] name = "curl" -version = "0.4.38" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "003cb79c1c6d1c93344c7e1201bb51c2148f24ec2bd9c253709d6b2efb796515" +checksum = "7de97b894edd5b5bcceef8b78d7da9b75b1d2f2f9a910569d0bde3dd31d84939" dependencies = [ "curl-sys", "libc", @@ -540,9 +623,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.44+curl-7.77.0" +version = "0.4.52+curl-7.81.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6d85e9322b193f117c966e79c2d6929ec08c02f339f950044aba12e20bbaf1" +checksum = "14b8c2d1023ea5fded5b7b892e4b8e95f70038a421126a056761a84246a28971" dependencies = [ "cc", "libc", @@ -559,9 +642,9 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "proc-macro2 1.0.27", - "quote 1.0.9", - "syn 1.0.73", + "proc-macro2 1.0.36", + "quote 1.0.14", + "syn 1.0.85", ] [[package]] @@ -585,7 +668,18 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", +] + +[[package]] +name = "digest" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b697d66081d42af4fba142d56918a3cb21dc8eb63372c6b85d14f44fb9c5979b" +dependencies = [ + "block-buffer 0.10.0", + "crypto-common", + "generic-array 0.14.5", ] [[package]] @@ -614,12 +708,6 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" -[[package]] -name = "dtoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" - [[package]] name = "either" version = "1.6.1" @@ -634,9 +722,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.28" +version = "0.8.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065" +checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df" dependencies = [ "cfg-if 1.0.0", ] @@ -677,9 +765,9 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" dependencies = [ - "proc-macro2 1.0.27", - "quote 1.0.9", - "syn 1.0.73", + "proc-macro2 1.0.36", + "quote 1.0.14", + "syn 1.0.85", "synstructure", ] @@ -690,10 +778,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" [[package]] -name = "filetime" -version = "0.2.14" +name = "fastrand" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8" +checksum = "779d043b6a0b90cc4c0ed7ee380a6504394cee7efd7db050e3774eee387324b2" +dependencies = [ + "instant", +] + +[[package]] +name = "filetime" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98" dependencies = [ "cfg-if 1.0.0", "libc", @@ -703,9 +800,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0" +checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" dependencies = [ "cfg-if 1.0.0", "crc32fast", @@ -813,44 +910,43 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.15" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2" +checksum = "ba3dda0b6588335f360afc675d0564c17a77a2bda81ca178a4b6081bd86c7f0b" dependencies = [ "futures-core", ] [[package]] name = "futures-core" -version = "0.3.15" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1" +checksum = "d0c8ff0461b82559810cdccfde3215c3f373807f5e5232b71479bff7bb2583d7" [[package]] name = "futures-io" -version = "0.3.15" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1" +checksum = "b1f9d34af5a1aac6fb380f735fe510746c38067c5bf16c7fd250280503c971b2" [[package]] name = "futures-sink" -version = "0.3.15" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282" +checksum = "e3055baccb68d74ff6480350f8d6eb8fcfa3aa11bdc1a1ae3afdd0514617d508" [[package]] name = "futures-task" -version = "0.3.15" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae" +checksum = "6ee7c6485c30167ce4dfb83ac568a849fe53274c831081476ee13e0dce1aad72" [[package]] name = "futures-util" -version = "0.3.15" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967" +checksum = "d9b5cf40b47a271f77a8b1bec03ca09044d99d2372c0de244e66430761127164" dependencies = [ - "autocfg", "futures-core", "futures-io", "futures-task", @@ -880,9 +976,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.4" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" +checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803" dependencies = [ "typenum", "version_check", @@ -933,9 +1029,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "h2" -version = "0.3.3" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "825343c4eef0b63f541f8903f395dc5beb362a979b5799a84062527ef1e37726" +checksum = "0c9de88456263e249e241fcd211d3954e2c9b0ef7ccfc235a444eb367cae3689" dependencies = [ "bytes", "fnv", @@ -952,9 +1048,9 @@ dependencies = [ [[package]] name = "half" -version = "1.7.1" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62aca2aba2d62b4a7f5b33f3712cb1b0692779a56fb510499d5c0aa594daeaf3" +checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "hashbrown" @@ -991,20 +1087,20 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "http" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11" +checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03" dependencies = [ "bytes", "fnv", - "itoa", + "itoa 1.0.1", ] [[package]] name = "http-body" -version = "0.4.2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60daa14be0e0786db0f03a9e57cb404c9d756eed2b6c62b9ea98ec5743ec75a9" +checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" dependencies = [ "bytes", "http", @@ -1013,21 +1109,21 @@ dependencies = [ [[package]] name = "httparse" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68" +checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503" [[package]] name = "httpdate" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "hyper" -version = "0.14.10" +version = "0.14.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7728a72c4c7d72665fde02204bcbd93b247721025b222ef78606f14513e0fd03" +checksum = "b7ec3e62bdc98a2f0393a5048e4c30ef659440ea6e0e572965103e72bd836f55" dependencies = [ "bytes", "futures-channel", @@ -1038,7 +1134,7 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa", + "itoa 0.4.8", "pin-project-lite", "socket2", "tokio", @@ -1090,9 +1186,9 @@ checksum = "0a0c890c85da4bab7bce4204c707396bbd3c6c8a681716a51c8814cfc2b682df" dependencies = [ "anyhow", "proc-macro-hack", - "proc-macro2 1.0.27", - "quote 1.0.9", - "syn 1.0.73", + "proc-macro2 1.0.36", + "quote 1.0.14", + "syn 1.0.85", ] [[package]] @@ -1103,9 +1199,9 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" [[package]] name = "indexmap" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" +checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223" dependencies = [ "autocfg", "hashbrown", @@ -1144,6 +1240,15 @@ dependencies = [ "libc", ] +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if 1.0.0", +] + [[package]] name = "iovec" version = "0.1.4" @@ -1170,24 +1275,30 @@ dependencies = [ [[package]] name = "itertools" -version = "0.10.1" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf" +checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" dependencies = [ "either", ] [[package]] name = "itoa" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + +[[package]] +name = "itoa" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" [[package]] name = "js-sys" -version = "0.3.51" +version = "0.3.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83bdfbace3a0e81a4253f73b49e960b053e396a11012cbd49b9b74d6a2b67062" +checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84" dependencies = [ "wasm-bindgen", ] @@ -1287,7 +1398,6 @@ dependencies = [ "leo-input", "leo-package", "leo-parser", - "leo-state", "leo-synthesizer", "leo-test-framework", "num-bigint", @@ -1298,14 +1408,14 @@ dependencies = [ "serde", "serde_json", "serde_yaml", - "sha2", - "snarkvm-algorithms", - "snarkvm-curves", + "sha2 0.9.9", + "snarkvm-algorithms 0.7.9", + "snarkvm-curves 0.7.5", "snarkvm-dpc", - "snarkvm-fields", + "snarkvm-fields 0.7.5", "snarkvm-gadgets", - "snarkvm-r1cs", - "snarkvm-utilities", + "snarkvm-r1cs 0.7.5", + "snarkvm-utilities 0.7.5", "tempfile", "tendril", "tracing", @@ -1355,7 +1465,7 @@ dependencies = [ name = "leo-lang" version = "1.5.3" dependencies = [ - "ansi_term 0.12.1", + "ansi_term", "assert_cmd", "clap", "color-backtrace", @@ -1372,7 +1482,6 @@ dependencies = [ "leo-input", "leo-package", "leo-parser", - "leo-state", "leo-stdlib", "leo-synthesizer", "notify", @@ -1383,11 +1492,11 @@ dependencies = [ "self_update", "serde", "serde_json", - "snarkvm-algorithms", - "snarkvm-curves", + "snarkvm-algorithms 0.7.5", + "snarkvm-curves 0.7.5", "snarkvm-gadgets", - "snarkvm-r1cs", - "snarkvm-utilities", + "snarkvm-r1cs 0.7.5", + "snarkvm-utilities 0.7.5", "structopt", "test_dir", "toml", @@ -1442,10 +1551,10 @@ dependencies = [ "rand 0.8.4", "rand_core 0.6.3", "rand_xorshift", - "snarkvm-algorithms", - "snarkvm-curves", + "snarkvm-algorithms 0.7.5", + "snarkvm-curves 0.7.5", "snarkvm-dpc", - "snarkvm-utilities", + "snarkvm-utilities 0.7.5", ] [[package]] @@ -1469,11 +1578,11 @@ dependencies = [ "num-bigint", "serde", "serde_json", - "sha2", - "snarkvm-curves", - "snarkvm-fields", + "sha2 0.9.9", + "snarkvm-curves 0.7.5", + "snarkvm-fields 0.7.5", "snarkvm-gadgets", - "snarkvm-r1cs", + "snarkvm-r1cs 0.7.5", ] [[package]] @@ -1508,24 +1617,11 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "lexical-core" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" -dependencies = [ - "arrayvec", - "bitflags", - "cfg-if 1.0.0", - "ryu", - "static_assertions", -] - [[package]] name = "libc" -version = "0.2.101" +version = "0.2.112" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cb00336871be5ed2c8ed44b60ae9959dc5b9f08539422ed43f09e34ecaeba21" +checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125" [[package]] name = "libz-sys" @@ -1568,9 +1664,9 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" [[package]] name = "matches" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" +checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" [[package]] name = "memchr" @@ -1580,9 +1676,9 @@ checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" [[package]] name = "memoffset" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" dependencies = [ "autocfg", ] @@ -1603,6 +1699,12 @@ dependencies = [ "unicase", ] +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + [[package]] name = "miniz_oxide" version = "0.4.4" @@ -1634,9 +1736,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16" +checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" dependencies = [ "libc", "log", @@ -1721,12 +1823,12 @@ checksum = "ab250442c86f1850815b5d268639dff018c0627022bc1940eb2d642ca1ce12f0" [[package]] name = "nom" -version = "7.0.0-alpha1" +version = "7.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd43cd1e53168596e629accc602ada1297f5125fed588d62cf8be81175b46002" +checksum = "1b1d11e1ef389c76fe5b81bcaf2ea32cf88b62bc494e19f493d0b30e7a930109" dependencies = [ - "lexical-core", "memchr", + "minimal-lexical", "version_check", ] @@ -1789,9 +1891,9 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" dependencies = [ "hermit-abi", "libc", @@ -1814,9 +1916,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" +checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5" [[package]] name = "oorandom" @@ -1838,9 +1940,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.35" +version = "0.10.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549430950c79ae24e6d02e0b7404534ecf311d94cc9f861e9e4020187d13d885" +checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95" dependencies = [ "bitflags", "cfg-if 1.0.0", @@ -1858,9 +1960,9 @@ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" [[package]] name = "openssl-sys" -version = "0.9.65" +version = "0.9.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a7907e3bfa08bb85105209cdfcb6c63d109f8f6c1ed6ca318fff5c1853fbc1d" +checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb" dependencies = [ "autocfg", "cc", @@ -1869,6 +1971,12 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "paste" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5" + [[package]] name = "percent-encoding" version = "2.1.0" @@ -1915,9 +2023,9 @@ checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55" dependencies = [ "pest", "pest_meta", - "proc-macro2 1.0.27", - "quote 1.0.9", - "syn 1.0.73", + "proc-macro2 1.0.36", + "quote 1.0.14", + "syn 1.0.85", ] [[package]] @@ -1933,9 +2041,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" +checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c" [[package]] name = "pin-utils" @@ -1945,9 +2053,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.19" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" +checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe" [[package]] name = "plotters" @@ -1979,18 +2087,18 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.10" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" +checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" [[package]] name = "predicates" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6e46ca79eb4e21e2ec14430340c71250ab69332abf85521c95d3a8bc336aa76" +checksum = "95e5a7689e456ab905c22c2b48225bb921aba7c8dfa58440d68ba13f6222a715" dependencies = [ "difflib", - "itertools 0.10.1", + "itertools 0.10.3", "predicates-core", ] @@ -2002,12 +2110,12 @@ checksum = "57e35a3326b75e49aa85f5dc6ec15b41108cf5aee58eabb1f274dd18b73c2451" [[package]] name = "predicates-tree" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f553275e5721409451eb85e15fd9a860a6e5ab4496eb215987502b5f5391f2" +checksum = "338c7be2905b732ae3984a2f40032b5e94fd8f52505b186c7d4d68d193445df7" dependencies = [ "predicates-core", - "treeline", + "termtree", ] [[package]] @@ -2026,9 +2134,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.27", - "quote 1.0.9", - "syn 1.0.73", + "proc-macro2 1.0.36", + "quote 1.0.14", + "syn 1.0.85", "version_check", ] @@ -2038,8 +2146,8 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.27", - "quote 1.0.9", + "proc-macro2 1.0.36", + "quote 1.0.14", "version_check", ] @@ -2060,9 +2168,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.27" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038" +checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" dependencies = [ "unicode-xid 0.2.2", ] @@ -2087,11 +2195,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.9" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +checksum = "47aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d" dependencies = [ - "proc-macro2 1.0.27", + "proc-macro2 1.0.36", ] [[package]] @@ -2217,9 +2325,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ab49abadf3f9e1c4bc499e8845e152ad87d2ad2d30371841171169e9d75feee" +checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" dependencies = [ "bitflags", ] @@ -2268,15 +2376,16 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.6" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d2927ca2f685faf0fc620ac4834690d29e7abb153add10f5812eef20b5e280" +checksum = "87f242f1488a539a79bac6dbe7c8609ae43b7914b7736210f239a37cccb32525" dependencies = [ "base64", "bytes", "encoding_rs", "futures-core", "futures-util", + "h2", "http", "http-body", "hyper", @@ -2304,9 +2413,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dead70b0b5e03e9c814bcb6b01e03e68f7c57a80aa48c72ec92152ab3e818d49" +checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" [[package]] name = "rustc_version" @@ -2314,7 +2423,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.3", + "semver 1.0.4", ] [[package]] @@ -2331,9 +2440,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.5" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" +checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" [[package]] name = "same-file" @@ -2362,9 +2471,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "security-framework" -version = "2.3.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23a2ac85147a3a11d77ecf1bc7166ec0b92febfa4461c37944e180f319ece467" +checksum = "525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87" dependencies = [ "bitflags", "core-foundation", @@ -2375,9 +2484,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.3.0" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4effb91b4b8b6fb7732e670b6cee160278ff8e6bf485c7805d9e319d76e284" +checksum = "a9dd14d83160b528b7bfd66439110573efcfbe281b17fc2ca9f39f550d619c7e" dependencies = [ "core-foundation-sys", "libc", @@ -2412,9 +2521,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f3aac57ee7f3272d8395c6e4f502f434f0e289fcd62876f70daa008c20dcabe" +checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012" [[package]] name = "semver-parser" @@ -2427,18 +2536,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.130" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" +checksum = "97565067517b60e2d1ea8b268e59ce036de907ac523ad83a0475da04e818989a" dependencies = [ "serde_derive", ] [[package]] name = "serde_cbor" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e18acfa2f90e8b735b2836ab8d538de304cbb6729a7360729ea5a895d15a622" +checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" dependencies = [ "half", "serde", @@ -2446,23 +2555,23 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.130" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" +checksum = "ed201699328568d8d08208fdd080e3ff594e6c422e438b6705905da01005d537" dependencies = [ - "proc-macro2 1.0.27", - "quote 1.0.9", - "syn 1.0.73", + "proc-macro2 1.0.36", + "quote 1.0.14", + "syn 1.0.85", ] [[package]] name = "serde_json" -version = "1.0.64" +version = "1.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" +checksum = "ee2bb9cd061c5865d345bb02ca49fcef1391741b672b54a0bf7b679badec3142" dependencies = [ "indexmap", - "itoa", + "itoa 1.0.1", "ryu", "serde", ] @@ -2474,19 +2583,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" dependencies = [ "form_urlencoded", - "itoa", + "itoa 0.4.8", "ryu", "serde", ] [[package]] name = "serde_yaml" -version = "0.8.21" +version = "0.8.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8c608a35705a5d3cdc9fbe403147647ff34b921f8e833e49306df898f9b20af" +checksum = "a4a521f2940385c165a24ee286aa8599633d162077a54bdcae2a6fd5a7bfa7a0" dependencies = [ - "dtoa", "indexmap", + "ryu", "serde", "yaml-rust", ] @@ -2505,9 +2614,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa" +checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", @@ -2517,10 +2626,21 @@ dependencies = [ ] [[package]] -name = "sharded-slab" -version = "0.1.1" +name = "sha2" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79c719719ee05df97490f80a45acfc99e5a30ce98a1e4fb67aee422745ae14e3" +checksum = "99c3bd8169c58782adad9290a9af5939994036b76187f7b4f0e6de91dbbfc0ec" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "digest 0.10.1", +] + +[[package]] +name = "sharded-slab" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" dependencies = [ "lazy_static", ] @@ -2536,15 +2656,44 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527" +checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" [[package]] name = "smallvec" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" +checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" + +[[package]] +name = "snarkvm-algorithms" +version = "0.7.5" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=2af7756#2af7756c030eac9fcf7443a6682f3f62628d443f" +dependencies = [ + "anyhow", + "blake2", + "blake2s_simd", + "crossbeam-channel", + "derivative", + "digest 0.9.0", + "hex", + "itertools 0.10.3", + "lazy_static", + "once_cell", + "rand 0.8.4", + "rand_chacha 0.3.1", + "rayon", + "serde", + "sha2 0.10.1", + "smallvec", + "snarkvm-curves 0.7.5", + "snarkvm-fields 0.7.5", + "snarkvm-profiler 0.7.5", + "snarkvm-r1cs 0.7.5", + "snarkvm-utilities 0.7.5", + "thiserror", +] [[package]] name = "snarkvm-algorithms" @@ -2554,23 +2703,36 @@ checksum = "3534da2cfa71894e4d28c5dcaf9f9c5c94315904c4ace6c86419a8f2ff8b1641" dependencies = [ "anyhow", "bitvec", - "blake2", "crossbeam-channel", "derivative", "digest 0.9.0", - "itertools 0.10.1", + "itertools 0.10.3", "lazy_static", "once_cell", "rand 0.8.4", "rand_chacha 0.3.1", "rayon", - "sha2", + "sha2 0.9.9", "smallvec", - "snarkvm-curves", - "snarkvm-fields", - "snarkvm-profiler", - "snarkvm-r1cs", - "snarkvm-utilities", + "snarkvm-curves 0.7.9", + "snarkvm-fields 0.7.9", + "snarkvm-profiler 0.7.9", + "snarkvm-r1cs 0.7.9", + "snarkvm-utilities 0.7.9", + "thiserror", +] + +[[package]] +name = "snarkvm-curves" +version = "0.7.5" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=2af7756#2af7756c030eac9fcf7443a6682f3f62628d443f" +dependencies = [ + "derivative", + "rand 0.8.4", + "rustc_version", + "serde", + "snarkvm-fields 0.7.5", + "snarkvm-utilities 0.7.5", "thiserror", ] @@ -2585,11 +2747,23 @@ dependencies = [ "rand_xorshift", "rustc_version", "serde", - "snarkvm-fields", - "snarkvm-utilities", + "snarkvm-fields 0.7.9", + "snarkvm-utilities 0.7.9", "thiserror", ] +[[package]] +name = "snarkvm-derives" +version = "0.7.5" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=2af7756#2af7756c030eac9fcf7443a6682f3f62628d443f" +dependencies = [ + "proc-macro-crate", + "proc-macro-error", + "proc-macro2 1.0.36", + "quote 1.0.14", + "syn 1.0.85", +] + [[package]] name = "snarkvm-derives" version = "0.7.9" @@ -2598,16 +2772,15 @@ checksum = "3e854888634305d8c5c79fe59adaae593971a8b29d3148834f698141b16c2c7b" dependencies = [ "proc-macro-crate", "proc-macro-error", - "proc-macro2 1.0.27", - "quote 1.0.9", - "syn 1.0.73", + "proc-macro2 1.0.36", + "quote 1.0.14", + "syn 1.0.85", ] [[package]] name = "snarkvm-dpc" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c922bb690fbe9c5919f67f2d887452376339a36bf5ffb50dc6b00d58a5650284" +version = "0.7.5" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=2af7756#2af7756c030eac9fcf7443a6682f3f62628d443f" dependencies = [ "anyhow", "base58", @@ -2617,21 +2790,35 @@ dependencies = [ "chrono", "derivative", "hex", - "itertools 0.10.1", + "itertools 0.10.3", "once_cell", "rand 0.8.4", + "rayon", "serde", - "sha2", - "snarkvm-algorithms", - "snarkvm-curves", - "snarkvm-fields", + "serde_json", + "snarkvm-algorithms 0.7.5", + "snarkvm-curves 0.7.5", + "snarkvm-fields 0.7.5", "snarkvm-gadgets", "snarkvm-marlin", "snarkvm-parameters", "snarkvm-polycommit", - "snarkvm-profiler", - "snarkvm-r1cs", - "snarkvm-utilities", + "snarkvm-profiler 0.7.5", + "snarkvm-r1cs 0.7.5", + "snarkvm-utilities 0.7.5", + "thiserror", +] + +[[package]] +name = "snarkvm-fields" +version = "0.7.5" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=2af7756#2af7756c030eac9fcf7443a6682f3f62628d443f" +dependencies = [ + "anyhow", + "derivative", + "rand 0.8.4", + "serde", + "snarkvm-utilities 0.7.5", "thiserror", ] @@ -2647,36 +2834,36 @@ dependencies = [ "rand 0.8.4", "rand_xorshift", "serde", - "snarkvm-utilities", + "snarkvm-utilities 0.7.9", "thiserror", ] [[package]] name = "snarkvm-gadgets" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3138cfcaaa27e53cabc7a4fc596b3b0abb47c3cb46fee496e3ac7ce2cd07df9d" +version = "0.7.5" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=2af7756#2af7756c030eac9fcf7443a6682f3f62628d443f" dependencies = [ + "anyhow", "derivative", "digest 0.9.0", - "itertools 0.10.1", + "itertools 0.10.3", "num-bigint", "num-integer", "num-traits", - "snarkvm-algorithms", - "snarkvm-curves", - "snarkvm-fields", - "snarkvm-r1cs", - "snarkvm-utilities", + "snarkvm-algorithms 0.7.5", + "snarkvm-curves 0.7.5", + "snarkvm-fields 0.7.5", + "snarkvm-r1cs 0.7.5", + "snarkvm-utilities 0.7.5", "thiserror", ] [[package]] name = "snarkvm-marlin" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12e6987cde7b734415afc7afe58a038d224393842ad5dfaba728a601c5c5473d" +version = "0.7.5" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=2af7756#2af7756c030eac9fcf7443a6682f3f62628d443f" dependencies = [ + "bincode", "blake2", "derivative", "digest 0.9.0", @@ -2685,54 +2872,80 @@ dependencies = [ "rand_chacha 0.3.1", "rand_core 0.6.3", "rayon", - "snarkvm-algorithms", - "snarkvm-curves", - "snarkvm-fields", + "serde", + "smallvec", + "snarkvm-algorithms 0.7.5", + "snarkvm-curves 0.7.5", + "snarkvm-fields 0.7.5", "snarkvm-gadgets", "snarkvm-polycommit", - "snarkvm-profiler", - "snarkvm-r1cs", - "snarkvm-utilities", + "snarkvm-profiler 0.7.5", + "snarkvm-r1cs 0.7.5", + "snarkvm-utilities 0.7.5", ] [[package]] name = "snarkvm-parameters" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "506cbbbfe27acb4d4e8dd15e49b430dbfb920fd680cfe1c69ab87542083d0422" +version = "0.7.5" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=2af7756#2af7756c030eac9fcf7443a6682f3f62628d443f" dependencies = [ + "aleo-std", + "anyhow", + "cfg-if 1.0.0", "curl", "hex", - "snarkvm-algorithms", - "snarkvm-utilities", + "paste", + "serde_json", + "snarkvm-algorithms 0.7.5", + "snarkvm-utilities 0.7.5", "thiserror", ] [[package]] name = "snarkvm-polycommit" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c23a7fa2aab25aa6fc3b7fb27b3d639936725a5c29b29936d1530b64bd011e67" +version = "0.7.5" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=2af7756#2af7756c030eac9fcf7443a6682f3f62628d443f" dependencies = [ "derivative", "digest 0.9.0", "hashbrown", "rand_core 0.6.3", - "snarkvm-algorithms", - "snarkvm-curves", - "snarkvm-fields", + "snarkvm-algorithms 0.7.5", + "snarkvm-curves 0.7.5", + "snarkvm-fields 0.7.5", "snarkvm-gadgets", - "snarkvm-profiler", - "snarkvm-r1cs", - "snarkvm-utilities", + "snarkvm-profiler 0.7.5", + "snarkvm-r1cs 0.7.5", + "snarkvm-utilities 0.7.5", ] +[[package]] +name = "snarkvm-profiler" +version = "0.7.5" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=2af7756#2af7756c030eac9fcf7443a6682f3f62628d443f" + [[package]] name = "snarkvm-profiler" version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7d80cc343b9e19e0f38582fa7e17e6263c4c7449122cf9a606279567ff33d71" +[[package]] +name = "snarkvm-r1cs" +version = "0.7.5" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=2af7756#2af7756c030eac9fcf7443a6682f3f62628d443f" +dependencies = [ + "anyhow", + "cfg-if 1.0.0", + "fxhash", + "indexmap", + "itertools 0.10.3", + "snarkvm-curves 0.7.5", + "snarkvm-fields 0.7.5", + "snarkvm-utilities 0.7.5", + "thiserror", +] + [[package]] name = "snarkvm-r1cs" version = "0.7.9" @@ -2742,10 +2955,24 @@ dependencies = [ "cfg-if 1.0.0", "fxhash", "indexmap", - "itertools 0.10.1", - "snarkvm-curves", - "snarkvm-fields", - "snarkvm-utilities", + "itertools 0.10.3", + "snarkvm-curves 0.7.9", + "snarkvm-fields 0.7.9", + "snarkvm-utilities 0.7.9", +] + +[[package]] +name = "snarkvm-utilities" +version = "0.7.5" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=2af7756#2af7756c030eac9fcf7443a6682f3f62628d443f" +dependencies = [ + "anyhow", + "bincode", + "num-bigint", + "rand 0.8.4", + "serde", + "snarkvm-derives 0.7.5", + "thiserror", ] [[package]] @@ -2758,26 +2985,20 @@ dependencies = [ "bincode", "num-bigint", "rand 0.8.4", - "snarkvm-derives", + "snarkvm-derives 0.7.9", "thiserror", ] [[package]] name = "socket2" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2" +checksum = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516" dependencies = [ "libc", "winapi 0.3.9", ] -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - [[package]] name = "strsim" version = "0.8.0" @@ -2803,9 +3024,9 @@ checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" dependencies = [ "heck", "proc-macro-error", - "proc-macro2 1.0.27", - "quote 1.0.9", - "syn 1.0.73", + "proc-macro2 1.0.36", + "quote 1.0.14", + "syn 1.0.85", ] [[package]] @@ -2827,24 +3048,24 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.73" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7" +checksum = "a684ac3dcd8913827e18cd09a68384ee66c1de24157e3c556c9ab16d85695fb7" dependencies = [ - "proc-macro2 1.0.27", - "quote 1.0.9", + "proc-macro2 1.0.36", + "quote 1.0.14", "unicode-xid 0.2.2", ] [[package]] name = "synstructure" -version = "0.12.5" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "474aaa926faa1603c40b7885a9eaea29b444d1cb2850cb7c0e37bb1a4182f4fa" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2 1.0.27", - "quote 1.0.9", - "syn 1.0.73", + "proc-macro2 1.0.36", + "quote 1.0.14", + "syn 1.0.85", "unicode-xid 0.2.2", ] @@ -2856,13 +3077,13 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" dependencies = [ "cfg-if 1.0.0", + "fastrand", "libc", - "rand 0.8.4", "redox_syscall", "remove_dir_all", "winapi 0.3.9", @@ -2898,6 +3119,12 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "termtree" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "507e9898683b6c43a9aa55b64259b721b52ba226e0f3779137e50ad114a4c90b" + [[package]] name = "test_dir" version = "0.1.0" @@ -2931,9 +3158,9 @@ version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" dependencies = [ - "proc-macro2 1.0.27", - "quote 1.0.9", - "syn 1.0.73", + "proc-macro2 1.0.36", + "quote 1.0.14", + "syn 1.0.85", ] [[package]] @@ -2967,9 +3194,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.2.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342" +checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" dependencies = [ "tinyvec_macros", ] @@ -2982,15 +3209,14 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.8.1" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98c8b05dc14c75ea83d63dd391100353789f5f24b8b3866542a5e85c8be8e985" +checksum = "fbbf1c778ec206785635ce8ad57fe52b3009ae9e0c9f574a728f3049d3e55838" dependencies = [ - "autocfg", "bytes", "libc", "memchr", - "mio 0.7.13", + "mio 0.7.14", "num_cpus", "pin-project-lite", "winapi 0.3.9", @@ -3008,9 +3234,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.6.7" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1caa0b0c8d94a049db56b5acf8cba99dc0623aab1b26d5b5f5e2d945846b3592" +checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" dependencies = [ "bytes", "futures-core", @@ -3053,9 +3279,9 @@ version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e" dependencies = [ - "proc-macro2 1.0.27", - "quote 1.0.9", - "syn 1.0.73", + "proc-macro2 1.0.36", + "quote 1.0.14", + "syn 1.0.85", ] [[package]] @@ -3080,11 +3306,11 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.1" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80a4ddde70311d8da398062ecf6fc2c309337de6b0f77d6c27aff8d53f6fca52" +checksum = "5d81bfa81424cc98cb034b837c985b7a290f592e5b4322f353f94a0ab0f9f594" dependencies = [ - "ansi_term 0.12.1", + "ansi_term", "sharded-slab", "smallvec", "thread_local", @@ -3092,12 +3318,6 @@ dependencies = [ "tracing-log", ] -[[package]] -name = "treeline" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41" - [[package]] name = "try-lock" version = "0.2.3" @@ -3112,9 +3332,9 @@ checksum = "0685c84d5d54d1c26f7d3eb96cd41550adb97baed141a761cf335d3d33bcd0ae" [[package]] name = "typenum" -version = "1.13.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" +checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "ucd-trie" @@ -3133,12 +3353,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0" -dependencies = [ - "matches", -] +checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" [[package]] name = "unicode-normalization" @@ -3157,9 +3374,9 @@ checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" [[package]] name = "unicode-width" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" +checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" [[package]] name = "unicode-xid" @@ -3205,9 +3422,9 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "version_check" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "void" @@ -3278,17 +3495,17 @@ dependencies = [ "bumpalo", "lazy_static", "log", - "proc-macro2 1.0.27", - "quote 1.0.9", - "syn 1.0.73", + "proc-macro2 1.0.36", + "quote 1.0.14", + "syn 1.0.85", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.24" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fba7978c679d53ce2d0ac80c8c175840feb849a161664365d1287b41f2e67f1" +checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -3302,7 +3519,7 @@ version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9" dependencies = [ - "quote 1.0.9", + "quote 1.0.14", "wasm-bindgen-macro-support", ] @@ -3312,9 +3529,9 @@ version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab" dependencies = [ - "proc-macro2 1.0.27", - "quote 1.0.9", - "syn 1.0.73", + "proc-macro2 1.0.36", + "quote 1.0.14", + "syn 1.0.85", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3327,9 +3544,9 @@ checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc" [[package]] name = "web-sys" -version = "0.3.51" +version = "0.3.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e828417b379f3df7111d3a2a9e5753706cae29c41f7c4029ee9fd77f3e09e582" +checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/Cargo.toml b/Cargo.toml index fb6873ea0c..4566e30c0b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -73,9 +73,9 @@ version = "1.5.3" path = "./parser" version = "1.5.3" -[dependencies.leo-state] -path = "./state" -version = "1.5.3" +#[dependencies.leo-state] +#path = "./state" +#version = "1.5.3" [dependencies.leo-stdlib] path = "./stdlib" @@ -86,22 +86,27 @@ path = "./synthesizer" version = "1.5.3" [dependencies.snarkvm-algorithms] -version = "0.7.9" +git = "https://github.com/AleoHQ/snarkVM.git" +rev = "2af7756" [dependencies.snarkvm-curves] -version = "0.7.9" +git = "https://github.com/AleoHQ/snarkVM.git" +rev = "2af7756" default-features = false [dependencies.snarkvm-gadgets] -version = "0.7.9" +git = "https://github.com/AleoHQ/snarkVM.git" +rev = "2af7756" default-features = false [dependencies.snarkvm-r1cs] -version = "0.7.9" +git = "https://github.com/AleoHQ/snarkVM.git" +rev = "2af7756" default-features = false [dependencies.snarkvm-utilities] -version = "0.7.9" +git = "https://github.com/AleoHQ/snarkVM.git" +rev = "2af7756" [dependencies.structopt] version = "0.3" diff --git a/compiler/Cargo.toml b/compiler/Cargo.toml index cbdf128418..df8a0f7cef 100644 --- a/compiler/Cargo.toml +++ b/compiler/Cargo.toml @@ -37,9 +37,9 @@ version = "1.5.3" path = "../package" version = "1.5.3" -[dependencies.leo-state] -path = "../state" -version = "1.5.3" +#[dependencies.leo-state] +#path = "../state" +#version = "1.5.3" [dependencies.leo-asg] path = "../asg" @@ -65,28 +65,34 @@ version = "1.5.3" version = "0.4" [dependencies.snarkvm-curves] -version = "0.7.9" +git = "https://github.com/AleoHQ/snarkVM.git" +rev = "2af7756" default-features = false [dependencies.snarkvm-fields] -version = "0.7.9" +git = "https://github.com/AleoHQ/snarkVM.git" +rev = "2af7756" default-features = false [dependencies.snarkvm-dpc] -version = "0.7.9" -default-features = false +git = "https://github.com/AleoHQ/snarkVM.git" +rev = "2af7756" +features = ["testnet2"] [dependencies.snarkvm-gadgets] -version = "0.7.9" +git = "https://github.com/AleoHQ/snarkVM.git" +rev = "2af7756" default-features = false features = [ "curves" ] [dependencies.snarkvm-r1cs] -version = "0.7.9" +git = "https://github.com/AleoHQ/snarkVM.git" +rev = "2af7756" default-features = false [dependencies.snarkvm-utilities] -version = "0.7.9" +git = "https://github.com/AleoHQ/snarkVM.git" +rev = "2af7756" [dependencies.bincode] version = "1.3" diff --git a/compiler/src/compiler.rs b/compiler/src/compiler.rs index 2f64e4eab2..9b29404382 100644 --- a/compiler/src/compiler.rs +++ b/compiler/src/compiler.rs @@ -27,9 +27,8 @@ use leo_imports::ImportParser; use leo_input::LeoInputParser; use leo_package::inputs::InputPairs; use leo_parser::parse_ast; -use leo_state::verify_local_data_commitment; +// use leo_state::verify_local_data_commitment; -use snarkvm_dpc::testnet1::{instantiated::Components, parameters::SystemParameters}; use snarkvm_fields::PrimeField; use snarkvm_r1cs::{ConstraintSynthesizer, ConstraintSystem, SynthesisError}; @@ -364,16 +363,16 @@ impl<'a, F: PrimeField, G: GroupType> Compiler<'a, F, G> { Ok(format!("{:x}", hash)) } - /// TODO (howardwu): Incorporate this for real program executions and intentionally-real - /// test executions. Exclude it for test executions on dummy data. - /// - /// Verifies the input to the program. - /// - pub fn verify_local_data_commitment(&self, system_parameters: &SystemParameters) -> Result { - let result = verify_local_data_commitment(system_parameters, &self.program_input)?; - - Ok(result) - } + // /// TODO (howardwu): Incorporate this for real program executions and intentionally-real + // /// test executions. Exclude it for test executions on dummy data. + // /// + // /// Verifies the input to the program. + // /// + // pub fn verify_local_data_commitment(&self, system_parameters: &SystemParameters) -> Result { + // let result = verify_local_data_commitment(system_parameters, &self.program_input)?; + // + // Ok(result) + // } /// /// Manually sets main function input. diff --git a/compiler/src/expression/expression.rs b/compiler/src/expression/expression.rs index 1b52608de8..79ba64101e 100644 --- a/compiler/src/expression/expression.rs +++ b/compiler/src/expression/expression.rs @@ -21,9 +21,10 @@ use crate::{ logical::*, program::ConstrainedProgram, relational::*, - resolve_core_circuit, + // resolve_core_circuit, value::{Address, Char, CharType, ConstrainedCircuitMember, ConstrainedValue, Integer}, - FieldType, GroupType, + FieldType, + GroupType, }; use leo_asg::{expression::*, ConstValue, Expression, Node}; use leo_errors::{Result, Span}; @@ -178,26 +179,27 @@ impl<'a, F: PrimeField, G: GroupType> ConstrainedProgram<'a, F, G> { // Functions Expression::Call(CallExpression { - function, - target, - arguments, + // function, + // target, + // arguments, .. }) => { - if let Some(circuit) = function.get().circuit.get() { - let core_mapping = circuit.core_mapping.borrow(); - if let Some(core_mapping) = core_mapping.as_deref() { - let core_circuit = resolve_core_circuit::(core_mapping); - return self.enforce_core_circuit_call_expression( - cs, - &core_circuit, - function.get(), - target.get(), - &arguments[..], - span, - ); - } - } - self.enforce_function_call_expression(cs, function.get(), target.get(), &arguments[..], span) + unimplemented!("core circuits are not supported yet") + // if let Some(circuit) = function.get().circuit.get() { + // let core_mapping = circuit.core_mapping.borrow(); + // if let Some(core_mapping) = core_mapping.as_deref() { + // let core_circuit = resolve_core_circuit::(core_mapping); + // return self.enforce_core_circuit_call_expression( + // cs, + // &core_circuit, + // function.get(), + // target.get(), + // &arguments[..], + // span, + // ); + // } + // } + // self.enforce_function_call_expression(cs, function.get(), target.get(), &arguments[..], span) } } } diff --git a/compiler/src/prelude/mod.rs b/compiler/src/prelude/mod.rs index 4189c374c9..615600f2f5 100644 --- a/compiler/src/prelude/mod.rs +++ b/compiler/src/prelude/mod.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 . -pub mod blake2s; -pub use blake2s::*; +// pub mod blake2s; +// pub use blake2s::*; use crate::{ConstrainedValue, GroupType}; use leo_asg::Function; @@ -35,9 +35,9 @@ pub trait CoreCircuit<'a, F: PrimeField, G: GroupType>: Send + Sync { ) -> Result>; } -pub fn resolve_core_circuit<'a, F: PrimeField, G: GroupType>(name: &str) -> impl CoreCircuit<'a, F, G> { - match name { - "blake2s" => Blake2s, - _ => unimplemented!("invalid core circuit: {}", name), - } -} +// pub fn resolve_core_circuit<'a, F: PrimeField, G: GroupType>(name: &str) -> impl CoreCircuit<'a, F, G> { +// match name { +// "blake2s" => Blake2s, +// _ => unimplemented!("invalid core circuit: {}", name), +// } +// } diff --git a/compiler/src/value/address/address.rs b/compiler/src/value/address/address.rs index 30e686ace1..f349a804c3 100644 --- a/compiler/src/value/address/address.rs +++ b/compiler/src/value/address/address.rs @@ -18,7 +18,7 @@ use crate::{ConstrainedValue, GroupType, IntegerTrait}; use leo_ast::InputValue; use leo_errors::{CompilerError, Result, Span}; -use snarkvm_dpc::{account::Address as AleoAddress, testnet1::instantiated::Components}; +use snarkvm_dpc::{account::Address as AleoAddress, network::testnet2::Testnet2}; use snarkvm_fields::PrimeField; use snarkvm_gadgets::{ boolean::Boolean, @@ -36,17 +36,16 @@ use std::{borrow::Borrow, str::FromStr}; /// A public address #[derive(Clone, Debug, PartialEq, Eq)] pub struct Address { - pub address: Option>, + pub address: Option>, pub bytes: Vec, } impl Address { pub(crate) fn constant(address: String, span: &Span) -> Result { - let address = - AleoAddress::from_str(&address).map_err(|e| CompilerError::address_value_account_error(e, span))?; + let address = AleoAddress::::from_str(&address) + .map_err(|e| CompilerError::address_value_account_error(e, span))?; - let mut address_bytes = vec![]; - address.write_le(&mut address_bytes).unwrap(); + let address_bytes = address.to_bytes_le().unwrap(); let bytes = UInt8::constant_vec(&address_bytes[..]); @@ -95,9 +94,9 @@ impl Address { >( cs: CS, value_gen: Fn, - ) -> Result, SynthesisError> { + ) -> Result, SynthesisError> { if cs.is_in_setup_mode() { - Ok(AleoAddress::::default()) + Ok(AleoAddress::::default()) } else { let address_string = value_gen()?.borrow().clone(); AleoAddress::from_str(&address_string).map_err(|_| SynthesisError::AssignmentMissing) @@ -110,14 +109,11 @@ impl AllocGadget for Address { _cs: CS, value_gen: Fn, ) -> Result { - let address = { + let address: AleoAddress = { let address_string = value_gen()?.borrow().clone(); AleoAddress::from_str(&address_string).map_err(|_| SynthesisError::AssignmentMissing)? }; - let mut address_bytes = vec![]; - address - .write_le(&mut address_bytes) - .map_err(|_| SynthesisError::AssignmentMissing)?; + let address_bytes = address.to_bytes_le().map_err(|_| SynthesisError::AssignmentMissing)?; let bytes = UInt8::constant_vec(&address_bytes[..]); @@ -131,11 +127,8 @@ impl AllocGadget for Address { mut cs: CS, value_gen: Fn, ) -> Result { - let address = Self::alloc_helper(cs.ns(|| "allocate the address"), value_gen)?; - let mut address_bytes = vec![]; - address - .write_le(&mut address_bytes) - .map_err(|_| SynthesisError::AssignmentMissing)?; + let address: AleoAddress = Self::alloc_helper(cs.ns(|| "allocate the address"), value_gen)?; + let address_bytes = address.to_bytes_le().map_err(|_| SynthesisError::AssignmentMissing)?; let bytes = UInt8::alloc_vec(cs.ns(|| "allocate the address bytes"), &address_bytes[..])?; @@ -150,10 +143,7 @@ impl AllocGadget for Address { value_gen: Fn, ) -> Result { let address = Self::alloc_helper(cs.ns(|| "allocate the address"), value_gen)?; - let mut address_bytes = vec![]; - address - .write_le(&mut address_bytes) - .map_err(|_| SynthesisError::AssignmentMissing)?; + let address_bytes = address.to_bytes_le().map_err(|_| SynthesisError::AssignmentMissing)?; let bytes = UInt8::alloc_input_vec_le(cs.ns(|| "allocate the address bytes"), &address_bytes[..])?; diff --git a/errors/Cargo.toml b/errors/Cargo.toml index 8a3e741af6..e2415a7030 100644 --- a/errors/Cargo.toml +++ b/errors/Cargo.toml @@ -41,7 +41,7 @@ version = "0.3.63" version = "2.0" [dependencies.serde] -version = "1.0.130" +version = "1.0" features = [ "derive", "rc" ] [dependencies.tendril] diff --git a/leo/commands/prove.rs b/leo/commands/prove.rs index 4447f1631a..ae1e458244 100644 --- a/leo/commands/prove.rs +++ b/leo/commands/prove.rs @@ -68,7 +68,7 @@ impl Command for Prove { let rng = &mut thread_rng(); // TODO fix this once snarkvm has better errors. let program_proof = - Groth16::>::prove(¶meters, &program, rng).map_err(|_| SnarkVMError::default())?; + Groth16::>::prove(¶meters, &program, rng).map_err(|_| SnarkVMError::default())?; // Write the proof file to the output directory let mut proof = vec![]; diff --git a/leo/commands/run.rs b/leo/commands/run.rs index 49e3622557..a2cb584307 100644 --- a/leo/commands/run.rs +++ b/leo/commands/run.rs @@ -16,7 +16,6 @@ use super::{build::BuildOptions, prove::Prove}; use crate::{commands::Command, context::Context}; -use leo_compiler::{compiler::Compiler, group::targets::edwards_bls12::EdwardsGroupType}; use leo_errors::{Result, SnarkVMError}; use snarkvm_algorithms::{snark::groth16::Groth16, traits::SNARK}; @@ -57,12 +56,8 @@ impl Command for Run { tracing::info!("Starting..."); // Run the verifier - let is_success = Groth16::, Vec>::verify( - &prepared_verifying_key, - &vec![], - &proof, - ) - .map_err(|_| SnarkVMError::default())?; + let is_success = Groth16::>::verify_prepared(&prepared_verifying_key, &vec![], &proof) + .map_err(|_| SnarkVMError::default())?; // Log the verifier output match is_success { diff --git a/leo/commands/setup.rs b/leo/commands/setup.rs index cc915730fa..6b54d92fca 100644 --- a/leo/commands/setup.rs +++ b/leo/commands/setup.rs @@ -23,6 +23,7 @@ use leo_package::outputs::{ProvingKeyFile, VerificationKeyFile}; use snarkvm_algorithms::{ snark::groth16::{Groth16, PreparedVerifyingKey, ProvingKey, VerifyingKey}, traits::snark::SNARK, + SRS, }; use snarkvm_curves::bls12_377::{Bls12_377, Fr}; use snarkvm_utilities::ToBytes; @@ -78,8 +79,8 @@ impl Command for Setup { // Run the program setup operation let rng = &mut thread_rng(); - let (proving_key, prepared_verifying_key) = - Groth16::, Vec>::setup(&program, rng) + let (proving_key, verifying_key) = + Groth16::>::setup(&program, &mut SRS::CircuitSpecific(rng)) .map_err(|_| CliError::unable_to_setup())?; // TODO (howardwu): Convert parameters to a 'proving key' struct for serialization. @@ -104,6 +105,9 @@ impl Command for Setup { let _ = verification_key_file.write_to(&path, &verification_key)?; tracing::info!("Complete"); + // Derive the prepared verifying key file from the verifying key + let prepared_verifying_key = PreparedVerifyingKey::::from(verifying_key); + (proving_key, prepared_verifying_key) } else { tracing::info!("Detected saved setup"); diff --git a/state/Cargo.toml b/state/Cargo.toml index 9efab47313..bdef16cd8c 100644 --- a/state/Cargo.toml +++ b/state/Cargo.toml @@ -30,18 +30,22 @@ path = "../input" version = "1.5.3" [dependencies.snarkvm-algorithms] -version = "0.7.9" +git = "https://github.com/AleoHQ/snarkVM.git" +rev = "2af7756" [dependencies.snarkvm-curves] -version = "0.7.9" +git = "https://github.com/AleoHQ/snarkVM.git" +rev = "2af7756" default-features = false [dependencies.snarkvm-dpc] -version = "0.7.9" -features = [ "testnet1" ] +git = "https://github.com/AleoHQ/snarkVM.git" +rev = "2af7756" +features = [ "testnet2" ] [dependencies.snarkvm-utilities] -version = "0.7.9" +git = "https://github.com/AleoHQ/snarkVM.git" +rev = "2af7756" [dependencies.indexmap] version = "1.7.0" diff --git a/synthesizer/Cargo.toml b/synthesizer/Cargo.toml index 564c6af606..7d236fb186 100644 --- a/synthesizer/Cargo.toml +++ b/synthesizer/Cargo.toml @@ -18,7 +18,8 @@ license = "GPL-3.0" edition = "2018" [dependencies.snarkvm-curves] -version = "0.7.9" +git = "https://github.com/AleoHQ/snarkVM.git" +rev = "2af7756" default-features = false [dependencies.leo-errors] @@ -30,14 +31,17 @@ version = "0.6.5" default-features = false [dependencies.snarkvm-fields] -version = "0.7.9" +git = "https://github.com/AleoHQ/snarkVM.git" +rev = "2af7756" default-features = false [dependencies.snarkvm-gadgets] -version = "0.7.9" +git = "https://github.com/AleoHQ/snarkVM.git" +rev = "2af7756" [dependencies.snarkvm-r1cs] -version = "0.7.9" +git = "https://github.com/AleoHQ/snarkVM.git" +rev = "2af7756" default-features = false [dependencies.num-bigint]