diff options
| author | Maran <maran.hidskes@gmail.com> | 2014-05-21 18:14:55 +0800 |
|---|---|---|
| committer | Maran <maran.hidskes@gmail.com> | 2014-05-21 18:14:55 +0800 |
| commit | 34008da807cdcf2a39f9ac1525155d871869ad69 (patch) | |
| tree | 03839973bfff586b6b9839f621fd31b0992ee8b0 | |
| parent | 0bccf1c3cd9576724cbd387922997ebd6bbcf898 (diff) | |
| parent | 16bd88c10ab3553984d180e3048839982c864f69 (diff) | |
| download | dexon-34008da807cdcf2a39f9ac1525155d871869ad69.tar.gz dexon-34008da807cdcf2a39f9ac1525155d871869ad69.tar.zst dexon-34008da807cdcf2a39f9ac1525155d871869ad69.zip | |
Merge branch 'develop' of github.com:ethereum/go-ethereum into develop
| -rw-r--r-- | ethereal/ui/gui.go | 2 | ||||
| -rw-r--r-- | ethereum/repl.go | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/ethereal/ui/gui.go b/ethereal/ui/gui.go index e267dabfd..440e94e22 100644 --- a/ethereal/ui/gui.go +++ b/ethereal/ui/gui.go @@ -234,7 +234,7 @@ func (gui *Gui) update() { gui.setWalletValue(object.Amount, nil) - state.SetStateObject(object) + state.UpdateStateObject(object) } } } diff --git a/ethereum/repl.go b/ethereum/repl.go index 29d38afef..d1243d19c 100644 --- a/ethereum/repl.go +++ b/ethereum/repl.go @@ -53,6 +53,10 @@ type JSEthereum struct { vm *otto.Otto } +func (self *JSEthereum) GetBlock(hash string) otto.Value { + return self.toVal(self.PEthereum.GetBlock(hash)) +} + func (self *JSEthereum) GetKey() otto.Value { return self.toVal(self.PEthereum.GetKey()) } |