From d6c3080c7c41552323c86387fcb51c68de076ec4 Mon Sep 17 00:00:00 2001 From: Tarrence van As Date: Mon, 6 May 2024 11:40:32 -0400 Subject: [PATCH] Use ubuntu 22 for release builds --- .github/workflows/release.yml | 4 +- Cargo.lock | 859 ++++++++++++++++++++++++++++++---- Cargo.toml | 8 +- 3 files changed, 772 insertions(+), 99 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3e68dae320..9e733fc12f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,11 +42,11 @@ jobs: # The target is used by Cargo # The arch is either 386, arm64 or amd64 # The svm target platform to use for the binary https://github.com/roynalnaruto/svm-rs/blob/84cbe0ac705becabdc13168bae28a45ad2299749/svm-builds/build.rs#L4-L24 - - os: ubuntu-20.04-4-cores + - os: ubuntu-latest-4-cores platform: linux target: x86_64-unknown-linux-gnu arch: amd64 - - os: ubuntu-20.04-8-cores + - os: ubuntu-latest-8-cores platform: linux target: aarch64-unknown-linux-gnu arch: arm64 diff --git a/Cargo.lock b/Cargo.lock index 9a8b84197b..b8b0ff571c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -127,7 +127,7 @@ dependencies = [ "alloy-serde", "c-kzg", "serde", - "sha2", + "sha2 0.10.8", ] [[package]] @@ -1288,6 +1288,12 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +[[package]] +name = "bech32" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445" + [[package]] name = "beef" version = "0.5.2" @@ -1318,7 +1324,7 @@ dependencies = [ "serde_json", "sozo", "sozo-ops", - "starknet", + "starknet 0.9.0", "tokio", ] @@ -1517,6 +1523,19 @@ dependencies = [ "tracing", ] +[[package]] +name = "blockstore" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5bff157a9c999bf0a39ca45e0b62076aa27135012cfbf9cc54ad1cf971876f0" +dependencies = [ + "async-trait", + "cid", + "dashmap", + "multihash 0.19.1", + "thiserror", +] + [[package]] name = "blst" version = "0.3.11" @@ -1696,7 +1715,7 @@ dependencies = [ "convert_case 0.6.0", "serde", "serde_json", - "starknet", + "starknet 0.9.0", "thiserror", "tracing", "tracing-subscriber", @@ -1708,7 +1727,7 @@ name = "cainome-cairo-serde" version = "0.1.0" source = "git+https://github.com/cartridge-gg/cainome?tag=v0.2.5#54df2a4114c0c61359c2f1a70bc7e5fb57d9eaf2" dependencies = [ - "starknet", + "starknet 0.9.0", "thiserror", ] @@ -1720,7 +1739,7 @@ dependencies = [ "convert_case 0.6.0", "quote", "serde_json", - "starknet", + "starknet 0.9.0", "syn 2.0.55", "thiserror", ] @@ -1736,7 +1755,7 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "starknet", + "starknet 0.9.0", "syn 2.0.55", "thiserror", ] @@ -1753,7 +1772,7 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "starknet", + "starknet 0.9.0", "syn 2.0.55", "thiserror", ] @@ -2366,6 +2385,24 @@ dependencies = [ "time", ] +[[package]] +name = "cairo-proof-parser" +version = "0.3.0" +source = "git+https://github.com/cartridge-gg/cairo-proof-parser?tag=v0.3.0#1cd7af307609d0f6a602a59d124d5044e56cc7b4" +dependencies = [ + "anyhow", + "clap", + "itertools 0.12.1", + "num-bigint", + "regex", + "serde", + "serde_json", + "starknet 0.10.0", + "starknet-crypto 0.6.2", + "tokio", + "url", +] + [[package]] name = "cairo-vm" version = "0.9.2" @@ -2389,7 +2426,7 @@ dependencies = [ "rand", "serde", "serde_json", - "sha2", + "sha2 0.10.8", "sha3", "starknet-crypto 0.6.2", "starknet-curve 0.4.2", @@ -2465,6 +2502,109 @@ dependencies = [ "subtle", ] +[[package]] +name = "celestia-proto" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d93904482a787d8caecb3a348788704fa044df6fb2402f28da5b91a2a5eabb" +dependencies = [ + "anyhow", + "celestia-tendermint-proto", + "prost 0.12.3", + "prost-build 0.12.3", + "prost-types 0.12.3", + "serde", +] + +[[package]] +name = "celestia-rpc" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f4c948ab3cd9562d256b752d874d573c836ec8b200bba87d1154bbf662d3a00" +dependencies = [ + "async-trait", + "celestia-types", + "http 0.2.11", + "jsonrpsee 0.20.3", + "serde", + "thiserror", + "tracing", +] + +[[package]] +name = "celestia-tendermint" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95f93b5cbbd62b6cfde961889bf05d5fe19e70d8500c4465694306ed2695ac23" +dependencies = [ + "bytes", + "celestia-tendermint-proto", + "digest 0.10.7", + "ed25519", + "ed25519-consensus", + "flex-error", + "futures", + "num-traits 0.2.18", + "once_cell", + "prost 0.12.3", + "prost-types 0.12.3", + "serde", + "serde_bytes", + "serde_json", + "serde_repr", + "sha2 0.10.8", + "signature", + "subtle", + "subtle-encoding", + "time", + "zeroize", +] + +[[package]] +name = "celestia-tendermint-proto" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8f7d49c1ececa30a4587c5fe8a4035b786b78a3253ed0f9636de591b3dc2b37" +dependencies = [ + "bytes", + "flex-error", + "num-derive", + "num-traits 0.2.18", + "prost 0.12.3", + "prost-types 0.12.3", + "serde", + "serde_bytes", + "subtle-encoding", + "time", +] + +[[package]] +name = "celestia-types" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc3c4c6698257125b315c04236a28cf5156a866211d336ba6ac70cc5f88e24eb" +dependencies = [ + "base64 0.21.7", + "bech32", + "blockstore", + "bytes", + "celestia-proto", + "celestia-tendermint", + "celestia-tendermint-proto", + "cid", + "const_format", + "enum_dispatch", + "libp2p-identity", + "multiaddr 0.18.1", + "multihash 0.19.1", + "nmt-rs", + "ruint", + "serde", + "serde_repr", + "sha2 0.10.8", + "thiserror", +] + [[package]] name = "cesu8" version = "1.1.0" @@ -2552,6 +2692,18 @@ dependencies = [ "half", ] +[[package]] +name = "cid" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3147d8272e8fa0ccd29ce51194dd98f79ddfb8191ba9e3409884e751798acf3a" +dependencies = [ + "core2", + "multibase", + "multihash 0.19.1", + "unsigned-varint 0.8.0", +] + [[package]] name = "cipher" version = "0.4.4" @@ -3059,6 +3211,19 @@ dependencies = [ "syn 2.0.55", ] +[[package]] +name = "curve25519-dalek-ng" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c359b7249347e46fb28804470d071c921156ad62b3eef5d34e2ba867533dec8" +dependencies = [ + "byteorder", + "digest 0.9.0", + "rand_core", + "subtle-ng", + "zeroize", +] + [[package]] name = "darling" version = "0.14.4" @@ -3416,7 +3581,7 @@ dependencies = [ "dojo-world", "serde", "serde_json", - "starknet", + "starknet 0.9.0", "thiserror", ] @@ -3471,7 +3636,7 @@ dependencies = [ "serde_json", "serde_with", "smol_str", - "starknet", + "starknet 0.9.0", "test-log", "thiserror", "toml 0.8.12", @@ -3533,7 +3698,7 @@ dependencies = [ "camino", "dojo-lang", "dojo-world", - "jsonrpsee", + "jsonrpsee 0.16.3", "katana-core", "katana-executor", "katana-primitives", @@ -3545,7 +3710,7 @@ dependencies = [ "serde_json", "serde_with", "smol_str", - "starknet", + "starknet 0.9.0", "thiserror", "tokio", "toml 0.7.8", @@ -3562,7 +3727,7 @@ dependencies = [ "itertools 0.12.1", "serde", "serde_json", - "starknet", + "starknet 0.9.0", "strum 0.25.0", "strum_macros 0.25.3", "thiserror", @@ -3596,7 +3761,7 @@ dependencies = [ "serde_with", "similar-asserts", "smol_str", - "starknet", + "starknet 0.9.0", "starknet-crypto 0.6.2", "tempfile", "thiserror", @@ -3667,6 +3832,19 @@ dependencies = [ "signature", ] +[[package]] +name = "ed25519-consensus" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c8465edc8ee7436ffea81d21a019b16676ee3db267aa8d5a8d729581ecf998b" +dependencies = [ + "curve25519-dalek-ng", + "hex", + "rand_core", + "sha2 0.9.9", + "zeroize", +] + [[package]] name = "ed25519-dalek" version = "2.1.1" @@ -3677,7 +3855,7 @@ dependencies = [ "ed25519", "rand_core", "serde", - "sha2", + "sha2 0.10.8", "subtle", "zeroize", ] @@ -3766,6 +3944,18 @@ dependencies = [ "syn 2.0.55", ] +[[package]] +name = "enum_dispatch" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd" +dependencies = [ + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.55", +] + [[package]] name = "env_logger" version = "0.10.2" @@ -3831,7 +4021,7 @@ dependencies = [ "scrypt", "serde", "serde_json", - "sha2", + "sha2 0.10.8", "sha3", "thiserror", "uuid 0.8.2", @@ -3912,6 +4102,16 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "eyre" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" +dependencies = [ + "indenter", + "once_cell", +] + [[package]] name = "fast_chemail" version = "0.9.6" @@ -4018,6 +4218,16 @@ dependencies = [ "miniz_oxide", ] +[[package]] +name = "flex-error" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c606d892c9de11507fa0dcffc116434f94e105d0bbdc4e405b61519464c49d7b" +dependencies = [ + "eyre", + "paste", +] + [[package]] name = "flume" version = "0.11.0" @@ -5643,7 +5853,24 @@ dependencies = [ "rustls-native-certs", "tokio", "tokio-rustls 0.24.1", - "webpki-roots", + "webpki-roots 0.25.4", +] + +[[package]] +name = "hyper-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" +dependencies = [ + "futures-util", + "http 1.1.0", + "hyper 1.3.1", + "hyper-util", + "rustls 0.22.4", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.25.0", + "tower-service", ] [[package]] @@ -5883,6 +6110,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9f1a0777d972970f204fdf8ef319f1f4f8459131636d7e3c96c5d59570d0fa6" +[[package]] +name = "indenter" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" + [[package]] name = "indexmap" version = "1.9.3" @@ -6202,14 +6435,28 @@ version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "367a292944c07385839818bb71c8d76611138e2dedb0677d035b8da21d29c78b" dependencies = [ - "jsonrpsee-client-transport", - "jsonrpsee-core", - "jsonrpsee-http-client", - "jsonrpsee-proc-macros", + "jsonrpsee-client-transport 0.16.3", + "jsonrpsee-core 0.16.3", + "jsonrpsee-http-client 0.16.3", + "jsonrpsee-proc-macros 0.16.3", "jsonrpsee-server", - "jsonrpsee-types", + "jsonrpsee-types 0.16.3", "jsonrpsee-wasm-client", - "jsonrpsee-ws-client", + "jsonrpsee-ws-client 0.16.3", + "tracing", +] + +[[package]] +name = "jsonrpsee" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "affdc52f7596ccb2d7645231fc6163bb314630c989b64998f3699a28b4d5d4dc" +dependencies = [ + "jsonrpsee-core 0.20.3", + "jsonrpsee-http-client 0.20.3", + "jsonrpsee-proc-macros 0.20.3", + "jsonrpsee-types 0.20.3", + "jsonrpsee-ws-client 0.20.3", "tracing", ] @@ -6225,8 +6472,28 @@ dependencies = [ "futures-util", "gloo-net", "http 0.2.11", - "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-core 0.16.3", + "jsonrpsee-types 0.16.3", + "pin-project", + "rustls-native-certs", + "soketto", + "thiserror", + "tokio", + "tokio-rustls 0.24.1", + "tokio-util", + "tracing", + "webpki-roots 0.25.4", +] + +[[package]] +name = "jsonrpsee-client-transport" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b005c793122d03217da09af68ba9383363caa950b90d3436106df8cabce935" +dependencies = [ + "futures-util", + "http 0.2.11", + "jsonrpsee-core 0.20.3", "pin-project", "rustls-native-certs", "soketto", @@ -6235,7 +6502,7 @@ dependencies = [ "tokio-rustls 0.24.1", "tokio-util", "tracing", - "webpki-roots", + "url", ] [[package]] @@ -6254,7 +6521,7 @@ dependencies = [ "futures-util", "globset", "hyper 0.14.28", - "jsonrpsee-types", + "jsonrpsee-types 0.16.3", "parking_lot 0.12.1", "rand", "rustc-hash", @@ -6267,6 +6534,28 @@ dependencies = [ "wasm-bindgen-futures", ] +[[package]] +name = "jsonrpsee-core" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da2327ba8df2fdbd5e897e2b5ed25ce7f299d345b9736b6828814c3dbd1fd47b" +dependencies = [ + "anyhow", + "async-lock 2.8.0", + "async-trait", + "beef", + "futures-timer", + "futures-util", + "hyper 0.14.28", + "jsonrpsee-types 0.20.3", + "rustc-hash", + "serde", + "serde_json", + "thiserror", + "tokio", + "tracing", +] + [[package]] name = "jsonrpsee-http-client" version = "0.16.3" @@ -6276,8 +6565,8 @@ dependencies = [ "async-trait", "hyper 0.14.28", "hyper-rustls 0.24.2", - "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-core 0.16.3", + "jsonrpsee-types 0.16.3", "rustc-hash", "serde", "serde_json", @@ -6286,6 +6575,26 @@ dependencies = [ "tracing", ] +[[package]] +name = "jsonrpsee-http-client" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f80c17f62c7653ce767e3d7288b793dfec920f97067ceb189ebdd3570f2bc20" +dependencies = [ + "async-trait", + "hyper 0.14.28", + "hyper-rustls 0.24.2", + "jsonrpsee-core 0.20.3", + "jsonrpsee-types 0.20.3", + "serde", + "serde_json", + "thiserror", + "tokio", + "tower", + "tracing", + "url", +] + [[package]] name = "jsonrpsee-proc-macros" version = "0.16.3" @@ -6299,6 +6608,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "jsonrpsee-proc-macros" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29110019693a4fa2dbda04876499d098fa16d70eba06b1e6e2b3f1b251419515" +dependencies = [ + "heck 0.4.1", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "jsonrpsee-server" version = "0.16.3" @@ -6309,8 +6631,8 @@ dependencies = [ "futures-util", "http 0.2.11", "hyper 0.14.28", - "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-core 0.16.3", + "jsonrpsee-types 0.16.3", "serde", "serde_json", "soketto", @@ -6335,15 +6657,29 @@ dependencies = [ "tracing", ] +[[package]] +name = "jsonrpsee-types" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be0be325642e850ed0bdff426674d2e66b2b7117c9be23a7caef68a2902b7d9" +dependencies = [ + "anyhow", + "beef", + "serde", + "serde_json", + "thiserror", + "tracing", +] + [[package]] name = "jsonrpsee-wasm-client" version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18e5df77c8f625d36e4cfb583c5a674eccebe32403fcfe42f7ceff7fac9324dd" dependencies = [ - "jsonrpsee-client-transport", - "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-client-transport 0.16.3", + "jsonrpsee-core 0.16.3", + "jsonrpsee-types 0.16.3", ] [[package]] @@ -6353,9 +6689,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e1b3975ed5d73f456478681a417128597acd6a2487855fdb7b4a3d4d195bf5e" dependencies = [ "http 0.2.11", - "jsonrpsee-client-transport", - "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-client-transport 0.16.3", + "jsonrpsee-core 0.16.3", + "jsonrpsee-types 0.16.3", +] + +[[package]] +name = "jsonrpsee-ws-client" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bca9cb3933ccae417eb6b08c3448eb1cb46e39834e5b503e395e5e5bd08546c0" +dependencies = [ + "http 0.2.11", + "jsonrpsee-client-transport 0.20.3", + "jsonrpsee-core 0.20.3", + "jsonrpsee-types 0.20.3", + "url", ] [[package]] @@ -6378,7 +6727,7 @@ dependencies = [ "ecdsa", "elliptic-curve", "once_cell", - "sha2", + "sha2 0.10.8", ] [[package]] @@ -6465,7 +6814,7 @@ dependencies = [ "serde", "serde_json", "serde_with", - "starknet", + "starknet 0.9.0", "starknet_api", "tempfile", "thiserror", @@ -6490,7 +6839,7 @@ dependencies = [ "roaring", "serde", "serde_json", - "starknet", + "starknet 0.9.0", "starknet_api", "tempfile", "thiserror", @@ -6514,7 +6863,7 @@ dependencies = [ "rstest_reuse", "serde_json", "similar-asserts", - "starknet", + "starknet 0.9.0", "starknet_api", "thiserror", "tokio", @@ -6540,7 +6889,7 @@ dependencies = [ "serde", "serde_json", "serde_with", - "starknet", + "starknet 0.9.0", "starknet-crypto 0.6.2", "starknet_api", "strum 0.25.0", @@ -6565,7 +6914,7 @@ dependencies = [ "rstest 0.18.2", "rstest_reuse", "serde_json", - "starknet", + "starknet 0.9.0", "tempfile", "thiserror", "tokio", @@ -6587,7 +6936,7 @@ dependencies = [ "futures", "hex", "hyper 0.14.28", - "jsonrpsee", + "jsonrpsee 0.16.3", "katana-core", "katana-executor", "katana-primitives", @@ -6600,7 +6949,7 @@ dependencies = [ "serde", "serde_json", "serde_with", - "starknet", + "starknet 0.9.0", "starknet_api", "thiserror", "tokio", @@ -6614,11 +6963,11 @@ dependencies = [ name = "katana-rpc-api" version = "0.7.0-alpha.1" dependencies = [ - "jsonrpsee", + "jsonrpsee 0.16.3", "katana-core", "katana-primitives", "katana-rpc-types", - "starknet", + "starknet 0.9.0", ] [[package]] @@ -6629,7 +6978,7 @@ dependencies = [ "anyhow", "derive_more", "futures", - "jsonrpsee", + "jsonrpsee 0.16.3", "katana-core", "katana-executor", "katana-primitives", @@ -6638,7 +6987,7 @@ dependencies = [ "serde", "serde_json", "serde_with", - "starknet", + "starknet 0.9.0", "thiserror", ] @@ -6651,7 +7000,7 @@ dependencies = [ "katana-primitives", "katana-provider", "katana-rpc-types", - "starknet", + "starknet 0.9.0", ] [[package]] @@ -6669,7 +7018,7 @@ dependencies = [ "serde", "serde_json", "sozo", - "starknet", + "starknet 0.9.0", "tokio", "url", ] @@ -6773,6 +7122,12 @@ dependencies = [ "regex", ] +[[package]] +name = "lambdaworks-math" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ee7dcab3968c71896b8ee4dc829147acc918cffe897af6265b1894527fe3add" + [[package]] name = "lazy_static" version = "1.4.0" @@ -6971,7 +7326,7 @@ dependencies = [ "quick-protobuf-codec 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand", "regex", - "sha2", + "sha2 0.10.8", "smallvec", "tracing", "void", @@ -7001,7 +7356,7 @@ dependencies = [ "quick-protobuf-codec 0.3.1 (git+https://github.com/libp2p/rust-libp2p)", "rand", "regex", - "sha2", + "sha2 0.10.8", "smallvec", "tracing", "void", @@ -7041,7 +7396,7 @@ dependencies = [ "multihash 0.19.1", "quick-protobuf", "rand", - "sha2", + "sha2 0.10.8", "thiserror", "tracing", "zeroize", @@ -7101,7 +7456,7 @@ dependencies = [ "once_cell", "quick-protobuf", "rand", - "sha2", + "sha2 0.10.8", "snow", "static_assertions", "thiserror", @@ -7259,7 +7614,7 @@ dependencies = [ "rcgen", "ring 0.16.20", "rustls 0.21.10", - "rustls-webpki", + "rustls-webpki 0.101.7", "thiserror", "x509-parser", "yasna", @@ -7324,7 +7679,7 @@ dependencies = [ "quick-protobuf-codec 0.3.1 (git+https://github.com/libp2p/rust-libp2p)", "rand", "serde", - "sha2", + "sha2 0.10.8", "thiserror", "tinytemplate", "tracing", @@ -8007,6 +8362,16 @@ dependencies = [ "libc", ] +[[package]] +name = "nmt-rs" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e787133eafbd0f386dc4e26828a50f7595d6d7213ea0e8244c1ca6b9a9648c30" +dependencies = [ + "bytes", + "sha2 0.10.8", +] + [[package]] name = "nohash-hasher" version = "0.2.0" @@ -8114,6 +8479,17 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" +[[package]] +name = "num-derive" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "num-integer" version = "0.1.46" @@ -8343,7 +8719,7 @@ dependencies = [ "ecdsa", "elliptic-curve", "primeorder", - "sha2", + "sha2 0.10.8", ] [[package]] @@ -8355,7 +8731,7 @@ dependencies = [ "ecdsa", "elliptic-curve", "primeorder", - "sha2", + "sha2 0.10.8", ] [[package]] @@ -8560,7 +8936,7 @@ checksum = "d0934d6907f148c22a3acbda520c7eed243ad7487a30f51f6ce52b58b7077a8a" dependencies = [ "once_cell", "pest", - "sha2", + "sha2 0.10.8", ] [[package]] @@ -9486,7 +9862,7 @@ dependencies = [ "pin-project-lite", "rustls 0.21.10", "rustls-native-certs", - "rustls-pemfile", + "rustls-pemfile 1.0.4", "serde", "serde_json", "serde_urlencoded", @@ -9502,7 +9878,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams 0.4.0", "web-sys", - "webpki-roots", + "webpki-roots 0.25.4", "winreg 0.50.0", ] @@ -9520,6 +9896,7 @@ dependencies = [ "http-body 1.0.0", "http-body-util", "hyper 1.3.1", + "hyper-rustls 0.26.0", "hyper-util", "ipnet", "js-sys", @@ -9528,16 +9905,21 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", + "rustls 0.22.4", + "rustls-pemfile 2.1.2", + "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", "sync_wrapper", "tokio", + "tokio-rustls 0.25.0", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", + "webpki-roots 0.26.1", "winreg 0.52.0", ] @@ -9935,10 +10317,24 @@ checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", "ring 0.17.8", - "rustls-webpki", + "rustls-webpki 0.101.7", "sct", ] +[[package]] +name = "rustls" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +dependencies = [ + "log", + "ring 0.17.8", + "rustls-pki-types", + "rustls-webpki 0.102.3", + "subtle", + "zeroize", +] + [[package]] name = "rustls-native-certs" version = "0.6.3" @@ -9946,7 +10342,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile", + "rustls-pemfile 1.0.4", "schannel", "security-framework", ] @@ -9960,6 +10356,22 @@ dependencies = [ "base64 0.21.7", ] +[[package]] +name = "rustls-pemfile" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +dependencies = [ + "base64 0.22.0", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54" + [[package]] name = "rustls-webpki" version = "0.101.7" @@ -9970,6 +10382,17 @@ dependencies = [ "untrusted 0.9.0", ] +[[package]] +name = "rustls-webpki" +version = "0.102.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf" +dependencies = [ + "ring 0.17.8", + "rustls-pki-types", + "untrusted 0.9.0", +] + [[package]] name = "rustversion" version = "1.0.14" @@ -10062,6 +10485,95 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "saya" +version = "0.7.0-alpha.1" +dependencies = [ + "anyhow", + "clap", + "clap_complete", + "console", + "katana-primitives", + "katana-rpc", + "katana-rpc-api", + "saya-core", + "serde_json", + "tokio", + "tracing", + "tracing-subscriber", + "url", +] + +[[package]] +name = "saya-core" +version = "0.7.0-alpha.1" +dependencies = [ + "anyhow", + "async-trait", + "cairo-felt", + "cairo-proof-parser", + "cairo-vm", + "celestia-rpc", + "celestia-types", + "convert_case 0.6.0", + "dojo-world", + "flate2", + "futures", + "itertools 0.12.1", + "katana-db", + "katana-executor", + "katana-primitives", + "katana-provider", + "katana-rpc-types", + "lazy_static", + "num-bigint", + "parking_lot 0.12.1", + "rand", + "reqwest 0.12.4", + "saya-provider", + "serde", + "serde_json", + "serde_with", + "starknet 0.9.0", + "starknet-crypto 0.6.2", + "starknet-types-core", + "starknet_api", + "thiserror", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "saya-provider" +version = "0.7.0-alpha.1" +dependencies = [ + "alloy-primitives", + "anyhow", + "async-trait", + "auto_impl", + "convert_case 0.6.0", + "flate2", + "futures", + "jsonrpsee 0.16.3", + "katana-db", + "katana-executor", + "katana-primitives", + "katana-provider", + "katana-rpc-api", + "katana-rpc-types", + "lazy_static", + "serde", + "serde_json", + "serde_with", + "starknet 0.9.0", + "starknet_api", + "thiserror", + "tokio", + "tracing", + "url", +] + [[package]] name = "scarb" version = "2.6.4" @@ -10117,7 +10629,7 @@ dependencies = [ "serde-value", "serde_json", "serde_repr", - "sha2", + "sha2 0.10.8", "smallvec", "smol_str", "tar", @@ -10250,7 +10762,7 @@ dependencies = [ "hmac", "pbkdf2", "salsa20", - "sha2", + "sha2 0.10.8", ] [[package]] @@ -10383,6 +10895,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_bytes" +version = "0.11.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" +dependencies = [ + "serde", +] + [[package]] name = "serde_derive" version = "1.0.197" @@ -10553,6 +11074,19 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" +[[package]] +name = "sha2" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" +dependencies = [ + "block-buffer 0.9.0", + "cfg-if", + "cpufeatures", + "digest 0.9.0", + "opaque-debug", +] + [[package]] name = "sha2" version = "0.10.8" @@ -10734,7 +11268,7 @@ dependencies = [ "rand_core", "ring 0.17.8", "rustc_version 0.4.0", - "sha2", + "sha2 0.10.8", "subtle", ] @@ -10820,7 +11354,7 @@ dependencies = [ "smol_str", "snapbox", "sozo-ops", - "starknet", + "starknet 0.9.0", "starknet-crypto 0.6.2", "thiserror", "tokio", @@ -10875,7 +11409,7 @@ dependencies = [ "serde_with", "smol_str", "snapbox", - "starknet", + "starknet 0.9.0", "starknet-crypto 0.6.2", "thiserror", "tokio", @@ -10884,6 +11418,14 @@ dependencies = [ "url", ] +[[package]] +name = "sozo-signers" +version = "0.7.0-alpha.1" +dependencies = [ + "anyhow", + "starknet 0.9.0", +] + [[package]] name = "spin" version = "0.5.2" @@ -10977,7 +11519,7 @@ dependencies = [ "percent-encoding", "serde", "serde_json", - "sha2", + "sha2 0.10.8", "smallvec", "sqlformat", "thiserror", @@ -11018,7 +11560,7 @@ dependencies = [ "quote", "serde", "serde_json", - "sha2", + "sha2 0.10.8", "sqlx-core", "sqlx-mysql", "sqlx-postgres", @@ -11063,7 +11605,7 @@ dependencies = [ "rsa", "serde", "sha1", - "sha2", + "sha2 0.10.8", "smallvec", "sqlx-core", "stringprep", @@ -11104,7 +11646,7 @@ dependencies = [ "serde", "serde_json", "sha1", - "sha2", + "sha2 0.10.8", "smallvec", "sqlx-core", "stringprep", @@ -11146,14 +11688,30 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36f8002bf3d750dd2c0434aca8b5e88e2438cd6c452f4c18f34d0a8a9f42cb1a" dependencies = [ - "starknet-accounts", - "starknet-contract", + "starknet-accounts 0.8.0", + "starknet-contract 0.8.0", "starknet-core 0.9.0", "starknet-crypto 0.6.2", "starknet-ff", "starknet-macros", - "starknet-providers", - "starknet-signers", + "starknet-providers 0.9.0", + "starknet-signers 0.7.0", +] + +[[package]] +name = "starknet" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20b9a7b7bfd87287af85854f7458b8170ba6aa59c39113436532b7ff3d2fcbd8" +dependencies = [ + "starknet-accounts 0.9.0", + "starknet-contract 0.9.0", + "starknet-core 0.10.0", + "starknet-crypto 0.6.2", + "starknet-ff", + "starknet-macros", + "starknet-providers 0.10.0", + "starknet-signers 0.8.0", ] [[package]] @@ -11165,8 +11723,22 @@ dependencies = [ "async-trait", "auto_impl", "starknet-core 0.9.0", - "starknet-providers", - "starknet-signers", + "starknet-providers 0.9.0", + "starknet-signers 0.7.0", + "thiserror", +] + +[[package]] +name = "starknet-accounts" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2095d7584608ae1707bd1cf2889368ab3734d9f54e4fcef4765cba1f3b3f7618" +dependencies = [ + "async-trait", + "auto_impl", + "starknet-core 0.10.0", + "starknet-providers 0.10.0", + "starknet-signers 0.8.0", "thiserror", ] @@ -11179,9 +11751,24 @@ dependencies = [ "serde", "serde_json", "serde_with", - "starknet-accounts", + "starknet-accounts 0.8.0", "starknet-core 0.9.0", - "starknet-providers", + "starknet-providers 0.9.0", + "thiserror", +] + +[[package]] +name = "starknet-contract" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb3b73d437b4d62241612d13fce612602de6684c149cccf696e76a20757e2156" +dependencies = [ + "serde", + "serde_json", + "serde_with", + "starknet-accounts 0.9.0", + "starknet-core 0.10.0", + "starknet-providers 0.10.0", "thiserror", ] @@ -11234,7 +11821,7 @@ dependencies = [ "num-integer", "num-traits 0.2.18", "rfc6979", - "sha2", + "sha2 0.10.8", "starknet-crypto-codegen", "starknet-curve 0.3.0", "starknet-ff", @@ -11254,7 +11841,7 @@ dependencies = [ "num-integer", "num-traits 0.2.18", "rfc6979", - "sha2", + "sha2 0.10.8", "starknet-crypto-codegen", "starknet-curve 0.4.2", "starknet-ff", @@ -11335,6 +11922,26 @@ dependencies = [ "url", ] +[[package]] +name = "starknet-providers" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6abf40ffcbe3b887b4d5cfc8ab73170c816b4aa78d1d4ad59abd3fb3b0f53cd" +dependencies = [ + "async-trait", + "auto_impl", + "ethereum-types", + "flate2", + "log", + "reqwest 0.11.24", + "serde", + "serde_json", + "serde_with", + "starknet-core 0.10.0", + "thiserror", + "url", +] + [[package]] name = "starknet-signers" version = "0.7.0" @@ -11351,6 +11958,37 @@ dependencies = [ "thiserror", ] +[[package]] +name = "starknet-signers" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e9a2bd4fd66090003c3b7f0d76476e5b63cd44f6a49ede2442673f4427d5a40" +dependencies = [ + "async-trait", + "auto_impl", + "crypto-bigint", + "eth-keystore", + "rand", + "starknet-core 0.10.0", + "starknet-crypto 0.6.2", + "thiserror", +] + +[[package]] +name = "starknet-types-core" +version = "0.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d53160556d1f23425100f42b3230df747ea05763efee685a2cd939dfb640701" +dependencies = [ + "bitvec", + "lambdaworks-math", + "lazy_static", + "num-bigint", + "num-integer", + "num-traits 0.2.18", + "serde", +] + [[package]] name = "starknet_api" version = "0.10.0" @@ -11488,6 +12126,21 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +[[package]] +name = "subtle-encoding" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dcb1ed7b8330c5eed5441052651dd7a12c75e2ed88f2ec024ae1fa3a5e59945" +dependencies = [ + "zeroize", +] + +[[package]] +name = "subtle-ng" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142" + [[package]] name = "syn" version = "1.0.109" @@ -11834,6 +12487,17 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-rustls" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +dependencies = [ + "rustls 0.22.4", + "rustls-pki-types", + "tokio", +] + [[package]] name = "tokio-stream" version = "0.1.14" @@ -12101,7 +12765,7 @@ dependencies = [ "serde", "serde_json", "sqlx", - "starknet", + "starknet 0.9.0", "starknet-crypto 0.6.2", "tokio", "tokio-stream", @@ -12136,7 +12800,7 @@ dependencies = [ "prost 0.12.3", "serde", "serde_json", - "starknet", + "starknet 0.9.0", "starknet-crypto 0.6.2", "thiserror", "tokio", @@ -12175,7 +12839,7 @@ dependencies = [ "sozo", "sozo-ops", "sqlx", - "starknet", + "starknet 0.9.0", "starknet-crypto 0.6.2", "thiserror", "tokio", @@ -12210,7 +12874,7 @@ dependencies = [ "sozo", "sozo-ops", "sqlx", - "starknet", + "starknet 0.9.0", "starknet-crypto 0.6.2", "strum 0.25.0", "strum_macros 0.25.3", @@ -12248,7 +12912,7 @@ dependencies = [ "serde_json", "sozo-ops", "sqlx", - "starknet", + "starknet 0.9.0", "starknet-crypto 0.6.2", "strum 0.25.0", "strum_macros 0.25.3", @@ -12289,7 +12953,7 @@ dependencies = [ "serde", "serde_json", "sqlx", - "starknet", + "starknet 0.9.0", "starknet-crypto 0.6.2", "tempfile", "thiserror", @@ -12329,7 +12993,7 @@ dependencies = [ "serde", "serde_json", "sqlx", - "starknet", + "starknet 0.9.0", "starknet-crypto 0.6.2", "tokio", "tokio-stream", @@ -12888,7 +13552,7 @@ dependencies = [ "multer", "percent-encoding", "pin-project", - "rustls-pemfile", + "rustls-pemfile 1.0.4", "scoped-tls", "serde", "serde_json", @@ -13082,6 +13746,15 @@ version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" +[[package]] +name = "webpki-roots" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "webrtc" version = "0.9.0" @@ -13107,7 +13780,7 @@ dependencies = [ "sdp", "serde", "serde_json", - "sha2", + "sha2 0.10.8", "smol_str", "stun", "thiserror", @@ -13168,7 +13841,7 @@ dependencies = [ "sec1", "serde", "sha1", - "sha2", + "sha2 0.10.8", "subtle", "thiserror", "tokio", diff --git a/Cargo.toml b/Cargo.toml index fe534943b3..7a285254d1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ resolver = "2" members = [ "bin/dojo-language-server", "bin/katana", - # "bin/saya", + "bin/saya", "bin/sozo", "bin/torii", "crates/benches", @@ -31,9 +31,9 @@ members = [ "crates/katana/storage/provider", "crates/katana/tasks", "crates/metrics", - # "crates/saya/core", - # "crates/saya/provider", - # "crates/sozo/signers", + "crates/saya/core", + "crates/saya/provider", + "crates/sozo/signers", "crates/torii/client", "crates/torii/server", "crates/torii/types-test",