add logs to execution

src/ApplicationLogs/LogReader.cs

@@ -31,6 +31,11 @@ public class LogReader : Plugin
         public override string Name => "ApplicationLogs";
         public override string Description => "Synchronizes the smart contract log with the NativeContract log (Notify)";
 
+        /// <summary>
+        ///  LogEvents is a list of events that are logged by the smart contract.
+        /// </summary>
+        private readonly Dictionary<UInt256, List<LogEventArgs>> _logEvents = new();
+
         public LogReader()
         {
             Blockchain.Committing += OnCommitting;
@@ -54,6 +59,19 @@ protected override void OnSystemLoaded(NeoSystem system)
         {
             if (system.Settings.Network != Settings.Default.Network) return;
             RpcServerPlugin.RegisterMethods(this, Settings.Default.Network);
+
+            // It is possible to have dos attack by sending a lot of transactions.
+            void Ev(object _, LogEventArgs e)
+            {
+                if (e.ScriptContainer is not Transaction tx) return;
+                if (!_logEvents.TryGetValue(tx.Hash, out var list))
+                {
+                    list = new();
+                    _logEvents.Add(tx.Hash, list);
+                }
+                list.Add(e);
+            }
+            ApplicationEngine.Log += Ev;
         }
 
         [RpcMethod]
@@ -114,8 +132,7 @@ public static JObject TxLogToJson(Blockchain.ApplicationExecuted appExec)
                 }
                 return notification;
             }).ToArray();
-
-            txJson["executions"] = new List<JObject>() { trigger }.ToArray();
+            txJson["executions"] = new JArray(trigger);
             return txJson;
         }
 
@@ -176,8 +193,18 @@ private void OnCommitting(NeoSystem system, Block block, DataCache snapshot, IRe
             foreach (var appExec in applicationExecutedList.Where(p => p.Transaction != null))
             {
                 var txJson = TxLogToJson(appExec);
+                if (_logEvents.TryGetValue(appExec.Transaction.Hash, out var list))
+                {
+                    var logs = list.Select(q => new JObject
+                    {
+                        ["contract"] = q.ScriptHash.ToString(),
+                        ["message"] = q.Message
+                    }).ToArray();
+                    txJson["logs"] = logs;
+                }
                 Put(appExec.Transaction.Hash.ToArray(), Neo.Utility.StrictUTF8.GetBytes(txJson.ToString()));
             }
+            _logEvents.Clear();
 
             //processing log for block
             var blockJson = BlockLogToJson(block, applicationExecutedList);

src/RpcClient/Models/RpcApplicationLog.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2015-2021 The Neo Project.
+// Copyright (C) 2015-2022 The Neo Project.
 //
 // The Neo.Network.RPC is free software distributed under the MIT software license,
 // see the accompanying file LICENSE in the main directory of the
@@ -61,15 +61,20 @@ public class Execution
 
         public List<RpcNotifyEventArgs> Notifications { get; set; }
 
+        public List<RpcLogEventArgs> Logs { get; set; }
+
         public JObject ToJson()
         {
-            JObject json = new();
-            json["trigger"] = Trigger;
-            json["vmstate"] = VMState;
-            json["gasconsumed"] = GasConsumed.ToString();
-            json["exception"] = ExceptionMessage;
-            json["stack"] = Stack.Select(q => q.ToJson()).ToArray();
-            json["notifications"] = Notifications.Select(q => q.ToJson()).ToArray();
+            JObject json = new()
+            {
+                ["trigger"] = Trigger,
+                ["vmstate"] = VMState,
+                ["gasconsumed"] = GasConsumed.ToString(),
+                ["exception"] = ExceptionMessage,
+                ["stack"] = Stack.Select(q => q.ToJson()).ToArray(),
+                ["notifications"] = Notifications.Select(q => q.ToJson()).ToArray(),
+                ["logs"] = Logs.Select(q => q.ToJson()).ToArray()
+            };
             return json;
         }
 
@@ -82,7 +87,8 @@ public static Execution FromJson(JObject json, ProtocolSettings protocolSettings
                 GasConsumed = long.Parse(json["gasconsumed"].AsString()),
                 ExceptionMessage = json["exception"]?.AsString(),
                 Stack = ((JArray)json["stack"]).Select(p => Utility.StackItemFromJson(p)).ToList(),
-                Notifications = ((JArray)json["notifications"]).Select(p => RpcNotifyEventArgs.FromJson(p, protocolSettings)).ToList()
+                Notifications = ((JArray)json["notifications"]).Select(p => RpcNotifyEventArgs.FromJson(p, protocolSettings)).ToList(),
+                Logs = ((JArray)json["logs"]).Select(p => RpcLogEventArgs.FromJson(p, protocolSettings)).ToList()
             };
         }
     }
@@ -114,4 +120,29 @@ public static RpcNotifyEventArgs FromJson(JObject json, ProtocolSettings protoco
             };
         }
     }
+
+    public class RpcLogEventArgs
+    {
+        public UInt160 Contract { get; set; }
+
+        public string Message { get; set; }
+
+        public JObject ToJson()
+        {
+            return new JObject
+            {
+                ["contract"] = Contract.ToString(),
+                ["message"] = Message
+            };
+        }
+
+        public static RpcLogEventArgs FromJson(JObject json, ProtocolSettings protocolSettings)
+        {
+            return new RpcLogEventArgs
+            {
+                Contract = json["contract"].ToScriptHash(protocolSettings),
+                Message = json["message"].AsString()
+            };
+        }
+    }
 }

src/RpcServer/RpcServer.SmartContract.cs

@@ -83,6 +83,14 @@ private JObject GetInvokeResult(byte[] script, Signer[] signers = null, Witness[
                     obj["state"] = ToJson(n.State, session);
                     return obj;
                 }));
+                json["logs"] = new JArray(session.Engine.Notifications.Select(n =>
+                {
+                    var obj = new JObject();
+                    obj["eventname"] = n.EventName;
+                    obj["contract"] = n.ScriptHash.ToString();
+                    obj["state"] = ToJson(n.State, session);
+                    return obj;
+                }));
                 if (useDiagnostic)
                 {
                     Diagnostic diagnostic = (Diagnostic)session.Engine.Diagnostic;