From 2e99d9a8ea8b58c44e8804ea4bf3f87d1024d532 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Wed, 14 May 2014 21:02:01 -0300 Subject: [PATCH] add version to networking --- .gitignore | 1 + copay.js | 3 +-- index.html | 3 ++- js/controllers/footer.js | 5 ++--- js/models/core/Wallet.js | 3 ++- js/models/core/WalletFactory.js | 27 +++++++++++++++++++++------ js/services/passphrase.js | 6 +----- js/services/walletFactory.js | 2 +- test/test.TxProposals.js | 1 - test/test.Wallet.js | 1 + test/test.Walletfactory.js | 10 +++++----- util/build.js | 9 +++++++++ 12 files changed, 46 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index 23900fae9..94dc3faf8 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ js/copayBundle.js config.js webapp chrome-extension +version.js diff --git a/copay.js b/copay.js index f35ba8732..8f127e2d9 100644 --- a/copay.js +++ b/copay.js @@ -18,6 +18,5 @@ var WalletFactory = require('soop').load('./js/models/core/WalletFactory',{ Storage: StorageLocalEncrypted, }); module.exports.WalletFactory = WalletFactory; - - +module.exports.version = require('./version'); module.exports.API = require('./API'); diff --git a/index.html b/index.html index 9a3d18c05..6fd3248a3 100644 --- a/index.html +++ b/index.html @@ -122,7 +122,7 @@
Copay - v. 0.0.5 + v{{version}}
@@ -658,6 +658,7 @@ on supported browsers please check http://www.w + diff --git a/js/controllers/footer.js b/js/controllers/footer.js index b07562713..bd71d68df 100644 --- a/js/controllers/footer.js +++ b/js/controllers/footer.js @@ -1,7 +1,6 @@ 'use strict'; -angular.module('copay.footer').controller('FooterController', - function($scope) { +angular.module('copay.footer').controller('FooterController', function($scope, $http) { if (config.themes && Array.isArray(config.themes) && config.themes[0]) { $scope.themes = config.themes; @@ -15,5 +14,5 @@ angular.module('copay.footer').controller('FooterController', $scope.change_theme = function(name) { $scope.theme = 'css/tpl-' + name + '.css'; }; - + $scope.version = copay.version; }); diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js index 3eda3de05..358ab197c 100644 --- a/js/models/core/Wallet.js +++ b/js/models/core/Wallet.js @@ -18,7 +18,7 @@ function Wallet(opts) { //required params ['storage', 'network', 'blockchain', 'requiredCopayers', 'totalCopayers', 'spendUnconfirmed', - 'publicKeyRing', 'txProposals', 'privateKey' + 'publicKeyRing', 'txProposals', 'privateKey', 'version' ].forEach(function(k) { if (typeof opts[k] === 'undefined') throw new Error('missing key:' + k); self[k] = opts[k]; @@ -146,6 +146,7 @@ Wallet.prototype._optsToObj = function() { totalCopayers: this.totalCopayers, name: this.name, netKey: this.netKey, + version: this.version, }; return obj; diff --git a/js/models/core/WalletFactory.js b/js/models/core/WalletFactory.js index 0db065eeb..80177dc8a 100644 --- a/js/models/core/WalletFactory.js +++ b/js/models/core/WalletFactory.js @@ -13,14 +13,9 @@ var Wallet = require('./Wallet'); /* * WalletFactory * - * - * var wallet = WF.read(config,walletId); -> always go to storage - * var wallet = WF.create(config,walletId); -> create wallets, with the given ID (or random is not given) - * - * var wallet = WF.open(config,walletId); -> try to read walletId, if fails, create a new wallet with that id */ -function WalletFactory(config) { +function WalletFactory(config, version) { var self = this; this.storage = new Storage(config.storage); this.network = new Network(config.network); @@ -29,6 +24,7 @@ function WalletFactory(config) { this.networkName = config.networkName; this.verbose = config.verbose; this.walletDefaults = config.wallet; + this.version = version; } WalletFactory.prototype.log = function(){ @@ -129,11 +125,28 @@ WalletFactory.prototype.create = function(opts) { opts.spendUnconfirmed = opts.spendUnconfirmed || this.walletDefaults.spendUnconfirmed; opts.requiredCopayers = requiredCopayers; opts.totalCopayers = totalCopayers; + opts.version = this.version; var w = new Wallet(opts); w.store(); return w; }; + +WalletFactory.prototype._checkVersion = function(inVersion) { + var thisV = this.version.split('.'); + var thisV0 = parseInt(thisV[0]); + var inV = inVersion.split('.'); + var inV0 = parseInt(inV[0]); + + //We only check for major version differences + if( thisV0 < inV0 ) { + throw new Error('Major difference in software versions' + + '. Received:' + inVersion + + '. Current version:' + this.version + + '. Aborting.'); + } +}; + WalletFactory.prototype.open = function(walletId, opts) { opts = opts || {}; opts.id = walletId; @@ -141,6 +154,8 @@ WalletFactory.prototype.open = function(walletId, opts) { this.storage._setPassphrase(opts.passphrase); var w = this.read(walletId); + this._checkVersion(w.version); + if (w) { w.store(); diff --git a/js/services/passphrase.js b/js/services/passphrase.js index 12043a3be..21fd495ae 100644 --- a/js/services/passphrase.js +++ b/js/services/passphrase.js @@ -1,7 +1,3 @@ 'use strict'; -var passphrase; -angular.module('copay.passphrase').factory('Passphrase', function($rootScope) { - passphrase = passphrase || new copay.Passphrase(config.passphrase); - return passphrase; -}); +angular.module('copay.passphrase').value('Passphrase', new copay.Passphrase(config.passphrase)); diff --git a/js/services/walletFactory.js b/js/services/walletFactory.js index ba7e48107..49af6ef26 100644 --- a/js/services/walletFactory.js +++ b/js/services/walletFactory.js @@ -1,4 +1,4 @@ 'use strict'; -angular.module('copay.walletFactory').value('walletFactory', new copay.WalletFactory(config)); +angular.module('copay.walletFactory').value('walletFactory', new copay.WalletFactory(config, copay.version)); diff --git a/test/test.TxProposals.js b/test/test.TxProposals.js index 647b634d4..1d76b1bae 100644 --- a/test/test.TxProposals.js +++ b/test/test.TxProposals.js @@ -7,7 +7,6 @@ var Transaction = bitcore.Transaction; var buffertools = bitcore.buffertools; var WalletKey = bitcore.WalletKey; var Key = bitcore.Key; -var BIP32 = bitcore.BIP32; var bignum = bitcore.bignum; var Script = bitcore.Script; var Builder = bitcore.TransactionBuilder; diff --git a/test/test.Wallet.js b/test/test.Wallet.js index 60bdb9359..53a235fe9 100644 --- a/test/test.Wallet.js +++ b/test/test.Wallet.js @@ -53,6 +53,7 @@ describe('Wallet model', function() { c.networkName = config.networkName; c.verbose = config.verbose; + c.version = '0.0.1'; return new Wallet(c); } diff --git a/test/test.Walletfactory.js b/test/test.Walletfactory.js index a3feeba50..8a5648a0e 100644 --- a/test/test.Walletfactory.js +++ b/test/test.Walletfactory.js @@ -46,12 +46,12 @@ describe('WalletFactory model', function() { }); it('should be able to create wallets', function() { - var wf = new WalletFactory(config); + var wf = new WalletFactory(config, '0.0.1'); var w = wf.create(); should.exist(w); }); it('should be able to get wallets', function() { - var wf = new WalletFactory(config); + var wf = new WalletFactory(config, '0.0.1'); var w = wf.create(); var w2 = wf.read(w.id); @@ -60,9 +60,9 @@ describe('WalletFactory model', function() { }); it('#fromObj #toObj round trip', function() { - var o = '{"opts":{"id":"dbfe10c3fae71cea","spendUnconfirmed":1,"requiredCopayers":3,"totalCopayers":5,"netKey":"LppzFYqlgT0="},"publicKeyRing":{"walletId":"dbfe10c3fae71cea","networkName":"testnet","requiredCopayers":3,"totalCopayers":5,"changeAddressIndex":3,"addressIndex":3,"copayersExtPubKeys":["tpubD6NzVbkrYhZ4YGK8ZhZ8WVeBXNAAoTYjjpw9twCPiNGrGQYFktP3iVQkKmZNiFnUcAFMJRxJVJF6Nq9MDv2kiRceExJaHFbxUCGUiRhmy97","tpubD6NzVbkrYhZ4YKGDJkzWdQsQV3AcFemaQKiwNhV4RL8FHnBFvinidGdQtP8RKj3h34E65RkdtxjrggZYqsEwJ8RhhN2zz9VrjLnrnwbXYNc","tpubD6NzVbkrYhZ4YkDiewjb32Pp3Sz9WK2jpp37KnL7RCrHAyPpnLfgdfRnTdpn6DTWmPS7niywfgWiT42aJb1J6CjWVNmkgsMCxuw7j9DaGKB","tpubD6NzVbkrYhZ4XEtUAz4UUTWbprewbLTaMhR8NUvSJUEAh4Sidxr6rRPFdqqVRR73btKf13wUjds2i8vVCNo8sbKrAnyoTr3o5Y6QSbboQjk","tpubD6NzVbkrYhZ4Yj9AAt6xUVuGPVd8jXCrEE6V2wp7U3PFh8jYYvVad31b4VUXEYXzSnkco4fktu8r4icBsB2t3pCR3WnhVLedY2hxGcPFLKD"],"nicknameFor":{},"publicKeysCache":{"m/0/1/0":["0314368b8efa07e8c7dad30498d0a7e3aa575db1fef833347c6d381c1a33a17b17","02cfd95f89ab46bd3bd86954dd9f83dbab0cd2e4466dee587e8e4d8d733fc0d748","02568969eb6212fe946450be6c5b3353fc754a40b2cdc4aed501a8976fec371da8","0360f870a088ae0ef1c37035a9b6a462ca8dcdd5da275f4e2dcd19f44b81d3e7e4","0300ad8f1bded838b02e127bb25961fbcee718db2df81f680f889692acdcbdd73d"],"m/0/1/1":["024f97a9adb2fa9306c4e3d9244f5e5355c7e2c6b3dd4122ba804e17dc9729df5d","0214834a5adcbc4ad0f3bbbc1c280b8ac480387fcc9a1fd988c1526ed496d923c4","024e72338bd5e976375d076bd71a9649e9141b4cbfc9e16cb7109b354b3e913a05","0322045ea35c3118aa7ab9f2c9f182b0120956b0aa65cc72b9d093f145327a4b17","030dc2450c72df366c1960739c577a2efd4451070bd78effcb6f71d1bcd7dfc7a8"],"m/0/1/2":["0247de59deb66783b8f9b0c326234a9569d00866c2a73f599e77a4d0cab5cbce8f","0376e49f0ac3647404034aae0dc8dd927c34a634ef24ea36f56a272f75fce9539b","032fbaa2593bd1eea4a46e7ac15f15802cdd1eb65a7d5bc4364ddd9d52f0838234","03a81f2a7e1f7191aa0b0c6e0a4ccefc71edd3564e86014972fe338045f68d5a5a","02eb8a012ea9a709392502cacda6ef5115d6d2319ab470d546d9068ab941621a99"],"m/0/0/0":["036dcbd378b4352120d6b720b6294dd2d0dd02801fcf010bb69dadbec1f3999279","022089eedb85dc45d1efa418e1ea226588deedebc1d85acca15ff72783e33636c0","0388aa5fd432b74c56427396f350d236c3ca8f7b2f62da513ce4c2e6ff04a67e9c","02fc4caa7449db7483d2e1fccdacac6fa2f736278c758af9966402589b5632f13e","02e4a15b885d8b2d586f82fa85d16179644e60a154674bde0ec3004810b1bdab99"],"m/0/0/1":["039afa26b2f341c76c7b3c3d0672438f35ac6ebb67b1ddfefac9cd79b7b24418c1","021acaaf500d431ebc396f50630767b01c91ce98ae48e968775ceaad932b7e3b8e","022a947259c4a9f76d5e95c0849df31d01233df41d0d75d631b89317a48d8cddce","03d38d9f94217da780303d9a8987c86d737ef39683febc0cd6632cddbfa62186fd","0394d2581b307fe2af19721888d922aab58ab198ef88cedf9506177e30d807811e"],"m/0/0/2":["037825ffce15d34f9bd6c02bcda7701826706471a4d6ab5004eb965f98811c2098","023768dd6d3c71b7df5733ccda5b2d8b454d5b4c4179d91a6fda74db8b869a2406","021a79e91f003f308764d43039e9b5d56bc8f33ca2f4d30ec6cc5a37c0d09dc273","02437f1e388b273936319f79a5d22958ef5ebff9c8cd7b6f6f72518445b1e30867","0373b0881cb4fd02baa62589023fdfe9739c6148cf104d907549f2528eb80146f5"]}},"txProposals":{"txps":[],"walletId":"dbfe10c3fae71cea","networkName":"testnet"},"privateKey":{"extendedPrivateKeyString":"tprv8ZgxMBicQKsPeoHLg3tY75z4xLeEe8MqAXLNcRA6J6UTRvHV8VZTXznt9eoTmSk1fwSrwZtMhY3XkNsceJ14h6sCXHSWinRqMSSbY8tfhHi","networkName":"testnet","privateKeyCache":{}}}'; + var o = '{"opts":{"id":"dbfe10c3fae71cea","spendUnconfirmed":1,"requiredCopayers":3,"totalCopayers":5,"netKey":"LppzFYqlgT0=","version":"0.0.5"},"publicKeyRing":{"walletId":"dbfe10c3fae71cea","networkName":"testnet","requiredCopayers":3,"totalCopayers":5,"changeAddressIndex":3,"addressIndex":3,"copayersExtPubKeys":["tpubD6NzVbkrYhZ4YGK8ZhZ8WVeBXNAAoTYjjpw9twCPiNGrGQYFktP3iVQkKmZNiFnUcAFMJRxJVJF6Nq9MDv2kiRceExJaHFbxUCGUiRhmy97","tpubD6NzVbkrYhZ4YKGDJkzWdQsQV3AcFemaQKiwNhV4RL8FHnBFvinidGdQtP8RKj3h34E65RkdtxjrggZYqsEwJ8RhhN2zz9VrjLnrnwbXYNc","tpubD6NzVbkrYhZ4YkDiewjb32Pp3Sz9WK2jpp37KnL7RCrHAyPpnLfgdfRnTdpn6DTWmPS7niywfgWiT42aJb1J6CjWVNmkgsMCxuw7j9DaGKB","tpubD6NzVbkrYhZ4XEtUAz4UUTWbprewbLTaMhR8NUvSJUEAh4Sidxr6rRPFdqqVRR73btKf13wUjds2i8vVCNo8sbKrAnyoTr3o5Y6QSbboQjk","tpubD6NzVbkrYhZ4Yj9AAt6xUVuGPVd8jXCrEE6V2wp7U3PFh8jYYvVad31b4VUXEYXzSnkco4fktu8r4icBsB2t3pCR3WnhVLedY2hxGcPFLKD"],"nicknameFor":{},"publicKeysCache":{"m/0/1/0":["0314368b8efa07e8c7dad30498d0a7e3aa575db1fef833347c6d381c1a33a17b17","02cfd95f89ab46bd3bd86954dd9f83dbab0cd2e4466dee587e8e4d8d733fc0d748","02568969eb6212fe946450be6c5b3353fc754a40b2cdc4aed501a8976fec371da8","0360f870a088ae0ef1c37035a9b6a462ca8dcdd5da275f4e2dcd19f44b81d3e7e4","0300ad8f1bded838b02e127bb25961fbcee718db2df81f680f889692acdcbdd73d"],"m/0/1/1":["024f97a9adb2fa9306c4e3d9244f5e5355c7e2c6b3dd4122ba804e17dc9729df5d","0214834a5adcbc4ad0f3bbbc1c280b8ac480387fcc9a1fd988c1526ed496d923c4","024e72338bd5e976375d076bd71a9649e9141b4cbfc9e16cb7109b354b3e913a05","0322045ea35c3118aa7ab9f2c9f182b0120956b0aa65cc72b9d093f145327a4b17","030dc2450c72df366c1960739c577a2efd4451070bd78effcb6f71d1bcd7dfc7a8"],"m/0/1/2":["0247de59deb66783b8f9b0c326234a9569d00866c2a73f599e77a4d0cab5cbce8f","0376e49f0ac3647404034aae0dc8dd927c34a634ef24ea36f56a272f75fce9539b","032fbaa2593bd1eea4a46e7ac15f15802cdd1eb65a7d5bc4364ddd9d52f0838234","03a81f2a7e1f7191aa0b0c6e0a4ccefc71edd3564e86014972fe338045f68d5a5a","02eb8a012ea9a709392502cacda6ef5115d6d2319ab470d546d9068ab941621a99"],"m/0/0/0":["036dcbd378b4352120d6b720b6294dd2d0dd02801fcf010bb69dadbec1f3999279","022089eedb85dc45d1efa418e1ea226588deedebc1d85acca15ff72783e33636c0","0388aa5fd432b74c56427396f350d236c3ca8f7b2f62da513ce4c2e6ff04a67e9c","02fc4caa7449db7483d2e1fccdacac6fa2f736278c758af9966402589b5632f13e","02e4a15b885d8b2d586f82fa85d16179644e60a154674bde0ec3004810b1bdab99"],"m/0/0/1":["039afa26b2f341c76c7b3c3d0672438f35ac6ebb67b1ddfefac9cd79b7b24418c1","021acaaf500d431ebc396f50630767b01c91ce98ae48e968775ceaad932b7e3b8e","022a947259c4a9f76d5e95c0849df31d01233df41d0d75d631b89317a48d8cddce","03d38d9f94217da780303d9a8987c86d737ef39683febc0cd6632cddbfa62186fd","0394d2581b307fe2af19721888d922aab58ab198ef88cedf9506177e30d807811e"],"m/0/0/2":["037825ffce15d34f9bd6c02bcda7701826706471a4d6ab5004eb965f98811c2098","023768dd6d3c71b7df5733ccda5b2d8b454d5b4c4179d91a6fda74db8b869a2406","021a79e91f003f308764d43039e9b5d56bc8f33ca2f4d30ec6cc5a37c0d09dc273","02437f1e388b273936319f79a5d22958ef5ebff9c8cd7b6f6f72518445b1e30867","0373b0881cb4fd02baa62589023fdfe9739c6148cf104d907549f2528eb80146f5"]}},"txProposals":{"txps":[],"walletId":"dbfe10c3fae71cea","networkName":"testnet"},"privateKey":{"extendedPrivateKeyString":"tprv8ZgxMBicQKsPeoHLg3tY75z4xLeEe8MqAXLNcRA6J6UTRvHV8VZTXznt9eoTmSk1fwSrwZtMhY3XkNsceJ14h6sCXHSWinRqMSSbY8tfhHi","networkName":"testnet","privateKeyCache":{}}}'; - var wf = new WalletFactory(config); + var wf = new WalletFactory(config, '0.0.5'); var w = wf.fromObj(JSON.parse(o)); should.exist(w); @@ -76,7 +76,7 @@ describe('WalletFactory model', function() { it('BIP32 length problem', function() { var sconfig = {"networkName":"testnet","network":{"key":"g23ihfh82h35rf","host":"162.242.219.26","port":10009,"path":"/","maxPeers":15,"debug":3},"limits":{"totalCopayers":10,"mPlusN":15},"wallet":{"requiredCopayers":2,"totalCopayers":3,"spendUnconfirmed":1,"verbose":0},"blockchain":{"host":"test.insight.is","port":3001},"socket":{"host":"test.insight.is","port":3001},"verbose":0,"themes":["default"]}; - var wf = new WalletFactory(sconfig); + var wf = new WalletFactory(sconfig, '0.0.1'); var opts = {'requiredCopayers': 2, 'totalCopayers':3}; var w = wf.create(opts); diff --git a/util/build.js b/util/build.js index f1d576c94..396bfca9c 100755 --- a/util/build.js +++ b/util/build.js @@ -24,6 +24,12 @@ var pack = function (params) { return browserPack(params); }; +var createVersion = function() { + var json = JSON.parse(fs.readFileSync('./package.json', 'utf8')); + var content = 'module.exports="' + json.version + '";'; + fs.writeFileSync("./version.js", content); +}; + var createBundle = function(opts) { opts.dir = opts.dir || 'js/'; @@ -45,6 +51,7 @@ var createBundle = function(opts) { b.require('./copay', { expose: 'copay' }); + b.require('./version'); // b.external('bitcore'); b.require('./js/models/core/WalletFactory'); b.require('./js/models/core/Wallet'); @@ -95,6 +102,8 @@ if (require.main === module) { .option('-d, --dontminify', 'Don\'t minify the code.') .option('-o, --stdout', 'Specify output as stdout') .parse(process.argv); + + createVersion(); var copayBundle = createBundle(program); copayBundle.pipe(program.stdout ? process.stdout : fs.createWriteStream('js/copayBundle.js')); }