anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

PublicKeyRing handles one index for each cosigner

Browse source
This commit is contained in:
Yemel Jardi 2014-07-03 11:18:01 -03:00
commit 04b6aa4003
7 changed files with 140 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

39
test/test.PublicKeyRing.js
View file

@ -36,7 +36,8 @@ var createW = function(networkName) {
return {
w: w,
copayers: copayers
copayers: copayers,
pub: w.copayersHK[0].eckey.public.toString('hex')
};
};
@ -88,7 +89,7 @@ describe('PublicKeyRing model', function() {
}
});
it('show be able to to store and read', function() {
it('should be able to to store and read', function() {
var k = createW();
var w = k.w;
var copayers = k.copayers;
@ -96,10 +97,10 @@ describe('PublicKeyRing model', function() {
var addressN = 2;
var start = new Date().getTime();
for (var i = 0; i < changeN; i++) {
w.generateAddress(true);
w.generateAddress(true, k.pub);
}
for (var i = 0; i < addressN; i++) {
w.generateAddress(false);
w.generateAddress(false, k.pub);
}
var data = w.toObj();
@ -115,8 +116,8 @@ describe('PublicKeyRing model', function() {
}).should.throw();
}
w2.getSharedIndex().getChangeIndex().should.equal(changeN);
w2.getSharedIndex().getReceiveIndex().should.equal(addressN);
w2.getIndex(k.pub).getChangeIndex().should.equal(changeN);
w2.getIndex(k.pub).getReceiveIndex().should.equal(addressN);
});
@ -126,7 +127,7 @@ describe('PublicKeyRing model', function() {
[true, false].forEach(function(isChange){
for (var i = 0; i < 2; i++) {
var a = w.generateAddress(isChange);
var a = w.generateAddress(isChange, k.pub);
a.isValid().should.equal(true);
a.isScript().should.equal(true);
a.network().name.should.equal('livenet');
@ -148,7 +149,7 @@ describe('PublicKeyRing model', function() {
[true, false].forEach(function(isChange){
for (var i = 0; i < 2; i++) {
w.generateAddress(isChange);
w.generateAddress(isChange, k.pub);
}
});
@ -167,12 +168,12 @@ describe('PublicKeyRing model', function() {
var w = k.w;
for (var i = 0; i < 3; i++)
w.generateAddress(true);
w.generateAddress(true, k.pub);
for (var i = 0; i < 2; i++)
w.generateAddress(false);
w.generateAddress(false, k.pub);
w.getSharedIndex().getChangeIndex().should.equal(3);
w.getSharedIndex().getReceiveIndex().should.equal(2);
w.getIndex(k.pub).getChangeIndex().should.equal(3);
w.getIndex(k.pub).getReceiveIndex().should.equal(2);
});
it('#merge index tests', function() {
@ -180,9 +181,9 @@ describe('PublicKeyRing model', function() {
var w = k.w;
for (var i = 0; i < 2; i++)
w.generateAddress(true);
w.generateAddress(true, k.pub);
for (var i = 0; i < 3; i++)
w.generateAddress(false);
w.generateAddress(false, k.pub);
var w2 = new PublicKeyRing({
networkName: 'livenet',
@ -191,8 +192,8 @@ describe('PublicKeyRing model', function() {
w2.merge(w).should.equal(true);
w2.requiredCopayers.should.equal(3);
w2.totalCopayers.should.equal(5);
w2.getSharedIndex().getChangeIndex().should.equal(2);
w2.getSharedIndex().getReceiveIndex().should.equal(3);
w2.getIndex(k.pub).getChangeIndex().should.equal(2);
w2.getIndex(k.pub).getReceiveIndex().should.equal(3);
//
w2.merge(w).should.equal(false);
@ -391,8 +392,6 @@ describe('PublicKeyRing model', function() {
var i = p.getIndex(Structure.SHARED_INDEX);
should.exist(i);
i.cosigner.should.equal(Structure.SHARED_INDEX);
var shared = p.getSharedIndex();
shared.should.equal(i);
});
it('#getIndex should throw error', function() {
@ -412,9 +411,9 @@ describe('PublicKeyRing model', function() {
var amount = 2;
for (var i = 0; i < amount; i++)
w.generateAddress(true);
w.generateAddress(true, k.pub);
for (var i = 0; i < amount; i++)
w.generateAddress(false);
w.generateAddress(false, k.pub);
var m = w.getRedeemScriptMap([
'm/45\'/2147483647/1/0',

85
test/test.TxProposals.js
View file

@ -51,12 +51,15 @@ var createPKR = function(bip32s) {
w.addCopayer();
}
}
w.generateAddress(false);
w.generateAddress(false);
w.generateAddress(false);
w.generateAddress(true);
w.generateAddress(true);
w.generateAddress(true);
var pubkey = bip32s[0].publicHex;
w.generateAddress(false, pubkey);
w.generateAddress(false, pubkey);
w.generateAddress(false, pubkey);
w.generateAddress(true, pubkey);
w.generateAddress(true, pubkey);
w.generateAddress(true, pubkey);
return w;
};
@ -77,19 +80,22 @@ describe('TxProposals model', function() {
var priv = new PrivateKey(config);
var priv2 = new PrivateKey(config);
var priv3 = new PrivateKey(config);
var pub = priv.publicHex;
var ts = Date.now();
var pkr = createPKR([priv, priv2, priv3]);
var opts = {
remainderOut: {
address: pkr.generateAddress(true).toString()
address: pkr.generateAddress(true, pub).toString()
}
};
var w = new TxProposals({
networkName: config.networkName,
});
unspentTest[0].address = pkr.getAddress(index, isChange).toString();
unspentTest[0].scriptPubKey = pkr.getScriptPubKeyHex(index, isChange);
unspentTest[0].address = pkr.getAddress(index, isChange, pub).toString();
unspentTest[0].scriptPubKey = pkr.getScriptPubKeyHex(index, isChange, pub);
w.add(createTx(
'15q6HKjWHAksHcH91JW23BJEuzZgFwydBt',
'123456789',
@ -102,8 +108,10 @@ describe('TxProposals model', function() {
var b = w.txps[ntxid].builder;
var tx = b.build();
tx.isComplete().should.equal(false);
b.sign(priv2.getAll(pkr.getSharedIndex().getReceiveIndex(), pkr.getSharedIndex().getChangeIndex()));
b.sign(priv3.getAll(pkr.getSharedIndex().getReceiveIndex(), pkr.getSharedIndex().getChangeIndex()));
var ringIndex = pkr.getIndex(pub);
b.sign(priv2.getAll(ringIndex.getReceiveIndex(), ringIndex.getChangeIndex(), ringIndex.cosigner));
b.sign(priv3.getAll(ringIndex.getReceiveIndex(), ringIndex.getChangeIndex(), ringIndex.cosigner));
tx = b.build();
tx.isComplete().should.equal(true);
@ -132,6 +140,7 @@ describe('TxProposals model', function() {
opts = opts || {};
var amountSat = bitcore.Bignum(amountSatStr);
var pub = priv.publicHex;
if (!pkr.isComplete()) {
throw new Error('publicKeyRing is not complete');
@ -139,7 +148,7 @@ describe('TxProposals model', function() {
if (!opts.remainderOut) {
opts.remainderOut = {
address: pkr.generateAddress(true).toString()
address: pkr.generateAddress(true, pub).toString()
};
};
@ -181,14 +190,16 @@ describe('TxProposals model', function() {
it('#getUsedUnspend', function() {
var priv = new PrivateKey(config);
var pub = priv.publicHex;
var w = new TxProposals({
networkName: config.networkName,
});
var start = new Date().getTime();
var pkr = createPKR([priv]);
var ts = Date.now();
unspentTest[0].address = pkr.getAddress(index, isChange).toString();
unspentTest[0].scriptPubKey = pkr.getScriptPubKeyHex(index, isChange);
unspentTest[0].address = pkr.getAddress(index, isChange, pub).toString();
unspentTest[0].scriptPubKey = pkr.getScriptPubKeyHex(index, isChange, pub);
w.add(createTx(
'15q6HKjWHAksHcH91JW23BJEuzZgFwydBt',
'123456789',
@ -204,6 +215,8 @@ describe('TxProposals model', function() {
it('#merge with self', function() {
var priv = new PrivateKey(config);
var pub = priv.publicHex;
var w = new TxProposals({
networkName: config.networkName,
});
@ -211,8 +224,8 @@ describe('TxProposals model', function() {
var pkr = createPKR([priv]);
var ts = Date.now();
unspentTest[0].address = pkr.getAddress(index, isChange).toString();
unspentTest[0].scriptPubKey = pkr.getScriptPubKeyHex(index, isChange);
unspentTest[0].address = pkr.getAddress(index, isChange, pub).toString();
unspentTest[0].scriptPubKey = pkr.getScriptPubKeyHex(index, isChange, pub);
w.add(createTx(
'15q6HKjWHAksHcH91JW23BJEuzZgFwydBt',
'123456789',
@ -246,11 +259,13 @@ describe('TxProposals model', function() {
it('#merge, merge signatures case 1', function() {
var priv2 = new PrivateKey(config);
var priv = new PrivateKey(config);
var pub = priv.publicHex;
var ts = Date.now();
var pkr = createPKR([priv]);
var opts = {
remainderOut: {
address: pkr.generateAddress(true).toString()
address: pkr.generateAddress(true, pub).toString()
}
};
@ -258,8 +273,8 @@ describe('TxProposals model', function() {
var w = new TxProposals({
networkName: config.networkName,
});
unspentTest[0].address = pkr.getAddress(index, isChange).toString();
unspentTest[0].scriptPubKey = pkr.getScriptPubKeyHex(index, isChange);
unspentTest[0].address = pkr.getAddress(index, isChange, pub).toString();
unspentTest[0].scriptPubKey = pkr.getScriptPubKeyHex(index, isChange, pub);
w.add(createTx(
'15q6HKjWHAksHcH91JW23BJEuzZgFwydBt',
'123456789',
@ -282,8 +297,8 @@ describe('TxProposals model', function() {
networkName: config.networkName,
publicKeyRing: w.publicKeyRing,
});
unspentTest[0].address = pkr.getAddress(index, isChange).toString();
unspentTest[0].scriptPubKey = pkr.getScriptPubKeyHex(index, isChange);
unspentTest[0].address = pkr.getAddress(index, isChange, pub).toString();
unspentTest[0].scriptPubKey = pkr.getScriptPubKeyHex(index, isChange, pub);
w2.add(createTx(
'15q6HKjWHAksHcH91JW23BJEuzZgFwydBt',
'123456789',
@ -346,6 +361,7 @@ describe('TxProposals model', function() {
var priv = PrivateKey.fromObj(o1);
var priv2 = PrivateKey.fromObj(o2);
var priv3 = PrivateKey.fromObj(o3);
var pub = priv.publicHex;
var ts = Date.now();
var pkr = createPKR([priv, priv2]);
@ -354,9 +370,9 @@ describe('TxProposals model', function() {
address: '2MxK2m7cPtEwjZBB8Ksq7ppjkgJyFPJGemr'
}
};
var addressToSign = pkr.generateAddress(false);
var addressToSign = pkr.generateAddress(false, pub);
unspentTest[0].address = addressToSign.toString();
unspentTest[0].scriptPubKey = pkr.getScriptPubKeyHex(index, isChange);
unspentTest[0].scriptPubKey = pkr.getScriptPubKeyHex(index, isChange, pub);
var tx, txb;
var w = new TxProposals({
@ -459,19 +475,22 @@ describe('TxProposals model', function() {
var priv = new PrivateKey(config);
var priv2 = new PrivateKey(config);
var priv3 = new PrivateKey(config);
var pub = priv.publicHex;
var ts = Date.now();
var pkr = createPKR([priv, priv2, priv3]);
var opts = {
remainderOut: {
address: pkr.generateAddress(true).toString()
address: pkr.generateAddress(true, pub).toString()
}
};
var w = new TxProposals({
networkName: config.networkName,
});
unspentTest[0].address = pkr.getAddress(index, isChange).toString();
unspentTest[0].scriptPubKey = pkr.getScriptPubKeyHex(index, isChange);
unspentTest[0].address = pkr.getAddress(index, isChange, pub).toString();
unspentTest[0].scriptPubKey = pkr.getScriptPubKeyHex(index, isChange, pub);
w.add(createTx(
'15q6HKjWHAksHcH91JW23BJEuzZgFwydBt',
'123456789',
@ -491,8 +510,8 @@ describe('TxProposals model', function() {
var w2 = new TxProposals({
networkName: config.networkName,
});
unspentTest[0].address = pkr.getAddress(index, isChange).toString();
unspentTest[0].scriptPubKey = pkr.getScriptPubKeyHex(index, isChange);
unspentTest[0].address = pkr.getAddress(index, isChange, pub).toString();
unspentTest[0].scriptPubKey = pkr.getScriptPubKeyHex(index, isChange, pub);
w2.add(createTx(
'15q6HKjWHAksHcH91JW23BJEuzZgFwydBt',
'123456789',
@ -511,8 +530,8 @@ describe('TxProposals model', function() {
var w3 = new TxProposals({
networkName: config.networkName,
});
unspentTest[0].address = pkr.getAddress(index, isChange).toString();
unspentTest[0].scriptPubKey = pkr.getScriptPubKeyHex(index, isChange);
unspentTest[0].address = pkr.getAddress(index, isChange, pub).toString();
unspentTest[0].scriptPubKey = pkr.getScriptPubKeyHex(index, isChange, pub);
w3.add(createTx(
'15q6HKjWHAksHcH91JW23BJEuzZgFwydBt',
'123456789',
@ -558,6 +577,8 @@ describe('TxProposals model', function() {
it('#toObj #fromObj roundtrip', function() {
var priv = new PrivateKey(config);
var pub = priv.publicHex;
var pkr = createPKR([priv]);
var w = new TxProposals({
walletId: 'qwerty',
@ -565,8 +586,8 @@ describe('TxProposals model', function() {
});
var ts = Date.now();
unspentTest[0].address = pkr.getAddress(index, isChange).toString();
unspentTest[0].scriptPubKey = pkr.getScriptPubKeyHex(index, isChange);
unspentTest[0].address = pkr.getAddress(index, isChange, pub).toString();
unspentTest[0].scriptPubKey = pkr.getScriptPubKeyHex(index, isChange, pub);
w.add(createTx(
'15q6HKjWHAksHcH91JW23BJEuzZgFwydBt',
'123456789',

18
test/test.Wallet.js
View file

@ -123,7 +123,7 @@ describe('Wallet model', function() {
var opts = {};
var w = cachedCreateW();
addCopayers(w);
w.publicKeyRing.generateAddress(false);
w.publicKeyRing.generateAddress(false, w.publicKey);
w.publicKeyRing.isComplete().should.equal(true);
w.generateAddress(true).isValid().should.equal(true);
w.generateAddress(true, function(addr) {
@ -177,8 +177,8 @@ describe('Wallet model', function() {
var w = cachedCreateW2();
unspentTest[0].address = w.publicKeyRing.getAddress(1, true).toString();
unspentTest[0].scriptPubKey = w.publicKeyRing.getScriptPubKeyHex(1, true);
unspentTest[0].address = w.publicKeyRing.getAddress(1, true, w.publicKey).toString();
unspentTest[0].scriptPubKey = w.publicKeyRing.getScriptPubKeyHex(1, true, w.publicKey);
var ntxid = w.createTxSync(
'15q6HKjWHAksHcH91JW23BJEuzZgFwydBt',
@ -202,8 +202,8 @@ describe('Wallet model', function() {
var w = cachedCreateW2();
var comment = 'This is a comment';
unspentTest[0].address = w.publicKeyRing.getAddress(1, true).toString();
unspentTest[0].scriptPubKey = w.publicKeyRing.getScriptPubKeyHex(1, true);
unspentTest[0].address = w.publicKeyRing.getAddress(1, true, w.publicKey).toString();
unspentTest[0].scriptPubKey = w.publicKeyRing.getScriptPubKeyHex(1, true, w.publicKey);
var ntxid = w.createTxSync(
'15q6HKjWHAksHcH91JW23BJEuzZgFwydBt',
@ -224,8 +224,8 @@ describe('Wallet model', function() {
var w = cachedCreateW2();
var comment = 'Lorem ipsum dolor sit amet, suas euismod vis te, velit deleniti vix an. Pri ex suscipit similique, inermis per';
unspentTest[0].address = w.publicKeyRing.getAddress(1, true).toString();
unspentTest[0].scriptPubKey = w.publicKeyRing.getScriptPubKeyHex(1, true);
unspentTest[0].address = w.publicKeyRing.getAddress(1, true, w.publicKey).toString();
unspentTest[0].scriptPubKey = w.publicKeyRing.getScriptPubKeyHex(1, true, w.publicKey);
var badCreate = function() {
w.createTxSync(
@ -260,8 +260,8 @@ describe('Wallet model', function() {
var ts = Date.now();
for (var isChange = false; !isChange; isChange = true) {
for (var index = 0; index < 3; index++) {
unspentTest[0].address = w.publicKeyRing.getAddress(index, isChange).toString();
unspentTest[0].scriptPubKey = w.publicKeyRing.getScriptPubKeyHex(index, isChange);
unspentTest[0].address = w.publicKeyRing.getAddress(index, isChange, w.publicKey).toString();
unspentTest[0].scriptPubKey = w.publicKeyRing.getScriptPubKeyHex(index, isChange, w.publicKey);
w.createTxSync(
'15q6HKjWHAksHcH91JW23BJEuzZgFwydBt',
'123456789',