BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix conflicts: 

js/controllers/transactions.js
This commit is contained in:
Gustavo Cortez 2014-04-23 15:10:42 -03:00
parent 68fd916053 b25d4e22db
commit e17aed54b0
13 changed files with 196 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
index.html
View File

@ -178,7 +178,7 @@
</script>
<script type="text/ng-template" id="peer.html">
<div class="row" ng-controller="PeerController">
<div class="row">
<div class="large-6 columns p70r line-dashed-v">
<h3>I am </h3>
<div class="row">
@ -244,16 +244,18 @@
<div class="transactions" data-ng-controller="TransactionsController">
<div class="row" ng-show='$root.wallet.publicKeyRing.isComplete()'>
<div class="large-12 columns">
<h4>Pending transactions <small>({{txs.length}})</small></h4>
<h4>Transactions proposals <small>({{txs.length}})</small></h4>
<div class="panel pending" ng-repeat="tx in txs | orderBy: 'createdTs':true">
<div class="txheader">
<div class="row">
<div class="large-8 columns">
<tr ng-repeat="o in tx.outs">
<td class="text-right size-24">{{o.value}} <i class="fi-bitcoin"></i></td>
<td class="text-center size-48"> <i class="fi-arrow-right size-40"> </i>
<td class="text-left size-24">{{o.address}}</td>
<table style="width:100%">
<tr ng-repeat="out in tx.outs">
<td class="text-right size-24"> <i class="fi-bitcoin"></i> {{out.value}}</td>
<td class="text-center size-48"> <i class="fi-arrow-right size-24"> </i></td>
<td class="text-left size-24">{{out.address}}</td>
</tr>
</table>
</div>
<div class="large-4 columns text-right">
<h6> created at {{tx.createdTs | date:'medium'}} </h6>
@ -266,7 +268,10 @@
<table style="width:100%">
<tbody>
<tr>
<small class="right text-gray"> <strong> Proposal ID: </strong> {{tx.ntxid}} </small>
<small class="right text-gray">
Fee: <strong> <i class="fi-bitcoin"></i> {{tx.fee}} </strong>
<strong> Proposal ID: </strong> {{tx.ntxid}}
</small>
</tr>
<tr ng-repeat="(peer, actions) in tx.peerActions">
<td colspan="3">
@ -279,6 +284,7 @@
<span ng-if="action == 'create'" title="{{ts | date:'medium'}}" class="fi-page-add size-18 right m10h"></span>
<span ng-if="action == 'seen'" title="{{ts | date:'medium'}}" class="fi-eye size-18 right m10h"> </span>
<span ng-if="action == 'sign'" title="{{ts | date:'medium'}}" class="fi-check size-18 right m10h"> </span>
<span ng-if="action == 'rejected'" title="{{ts | date:'medium'}}" class="fi-x size-18 right m10h" style="color:red"> </span>
<a title="{{ts | date:'medium'}}"></a>
</span>
@ -296,16 +302,20 @@
<div ng-show="tx.signedByUs">
<i class="fi-check size-40"></i> Signed by you already
</div>
<div ng-show="!tx.signedByUs && tx.missingSignatures">
<div ng-show="!tx.signedByUs && !tx.rejectedByUs && !tx.finallyRejected && tx.missingSignatures">
<button class="secondary round" ng-click="sign(tx.ntxid)">
<i class="fi-check"></i> Sign
</button>
<button class="primary round">
<i class="fi-x"></i> Ignore
<button class="primary round" ng-click="reject(tx.ntxid)">
<i class="fi-x" ></i> Reject
</button>
</div>
</div>
<div class="large-6 columns text-right">
<span ng-show="tx.finallyRejected ">
Transaction finally rejected
</span>
<span ng-show="!tx.missingSignatures && !tx.sentTs">
Transaction ready.
<button class="secondary round" ng-click="send(tx.ntxid)">
@ -318,10 +328,10 @@
Sent at {{tx.sentTs | date:'medium'}}
TXID: {{tx.sentTxid}}
</span>
<span ng-show="tx.missingSignatures==1">
<span ng-show="!tx.finallyRejected && tx.missingSignatures==1">
One signature missing
</span>
<span ng-show="tx.missingSignatures>1">
<span ng-show="!tx.finallyRejected && tx.missingSignatures>1">
{{tx.missingSignatures}} signatures missing</span>
</div>
</div>
@ -497,7 +507,6 @@
<script src="js/controllers/backup.js"></script>
<script src="js/controllers/signin.js"></script>
<script src="js/controllers/setup.js"></script>
<script src="js/controllers/peer.js"></script>
<script src="js/init.js"></script>
</body>

