Commit e84f3ec1 authored by Bas van Kervel's avatar Bas van Kervel

added net.version

parent a2333bcb
...@@ -116,7 +116,7 @@ var isBigNumber = function (object) { ...@@ -116,7 +116,7 @@ var isBigNumber = function (object) {
var result = typeof BigNumber !== 'undefined' && object instanceof BigNumber; var result = typeof BigNumber !== 'undefined' && object instanceof BigNumber;
if (!result) { if (!result) {
if(typeof(object) === "object") { if (typeof(object) === "object" && object.constructor != null) {
result = object.constructor.toString().indexOf("function BigNumber(") == 0; result = object.constructor.toString().indexOf("function BigNumber(") == 0;
} }
} }
......
...@@ -32,6 +32,7 @@ var ( ...@@ -32,6 +32,7 @@ var (
netMapping = map[string]nethandler{ netMapping = map[string]nethandler{
"net_peerCount": (*netApi).PeerCount, "net_peerCount": (*netApi).PeerCount,
"net_listening": (*netApi).IsListening, "net_listening": (*netApi).IsListening,
"net_version": (*netApi).Version,
} }
) )
...@@ -93,3 +94,7 @@ func (self *netApi) IsListening(req *shared.Request) (interface{}, error) { ...@@ -93,3 +94,7 @@ func (self *netApi) IsListening(req *shared.Request) (interface{}, error) {
return self.xeth.IsListening(), nil return self.xeth.IsListening(), nil
} }
func (self *netApi) Version(req *shared.Request) (interface{}, error) {
return self.xeth.NetworkVersion(), nil
}
...@@ -30,6 +30,10 @@ web3._extend({ ...@@ -30,6 +30,10 @@ web3._extend({
], ],
properties: properties:
[ [
new web3._extend.Property({
name: 'version',
getter: 'net_version'
})
] ]
}); });
` `
...@@ -26,8 +26,7 @@ web3._extend({ ...@@ -26,8 +26,7 @@ web3._extend({
[ [
new web3._extend.Property({ new web3._extend.Property({
name: 'status', name: 'status',
getter: 'txpool_status', getter: 'txpool_status'
outputFormatter: function(obj) { return obj; }
}) })
] ]
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment