use sha256 to generate copayerId from xPub
This commit is contained in:
parent
0c3bbf8940
commit
cdbbbec640
|
@ -61,7 +61,8 @@ WalletUtils.getProposalHash = function(toAddress, amount, message) {
|
||||||
};
|
};
|
||||||
|
|
||||||
WalletUtils.xPubToCopayerId = function(xpub) {
|
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) {
|
WalletUtils.toSecret = function(walletId, walletPrivKey, network) {
|
||||||
|
@ -85,7 +86,6 @@ WalletUtils.fromSecret = function(secret) {
|
||||||
|
|
||||||
WalletUtils.encryptMessage = function(message, encryptingKey) {
|
WalletUtils.encryptMessage = function(message, encryptingKey) {
|
||||||
var key = sjcl.codec.base64.toBits(encryptingKey);
|
var key = sjcl.codec.base64.toBits(encryptingKey);
|
||||||
//key = sjcl.bitArray.clamp(key, 128);
|
|
||||||
return sjcl.encrypt(key, message, {
|
return sjcl.encrypt(key, message, {
|
||||||
ks: 128,
|
ks: 128,
|
||||||
iter: 1
|
iter: 1
|
||||||
|
@ -94,7 +94,6 @@ WalletUtils.encryptMessage = function(message, encryptingKey) {
|
||||||
|
|
||||||
WalletUtils.decryptMessage = function(cyphertextJson, encryptingKey) {
|
WalletUtils.decryptMessage = function(cyphertextJson, encryptingKey) {
|
||||||
var key = sjcl.codec.base64.toBits(encryptingKey);
|
var key = sjcl.codec.base64.toBits(encryptingKey);
|
||||||
//key = sjcl.bitArray.clamp(key, 128);
|
|
||||||
return sjcl.decrypt(key, cyphertextJson);
|
return sjcl.decrypt(key, cyphertextJson);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,7 @@ var storage = {
|
||||||
"m": 2,
|
"m": 2,
|
||||||
"n": 2,
|
"n": 2,
|
||||||
"publicKeyRing": ["xpub661MyMwAqRbcGzNFbVQLh6CV6ukHuhBn4Bf4CGrQ6pFfNNdJ3pxrEVDtFHGsTzyz6Py23FhP8GWAqew3PsvnstEs2iayH1PK5Mx1bSVSEAG", "xpub661MyMwAqRbcGH2FXudWPDdrRobZ9XWTGaz18AnN1gkG8QW9ZUcn63RcK5qJJ5DXYXeAWBNqprdvvg8VHA5twmBHCUc6gWygXkwmU1Dohwh"],
|
"publicKeyRing": ["xpub661MyMwAqRbcGzNFbVQLh6CV6ukHuhBn4Bf4CGrQ6pFfNNdJ3pxrEVDtFHGsTzyz6Py23FhP8GWAqew3PsvnstEs2iayH1PK5Mx1bSVSEAG", "xpub661MyMwAqRbcGH2FXudWPDdrRobZ9XWTGaz18AnN1gkG8QW9ZUcn63RcK5qJJ5DXYXeAWBNqprdvvg8VHA5twmBHCUc6gWygXkwmU1Dohwh"],
|
||||||
"copayerId": "020b41cfea5fae42050580474a195a8385b093f291af4079759851d8819383a680",
|
"copayerId": "c6ef9ad6de90b16174a0c0bdc430238ef6c04cb12e3bafa7c46e5acfb2b9d0b9",
|
||||||
"signingPrivKey": "KyhU3befBaePqHuPQNNyY1XFUgnArR3GUKZpZwV5vS7u1pcR3uzB",
|
"signingPrivKey": "KyhU3befBaePqHuPQNNyY1XFUgnArR3GUKZpZwV5vS7u1pcR3uzB",
|
||||||
"sharedEncryptingKey": "ezDRS2NRchMJLf1IWtjL5A==",
|
"sharedEncryptingKey": "ezDRS2NRchMJLf1IWtjL5A==",
|
||||||
"network": "livenet"
|
"network": "livenet"
|
||||||
|
|
Loading…
Reference in New Issue