wip

Jon-Becker · Dec 23, 2024 · b2bbfdf · b2bbfdf
1 parent 4767941
commit b2bbfdf
Show file tree

Hide file tree

Showing 6 changed files with 88 additions and 74 deletions.
diff --git a/crates/cfg/src/core/graph.rs b/crates/cfg/src/core/graph.rs
@@ -25,7 +25,7 @@ pub fn build_cfg(
 
         let assembly = format!(
             "{} {} {}",
-            encode_hex_reduced(U256::from(operation.last_instruction.instruction)),
+            encode_hex_reduced(U256::from(operation.last_instruction.pc)),
             opcode_name,
             if opcode_name.contains("PUSH") {
                 encode_hex_reduced(
@@ -61,8 +61,8 @@ pub fn build_cfg(
                 .first()
                 .ok_or_eyre("failed to get first operation")?
                 .last_instruction
-                .opcode ==
-                JUMPDEST,
+                .opcode
+                == JUMPDEST,
         )?;
     }
 

diff --git a/crates/decompile/src/utils/heuristics/arguments.rs b/crates/decompile/src/utils/heuristics/arguments.rs
@@ -30,8 +30,8 @@ pub fn argument_heuristic<'a>(
                 // calculate the argument index, with the 4byte signature padding removed
                 // for example, CALLDATALOAD(4) -> (4-4)/32 = 0
                 //              CALLDATALOAD(36) -> (36-4)/32 = 1
-                let arg_index = (state.last_instruction.inputs[0].saturating_sub(U256::from(4)) /
-                    U256::from(32))
+                let arg_index = (state.last_instruction.inputs[0].saturating_sub(U256::from(4))
+                    / U256::from(32))
                 .try_into()
                 .unwrap_or(usize::MAX);
 
@@ -77,7 +77,7 @@ pub fn argument_heuristic<'a>(
                     {
                         debug!(
                             "instruction {} ({}) indicates argument {} is masked to {} bytes",
-                            state.last_instruction.instruction,
+                            state.last_instruction.pc,
                             opcode_name(state.last_instruction.opcode),
                             arg_index,
                             mask_size_bytes
@@ -227,7 +227,7 @@ pub fn argument_heuristic<'a>(
                 {
                     debug!(
                         "instruction {} ({}) indicates argument {} may be a numeric type",
-                        state.last_instruction.instruction,
+                        state.last_instruction.pc,
                         opcode_name(state.last_instruction.opcode),
                         arg_index
                     );
@@ -251,7 +251,7 @@ pub fn argument_heuristic<'a>(
                 {
                     debug!(
                         "instruction {} ({}) indicates argument {} may be a bytes type",
-                        state.last_instruction.instruction,
+                        state.last_instruction.pc,
                         opcode_name(state.last_instruction.opcode),
                         arg_index
                     );
@@ -278,7 +278,7 @@ pub fn argument_heuristic<'a>(
                     {
                         debug!(
                             "instruction {} ({}) indicates argument {} may be a boolean",
-                            state.last_instruction.instruction,
+                            state.last_instruction.pc,
                             opcode_name(state.last_instruction.opcode),
                             arg_index
                         );

diff --git a/crates/decompile/src/utils/heuristics/extcall.rs b/crates/decompile/src/utils/heuristics/extcall.rs
@@ -39,7 +39,7 @@ pub fn extcall_heuristic<'a>(
                 if gas_solidified.contains("0x08fc") {
                     trace!(
                         "instruction {} ({}) with 2300 gas indicates a value transfer",
-                        instruction.instruction,
+                        instruction.pc,
                         opcode_name(instruction.opcode)
                     );
                     function.logic.push(format!(
@@ -51,7 +51,7 @@ pub fn extcall_heuristic<'a>(
                 if extcalldata.is_empty() {
                     trace!(
                         "instruction {} ({}) with no calldata indicates a value transfer",
-                        instruction.instruction,
+                        instruction.pc,
                         opcode_name(instruction.opcode)
                     );
                     function.logic.push(format!(

diff --git a/crates/decompile/src/utils/heuristics/modifiers.rs b/crates/decompile/src/utils/heuristics/modifiers.rs
@@ -22,7 +22,7 @@ pub fn modifier_heuristic<'a>(
         if function.pure && !opcode_info.is_pure() {
             debug!(
                 "instruction {} ({}) indicates a non-pure function",
-                state.last_instruction.instruction,
+                state.last_instruction.pc,
                 opcode_info.name()
             );
             function.pure = false;
@@ -32,21 +32,21 @@ pub fn modifier_heuristic<'a>(
         if function.view && !opcode_info.is_view() {
             debug!(
                 "instruction {} ({}) indicates a non-view function",
-                state.last_instruction.instruction,
+                state.last_instruction.pc,
                 opcode_info.name()
             );
             function.view = false;
         }
 
         // if the instruction is a JUMPI with non-zero CALLVALUE requirement, the function is
         // non-payable exactly: ISZERO(CALLVALUE())
-        if function.payable &&
-            state.last_instruction.opcode == JUMPI &&
-            state.last_instruction.input_operations[1] == w_iszero!(w_callvalue!())
+        if function.payable
+            && state.last_instruction.opcode == JUMPI
+            && state.last_instruction.input_operations[1] == w_iszero!(w_callvalue!())
         {
             debug!(
                 "conditional at instruction {} indicates a non-payable function",
-                state.last_instruction.instruction
+                state.last_instruction.pc
             );
             function.payable = false;
         }