4
js/app.js
View File

@ -13,8 +13,7 @@ angular.module('copay',[
'copay.signin',
'copay.socket',
'copay.controllerUtils',
'copay.setup',
'copay.peer'
'copay.setup'
]);
angular.module('copay.header', []);
@ -26,6 +25,5 @@ angular.module('copay.walletFactory', []);
angular.module('copay.controllerUtils', []);
angular.module('copay.signin', []);
angular.module('copay.setup', []);
angular.module('copay.peer', []);
angular.module('copay.socket', []);

6
js/controllers/peer.js
View File

@ -1,6 +0,0 @@
'use strict';
angular.module('copay.peer').controller('PeerController',
function($scope, $rootScope, $location, $routeParams) {
});

15
js/controllers/send.js
View File

@ -23,16 +23,15 @@ angular.module('copay.send').controller('SendController',
var w = $rootScope.wallet;
w.createTx( address, amount,function() {
// reset fields
$scope.address = null;
$scope.amount = null;
form.address.$pristine = true;
form.amount.$pristine = true;
$rootScope.flashMessage = { message: 'The transaction proposal has been created', type: 'success'};
$rootScope.$digest();
});
// reset fields
$scope.address = null;
$scope.amount = null;
form.address.$pristine = true;
form.amount.$pristine = true;
// TODO: check if createTx has an error.
$rootScope.flashMessage = { message: 'Your transaction proposal has been sent successfully', type: 'success'};
};
});

29
js/controllers/transactions.js
View File

@ -5,8 +5,9 @@ angular.module('copay.transactions').controller('TransactionsController',
function($scope, $rootScope, $location) {
$scope.title = 'Transactions';
var _updateTxs = function() {
console.log('[transactions.js.10:_updateTxs:]'); //TODO
var w =$rootScope.wallet;
if (!w) return;
var inT = w.getTxProposals();
var txs = [];
@ -25,11 +26,10 @@ console.log('[transactions.js.10:_updateTxs:]'); //TODO
});
// extra fields
i.outs = outs;
i.fee = i.feeSat/bitcore.util.COIN;
i.fee = i.builder.feeSat/bitcore.util.COIN;
i.missingSignatures = tx.countInputMissingSignatures(0);
txs.push(i);
});
console.log('[transactions.js.35:txs:]',txs); //TODO
$scope.txs = txs;
w.removeListener('txProposalsUpdated',_updateTxs)
w.once('txProposalsUpdated',_updateTxs);
@ -38,7 +38,7 @@ console.log('[transactions.js.35:txs:]',txs); //TODO
$scope.send = function (ntxid) {
var w = $rootScope.wallet;
w.sendTx(ntxid, function(txid) {
console.log('[transactions.js.68:txid:] SENTTX CALLBACK',txid); //TODO
console.log('[transactions.js.68:txid:] SENTTX CALLBACK',txid); //TODO
$rootScope.flashMessage = txid
? {type:'success', message: 'Transactions SENT! txid:' + txid}
: {type:'error', message: 'There was an error sending the Transaction'}
@ -51,17 +51,20 @@ console.log('[transactions.js.68:txid:] SENTTX CALLBACK',txid); //TODO
$scope.sign = function (ntxid) {
var w = $rootScope.wallet;
var ret = w.sign(ntxid);
_updateTxs();
if (!ret) {
$rootScope.flashMessage = {type:'error', message: 'There was an error signing the Transaction'};
_updateTxs();
$rootScope.$digest();
return;
}
var p = w.getTxProposal(ntxid);
if (p.txp.builder.isFullySigned()) {
$scope.send(ntxid);
_updateTxs();
$rootScope.$digest();
}
else {
$rootScope.flashMessage = ret
? {type:'success', message: 'Transactions signed'}
: {type:'error', message: 'There was an error signing the Transaction'}
;
_updateTxs();
$rootScope.$digest();
}
@ -79,5 +82,13 @@ console.log('[transactions.js.68:txid:] SENTTX CALLBACK',txid); //TODO
}
};
$scope.reject = function (ntxid) {
var w = $rootScope.wallet;
w.reject(ntxid);
$rootScope.flashMessage = {type:'warning', message: 'Transaction rejected by you'};
_updateTxs();
$rootScope.$digest();
};
_updateTxs();
});

