lukechilds
/
bitcore-wallet-service
mirror of https://github.com/lukechilds/bitcore-wallet-service.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

async storage

activeAddress
Matias Alejo Garcia 10 years ago
parent
673ba2823b
commit
2121565070
3 changed files with 217 additions and 164 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 140
      lib/client/api.js
  2. 15
      lib/client/filestorage.js
  3. 30
      test/integration/clientApi.js

140
lib/client/api.js
View File

@ -62,28 +62,24 @@ function API(opts) {
}; };
API.prototype._loadAndCheck = function(opts) { API.prototype._loadAndCheck = function(opts, cb) {
var data = this.storage.load(); this.storage.load(function(err, data) {
if (!data) { if (err || !data) {
log.error('Wallet file not found.'); return cb(err || 'Wallet file not found.');
process.exit(1);
} }
if (data.verified == 'corrupt') { if (data.verified == 'corrupt') {
throw new Error('The wallet is tagged as corrupt. Some of the copayers cannot be verified to have known the wallet secret.'); return cb('The wallet is tagged as corrupt. Some of the copayers cannot be verified to have known the wallet secret.');
} }
if (data.n > 1) { if (data.n > 1) {
var pkrComplete = data.publicKeyRing && data.m && data.publicKeyRing.length === data.n; var pkrComplete = data.publicKeyRing && data.m && data.publicKeyRing.length === data.n;
if (opts.requireCompletePKR && !pkrComplete) { if (opts.requireCompletePKR && !pkrComplete) {
throw new Error('Wallet Incomplete, cannot derive address.'); return cb('Wallet Incomplete, cannot derive address');
}
if (!pkrComplete) {
log.warn('The file ' + this.filename + ' is incomplete. It will allow you to operate with the wallet but it should not be trusted as a backup. Please wait for all copayers to join the wallet and run the tool with -export flag.')
} }
} }
return data; return cb(null, data);
});
}; };
API.prototype._doRequest = function(method, url, args, data, cb) { API.prototype._doRequest = function(method, url, args, data, cb) {
@ -130,9 +126,11 @@ API.prototype.createWallet = function(walletName, copayerName, m, n, network, cb
if (!_.contains(['testnet', 'livenet'], network)) if (!_.contains(['testnet', 'livenet'], network))
return cb('Invalid network'); return cb('Invalid network');
var data = this.storage.load(); this.storage.load(function(err, data) {
if (data) return cb('File ' + this.filename + ' already contains a wallet'); if (data)
return cb('Storage already contains a wallet');
console.log('[API.js.132]'); //TODO
// Generate wallet key pair to verify copayers // Generate wallet key pair to verify copayers
var privKey = new Bitcore.PrivateKey(null, network); var privKey = new Bitcore.PrivateKey(null, network);
var pubKey = privKey.toPublicKey(); var pubKey = privKey.toPublicKey();
@ -153,7 +151,7 @@ API.prototype.createWallet = function(walletName, copayerName, m, n, network, cb
}; };
var url = '/v1/wallets/'; var url = '/v1/wallets/';
this._doPostRequest(url, args, data, function(err, body) { self._doPostRequest(url, args, data, function(err, body) {
if (err) return cb(err); if (err) return cb(err);
var walletId = body.walletId; var walletId = body.walletId;
@ -163,11 +161,13 @@ API.prototype.createWallet = function(walletName, copayerName, m, n, network, cb
if (n > 1) if (n > 1)
ret = data.secret = secret; ret = data.secret = secret;
self.storage.save(data); self.storage.save(data, function(err) {
self._joinWallet(data, secret, copayerName, function(err) {
if (err) return cb(err); if (err) return cb(err);
self._joinWallet(data, secret, copayerName, function(err) {
return cb(err, ret);
});
return cb(null, ret); });
}); });
}); });
}; };
@ -204,28 +204,29 @@ API.prototype._joinWallet = function(data, secret, copayerName, cb) {
data.n = wallet.n; data.n = wallet.n;
data.publicKeyRing = wallet.publicKeyRing; data.publicKeyRing = wallet.publicKeyRing;
data.network = wallet.network, data.network = wallet.network,
self.storage.save(data); self.storage.save(data, cb);
return cb();
}); });
}; };
API.prototype.joinWallet = function(secret, copayerName, cb) { API.prototype.joinWallet = function(secret, copayerName, cb) {
var self = this; var self = this;
var data = this.storage.load(); this.storage.load(function(err, data) {
if (data) return cb('File ' + this.filename + ' already contains a wallet'); if (data)
return cb('Storage already contains a wallet');
self._joinWallet(data, secret, copayerName, cb); self._joinWallet(data, secret, copayerName, cb);
});
}; };
API.prototype.getStatus = function(cb) { API.prototype.getStatus = function(cb) {
var self = this; var self = this;
var data = this._loadAndCheck(); this._loadAndCheck({}, function(err, data) {
if (err) return cb(err);
var url = '/v1/wallets/'; var url = '/v1/wallets/';
this._doGetRequest(url, data, function(err, body) { self._doGetRequest(url, data, function(err, body) {
if (err) return cb(err); if (err) return cb(err);
var wallet = body; var wallet = body;
@ -248,11 +249,14 @@ API.prototype.getStatus = function(cb) {
} else { } else {
data.verified = 'ok'; data.verified = 'ok';
} }
self.storage.save(data); self.storage.save(data, function(err) {
return cb(err, wallet);
});
} }
return cb(null, wallet); return cb(null, wallet);
}); });
});
}; };
/** /**
@ -266,32 +270,28 @@ API.prototype.getStatus = function(cb) {
API.prototype.sendTxProposal = function(inArgs, cb) { API.prototype.sendTxProposal = function(inArgs, cb) {
var self = this; var self = this;
var data = this._loadAndCheck(); this._loadAndCheck({
requireCompletePKR: true
}, function(err, data) {
if (err) return cb(err);
var args = _createProposalOpts(inArgs, data.signingPrivKey); var args = _createProposalOpts(inArgs, data.signingPrivKey);
var url = '/v1/txproposals/'; var url = '/v1/txproposals/';
this._doPostRequest(url, args, data, cb); self._doPostRequest(url, args, data, cb);
}; });
// Get addresses
API.prototype.getAddresses = function(cb) {
var self = this;
var data = this._loadAndCheck();
var url = '/v1/addresses/';
this._doGetRequest(url, data, cb);
}; };
// Creates a new address
// TODO: verify derivation!!
API.prototype.createAddress = function(cb) { API.prototype.createAddress = function(cb) {
var self = this; var self = this;
var data = this._loadAndCheck({requireCompletePKR: true}); this._loadAndCheck({
requireCompletePKR: true
}, function(err, data) {
if (err) return cb(err);
var url = '/v1/addresses/'; var url = '/v1/addresses/';
this._doPostRequest(url, {}, data, function(err, address) { self._doPostRequest(url, {}, data, function(err, address) {
if (err) return cb(err); if (err) return cb(err);
if (!Verifier.checkAddress(data, address)) { if (!Verifier.checkAddress(data, address)) {
return cb(new ServerCompromisedError('Server sent fake address')); return cb(new ServerCompromisedError('Server sent fake address'));
@ -299,6 +299,7 @@ API.prototype.createAddress = function(cb) {
return cb(null, address); return cb(null, address);
}); });
});
}; };
API.prototype.history = function(limit, cb) { API.prototype.history = function(limit, cb) {
@ -308,25 +309,33 @@ API.prototype.history = function(limit, cb) {
API.prototype.getBalance = function(cb) { API.prototype.getBalance = function(cb) {
var self = this; var self = this;
var data = this._loadAndCheck(); this._loadAndCheck({}, function(err, data) {
if (err) return cb(err);
var url = '/v1/balance/'; var url = '/v1/balance/';
this._doGetRequest(url, data, cb); self._doGetRequest(url, data, cb);
});
}; };
API.prototype.getTxProposals = function(opts, cb) { API.prototype.getTxProposals = function(opts, cb) {
var self = this; var self = this;
var data = this._loadAndCheck(); this._loadAndCheck({
requireCompletePKR: true
}, function(err, data) {
if (err) return cb(err);
var url = '/v1/txproposals/'; var url = '/v1/txproposals/';
this._doGetRequest(url, data, cb); self._doGetRequest(url, data, cb);
});
}; };
API.prototype.signTxProposal = function(txp, cb) { API.prototype.signTxProposal = function(txp, cb) {
var self = this; var self = this;
var data = this._loadAndCheck();
this._loadAndCheck({
requireCompletePKR: true
}, function(err, data) {
if (err) return cb(err);
//Derive proper key to sign, for each input //Derive proper key to sign, for each input
@ -363,37 +372,50 @@ API.prototype.signTxProposal = function(txp, cb) {
signatures: signatures signatures: signatures
}; };
this._doPostRequest(url, args, data, cb); self._doPostRequest(url, args, data, cb);
});
}; };
API.prototype.rejectTxProposal = function(txp, reason, cb) { API.prototype.rejectTxProposal = function(txp, reason, cb) {
var self = this; var self = this;
var data = this._loadAndCheck();
this._loadAndCheck({
requireCompletePKR: true
}, function(err, data) {
if (err) return cb(err);
var url = '/v1/txproposals/' + txp.id + '/rejections/'; var url = '/v1/txproposals/' + txp.id + '/rejections/';
var args = { var args = {
reason: reason || '', reason: reason || '',
}; };
this._doPostRequest(url, args, data, cb); self._doPostRequest(url, args, data, cb);
});
}; };
API.prototype.broadcastTxProposal = function(txp, cb) { API.prototype.broadcastTxProposal = function(txp, cb) {
var self = this; var self = this;
var data = this._loadAndCheck();
this._loadAndCheck({
requireCompletePKR: true
}, function(err, data) {
if (err) return cb(err);
var url = '/v1/txproposals/' + txp.id + '/broadcast/'; var url = '/v1/txproposals/' + txp.id + '/broadcast/';
this._doPostRequest(url, {}, data, cb); self._doPostRequest(url, {}, data, cb);
});
}; };
API.prototype.removeTxProposal = function(txp, cb) { API.prototype.removeTxProposal = function(txp, cb) {
var self = this; var self = this;
var data = this._loadAndCheck(); this._loadAndCheck({
requireCompletePKR: true
}, function(err, data) {
if (err) return cb(err);
var url = '/v1/txproposals/' + txp.id; var url = '/v1/txproposals/' + txp.id;
self._doRequest('delete', url, {}, data, cb);
this._doRequest('delete', url, {}, data, cb); });
}; };
module.exports = API; module.exports = API;

15
lib/client/filestorage.js
View File

@ -10,14 +10,19 @@ function FileStorage(opts) {
}; };
FileStorage.prototype.save = function(data) { FileStorage.prototype.save = function(data, cb) {
this.fs.writeFileSync(this.filename, JSON.stringify(data)); this.fs.writeFile(this.filename, JSON.stringify(data), cb);
}; };
FileStorage.prototype.load = function() { FileStorage.prototype.load = function(cb) {
this.fs.readFile(this.filename, 'utf8', function(err,data) {
if (err) return cb(err);
try { try {
return JSON.parse(this.fs.readFileSync(this.filename)); data = JSON.parse(data);
} catch (ex) {}; } catch (e) {
}
return cb(null, data);
});
}; };

30
test/integration/clientApi.js
View File

@ -19,6 +19,17 @@ var wallet11 = {
"publicKeyRing": ["tpubD6NzVbkrYhZ4YBumFxZEowDuA8iirsny2nmmFUkuxBkkZoGdPyf61Waei3tDYvVa1yqW82Xhmmd6oiibeDyM1MS3zTiky7Yg75UEV9oQhFJ"] "publicKeyRing": ["tpubD6NzVbkrYhZ4YBumFxZEowDuA8iirsny2nmmFUkuxBkkZoGdPyf61Waei3tDYvVa1yqW82Xhmmd6oiibeDyM1MS3zTiky7Yg75UEV9oQhFJ"]
}; };
var incompleteWallet22 = {
"m": 2,
"n": 2,
"walletPrivKey": "L3XSE3KNjQM1XRP1h5yMCSKsN4hs3D6eK7Vwn5M88Bs6jpCnXR3R",
"network": "testnet",
"secret": "d9cf45a1-6793-4df4-94df-c99d2c2e1fe9:bc2488c1b83e455a4b908a0d0aeaf70351efc48fbcaa454bffefdef419a5ee6a:T",
"xPrivKey": "tprv8ZgxMBicQKsPdoC5DGtnXx7fp7YnUtGv8b7fU2oDQfDpHFQh1QCgpKc8GHpdsBN5THaHYMV5LgD5cP5NYaacGVr786p3mVLSZff9berTV8h",
"copayerId": "c3a33ca0-37cf-4e80-b745-71272683835c",
"signingPrivKey": "6e129c4996666e5ecdf78aed626c01977fa19eacce6659738ebe065f86523e9b",
"publicKeyRing": []
};
describe('client API', function() { describe('client API', function() {
@ -28,8 +39,8 @@ describe('client API', function() {
beforeEach(function() { beforeEach(function() {
var fsmock = {};; var fsmock = {};;
fsmock.readFileSync = sinon.mock().returns(JSON.stringify(wallet11)); fsmock.readFile = sinon.mock().yields(null, JSON.stringify(wallet11));
fsmock.writeFileSync = sinon.mock(); fsmock.writeFile = sinon.mock().yields();
var storage = new Client.FileStorage({ var storage = new Client.FileStorage({
filename: 'dummy', filename: 'dummy',
fs: fsmock, fs: fsmock,
@ -77,5 +88,20 @@ describe('client API', function() {
done(); done();
}); });
}) })
it('should complain wallet is not complete', function(done) {
var request = sinon.mock().yields(null, {
statusCode: 200
}, {
dummy: true
});
client.request = request;
client.storage.fs.readFile = sinon.mock().yields(null, JSON.stringify(incompleteWallet22));
client.createAddress(function(err, x) {
err.should.contain('Incomplete');
done();
});
})
}); });
}); });

Write Preview
Loading…
Cancel
Save