diff options
| author | obscuren <geffobscura@gmail.com> | 2014-12-18 20:19:41 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-12-18 20:19:41 +0800 |
| commit | 721e8ae93f9b8918ff4bc74af86c530bacacea00 (patch) | |
| tree | ee33bd346e396f56d6462f99de9ca7b5dac9c586 /cmd | |
| parent | e6fdf0c9f7564b8b08cf428e03af66fc423adcc1 (diff) | |
| parent | 2d09e67713757e2a80eb614562c97f962af36cf7 (diff) | |
| download | dexon-721e8ae93f9b8918ff4bc74af86c530bacacea00.tar dexon-721e8ae93f9b8918ff4bc74af86c530bacacea00.tar.gz dexon-721e8ae93f9b8918ff4bc74af86c530bacacea00.tar.bz2 dexon-721e8ae93f9b8918ff4bc74af86c530bacacea00.tar.lz dexon-721e8ae93f9b8918ff4bc74af86c530bacacea00.tar.xz dexon-721e8ae93f9b8918ff4bc74af86c530bacacea00.tar.zst dexon-721e8ae93f9b8918ff4bc74af86c530bacacea00.zip | |
Merged develop
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/ethereum/main.go | 2 | ||||
| -rw-r--r-- | cmd/mist/debugger.go | 2 | ||||
| -rw-r--r-- | cmd/mist/gui.go | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go index 4f87ef17b..da09e0b58 100644 --- a/cmd/ethereum/main.go +++ b/cmd/ethereum/main.go @@ -77,7 +77,7 @@ func main() { var block *types.Block if len(DumpHash) == 0 && DumpNumber == -1 { - block = ethereum.ChainManager().CurrentBlock + block = ethereum.ChainManager().CurrentBlock() } else if len(DumpHash) > 0 { block = ethereum.ChainManager().GetBlock(ethutil.Hex2Bytes(DumpHash)) } else { diff --git a/cmd/mist/debugger.go b/cmd/mist/debugger.go index d7c584eab..a7a286e23 100644 --- a/cmd/mist/debugger.go +++ b/cmd/mist/debugger.go @@ -149,7 +149,7 @@ func (self *DebuggerWindow) Debug(valueStr, gasStr, gasPriceStr, scriptStr, data self.SetAsm(script) - block := self.lib.eth.ChainManager().CurrentBlock + block := self.lib.eth.ChainManager().CurrentBlock() env := utils.NewEnv(statedb, block, account.Address(), value) diff --git a/cmd/mist/gui.go b/cmd/mist/gui.go index ba031e6c3..0339f601e 100644 --- a/cmd/mist/gui.go +++ b/cmd/mist/gui.go @@ -250,7 +250,7 @@ func (gui *Gui) CreateAndSetPrivKey() (string, string, string, string) { } func (gui *Gui) setInitialChain(ancientBlocks bool) { - sBlk := gui.eth.ChainManager().LastBlockHash + sBlk := gui.eth.ChainManager().LastBlockHash() blk := gui.eth.ChainManager().GetBlock(sBlk) for ; blk != nil; blk = gui.eth.ChainManager().GetBlock(sBlk) { sBlk = blk.PrevHash @@ -470,7 +470,7 @@ func (gui *Gui) update() { case <-peerUpdateTicker.C: gui.setPeerInfo() case <-generalUpdateTicker.C: - statusText := "#" + gui.eth.ChainManager().CurrentBlock.Number.String() + statusText := "#" + gui.eth.ChainManager().CurrentBlock().Number.String() lastBlockLabel.Set("text", statusText) miningLabel.Set("text", "Mining @ "+strconv.FormatInt(gui.uiLib.miner.GetPow().GetHashrate(), 10)+"Khash") |