Merge branch 'testnet' into testnet-coreclr

neo-project · Oct 15, 2016 · ed35261 · ed35261
2 parents 05a6242 + b4d6c40
commit ed35261
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/AntSharesCore/Network/LocalNode.cs b/AntSharesCore/Network/LocalNode.cs
@@ -301,6 +301,17 @@ public RemoteNode[] GetRemoteNodes()
             }
         }
 
+        public static Transaction GetTransaction(UInt256 hash)
+        {
+            lock (MemoryPool)
+            {
+                Transaction tx;
+                if (!MemoryPool.TryGetValue(hash, out tx))
+                    return null;
+                return tx;
+            }
+        }
+
         private static bool IsIntranetAddress(IPAddress address)
         {
             byte[] data = address.MapToIPv4().GetAddressBytes();

diff --git a/AntSharesCore/Network/RemoteNode.cs b/AntSharesCore/Network/RemoteNode.cs
@@ -187,6 +187,8 @@ private void OnGetDataMessageReceived(InvPayload payload)
                 switch (vector.Type)
                 {
                     case InventoryType.TX:
+                        if (inventory == null)
+                            inventory = LocalNode.GetTransaction(hash);
                         if (inventory == null && Blockchain.Default != null)
                             inventory = Blockchain.Default.GetTransaction(vector.Hash);
                         if (inventory != null)

diff --git a/AntSharesDaemon/Network/RPC/RpcServer.cs b/AntSharesDaemon/Network/RPC/RpcServer.cs
@@ -97,7 +97,9 @@ private JObject InternalCall(string method, JArray _params)
                     {
                         UInt256 hash = UInt256.Parse(_params[0].AsString());
                         bool verbose = _params.Count >= 2 && _params[1].AsBooleanOrDefault(false);
-                        Transaction tx = Blockchain.Default.GetTransaction(hash);
+                        Transaction tx = LocalNode.GetTransaction(hash);
+                        if (tx == null)
+                            tx = Blockchain.Default.GetTransaction(hash);
                         if (tx == null)
                             throw new RpcException(-101, "Unknown transaction");
                         if (verbose)

diff --git a/Miner/Program.cs b/Miner/Program.cs
@@ -6,6 +6,8 @@ namespace AntShares
 {
     static class Program
     {
+          private static readonly object LogSync = new object();
+
 //        private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
 //        {
 //#if DEBUG
@@ -34,10 +36,13 @@ internal static void Log(string message)
             DateTime now = DateTime.Now;
             string line = $"[{now.TimeOfDay:hh\\:mm\\:ss}] {message}";
             Console.WriteLine(line);
-            string path = Path.Combine(AppContext.BaseDirectory, "Logs");
-            Directory.CreateDirectory(path);
-            path = Path.Combine(path, $"{now:yyyy-MM-dd}.log");
-            File.AppendAllLines(path, new[] { line });
+            lock (LogSync)
+            {
+                string path = Path.Combine(AppContext.BaseDirectory, "Logs");
+                Directory.CreateDirectory(path);
+                path = Path.Combine(path, $"{now:yyyy-MM-dd}.log");
+                File.AppendAllLines(path, new[] { line });
+            }
         }
 
         static void Main(string[] args)