diff options
| author | zelig <viktor.tron@gmail.com> | 2014-05-24 01:25:49 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2014-05-24 01:25:49 +0800 |
| commit | 72df038d25c50a27adae8ea528dcedd3537267cf (patch) | |
| tree | 44b358714448d492dcf8cdcddb4d1e6e57c4318b /ethereum/javascript_runtime.go | |
| parent | 7f1a4c377c18055137909521d809251248b7b5af (diff) | |
| parent | d35380c19e5ce92b57158e7780f7105dc4136916 (diff) | |
| download | dexon-72df038d25c50a27adae8ea528dcedd3537267cf.tar dexon-72df038d25c50a27adae8ea528dcedd3537267cf.tar.gz dexon-72df038d25c50a27adae8ea528dcedd3537267cf.tar.bz2 dexon-72df038d25c50a27adae8ea528dcedd3537267cf.tar.lz dexon-72df038d25c50a27adae8ea528dcedd3537267cf.tar.xz dexon-72df038d25c50a27adae8ea528dcedd3537267cf.tar.zst dexon-72df038d25c50a27adae8ea528dcedd3537267cf.zip | |
Merge branch 'develop' of github.com:ethereum/go-ethereum into develop
Diffstat (limited to 'ethereum/javascript_runtime.go')
| -rw-r--r-- | ethereum/javascript_runtime.go | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/ethereum/javascript_runtime.go b/ethereum/javascript_runtime.go index fa01c7005..93297f604 100644 --- a/ethereum/javascript_runtime.go +++ b/ethereum/javascript_runtime.go @@ -6,6 +6,7 @@ import ( "github.com/ethereum/eth-go/ethchain" "github.com/ethereum/eth-go/ethpub" "github.com/ethereum/eth-go/ethutil" + "github.com/ethereum/go-ethereum/utils" "github.com/obscuren/otto" "io/ioutil" "os" @@ -116,14 +117,26 @@ func (self *JSRE) initStdFuncs() { eth.Set("watch", self.watch) eth.Set("addPeer", self.addPeer) eth.Set("require", self.require) + eth.Set("stopMining", self.stopMining) + eth.Set("startMining", self.startMining) } /* * The following methods are natively implemented javascript functions */ +func (self *JSRE) stopMining(call otto.FunctionCall) otto.Value { + v, _ := self.vm.ToValue(utils.StopMining(self.ethereum)) + return v +} + +func (self *JSRE) startMining(call otto.FunctionCall) otto.Value { + v, _ := self.vm.ToValue(utils.StartMining(self.ethereum)) + return v +} + // eth.watch -func (self JSRE) watch(call otto.FunctionCall) otto.Value { +func (self *JSRE) watch(call otto.FunctionCall) otto.Value { addr, _ := call.Argument(0).ToString() var storageAddr string var cb otto.Value |