diff options
| author | obscuren <geffobscura@gmail.com> | 2014-09-23 01:33:24 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-09-23 01:33:24 +0800 |
| commit | 154ca03228a9d97a4b2319f525814a16f102430f (patch) | |
| tree | a6e71cdafb18f011c2472d4792075173c132bee6 /javascript | |
| parent | 7855a233a7ed4968d93fc76a74501c931574f6eb (diff) | |
| parent | c7d666ad61a76e79867c9f7ae783a2cc44485dd0 (diff) | |
| download | dexon-154ca03228a9d97a4b2319f525814a16f102430f.tar dexon-154ca03228a9d97a4b2319f525814a16f102430f.tar.gz dexon-154ca03228a9d97a4b2319f525814a16f102430f.tar.bz2 dexon-154ca03228a9d97a4b2319f525814a16f102430f.tar.lz dexon-154ca03228a9d97a4b2319f525814a16f102430f.tar.xz dexon-154ca03228a9d97a4b2319f525814a16f102430f.tar.zst dexon-154ca03228a9d97a4b2319f525814a16f102430f.zip | |
Merge branch 'release/0.6.5'
Diffstat (limited to 'javascript')
| -rw-r--r-- | javascript/javascript_runtime.go | 2 | ||||
| -rw-r--r-- | javascript/types.go | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/javascript/javascript_runtime.go b/javascript/javascript_runtime.go index c794c32a8..ffc672a63 100644 --- a/javascript/javascript_runtime.go +++ b/javascript/javascript_runtime.go @@ -42,7 +42,7 @@ func (jsre *JSRE) LoadExtFile(path string) { } func (jsre *JSRE) LoadIntFile(file string) { - assetPath := path.Join(os.Getenv("GOPATH"), "src", "github.com", "ethereum", "go-ethereum", "ethereal", "assets", "ext") + assetPath := path.Join(os.Getenv("GOPATH"), "src", "github.com", "ethereum", "go-ethereum", "mist", "assets", "ext") jsre.LoadExtFile(path.Join(assetPath, file)) } 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 { |