Migrate to alloy-rs

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dv"
-version = "0.9.0"
+version = "0.9.1"
 edition = "2021"
 
 [[bin]]
@@ -22,48 +22,56 @@ path = "src/cached_proxy.rs"
 [lib]
 name = "dvf_libs"
 path = "lib/lib.rs"
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-tracing = "0.1.34"
-tracing-subscriber = { version = "0.3.11", default-features = true, features = ["env-filter", "fmt"]}
-reqwest = { version = "0.11", features = ["json", "blocking"] }
-tokio = { version = "1", features = ["full"] }
-serde = { version = "1.0.144", features = ["derive"] }
-serde_json = "1.0.85"
-substring = "1.4.5"
-clap = { version = "3.1.6", features = ["derive"]}
-colored = "1.0.0"
+actix-web = "4.9.0"
+alloy = { version = "0.9.2", features = ["full"] }
+alloy-chains = { version = "0.1.55", features = ["serde"] }
+alloy-dyn-abi = { version = "0.8.19", features = ["eip712"] }
+alloy-json-abi = "0.8.19"
+alloy-node-bindings = "0.9.2"
+alloy-rpc-types = "0.9.2"
+alloy-rpc-types-trace = "0.9.2"
+alloy-signer = { version = "0.9.2", features = ["eip712"] }
+alloy-signer-ledger = "0.9.2"
+alloy-signer-local = "0.9.2"
+async-trait = "0.1.85"
+bigint = "4"
+bytes = "1.9.0"
+clap = { version = "4.5.26", features = ["derive", "cargo"] }
+colored = "3.0.0"
+console = "0.15.10"
+dirs-next = "2.0.0"
+dotenv = "0.15.0"
+foundry-block-explorers = "0.9.0"
+foundry-compilers = "0.12.9"
+foundry-compilers-core = "0.12.9"
+hex = "0.4"
+indicatif = "0.17.9"
 prettytable-rs = "0.10.0"
+rand = "0.8.5"
 regex = "1"
-bigint = "1"
-tiny-keccak = { version = "2.0.0", features = ["sha3", "keccak"] }
-hex = "0.4"
-ethers = { version = "2.0.8", features = ["solc"] }
-ethers-contract = "2.0.8"
-ethers-core = { version = "2.0.8" }
-ethers-etherscan = { version = "2.0.8" }
-ethers-providers = "2.0.8"
-ethers-signers = {version = "2.0.8", features = ["ledger", "yubi", "yubihsm"]}
-ethers-solc = "2.0.8"
-semver = { version = "1.0.17", features = ["serde"] }
-toml = "0.7.4"
-dirs-next = "2.0.0"
-zip = "0.6.6"
-tempfile = "3.6.0"
-bytes = "1.4.0"
-async-trait = "0.1.69"
-thiserror = "1.0.40"
-sha3 = "0.10.8"
+reqwest = { version = "0.12", features = ["json", "blocking"] }
+reth-trie = { git = "https://github.com/paradigmxyz/reth", tag = "v1.1.5"}
+ruint = "1.12.4"
 rustc-hex = "2.1.0"
-indicatif = "0.17.6"
-console = "0.15.7"
-actix-web = "4.7.0"
-scanf = "1.2.1"
-dotenv = "0.15.0"
-time = "0.3.36"
+scanf = "1.2.3"
+semver = { version = "1.0.24", features = ["serde"] }
+serde = { version = "1.0.217", features = ["derive"] }
+serde_json = "1.0.135"
+sha3 = "0.10.8"
+substring = "1.4.5"
+tempfile = "3.15.0"
+thiserror = "2.0.11"
+time = "0.3.37"
+tiny-keccak = { version = "2.0.2", features = ["sha3", "keccak"] }
+tokio = { version = "1", features = ["full"] }
+toml = "0.8.19"
+tracing = "0.1.41"
+tracing-subscriber = { version = "0.3.19", default-features = true, features = ["env-filter", "fmt"] }
+zip = "2.2.2"
 
 [dev-dependencies]
-assert_cmd = "2.0.12"
-env_logger = "0.11.5"
+assert_cmd = "2.0.16"
+env_logger = "0.11.6"

README.md

@@ -99,7 +99,7 @@ NodeJS is only required if you are running `dv` in a Hardhat project. Foundry is
 To install `dv`, clone this repository and build:
 
 ```
-git clone TODO: add repo URI
+git clone https://github.com/ChainSecurity/deployment_validation
 cd deployment-validation
 cargo install --path .
 ```
@@ -117,7 +117,7 @@ Depending on your system's configuration, this command might have to be adapted.
 To run `dv` with the pre-configured Docker image, clone this repository and run:
 
 ```
-git clone TODO: add repo URI
+git clone https://github.com/ChainSecurity/deployment_validation
 cd deployment-validation
 docker build -t dv .
 ```

lib/bytecode_verification/compare_bytecodes.rs

@@ -1,5 +1,5 @@
-use ethers::abi;
-use ethers::solc::artifacts::BytecodeHash;
+use alloy::dyn_abi::JsonAbiExt;
+use foundry_compilers::artifacts::BytecodeHash;
 use tracing::{debug, info};
 
 use crate::bytecode_verification::parse_json::ProjectInfo;
