improve locking in merging deletion proof

scroll-tech · Mar 28, 2023 · 1aeac4e · 1aeac4e
1 parent 7471d45
commit 1aeac4e
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/eth/tracers/api_blocktrace.go b/eth/tracers/api_blocktrace.go
@@ -334,12 +334,17 @@ func (api *API) getTxResult(env *traceEnv, state *state.StateDB, index int, bloc
 	}
 
 	deletionProofs := tracer.DeletionProofs()
+	// calc key and cache first, so we lock env shorter
+	// while merging
+	mergedProofs := make(map[common.Hash][]byte)
 	for _, bt := range deletionProofs {
-		key := crypto.Keccak256Hash(bt)
-		env.sMu.Lock()
+		mergedProofs[crypto.Keccak256Hash(bt)] = bt
+	}
+	env.sMu.Lock()
+	for key, bt := range mergedProofs {
 		env.deletionProofAgg[key] = bt
-		env.sMu.Unlock()
 	}
+	env.sMu.Unlock()
 
 	var l1Fee uint64
 	if result.L1Fee != nil {