From 2d0e8162b8b004c6110ea513ec798e6ca320a469 Mon Sep 17 00:00:00 2001
From: Matthias Seitz <matthias.seitz@outlook.de>
Date: Mon, 5 Jun 2023 04:26:57 +0200
Subject: [PATCH] fix: push_trace iteratively (#2979)

---
 .../revm/revm-inspectors/src/tracing/arena.rs | 53 ++++++++++---------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/crates/revm/revm-inspectors/src/tracing/arena.rs b/crates/revm/revm-inspectors/src/tracing/arena.rs
index 4085acd6b..9e8ffa02e 100644
--- a/crates/revm/revm-inspectors/src/tracing/arena.rs
+++ b/crates/revm/revm-inspectors/src/tracing/arena.rs
@@ -11,35 +11,36 @@ pub struct CallTraceArena {
 
 impl CallTraceArena {
     /// Pushes a new trace into the arena, returning the trace ID
-    pub(crate) fn push_trace(&mut self, entry: usize, new_trace: CallTrace) -> usize {
-        match new_trace.depth {
-            // The entry node, just update it
-            0 => {
-                self.arena[0].trace = new_trace;
-                0
-            }
-            // We found the parent node, add the new trace as a child
-            _ if self.arena[entry].trace.depth == new_trace.depth - 1 => {
-                let id = self.arena.len();
+    pub(crate) fn push_trace(&mut self, mut entry: usize, new_trace: CallTrace) -> usize {
+        loop {
+            match new_trace.depth {
+                // The entry node, just update it
+                0 => {
+                    self.arena[0].trace = new_trace;
+                    return 0
+                }
+                // We found the parent node, add the new trace as a child
+                _ if self.arena[entry].trace.depth == new_trace.depth - 1 => {
+                    let id = self.arena.len();
 
-                let trace_location = self.arena[entry].children.len();
-                self.arena[entry].ordering.push(LogCallOrder::Call(trace_location));
-                let node = CallTraceNode {
-                    parent: Some(entry),
-                    trace: new_trace,
-                    idx: id,
-                    ..Default::default()
-                };
-                self.arena.push(node);
-                self.arena[entry].children.push(id);
+                    let trace_location = self.arena[entry].children.len();
+                    self.arena[entry].ordering.push(LogCallOrder::Call(trace_location));
+                    let node = CallTraceNode {
+                        parent: Some(entry),
+                        trace: new_trace,
+                        idx: id,
+                        ..Default::default()
+                    };
+                    self.arena.push(node);
+                    self.arena[entry].children.push(id);
 
-                id
+                    return id
+                }
+                _ => {
+                    // We haven't found the parent node, go deeper
+                    entry = *self.arena[entry].children.last().expect("Disconnected trace");
+                }
             }
-            // We haven't found the parent node, go deeper
-            _ => self.push_trace(
-                *self.arena[entry].children.last().expect("Disconnected trace"),
-                new_trace,
-            ),
         }
     }
 }