From 9a8c467a01dc795fa6e167d9cfdc06ac381644d3 Mon Sep 17 00:00:00 2001
From: Gregg Zigler <gregg@bitpay.com>
Date: Tue, 15 Sep 2015 09:28:08 -0700
Subject: [PATCH 1/4] clients want bws version for logging and debugging

---
 lib/expressapp.js | 6 ++++++
 lib/server.js     | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/lib/expressapp.js b/lib/expressapp.js
index 3b7e08c..0bb8536 100644
--- a/lib/expressapp.js
+++ b/lib/expressapp.js
@@ -415,6 +415,12 @@ ExpressApp.prototype.start = function(opts, cb) {
     });
   });
 
+  router.get('/v1/version/', function(req, res) {
+    var server = getServer(req, res);
+    res.json( { version: server.version } );
+    res.end();
+  });
+
   this.app.use(opts.basePath || '/bws/api', router);
 
   WalletService.initialize(opts, cb);
diff --git a/lib/server.js b/lib/server.js
index 6099f2e..92397ba 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -15,6 +15,7 @@ var Address = Bitcore.Address;
 
 var ClientError = require('./errors/clienterror');
 var Errors = require('./errors/errordefinitions');
+var Package = require('../package');
 
 var Utils = require('./utils');
 var Lock = require('./lock');
@@ -49,6 +50,7 @@ function WalletService() {
   this.blockchainExplorerOpts = blockchainExplorerOpts;
   this.messageBroker = messageBroker;
   this.notifyTicker = 0;
+  this.version = Package.version;
 };
 
 

From 9b630002ae9f45c96fc32ff2feacddce876d1085 Mon Sep 17 00:00:00 2001
From: Gregg Zigler <gregg@bitpay.com>
Date: Tue, 15 Sep 2015 09:43:24 -0700
Subject: [PATCH 2/4] rename to disambiguate from clientVersion

---
 lib/expressapp.js          | 2 +-
 lib/server.js              | 2 +-
 test/integration/server.js | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/expressapp.js b/lib/expressapp.js
index 0bb8536..02533f6 100644
--- a/lib/expressapp.js
+++ b/lib/expressapp.js
@@ -417,7 +417,7 @@ ExpressApp.prototype.start = function(opts, cb) {
 
   router.get('/v1/version/', function(req, res) {
     var server = getServer(req, res);
-    res.json( { version: server.version } );
+    res.json( { version: server.serverVersion } );
     res.end();
   });
 
diff --git a/lib/server.js b/lib/server.js
index 92397ba..3af9963 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -50,7 +50,7 @@ function WalletService() {
   this.blockchainExplorerOpts = blockchainExplorerOpts;
   this.messageBroker = messageBroker;
   this.notifyTicker = 0;
-  this.version = Package.version;
+  this.serverVersion = Package.version;
 };
 
 
diff --git a/test/integration/server.js b/test/integration/server.js
index 096cc6e..da4c959 100644
--- a/test/integration/server.js
+++ b/test/integration/server.js
@@ -756,6 +756,7 @@ describe('Wallet service', function() {
         clientVersion: 'bwc-0.0.1',
       });
       server.clientVersion.should.equal('bwc-0.0.1');
+      should.exist(server.serverVersion);
     });
   });
 

From bf76023869b5dd274099410ba9b692cbb83708d8 Mon Sep 17 00:00:00 2001
From: Gregg Zigler <gregg@bitpay.com>
Date: Tue, 15 Sep 2015 09:57:10 -0700
Subject: [PATCH 3/4] use 'bws-' prefix to match style of bwc clientVersion
 values

---
 lib/server.js              | 2 +-
 test/integration/server.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/server.js b/lib/server.js
index 3af9963..8441d48 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -50,7 +50,7 @@ function WalletService() {
   this.blockchainExplorerOpts = blockchainExplorerOpts;
   this.messageBroker = messageBroker;
   this.notifyTicker = 0;
-  this.serverVersion = Package.version;
+  this.serverVersion = 'bws-' + Package.version;
 };
 
 
diff --git a/test/integration/server.js b/test/integration/server.js
index da4c959..44dfbb3 100644
--- a/test/integration/server.js
+++ b/test/integration/server.js
@@ -756,7 +756,7 @@ describe('Wallet service', function() {
         clientVersion: 'bwc-0.0.1',
       });
       server.clientVersion.should.equal('bwc-0.0.1');
-      should.exist(server.serverVersion);
+      server.serverVersion.indexOf('bws-').should.equal(0);
     });
   });
 

From 19cb11abebecbd2bed9d53e32b16d875d630a287 Mon Sep 17 00:00:00 2001
From: Gregg Zigler <gregg@bitpay.com>
Date: Fri, 18 Sep 2015 10:20:38 -0700
Subject: [PATCH 4/4] rename server to service

---
 lib/expressapp.js          | 2 +-
 lib/server.js              | 2 +-
 test/integration/server.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/expressapp.js b/lib/expressapp.js
index 02533f6..0a1afec 100644
--- a/lib/expressapp.js
+++ b/lib/expressapp.js
@@ -417,7 +417,7 @@ ExpressApp.prototype.start = function(opts, cb) {
 
   router.get('/v1/version/', function(req, res) {
     var server = getServer(req, res);
-    res.json( { version: server.serverVersion } );
+    res.json( { serviceVersion: server.serviceVersion } );
     res.end();
   });
 
diff --git a/lib/server.js b/lib/server.js
index 8441d48..e933148 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -50,7 +50,7 @@ function WalletService() {
   this.blockchainExplorerOpts = blockchainExplorerOpts;
   this.messageBroker = messageBroker;
   this.notifyTicker = 0;
-  this.serverVersion = 'bws-' + Package.version;
+  this.serviceVersion = 'bws-' + Package.version;
 };
 
 
diff --git a/test/integration/server.js b/test/integration/server.js
index 44dfbb3..77f2ead 100644
--- a/test/integration/server.js
+++ b/test/integration/server.js
@@ -756,7 +756,7 @@ describe('Wallet service', function() {
         clientVersion: 'bwc-0.0.1',
       });
       server.clientVersion.should.equal('bwc-0.0.1');
-      server.serverVersion.indexOf('bws-').should.equal(0);
+      server.serviceVersion.indexOf('bws-').should.equal(0);
     });
   });