From 84839ba3bdf3aa965e292fb48ee27984678e6856 Mon Sep 17 00:00:00 2001 From: Arsenii Kulikov Date: Wed, 28 Aug 2024 20:31:57 +0400 Subject: [PATCH] rm patches --- Cargo.lock | 91 +++++++++++++++++++++++++----------- Cargo.toml | 5 -- crates/primitives/Cargo.toml | 2 +- crates/revm/Cargo.toml | 8 ++-- 4 files changed, 70 insertions(+), 36 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7ff8f72013..5d82bf6b80 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -56,8 +56,9 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "0.2.1" -source = "git+https://github.com/alloy-rs/alloy?rev=05cc4e0#05cc4e00dc5ce9aeca01e1ffee3d7865f853ae1b" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7198a527b4c4762cb88d54bcaeb0428f4298b72552c9c8ec4af614b4a4990c59" dependencies = [ "alloy-eips", "alloy-primitives", @@ -67,19 +68,47 @@ dependencies = [ "serde", ] +[[package]] +name = "alloy-eip2930" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0069cf0642457f87a01a014f6dc29d5d893cd4fd8fddf0c3cdfad1bb3ebafc41" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "arbitrary", + "rand", + "serde", +] + +[[package]] +name = "alloy-eip7702" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37d319bb544ca6caeab58c39cea8921c55d924d4f68f2c60f24f914673f9a74a" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "arbitrary", + "k256", + "rand", + "serde", +] + [[package]] name = "alloy-eips" -version = "0.2.1" -source = "git+https://github.com/alloy-rs/alloy?rev=05cc4e0#05cc4e00dc5ce9aeca01e1ffee3d7865f853ae1b" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "159eab0e4e15b88571f55673af37314f4b8f17630dc1b393c3d70f2128a1d494" dependencies = [ + "alloy-eip2930", + "alloy-eip7702", "alloy-primitives", "alloy-rlp", "alloy-serde", "arbitrary", "c-kzg", - "k256", "once_cell", - "rand", "serde", "sha2", ] @@ -98,8 +127,9 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "0.2.1" -source = "git+https://github.com/alloy-rs/alloy?rev=05cc4e0#05cc4e00dc5ce9aeca01e1ffee3d7865f853ae1b" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7733446dd531f8eb877331fea02f6c40bdbb47444a17dc3464bf75319cc073a" dependencies = [ "alloy-primitives", "alloy-sol-types", @@ -111,8 +141,9 @@ dependencies = [ [[package]] name = "alloy-network" -version = "0.2.1" -source = "git+https://github.com/alloy-rs/alloy?rev=05cc4e0#05cc4e00dc5ce9aeca01e1ffee3d7865f853ae1b" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b80851d1697fc4fa2827998e3ee010a3d1fc59c7d25e87070840169fcf465832" dependencies = [ "alloy-consensus", "alloy-eips", @@ -131,8 +162,9 @@ dependencies = [ [[package]] name = "alloy-network-primitives" -version = "0.2.1" -source = "git+https://github.com/alloy-rs/alloy?rev=05cc4e0#05cc4e00dc5ce9aeca01e1ffee3d7865f853ae1b" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d76a2336889f3d0624b18213239d27f4f34eb476eb35bef22f6a8cc24e0c0078" dependencies = [ "alloy-primitives", "alloy-serde", @@ -167,8 +199,9 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "0.2.1" -source = "git+https://github.com/alloy-rs/alloy?rev=05cc4e0#05cc4e00dc5ce9aeca01e1ffee3d7865f853ae1b" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2d2a195caa6707f5ce13905794865765afc6d9ea92c3a56e3a973c168d703bc" dependencies = [ "alloy-chains", "alloy-consensus", @@ -222,8 +255,9 @@ dependencies = [ [[package]] name = "alloy-rpc-client" -version = "0.2.1" -source = "git+https://github.com/alloy-rs/alloy?rev=05cc4e0#05cc4e00dc5ce9aeca01e1ffee3d7865f853ae1b" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed31cdba2b23d71c555505b06674f8e7459496abfd7f4875d268434ef5a99ee6" dependencies = [ "alloy-json-rpc", "alloy-transport", @@ -242,8 +276,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "0.2.1" -source = "git+https://github.com/alloy-rs/alloy?rev=05cc4e0#05cc4e00dc5ce9aeca01e1ffee3d7865f853ae1b" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ba05d6ee4db0d89113294a614137940f79abfc2c40a9a3bee2995660358776" dependencies = [ "alloy-consensus", "alloy-eips", @@ -260,8 +295,9 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "0.2.1" -source = "git+https://github.com/alloy-rs/alloy?rev=05cc4e0#05cc4e00dc5ce9aeca01e1ffee3d7865f853ae1b" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfd260ede54f0b53761fdd04133acc10ae70427f66a69aa9590529bbd066cd58" dependencies = [ "alloy-primitives", "arbitrary", @@ -271,8 +307,9 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "0.2.1" -source = "git+https://github.com/alloy-rs/alloy?rev=05cc4e0#05cc4e00dc5ce9aeca01e1ffee3d7865f853ae1b" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5193ee6b370b89db154d7dc40c6a8e6ce11213865baaf2b418a9f2006be762" dependencies = [ "alloy-primitives", "async-trait", @@ -354,8 +391,9 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "0.2.1" -source = "git+https://github.com/alloy-rs/alloy?rev=05cc4e0#05cc4e00dc5ce9aeca01e1ffee3d7865f853ae1b" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "454220c714857cf68af87d788d1f0638ad8766268b94f6a49fed96cbc2ab382c" dependencies = [ "alloy-json-rpc", "base64 0.22.1", @@ -372,8 +410,9 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "0.2.1" -source = "git+https://github.com/alloy-rs/alloy?rev=05cc4e0#05cc4e00dc5ce9aeca01e1ffee3d7865f853ae1b" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "377f2353d7fea03a2dba6b9ffbb7d610402c040dd5700d1fae8b9ec2673eed9b" dependencies = [ "alloy-json-rpc", "alloy-transport", diff --git a/Cargo.toml b/Cargo.toml index cd9be0413c..426d6e403f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,8 +22,3 @@ debug = true [profile.ethtests] inherits = "test" opt-level = 3 - -[patch.crates-io] -alloy-eips = { git = "https://github.com/alloy-rs/alloy", rev = "05cc4e0" } -alloy-provider = { git = "https://github.com/alloy-rs/alloy", rev = "05cc4e0" } -alloy-transport = { git = "https://github.com/alloy-rs/alloy", rev = "05cc4e0" } diff --git a/crates/primitives/Cargo.toml b/crates/primitives/Cargo.toml index 36691f5474..777d08fd8d 100644 --- a/crates/primitives/Cargo.toml +++ b/crates/primitives/Cargo.toml @@ -22,7 +22,7 @@ rust_2018_idioms = "deny" all = "warn" [dependencies] -alloy-eips = { version = "0.2", default-features = false, features = ["k256"] } +alloy-eips = { version = "0.3", default-features = false, features = ["k256"] } alloy-primitives = { version = "0.8.0", default-features = false, features = [ "rlp", ] } diff --git a/crates/revm/Cargo.toml b/crates/revm/Cargo.toml index 8e111ad6db..f35eeb307e 100644 --- a/crates/revm/Cargo.toml +++ b/crates/revm/Cargo.toml @@ -49,9 +49,9 @@ ethers-providers = { version = "2.0", optional = true } ethers-core = { version = "2.0", optional = true } # alloydb -alloy-provider = { version = "0.2", optional = true, default-features = false } -alloy-eips = { version = "0.2", optional = true, default-features = false } -alloy-transport = { version = "0.2", optional = true, default-features = false } +alloy-provider = { version = "0.3", optional = true, default-features = false } +alloy-eips = { version = "0.3", optional = true, default-features = false } +alloy-transport = { version = "0.3", optional = true, default-features = false } [dev-dependencies] alloy-sol-types = { version = "0.8.0", default-features = false, features = [ @@ -64,7 +64,7 @@ indicatif = "0.17" reqwest = { version = "0.12" } rstest = "0.22.0" -alloy-provider = "0.2" +alloy-provider = "0.3" [features] default = ["std", "c-kzg", "secp256k1", "portable", "blst"]