Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions bins/revme/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,20 @@ version = "0.2.0"
[dependencies]
hash-db = "0.15"
hashbrown = "0.14"
hex = "0.4"
indicatif = "0.17"
plain_hasher = "0.2"
revm = { path = "../../crates/revm", version = "3.3.0", default-features = false, features = [
"ethersdb",
"std",
"serde",
] }
alloy-rlp = { version = "0.3", default-features = false, features = ["arrayvec"] }
alloy-rlp = { version = "0.3", default-features = false, features = [
"arrayvec",
] }
ruint = { version = "1.9.0", features = ["rlp", "serde"] }
serde = { version = "1.0", features = ["derive", "rc"] }
serde_json = { version = "1.0", features = ["preserve_order"] }
structopt = "0.3"
thiserror = "1.0"
triehash = "0.8"
walkdir = "2.4"
hex-literal = "0.4"
6 changes: 0 additions & 6 deletions crates/precompile/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,6 @@ sha2 = { version = "0.10.5", default-features = false }
sha3 = { version = "0.10.7", default-features = false }
c-kzg = { git = "https://github.com/ethereum/c-kzg-4844", default-features = false, optional = true }

[dev-dependencies]
hex = "0.4"

[build-dependencies]
hex = "0.4"

[features]
default = ["secp256k1", "std"]
# Used to disable kzg lib as i couldn't make it compile for wasm target
Expand Down
2 changes: 1 addition & 1 deletion crates/precompile/src/modexp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,8 @@ fn berlin_gas_calc(base_length: u64, exp_length: u64, mod_length: u64, exp_highp

#[cfg(test)]
mod tests {

use super::*;
use revm_primitives::hex;

struct Test {
input: &'static str,
Expand Down
11 changes: 4 additions & 7 deletions crates/primitives/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ version = "1.1.2"
readme = "../../README.md"

[dependencies]
alloy-primitives = { version = "0.3", default-features = false, features = ["rlp"] }
alloy-primitives = { version = "0.3", default-features = false, features = [
"rlp",
] }
alloy-rlp = { version = "0.3", default-features = false, features = ["derive"] }
bytes = { version = "1.5", default-features = false }
hashbrown = "0.14"
Expand All @@ -22,10 +24,7 @@ bitflags = { version = "2.4.0", default-features = false }
# For setting the CfgEnv KZGSettings. Enabled by std flag.
c-kzg = { git = "https://github.com/ethereum/c-kzg-4844", default-features = false, optional = true }


#utility
hex-literal = "0.4"
hex = { version = "0.4", default-features = false, features = ["alloc"]}
# utility
derive_more = "0.99"
enumn = "0.1"
once_cell = { version = "1.18", default-features = false }
Expand Down Expand Up @@ -71,15 +70,13 @@ std = [
"alloy-primitives/std",
"alloy-rlp/std",
"bytes/std",
"hex/std",
"bitvec/std",
"bitflags/std",
"dep:c-kzg",
]
serde = [
"dep:serde",
"alloy-primitives/serde",
"hex/serde",
"hashbrown/serde",
"bytes/serde",
"bitvec/serde",
Expand Down
29 changes: 0 additions & 29 deletions crates/primitives/src/utilities.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,35 +69,6 @@ pub fn fake_exponential(factor: u64, numerator: u64, denominator: u64) -> u64 {
(output / denominator) as u64
}

/// Serde functions to serde as [bytes::Bytes] hex string
#[cfg(feature = "serde")]
pub mod serde_hex_bytes {
use alloc::string::{String, ToString};
use serde::{Deserialize, Deserializer, Serializer};

pub fn serialize<S, T>(x: T, s: S) -> Result<S::Ok, S::Error>
where
S: Serializer,
T: AsRef<[u8]>,
{
s.serialize_str(&alloc::format!("0x{}", hex::encode(x.as_ref())))
}

pub fn deserialize<'de, D>(d: D) -> Result<bytes::Bytes, D::Error>
where
D: Deserializer<'de>,
{
let value = String::deserialize(d)?;
if let Some(value) = value.strip_prefix("0x") {
hex::decode(value)
} else {
hex::decode(&value)
}
.map(Into::into)
.map_err(|e| serde::de::Error::custom(e.to_string()))
}
}

#[cfg(test)]
mod tests {
use super::*;
Expand Down
2 changes: 0 additions & 2 deletions crates/revm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ ethers-core = { version = "2.0", optional = true }
futures = { version = "0.3.27", optional = true }

[dev-dependencies]
hex-literal = "0.4"
ethers-contract = { version = "2.0.10", default-features = false }
hex = "0.4.3"
anyhow = "1.0.75"
criterion = "0.5"

Expand Down
4 changes: 3 additions & 1 deletion crates/revm/benches/bench.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ use criterion::{
use revm::{
db::BenchmarkDB,
interpreter::{analysis::to_analysed, BytecodeLocked, Contract, DummyHost, Interpreter},
primitives::{address, bytes, BerlinSpec, Bytecode, BytecodeState, Bytes, TransactTo, U256},
primitives::{
address, bytes, hex, BerlinSpec, Bytecode, BytecodeState, Bytes, TransactTo, U256,
},
};
use std::time::Duration;

Expand Down