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

Merge pull request #42 from isocolsky/fix/prop_sig 

Fix proposal signature verification
activeAddress
Matias Alejo Garcia 10 years ago
parent
0c3bbf8940 8dd523fec8
commit
3adca1de3b
10 changed files with 39 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      bit-wallet/bit-status
  2. 11
      lib/client/Verifier.js
  3. 7
      lib/client/api.js
  4. 2
      lib/model/txproposal.js
  5. 8
      lib/server.js
  6. 6
      lib/walletutils.js
  7. 4
      test/integration/clientApi.js
  8. 4
      test/integration/clienttestdata.js
  9. 2
      test/integration/server.js
  10. 13
      test/txproposal.js

2
bit-wallet/bit-status
View File

@ -30,7 +30,7 @@ client.getStatus(function(err, res) {
if (!_.isEmpty(res.pendingTxps)) {
console.log("* TX Proposals:")
_.each(res.pendingTxps, function(x) {
console.log("\t%s [%s by %s] %dSAT => %s", utils.shortID(x.id), x.message, x.creatorName, x.amount, x.toAddress);
console.log("\t%s [%s by %s] %dSAT => %s", utils.shortID(x.id), x.decryptedMessage, x.creatorName, x.amount, x.toAddress);
if (!_.isEmpty(x.actions)) {
console.log('\t\t * Actions');

11
lib/client/Verifier.js
View File

@ -53,9 +53,16 @@ Verifier.checkCopayers = function(copayers, walletPrivKey, myXPrivKey, n) {
Verifier.checkTxProposal = function(data, txp) {
var creatorXPubKey = _.find(data.publicKeyRing, function(xPubKey) {
if (WalletUtils.xPubToCopayerId(xPubKey) === txp.creatorId) return true;
});
if (!creatorXPubKey) return false;
var creatorSigningPubKey = (new Bitcore.HDPublicKey(creatorXPubKey)).derive('m/1/0').publicKey.toString();
var hash = WalletUtils.getProposalHash(txp.toAddress, txp.amount, txp.message);
var signingPubKey = Bitcore.PrivateKey.fromString(data.signingPrivKey).toPublicKey().toString();
if (!WalletUtils.verifyMessage(hash, txp.proposalSignature, signingPubKey)) return false;
log.debug('Regenerating & verifying tx proposal hash -> Hash: ', hash, ' Signature: ', txp.proposalSignature);
if (!WalletUtils.verifyMessage(hash, txp.proposalSignature, creatorSigningPubKey)) return false;
return Verifier.checkAddress(data, txp.changeAddress);
};

7
lib/client/api.js
View File

@ -297,7 +297,7 @@ API.prototype.getStatus = function(cb) {
var url = '/v1/wallets/';
self._doGetRequest(url, data, function(err, body) {
_.each(body.pendingTxps, function(txp) {
txp.message = _decryptProposalMessage(txp.message, data.sharedEncryptingKey);
txp.decryptedMessage = _decryptProposalMessage(txp.message, data.sharedEncryptingKey);
});
return cb(err, body, data.copayerId);
@ -333,6 +333,7 @@ API.prototype.sendTxProposal = function(opts, cb) {
};
var hash = WalletUtils.getProposalHash(args.toAddress, args.amount, args.message);
args.proposalSignature = WalletUtils.signMessage(hash, data.signingPrivKey);
log.debug('Generating & signing tx proposal hash -> Hash: ', hash, ' Signature: ', args.proposalSignature);
var url = '/v1/txproposals/';
self._doPostRequest(url, args, data, cb);
@ -434,7 +435,7 @@ API.prototype.getTxProposals = function(opts, cb) {
if (err) return cb(err);
_.each(txps, function(txp) {
txp.message = _decryptProposalMessage(txp.message, data.sharedEncryptingKey);
txp.decryptedMessage = _decryptProposalMessage(txp.message, data.sharedEncryptingKey);
});
return cb(null, txps);
});
@ -472,7 +473,7 @@ API.prototype.signTxProposal = function(txp, cb) {
});
t.to(txp.toAddress, txp.amount)
.change(txp.changeAddress)
.change(txp.changeAddress.address)
.sign(privs);
var signatures = [];

2
lib/model/txproposal.js
View File

@ -96,7 +96,7 @@ TxProposal.prototype._getBitcoreTx = function() {
});
t.to(this.toAddress, this.amount)
.change(this.changeAddress);
.change(this.changeAddress.address);
t._updateChangeOutput();

8
lib/server.js
View File

@ -222,7 +222,7 @@ CopayServer.prototype.joinWallet = function(opts, cb) {
self.storage.fetchCopayerLookup(copayer.id, function(err, res) {
if (err) return cb(err);
if (res)
return cb(new ClientError('CREGISTED', 'Copayer ID already registered on server'));
return cb(new ClientError('CREGISTERED', 'Copayer ID already registered on server'));
wallet.addCopayer(copayer);
self.storage.storeWalletAndUpdateCopayersLookup(wallet, function(err) {
@ -378,7 +378,7 @@ CopayServer.prototype._getUtxos = function(cb) {
// Needed for the clients to sign UTXOs
_.each(utxos, function(utxo) {
utxo.satoshis = utxo.satoshis ? +utxo.satoshis : Utils.strip(utxo.amount * 1e8);
delete utxo.amount;
delete utxo.amount;
utxo.path = addressToPath[utxo.address].path;
utxo.publicKeys = addressToPath[utxo.address].publicKeys;
});
@ -497,7 +497,8 @@ CopayServer.prototype.createTx = function(opts, cb) {
toAddress: opts.toAddress,
amount: opts.amount,
message: opts.message,
changeAddress: changeAddress.address,
proposalSignature: opts.proposalSignature,
changeAddress: changeAddress,
requiredSignatures: wallet.m,
requiredRejections: Math.min(wallet.m, wallet.n - wallet.m + 1),
});
@ -655,6 +656,7 @@ CopayServer.prototype.signTx = function(opts, cb) {
copayerId: self.copayerId,
});
// TODO: replace with .isAccepted()
if (txp.status == 'accepted') {
self._notify('TxProposalFinallyAccepted', {

6
lib/walletutils.js
View File

@ -41,7 +41,6 @@ WalletUtils.verifyMessage = function(text, signature, pubKey) {
};
WalletUtils.deriveAddress = function(publicKeyRing, path, m, network) {
var publicKeys = _.map(publicKeyRing, function(xPubKey) {
var xpub = new Bitcore.HDPublicKey(xPubKey);
return xpub.derive(path).publicKey;
@ -61,7 +60,8 @@ WalletUtils.getProposalHash = function(toAddress, amount, message) {
};
WalletUtils.xPubToCopayerId = function(xpub) {
return (new Bitcore.HDPublicKey(xpub)).derive(HDPath.IdBranch).publicKey.toString();
var hash = sjcl.hash.sha256.hash(xpub);
return sjcl.codec.hex.fromBits(hash);
};
WalletUtils.toSecret = function(walletId, walletPrivKey, network) {
@ -85,7 +85,6 @@ WalletUtils.fromSecret = function(secret) {
WalletUtils.encryptMessage = function(message, encryptingKey) {
var key = sjcl.codec.base64.toBits(encryptingKey);
//key = sjcl.bitArray.clamp(key, 128);
return sjcl.encrypt(key, message, {
ks: 128,
iter: 1
@ -94,7 +93,6 @@ WalletUtils.encryptMessage = function(message, encryptingKey) {
WalletUtils.decryptMessage = function(cyphertextJson, encryptingKey) {
var key = sjcl.codec.base64.toBits(encryptingKey);
//key = sjcl.bitArray.clamp(key, 128);
return sjcl.decrypt(key, cyphertextJson);
};

4
test/integration/clientApi.js
View File

@ -182,7 +182,7 @@ describe('client API ', function() {
should.not.exist(err);
x.length.should.equal(1);
x[0].id.should.equal(TestData.serverResponse.pendingTxs[0].id);
x[0].message.should.equal('hola');
x[0].decryptedMessage.should.equal('hola');
done();
});
});
@ -222,7 +222,9 @@ describe('client API ', function() {
it.skip('should sign tx proposal', function(done) {});
it('should detect fake tx proposal signature', function(done) {
client.storage.fs.readFile = sinon.stub().yields(null, JSON.stringify(TestData.storage.complete11));
var txp = {
creatorId: '56cb00afd85f4f37fa900ac4e367676f2eb6189a773633eb9f119eb21a22ba44',
toAddress: '2N3fA6wDtnebzywPkGuNK9KkFaEzgbPRRTq',
amount: 100000,
message: 'some message',

4
test/integration/clienttestdata.js
View File

@ -26,13 +26,13 @@ var storage = {
"m": 2,
"n": 2,
"publicKeyRing": ["xpub661MyMwAqRbcGzNFbVQLh6CV6ukHuhBn4Bf4CGrQ6pFfNNdJ3pxrEVDtFHGsTzyz6Py23FhP8GWAqew3PsvnstEs2iayH1PK5Mx1bSVSEAG", "xpub661MyMwAqRbcGH2FXudWPDdrRobZ9XWTGaz18AnN1gkG8QW9ZUcn63RcK5qJJ5DXYXeAWBNqprdvvg8VHA5twmBHCUc6gWygXkwmU1Dohwh"],
"copayerId": "020b41cfea5fae42050580474a195a8385b093f291af4079759851d8819383a680",
"copayerId": "c6ef9ad6de90b16174a0c0bdc430238ef6c04cb12e3bafa7c46e5acfb2b9d0b9",
"signingPrivKey": "KyhU3befBaePqHuPQNNyY1XFUgnArR3GUKZpZwV5vS7u1pcR3uzB",
"sharedEncryptingKey": "ezDRS2NRchMJLf1IWtjL5A==",
"network": "livenet"
},
complete11: {
"copayerId": "036ed70f51adf14e3e55aba727d28adec1851aff6865552aa9ec9b9dbafecd4a87",
"copayerId": "56cb00afd85f4f37fa900ac4e367676f2eb6189a773633eb9f119eb21a22ba44",
"xPrivKey": "tprv8ZgxMBicQKsPdjYWSKKh8SuMZAQ6K3J6v5H3A8ZVyyvXk4h1xft3qeRTmCZbxQB77n3ndfF6G4AevqgpiAVuCmZqYURH3wzSQviTvP1nkYN",
"publicKeyRing": ["tpubD6NzVbkrYhZ4XCaJKxzHXrZU8Bv2UNV1VNspSeboQFivaYwnb4he293KwLPxnNNSBEj3RAE5EEaHqPWatzexGd613hGMLLQz5BEgjtpgWnZ"],
"network": "testnet",

2
test/integration/server.js
View File

@ -159,7 +159,7 @@ helpers.clientSign = function(tx, xprivHex) {
});
t.to(tx.toAddress, tx.amount)
.change(tx.changeAddress)
.change(tx.changeAddress.address)
.sign(privs);
var signatures = [];

13
test/txproposal.js
View File

@ -37,7 +37,7 @@ describe('TXProposal', function() {
});
});
describe('#getRawTx', function() {
describe.skip('#getRawTx', function() {
it('should generate correct raw transaction for signed 2-2', function() {
var txp = TXP.fromObj(aTXP());
txp.sign('1', theSignatures, theXPub);
@ -85,7 +85,16 @@ var aTXP = function() {
"amount": 50000000,
"message": 'some message',
"proposalSignature": '7035022100896aeb8db75fec22fddb5facf791927a996eb3aee23ee6deaa15471ea46047de02204c0c33f42a9d3ff93d62738712a8c8a5ecd21b45393fdd144e7b01b5a186f1f9',
"changeAddress": "3CauZ5JUFfmSAx2yANvCRoNXccZ3YSUjXH",
"changeAddress": {
"version": '1.0.0',
"createdOn": 1424372337,
"address": '3CauZ5JUFfmSAx2yANvCRoNXccZ3YSUjXH',
"path": 'm/2147483647/1/0',
"publicKeys": ['030562cb099e6043dc499eb359dd97c9d500a3586498e4bcf0228a178cc20e6f16',
'0367027d17dbdfc27b5e31f8ed70e14d47949f0fa392261e977db0851c8b0d6fac',
'0315ae1e8aa866794ae603389fb2b8549153ebf04e7cdf74501dadde5c75ddad11'
]
},
"inputs": [{
"txid": "6ee699846d2d6605f96d20c7cc8230382e5da43342adb11b499bbe73709f06ab",
"vout": 8,

Write Preview
Loading…
Cancel
Save