chore(deps): alloy 0.3.3

Cargo.toml

@@ -34,7 +34,7 @@ debug = true
 version = "0.8.4"
 edition = "2021"
 license = "MIT"
-rust-version = "1.75"
+rust-version = "1.79"
 homepage = "https://heimdall.rs"
 repository = "https://github.com/Jon-Becker/heimdall-rs"
 keywords = ["ethereum", "web3", "decompiler", "evm", "crypto"]

crates/cfg/Cargo.toml

@@ -25,7 +25,7 @@ eyre = "0.6.12"
 futures = "0.3.30"
 lazy_static = "1.4.0"
 petgraph = "0.6.2"
-alloy = { version = "0.1.3", features = ["full", "rpc-types-debug", "rpc-types-trace"] }
+alloy = { version = "0.3.3", features = ["full", "rpc-types-debug", "rpc-types-trace"] }
 
 heimdall-disassembler.workspace = true
 heimdall-vm.workspace = true

crates/cli/Cargo.toml

@@ -25,8 +25,8 @@ thiserror = "1.0.50"
 tracing = "0.1.40"
 tracing-subscriber = "0.3.18"
 eyre = "0.6.12"
-alloy-json-abi = "0.7.6"
-alloy = { version = "0.1.3", features = ["full", "rpc-types-debug", "rpc-types-trace"] }
+alloy-json-abi = "0.8.3"
+alloy = { version = "0.3.3", features = ["full", "rpc-types-debug", "rpc-types-trace"] }
 async-trait = "0.1.51"
 
 [[bin]]

crates/common/Cargo.toml

@@ -35,10 +35,10 @@ backoff = { version = "0.4.0", features = ["tokio"] }
 thiserror = "1.0.50"
 tracing = "0.1.40"
 eyre = "0.6.12"
-alloy-json-abi = "0.7.6"
+alloy-json-abi = "0.8.3"
 futures = "0.3.17"
-alloy = { version = "0.1.3", features = ["full", "rpc-types-debug", "rpc-types-trace"] }
+alloy = { version = "0.3.3", features = ["full", "rpc-types-debug", "rpc-types-trace"] }
 bytes = "1.6.1"
-alloy-dyn-abi = "0.7.7"
+alloy-dyn-abi = "0.8.3"
 tokio-retry = "0.3.0"
 hashbrown = "0.14.5"

crates/common/src/ether/types.rs

@@ -3,7 +3,7 @@ use alloy_json_abi::Param;
 use serde_json::{Map, Number, Value};
 use std::collections::VecDeque;
 
-use crate::utils::{hex::ToLowerHex, strings::find_balanced_encapsulator};
+use crate::utils::strings::find_balanced_encapsulator;
 use eyre::Result;
 
 #[derive(Debug, Clone, PartialEq)]
