diff options
| author | JoeG <joegoulden@gmail.com> | 2014-09-19 04:41:45 +0800 |
|---|---|---|
| committer | JoeG <joegoulden@gmail.com> | 2014-09-19 04:41:45 +0800 |
| commit | a96c5986c5216b1238decde40bc6c6882da81996 (patch) | |
| tree | 25ffbdcca995473c05ff780698439e2192597296 /javascript | |
| parent | b27100c8fc48c819c9e6a6b76fcc50cfe118cedb (diff) | |
| parent | 728005722853028348909e1d458593415cb52660 (diff) | |
| download | dexon-a96c5986c5216b1238decde40bc6c6882da81996.tar dexon-a96c5986c5216b1238decde40bc6c6882da81996.tar.gz dexon-a96c5986c5216b1238decde40bc6c6882da81996.tar.bz2 dexon-a96c5986c5216b1238decde40bc6c6882da81996.tar.lz dexon-a96c5986c5216b1238decde40bc6c6882da81996.tar.xz dexon-a96c5986c5216b1238decde40bc6c6882da81996.tar.zst dexon-a96c5986c5216b1238decde40bc6c6882da81996.zip | |
Merge remote-tracking branch 'upstream/develop' into develop
Conflicts:
Mist/assets/qml/wallet.qml
Diffstat (limited to 'javascript')
| -rw-r--r-- | javascript/types.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/javascript/types.go b/javascript/types.go index afa0a41c6..53a2977a8 100644 --- a/javascript/types.go +++ b/javascript/types.go @@ -88,6 +88,10 @@ func (self *JSEthereum) GetStateObject(addr string) otto.Value { return self.toVal(&JSStateObject{ethpipe.NewJSObject(self.JSPipe.World().SafeGet(ethutil.Hex2Bytes(addr))), self}) } +func (self *JSEthereum) Peers() otto.Value { + return self.toVal(self.JSPipe.Peers()) +} + func (self *JSEthereum) Transact(key, recipient, valueStr, gasStr, gasPriceStr, dataStr string) otto.Value { r, err := self.JSPipe.Transact(key, recipient, valueStr, gasStr, gasPriceStr, dataStr) if err != nil { |