Implemented new miner w/ ui interface for merged mining. Closes #177

* Miner has been rewritten
* Added new miner pane
* Added option for local txs
* Added option to read from MergeMining contract and list them for
  merged mining

2 files changed, 6 insertions, 0 deletions

diff --git a/xeth/config.go b/xeth/config.go
index 34aa9e32d..ad0660d75 100644
--- a/xeth/config.go
+++ b/xeth/config.go
@@ -19,6 +19,8 @@ func (self *Config) Get(name string) *Object {
 		objectAddr := configCtrl.GetStorage(ethutil.BigD([]byte{0}))
 		domainAddr := (&Object{self.pipe.World().safeGet(objectAddr.Bytes())}).StorageString("DnsReg").Bytes()
 		return &Object{self.pipe.World().safeGet(domainAddr)}
+	case "MergeMining":
+		addr = []byte{4}
 	default:
 		addr = ethutil.RightPadBytes([]byte(name), 32)
 	}
diff --git a/xeth/hexface.go b/xeth/hexface.go
index 21e82e37d..5ef3eaf1a 100644
--- a/xeth/hexface.go
+++ b/xeth/hexface.go
@@ -254,6 +254,10 @@ func (self *JSXEth) CompileMutan(code string) string {
 	return ethutil.Bytes2Hex(data)
 }
 
+func (self *JSXEth) FindInConfig(str string) string {
+	return ethutil.Bytes2Hex(self.World().Config().Get(str).Address())
+}
+
 func ToJSMessages(messages state.Messages) *ethutil.List {
 	var msgs []JSMessage
 	for _, m := range messages {