fix bugs

src/bad_node_demo/Program.cs

@@ -81,7 +81,7 @@ static void Main(string[] args)
                 {
                     var addr = Console.ReadLine();
 
-                    peers.AddPeer(addr);
+                    peers.ConnectPeer(addr);
                 }
             }
             catch (Exception e)

src/mcore/DataType/Hash.cs

@@ -11,7 +11,7 @@ public partial struct Hash
 
     private static readonly int ValidAddrLength = -1;
 
-    public int Length => addr.Length;
+    public int Length => addr != null ? addr.Length : 0;
     public string str => addr;
 
     private string addr;

src/mcore/Serialize/Serializer.cs

@@ -21,18 +21,39 @@ static Serializer()
 
     public static string Serialize(this object o, bool indented = false)
     {
-        return JsonConvert.SerializeObject(o,
-            indented ? Formatting.Indented : Formatting.None,
-            converters);
+        var setting = new JsonSerializerSettings()
+        {
+            TypeNameHandling = TypeNameHandling.All,
+            TypeNameAssemblyFormatHandling = TypeNameAssemblyFormatHandling.Simple,
+            ContractResolver = new NonPublicPropertiesResolver(),
+            Converters = converters,
+            Formatting = indented ? Formatting.Indented : Formatting.None
+        };
+
+        return JsonConvert.SerializeObject(o, setting);
     }
     public static T Deserialize<T>(this string json)
     {
         var setting = new JsonSerializerSettings()
         {
+            TypeNameHandling = TypeNameHandling.All,
+            TypeNameAssemblyFormatHandling = TypeNameAssemblyFormatHandling.Simple,
             ContractResolver = new NonPublicPropertiesResolver(),
             Converters = converters
         };
 
         return JsonConvert.DeserializeObject<T>(json, setting);
     }
+    public static object Deserialize(this string json)
+    {
+        var setting = new JsonSerializerSettings()
+        {
+            TypeNameHandling = TypeNameHandling.All,
+            TypeNameAssemblyFormatHandling = TypeNameAssemblyFormatHandling.Simple,
+            ContractResolver = new NonPublicPropertiesResolver(),
+            Converters = converters
+        };
+
+        return JsonConvert.DeserializeObject(json, setting);
+    }
 }

src/minichain.test/mcore/Hash_test.cs

@@ -47,5 +47,16 @@ public void HashToString()
 
             Assert.AreEqual(hash.ToString(), hash.str);
         }
+
+        [TestMethod]
+        public void Serialize()
+        {
+            var hash = Hash.Calc("a");
+
+            var json = Serializer.Serialize(hash);
+            var back = Serializer.Deserialize<Hash>(json);
+
+            Assert.AreEqual(hash.ToString(), back.ToString());
+        }
     }
 }

src/minichain/Chain/ChainState.cs

@@ -164,6 +164,8 @@ internal bool PushBlock(Block block, bool isSync = false)
 
                     onBlockConfirmed?.Invoke(block);
 
+                    Console.WriteLine("   * Block accepted: " + currentBlock.blockNo);
+
                     return true;
                 }
             }

src/minichain/Net/Packet/Packets.cs

@@ -27,10 +27,11 @@ public static PacketBase FromJson(string json)
         {
             try
             {
-                return (PacketBase)JsonConvert.DeserializeObject(json, SerializeSetting);
+                return (PacketBase)Serializer.Deserialize(json);
             }
             catch(Exception e)
             {
+                Console.WriteLine(e);
                 return null;
             }
         }
@@ -52,7 +53,7 @@ public PacketBase()
         /// <returns></returns>
         public string ToJson()
         {
-            return JsonConvert.SerializeObject(this, SerializeSetting);
+            return Serializer.Serialize(this);
         }
     }
 

src/minichain/Net/PeerPool.cs

@@ -43,10 +43,15 @@ public PeerPool(NodeBase _nodeBase)
             Console.WriteLine("RUNNING on port " + listeningPort);
 
             foreach (var addr in HardCodedSeeds.Addrs)
-                AddPeer(addr);
+                ConnectPeer(addr);
+
+            onPeerConnected += p =>
+            {
+                Console.WriteLine("[PEER] New peer " + p.address);
+            };
         }
 
-        public void AddPeer(string addr)
+        public void ConnectPeer(string addr)
         {
             if (peers.Count >= MaxPeers) return;
             if (peers.Any(x => x.Key.address == addr)) return;
@@ -63,8 +68,6 @@ public void AddPeer(string addr)
             var ws = new WebSocket(addr);
             var peer = new Peer(this, ws);
             ws.Connect();
-
-            onPeerConnected?.Invoke(peer);
         }
         public void AddPeer(Peer peer)
         {
@@ -90,6 +93,7 @@ public void SendPacketToAllPeers(PacketBase packet)
                 }
                 catch(Exception e)
                 {
+                    Console.WriteLine(e);
                 }
             }
         }

src/minichain/POW/Miner.cs

@@ -103,13 +103,11 @@ private void MinerHQ()
 
                     PublishBlock(chain.currentBlock);
 
-                    /*
                     Console.WriteLine(
                         $"   * FindBlock#{chain.currentBlock.blockNo}, elapsed {elapsed} sec(s)\r\n" +
                         $"        nonce: {solution} \r\n" +
                         $"        prevBlock: {chain.currentBlock.prevBlockHash} \r\n" + 
                         $"        txs: {chain.currentBlock.txs.Length}");
-                    */
                 }
             }
         }
@@ -125,11 +123,9 @@ private void OnNewBlockDiscovered(Block block)
 
         private void PrepareWorkers(Block vblock, int nThread)
         {
-            /*
             Console.WriteLine(
                 "------------------------------------------------------------\r\n" +
                 "Preparing job, block#" + vblock.blockNo + " with " + nThread + " thread(s).");
-            */
 
             Interlocked.Exchange(ref hashCounter, 0);
             for (int i = 0; i < nThread; i++)

src/minichain/State/EndpointNode.cs

@@ -91,7 +91,7 @@ private void OnFoundLocalPeer(Int64 id, string payload, IPEndPoint ep)
             if (payload == peers.listeningPort.ToString())
                 return;
 
-            peers.AddPeer(ep.Address.ToString().Split(':')[0] + ":" + payload);
+            peers.ConnectPeer(ep.Address.ToString().Split(':')[0] + ":" + payload);
         }
 
         /// <summary>
@@ -125,7 +125,7 @@ private void OnResponsePeers(Peer sender, PktResponsePeers pkt)
             if (pkt.addrs == null) return;
 
             foreach (var addr in pkt.addrs)
-                peers.AddPeer(addr);
+                peers.ConnectPeer(addr);
         }
 
         private void OnRequestBlock(Peer sender, PktRequestBlock pkt)
@@ -180,7 +180,7 @@ protected virtual void OnNewBlock(Peer sender, PktBroadcastNewBlock pkt)
             if (state != NodeState.OK) return;
 
             // Peer sent invalid block.
-            if (Block.IsValidBlockLight(pkt.block, pkt.block.nonce) == false)  { Console.WriteLine("Invalid block"); return; }
+            if (Block.IsValidBlockLight(pkt.block, pkt.block.nonce) == false) return;
             // My block is longer than received
             if (chain.currentBlock.blockNo >= pkt.block.blockNo) return;