diff --git a/Cargo.lock b/Cargo.lock index 6ef31e2..dd3b36e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -260,9 +260,9 @@ dependencies = [ [[package]] name = "alloy-json-abi" -version = "1.1.2" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ccaa79753d7bf15f06399ea76922afbfaf8d18bebed9e8fc452984b4a90dcc9" +checksum = "15516116086325c157c18261d768a20677f0f699348000ed391d4ad0dcb82530" dependencies = [ "alloy-primitives", "alloy-sol-type-parser", @@ -325,9 +325,9 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "1.1.2" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18c35fc4b03ace65001676358ffbbaefe2a2b27ee50fe777c345082c7c888be8" +checksum = "6177ed26655d4e84e00b65cb494d4e0b8830e7cae7ef5d63087d445a2600fb55" dependencies = [ "alloy-rlp", "bytes", @@ -575,9 +575,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro" -version = "1.1.2" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8612e0658964d616344f199ab251a49d48113992d81b92dab93ed855faa66383" +checksum = "a14f21d053aea4c6630687c2f4ad614bed4c81e14737a9b904798b24f30ea849" dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", @@ -589,9 +589,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro-expander" -version = "1.1.2" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a384edac7283bc4c010a355fb648082860c04b826bb7a814c45263c8f304c74" +checksum = "34d99282e7c9ef14eb62727981a985a01869e586d1dec729d3bb33679094c100" dependencies = [ "alloy-json-abi", "alloy-sol-macro-input", @@ -608,9 +608,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro-input" -version = "1.1.2" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd588c2d516da7deb421b8c166dc60b7ae31bca5beea29ab6621fcfa53d6ca5" +checksum = "eda029f955b78e493360ee1d7bd11e1ab9f2a220a5715449babc79d6d0a01105" dependencies = [ "alloy-json-abi", "const-hex", @@ -626,9 +626,9 @@ dependencies = [ [[package]] name = "alloy-sol-type-parser" -version = "1.1.2" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86ddeb70792c7ceaad23e57d52250107ebbb86733e52f4a25d8dc1abc931837" +checksum = "10db1bd7baa35bc8d4a1b07efbf734e73e5ba09f2580fb8cee3483a36087ceb2" dependencies = [ "serde", "winnow", @@ -636,9 +636,9 @@ dependencies = [ [[package]] name = "alloy-sol-types" -version = "1.1.2" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "584cb97bfc5746cb9dcc4def77da11694b5d6d7339be91b7480a6a68dc129387" +checksum = "58377025a47d8b8426b3e4846a251f2c1991033b27f517aade368146f6ab1dfe" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -4034,6 +4034,7 @@ dependencies = [ "revive-dt-node-interaction", "revive-dt-report", "revive-solc-json-interface", + "serde_json", "temp-dir", ] @@ -4042,6 +4043,8 @@ name = "revive-dt-format" version = "0.1.0" dependencies = [ "alloy", + "alloy-primitives", + "alloy-sol-types", "anyhow", "log", "semver 1.0.26", @@ -5143,9 +5146,9 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "1.1.2" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5d879005cc1b5ba4e18665be9e9501d9da3a9b95f625497c4cb7ee082b532e" +checksum = "b9ac494e7266fcdd2ad80bf4375d55d27a117ea5c866c26d0e97fe5b3caeeb75" dependencies = [ "paste", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index 597ef15..9e7f873 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,6 +23,8 @@ revive-dt-node-pool = { version = "0.1.0", path = "crates/node-pool" } revive-dt-report = { version = "0.1.0", path = "crates/report" } revive-dt-solc-binaries = { version = "0.1.0", path = "crates/solc-binaries" } +alloy-primitives = "1.2.1" +alloy-sol-types = "1.2.1" anyhow = "1.0" clap = { version = "4", features = ["derive"] } env_logger = "0.11.8" diff --git a/crates/format/Cargo.toml b/crates/format/Cargo.toml index d8fc345..e0db5cc 100644 --- a/crates/format/Cargo.toml +++ b/crates/format/Cargo.toml @@ -10,6 +10,8 @@ rust-version.workspace = true [dependencies] alloy = { workspace = true } +alloy-primitives = { workspace = true } +alloy-sol-types = { workspace = true } anyhow = { workspace = true } log = { workspace = true } semver = { workspace = true } diff --git a/crates/format/src/input.rs b/crates/format/src/input.rs index f1ad8f4..6177830 100644 --- a/crates/format/src/input.rs +++ b/crates/format/src/input.rs @@ -126,6 +126,8 @@ impl Input { .get(&self.instance) .ok_or_else(|| anyhow::anyhow!("ABI for instance '{}' not found", &self.instance))?; + log::trace!("ABI found for instance: {}", &self.instance); + // Find function by selector let function = abi .functions() @@ -138,6 +140,8 @@ impl Input { ) })?; + log::trace!("Functions found for instance: {}", &self.instance); + // Parse calldata let calldata_args = match &self.calldata { Some(Calldata::Compound(args)) => args, @@ -152,6 +156,8 @@ impl Input { ); } + log::trace!("Starting encoding ABI's paramters for instance: {}", &self.instance); + let mut encoded = selector.to_vec(); for (i, param) in function.inputs.iter().enumerate() { diff --git a/crates/node/src/geth.rs b/crates/node/src/geth.rs index 29c2b66..673021e 100644 --- a/crates/node/src/geth.rs +++ b/crates/node/src/geth.rs @@ -16,7 +16,7 @@ use std::{ use alloy::{ network::EthereumWallet, - primitives::{Address, map::HashMap}, + primitives::{Address}, providers::{Provider, ProviderBuilder, ext::DebugApi}, rpc::types::{ TransactionReceipt, TransactionRequest, diff --git a/crates/node/src/kitchensink.rs b/crates/node/src/kitchensink.rs index d9fa886..3bb3ad1 100644 --- a/crates/node/src/kitchensink.rs +++ b/crates/node/src/kitchensink.rs @@ -14,7 +14,7 @@ use std::{ use alloy::{ hex, network::EthereumWallet, - primitives::{Address, map::HashMap}, + primitives::{Address}, providers::{Provider, ProviderBuilder, ext::DebugApi}, rpc::types::{ TransactionReceipt,