add cleanup

x/evm/keeper/msg_server.go

@@ -62,7 +62,8 @@ func (server msgServer) EVMTransaction(goCtx context.Context, msg *types.MsgEVMT
 
 	defer func() {
 		if pe := recover(); pe != nil {
-			// there is not supposed to be any panic
+			stateDB.Cleanup()
+			// there is not supposed to be any panic (except from OCC)
 			debug.PrintStack()
 			ctx.Logger().Error(fmt.Sprintf("EVM PANIC: %s", pe))
 			telemetry.IncrCounter(1, types.ModuleName, "panics")

x/evm/state/accesslist.go

@@ -115,5 +115,5 @@ func (s *DBImpl) getCurrentAccessList() *accessList {
 }
 
 func (s *DBImpl) saveAccessList(al *accessList) {
-	s.tempStateCurrent.transientAccessLists = al
+	// s.tempStateCurrent.transientAccessLists = al
 }

x/evm/state/statedb.go

@@ -81,14 +81,17 @@ func (s *DBImpl) SetEVM(evm *vm.EVM) {}
 // to the database.
 func (s *DBImpl) AddPreimage(_ common.Hash, _ []byte) {}
 
+func (s *DBImpl) Cleanup() {
+	s.tempStateCurrent = nil
+	s.tempStatesHist = []*TemporaryState{}
+	s.logger = nil
+	s.snapshottedCtxs = nil
+}
+
 func (s *DBImpl) Finalize() (surplus sdk.Int, err error) {
 	if s.simulation {
 		panic("should never call finalize on a simulation DB")
 	}
-	defer func() {
-		s.tempStateCurrent = nil
-		s.tempStatesHist = []*TemporaryState{}
-	}()
 	if s.err != nil {
 		err = s.err
 		return