mirror of https://github.com/BTCPrivate/copay.git
commit
d91c42ee30
1
copay.js
1
copay.js
|
@ -10,7 +10,6 @@ module.exports.AddressIndex = require('./js/models/core/AddressIndex');
|
|||
// components
|
||||
var WebRTC = module.exports.WebRTC = require('./js/models/network/WebRTC');
|
||||
var Insight = module.exports.Insight = require('./js/models/blockchain/Insight');
|
||||
var StorageLocalPlain = module.exports.StorageLocalPlain = require('./js/models/storage/LocalPlain');
|
||||
var StorageLocalEncrypted = module.exports.StorageLocalEncrypted = require('./js/models/storage/LocalEncrypted');
|
||||
|
||||
module.exports.WalletFactory = require('./js/models/core/WalletFactory');
|
||||
|
|
|
@ -9,7 +9,6 @@ var Wallet = require('./Wallet');
|
|||
|
||||
var WebRTC = module.exports.WebRTC = require('../network/WebRTC');
|
||||
var Insight = module.exports.Insight = require('../blockchain/Insight');
|
||||
//var StorageLocalPlain = module.exports.StorageLocalPlain = require('../storage/LocalPlain');
|
||||
var StorageLocalEncrypted = module.exports.StorageLocalEncrypted = require('../storage/LocalEncrypted');
|
||||
|
||||
/*
|
||||
|
|
|
@ -8,13 +8,21 @@ function Storage(opts) {
|
|||
opts = opts || {};
|
||||
|
||||
this.__uniqueid = ++id;
|
||||
|
||||
if (opts.password)
|
||||
this._setPassphrase(opts.password);
|
||||
|
||||
if (opts.localStorage) {
|
||||
this.localStorage = opts.localStorage;
|
||||
} else if (localStorage) {
|
||||
this.localStorage = localStorage;
|
||||
}
|
||||
}
|
||||
|
||||
var pps = {};
|
||||
Storage.prototype._getPassphrase = function() {
|
||||
if (!pps[this.__uniqueid])
|
||||
throw new Error('No passprase set');
|
||||
|
||||
return pps[this.__uniqueid];
|
||||
}
|
||||
|
||||
|
@ -37,7 +45,6 @@ Storage.prototype._decrypt = function(base64) {
|
|||
var decryptedStr = null;
|
||||
try {
|
||||
var decrypted = CryptoJS.AES.decrypt(base64, this._getPassphrase());
|
||||
|
||||
if (decrypted)
|
||||
decryptedStr = decrypted.toString(CryptoJS.enc.Utf8);
|
||||
} catch (e) {
|
||||
|
@ -54,7 +61,7 @@ Storage.prototype._decryptObj = function(base64) {
|
|||
|
||||
Storage.prototype._read = function(k) {
|
||||
var ret;
|
||||
ret = localStorage.getItem(k);
|
||||
ret = this.localStorage.getItem(k);
|
||||
if (!ret) return null;
|
||||
ret = this._decrypt(ret);
|
||||
if (!ret) return null;
|
||||
|
@ -67,23 +74,23 @@ Storage.prototype._write = function(k, v) {
|
|||
v = JSON.stringify(v);
|
||||
v = this._encrypt(v);
|
||||
|
||||
localStorage.setItem(k, v);
|
||||
this.localStorage.setItem(k, v);
|
||||
};
|
||||
|
||||
// get value by key
|
||||
Storage.prototype.getGlobal = function(k) {
|
||||
var item = localStorage.getItem(k);
|
||||
var item = this.localStorage.getItem(k);
|
||||
return item == 'undefined' ? undefined : item;
|
||||
};
|
||||
|
||||
// set value for key
|
||||
Storage.prototype.setGlobal = function(k, v) {
|
||||
localStorage.setItem(k, JSON.stringify(v));
|
||||
this.localStorage.setItem(k, typeof v === 'object' ? JSON.stringify(v) : v);
|
||||
};
|
||||
|
||||
// remove value for key
|
||||
Storage.prototype.removeGlobal = function(k) {
|
||||
localStorage.removeItem(k);
|
||||
this.localStorage.removeItem(k);
|
||||
};
|
||||
|
||||
Storage.prototype._key = function(walletId, k) {
|
||||
|
@ -110,14 +117,17 @@ Storage.prototype.setName = function(walletId, name) {
|
|||
};
|
||||
|
||||
Storage.prototype.getName = function(walletId) {
|
||||
return this.getGlobal('nameFor::' + walletId);
|
||||
var ret = this.getGlobal('nameFor::' + walletId);
|
||||
|
||||
return ret;
|
||||
};
|
||||
|
||||
Storage.prototype.getWalletIds = function() {
|
||||
var walletIds = [];
|
||||
var uniq = {};
|
||||
for (var i = 0; i < localStorage.length; i++) {
|
||||
var key = localStorage.key(i);
|
||||
|
||||
for (var i = 0; i < this.localStorage.length; i++) {
|
||||
var key = this.localStorage.key(i);
|
||||
var split = key.split('::');
|
||||
if (split.length == 2) {
|
||||
var walletId = split[0];
|
||||
|
@ -150,8 +160,8 @@ Storage.prototype.deleteWallet = function(walletId) {
|
|||
var toDelete = {};
|
||||
toDelete['nameFor::' + walletId] = 1;
|
||||
|
||||
for (var i = 0; i < localStorage.length; i++) {
|
||||
var key = localStorage.key(i);
|
||||
for (var i = 0; i < this.localStorage.length; i++) {
|
||||
var key = this.localStorage.key(i);
|
||||
var split = key.split('::');
|
||||
if (split.length == 2 && split[0] === walletId) {
|
||||
toDelete[key] = 1;
|
||||
|
@ -173,7 +183,7 @@ Storage.prototype.setFromObj = function(walletId, obj) {
|
|||
|
||||
// remove all values
|
||||
Storage.prototype.clearAll = function() {
|
||||
localStorage.clear();
|
||||
this.localStorage.clear();
|
||||
};
|
||||
|
||||
Storage.prototype.export = function(obj) {
|
||||
|
|
|
@ -1,124 +0,0 @@
|
|||
'use strict';
|
||||
|
||||
var imports = require('soop').imports();
|
||||
|
||||
function Storage() {}
|
||||
|
||||
Storage.prototype._read = function(k) {
|
||||
var ret;
|
||||
try {
|
||||
ret = JSON.parse(localStorage.getItem(k));
|
||||
} catch (e) {};
|
||||
return ret;
|
||||
};
|
||||
|
||||
Storage.prototype._write = function(k, v) {
|
||||
localStorage.setItem(k, JSON.stringify(v));
|
||||
};
|
||||
|
||||
Storage.prototype._getWalletKeys = function(walletId) {
|
||||
var keys = [];
|
||||
|
||||
for (var i = 0; i < localStorage.length; i++) {
|
||||
var key = localStorage.key(i);
|
||||
var split = key.split('::');
|
||||
if (split.length == 3) {
|
||||
if (walletId = split[0])
|
||||
keys.push(split[2]);
|
||||
}
|
||||
}
|
||||
|
||||
return keys;
|
||||
};
|
||||
|
||||
// get value by key
|
||||
Storage.prototype.getGlobal = function(k) {
|
||||
return this._read(k);
|
||||
};
|
||||
|
||||
// set value for key
|
||||
Storage.prototype.setGlobal = function(k, v) {
|
||||
this._write(k, v);
|
||||
};
|
||||
|
||||
// remove value for key
|
||||
Storage.prototype.removeGlobal = function(k) {
|
||||
localStorage.removeItem(k);
|
||||
};
|
||||
|
||||
|
||||
|
||||
Storage.prototype._key = function(walletId, k) {
|
||||
return walletId + '::' + k;
|
||||
};
|
||||
// get value by key
|
||||
Storage.prototype.get = function(walletId, k) {
|
||||
return this.getGlobal(this._key(walletId, k));
|
||||
};
|
||||
|
||||
// set value for key
|
||||
Storage.prototype.set = function(walletId, k, v) {
|
||||
this.setGlobal(this._key(walletId, k), v);
|
||||
};
|
||||
|
||||
// remove value for key
|
||||
Storage.prototype.remove = function(walletId, k) {
|
||||
this.removeGlobal(this._key(walletId, k));
|
||||
};
|
||||
|
||||
Storage.prototype.setName = function(walletId, name) {
|
||||
this.setGlobal('nameFor::' + walletId, name);
|
||||
};
|
||||
|
||||
Storage.prototype.getName = function(walletId) {
|
||||
return this.getGlobal('nameFor::' + walletId);
|
||||
};
|
||||
|
||||
Storage.prototype.getWalletIds = function() {
|
||||
var walletIds = [];
|
||||
var uniq = {};
|
||||
for (var i = 0; i < localStorage.length; i++) {
|
||||
var key = localStorage.key(i);
|
||||
var split = key.split('::');
|
||||
if (split.length == 2) {
|
||||
var walletId = split[0];
|
||||
|
||||
if (walletId === 'nameFor') continue;
|
||||
|
||||
if (typeof uniq[walletId] === 'undefined') {
|
||||
walletIds.push(walletId);
|
||||
uniq[walletId] = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
return walletIds;
|
||||
};
|
||||
|
||||
Storage.prototype.getWallets = function() {
|
||||
var wallets = [];
|
||||
var uniq = {};
|
||||
var ids = this.getWalletIds();
|
||||
|
||||
for (var i in ids) {
|
||||
wallets.push({
|
||||
id: ids[i],
|
||||
name: this.getName(ids[i]),
|
||||
});
|
||||
}
|
||||
return wallets;
|
||||
};
|
||||
|
||||
//obj contains keys to be set
|
||||
Storage.prototype.setFromObj = function(walletId, obj) {
|
||||
for (var k in obj) {
|
||||
this.set(walletId, k, obj[k]);
|
||||
}
|
||||
this.setName(walletId, obj.opts.name);
|
||||
};
|
||||
|
||||
// remove all values
|
||||
Storage.prototype.clearAll = function() {
|
||||
localStorage.clear();
|
||||
};
|
||||
|
||||
module.exports = require('soop')(Storage);
|
|
@ -20,7 +20,6 @@
|
|||
<script src="test.PrivateKey.js"></script>
|
||||
<script src="test.PublicKeyRing.js"></script>
|
||||
<script src="test.storage.LocalEncrypted.js"></script>
|
||||
<script src="test.storage.LocalPlain.js"></script>
|
||||
<script src="test.Wallet.js"></script>
|
||||
<script src="test.WalletFactory.js"></script>
|
||||
<script src="test.performance.js"></script>
|
||||
|
|
|
@ -0,0 +1,27 @@
|
|||
//localstorage Mock
|
||||
ls = {};
|
||||
function LocalStorage(opts) {}
|
||||
|
||||
FakeLocalStorage = {};
|
||||
FakeLocalStorage.length = 0;
|
||||
FakeLocalStorage.removeItem = function(key) {
|
||||
delete ls[key];
|
||||
this.length = Object.keys(ls).length;
|
||||
};
|
||||
|
||||
FakeLocalStorage.getItem = function(k) {
|
||||
return ls[k];
|
||||
};
|
||||
|
||||
|
||||
FakeLocalStorage.key = function(i) {
|
||||
return Object.keys(ls)[i];
|
||||
};
|
||||
|
||||
FakeLocalStorage.setItem = function(k, v) {
|
||||
ls[k] = v;
|
||||
this.key[this.length] = k;
|
||||
this.length = Object.keys(ls).length;
|
||||
};
|
||||
|
||||
module.exports = require('soop')(FakeLocalStorage);
|
|
@ -348,7 +348,8 @@ describe('Wallet model', function() {
|
|||
throw();
|
||||
});
|
||||
|
||||
it('call reconnect after interval', function(done) {
|
||||
//this test fails randomly
|
||||
it.skip('call reconnect after interval', function(done) {
|
||||
this.timeout(10000);
|
||||
var w = cachedCreateW2();
|
||||
var spy = sinon.spy(w, 'scheduleConnect');
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
var chai = chai || require('chai');
|
||||
var should = chai.should();
|
||||
|
||||
var FakeStorage = require('./mocks/FakeLocalStorage');
|
||||
var copay = copay || require('../copay');
|
||||
var sinon = require('sinon');
|
||||
var FakeNetwork = require('./mocks/FakeNetwork');
|
||||
|
@ -50,6 +51,7 @@ describe('WalletFactory model', function() {
|
|||
it('should log', function() {
|
||||
var c2 = JSON.parse(JSON.stringify(config));
|
||||
c2.verbose = 1;
|
||||
c2.Storage= FakeStorage;
|
||||
var wf = new WalletFactory(c2, '0.0.1');
|
||||
var save_console_log = console.log;
|
||||
console.log = function() {};
|
||||
|
@ -140,7 +142,12 @@ describe('WalletFactory model', function() {
|
|||
|
||||
it('should import and update indexes', function() {
|
||||
var wf = new WalletFactory(config, '0.0.1');
|
||||
var wallet = {id: "fake wallet", updateIndexes: function(cb) { cb(); }};
|
||||
var wallet = {
|
||||
id: "fake wallet",
|
||||
updateIndexes: function(cb) {
|
||||
cb();
|
||||
}
|
||||
};
|
||||
wf.fromEncryptedObj = sinon.stub().returns(wallet);
|
||||
|
||||
var w = wf.import("encrypted", "password");
|
||||
|
|
|
@ -1,7 +1,22 @@
|
|||
'use strict';
|
||||
//Crypto Mock
|
||||
CryptoJS = {};
|
||||
CryptoJS.AES = {};
|
||||
CryptoJS.AES.encrypt = function(a) {
|
||||
return a;
|
||||
};
|
||||
|
||||
if (typeof process === 'undefined' || !process.version) {
|
||||
// browser
|
||||
CryptoJS.enc = {
|
||||
utf8: ''
|
||||
};
|
||||
|
||||
CryptoJS.AES.decrypt = function(a) {
|
||||
return a;
|
||||
};
|
||||
|
||||
|
||||
|
||||
|
||||
'use strict';
|
||||
var chai = chai || require('chai');
|
||||
var should = chai.should();
|
||||
var copay = copay || require('../copay');
|
||||
|
@ -9,30 +24,37 @@ if (typeof process === 'undefined' || !process.version) {
|
|||
|
||||
var fakeWallet = 'fake-wallet-id';
|
||||
var timeStamp = Date.now();
|
||||
var localMock = require('./mocks/FakeLocalStorage');
|
||||
|
||||
|
||||
describe('Storage/LocalEncrypted model', function() {
|
||||
var s = new LocalEncrypted();
|
||||
var s = new LocalEncrypted({
|
||||
localStorage: localMock,
|
||||
});
|
||||
s._setPassphrase('mysupercoolpassword');
|
||||
|
||||
it('should create an instance', function() {
|
||||
var s = new LocalEncrypted();
|
||||
should.exist(s);
|
||||
var s2 = new LocalEncrypted({
|
||||
localStorage: localMock,
|
||||
});
|
||||
should.exist(s2);
|
||||
});
|
||||
it('should fail when encrypting without a password', function() {
|
||||
var s = new LocalEncrypted();
|
||||
var s2 = new LocalEncrypted({
|
||||
localStorage: localMock,
|
||||
});
|
||||
(function() {
|
||||
s.set(fakeWallet, timeStamp, 1);
|
||||
localStorage.removeItem(fakeWallet + '::' + timeStamp);
|
||||
s2.set(fakeWallet, timeStamp, 1);
|
||||
}).should.throw();
|
||||
});
|
||||
it('should be able to encrypt and decrypt', function() {
|
||||
s._write(fakeWallet + timeStamp, 'value');
|
||||
s._read(fakeWallet + timeStamp).should.equal('value');
|
||||
localStorage.removeItem(fakeWallet + timeStamp);
|
||||
localMock.removeItem(fakeWallet + timeStamp);
|
||||
});
|
||||
it('should be able to set a value', function() {
|
||||
s.set(fakeWallet, timeStamp, 1);
|
||||
localStorage.removeItem(fakeWallet + '::' + timeStamp);
|
||||
localMock.removeItem(fakeWallet + '::' + timeStamp);
|
||||
});
|
||||
var getSetData = [
|
||||
1, 1000, -15, -1000,
|
||||
|
@ -56,14 +78,15 @@ if (typeof process === 'undefined' || !process.version) {
|
|||
s.set(fakeWallet, timeStamp, obj);
|
||||
var obj2 = s.get(fakeWallet, timeStamp);
|
||||
JSON.stringify(obj2).should.equal(JSON.stringify(obj));
|
||||
localStorage.removeItem(fakeWallet + '::' + timeStamp);
|
||||
localMock.removeItem(fakeWallet + '::' + timeStamp);
|
||||
});
|
||||
});
|
||||
|
||||
describe('#export', function() {
|
||||
it('should export the encrypted wallet', function() {
|
||||
var storage = new LocalEncrypted({
|
||||
password: 'password'
|
||||
localStorage: localMock,
|
||||
password: 'password',
|
||||
});
|
||||
storage.set(fakeWallet, timeStamp, 'testval');
|
||||
var obj = {
|
||||
|
@ -71,10 +94,131 @@ if (typeof process === 'undefined' || !process.version) {
|
|||
};
|
||||
var encrypted = storage.export(obj);
|
||||
encrypted.length.should.be.greaterThan(10);
|
||||
localStorage.removeItem(fakeWallet + '::' + timeStamp);
|
||||
localMock.removeItem(fakeWallet + '::' + timeStamp);
|
||||
//encrypted.slice(0,6).should.equal("53616c");
|
||||
});
|
||||
});
|
||||
describe('#_decryptObj', function() {
|
||||
it('should decrypt and Obj', function() {
|
||||
var storage = new LocalEncrypted({
|
||||
password: 'password',
|
||||
localStorage: localMock,
|
||||
});
|
||||
storage._decryptObj('{"a":"2"}').should.deep.equal({
|
||||
a: "2"
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
describe('#remove', function() {
|
||||
it('should remove an item', function() {
|
||||
var s = new LocalEncrypted({
|
||||
localStorage: localMock,
|
||||
password: 'password'
|
||||
});
|
||||
s.set('1', "hola", 'juan');
|
||||
s.get('1', 'hola').should.equal('juan');
|
||||
s.remove('1', 'hola');
|
||||
|
||||
should.not.exist(s.get('1', 'hola'));
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
describe('#getWalletIds', function() {
|
||||
it('should get wallet ids', function() {
|
||||
var s = new LocalEncrypted({
|
||||
localStorage: localMock,
|
||||
password: 'password'
|
||||
});
|
||||
s.set('1', "hola", 'juan');
|
||||
s.set('2', "hola", 'juan');
|
||||
s.getWalletIds().should.deep.equal(['1', '2']);
|
||||
});
|
||||
});
|
||||
|
||||
describe('#getName #setName', function() {
|
||||
it('should get/set names', function() {
|
||||
var s = new LocalEncrypted({
|
||||
localStorage: localMock,
|
||||
password: 'password'
|
||||
});
|
||||
s.setName(1, 'hola');
|
||||
s.getName(1).should.equal('hola');
|
||||
});
|
||||
});
|
||||
describe('#getWallets', function() {
|
||||
it('should retreive wallets from storage', function() {
|
||||
var s = new LocalEncrypted({
|
||||
localStorage: localMock,
|
||||
password: 'password'
|
||||
});
|
||||
s.set('1', "hola", 'juan');
|
||||
s.set('2', "hola", 'juan');
|
||||
s.setName(1, 'hola');
|
||||
s.getWallets()[0].should.deep.equal({
|
||||
id: '1',
|
||||
name: 'hola',
|
||||
});
|
||||
s.getWallets()[1].should.deep.equal({
|
||||
id: '2',
|
||||
name: undefined
|
||||
});
|
||||
});
|
||||
});
|
||||
describe('#deleteWallet', function() {
|
||||
it('should delete a wallet', function() {
|
||||
var s = new LocalEncrypted({
|
||||
localStorage: localMock,
|
||||
password: 'password'
|
||||
});
|
||||
s.set('1', "hola", 'juan');
|
||||
s.set('2', "hola", 'juan');
|
||||
s.setName(1, 'hola');
|
||||
|
||||
s.deleteWallet('1');
|
||||
s.getWallets().length.should.equal(1);
|
||||
s.getWallets()[0].should.deep.equal({
|
||||
id: '2',
|
||||
name: undefined
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe('#setFromObj', function() {
|
||||
it('set localstorage from an object', function() {
|
||||
var s = new LocalEncrypted({
|
||||
localStorage: localMock,
|
||||
password: 'password'
|
||||
});
|
||||
s.setFromObj('id1', {
|
||||
'key': 'val',
|
||||
'opts': {
|
||||
'name': 'nameid1'
|
||||
},
|
||||
});
|
||||
|
||||
s.get('id1', 'key').should.equal('val');
|
||||
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
describe('#globals', function() {
|
||||
it('should set, get and remove keys', function() {
|
||||
var s = new LocalEncrypted({
|
||||
localStorage: localMock,
|
||||
password: 'password'
|
||||
});
|
||||
s.setGlobal('a', {
|
||||
b: 1
|
||||
});
|
||||
JSON.parse(s.getGlobal('a')).should.deep.equal({
|
||||
b: 1
|
||||
});
|
||||
s.removeGlobal('a');
|
||||
should.not.exist(s.getGlobal('a'));
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
@ -1,39 +0,0 @@
|
|||
'use strict';
|
||||
|
||||
if (typeof process === 'undefined' || !process.version) {
|
||||
// browser
|
||||
var chai = chai || require('chai');
|
||||
var should = chai.should();
|
||||
var copay = copay || require('../copay');
|
||||
var LocalPlain = copay.StorageLocalPlain;
|
||||
|
||||
describe('Storage/LocalPlain model', function() {
|
||||
|
||||
it('should create an instance', function() {
|
||||
var s = new LocalPlain();
|
||||
should.exist(s);
|
||||
});
|
||||
|
||||
describe('#setFromObj', function() {
|
||||
it('should set keys from an object', function() {
|
||||
var fakeWallet = 'fake-wallet-id';
|
||||
var timeStamp = Date.now();
|
||||
|
||||
var obj = {
|
||||
test: 'testval',
|
||||
opts: {
|
||||
name: 'testname'
|
||||
}
|
||||
};
|
||||
var storage = new LocalPlain();
|
||||
storage.setFromObj(fakeWallet + timeStamp, obj);
|
||||
storage.get(fakeWallet + timeStamp, 'test').should.equal('testval');
|
||||
|
||||
// Clean data used in localstorage
|
||||
localStorage.removeItem(fakeWallet + timeStamp + '::test');
|
||||
localStorage.removeItem(fakeWallet + timeStamp + '::opts');
|
||||
localStorage.removeItem('nameFor::' + fakeWallet + timeStamp);
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
|
@ -63,6 +63,9 @@ var createBundle = function(opts) {
|
|||
b.require('./test/mocks/FakeBlockchain', {
|
||||
expose: './mocks/FakeBlockchain'
|
||||
});
|
||||
b.require('./test/mocks/FakeLocalStorage', {
|
||||
expose: './mocks/FakeLocalStorage'
|
||||
});
|
||||
b.require('./js/models/core/Wallet', {
|
||||
expose: '../js/models/core/Wallet'
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue