diff options
| author | obscuren <geffobscura@gmail.com> | 2014-11-07 19:18:48 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-11-07 19:18:48 +0800 |
| commit | 429dd2a100f3b9e2b612b59bcb48f79a805cd6f9 (patch) | |
| tree | c91fee673e461a192d4d783193c8ddbead4a97d2 /xeth | |
| parent | 48488017e498916c81122c01cfe1880afdd00d48 (diff) | |
| download | dexon-429dd2a100f3b9e2b612b59bcb48f79a805cd6f9.tar.gz dexon-429dd2a100f3b9e2b612b59bcb48f79a805cd6f9.tar.zst dexon-429dd2a100f3b9e2b612b59bcb48f79a805cd6f9.zip | |
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
Diffstat (limited to 'xeth')
| -rw-r--r-- | xeth/config.go | 2 | ||||
| -rw-r--r-- | xeth/hexface.go | 4 |
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 { |