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/config.go | |
| parent | 48488017e498916c81122c01cfe1880afdd00d48 (diff) | |
| download | go-tangerine-429dd2a100f3b9e2b612b59bcb48f79a805cd6f9.tar go-tangerine-429dd2a100f3b9e2b612b59bcb48f79a805cd6f9.tar.gz go-tangerine-429dd2a100f3b9e2b612b59bcb48f79a805cd6f9.tar.bz2 go-tangerine-429dd2a100f3b9e2b612b59bcb48f79a805cd6f9.tar.lz go-tangerine-429dd2a100f3b9e2b612b59bcb48f79a805cd6f9.tar.xz go-tangerine-429dd2a100f3b9e2b612b59bcb48f79a805cd6f9.tar.zst go-tangerine-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/config.go')
| -rw-r--r-- | xeth/config.go | 2 |
1 files changed, 2 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) } |