diff --git a/app-template/package-template.json b/app-template/package-template.json index c6b567f25..054526a24 100644 --- a/app-template/package-template.json +++ b/app-template/package-template.json @@ -56,7 +56,7 @@ "bezier-easing": "^2.0.3", "bhttp": "^1.2.1", "bitauth": "https://github.com/gabrielbazan7/bitauth.git#copay", - "bitcore-wallet-client": "5.1.2", + "bitcore-wallet-client": "git://github.com/isocolsky/bitcore-wallet-client#369eaede49cd64836015fb9b8a502092ee84dc7c", "bower": "^1.7.9", "cordova-android": "5.1.1", "cordova-custom-config": "^3.0.5", diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js index 78561a45a..6316fd4f8 100644 --- a/src/js/controllers/create.js +++ b/src/js/controllers/create.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('createController', - function($scope, $rootScope, $timeout, $log, lodash, $state, $ionicScrollDelegate, $ionicHistory, profileService, configService, gettextCatalog, ledger, trezor, platformInfo, derivationPathHelper, ongoingProcess, walletService, storageService, popupService, appConfigService) { + function($scope, $rootScope, $timeout, $log, lodash, $state, $ionicScrollDelegate, $ionicHistory, profileService, configService, gettextCatalog, ledger, trezor, intelTEE, platformInfo, derivationPathHelper, ongoingProcess, walletService, storageService, popupService, appConfigService) { var isChromeApp = platformInfo.isChromeApp; var isCordova = platformInfo.isCordova; @@ -68,6 +68,9 @@ angular.module('copayApp.controllers').controller('createController', id: 'new', label: gettextCatalog.getString('Random'), }, { + id: walletService.externalSource.intelTEE.id, + label: gettextCatalog(walletService.externalSource.intelTEE.name), + }, { id: 'set', label: gettextCatalog.getString('Specify Recovery Phrase...'), }]; @@ -81,16 +84,16 @@ angular.module('copayApp.controllers').controller('createController', */ if (appConfigService.name == 'copay') { - if (n > 1 && isChromeApp) { + if (n > 1 && isChromeApp) seedOptions.push({ - id: 'ledger', - label: 'Ledger Hardware Wallet', + id: walletService.externalSource.ledger.id, + label: walletService.externalSource.ledger.longName, }); - } + if (isChromeApp || isDevel) { seedOptions.push({ - id: 'trezor', - label: 'Trezor Hardware Wallet', + id: walletService.externalSource.trezor.id, + label: walletService.externalSource.trezor.longName, }); } } @@ -151,22 +154,36 @@ angular.module('copayApp.controllers').controller('createController', return; } - if ($scope.seedSource.id == 'ledger' || $scope.seedSource.id == 'trezor') { + if ($scope.seedSource.id == walletService.externalSource.ledger.id || $scope.seedSource.id == walletService.externalSource.trezor.id || self.seedSourceId == walletService.externalSource.intelTEE.id) { var account = $scope.formData.account; if (!account || account < 1) { popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Invalid account number')); return; } - if ($scope.seedSource.id == 'trezor') + if ($scope.seedSource.id == walletService.externalSource.trezor.id || self.seedSource.id == walletService.externalSource.intelTEE.id) account = account - 1; opts.account = account; ongoingProcess.set('connecting' + $scope.seedSource.id, true); - var src = $scope.seedSource.id == 'ledger' ? ledger : trezor; + var src; + switch (self.seedSourceId) { + case walletService.externalSource.ledger.id: + src = legder; + break; + case walletService.externalSource.trezor.id: + src = trezor; + break; + case walletService.externalSource.intelTEE.id: + src = intelTEE; + break; + default: + this.error = gettextCatalog('Invalid seed source id: ' + self.seedSourceId); + return; + } - src.getInfoForNewWallet(opts.n > 1, account, function(err, lopts) { + src.getInfoForNewWallet(opts, function(err, lopts) { ongoingProcess.set('connecting' + $scope.seedSource.id, false); if (err) { popupService.showAlert(gettextCatalog.getString('Error'), err); diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js index 3b1c96771..4964058ef 100644 --- a/src/js/controllers/import.js +++ b/src/js/controllers/import.js @@ -3,6 +3,8 @@ angular.module('copayApp.controllers').controller('importController', function($scope, $timeout, $log, $state, $stateParams, $ionicHistory, $ionicScrollDelegate, profileService, configService, sjcl, ledger, trezor, derivationPathHelper, platformInfo, bwcService, ongoingProcess, walletService, popupService, gettextCatalog, appConfigService) { + var isChromeApp = platformInfo.isChromeApp; + var isDevel = platformInfo.isDevel; var reader = new FileReader(); var defaults = configService.getDefaults(); var errors = bwcService.getErrors(); @@ -25,15 +27,15 @@ angular.module('copayApp.controllers').controller('importController', if ($scope.isChromeApp) { $scope.seedOptions.push({ - id: 'ledger', - label: 'Ledger Hardware Wallet', + id: walletService.externalSource.ledger.id, + label: walletService.externalSource.ledger.longName, }); } if ($scope.isChromeApp || $scope.isDevel) { $scope.seedOptions.push({ - id: 'trezor', - label: 'Trezor Hardware Wallet', + id: walletService.externalSource.trezor.id, + label: walletService.externalSource.ledger.longName, }); $scope.formData.seedSource = $scope.seedOptions[0]; } @@ -267,7 +269,7 @@ angular.module('copayApp.controllers').controller('importController', return; } - lopts.externalSource = 'trezor'; + lopts.externalSource = walletService.externalSource.trezor.id; lopts.bwsurl = $scope.formData.bwsurl; ongoingProcess.set('importingWallet', true); $log.debug('Import opts', lopts); @@ -293,7 +295,7 @@ angular.module('copayApp.controllers').controller('importController', var account = $scope.formData.account; - if ($scope.formData.seedSource.id == 'trezor') { + if ($scope.formData.seedSource.id == walletService.externalSource.trezor.id) { if (account < 1) { popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Invalid account number')); return; @@ -302,11 +304,11 @@ angular.module('copayApp.controllers').controller('importController', } switch ($scope.formData.seedSource.id) { - case ('ledger'): + case (walletService.externalSource.ledger.id): ongoingProcess.set('connectingledger', true); $scope.importLedger(account); break; - case ('trezor'): + case (walletService.externalSource.trezor.id): ongoingProcess.set('connectingtrezor', true); $scope.importTrezor(account, $scope.formData.isMultisig); break; @@ -323,7 +325,7 @@ angular.module('copayApp.controllers').controller('importController', return; } - lopts.externalSource = 'ledger'; + lopts.externalSource = lopts.externalSource = walletService.externalSource.ledger.id; lopts.bwsurl = $scope.formData.bwsurl; ongoingProcess.set('importingWallet', true); $log.debug('Import opts', lopts); diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js index 74abe3228..3bbf4813b 100644 --- a/src/js/controllers/join.js +++ b/src/js/controllers/join.js @@ -66,15 +66,15 @@ angular.module('copayApp.controllers').controller('joinController', if (appConfigService.name == 'copay') { if (isChromeApp) { self.seedOptions.push({ - id: 'ledger', - label: 'Ledger Hardware Wallet', + id: walletService.externalSource.ledger.id, + label: walletService.externalSource.ledger.longName, }); } if (isChromeApp || isDevel) { self.seedOptions.push({ - id: 'trezor', - label: 'Trezor Hardware Wallet', + id: walletService.externalSource.trezor.id, + label: walletService.externalSource.trezor.longName, }); } } @@ -130,19 +130,19 @@ angular.module('copayApp.controllers').controller('joinController', return; } - if (self.seedSourceId == 'ledger' || self.seedSourceId == 'trezor') { + if (self.seedSourceId == walletService.externalSource.ledger.id || self.seedSourceId == walletService.externalSource.trezor.id) { var account = $scope.account; if (!account || account < 1) { popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Invalid account number')); return; } - if (self.seedSourceId == 'trezor') + if (self.seedSourceId == walletService.externalSource.trezor.id) account = account - 1; opts.account = account; ongoingProcess.set('connecting' + self.seedSourceId, true); - var src = self.seedSourceId == 'ledger' ? ledger : trezor; + var src = self.seedSourceId == walletService.externalSource.ledger.id ? ledger : trezor; src.getInfoForNewWallet(true, account, function(err, lopts) { ongoingProcess.set('connecting' + self.seedSourceId, false); diff --git a/src/js/controllers/preferences.js b/src/js/controllers/preferences.js index 8b1a8dde0..90ff53f29 100644 --- a/src/js/controllers/preferences.js +++ b/src/js/controllers/preferences.js @@ -89,9 +89,6 @@ angular.module('copayApp.controllers').controller('preferencesController', value: $scope.wallet.balanceHidden }; - if (wallet.isPrivKeyExternal) - $scope.externalSource = wallet.getPrivKeyExternalSourceName() == 'ledger' ? 'Ledger' : 'Trezor'; - $scope.touchIdAvailable = fingerprintService.isAvailable(); $scope.touchIdEnabled = { value: config.touchIdFor ? config.touchIdFor[walletId] : null diff --git a/src/js/controllers/preferencesExternal.js b/src/js/controllers/preferencesExternal.js new file mode 100644 index 000000000..9be05b92f --- /dev/null +++ b/src/js/controllers/preferencesExternal.js @@ -0,0 +1,24 @@ +'use strict'; + +angular.module('copayApp.controllers').controller('preferencesExternalController', function($scope, lodash, profileService, walletService) { + var wallet = profileService.getWallet($stateParams.walletId); + + $scope.externalSource = lodash.find(walletService.externalSource, function(source) { + return source.id == wallet.getPrivKeyExternalSourceName(); + }).name; + + $scope.showMneumonicFromHardwarePopup = function() { + var title = gettextCatalog.getString('Warning!'); + var message = gettextCatalog.getString('Are you being watched? Anyone with your recovery phrase can access or spend your bitcoin.'); + popupService.showConfirm(title, message, null, null, function(res) { + if (res) { + walletService.showMneumonicFromHardware(wallet, function(err) { + if (err) { + popupService.showAlert(gettextCatalog.getString('Error'), err.message || err); + } + }); + } + }); + }; + +}); \ No newline at end of file diff --git a/src/js/controllers/preferencesInformation.js b/src/js/controllers/preferencesInformation.js index 70ba5484e..21dc3db46 100644 --- a/src/js/controllers/preferencesInformation.js +++ b/src/js/controllers/preferencesInformation.js @@ -44,5 +44,13 @@ angular.module('copayApp.controllers').controller('preferencesInformation', $scope.M = c.m; $scope.N = c.n; $scope.pubKeys = lodash.pluck(c.publicKeyRing, 'xPubKey'); + $scope.externalSource = null; + + if (wallet.isPrivKeyExternal()) { + $scope.externalSource = lodash.find(walletService.externalSource, function(source) { + return source.id == wallet.getPrivKeyExternalSourceName(); + }).name; + } }); + }); diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js index 4073e08f9..b8b1a37d2 100644 --- a/src/js/controllers/tab-receive.js +++ b/src/js/controllers/tab-receive.js @@ -145,6 +145,22 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi }); }; + $scope.shouldShowReceiveAddressFromHardware = function() { + var wallet = $scope.wallet; + if (wallet.isPrivKeyExternal() && wallet.credentials.hwInfo) { + return (wallet.credentials.hwInfo.name == walletService.externalSource.intelTEE.id); + } else { + return false; + } + }; + + $scope.showReceiveAddressFromHardware = function() { + var wallet = $scope.wallet; + if (wallet.isPrivKeyExternal() && wallet.credentials.hwInfo) { + walletService.showReceiveAddressFromHardware(wallet, $scope.addr, function(){}); + } + }; + $scope.$on("$ionicView.beforeEnter", function(event, data) { $scope.wallets = profileService.getWallets(); diff --git a/src/js/routes.js b/src/js/routes.js index 45cbc9249..2e14190c0 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -579,6 +579,15 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } } }) + .state('tabs.preferences.preferencesExternal', { + url: '/preferencesExternal', + views: { + 'tab-settings@tabs': { + controller: 'preferencesExternalController', + templateUrl: 'views/preferencesExternal.html' + } + } + }) .state('tabs.preferences.delete', { url: '/delete', views: { diff --git a/src/js/services/hwWallet.js b/src/js/services/hwWallet.js index 1c9314164..f3553bf37 100644 --- a/src/js/services/hwWallet.js +++ b/src/js/services/hwWallet.js @@ -6,9 +6,11 @@ angular.module('copayApp.services') // Ledger magic number to get xPub without user confirmation root.ENTROPY_INDEX_PATH = "0xb11e/"; + root.M = 'm/'; root.UNISIG_ROOTPATH = 44; root.MULTISIG_ROOTPATH = 48; root.LIVENET_PATH = 0; + root.TESTNET_PATH = 1; root._err = function(data) { var msg = data.error || data.message || 'unknown'; @@ -17,26 +19,49 @@ angular.module('copayApp.services') root.getRootPath = function(device, isMultisig, account) { - if (!isMultisig) return root.UNISIG_ROOTPATH; - - // Compat - if (device == 'ledger' && account == 0) return root.UNISIG_ROOTPATH; - - return root.MULTISIG_ROOTPATH; + var path; + if (isMultisig) { + path = root.MULTISIG_ROOTPATH; + } else { + if (device == 'ledger' && account > 0) { + path = root.MULTISIG_ROOTPATH; + } else { + path = root.UNISIG_ROOTPATH; + } + } + if (device == 'intelTEE') { + path = root.M + path; + } + return path; }; - root.getAddressPath = function(device, isMultisig, account) { - return root.getRootPath(device, isMultisig, account) + "'/" + root.LIVENET_PATH + "'/" + account + "'"; - } + root.getAddressPath = function(device, isMultisig, account, network) { + network = network || 'livenet'; + var networkPath = root.LIVENET_PATH; + if (network == 'testnet') { + networkPath = root.TESTNET_PATH; + } + return root.getRootPath(device, isMultisig, account) + "'/" + networkPath + "'/" + account + "'"; + }; root.getEntropyPath = function(device, isMultisig, account) { - var path; + var path = root.ENTROPY_INDEX_PATH; + if (isMultisig) { + path = path + "48'/" + } else { + path = path + "44'/" + } // Old ledger wallet compat - if (device == 'ledger' && account == 0) - return root.ENTROPY_INDEX_PATH + "0'"; + if (device == 'ledger' && account == 0) { + return path + "0'/"; + } - return root.ENTROPY_INDEX_PATH + root.getRootPath(device, isMultisig, account) + "'/" + account + "'"; + if (device == 'intelTEE') { + path = root.M + path; + } + + return path + account + "'"; }; root.pubKeyToEntropySource = function(xPubKey) { diff --git a/src/js/services/intelTEE.js b/src/js/services/intelTEE.js new file mode 100644 index 000000000..6840d10bd --- /dev/null +++ b/src/js/services/intelTEE.js @@ -0,0 +1,191 @@ +'use strict'; + +angular.module('copayApp.services') + .factory('intelTEE', function($log, $timeout, gettext, lodash, bitcore, hwWallet, bwcService, platformInfo) { + + var root = {}; + + if (!platformInfo.isIntelTEE) { + return root; + } + + var IntelWallet = require('intelWalletCon'); + var TEE_APP_ID = '63279de1b6cb4dcf8c206716bd318092f8c206716bd31809263279de1b6cb4dc'; + + root.description = { + id: 'intelTEE', + name: 'Intel TEE', + longName: 'Intel TEE Hardware Wallet', + derivationStrategy: 'BIP44' + }; + + root.walletEnclave = new IntelWallet.Wallet(); + var walletEnclaveStatus = root.walletEnclave.initializeEnclave(); + if (walletEnclaveStatus != 0) { + $log.error('Failed to create Intel Wallet enclave'); + } + + root.getInfoForNewWallet = function(opts, callback) { + initSource(opts, function(err, opts) { + if (err) return callback(err); + + var isMultisig = opts.n > 1; + root.getEntropySource(opts.hwInfo.id, isMultisig, opts.account, function(err, entropySource) { + if (err) return callback(err); + + opts.entropySource = entropySource; + root.getXPubKey(opts.hwInfo.id, hwWallet.getAddressPath(root.description.id, isMultisig, opts.account, opts.networkName), function(data) { + if (!data.success) { + $log.warn(data.message); + return callback(data); + } + opts.extendedPublicKey = data.xpubkey; + opts.externalSource = root.description.id; + opts.derivationStrategy = root.description.derivationStrategy; + + return callback(null, opts); + }); + }); + }); + }; + + root.getXPubKey = function(teeWalletId, path, callback) { + $log.debug('TEE deriving xPub path:', path); + + // Expected to be a extended public key. + var xpubkey = root.walletEnclave.getPublicKey(teeWalletId, path); + + // Error messages returned in value. + var result = { + success: false, + message: xpubkey.ExtendedPublicKey + }; + + // Success indicated by status being equal to the tee wallet id. + if (xpubkey.Status == teeWalletId) { + result.success = true; + result.message = 'OK'; + result.xpubkey = xpubkey.ExtendedPublicKey; + } else { + $log.error('Failed to get xpubkey from TEE wallet: ' + result.message); + } + + callback(result); + }; + + root.getEntropySource = function(teeWalletId, isMultisig, account, callback) { + root.getXPubKey(teeWalletId, hwWallet.getEntropyPath(root.description.id, isMultisig, account), function(data) { + if (!data.success) + return callback(hwWallet._err(data)); + + return callback(null, hwWallet.pubKeyToEntropySource(data.xpubkey)); + }); + }; + + root.showMneumonic = function(teeWalletId, cb) { + var result = root.walletEnclave.displayWordList(teeWalletId, 'en'); + if (result != teeWalletId) { + cb(result); + } else { + cb(); + } + }; + + root.showReceiveAddress = function(teeWalletId, address, cb) { + var isMultisig = false; // TODO + var account = 0; // TODO + var basePath = hwWallet.getAddressPath(root.description.id, isMultisig, account, address.network); + var keyPath = address.path.replace('m', basePath); + + var result = root.walletEnclave.displayReceiveAddress(teeWalletId, keyPath); + if (result != teeWalletId) { + cb(result); + } else { + cb(); + } + }; + + root.signTx = function(teeWalletId, txp, callback) { + var account = 0; // TODO + var isMultisig = txp.requiredSignatures > 1; + var basePath = hwWallet.getAddressPath(root.description.id, isMultisig, account, txp.network); + + var rawTx = bwcService.Client.getRawTx(txp); + var keypaths = lodash.map(lodash.pluck(txp.inputs, 'path'), function(path) { + return path.replace('m', basePath); + }); + var publicKeys = lodash.pluck(txp.inputs, 'publicKeys'); + var changePublicKeys = txp.changeAddress.publicKeys; + publicKeys.push(changePublicKeys); + + var changeaddrpath; + if (txp.changeAddress) { + changeaddrpath = txp.changeAddress.path.replace('m', basePath); + } + + var result; + if (txp.requiredSignatures == 1) { + result = root.walletEnclave.signTransaction(teeWalletId, rawTx, changeaddrpath, keypaths); + } else { + result = root.walletEnclave.signTransaction(teeWalletId, rawTx, changeaddrpath, keypaths, publicKeys, txp.requiredSignatures, changePublicKeys, txp.requiredSignatures); + } + + if (result.Status != teeWalletId) { + return callback('TEE failed to sign transction: ' + result.Status); + } + return callback(null, result); + }; + + function initSource(opts, callback) { + var args = { + "Testnet" : (opts.networkName == 'livenet'? false : true), + "PINUnlockRequired" : false, + "PINSignatureDataRequired" : false, + "PINSignatureTransaction" : 0, + "ExportCount" : 10, + "MaxPINAttempts" : 3, + "PINTimeout" : 30 + }; + + var teeStatus = root.walletEnclave.createWallet(TEE_APP_ID, args); + switch (teeStatus) { + case "CREATE WALLET FAILURE": + case "CREATE WALLET FAILED TO INITIALIZE": + case "CREATE WALLET FAILURE BAD INPUT": + case "CREATE WALLET FAILURE case SERIALIZATION": + case "DELETE_WALLET_AUTHORIZATION_UNSUCCESSFUL": + case "LOAD_WALLET_FAILTURE": + case "IMPORT WORD LIST FAILTURE": + case "IMPORT WORD LIST FAILURE BAD INPUT": + case "IMPORT WORD NOT IN DICTIONARY": + case "INVALID PIN": + case "INVALID APPLICATION ID": + case "DISPLAY WORD LIST FAILURE": + case "DELETE WALLET NO SUCH APPLICATION ID": + case "SIGN DATA FAILURE": + case "SIGN DATA INVALID HASH": + case "SIGN DATA BUFFER TOO SMALL": + case "SIGN DATA INVALID PIN": + case "RECEIVE ADDRESS INVALID INPUT": + case "RECEIVE ADDRESS NULL": + case "RECEIVE ADDRESS BUFFER TOO SMALL": + case "PUBLIC KEY BUFFER TOO SMALL": + case "LOAD WALLET FAILURE": + case "PUBLIC KEY FAILURE": + case "PUBLIC KEY FAIL TO SERIALIZE": + case "UKNOWN ERROR CODE": + $log.error(teeStatus); + return callback(teeStatus); // TODO: translate error text for display + break; + default: + opts.hwInfo = { + name: root.description.id, + id: teeStatus + }; + $log.debug('TEE wallet created: ' + opts.hwInfo); + return callback(null, opts); + } + }; + + return root; +}); \ No newline at end of file diff --git a/src/js/services/ledger.js b/src/js/services/ledger.js index a58aa2906..3e01811b1 100644 --- a/src/js/services/ledger.js +++ b/src/js/services/ledger.js @@ -5,6 +5,12 @@ angular.module('copayApp.services') var root = {}; var LEDGER_CHROME_ID = "kkdpmhnladdopljabkgpacgpliggeeaf"; + root.description = { + id: 'ledger', + name: 'Ledger', + longName: 'Ledger Hardware Wallet' + }; + root.callbacks = {}; root.hasSession = function() { root._message({ @@ -13,7 +19,7 @@ angular.module('copayApp.services') } root.getEntropySource = function(isMultisig, account, callback) { - root.getXPubKey(hwWallet.getEntropyPath('ledger', isMultisig, account), function(data) { + root.getXPubKey(hwWallet.getEntropyPath(root.description.id, isMultisig, account), function(data) { if (!data.success) return callback(hwWallet._err(data)); @@ -30,21 +36,27 @@ angular.module('copayApp.services') }); }; - root.getInfoForNewWallet = function(isMultisig, account, callback) { - root.getEntropySource(isMultisig, account, function(err, entropySource) { + root.initSource = function(opts, callback) { + // No initialization for this hardware source. + return callback(opts); + }; + + root.getInfoForNewWallet = function(opts, callback) { + var isMultisig = opts.n > 1; + root.getEntropySource(isMultisig, opts.account, function(err, entropySource) { if (err) return callback(err); - root.getXPubKey(hwWallet.getAddressPath('ledger', isMultisig, account), function(data) { - if (!data.success) return callback(data); - - var opts = {}; - opts.entropySource = entropySource; + opts.entropySource = entropySource; + root.getXPubKey(hwWallet.getAddressPath(root.description.id, isMultisig, opts.account), function(data) { + if (!data.success) { + $log.warn(data.message); + return callback(data); + } opts.extendedPublicKey = data.xpubkey; - opts.externalSource = 'ledger'; - opts.account = account; + opts.externalSource = root.description.id; // Old ledger compat - opts.derivationStrategy = account ? 'BIP48' : 'BIP44'; + opts.derivationStrategy = opts.account ? 'BIP48' : 'BIP44'; return callback(null, opts); }); }); @@ -57,7 +69,7 @@ angular.module('copayApp.services') var tx = bwcService.getUtils().buildTx(txp); for (var i = 0; i < tx.inputs.length; i++) { redeemScripts.push(new ByteString(tx.inputs[i].redeemScript.toBuffer().toString('hex'), GP.HEX).toString()); - paths.push(hwWallet.getAddressPath('ledger', isMultisig, account) + txp.inputs[i].path.substring(1)); + paths.push(hwWallet.getAddressPath(root.description.id, isMultisig, account) + txp.inputs[i].path.substring(1)); } var splitTransaction = root._splitTransaction(new ByteString(tx.toString(), GP.HEX)); var inputs = []; diff --git a/src/js/services/platformInfo.js b/src/js/services/platformInfo.js index ee7d4c221..2a6d75aea 100644 --- a/src/js/services/platformInfo.js +++ b/src/js/services/platformInfo.js @@ -38,6 +38,7 @@ angular.module('copayApp.services').factory('platformInfo', function($window) { ret.isMobile = ret.isAndroid || ret.isIOS || ret.isWP; ret.isChromeApp = $window.chrome && chrome.runtime && chrome.runtime.id && !ret.isNW; ret.isDevel = !ret.isMobile && !ret.isChromeApp && !ret.isNW; + ret.isIntelTEE = true; return ret; }); diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index e5af8bc22..6ef9b96b0 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -347,6 +347,7 @@ angular.module('copayApp.services') account: opts.account || 0, derivationStrategy: opts.derivationStrategy || 'BIP44', }); + walletClient.credentials.hwInfo = opts.hwInfo; } catch (ex) { $log.warn("Creating wallet from Extended Public Key Arg:", ex, opts); return cb(gettextCatalog.getString('Could not create using the specified extended public key')); diff --git a/src/js/services/trezor.js b/src/js/services/trezor.js index 3a3c48215..c76860ed0 100644 --- a/src/js/services/trezor.js +++ b/src/js/services/trezor.js @@ -7,8 +7,15 @@ angular.module('copayApp.services') var SETTLE_TIME = 3000; root.callbacks = {}; + root.description = { + id: 'trezor', + name: 'Trezor', + longName: 'Trezor Hardware Wallet', + derivationStrategy: 'BIP48' + }; + root.getEntropySource = function(isMultisig, account, callback) { - root.getXPubKey(hwWallet.getEntropyPath('trezor', isMultisig, account), function(data) { + root.getXPubKey(hwWallet.getEntropyPath(root.description.id, isMultisig, account), function(data) { if (!data.success) return callback(hwWallet._err(data)); @@ -26,22 +33,25 @@ angular.module('copayApp.services') } }; + root.initSource = function(opts, callback) { + // No initialization for this hardware source. + return callback(opts); + }; - root.getInfoForNewWallet = function(isMultisig, account, callback) { - var opts = {}; - root.getEntropySource(isMultisig, account, function(err, data) { + root.getInfoForNewWallet = function(opts, callback) { + var isMultisig = opts.n > 1; + root.getEntropySource(isMultisig, opts.account, function(err, data) { if (err) return callback(err); opts.entropySource = data; $log.debug('Waiting TREZOR to settle...'); $timeout(function() { - root.getXPubKey(hwWallet.getAddressPath('trezor', isMultisig, account), function(data) { + root.getXPubKey(hwWallet.getAddressPath(root.description.id, isMultisig, opts.account), function(data) { if (!data.success) return callback(hwWallet._err(data)); opts.extendedPublicKey = data.xpubkey; - opts.externalSource = 'trezor'; - opts.account = account; + opts.externalSource = root.description.id; if (isMultisig) opts.derivationStrategy = 'BIP48'; diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js index 7c3b98f07..53342286e 100644 --- a/src/js/services/walletService.js +++ b/src/js/services/walletService.js @@ -1,10 +1,16 @@ 'use strict'; -angular.module('copayApp.services').factory('walletService', function($log, $timeout, lodash, trezor, ledger, storageService, configService, rateService, uxLanguage, $filter, gettextCatalog, bwcError, $ionicPopup, fingerprintService, ongoingProcess, gettext, $rootScope, txFormatService, $ionicModal, $state, bwcService, bitcore, popupService) { +angular.module('copayApp.services').factory('walletService', function($log, $timeout, lodash, trezor, ledger, intelTEE, storageService, configService, rateService, uxLanguage, $filter, gettextCatalog, bwcError, $ionicPopup, fingerprintService, ongoingProcess, gettext, $rootScope, txFormatService, $ionicModal, $state, bwcService, bitcore, popupService) { // `wallet` is a decorated version of client. var root = {}; + root.externalSource = { + ledger: ledger.description, + trezor: trezor.description, + intelTEE: intelTEE.description + } + root.WALLET_STATUS_MAX_TRIES = 7; root.WALLET_STATUS_DELAY_BETWEEN_TRIES = 1.4 * 1000; root.SOFT_CONFIRMATION_LIMIT = 12; @@ -40,6 +46,40 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim }); }; + var _signWithIntelTEE = function(wallet, txp, cb) { + $log.info('Requesting Intel TEE to sign the transaction'); + + intelTEE.signTx(wallet.credentials.hwInfo.id, txp, function(err, result) { + if (err) return cb(err); + + $log.debug('Intel TEE response', result); + txp.signatures = result.Signatures; + return wallet.signTxProposal(txp, cb); + }); + }; + + root.showMneumonicFromHardware = function(wallet, cb) { + switch (wallet.getPrivKeyExternalSourceName()) { + case root.externalSource.intelTEE.id: + return intelTEE.showMneumonic(wallet.credentials.hwInfo.id, cb); + break; + default: + cb('Error: unrecognized external source'); + break; + } + }; + + root.showReceiveAddressFromHardware = function(wallet, address, cb) { + switch (wallet.getPrivKeyExternalSourceName()) { + case root.externalSource.intelTEE.id: + return intelTEE.showReceiveAddress(wallet.credentials.hwInfo.id, address, cb); + break; + default: + cb('Error: unrecognized external source'); + break; + } + }; + root.invalidateCache = function(wallet) { if (wallet.cachedStatus) wallet.cachedStatus.isValid = false; @@ -629,10 +669,12 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim if (wallet.isPrivKeyExternal()) { switch (wallet.getPrivKeyExternalSourceName()) { - case 'ledger': + case root.externalSource.ledger.id: return _signWithLedger(wallet, txp, cb); - case 'trezor': + case root.externalSource.trezor.id: return _signWithTrezor(wallet, txp, cb); + case root.externalSource.intelTEE.id: + return _signWithIntelTEE(wallet, txp, cb); default: var msg = 'Unsupported External Key:' + wallet.getPrivKeyExternalSourceName(); $log.error(msg); diff --git a/www/img/icon-inteltee-white.svg b/www/img/icon-inteltee-white.svg new file mode 100644 index 000000000..92f9bc4ba --- /dev/null +++ b/www/img/icon-inteltee-white.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + ® + \ No newline at end of file diff --git a/www/views/includes/walletInfo.html b/www/views/includes/walletInfo.html index d4f1fbc17..7b149060e 100644 --- a/www/views/includes/walletInfo.html +++ b/www/views/includes/walletInfo.html @@ -4,7 +4,13 @@
Auditable - + + + +#{{wallet.account || 0}} diff --git a/www/views/preferences.html b/www/views/preferences.html index 5d21e1193..fda6f20d7 100644 --- a/www/views/preferences.html +++ b/www/views/preferences.html @@ -18,12 +18,6 @@ - - Hardware Wallet - - {{externalSource}} - - Color diff --git a/www/views/preferencesExternal.html b/www/views/preferencesExternal.html new file mode 100644 index 000000000..651a394e4 --- /dev/null +++ b/www/views/preferencesExternal.html @@ -0,0 +1,14 @@ + + + {{exteralSource}} + + + + +
+ +
+ + diff --git a/www/views/preferencesInformation.html b/www/views/preferencesInformation.html index bdf2ca9df..060ae55a8 100644 --- a/www/views/preferencesInformation.html +++ b/www/views/preferencesInformation.html @@ -43,6 +43,13 @@ {{derivationStrategy}}
+ + Hardware Wallet + + {{externalSource}} + + +
Hardware Wallet diff --git a/www/views/tab-create-shared.html b/www/views/tab-create-shared.html index 3f9d25811..4b3100247 100644 --- a/www/views/tab-create-shared.html +++ b/www/views/tab-create-shared.html @@ -120,7 +120,7 @@ ng-model="formData.derivationPath"> - + Testnet diff --git a/www/views/tab-import-hardware.html b/www/views/tab-import-hardware.html index 7f750182b..07c715315 100644 --- a/www/views/tab-import-hardware.html +++ b/www/views/tab-import-hardware.html @@ -15,7 +15,7 @@ -
+ + + +
+ +
+ + +