From 3f1d0d1dc6a50670ad2764ba4810dff77bb4c3c1 Mon Sep 17 00:00:00 2001 From: Warm Beer Date: Wed, 23 Oct 2024 10:04:16 +0200 Subject: [PATCH] chore: upgrade alloy to version 0.5.3 --- Cargo.lock | 493 +++++++++++++++++++++++++++++++++++++++------- evmlib/Cargo.toml | 2 +- 2 files changed, 427 insertions(+), 68 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e76033a306..6fff45c6aa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -122,21 +122,44 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "056f2c01b2aed86e15b43c47d109bfc8b82553dc34e66452875e51247ec31ab2" dependencies = [ - "alloy-consensus", - "alloy-contract", + "alloy-consensus 0.4.2", + "alloy-contract 0.4.2", "alloy-core", - "alloy-eips", - "alloy-genesis", - "alloy-network", - "alloy-node-bindings", - "alloy-provider", - "alloy-rpc-client", - "alloy-rpc-types", - "alloy-serde", - "alloy-signer", - "alloy-signer-local", - "alloy-transport", - "alloy-transport-http", + "alloy-eips 0.4.2", + "alloy-genesis 0.4.2", + "alloy-network 0.4.2", + "alloy-node-bindings 0.4.2", + "alloy-provider 0.4.2", + "alloy-rpc-client 0.4.2", + "alloy-rpc-types 0.4.2", + "alloy-serde 0.4.2", + "alloy-signer 0.4.2", + "alloy-signer-local 0.4.2", + "alloy-transport 0.4.2", + "alloy-transport-http 0.4.2", +] + +[[package]] +name = "alloy" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8cbebb817e6ada1abb27e642592a39eebc963eb0b9e78f66c467549f3903770" +dependencies = [ + "alloy-consensus 0.5.3", + "alloy-contract 0.5.3", + "alloy-core", + "alloy-eips 0.5.3", + "alloy-genesis 0.5.3", + "alloy-network 0.5.3", + "alloy-node-bindings 0.5.3", + "alloy-provider 0.5.3", + "alloy-rpc-client 0.5.3", + "alloy-rpc-types 0.5.3", + "alloy-serde 0.5.3", + "alloy-signer 0.5.3", + "alloy-signer-local 0.5.3", + "alloy-transport 0.5.3", + "alloy-transport-http 0.5.3", ] [[package]] @@ -155,10 +178,26 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "705687d5bfd019fee57cf9e206b27b30a9a9617535d5590a02b171e813208f8e" dependencies = [ - "alloy-eips", + "alloy-eips 0.4.2", "alloy-primitives", "alloy-rlp", - "alloy-serde", + "alloy-serde 0.4.2", + "auto_impl", + "c-kzg", + "derive_more", + "serde", +] + +[[package]] +name = "alloy-consensus" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdf02dfacfc815214f9b54ff50d54900ba527a68fd73e2c5637ced3460005045" +dependencies = [ + "alloy-eips 0.5.3", + "alloy-primitives", + "alloy-rlp", + "alloy-serde 0.5.3", "auto_impl", "c-kzg", "derive_more", @@ -173,13 +212,33 @@ checksum = "917f7d12cf3971dc8c11c9972f732b35ccb9aaaf5f28f2f87e9e6523bee3a8ad" dependencies = [ "alloy-dyn-abi", "alloy-json-abi", - "alloy-network", - "alloy-network-primitives", + "alloy-network 0.4.2", + "alloy-network-primitives 0.4.2", + "alloy-primitives", + "alloy-provider 0.4.2", + "alloy-rpc-types-eth 0.4.2", + "alloy-sol-types", + "alloy-transport 0.4.2", + "futures", + "futures-util", + "thiserror", +] + +[[package]] +name = "alloy-contract" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d45354c6946d064827d3b85041876aad9490b634f1761139934f8b1f65686b09" +dependencies = [ + "alloy-dyn-abi", + "alloy-json-abi", + "alloy-network 0.5.3", + "alloy-network-primitives 0.5.3", "alloy-primitives", - "alloy-provider", - "alloy-rpc-types-eth", + "alloy-provider 0.5.3", + "alloy-rpc-types-eth 0.5.3", "alloy-sol-types", - "alloy-transport", + "alloy-transport 0.5.3", "futures", "futures-util", "thiserror", @@ -237,6 +296,18 @@ dependencies = [ "serde", ] +[[package]] +name = "alloy-eip7702" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c15873ee28dfe5a1aeddd762483bc7f378b465ec49bdce8165c4c46b4f55cb0a" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "derive_more", + "serde", +] + [[package]] name = "alloy-eips" version = "0.4.2" @@ -244,10 +315,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ffb906284a1e1f63c4607da2068c8197458a352d0b3e9796e67353d72a9be85" dependencies = [ "alloy-eip2930", - "alloy-eip7702", + "alloy-eip7702 0.1.1", + "alloy-primitives", + "alloy-rlp", + "alloy-serde 0.4.2", + "c-kzg", + "derive_more", + "once_cell", + "serde", + "sha2 0.10.8", +] + +[[package]] +name = "alloy-eips" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "769da342b6bcd945013925ef4c40763cc82f11e002c60702dba8b444bb60e5a7" +dependencies = [ + "alloy-eip2930", + "alloy-eip7702 0.3.1", "alloy-primitives", "alloy-rlp", - "alloy-serde", + "alloy-serde 0.5.3", "c-kzg", "derive_more", "once_cell", @@ -262,7 +351,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8429cf4554eed9b40feec7f4451113e76596086447550275e3def933faf47ce3" dependencies = [ "alloy-primitives", - "alloy-serde", + "alloy-serde 0.4.2", + "serde", +] + +[[package]] +name = "alloy-genesis" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c698ce0ada980b17f0323e1a28c7da8a2e9abc6dff5be9ee33d1525b28ac46b6" +dependencies = [ + "alloy-primitives", + "alloy-serde 0.5.3", "serde", ] @@ -292,20 +392,55 @@ dependencies = [ "tracing", ] +[[package]] +name = "alloy-json-rpc" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1050e1d65524c030b17442b6546b564da51fdab7f71bd534b001ba65f2ebb16" +dependencies = [ + "alloy-primitives", + "alloy-sol-types", + "serde", + "serde_json", + "thiserror", + "tracing", +] + [[package]] name = "alloy-network" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85fa23a6a9d612b52e402c995f2d582c25165ec03ac6edf64c861a76bc5b87cd" dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-json-rpc", - "alloy-network-primitives", + "alloy-consensus 0.4.2", + "alloy-eips 0.4.2", + "alloy-json-rpc 0.4.2", + "alloy-network-primitives 0.4.2", + "alloy-primitives", + "alloy-rpc-types-eth 0.4.2", + "alloy-serde 0.4.2", + "alloy-signer 0.4.2", + "alloy-sol-types", + "async-trait", + "auto_impl", + "futures-utils-wasm", + "thiserror", +] + +[[package]] +name = "alloy-network" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da34a18446a27734473af3d77eb21c5ebbdf97ea8eb65c39c0b50916bc659023" +dependencies = [ + "alloy-consensus 0.5.3", + "alloy-eips 0.5.3", + "alloy-json-rpc 0.5.3", + "alloy-network-primitives 0.5.3", "alloy-primitives", - "alloy-rpc-types-eth", - "alloy-serde", - "alloy-signer", + "alloy-rpc-types-eth 0.5.3", + "alloy-serde 0.5.3", + "alloy-signer 0.5.3", "alloy-sol-types", "async-trait", "auto_impl", @@ -319,10 +454,23 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "801492711d4392b2ccf5fc0bc69e299fa1aab15167d74dcaa9aab96a54f684bd" dependencies = [ - "alloy-consensus", - "alloy-eips", + "alloy-consensus 0.4.2", + "alloy-eips 0.4.2", + "alloy-primitives", + "alloy-serde 0.4.2", + "serde", +] + +[[package]] +name = "alloy-network-primitives" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a968c063fcfcb937736665c865a71fc2242b68916156f5ffa41fee7b44bb695" +dependencies = [ + "alloy-consensus 0.5.3", + "alloy-eips 0.5.3", "alloy-primitives", - "alloy-serde", + "alloy-serde 0.5.3", "serde", ] @@ -332,7 +480,24 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4f1334a738aa1710cb8227441b3fcc319202ce78e967ef37406940242df4a454" dependencies = [ - "alloy-genesis", + "alloy-genesis 0.4.2", + "alloy-primitives", + "k256", + "rand 0.8.5", + "serde_json", + "tempfile", + "thiserror", + "tracing", + "url", +] + +[[package]] +name = "alloy-node-bindings" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439fc6a933b9f8e8b272a8cac35dbeabaf2b2eaf9590482bebedb5782153118e" +dependencies = [ + "alloy-genesis 0.5.3", "alloy-primitives", "k256", "rand 0.8.5", @@ -377,19 +542,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcfaa4ffec0af04e3555686b8aacbcdf7d13638133a0672749209069750f78a6" dependencies = [ "alloy-chains", - "alloy-consensus", - "alloy-eips", - "alloy-json-rpc", - "alloy-network", - "alloy-network-primitives", - "alloy-node-bindings", + "alloy-consensus 0.4.2", + "alloy-eips 0.4.2", + "alloy-json-rpc 0.4.2", + "alloy-network 0.4.2", + "alloy-network-primitives 0.4.2", + "alloy-node-bindings 0.4.2", "alloy-primitives", - "alloy-rpc-client", - "alloy-rpc-types-anvil", - "alloy-rpc-types-eth", - "alloy-signer-local", - "alloy-transport", - "alloy-transport-http", + "alloy-rpc-client 0.4.2", + "alloy-rpc-types-anvil 0.4.2", + "alloy-rpc-types-eth 0.4.2", + "alloy-signer-local 0.4.2", + "alloy-transport 0.4.2", + "alloy-transport-http 0.4.2", "async-stream", "async-trait", "auto_impl", @@ -407,6 +572,47 @@ dependencies = [ "url", ] +[[package]] +name = "alloy-provider" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c45dbc0e3630becef9e988b69d43339f68d67e32a854e3c855bc28bd5031895b" +dependencies = [ + "alloy-chains", + "alloy-consensus 0.5.3", + "alloy-eips 0.5.3", + "alloy-json-rpc 0.5.3", + "alloy-network 0.5.3", + "alloy-network-primitives 0.5.3", + "alloy-node-bindings 0.5.3", + "alloy-primitives", + "alloy-rpc-client 0.5.3", + "alloy-rpc-types-anvil 0.5.3", + "alloy-rpc-types-eth 0.5.3", + "alloy-signer 0.5.3", + "alloy-signer-local 0.5.3", + "alloy-transport 0.5.3", + "alloy-transport-http 0.5.3", + "async-stream", + "async-trait", + "auto_impl", + "dashmap", + "futures", + "futures-utils-wasm", + "lru", + "parking_lot", + "pin-project", + "reqwest 0.12.7", + "schnellru", + "serde", + "serde_json", + "thiserror", + "tokio", + "tracing", + "url", + "wasmtimer", +] + [[package]] name = "alloy-rlp" version = "0.3.8" @@ -435,10 +641,32 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "370143ed581aace6e663342d21d209c6b2e34ee6142f7d6675adb518deeaf0dc" dependencies = [ - "alloy-json-rpc", + "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", + "serde", + "serde_json", + "tokio", + "tokio-stream", + "tower 0.5.1", + "tracing", + "url", +] + +[[package]] +name = "alloy-rpc-client" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "917e5504e4f8f7e39bdc322ff81589ed54c1e462240adaeb58162c2d986a5a2b" +dependencies = [ + "alloy-json-rpc 0.5.3", "alloy-primitives", - "alloy-transport", - "alloy-transport-http", + "alloy-transport 0.5.3", + "alloy-transport-http 0.5.3", "futures", "pin-project", "reqwest 0.12.7", @@ -449,6 +677,7 @@ dependencies = [ "tower 0.5.1", "tracing", "url", + "wasmtimer", ] [[package]] @@ -458,9 +687,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ffc534b7919e18f35e3aa1f507b6f3d9d92ec298463a9f6beaac112809d8d06" dependencies = [ "alloy-primitives", - "alloy-rpc-types-anvil", - "alloy-rpc-types-eth", - "alloy-serde", + "alloy-rpc-types-anvil 0.4.2", + "alloy-rpc-types-eth 0.4.2", + "alloy-serde 0.4.2", + "serde", +] + +[[package]] +name = "alloy-rpc-types" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07c7eb2dc6db1dd41e5e7bd2b98a38813854efc30e034afd90d1e420e7f3de2b" +dependencies = [ + "alloy-primitives", + "alloy-rpc-types-anvil 0.5.3", + "alloy-rpc-types-eth 0.5.3", + "alloy-serde 0.5.3", "serde", ] @@ -471,7 +713,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d780adaa5d95b07ad92006b2feb68ecfa7e2015f7d5976ceaac4c906c73ebd07" dependencies = [ "alloy-primitives", - "alloy-serde", + "alloy-serde 0.4.2", + "serde", +] + +[[package]] +name = "alloy-rpc-types-anvil" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2640928d9b1d43bb1cec7a0d615e10c2b407c5bd8ff1fcbe49e6318a2b62d731" +dependencies = [ + "alloy-primitives", + "alloy-serde 0.5.3", "serde", ] @@ -481,12 +734,31 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "413f4aa3ccf2c3e4234a047c5fa4727916d7daf25a89f9b765df0ba09784fd87" dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-network-primitives", + "alloy-consensus 0.4.2", + "alloy-eips 0.4.2", + "alloy-network-primitives 0.4.2", + "alloy-primitives", + "alloy-rlp", + "alloy-serde 0.4.2", + "alloy-sol-types", + "derive_more", + "itertools 0.13.0", + "serde", + "serde_json", +] + +[[package]] +name = "alloy-rpc-types-eth" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e855b0daccf2320ba415753c3fed422abe9d3ad5d77b2d6cafcc9bcf32fe387f" +dependencies = [ + "alloy-consensus 0.5.3", + "alloy-eips 0.5.3", + "alloy-network-primitives 0.5.3", "alloy-primitives", "alloy-rlp", - "alloy-serde", + "alloy-serde 0.5.3", "alloy-sol-types", "derive_more", "itertools 0.13.0", @@ -505,6 +777,17 @@ dependencies = [ "serde_json", ] +[[package]] +name = "alloy-serde" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35c2661ca6785add8fc37aff8005439c806ffad58254c19939c6f59ac0d6596e" +dependencies = [ + "alloy-primitives", + "serde", + "serde_json", +] + [[package]] name = "alloy-signer" version = "0.4.2" @@ -519,16 +802,46 @@ dependencies = [ "thiserror", ] +[[package]] +name = "alloy-signer" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67eca011160d18a7dc6d8cdc1e8dc13e2e86c908f8e41b02aa76e429d6fe7085" +dependencies = [ + "alloy-primitives", + "async-trait", + "auto_impl", + "elliptic-curve 0.13.8", + "k256", + "thiserror", +] + [[package]] name = "alloy-signer-local" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "494e0a256f3e99f2426f994bcd1be312c02cb8f88260088dacb33a8b8936475f" dependencies = [ - "alloy-consensus", - "alloy-network", + "alloy-consensus 0.4.2", + "alloy-network 0.4.2", + "alloy-primitives", + "alloy-signer 0.4.2", + "async-trait", + "k256", + "rand 0.8.5", + "thiserror", +] + +[[package]] +name = "alloy-signer-local" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c54b195a6ee5a83f32e7c697b4e6b565966737ed5a2ef9176bbbb39f720d023" +dependencies = [ + "alloy-consensus 0.5.3", + "alloy-network 0.5.3", "alloy-primitives", - "alloy-signer", + "alloy-signer 0.5.3", "async-trait", "k256", "rand 0.8.5", @@ -614,7 +927,26 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ac3e97dad3d31770db0fc89bd6a63b789fbae78963086733f960cf32c483904" dependencies = [ - "alloy-json-rpc", + "alloy-json-rpc 0.4.2", + "base64 0.22.1", + "futures-util", + "futures-utils-wasm", + "serde", + "serde_json", + "thiserror", + "tokio", + "tower 0.5.1", + "tracing", + "url", +] + +[[package]] +name = "alloy-transport" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e4a136e733f55fef0870b81e1f8f1db28e78973d1b1ae5a5df642ba39538a07" +dependencies = [ + "alloy-json-rpc 0.5.3", "base64 0.22.1", "futures-util", "futures-utils-wasm", @@ -626,6 +958,7 @@ dependencies = [ "tracing", "url", "wasm-bindgen-futures", + "wasmtimer", ] [[package]] @@ -634,8 +967,23 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b367dcccada5b28987c2296717ee04b9a5637aacd78eacb1726ef211678b5212" dependencies = [ - "alloy-json-rpc", - "alloy-transport", + "alloy-json-rpc 0.4.2", + "alloy-transport 0.4.2", + "reqwest 0.12.7", + "serde_json", + "tower 0.5.1", + "tracing", + "url", +] + +[[package]] +name = "alloy-transport-http" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a6b358a89b6d107b92d09b61a61fbc04243942182709752c796f4b29402cead" +dependencies = [ + "alloy-json-rpc 0.5.3", + "alloy-transport 0.5.3", "reqwest 0.12.7", "serde_json", "tower 0.5.1", @@ -1071,7 +1419,7 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" name = "autonomi" version = "0.1.2" dependencies = [ - "alloy", + "alloy 0.4.2", "bip39", "blsttc", "bytes", @@ -2761,7 +3109,7 @@ dependencies = [ name = "evmlib" version = "0.1.0" dependencies = [ - "alloy", + "alloy 0.5.3", "dirs-next", "getrandom 0.2.15", "rand 0.8.5", @@ -7567,6 +7915,17 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "schnellru" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9a8ef13a93c54d20580de1e5c413e624e53121d42fc7e2c11d10ef7f8b02367" +dependencies = [ + "ahash", + "cfg-if", + "hashbrown 0.13.2", +] + [[package]] name = "scoped-tls" version = "1.0.1" @@ -9898,7 +10257,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] diff --git a/evmlib/Cargo.toml b/evmlib/Cargo.toml index c3cfbdf432..7db6d22301 100644 --- a/evmlib/Cargo.toml +++ b/evmlib/Cargo.toml @@ -14,7 +14,7 @@ local = [] external-signer = [] [dependencies] -alloy = { version = "0.4.2", default-features = false, features = ["std", "reqwest-rustls-tls", "provider-anvil-node", "sol-types", "json", "signers", "contract", "signer-local", "network"] } +alloy = { version = "0.5.3", default-features = false, features = ["std", "reqwest-rustls-tls", "provider-anvil-node", "sol-types", "json", "signers", "contract", "signer-local", "network"] } dirs-next = "~2.0.0" serde = "1.0" serde_with = { version = "3.11.0", features = ["macros"] }