diff --git a/Cargo.lock b/Cargo.lock index 4afbf1431c..898eeacaad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -119,17 +119,21 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" [[package]] name = "alloy-consensus" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=98e9012c95a12d67b012dfee6f0d928797426e79#98e9012c95a12d67b012dfee6f0d928797426e79" +source = "git+https://github.com/alloy-rs/alloy?rev=d68a6b787b2904061f0ae7fcc02ece8513e3c500#d68a6b787b2904061f0ae7fcc02ece8513e3c500" dependencies = [ "alloy-eips", "alloy-primitives", "alloy-rlp", + "alloy-serde", + "c-kzg", + "serde", + "sha2 0.10.8", ] [[package]] name = "alloy-contract" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=98e9012c95a12d67b012dfee6f0d928797426e79#98e9012c95a12d67b012dfee6f0d928797426e79" +source = "git+https://github.com/alloy-rs/alloy?rev=d68a6b787b2904061f0ae7fcc02ece8513e3c500#d68a6b787b2904061f0ae7fcc02ece8513e3c500" dependencies = [ "alloy-dyn-abi", "alloy-json-abi", @@ -146,8 +150,9 @@ dependencies = [ [[package]] name = "alloy-dyn-abi" -version = "0.6.4" -source = "git+https://github.com/alloy-rs/core?rev=ff339696fa9b490698cb3edec3d4647fae0bd332#ff339696fa9b490698cb3edec3d4647fae0bd332" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ab339ca7b4ea9115f0578c941abc80a171edf8e5eadd01e6c4237b68db8083" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -163,18 +168,31 @@ dependencies = [ [[package]] name = "alloy-eips" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=98e9012c95a12d67b012dfee6f0d928797426e79#98e9012c95a12d67b012dfee6f0d928797426e79" +source = "git+https://github.com/alloy-rs/alloy?rev=d68a6b787b2904061f0ae7fcc02ece8513e3c500#d68a6b787b2904061f0ae7fcc02ece8513e3c500" dependencies = [ "alloy-primitives", "alloy-rlp", "alloy-serde", + "c-kzg", + "once_cell", + "serde", +] + +[[package]] +name = "alloy-genesis" +version = "0.1.0" +source = "git+https://github.com/alloy-rs/alloy?rev=d68a6b787b2904061f0ae7fcc02ece8513e3c500#d68a6b787b2904061f0ae7fcc02ece8513e3c500" +dependencies = [ + "alloy-primitives", + "alloy-serde", "serde", ] [[package]] name = "alloy-json-abi" -version = "0.6.4" -source = "git+https://github.com/alloy-rs/core?rev=ff339696fa9b490698cb3edec3d4647fae0bd332#ff339696fa9b490698cb3edec3d4647fae0bd332" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44294729c145cf7ae65feab544b5b81fb2bb7e2fd060214842eb3989a1e9d882" dependencies = [ "alloy-primitives", "alloy-sol-type-parser", @@ -185,18 +203,19 @@ dependencies = [ [[package]] name = "alloy-json-rpc" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=98e9012c95a12d67b012dfee6f0d928797426e79#98e9012c95a12d67b012dfee6f0d928797426e79" +source = "git+https://github.com/alloy-rs/alloy?rev=d68a6b787b2904061f0ae7fcc02ece8513e3c500#d68a6b787b2904061f0ae7fcc02ece8513e3c500" dependencies = [ "alloy-primitives", "serde", "serde_json", "thiserror", + "tracing", ] [[package]] name = "alloy-network" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=98e9012c95a12d67b012dfee6f0d928797426e79#98e9012c95a12d67b012dfee6f0d928797426e79" +source = "git+https://github.com/alloy-rs/alloy?rev=d68a6b787b2904061f0ae7fcc02ece8513e3c500#d68a6b787b2904061f0ae7fcc02ece8513e3c500" dependencies = [ "alloy-consensus", "alloy-eips", @@ -206,14 +225,14 @@ dependencies = [ "alloy-signer", "async-trait", "futures-utils-wasm", - "serde", "thiserror", ] [[package]] name = "alloy-primitives" -version = "0.6.4" -source = "git+https://github.com/alloy-rs/core?rev=ff339696fa9b490698cb3edec3d4647fae0bd332#ff339696fa9b490698cb3edec3d4647fae0bd332" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50c715249705afa1e32be79dabfd35e2ef0f1cc02ad2cf48c9d1e20026ee637b" dependencies = [ "alloy-rlp", "bytes", @@ -234,14 +253,15 @@ dependencies = [ [[package]] name = "alloy-provider" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=98e9012c95a12d67b012dfee6f0d928797426e79#98e9012c95a12d67b012dfee6f0d928797426e79" +source = "git+https://github.com/alloy-rs/alloy?rev=d68a6b787b2904061f0ae7fcc02ece8513e3c500#d68a6b787b2904061f0ae7fcc02ece8513e3c500" dependencies = [ + "alloy-eips", "alloy-json-rpc", "alloy-network", "alloy-primitives", "alloy-rpc-client", - "alloy-rpc-trace-types", "alloy-rpc-types", + "alloy-rpc-types-trace", "alloy-transport", "alloy-transport-http", "async-stream", @@ -249,11 +269,13 @@ dependencies = [ "auto_impl", "dashmap", "futures", + "futures-utils-wasm", "lru 0.12.2", - "reqwest", + "reqwest 0.12.4", "serde_json", "tokio", "tracing", + "url", ] [[package]] @@ -281,14 +303,14 @@ dependencies = [ [[package]] name = "alloy-rpc-client" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=98e9012c95a12d67b012dfee6f0d928797426e79#98e9012c95a12d67b012dfee6f0d928797426e79" +source = "git+https://github.com/alloy-rs/alloy?rev=d68a6b787b2904061f0ae7fcc02ece8513e3c500#d68a6b787b2904061f0ae7fcc02ece8513e3c500" dependencies = [ "alloy-json-rpc", "alloy-transport", "alloy-transport-http", "futures", "pin-project", - "reqwest", + "reqwest 0.12.4", "serde", "serde_json", "tokio", @@ -299,37 +321,39 @@ dependencies = [ ] [[package]] -name = "alloy-rpc-trace-types" +name = "alloy-rpc-types" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=98e9012c95a12d67b012dfee6f0d928797426e79#98e9012c95a12d67b012dfee6f0d928797426e79" +source = "git+https://github.com/alloy-rs/alloy?rev=d68a6b787b2904061f0ae7fcc02ece8513e3c500#d68a6b787b2904061f0ae7fcc02ece8513e3c500" dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-genesis", "alloy-primitives", - "alloy-rpc-types", + "alloy-rlp", "alloy-serde", + "alloy-sol-types", + "itertools 0.12.1", "serde", "serde_json", + "thiserror", ] [[package]] -name = "alloy-rpc-types" +name = "alloy-rpc-types-trace" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=98e9012c95a12d67b012dfee6f0d928797426e79#98e9012c95a12d67b012dfee6f0d928797426e79" +source = "git+https://github.com/alloy-rs/alloy?rev=d68a6b787b2904061f0ae7fcc02ece8513e3c500#d68a6b787b2904061f0ae7fcc02ece8513e3c500" dependencies = [ - "alloy-consensus", - "alloy-eips", "alloy-primitives", - "alloy-rlp", + "alloy-rpc-types", "alloy-serde", - "itertools 0.12.1", "serde", "serde_json", - "thiserror", ] [[package]] name = "alloy-serde" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=98e9012c95a12d67b012dfee6f0d928797426e79#98e9012c95a12d67b012dfee6f0d928797426e79" +source = "git+https://github.com/alloy-rs/alloy?rev=d68a6b787b2904061f0ae7fcc02ece8513e3c500#d68a6b787b2904061f0ae7fcc02ece8513e3c500" dependencies = [ "alloy-primitives", "serde", @@ -339,7 +363,7 @@ dependencies = [ [[package]] name = "alloy-signer" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=98e9012c95a12d67b012dfee6f0d928797426e79#98e9012c95a12d67b012dfee6f0d928797426e79" +source = "git+https://github.com/alloy-rs/alloy?rev=d68a6b787b2904061f0ae7fcc02ece8513e3c500#d68a6b787b2904061f0ae7fcc02ece8513e3c500" dependencies = [ "alloy-primitives", "async-trait", @@ -352,7 +376,7 @@ dependencies = [ [[package]] name = "alloy-signer-wallet" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=98e9012c95a12d67b012dfee6f0d928797426e79#98e9012c95a12d67b012dfee6f0d928797426e79" +source = "git+https://github.com/alloy-rs/alloy?rev=d68a6b787b2904061f0ae7fcc02ece8513e3c500#d68a6b787b2904061f0ae7fcc02ece8513e3c500" dependencies = [ "alloy-consensus", "alloy-network", @@ -366,8 +390,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro" -version = "0.6.4" -source = "git+https://github.com/alloy-rs/core?rev=ff339696fa9b490698cb3edec3d4647fae0bd332#ff339696fa9b490698cb3edec3d4647fae0bd332" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef9a94a27345fb31e3fcb5f5e9f592bb4847493b07fa1e47dd9fde2222f2e28" dependencies = [ "alloy-json-abi", "alloy-sol-macro-input", @@ -384,8 +409,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro-input" -version = "0.6.4" -source = "git+https://github.com/alloy-rs/core?rev=ff339696fa9b490698cb3edec3d4647fae0bd332#ff339696fa9b490698cb3edec3d4647fae0bd332" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31fe73cd259527e24dc2dbfe64bc95e5ddfcd2b2731f670a11ff72b2be2c25b" dependencies = [ "alloy-json-abi", "const-hex", @@ -400,16 +426,18 @@ dependencies = [ [[package]] name = "alloy-sol-type-parser" -version = "0.6.4" -source = "git+https://github.com/alloy-rs/core?rev=ff339696fa9b490698cb3edec3d4647fae0bd332#ff339696fa9b490698cb3edec3d4647fae0bd332" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c8d6e74e4feeaa2bcfdecfd3da247ab53c67bd654ba1907270c32e02b142331" dependencies = [ "winnow 0.6.1", ] [[package]] name = "alloy-sol-types" -version = "0.6.4" -source = "git+https://github.com/alloy-rs/core?rev=ff339696fa9b490698cb3edec3d4647fae0bd332#ff339696fa9b490698cb3edec3d4647fae0bd332" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afaffed78bfb17526375754931e045f96018aa810844b29c7aef823266dd4b4b" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -421,7 +449,7 @@ dependencies = [ [[package]] name = "alloy-transport" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=98e9012c95a12d67b012dfee6f0d928797426e79#98e9012c95a12d67b012dfee6f0d928797426e79" +source = "git+https://github.com/alloy-rs/alloy?rev=d68a6b787b2904061f0ae7fcc02ece8513e3c500#d68a6b787b2904061f0ae7fcc02ece8513e3c500" dependencies = [ "alloy-json-rpc", "base64 0.22.0", @@ -439,11 +467,11 @@ dependencies = [ [[package]] name = "alloy-transport-http" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=98e9012c95a12d67b012dfee6f0d928797426e79#98e9012c95a12d67b012dfee6f0d928797426e79" +source = "git+https://github.com/alloy-rs/alloy?rev=d68a6b787b2904061f0ae7fcc02ece8513e3c500#d68a6b787b2904061f0ae7fcc02ece8513e3c500" dependencies = [ "alloy-json-rpc", "alloy-transport", - "reqwest", + "reqwest 0.12.4", "serde_json", "tower", "url", @@ -892,7 +920,7 @@ dependencies = [ "fnv", "futures-util", "handlebars", - "http", + "http 0.2.11", "indexmap 2.2.5", "mime", "multer", @@ -1140,7 +1168,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d9a9bf8b79a749ee0b911b91b671cc2b6c670bdbc7e3dfd537576ddc94bb2a2" dependencies = [ - "http", + "http 0.2.11", "log", "url", ] @@ -1173,9 +1201,9 @@ dependencies = [ "bitflags 1.3.2", "bytes", "futures-util", - "http", - "http-body", - "hyper", + "http 0.2.11", + "http-body 0.4.6", + "hyper 0.14.28", "itoa", "matchit", "memchr", @@ -1199,8 +1227,8 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http", - "http-body", + "http 0.2.11", + "http-body 0.4.6", "mime", "rustversion", "tower-layer", @@ -1288,7 +1316,7 @@ dependencies = [ "katana-runner", "lazy_static", "proptest", - "reqwest", + "reqwest 0.11.24", "scarb", "serde", "serde_json", @@ -1504,6 +1532,18 @@ dependencies = [ "thiserror", ] +[[package]] +name = "blst" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c94087b935a822949d3291a9989ad2b2051ea141eda0fd4e478a75f6aa3e604b" +dependencies = [ + "cc", + "glob", + "threadpool", + "zeroize", +] + [[package]] name = "brotli" version = "3.4.0" @@ -1625,6 +1665,20 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "c-kzg" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3130f3d8717cc02e668a896af24984d5d5d4e8bf12e278e982e0f1bd88a0f9af" +dependencies = [ + "blst", + "cc", + "glob", + "hex", + "libc", + "serde", +] + [[package]] name = "cached" version = "0.44.0" @@ -2527,7 +2581,7 @@ checksum = "4f4c948ab3cd9562d256b752d874d573c836ec8b200bba87d1154bbf662d3a00" dependencies = [ "async-trait", "celestia-types", - "http", + "http 0.2.11", "jsonrpsee 0.20.3", "serde", "thiserror", @@ -2843,7 +2897,7 @@ name = "common" version = "0.6.1-alpha.4" dependencies = [ "anyhow", - "reqwest", + "reqwest 0.11.24", "thiserror", ] @@ -2856,7 +2910,7 @@ dependencies = [ "bytes", "futures-core", "futures-util", - "http", + "http 0.2.11", "mime", "mime_guess", "rand", @@ -3689,7 +3743,7 @@ name = "dojo-metrics" version = "0.6.1-alpha.4" dependencies = [ "anyhow", - "hyper", + "hyper 0.14.28", "jemalloc-ctl", "jemallocator", "metrics", @@ -3769,7 +3823,7 @@ dependencies = [ "dojo-test-utils", "dojo-types", "futures", - "http", + "http 0.2.11", "ipfs-api-backend-hyper", "scarb", "serde", @@ -5459,7 +5513,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.11", "indexmap 2.2.5", "slab", "tokio", @@ -5548,7 +5602,7 @@ dependencies = [ "base64 0.21.7", "bytes", "headers-core", - "http", + "http 0.2.11", "httpdate", "mime", "sha1", @@ -5560,7 +5614,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" dependencies = [ - "http", + "http 0.2.11", ] [[package]] @@ -5709,6 +5763,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http-body" version = "0.4.6" @@ -5716,7 +5781,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http", + "http 0.2.11", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +dependencies = [ + "bytes", + "futures-core", + "http 1.1.0", + "http-body 1.0.0", "pin-project-lite", ] @@ -5761,8 +5849,8 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", - "http-body", + "http 0.2.11", + "http-body 0.4.6", "httparse", "httpdate", "itoa", @@ -5774,6 +5862,25 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + [[package]] name = "hyper-multipart-rfc7578" version = "0.8.0" @@ -5783,8 +5890,8 @@ dependencies = [ "bytes", "common-multipart-rfc7578", "futures-core", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.28", ] [[package]] @@ -5792,7 +5899,7 @@ name = "hyper-reverse-proxy" version = "0.5.2-dev" source = "git+https://github.com/tarrencev/hyper-reverse-proxy#4bfaf98b7ae61a49c6238ee1bd38ad030e7fa7f6" dependencies = [ - "hyper", + "hyper 0.14.28", "lazy_static", "tokio", "tracing", @@ -5804,8 +5911,8 @@ version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" dependencies = [ - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.28", "log", "rustls 0.20.9", "rustls-native-certs", @@ -5820,8 +5927,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.28", "log", "rustls 0.21.10", "rustls-native-certs", @@ -5836,7 +5943,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper", + "hyper 0.14.28", "pin-project-lite", "tokio", "tokio-io-timeout", @@ -5849,12 +5956,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper", + "hyper 0.14.28", "native-tls", "tokio", "tokio-native-tls", ] +[[package]] +name = "hyper-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "hyper 1.3.1", + "pin-project-lite", + "socket2 0.5.5", + "tokio", + "tower", + "tower-service", + "tracing", +] + [[package]] name = "iana-time-zone" version = "0.1.60" @@ -5949,8 +6076,8 @@ dependencies = [ "attohttpc", "bytes", "futures", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.28", "log", "rand", "tokio", @@ -6191,7 +6318,7 @@ dependencies = [ "socket2 0.5.5", "widestring", "windows-sys 0.48.0", - "winreg", + "winreg 0.50.0", ] [[package]] @@ -6203,8 +6330,8 @@ dependencies = [ "base64 0.13.1", "bytes", "futures", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.28", "hyper-multipart-rfc7578", "hyper-rustls 0.23.2", "ipfs-api-prelude", @@ -6222,7 +6349,7 @@ dependencies = [ "common-multipart-rfc7578", "dirs 4.0.0", "futures", - "http", + "http 0.2.11", "multiaddr 0.17.1", "multibase", "serde", @@ -6408,7 +6535,7 @@ dependencies = [ "futures-timer", "futures-util", "gloo-net", - "http", + "http 0.2.11", "jsonrpsee-core 0.16.3", "jsonrpsee-types 0.16.3", "pin-project", @@ -6429,7 +6556,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5b005c793122d03217da09af68ba9383363caa950b90d3436106df8cabce935" dependencies = [ "futures-util", - "http", + "http 0.2.11", "jsonrpsee-core 0.20.3", "pin-project", "rustls-native-certs", @@ -6457,7 +6584,7 @@ dependencies = [ "futures-timer", "futures-util", "globset", - "hyper", + "hyper 0.14.28", "jsonrpsee-types 0.16.3", "parking_lot 0.12.1", "rand", @@ -6483,7 +6610,7 @@ dependencies = [ "beef", "futures-timer", "futures-util", - "hyper", + "hyper 0.14.28", "jsonrpsee-types 0.20.3", "rustc-hash", "serde", @@ -6500,7 +6627,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e5f9fabdd5d79344728521bb65e3106b49ec405a78b66fbff073b72b389fa43" dependencies = [ "async-trait", - "hyper", + "hyper 0.14.28", "hyper-rustls 0.24.2", "jsonrpsee-core 0.16.3", "jsonrpsee-types 0.16.3", @@ -6519,7 +6646,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f80c17f62c7653ce767e3d7288b793dfec920f97067ceb189ebdd3570f2bc20" dependencies = [ "async-trait", - "hyper", + "hyper 0.14.28", "hyper-rustls 0.24.2", "jsonrpsee-core 0.20.3", "jsonrpsee-types 0.20.3", @@ -6566,8 +6693,8 @@ checksum = "cf4d945a6008c9b03db3354fb3c83ee02d2faa9f2e755ec1dfb69c3551b8f4ba" dependencies = [ "futures-channel", "futures-util", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.28", "jsonrpsee-core 0.16.3", "jsonrpsee-types 0.16.3", "serde", @@ -6625,7 +6752,7 @@ version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e1b3975ed5d73f456478681a417128597acd6a2487855fdb7b4a3d4d195bf5e" dependencies = [ - "http", + "http 0.2.11", "jsonrpsee-client-transport 0.16.3", "jsonrpsee-core 0.16.3", "jsonrpsee-types 0.16.3", @@ -6637,7 +6764,7 @@ version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bca9cb3933ccae417eb6b08c3448eb1cb46e39834e5b503e395e5e5bd08546c0" dependencies = [ - "http", + "http 0.2.11", "jsonrpsee-client-transport 0.20.3", "jsonrpsee-core 0.20.3", "jsonrpsee-types 0.20.3", @@ -6748,7 +6875,7 @@ dependencies = [ "metrics", "parking_lot 0.12.1", "rand", - "reqwest", + "reqwest 0.11.24", "serde", "serde_json", "serde_with", @@ -6874,7 +7001,7 @@ dependencies = [ "flate2", "futures", "hex", - "hyper", + "hyper 0.14.28", "jsonrpsee 0.16.3", "katana-core", "katana-executor", @@ -7884,7 +8011,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d4fa7ce7c4862db464a37b0b31d89bca874562f034bd7993895572783d02950" dependencies = [ "base64 0.21.7", - "hyper", + "hyper 0.14.28", "indexmap 1.9.3", "ipnet", "metrics", @@ -8017,7 +8144,7 @@ dependencies = [ "bytes", "encoding_rs", "futures-util", - "http", + "http 0.2.11", "httparse", "log", "memchr", @@ -9795,9 +9922,9 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", - "http-body", - "hyper", + "http 0.2.11", + "http-body 0.4.6", + "hyper 0.14.28", "hyper-rustls 0.24.2", "hyper-tls", "ipnet", @@ -9827,7 +9954,42 @@ dependencies = [ "wasm-streams 0.4.0", "web-sys", "webpki-roots", - "winreg", + "winreg 0.50.0", +] + +[[package]] +name = "reqwest" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +dependencies = [ + "base64 0.22.0", + "bytes", + "futures-core", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.3.1", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg 0.52.0", ] [[package]] @@ -10450,7 +10612,7 @@ dependencies = [ "pathdiff", "petgraph", "redb", - "reqwest", + "reqwest 0.11.24", "scarb-build-metadata", "scarb-macro-interface", "scarb-metadata 1.11.1 (git+https://github.com/software-mansion/scarb?tag=v2.5.4)", @@ -11136,7 +11298,7 @@ dependencies = [ "base64 0.13.1", "bytes", "futures", - "http", + "http 0.2.11", "httparse", "log", "rand", @@ -11810,7 +11972,7 @@ dependencies = [ "ethereum-types", "flate2", "log", - "reqwest", + "reqwest 0.11.24", "serde", "serde_json", "serde_with", @@ -11830,7 +11992,7 @@ dependencies = [ "ethereum-types", "flate2", "log", - "reqwest", + "reqwest 0.11.24", "serde", "serde_json", "serde_with", @@ -11850,7 +12012,7 @@ dependencies = [ "ethereum-types", "flate2", "log", - "reqwest", + "reqwest 0.11.24", "serde", "serde_json", "serde_with", @@ -12140,8 +12302,9 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "0.6.4" -source = "git+https://github.com/alloy-rs/core?rev=ff339696fa9b490698cb3edec3d4647fae0bd332#ff339696fa9b490698cb3edec3d4647fae0bd332" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70aba06097b6eda3c15f6eebab8a6339e121475bcf08bbe6758807e716c372a1" dependencies = [ "paste", "proc-macro2", @@ -12314,6 +12477,15 @@ dependencies = [ "once_cell", ] +[[package]] +name = "threadpool" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ + "num_cpus", +] + [[package]] name = "time" version = "0.3.34" @@ -12571,8 +12743,8 @@ dependencies = [ "flate2", "futures-core", "futures-util", - "http", - "http-body", + "http 0.2.11", + "http-body 0.4.6", "percent-encoding", "pin-project", "prost 0.11.9", @@ -12594,9 +12766,9 @@ dependencies = [ "base64 0.21.7", "bytes", "h2", - "http", - "http-body", - "hyper", + "http 0.2.11", + "http-body 0.4.6", + "hyper 0.14.28", "hyper-timeout", "percent-encoding", "pin-project", @@ -12656,9 +12828,9 @@ checksum = "0fddb2a37b247e6adcb9f239f4e5cefdcc5ed526141a416b943929f13aea2cce" dependencies = [ "base64 0.21.7", "bytes", - "http", - "http-body", - "hyper", + "http 0.2.11", + "http-body 0.4.6", + "hyper 0.14.28", "pin-project", "tokio-stream", "tonic 0.10.2", @@ -12678,8 +12850,8 @@ dependencies = [ "byteorder", "bytes", "futures-util", - "http", - "http-body", + "http 0.2.11", + "http-body 0.4.6", "httparse", "js-sys", "pin-project", @@ -12709,9 +12881,9 @@ dependencies = [ "dojo-world", "either", "futures", - "http", - "http-body", - "hyper", + "http 0.2.11", + "http-body 0.4.6", + "hyper 0.14.28", "hyper-reverse-proxy", "indexmap 1.9.3", "lazy_static", @@ -12784,7 +12956,7 @@ dependencies = [ "lazy_static", "log", "once_cell", - "reqwest", + "reqwest 0.11.24", "scarb", "scarb-ui", "serde", @@ -12855,7 +13027,7 @@ dependencies = [ "futures", "futures-util", "hex", - "hyper", + "hyper 0.14.28", "parking_lot 0.12.1", "prost 0.11.9", "prost 0.12.3", @@ -12937,9 +13109,9 @@ dependencies = [ "dojo-world", "either", "futures", - "http", - "http-body", - "hyper", + "http 0.2.11", + "http-body 0.4.6", + "hyper 0.14.28", "hyper-reverse-proxy", "indexmap 1.9.3", "lazy_static", @@ -12995,8 +13167,8 @@ dependencies = [ "bytes", "futures-core", "futures-util", - "http", - "http-body", + "http 0.2.11", + "http-body 0.4.6", "http-range-header", "httpdate", "iri-string", @@ -13171,7 +13343,7 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http", + "http 0.2.11", "httparse", "log", "rand", @@ -13498,8 +13670,8 @@ dependencies = [ "futures-channel", "futures-util", "headers", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.28", "log", "mime", "mime_guess", @@ -14238,6 +14410,16 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + [[package]] name = "wyz" version = "0.5.1" diff --git a/Cargo.toml b/Cargo.toml index 5b70dfd99c..0353a53c89 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -191,23 +191,18 @@ wasm-prost = { version = "0.11.9", package = "prost" } wasm-tonic = { version = "0.9.2", default-features = false, features = [ "codegen", "gzip", "prost" ], package = "tonic" } wasm-tonic-build = { version = "0.9.2", default-features = false, features = [ "prost" ], package = "tonic-build" } -alloy-primitives = { version = "0.6.4", default-features = false } +alloy-primitives = { version = "0.7.0", default-features = false } +alloy-sol-types = { version = "0.7.0", default-features = false } [patch.crates-io] cairo-felt = { git = "https://github.com/dojoengine/cairo-rs.git", rev = "1031381" } cairo-vm = { git = "https://github.com/dojoengine/cairo-rs.git", rev = "1031381" } -alloy-contract = { git = "https://github.com/alloy-rs/alloy", rev = "98e9012c95a12d67b012dfee6f0d928797426e79" } -alloy-dyn-abi = { git = "https://github.com/alloy-rs/core", rev = "ff339696fa9b490698cb3edec3d4647fae0bd332" } -alloy-json-abi = { git = "https://github.com/alloy-rs/core", rev = "ff339696fa9b490698cb3edec3d4647fae0bd332" } -alloy-json-rpc = { git = "https://github.com/alloy-rs/alloy", rev = "98e9012c95a12d67b012dfee6f0d928797426e79" } -alloy-network = { git = "https://github.com/alloy-rs/alloy", rev = "98e9012c95a12d67b012dfee6f0d928797426e79" } -alloy-primitives = { git = "https://github.com/alloy-rs/core", rev = "ff339696fa9b490698cb3edec3d4647fae0bd332" } -alloy-provider = { git = "https://github.com/alloy-rs/alloy", rev = "98e9012c95a12d67b012dfee6f0d928797426e79" } -alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "98e9012c95a12d67b012dfee6f0d928797426e79" } -alloy-signer = { git = "https://github.com/alloy-rs/alloy", rev = "98e9012c95a12d67b012dfee6f0d928797426e79" } -alloy-signer-wallet = { git = "https://github.com/alloy-rs/alloy", rev = "98e9012c95a12d67b012dfee6f0d928797426e79" } -alloy-sol-macro = { git = "https://github.com/alloy-rs/core", rev = "ff339696fa9b490698cb3edec3d4647fae0bd332" } -alloy-sol-types = { git = "https://github.com/alloy-rs/core", rev = "ff339696fa9b490698cb3edec3d4647fae0bd332" } -alloy-transport = { git = "https://github.com/alloy-rs/alloy", rev = "98e9012c95a12d67b012dfee6f0d928797426e79" } -syn-solidity = { git = "https://github.com/alloy-rs/core", rev = "ff339696fa9b490698cb3edec3d4647fae0bd332" } +alloy-contract = { git = "https://github.com/alloy-rs/alloy", rev = "d68a6b787b2904061f0ae7fcc02ece8513e3c500" } +alloy-json-rpc = { git = "https://github.com/alloy-rs/alloy", rev = "d68a6b787b2904061f0ae7fcc02ece8513e3c500" } +alloy-network = { git = "https://github.com/alloy-rs/alloy", rev = "d68a6b787b2904061f0ae7fcc02ece8513e3c500" } +alloy-provider = { git = "https://github.com/alloy-rs/alloy", rev = "d68a6b787b2904061f0ae7fcc02ece8513e3c500"} +alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "d68a6b787b2904061f0ae7fcc02ece8513e3c500" } +alloy-signer = { git = "https://github.com/alloy-rs/alloy", rev = "d68a6b787b2904061f0ae7fcc02ece8513e3c500" } +alloy-signer-wallet = { git = "https://github.com/alloy-rs/alloy", rev = "d68a6b787b2904061f0ae7fcc02ece8513e3c500" } +alloy-transport = { git = "https://github.com/alloy-rs/alloy", rev = "d68a6b787b2904061f0ae7fcc02ece8513e3c500" } diff --git a/crates/katana/core/Cargo.toml b/crates/katana/core/Cargo.toml index 68c395f28b..e533696360 100644 --- a/crates/katana/core/Cargo.toml +++ b/crates/katana/core/Cargo.toml @@ -40,11 +40,10 @@ tracing.workspace = true url.workspace = true alloy-primitives = { workspace = true, features = ["serde"] } - -alloy-sol-types = { version = "0.6.4", default-features = false, features = ["json"], optional = true } +alloy-sol-types = { workspace = true, default-features = false, features = ["json"], optional = true } alloy-transport = { version = "0.1.0", default-features = false, optional = true } -alloy-provider = { version = "0.1.0", default-features = false, optional = true } +alloy-provider = { version = "0.1.0", default-features = false, optional = true, features = ["reqwest"]} alloy-signer = { version = "0.1.0", default-features = false, optional = true } alloy-network = { version = "0.1.0", default-features = false, optional = true } alloy-rpc-types = { version = "0.1.0", default-features = false, optional = true } diff --git a/crates/katana/core/src/service/messaging/ethereum.rs b/crates/katana/core/src/service/messaging/ethereum.rs index 743ac137c7..efea52b550 100644 --- a/crates/katana/core/src/service/messaging/ethereum.rs +++ b/crates/katana/core/src/service/messaging/ethereum.rs @@ -4,7 +4,7 @@ use std::sync::Arc; use alloy_network::Ethereum; use alloy_primitives::{Address, LogData, U256}; -use alloy_provider::{HttpProvider, Provider}; +use alloy_provider::{Provider, ReqwestProvider}; use alloy_rpc_types::{BlockNumberOrTag, Filter, FilterBlockOption, FilterSet, Log, Topic}; use alloy_sol_types::{sol, SolEvent}; use anyhow::Result; @@ -41,14 +41,14 @@ sol! { } pub struct EthereumMessaging { - provider: Arc>, + provider: Arc>, messaging_contract_address: Address, } impl EthereumMessaging { pub async fn new(config: MessagingConfig) -> Result { Ok(EthereumMessaging { - provider: Arc::new(HttpProvider::::new_http(reqwest::Url::parse( + provider: Arc::new(ReqwestProvider::::new_http(reqwest::Url::parse( &config.rpc_url, )?)), messaging_contract_address: config.contract_address.parse::
()?, @@ -98,15 +98,7 @@ impl EthereumMessaging { .await? .into_iter() .filter(|log| log.block_number.is_some()) - .map(|log| { - ( - log.block_number - .unwrap() - .try_into() - .expect("Block number couldn't be converted to u64."), - log, - ) - }) + .map(|log| (log.block_number.unwrap(), log)) .for_each(|(block_num, log)| { block_to_logs .entry(block_num) @@ -200,7 +192,12 @@ impl Messenger for EthereumMessaging { fn l1_handler_tx_from_log(log: Log, chain_id: ChainId) -> MessengerResult { let parsed_log = LogMessageToL2::LogMessageToL2Event::decode_log( - &alloy_primitives::Log::::new(log.address, log.topics, log.data).unwrap(), + &alloy_primitives::Log::::new( + log.address(), + log.topics().into(), + log.data().clone().data, + ) + .unwrap(), false, ) .unwrap(); @@ -279,17 +276,22 @@ mod tests { felt!("0x6182c63599a9638272f1ce5b5cadabece9c81c2d2b8f88ab7a294472b8fce8b"); let log = Log { - address: Address::from_str("0xde29d060D45901Fb19ED6C6e959EB22d8626708e").unwrap(), - topics: vec![ - B256::from_str( - "0xdb80dd488acf86d17c747445b0eabb5d57c541d3bd7b6b87af987858e5066b2b", + inner: alloy_primitives::Log:: { + address: Address::from_str("0xde29d060D45901Fb19ED6C6e959EB22d8626708e").unwrap(), + data: LogData::new( + vec![ + B256::from_str( + "0xdb80dd488acf86d17c747445b0eabb5d57c541d3bd7b6b87af987858e5066b2b", + ) + .unwrap(), + B256::from_str(from_address).unwrap(), + B256::from_str(to_address).unwrap(), + B256::from_str(selector).unwrap(), + ], + payload_buf.into(), ) - .unwrap(), - B256::from_str(from_address).unwrap(), - B256::from_str(to_address).unwrap(), - B256::from_str(selector).unwrap(), - ], - data: payload_buf.into(), + .expect("Failed to load log data"), + }, ..Default::default() };