aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2015-07-09 22:22:20 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2015-07-09 22:22:20 +0800
commit06afabb63105cab5ab2360d6a84cbe398b25d8ca (patch)
tree61d99eec54fca096030dfe05922488000883f4b0
parent505b77a0d5f12f3a24aea9218d14bb3649cc6644 (diff)
parente84f3ec1d48f6a6c191e1f8a38d865fda3267a8a (diff)
downloadgo-tangerine-06afabb63105cab5ab2360d6a84cbe398b25d8ca.tar
go-tangerine-06afabb63105cab5ab2360d6a84cbe398b25d8ca.tar.gz
go-tangerine-06afabb63105cab5ab2360d6a84cbe398b25d8ca.tar.bz2
go-tangerine-06afabb63105cab5ab2360d6a84cbe398b25d8ca.tar.lz
go-tangerine-06afabb63105cab5ab2360d6a84cbe398b25d8ca.tar.xz
go-tangerine-06afabb63105cab5ab2360d6a84cbe398b25d8ca.tar.zst
go-tangerine-06afabb63105cab5ab2360d6a84cbe398b25d8ca.zip
Merge pull request #1436 from bas-vk/net_version
added net.version
-rw-r--r--jsre/pp_js.go2
-rw-r--r--rpc/api/net.go5
-rw-r--r--rpc/api/net_js.go4
-rw-r--r--rpc/api/txpool_js.go3
4 files changed, 11 insertions, 3 deletions
diff --git a/jsre/pp_js.go b/jsre/pp_js.go
index d29e21cfa..723d74d5f 100644
--- a/jsre/pp_js.go
+++ b/jsre/pp_js.go
@@ -116,7 +116,7 @@ var isBigNumber = function (object) {
var result = typeof BigNumber !== 'undefined' && object instanceof BigNumber;
if (!result) {
- if(typeof(object) === "object") {
+ if (typeof(object) === "object" && object.constructor != null) {
result = object.constructor.toString().indexOf("function BigNumber(") == 0;
}
}
diff --git a/rpc/api/net.go b/rpc/api/net.go
index dbed9e11e..d8b636b02 100644
--- a/rpc/api/net.go
+++ b/rpc/api/net.go
@@ -32,6 +32,7 @@ var (
netMapping = map[string]nethandler{
"net_peerCount": (*netApi).PeerCount,
"net_listening": (*netApi).IsListening,
+ "net_version": (*netApi).Version,
}
)
@@ -93,3 +94,7 @@ func (self *netApi) IsListening(req *shared.Request) (interface{}, error) {
return self.xeth.IsListening(), nil
}
+func (self *netApi) Version(req *shared.Request) (interface{}, error) {
+ return self.xeth.NetworkVersion(), nil
+}
+
diff --git a/rpc/api/net_js.go b/rpc/api/net_js.go
index 391039eea..acfd35fce 100644
--- a/rpc/api/net_js.go
+++ b/rpc/api/net_js.go
@@ -30,6 +30,10 @@ web3._extend({
],
properties:
[
+ new web3._extend.Property({
+ name: 'version',
+ getter: 'net_version'
+ })
]
});
`
diff --git a/rpc/api/txpool_js.go b/rpc/api/txpool_js.go
index ef9a0487c..f0473ffec 100644
--- a/rpc/api/txpool_js.go
+++ b/rpc/api/txpool_js.go
@@ -26,8 +26,7 @@ web3._extend({
[
new web3._extend.Property({
name: 'status',
- getter: 'txpool_status',
- outputFormatter: function(obj) { return obj; }
+ getter: 'txpool_status'
})
]
});