status-im
/
op-geth
mirror of https://github.com/status-im/op-geth.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:ethereum/go-ethereum into develop

This commit is contained in:
Maran 2014-05-21 12:14:55 +02:00
parent 0bccf1c3cd 16bd88c10a
commit 34008da807
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ethereal/ui/gui.go
View File

@ -234,7 +234,7 @@ func (gui *Gui) update() {
gui.setWalletValue(object.Amount, nil) gui.setWalletValue(object.Amount, nil)
state.SetStateObject(object) state.UpdateStateObject(object)
} }
} }
} }

4
ethereum/repl.go
View File

@ -53,6 +53,10 @@ type JSEthereum struct {
vm *otto.Otto vm *otto.Otto
} }
func (self *JSEthereum) GetBlock(hash string) otto.Value {
return self.toVal(self.PEthereum.GetBlock(hash))
}
func (self *JSEthereum) GetKey() otto.Value { func (self *JSEthereum) GetKey() otto.Value {
return self.toVal(self.PEthereum.GetKey()) return self.toVal(self.PEthereum.GetKey())
} }