1
js/models/core/PrivateKey.js
View File

@ -71,7 +71,6 @@ PrivateKey.prototype.get = function(index,isChange) {
PrivateKey.prototype.getAll = function(addressIndex, changeAddressIndex) {
var ret = [];
for(var i=0;i<addressIndex; i++) {
ret.push(this.get(i,false));
}

22
js/models/core/PublicKeyRing.js
View File

@ -142,7 +142,7 @@ PublicKeyRing.prototype.getPubKeys = function (index, isChange) {
var bip32 = this.copayersBIP32[i].derive(path);
pubKeys[i] = bip32.eckey.public;
}
this.publicKeysCache[path] = pubKeys.map(function(pk){return pk.toString('hex')});
this.publicKeysCache[path] = pubKeys.map(function(pk){return pk.toString('hex');});
} else {
pubKeys = pubKeys.map(function(s){return new Buffer(s,'hex')});
}
@ -158,6 +158,7 @@ PublicKeyRing.prototype._checkIndexRange = function (index, isChange) {
}
};
// TODO this could be cached
PublicKeyRing.prototype.getRedeemScript = function (index, isChange) {
this._checkIndexRange(index, isChange);
@ -166,13 +167,21 @@ PublicKeyRing.prototype.getRedeemScript = function (index, isChange) {
return script;
};
// TODO this could be cached
PublicKeyRing.prototype.getAddress = function (index, isChange) {
this._checkIndexRange(index, isChange);
var script = this.getRedeemScript(index,isChange);
return Address.fromScript(script, this.network.name);
};
// TODO this could be cached
PublicKeyRing.prototype._addScriptMap = function (map, index, isChange) {
this._checkIndexRange(index, isChange);
var script = this.getRedeemScript(index,isChange);
map[Address.fromScript(script, this.network.name).toString()] = script.getBuffer().toString('hex');
};
// TODO this could be cached
PublicKeyRing.prototype.getScriptPubKeyHex = function (index, isChange) {
this._checkIndexRange(index, isChange);
var addr = this.getAddress(index,isChange);
@ -180,7 +189,6 @@ PublicKeyRing.prototype.getScriptPubKeyHex = function (index, isChange) {
};
//generate a new address, update index.
PublicKeyRing.prototype.generateAddress = function(isChange) {
@ -215,11 +223,10 @@ PublicKeyRing.prototype.getRedeemScriptMap = function () {
var ret = {};
for (var i=0; i<this.changeAddressIndex; i++) {
ret[this.getAddress(i,true)] = this.getRedeemScript(i,true).getBuffer().toString('hex');
this._addScriptMap(ret,i,true);
}
for (var i=0; i<this.addressIndex; i++) {
ret[this.getAddress(i)] = this.getRedeemScript(i).getBuffer().toString('hex');
this._addScriptMap(ret,i,false);
}
return ret;
};
@ -267,6 +274,8 @@ PublicKeyRing.prototype._mergePubkeys = function(inPKR) {
var self = this;
var hasChanged = false;
var l= self.copayersBIP32.length;
if (self.isComplete())
return;
inPKR.copayersBIP32.forEach( function(b) {
var haveIt = false;
@ -279,7 +288,6 @@ PublicKeyRing.prototype._mergePubkeys = function(inPKR) {
}
if (!haveIt) {
if (self.isComplete()) {
//console.log('[PublicKeyRing.js.318] REPEATED KEY', epk); //TODO
throw new Error('trying to add more pubkeys, when PKR isComplete at merge');
}
self.copayersBIP32.push(new BIP32(epk));

44
js/models/core/TxProposals.js
View File

@ -18,6 +18,7 @@ function TxProposal(opts) {
this.createdTs = opts.createdTs;
this.seenBy = opts.seenBy || {};
this.signedBy = opts.signedBy || {};
this.rejectedBy = opts.rejectedBy || {};
this.builder = opts.builder;
this.sentTs = opts.sentTs || null;
this.sentTxid = opts.sentTxid || null;
@ -120,6 +121,7 @@ TxProposals.prototype._startMerge = function(myTxps, theirTxps) {
};
};
// TODO add signatures.
TxProposals.prototype._mergeMetadata = function(myTxps, theirTxps, mergeInfo) {
var toMerge = mergeInfo.toMerge;
@ -130,7 +132,7 @@ TxProposals.prototype._mergeMetadata = function(myTxps, theirTxps, mergeInfo) {
var v1 = toMerge[hash];
Object.keys(v1.seenBy).forEach(function(k) {
if (!v0.seenBy[k] || v0.seenBy[k] !== v1.seenBy[k]) {
if (!v0.seenBy[k]) {
v0.seenBy[k] = v1.seenBy[k];
hasChanged++;
}
@ -143,6 +145,13 @@ TxProposals.prototype._mergeMetadata = function(myTxps, theirTxps, mergeInfo) {
}
});
Object.keys(v1.rejectedBy).forEach(function(k) {
if (!v0.rejectedBy[k]) {
v0.rejectedBy[k] = v1.rejectedBy[k];
hasChanged++;
}
});
if (!v0.sentTxid && v1.sentTxid) {
v0.sentTs = v1.sentTs;
v0.sentTxid = v1.sentTxid;
@ -181,10 +190,41 @@ TxProposals.prototype.setSent = function(ntxid,txid) {
this.txps[ntxid].setSent(txid);
};
TxProposals.prototype.getUsedUnspent = function() {
TxProposals.prototype.getTxProposal = function(ntxid) {
var txp = this.txps[ntxid];
var i = JSON.parse(JSON.stringify(txp));
i.builder = txp.builder;
i.ntxid = ntxid;
i.peerActions = {};
for(var p in txp.seenBy){
i.peerActions[p]={seen: txp.seenBy[p]};
}
for(var p in txp.signedBy){
i.peerActions[p]= i.peerActions[p] || {};
i.peerActions[p].sign = txp.signedBy[p];
}
var r=0;
for(var p in txp.rejectedBy){
i.peerActions[p]= i.peerActions[p] || {};
i.peerActions[p].rejected = txp.rejectedBy[p];
r++;
}
i.rejectCount=r;
var c = txp.creator;
i.peerActions[c] = i.peerActions[c] || {};
i.peerActions[c].create = txp.createdTs;
return i;
};
TxProposals.prototype.getUsedUnspent = function(maxRejectCount) {
var ret = [];
for(var i in this.txps) {
var u = this.txps[i].builder.getSelectedUnspent();
if (this.getTxProposal(i).rejectCount>maxRejectCount)
continue;
for (var j in u){
ret.push(u[j].txid);
}

74
js/models/core/Wallet.js
View File

@ -269,56 +269,46 @@ Wallet.prototype.sendPublicKeyRing = function(recipients) {
Wallet.prototype.generateAddress = function(isChange) {
var addr = this.publicKeyRing.generateAddress(isChange);
console.log('[Wallet.js.281:addr:]',addr, this.publicKeyRing.toObj(), this.getAddresses()); //TODO
this.sendPublicKeyRing();
this.store(true);
return addr;
};
// TODO : sort by time... / signed.
Wallet.prototype.getTxProposals = function() {
var ret = [];
for(var k in this.txProposals.txps) {
var txp = this.txProposals.txps[k];
var i = JSON.parse(JSON.stringify(txp));
i.builder = txp.builder;
i.ntxid = k;
i.signedByUs = txp.signedBy[this.getMyPeerId()]?true:false;
i.peerActions = {};
for(var p in txp.seenBy){
i.peerActions[p]={seen: txp.seenBy[p]};
}
for(var p in txp.signedBy){
i.peerActions[p]= i.peerActions[p] || {};
i.peerActions[p].sign = txp.signedBy[p];
}
var c = txp.creator;
i.peerActions[c] = i.peerActions[c] || {};
i.peerActions[c].create = txp.createdTs;
var i = this.txProposals.getTxProposal(k);
i.signedByUs = i.signedBy[this.getMyPeerId()]?true:false;
i.rejectedByUs = i.rejectedBy[this.getMyPeerId()]?true:false;
if (this.totalCopayers-i.rejectCount < this.requiredCopayers)
i.finallyRejected=true;
ret.push(i);
}
return ret;
};
Wallet.prototype.getTxProposal = function(ntxid) {
Wallet.prototype.reject = function(ntxid) {
var myId=this.getMyPeerId();
var txp = this.txProposals.txps[ntxid];
var i = {txp:txp};
i.ntxid = ntxid;
i.signedByUs = txp.signedBy[this.getMyPeerId()]?true:false;
return i;
if (!txp || txp.rejectedBy[myId] || txp.signedBy[myId]) return;
txp.rejectedBy[myId] = Date.now();
this.sendTxProposals();
this.store(true);
};
Wallet.prototype.sign = function(ntxid) {
var self = this;
var myId=this.getMyPeerId();
var txp = self.txProposals.txps[ntxid];
if (!txp) return;
if (!txp || txp.rejectedBy[myId] || txp.signedBy[myId]) return;
var pkr = self.publicKeyRing;
var keys = self.privateKey.getAll(pkr.addressIndex, pkr.changeAddressIndex);
console.log('[Wallet.js.329:keys:]',keys); //TODO
var b = txp.builder;
var before = b.signaturesAdded;
@ -326,7 +316,7 @@ console.log('[Wallet.js.329:keys:]',keys); //TODO
var ret = false;
if (b.signaturesAdded > before) {
txp.signedBy[self.getMyPeerId()] = Date.now();
txp.signedBy[myId] = Date.now();
this.sendTxProposals();
this.store(true);
ret = true;
@ -373,7 +363,6 @@ Wallet.prototype.addSeenToTxProposals = function() {
return ret;
};
Wallet.prototype.getAddresses = function(onlyMain) {
return this.publicKeyRing.getAddresses(onlyMain);
};
@ -440,7 +429,8 @@ Wallet.prototype.getSafeUnspent = function(cb) {
this.blockchain.getUnspent(this.getAddressesStr(), function(unspentList) {
var ret=[];
var uu = self.txProposals.getUsedUnspent();
var maxRejectCount = self.totalCopayers - self.requiredCopayers;
var uu = self.txProposals.getUsedUnspent(maxRejectCount);
for(var i in unspentList){
if (uu.indexOf(unspentList[i].txid) === -1)
@ -465,11 +455,11 @@ Wallet.prototype.createTx = function(toAddress, amountSatStr, opts, cb) {
}
self.getSafeUnspent(function(unspentList) {
// TODO check enough funds, etc.
self.createTxSync(toAddress, amountSatStr, unspentList, opts);
self.sendPublicKeyRing(); // Change Address
self.sendTxProposals();
self.store();
if (self.createTxSync(toAddress, amountSatStr, unspentList, opts)) {
self.sendPublicKeyRing(); // Change Address
self.sendTxProposals();
self.store();
}
return cb();
});
};
@ -497,25 +487,27 @@ Wallet.prototype.createTxSync = function(toAddress, amountSatStr, utxos, opts) {
var signRet;
if (priv) {
console.log('[Wallet.js.486] aLL Priv', priv.getAll(pkr.addressIndex, pkr.changeAddressIndex)); //TODO
b.sign( priv.getAll(pkr.addressIndex, pkr.changeAddressIndex) );
}
console.log('[Wallet.js.494]', b, b.build().serialize().toString('hex')); //TODO
var me = {};
var myId = this.getMyPeerId();
var now = Date.now();
if (priv) me[myId] = now;
var me = {};
if (priv && b.signaturesAdded) me[myId] = now;
var meSeen = {};
if (priv) meSeen[myId] = now;
var data = {
signedBy: (priv && b.signaturesAdded ? me : {}),
seenBy: (priv ? me : {}),
signedBy: me,
seenBy: meSeen,
creator: myId,
createdTs: now,
builder: b,
};
this.txProposals.add(data);
return true;
};
Wallet.prototype.connectTo = function(peerId) {

1
js/models/network/WebRTC.js
View File

@ -261,7 +261,6 @@ console.log('[WebRTC.js.255] WARN: NO CONNECTION TO:', peerId); //TODO
Network.prototype.send = function(peerIds, data, cb) {
var self=this;
console.log('[WebRTC.js.242] SENDING ', data.type); //TODO
if (!peerIds) {
peerIds = this.connectedPeers;
data.isBroadcast = 1;

2
js/services/controllerUtils.js
View File

@ -61,7 +61,7 @@ angular.module('copay.controllerUtils').factory('controllerUtils', function ($ro
console.log('### SUBSCRIBE TO', addrs[i]);
Socket.emit('subscribe', addrs[i]);
}
console.log('[controllerUtils.js.64]'); //TODO
addrs.forEach(function(addr) {
Socket.on(addr, function(txid) {
console.log('Received!', txid);

2
test/test.PrivateKey.js
View File

@ -70,7 +70,7 @@ describe('PrivateKey model', function() {
it('should calculate .id', function () {
var w1 = new PrivateKey(config);
should.exist(w1.getId());
w1.getId().length.should.equal(40);
w1.getId().length.should.equal(32);
});
it('fromObj toObj roundtrip', function () {
var w1 = new PrivateKey(config);

55
test/test.TxProposals.js
View File

@ -59,9 +59,61 @@ var createPKR = function (bip32s) {
return w;
};
var vopts = {
verifyP2SH: true,
dontVerifyStrictEnc: true
};
describe('TxProposals model', function() {
it('verify TXs', function (done) {
var priv = new PrivateKey(config);
var priv2 = new PrivateKey(config);
var priv3 = new PrivateKey(config);
var ts = Date.now();
var isChange=0;
var index=0;
var pkr = createPKR([priv, priv2, priv3]);
var opts = {remainderOut: { address: pkr.generateAddress(true).toString() }};
var w = new TxProposals({
networkName: config.networkName,
});
unspentTest[0].address = pkr.getAddress(index, isChange).toString();
unspentTest[0].scriptPubKey = pkr.getScriptPubKeyHex(index, isChange);
w.add(createTx(
'15q6HKjWHAksHcH91JW23BJEuzZgFwydBt',
'123456789',
unspentTest,
opts,
priv,
pkr
));
var k = Object.keys(w.txps)[0];
var b = w.txps[k].builder;
var tx = b.build();
tx.isComplete().should.equal(false);
b.sign( priv2.getAll(pkr.addressIndex, pkr.changeAddressIndex) );
b.sign( priv3.getAll(pkr.addressIndex, pkr.changeAddressIndex) );
tx = b.build();
tx.isComplete().should.equal(true);
var s = new Script(new Buffer(unspentTest[0].scriptPubKey,'hex'));
tx.verifyInput(0,s, {
verifyP2SH: true,
dontVerifyStrictEnc: true
}, function(err, results){
should.not.exist(err);
results.should.equal(true);
done();
});
});
it('should create an instance', function () {
var w = new TxProposals({
networkName: config.networkName
@ -496,5 +548,6 @@ var _dumpChunks = function (scriptSig, label) {
w2.merge(w);
Object.keys(w2.txps).length.should.equal(1);
});
});