From cdbbbec640f2f1d035eed5fc41cdef74367aa04d Mon Sep 17 00:00:00 2001
From: Ivan Socolsky <jungans@gmail.com>
Date: Thu, 19 Feb 2015 10:17:28 -0300
Subject: [PATCH] use sha256 to generate copayerId from xPub

---
 lib/walletutils.js                 | 5 ++---
 test/integration/clienttestdata.js | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/walletutils.js b/lib/walletutils.js
index f342054..aa9a465 100644
--- a/lib/walletutils.js
+++ b/lib/walletutils.js
@@ -61,7 +61,8 @@ WalletUtils.getProposalHash = function(toAddress, amount, message) {
 };
 
 WalletUtils.xPubToCopayerId = function(xpub) {
-  return (new Bitcore.HDPublicKey(xpub)).derive(HDPath.IdBranch).publicKey.toString();
+  //return (new Bitcore.HDPublicKey(xpub)).derive(HDPath.IdBranch).publicKey.toString();
+  return crypto.Hash.sha256(new Buffer(xpub)).toString('hex');
 };
 
 WalletUtils.toSecret = function(walletId, walletPrivKey, network) {
@@ -85,7 +86,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 +94,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);
 };
 
diff --git a/test/integration/clienttestdata.js b/test/integration/clienttestdata.js
index 6a1da29..f209697 100644
--- a/test/integration/clienttestdata.js
+++ b/test/integration/clienttestdata.js
@@ -26,7 +26,7 @@ var storage = {
     "m": 2,
     "n": 2,
     "publicKeyRing": ["xpub661MyMwAqRbcGzNFbVQLh6CV6ukHuhBn4Bf4CGrQ6pFfNNdJ3pxrEVDtFHGsTzyz6Py23FhP8GWAqew3PsvnstEs2iayH1PK5Mx1bSVSEAG", "xpub661MyMwAqRbcGH2FXudWPDdrRobZ9XWTGaz18AnN1gkG8QW9ZUcn63RcK5qJJ5DXYXeAWBNqprdvvg8VHA5twmBHCUc6gWygXkwmU1Dohwh"],
-    "copayerId": "020b41cfea5fae42050580474a195a8385b093f291af4079759851d8819383a680",
+    "copayerId": "c6ef9ad6de90b16174a0c0bdc430238ef6c04cb12e3bafa7c46e5acfb2b9d0b9",
     "signingPrivKey": "KyhU3befBaePqHuPQNNyY1XFUgnArR3GUKZpZwV5vS7u1pcR3uzB",
     "sharedEncryptingKey": "ezDRS2NRchMJLf1IWtjL5A==",
     "network": "livenet"