@@ -166,7 +166,10 @@ impl CompareBytecode {
         if factory_mode {
             let mut other_bytecodes: Vec<Vec<u8>> = vec![];
             for other_bytecode in &project_info.other_bytecodes {
-                other_bytecodes.push(hex::decode(other_bytecode.trim_start_matches("0x")).unwrap());
+                // TODO: bytecode may contain placehodlers for linked libraries (e.g., "__$a8edeab004e053fbdc8344e3d53a225696$__"). handle this
+                if let Ok(hex_bytecode) = hex::decode(other_bytecode.trim_start_matches("0x")) {
+                    other_bytecodes.push(hex_bytecode);
+                }
             }
             ignore_subcontracts_metadata(
                 &other_bytecodes,
@@ -246,7 +249,9 @@ impl CompareInitCode {
         if factory_mode {
             let mut other_bytecodes: Vec<Vec<u8>> = vec![];
             for other_bytecode in &project_info.other_bytecodes {
-                other_bytecodes.push(hex::decode(other_bytecode.trim_start_matches("0x")).unwrap());
+                if let Ok(hex_bytecode) = hex::decode(other_bytecode.trim_start_matches("0x")) {
+                    other_bytecodes.push(hex_bytecode);
+                }
             }
             ignore_subcontracts_metadata(
                 &other_bytecodes,
@@ -263,28 +268,28 @@ impl CompareInitCode {
             return Self::no_match();
         }
 
-        if project_info.constructor_args.is_empty() {
+        if project_info.constructor.is_none() {
             return CompareInitCode { matched: true };
         }
 
         // decode constructor arguments
-        let argument_types: Vec<_> = project_info
-            .constructor_args
-            .iter()
-            .map(|arg| arg.kind.clone())
-            .collect();
-        let decoded_args = abi::decode(&argument_types, &init_bytecode[compiled_init_code.len()..])
+        let decoded_args = project_info
+            .constructor
+            .as_ref()
+            .unwrap()
+            .abi_decode_input(&init_bytecode[compiled_init_code.len()..], true)
             .expect("Unable to decode the constructor arguments.");
 
-        if decoded_args.len() != project_info.constructor_args.len() {
-            return Self::no_match();
-        }
-
         for (arg, value) in project_info.constructor_args.iter_mut().zip(decoded_args) {
-            let encoded_value = abi::encode_packed(&[value]).unwrap();
+            let encoded_value = value.abi_encode_packed();
             let formatted_value = format!("0x{}", hex::encode(&encoded_value));
 
+            let sol_type = value.as_type().unwrap_or_else(|| {
+                panic!("Unable to find constructor argument type for {}", arg.name)
+            });
+
             arg.value = formatted_value;
+            arg.type_string = sol_type.sol_type_name().to_string()
         }
 
         // Byte offset -> Relevant
@@ -295,7 +300,7 @@ impl CompareInitCode {
 #[cfg(test)]
 mod tests {
     use crate::types::ConstructorArg;
-    use ethers::abi::ParamType;
+    use alloy::json_abi::{Constructor, Param, StateMutability};
     use semver::Version;
     use std::collections::HashMap;
 
@@ -314,6 +319,7 @@ mod tests {
             cbor_metadata: None,
             immutables: Vec::<Immutable>::new(),
             constructor_args: Vec::<ConstructorArg>::new(),
+            constructor: None,
             events: vec![],
             other_bytecodes: vec![],
             types: HashMap::new(),
@@ -337,6 +343,7 @@ mod tests {
             cbor_metadata: None,
             immutables: Vec::<Immutable>::new(),
             constructor_args: Vec::<ConstructorArg>::new(),
+            constructor: None,
             events: vec![],
             other_bytecodes: vec![],
             types: HashMap::new(),
@@ -362,18 +369,26 @@ mod tests {
         let constructor_args = vec![
             ConstructorArg {
                 name: "arg1".to_string(),
-                kind: ParamType::Address,
-                value: "value1".to_string(),
-                type_string: "type1".to_string(),
+                value: "1".to_string(),
+                type_string: "address".to_string(),
             },
             ConstructorArg {
-                name: "arg1".to_string(),
-                kind: ParamType::Address,
-                value: "value1".to_string(),
-                type_string: "type1".to_string(),
+                name: "arg2".to_string(),
+                value: "2".to_string(),
+                type_string: "address".to_string(),
             },
         ];
 
+        let constructor_inputs: Vec<Param> = vec![
+            Param::parse("address arg1").unwrap(),
+            Param::parse("address arg2").unwrap(),
+        ];
+
+        let constructor = Constructor {
+            inputs: constructor_inputs,
+            state_mutability: StateMutability::NonPayable,
+        };
+
         let mut p = ProjectInfo {
             compiled_bytecode,
             init_code: compiled_init_code,
@@ -383,6 +398,7 @@ mod tests {
             cbor_metadata: None,
             immutables: vec![],
             constructor_args,
+            constructor: Some(constructor),
             events: vec![],
             other_bytecodes: vec![],
             types: HashMap::new(),