From b1cf0e74e3373a18a7eb7eadcb94d176987662bb Mon Sep 17 00:00:00 2001 From: Tarrence van As Date: Sun, 25 Jun 2023 10:39:07 -0400 Subject: [PATCH] Add dojo diff --- Cargo.lock | 1530 ++++++++++++++--- Cargo.toml | 7 + .../src/transaction/account_transaction.rs | 1 + .../src/transaction/transactions.rs | 3 +- 4 files changed, 1321 insertions(+), 220 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b7ad9ca870..e7f2521999 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -51,6 +51,55 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" + +[[package]] +name = "anstyle-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +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" @@ -91,7 +140,7 @@ dependencies = [ "ark-serialize", "ark-std 0.4.0", "derivative", - "digest", + "digest 0.10.7", "itertools", "num-bigint", "num-traits 0.2.15", @@ -166,7 +215,7 @@ checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5" dependencies = [ "ark-serialize-derive", "ark-std 0.4.0", - "digest", + "digest 0.10.7", "num-bigint", ] @@ -239,6 +288,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + [[package]] name = "base64" version = "0.21.2" @@ -294,16 +349,38 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitvec" +version = "0.20.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848" +dependencies = [ + "funty 1.1.0", + "radium 0.6.2", + "tap", + "wyz 0.2.0", +] + [[package]] name = "bitvec" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" dependencies = [ - "funty", - "radium", + "funty 2.0.0", + "radium 0.7.0", "tap", - "wyz", + "wyz 0.5.1", +] + +[[package]] +name = "block-buffer" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" +dependencies = [ + "block-padding", + "generic-array", ] [[package]] @@ -315,19 +392,25 @@ dependencies = [ "generic-array", ] +[[package]] +name = "block-padding" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" + [[package]] name = "blockifier" version = "0.1.0" dependencies = [ "assert_matches", - "cairo-felt", - "cairo-lang-casm", + "cairo-felt 0.6.1", + "cairo-lang-casm 2.0.0-rc4", "cairo-lang-runner", - "cairo-lang-starknet", + "cairo-lang-starknet 2.0.0-rc4", "cairo-vm", "ctor 0.2.2", "derive_more", - "indexmap", + "indexmap 1.9.3", "itertools", "log", "num-bigint", @@ -337,7 +420,7 @@ dependencies = [ "pretty_assertions", "serde", "serde_json", - "sha3", + "sha3 0.10.8", "starknet-crypto", "starknet_api", "strum", @@ -372,9 +455,21 @@ checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "cairo-felt" -version = "0.6.0" +version = "0.3.0-rc1" +source = "git+https://github.com/dojoengine/cairo-rs.git?rev=46d77f3#46d77f3be79928d5c1daacb3d4a743eb7980a7d0" +dependencies = [ + "lazy_static", + "num-bigint", + "num-integer", + "num-traits 0.2.15", + "serde", +] + +[[package]] +name = "cairo-felt" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb1ceee24a02475932277c5354d5acf8dcc373944af8e7527de258b5effbea42" +checksum = "edaee21a254b549dd00ecb5db15399c8d03b663ddb5a659f7c62ea7e16a3ed85" dependencies = [ "lazy_static", "num-bigint", @@ -383,23 +478,63 @@ dependencies = [ "serde", ] +[[package]] +name = "cairo-lang-casm" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "609d537551d96f322307b63863025e939ea87463dc3bb216a9d12dfb6bb4ceea" +dependencies = [ + "cairo-lang-utils 1.1.0", + "indoc 2.0.1", + "num-bigint", + "num-traits 0.2.15", + "serde", + "thiserror", +] + [[package]] name = "cairo-lang-casm" version = "2.0.0-rc4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39238f3b4940f83ac16ab17300635fe326ba8f371245ac1041905a989c884c5e" dependencies = [ - "cairo-lang-utils", + "cairo-lang-utils 2.0.0-rc4", "indoc 2.0.1", "num-bigint", "num-traits 0.2.15", - "parity-scale-codec", - "parity-scale-codec-derive", + "parity-scale-codec 3.6.1", + "parity-scale-codec-derive 3.6.1", "schemars", "serde", "thiserror", ] +[[package]] +name = "cairo-lang-compiler" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aac8f0065a777d7b6591956dc238108b873f5c8155c6daa36808679b8407a08" +dependencies = [ + "anyhow", + "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", + "smol_str", + "thiserror", +] + [[package]] name = "cairo-lang-compiler" version = "2.0.0-rc4" @@ -407,31 +542,55 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0095a21007b8730dee137a03052425519598bf55ed3b3076992ce46f666aaa5" dependencies = [ "anyhow", - "cairo-lang-defs", - "cairo-lang-diagnostics", - "cairo-lang-filesystem", - "cairo-lang-lowering", - "cairo-lang-parser", - "cairo-lang-plugins", - "cairo-lang-project", - "cairo-lang-semantic", - "cairo-lang-sierra", - "cairo-lang-sierra-generator", - "cairo-lang-syntax", - "cairo-lang-utils", + "cairo-lang-defs 2.0.0-rc4", + "cairo-lang-diagnostics 2.0.0-rc4", + "cairo-lang-filesystem 2.0.0-rc4", + "cairo-lang-lowering 2.0.0-rc4", + "cairo-lang-parser 2.0.0-rc4", + "cairo-lang-plugins 2.0.0-rc4", + "cairo-lang-project 2.0.0-rc4", + "cairo-lang-semantic 2.0.0-rc4", + "cairo-lang-sierra 2.0.0-rc4", + "cairo-lang-sierra-generator 2.0.0-rc4", + "cairo-lang-syntax 2.0.0-rc4", + "cairo-lang-utils 2.0.0-rc4", "log", "salsa", "smol_str", "thiserror", ] +[[package]] +name = "cairo-lang-debug" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65999f741e714e9b3605bae54fbf3816bcc085a68c365132dc944cf3b9603c82" + [[package]] name = "cairo-lang-debug" version = "2.0.0-rc4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "121eb116acf814824130639ca3c9cf6b901f659f46a7af391e34a13961029008" dependencies = [ - "cairo-lang-utils", + "cairo-lang-utils 2.0.0-rc4", +] + +[[package]] +name = "cairo-lang-defs" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1905ad17cd5bdc511ec64767bd3b1e187bfd428c8a62928e8c5e87ee3b0bad70" +dependencies = [ + "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 1.9.3", + "itertools", + "salsa", + "smol_str", ] [[package]] @@ -440,73 +599,136 @@ version = "2.0.0-rc4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb85733064d6689ccd0cad7b7b27c34da3988c7e7a3560c5002ab4ec1a3b2b7f" dependencies = [ - "cairo-lang-debug", - "cairo-lang-diagnostics", - "cairo-lang-filesystem", - "cairo-lang-parser", - "cairo-lang-syntax", - "cairo-lang-utils", - "indexmap", + "cairo-lang-debug 2.0.0-rc4", + "cairo-lang-diagnostics 2.0.0-rc4", + "cairo-lang-filesystem 2.0.0-rc4", + "cairo-lang-parser 2.0.0-rc4", + "cairo-lang-syntax 2.0.0-rc4", + "cairo-lang-utils 2.0.0-rc4", + "indexmap 1.9.3", "itertools", "salsa", "smol_str", ] +[[package]] +name = "cairo-lang-diagnostics" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12338363df11e798507658e7de4d0e9afe7c45db6c411fa7390bad8a12456d83" +dependencies = [ + "cairo-lang-filesystem 1.1.0", + "cairo-lang-utils 1.1.0", + "itertools", + "salsa", +] + [[package]] name = "cairo-lang-diagnostics" version = "2.0.0-rc4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c275e9d4a84ea1509dcb84452ed3b45ad824bc7730cda18bc09512f891016d5e" dependencies = [ - "cairo-lang-filesystem", - "cairo-lang-utils", + "cairo-lang-filesystem 2.0.0-rc4", + "cairo-lang-utils 2.0.0-rc4", "itertools", "salsa", ] +[[package]] +name = "cairo-lang-eq-solver" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6de967ad85f599670b636ee955e1554597fba178b133b0dbe38f45d7c477456c" +dependencies = [ + "cairo-lang-utils 1.1.0", + "good_lp", + "indexmap 1.9.3", + "itertools", +] + [[package]] name = "cairo-lang-eq-solver" version = "2.0.0-rc4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ee30a86aa443667eb7041deb373e2f89b1d8ad1c85e4fbe98e536e6b799a17c" dependencies = [ - "cairo-lang-utils", + "cairo-lang-utils 2.0.0-rc4", "good_lp", - "indexmap", + "indexmap 1.9.3", "itertools", ] +[[package]] +name = "cairo-lang-filesystem" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8697f7ada715a7eb2ffbec70ffdeccaa50b37231931c430467d12de0d1d5bf98" +dependencies = [ + "cairo-lang-debug 1.1.0", + "cairo-lang-utils 1.1.0", + "path-clean", + "salsa", + "serde", + "smol_str", +] + [[package]] name = "cairo-lang-filesystem" version = "2.0.0-rc4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18be661230bfcdf1288a448dffee15597c84a822265179bb317d897fa2b5779b" dependencies = [ - "cairo-lang-debug", - "cairo-lang-utils", + "cairo-lang-debug 2.0.0-rc4", + "cairo-lang-utils 2.0.0-rc4", "path-clean", "salsa", "serde", "smol_str", ] +[[package]] +name = "cairo-lang-lowering" +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 1.9.3", + "itertools", + "log", + "num-bigint", + "num-traits 0.2.15", + "salsa", + "smol_str", +] + [[package]] name = "cairo-lang-lowering" version = "2.0.0-rc4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6de1c4f407d9b0f2f5e153eed6b3e5da7bb5d12c194871faf23c6898d1598a6" dependencies = [ - "cairo-lang-debug", - "cairo-lang-defs", - "cairo-lang-diagnostics", - "cairo-lang-filesystem", - "cairo-lang-parser", - "cairo-lang-proc-macros", - "cairo-lang-semantic", - "cairo-lang-syntax", - "cairo-lang-utils", + "cairo-lang-debug 2.0.0-rc4", + "cairo-lang-defs 2.0.0-rc4", + "cairo-lang-diagnostics 2.0.0-rc4", + "cairo-lang-filesystem 2.0.0-rc4", + "cairo-lang-parser 2.0.0-rc4", + "cairo-lang-proc-macros 2.0.0-rc4", + "cairo-lang-semantic 2.0.0-rc4", + "cairo-lang-syntax 2.0.0-rc4", + "cairo-lang-utils 2.0.0-rc4", "id-arena", - "indexmap", + "indexmap 1.9.3", "itertools", "log", "num-bigint", @@ -515,17 +737,38 @@ dependencies = [ "smol_str", ] +[[package]] +name = "cairo-lang-parser" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85d617fd0b9e85d66ba8cec10ddbfb6842495355f6086f84ae3bb5cacbe6cb35" +dependencies = [ + "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", + "num-bigint", + "num-traits 0.2.15", + "salsa", + "smol_str", + "unescaper", +] + [[package]] name = "cairo-lang-parser" version = "2.0.0-rc4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32bf3c176b4354abf97378f221fa9cb33c57ea5d1574360435ab3a255dfbb577" dependencies = [ - "cairo-lang-diagnostics", - "cairo-lang-filesystem", - "cairo-lang-syntax", - "cairo-lang-syntax-codegen", - "cairo-lang-utils", + "cairo-lang-diagnostics 2.0.0-rc4", + "cairo-lang-filesystem 2.0.0-rc4", + "cairo-lang-syntax 2.0.0-rc4", + "cairo-lang-syntax-codegen 2.0.0-rc4", + "cairo-lang-utils 2.0.0-rc4", "colored", "itertools", "log", @@ -536,44 +779,87 @@ dependencies = [ "unescaper", ] +[[package]] +name = "cairo-lang-plugins" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd5daa572e1689c89d889040cda5a1ee769a859d1d30199ec098228eec890d8c" +dependencies = [ + "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 2.0.1", + "itertools", + "salsa", + "smol_str", +] + [[package]] name = "cairo-lang-plugins" version = "2.0.0-rc4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89674ab6dcbff2f88c0379a3c7c16dbdb693e29ecc2259712537b76437322fd9" dependencies = [ - "cairo-lang-defs", - "cairo-lang-diagnostics", - "cairo-lang-filesystem", - "cairo-lang-parser", - "cairo-lang-semantic", - "cairo-lang-syntax", - "cairo-lang-utils", + "cairo-lang-defs 2.0.0-rc4", + "cairo-lang-diagnostics 2.0.0-rc4", + "cairo-lang-filesystem 2.0.0-rc4", + "cairo-lang-parser 2.0.0-rc4", + "cairo-lang-semantic 2.0.0-rc4", + "cairo-lang-syntax 2.0.0-rc4", + "cairo-lang-utils 2.0.0-rc4", "indoc 2.0.1", "itertools", "salsa", "smol_str", ] +[[package]] +name = "cairo-lang-proc-macros" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2de917c241cf3b9043490412ec4d93c471def7f86fcc72c4f2a06f4f9c2a37b8" +dependencies = [ + "cairo-lang-debug 1.1.0", + "quote", + "syn 1.0.109", +] + [[package]] name = "cairo-lang-proc-macros" version = "2.0.0-rc4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48e54210f58cd997c5615dfeeca020f09e736041e243829a002156c8026b77d4" dependencies = [ - "cairo-lang-debug", + "cairo-lang-debug 2.0.0-rc4", "quote", "syn 1.0.109", ] +[[package]] +name = "cairo-lang-project" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2db21302fa5f00c1951e2e9c14c57ac1f1fa925d1853efdfc43095ae77674daa" +dependencies = [ + "cairo-lang-filesystem 1.1.0", + "serde", + "smol_str", + "thiserror", + "toml", +] + [[package]] name = "cairo-lang-project" version = "2.0.0-rc4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8bbbeba97aea49a2374a5c7a3df5a8ef9166511ae1d824b2a1c0ed20fa8cecc3" dependencies = [ - "cairo-lang-filesystem", - "cairo-lang-utils", + "cairo-lang-filesystem 2.0.0-rc4", + "cairo-lang-utils 2.0.0-rc4", "serde", "smol_str", "thiserror", @@ -591,21 +877,21 @@ dependencies = [ "ark-secp256k1", "ark-secp256r1", "ark-std 0.3.0", - "cairo-felt", - "cairo-lang-casm", - "cairo-lang-compiler", - "cairo-lang-defs", - "cairo-lang-diagnostics", - "cairo-lang-filesystem", - "cairo-lang-lowering", - "cairo-lang-semantic", - "cairo-lang-sierra", - "cairo-lang-sierra-ap-change", - "cairo-lang-sierra-gas", - "cairo-lang-sierra-generator", - "cairo-lang-sierra-to-casm", - "cairo-lang-starknet", - "cairo-lang-utils", + "cairo-felt 0.6.1", + "cairo-lang-casm 2.0.0-rc4", + "cairo-lang-compiler 2.0.0-rc4", + "cairo-lang-defs 2.0.0-rc4", + "cairo-lang-diagnostics 2.0.0-rc4", + "cairo-lang-filesystem 2.0.0-rc4", + "cairo-lang-lowering 2.0.0-rc4", + "cairo-lang-semantic 2.0.0-rc4", + "cairo-lang-sierra 2.0.0-rc4", + "cairo-lang-sierra-ap-change 2.0.0-rc4", + "cairo-lang-sierra-gas 2.0.0-rc4", + "cairo-lang-sierra-generator 2.0.0-rc4", + "cairo-lang-sierra-to-casm 2.0.0-rc4", + "cairo-lang-starknet 2.0.0-rc4", + "cairo-lang-utils 2.0.0-rc4", "cairo-vm", "itertools", "keccak", @@ -616,20 +902,43 @@ dependencies = [ "thiserror", ] +[[package]] +name = "cairo-lang-semantic" +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", + "num-bigint", + "num-traits 0.2.15", + "salsa", + "smol_str", +] + [[package]] name = "cairo-lang-semantic" version = "2.0.0-rc4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86107c797dac2f7aa1afaa4a2231f2632b188c5af7039becf6b87e7325cd95c8" dependencies = [ - "cairo-lang-debug", - "cairo-lang-defs", - "cairo-lang-diagnostics", - "cairo-lang-filesystem", - "cairo-lang-parser", - "cairo-lang-proc-macros", - "cairo-lang-syntax", - "cairo-lang-utils", + "cairo-lang-debug 2.0.0-rc4", + "cairo-lang-defs 2.0.0-rc4", + "cairo-lang-diagnostics 2.0.0-rc4", + "cairo-lang-filesystem 2.0.0-rc4", + "cairo-lang-parser 2.0.0-rc4", + "cairo-lang-proc-macros 2.0.0-rc4", + "cairo-lang-syntax 2.0.0-rc4", + "cairo-lang-utils 2.0.0-rc4", "id-arena", "itertools", "log", @@ -639,13 +948,36 @@ dependencies = [ "smol_str", ] +[[package]] +name = "cairo-lang-sierra" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b170053511656c68ce4a1947d3736d7e1008e8031559727017d70661ab9d779" +dependencies = [ + "cairo-lang-utils 1.1.0", + "const-fnv1a-hash", + "convert_case 0.6.0", + "derivative", + "itertools", + "lalrpop", + "lalrpop-util", + "num-bigint", + "num-traits 0.2.15", + "regex", + "salsa", + "serde", + "sha3 0.10.8", + "smol_str", + "thiserror", +] + [[package]] name = "cairo-lang-sierra" version = "2.0.0-rc4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53eaf2e96c08befdee4fed0b8df28a65514b2abce4e44a7af209460a7bbbdf7f" dependencies = [ - "cairo-lang-utils", + "cairo-lang-utils 2.0.0-rc4", "const-fnv1a-hash", "convert_case 0.6.0", "derivative", @@ -657,20 +989,46 @@ dependencies = [ "regex", "salsa", "serde", - "sha3", + "sha3 0.10.8", "smol_str", "thiserror", ] +[[package]] +name = "cairo-lang-sierra-ap-change" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ec23f4d6d05e79262873758b09cdcabb323ae4f4ae0dfd6749237a9aee435c7" +dependencies = [ + "cairo-lang-eq-solver 1.1.0", + "cairo-lang-sierra 1.1.0", + "cairo-lang-utils 1.1.0", + "itertools", + "thiserror", +] + [[package]] name = "cairo-lang-sierra-ap-change" version = "2.0.0-rc4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8135f6e86e465c07a2a2e8d688c4b32fc77f5820c7022e7fff20e51e956e1265" dependencies = [ - "cairo-lang-eq-solver", - "cairo-lang-sierra", - "cairo-lang-utils", + "cairo-lang-eq-solver 2.0.0-rc4", + "cairo-lang-sierra 2.0.0-rc4", + "cairo-lang-utils 2.0.0-rc4", + "itertools", + "thiserror", +] + +[[package]] +name = "cairo-lang-sierra-gas" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "757224b576923627d60c74b14993c0d4a9d84118aee5fbcdbd1602a4ec532986" +dependencies = [ + "cairo-lang-eq-solver 1.1.0", + "cairo-lang-sierra 1.1.0", + "cairo-lang-utils 1.1.0", "itertools", "thiserror", ] @@ -681,39 +1039,88 @@ version = "2.0.0-rc4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b8374a985cfc2e8b3773a14c36aeccf92ea5d61d1631c4aa748860c29187036" dependencies = [ - "cairo-lang-eq-solver", - "cairo-lang-sierra", - "cairo-lang-utils", + "cairo-lang-eq-solver 2.0.0-rc4", + "cairo-lang-sierra 2.0.0-rc4", + "cairo-lang-utils 2.0.0-rc4", "itertools", "thiserror", ] +[[package]] +name = "cairo-lang-sierra-generator" +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 1.9.3", + "itertools", + "num-bigint", + "salsa", + "smol_str", +] + [[package]] name = "cairo-lang-sierra-generator" version = "2.0.0-rc4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72d68591feab91bf207043fec719494f9f26b6fe06dfef0731801a168d12f3a6" dependencies = [ - "cairo-lang-debug", - "cairo-lang-defs", - "cairo-lang-diagnostics", - "cairo-lang-filesystem", - "cairo-lang-lowering", - "cairo-lang-parser", - "cairo-lang-plugins", - "cairo-lang-proc-macros", - "cairo-lang-semantic", - "cairo-lang-sierra", - "cairo-lang-syntax", - "cairo-lang-utils", + "cairo-lang-debug 2.0.0-rc4", + "cairo-lang-defs 2.0.0-rc4", + "cairo-lang-diagnostics 2.0.0-rc4", + "cairo-lang-filesystem 2.0.0-rc4", + "cairo-lang-lowering 2.0.0-rc4", + "cairo-lang-parser 2.0.0-rc4", + "cairo-lang-plugins 2.0.0-rc4", + "cairo-lang-proc-macros 2.0.0-rc4", + "cairo-lang-semantic 2.0.0-rc4", + "cairo-lang-sierra 2.0.0-rc4", + "cairo-lang-syntax 2.0.0-rc4", + "cairo-lang-utils 2.0.0-rc4", "id-arena", - "indexmap", + "indexmap 1.9.3", "itertools", "num-bigint", "salsa", "smol_str", ] +[[package]] +name = "cairo-lang-sierra-to-casm" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abba31b7e9b78dd2d891b5f12954882ad8080fd9071fd346f8720050e00d0588" +dependencies = [ + "anyhow", + "assert_matches", + "cairo-felt 0.3.0-rc1", + "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 2.0.1", + "itertools", + "log", + "num-bigint", + "num-traits 0.2.15", + "thiserror", +] + [[package]] name = "cairo-lang-sierra-to-casm" version = "2.0.0-rc4" @@ -721,12 +1128,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ac9e9f295dffce94922e34dc93401ca69716c089795c336258bfabdafd32738" dependencies = [ "assert_matches", - "cairo-felt", - "cairo-lang-casm", - "cairo-lang-sierra", - "cairo-lang-sierra-ap-change", - "cairo-lang-sierra-gas", - "cairo-lang-utils", + "cairo-felt 0.6.1", + "cairo-lang-casm 2.0.0-rc4", + "cairo-lang-sierra 2.0.0-rc4", + "cairo-lang-sierra-ap-change 2.0.0-rc4", + "cairo-lang-sierra-gas 2.0.0-rc4", + "cairo-lang-utils 2.0.0-rc4", "indoc 2.0.1", "itertools", "log", @@ -735,6 +1142,47 @@ dependencies = [ "thiserror", ] +[[package]] +name = "cairo-lang-starknet" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b08babd653ecad37e051ad0812b1a7e035cb8dd9e1ae07a2470378ee73acd84" +dependencies = [ + "anyhow", + "cairo-felt 0.3.0-rc1", + "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", + "indoc 2.0.1", + "itertools", + "log", + "num-bigint", + "num-integer", + "num-traits 0.2.15", + "once_cell", + "serde", + "serde_json", + "sha3 0.10.8", + "smol_str", + "thiserror", +] + [[package]] name = "cairo-lang-starknet" version = "2.0.0-rc4" @@ -742,23 +1190,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e705aa2221ca7d1a1dca9babc690d798aa90d0219782c70f0f6e1af1cfc5ea70" dependencies = [ "anyhow", - "cairo-felt", - "cairo-lang-casm", - "cairo-lang-compiler", - "cairo-lang-defs", - "cairo-lang-diagnostics", - "cairo-lang-filesystem", - "cairo-lang-lowering", - "cairo-lang-parser", - "cairo-lang-plugins", - "cairo-lang-semantic", - "cairo-lang-sierra", - "cairo-lang-sierra-ap-change", - "cairo-lang-sierra-gas", - "cairo-lang-sierra-generator", - "cairo-lang-sierra-to-casm", - "cairo-lang-syntax", - "cairo-lang-utils", + "cairo-felt 0.6.1", + "cairo-lang-casm 2.0.0-rc4", + "cairo-lang-compiler 2.0.0-rc4", + "cairo-lang-defs 2.0.0-rc4", + "cairo-lang-diagnostics 2.0.0-rc4", + "cairo-lang-filesystem 2.0.0-rc4", + "cairo-lang-lowering 2.0.0-rc4", + "cairo-lang-parser 2.0.0-rc4", + "cairo-lang-plugins 2.0.0-rc4", + "cairo-lang-semantic 2.0.0-rc4", + "cairo-lang-sierra 2.0.0-rc4", + "cairo-lang-sierra-ap-change 2.0.0-rc4", + "cairo-lang-sierra-gas 2.0.0-rc4", + "cairo-lang-sierra-generator 2.0.0-rc4", + "cairo-lang-sierra-to-casm 2.0.0-rc4", + "cairo-lang-syntax 2.0.0-rc4", + "cairo-lang-utils 2.0.0-rc4", "convert_case 0.6.0", "genco", "indoc 2.0.1", @@ -770,20 +1218,37 @@ dependencies = [ "once_cell", "serde", "serde_json", - "sha3", + "sha3 0.10.8", "smol_str", "thiserror", ] +[[package]] +name = "cairo-lang-syntax" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d41c12845b03cb80e99cd6738da254bb504b03acafd1cfa6e32c246ada73358" +dependencies = [ + "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", + "smol_str", + "thiserror", + "unescaper", +] + [[package]] name = "cairo-lang-syntax" version = "2.0.0-rc4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4896171929848792151d3c54073ec7542a52a6d63d6b2c3e46f8dc426370723" dependencies = [ - "cairo-lang-debug", - "cairo-lang-filesystem", - "cairo-lang-utils", + "cairo-lang-debug 2.0.0-rc4", + "cairo-lang-filesystem 2.0.0-rc4", + "cairo-lang-utils 2.0.0-rc4", "num-bigint", "num-traits 0.2.15", "salsa", @@ -792,6 +1257,18 @@ dependencies = [ "unescaper", ] +[[package]] +name = "cairo-lang-syntax-codegen" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40c7cab29886a9473ede4d07e779597e0892644b85884ce7e419b59b5b4ccd48" +dependencies = [ + "cairo-lang-utils 1.1.0", + "genco", + "log", + "xshell", +] + [[package]] name = "cairo-lang-syntax-codegen" version = "2.0.0-rc4" @@ -802,41 +1279,58 @@ dependencies = [ "xshell", ] +[[package]] +name = "cairo-lang-utils" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36a6e61704fd937cfffe8536cf13739ae772fc0afe118c4105ce2de5780505ae" +dependencies = [ + "env_logger", + "indexmap 1.9.3", + "itertools", + "log", + "num-bigint", + "num-integer", + "num-traits 0.2.15", + "serde", + "time", +] + [[package]] name = "cairo-lang-utils" version = "2.0.0-rc4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c37b39cd79b11421f6682dfd1bbc9982e186e0925f081dbed33bd79160bfcd8f" dependencies = [ - "indexmap", + "indexmap 1.9.3", "itertools", "num-bigint", "num-integer", "num-traits 0.2.15", - "parity-scale-codec", + "parity-scale-codec 3.6.1", "schemars", "serde", ] [[package]] name = "cairo-take_until_unbalanced" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "847ac5da858bfccf41ca81ce51e2f39f43c7b8ce5616c5405e6ac99006f9d01e" +checksum = "32c366b2a52b63db19fcc20a761ea37aa9f5fdce1723016c458e3990ef4fdf2c" dependencies = [ "nom", ] [[package]] name = "cairo-vm" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e859bef70476e5094fc5b5c5bdc8c842e9d59480e808856fe54370991610f6" +checksum = "8be504f2684bab154d3bd45257c847db6fb450333305f162600dc497687d87d2" dependencies = [ "anyhow", "bincode", - "bitvec", - "cairo-felt", + "bitvec 1.0.1", + "cairo-felt 0.6.1", "cairo-take_until_unbalanced", "generic-array", "hashbrown 0.13.2", @@ -855,7 +1349,7 @@ dependencies = [ "serde_bytes", "serde_json", "sha2", - "sha3", + "sha3 0.10.8", "starknet-crypto", "thiserror", "thiserror-no-std", @@ -893,6 +1387,54 @@ dependencies = [ "libloading", ] +[[package]] +name = "clap" +version = "4.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9394150f5b4273a1763355bd1c2ec54cc5a2593f790587bcd6b2c947cfa9211" +dependencies = [ + "clap_builder", + "clap_derive", + "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a78fbdd3cc2914ddf37ba444114bc7765bbdcb55ec9cbe6fa054f0137400717" +dependencies = [ + "anstream", + "anstyle", + "bitflags", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 2.0.22", +] + +[[package]] +name = "clap_lex" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" + +[[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" @@ -1012,7 +1554,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1586fa608b1dab41f667475b4a41faec5ba680aee428bfa5de4ea520fdc6e901" dependencies = [ "quote", - "syn 2.0.18", + "syn 2.0.22", ] [[package]] @@ -1045,13 +1587,22 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" +[[package]] +name = "digest" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +dependencies = [ + "generic-array", +] + [[package]] name = "digest" version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer", + "block-buffer 0.10.4", "crypto-common", "subtle", ] @@ -1107,6 +1658,25 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "env_logger" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" +dependencies = [ + "atty", + "humantime", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "equivalent" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" + [[package]] name = "errno" version = "0.3.1" @@ -1128,6 +1698,48 @@ dependencies = [ "libc", ] +[[package]] +name = "ethabi" +version = "16.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4c98847055d934070b90e806e12d3936b787d0a115068981c1d8dfd5dfef5a5" +dependencies = [ + "ethereum-types", + "hex", + "serde", + "serde_json", + "sha3 0.9.1", + "thiserror", + "uint", +] + +[[package]] +name = "ethbloom" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfb684ac8fa8f6c5759f788862bb22ec6fe3cb392f6bfd08e3c64b603661e3f8" +dependencies = [ + "crunchy", + "fixed-hash 0.7.0", + "impl-rlp", + "impl-serde 0.3.2", + "tiny-keccak", +] + +[[package]] +name = "ethereum-types" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05136f7057fe789f06e6d41d07b34e6f70d8c86e5693b60f97aaa6553553bdaf" +dependencies = [ + "ethbloom", + "fixed-hash 0.7.0", + "impl-rlp", + "impl-serde 0.3.2", + "primitive-types 0.10.1", + "uint", +] + [[package]] name = "fastrand" version = "1.9.0" @@ -1137,6 +1749,18 @@ dependencies = [ "instant", ] +[[package]] +name = "fixed-hash" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c" +dependencies = [ + "byteorder", + "rand", + "rustc-hex", + "static_assertions", +] + [[package]] name = "fixed-hash" version = "0.8.0" @@ -1195,12 +1819,33 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "funty" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" + [[package]] name = "funty" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" +[[package]] +name = "futures" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + [[package]] name = "futures-channel" version = "0.3.28" @@ -1208,6 +1853,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", + "futures-sink", ] [[package]] @@ -1216,6 +1862,17 @@ version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +[[package]] +name = "futures-executor" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + [[package]] name = "futures-io" version = "0.3.28" @@ -1230,7 +1887,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.22", ] [[package]] @@ -1245,15 +1902,23 @@ version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +[[package]] +name = "futures-timer" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" + [[package]] name = "futures-util" version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ + "futures-channel", "futures-core", "futures-io", "futures-macro", + "futures-sink", "futures-task", "memchr", "pin-project-lite", @@ -1334,7 +1999,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", "tokio-util", @@ -1360,6 +2025,37 @@ dependencies = [ "serde", ] +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + +[[package]] +name = "headers" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" +dependencies = [ + "base64 0.13.1", + "bitflags", + "bytes", + "headers-core", + "http", + "httpdate", + "mime", + "sha1", +] + +[[package]] +name = "headers-core" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" +dependencies = [ + "http", +] + [[package]] name = "heck" version = "0.3.3" @@ -1411,7 +2107,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest", + "digest 0.10.7", ] [[package]] @@ -1448,6 +2144,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + [[package]] name = "hyper" version = "0.14.26" @@ -1472,6 +2174,19 @@ dependencies = [ "want", ] +[[package]] +name = "hyper-rustls" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" +dependencies = [ + "http", + "hyper", + "rustls", + "tokio", + "tokio-rustls", +] + [[package]] name = "hyper-tls" version = "0.5.0" @@ -1491,6 +2206,17 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" +[[package]] +name = "idna" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "idna" version = "0.4.0" @@ -1501,13 +2227,40 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "impl-codec" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "161ebdfec3c8e3b52bf61c4f3550a1eea4f9579d10dc1b936f3171ebdcd6c443" +dependencies = [ + "parity-scale-codec 2.3.1", +] + [[package]] name = "impl-codec" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.6.1", +] + +[[package]] +name = "impl-rlp" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808" +dependencies = [ + "rlp", +] + +[[package]] +name = "impl-serde" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4551f042f3438e64dbd6226b20527fc84a6e1fe65688b58746a2f53623f25f5c" +dependencies = [ + "serde", ] [[package]] @@ -1541,6 +2294,16 @@ dependencies = [ "serde", ] +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", +] + [[package]] name = "indoc" version = "1.0.9" @@ -1621,6 +2384,21 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "jsonrpc-core" +version = "18.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb" +dependencies = [ + "futures", + "futures-executor", + "futures-util", + "log", + "serde", + "serde_derive", + "serde_json", +] + [[package]] name = "keccak" version = "0.1.4" @@ -1701,7 +2479,7 @@ dependencies = [ "bitflags", "byteorder", "derive_more", - "indexmap", + "indexmap 1.9.3", "libc", "lifetimed-bytes", "mdbx-sys", @@ -1759,6 +2537,12 @@ dependencies = [ "hashbrown 0.12.3", ] +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + [[package]] name = "matrixmultiply" version = "0.2.4" @@ -1868,9 +2652,9 @@ name = "native_blockifier" version = "0.1.0" dependencies = [ "blockifier", - "cairo-lang-starknet", + "cairo-lang-starknet 2.0.0-rc4", "cairo-vm", - "indexmap", + "indexmap 1.9.3", "log", "num-bigint", "ouroboros", @@ -1961,7 +2745,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f4e3bc495f6e95bc15a6c0c55ac00421504a5a43d09e3cc455d1fea7015581d" dependencies = [ - "bitvec", + "bitvec 1.0.1", "either", "lru", "num-bigint", @@ -1999,6 +2783,15 @@ dependencies = [ "libc", ] +[[package]] +name = "num_threads" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +dependencies = [ + "libc", +] + [[package]] name = "once_cell" version = "1.18.0" @@ -2011,6 +2804,12 @@ version = "11.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" +[[package]] +name = "opaque-debug" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" + [[package]] name = "openssl" version = "0.10.55" @@ -2034,7 +2833,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.22", ] [[package]] @@ -2093,17 +2892,17 @@ version = "0.1.0-alpha" source = "git+https://github.com/starkware-libs/papyrus?tag=v0.1.2-alpha#c78a938be2c8d4588326cfdc2b2031ae2558f5fb" dependencies = [ "byteorder", - "cairo-lang-casm", - "cairo-lang-starknet", - "cairo-lang-utils", + "cairo-lang-casm 2.0.0-rc4", + "cairo-lang-starknet 2.0.0-rc4", + "cairo-lang-utils 2.0.0-rc4", "flate2", "futures-util", - "indexmap", + "indexmap 1.9.3", "integer-encoding", "libmdbx", "num-bigint", - "parity-scale-codec", - "primitive-types", + "parity-scale-codec 3.6.1", + "primitive-types 0.12.1", "rand", "rand_chacha", "reqwest", @@ -2118,6 +2917,20 @@ dependencies = [ "url", ] +[[package]] +name = "parity-scale-codec" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909" +dependencies = [ + "arrayvec", + "bitvec 0.20.4", + "byte-slice-cast", + "impl-trait-for-tuples", + "parity-scale-codec-derive 2.3.1", + "serde", +] + [[package]] name = "parity-scale-codec" version = "3.6.1" @@ -2125,13 +2938,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2287753623c76f953acd29d15d8100bcab84d29db78fb6f352adb3c53e83b967" dependencies = [ "arrayvec", - "bitvec", + "bitvec 1.0.1", "byte-slice-cast", "impl-trait-for-tuples", - "parity-scale-codec-derive", + "parity-scale-codec-derive 3.6.1", "serde", ] +[[package]] +name = "parity-scale-codec-derive" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "parity-scale-codec-derive" version = "3.6.1" @@ -2223,40 +3048,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" dependencies = [ "fixedbitset", - "indexmap", + "indexmap 1.9.3", ] [[package]] name = "phf" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ "phf_macros", - "phf_shared 0.11.1", + "phf_shared 0.11.2", ] [[package]] name = "phf_generator" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ - "phf_shared 0.11.1", + "phf_shared 0.11.2", "rand", ] [[package]] name = "phf_macros" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" dependencies = [ "phf_generator", - "phf_shared 0.11.1", + "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.22", ] [[package]] @@ -2270,13 +3095,33 @@ dependencies = [ [[package]] name = "phf_shared" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ "siphasher", ] +[[package]] +name = "pin-project" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.22", +] + [[package]] name = "pin-project-lite" version = "0.2.9" @@ -2319,15 +3164,28 @@ dependencies = [ "yansi", ] +[[package]] +name = "primitive-types" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373" +dependencies = [ + "fixed-hash 0.7.0", + "impl-codec 0.5.1", + "impl-rlp", + "impl-serde 0.3.2", + "uint", +] + [[package]] name = "primitive-types" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f3486ccba82358b11a77516035647c34ba167dfa53312630de83b12bd4f3d66" dependencies = [ - "fixed-hash", - "impl-codec", - "impl-serde", + "fixed-hash 0.8.0", + "impl-codec 0.6.0", + "impl-serde 0.4.0", "uint", ] @@ -2367,9 +3225,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.60" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406" +checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" dependencies = [ "unicode-ident", ] @@ -2456,6 +3314,12 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "radium" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" + [[package]] name = "radium" version = "0.7.0" @@ -2562,7 +3426,7 @@ version = "0.11.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" dependencies = [ - "base64", + "base64 0.21.2", "bytes", "encoding_rs", "futures-core", @@ -2571,6 +3435,7 @@ dependencies = [ "http", "http-body", "hyper", + "hyper-rustls", "hyper-tls", "ipnet", "js-sys", @@ -2580,16 +3445,20 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", + "rustls", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", "tokio", "tokio-native-tls", + "tokio-rustls", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", + "webpki-roots", "winreg", ] @@ -2603,6 +3472,31 @@ dependencies = [ "subtle", ] +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin", + "untrusted", + "web-sys", + "winapi", +] + +[[package]] +name = "rlp" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb919243f34364b6bd2fc10ef797edbfa75f33c252e7998527479c6d6b47e1ec" +dependencies = [ + "bytes", + "rustc-hex", +] + [[package]] name = "rustc-hash" version = "1.1.0" @@ -2638,6 +3532,37 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "rustls" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e32ca28af694bc1bbf399c33a516dbdf1c90090b8ab23c2bc24f834aa2247f5f" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +dependencies = [ + "base64 0.21.2", +] + +[[package]] +name = "rustls-webpki" +version = "0.100.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "rustversion" version = "1.0.12" @@ -2657,7 +3582,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b84d9f96071f3f3be0dc818eae3327625d8ebc95b58da37d6850724f31d3403" dependencies = [ "crossbeam-utils", - "indexmap", + "indexmap 1.9.3", "lock_api", "log", "oorandom", @@ -2695,7 +3620,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f" dependencies = [ "dyn-clone", - "indexmap", + "indexmap 1.9.3", "schemars_derive", "serde", "serde_json", @@ -2719,6 +3644,16 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +[[package]] +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "security-framework" version = "2.9.1" @@ -2774,7 +3709,7 @@ checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.22", ] [[package]] @@ -2790,9 +3725,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.97" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a" +checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3" dependencies = [ "itoa", "ryu", @@ -2811,6 +3746,17 @@ dependencies = [ "serde", ] +[[package]] +name = "sha1" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest 0.10.7", +] + [[package]] name = "sha2" version = "0.10.7" @@ -2819,7 +3765,19 @@ checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" dependencies = [ "cfg-if", "cpufeatures", - "digest", + "digest 0.10.7", +] + +[[package]] +name = "sha3" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809" +dependencies = [ + "block-buffer 0.9.0", + "digest 0.9.0", + "keccak", + "opaque-debug", ] [[package]] @@ -2828,7 +3786,7 @@ version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" dependencies = [ - "digest", + "digest 0.10.7", "keccak", ] @@ -2932,7 +3890,7 @@ checksum = "e6dc88f1f470d9de1001ffbb90d2344c9dd1a615f5467daf0574e2975dfd9ebd" dependencies = [ "starknet-curve", "starknet-ff", - "syn 2.0.18", + "syn 2.0.22", ] [[package]] @@ -2946,9 +3904,9 @@ dependencies = [ [[package]] name = "starknet-ff" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcdf692e13247ec111718e219caaa44ea1a687e9c36bf6083e1cd1b98374a2ad" +checksum = "db2cb1d9c0a50380cddab99cb202c6bfb3332728a2769bd0ca2ee80b0b390dd4" dependencies = [ "ark-ff", "crypto-bigint", @@ -2959,18 +3917,18 @@ dependencies = [ [[package]] name = "starknet_api" version = "0.1.0" -source = "git+https://github.com/starkware-libs/starknet-api?rev=a4c78ff#a4c78ff11e8b661eb8824e6d5adb2cbd36e77a2a" +source = "git+https://github.com/dojoengine/starknet-api?branch=dev#141d126321331376a76d4f0a61e3facb7b0e4499" dependencies = [ - "cairo-lang-starknet", + "cairo-lang-starknet 1.1.0", "derive_more", "hex", - "indexmap", + "indexmap 1.9.3", "once_cell", - "primitive-types", "serde", "serde_json", "starknet-crypto", "thiserror", + "web3", ] [[package]] @@ -2992,6 +3950,12 @@ dependencies = [ "precomputed-hash", ] +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + [[package]] name = "strum" version = "0.24.1" @@ -3030,9 +3994,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.18" +version = "2.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +checksum = "2efbeae7acf4eabd6bcdcbd11c92f45231ddda7539edc7806bd1a04a03b24616" dependencies = [ "proc-macro2", "quote", @@ -3076,6 +4040,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "termcolor" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +dependencies = [ + "winapi-util", +] + [[package]] name = "test-case" version = "2.2.2" @@ -3103,12 +4076,12 @@ name = "test_utils" version = "0.1.0-alpha" source = "git+https://github.com/starkware-libs/papyrus?tag=v0.1.2-alpha#c78a938be2c8d4588326cfdc2b2031ae2558f5fb" dependencies = [ - "cairo-lang-casm", - "cairo-lang-starknet", - "cairo-lang-utils", - "indexmap", + "cairo-lang-casm 2.0.0-rc4", + "cairo-lang-starknet 2.0.0-rc4", + "cairo-lang-utils 2.0.0-rc4", + "indexmap 1.9.3", "num-bigint", - "primitive-types", + "primitive-types 0.12.1", "rand", "rand_chacha", "reqwest", @@ -3135,7 +4108,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.22", ] [[package]] @@ -3158,6 +4131,35 @@ dependencies = [ "thiserror-impl-no-std", ] +[[package]] +name = "time" +version = "0.3.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" +dependencies = [ + "itoa", + "libc", + "num_threads", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" + +[[package]] +name = "time-macros" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +dependencies = [ + "time-core", +] + [[package]] name = "tiny-keccak" version = "2.0.2" @@ -3209,7 +4211,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.22", ] [[package]] @@ -3222,6 +4224,16 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls", + "tokio", +] + [[package]] name = "tokio-util" version = "0.7.8" @@ -3247,17 +4259,17 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" [[package]] name = "toml_edit" -version = "0.19.10" +version = "0.19.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" +checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7" dependencies = [ - "indexmap", + "indexmap 2.0.0", "toml_datetime", "winnow", ] @@ -3283,13 +4295,13 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.25" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8803eee176538f94ae9a14b55b2804eb7e1441f8210b1c31290b3bccdccff73b" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.22", ] [[package]] @@ -3373,6 +4385,12 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + [[package]] name = "url" version = "2.4.0" @@ -3380,10 +4398,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" dependencies = [ "form_urlencoded", - "idna", + "idna 0.4.0", "percent-encoding", ] +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + [[package]] name = "vcpkg" version = "0.2.15" @@ -3432,7 +4456,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.22", "wasm-bindgen-shared", ] @@ -3466,7 +4490,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.22", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3487,6 +4511,54 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "web3" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44f258e254752d210b84fe117b31f1e3cc9cbf04c0d747eb7f8cf7cf5e370f6d" +dependencies = [ + "arrayvec", + "base64 0.13.1", + "bytes", + "derive_more", + "ethabi", + "ethereum-types", + "futures", + "futures-timer", + "headers", + "hex", + "idna 0.2.3", + "jsonrpc-core", + "log", + "parking_lot 0.12.1", + "pin-project", + "reqwest", + "rlp", + "serde", + "serde_json", + "tiny-keccak", + "url", +] + +[[package]] +name = "webpki" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "webpki-roots" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" +dependencies = [ + "webpki", +] + [[package]] name = "winapi" version = "0.3.9" @@ -3503,6 +4575,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -3650,6 +4731,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "wyz" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" + [[package]] name = "wyz" version = "0.5.1" @@ -3697,5 +4784,10 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.22", ] + +[[patch.unused]] +name = "cairo-vm" +version = "0.3.0-rc1" +source = "git+https://github.com/dojoengine/cairo-rs.git?rev=46d77f3#46d77f3be79928d5c1daacb3d4a743eb7980a7d0" diff --git a/Cargo.toml b/Cargo.toml index 5e123189cd..e2fd405829 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,3 +37,10 @@ strum = "0.24.1" strum_macros = "0.24.3" test-case = "2.2.2" thiserror = "1.0.37" + +[patch."https://github.com/starkware-libs/starknet-api"] +starknet_api = { git = "https://github.com/dojoengine/starknet-api", branch = "dev" } + +[patch.crates-io] +cairo-vm = { git = "https://github.com/dojoengine/cairo-rs.git", rev = "46d77f3"} +cairo-felt = { git = "https://github.com/dojoengine/cairo-rs.git", rev = "46d77f3"} \ No newline at end of file diff --git a/crates/blockifier/src/transaction/account_transaction.rs b/crates/blockifier/src/transaction/account_transaction.rs index fa360b8657..b731b061aa 100644 --- a/crates/blockifier/src/transaction/account_transaction.rs +++ b/crates/blockifier/src/transaction/account_transaction.rs @@ -153,6 +153,7 @@ impl AccountTransaction { vec![ TransactionVersion(StarkFelt::from(0_u8)), TransactionVersion(StarkFelt::from(1_u8)), + TransactionVersion(StarkFelt::from(2_u8)), ] } _ => vec![TransactionVersion(StarkFelt::from(1_u8))], diff --git a/crates/blockifier/src/transaction/transactions.rs b/crates/blockifier/src/transaction/transactions.rs index 774aa48bb5..1e4cc03d33 100644 --- a/crates/blockifier/src/transaction/transactions.rs +++ b/crates/blockifier/src/transaction/transactions.rs @@ -1,7 +1,7 @@ use std::sync::Arc; use cairo_felt::Felt252; -use starknet_api::core::ContractAddress; +use starknet_api::core::{CompiledClassHash, ContractAddress}; use starknet_api::deprecated_contract_class::EntryPointType; use starknet_api::transaction::{Calldata, DeployAccountTransaction, Fee, InvokeTransaction}; @@ -147,6 +147,7 @@ impl Executable for DeclareTransaction { starknet_api::transaction::DeclareTransaction::V0(_) | starknet_api::transaction::DeclareTransaction::V1(_) => { state.set_contract_class(&class_hash, self.contract_class.clone())?; + state.set_compiled_class_hash(class_hash, CompiledClassHash(class_hash.0))?; Ok(None) } starknet_api::transaction::DeclareTransaction::V2(tx) => {