From e9f20b5de6fa05952d2770ea280643b1e94b2738 Mon Sep 17 00:00:00 2001 From: Yemel Jardi Date: Tue, 1 Jul 2014 09:41:28 -0300 Subject: [PATCH] Change PublicKeyRing index to array of AddressIndex --- js/models/core/AddressIndex.js | 14 ++++---- js/models/core/PublicKeyRing.js | 59 +++++++++++++++++++++++++-------- js/models/core/Wallet.js | 17 +++++----- test/test.AddressIndex.js | 11 ------ test/test.PublicKeyRing.js | 17 ++++++---- test/test.TxProposals.js | 4 +-- test/test.Wallet.js | 27 ++++++++------- test/test.WalletFactory.js | 18 +++++++++- 8 files changed, 105 insertions(+), 62 deletions(-) diff --git a/js/models/core/AddressIndex.js b/js/models/core/AddressIndex.js index f5532905c..bfc9b6464 100644 --- a/js/models/core/AddressIndex.js +++ b/js/models/core/AddressIndex.js @@ -2,27 +2,28 @@ var imports = require('soop').imports(); var preconditions = require('preconditions').singleton(); +var Structure = require('./Structure'); function AddressIndex(opts) { opts = opts || {}; - this.walletId = opts.walletId; - this.cosigner = opts.cosigner || 0; - + this.cosigner = opts.cosigner || Structure.SHARED_INDEX; this.changeIndex = opts.changeIndex || 0; this.receiveIndex = opts.receiveIndex || 0; } +AddressIndex.fromList = function(indexes) { + return indexes.map(function(i) { return AddressIndex.fromObj(i); }); +} + AddressIndex.fromObj = function(data) { if (data instanceof AddressIndex) { throw new Error('bad data format: Did you use .toObj()?'); } - var ret = new AddressIndex(data); - return ret; + return new AddressIndex(data); }; AddressIndex.prototype.toObj = function() { return { - walletId: this.walletId, cosigner: this.cosigner, changeIndex: this.changeIndex, receiveIndex: this.receiveIndex @@ -54,7 +55,6 @@ AddressIndex.prototype.increment = function(isChange) { AddressIndex.prototype.merge = function(inAddressIndex) { preconditions.shouldBeObject(inAddressIndex) - .checkArgument(this.walletId == inAddressIndex.walletId) .checkArgument(this.cosigner == inAddressIndex.cosigner); var hasChanged = false; diff --git a/js/models/core/PublicKeyRing.js b/js/models/core/PublicKeyRing.js index e05fa8049..f9e608afb 100644 --- a/js/models/core/PublicKeyRing.js +++ b/js/models/core/PublicKeyRing.js @@ -24,7 +24,7 @@ function PublicKeyRing(opts) { this.copayersHK = opts.copayersHK || []; - this.indexes = AddressIndex.fromObj(opts.indexes) || new AddressIndex(opts); + this.indexes = opts.indexes ? AddressIndex.fromList(opts.indexes) : [new AddressIndex()]; this.publicKeysCache = opts.publicKeysCache || {}; this.nicknameFor = opts.nicknameFor || {}; @@ -36,6 +36,13 @@ PublicKeyRing.fromObj = function(data) { if (data instanceof PublicKeyRing) { throw new Error('bad data format: Did you use .toObj()?'); } + + // Support old indexes schema + if (!Array.isArray(data.indexes)) { + data.indexes.cosigner = Structure.SHARED_INDEX; + data.indexes = [data.indexes]; + } + var ret = new PublicKeyRing(data); for (var k in data.copayersExtPubKeys) { @@ -51,7 +58,7 @@ PublicKeyRing.prototype.toObj = function() { networkName: this.network.name, requiredCopayers: this.requiredCopayers, totalCopayers: this.totalCopayers, - indexes: this.indexes.toObj(), + indexes: this.getIndexesObj(), copayersExtPubKeys: this.copayersHK.map(function(b) { return b.extendedPublicKeyString(); @@ -61,6 +68,10 @@ PublicKeyRing.prototype.toObj = function() { }; }; +PublicKeyRing.prototype.getIndexesObj = function(i) { + return this.indexes.map(function(i) { return i.toObj(); }); +} + PublicKeyRing.prototype.getCopayerId = function(i) { preconditions.checkArgument(typeof i !== 'undefined'); return this.copayerIds[i]; @@ -176,6 +187,16 @@ PublicKeyRing.prototype.getAddress = function(index, isChange) { return address; }; +PublicKeyRing.prototype.getSharedIndex = function() { + return this.getIndex(Structure.SHARED_INDEX); +}; + +PublicKeyRing.prototype.getIndex = function(cosigner) { + var index = this.indexes.filter(function(i) { return i.cosigner == cosigner }); + if (index.length != 1) throw new Error('no index for cosigner'); + return index[0]; +}; + PublicKeyRing.prototype.pathForAddress = function(address) { var path = this.addressToPath[address]; if (!path) throw new Error('Couldn\'t find path for address ' + address); @@ -191,9 +212,10 @@ PublicKeyRing.prototype.getScriptPubKeyHex = function(index, isChange) { //generate a new address, update index. PublicKeyRing.prototype.generateAddress = function(isChange) { isChange = !!isChange; - var index = isChange ? this.indexes.getChangeIndex() : this.indexes.getReceiveIndex(); + var shared = this.getIndex(Structure.SHARED_INDEX); + var index = isChange ? shared.getChangeIndex() : shared.getReceiveIndex(); var ret = this.getAddress(index, isChange); - this.indexes.increment(isChange); + shared.increment(isChange); return ret; }; @@ -206,9 +228,10 @@ PublicKeyRing.prototype.getAddresses = function(opts) { PublicKeyRing.prototype.getAddressesInfo = function(opts) { opts = opts || {}; + var shared = this.getIndex(Structure.SHARED_INDEX); var ret = []; if (!opts.excludeChange) { - for (var i = 0; i < this.indexes.getChangeIndex(); i++) { + for (var i = 0; i < shared.getChangeIndex(); i++) { var a = this.getAddress(i, true); ret.unshift({ address: this.getAddress(i, true), @@ -219,7 +242,7 @@ PublicKeyRing.prototype.getAddressesInfo = function(opts) { } if (!opts.excludeMain) { - for (var i = 0; i < this.indexes.getReceiveIndex(); i++) { + for (var i = 0; i < shared.getReceiveIndex(); i++) { var a = this.getAddress(i, false); ret.unshift({ address: a, @@ -303,17 +326,25 @@ PublicKeyRing.prototype._mergePubkeys = function(inPKR) { }; PublicKeyRing.prototype.merge = function(inPKR, ignoreId) { - var hasChanged = false; - this._checkInPKR(inPKR, ignoreId); - if (this.indexes.merge(inPKR.indexes)) - hasChanged = true; + var hasChanged = false; + hasChanged |= this.mergeIndexes(inPKR.indexes); + hasChanged |= this._mergePubkeys(inPKR); - if (this._mergePubkeys(inPKR)) - hasChanged = true; - - return hasChanged; + return !!hasChanged; }; +PublicKeyRing.prototype.mergeIndexes = function(indexes) { + var self = this; + var hasChanged = false; + + indexes.forEach(function(theirs) { + var mine = self.getIndex(theirs.cosigner); + hasChanged |= mine.merge(theirs); + }); + + return !!hasChanged +} + module.exports = require('soop')(PublicKeyRing); diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js index fec67735b..20e5d1b1f 100644 --- a/js/models/core/Wallet.js +++ b/js/models/core/Wallet.js @@ -81,8 +81,8 @@ Wallet.prototype.connectToAll = function() { Wallet.prototype._handleIndexes = function(senderId, data, isInbound) { this.log('RECV INDEXES:', data); - var inIndexes = AddressIndex.fromObj(data.indexes); - var hasChanged = this.publicKeyRing.indexes.merge(inIndexes); + var inIndexes = AddressIndex.fromList(data.indexes); + var hasChanged = this.publicKeyRing.mergeIndexes(inIndexes); if (hasChanged) { this.emit('publicKeyRingUpdated'); this.store(); @@ -439,11 +439,11 @@ Wallet.prototype.sendPublicKeyRing = function(recipients) { }); }; Wallet.prototype.sendIndexes = function(recipients) { - this.log('### INDEXES TO:', recipients || 'All', this.publicKeyRing.indexes.toObj()); + this.log('### INDEXES TO:', recipients || 'All', this.publicKeyRing.getIndexesObj()); this.network.send(recipients, { type: 'indexes', - indexes: this.publicKeyRing.indexes.toObj(), + indexes: this.publicKeyRing.getIndexesObj(), walletId: this.id, }); }; @@ -752,20 +752,21 @@ Wallet.prototype.createTxSync = function(toAddress, amountSatStr, comment, utxos return ntxid; }; +// TODO: Updetear todos los indices Wallet.prototype.updateIndexes = function(callback) { var self = this; - var start = self.publicKeyRing.indexes.changeIndex; + var start = self.publicKeyRing.getSharedIndex().changeIndex; self.log('Updating indexes...'); self.indexDiscovery(start, true, 20, function(err, changeIndex) { if (err) return callback(err); if (changeIndex != -1) - self.publicKeyRing.indexes.changeIndex = changeIndex + 1; + self.publicKeyRing.getSharedIndex().changeIndex = changeIndex + 1; - start = self.publicKeyRing.indexes.receiveIndex; + start = self.publicKeyRing.getSharedIndex().receiveIndex; self.indexDiscovery(start, false, 20, function(err, receiveIndex) { if (err) return callback(err); if (receiveIndex != -1) - self.publicKeyRing.indexes.receiveIndex = receiveIndex + 1; + self.publicKeyRing.getSharedIndex().receiveIndex = receiveIndex + 1; self.log('Indexes updated'); self.emit('publicKeyRingUpdated'); diff --git a/test/test.AddressIndex.js b/test/test.AddressIndex.js index ccb08ff96..767041529 100644 --- a/test/test.AddressIndex.js +++ b/test/test.AddressIndex.js @@ -22,7 +22,6 @@ var createAI = function() { var i = new AddressIndex(); should.exist(i); - i.walletId = '1234567'; i.cosigner = 1; return i; @@ -50,7 +49,6 @@ describe('AddressIndex model', function() { should.exist(data); var i2 = AddressIndex.fromObj(data); - i2.walletId.should.equal(i.walletId); i2.cosigner.should.equal(i.cosigner); i2.getChangeIndex().should.equal(changeN); @@ -76,7 +74,6 @@ describe('AddressIndex model', function() { for (var i = 0; i < 7; i++) j.increment(false); var j2 = new AddressIndex({ - walletId: j.walletId, cosigner: j.cosigner, }); j2.merge(j).should.equal(true); @@ -86,14 +83,6 @@ describe('AddressIndex model', function() { j2.merge(j).should.equal(false); }); - it('#merge should fail with different walletId', function() { - var j1 = new AddressIndex({ walletId: '1234' }); - var j2 = new AddressIndex({ walletId: '4321' }); - - var merge = function() { j2.merge(j1); }; - merge.should.throw(Error); - }) - it('#merge should fail with different cosigner index', function() { var j1 = new AddressIndex({ walletId: '1234', cosigner: 2 }); var j2 = new AddressIndex({ walletId: '1234', cosigner: 3 }); diff --git a/test/test.PublicKeyRing.js b/test/test.PublicKeyRing.js index b2405a161..c60aa8b01 100644 --- a/test/test.PublicKeyRing.js +++ b/test/test.PublicKeyRing.js @@ -5,6 +5,9 @@ var should = chai.should(); var bitcore = bitcore || require('bitcore'); var Address = bitcore.Address; var buffertools = bitcore.buffertools; + +var Structure = require('../js/models/core/Structure'); + try { var copay = require('copay'); //browser } catch (e) { @@ -85,7 +88,7 @@ describe('PublicKeyRing model', function() { } }); - it('show be able to tostore and read', function() { + it('show be able to to store and read', function() { var k = createW(); var w = k.w; var copayers = k.copayers; @@ -112,8 +115,8 @@ describe('PublicKeyRing model', function() { }).should.throw(); } - w2.indexes.getChangeIndex().should.equal(changeN); - w2.indexes.getReceiveIndex().should.equal(addressN); + w2.getSharedIndex().getChangeIndex().should.equal(changeN); + w2.getSharedIndex().getReceiveIndex().should.equal(addressN); }); @@ -168,8 +171,8 @@ describe('PublicKeyRing model', function() { for (var i = 0; i < 2; i++) w.generateAddress(false); - w.indexes.getChangeIndex().should.equal(3); - w.indexes.getReceiveIndex().should.equal(2); + w.getSharedIndex().getChangeIndex().should.equal(3); + w.getSharedIndex().getReceiveIndex().should.equal(2); }); it('#merge index tests', function() { @@ -188,8 +191,8 @@ describe('PublicKeyRing model', function() { w2.merge(w).should.equal(true); w2.requiredCopayers.should.equal(3); w2.totalCopayers.should.equal(5); - w2.indexes.getChangeIndex().should.equal(2); - w2.indexes.getReceiveIndex().should.equal(3); + w2.getSharedIndex().getChangeIndex().should.equal(2); + w2.getSharedIndex().getReceiveIndex().should.equal(3); // w2.merge(w).should.equal(false); diff --git a/test/test.TxProposals.js b/test/test.TxProposals.js index 30615a990..b0aa3a622 100644 --- a/test/test.TxProposals.js +++ b/test/test.TxProposals.js @@ -102,8 +102,8 @@ describe('TxProposals model', function() { var b = w.txps[ntxid].builder; var tx = b.build(); tx.isComplete().should.equal(false); - b.sign(priv2.getAll(pkr.indexes.getReceiveIndex(), pkr.indexes.getChangeIndex())); - b.sign(priv3.getAll(pkr.indexes.getReceiveIndex(), pkr.indexes.getChangeIndex())); + b.sign(priv2.getAll(pkr.getSharedIndex().getReceiveIndex(), pkr.getSharedIndex().getChangeIndex())); + b.sign(priv3.getAll(pkr.getSharedIndex().getReceiveIndex(), pkr.getSharedIndex().getChangeIndex())); tx = b.build(); tx.isComplete().should.equal(true); diff --git a/test/test.Wallet.js b/test/test.Wallet.js index 20dd4b6ba..3e392833c 100644 --- a/test/test.Wallet.js +++ b/test/test.Wallet.js @@ -9,6 +9,7 @@ try { var copay = require('../copay'); //node } var Wallet = require('../js/models/core/Wallet'); +var Structure = require('../js/models/core/Structure'); var Storage = require('./mocks/FakeStorage'); var Network = require('./mocks/FakeNetwork'); var Blockchain = require('./mocks/FakeBlockchain'); @@ -341,13 +342,15 @@ describe('Wallet model', function() { it('handle network indexes correctly', function() { var w = createW(); var aiObj = { - walletId: w.id, - changeIndex: 3, - receiveIndex: 2 + indexes: [{ + cosigner: Structure.SHARED_INDEX, + changeIndex: 3, + receiveIndex: 2 + }] }; w._handleIndexes('senderID', aiObj, true); - w.publicKeyRing.indexes.getReceiveIndex(2); - w.publicKeyRing.indexes.getChangeIndex(3); + w.publicKeyRing.getSharedIndex().getReceiveIndex(2); + w.publicKeyRing.getSharedIndex().getChangeIndex(3); }); it('handle network pubKeyRings correctly', function() { @@ -363,19 +366,19 @@ describe('Wallet model', function() { networkName: w.networkName, requiredCopayers: w.requiredCopayers, totalCopayers: w.totalCopayers, - indexes: { - walletId: undefined, + indexes: [{ + cosigner: Structure.SHARED_INDEX, changeIndex: 2, receiveIndex: 3 - }, + }], copayersExtPubKeys: cepk, nicknameFor: {}, }; w._handlePublicKeyRing('senderID', { publicKeyRing: pkrObj }, true); - w.publicKeyRing.indexes.getReceiveIndex(2); - w.publicKeyRing.indexes.getChangeIndex(3); + w.publicKeyRing.getSharedIndex().getReceiveIndex(2); + w.publicKeyRing.getSharedIndex().getChangeIndex(3); for (var i = 0; i < w.requiredCopayers; i++) { w.publicKeyRing.toObj().copayersExtPubKeys[i].should.equal(cepk[i]); } @@ -729,8 +732,8 @@ describe('Wallet model', function() { }); w.updateIndexes(function(err) { - w.publicKeyRing.indexes.receiveIndex.should.equal(15); - w.publicKeyRing.indexes.changeIndex.should.equal(15); + w.publicKeyRing.getSharedIndex().receiveIndex.should.equal(15); + w.publicKeyRing.getSharedIndex().changeIndex.should.equal(15); done(); }); }); diff --git a/test/test.WalletFactory.js b/test/test.WalletFactory.js index d240acace..f57b740c7 100644 --- a/test/test.WalletFactory.js +++ b/test/test.WalletFactory.js @@ -10,7 +10,7 @@ var FakeBlockchain = require('./mocks/FakeBlockchain'); var FakeStorage = require('./mocks/FakeStorage'); var WalletFactory = require('../js/models/core/WalletFactory'); -var o = '{"opts":{"id":"dbfe10c3fae71cea","spendUnconfirmed":1,"requiredCopayers":3,"totalCopayers":5,"version":"0.0.5"},"publicKeyRing":{"walletId":"dbfe10c3fae71cea","networkName":"testnet","requiredCopayers":3,"totalCopayers":5,"indexes":{"cosigner":2,"changeIndex":0,"receiveIndex":0},"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":{}},"addressBook":{},"backupOffered":false}'; +var o = '{"opts":{"id":"dbfe10c3fae71cea","spendUnconfirmed":1,"requiredCopayers":3,"totalCopayers":5,"version":"0.0.5"},"publicKeyRing":{"walletId":"dbfe10c3fae71cea","networkName":"testnet","requiredCopayers":3,"totalCopayers":5,"indexes":[{"cosigner":2,"changeIndex":0,"receiveIndex":0}],"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":{}},"addressBook":{},"backupOffered":false}'; describe('WalletFactory model', function() { var config = { @@ -94,6 +94,22 @@ describe('WalletFactory model', function() { JSON.stringify(w.toObj()).should.equal(o); }); + it('support old index schema: #fromObj #toObj round trip', function() { + var o = '{"opts":{"id":"dbfe10c3fae71cea","spendUnconfirmed":1,"requiredCopayers":3,"totalCopayers":5,"version":"0.0.5"},"publicKeyRing":{"walletId":"dbfe10c3fae71cea","networkName":"testnet","requiredCopayers":3,"totalCopayers":5,"indexes":{"changeIndex":0,"receiveIndex":0},"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":{}},"addressBook":{},"backupOffered":false}'; + var o2 = '{"opts":{"id":"dbfe10c3fae71cea","spendUnconfirmed":1,"requiredCopayers":3,"totalCopayers":5,"version":"0.0.5"},"publicKeyRing":{"walletId":"dbfe10c3fae71cea","networkName":"testnet","requiredCopayers":3,"totalCopayers":5,"indexes":[{"cosigner":2147483647,"changeIndex":0,"receiveIndex":0}],"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":{}},"addressBook":{},"backupOffered":false}'; + + var wf = new WalletFactory(config, '0.0.5'); + var w = wf.fromObj(JSON.parse(o)); + + should.exist(w); + w.id.should.equal("dbfe10c3fae71cea"); + should.exist(w.publicKeyRing.getCopayerId); + should.exist(w.txProposals.toObj); + should.exist(w.privateKey.toObj); + + JSON.stringify(w.toObj()).should.equal(o2); + }); + it('should create wallet from encrypted object', function() { var wf = new WalletFactory(config, '0.0.1'); var walletObj = JSON.parse(o);