add parent address&port in miner config

AElf.Launcher/ChainInfo.json

@@ -1 +1 @@
-{"id":"0x42d2a2e26537bc7de9894103c4c9f24884f10c2a0b37639abfec92d186a7ae29"}
+{"id":"0xdb4a9b4fdbc3fa6b3ad07052c5bb3080d6f72635365fa243be5e7250f030cef8"}

AElf.Miner/Miner/IMinerConfig.cs

@@ -16,5 +16,20 @@ public interface IMinerConfig
 
 
         Hash ChainId { get; set; }
+
+        /// <summary>
+        /// merge mining flag
+        /// </summary>
+        bool IsMergeMining { get; set; }
+
+        /// <summary>
+        /// parent miner address
+        /// </summary>
+        string ParentAdddress { get; set; }
+
+        /// <summary>
+        /// parent miner port for rpc
+        /// </summary>
+        string ParentPort { get; set; }
     }
 }

AElf.Miner/Miner/Miner.cs

@@ -31,8 +31,6 @@ public class Miner : IMiner
         private readonly ITransactionManager _transactionManager;
         private readonly ITransactionResultManager _transactionResultManager;
 
-        private readonly Dictionary<ulong, IBlock> waiting = new Dictionary<ulong, IBlock>();
-
         private MinerLock Lock { get; } = new MinerLock();
         private readonly ILogger _logger;
 

AElf.Miner/Miner/MinerConifg.cs

@@ -8,6 +8,9 @@ public class MinerConfig : IMinerConfig
         public Hash CoinBase { get; set; }
         public bool IsParallel { get; } = true;
         public Hash ChainId { get; set; }
+        public bool IsMergeMining { get; set; }
+        public string ParentAdddress { get; set; }
+        public string ParentPort { get; set; }
 
         public static MinerConfig Default = new MinerConfig
         {