diff --git a/Cargo.lock b/Cargo.lock index 5e11b8cf71..ae8aed28c9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -180,20 +180,20 @@ name = "alloy" version = "0.3.6" source = "git+https://github.com/alloy-rs/alloy#04b1e0984b8661ef910b0ae88e1ef218db66b636" dependencies = [ - "alloy-consensus 0.3.6 (git+https://github.com/alloy-rs/alloy)", - "alloy-contract 0.3.6 (git+https://github.com/alloy-rs/alloy)", + "alloy-consensus 0.3.6", + "alloy-contract 0.3.6", "alloy-core", - "alloy-eips 0.3.6 (git+https://github.com/alloy-rs/alloy)", + "alloy-eips 0.3.6", "alloy-genesis", - "alloy-network 0.3.6 (git+https://github.com/alloy-rs/alloy)", + "alloy-network 0.3.6", "alloy-node-bindings", - "alloy-provider 0.3.6 (git+https://github.com/alloy-rs/alloy)", - "alloy-rpc-client 0.3.6 (git+https://github.com/alloy-rs/alloy)", - "alloy-serde 0.3.6 (git+https://github.com/alloy-rs/alloy)", - "alloy-signer 0.3.6 (git+https://github.com/alloy-rs/alloy)", + "alloy-provider 0.3.6", + "alloy-rpc-client 0.3.6", + "alloy-serde 0.3.6", + "alloy-signer 0.3.6", "alloy-signer-local", - "alloy-transport 0.3.6 (git+https://github.com/alloy-rs/alloy)", - "alloy-transport-http 0.3.6 (git+https://github.com/alloy-rs/alloy)", + "alloy-transport 0.3.6", + "alloy-transport-http 0.3.6", ] [[package]] @@ -209,26 +209,28 @@ dependencies = [ [[package]] name = "alloy-consensus" version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "629b62e38d471cc15fea534eb7283d2f8a4e8bdb1811bcc5d66dda6cfce6fae1" +source = "git+https://github.com/alloy-rs/alloy#04b1e0984b8661ef910b0ae88e1ef218db66b636" dependencies = [ - "alloy-eips 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-eips 0.3.6", "alloy-primitives", "alloy-rlp", - "alloy-serde 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-serde 0.3.6", "c-kzg", + "derive_more 1.0.0", "serde", ] [[package]] name = "alloy-consensus" -version = "0.3.6" -source = "git+https://github.com/alloy-rs/alloy#04b1e0984b8661ef910b0ae88e1ef218db66b636" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "705687d5bfd019fee57cf9e206b27b30a9a9617535d5590a02b171e813208f8e" dependencies = [ - "alloy-eips 0.3.6 (git+https://github.com/alloy-rs/alloy)", + "alloy-eips 0.4.0", "alloy-primitives", "alloy-rlp", - "alloy-serde 0.3.6 (git+https://github.com/alloy-rs/alloy)", + "alloy-serde 0.4.2", + "auto_impl", "c-kzg", "derive_more 1.0.0", "serde", @@ -237,18 +239,17 @@ dependencies = [ [[package]] name = "alloy-contract" version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eefe64fd344cffa9cf9e3435ec4e93e6e9c3481bc37269af988bf497faf4a6a" +source = "git+https://github.com/alloy-rs/alloy#04b1e0984b8661ef910b0ae88e1ef218db66b636" dependencies = [ "alloy-dyn-abi", "alloy-json-abi", - "alloy-network 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-network-primitives 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-network 0.3.6", + "alloy-network-primitives 0.3.6", "alloy-primitives", - "alloy-provider 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-rpc-types-eth 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-provider 0.3.6", + "alloy-rpc-types-eth 0.3.6", "alloy-sol-types", - "alloy-transport 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-transport 0.3.6", "futures", "futures-util", "thiserror 1.0.63", @@ -256,18 +257,19 @@ dependencies = [ [[package]] name = "alloy-contract" -version = "0.3.6" -source = "git+https://github.com/alloy-rs/alloy#04b1e0984b8661ef910b0ae88e1ef218db66b636" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "917f7d12cf3971dc8c11c9972f732b35ccb9aaaf5f28f2f87e9e6523bee3a8ad" dependencies = [ "alloy-dyn-abi", "alloy-json-abi", - "alloy-network 0.3.6 (git+https://github.com/alloy-rs/alloy)", - "alloy-network-primitives 0.3.6 (git+https://github.com/alloy-rs/alloy)", + "alloy-network 0.4.2", + "alloy-network-primitives 0.4.2", "alloy-primitives", - "alloy-provider 0.3.6 (git+https://github.com/alloy-rs/alloy)", - "alloy-rpc-types-eth 0.3.6 (git+https://github.com/alloy-rs/alloy)", + "alloy-provider 0.4.2", + "alloy-rpc-types-eth 0.4.2", "alloy-sol-types", - "alloy-transport 0.3.6 (git+https://github.com/alloy-rs/alloy)", + "alloy-transport 0.4.2", "futures", "futures-util", "thiserror 1.0.63", @@ -287,9 +289,9 @@ dependencies = [ [[package]] name = "alloy-dyn-abi" -version = "0.8.3" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4004925bff5ba0a11739ae84dbb6601a981ea692f3bd45b626935ee90a6b8471" +checksum = "41056bde53ae10ffbbf11618efbe1e0290859e5eab0fe9ef82ebdb62f12a866f" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -327,14 +329,13 @@ dependencies = [ [[package]] name = "alloy-eips" version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f923dd5fca5f67a43d81ed3ebad0880bd41f6dd0ada930030353ac356c54cd0f" +source = "git+https://github.com/alloy-rs/alloy#04b1e0984b8661ef910b0ae88e1ef218db66b636" dependencies = [ "alloy-eip2930", "alloy-eip7702", "alloy-primitives", "alloy-rlp", - "alloy-serde 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-serde 0.3.6", "c-kzg", "derive_more 1.0.0", "once_cell", @@ -344,14 +345,15 @@ dependencies = [ [[package]] name = "alloy-eips" -version = "0.3.6" -source = "git+https://github.com/alloy-rs/alloy#04b1e0984b8661ef910b0ae88e1ef218db66b636" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2717a756c33fe935751d8963b5898d406c8846199660c9d6c6eeb41a18a15697" dependencies = [ "alloy-eip2930", "alloy-eip7702", "alloy-primitives", "alloy-rlp", - "alloy-serde 0.3.6 (git+https://github.com/alloy-rs/alloy)", + "alloy-serde 0.4.2", "c-kzg", "derive_more 1.0.0", "once_cell", @@ -365,15 +367,15 @@ version = "0.3.6" source = "git+https://github.com/alloy-rs/alloy#04b1e0984b8661ef910b0ae88e1ef218db66b636" dependencies = [ "alloy-primitives", - "alloy-serde 0.3.6 (git+https://github.com/alloy-rs/alloy)", + "alloy-serde 0.3.6", "serde", ] [[package]] name = "alloy-json-abi" -version = "0.8.3" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9996daf962fd0a90d3c93b388033228865953b92de7bb1959b891d78750a4091" +checksum = "c357da577dfb56998d01f574d81ad7a1958d248740a7981b205d69d65a7da404" dependencies = [ "alloy-primitives", "alloy-sol-type-parser", @@ -384,8 +386,7 @@ dependencies = [ [[package]] name = "alloy-json-rpc" version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3c717b5298fad078cd3a418335b266eba91b511383ca9bd497f742d5975d5ab" +source = "git+https://github.com/alloy-rs/alloy#04b1e0984b8661ef910b0ae88e1ef218db66b636" dependencies = [ "alloy-primitives", "alloy-sol-types", @@ -397,8 +398,9 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "0.3.6" -source = "git+https://github.com/alloy-rs/alloy#04b1e0984b8661ef910b0ae88e1ef218db66b636" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8fa8a1a3c4cbd221f2b8e3693aeb328fca79a757fe556ed08e47bbbc2a70db7" dependencies = [ "alloy-primitives", "alloy-sol-types", @@ -411,17 +413,16 @@ dependencies = [ [[package]] name = "alloy-network" version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb3705ce7d8602132bcf5ac7a1dd293a42adc2f183abf5907c30ac535ceca049" +source = "git+https://github.com/alloy-rs/alloy#04b1e0984b8661ef910b0ae88e1ef218db66b636" dependencies = [ - "alloy-consensus 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-eips 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-json-rpc 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-network-primitives 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-consensus 0.3.6", + "alloy-eips 0.3.6", + "alloy-json-rpc 0.3.6", + "alloy-network-primitives 0.3.6", "alloy-primitives", - "alloy-rpc-types-eth 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-serde 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-signer 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-rpc-types-eth 0.3.6", + "alloy-serde 0.3.6", + "alloy-signer 0.3.6", "alloy-sol-types", "async-trait", "auto_impl", @@ -431,17 +432,18 @@ dependencies = [ [[package]] name = "alloy-network" -version = "0.3.6" -source = "git+https://github.com/alloy-rs/alloy#04b1e0984b8661ef910b0ae88e1ef218db66b636" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85fa23a6a9d612b52e402c995f2d582c25165ec03ac6edf64c861a76bc5b87cd" dependencies = [ - "alloy-consensus 0.3.6 (git+https://github.com/alloy-rs/alloy)", - "alloy-eips 0.3.6 (git+https://github.com/alloy-rs/alloy)", - "alloy-json-rpc 0.3.6 (git+https://github.com/alloy-rs/alloy)", - "alloy-network-primitives 0.3.6 (git+https://github.com/alloy-rs/alloy)", + "alloy-consensus 0.4.2", + "alloy-eips 0.4.0", + "alloy-json-rpc 0.4.2", + "alloy-network-primitives 0.4.2", "alloy-primitives", - "alloy-rpc-types-eth 0.3.6 (git+https://github.com/alloy-rs/alloy)", - "alloy-serde 0.3.6 (git+https://github.com/alloy-rs/alloy)", - "alloy-signer 0.3.6 (git+https://github.com/alloy-rs/alloy)", + "alloy-rpc-types-eth 0.4.2", + "alloy-serde 0.4.2", + "alloy-signer 0.4.2", "alloy-sol-types", "async-trait", "auto_impl", @@ -452,23 +454,24 @@ dependencies = [ [[package]] name = "alloy-network-primitives" version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94ad40869867ed2d9cd3842b1e800889e5b49e6b92da346e93862b4a741bedf3" +source = "git+https://github.com/alloy-rs/alloy#04b1e0984b8661ef910b0ae88e1ef218db66b636" dependencies = [ - "alloy-eips 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-eips 0.3.6", "alloy-primitives", - "alloy-serde 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-serde 0.3.6", "serde", ] [[package]] name = "alloy-network-primitives" -version = "0.3.6" -source = "git+https://github.com/alloy-rs/alloy#04b1e0984b8661ef910b0ae88e1ef218db66b636" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "801492711d4392b2ccf5fc0bc69e299fa1aab15167d74dcaa9aab96a54f684bd" dependencies = [ - "alloy-eips 0.3.6 (git+https://github.com/alloy-rs/alloy)", + "alloy-consensus 0.4.2", + "alloy-eips 0.4.0", "alloy-primitives", - "alloy-serde 0.3.6 (git+https://github.com/alloy-rs/alloy)", + "alloy-serde 0.4.2", "serde", ] @@ -490,9 +493,9 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "0.8.3" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "411aff151f2a73124ee473708e82ed51b2535f68928b6a1caa8bc1246ae6f7cd" +checksum = "6259a506ab13e1d658796c31e6e39d2e2ee89243bcc505ddc613b35732e0a430" dependencies = [ "alloy-rlp", "arbitrary", @@ -501,35 +504,43 @@ dependencies = [ "const-hex", "derive_arbitrary", "derive_more 1.0.0", + "foldhash", + "hashbrown 0.15.2", "hex-literal", + "indexmap 2.5.0", "itoa", "k256", "keccak-asm", + "paste", "proptest", "proptest-derive", "rand", "ruint", + "rustc-hash 2.0.0", "serde", + "sha3", "tiny-keccak", ] [[package]] name = "alloy-provider" version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927f708dd457ed63420400ee5f06945df9632d5d101851952056840426a10dc5" +source = "git+https://github.com/alloy-rs/alloy#04b1e0984b8661ef910b0ae88e1ef218db66b636" dependencies = [ "alloy-chains", - "alloy-consensus 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-eips 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-json-rpc 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-network 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-network-primitives 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-consensus 0.3.6", + "alloy-eips 0.3.6", + "alloy-json-rpc 0.3.6", + "alloy-network 0.3.6", + "alloy-network-primitives 0.3.6", + "alloy-node-bindings", "alloy-primitives", - "alloy-rpc-client 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-rpc-types-eth 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-transport 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-transport-http 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-rpc-client 0.3.6", + "alloy-rpc-types-anvil", + "alloy-rpc-types-eth 0.3.6", + "alloy-signer-local", + "alloy-transport 0.3.6", + "alloy-transport-http 0.3.6", "async-stream", "async-trait", "auto_impl", @@ -549,23 +560,21 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "0.3.6" -source = "git+https://github.com/alloy-rs/alloy#04b1e0984b8661ef910b0ae88e1ef218db66b636" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcfaa4ffec0af04e3555686b8aacbcdf7d13638133a0672749209069750f78a6" dependencies = [ "alloy-chains", - "alloy-consensus 0.3.6 (git+https://github.com/alloy-rs/alloy)", - "alloy-eips 0.3.6 (git+https://github.com/alloy-rs/alloy)", - "alloy-json-rpc 0.3.6 (git+https://github.com/alloy-rs/alloy)", - "alloy-network 0.3.6 (git+https://github.com/alloy-rs/alloy)", - "alloy-network-primitives 0.3.6 (git+https://github.com/alloy-rs/alloy)", - "alloy-node-bindings", + "alloy-consensus 0.4.2", + "alloy-eips 0.4.0", + "alloy-json-rpc 0.4.2", + "alloy-network 0.4.2", + "alloy-network-primitives 0.4.2", "alloy-primitives", - "alloy-rpc-client 0.3.6 (git+https://github.com/alloy-rs/alloy)", - "alloy-rpc-types-anvil", - "alloy-rpc-types-eth 0.3.6 (git+https://github.com/alloy-rs/alloy)", - "alloy-signer-local", - "alloy-transport 0.3.6 (git+https://github.com/alloy-rs/alloy)", - "alloy-transport-http 0.3.6 (git+https://github.com/alloy-rs/alloy)", + "alloy-rpc-client 0.4.2", + "alloy-rpc-types-eth 0.4.2", + "alloy-transport 0.4.2", + "alloy-transport-http 0.4.2", "async-stream", "async-trait", "auto_impl", @@ -608,12 +617,11 @@ dependencies = [ [[package]] name = "alloy-rpc-client" version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d82952dca71173813d4e5733e2c986d8b04aea9e0f3b0a576664c232ad050a5" +source = "git+https://github.com/alloy-rs/alloy#04b1e0984b8661ef910b0ae88e1ef218db66b636" dependencies = [ - "alloy-json-rpc 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-transport 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-transport-http 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-json-rpc 0.3.6", + "alloy-transport 0.3.6", + "alloy-transport-http 0.3.6", "futures", "pin-project", "reqwest 0.12.7", @@ -628,12 +636,14 @@ dependencies = [ [[package]] name = "alloy-rpc-client" -version = "0.3.6" -source = "git+https://github.com/alloy-rs/alloy#04b1e0984b8661ef910b0ae88e1ef218db66b636" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "370143ed581aace6e663342d21d209c6b2e34ee6142f7d6675adb518deeaf0dc" dependencies = [ - "alloy-json-rpc 0.3.6 (git+https://github.com/alloy-rs/alloy)", - "alloy-transport 0.3.6 (git+https://github.com/alloy-rs/alloy)", - "alloy-transport-http 0.3.6 (git+https://github.com/alloy-rs/alloy)", + "alloy-json-rpc 0.4.2", + "alloy-primitives", + "alloy-transport 0.4.2", + "alloy-transport-http 0.4.2", "futures", "pin-project", "reqwest 0.12.7", @@ -652,22 +662,21 @@ version = "0.3.6" source = "git+https://github.com/alloy-rs/alloy#04b1e0984b8661ef910b0ae88e1ef218db66b636" dependencies = [ "alloy-primitives", - "alloy-serde 0.3.6 (git+https://github.com/alloy-rs/alloy)", + "alloy-serde 0.3.6", "serde", ] [[package]] name = "alloy-rpc-types-eth" version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83aa984386deda02482660aa31cb8ca1e63d533f1c31a52d7d181ac5ec68e9b8" +source = "git+https://github.com/alloy-rs/alloy#04b1e0984b8661ef910b0ae88e1ef218db66b636" dependencies = [ - "alloy-consensus 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-eips 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-network-primitives 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-consensus 0.3.6", + "alloy-eips 0.3.6", + "alloy-network-primitives 0.3.6", "alloy-primitives", "alloy-rlp", - "alloy-serde 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-serde 0.3.6", "alloy-sol-types", "cfg-if", "derive_more 1.0.0", @@ -679,19 +688,18 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "0.3.6" -source = "git+https://github.com/alloy-rs/alloy#04b1e0984b8661ef910b0ae88e1ef218db66b636" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413f4aa3ccf2c3e4234a047c5fa4727916d7daf25a89f9b765df0ba09784fd87" dependencies = [ - "alloy-consensus 0.3.6 (git+https://github.com/alloy-rs/alloy)", - "alloy-eips 0.3.6 (git+https://github.com/alloy-rs/alloy)", - "alloy-network-primitives 0.3.6 (git+https://github.com/alloy-rs/alloy)", + "alloy-consensus 0.4.2", + "alloy-eips 0.4.0", + "alloy-network-primitives 0.4.2", "alloy-primitives", "alloy-rlp", - "alloy-serde 0.3.6 (git+https://github.com/alloy-rs/alloy)", + "alloy-serde 0.4.2", "alloy-sol-types", - "cfg-if", "derive_more 1.0.0", - "hashbrown 0.14.5", "itertools 0.13.0", "serde", "serde_json", @@ -700,8 +708,7 @@ dependencies = [ [[package]] name = "alloy-serde" version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "731f75ec5d383107fd745d781619bd9cedf145836c51ecb991623d41278e71fa" +source = "git+https://github.com/alloy-rs/alloy#04b1e0984b8661ef910b0ae88e1ef218db66b636" dependencies = [ "alloy-primitives", "serde", @@ -710,8 +717,9 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "0.3.6" -source = "git+https://github.com/alloy-rs/alloy#04b1e0984b8661ef910b0ae88e1ef218db66b636" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dff0ab1cdd43ca001e324dc27ee0e8606bd2161d6623c63e0e0b8c4dfc13600" dependencies = [ "alloy-primitives", "serde", @@ -721,8 +729,7 @@ dependencies = [ [[package]] name = "alloy-signer" version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307324cca94354cd654d6713629f0383ec037e1ff9e3e3d547212471209860c0" +source = "git+https://github.com/alloy-rs/alloy#04b1e0984b8661ef910b0ae88e1ef218db66b636" dependencies = [ "alloy-primitives", "async-trait", @@ -734,8 +741,9 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "0.3.6" -source = "git+https://github.com/alloy-rs/alloy#04b1e0984b8661ef910b0ae88e1ef218db66b636" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fd4e0ad79c81a27ca659be5d176ca12399141659fef2bcbfdc848da478f4504" dependencies = [ "alloy-primitives", "async-trait", @@ -750,10 +758,10 @@ name = "alloy-signer-local" version = "0.3.6" source = "git+https://github.com/alloy-rs/alloy#04b1e0984b8661ef910b0ae88e1ef218db66b636" dependencies = [ - "alloy-consensus 0.3.6 (git+https://github.com/alloy-rs/alloy)", - "alloy-network 0.3.6 (git+https://github.com/alloy-rs/alloy)", + "alloy-consensus 0.3.6", + "alloy-network 0.3.6", "alloy-primitives", - "alloy-signer 0.3.6 (git+https://github.com/alloy-rs/alloy)", + "alloy-signer 0.3.6", "async-trait", "k256", "rand", @@ -762,9 +770,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro" -version = "0.8.3" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0458ccb02a564228fcd76efb8eb5a520521a8347becde37b402afec9a1b83859" +checksum = "d9d64f851d95619233f74b310f12bcf16e0cbc27ee3762b6115c14a84809280a" dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", @@ -776,9 +784,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro-expander" -version = "0.8.3" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc65475025fc1e84bf86fc840f04f63fcccdcf3cf12053c99918e4054dfbc69" +checksum = "6bf7ed1574b699f48bf17caab4e6e54c6d12bc3c006ab33d58b1e227c1c3559f" dependencies = [ "alloy-json-abi", "alloy-sol-macro-input", @@ -795,9 +803,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro-input" -version = "0.8.3" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed10f0715a0b69fde3236ff3b9ae5f6f7c97db5a387747100070d3016b9266b" +checksum = "8c02997ccef5f34f9c099277d4145f183b422938ed5322dc57a089fe9b9ad9ee" dependencies = [ "alloy-json-abi", "const-hex", @@ -812,9 +820,9 @@ dependencies = [ [[package]] name = "alloy-sol-type-parser" -version = "0.8.3" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3edae8ea1de519ccba896b6834dec874230f72fe695ff3c9c118e90ec7cff783" +checksum = "ce13ff37285b0870d0a0746992a4ae48efaf34b766ae4c2640fa15e5305f8e73" dependencies = [ "serde", "winnow", @@ -822,9 +830,9 @@ dependencies = [ [[package]] name = "alloy-sol-types" -version = "0.8.3" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1eb88e4da0a1b697ed6a9f811fdba223cf4d5c21410804fd1707836af73a462b" +checksum = "1174cafd6c6d810711b4e00383037bdb458efc4fe3dbafafa16567e0320c54d8" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -836,10 +844,9 @@ dependencies = [ [[package]] name = "alloy-transport" version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33616b2edf7454302a1d48084db185e52c309f73f6c10be99b0fe39354b3f1e9" +source = "git+https://github.com/alloy-rs/alloy#04b1e0984b8661ef910b0ae88e1ef218db66b636" dependencies = [ - "alloy-json-rpc 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-json-rpc 0.3.6", "base64 0.22.1", "futures-util", "futures-utils-wasm", @@ -854,10 +861,11 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "0.3.6" -source = "git+https://github.com/alloy-rs/alloy#04b1e0984b8661ef910b0ae88e1ef218db66b636" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ac3e97dad3d31770db0fc89bd6a63b789fbae78963086733f960cf32c483904" dependencies = [ - "alloy-json-rpc 0.3.6 (git+https://github.com/alloy-rs/alloy)", + "alloy-json-rpc 0.4.2", "base64 0.22.1", "futures-util", "futures-utils-wasm", @@ -873,11 +881,10 @@ dependencies = [ [[package]] name = "alloy-transport-http" version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a944f5310c690b62bbb3e7e5ce34527cbd36b2d18532a797af123271ce595a49" +source = "git+https://github.com/alloy-rs/alloy#04b1e0984b8661ef910b0ae88e1ef218db66b636" dependencies = [ - "alloy-json-rpc 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-transport 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-json-rpc 0.3.6", + "alloy-transport 0.3.6", "reqwest 0.12.7", "serde_json", "tower 0.5.1", @@ -887,11 +894,12 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "0.3.6" -source = "git+https://github.com/alloy-rs/alloy#04b1e0984b8661ef910b0ae88e1ef218db66b636" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b367dcccada5b28987c2296717ee04b9a5637aacd78eacb1726ef211678b5212" dependencies = [ - "alloy-json-rpc 0.3.6 (git+https://github.com/alloy-rs/alloy)", - "alloy-transport 0.3.6 (git+https://github.com/alloy-rs/alloy)", + "alloy-json-rpc 0.4.2", + "alloy-transport 0.4.2", "reqwest 0.12.7", "serde_json", "tower 0.5.1", @@ -3778,9 +3786,9 @@ checksum = "32b13ea120a812beba79e34316b3942a857c86ec1593cb34f27bb28272ce2cca" [[package]] name = "const-hex" -version = "1.12.0" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94fb8a24a26d37e1ffd45343323dc9fe6654ceea44c12f2fcb3d7ac29e610bc6" +checksum = "4b0485bab839b018a8f1723fc5391819fea5f8f0f32288ef8a735fd096b6160c" dependencies = [ "cfg-if", "cpufeatures", @@ -5263,6 +5271,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f" + [[package]] name = "foreign-types" version = "0.3.2" @@ -6725,6 +6739,16 @@ dependencies = [ "serde", ] +[[package]] +name = "hashbrown" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" +dependencies = [ + "foldhash", + "serde", +] + [[package]] name = "hashlink" version = "0.9.1" @@ -7437,6 +7461,7 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ + "arbitrary", "equivalent", "hashbrown 0.14.5", "serde", @@ -8121,8 +8146,8 @@ name = "katana-core" version = "1.1.2" dependencies = [ "alloy-primitives", - "alloy-provider 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-rpc-types-eth 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-provider 0.4.2", + "alloy-rpc-types-eth 0.4.2", "anyhow", "arbitrary", "assert_matches", @@ -8239,13 +8264,13 @@ dependencies = [ name = "katana-messaging" version = "1.1.2" dependencies = [ - "alloy-contract 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-network 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-contract 0.4.2", + "alloy-network 0.4.2", "alloy-primitives", - "alloy-provider 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "alloy-rpc-types-eth 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-provider 0.4.2", + "alloy-rpc-types-eth 0.4.2", "alloy-sol-types", - "alloy-transport 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "alloy-transport 0.4.2", "anyhow", "async-trait", "futures", @@ -11517,6 +11542,7 @@ dependencies = [ "libc", "rand_chacha", "rand_core", + "serde", ] [[package]] @@ -14230,9 +14256,9 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "0.8.3" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b95156f8b577cb59dc0b1df15c6f29a10afc5f8a7ac9786b0b5c68c19149278" +checksum = "9c2de690018098e367beeb793991c7d4dc7270f42c9d2ac4ccc876c1368ca430" dependencies = [ "paste", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index 173427fd8a..517291653e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -257,22 +257,24 @@ wasm-prost = { version = "0.13", package = "prost" } wasm-tonic = { version = "0.12", default-features = false, features = [ "codegen", "gzip", "prost" ], package = "tonic" } wasm-tonic-build = { version = "0.12", default-features = false, features = [ "prost" ], package = "tonic-build" } -alloy-primitives = { version = "0.8.3", default-features = false } -alloy-sol-types = { version = "0.8.3", default-features = false } - criterion = "0.5.1" pprof = { version = "0.13.0", features = [ "criterion", "flamegraph" ] } # Slot integration. Dojo don't need to manually include `account_sdk` as dependency as `slot` already re-exports it. slot = { git = "https://github.com/cartridge-gg/slot", rev = "1298a30" } -alloy-contract = { version = "0.3", default-features = false } -alloy-json-rpc = { version = "0.3", default-features = false } -alloy-network = { version = "0.3", default-features = false } -alloy-provider = { version = "0.3", default-features = false } -alloy-rpc-types-eth = { version = "0.3", default-features = false } -alloy-signer = { version = "0.3", default-features = false } -alloy-transport = { version = "0.3", default-features = false } +# alloy core +alloy-primitives = { version = "0.8", default-features = false } +alloy-sol-types = { version = "0.8", default-features = false } + +# alloy +alloy-contract = { version = "0.4", default-features = false } +alloy-json-rpc = { version = "0.4", default-features = false } +alloy-network = { version = "0.4", default-features = false } +alloy-provider = { version = "0.4", default-features = false } +alloy-rpc-types-eth = { version = "0.4", default-features = false } +alloy-signer = { version = "0.4", default-features = false } +alloy-transport = { version = "0.4", default-features = false } starknet = "0.12.0" starknet-crypto = "0.7.1" diff --git a/crates/katana/messaging/src/ethereum.rs b/crates/katana/messaging/src/ethereum.rs index 982f80f7aa..fcaf0972f6 100644 --- a/crates/katana/messaging/src/ethereum.rs +++ b/crates/katana/messaging/src/ethereum.rs @@ -30,18 +30,15 @@ sol! { } sol! { - #[sol(rpc)] - contract LogMessageToL2 { - #[derive(Debug, PartialEq)] - event LogMessageToL2Event( - address indexed from_address, - uint256 indexed to_address, - uint256 indexed selector, - uint256[] payload, - uint256 nonce, - uint256 fee - ); - } + #[derive(Debug, PartialEq)] + event LogMessageToL2( + address indexed from_address, + uint256 indexed to_address, + uint256 indexed selector, + uint256[] payload, + uint256 nonce, + uint256 fee + ); } #[derive(Debug)] @@ -189,7 +186,7 @@ impl Messenger for EthereumMessaging { // TODO: refactor this as a method of the message log struct fn l1_handler_tx_from_log(log: Log, chain_id: ChainId) -> MessengerResult { - let log = LogMessageToL2::LogMessageToL2Event::decode_log(log.as_ref(), false).unwrap(); + let log = LogMessageToL2::decode_log(log.as_ref(), false).unwrap(); let from_address = EthAddress::try_from(log.from_address.as_slice()).expect("valid address"); let contract_address = felt_from_u256(log.to_address); @@ -264,7 +261,7 @@ mod tests { let expected_tx_hash = felt!("0x6182c63599a9638272f1ce5b5cadabece9c81c2d2b8f88ab7a294472b8fce8b"); - let event = LogMessageToL2::LogMessageToL2Event::new( + let event = LogMessageToL2::new( ( b256!("db80dd488acf86d17c747445b0eabb5d57c541d3bd7b6b87af987858e5066b2b"), address!("be3C44c09bc1a3566F3e1CA12e5AbA0fA4Ca72Be"),