@@ -261,14 +261,14 @@ pub trait DynSolValueExt {
 impl DynSolValueExt for DynSolValue {
     fn serialize(&self) -> Value {
         match self {
-            DynSolValue::Address(addr) => Value::String(addr.to_lower_hex()),
+            DynSolValue::Address(addr) => Value::String(addr.to_string()),
             DynSolValue::Bool(b) => Value::Bool(*b),
             DynSolValue::String(s) => Value::String(s.to_owned()),
             DynSolValue::Bytes(b) => {
                 Value::Array(b.iter().map(|b| Value::Number(Number::from(*b))).collect())
             }
-            DynSolValue::Uint(u, _) => Value::String(u.to_lower_hex()),
-            DynSolValue::Int(i, _) => Value::String(i.to_lower_hex()),
+            DynSolValue::Uint(u, _) => Value::String(u.to_string()),
+            DynSolValue::Int(i, _) => Value::String(i.to_string()),
             DynSolValue::FixedBytes(b, _) => {
                 Value::Array(b.iter().map(|b| Value::Number(Number::from(*b))).collect())
             }

crates/common/src/utils/io/types.rs

@@ -11,7 +11,7 @@ pub fn display(inputs: Vec<DynSolValue>, prefix: &str) -> Vec<String> {
     for input in inputs {
         match input {
             DynSolValue::Address(val) => {
-                output.push(format!("{prefix}{} {}", "address".blue(), val.to_lower_hex()))
+                output.push(format!("{prefix}{} {}", "address".blue(), val.to_string()))
             }
             DynSolValue::Int(val, _) => {
                 output.push(format!("{prefix}{} {}", "int    ".blue(), val))
@@ -28,7 +28,7 @@ pub fn display(inputs: Vec<DynSolValue>, prefix: &str) -> Vec<String> {
                 }
             }
             DynSolValue::FixedBytes(val, _) => {
-                output.push(format!("{prefix}{} {}", "bytes  ".blue(), val.to_lower_hex()));
+                output.push(format!("{prefix}{} {}", "bytes  ".blue(), val.to_string()));
             }
             DynSolValue::Bytes(val) => {
                 // chunk val into 32-byte chunks
@@ -85,14 +85,14 @@ pub trait Parameterize {
 impl Parameterize for DynSolValue {
     fn parameterize(&self) -> String {
         match self {
-            DynSolValue::Address(val) => format!("address: {}", val.to_lower_hex()),
+            DynSolValue::Address(val) => format!("address: {}", val.to_string()),
             DynSolValue::Int(val, _) => format!("int: {}", val),
             DynSolValue::Uint(val, _) => format!("uint: {}", val),
             DynSolValue::String(val) => format!("string: {}", val),
             DynSolValue::Bool(val) => format!("bool: {}", val),
             DynSolValue::Bytes(val) => format!("bytes: 0x{}", val.to_lower_hex()),
             DynSolValue::FixedBytes(val, size) => {
-                format!("bytes{}: 0x{}", size, &val.to_lower_hex()[(64 - size * 2) + 2..])
+                format!("bytes{}: 0x{}", size, &val.to_string()[(64 - size * 2) + 2..])
             }
             DynSolValue::Array(val) => {
                 // get type of array

crates/decode/Cargo.toml

@@ -23,8 +23,8 @@ derive_builder = "0.12.0"
 tracing = "0.1.40"
 eyre = "0.6.12"
 heimdall-vm.workspace = true
-alloy-dyn-abi = "0.7.7"
-alloy-json-abi = "0.7.6"
-alloy = { version = "0.1.3", features = ["full", "rpc-types-debug", "rpc-types-trace"] }
+alloy-dyn-abi = "0.8.3"
+alloy-json-abi = "0.8.3"
+alloy = { version = "0.3.3", features = ["full", "rpc-types-debug", "rpc-types-trace"] }
 serde_json = "1.0"
 hashbrown = "0.14.5"

crates/decompile/Cargo.toml

@@ -21,16 +21,16 @@ heimdall-decoder = { workspace = true }
 thiserror = "1.0.50"
 clap = { workspace = true, features = ["derive"] }
 derive_builder = "0.12.0"
-alloy-json-abi = "0.7.6"
+alloy-json-abi = "0.8.3"
 tracing = "0.1.40"
 eyre = "0.6.12"
 futures = "0.3.30"
 lazy_static = "1.4.0"
 fancy-regex = "0.11.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-alloy-dyn-abi = "0.7.7"
-alloy = { version = "0.1.3", features = ["full", "rpc-types-debug", "rpc-types-trace"] }
+alloy-dyn-abi = "0.8.3"
+alloy = { version = "0.3.3", features = ["full", "rpc-types-debug", "rpc-types-trace"] }
 hashbrown = "0.14.5"
 
 heimdall-disassembler.workspace = true

crates/dump/Cargo.toml

@@ -24,5 +24,5 @@ tracing = "0.1.40"
 eyre = "0.6.12"
 tokio = { version = "1", features = ["full"] }
 futures = "0.3.30"
-alloy = { version = "0.1.3", features = ["full", "rpc-types-debug", "rpc-types-trace"] }
+alloy = { version = "0.3.3", features = ["full", "rpc-types-debug", "rpc-types-trace"] }
 hashbrown = "0.14.5"

crates/inspect/Cargo.toml

@@ -28,6 +28,6 @@ async-convert = "1.0.0"
 futures = "0.3.28"
 async-recursion = "1.0.5"
 tokio = { version = "1", features = ["full"] }
-alloy = { version = "0.1.3", features = ["full", "rpc-types-debug", "rpc-types-trace"] }
+alloy = { version = "0.3.3", features = ["full", "rpc-types-debug", "rpc-types-trace"] }
 serde_json = "1.0"
 hashbrown = "0.14.5"

crates/inspect/src/interfaces/traces.rs

@@ -225,7 +225,7 @@ impl TryFrom<CallAction> for DecodedCall {
             from: value.from,
             to: value.to,
             value: value.value,
-            gas: value.gas,
+            gas: alloy::primitives::U64::from(value.gas),
             input: value.input,
             call_type: value.call_type,
             resolved_function,
@@ -256,7 +256,7 @@ impl TryFrom<CallOutput> for DecodedCallResult {
         let decoded_outputs = result.decoded.decoded_inputs.unwrap_or_default();
 
         Ok(Self {
-            gas_used: value.gas_used,
+            gas_used: alloy::primitives::U64::from(value.gas_used),
             output: value.output,
             decoded_outputs_serializeable: decoded_outputs.iter().map(|v| v.serialize()).collect(),
             decoded_outputs,

crates/vm/Cargo.toml

@@ -36,7 +36,7 @@ thiserror = "1.0.50"
 tracing = "0.1.40"
 eyre = "0.6.12"
 heimdall-common.workspace = true
-alloy = { version = "0.1.3", features = [
+alloy = { version = "0.3.3", features = [
     "full",
     "rpc-types-debug",
     "rpc-types-trace",