From 831245a3c0d988685903edb9d305930f9456e34e Mon Sep 17 00:00:00 2001 From: mfachal <647731+mfachal@users.noreply.github.com> Date: Fri, 2 Jun 2023 11:55:31 -0300 Subject: [PATCH] Move CLI to crate and remove actix-web from deps (#564) * add cli crate * add cli crate * address comments * pin vm version of cli crate * remove clap dependency --- Cargo.lock | 478 +++++++++++++++++++++++---------------- Cargo.toml | 4 +- Makefile | 2 +- cli/Cargo.toml | 38 ++++ {src => cli/src}/main.rs | 0 5 files changed, 320 insertions(+), 202 deletions(-) create mode 100644 cli/Cargo.toml rename {src => cli/src}/main.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 7a65023f3..25027e737 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -512,9 +512,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.0" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" [[package]] name = "bigdecimal" @@ -609,9 +609,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" +checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" dependencies = [ "memchr", "once_cell", @@ -621,9 +621,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.2" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c6ed94e98ecff0c12dd1b04c15ec0d7d9458ca8fe806cea6f12954efe74c63b" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "byte-slice-cast" @@ -692,11 +692,11 @@ dependencies = [ [[package]] name = "cairo-lang-casm" -version = "1.1.0-alpha0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dba9ce4e6940ef254288d052c6e6f243ba98420e8be0966dd3d196a776ff7d2" +checksum = "609d537551d96f322307b63863025e939ea87463dc3bb216a9d12dfb6bb4ceea" dependencies = [ - "cairo-lang-utils 1.1.0-alpha0", + "cairo-lang-utils 1.1.0", "indoc", "num-bigint", "num-traits 0.2.15", @@ -731,23 +731,23 @@ dependencies = [ [[package]] name = "cairo-lang-compiler" -version = "1.1.0-alpha0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41751d2cb086235cabef8d0f86d081593c8273068a96de20eb2ce0337ba100f2" +checksum = "5aac8f0065a777d7b6591956dc238108b873f5c8155c6daa36808679b8407a08" dependencies = [ "anyhow", - "cairo-lang-defs 1.1.0-alpha0", - "cairo-lang-diagnostics 1.1.0-alpha0", - "cairo-lang-filesystem 1.1.0-alpha0", - "cairo-lang-lowering 1.1.0-alpha0", - "cairo-lang-parser 1.1.0-alpha0", - "cairo-lang-plugins 1.1.0-alpha0", - "cairo-lang-project 1.1.0-alpha0", - "cairo-lang-semantic 1.1.0-alpha0", - "cairo-lang-sierra 1.1.0-alpha0", - "cairo-lang-sierra-generator 1.1.0-alpha0", - "cairo-lang-syntax 1.1.0-alpha0", - "cairo-lang-utils 1.1.0-alpha0", + "cairo-lang-defs 1.1.0", + "cairo-lang-diagnostics 1.1.0", + "cairo-lang-filesystem 1.1.0", + "cairo-lang-lowering 1.1.0", + "cairo-lang-parser 1.1.0", + "cairo-lang-plugins 1.1.0", + "cairo-lang-project 1.1.0", + "cairo-lang-semantic 1.1.0", + "cairo-lang-sierra 1.1.0", + "cairo-lang-sierra-generator 1.1.0", + "cairo-lang-syntax 1.1.0", + "cairo-lang-utils 1.1.0", "clap", "log", "salsa", @@ -762,9 +762,9 @@ source = "git+https://github.com/starkware-libs/cairo?rev=4afacfd574de1121d61dea [[package]] name = "cairo-lang-debug" -version = "1.1.0-alpha0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf6d2838bf3677a0f6b3812ee404af1dc8b8192e99490c79da02be70788141af" +checksum = "65999f741e714e9b3605bae54fbf3816bcc085a68c365132dc944cf3b9603c82" [[package]] name = "cairo-lang-defs" @@ -785,16 +785,16 @@ dependencies = [ [[package]] name = "cairo-lang-defs" -version = "1.1.0-alpha0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d7cf2fa4b6a7511e759c8347af489c1901f1721f9c86c8fdeac8a03ce988fa" +checksum = "1905ad17cd5bdc511ec64767bd3b1e187bfd428c8a62928e8c5e87ee3b0bad70" dependencies = [ - "cairo-lang-debug 1.1.0-alpha0", - "cairo-lang-diagnostics 1.1.0-alpha0", - "cairo-lang-filesystem 1.1.0-alpha0", - "cairo-lang-parser 1.1.0-alpha0", - "cairo-lang-syntax 1.1.0-alpha0", - "cairo-lang-utils 1.1.0-alpha0", + "cairo-lang-debug 1.1.0", + "cairo-lang-diagnostics 1.1.0", + "cairo-lang-filesystem 1.1.0", + "cairo-lang-parser 1.1.0", + "cairo-lang-syntax 1.1.0", + "cairo-lang-utils 1.1.0", "indexmap", "itertools", "salsa", @@ -814,12 +814,12 @@ dependencies = [ [[package]] name = "cairo-lang-diagnostics" -version = "1.1.0-alpha0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "894d6a7d5f295f086188ee76651c514ab6a49bf1591234322124d8bc7d9b2fbd" +checksum = "12338363df11e798507658e7de4d0e9afe7c45db6c411fa7390bad8a12456d83" dependencies = [ - "cairo-lang-filesystem 1.1.0-alpha0", - "cairo-lang-utils 1.1.0-alpha0", + "cairo-lang-filesystem 1.1.0", + "cairo-lang-utils 1.1.0", "itertools", "salsa", ] @@ -837,11 +837,11 @@ dependencies = [ [[package]] name = "cairo-lang-eq-solver" -version = "1.1.0-alpha0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8842e8cf4dc7ac567cbdf6735258abd79b22c3d2ee982fc81622ce9caecd545" +checksum = "6de967ad85f599670b636ee955e1554597fba178b133b0dbe38f45d7c477456c" dependencies = [ - "cairo-lang-utils 1.1.0-alpha0", + "cairo-lang-utils 1.1.0", "good_lp", "indexmap", "itertools", @@ -862,12 +862,12 @@ dependencies = [ [[package]] name = "cairo-lang-filesystem" -version = "1.1.0-alpha0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7d29b7dc5137e13ca6c8cccbb29f8221519d030322bce6bd8b822451706cb11" +checksum = "8697f7ada715a7eb2ffbec70ffdeccaa50b37231931c430467d12de0d1d5bf98" dependencies = [ - "cairo-lang-debug 1.1.0-alpha0", - "cairo-lang-utils 1.1.0-alpha0", + "cairo-lang-debug 1.1.0", + "cairo-lang-utils 1.1.0", "path-clean", "salsa", "serde", @@ -900,19 +900,19 @@ dependencies = [ [[package]] name = "cairo-lang-lowering" -version = "1.1.0-alpha0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c081e6ebe47252b64ae0535d425852a3afc6dbc6543aeb44f621b555294afa0e" -dependencies = [ - "cairo-lang-debug 1.1.0-alpha0", - "cairo-lang-defs 1.1.0-alpha0", - "cairo-lang-diagnostics 1.1.0-alpha0", - "cairo-lang-filesystem 1.1.0-alpha0", - "cairo-lang-parser 1.1.0-alpha0", - "cairo-lang-proc-macros 1.1.0-alpha0", - "cairo-lang-semantic 1.1.0-alpha0", - "cairo-lang-syntax 1.1.0-alpha0", - "cairo-lang-utils 1.1.0-alpha0", +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4f386695a21ba59a3ed2bb9871e946936d67cd1f0493b6b7e336a47cbdc031d" +dependencies = [ + "cairo-lang-debug 1.1.0", + "cairo-lang-defs 1.1.0", + "cairo-lang-diagnostics 1.1.0", + "cairo-lang-filesystem 1.1.0", + "cairo-lang-parser 1.1.0", + "cairo-lang-proc-macros 1.1.0", + "cairo-lang-semantic 1.1.0", + "cairo-lang-syntax 1.1.0", + "cairo-lang-utils 1.1.0", "id-arena", "indexmap", "itertools", @@ -945,15 +945,15 @@ dependencies = [ [[package]] name = "cairo-lang-parser" -version = "1.1.0-alpha0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a30c90cbc71d242d4cd7feb00ead774c0f1882e47a0ce406f14d31a41c5bba" +checksum = "85d617fd0b9e85d66ba8cec10ddbfb6842495355f6086f84ae3bb5cacbe6cb35" dependencies = [ - "cairo-lang-diagnostics 1.1.0-alpha0", - "cairo-lang-filesystem 1.1.0-alpha0", - "cairo-lang-syntax 1.1.0-alpha0", - "cairo-lang-syntax-codegen 1.1.0-alpha0", - "cairo-lang-utils 1.1.0-alpha0", + "cairo-lang-diagnostics 1.1.0", + "cairo-lang-filesystem 1.1.0", + "cairo-lang-syntax 1.1.0", + "cairo-lang-syntax-codegen 1.1.0", + "cairo-lang-utils 1.1.0", "colored", "itertools", "log", @@ -984,17 +984,17 @@ dependencies = [ [[package]] name = "cairo-lang-plugins" -version = "1.1.0-alpha0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e36a6e568569a3a4b660483fe05ba883976a07f114aa040a174616b1dad249e" +checksum = "dd5daa572e1689c89d889040cda5a1ee769a859d1d30199ec098228eec890d8c" dependencies = [ - "cairo-lang-defs 1.1.0-alpha0", - "cairo-lang-diagnostics 1.1.0-alpha0", - "cairo-lang-filesystem 1.1.0-alpha0", - "cairo-lang-parser 1.1.0-alpha0", - "cairo-lang-semantic 1.1.0-alpha0", - "cairo-lang-syntax 1.1.0-alpha0", - "cairo-lang-utils 1.1.0-alpha0", + "cairo-lang-defs 1.1.0", + "cairo-lang-diagnostics 1.1.0", + "cairo-lang-filesystem 1.1.0", + "cairo-lang-parser 1.1.0", + "cairo-lang-semantic 1.1.0", + "cairo-lang-syntax 1.1.0", + "cairo-lang-utils 1.1.0", "indoc", "itertools", "salsa", @@ -1013,11 +1013,11 @@ dependencies = [ [[package]] name = "cairo-lang-proc-macros" -version = "1.1.0-alpha0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b4e305f43e2d38582e38aecd835288837085880b122ce828612b2707620f8b1" +checksum = "2de917c241cf3b9043490412ec4d93c471def7f86fcc72c4f2a06f4f9c2a37b8" dependencies = [ - "cairo-lang-debug 1.1.0-alpha0", + "cairo-lang-debug 1.1.0", "quote", "syn 1.0.109", ] @@ -1036,11 +1036,11 @@ dependencies = [ [[package]] name = "cairo-lang-project" -version = "1.1.0-alpha0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5e6527d83a6ab03b2c99ee670a26aefe8b001730565b9eb85a8014e349af02a" +checksum = "2db21302fa5f00c1951e2e9c14c57ac1f1fa925d1853efdfc43095ae77674daa" dependencies = [ - "cairo-lang-filesystem 1.1.0-alpha0", + "cairo-lang-filesystem 1.1.0", "serde", "smol_str", "thiserror", @@ -1071,18 +1071,18 @@ dependencies = [ [[package]] name = "cairo-lang-semantic" -version = "1.1.0-alpha0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b037222c1255fe46eb131f366bed0a938f3c1799185b4c0ae6fef511af828e47" -dependencies = [ - "cairo-lang-debug 1.1.0-alpha0", - "cairo-lang-defs 1.1.0-alpha0", - "cairo-lang-diagnostics 1.1.0-alpha0", - "cairo-lang-filesystem 1.1.0-alpha0", - "cairo-lang-parser 1.1.0-alpha0", - "cairo-lang-proc-macros 1.1.0-alpha0", - "cairo-lang-syntax 1.1.0-alpha0", - "cairo-lang-utils 1.1.0-alpha0", +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1a77a240188ac3ef5139a7f8f10fd879dcacf205c26ba7708999d8728f0d17d" +dependencies = [ + "cairo-lang-debug 1.1.0", + "cairo-lang-defs 1.1.0", + "cairo-lang-diagnostics 1.1.0", + "cairo-lang-filesystem 1.1.0", + "cairo-lang-parser 1.1.0", + "cairo-lang-proc-macros 1.1.0", + "cairo-lang-syntax 1.1.0", + "cairo-lang-utils 1.1.0", "id-arena", "itertools", "log", @@ -1116,11 +1116,11 @@ dependencies = [ [[package]] name = "cairo-lang-sierra" -version = "1.1.0-alpha0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48cd48496882a43476e455ef37c68e19a05111f88c9368dd2b457a5e35511e1" +checksum = "0b170053511656c68ce4a1947d3736d7e1008e8031559727017d70661ab9d779" dependencies = [ - "cairo-lang-utils 1.1.0-alpha0", + "cairo-lang-utils 1.1.0", "const-fnv1a-hash", "convert_case 0.6.0", "derivative", @@ -1151,13 +1151,13 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-ap-change" -version = "1.1.0-alpha0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdcf40a4041d9819746c5244d42b32ad556247132f6957c008fed86595508090" +checksum = "2ec23f4d6d05e79262873758b09cdcabb323ae4f4ae0dfd6749237a9aee435c7" dependencies = [ - "cairo-lang-eq-solver 1.1.0-alpha0", - "cairo-lang-sierra 1.1.0-alpha0", - "cairo-lang-utils 1.1.0-alpha0", + "cairo-lang-eq-solver 1.1.0", + "cairo-lang-sierra 1.1.0", + "cairo-lang-utils 1.1.0", "itertools", "thiserror", ] @@ -1176,13 +1176,13 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-gas" -version = "1.1.0-alpha0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c31b8a07db1958903a27f872b39ec58e40b6b5e5d820b88d373da27868bc8f" +checksum = "757224b576923627d60c74b14993c0d4a9d84118aee5fbcdbd1602a4ec532986" dependencies = [ - "cairo-lang-eq-solver 1.1.0-alpha0", - "cairo-lang-sierra 1.1.0-alpha0", - "cairo-lang-utils 1.1.0-alpha0", + "cairo-lang-eq-solver 1.1.0", + "cairo-lang-sierra 1.1.0", + "cairo-lang-utils 1.1.0", "itertools", "thiserror", ] @@ -1214,22 +1214,22 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-generator" -version = "1.1.0-alpha0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031232b0b6d4eb01d8b2dc641c96634ac8fade04e0da7129fa867c4c8932483e" -dependencies = [ - "cairo-lang-debug 1.1.0-alpha0", - "cairo-lang-defs 1.1.0-alpha0", - "cairo-lang-diagnostics 1.1.0-alpha0", - "cairo-lang-filesystem 1.1.0-alpha0", - "cairo-lang-lowering 1.1.0-alpha0", - "cairo-lang-parser 1.1.0-alpha0", - "cairo-lang-plugins 1.1.0-alpha0", - "cairo-lang-proc-macros 1.1.0-alpha0", - "cairo-lang-semantic 1.1.0-alpha0", - "cairo-lang-sierra 1.1.0-alpha0", - "cairo-lang-syntax 1.1.0-alpha0", - "cairo-lang-utils 1.1.0-alpha0", +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ab0598f66d5866853512ab8e64abc745892d0a1002940845adf132ea2b9b126" +dependencies = [ + "cairo-lang-debug 1.1.0", + "cairo-lang-defs 1.1.0", + "cairo-lang-diagnostics 1.1.0", + "cairo-lang-filesystem 1.1.0", + "cairo-lang-lowering 1.1.0", + "cairo-lang-parser 1.1.0", + "cairo-lang-plugins 1.1.0", + "cairo-lang-proc-macros 1.1.0", + "cairo-lang-semantic 1.1.0", + "cairo-lang-sierra 1.1.0", + "cairo-lang-syntax 1.1.0", + "cairo-lang-utils 1.1.0", "id-arena", "indexmap", "itertools", @@ -1262,18 +1262,18 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-to-casm" -version = "1.1.0-alpha0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f65d7860fe339a726df3dbeaeefb90da5891532f40499285b53b51e92911c1d1" +checksum = "abba31b7e9b78dd2d891b5f12954882ad8080fd9071fd346f8720050e00d0588" dependencies = [ "anyhow", "assert_matches", "cairo-felt 0.3.0-rc1", - "cairo-lang-casm 1.1.0-alpha0", - "cairo-lang-sierra 1.1.0-alpha0", - "cairo-lang-sierra-ap-change 1.1.0-alpha0", - "cairo-lang-sierra-gas 1.1.0-alpha0", - "cairo-lang-utils 1.1.0-alpha0", + "cairo-lang-casm 1.1.0", + "cairo-lang-sierra 1.1.0", + "cairo-lang-sierra-ap-change 1.1.0", + "cairo-lang-sierra-gas 1.1.0", + "cairo-lang-utils 1.1.0", "clap", "indoc", "itertools", @@ -1325,28 +1325,28 @@ dependencies = [ [[package]] name = "cairo-lang-starknet" -version = "1.1.0-alpha0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6078d5873de4a26ded0e257f88d7ef51d896bb59645cbf7388b8794cd982086" +checksum = "4b08babd653ecad37e051ad0812b1a7e035cb8dd9e1ae07a2470378ee73acd84" dependencies = [ "anyhow", "cairo-felt 0.3.0-rc1", - "cairo-lang-casm 1.1.0-alpha0", - "cairo-lang-compiler 1.1.0-alpha0", - "cairo-lang-defs 1.1.0-alpha0", - "cairo-lang-diagnostics 1.1.0-alpha0", - "cairo-lang-filesystem 1.1.0-alpha0", - "cairo-lang-lowering 1.1.0-alpha0", - "cairo-lang-parser 1.1.0-alpha0", - "cairo-lang-plugins 1.1.0-alpha0", - "cairo-lang-semantic 1.1.0-alpha0", - "cairo-lang-sierra 1.1.0-alpha0", - "cairo-lang-sierra-ap-change 1.1.0-alpha0", - "cairo-lang-sierra-gas 1.1.0-alpha0", - "cairo-lang-sierra-generator 1.1.0-alpha0", - "cairo-lang-sierra-to-casm 1.1.0-alpha0", - "cairo-lang-syntax 1.1.0-alpha0", - "cairo-lang-utils 1.1.0-alpha0", + "cairo-lang-casm 1.1.0", + "cairo-lang-compiler 1.1.0", + "cairo-lang-defs 1.1.0", + "cairo-lang-diagnostics 1.1.0", + "cairo-lang-filesystem 1.1.0", + "cairo-lang-lowering 1.1.0", + "cairo-lang-parser 1.1.0", + "cairo-lang-plugins 1.1.0", + "cairo-lang-semantic 1.1.0", + "cairo-lang-sierra 1.1.0", + "cairo-lang-sierra-ap-change 1.1.0", + "cairo-lang-sierra-gas 1.1.0", + "cairo-lang-sierra-generator 1.1.0", + "cairo-lang-sierra-to-casm 1.1.0", + "cairo-lang-syntax 1.1.0", + "cairo-lang-utils 1.1.0", "clap", "convert_case 0.6.0", "genco", @@ -1382,13 +1382,13 @@ dependencies = [ [[package]] name = "cairo-lang-syntax" -version = "1.1.0-alpha0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19509c3d3152111a1dfad2dff0ec3f591aaf5231d31d2928d1ce0f2b6dcbe5e5" +checksum = "8d41c12845b03cb80e99cd6738da254bb504b03acafd1cfa6e32c246ada73358" dependencies = [ - "cairo-lang-debug 1.1.0-alpha0", - "cairo-lang-filesystem 1.1.0-alpha0", - "cairo-lang-utils 1.1.0-alpha0", + "cairo-lang-debug 1.1.0", + "cairo-lang-filesystem 1.1.0", + "cairo-lang-utils 1.1.0", "num-bigint", "num-traits 0.2.15", "salsa", @@ -1410,11 +1410,11 @@ dependencies = [ [[package]] name = "cairo-lang-syntax-codegen" -version = "1.1.0-alpha0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "385e3393d716a833c37a9b0141cd2da587d0e73d3f06399dbfeac80576707894" +checksum = "40c7cab29886a9473ede4d07e779597e0892644b85884ce7e419b59b5b4ccd48" dependencies = [ - "cairo-lang-utils 1.1.0-alpha0", + "cairo-lang-utils 1.1.0", "genco", "log", "xshell", @@ -1438,9 +1438,9 @@ dependencies = [ [[package]] name = "cairo-lang-utils" -version = "1.1.0-alpha0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ea5faa3eb23c96b6d3f30a5e32d53dede950f9705d6c584041d3719176f6565" +checksum = "36a6e61704fd937cfffe8536cf13739ae772fc0afe118c4105ce2de5780505ae" dependencies = [ "env_logger", "indexmap", @@ -1629,7 +1629,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.18", ] [[package]] @@ -2024,8 +2024,8 @@ dependencies = [ "honggfuzz", "num-traits 0.2.15", "serde_json", - "starknet-rs", - "starknet_api", + "starknet-rs 0.1.0", + "starknet_api 0.1.0 (git+https://github.com/starkware-libs/starknet-api?rev=a891109ecc9c269e91b1afd2d44bc597728e1172)", "tempfile", ] @@ -2327,9 +2327,9 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ "hermit-abi 0.3.1", "libc", @@ -2515,12 +2515,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de" [[package]] name = "lru" @@ -2597,14 +2594,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", "log", "wasi", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -2744,9 +2741,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.1" +version = "1.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "9670a07f94779e00908f3e686eab508878ebb390ba6e604d3a284c00e8d0487b" [[package]] name = "oorandom" @@ -2980,9 +2977,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8" +checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b" dependencies = [ "unicode-ident", ] @@ -2998,9 +2995,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" +checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" dependencies = [ "proc-macro2", ] @@ -3078,13 +3075,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.1" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" +checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.1", + "regex-syntax 0.7.2", ] [[package]] @@ -3101,9 +3098,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" +checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" [[package]] name = "relative-path" @@ -3302,7 +3299,7 @@ checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.18", ] [[package]] @@ -3471,7 +3468,18 @@ dependencies = [ "cairo-vm", "serde", "serde_json", - "starknet_api", + "starknet_api 0.1.0 (git+https://github.com/starkware-libs/starknet-api?rev=a891109ecc9c269e91b1afd2d44bc597728e1172)", +] + +[[package]] +name = "starknet-contract-class" +version = "0.1.0" +source = "git+https://github.com/lambdaclass/starknet_in_rust?branch=main#c79f1719f04c197a7f834603eb29a0e57bcdbe6c" +dependencies = [ + "cairo-vm", + "serde", + "serde_json", + "starknet_api 0.1.0 (git+https://github.com/starkware-libs/starknet-api?rev=a891109ecc9c269e91b1afd2d44bc597728e1172)", ] [[package]] @@ -3554,7 +3562,7 @@ checksum = "e6dc88f1f470d9de1001ffbb90d2344c9dd1a615f5467daf0574e2975dfd9ebd" dependencies = [ "starknet-curve 0.3.0", "starknet-ff 0.3.2", - "syn 2.0.16", + "syn 2.0.18", ] [[package]] @@ -3615,6 +3623,63 @@ dependencies = [ [[package]] name = "starknet-rs" version = "0.1.0" +dependencies = [ + "assert_matches", + "awc", + "cairo-lang-casm 1.0.0-rc0", + "cairo-lang-starknet 1.0.0-rc0", + "cairo-vm", + "cargo-llvm-cov", + "coverage-helper", + "getset", + "hex", + "lazy_static", + "mimalloc", + "num-bigint", + "num-integer", + "num-traits 0.2.15", + "once_cell", + "serde", + "serde_json", + "sha3", + "starknet-contract-class 0.1.0", + "starknet-crypto 0.4.3", + "starknet_api 0.1.0 (git+https://github.com/starkware-libs/starknet-api?rev=a891109ecc9c269e91b1afd2d44bc597728e1172)", + "thiserror", +] + +[[package]] +name = "starknet-rs" +version = "0.1.0" +source = "git+https://github.com/lambdaclass/starknet_in_rust?branch=main#c79f1719f04c197a7f834603eb29a0e57bcdbe6c" +dependencies = [ + "actix-web", + "awc", + "cairo-lang-casm 1.0.0-rc0", + "cairo-lang-starknet 1.0.0-rc0", + "cairo-vm", + "cargo-llvm-cov", + "clap", + "getset", + "hex", + "lazy_static", + "mimalloc", + "num-bigint", + "num-integer", + "num-traits 0.2.15", + "once_cell", + "serde", + "serde_json", + "sha3", + "starknet-contract-class 0.1.0 (git+https://github.com/lambdaclass/starknet_in_rust?branch=main)", + "starknet-crypto 0.4.3", + "starknet_api 0.1.0 (git+https://github.com/starkware-libs/starknet-api?rev=a891109ecc9c269e91b1afd2d44bc597728e1172)", + "thiserror", +] + +[[package]] +name = "starknet-rs-cli" +version = "0.1.0" dependencies = [ "actix-web", "assert_matches", @@ -3632,13 +3697,30 @@ dependencies = [ "num-bigint", "num-integer", "num-traits 0.2.15", - "once_cell", "serde", "serde_json", "sha3", - "starknet-contract-class", + "starknet-contract-class 0.1.0", "starknet-crypto 0.4.3", - "starknet_api", + "starknet-rs 0.1.0 (git+https://github.com/lambdaclass/starknet_in_rust?branch=main)", + "starknet_api 0.1.0 (git+https://github.com/starkware-libs/starknet-api?rev=a891109)", + "thiserror", +] + +[[package]] +name = "starknet_api" +version = "0.1.0" +source = "git+https://github.com/starkware-libs/starknet-api?rev=a891109#a891109ecc9c269e91b1afd2d44bc597728e1172" +dependencies = [ + "cairo-lang-starknet 1.1.0", + "derive_more", + "hex", + "indexmap", + "once_cell", + "primitive-types", + "serde", + "serde_json", + "starknet-crypto 0.2.0", "thiserror", ] @@ -3647,7 +3729,7 @@ name = "starknet_api" version = "0.1.0" source = "git+https://github.com/starkware-libs/starknet-api?rev=a891109ecc9c269e91b1afd2d44bc597728e1172#a891109ecc9c269e91b1afd2d44bc597728e1172" dependencies = [ - "cairo-lang-starknet 1.1.0-alpha0", + "cairo-lang-starknet 1.1.0", "derive_more", "hex", "indexmap", @@ -3703,9 +3785,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.16" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" +checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" dependencies = [ "proc-macro2", "quote", @@ -3768,7 +3850,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.18", ] [[package]] @@ -3846,9 +3928,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.1" +version = "1.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" +checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" dependencies = [ "autocfg", "bytes", @@ -3907,9 +3989,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.9" +version = "0.19.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d964908cec0d030b812013af25a0e57fddfadb1e066ecc6681d86253129d4f" +checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" dependencies = [ "indexmap", "serde", @@ -3980,9 +4062,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" [[package]] name = "unicode-normalization" @@ -4065,7 +4147,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.18", "wasm-bindgen-shared", ] @@ -4087,7 +4169,7 @@ checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.18", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4311,7 +4393,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.18", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 00641259b..39734982f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,8 +24,6 @@ starknet_api = { git = "https://github.com/starkware-libs/starknet-api", rev="a8 ] } starknet-crypto = "0.4.3" thiserror = "1.0.32" -clap = { version = "4.1.8", features = ["derive"] } -actix-web = "4.3.1" awc = "3.1.1" mimalloc = { version = "0.1.29", default-features = false, optional = true } hex = "0.4.3" @@ -39,7 +37,7 @@ assert_matches = "1.5.0" coverage-helper = "0.1.0" [workspace] -members = ["crates/starknet-contract-class", "fuzzer"] +members = ["crates/starknet-contract-class", "fuzzer", "cli"] [[bench]] path = "bench/internals.rs" diff --git a/Makefile b/Makefile index 1ff6e22bc..b3c752a0d 100644 --- a/Makefile +++ b/Makefile @@ -109,7 +109,7 @@ clean: clippy: compile-cairo compile-starknet $(COMPILED_CASM_CONTRACTS) cargo clippy --all --all-targets -- -D warnings -test: compile-cairo compile-starknet $(COMPILED_CASM_CONTRACTS) +test: compile-cairo compile-starknet $(COMPILED_CASM_CONTRACTS) $(COMPILED_SIERRA_CONTRACTS) cargo test --all --all-targets coverage: compile-cairo compile-starknet compile-abi $(COMPILED_CASM_CONTRACTS) diff --git a/cli/Cargo.toml b/cli/Cargo.toml new file mode 100644 index 000000000..8d845c323 --- /dev/null +++ b/cli/Cargo.toml @@ -0,0 +1,38 @@ +[package] +name = "starknet-rs-cli" +version = "0.1.0" +edition = "2021" + +[features] +default = ["with_mimalloc"] +with_mimalloc = ["mimalloc"] + +[dependencies] +cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "4afacfd574de1121d61dea28f8c73e1516c7e07d"} +cairo-lang-casm = { git = "https://github.com/starkware-libs/cairo", rev = "4afacfd574de1121d61dea28f8c73e1516c7e07d"} +cairo-vm = { git = "https://github.com/lambdaclass/cairo-rs", features = ["cairo-1-hints"], rev = "5db2e656d46a97d89563a74f8fc3abd595e8befb" } +getset = "0.1.2" +lazy_static = "1.4.0" +num-bigint = { version = "0.4", features = ["serde"] } +num-integer = "0.1.45" +num-traits = "0.2.15" +serde = { version = "1.0.152", features = ["derive"] } +serde_json = { version = "1.0", features = ["arbitrary_precision"] } +sha3 = "0.10.1" +starknet_api = { git = "https://github.com/starkware-libs/starknet-api", rev="a891109", features = [ + "testing", +] } +starknet-crypto = "0.4.3" +thiserror = "1.0.32" +clap = { version = "4.1.8", features = ["derive"] } +actix-web = "4.3.1" +awc = "3.1.1" +mimalloc = { version = "0.1.29", default-features = false, optional = true } +hex = "0.4.3" +cargo-llvm-cov = "0.5.14" +starknet-rs = {git = "https://github.com/lambdaclass/starknet_in_rust", branch = "main"} +starknet-contract-class = { path = "../crates/starknet-contract-class" } + +[dev-dependencies] +assert_matches = "1.5.0" +coverage-helper = "0.1.0" diff --git a/src/main.rs b/cli/src/main.rs similarity index 100% rename from src/main.rs rename to cli/src/main.rs