diff --git a/src/js/controllers/shapeshift.js b/src/js/controllers/shapeshift.js index d05c98f1f..0dac21a11 100644 --- a/src/js/controllers/shapeshift.js +++ b/src/js/controllers/shapeshift.js @@ -6,22 +6,6 @@ angular.module('copayApp.controllers').controller('shapeshiftController', functi $scope.showMyAddress = showMyAddress; - function generateAddress(wallet, cb) { - if (!wallet) return; - walletService.getAddress(wallet, false, function(err, addr) { - if (err) { - popupService.showAlert(err); - } - return cb(addr); - }); - } - - function showToWallets() { - $scope.toWallets = $scope.fromWallet.coin === 'btc' ? walletsBch : walletsBtc; - $scope.onToWalletSelect($scope.toWallets[0]); - $scope.singleToWallet = $scope.toWallets.length === 1; - } - $scope.$on("$ionicView.beforeEnter", function(event, data) { walletsBtc = profileService.getWallets({coin: 'btc'}); walletsBch = profileService.getWallets({coin: 'bch'}); diff --git a/src/js/services/incomingData.js b/src/js/services/incomingData.js index 016e39421..3a0dda0a9 100644 --- a/src/js/services/incomingData.js +++ b/src/js/services/incomingData.js @@ -9,9 +9,9 @@ angular.module('copayApp.services').factory('incomingData', function(externalLin }; root.redir = function(data) { - var allParsed = bitcoinUriService.parse(data); + var parsed = bitcoinUriService.parse(data); - if (allParsed.isValid && allParsed.isTestnet) { + if (parsed.isValid && parsed.isTestnet) { popupService.showAlert( gettextCatalog.getString('Unsupported'), gettextCatalog.getString('Testnet is not supported.') @@ -30,13 +30,13 @@ angular.module('copayApp.services').factory('incomingData', function(externalLin * Strategy for the action */ if ( - !allParsed.isValid - || allParsed.privateKey - || (sendFlowService.state.isEmpty() && !allParsed.url && !allParsed.amount) + !parsed.isValid + || parsed.privateKey + || (sendFlowService.state.isEmpty() && !parsed.url && !parsed.amount) ) { root.showMenu({ original: data, - parsed: allParsed + parsed: parsed }); } else { var state = sendFlowService.state.getClone(); @@ -48,329 +48,16 @@ angular.module('copayApp.services').factory('incomingData', function(externalLin */ root.showMenu({ original: data, - parsed: allParsed + parsed: parsed }); }); } } - - // No need to go more far - return; + } /** * The legacy code in the bottom needs to be checked and removed if any case is forgotten. - */ - - if (data.toLowerCase().indexOf('bitcoin') < 0) { - noPrefixInAddress = 1; - } - - if (typeof(data) == 'string' && !(/^bitcoin(cash)?:\?r=[\w+]/).exec(data) && (data.toLowerCase().indexOf('bitcoincash:') >= 0 || data[0] == 'q' || data[0] == 'p' || data[0] == 'C' || data[0] == 'H')) { - try { - noPrefixInAddress = 0; - - if (data[0] == 'p' || data[0] == 'q') { - data = 'bitcoincash:' + data; - } - var paramString = ''; - if (data.indexOf('?') >= 0) { - paramString = data.substring(data.indexOf('?')); - data = data.substring(0, data.indexOf('?')); - } - - if (data.indexOf('BITCOINCASH:') >= 0) { - data = data.toLowerCase(); - } - originalAddress = data.replace('bitcoincash:', ''); - var legacyAddress = bitcoinCashJsService.readAddress(data).legacy; - data = 'bitcoincash:' + legacyAddress + paramString; - } catch (ex) {} - } - - $log.debug('Processing incoming data: ' + data); - - function sanitizeUri(data) { - // Fixes when a region uses comma to separate decimals - var regex = /[\?\&]amount=(\d+([\,\.]\d+)?)/i; - var match = regex.exec(data); - if (!match || match.length === 0) { - return data; - } - var value = match[0].replace(',', '.'); - var newUri = data.replace(regex, value); - - // mobile devices, uris like copay://glidera - newUri.replace('://', ':'); - - return newUri; - } - - function getParameterByName(name, url) { - if (!url) return; - name = name.replace(/[\[\]]/g, "\\$&"); - var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"), - results = regex.exec(url); - if (!results) return null; - if (!results[2]) return ''; - return decodeURIComponent(results[2].replace(/\+/g, " ")); - } - - function checkPrivateKey(privateKey) { - try { - new bitcore.PrivateKey(privateKey, 'livenet'); - } catch (err) { - return false; - } - return true; - } - - function goSend(addr, amount, message, coin, serviceId, serviceData) { - var params = sendFlowService.state.getClone(); - - if (amount) { - params.amount = amount; - } - - if (addr) { - params.toAddress = addr; - params.displayAddress = originalAddress ? originalAddress : addr; - } - - if (coin) { - params.coin = coin; - } - - if (noPrefixInAddress) { - params.noPrefixInAddress = noPrefixInAddress; - } - - if (serviceId) { - params.thirdParty = []; - params.thirdParty.id = serviceId; - params.thirdParty.data = serviceData; - } - - sendFlowService.start(params); - } - - // data extensions for Payment Protocol with non-backwards-compatible request - if (allParsed.isValid && allParsed.coin && allParsed.url && !allParsed.isTestnet) { - var coin = allParsed.coin; - data = allParsed.url; - payproService.getPayProDetails(data, allParsed.coin, function onGetPayProDetails(err, details) { - if (err) { - popupService.showAlert(gettextCatalog.getString('Error'), err); - } else { - handlePayPro(details, allParsed.coin); - } - }); - return true; - } - - data = sanitizeUri(data); - - var addr = ''; - // Bitcoin URL - if (bitcore.URI.isValid(data)) { - var coin = 'btc'; - var parsed = new bitcore.URI(data); - - var addr = parsed.address ? parsed.address.toString() : ''; - var message = parsed.message; - - var amount = parsed.amount ? parsed.amount : ''; - - if (parsed.r) { - payproService.getPayProDetails(parsed.r, coin, function(err, details) { - if (err) { - if (addr && amount) goSend(addr, amount, message, coin, serviceId, serviceData); - else popupService.showAlert(gettextCatalog.getString('Error'), err); - } else handlePayPro(details, coin); - }); - } else { - goSend(addr, amount, message, coin, serviceId, serviceData); - } - return true; - // Cash URI - } else if (allParsed.isValid && allParsed.coin === 'bch' && allParsed.publicAddress && !allParsed.isTestnet) { - var prefix = allParsed.isTestnet ? 'bchtest:' : 'bitcoincash:'; - var addrIn = allParsed.publicAddress.legacy || allParsed.publicAddress.bitpay || prefix + allParsed.publicAddress.cashAddr; - originalAddress = allParsed.publicAddress.cashAddr || allParsed.publicAddress.legacy || allParsed.publicAddress.bitpay; - - var addresses = bitcoinCashJsService.readAddress(addrIn); - if (!addresses) { - return false; - } - addr = addresses.legacy; - var message = allParsed.message; - - var amount = allParsed.amount ? allParsed.amount : ''; - - // paypro not yet supported on cash - if (allParsed.url) { - payproService.getPayProDetails(allParsed.url, allParsed.coin, function(err, details) { - if (err) { - if (addr && amount) - goSend(addr, amount, message, allParsed.coin, serviceId, serviceData); - else - popupService.showAlert(gettextCatalog.getString('Error'), err); - } - handlePayPro(details, allParsed.coin); - }); - } else { - goSend(addr, amount, message, allParsed.coin, serviceId, serviceData); - } - return true; - - // Cash URI with bitcoin (btc) address version number? - } else if (bitcore.URI.isValid(data.replace(/^bitcoincash:/,'bitcoin:'))) { - $log.debug('Handling bitcoincash URI with legacy address'); - var coin = 'bch'; - var parsed = new bitcore.URI(data.replace(/^bitcoincash:/,'bitcoin:')); - - var oldAddr = parsed.address ? parsed.address.toString() : ''; - if (!oldAddr) return false; - - var addr = ''; - - var a = bitcore.Address(oldAddr).toObject(); - addr = bitcoreCash.Address.fromObject(a).toString(); - - // Translate address - $log.debug('address transalated to:' + addr); - popupService.showConfirm( - gettextCatalog.getString('Bitcoin cash Payment'), - gettextCatalog.getString('Payment address was translated to new Bitcoin Cash address format: ' + addr), - gettextCatalog.getString('OK'), - gettextCatalog.getString('Cancel'), - function(ret) { - if (!ret) return false; - - var message = parsed.message; - var amount = parsed.amount ? parsed.amount : ''; - - // paypro not yet supported on cash - if (parsed.r) { - payproService.getPayProDetails(parsed.r, coin, function(err, details) { - if (err) { - if (addr && amount) - goSend(addr, amount, message, coin, serviceId, serviceData); - else - popupService.showAlert(gettextCatalog.getString('Error'), err); - } - handlePayPro(details, coin); - }); - } else { - goSend(addr, amount, message, coin, serviceId, serviceData); - } - } - ); - return true; - // Plain URL - } else if (allParsed.bareUrl) { - - if ($state.includes('tabs.scan')) { - root.showMenu({ - data: allParsed.bareUrl, - type: 'url' - }); - } else { - externalLinkService.open( - allParsed.bareUrl, - true, - gettextCatalog.getString('Open in web browser'), - allParsed.bareUrl - ); - } - return true; - - // Plain Address - } else if (bitcore.Address.isValid(data, 'livenet') || bitcore.Address.isValid(data, 'testnet')) { - if ($state.includes('tabs.scan')) { - root.showMenu({ - data: data, - type: 'bitcoinAddress' - }); - } else { - goToAmountPage(data); - } - } else if (bitcoreCash.Address.isValid(data, 'livenet')) { - if ($state.includes('tabs.scan')) { - root.showMenu({ - data: data, - type: 'bitcoinAddress', - coin: 'bch', - }); - } else { - goToAmountPage(data, 'bch'); - } - } else if (data && data.indexOf(appConfigService.name + '://glidera') === 0) { - var code = getParameterByName('code', data); - $ionicHistory.nextViewOptions({ - disableAnimate: true - }); - $state.go('tabs.home', {}, { - 'reload': true, - 'notify': $state.current.name == 'tabs.home' ? false : true - }).then(function() { - $ionicHistory.nextViewOptions({ - disableAnimate: true - }); - $state.transitionTo('tabs.buyandsell.glidera', { - code: code - }); - }); - return true; - - } else if (data && data.indexOf(appConfigService.name + '://coinbase') === 0) { - var code = getParameterByName('code', data); - $ionicHistory.nextViewOptions({ - disableAnimate: true - }); - $state.go('tabs.home', {}, { - 'reload': true, - 'notify': $state.current.name == 'tabs.home' ? false : true - }).then(function() { - $ionicHistory.nextViewOptions({ - disableAnimate: true - }); - $state.transitionTo('tabs.buyandsell.coinbase', { - code: code - }); - }); - return true; - - // BitPayCard Authentication - } else if (data && data.indexOf(appConfigService.name + '://') === 0) { - - // Disable BitPay Card - if (!appConfigService._enabledExtensions.debitcard) return false; - - var secret = getParameterByName('secret', data); - var email = getParameterByName('email', data); - var otp = getParameterByName('otp', data); - var reason = getParameterByName('r', data); - - $state.go('tabs.home', {}, { - 'reload': true, - 'notify': $state.current.name == 'tabs.home' ? false : true - }).then(function() { - switch (reason) { - default: - case '0': - /* For BitPay card binding */ - $state.transitionTo('tabs.bitpayCardIntro', { - secret: secret, - email: email, - otp: otp - }); - break; - } - }); - return true; - - // Join - } else if (data && data.match(/^copay:[0-9A-HJ-NP-Za-km-z]{70,80}$/)) { + * else if (data && data.match(/^copay:[0-9A-HJ-NP-Za-km-z]{70,80}$/)) { $state.go('tabs.home', {}, { 'reload': true, 'notify': $state.current.name == 'tabs.home' ? false : true @@ -403,88 +90,8 @@ angular.module('copayApp.services').factory('incomingData', function(externalLin code: data }); }); - return true; - - } else { - if ($state.includes('tabs.scan')) { - root.showMenu({ - data: data, - type: 'text' - }); - } - } - return false; - }; - - function goToAmountPage(toAddress, coin) { - var stateParams = { - toAddress: toAddress, - displayAddress: toAddress, - coin: coin, - }; - sendFlowService.start(stateParams); - } - - function handlePayPro(payProData, coin) { - - console.log('payProData', payProData); - - var toAddr = payProData.toAddress; - var amount = payProData.amount; - var paymentUrl = payProData.url; - var expires = payProData.expires; - var time = payProData.time; - - if (coin === 'bch') { - var displayAddr = payProData.outputs[0].address; - toAddr = bitcoinCashJsService.readAddress('bitcoincash:' + displayAddr).legacy; - amount = payProData.outputs[0].amount; - paymentUrl = payProData.paymentUrl; - expires = Math.floor(new Date(expires).getTime() / 1000) - time = Math.ceil(new Date(time).getTime() / 1000) - } - - var name = payProData.domain; - - if (payProData.memo.indexOf('eGifter') > -1) { - name = 'eGifter' - } else if (paymentUrl.indexOf('https://bitpay.com') > -1) { - name = 'BitPay'; - } - - var thirdPartyData = { - id: 'bip70', - amount: amount, - caTrusted: true, - name: name, - domain: payProData.domain, - expires: expires, - memo: payProData.memo, - network: 'livenet', - requiredFeeRate: payProData.requiredFeeRate, - selfSigned: 0, - time: time, - displayAddress: displayAddr, - toAddress: toAddr, - url: paymentUrl, - verified: true - }; - - var stateParams = { - amount: thirdPartyData.amount, - toAddress: thirdPartyData.toAddress, - coin: coin, - thirdParty: thirdPartyData - }; - - // fee - if (thirdPartyData.requiredFeeRate) { - stateParams.requiredFeeRate = thirdPartyData.requiredFeeRate * 1024; - } - - scannerService.pausePreview(); - sendFlowService.start(stateParams); - } + * + */ return root; });