Merge PR: fix random panic parallel tx (#2794)

okx · Nov 23, 2022 · 312efd9 · 312efd9
1 parent 27cbd9c
commit 312efd9
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/libs/cosmos-sdk/baseapp/baseapp_parallel.go b/libs/cosmos-sdk/baseapp/baseapp_parallel.go
@@ -279,6 +279,7 @@ func (app *BaseApp) runTxs() []*abci.ResponseDeliverTx {
 			pm.blockGasMeterMu.Unlock()
 			// merge tx
 			pm.SetCurrentIndex(txIndex, res)
+			pm.finalResult[txIndex] = res
 
 			currentGas += uint64(res.resp.GasUsed)
 			txIndex++
@@ -335,7 +336,7 @@ func (app *BaseApp) endParallelTxs() [][]byte {
 	txs := make([]sdk.Tx, app.parallelTxManage.txSize)
 	app.FeeSplitCollector = make([]*sdk.FeeSplitInfo, 0)
 	for index := 0; index < app.parallelTxManage.txSize; index++ {
-		txRes := app.parallelTxManage.txResultCollector.getTxResult(index)
+		txRes := app.parallelTxManage.finalResult[index]
 		logIndex[index] = txRes.paraMsg.LogIndex
 		errs[index] = txRes.paraMsg.AnteErr
 		hasEnterEvmTx[index] = txRes.paraMsg.HasRunEvmTx
@@ -617,6 +618,7 @@ type parallelTxManager struct {
 
 	extraTxsInfo      []*extraDataForTx
 	txResultCollector *txResultCollector
+	finalResult       []*executeResult
 
 	groupList     map[int][]int
 	nextTxInGroup map[int]int
@@ -745,6 +747,7 @@ func (f *parallelTxManager) init() {
 	txSize := f.txSize
 
 	f.txResultCollector.init(txSize)
+	f.finalResult = make([]*executeResult, txSize)
 
 	txsInfoCap := cap(f.extraTxsInfo)
 	if f.extraTxsInfo == nil || txsInfoCap < txSize {