From 176b7802510a667b8973f2be232f7a8213b3474b Mon Sep 17 00:00:00 2001 From: obscuren Date: Mon, 23 Jun 2014 11:28:05 +0200 Subject: Added a execBlock method which replays the given block --- ethereum/javascript_runtime.go | 16 ++++++++++++++++ utils/cmd.go | 8 +++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/ethereum/javascript_runtime.go b/ethereum/javascript_runtime.go index b05d39232..737f7663f 100644 --- a/ethereum/javascript_runtime.go +++ b/ethereum/javascript_runtime.go @@ -138,6 +138,7 @@ func (self *JSRE) initStdFuncs() { eth.Set("require", self.require) eth.Set("stopMining", self.stopMining) eth.Set("startMining", self.startMining) + eth.Set("blockDo", self.execBlock) } /* @@ -207,3 +208,18 @@ func (self *JSRE) require(call otto.FunctionCall) otto.Value { return t } + +func (self *JSRE) execBlock(call otto.FunctionCall) otto.Value { + hash, err := call.Argument(0).ToString() + if err != nil { + return otto.UndefinedValue() + } + + err = self.ethereum.BlockDo(ethutil.FromHex(hash)) + if err != nil { + fmt.Println(err) + return otto.FalseValue() + } + + return otto.TrueValue() +} diff --git a/utils/cmd.go b/utils/cmd.go index e1fc0fc00..e66bb2612 100644 --- a/utils/cmd.go +++ b/utils/cmd.go @@ -38,9 +38,11 @@ func DoMining(ethereum *eth.Ethereum) { // Give it some time to connect with peers time.Sleep(3 * time.Second) - for ethereum.IsUpToDate() == false { - time.Sleep(5 * time.Second) - } + /* + for ethereum.IsUpToDate() == false { + time.Sleep(5 * time.Second) + } + */ ethutil.Config.Log.Infoln("Miner started") -- cgit v1.2.3