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

2014-05-21 12:14:55 +02:00 · 2014-05-21 12:14:55 +02:00 · 34008da807
commit 34008da807
parent 0bccf1c3cd 16bd88c10a
2 changed files with 5 additions and 1 deletions
--- 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)
 			}
 		}
 	}
--- 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())
 }