fix addBalance for delayGasFee (bnb-chain#25)

Make the change into the merged mainDB instead of slotDB to avoid the concurrency issue Co-authored-by: Sunny <[email protected]>
sunny2022da · Nov 14, 2024 · 0179461 · 0179461
1 parent 48cc66a
commit 0179461
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/core/parallel_state_processor.go b/core/parallel_state_processor.go
@@ -622,28 +622,30 @@ func (p *ParallelStateProcessor) confirmTxResults(statedb *state.StateDB, gp *Ga
 	}
 
 	resultTxIndex := result.txReq.txIndex
+
+	var root []byte
+	header := result.txReq.block.Header()
+
+	isByzantium := p.config.IsByzantium(header.Number)
+	isEIP158 := p.config.IsEIP158(header.Number)
+	result.slotDB.FinaliseForParallel(isByzantium || isEIP158, statedb)
+
+	// merge slotDB into mainDB
+	statedb.MergeSlotDB(result.slotDB, result.receipt, resultTxIndex, result.result.delayFees)
+
 	delayGasFee := result.result.delayFees
 	// add delayed gas fee
 	if delayGasFee != nil {
 		if delayGasFee.TipFee != nil {
-			result.slotDB.AddBalance(delayGasFee.Coinbase, delayGasFee.TipFee)
+			statedb.AddBalance(delayGasFee.Coinbase, delayGasFee.TipFee)
 		}
 		if delayGasFee.BaseFee != nil {
-			result.slotDB.AddBalance(params.OptimismBaseFeeRecipient, delayGasFee.BaseFee)
+			statedb.AddBalance(params.OptimismBaseFeeRecipient, delayGasFee.BaseFee)
 		}
 		if delayGasFee.L1Fee != nil {
-			result.slotDB.AddBalance(params.OptimismL1FeeRecipient, delayGasFee.L1Fee)
+			statedb.AddBalance(params.OptimismL1FeeRecipient, delayGasFee.L1Fee)
 		}
 	}
-	var root []byte
-	header := result.txReq.block.Header()
-
-	isByzantium := p.config.IsByzantium(header.Number)
-	isEIP158 := p.config.IsEIP158(header.Number)
-	result.slotDB.FinaliseForParallel(isByzantium || isEIP158, statedb)
-
-	// merge slotDB into mainDB
-	statedb.MergeSlotDB(result.slotDB, result.receipt, resultTxIndex, result.result.delayFees)
 
 	// Do IntermediateRoot after mergeSlotDB.
 	if !isByzantium {