Dont inspect account twice in API methods for emulation

(cherry picked from commit 2054c3e)
tonkeeper · Oct 13, 2023 · f83d018 · f83d018
1 parent d6fae81
commit f83d018
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/pkg/api/event_handlers.go b/pkg/api/event_handlers.go
@@ -595,6 +595,7 @@ func emulatedTreeToTrace(ctx context.Context, resolver core.LibraryResolver, con
 					Token1: *t1,
 				}
 			}
+			// TODO: find out masters of t0, t1
 		}
 	}
 	return t, nil

diff --git a/pkg/core/trace.go b/pkg/core/trace.go
@@ -101,6 +101,13 @@ func CollectAdditionalInfo(ctx context.Context, infoSource InformationSource, tr
 	var basicNftSale []tongo.AccountID
 	var stonfiPoolIDs []tongo.AccountID
 	visit(trace, func(trace *Trace) {
+		// when we emulate a trace,
+		// we construct "trace.AdditionalInfo" in emulatedTreeToTrace for all accounts the trace touches.
+		// moreover, some accounts change their states and some of them are not exist in the blockchain,
+		// so we must not inspect them again.
+		if trace.AdditionalInfo != nil {
+			return
+		}
 		if isDestinationJettonWallet(trace.InMsg) {
 			jettonWallets = append(jettonWallets, *trace.InMsg.Destination)
 		}
@@ -135,6 +142,13 @@ func CollectAdditionalInfo(ctx context.Context, infoSource InformationSource, tr
 		return err
 	}
 	visit(trace, func(trace *Trace) {
+		// when we emulate a trace,
+		// we construct "trace.AdditionalInfo" in emulatedTreeToTrace for all accounts the trace touches.
+		// moreover, some accounts change their states and some of them are not exist in the blockchain,
+		// so we must not inspect them again.
+		if trace.AdditionalInfo != nil {
+			return
+		}
 		trace.AdditionalInfo = &TraceAdditionalInfo{}
 		if isDestinationJettonWallet(trace.InMsg) {
 			if master, ok := masters[*trace.InMsg.Destination]; ok {
-Original file line number
+Diff line change
@@ Expand Up @@
     					Token1: *t1,
     				}
     			}
+    			// TODO: find out masters of t0, t1
     		}
     	}
     	return t, nil
@@ Expand Down @@