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

fix conflicts

Browse source
This commit is contained in:
Mario Colque 2014-04-20 17:18:20 -03:00
commit 74f7271310
28 changed files with 653 additions and 761 deletions
Download patch file Download diff file Expand all files Collapse all files

10
js/config.js → js/config.template.js
View file

@ -3,12 +3,12 @@
var config = {
networkName: 'testnet',
network: {
key: 'lwjd5qra8257b9',
// key: 'lwjd5qra8257b9',
// This is for running local peerJs with params: ./peerjs -p 10009 -k 'sdfjhwefh'
// key: 'sdfjhwefh',
// host: 'localhost',
// port: 10009,
// path: '/',
key: 'sdfjhwefh',
host: 'localhost',
port: 10009,
path: '/',
maxPeers: 3,
debug: 3,
},

8
js/controllers/home.js
View file

@ -10,11 +10,12 @@ angular.module('copay.home').controller('HomeController',
var _updateBalance = function () {
w.getBalance(function (balance, balanceByAddr) {
$rootScope.$apply(function() {
$rootScope.balanceByAddr = balanceByAddr;
if (balanceByAddr && Object.keys(balanceByAddr).length) {
$scope.balanceByAddr = balanceByAddr;
$scope.addrs = Object.keys(balanceByAddr);
$scope.selectedAddr = $scope.addrs[0];
});
$scope.$digest();
}
});
};
@ -30,4 +31,5 @@ angular.module('copay.home').controller('HomeController',
};
_updateBalance();
w.on('refresh',_updateBalance);
});

29
js/controllers/send.js
View file

@ -4,8 +4,35 @@ angular.module('copay.send').controller('SendController',
function($scope, $rootScope, $location) {
$scope.title = 'Send';
$scope.unitIds = ['BTC','mBTC'];
$scope.selectedUnit = $scope.unitIds[0];
$scope.submitForm = function(form) {
if (form.$invalid) {
$rootScope.flashMessage = { message: 'You can not send a proposal transaction. Please, try again', type: 'error'};
return;
}
var address = form.address.$modelValue;
var amount = (form.amount.$modelValue * 100000000).toString(); // satoshi to string
var w = $rootScope.wallet;
w.createTx( address, amount,function() {
$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: 'You send a proposal transaction succefully', type: 'success'};
};
$scope.sendTest = function() {
var w = $rootScope.wallet;
var w = $rootScope.wallet;
w.createTx( 'mimoZNLcP2rrMRgdeX5PSnR7AjCqQveZZ4', '12345',function() {
$rootScope.$digest();
});

1
js/controllers/setup.js
View file

@ -34,7 +34,6 @@ angular.module('copay.setup').controller('SetupController',
};
var w = walletFactory.create(opts);
controllerUtils.setupUxHandlers(w);
w.netStart();
};
});

19
js/controllers/signin.js
View file

@ -10,23 +10,26 @@ angular.module('copay.signin').controller('SigninController',
$location.path('setup');
};
$scope.open = function(walletId) {
$scope.open = function(walletId, opts) {
$scope.loading = true;
var w = walletFactory.open(walletId);
console.log('[signin.js.23:walletId:]',walletId); //TODO
var w = walletFactory.open(walletId, opts);
controllerUtils.setupUxHandlers(w);
w.netStart();
};
$scope.join = function(peerId) {
$scope.join = function(secret) {
$scope.loading = true;
walletFactory.network.on('openError', function() {
controllerUtils.onError($scope);
$rootScope.$digest();
walletFactory.network.on('joinError', function() {
controllerUtils.onErrorDigest($scope);
});
walletFactory.connectTo(peerId, function(w) {
walletFactory.joinCreateSession(secret, function(w) {
console.log('[signin.js.33] joinCreateSession RETURN', w); //TODO
controllerUtils.setupUxHandlers(w);
w.netStart();
w.setupNetHandlers();
});
};
});

46
js/controllers/transactions.js
View file

@ -1,4 +1,5 @@
'use strict';
var bitcore = require('bitcore');
angular.module('copay.transactions').controller('TransactionsController',
function($scope, $rootScope, $location) {
@ -9,7 +10,7 @@ angular.module('copay.transactions').controller('TransactionsController',
var _updateTxs = function() {
var w =$rootScope.wallet;
var inT = w.getTxProposals();
var ts = [];
var txs = [];
inT.forEach(function(i){
var b = i.txp.builder;
@ -18,28 +19,49 @@ angular.module('copay.transactions').controller('TransactionsController',
feeSat: b.feeSat,
};
var outs = [];
var bitcore = require('bitcore');
tx.outs.forEach(function(o) {
var s = o.getScript();
var aStr = bitcore.Address.fromScript(s, config.networkName).toString();
if (!w.addressIsOwn(aStr))
var addr = bitcore.Address.fromScriptPubKey(o.getScript(), config.networkName)[0].toString();
if (!w.addressIsOwn(addr)) {
outs.push({
address: aStr,
address: addr,
value: bitcore.util.valueToBigInt(o.getValue())/bitcore.util.COIN,
});
}
});
one.outs = outs;
ts.push(one);
});
$scope.txs = ts;
};
_updateTxs();
// TOD: check missingSignatures === in al inputs?
one.missingSignatures = tx.countInputMissingSignatures(0);
one.signedByUs = i.signedByUs;
one.ntxid = i.ntxid;
one.creator = i.txp.creator,
one.createdTs = i.txp.createdTs;
txs.push(one);
});
$scope.txs = txs;
};
$scope.sign = function (ntxid) {
var w = $rootScope.wallet;
var ret = w.sign(ntxid);
$rootScope.flashMessage = {type:'success', message: 'Transactions SEND! : ' + ret};
_updateTxs();
var p = w.getTxProposal(ntxid);
if (p.txp.builder.isFullySigned()) {
w.sendTx(ntxid, function(txid) {
$rootScope.flashMessage = txid
? {type:'success', message: 'Transactions SENT! txid:' + txid}
: {type:'error', message: 'There was an error sending the Transaction'}
;
});
}
else {
$rootScope.flashMessage = ret
? {type:'success', message: 'Transactions signed'}
: {type:'error', message: 'There was an error signing the Transaction'}
;
}
_updateTxs();
};
});

2
js/models/blockchain/Insight.js
View file

@ -102,7 +102,7 @@ Insight.prototype._request = function(options, callback) {
return callback({message: 'Wrong response from insight'});
}
} else {
return callback({message: 'Error ' + response.statusCode});
return callback({message: 'Error ' + request.status});
}
}
};

