From 9e98b7180472444b43b48609c67cbd3ca9087dc0 Mon Sep 17 00:00:00 2001 From: Dan Cline <6798349+Rjected@users.noreply.github.com> Date: Fri, 14 Oct 2022 22:31:36 -0400 Subject: [PATCH 1/2] feat(primitives): add H128 * uses patch for now --- Cargo.lock | 2 +- Cargo.toml | 3 +++ crates/primitives/src/lib.rs | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f08350cbfcc9..e3340651125d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -671,7 +671,7 @@ dependencies = [ [[package]] name = "ethers-core" version = "0.17.0" -source = "git+https://github.com/gakonst/ethers-rs#f3a5a7aef06db391f8d2c4370bbc2a1b6ae4ea0f" +source = "git+https://github.com/rjected/ethers-rs?branch=add-h128#e600580c0348e959d74fdfb0db9d3cdfb67222d7" dependencies = [ "arrayvec", "bytes", diff --git a/Cargo.toml b/Cargo.toml index 84ba53c2a14c..9ca830669c35 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,3 +18,6 @@ members = [ "crates/db" ] default-members = ["bin/reth"] + +[patch."https://github.com/gakonst/ethers-rs"] +ethers-core = { git = "https://github.com/rjected/ethers-rs", branch = "add-h128" } diff --git a/crates/primitives/src/lib.rs b/crates/primitives/src/lib.rs index 37c5f83a21a9..c75474b8cbe0 100644 --- a/crates/primitives/src/lib.rs +++ b/crates/primitives/src/lib.rs @@ -43,5 +43,5 @@ pub type StorageValue = H256; // NOTE: There is a benefit of using wrapped Bytes as it gives us serde and debug pub use ethers_core::{ types as rpc, - types::{Bloom, Bytes, H160, H256, H512, H64, U256, U64}, + types::{Bloom, Bytes, H160, H128, H256, H512, H64, U256, U64}, }; From 34235ff0be4e70a712b8fac78361fb2e561a6033 Mon Sep 17 00:00:00 2001 From: Dan Cline <6798349+Rjected@users.noreply.github.com> Date: Fri, 14 Oct 2022 22:51:05 -0400 Subject: [PATCH 2/2] cargo fmt --- Cargo.toml | 3 --- crates/primitives/src/lib.rs | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9ca830669c35..84ba53c2a14c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,6 +18,3 @@ members = [ "crates/db" ] default-members = ["bin/reth"] - -[patch."https://github.com/gakonst/ethers-rs"] -ethers-core = { git = "https://github.com/rjected/ethers-rs", branch = "add-h128" } diff --git a/crates/primitives/src/lib.rs b/crates/primitives/src/lib.rs index c75474b8cbe0..db5eed2166e8 100644 --- a/crates/primitives/src/lib.rs +++ b/crates/primitives/src/lib.rs @@ -43,5 +43,5 @@ pub type StorageValue = H256; // NOTE: There is a benefit of using wrapped Bytes as it gives us serde and debug pub use ethers_core::{ types as rpc, - types::{Bloom, Bytes, H160, H128, H256, H512, H64, U256, U64}, + types::{Bloom, Bytes, H128, H160, H256, H512, H64, U256, U64}, };