Merge branch 'release/0.9.38'

3 files changed, 10 insertions, 2 deletions

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'
 		})
 	]
 });