Merge pull request #9 from neo-project/master

m
chenzhitong · Nov 23, 2020 · a59d9ae · a59d9ae
2 parents 6828062 + f0a3ab6
commit a59d9ae
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/ApplicationLogs/LogReader.cs b/src/ApplicationLogs/LogReader.cs
@@ -68,6 +68,7 @@ public void OnPersist(StoreView snapshot, IReadOnlyList<Blockchain.ApplicationEx
                 JObject trigger = new JObject();
                 trigger["trigger"] = appExec.Trigger;
                 trigger["vmstate"] = appExec.VMState;
+                trigger["exception"] = GetExceptionMessage(appExec.Exception);
                 trigger["gasconsumed"] = appExec.GasConsumed.ToString();
                 try
                 {
@@ -150,5 +151,17 @@ public bool ShouldThrowExceptionFromCommit(Exception ex)
         {
             return false;
         }
+
+        string GetExceptionMessage(Exception exception)
+        {
+            if (exception == null) return "Engine faulted.";
+
+            if (exception.InnerException != null)
+            {
+                return GetExceptionMessage(exception.InnerException);
+            }
+
+            return exception.Message;
+        }
     }
 }
diff --git a/src/RpcServer/RpcServer.SmartContract.cs b/src/RpcServer/RpcServer.SmartContract.cs
@@ -63,7 +63,7 @@ public void SerializeUnsigned(BinaryWriter writer)
 
         private JObject GetInvokeResult(byte[] script, Signers signers = null)
         {
-            Transaction tx = new Transaction
+            Transaction tx = signers == null ? null : new Transaction
             {
                 Signers = signers?.GetSigners(),
                 Attributes = Array.Empty<TransactionAttribute>(),