core: add FaultException to AppExecResult

pkg/core/blockchain.go

@@ -584,6 +584,7 @@ func (bc *Blockchain) storeBlock(block *block.Block, txpool *mempool.Pool) error
 		v.GasLimit = tx.SystemFee
 
 		err := v.Run()
+		var faultException string
 		if !v.HasFailed() {
 			_, err := systemInterop.DAO.Persist()
 			if err != nil {
@@ -597,6 +598,7 @@ func (bc *Blockchain) storeBlock(block *block.Block, txpool *mempool.Pool) error
 				zap.String("tx", tx.Hash().StringLE()),
 				zap.Uint32("block", block.Index),
 				zap.Error(err))
+			faultException = err.Error()
 		}
 		aer := &state.AppExecResult{
 			TxHash:         tx.Hash(),
@@ -605,6 +607,7 @@ func (bc *Blockchain) storeBlock(block *block.Block, txpool *mempool.Pool) error
 			GasConsumed:    v.GasConsumed(),
 			Stack:          v.Estack().ToArray(),
 			Events:         systemInterop.Notifications,
+			FaultException: faultException,
 		}
 		appExecResults = append(appExecResults, aer)
 		err = cache.PutAppExecResult(aer, writeBuf)

pkg/core/state/notification_event.go

@@ -29,6 +29,7 @@ type AppExecResult struct {
 	GasConsumed    int64
 	Stack          []stackitem.Item
 	Events         []NotificationEvent
+	FaultException string
 }
 
 // EncodeBinary implements the Serializable interface.
@@ -62,6 +63,7 @@ func (aer *AppExecResult) EncodeBinary(w *io.BinWriter) {
 	w.WriteU64LE(uint64(aer.GasConsumed))
 	stackitem.EncodeBinaryStackItem(stackitem.NewArray(aer.Stack), w)
 	w.WriteArray(aer.Events)
+	w.WriteVarBytes([]byte(aer.FaultException))
 }
 
 // DecodeBinary implements the Serializable interface.
@@ -80,6 +82,7 @@ func (aer *AppExecResult) DecodeBinary(r *io.BinReader) {
 		aer.Stack = arr
 	}
 	r.ReadArray(&aer.Events)
+	aer.FaultException = r.ReadString()
 }
 
 // notificationEventAux is an auxiliary struct for NotificationEvent JSON marshalling.
@@ -129,6 +132,7 @@ type appExecResultAux struct {
 	GasConsumed    int64               `json:"gasconsumed,string"`
 	Stack          json.RawMessage     `json:"stack"`
 	Events         []NotificationEvent `json:"notifications"`
+	FaultException string              `json:"exception,omitempty"`
 }
 
 // MarshalJSON implements implements json.Marshaler interface.
@@ -164,6 +168,7 @@ func (aer *AppExecResult) MarshalJSON() ([]byte, error) {
 		GasConsumed:    aer.GasConsumed,
 		Stack:          st,
 		Events:         aer.Events,
+		FaultException: aer.FaultException,
 	})
 }
 
@@ -202,6 +207,7 @@ func (aer *AppExecResult) UnmarshalJSON(data []byte) error {
 	aer.VMState = state
 	aer.Events = aux.Events
 	aer.GasConsumed = aux.GasConsumed
+	aer.FaultException = aux.FaultException
 
 	return nil
 }

pkg/core/state/notification_event_test.go

@@ -24,6 +24,7 @@ func TestEncodeDecodeNotificationEvent(t *testing.T) {
 }
 
 func TestEncodeDecodeAppExecResult(t *testing.T) {
+	t.Run("halt", func(t *testing.T) {
 		appExecResult := &AppExecResult{
 			TxHash:      random.Uint256(),
 			Trigger:     1,
@@ -34,6 +35,20 @@ func TestEncodeDecodeAppExecResult(t *testing.T) {
 		}
 
 		testserdes.EncodeDecodeBinary(t, appExecResult, new(AppExecResult))
+	})
+	t.Run("fault", func(t *testing.T) {
+		appExecResult := &AppExecResult{
+			TxHash:         random.Uint256(),
+			Trigger:        1,
+			VMState:        vm.FaultState,
+			GasConsumed:    10,
+			Stack:          []stackitem.Item{},
+			Events:         []NotificationEvent{},
+			FaultException: "unhandled error",
+		}
+
+		testserdes.EncodeDecodeBinary(t, appExecResult, new(AppExecResult))
+	})
 }
 
 func TestMarshalUnmarshalJSONNotificationEvent(t *testing.T) {
@@ -86,6 +101,18 @@ func TestMarshalUnmarshalJSONAppExecResult(t *testing.T) {
 		testserdes.MarshalUnmarshalJSON(t, appExecResult, new(AppExecResult))
 	})
 
+	t.Run("positive, fault state", func(t *testing.T) {
+		appExecResult := &AppExecResult{
+			TxHash:         random.Uint256(),
+			Trigger:        trigger.Application,
+			VMState:        vm.FaultState,
+			GasConsumed:    10,
+			Stack:          []stackitem.Item{},
+			Events:         []NotificationEvent{},
+			FaultException: "unhandled exception",
+		}
+		testserdes.MarshalUnmarshalJSON(t, appExecResult, new(AppExecResult))
+	})
 	t.Run("positive, block", func(t *testing.T) {
 		appExecResult := &AppExecResult{
 			TxHash:      random.Uint256(),