aboutsummaryrefslogtreecommitdiffstats
path: root/mist
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-10-20 18:03:31 +0800
committerobscuren <geffobscura@gmail.com>2014-10-20 18:03:31 +0800
commit6ea44c466a5c3383dd4e21a57423edbf33a52e6f (patch)
treeda7c995341607f5b9dc362460ed762dc3f8541c2 /mist
parent82a2e4fe283d15eaacc554544131bd6669210f79 (diff)
downloaddexon-6ea44c466a5c3383dd4e21a57423edbf33a52e6f.tar
dexon-6ea44c466a5c3383dd4e21a57423edbf33a52e6f.tar.gz
dexon-6ea44c466a5c3383dd4e21a57423edbf33a52e6f.tar.bz2
dexon-6ea44c466a5c3383dd4e21a57423edbf33a52e6f.tar.lz
dexon-6ea44c466a5c3383dd4e21a57423edbf33a52e6f.tar.xz
dexon-6ea44c466a5c3383dd4e21a57423edbf33a52e6f.tar.zst
dexon-6ea44c466a5c3383dd4e21a57423edbf33a52e6f.zip
Updated to reflect BlockChain changes
Diffstat (limited to 'mist')
-rw-r--r--mist/bindings.go4
-rw-r--r--mist/debugger.go2
-rw-r--r--mist/gui.go12
3 files changed, 9 insertions, 9 deletions
diff --git a/mist/bindings.go b/mist/bindings.go
index aa8bba1e4..972e4e8ed 100644
--- a/mist/bindings.go
+++ b/mist/bindings.go
@@ -96,9 +96,9 @@ func (self *Gui) DumpState(hash, path string) {
var block *ethchain.Block
if hash[0] == '#' {
i, _ := strconv.Atoi(hash[1:])
- block = self.eth.BlockChain().GetBlockByNumber(uint64(i))
+ block = self.eth.ChainManager().GetBlockByNumber(uint64(i))
} else {
- block = self.eth.BlockChain().GetBlock(ethutil.Hex2Bytes(hash))
+ block = self.eth.ChainManager().GetBlock(ethutil.Hex2Bytes(hash))
}
if block == nil {
diff --git a/mist/debugger.go b/mist/debugger.go
index f364a487e..f81cddb1b 100644
--- a/mist/debugger.go
+++ b/mist/debugger.go
@@ -131,7 +131,7 @@ func (self *DebuggerWindow) Debug(valueStr, gasStr, gasPriceStr, scriptStr, data
self.SetAsm(script)
- block := self.lib.eth.BlockChain().CurrentBlock
+ block := self.lib.eth.ChainManager().CurrentBlock
callerClosure := vm.NewClosure(&ethstate.Message{}, account, contract, script, gas, gasPrice)
env := utils.NewEnv(state, block, account.Address(), value)
diff --git a/mist/gui.go b/mist/gui.go
index 84ee1ea00..1bb8a1934 100644
--- a/mist/gui.go
+++ b/mist/gui.go
@@ -228,10 +228,10 @@ func (gui *Gui) CreateAndSetPrivKey() (string, string, string, string) {
return gui.eth.KeyManager().KeyPair().AsStrings()
}
-func (gui *Gui) setInitialBlockChain() {
- sBlk := gui.eth.BlockChain().LastBlockHash
- blk := gui.eth.BlockChain().GetBlock(sBlk)
- for ; blk != nil; blk = gui.eth.BlockChain().GetBlock(sBlk) {
+func (gui *Gui) setInitialChainManager() {
+ sBlk := gui.eth.ChainManager().LastBlockHash
+ blk := gui.eth.ChainManager().GetBlock(sBlk)
+ for ; blk != nil; blk = gui.eth.ChainManager().GetBlock(sBlk) {
sBlk = blk.PrevHash
addr := gui.address()
@@ -363,7 +363,7 @@ func (gui *Gui) update() {
}
go func() {
- go gui.setInitialBlockChain()
+ go gui.setInitialChainManager()
gui.loadAddressBook()
gui.setPeerInfo()
gui.readPreviousTransactions()
@@ -464,7 +464,7 @@ func (gui *Gui) update() {
case <-peerUpdateTicker.C:
gui.setPeerInfo()
case <-generalUpdateTicker.C:
- statusText := "#" + gui.eth.BlockChain().CurrentBlock.Number.String()
+ statusText := "#" + gui.eth.ChainManager().CurrentBlock.Number.String()
lastBlockLabel.Set("text", statusText)
if gui.miner != nil {