From af604289bb7f7f6da08926a071cc18d285d32247 Mon Sep 17 00:00:00 2001 From: Matthias Seitz Date: Tue, 25 Jul 2023 17:19:30 +0200 Subject: [PATCH] chore: use ruint 1.9 and remove patch (#3910) --- Cargo.lock | 12 ++++++------ Cargo.toml | 3 --- crates/primitives/Cargo.toml | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5df882cc4f..b2c14b5d47 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6045,24 +6045,24 @@ dependencies = [ [[package]] name = "ruint" -version = "1.8.0" -source = "git+https://github.com/paradigmxyz/uint#38f565ff907ccaf2a2c57d395ed7c2b8905ae1ab" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77e1574d439643c8962edf612a888e7cc5581bcdf36cb64e6bc88466b03b2daa" dependencies = [ "arbitrary", - "derive_more", "primitive-types", "proptest", "rlp", "ruint-macro", - "rustc_version", "serde", "thiserror", ] [[package]] name = "ruint-macro" -version = "1.0.2" -source = "git+https://github.com/paradigmxyz/uint#38f565ff907ccaf2a2c57d395ed7c2b8905ae1ab" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e666a5496a0b2186dbcd0ff6106e29e093c15591bde62c20d3842007c6978a09" [[package]] name = "rustc-demangle" diff --git a/Cargo.toml b/Cargo.toml index 89efb758c8..ff1fe7c89e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -77,9 +77,6 @@ codegen-units = 1 incremental = false [patch.crates-io] -# patched for quantity U256 responses -ruint = { git = "https://github.com/paradigmxyz/uint" } - revm = { git = "https://github.com/bluealloy/revm/", branch = "release/v25" } revm-primitives = { git = "https://github.com/bluealloy/revm/", branch = "release/v25" } diff --git a/crates/primitives/Cargo.toml b/crates/primitives/Cargo.toml index aca12eb546..10e47b7a3a 100644 --- a/crates/primitives/Cargo.toml +++ b/crates/primitives/Cargo.toml @@ -19,7 +19,7 @@ revm-primitives = { workspace = true, features = ["serde"] } ethers-core = { workspace = true, default-features = false } tiny-keccak = { version = "2.0", features = ["keccak"] } crunchy = { version = "0.2.2", default-features = false, features = ["limit_256"] } -ruint = { version = "1.7.0", features = ["primitive-types", "rlp"] } +ruint = { version = "1.9.0", features = ["primitive-types", "rlp"] } # Bloom fixed-hash = { version = "0.8", default-features = false, features = ["rustc-hex"] }