txdag: fix system tx finalise issue; (bnb-chain#33)

* txdag: fix system tx finalise issue; * txdag: fix system tx finalise issue; --------- Co-authored-by: galaio <[email protected]>
sunny2022da · Nov 14, 2024 · e1fda81 · e1fda81
1 parent 5f2b561
commit e1fda81
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/core/state/statedb.go b/core/state/statedb.go
@@ -2528,6 +2528,7 @@ func (s *StateDB) RecordSystemTxRWSet(index int) {
 	s.mvStates.FulfillRWSet(types.NewRWSet(types.StateVersion{
 		TxIndex: index,
 	}).WithExcludedTxFlag(), types.NewExeStat(index).WithExcludedTxFlag())
+	s.mvStates.Finalise(index)
 }
 
 // copySet returns a deep-copied set.

diff --git a/core/state_transition.go b/core/state_transition.go
@@ -448,7 +448,7 @@ func (st *StateTransition) TransitionDb() (*ExecutionResult, error) {
 		}
 		// just record error tx here
 		if ferr := st.state.FinaliseRWSet(); ferr != nil {
-			log.Error("finalise error deposit tx rwSet fail", "block", st.evm.Context.BlockNumber, "tx", st.evm.StateDB.TxIndex())
+			log.Error("finalise error deposit tx rwSet fail", "block", st.evm.Context.BlockNumber, "tx", st.evm.StateDB.TxIndex(), "err", ferr)
 		}
 		result = &ExecutionResult{
 			UsedGas:    gasUsed,
@@ -460,7 +460,7 @@ func (st *StateTransition) TransitionDb() (*ExecutionResult, error) {
 	if err != nil {
 		// just record error tx here
 		if ferr := st.state.FinaliseRWSet(); ferr != nil {
-			log.Error("finalise error tx rwSet fail", "block", st.evm.Context.BlockNumber, "tx", st.evm.StateDB.TxIndex())
+			log.Error("finalise error tx rwSet fail", "block", st.evm.Context.BlockNumber, "tx", st.evm.StateDB.TxIndex(), "err", ferr)
 		}
 	}
 	return result, err
@@ -545,7 +545,7 @@ func (st *StateTransition) innerTransitionDb() (*ExecutionResult, error) {
 
 	// stop record rw set in here, skip gas fee distribution
 	if ferr := st.state.FinaliseRWSet(); ferr != nil {
-		log.Error("finalise tx rwSet fail", "block", st.evm.Context.BlockNumber, "tx", st.evm.StateDB.TxIndex())
+		log.Error("finalise tx rwSet fail", "block", st.evm.Context.BlockNumber, "tx", st.evm.StateDB.TxIndex(), "err", ferr)
 	}
 
 	// if deposit: skip refunds, skip tipping coinbase