10
js/models/core/PrivateKey.js
View file

@ -16,13 +16,17 @@ function PrivateKey(opts) {
var init = opts.extendedPrivateKeyString || this.network.name;
this.bip = opts.BIP32 || new BIP32(init);
this.privateKeyCache = opts.privateKeyCache || {};
this._calcId();
};
PrivateKey.prototype._calcId = function() {
this.id = util.ripe160(this.bip.extendedPublicKey).toString('hex');
PrivateKey.prototype.getId = function(prefix) {
var buf = this.bip.extendedPublicKey;
if (prefix) {
buf = Buffer.concat([prefix, buf]);
}
return util.ripe160(buf).toString('hex');
};
PrivateKey.fromObj = function(obj) {
return new PrivateKey(obj);
};

16
js/models/core/PublicKeyRing.js
View file

@ -9,6 +9,7 @@ var Address = bitcore.Address;
var Script = bitcore.Script;
var coinUtil = bitcore.util;
var Transaction = bitcore.Transaction;
var util = bitcore.util;
var Storage = imports.Storage || require('../storage/Base.js');
var storage = Storage.default();
@ -76,6 +77,17 @@ PublicKeyRing.prototype.serialize = function () {
return JSON.stringify(this.toObj());
};
PublicKeyRing.prototype.getCopayerId = function(i, prefix) {
var buf = this.copayersBIP32[i].extendedPublicKey;
if (prefix) {
buf = Buffer.concat([prefix, buf]);
}
return util.ripe160(buf).toString('hex');
};
PublicKeyRing.prototype.myCopayerId = function(i, prefix) {
return this.getCopayerId(0,prefix);
};
PublicKeyRing.prototype.registeredCopayers = function () {
return this.copayersBIP32.length;
@ -225,12 +237,12 @@ PublicKeyRing.prototype._checkInPRK = function(inPKR, ignoreId) {
if (
this.requiredCopayers && inPKR.requiredCopayers &&
(this.requiredCopayers !== inPKR.requiredCopayers))
throw new Error('inPRK requiredCopayers mismatch');
throw new Error('inPRK requiredCopayers mismatch '+this.requiredCopayers+'!='+inPKR.requiredCopayers);
if (
this.totalCopayers && inPKR.totalCopayers &&
(this.totalCopayers !== inPKR.totalCopayers))
throw new Error('inPRK requiredCopayers mismatch');
throw new Error('inPRK totalCopayers mismatch'+this.totalCopayers+'!='+inPKR.requiredCopayers);
};

87
js/models/core/TxProposals.js
View file

@ -14,10 +14,27 @@ var Storage = imports.Storage || require('../storage/Base');
var storage = Storage.default();
function TxProposal(opts) {
this.creator = opts.creator;
this.createdTs = opts.createdTs;
this.seenBy = opts.seenBy || {};
this.signedBy = opts.signedBy || {};
this.builder = opts.builder;
}
TxProposal.prototype.toObj = function() {
var o = JSON.parse(JSON.stringify(this));
delete o['builder'];
o.builderObj = this.builder.toObj();
return o;
};
TxProposal.fromObj = function(o) {
var t = new TxProposal(o);
var b = new Builder.fromObj(o.builderObj);
t.builder = b;
return t;
};
module.exports = require('soop')(TxProposal);
@ -26,7 +43,7 @@ function TxProposals(opts) {
this.walletId = opts.walletId;
this.network = opts.networkName === 'livenet' ?
bitcore.networks.livenet : bitcore.networks.testnet;
this.txps = [];
this.txps = {};
}
TxProposals.fromObj = function(o) {
@ -34,12 +51,10 @@ TxProposals.fromObj = function(o) {
networkName: o.networkName,
walletId: o.walletId,
});
o.txps.forEach(function(t) {
ret.txps.push({
seenBy: t.seenBy,
signedBy: t.signedBy,
builder: new Builder.fromObj(t.builderObj),
});
o.txps.forEach(function(o2) {
var t = TxProposal.fromObj(o2);
var id = t.builder.build().getNormalizedHash().toString('hex');
ret.txps[id] = t;
});
return ret;
};
@ -47,13 +62,10 @@ TxProposals.fromObj = function(o) {
TxProposals.prototype.toObj = function() {
var ret = [];
this.txps.forEach(function(t) {
ret.push({
seenBy: t.seenBy,
signedBy: t.signedBy,
builderObj: t.builder.toObj(),
});
});
for(var id in this.txps){
var t = this.txps[id];
ret.push(t.toObj());
}
return {
txps: ret,
walletId: this.walletId,
@ -62,36 +74,27 @@ TxProposals.prototype.toObj = function() {
};
TxProposals.prototype._getNormHash = function(txps) {
var ret = {};
txps.forEach(function(txp) {
var hash = txp.builder.build().getNormalizedHash().toString('hex');
ret[hash]=txp;
});
return ret;
};
TxProposals.prototype._startMerge = function(myTxps, theirTxps) {
var fromUs=0, fromTheirs=0, merged =0;
var toMerge = {}, ready=[];
var toMerge = {}, ready={};
Object.keys(theirTxps).forEach(function(hash) {
for(var hash in theirTxps){
if (!myTxps[hash]) {
ready.push(theirTxps[hash]); // only in theirs;
ready[hash]=theirTxps[hash]; // only in theirs;
fromTheirs++;
}
else {
toMerge[hash]=theirTxps[hash]; // need Merging
merged++;
}
});
}
Object.keys(myTxps).forEach(function(hash) {
for(var hash in myTxps){
if(!toMerge[hash]) {
ready.push(myTxps[hash]); // only in myTxps;
ready[hash]=myTxps[hash]; // only in myTxps;
fromUs++;
}
});
}
return {
stats: {
@ -124,42 +127,48 @@ TxProposals.prototype._mergeMetadata = function(myTxps, theirTxps, mergeInfo) {
TxProposals.prototype._mergeBuilder = function(myTxps, theirTxps, mergeInfo) {
var self = this;
var toMerge = mergeInfo.toMerge;
Object.keys(toMerge).forEach(function(hash) {
for(var hash in toMerge){
var v0 = myTxps[hash].builder;
var v1 = toMerge[hash].builder;
v0.merge(v1);
});
};
};
TxProposals.prototype.add = function(data) {
this.txps.push( new TxProposal(data) );
var id = data.builder.build().getNormalizedHash().toString('hex');
this.txps[id] = new TxProposal(data);
};
TxProposals.prototype.remove = function(ntxid) {
console.log('[TxProposals.js.147] DELETING:', ntxid); //TODO
delete this.txps[ntxid];
};
TxProposals.prototype.merge = function(t) {
if (this.network.name !== t.network.name)
throw new Error('network mismatch in:', t);
var res = [];
var myTxps = this._getNormHash(this.txps);
var theirTxps = this._getNormHash(t.txps);
var myTxps = this.txps;
var theirTxps = t.txps;
var mergeInfo = this._startMerge(myTxps, theirTxps);
this._mergeMetadata(myTxps, theirTxps, mergeInfo);
this._mergeBuilder(myTxps, theirTxps, mergeInfo);
Object.keys(mergeInfo.toMerge).forEach(function(hash) {
mergeInfo.ready.push(myTxps[hash]);
mergeInfo.ready[hash] = myTxps[hash];
});
this.txps=mergeInfo.ready;
return mergeInfo.stats;
};
module.exports = require('soop')(TxProposals);

215
js/models/core/Wallet.js
View file

@ -48,17 +48,19 @@ Wallet.prototype._handlePublicKeyRing = function(senderId, data, isInbound) {
var shouldSend = false;
var recipients, pkr = this.publicKeyRing;
var inPKR = copay.PublicKeyRing.fromObj(data.publicKeyRing);
if (pkr.merge(inPKR, true) && !data.isBroadcast) {
var hasChanged = pkr.merge(inPKR, true);
if (hasChanged) {
this.log('### BROADCASTING PKR');
recipients = null;
shouldSend = true;
}
else if (isInbound && !data.isBroadcast) {
// always replying to connecting peer
this.log('### REPLYING PKR TO:', senderId);
recipients = senderId;
shouldSend = true;
}
// else if (isInbound && !data.isBroadcast) {
// // always replying to connecting peer
// this.log('### REPLYING PKR TO:', senderId);
// recipients = senderId;
// shouldSend = true;
// }
if (shouldSend) {
this.sendPublicKeyRing(recipients);
@ -76,17 +78,18 @@ Wallet.prototype._handleTxProposals = function(senderId, data, isInbound) {
var mergeInfo = this.txProposals.merge(inTxp, true);
var addSeen = this.addSeenToTxProposals();
if ((mergeInfo.merged && !data.isBroadcast) || addSeen) {
// if ((mergeInfo.merged && !data.isBroadcast) || addSeen) {
if (mergeInfo.merged || addSeen) {
this.log('### BROADCASTING txProposals. ' );
recipients = null;
shouldSend = true;
}
else if (isInbound && !data.isBroadcast) {
// always replying to connecting peer
this.log('### REPLYING txProposals TO:', senderId);
recipients = senderId;
shouldSend = true;
}
// else if (isInbound && !data.isBroadcast) {
// // always replying to connecting peer
// this.log('### REPLYING txProposals TO:', senderId);
// recipients = senderId;
// shouldSend = true;
// }
if (shouldSend)
this.sendTxProposals(recipients);
@ -95,7 +98,7 @@ Wallet.prototype._handleTxProposals = function(senderId, data, isInbound) {
};
Wallet.prototype._handleData = function(senderId, data, isInbound) {
// TODO check message signature
if (this.id !== data.walletId) {
this.emit('badMessage',senderId);
this.log('badMessage FROM:', senderId); //TODO
@ -103,6 +106,12 @@ Wallet.prototype._handleData = function(senderId, data, isInbound) {
}
this.log('[Wallet.js.98]' , data.type); //TODO
switch(data.type) {
case 'walletReady':
console.log('[Wallet.js.109] RECV WALLETREADY'); //TODO
this.sendPublicKeyRing(senderId);
this.sendTxProposals(senderId);
break;
case 'publicKeyRing':
this._handlePublicKeyRing(senderId, data, isInbound);
break;
@ -112,16 +121,15 @@ Wallet.prototype._handleData = function(senderId, data, isInbound) {
}
};
Wallet.prototype._handleNetworkChange = function(newPeer) {
if (newPeer) {
this.log('#### Setting new PEER:', newPeer);
this.sendWalletId(newPeer);
this.sendPublicKeyRing(newPeer);
this.sendTxProposals(newPeer);
Wallet.prototype._handleNetworkChange = function(newPeerId) {
if (newPeerId) {
this.log('#### Setting new PEER:', newPeerId);
this.sendWalletId(newPeerId);
}
this.emit('refresh');
};
Wallet.prototype._optsToObj = function () {
var obj = {
id: this.id,
@ -133,7 +141,28 @@ Wallet.prototype._optsToObj = function () {
return obj;
};
Wallet.prototype.getPeerId = function(index) {
// if (typeof index === 'undefined') {
// // return my own peerId
// var gen = this.privateKey.getId(idBuf);
// return gen;
// }
// return peer number 'index' peerId
//
var idBuf;
// TODO idBuf DISABLED FOR NOW
//idBuf = new Buffer(this.id);
return this.publicKeyRing.getCopayerId(index || 0, idBuf);
};
Wallet.prototype.getMyPeerId = function() {
return this.getPeerId(0);
};
Wallet.prototype.netStart = function() {
console.log('[Wallet.js.159:netStart:]'); //TODO
var self = this;
var net = this.network;
net.removeAllListeners();
@ -141,15 +170,27 @@ Wallet.prototype.netStart = function() {
net.on('data', self._handleData.bind(self) );
net.on('open', function() {}); // TODO
net.on('openError', function() {
this.log('[Wallet.js.132:openError:] GOT openError'); //TODO
self.log('[Wallet.js.132:openError:] GOT openError'); //TODO
self.emit('openError');
});
net.on('close', function() {
self.emit('close');
});
net.start(function(peerId) {
var myPeerId = self.getMyPeerId();
var startOpts = {
peerId: myPeerId
};
net.start(function() {
console.log('[Wallet.js.177] NET START: emit CREATED'); //TODO
self.emit('created');
});
for (var i=0; i<self.publicKeyRing.registeredCopayers(); i++) {
var otherPeerId = self.getPeerId(i);
if (otherPeerId !== myPeerId) {
net.connectTo(otherPeerId);
}
}
}, startOpts);
};
Wallet.prototype.store = function(isSync) {
@ -200,6 +241,15 @@ Wallet.prototype.sendTxProposals = function(recipients) {
this.emit('txProposalsUpdated', this.txProposals);
};
Wallet.prototype.sendWalletReady = function(recipients) {
this.log('### SENDING WalletReady TO:', recipients);
this.network.send( recipients, {
type: 'walletReady',
walletId: this.id,
});
this.emit('walletReady');
};
Wallet.prototype.sendWalletId = function(recipients) {
this.log('### SENDING walletId TO:', recipients||'All', this.walletId);
@ -207,6 +257,7 @@ Wallet.prototype.sendWalletId = function(recipients) {
this.network.send(recipients, {
type: 'walletId',
walletId: this.id,
opts: this._optsToObj()
});
};
@ -230,75 +281,82 @@ Wallet.prototype.generateAddress = function() {
return addr;
};
// TODO : sort by time... / signed.
Wallet.prototype.getTxProposals = function() {
var ret = [];
var self= this;
self.txProposals.txps.forEach(function(txp) {
for(var k in this.txProposals.txps) {
var txp = this.txProposals.txps[k];
var i = {txp:txp};
i.ntxid = txp.builder.build().getNormalizedHash();
i.signedByUs = txp.signedBy[self.privateKey.id]?true:false;
i.ntxid = k;
i.signedByUs = txp.signedBy[this.privateKey.getId()]?true:false;
ret.push(i);
});
return ret;
};
// TODO: this can be precalculated.
Wallet.prototype._findTxByNtxid = function(ntxid) {
var ret;
var l = this.txProposals.txps.length;
var id = ntxid.toString('hex');
for(var i=0; i<l; i++) {
var txp = this.txProposals.txps[i];
var id2 = txp.builder.build().getNormalizedHash().toString('hex');
if (id === id2 ) {
ret = txp;
}
}
return ret;
};
Wallet.prototype.getTxProposal = function(ntxid) {
var txp = this.txProposals.txps[ntxid];
var i = {txp:txp};
i.ntxid = ntxid;
i.signedByUs = txp.signedBy[this.privateKey.getId()]?true:false;
return i;
};
Wallet.prototype.sign = function(ntxid) {
var txp = this._findTxByNtxid(ntxid);
var self = this;
var txp = self.txProposals.txps[ntxid];
if (!txp) return;
var pkr = this.publicKeyRing;
var keys = this.privateKey.getAll(pkr.addressIndex, pkr.changeAddressIndex);
var ret = txp.builder.sign(keys);
var pkr = self.publicKeyRing;
var keys = self.privateKey.getAll(pkr.addressIndex, pkr.changeAddressIndex);
if (ret.signaturesAdded) {
txp.signedBy[this.privateKey.id] = Date.now();
this.log('[Wallet.js.230:ret:]',ret); //TODO
if (ret.isFullySigned) {
this.log('[Wallet.js.231] BROADCASTING TX!!!'); //TODO
var tx = txp.builder.build();
var txHex = tx.serialize().toString('hex');
this.blockchain.sendRawTransaction(txHex, function(txid) {
this.log('[Wallet.js.235:txid:]',txid); //TODO
if (txid) {
this.store(true);
}
});
}
else {
this.sendTxProposals();
this.store(true);
}
var b = txp.builder;
var before = b.signaturesAdded;
b.sign(keys);
var ret = false;
if (b.signaturesAdded > before) {
txp.signedBy[self.privateKey.getId()] = Date.now();
this.sendTxProposals();
this.store(true);
ret = true;
}
return ret;
};
Wallet.prototype.sendTx = function(ntxid) {
var txp = this.txProposals.txps[ntxid];
if (!txp) return;
var tx = txp.builder.build();
if (!tx.isComplete()) return;
this.log('[Wallet.js.231] BROADCASTING TX!!!'); //TODO
var txHex = tx.serialize().toString('hex');
this.log('[Wallet.js.261:txHex:]',txHex); //TODO
var self = this;
this.blockchain.sendRawTransaction(txHex, function(txid) {
self.log('BITCOND txid:',txid); //TODO
if (txid) {
self.txProposals.remove(ntxid);
self.store(true);
}
return (txid);
});
};
Wallet.prototype.addSeenToTxProposals = function() {
var ret=false;
var self=this;
this.txProposals.txps.forEach(function(txp) {
if (!txp.seenBy[self.privateKey.id]) {
txp.seenBy[self.privateKey.id] = Date.now();
for(var k in this.txProposals.txps) {
var txp = this.txProposals.txps[k];
if (!txp.seenBy[self.privateKey.getId()]) {
txp.seenBy[self.privateKey.getId()] = Date.now();
ret = true;
}
});
}
return ret;
};
@ -333,9 +391,12 @@ Wallet.prototype.getBalance = function(cb) {
var balance = 0;
var balanceByAddr = {};
var COIN = bitcore.util.COIN;
var addresses = this.getAddressesStr(true);
if (!addresses.length) return cb(0,[]);
// Prefill balanceByAddr with main address
this.getAddressesStr(true).forEach(function(a){
addresses.forEach(function(a){
balanceByAddr[a]=0;
});
this.getUnspent(function(utxos) {
@ -345,9 +406,9 @@ Wallet.prototype.getBalance = function(cb) {
balance = balance + amt;
balanceByAddr[u.address] = (balanceByAddr[u.address]||0) + amt;
}
Object.keys(balanceByAddr).forEach(function(a) {
for(var a in balanceByAddr){
balanceByAddr[a] = balanceByAddr[a]/COIN;
});
};
return cb(balance / COIN, balanceByAddr);
});
};
@ -369,14 +430,10 @@ Wallet.prototype.createTx = function(toAddress, amountSatStr, opts, cb) {
if (typeof opts.spendUnconfirmed === 'undefined') {
opts.spendUnconfirmed = this.spendUnconfirmed;
}
if (!opts.remainderOut) {
opts.remainderOut={ address: this.publicKeyRing.generateAddress(true).toString()};
}
self.getUnspent(function(unspentList) {
// TODO check enough funds, etc.
self.createTxSync(toAddress, amountSatStr, unspentList, opts);
self.sendPublicKeyRing(); // Change Address
self.sendTxProposals();
self.store();
return cb();
@ -409,11 +466,13 @@ Wallet.prototype.createTxSync = function(toAddress, amountSatStr, utxos, opts) {
b.sign( priv.getAll(pkr.addressIndex, pkr.changeAddressIndex) );
}
var me = {};
if (priv) me[priv.id] = Date.now();
if (priv) me[priv.getId()] = Date.now();
this.txProposals.add({
signedBy: priv && b.signaturesAdded ? me : {},
seenBy: priv ? me : {},
creator: priv.getId(),
createdTs: Date.now(),
builder: b,
});
};

92
js/models/core/WalletFactory.js
View file

@ -39,10 +39,13 @@ WalletFactory.prototype.log = function(){
WalletFactory.prototype._checkRead = function(walletId) {
var s = this.storage;
var ret = s.get(walletId, 'publicKeyRing') &&
s.get(walletId, 'txProposals') &&
s.get(walletId, 'opts') &&
s.get(walletId, 'privateKey')
var ret =
(
s.get(walletId, 'publicKeyRing') &&
s.get(walletId, 'txProposals') &&
s.get(walletId, 'opts') &&
s.get(walletId, 'privateKey')
)?true:false;
;
return ret?true:false;
};
@ -53,17 +56,14 @@ WalletFactory.prototype.read = function(walletId) {
var s = this.storage;
var opts = s.get(walletId, 'opts');
opts.id = walletId;
opts.publicKeyRing = new PublicKeyRing.fromObj(s.get(walletId, 'publicKeyRing'));
opts.txProposals = new TxProposals.fromObj(s.get(walletId, 'txProposals'));
opts.privateKey = new PrivateKey.fromObj(s.get(walletId, 'privateKey'));
opts.storage = this.storage;
opts.network = this.network;
opts.blockchain = this.blockchain;
opts.verbose = this.verbose;
var w = new Wallet(opts);
// JIC: Add our key
@ -81,10 +81,13 @@ WalletFactory.prototype.read = function(walletId) {
WalletFactory.prototype.create = function(opts) {
var s = WalletFactory.storage;
opts = opts || {};
this.log('### CREATING NEW WALLET.' + (opts.id ? ' USING ID: ' + opts.id : ' NEW ID'));
this.log('### CREATING NEW WALLET.' +
(opts.id ? ' USING ID: ' + opts.id : ' NEW ID') +
(opts.privateKey ? ' USING PrivateKey: ' + opts.privateKey.getId() : ' NEW PrivateKey')
);
opts.privateKey = opts.privateKey || new PrivateKey({ networkName: this.networkName });
this.log('\t### PrivateKey Initialized');
var requiredCopayers = opts.requiredCopayers || this.walletDefaults.requiredCopayers;
var totalCopayers = opts.totalCopayers || this.walletDefaults.totalCopayers;
@ -115,48 +118,12 @@ WalletFactory.prototype.create = function(opts) {
return w;
};
WalletFactory.prototype.open = function(walletId) {
var w = this.read(walletId) || this.create({
id: walletId,
verbose: this.verbose,
});
return w;
};
WalletFactory.prototype.openRemote = function(peedId) {
var s = WalletFactory.storage;
opts = opts || {};
this.log('### CREATING NEW WALLET.' + (opts.id ? ' USING ID: ' + opts.id : ' NEW ID'));
opts.privateKey = opts.privateKey || new PrivateKey({ networkName: this.networkName });
this.log('\t### PrivateKey Initialized');
var requiredCopayers = opts.requiredCopayers || this.walletDefaults.requiredCopayers;
var totalCopayers = opts.totalCopayers || this.walletDefaults.totalCopayers;
opts.publicKeyRing = opts.publicKeyRing || new PublicKeyRing({
networkName: this.networkName,
requiredCopayers: requiredCopayers,
totalCopayers: totalCopayers,
});
opts.publicKeyRing.addCopayer(opts.privateKey.getExtendedPublicKeyString());
this.log('\t### PublicKeyRing Initialized');
opts.txProposals = opts.txProposals || new TxProposals({
networkName: this.networkName,
});
this.log('\t### TxProposals Initialized');
opts.storage = this.storage;
opts.network = this.network;
opts.blockchain = this.blockchain;
opts.spendUnconfirmed = typeof opts.spendUnconfirmed === undefined
?this.walletDefaults.spendUnconfirmed : opts.spendUnconfirmed;
opts.requiredCopayers = requiredCopayers;
opts.totalCopayers = totalCopayers;
var w = new Wallet(opts);
WalletFactory.prototype.open = function(walletId, opts) {
this.log('Opening walletId:' + walletId);
opts = opts || {};
opts.id = walletId;
opts.verbose = this.verbose;
var w = this.read(walletId) || this.create(opts);
w.store();
return w;
};
@ -167,16 +134,27 @@ WalletFactory.prototype.getWalletIds = function() {
WalletFactory.prototype.remove = function(walletId) {
// TODO remove wallet contents
console.log('TODO: remove wallet contents');
};
WalletFactory.prototype.connectTo = function(peerId, cb) {
var self=this;
WalletFactory.prototype.joinCreateSession = function(peerId, cb) {
var self = this;
//Create our PrivateK
var privateKey = new PrivateKey({ networkName: this.networkName });
this.log('\t### PrivateKey Initialized');
self.network.setPeerId(privateKey.getId());
self.network.start(function() {
self.network.connectTo(peerId)
self.network.on('walletId', function(walletId) {
self.log('Opening walletId:' + walletId);
return cb(self.open(walletId));
self.network.connectTo(peerId);
self.network.on('data', function(sender, data) {
if (data.type ==='walletId') {
data.opts.privateKey = privateKey;
var w = self.open(data.walletId, data.opts);
w.sendWalletReady(peerId);
return cb(w);
}
});
});
};

8
js/models/network/Peer.js
View file

@ -1,8 +0,0 @@
function Peer(id) {
this.id = id;
};
module.exports = require('soop')(Peer);

62
js/models/network/WebRTC.js
View file

@ -21,7 +21,7 @@ function Network(opts) {
this.peerId = opts.peerId;
this.apiKey = opts.apiKey || 'lwjd5qra8257b9';
this.debug = opts.debug || 3;
this.maxPeers = opts.maxPeers || 5;
this.maxPeers = opts.maxPeers || 10;
this.opts = { key: opts.key };
// For using your own peerJs server
@ -29,6 +29,7 @@ function Network(opts) {
if (opts[k]) self.opts[k]=opts[k];
});
this.connectedPeers = [];
this.started = false;
}
Network.parent=EventEmitter;
@ -64,7 +65,6 @@ Network._arrayPushOnce = function(el, array) {
Network._arrayRemove = function(el, array) {
var pos = array.indexOf(el);
if (pos >= 0) array.splice(pos, 1);
return array;
};
@ -104,9 +104,6 @@ Network.prototype._onData = function(data, isInbound) {
case 'disconnect':
this._onClose(obj.sender);
break;
case 'walletId':
this.emit('walletId', obj.data.walletId);
break;
default:
this.emit('data', obj.sender, obj.data, isInbound);
}
@ -123,8 +120,6 @@ Network.prototype._sendPeers = function(peerIds) {
Network.prototype._addPeer = function(peerId, isInbound) {
var hasChanged = Network._arrayPushOnce(peerId, this.connectedPeers);
if (isInbound && hasChanged) {
this._sendPeers(); //broadcast peer list
}
@ -184,18 +179,16 @@ Network.prototype._setupPeerHandlers = function(openCallback) {
var self=this;
var p = this.peer;
p.on('open', function(peerId) {
self.peerId = peerId;
self.connectedPeers = [peerId];
self._notifyNetworkChange();
return openCallback(peerId);
p.on('open', function() {
self.connectedPeers = [self.peerId];
console.log('[WebRTC.js.187] LENGTH', self.connectedPeers.length); //TODO
return openCallback();
});
p.on('error', function(err) {
console.log('### PEER ERROR:', err);
self.peer.disconnect();
self.peer.destroy();
self.peer = null;
//self.disconnect(null, true); // force disconnect
self._checkAnyPeer();
});
@ -215,12 +208,33 @@ Network.prototype._setupPeerHandlers = function(openCallback) {
});
};
Network.prototype.start = function(openCallback) {
Network.prototype.setPeerId = function(peerId) {
if (this.started) {
throw new Error ('network already started: can not change peerId')
}
this.peerId = peerId;
};
Network.prototype.start = function(openCallback, opts) {
opts = opts || {};
// Start PeerJS Peer
if (this.peer) return openCallback(); // This is for connectTo-> peer is started before
var self = this;
if (this.started) return openCallback();
opts.connectedPeers = opts.connectedPeers || [];
this.peerId = this.peerId || opts.peerId;
this.peer = new Peer(this.peerId, this.opts);
this._setupPeerHandlers(openCallback);
for (var i = 0; i<opts.connectedPeers.length; i++) {
var otherPeerId = opts.connectedPeers[i];
this.connectTo(otherPeerId);
}
this.started = true;
console.log('[WebRTC.js.237] started TRUE'); //TODO
};
Network.prototype._sendToOne = function(peerId, data, cb) {
@ -267,7 +281,7 @@ console.log('[WebRTC.js.258:peerId:]',peerId); //TODO
Network.prototype.connectTo = function(peerId) {
var self = this;
console.log('### STARTING TO CONNECT TO:' + peerId );
console.log('### STARTING CONNECTION TO:' + peerId );
var dataConn = this.peer.connect(peerId, {
serialization: 'none',
@ -279,11 +293,12 @@ Network.prototype.connectTo = function(peerId) {
};
Network.prototype.disconnect = function(cb) {
Network.prototype.disconnect = function(cb, forced) {
var self = this;
self.closing = 1;
this.send(null, { type: 'disconnect' }, function() {
var cleanUp = function() {
self.connectedPeers = [];
self.started = false;
self.peerId = null;
if (self.peer) {
self.peer.disconnect();
@ -292,7 +307,12 @@ Network.prototype.disconnect = function(cb) {
}
self.closing = 0;
if (typeof cb === 'function') cb();
});
};
if (!forced) {
this.send(null, { type: 'disconnect' }, cleanUp);
} else {
cleanUp();
}
};
module.exports = require('soop')(Network);

44
js/models/storage/File.js
View file

@ -2,7 +2,6 @@
var imports = require('soop').imports();
var fs = imports.fs || require('fs');
var parent = imports.parent || require('./Base');
var crypto = imports.crypto || require('crypto');
var CryptoJS = require('node-cryptojs-aes').CryptoJS;
var passwords = [];
@ -15,8 +14,33 @@ function Storage(opts) {
}
Storage.parent = parent;
Storage.prototype._encrypt = function(string) {
var encrypted = CryptoJS.AES.encrypt(string, passwords[0]);
var encryptedBase64 = encrypted.toString();
return encryptedBase64;
};
Storage.prototype._encryptObj = function(obj) {
var string = JSON.stringify(obj);
return this._encrypt(string);
};
Storage.prototype._decrypt = function(base64) {
var decrypted = CryptoJS.AES.decrypt(base64, passwords[0]);
var decryptedStr = decrypted.toString(CryptoJS.enc.Utf8);
return decryptedStr;
};
Storage.prototype._decryptObj = function(base64) {
var decryptedStr = this._decrypt(base64);
return JSON.parse(decryptedStr);
};
Storage.prototype.load = function(walletId, callback) {
fs.readFile(walletId, function(err, data) {
var self = this;
fs.readFile(walletId, function(err, base64) {
var data = self._decryptObj(base64);
if (err) return callback(err);
try {
@ -32,10 +56,11 @@ Storage.prototype.load = function(walletId, callback) {
};
Storage.prototype.save = function(walletId, callback) {
var data = JSON.stringify(this.data[walletId]);
var obj = this.data[walletId];
var encryptedBase64 = this._encryptObj(obj);
//TODO: update to use a queue to ensure that saves are made sequentially
fs.writeFile(walletId, data, function(err) {
fs.writeFile(walletId, encryptedBase64, function(err) {
if (callback)
return callback(err);
});
@ -105,16 +130,15 @@ Storage.prototype.setFromObj = function(walletId, obj, callback) {
this.save(walletId, callback);
};
Storage.prototype.setFromEncryptedObj = function(walletId) {
//TODO: implement
Storage.prototype.setFromEncryptedObj = function(walletId, base64, callback) {
var obj = this._decryptObj(base64);
this.setFromObj(walletId, obj, callback);
};
Storage.prototype.getEncryptedObj = function(walletId) {
var data = JSON.stringify(this.data[walletId]);
var encrypted = CryptoJS.AES.encrypt(data, passwords[0]);
var hex = CryptoJS.enc.Hex.stringify(CryptoJS.enc.Base64.parse(encrypted.toString()));
var encryptedBase64 = this._encryptObj(this.data[walletId]);
return hex;
return encryptedBase64;
};
// remove all values

37
js/models/storage/LocalEncrypted.js
View file

@ -25,12 +25,26 @@ Storage.prototype._setPassphrase = function(password) {
pps[this.__uniqueid] = password;
}
Storage.prototype._encrypt = function(data) {
return CryptoJS.AES.encrypt(data, this._getPassphrase());
Storage.prototype._encrypt = function(string) {
var encrypted = CryptoJS.AES.encrypt(string, this._getPassphrase());
var encryptedBase64 = encrypted.toString();
return encryptedBase64;
};
Storage.prototype._decrypt = function(encrypted) {
return CryptoJS.AES.decrypt(encrypted, this._getPassphrase());
Storage.prototype._encryptObj = function(obj) {
var string = JSON.stringify(obj);
return this._encrypt(string);
};
Storage.prototype._decrypt = function(base64) {
var decrypted = CryptoJS.AES.decrypt(base64, this._getPassphrase());
var decryptedStr = decrypted.toString(CryptoJS.enc.Utf8);
return decryptedStr;
};
Storage.prototype._decryptObj = function(base64) {
var decryptedStr = this._decrypt(base64);
return JSON.parse(decryptedStr);
};
Storage.prototype._read = function(k) {
@ -53,6 +67,17 @@ Storage.prototype._write = function(k,v) {
localStorage.setItem(k, v);
};
Storage.prototype.setFromObj = function(walletId, obj) {
for (var i in keys) {
var key = keys[0];
obj[key] = this.get(walletId, key);
}
};
Storage.prototype.setFromEncryptedObj = function(walletId, base64) {
};
Storage.prototype.getEncryptedObj = function(walletId) {
var keys = this._getWalletKeys();
var obj = {};
@ -62,9 +87,9 @@ Storage.prototype.getEncryptedObj = function(walletId) {
}
var str = JSON.stringify(obj);
var hex = CryptoJS.enc.Hex.stringify(CryptoJS.enc.Base64.parse(this._encrypt(str).toString()));
var base64 = this._encrypt(str).toString();
return hex;
return base64;
};
module.exports = require('soop')(Storage);

3
js/services/controllerUtils.js
View file

@ -27,6 +27,7 @@ angular.module('copay.controllerUtils').factory('controllerUtils', function ($ro
});
w.on('created', function() {
console.log('[controllerUtils.js.30:created:] RECV '); //TODO
$location.path('peer');
$rootScope.wallet = w;
@ -41,6 +42,8 @@ angular.module('copay.controllerUtils').factory('controllerUtils', function ($ro
});
w.on('openError', root.onErrorDigest);
w.on('close', root.onErrorDigest);
w.netStart();
console.log('[controllerUtils.js.45] setupUxHandlers END'); //TODO
};
root.setSocketHandlers = function(cb) {