Bump/snarkvm v0.11.4 (#2399)

This commit is contained in:
Collin Chin 2023-05-30 19:50:01 -07:00 committed by GitHub
parent 02bf3ab5d3
commit ed734e878e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 308 additions and 317 deletions

441
Cargo.lock generated
View File

@ -69,9 +69,9 @@ dependencies = [
[[package]]
name = "aleo-std"
version = "0.1.15"
version = "0.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3a0b63a4bc771020ff7522ca7458b60ac30e8e71a6e1382765b94b1a278b78d"
checksum = "c3aa6ad1a3bb96698e7e8d8e42a6f2fda3b8611a43aab4d5effb921f18798833"
dependencies = [
"aleo-std-cpu",
"aleo-std-profiler",
@ -83,15 +83,15 @@ dependencies = [
[[package]]
name = "aleo-std-cpu"
version = "0.1.3"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d1dcc739555d14733cbe4756f144b81d64f01843df359189b4d71bd5e521e2ee"
checksum = "7527351aa675fdbe6a1902de3cf913ff7d50ccd6822f1562be374bdd85eaefb8"
[[package]]
name = "aleo-std-profiler"
version = "0.1.14"
version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b007e46c4d064a62d41fe58ab6a15af809beb0e739ff4086acabc83014aa3a5"
checksum = "2bf055ddb2f54fa86394d19d87e7956df2f3cafff489fc14c0f48f2f80664c3d"
[[package]]
name = "aleo-std-storage"
@ -104,13 +104,13 @@ dependencies = [
[[package]]
name = "aleo-std-time"
version = "0.1.1"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c22735dbb880454b04b26792068f9401f0dc2c5d9b64452b55fcca4e4263e34"
checksum = "72f2a841f04c2eaeb5a95312e5201a9e4b7c95b64ca99870d6bd2e2376df540a"
dependencies = [
"proc-macro2 0.4.30",
"quote 0.6.13",
"syn 0.15.44",
"proc-macro2",
"quote 1.0.27",
"syn 1.0.109",
]
[[package]]
@ -119,7 +119,7 @@ version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6118baab6285accf088b31d5ea5029c37bbf9d98e62b4d8720a0a5a66bc2e427"
dependencies = [
"proc-macro2 1.0.56",
"proc-macro2",
"quote 1.0.27",
"syn 1.0.109",
]
@ -145,12 +145,55 @@ dependencies = [
"winapi",
]
[[package]]
name = "anstream"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
dependencies = [
"anstyle",
"anstyle-parse",
"anstyle-query",
"anstyle-wincon",
"colorchoice",
"is-terminal",
"utf8parse",
]
[[package]]
name = "anstyle"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d"
[[package]]
name = "anstyle-parse"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee"
dependencies = [
"utf8parse",
]
[[package]]
name = "anstyle-query"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
dependencies = [
"windows-sys 0.48.0",
]
[[package]]
name = "anstyle-wincon"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
dependencies = [
"anstyle",
"windows-sys 0.48.0",
]
[[package]]
name = "anyhow"
version = "1.0.71"
@ -286,9 +329,12 @@ dependencies = [
[[package]]
name = "bs58"
version = "0.4.0"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896"
dependencies = [
"tinyvec",
]
[[package]]
name = "bstr"
@ -408,23 +454,6 @@ dependencies = [
"inout",
]
[[package]]
name = "clap"
version = "3.2.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
dependencies = [
"atty",
"bitflags",
"clap_derive",
"clap_lex 0.2.4",
"indexmap",
"once_cell",
"strsim",
"termcolor",
"textwrap",
]
[[package]]
name = "clap"
version = "4.3.0"
@ -432,6 +461,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc"
dependencies = [
"clap_builder",
"clap_derive",
"once_cell",
]
[[package]]
@ -440,31 +471,23 @@ version = "4.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990"
dependencies = [
"anstream",
"anstyle",
"bitflags",
"clap_lex 0.5.0",
"clap_lex",
"strsim",
]
[[package]]
name = "clap_derive"
version = "3.2.25"
version = "4.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008"
checksum = "191d9573962933b4027f932c600cd252ce27a8ad5979418fe78e43c07996f27b"
dependencies = [
"heck",
"proc-macro-error",
"proc-macro2 1.0.56",
"proc-macro2",
"quote 1.0.27",
"syn 1.0.109",
]
[[package]]
name = "clap_lex"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
dependencies = [
"os_str_bytes",
"syn 2.0.15",
]
[[package]]
@ -484,6 +507,12 @@ dependencies = [
"termcolor",
]
[[package]]
name = "colorchoice"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
[[package]]
name = "colored"
version = "2.0.0"
@ -563,7 +592,7 @@ dependencies = [
"anes",
"cast",
"ciborium",
"clap 4.3.0",
"clap",
"criterion-plot",
"is-terminal",
"itertools",
@ -679,7 +708,7 @@ version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
dependencies = [
"proc-macro2 1.0.56",
"proc-macro2",
"quote 1.0.27",
"syn 1.0.109",
]
@ -1302,7 +1331,7 @@ dependencies = [
"ansi_term",
"assert_cmd",
"backtrace",
"clap 3.2.25",
"clap",
"color-backtrace",
"colored",
"console",
@ -1348,7 +1377,7 @@ dependencies = [
name = "leo-parser"
version = "1.7.1"
dependencies = [
"clap 3.2.25",
"clap",
"indexmap",
"lazy_static",
"leo-ast",
@ -1392,7 +1421,7 @@ name = "leo-test-framework"
version = "1.7.1"
dependencies = [
"backtrace",
"clap 3.2.25",
"clap",
"criterion",
"leo-compiler",
"leo-errors",
@ -1581,7 +1610,7 @@ version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
dependencies = [
"proc-macro2 1.0.56",
"proc-macro2",
"quote 1.0.27",
"syn 1.0.109",
]
@ -1673,7 +1702,7 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
"proc-macro2 1.0.56",
"proc-macro2",
"quote 1.0.27",
"syn 2.0.15",
]
@ -1702,12 +1731,6 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
[[package]]
name = "os_str_bytes"
version = "6.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267"
[[package]]
name = "overload"
version = "0.1.1"
@ -1867,39 +1890,6 @@ dependencies = [
"termtree",
]
[[package]]
name = "proc-macro-error"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
dependencies = [
"proc-macro-error-attr",
"proc-macro2 1.0.56",
"quote 1.0.27",
"syn 1.0.109",
"version_check",
]
[[package]]
name = "proc-macro-error-attr"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
dependencies = [
"proc-macro2 1.0.56",
"quote 1.0.27",
"version_check",
]
[[package]]
name = "proc-macro2"
version = "0.4.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
dependencies = [
"unicode-xid 0.1.0",
]
[[package]]
name = "proc-macro2"
version = "1.0.56"
@ -1924,22 +1914,13 @@ version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
[[package]]
name = "quote"
version = "0.6.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
dependencies = [
"proc-macro2 0.4.30",
]
[[package]]
name = "quote"
version = "1.0.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500"
dependencies = [
"proc-macro2 1.0.56",
"proc-macro2",
]
[[package]]
@ -2270,7 +2251,7 @@ version = "1.0.163"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
dependencies = [
"proc-macro2 1.0.56",
"proc-macro2",
"quote 1.0.27",
"syn 2.0.15",
]
@ -2371,12 +2352,13 @@ dependencies = [
[[package]]
name = "snarkvm"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f9c6245f2c216fbc13b10034c0ab7bdbab1a43c31e36968f99d9fb50142b1633"
checksum = "12479ff440885e7e4b76f1cc4c531da676de8369b7753369f343388f5c167df8"
dependencies = [
"anstyle",
"anyhow",
"clap 3.2.25",
"clap",
"colored",
"indexmap",
"num-format",
@ -2399,9 +2381,9 @@ dependencies = [
[[package]]
name = "snarkvm-algorithms"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b0caabf8900279cdfcd5bc2495b4442b4b5e1b4610c72392e984a49468bf7a8b"
checksum = "da8157d3a631f6d96aec76f09fb22b34b8a4a0bc26515ec8a2b446ad13ebf83b"
dependencies = [
"aleo-std",
"anyhow",
@ -2427,9 +2409,9 @@ dependencies = [
[[package]]
name = "snarkvm-circuit"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d0dfedda63b8ea1298f420bbc5db0f3eb9861d7f9616112b05f44f145ebfd76"
checksum = "5f2428341d452abc3c3abf7e82c7c5825cd2a52b3a4aca4fed312855769186b4"
dependencies = [
"snarkvm-circuit-account",
"snarkvm-circuit-algorithms",
@ -2442,9 +2424,9 @@ dependencies = [
[[package]]
name = "snarkvm-circuit-account"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "785621fb3585ab23a21b7c6dc373f1af9d507ec72038aaa21e04ddf616bcef1a"
checksum = "89253dfe23b080d8433462e53425eca604e4016c9e496482a7ccd9cf00c6e7b6"
dependencies = [
"snarkvm-circuit-algorithms",
"snarkvm-circuit-network",
@ -2454,9 +2436,9 @@ dependencies = [
[[package]]
name = "snarkvm-circuit-algorithms"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2cbfb102ad879a0222baade94fc7ff834739fcaaaee59f5ac38f5895f7602ebd"
checksum = "f9b79ec7787e12b9ec8a6b02b64cacb31adea246a14fd4ad5e02a49d4b835cd4"
dependencies = [
"snarkvm-circuit-types",
"snarkvm-console-algorithms",
@ -2465,9 +2447,9 @@ dependencies = [
[[package]]
name = "snarkvm-circuit-collections"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b3ef576e1589d09642c65d0f0c645e6e809f921c500790351e94ece7ac9e3cdd"
checksum = "f750c474c1318cfaf417027f4bc5c2662d4d104bbf958f14b212aeb775f417d2"
dependencies = [
"snarkvm-circuit-algorithms",
"snarkvm-circuit-types",
@ -2476,9 +2458,9 @@ dependencies = [
[[package]]
name = "snarkvm-circuit-environment"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c8fa0e38ca60aeee9c2d11502aa4071be54e1db127cabd03bdc1d2652b85456e"
checksum = "2352e29d3e94f204fb19a9e409925745f772f10570868a011cdc71b67f513cdb"
dependencies = [
"indexmap",
"itertools",
@ -2495,15 +2477,15 @@ dependencies = [
[[package]]
name = "snarkvm-circuit-environment-witness"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d20e53e6b5eba90c8017968271dfae11bfd2c89b49e6494b299b9857f45646e"
checksum = "c9e2e76ffb8b6d3cf9d7c723e0b208e74c339eeadc09cd3ab5c1cef30b8ef082"
[[package]]
name = "snarkvm-circuit-network"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "310a6f62a66403bd4697666d2eeec02c0eec9326d8e880a91f0896573a0cbba0"
checksum = "3babc555c59f281db53474a4029987e07ad364126db89ab3c9a1190281f4f059"
dependencies = [
"snarkvm-circuit-algorithms",
"snarkvm-circuit-collections",
@ -2513,9 +2495,9 @@ dependencies = [
[[package]]
name = "snarkvm-circuit-program"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b30077e91636f66ea835fbf4aac3292a3414702441cf4063baccf5c54ce9cf2d"
checksum = "51fd8550bd22f84daa8f807a52af2b3d0564d8e92d7f7f48e5df80f4da80cb15"
dependencies = [
"snarkvm-circuit-account",
"snarkvm-circuit-collections",
@ -2527,9 +2509,9 @@ dependencies = [
[[package]]
name = "snarkvm-circuit-types"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6bf74f3f9a38701d61b59c821f2993e17504a97a5b193e86a1a3102f6b5237e1"
checksum = "0ab6967cb8955cb980b91de993a4815306475d4f592ee8c87536008d76c3c4d3"
dependencies = [
"snarkvm-circuit-environment",
"snarkvm-circuit-types-address",
@ -2543,9 +2525,9 @@ dependencies = [
[[package]]
name = "snarkvm-circuit-types-address"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "454fe2bb620a336b35cdc68bce946bba4853af8a0f841d1cc8973cde56094b6c"
checksum = "a484c30ccefb81174a62f0016944f103c062b50fd846dc7c3ca6a60b73a0ca06"
dependencies = [
"snarkvm-circuit-environment",
"snarkvm-circuit-types-boolean",
@ -2557,9 +2539,9 @@ dependencies = [
[[package]]
name = "snarkvm-circuit-types-boolean"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d319a97b9d514dc6bef719f82c89606b7ba67b4bb3bbe64d71da34b603fef129"
checksum = "22b6247878c79d679d9d6bd5a08b6ea3fc17e7ff93af662d8475fe2d4af79ce2"
dependencies = [
"snarkvm-circuit-environment",
"snarkvm-console-types-boolean",
@ -2567,9 +2549,9 @@ dependencies = [
[[package]]
name = "snarkvm-circuit-types-field"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2e21d52b0c13e5b5b97e8c082c36eb797cc31dd976e79b645d5abbd022d56ead"
checksum = "8eb1e370caf16b8a56190a63500298f8190d31ec824201fd2a986809c1dc6130"
dependencies = [
"snarkvm-circuit-environment",
"snarkvm-circuit-types-boolean",
@ -2578,9 +2560,9 @@ dependencies = [
[[package]]
name = "snarkvm-circuit-types-group"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce538f7e4789c42de688008cefe589694cae0df01e85b0d99aa8f1b5266dfb5a"
checksum = "c995962552cc9050d17bcb0c7b28da566e09a6c494c115b06aa4b475d95056ab"
dependencies = [
"snarkvm-circuit-environment",
"snarkvm-circuit-types-boolean",
@ -2591,9 +2573,9 @@ dependencies = [
[[package]]
name = "snarkvm-circuit-types-integers"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc0b0bd5ca2472d5f562a2636707a1805ed2ae118603a5776b0f72561cc4be21"
checksum = "c06b6f165676fe6d88e40dd33a9170542e5be0d4f1c26ea1044e4077107e93aa"
dependencies = [
"snarkvm-circuit-environment",
"snarkvm-circuit-types-boolean",
@ -2603,9 +2585,9 @@ dependencies = [
[[package]]
name = "snarkvm-circuit-types-scalar"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ced1e9d87cbf71bd7a802c2f7ceadffc377b4898138eda882fd578eaf1edd2df"
checksum = "bd3015de3e305101c5282d30834782e1367ebce0963e136256cdac59393c8122"
dependencies = [
"snarkvm-circuit-environment",
"snarkvm-circuit-types-boolean",
@ -2615,9 +2597,9 @@ dependencies = [
[[package]]
name = "snarkvm-circuit-types-string"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "140b52c70ec450fede16be8338df01a857d7747adf00ac01541e0534b95e8cca"
checksum = "3a08d23e03080229a97a1f88028bd3c9bda7e2b6b3aefe23fe55fc5cd6c5661e"
dependencies = [
"snarkvm-circuit-environment",
"snarkvm-circuit-types-boolean",
@ -2628,9 +2610,9 @@ dependencies = [
[[package]]
name = "snarkvm-console"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb7fbf10e659ede78b570490c884c5e6f57d15cb763bef58307aaa604b57aa26"
checksum = "317ce70515568c6e81513dee1764cb68b9f058f7f6671c3269a1f35637e23302"
dependencies = [
"snarkvm-console-account",
"snarkvm-console-algorithms",
@ -2642,9 +2624,9 @@ dependencies = [
[[package]]
name = "snarkvm-console-account"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb0cbb8f301b14eb59cd7217446debdb3555dbe57f7a9d87a2686ad66e1db690"
checksum = "c38452341010e50b667a19e85fa2ff6915d704e70dfac5125b2171a2f9c355e4"
dependencies = [
"bs58",
"snarkvm-console-network",
@ -2653,9 +2635,9 @@ dependencies = [
[[package]]
name = "snarkvm-console-algorithms"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e095bf9cb52a66cc3a5c88c4b56d657429f5e4609e4e2560b9576f5397827bb2"
checksum = "6a9b94530cbc261a0f9eb04e441f62a30c04a1ddfc9cd0275e7ab6795e88a68b"
dependencies = [
"blake2s_simd",
"smallvec",
@ -2666,9 +2648,9 @@ dependencies = [
[[package]]
name = "snarkvm-console-collections"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5692788b14c116196cd5b3a46b783d7ebcf359f10da0e1dc7b1e9cdd9e5aed3b"
checksum = "25f7558718f249eb4cd44298b3ba18473f7ab380566c0050e467919b2a670894"
dependencies = [
"aleo-std",
"rayon",
@ -2678,9 +2660,9 @@ dependencies = [
[[package]]
name = "snarkvm-console-network"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb0f3811fb71ef28979163ac1ace793314322a3be1341ee3ae0430313ec82392"
checksum = "0e9bf087f0c09f2e86f88702b75da1b2b0d35ae3c120bcf0a9a54de551903378"
dependencies = [
"anyhow",
"indexmap",
@ -2702,9 +2684,9 @@ dependencies = [
[[package]]
name = "snarkvm-console-network-environment"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa0bbb8194878617bad81865a3251cbc944d16e5f71981781aeb8940789cc90d"
checksum = "d506fe6d51acdf2578d769ae1f9ae50d1064627c223660579b77dfd67c40e972"
dependencies = [
"anyhow",
"bech32",
@ -2720,9 +2702,9 @@ dependencies = [
[[package]]
name = "snarkvm-console-program"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12e413dab38923a82e4b5b495a894e405864c603789ca805b4dbd048332a6b23"
checksum = "0ea5c5c0f448a0426f8dde11a37e82936d150bf55dd889e52d766b8ce8d9b602"
dependencies = [
"enum_index",
"enum_index_derive",
@ -2740,9 +2722,9 @@ dependencies = [
[[package]]
name = "snarkvm-console-types"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9cc5054d2409b4b9675963056f042d5ede9973e749945a68ff986abd4da5770e"
checksum = "aa37915d66810b443ea038064576349fe6f85d9a99a767150102a904e9517c0e"
dependencies = [
"snarkvm-console-network-environment",
"snarkvm-console-types-address",
@ -2756,9 +2738,9 @@ dependencies = [
[[package]]
name = "snarkvm-console-types-address"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0bab955cd3043549a18157e2980d21a3753fa96d3aff1fab632f257c04e5aa9d"
checksum = "96c2c32d2cec09bc280335ad3786b891bfed3c31c7f52f62e27b1126aa20219b"
dependencies = [
"snarkvm-console-network-environment",
"snarkvm-console-types-boolean",
@ -2768,18 +2750,18 @@ dependencies = [
[[package]]
name = "snarkvm-console-types-boolean"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23e22a44f691881c3ae728fe73e40f797aa211acd3db5a6659aac9a8e93fb415"
checksum = "dbab1e9ec87cf48b49fe1d58398fb54a3c23eea1519b0f7c1af6c64d108f8950"
dependencies = [
"snarkvm-console-network-environment",
]
[[package]]
name = "snarkvm-console-types-field"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1cee4fd904c3f754c11da248801cc6880b30362298f8a533592daa2110081648"
checksum = "f71163a268281fed303f991b6c8ce9f9af867ee44c8e10b854a872c2f2730e69"
dependencies = [
"snarkvm-console-network-environment",
"snarkvm-console-types-boolean",
@ -2787,9 +2769,9 @@ dependencies = [
[[package]]
name = "snarkvm-console-types-group"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d1065ef59acd60a3aaf2e35d4d67876c1812e4f37b08ed9ada4b529c09c3877"
checksum = "6dc422e0ff5b73ff5800dd6db98efae23477c8228b5f85a9ffb97b4a22f8080b"
dependencies = [
"snarkvm-console-network-environment",
"snarkvm-console-types-boolean",
@ -2799,9 +2781,9 @@ dependencies = [
[[package]]
name = "snarkvm-console-types-integers"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "64eaa628492f4283bf8de76d6ba44a0019fdaca9d8a25cbfd1faa8c073435706"
checksum = "60c634dcc9f454ea8657402742cdfeca0db2530a2e9e49064e9d374c4c6d9c9d"
dependencies = [
"snarkvm-console-network-environment",
"snarkvm-console-types-boolean",
@ -2810,9 +2792,9 @@ dependencies = [
[[package]]
name = "snarkvm-console-types-scalar"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "79aed266e9de8363f525ce1806af03fea0a47e19f994bb2e96617be7e1565828"
checksum = "470a20dd37f8e3204d88f3bea7474425e8d4de101e46e27ea2497e13e76f58a5"
dependencies = [
"snarkvm-console-network-environment",
"snarkvm-console-types-boolean",
@ -2821,9 +2803,9 @@ dependencies = [
[[package]]
name = "snarkvm-console-types-string"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d79bd7ffdc42a9760b6d70f4691f489a0b856b1773a091e43459d4334a88833"
checksum = "c62fead6fb357b8f879db60807c16065b7611dc7e1b883b543b307f3037650a4"
dependencies = [
"snarkvm-console-network-environment",
"snarkvm-console-types-boolean",
@ -2833,9 +2815,9 @@ dependencies = [
[[package]]
name = "snarkvm-curves"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc5a93e34f78960687afb89b559d47f2a980601ee2a24af2cde08e5dba5a8289"
checksum = "74784bf246df76c9b53751fc1b26929d0a391c4561238eb1c969ddc52a802b04"
dependencies = [
"rand",
"rayon",
@ -2848,9 +2830,9 @@ dependencies = [
[[package]]
name = "snarkvm-fields"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6d6cbd4592732dc7b333942174c8224a5c5811af8a3e3d09fc942d1b7568153"
checksum = "5b2e12452317467b228cfe7deaba180f935bb5fe8459c6112a702c092984a3b4"
dependencies = [
"aleo-std",
"anyhow",
@ -2866,9 +2848,9 @@ dependencies = [
[[package]]
name = "snarkvm-ledger"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b68b4dbde197662f339d6dd10087bf78df1304aae8c2043e2652adc37ff855e3"
checksum = "2ef99e889ca31f8999e41cb17b3b91e4410fdb9207337dc60fa740928008768a"
dependencies = [
"aleo-std",
"anyhow",
@ -2884,9 +2866,9 @@ dependencies = [
[[package]]
name = "snarkvm-parameters"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77a8fa020dcbef000766a986aa555de4299419a4d5f06ff096f4795fb467e5df"
checksum = "2b02d990ab1fb0a4096ff1d73926abd91424134b741d22232a830cbd4b4fcca6"
dependencies = [
"aleo-std",
"anyhow",
@ -2898,7 +2880,6 @@ dependencies = [
"indexmap",
"itertools",
"lazy_static",
"parking_lot",
"paste",
"rand",
"serde_json",
@ -2910,9 +2891,9 @@ dependencies = [
[[package]]
name = "snarkvm-r1cs"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf46d29be03039189df0308014686022411b6f3fecc3b29d907d90de1b3e6c37"
checksum = "b0d95989a291c0f802e0cd09e0381bfd0c8e4e98c441d3c7a87521150248338d"
dependencies = [
"anyhow",
"cfg-if",
@ -2927,9 +2908,9 @@ dependencies = [
[[package]]
name = "snarkvm-synthesizer"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4321aaadf7e6574cea9a2a3a60262ef46e94f263f1ac25630a1d08f9c055bcd8"
checksum = "7ccb68615a925d72c20a2084e92d45659be377ae8637959fc368c9a40b0840e8"
dependencies = [
"aleo-std",
"anyhow",
@ -2943,6 +2924,7 @@ dependencies = [
"paste",
"rand",
"rayon",
"reqwest",
"serde",
"serde_json",
"snarkvm-algorithms",
@ -2950,16 +2932,52 @@ dependencies = [
"snarkvm-console",
"snarkvm-curves",
"snarkvm-fields",
"snarkvm-synthesizer-coinbase",
"snarkvm-synthesizer-snark",
"snarkvm-utilities",
"tracing",
"ureq",
]
[[package]]
name = "snarkvm-utilities"
version = "0.11.2"
name = "snarkvm-synthesizer-coinbase"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f651d01ef2ca1b20114b4098abf9759f2c75af5c86cf39be86f6316aec2e5485"
checksum = "a2f02f2bdd979fc799fde4876c23f759fa8fe1b0d76a56adbfdb31148b3e0350"
dependencies = [
"anyhow",
"bincode",
"blake2",
"itertools",
"rayon",
"serde_json",
"snarkvm-algorithms",
"snarkvm-console",
"snarkvm-curves",
"snarkvm-fields",
"snarkvm-synthesizer-snark",
"snarkvm-utilities",
]
[[package]]
name = "snarkvm-synthesizer-snark"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3ac7560feefc58470123e7d462391857bd0b2ad59aca15f7f8b1f6a036fec80"
dependencies = [
"bincode",
"once_cell",
"serde_json",
"snarkvm-algorithms",
"snarkvm-circuit",
"snarkvm-console",
]
[[package]]
name = "snarkvm-utilities"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "412888497b43be581a89acb3e6e25739977818d202b1396ad283fff05059b184"
dependencies = [
"aleo-std",
"anyhow",
@ -2977,11 +2995,11 @@ dependencies = [
[[package]]
name = "snarkvm-utilities-derives"
version = "0.11.2"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e194fcc1f895a6a7a41c4c5de3fd8eb251694f1110079f077d8aed4ac1cc0011"
checksum = "aaf8b06bcd5f697b3af538e6e6f8cf801189e135353059e1854f3821abdcbd53"
dependencies = [
"proc-macro2 1.0.56",
"proc-macro2",
"quote 1.0.27",
"syn 2.0.15",
]
@ -3022,18 +3040,7 @@ checksum = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
dependencies = [
"quote 0.3.15",
"synom",
"unicode-xid 0.0.4",
]
[[package]]
name = "syn"
version = "0.15.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
dependencies = [
"proc-macro2 0.4.30",
"quote 0.6.13",
"unicode-xid 0.1.0",
"unicode-xid",
]
[[package]]
@ -3042,7 +3049,7 @@ version = "1.0.109"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
dependencies = [
"proc-macro2 1.0.56",
"proc-macro2",
"quote 1.0.27",
"unicode-ident",
]
@ -3053,7 +3060,7 @@ version = "2.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
dependencies = [
"proc-macro2 1.0.56",
"proc-macro2",
"quote 1.0.27",
"unicode-ident",
]
@ -3064,7 +3071,7 @@ version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
dependencies = [
"unicode-xid 0.0.4",
"unicode-xid",
]
[[package]]
@ -3114,12 +3121,6 @@ dependencies = [
"rand",
]
[[package]]
name = "textwrap"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
[[package]]
name = "thiserror"
version = "1.0.40"
@ -3135,7 +3136,7 @@ version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
dependencies = [
"proc-macro2 1.0.56",
"proc-macro2",
"quote 1.0.27",
"syn 2.0.15",
]
@ -3298,7 +3299,7 @@ version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74"
dependencies = [
"proc-macro2 1.0.56",
"proc-macro2",
"quote 1.0.27",
"syn 2.0.15",
]
@ -3392,12 +3393,6 @@ version = "0.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
[[package]]
name = "unicode-xid"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
[[package]]
name = "untrusted"
version = "0.7.1"
@ -3439,6 +3434,12 @@ version = "2.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9"
[[package]]
name = "utf8parse"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
[[package]]
name = "valuable"
version = "0.1.0"
@ -3511,7 +3512,7 @@ dependencies = [
"bumpalo",
"log",
"once_cell",
"proc-macro2 1.0.56",
"proc-macro2",
"quote 1.0.27",
"syn 2.0.15",
"wasm-bindgen-shared",
@ -3545,7 +3546,7 @@ version = "0.2.85"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4783ce29f09b9d93134d41297aded3a712b7b979e9c6f28c32cb88c973a94869"
dependencies = [
"proc-macro2 1.0.56",
"proc-macro2",
"quote 1.0.27",
"syn 2.0.15",
"wasm-bindgen-backend",

View File

@ -31,10 +31,10 @@ members = [
]
[workspace.dependencies.snarkvm]
version = "=0.11.2"
version = "=0.11.4"
[workspace.dependencies.snarkvm-console]
version = "=0.11.2"
version = "=0.11.4"
[lib]
path = "leo/lib.rs"
@ -76,8 +76,8 @@ version = "1.7.1"
version = "0.3.67"
[dependencies.clap]
version = "3.2"
features = [ "derive", "env" ]
version = "4.3"
features = [ "derive", "env", "color", "unstable-styles"]
[dependencies.color-backtrace]
version = "0.5.1"

View File

@ -36,7 +36,7 @@ default-features = false
features = [ "account", "network" ]
[dependencies.clap]
version = "3.2"
version = "4.3"
features = [ "derive" ]
[dependencies.indexmap]

View File

@ -19,25 +19,23 @@
use leo_errors::{emitter::Handler, Result};
use leo_span::symbol::create_session_if_not_set_then;
use clap::StructOpt;
use clap::Parser;
use std::{
fs,
path::{Path, PathBuf},
};
#[derive(Debug, StructOpt)]
#[structopt(name = "input parser", about = "Parse an Input file and save its JSON representation")]
#[derive(Debug, Parser)]
#[clap(name = "input parser", about = "Parse an Input file and save its JSON representation")]
struct Opt {
/// Path to the input file.
#[structopt(parse(from_os_str))]
input_path: PathBuf,
/// Optional path to the output directory.
#[structopt(parse(from_os_str))]
out_dir_path: Option<PathBuf>,
/// Whether to print result to STDOUT.
#[structopt(short, long)]
#[clap(short, long)]
print_stdout: bool,
}

View File

@ -20,25 +20,23 @@ use leo_ast::Ast;
use leo_errors::emitter::Handler;
use leo_span::symbol::create_session_if_not_set_then;
use clap::StructOpt;
use clap::Parser;
use std::{
fs,
path::{Path, PathBuf},
};
#[derive(Debug, StructOpt)]
#[structopt(name = "leo parser", about = "Parse Leo AST and store it as a JSON")]
#[derive(Debug, Parser)]
#[clap(name = "leo parser", about = "Parse Leo AST and store it as a JSON")]
struct Opt {
/// Path to the Leo file.
#[structopt(parse(from_os_str))]
input_path: PathBuf,
/// Optional path to the output directory.
#[structopt(parse(from_os_str))]
out_dir_path: Option<PathBuf>,
/// Whether to print result to STDOUT.
#[structopt(short, long)]
#[clap(short, long)]
print_stdout: bool,
}

View File

@ -31,11 +31,13 @@ use leo_package::{
};
use leo_span::{symbol::with_session_globals, Symbol};
use snarkvm::cli::Build as AleoBuild;
use snarkvm::{
cli::Build as AleoBuild,
prelude::{ProgramID, Testnet3},
};
use clap::StructOpt;
use clap::Parser;
use indexmap::IndexMap;
use snarkvm::prelude::{ProgramID, Testnet3};
use std::{
io::Write,
path::{Path, PathBuf},
@ -45,29 +47,29 @@ use tracing::span::Span;
/// Compiler Options wrapper for Build command. Also used by other commands which
/// require Build command output as their input.
#[derive(StructOpt, Clone, Debug, Default)]
#[derive(Parser, Clone, Debug, Default)]
pub struct BuildOptions {
#[structopt(long, help = "Enables offline mode.")]
#[clap(long, help = "Enables offline mode.")]
pub offline: bool,
#[structopt(long, help = "Enable spans in AST snapshots.")]
#[clap(long, help = "Enable spans in AST snapshots.")]
pub enable_spans: bool,
#[structopt(long, help = "Enables dead code elimination in the compiler.")]
#[clap(long, help = "Enables dead code elimination in the compiler.")]
pub enable_dce: bool,
#[structopt(long, help = "Writes all AST snapshots for the different compiler phases.")]
#[clap(long, help = "Writes all AST snapshots for the different compiler phases.")]
pub enable_all_ast_snapshots: bool,
#[structopt(long, help = "Writes Input AST snapshot of the initial parse.")]
#[clap(long, help = "Writes Input AST snapshot of the initial parse.")]
pub enable_initial_input_ast_snapshot: bool,
#[structopt(long, help = "Writes AST snapshot of the initial parse.")]
#[clap(long, help = "Writes AST snapshot of the initial parse.")]
pub enable_initial_ast_snapshot: bool,
#[structopt(long, help = "Writes AST snapshot of the unrolled AST.")]
#[clap(long, help = "Writes AST snapshot of the unrolled AST.")]
pub enable_unrolled_ast_snapshot: bool,
#[structopt(long, help = "Writes AST snapshot of the SSA AST.")]
#[clap(long, help = "Writes AST snapshot of the SSA AST.")]
pub enable_ssa_ast_snapshot: bool,
#[structopt(long, help = "Writes AST snapshot of the flattened AST.")]
#[clap(long, help = "Writes AST snapshot of the flattened AST.")]
pub enable_flattened_ast_snapshot: bool,
#[structopt(long, help = "Writes AST snapshot of the inlined AST.")]
#[clap(long, help = "Writes AST snapshot of the inlined AST.")]
pub enable_inlined_ast_snapshot: bool,
#[structopt(long, help = "Writes AST snapshot of the dead code eliminated (DCE) AST.")]
#[clap(long, help = "Writes AST snapshot of the dead code eliminated (DCE) AST.")]
pub enable_dce_ast_snapshot: bool,
}
@ -101,9 +103,9 @@ impl From<BuildOptions> for CompilerOptions {
}
/// Compile and build program command.
#[derive(StructOpt, Debug)]
#[derive(Parser, Debug)]
pub struct Build {
#[structopt(flatten)]
#[clap(flatten)]
pub(crate) options: BuildOptions,
}

View File

@ -18,12 +18,12 @@ use crate::{commands::Command, context::Context};
use leo_errors::Result;
use leo_package::{build::BuildDirectory, outputs::OutputsDirectory};
use clap::StructOpt;
use clap::Parser;
use colored::Colorize;
use tracing::span::Span;
/// Clean outputs folder command
#[derive(StructOpt, Debug)]
#[derive(Parser, Debug)]
pub struct Clean {}
impl Command for Clean {

View File

@ -24,11 +24,11 @@ use leo_package::build::BuildDirectory;
use aleo::commands::Deploy as AleoDeploy;
use clap::StructOpt;
use clap::Parser;
use tracing::span::Span;
/// Deploys an Aleo program.
#[derive(StructOpt, Debug)]
#[derive(Parser, Debug)]
pub struct Deploy;
impl Command for Deploy {

View File

@ -39,7 +39,7 @@ use leo_errors::Result;
use tracing::span::Span;
pub(crate) type Network = snarkvm::prelude::Testnet3;
pub(crate) const ALEO_CLI_COMMAND: &str = "aleo";
pub(crate) const ALEO_CLI_COMMAND: &str = "snarkvm";
/// Base trait for the Leo CLI, see methods and their documentation for details.
pub trait Command {

View File

@ -20,17 +20,16 @@ use crate::{
};
use leo_errors::{CliError, PackageError, Result};
use leo_package::{build::BUILD_DIRECTORY_NAME, package::Package};
use snarkvm::file::AleoFile;
use snarkvm::cli::New as AleoNew;
use snarkvm::{cli::New as AleoNew, file::AleoFile};
use clap::StructOpt;
use clap::Parser;
use tracing::span::Span;
/// Create new Leo project
#[derive(StructOpt, Debug)]
#[derive(Parser, Debug)]
pub struct New {
#[structopt(name = "NAME", help = "Set package name")]
#[clap(name = "NAME", help = "Set package name")]
name: String,
}

View File

@ -14,23 +14,25 @@
// 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 crate::commands::ALEO_CLI_COMMAND;
use crate::{commands::Command, context::Context};
use crate::{
commands::{Command, ALEO_CLI_COMMAND},
context::Context,
};
use leo_errors::{CliError, PackageError, Result};
use leo_package::build::BuildDirectory;
use aleo::commands::Node as AleoNode;
use clap::StructOpt;
use clap::Parser;
use tracing::span::Span;
/// Commands to operate a local development node.
#[derive(StructOpt, Debug)]
#[derive(Parser, Debug)]
pub enum Node {
/// Starts a local development node
Start {
/// Skips deploying the local program at genesis.
#[structopt(long)]
#[clap(long)]
nodeploy: bool,
},
}

View File

@ -24,19 +24,19 @@ use leo_package::build::BuildDirectory;
use snarkvm::cli::Run as AleoRun;
use clap::StructOpt;
use clap::Parser;
use tracing::span::Span;
/// Build, Prove and Run Leo program with inputs
#[derive(StructOpt, Debug)]
#[derive(Parser, Debug)]
pub struct Run {
#[structopt(name = "NAME", help = "The name of the program to run.", default_value = "main")]
#[clap(name = "NAME", help = "The name of the program to run.", default_value = "main")]
name: String,
#[structopt(name = "INPUTS", help = "The inputs to the program. If none are provided, the input file is used.")]
#[clap(name = "INPUTS", help = "The inputs to the program. If none are provided, the input file is used.")]
inputs: Vec<String>,
#[structopt(flatten)]
#[clap(flatten)]
pub(crate) compiler_options: BuildOptions,
}

View File

@ -23,63 +23,63 @@ use crate::{commands::*, context::*};
use leo_errors::Result;
use leo_span::symbol::create_session_if_not_set_then;
use clap::StructOpt;
use clap::Parser;
use std::{path::PathBuf, process::exit};
/// CLI Arguments entry point - includes global parameters and subcommands
#[derive(StructOpt, Debug)]
#[structopt(name = "leo", author = "The Aleo Team <hello@aleo.org>", version)]
#[derive(Parser, Debug)]
#[clap(name = "leo", author = "The Aleo Team <hello@aleo.org>", version)]
pub struct CLI {
#[structopt(short, global = true, help = "Print additional information for debugging")]
#[clap(short, global = true, help = "Print additional information for debugging")]
debug: bool,
#[structopt(short, global = true, help = "Suppress CLI output")]
#[clap(short, global = true, help = "Suppress CLI output")]
quiet: bool,
#[structopt(subcommand)]
#[clap(subcommand)]
command: Commands,
#[structopt(help = "Custom Aleo PM backend URL", env = "APM_URL")]
#[clap(help = "Custom Aleo PM backend URL", env = "APM_URL")]
api: Option<String>,
#[structopt(long, global = true, help = "Optional path to Leo program root folder", parse(from_os_str))]
#[clap(long, global = true, help = "Optional path to Leo program root folder")]
path: Option<PathBuf>,
}
///Leo compiler and package manager
#[derive(StructOpt, Debug)]
#[derive(Parser, Debug)]
enum Commands {
// #[structopt(about = "Create a new Leo package in an existing directory")]
// #[clap(about = "Create a new Leo package in an existing directory")]
// Init {
// #[structopt(flatten)]
// #[clap(flatten)]
// command: Init,
// },
//
#[structopt(about = "Create a new Leo package in a new directory")]
#[clap(about = "Create a new Leo package in a new directory")]
New {
#[structopt(flatten)]
#[clap(flatten)]
command: New,
},
#[structopt(about = "Compile the current package as a program")]
#[clap(about = "Compile the current package as a program")]
Build {
#[structopt(flatten)]
#[clap(flatten)]
command: Build,
},
#[structopt(about = "Clean the output directory")]
#[clap(about = "Clean the output directory")]
Clean {
#[structopt(flatten)]
#[clap(flatten)]
command: Clean,
},
#[structopt(about = "Run a program with input variables")]
#[clap(about = "Run a program with input variables")]
Run {
#[structopt(flatten)]
#[clap(flatten)]
command: Run,
},
// #[structopt(subcommand)]
// #[clap(subcommand)]
// Node(Node),
// #[structopt(about = "Deploy a program")]
// #[clap(about = "Deploy a program")]
// Deploy {
// #[structopt(flatten)]
// #[clap(flatten)]
// command: Deploy,
// },
}

View File

@ -30,7 +30,7 @@ version = "1.7.1"
version = "0.3.67"
[dependencies.clap]
version = "3.2"
version = "4.3"
features = [ "derive" ]
[dependencies.serde]

View File

@ -25,12 +25,12 @@
// use serde_yaml::Value;
// use std::collections::{BTreeMap, HashSet};
// use std::{error::Error, fs, io, path::PathBuf};
// use structopt::{clap::AppSettings, StructOpt};
// use clap::{clap::AppSettings, Parser};
// #[derive(StructOpt)]
// #[structopt(name = "error-coverage", author = "The Aleo Team <hello@aleo.org>", setting = AppSettings::ColoredHelp)]
// #[derive(Parser)]
// #[clap(name = "error-coverage", author = "The Aleo Team <hello@aleo.org>", setting = AppSettings::ColoredHelp)]
// struct Opt {
// #[structopt(
// #[clap(
// short,
// long,
// help = "Path to the output file, defaults to stdout.",

View File

@ -24,23 +24,18 @@ use leo_test_framework::{
};
use std::{error::Error, fs, path::PathBuf};
use structopt::{clap::AppSettings, StructOpt};
use structopt::{clap::AppSettings, Parser};
#[derive(StructOpt)]
#[structopt(name = "ast-stages-generator", author = "The Aleo Team <hello@aleo.org>", setting = AppSettings::ColoredHelp)]
#[derive(Parser)]
#[clap(name = "ast-stages-generator", author = "The Aleo Team <hello@aleo.org>", setting = AppSettings::ColoredHelp)]
struct Opt {
#[structopt(
short,
long,
help = "Path to the output folder (auto generated)",
default_value = "tmp/tgc"
)]
#[clap(short, long, help = "Path to the output folder (auto generated)", default_value = "tmp/tgc")]
path: PathBuf,
#[structopt(short, long, help = "Run only for test that match pattern")]
#[clap(short, long, help = "Run only for test that match pattern")]
filter: Option<String>,
#[structopt(short, long, help = "Skip tests matching pattern")]
#[clap(short, long, help = "Skip tests matching pattern")]
skip: Option<Vec<String>>,
}
@ -67,11 +62,7 @@ fn run_with_args(opt: Opt) -> Result<(), Box<dyn Error>> {
continue;
}
let mut test_name = path
.split("tests/")
.last()
.unwrap()
.replace(std::path::MAIN_SEPARATOR, "_");
let mut test_name = path.split("tests/").last().unwrap().replace(std::path::MAIN_SEPARATOR, "_");
// Filter out the tests that do not match pattern, if pattern is set.
if let Some(filter) = &opt.filter {