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

Provide address object to intel tee service to display address securely.

Browse source
This commit is contained in:
Andy Phillipson 2017-03-17 17:00:26 -04:00
commit e6d997a701
1 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/js/services/walletService.js
View file

@ -72,7 +72,10 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
root.showReceiveAddressFromHardware = function(wallet, address, cb) { root.showReceiveAddressFromHardware = function(wallet, address, cb) {
switch (wallet.getPrivKeyExternalSourceName()) { switch (wallet.getPrivKeyExternalSourceName()) {
case root.externalSource.intelTEE.id: case root.externalSource.intelTEE.id:
return intelTEE.showReceiveAddress(wallet.credentials.hwInfo.id, address, cb); root.getAddressObj(wallet, address, function(err, addrObj) {
if (err) return cb(err);
return intelTEE.showReceiveAddress(wallet.credentials.hwInfo.id, addrObj, cb);
});
break; break;
default: default:
cb('Error: unrecognized external source'); cb('Error: unrecognized external source');
@ -887,6 +890,21 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
}); });
}; };
root.getAddressObj = function(wallet, address, cb) {
wallet.getMainAddresses({
reverse: true
}, function(err, addr) {
if (err) return cb(err);
var addrObj = lodash.find(addr, function(a) {
return a.address == address;
});
var err = null;
if (!addrObj) {
err = 'Error: specified address not in wallet';
}
return cb(err, addrObj);
});
};
root.isReady = function(wallet, cb) { root.isReady = function(wallet, cb) {
if (!wallet.isComplete()) if (!wallet.isComplete())