diff --git a/AElf.Launcher/ChainInfo.json b/AElf.Launcher/ChainInfo.json
index 789a3d67ec..ac2e3dbe0b 100644
--- a/AElf.Launcher/ChainInfo.json
+++ b/AElf.Launcher/ChainInfo.json
@@ -1 +1 @@
-{"id":"0x42d2a2e26537bc7de9894103c4c9f24884f10c2a0b37639abfec92d186a7ae29"}
\ No newline at end of file
+{"id":"0xdb4a9b4fdbc3fa6b3ad07052c5bb3080d6f72635365fa243be5e7250f030cef8"}
\ No newline at end of file
diff --git a/AElf.Miner/Miner/IMinerConfig.cs b/AElf.Miner/Miner/IMinerConfig.cs
index ad862c098d..69a6e32886 100644
--- a/AElf.Miner/Miner/IMinerConfig.cs
+++ b/AElf.Miner/Miner/IMinerConfig.cs
@@ -16,5 +16,20 @@ public interface IMinerConfig
Hash ChainId { get; set; }
+
+ ///
+ /// merge mining flag
+ ///
+ bool IsMergeMining { get; set; }
+
+ ///
+ /// parent miner address
+ ///
+ string ParentAdddress { get; set; }
+
+ ///
+ /// parent miner port for rpc
+ ///
+ string ParentPort { get; set; }
}
}
\ No newline at end of file
diff --git a/AElf.Miner/Miner/Miner.cs b/AElf.Miner/Miner/Miner.cs
index 48124070d4..e5ae302f30 100644
--- a/AElf.Miner/Miner/Miner.cs
+++ b/AElf.Miner/Miner/Miner.cs
@@ -31,8 +31,6 @@ public class Miner : IMiner
private readonly ITransactionManager _transactionManager;
private readonly ITransactionResultManager _transactionResultManager;
- private readonly Dictionary waiting = new Dictionary();
-
private MinerLock Lock { get; } = new MinerLock();
private readonly ILogger _logger;
diff --git a/AElf.Miner/Miner/MinerConifg.cs b/AElf.Miner/Miner/MinerConifg.cs
index 586d3e3cfd..35b239e255 100644
--- a/AElf.Miner/Miner/MinerConifg.cs
+++ b/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
{