Merge pull request #81 from Jon-Becker/fix/decompile-patches

🔀 0.4.1 patches
Jon-Becker · Mar 19, 2023 · 754aa10 · 754aa10
2 parents f3fab2b + 3d6c73f
commit 754aa10
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cache/Cargo.toml b/cache/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "heimdall-cache"
-version = "0.4.0"
+version = "0.4.1"
 edition = "2021"
 license = "MIT"
 readme = "README.md"

diff --git a/common/Cargo.toml b/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "heimdall-common"
-version = "0.4.0"
+version = "0.4.1"
 edition = "2021"
 license = "MIT"
 readme = "README.md"

diff --git a/common/src/resources/transpose.rs b/common/src/resources/transpose.rs
@@ -72,6 +72,7 @@ fn _call_transpose(query: String, api_key: &String, logger: &Logger) -> Option<T
 }
 
 pub fn get_transaction_list(
+    chain: &String,
     address: &String,
     api_key: &String,
     bounds: (&u128, &u128),
@@ -87,7 +88,7 @@ pub fn get_transaction_list(
 
     // build the SQL query
     let query = format!(
-        "{{\"sql\":\"SELECT block_number, transaction_hash FROM  (SELECT transaction_hash, block_number FROM ethereum.transactions WHERE to_address = '{}' AND block_number BETWEEN {} AND {}  UNION  SELECT transaction_hash, block_number FROM ethereum.traces WHERE to_address = '{}' AND block_number BETWEEN {} AND {}) x\",\"parameters\":{{}},\"options\":{{\"timeout\": 999999999}}}}",
+        "{{\"sql\":\"SELECT block_number, transaction_hash FROM  (SELECT transaction_hash, block_number FROM {chain}.transactions WHERE to_address = '{}' AND block_number BETWEEN {} AND {}  UNION  SELECT transaction_hash, block_number FROM {chain}.traces WHERE to_address = '{}' AND block_number BETWEEN {} AND {}) x\",\"parameters\":{{}},\"options\":{{\"timeout\": 999999999}}}}",
         address,
         bounds.0,
         bounds.1,
@@ -152,6 +153,7 @@ pub fn get_transaction_list(
 }
 
 pub fn get_contract_creation(
+    chain: &String,
     address: &String,
     api_key: &String,
     logger: &Logger
@@ -166,7 +168,7 @@ pub fn get_contract_creation(
 
     // build the SQL query
     let query = format!(
-        "{{\"sql\":\"SELECT block_number, transaction_hash FROM ethereum.transactions WHERE TIMESTAMP = ( SELECT created_timestamp FROM ethereum.accounts WHERE address = '{}' ) AND contract_address = '{}'\",\"parameters\":{{}},\"options\":{{\"timeout\": 999999999}}}}",
+        "{{\"sql\":\"SELECT block_number, transaction_hash FROM {chain}.transactions WHERE TIMESTAMP = ( SELECT created_timestamp FROM {chain}.accounts WHERE address = '{}' ) AND contract_address = '{}'\",\"parameters\":{{}},\"options\":{{\"timeout\": 999999999}}}}",
         address,
         address,
     );

diff --git a/config/Cargo.toml b/config/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "heimdall-config"
-version = "0.4.0"
+version = "0.4.1"
 edition = "2021"
 license = "MIT"
 readme = "README.md"

diff --git a/heimdall/Cargo.toml b/heimdall/Cargo.toml
@@ -5,7 +5,7 @@ keywords = ["ethereum", "web3", "decompiler", "evm", "crypto"]
 license = "MIT"
 name = "heimdall"
 readme = "README.md"
-version = "0.4.0"
+version = "0.4.1"
 
 [dependencies]
 backtrace = "0.3"

diff --git a/heimdall/src/decompile/postprocess.rs b/heimdall/src/decompile/postprocess.rs
@@ -519,7 +519,6 @@ fn replace_resolved(
     }
 
     for (selector, event) in all_resolved_events.iter() {
-        let selector = selector.get(0..8).unwrap_or("00000000");
         if cleaned.contains(selector) {
             cleaned = cleaned.replace(&format!("Event_{selector}"), &event.name);
         }

diff --git a/heimdall/src/dump/mod.rs b/heimdall/src/dump/mod.rs
@@ -61,6 +61,10 @@ pub struct DumpArgs {
     /// Whether to skip opening the TUI.
     #[clap(long)]
     pub no_tui: bool,
+
+    /// The chain of the target. Valid chains are ethereum, polygon, goerli, canto, and arbitrum.
+    #[clap(long, default_value = "ethereum", hide_default_value = true)]
+    pub chain: String,
 }
 
 pub fn dump(args: DumpArgs) {
@@ -101,7 +105,7 @@ pub fn dump(args: DumpArgs) {
     // println!("{:?}", selectors);
 
     // get the contract creation tx
-    let contract_creation_tx = match get_contract_creation(&args.target, &args.transpose_api_key, &logger) {
+    let contract_creation_tx = match get_contract_creation(&args.chain, &args.target, &args.transpose_api_key, &logger) {
         Some(tx) => tx,
         None => {
             logger.error("failed to get contract creation transaction. Is the target a contract address?");
@@ -132,7 +136,7 @@ pub fn dump(args: DumpArgs) {
     }
 
     // fetch transactions
-    let transaction_list = get_transaction_list(&args.target, &args.transpose_api_key, (&args.from_block, &args.to_block), &logger);
+    let transaction_list = get_transaction_list(&args.chain, &args.target, &args.transpose_api_key, (&args.from_block, &args.to_block), &logger);
 
     // convert to vec of Transaction
     for transaction in transaction_list {

diff --git a/heimdall/src/dump/structures/dump_state.rs b/heimdall/src/dump/structures/dump_state.rs
@@ -32,6 +32,7 @@ impl DumpState {
                 from_block: 0,
                 to_block: 9999999999,
                 no_tui: false,
+                chain: String::from("ethereum"),
             },
             scroll_index: 0,
             selection_size: 1,