From f808a3afcdbecaedecac73aafeda576d9029cae8 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Wed, 12 Oct 2016 08:57:08 -0400 Subject: [PATCH 001/110] added new logic to external link service to open in system browser with confirm message to notify them they're leaving and give option to cancel --- src/js/controllers/glidera.js | 8 +++++--- src/js/routes.js | 6 ++---- src/js/services/externalLinkService.js | 12 ++++++++---- www/views/amazon.html | 2 +- www/views/buyAmazon.html | 22 +++++++++++----------- www/views/glidera.html | 7 +++---- www/views/modals/amazon-card-details.html | 16 ++++++++-------- www/views/modals/terms.html | 2 +- www/views/modals/tx-details.html | 2 +- www/views/preferencesAbout.html | 2 +- www/views/preferencesLanguage.html | 4 ++-- www/views/tab-settings.html | 2 +- www/views/termsOfUse.html | 2 +- www/views/translators.html | 2 +- www/views/walletDetails.html | 2 +- 15 files changed, 47 insertions(+), 44 deletions(-) diff --git a/src/js/controllers/glidera.js b/src/js/controllers/glidera.js index 9f701e984..9250de9f1 100644 --- a/src/js/controllers/glidera.js +++ b/src/js/controllers/glidera.js @@ -6,7 +6,7 @@ angular.module('copayApp.controllers').controller('glideraController', $scope.network = glideraService.getEnvironment(); $scope.openExternalLink = function(url, target) { - externalLinkService.open(url, target); + externalLinkService.open(url); }; var initGlidera = function(accessToken) { @@ -27,7 +27,9 @@ angular.module('copayApp.controllers').controller('glideraController', } $scope.token = glidera.token; $scope.permissions = glidera.permissions; - $scope.update({fullUpdate: true}); + $scope.update({ + fullUpdate: true + }); }); }; @@ -113,7 +115,7 @@ angular.module('copayApp.controllers').controller('glideraController', }); }; - $scope.$on("$ionicView.beforeEnter", function(event, data){ + $scope.$on("$ionicView.beforeEnter", function(event, data) { initGlidera(); }); diff --git a/src/js/routes.js b/src/js/routes.js index ed29cd0a0..ff3073659 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -971,8 +971,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr if (lodash.isEmpty(profileService.getWallets())) { $log.debug('No wallets and no disclaimer... redirecting'); $state.go('onboarding.welcome'); - } - else { + } else { $log.debug('Display disclaimer... redirecting'); $state.go('onboarding.disclaimer', { resume: true @@ -981,8 +980,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } else { throw new Error(err); // TODO } - } - else { + } else { profileService.storeProfileIfDirty(); $log.debug('Profile loaded ... Starting UX.'); scannerService.gentleInitialize(); diff --git a/src/js/services/externalLinkService.js b/src/js/services/externalLinkService.js index aa1951fd6..58e5dba54 100644 --- a/src/js/services/externalLinkService.js +++ b/src/js/services/externalLinkService.js @@ -1,13 +1,17 @@ 'use strict'; -angular.module('copayApp.services').service('externalLinkService', function(platformInfo, nodeWebkitService) { +angular.module('copayApp.services').service('externalLinkService', function(platformInfo, nodeWebkitService, popupService, gettextCatalog) { - this.open = function(url, target) { + this.open = function(url, desc) { if (platformInfo.isNW) { nodeWebkitService.openExternalLink(url); } else { - target = target || '_blank'; - var ref = window.open(url, target, 'location=no'); + desc = desc || 'this link'; + var message = gettextCatalog.getString('You are leaving to view ' + desc + ''), + openBrowser = function(res) { + if (res) window.open(url, '_system'); + }; + popupService.showConfirm('Opening Browser', message, 'Open', 'Cancel', openBrowser); } }; diff --git a/www/views/amazon.html b/www/views/amazon.html index ad3350ac0..f5499dabb 100644 --- a/www/views/amazon.html +++ b/www/views/amazon.html @@ -24,7 +24,7 @@
Amazon.com Gift Cards never expire and can be redeemed towards millions of items at - www.amazon.com + www.amazon.com
diff --git a/www/views/buyAmazon.html b/www/views/buyAmazon.html index cb0374248..7c22fb9e7 100644 --- a/www/views/buyAmazon.html +++ b/www/views/buyAmazon.html @@ -17,7 +17,7 @@ BitPay Invoice ID: {{buy.errorInfo.invoiceId}}.
- Open invoice + Open invoice
@@ -88,7 +88,7 @@
Thank you for participating in the BitPay offer. It is our pleasure to send you this Amazon.com Gift Card* that can be redeemed towards millions of items at - www.amazon.com. + www.amazon.com. You may want to print this screen for easy reference later you will need the gift card claim code below.
@@ -105,19 +105,19 @@
- See invoice + See invoice
To redeem your gift card, follow these steps:
    -
  1. 1. Visit www.amazon.com/gc +
  2. 1. Visit www.amazon.com/gc
  3. 2. Click Apply to Account and enter the Claim Code when prompted.
  4. 3. Gift card funds will be applied automatically to eligible orders during the checkout process.
  5. 4. You must pay for any remaining balance on your order with another payment method. @@ -130,7 +130,7 @@

    If you have questions about redeeming your gift card, please visit - www.amazon.com/gc-redeem. + www.amazon.com/gc-redeem. If you have questions regarding the BitPay Introductory offer, please contact BitPay.

    @@ -139,14 +139,14 @@
- * Amazon.com is not a sponsor of this promotion. - Except as required by law, Amazon.com + * Amazon.com is not a sponsor of this promotion. + Except as required by law, Amazon.com Gift Cards ("GCs") cannot be transferred for value or redeemed for cash. GCs may be used only for purchases of - eligible goods at Amazon.com or certain of its + eligible goods at Amazon.com or certain of its affiliated websites. For complete terms and conditions, see - www.amazon.com/gc-legal. + www.amazon.com/gc-legal. GCs are issued by ACI Gift Cards, Inc., a Washington corporation. All Amazon ®, ™ & © are IP - of Amazon.com, Inc. or its affiliates. + of Amazon.com, Inc. or its affiliates. No expiration date or service fees.
diff --git a/www/views/glidera.html b/www/views/glidera.html index fb65265e7..436f77932 100644 --- a/www/views/glidera.html +++ b/www/views/glidera.html @@ -37,7 +37,7 @@

Connect your Glidera account to get started

@@ -96,9 +96,8 @@

Complete Setup

Your Glidera account is not ready to transact. Please, verify it at Glidera.io
+ ng-init="glideraUrl = network == 'testnet' ? 'https://sandbox.glidera.io/login' : 'https://glidera.io/login'" + ng-click="openExternalLink(glideraUrl, 'Glidera account verification')"> Go to Glidera
diff --git a/www/views/modals/amazon-card-details.html b/www/views/modals/amazon-card-details.html index daf729be4..95cee6b29 100644 --- a/www/views/modals/amazon-card-details.html +++ b/www/views/modals/amazon-card-details.html @@ -23,7 +23,7 @@
@@ -48,7 +48,7 @@
- See invoice + See invoice
@@ -60,7 +60,7 @@ To redeem your gift card, follow these steps:
    -
  1. 1. Visit www.amazon.com/gc +
  2. 1. Visit www.amazon.com/gc
  3. 2. Click Apply to Account and enter the Claim Code when prompted.
  4. 3. Gift card funds will be applied automatically to eligible orders during the checkout process.
  5. 4. You must pay for any remaining balance on your order with another payment method. @@ -73,7 +73,7 @@

    If you have questions about redeeming your gift card, please visit - www.amazon.com/gc-redeem. + www.amazon.com/gc-redeem. If you have questions regarding the BitPay Introductory offer, please contact BitPay.

    @@ -81,13 +81,13 @@
    * Amazon.com is not a sponsor of this promotion. - Except as required by law, Amazon.com + Except as required by law, Amazon.com Gift Cards ("GCs") cannot be transferred for value or redeemed for cash. GCs may be used only for purchases of - eligible goods at Amazon.com or certain of its + eligible goods at Amazon.com or certain of its affiliated websites. For complete terms and conditions, see - www.amazon.com/gc-legal. + www.amazon.com/gc-legal. GCs are issued by ACI Gift Cards, Inc., a Washington corporation. All Amazon ®, ™ & © are IP - of Amazon.com, Inc. or its affiliates. + of Amazon.com, Inc. or its affiliates. No expiration date or service fees.
    diff --git a/www/views/modals/terms.html b/www/views/modals/terms.html index 743970e06..d2872f95b 100644 --- a/www/views/modals/terms.html +++ b/www/views/modals/terms.html @@ -10,7 +10,7 @@
    - Official English Disclaimer + Official English Disclaimer

    I have read, understood, and agree with the Terms of use.

    diff --git a/www/views/modals/tx-details.html b/www/views/modals/tx-details.html index b5a118a29..51ca318bd 100644 --- a/www/views/modals/tx-details.html +++ b/www/views/modals/tx-details.html @@ -70,7 +70,7 @@
    + ng-click="openExternalLink('https://' + (getShortNetworkName() == 'test' ? 'test-' : '', 'blockchain transaction') + 'insight.bitpay.com/tx/' + btx.txid)"> View transaction on the blockchain
    diff --git a/www/views/preferencesAbout.html b/www/views/preferencesAbout.html index 7c66822e9..72102c1ac 100644 --- a/www/views/preferencesAbout.html +++ b/www/views/preferencesAbout.html @@ -16,7 +16,7 @@ v{{version}} -
    +
    Commit hash diff --git a/www/views/preferencesLanguage.html b/www/views/preferencesLanguage.html index b4544870a..9ad77f72a 100644 --- a/www/views/preferencesLanguage.html +++ b/www/views/preferencesLanguage.html @@ -14,10 +14,10 @@
    All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at - https://crowdin.com/project/copay. + https://crowdin.com/project/copay. Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language.
    - \ No newline at end of file + diff --git a/www/views/tab-settings.html b/www/views/tab-settings.html index c22662e72..80cf2af3b 100644 --- a/www/views/tab-settings.html +++ b/www/views/tab-settings.html @@ -123,7 +123,7 @@
    - + diff --git a/www/views/termsOfUse.html b/www/views/termsOfUse.html index 5d330a0cc..e80a003b2 100644 --- a/www/views/termsOfUse.html +++ b/www/views/termsOfUse.html @@ -11,7 +11,7 @@
    diff --git a/www/views/translators.html b/www/views/translators.html index 6d368914d..961a46e26 100644 --- a/www/views/translators.html +++ b/www/views/translators.html @@ -22,7 +22,7 @@

    All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at - https://crowdin.com/project/copay. + https://crowdin.com/project/copay.

    Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language. diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index 5314a2714..c634c1ef8 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -90,7 +90,7 @@
    -
    +
    {{newRelease}}
    From 3b3d931892f610a398b5fa94d00273083f786c49 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Wed, 12 Oct 2016 11:19:09 -0400 Subject: [PATCH 002/110] added opt in option, and new inputs to make modal completely custom per use. --- src/js/services/externalLinkService.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/js/services/externalLinkService.js b/src/js/services/externalLinkService.js index 58e5dba54..e33bdd871 100644 --- a/src/js/services/externalLinkService.js +++ b/src/js/services/externalLinkService.js @@ -2,16 +2,16 @@ angular.module('copayApp.services').service('externalLinkService', function(platformInfo, nodeWebkitService, popupService, gettextCatalog) { - this.open = function(url, desc) { + this.open = function(url, optIn, title, desc, okText, cancelText) { if (platformInfo.isNW) { nodeWebkitService.openExternalLink(url); } else { - desc = desc || 'this link'; - var message = gettextCatalog.getString('You are leaving to view ' + desc + ''), + var message = gettextCatalog.getString(desc), + title = gettextCatalog.getString(title), openBrowser = function(res) { if (res) window.open(url, '_system'); }; - popupService.showConfirm('Opening Browser', message, 'Open', 'Cancel', openBrowser); + popupService.showConfirm(title, message, 'Open', 'Cancel', openBrowser); } }; From 337b56258e8f4fba539527774e7f31aee43430c4 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Wed, 12 Oct 2016 13:54:02 -0400 Subject: [PATCH 003/110] improved slider card design --- src/sass/views/includes/wallets.scss | 23 ++++++++++++++++++----- www/views/includes/wallets.html | 7 +++++-- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/src/sass/views/includes/wallets.scss b/src/sass/views/includes/wallets.scss index cf2626745..a9894ecf3 100644 --- a/src/sass/views/includes/wallets.scss +++ b/src/sass/views/includes/wallets.scss @@ -1,15 +1,12 @@ .wallets { .slides { .swiper-container { - width: 75% !important; + width: 85% !important; overflow: visible; } .card { - padding: .7rem; - padding-left: .25rem; - padding-right: .25rem; - border-radius: .25rem; max-width: 350px; + box-shadow:$subtle-box-shadow; @media (min-width: 500px) { & { width: 350px; @@ -17,6 +14,22 @@ margin: 1.5rem auto 0; } } + .item{ + padding:.7rem 1.5rem; + span{ + clear:both; + width: 100%; + display: inline-block; + &.wallet-name{ + margin-top:10px; + margin-bottom:5px; + font-size:14px; + } + } + .big-icon-svg{ + & > .bg{padding:.3rem;width: 50px;height:50px;} + } + } } .swiper-slide { width: 100% !important; diff --git a/www/views/includes/wallets.html b/www/views/includes/wallets.html index ad96481e6..6de2c5a5b 100644 --- a/www/views/includes/wallets.html +++ b/www/views/includes/wallets.html @@ -1,12 +1,15 @@
    - +
    - {{wallet.name || wallet.id}} + {{wallet.name || wallet.id}} + + {{wallet.status.availableBalanceStr}} + {{wallet.m}}-of-{{wallet.n}} From fa7c746f5e8c3a010655d15beda3a6ba4072c9ed Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Wed, 12 Oct 2016 15:29:06 -0400 Subject: [PATCH 004/110] added additional options to external service to provide custom message. disabled confirm dialog where needed --- src/js/controllers/amazon.js | 6 ++--- src/js/controllers/buyAmazon.js | 14 +++++++----- src/js/controllers/glidera.js | 4 ++-- .../controllers/modals/amazonCardDetails.js | 6 ++++- src/js/controllers/modals/txDetails.js | 4 ++-- src/js/controllers/onboarding/terms.js | 4 ++-- src/js/controllers/preferencesAbout.js | 4 ++-- src/js/controllers/tab-settings.js | 4 ++-- src/js/services/externalLinkService.js | 20 ++++++++++------- www/views/amazon.html | 2 +- www/views/buyAmazon.html | 22 +++++++++---------- www/views/glidera.html | 4 ++-- www/views/modals/amazon-card-details.html | 16 +++++++------- www/views/modals/terms.html | 2 +- www/views/modals/tx-details.html | 2 +- www/views/preferencesAbout.html | 2 +- www/views/preferencesLanguage.html | 6 +++-- www/views/tab-settings.html | 2 +- www/views/translators.html | 6 +++-- 19 files changed, 73 insertions(+), 57 deletions(-) diff --git a/src/js/controllers/amazon.js b/src/js/controllers/amazon.js index 954c35c24..453cced4e 100644 --- a/src/js/controllers/amazon.js +++ b/src/js/controllers/amazon.js @@ -5,8 +5,8 @@ angular.module('copayApp.controllers').controller('amazonController', $scope.network = amazonService.getEnvironment(); - $scope.openExternalLink = function(url, target) { - externalLinkService.open(url, target); + $scope.openExternalLink = function(url, optIn, title, message, okText, cancelText) { + externalLinkService.open(url, optIn, title, message, okText, cancelText); }; var initAmazon = function() { @@ -83,7 +83,7 @@ angular.module('copayApp.controllers').controller('amazonController', }); }; - $scope.$on("$ionicView.beforeEnter", function(event, data){ + $scope.$on("$ionicView.beforeEnter", function(event, data) { initAmazon(); }); }); diff --git a/src/js/controllers/buyAmazon.js b/src/js/controllers/buyAmazon.js index 903e2a682..ca2aede91 100644 --- a/src/js/controllers/buyAmazon.js +++ b/src/js/controllers/buyAmazon.js @@ -16,12 +16,14 @@ angular.module('copayApp.controllers').controller('buyAmazonController', $log.debug('Wallet changed: ' + w.name); }); - $scope.openExternalLink = function(url, target) { - externalLinkService.open(url, target); + $scope.openExternalLink = function(url, optIn, title, message, okText, cancelText) { + externalLinkService.open(url, optIn, title, message, okText, cancelText); }; this.confirm = function() { - var message = gettextCatalog.getString('Amazon.com Gift Card purchase for ${{amount}} USD', {amount: $scope.formData.fiat}); + var message = gettextCatalog.getString('Amazon.com Gift Card purchase for ${{amount}} USD', { + amount: $scope.formData.fiat + }); var ok = gettextCatalog.getString('Buy'); popupService.showConfirm(null, message, ok, null, function(res) { if (res) self.createTx(); @@ -209,8 +211,10 @@ angular.module('copayApp.controllers').controller('buyAmazonController', }); }; - $scope.$on("$ionicView.enter", function(event, data){ - $scope.formData = { fiat: null }; + $scope.$on("$ionicView.enter", function(event, data) { + $scope.formData = { + fiat: null + }; $scope.wallets = profileService.getWallets({ network: network, onlyComplete: true diff --git a/src/js/controllers/glidera.js b/src/js/controllers/glidera.js index 9250de9f1..c3b9380c9 100644 --- a/src/js/controllers/glidera.js +++ b/src/js/controllers/glidera.js @@ -5,8 +5,8 @@ angular.module('copayApp.controllers').controller('glideraController', $scope.network = glideraService.getEnvironment(); - $scope.openExternalLink = function(url, target) { - externalLinkService.open(url); + $scope.openExternalLink = function(url, optIn, title, message, okText, cancelText) { + externalLinkService.open(url, optIn, title, message, okText, cancelText); }; var initGlidera = function(accessToken) { diff --git a/src/js/controllers/modals/amazonCardDetails.js b/src/js/controllers/modals/amazonCardDetails.js index 9cadccb10..ffe54b713 100644 --- a/src/js/controllers/modals/amazonCardDetails.js +++ b/src/js/controllers/modals/amazonCardDetails.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('amazonCardDetailsController', function($scope, $log, $timeout, bwcError, amazonService, lodash, ongoingProcess, popupService, gettextCatalog) { +angular.module('copayApp.controllers').controller('amazonCardDetailsController', function($scope, $log, $timeout, bwcError, amazonService, lodash, ongoingProcess, popupService, gettextCatalog, externalLinkService) { $scope.cancelGiftCard = function() { ongoingProcess.set('Canceling gift card...', true); @@ -62,4 +62,8 @@ angular.module('copayApp.controllers').controller('amazonCardDetailsController', $scope.amazonCardDetailsModal.hide(); }; + $scope.openExternalLink = function(url, optIn, title, message, okText, cancelText) { + externalLinkService.open(url, optIn, title, message, okText, cancelText); + }; + }); diff --git a/src/js/controllers/modals/txDetails.js b/src/js/controllers/modals/txDetails.js index adb7ddda6..7f3dacf10 100644 --- a/src/js/controllers/modals/txDetails.js +++ b/src/js/controllers/modals/txDetails.js @@ -139,8 +139,8 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio }); }; - $scope.openExternalLink = function(url, target) { - externalLinkService.open(url, target); + $scope.openExternalLink = function(url, optIn, title, message, okText, cancelText) { + externalLinkService.open(url, optIn, title, message, okText, cancelText); }; $scope.getShortNetworkName = function() { diff --git a/src/js/controllers/onboarding/terms.js b/src/js/controllers/onboarding/terms.js index 0c4773c04..f06b8ca20 100644 --- a/src/js/controllers/onboarding/terms.js +++ b/src/js/controllers/onboarding/terms.js @@ -15,8 +15,8 @@ angular.module('copayApp.controllers').controller('termsController', function($s }); }; - $scope.openExternalLink = function(url, target) { - externalLinkService.open(url, target); + $scope.openExternalLink = function(url, optIn, title, message, okText, cancelText) { + externalLinkService.open(url, optIn, title, message, okText, cancelText); }; }); diff --git a/src/js/controllers/preferencesAbout.js b/src/js/controllers/preferencesAbout.js index 64f10de54..e8369abd7 100644 --- a/src/js/controllers/preferencesAbout.js +++ b/src/js/controllers/preferencesAbout.js @@ -8,7 +8,7 @@ angular.module('copayApp.controllers').controller('preferencesAbout', $scope.commitHash = $window.commitHash; $scope.name = $window.appConfig.gitHubRepoName; - $scope.openExternalLink = function(url, target) { - externalLinkService.open(url, target); + $scope.openExternalLink = function(url, optIn, title, message, okText, cancelText) { + externalLinkService.open(url, optIn, title, message, okText, cancelText); }; }); diff --git a/src/js/controllers/tab-settings.js b/src/js/controllers/tab-settings.js index 2981745ca..773a6a5f3 100644 --- a/src/js/controllers/tab-settings.js +++ b/src/js/controllers/tab-settings.js @@ -24,8 +24,8 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct $scope.wallets = profileService.getWallets(); }; - $scope.openExternalLink = function(url, target) { - externalLinkService.open(url, target); + $scope.openExternalLink = function(url, optIn, title, message, okText, cancelText) { + externalLinkService.open(url, optIn, title, message, okText, cancelText); }; $scope.$on("$ionicView.beforeEnter", function(event, data) { diff --git a/src/js/services/externalLinkService.js b/src/js/services/externalLinkService.js index cc0a447fe..8154601d0 100644 --- a/src/js/services/externalLinkService.js +++ b/src/js/services/externalLinkService.js @@ -1,8 +1,8 @@ 'use strict'; -angular.module('copayApp.services').service('externalLinkService', function(platformInfo, nodeWebkitService, popupService, gettextCatalog) { +angular.module('copayApp.services').service('externalLinkService', function(platformInfo, nodeWebkitService, popupService, gettextCatalog, $window, $log, $timeout) { - this.open = function(url, optIn, title, desc, okText, cancelText) { + this.open = function(url, optIn, title, message, okText, cancelText) { var old = $window.handleOpenURL; $window.handleOpenURL = function(url) { @@ -17,12 +17,16 @@ angular.module('copayApp.services').service('externalLinkService', function(plat if (platformInfo.isNW) { nodeWebkitService.openExternalLink(url); } else { - var message = gettextCatalog.getString(desc), - title = gettextCatalog.getString(title), - openBrowser = function(res) { - if (res) window.open(url, '_system'); - }; - popupService.showConfirm(title, message, 'Open', 'Cancel', openBrowser); + if (optIn) { + var message = gettextCatalog.getString(message), + title = gettextCatalog.getString(title), + okText = gettextCatalog.getString(okText), + cancelText = gettextCatalog.getString(cancelText), + openBrowser = function(res) { + if (res) window.open(url, '_system'); + }; + popupService.showConfirm(title, message, okText, cancelText, openBrowser); + } else window.open(url, '_system'); } }; diff --git a/www/views/amazon.html b/www/views/amazon.html index 543ac2a1a..31701b4d6 100644 --- a/www/views/amazon.html +++ b/www/views/amazon.html @@ -24,7 +24,7 @@
    Amazon.com Gift Cards never expire and can be redeemed towards millions of items at - www.amazon.com + www.amazon.com
    diff --git a/www/views/buyAmazon.html b/www/views/buyAmazon.html index 495292aa0..f382490c0 100644 --- a/www/views/buyAmazon.html +++ b/www/views/buyAmazon.html @@ -17,7 +17,7 @@ BitPay Invoice ID: {{buy.errorInfo.invoiceId}}.
    - Open invoice + Open invoice
    @@ -88,7 +88,7 @@
    Thank you for participating in the BitPay offer. It is our pleasure to send you this Amazon.com Gift Card* that can be redeemed towards millions of items at - www.amazon.com. + www.amazon.com. You may want to print this screen for easy reference later you will need the gift card claim code below.
    @@ -105,19 +105,19 @@
    - See invoice + See invoice
    To redeem your gift card, follow these steps:
      -
    1. 1. Visit www.amazon.com/gc +
    2. 1. Visit www.amazon.com/gc
    3. 2. Click Apply to Account and enter the Claim Code when prompted.
    4. 3. Gift card funds will be applied automatically to eligible orders during the checkout process.
    5. 4. You must pay for any remaining balance on your order with another payment method. @@ -130,7 +130,7 @@

      If you have questions about redeeming your gift card, please visit - www.amazon.com/gc-redeem. + www.amazon.com/gc-redeem. If you have questions regarding the BitPay Introductory offer, please contact BitPay.

      @@ -139,14 +139,14 @@
    - * Amazon.com is not a sponsor of this promotion. - Except as required by law, Amazon.com + * Amazon.com is not a sponsor of this promotion. + Except as required by law, Amazon.com Gift Cards ("GCs") cannot be transferred for value or redeemed for cash. GCs may be used only for purchases of - eligible goods at Amazon.com or certain of its + eligible goods at Amazon.com or certain of its affiliated websites. For complete terms and conditions, see - www.amazon.com/gc-legal. + www.amazon.com/gc-legal. GCs are issued by ACI Gift Cards, Inc., a Washington corporation. All Amazon ®, ™ & © are IP - of Amazon.com, Inc. or its affiliates. + of Amazon.com, Inc. or its affiliates. No expiration date or service fees.
    diff --git a/www/views/glidera.html b/www/views/glidera.html index 314297c05..4fe56cb16 100644 --- a/www/views/glidera.html +++ b/www/views/glidera.html @@ -36,7 +36,7 @@

    Connect your Glidera account to get started

    @@ -96,7 +96,7 @@
    Your Glidera account is not ready to transact. Please, verify it at Glidera.io
    + ng-click="openExternalLink(glideraUrl, false)"> Go to Glidera
    diff --git a/www/views/modals/amazon-card-details.html b/www/views/modals/amazon-card-details.html index 95cee6b29..d9c2813e0 100644 --- a/www/views/modals/amazon-card-details.html +++ b/www/views/modals/amazon-card-details.html @@ -23,7 +23,7 @@
    @@ -48,7 +48,7 @@
    - See invoice + See invoice
    @@ -60,7 +60,7 @@ To redeem your gift card, follow these steps:
      -
    1. 1. Visit www.amazon.com/gc +
    2. 1. Visit www.amazon.com/gc
    3. 2. Click Apply to Account and enter the Claim Code when prompted.
    4. 3. Gift card funds will be applied automatically to eligible orders during the checkout process.
    5. 4. You must pay for any remaining balance on your order with another payment method. @@ -73,7 +73,7 @@

      If you have questions about redeeming your gift card, please visit - www.amazon.com/gc-redeem. + www.amazon.com/gc-redeem. If you have questions regarding the BitPay Introductory offer, please contact BitPay.

      @@ -81,13 +81,13 @@
      * Amazon.com is not a sponsor of this promotion. - Except as required by law, Amazon.com + Except as required by law, Amazon.com Gift Cards ("GCs") cannot be transferred for value or redeemed for cash. GCs may be used only for purchases of - eligible goods at Amazon.com or certain of its + eligible goods at Amazon.com or certain of its affiliated websites. For complete terms and conditions, see - www.amazon.com/gc-legal. + www.amazon.com/gc-legal. GCs are issued by ACI Gift Cards, Inc., a Washington corporation. All Amazon ®, ™ & © are IP - of Amazon.com, Inc. or its affiliates. + of Amazon.com, Inc. or its affiliates. No expiration date or service fees.
      diff --git a/www/views/modals/terms.html b/www/views/modals/terms.html index d2872f95b..d5bf23609 100644 --- a/www/views/modals/terms.html +++ b/www/views/modals/terms.html @@ -10,7 +10,7 @@
      - Official English Disclaimer + Official English Disclaimer

      I have read, understood, and agree with the Terms of use.

      diff --git a/www/views/modals/tx-details.html b/www/views/modals/tx-details.html index 47f9911e1..af5272235 100644 --- a/www/views/modals/tx-details.html +++ b/www/views/modals/tx-details.html @@ -70,7 +70,7 @@
      + ng-click="openExternalLink('https://' + (getShortNetworkName() == 'test' ? 'test-' : '', 'blockchain transaction') + 'insight.bitpay.com/tx/' + btx.txid, yes, 'View Transaction on Insight', 'Would you like to view this transaction on the Insight blockchain explorer?
', 'Open Insight', 'Go back')"> View transaction on the blockchain
      diff --git a/www/views/preferencesAbout.html b/www/views/preferencesAbout.html index 356dc74c4..72ff490e6 100644 --- a/www/views/preferencesAbout.html +++ b/www/views/preferencesAbout.html @@ -16,7 +16,7 @@ v{{version}} -
      +
      Commit hash diff --git a/www/views/preferencesLanguage.html b/www/views/preferencesLanguage.html index 9ad77f72a..2c01d7d61 100644 --- a/www/views/preferencesLanguage.html +++ b/www/views/preferencesLanguage.html @@ -13,8 +13,10 @@
      - All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at - https://crowdin.com/project/copay. + We’re always looking for translation contributions! You can make corrections or help to make this app available in your native language by joining our community on Crowdin. + Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language. diff --git a/www/views/tab-settings.html b/www/views/tab-settings.html index 80cf2af3b..2c94c426c 100644 --- a/www/views/tab-settings.html +++ b/www/views/tab-settings.html @@ -123,7 +123,7 @@
      - + diff --git a/www/views/translators.html b/www/views/translators.html index 961a46e26..e2a97d9cb 100644 --- a/www/views/translators.html +++ b/www/views/translators.html @@ -21,8 +21,10 @@

      - All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at - https://crowdin.com/project/copay. + We’re always looking for translation contributions! You can make corrections or help to make this app available in your native language by joining our community on Crowdin. +

      Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language. From 404b76d65b362b81b086a63e6a559eb27e64737d Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Wed, 12 Oct 2016 15:33:52 -0400 Subject: [PATCH 005/110] fix settings view issue --- www/views/tab-settings.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/views/tab-settings.html b/www/views/tab-settings.html index 2c94c426c..e88cf5141 100644 --- a/www/views/tab-settings.html +++ b/www/views/tab-settings.html @@ -123,7 +123,7 @@
      - + From 81a49586fb251e206b71e4ac31b485a0e0d88af5 Mon Sep 17 00:00:00 2001 From: Javier Date: Wed, 12 Oct 2016 14:57:02 -0300 Subject: [PATCH 006/110] export decrypted wallet --- src/js/controllers/preferencesDelete.js | 3 ++- src/js/services/walletService.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/js/controllers/preferencesDelete.js b/src/js/controllers/preferencesDelete.js index 60c1a4c2d..9c30fda2e 100644 --- a/src/js/controllers/preferencesDelete.js +++ b/src/js/controllers/preferencesDelete.js @@ -21,7 +21,8 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro if (err) { popupService.showAlert(gettextCatalog.getString('Error'), err.message || err); } else { - $ionicHistory.removeBackView(); + $ionicHistory.clearHistory(); + $ionicHistory.clearCache(); $state.go('tabs.home'); } }); diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js index 216df83d8..748846d72 100644 --- a/src/js/services/walletService.js +++ b/src/js/services/walletService.js @@ -872,7 +872,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim if (!password) return cb('no password'); if (!wallet.checkPassword(password)) return cb('wrong password'); - + wallet.credentials.decryptPrivateKey(password); return cb(null, password); }); }; From 60f371fe6d2c955bc327a7d5e9d19675d363fdaf Mon Sep 17 00:00:00 2001 From: Javier Date: Wed, 12 Oct 2016 14:58:02 -0300 Subject: [PATCH 007/110] update bwc version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c690d4989..3a2339ec0 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "angular-mocks": "1.4.10", "bezier-easing": "^2.0.3", "bhttp": "^1.2.1", - "bitcore-wallet-client": "4.3.1", + "bitcore-wallet-client": "4.3.2", "bower": "^1.7.9", "chai": "^3.5.0", "cordova-android": "5.1.1", From 696c5bbd1845cbc8457619dfa264a01850e4f636 Mon Sep 17 00:00:00 2001 From: Javier Date: Wed, 12 Oct 2016 18:11:02 -0300 Subject: [PATCH 008/110] fix export wallet --- src/js/controllers/export.js | 99 ++++++++++++++++++++++---------- src/js/services/walletService.js | 40 +++++++------ www/views/export.html | 12 ++-- 3 files changed, 97 insertions(+), 54 deletions(-) diff --git a/src/js/controllers/export.js b/src/js/controllers/export.js index a5a90766b..64fa8ba9d 100644 --- a/src/js/controllers/export.js +++ b/src/js/controllers/export.js @@ -15,6 +15,54 @@ angular.module('copayApp.controllers').controller('exportController', }); }; + function prepareWallet(cb) { + if ($scope.password) return cb($scope.password); + + walletService.prepare(wallet, function(err, password) { + if (err) { + popupService.showAlert(gettextCatalog.getString('Error'), err); + return cb(); + } + $scope.password = password; + + walletService.getEncodedWalletInfo(wallet, $scope.password, function(err, code) { + if (err) { + popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Could not decrypt private key')); + return cb(password); + } + + $scope.file.value = false; + + if (!code) + $scope.formData.supported = false; + else { + $scope.formData.supported = true; + $scope.formData.exportWalletInfo = code; + } + + $timeout(function() { + $scope.$apply(); + }); + return cb(password); + }); + }); + }; + + $scope.generateQrCode = function() { + if ($scope.formData.exportWalletInfo) { + $scope.file.value = false; + $timeout(function() { + $scope.$apply(); + }); + return; + } + + prepareWallet(function(password) { + if (!password) return; + $scope.password = password; + }); + }; + var init = function() { $scope.formData = {}; $scope.isEncrypted = wallet.isPrivKeyEncrypted(); @@ -25,23 +73,6 @@ angular.module('copayApp.controllers').controller('exportController', $scope.wallet = wallet; $scope.canSign = wallet.canSign(); - walletService.getEncodedWalletInfo(wallet, function(err, code) { - if (err || !code) { - $log.warn(err); - return $ionicHistory.goBack(); - } - - if (!code) - $scope.formData.supported = false; - else { - $scope.formData.supported = true; - $scope.formData.exportWalletInfo = code; - } - - $timeout(function() { - $scope.$apply(); - }, 1); - }); }; /* @@ -67,23 +98,28 @@ angular.module('copayApp.controllers').controller('exportController', }; $scope.downloadWalletBackup = function() { - $scope.getAddressbook(function(err, localAddressBook) { - if (err) { - popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Failed to export')); - return; - } - var opts = { - noSign: $scope.formData.noSignEnabled, - addressBook: localAddressBook - }; + prepareWallet(function(password) { + if (!password) return; - backupService.walletDownload($scope.formData.password, opts, function(err) { + $scope.getAddressbook(function(err, localAddressBook) { if (err) { popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Failed to export')); return; } - $ionicHistory.removeBackView(); - $state.go('tabs.home'); + var opts = { + noSign: $scope.formData.noSignEnabled, + addressBook: localAddressBook, + password: password + }; + + backupService.walletDownload($scope.formData.password, opts, function(err) { + if (err) { + popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Failed to export')); + return; + } + $ionicHistory.removeBackView(); + $state.go('tabs.home'); + }); }); }); }; @@ -171,6 +207,11 @@ angular.module('copayApp.controllers').controller('exportController', $scope.$on("$ionicView.beforeEnter", function(event, data) { init(); + $scope.file = { + value: true + }; + $scope.formData.exportWalletInfo = null; + $scope.password = null; }); }); diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js index 748846d72..593698907 100644 --- a/src/js/services/walletService.js +++ b/src/js/services/walletService.js @@ -869,10 +869,9 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim if (!root.isEncrypted(wallet)) return cb(); askPassword(wallet.name, gettext('Enter Spending Password'), function(password) { - if (!password) return cb('no password'); - if (!wallet.checkPassword(password)) return cb('wrong password'); + if (!password) return cb('No password'); + if (!wallet.checkPassword(password)) return cb('Wrong password'); - wallet.credentials.decryptPrivateKey(password); return cb(null, password); }); }; @@ -990,8 +989,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim }); }; - root.getEncodedWalletInfo = function(wallet, cb) { - + root.getEncodedWalletInfo = function(wallet, password, cb) { var derivationPath = wallet.credentials.getBaseAddressDerivationPath(); var encodingType = { mnemonic: 1, @@ -1004,23 +1002,21 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim if (wallet.credentials.derivationStrategy != 'BIP44' || !wallet.canSign()) return null; - root.getKeys(wallet, function(err, keys) { - if (err || !keys) return cb(err); + var keys = root.getKeysWithPassword(wallet, password); - if (keys.mnemonic) { - info = { - type: encodingType.mnemonic, - data: keys.mnemonic, - } - } else { - info = { - type: encodingType.xpriv, - data: keys.xPrivKey - } + if (keys.mnemonic) { + info = { + type: encodingType.mnemonic, + data: keys.mnemonic, } - return cb(null, info.type + '|' + info.data + '|' + wallet.credentials.network.toLowerCase() + '|' + derivationPath + '|' + (wallet.credentials.mnemonicHasPassphrase)); + } else { + info = { + type: encodingType.xpriv, + data: keys.xPrivKey + } + } - }); + return cb(null, info.type + '|' + info.data + '|' + wallet.credentials.network.toLowerCase() + '|' + derivationPath + '|' + (wallet.credentials.mnemonicHasPassphrase)); }; root.setTouchId = function(wallet, enabled, cb) { @@ -1055,6 +1051,12 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim }); }; + root.getKeysWithPassword = function(wallet, password) { + try { + return wallet.getKeys(password); + } catch (e) {} + } + root.getViewStatus = function(wallet, txp) { var status = txp.status; var type; diff --git a/www/views/export.html b/www/views/export.html index b6117ced1..805a84e1c 100644 --- a/www/views/export.html +++ b/www/views/export.html @@ -5,17 +5,17 @@ - -
      -
      + +
      +
      File/Text
      -
      +
      QR Code
      -
      -
      +
      +
      From 18a25775233e3dd403e4ac86acad800c95774d70 Mon Sep 17 00:00:00 2001 From: Javier Date: Wed, 12 Oct 2016 18:42:30 -0300 Subject: [PATCH 009/110] check extended private key at import --- src/js/services/profileService.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index 659f9dd8f..459b3a6e5 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -134,8 +134,7 @@ angular.module('copayApp.services') if (n.type == "NewBlock" && n.data.network == "testnet") { throttledBwsEvent(n, wallet); - } - else newBwsEvent(n, wallet); + } else newBwsEvent(n, wallet); }); wallet.on('walletCompleted', function() { @@ -600,6 +599,7 @@ angular.module('copayApp.services') var walletClient = bwcService.getClient(null, opts); $log.debug('Importing Wallet:', opts); + try { walletClient.import(str, { compressed: opts.compressed, @@ -611,6 +611,11 @@ angular.module('copayApp.services') str = JSON.parse(str); + if (str.xPrivKey) { + delete str.xPrivKeyEncrypted; + delete str.mnemonicEncrypted; + } + var addressBook = str.addressBook || {}; addAndBindWalletClient(walletClient, { From 1c40185b0530a9a79fdb9df937d7369d5f113c93 Mon Sep 17 00:00:00 2001 From: Javier Date: Thu, 13 Oct 2016 10:16:10 -0300 Subject: [PATCH 010/110] complete decrypt pk process --- package.json | 2 +- src/js/controllers/export.js | 71 ++++++++++++++++++-------------- src/js/services/walletService.js | 2 +- 3 files changed, 43 insertions(+), 32 deletions(-) diff --git a/package.json b/package.json index 3a2339ec0..c690d4989 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "angular-mocks": "1.4.10", "bezier-easing": "^2.0.3", "bhttp": "^1.2.1", - "bitcore-wallet-client": "4.3.2", + "bitcore-wallet-client": "4.3.1", "bower": "^1.7.9", "chai": "^3.5.0", "cordova-android": "5.1.1", diff --git a/src/js/controllers/export.js b/src/js/controllers/export.js index 64fa8ba9d..27ebf6705 100644 --- a/src/js/controllers/export.js +++ b/src/js/controllers/export.js @@ -16,22 +16,14 @@ angular.module('copayApp.controllers').controller('exportController', }; function prepareWallet(cb) { - if ($scope.password) return cb($scope.password); + if ($scope.password) return cb(null, $scope.password); walletService.prepare(wallet, function(err, password) { - if (err) { - popupService.showAlert(gettextCatalog.getString('Error'), err); - return cb(); - } + if (err) return cb(err); $scope.password = password; walletService.getEncodedWalletInfo(wallet, $scope.password, function(err, code) { - if (err) { - popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Could not decrypt private key')); - return cb(password); - } - - $scope.file.value = false; + if (err) return cb(err); if (!code) $scope.formData.supported = false; @@ -40,10 +32,7 @@ angular.module('copayApp.controllers').controller('exportController', $scope.formData.exportWalletInfo = code; } - $timeout(function() { - $scope.$apply(); - }); - return cb(password); + return cb(null, password); }); }); }; @@ -57,9 +46,19 @@ angular.module('copayApp.controllers').controller('exportController', return; } - prepareWallet(function(password) { + prepareWallet(function(err, password) { + if (err) { + popupService.showAlert(gettextCatalog.getString('Error'), err); + return; + } if (!password) return; + + $scope.file.value = false; $scope.password = password; + + $timeout(function() { + $scope.$apply(); + }); }); }; @@ -72,7 +71,6 @@ angular.module('copayApp.controllers').controller('exportController', $scope.showAdvanced = false; $scope.wallet = wallet; $scope.canSign = wallet.canSign(); - }; /* @@ -98,7 +96,11 @@ angular.module('copayApp.controllers').controller('exportController', }; $scope.downloadWalletBackup = function() { - prepareWallet(function(password) { + prepareWallet(function(err, password) { + if (err) { + popupService.showAlert(gettextCatalog.getString('Error'), err); + return; + } if (!password) return; $scope.getAddressbook(function(err, localAddressBook) { @@ -140,21 +142,30 @@ angular.module('copayApp.controllers').controller('exportController', }; $scope.getBackup = function(cb) { - $scope.getAddressbook(function(err, localAddressBook) { + prepareWallet(function(err, password) { if (err) { - popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Failed to export')); - return cb(null); + popupService.showAlert(gettextCatalog.getString('Error'), err); + return; } - var opts = { - noSign: $scope.formData.noSignEnabled, - addressBook: localAddressBook - }; + if (!password) return; - var ew = backupService.walletExport($scope.formData.password, opts); - if (!ew) { - popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Failed to export')); - } - return cb(ew); + $scope.getAddressbook(function(err, localAddressBook) { + if (err) { + popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Failed to export')); + return cb(null); + } + var opts = { + noSign: $scope.formData.noSignEnabled, + addressBook: localAddressBook, + password: password + }; + + var ew = backupService.walletExport($scope.formData.password, opts); + if (!ew) { + popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Failed to export')); + } + return cb(ew); + }); }); }; diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js index 593698907..4ea415b0f 100644 --- a/src/js/services/walletService.js +++ b/src/js/services/walletService.js @@ -1000,7 +1000,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim // not supported yet if (wallet.credentials.derivationStrategy != 'BIP44' || !wallet.canSign()) - return null; + return cb(gettextCatalog.getString('Exporting via QR not supported for this wallet')); var keys = root.getKeysWithPassword(wallet, password); From d245123079a45c6963d40dfbf2cc6445f91c1571 Mon Sep 17 00:00:00 2001 From: Javier Date: Thu, 13 Oct 2016 12:13:57 -0300 Subject: [PATCH 011/110] add check and warning before delete the encrypted version --- src/js/services/profileService.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index 459b3a6e5..de2c29e98 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -611,7 +611,8 @@ angular.module('copayApp.services') str = JSON.parse(str); - if (str.xPrivKey) { + if (str.xPrivKey && str.xPrivKeyEncrypted) { + $log.warn('Found both encrypted and decrypted key. Deleting the encrypted version'); delete str.xPrivKeyEncrypted; delete str.mnemonicEncrypted; } From 6df046c315cf37bd6eb841250bfc9d79de65f8e6 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Thu, 13 Oct 2016 11:44:31 -0400 Subject: [PATCH 012/110] updated styles for wallet slider --- src/sass/views/includes/wallets.scss | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/sass/views/includes/wallets.scss b/src/sass/views/includes/wallets.scss index a9894ecf3..ae1d52c83 100644 --- a/src/sass/views/includes/wallets.scss +++ b/src/sass/views/includes/wallets.scss @@ -7,6 +7,7 @@ .card { max-width: 350px; box-shadow:$subtle-box-shadow; + padding:0; @media (min-width: 500px) { & { width: 350px; @@ -15,7 +16,7 @@ } } .item{ - padding:.7rem 1.5rem; + padding:.6rem; span{ clear:both; width: 100%; @@ -23,7 +24,7 @@ &.wallet-name{ margin-top:10px; margin-bottom:5px; - font-size:14px; + font-size:13px; } } .big-icon-svg{ @@ -50,13 +51,14 @@ } &.swiper-slide-prev, &.swiper-slide-next { - opacity: .2; + opacity: .3; + transform: scale(.8); } &.swiper-slide-prev { - left: -5%; + left: 10vw; } &.swiper-slide-next { - left: 4%; + left: -10vw; } } } From 992f0bd8a47960c9f1f70465e59deac412a6b5af Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Thu, 13 Oct 2016 12:11:36 -0400 Subject: [PATCH 013/110] removed new releases link --- www/views/walletDetails.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index 371cfc392..b0d2e784c 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -90,10 +90,6 @@
      -
      - {{newRelease}} -
      -
      From e0046c7d02dcfc67192272cf2c7aad2705153bd8 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Thu, 13 Oct 2016 12:17:19 -0400 Subject: [PATCH 014/110] increase address height --- src/sass/views/tab-receive.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/sass/views/tab-receive.scss b/src/sass/views/tab-receive.scss index 0192e213f..eddb75335 100644 --- a/src/sass/views/tab-receive.scss +++ b/src/sass/views/tab-receive.scss @@ -10,8 +10,10 @@ .border-top{ border-top:1px solid rgb(228,228,228); } + .scroll{height:100%;} #address { background: #fff; + height:70%; .incomplete { padding: 50px; height: 350px; From a0201cfec88d0c757549d5f81d706f10554ce691 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Thu, 13 Oct 2016 12:20:53 -0400 Subject: [PATCH 015/110] removed false declaration, fixed broken string in open link function call --- www/views/amazon.html | 2 +- www/views/buyAmazon.html | 22 +++++++++++----------- www/views/glidera.html | 4 ++-- www/views/modals/amazon-card-details.html | 16 ++++++++-------- www/views/modals/tx-details.html | 2 +- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/www/views/amazon.html b/www/views/amazon.html index 31701b4d6..8e17d5559 100644 --- a/www/views/amazon.html +++ b/www/views/amazon.html @@ -24,7 +24,7 @@
      Amazon.com Gift Cards never expire and can be redeemed towards millions of items at - www.amazon.com + www.amazon.com
      diff --git a/www/views/buyAmazon.html b/www/views/buyAmazon.html index f382490c0..8dc95908e 100644 --- a/www/views/buyAmazon.html +++ b/www/views/buyAmazon.html @@ -17,7 +17,7 @@ BitPay Invoice ID: {{buy.errorInfo.invoiceId}}.
      - Open invoice + Open invoice
      @@ -88,7 +88,7 @@
      Thank you for participating in the BitPay offer. It is our pleasure to send you this Amazon.com Gift Card* that can be redeemed towards millions of items at - www.amazon.com. + www.amazon.com. You may want to print this screen for easy reference later you will need the gift card claim code below.
      @@ -105,19 +105,19 @@
      - See invoice + See invoice
      To redeem your gift card, follow these steps:
        -
      1. 1. Visit www.amazon.com/gc +
      2. 1. Visit www.amazon.com/gc
      3. 2. Click Apply to Account and enter the Claim Code when prompted.
      4. 3. Gift card funds will be applied automatically to eligible orders during the checkout process.
      5. 4. You must pay for any remaining balance on your order with another payment method. @@ -130,7 +130,7 @@

        If you have questions about redeeming your gift card, please visit - www.amazon.com/gc-redeem. + www.amazon.com/gc-redeem. If you have questions regarding the BitPay Introductory offer, please contact BitPay.

        @@ -139,14 +139,14 @@
      - * Amazon.com is not a sponsor of this promotion. - Except as required by law, Amazon.com + * Amazon.com is not a sponsor of this promotion. + Except as required by law, Amazon.com Gift Cards ("GCs") cannot be transferred for value or redeemed for cash. GCs may be used only for purchases of - eligible goods at Amazon.com or certain of its + eligible goods at Amazon.com or certain of its affiliated websites. For complete terms and conditions, see - www.amazon.com/gc-legal. + www.amazon.com/gc-legal. GCs are issued by ACI Gift Cards, Inc., a Washington corporation. All Amazon ®, ™ & © are IP - of Amazon.com, Inc. or its affiliates. + of Amazon.com, Inc. or its affiliates. No expiration date or service fees.
      diff --git a/www/views/glidera.html b/www/views/glidera.html index 4fe56cb16..368651cd6 100644 --- a/www/views/glidera.html +++ b/www/views/glidera.html @@ -36,7 +36,7 @@

      Connect your Glidera account to get started

      @@ -96,7 +96,7 @@
      Your Glidera account is not ready to transact. Please, verify it at Glidera.io
      + ng-click="openExternalLink(glideraUrl)"> Go to Glidera
      diff --git a/www/views/modals/amazon-card-details.html b/www/views/modals/amazon-card-details.html index d9c2813e0..75e6aa7b1 100644 --- a/www/views/modals/amazon-card-details.html +++ b/www/views/modals/amazon-card-details.html @@ -23,7 +23,7 @@
      @@ -48,7 +48,7 @@
      - See invoice + See invoice
      @@ -60,7 +60,7 @@ To redeem your gift card, follow these steps:
        -
      1. 1. Visit www.amazon.com/gc +
      2. 1. Visit www.amazon.com/gc
      3. 2. Click Apply to Account and enter the Claim Code when prompted.
      4. 3. Gift card funds will be applied automatically to eligible orders during the checkout process.
      5. 4. You must pay for any remaining balance on your order with another payment method. @@ -73,7 +73,7 @@

        If you have questions about redeeming your gift card, please visit - www.amazon.com/gc-redeem. + www.amazon.com/gc-redeem. If you have questions regarding the BitPay Introductory offer, please contact BitPay.

        @@ -81,13 +81,13 @@
        * Amazon.com is not a sponsor of this promotion. - Except as required by law, Amazon.com + Except as required by law, Amazon.com Gift Cards ("GCs") cannot be transferred for value or redeemed for cash. GCs may be used only for purchases of - eligible goods at Amazon.com or certain of its + eligible goods at Amazon.com or certain of its affiliated websites. For complete terms and conditions, see - www.amazon.com/gc-legal. + www.amazon.com/gc-legal. GCs are issued by ACI Gift Cards, Inc., a Washington corporation. All Amazon ®, ™ & © are IP - of Amazon.com, Inc. or its affiliates. + of Amazon.com, Inc. or its affiliates. No expiration date or service fees.
        diff --git a/www/views/modals/tx-details.html b/www/views/modals/tx-details.html index af5272235..2db70f5b6 100644 --- a/www/views/modals/tx-details.html +++ b/www/views/modals/tx-details.html @@ -70,7 +70,7 @@
        + ng-click="openExternalLink('https://' + (getShortNetworkName() == 'test' ? 'test-' : '') + 'insight.bitpay.com/tx/' + btx.txid, true, 'View Transaction on Insight', 'Would you like to view this transaction on the Insight blockchain explorer?
', 'Open Insight', 'Go back')"> View transaction on the blockchain
        From 3769772f74caa1eb025ae6246813217043c52a0c Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Thu, 13 Oct 2016 12:22:05 -0400 Subject: [PATCH 016/110] removed duplicate help and support --- www/views/tab-settings.html | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/www/views/tab-settings.html b/www/views/tab-settings.html index 72cb67c18..8f8eba854 100644 --- a/www/views/tab-settings.html +++ b/www/views/tab-settings.html @@ -135,17 +135,6 @@ About {{appName}} - -
        - - - - - Help & Support - - - -
        From 7f09012169c1981793dc8e407bb8dad9ba905218 Mon Sep 17 00:00:00 2001 From: Javier Date: Thu, 13 Oct 2016 15:09:52 -0300 Subject: [PATCH 017/110] Homogenize wallet names --- www/views/tab-settings.html | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/www/views/tab-settings.html b/www/views/tab-settings.html index efd815f57..485a40db5 100644 --- a/www/views/tab-settings.html +++ b/www/views/tab-settings.html @@ -99,9 +99,11 @@ - {{item.name || item.id}} - - {{item.m}}-of-{{item.n}} + + {{item.name || item.id}} + + {{item.m}}-of-{{item.n}} + Incomplete From 4124e68e74f85b04881fbd2bb3cfd11d254a6616 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Thu, 13 Oct 2016 14:28:41 -0400 Subject: [PATCH 018/110] polish for iPhone5 and iPhone 6 --- src/sass/views/tab-receive.scss | 25 ++++++++++++++++++---- www/views/tab-receive.html | 38 +++++++++++++++++---------------- 2 files changed, 41 insertions(+), 22 deletions(-) diff --git a/src/sass/views/tab-receive.scss b/src/sass/views/tab-receive.scss index eddb75335..8c548e518 100644 --- a/src/sass/views/tab-receive.scss +++ b/src/sass/views/tab-receive.scss @@ -13,7 +13,13 @@ .scroll{height:100%;} #address { background: #fff; - height:70%; + height:80%; + article{height: 100%;position: relative;} + #wallet-info{ + position: absolute; + bottom:0; + width:100%; + } .incomplete { padding: 50px; height: 350px; @@ -44,7 +50,6 @@ display: inline-block; font-size: .7rem; } - &-gen-address {} } .qr { padding: 50px 0 20px 0; @@ -58,6 +63,17 @@ padding: 10px; } } + @media (max-height: 600px){ + &{ + height: 77%; + .qr{ + padding:6.5vh 0 2vh; + div{ + transform: scale(.7); + } + } + } + } } #wallets { position: relative; @@ -68,10 +84,11 @@ height: 0; border-style: solid; border-width: 0 20px 20px 20px; - border-color: transparent transparent #f5f5f5 transparent; + border-color: transparent transparent rgb(242,242,242) transparent; top: -9px; position: absolute; - left: 45%; + left: 50%; + transform: translateX(-50%); } } #first-time-tip { diff --git a/www/views/tab-receive.html b/www/views/tab-receive.html index 02f20c7a4..6f70e0fd1 100644 --- a/www/views/tab-receive.html +++ b/www/views/tab-receive.html @@ -59,26 +59,28 @@ -
        -
        -
        - - Share +
        +
        +
        +
        + + Share +
        +
        -
        -
        - - Next Address -
        -
        -
        -
        -
        -
        - - ... - {{addr}} +
        +
        +
        + + ... + {{addr}} +
        From 796b70304e0bb4e9a61ec9151b4b7fb5993aca23 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Thu, 13 Oct 2016 14:33:31 -0400 Subject: [PATCH 019/110] last updates --- www/views/tab-settings.html | 2 +- www/views/termsOfUse.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/www/views/tab-settings.html b/www/views/tab-settings.html index 8f8eba854..76d8e353b 100644 --- a/www/views/tab-settings.html +++ b/www/views/tab-settings.html @@ -20,7 +20,7 @@ Address Book - + diff --git a/www/views/termsOfUse.html b/www/views/termsOfUse.html index d7672a732..93d475dcd 100644 --- a/www/views/termsOfUse.html +++ b/www/views/termsOfUse.html @@ -11,7 +11,7 @@
        From 04539bfca80d68882fc69d8f41b34b7709f633a1 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Thu, 13 Oct 2016 14:34:24 -0400 Subject: [PATCH 020/110] removed typo --- www/views/termsOfUse.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/views/termsOfUse.html b/www/views/termsOfUse.html index 93d475dcd..9421f7fda 100644 --- a/www/views/termsOfUse.html +++ b/www/views/termsOfUse.html @@ -11,7 +11,7 @@
        From 9e5debc1b6c491eb4b34521df9162f0b9b8e0b2d Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Thu, 13 Oct 2016 14:54:54 -0400 Subject: [PATCH 021/110] created responsive view for iPhone 5 through 7 plus --- src/sass/views/tab-receive.scss | 4 ++-- www/views/tab-receive.html | 38 ++++++++++++++++----------------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/src/sass/views/tab-receive.scss b/src/sass/views/tab-receive.scss index 8c548e518..404e67e25 100644 --- a/src/sass/views/tab-receive.scss +++ b/src/sass/views/tab-receive.scss @@ -15,7 +15,7 @@ background: #fff; height:80%; article{height: 100%;position: relative;} - #wallet-info{ + #bit-address{ position: absolute; bottom:0; width:100%; @@ -52,7 +52,7 @@ } } .qr { - padding: 50px 0 20px 0; + padding: 13vh 0 5vh 0; } .backup { background-color: orange; diff --git a/www/views/tab-receive.html b/www/views/tab-receive.html index 6f70e0fd1..7649e9b0c 100644 --- a/www/views/tab-receive.html +++ b/www/views/tab-receive.html @@ -59,28 +59,26 @@
        -
        -
        -
        -
        - - Share -
        +
        +
        +
        + + Share
        -
        -
        -
        -
        - - ... - {{addr}} -
        + +
        +
        +
        +
        + + ... + {{addr}}
        From 2a390760bc1fd79364d7dbfba0ae9cd90573e9b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Thu, 13 Oct 2016 16:09:28 -0300 Subject: [PATCH 022/110] disable email notifications --- src/js/controllers/preferencesEmail.js | 14 ++++++++------ src/sass/views/tab-settings.scss | 3 +++ www/views/preferencesEmail.html | 5 +++-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/js/controllers/preferencesEmail.js b/src/js/controllers/preferencesEmail.js index e4a339ce5..c865c67dc 100644 --- a/src/js/controllers/preferencesEmail.js +++ b/src/js/controllers/preferencesEmail.js @@ -2,23 +2,25 @@ angular.module('copayApp.controllers').controller('preferencesEmailController', function($scope, $ionicHistory, $stateParams, gettextCatalog, profileService, walletService, configService) { - var wallet = profileService.getWallet($stateParams.walletId); - var walletId = wallet.credentials.walletId; + $scope.wallet = profileService.getWallet($stateParams.walletId); + var walletId = $scope.wallet.credentials.walletId; var config = configService.getSync(); config.emailFor = config.emailFor || {}; + $scope.emailForExist = config.emailFor && config.emailFor[walletId]; $scope.email = { value: config.emailFor && config.emailFor[walletId] }; - $scope.save = function() { + + $scope.save = function(val) { var opts = { emailFor: {} }; - opts.emailFor[walletId] = $scope.email.value; + opts.emailFor[walletId] = val; - walletService.updateRemotePreferences(wallet, { - email: $scope.email.value, + walletService.updateRemotePreferences($scope.wallet, { + email: val, }, function(err) { if (err) $log.warn(err); configService.set(opts, function(err) { diff --git a/src/sass/views/tab-settings.scss b/src/sass/views/tab-settings.scss index 5c93e1c02..2dfee3b37 100644 --- a/src/sass/views/tab-settings.scss +++ b/src/sass/views/tab-settings.scss @@ -17,6 +17,9 @@ color: $mid-gray; margin: 1rem 0; } + &-description-disabled { + color: cadetblue; + } .setting-title, .setting-value { display: block; overflow: hidden; diff --git a/www/views/preferencesEmail.html b/www/views/preferencesEmail.html index 06c02aaa1..256e354c4 100644 --- a/www/views/preferencesEmail.html +++ b/www/views/preferencesEmail.html @@ -9,10 +9,11 @@
        - You'll receive email notifications about payments sent and received from this wallet. + You'll receive email notifications about payments sent and received from {{wallet.name}}.
        + Disable notifications
        -
        +
        Remove email notifications
        From 5538591d11e11d03e902afdfd379843347c6a206 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Thu, 13 Oct 2016 16:28:37 -0300 Subject: [PATCH 024/110] fix home tip in chrome app --- src/js/controllers/tab-home.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js index c4fa9b106..e276902ae 100644 --- a/src/js/controllers/tab-home.js +++ b/src/js/controllers/tab-home.js @@ -175,7 +175,7 @@ angular.module('copayApp.controllers').controller('tabHomeController', }; $scope.hideHomeTip = function() { - storageService.setHomeTipAccepted(false, function(error, value) { + storageService.setHomeTipAccepted(JSON.stringify(false), function(error, value) { $scope.homeTip = false; $timeout(function() { $scope.$apply(); From a8becd4ba410234bd88fbe771f972d88b8a74234 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Thu, 13 Oct 2016 16:33:25 -0300 Subject: [PATCH 025/110] fix multiple outputs --- src/js/controllers/modals/txDetails.js | 1 + www/views/includes/output.html | 17 ++++++++------ www/views/modals/tx-details.html | 32 +++++++++++++------------- 3 files changed, 27 insertions(+), 23 deletions(-) diff --git a/src/js/controllers/modals/txDetails.js b/src/js/controllers/modals/txDetails.js index 7f3dacf10..c82343c17 100644 --- a/src/js/controllers/modals/txDetails.js +++ b/src/js/controllers/modals/txDetails.js @@ -24,6 +24,7 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio updateMemo(); initActionList(); getAlternativeAmount(); +console.log('[txDetails.js.16:btx:]',$scope.btx, $scope.btx.addressTo); //TODO }; function updateMemo() { diff --git a/www/views/includes/output.html b/www/views/includes/output.html index d085ecb4d..1decbdff0 100644 --- a/www/views/includes/output.html +++ b/www/views/includes/output.html @@ -1,14 +1,17 @@ -
      6. +
        To: {{output.toAddress || output.address}} -
        7. -
      7. +
        8. + +
        Amount: {{output.amountStr}} - {{output.alternativeAmountStr}} + ({{output.alternativeAmountStr}}) -
        8. -
      8. + + + +
        Note: {{output.message}} -
        9. + diff --git a/www/views/modals/tx-details.html b/www/views/modals/tx-details.html index 2db70f5b6..a34febe9b 100644 --- a/www/views/modals/tx-details.html +++ b/www/views/modals/tx-details.html @@ -55,9 +55,9 @@
        -
        +
        -
        +
        {{btx.merchant.domain}} {{btx.merchant.domain}} @@ -69,6 +69,20 @@
        +
        + {{'Recipients'|translate}} + [ {{btx.recipientCount}} ] + + + +
        + +
        +
        + +
        @@ -120,20 +134,6 @@
        -
        - {{'Recipients'|translate}} - - {{btx.recipientCount}} - - - -
        - -
        -
        -
        This transaction has become invalid; possibly due to a double spend attempt. From b8a9d38fd65d234956e665387499a173ae75c354 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Thu, 13 Oct 2016 16:39:21 -0300 Subject: [PATCH 026/110] rm log --- src/js/controllers/modals/txDetails.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/js/controllers/modals/txDetails.js b/src/js/controllers/modals/txDetails.js index c82343c17..7f3dacf10 100644 --- a/src/js/controllers/modals/txDetails.js +++ b/src/js/controllers/modals/txDetails.js @@ -24,7 +24,6 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio updateMemo(); initActionList(); getAlternativeAmount(); -console.log('[txDetails.js.16:btx:]',$scope.btx, $scope.btx.addressTo); //TODO }; function updateMemo() { From 1b8f65657970cfb96e4bd2b968eba0cff3528364 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Thu, 13 Oct 2016 16:53:15 -0300 Subject: [PATCH 027/110] fix gravatar --- src/js/controllers/addressbookView.js | 31 ++++----------------------- src/js/routes.js | 2 +- www/views/addressbook.html | 4 ++-- 3 files changed, 7 insertions(+), 30 deletions(-) diff --git a/src/js/controllers/addressbookView.js b/src/js/controllers/addressbookView.js index a87d23bec..236070e59 100644 --- a/src/js/controllers/addressbookView.js +++ b/src/js/controllers/addressbookView.js @@ -2,33 +2,10 @@ angular.module('copayApp.controllers').controller('addressbookViewController', function($scope, $state, $timeout, $stateParams, lodash, addressbookService, popupService, $ionicHistory) { - $scope.$on("$ionicView.beforeEnter", function(event, data){ - var address = data.stateParams.address; - - if (!address) { - $ionicHistory.back(); - return; - } - - addressbookService.get(address, function(err, obj) { - if (err) { - popupService.showAlert(err); - return; - } - if (!lodash.isObject(obj)) { - var name = obj; - obj = { - 'name': name, - 'address': address, - 'email': '' - }; - } - $scope.addressbookEntry = obj; - $timeout(function() { - $scope.$apply(); - }); - }); - }); + $scope.addressbookEntry = {}; + $scope.addressbookEntry.name = $stateParams.name; + $scope.addressbookEntry.email = $stateParams.email; + $scope.addressbookEntry.address = $stateParams.address; $scope.sendTo = function() { $ionicHistory.removeBackView(); diff --git a/src/js/routes.js b/src/js/routes.js index 8e9a6729c..caa3df17f 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -571,7 +571,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } }) .state('tabs.addressbook.view', { - url: '/view/:address', + url: '/view/:address/:email/:name', views: { 'tab-settings@tabs': { templateUrl: 'views/addressbook.view.html', diff --git a/www/views/addressbook.html b/www/views/addressbook.html index ea28dd923..19b32979c 100644 --- a/www/views/addressbook.html +++ b/www/views/addressbook.html @@ -24,7 +24,7 @@
        -
        +
        - +
        From 4f5c814c508db93da407f53bf55ab40c69c219fb Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 5 Oct 2016 11:42:40 -0300 Subject: [PATCH 029/110] Fix first view --- src/js/controllers/bitpayCard.js | 1 + src/js/controllers/preferencesBitpayCard.js | 4 ++-- src/sass/views/bitpayCard.scss | 5 ++++- www/views/bitpayCard.html | 12 +++++++----- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/js/controllers/bitpayCard.js b/src/js/controllers/bitpayCard.js index 54a9c09a5..03d1d123f 100644 --- a/src/js/controllers/bitpayCard.js +++ b/src/js/controllers/bitpayCard.js @@ -94,6 +94,7 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi transactions: self.bitpayCardTransactionHistory }; bitpayCardService.setCacheData(cacheData, function(err) { + $scope.bitpayCardCached = true; if (err) $log.error(err); }); }); diff --git a/src/js/controllers/preferencesBitpayCard.js b/src/js/controllers/preferencesBitpayCard.js index 2abf6a8c4..536d4cde6 100644 --- a/src/js/controllers/preferencesBitpayCard.js +++ b/src/js/controllers/preferencesBitpayCard.js @@ -4,8 +4,8 @@ angular.module('copayApp.controllers').controller('preferencesBitpayCardControll function($scope, $state, $timeout, $ionicHistory, bitpayCardService, popupService) { $scope.logout = function() { - var title = 'Are you sure you would like to log out of your Bitpay Card account?'; - popupService.showConfirm(title, null, null, null, function(res) { + var msg = 'Are you sure you would like to log out of your BitPay Card account?'; + popupService.showConfirm(null, msg, null, null, function(res) { if (res) logout(); }); }; diff --git a/src/sass/views/bitpayCard.scss b/src/sass/views/bitpayCard.scss index 5d7b045b6..563554f15 100644 --- a/src/sass/views/bitpayCard.scss +++ b/src/sass/views/bitpayCard.scss @@ -3,12 +3,15 @@ width: 100%; text-align: center; padding: 2rem 1rem 1.5rem 1rem; - min-height: 140px; + height: 140px; border-color: #172565; background-color: #1e3186; background-image: linear-gradient(0deg, #172565, #172565 0%, transparent 0%); color: #fff; } + .wallet-details-wallet-info { + bottom: 5px; + } strong { line-height: 100%; } diff --git a/www/views/bitpayCard.html b/www/views/bitpayCard.html index ab8457b30..b5d3cd836 100644 --- a/www/views/bitpayCard.html +++ b/www/views/bitpayCard.html @@ -92,28 +92,30 @@
        -
        + ng-if="!bitpayCardCached && !loadingHistory && !bitpayCard.bitpayCardTransactionHistory[0]">

        Get started

        Your BitPay Card is ready. Add funds to your card to start using your card at stores and ATMs worldwide.

        -
        +
        - - - -
        - - - - -

        - Enter the verification code generated by the authenticator app on your phone. -

        - -
        - -
        - -
        - - -
        -
        - -
        -
        -
        -
        -
        ${{bitpayCard.bitpayCardCurrentBalance}}
        - - {{'Add Funds'|translate}} - -
        -
        - ... -
        -
        -
        - +
        + ...
        +
        + +
        +
        +
        + {{error}} +
        + +
        + +

        Get started

        +

        Your BitPay Card is ready. Add funds to your card to start using your card at stores and ATMs worldwide.

        +
        + +
        +
        + +
        - -

        Get started

        -

        Your BitPay Card is ready. Add funds to your card to start using your card at stores and ATMs worldwide.

        -
        + ng-repeat="tx in bitpayCard.bitpayCardTransactionHistory | orderBy: ['pending','-timestamp']" + class="item row" + ng-init="bitpayCard.getMerchantInfo(tx)"> +
        + +
        -
        -
        - +
        +
        + {{tx.merchant.name}} +
        +
        + {{tx.merchant.city}}, {{tx.merchant.state}} +
        -
        - -
        - -
        -
        - {{tx.merchant.name}} -
        -
        - {{tx.merchant.city}}, {{tx.merchant.state}} -
        -
        -
        - {{desc}} -
        -
        - - -
        -
        -
        - {{tx.amount | currency:'$':2 }} -
        - + ng-init="desc = bitpayCard.processDescription(tx)" + class="col size-12"> + {{desc}} +
        +
        + + +
        +
        +
        + {{tx.amount | currency:'$':2 }}
        +
        diff --git a/www/views/confirm.html b/www/views/confirm.html index 953dc89fb..9886ca270 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -23,7 +23,16 @@
        To - + + +
        +         + {{toName}} +
        + + + {{_paypro.domain}} +
        {{toAddress}} diff --git a/www/views/tab-home.html b/www/views/tab-home.html index 531cc72eb..81b5551ca 100644 --- a/www/views/tab-home.html +++ b/www/views/tab-home.html @@ -78,7 +78,6 @@ {{wallet.m}}-of-{{wallet.n}}         -

        Incomplete @@ -91,15 +90,15 @@

        - +

        BitPay Card

        -

        Add funds to get started

        - ${{bitpayCard.balance}} +

        {{card.lastFourDigits}}
        From 9196e07f3a851f75ffb5405bcb4fc94c0a63c3bd Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 7 Oct 2016 11:33:39 -0300 Subject: [PATCH 031/110] Fix card intro --- public/views/bitpayCardIntro.html | 89 +++++++++------------------ src/js/controllers/bitpayCardIntro.js | 34 +--------- src/js/services/bitpayCardService.js | 23 ------- src/sass/views/bitpayCardIntro.scss | 14 +---- www/views/tab-home.html | 12 +++- 5 files changed, 47 insertions(+), 125 deletions(-) diff --git a/public/views/bitpayCardIntro.html b/public/views/bitpayCardIntro.html index d272f3639..7b42f3611 100644 --- a/public/views/bitpayCardIntro.html +++ b/public/views/bitpayCardIntro.html @@ -1,74 +1,45 @@ + + - - - - - - - -
        - -
        + +
        + +
        + +

        - Turn bitcoin into dollars, swipe anywhere Visa® is accepted. + Turn bitcoin into dollars, swipe anywhere Visa® is accepted.

        -
        - - -
        -         -         - - -
        - -
        + +

        - Get local cash anywhere you go, from any Visa®-compatible ATM. -

        - *ATM bank fees may apply -
        + Get local cash anywhere you go, from any Visa®-compatible ATM. +
        + *ATM bank fees may apply +

        -
        - - -
        -         -         - - -
        - -
        + +

        - Pay 0% fees to turn bitcoin into dollars. + Pay 0% fees to turn bitcoin into dollars.

        -
        - - -
        -         -         -         + + +
        + + +
        +         diff --git a/src/js/controllers/bitpayCardIntro.js b/src/js/controllers/bitpayCardIntro.js index 042195951..5e26a0218 100644 --- a/src/js/controllers/bitpayCardIntro.js +++ b/src/js/controllers/bitpayCardIntro.js @@ -2,16 +2,6 @@ angular.module('copayApp.controllers').controller('bitpayCardIntroController', function($scope, $state, $timeout, $ionicHistory, storageService, externalLinkService, bitpayCardService, gettextCatalog, popupService) { $scope.$on("$ionicView.beforeEnter", function(event, data) { - $scope.data = { - index: 0 - }; - - $scope.options = { - loop: false, - effect: 'flip', - speed: 500, - spaceBetween: 100 - }; if (data.stateParams && data.stateParams.secret) { var obj = { @@ -25,11 +15,13 @@ angular.module('copayApp.controllers').controller('bitpayCardIntroController', f return; } var title = gettextCatalog.getString('Add BitPay Cards?'); - var msg = gettextCatalog.getString('Would you like to add this account to your wallet?'); + var msg = gettextCatalog.getString('Would you like to add this account ({{email}}) to your wallet?', {email: obj.email}); var ok = gettextCatalog.getString('Add cards'); var cancel = gettextCatalog.getString('Go back'); popupService.showConfirm(title, msg, ok, cancel, function(res) { if (res) { + // Set flag for nextStep + storageService.setNextStep('BitpayCard', true, function(err) {}); // Save data bitpayCardService.setBitpayDebitCards(data, function(err) { if (err) return; @@ -71,25 +63,5 @@ angular.module('copayApp.controllers').controller('bitpayCardIntroController', f var target = '_system'; externalLinkService.open(url, target); }; - - $scope.goBack = function() { - if ($scope.data.index != 0) $scope.slider.slidePrev(); - else $state.go('tabs.home'); - }; - - $scope.slideNext = function() { - if ($scope.data.index != 2) $scope.slider.slideNext(); - else $state.go('tabs.home'); - }; - - $scope.$on("$ionicSlides.sliderInitialized", function(event, data) { - $scope.slider = data.slider; - }); - - $scope.$on("$ionicSlides.slideChangeStart", function(event, data) { - $scope.data.index = data.slider.activeIndex; - }); - - $scope.$on("$ionicSlides.slideChangeEnd", function(event, data) {}); }); diff --git a/src/js/services/bitpayCardService.js b/src/js/services/bitpayCardService.js index 1bce179f1..e01441220 100644 --- a/src/js/services/bitpayCardService.js +++ b/src/js/services/bitpayCardService.js @@ -35,27 +35,6 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http, return error; }; - var _getUser = function(cb) { - _setCredentials(); - storageService.getBitpayCard(credentials.NETWORK, function(err, user) { - if (err) return cb(err); - if (lodash.isString(user)) { - user = JSON.parse(user); - } - return cb(null, user); - }); - }; - - var _setUser = function(user, cb) { - _setCredentials(); - user = JSON.stringify(user); - storageService.setBitpayCard(credentials.NETWORK, user, function(err) { - return cb(err); - }); - // Show pending task from the UI - storageService.setNextStep('BitpayCard', true, function(err) {}); - }; - var _getSession = function(cb) { _setCredentials(); $http({ @@ -179,8 +158,6 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http, data: userData }).then(function(data) { $log.info('BitPay Card BitAuth: SUCCESS'); - // Set an UI flag - storageService.setNextStep('BitpayCard', true, function(err) {}); // Get cards _afterBitAuthSuccess(obj, cb); }, function(data) { diff --git a/src/sass/views/bitpayCardIntro.scss b/src/sass/views/bitpayCardIntro.scss index 1405a2f7d..3ce232b0f 100644 --- a/src/sass/views/bitpayCardIntro.scss +++ b/src/sass/views/bitpayCardIntro.scss @@ -1,11 +1,11 @@ #bitpayCard-intro { - .swiper-container-horizontal > .swiper-pagination { - bottom: 150px; + .slider-pager .slider-pager-page { + color: #fff; } .cta-button{ text-align: center; position: absolute; - bottom: 45px; + bottom: 55px; padding: 0 1.5rem; width: 100%; } @@ -34,14 +34,6 @@ border-color: transparent; border:none; } - .swiper-pagination { - &-bullet { - background: rgb(100, 124, 232); - &-active { - background: rgb(100, 124, 232); - } - } - } .button-transparent{ background: none !important; } diff --git a/www/views/tab-home.html b/www/views/tab-home.html index 81b5551ca..f3bbc976a 100644 --- a/www/views/tab-home.html +++ b/www/views/tab-home.html @@ -97,10 +97,20 @@
        -

        BitPay Card

        +

        BitPay Visa® Card

        {{card.lastFourDigits}}

        + + +
        +         +

        BitPay Visa® Card

        +

        Add your cards

        + +
        From 3f2f169db34392d105db11cf00561dd0af41f9ef Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 7 Oct 2016 13:51:55 -0300 Subject: [PATCH 032/110] Activate caching for bitpay card --- src/js/controllers/bitpayCard.js | 26 +++++++---- src/js/controllers/tab-home.js | 6 +-- src/js/services/bitpayCardService.js | 43 +++++++++++++++++ src/js/services/storageService.js | 12 ++--- www/views/tab-home.html | 69 ++++++++++++++-------------- 5 files changed, 104 insertions(+), 52 deletions(-) diff --git a/src/js/controllers/bitpayCard.js b/src/js/controllers/bitpayCard.js index 8dee60315..f92c3e461 100644 --- a/src/js/controllers/bitpayCard.js +++ b/src/js/controllers/bitpayCard.js @@ -6,13 +6,15 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi $scope.dateRange = 'last30Days'; $scope.network = bitpayCardService.getEnvironment(); - /* - bitpayCardService.getCacheData(function(err, data) { - if (err || lodash.isEmpty(data)) return; - self.bitpayCardTransactionHistory = data.transactions; - self.bitpayCardCurrentBalance = data.balance; - }); - */ + var getFromCache = function() { + bitpayCardService.getBitpayDebitCardsHistory($scope.cardId, function(err, data) { + if (err || lodash.isEmpty(data)) return; + $scope.historyCached = true; + self.bitpayCardTransactionHistory = data.transactions; + self.bitpayCardCurrentBalance = data.balance; + $scope.$apply(); + }); + }; var setDateRange = function(preset) { var startDate, endDate; @@ -54,10 +56,17 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi self.bitpayCardTransactionHistory = history.transactionList; self.bitpayCardCurrentBalance = history.currentCardBalance; - var cacheData = { + var cacheHistory = { balance: self.bitpayCardCurrentBalance, transactions: self.bitpayCardTransactionHistory }; + bitpayCardService.setBitpayDebitCardsHistory($scope.cardId, cacheHistory, {}, function(err) { + if (err) $log.error(err); + $scope.historyCached = true; + }); + $timeout(function() { + $scope.$apply(); + }); }); }; @@ -93,6 +102,7 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi $state.go('tabs.home'); popupService.showAlert(null, msg); } else { + getFromCache(); self.update(); } }); diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js index 7e40a4e2c..996226957 100644 --- a/src/js/controllers/tab-home.js +++ b/src/js/controllers/tab-home.js @@ -206,12 +206,10 @@ angular.module('copayApp.controllers').controller('tabHomeController', if (err) return; $scope.bitpayCards = data.cards; }); - /* - bitpayCardService.getCacheData(function(err, data) { + bitpayCardService.getBitpayDebitCardsHistory(null, function(err, data) { if (err ||  lodash.isEmpty(data)) return; - $scope.bitpayCard = data; + $scope.cardsHistory = data; }); - */ }; $scope.onRefresh = function() { diff --git a/src/js/services/bitpayCardService.js b/src/js/services/bitpayCardService.js index e01441220..ca0c26b63 100644 --- a/src/js/services/bitpayCardService.js +++ b/src/js/services/bitpayCardService.js @@ -278,6 +278,49 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http, }); }; + root.getBitpayDebitCardsHistory = function(cardId, cb) { + _setCredentials(); + storageService.getBitpayDebitCardsHistory(credentials.NETWORK, function(err, data) { + if (err) return cb(err); + if (lodash.isString(data)) { + data = JSON.parse(data); + } + data = data || {}; + if (cardId) data = data[cardId]; + return cb(null, data); + }); + }; + + root.setBitpayDebitCardsHistory = function(cardId, data, opts, cb) { + _setCredentials(); + storageService.getBitpayDebitCardsHistory(credentials.NETWORK, function(err, oldData) { + if (lodash.isString(oldData)) { + oldData = JSON.parse(oldData); + } + if (lodash.isString(data)) { + data = JSON.parse(data); + } + var inv = oldData || {}; + inv[cardId] = data; + if (opts && opts.remove) { + delete(inv[cardId]); + } + inv = JSON.stringify(inv); + + storageService.setBitpayDebitCardsHistory(credentials.NETWORK, inv, function(err) { + return cb(err); + }); + }); + }; + + root.removeBitpayDebitCardsHistory = function(cb) { + _setCredentials(); + storageService.removeBitpayDebitCardsHistory(credentials.NETWORK, function(err) { + if (err) return cb(err); + return cb(); + }); + }; + root.logout = function(cb) { _setCredentials(); storageService.removeBitpayDebitCards(credentials.NETWORK, function(err) { diff --git a/src/js/services/storageService.js b/src/js/services/storageService.js index bbbcea5a0..1cce7006a 100644 --- a/src/js/services/storageService.js +++ b/src/js/services/storageService.js @@ -325,16 +325,16 @@ angular.module('copayApp.services') storage.remove('coinbaseTxs-' + network, cb); }; - root.setBitpayCard = function(network, data, cb) { - storage.set('bitpayCard-' + network, data, cb); + root.setBitpayDebitCardsHistory = function(network, data, cb) { + storage.set('bitpayDebitCardsHistory-' + network, data, cb); }; - root.getBitpayCard = function(network, cb) { - storage.get('bitpayCard-' + network, cb); + root.getBitpayDebitCardsHistory = function(network, cb) { + storage.get('bitpayDebitCardsHistory-' + network, cb); }; - root.removeBitpayCard = function(network, cb) { - storage.remove('bitpayCard-' + network, cb); + root.removeBitpayDebitCardsHistory = function(network, cb) { + storage.remove('bitpayDebitCardsHistory-' + network, cb); }; root.setBitpayDebitCards = function(network, data, cb) { diff --git a/www/views/tab-home.html b/www/views/tab-home.html index f3bbc976a..32dfafe21 100644 --- a/www/views/tab-home.html +++ b/www/views/tab-home.html @@ -78,40 +78,41 @@ {{wallet.m}}-of-{{wallet.n}} -

        - - Incomplete - - - {{wallet.status.availableBalanceStr}} - [Balance Hidden] - -   -

        - - - - -
        -         -

        BitPay Visa® Card

        -

        {{card.lastFourDigits}}

        - -         - - -
        -         -

        BitPay Visa® Card

        -

        Add your cards

        - -         -
        + + +

        + + Incomplete + + + {{wallet.status.availableBalanceStr}} + [Balance Hidden] + +   +

        + + + + +
        +         +

        BitPay Visa® Card

        +

        {{!cardsHistory[card.id].balance ? '$' + cardsHistory[card.id].balance : 'Add funds to get started'|translate}}

        + +         + + +
        +         +

        BitPay Visa® Card

        +

        Add your cards

        + +
        From c14a3b065880133ee228c702e3b77331611f2554 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 7 Oct 2016 13:52:55 -0300 Subject: [PATCH 033/110] Fix tab-home --- www/views/tab-home.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/views/tab-home.html b/www/views/tab-home.html index 32dfafe21..a072aa704 100644 --- a/www/views/tab-home.html +++ b/www/views/tab-home.html @@ -100,7 +100,7 @@

        BitPay Visa® Card

        -

        {{!cardsHistory[card.id].balance ? '$' + cardsHistory[card.id].balance : 'Add funds to get started'|translate}}

        +

        {{cardsHistory[card.id].balance ? '$' + cardsHistory[card.id].balance : 'Add funds to get started'|translate}}

        Date: Fri, 7 Oct 2016 15:51:15 -0300 Subject: [PATCH 034/110] Removes cards. Fix history. New method getInvoiceHistory --- src/js/controllers/bitpayCard.js | 13 ++--- src/js/controllers/bitpayCardIntro.js | 56 +++++++++++++-------- src/js/controllers/preferencesBitpayCard.js | 19 ++++--- src/js/routes.js | 1 + src/js/services/bitpayCardService.js | 27 ++++++---- www/views/bitpayCard.html | 6 +-- www/views/preferencesBitpayCard.html | 21 +++++--- 7 files changed, 89 insertions(+), 54 deletions(-) diff --git a/src/js/controllers/bitpayCard.js b/src/js/controllers/bitpayCard.js index f92c3e461..56d6750a8 100644 --- a/src/js/controllers/bitpayCard.js +++ b/src/js/controllers/bitpayCard.js @@ -6,13 +6,13 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi $scope.dateRange = 'last30Days'; $scope.network = bitpayCardService.getEnvironment(); - var getFromCache = function() { + var getFromCache = function(cb) { bitpayCardService.getBitpayDebitCardsHistory($scope.cardId, function(err, data) { - if (err || lodash.isEmpty(data)) return; + if (err || lodash.isEmpty(data)) return cb(); $scope.historyCached = true; self.bitpayCardTransactionHistory = data.transactions; self.bitpayCardCurrentBalance = data.balance; - $scope.$apply(); + return cb(); }); }; @@ -53,7 +53,7 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi return; } - self.bitpayCardTransactionHistory = history.transactionList; + self.bitpayCardTransactionHistory = history.txs; self.bitpayCardCurrentBalance = history.currentCardBalance; var cacheHistory = { @@ -102,8 +102,9 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi $state.go('tabs.home'); popupService.showAlert(null, msg); } else { - getFromCache(); - self.update(); + getFromCache(function() { + self.update(); + }); } }); diff --git a/src/js/controllers/bitpayCardIntro.js b/src/js/controllers/bitpayCardIntro.js index 5e26a0218..09ea1a96c 100644 --- a/src/js/controllers/bitpayCardIntro.js +++ b/src/js/controllers/bitpayCardIntro.js @@ -1,6 +1,17 @@ 'use strict'; angular.module('copayApp.controllers').controller('bitpayCardIntroController', function($scope, $state, $timeout, $ionicHistory, storageService, externalLinkService, bitpayCardService, gettextCatalog, popupService) { + var checkOtp = function(obj, cb) { + if (obj.otp) { + var msg = gettextCatalog.getString('Enter Two Factor for BitPay Cards'); + popupService.showPrompt(null, msg, null, function(res) { + cb(res); + }); + } else { + cb(); + } + }; + $scope.$on("$ionicView.beforeEnter", function(event, data) { if (data.stateParams && data.stateParams.secret) { @@ -9,28 +20,31 @@ angular.module('copayApp.controllers').controller('bitpayCardIntroController', f email: data.stateParams.email, otp: data.stateParams.otp }; - bitpayCardService.bitAuthPair(obj, function(err, data) { - if (err) { - popupService.showAlert(null, err); - return; - } - var title = gettextCatalog.getString('Add BitPay Cards?'); - var msg = gettextCatalog.getString('Would you like to add this account ({{email}}) to your wallet?', {email: obj.email}); - var ok = gettextCatalog.getString('Add cards'); - var cancel = gettextCatalog.getString('Go back'); - popupService.showConfirm(title, msg, ok, cancel, function(res) { - if (res) { - // Set flag for nextStep - storageService.setNextStep('BitpayCard', true, function(err) {}); - // Save data - bitpayCardService.setBitpayDebitCards(data, function(err) { - if (err) return; - $ionicHistory.nextViewOptions({ - disableAnimate: true - }); - $state.go('tabs.home'); - }); + checkOtp(obj, function(otp) { + obj.otp = otp; + bitpayCardService.bitAuthPair(obj, function(err, data) { + if (err) { + popupService.showAlert(null, err); + return; } + var title = gettextCatalog.getString('Add BitPay Cards?'); + var msg = gettextCatalog.getString('Would you like to add this account ({{email}}) to your wallet?', {email: obj.email}); + var ok = gettextCatalog.getString('Add cards'); + var cancel = gettextCatalog.getString('Go back'); + popupService.showConfirm(title, msg, ok, cancel, function(res) { + if (res) { + // Set flag for nextStep + storageService.setNextStep('BitpayCard', true, function(err) {}); + // Save data + bitpayCardService.setBitpayDebitCards(data, function(err) { + if (err) return; + $ionicHistory.nextViewOptions({ + disableAnimate: true + }); + $state.go('tabs.home'); + }); + } + }); }); }); } else { diff --git a/src/js/controllers/preferencesBitpayCard.js b/src/js/controllers/preferencesBitpayCard.js index 536d4cde6..0fb74d228 100644 --- a/src/js/controllers/preferencesBitpayCard.js +++ b/src/js/controllers/preferencesBitpayCard.js @@ -1,17 +1,17 @@ 'use strict'; angular.module('copayApp.controllers').controller('preferencesBitpayCardController', - function($scope, $state, $timeout, $ionicHistory, bitpayCardService, popupService) { + function($scope, $state, $timeout, $ionicHistory, bitpayCardService, popupService, gettextCatalog) { - $scope.logout = function() { - var msg = 'Are you sure you would like to log out of your BitPay Card account?'; + $scope.remove = function() { + var msg = gettextCatalog.getString('Are you sure you would like to remove your BitPay Card account from this device?'); popupService.showConfirm(null, msg, null, null, function(res) { - if (res) logout(); + if (res) remove(); }); }; - var logout = function() { - bitpayCardService.logout(function() { + var remove = function() { + bitpayCardService.remove(function() { $ionicHistory.removeBackView(); $timeout(function() { $state.go('tabs.home'); @@ -19,4 +19,11 @@ angular.module('copayApp.controllers').controller('preferencesBitpayCardControll }); }; + $scope.$on("$ionicView.beforeEnter", function(event, data) { + bitpayCardService.getBitpayDebitCards(function(err, data) { + if (err) return; + $scope.bitpayCards = data.cards; + }); + }); + }); diff --git a/src/js/routes.js b/src/js/routes.js index 72c269060..0a841ebe2 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -887,6 +887,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr url: '/preferences', views: { 'tab-home@tabs': { + controller: 'preferencesBitpayCardController', templateUrl: 'views/preferencesBitpayCard.html' } } diff --git a/src/js/services/bitpayCardService.js b/src/js/services/bitpayCardService.js index ca0c26b63..7c91bc8a4 100644 --- a/src/js/services/bitpayCardService.js +++ b/src/js/services/bitpayCardService.js @@ -194,15 +194,17 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http, root.getHistory = function(cardId, params, cb) { params = params || {}; var json = {}; -// json = { -// method: 'getInvoiceHistory' -// }; + json = { + method: 'getInvoiceHistory', + params: JSON.stringify(params) + }; root.getBitpayDebitCards(function(err, data) { var card = lodash.find(data.cards, {id : cardId}); if (!card) return cb(_setError('No card available')); // Get invoices -// $http(_postBitAuth('/api/v2/' + card.token, json)).then(function(data) { -// var invoices = data.data.data; + $http(_postBitAuth('/api/v2/' + card.token, json)).then(function(data) { + $log.info('BitPay Get Invoices: SUCCESS'); + var invoices = data.data.data; json = { method: 'getTransactionHistory', params: JSON.stringify(params) @@ -211,14 +213,14 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http, $http(_postBitAuth('/api/v2/' + card.token, json)).then(function(data) { $log.info('BitPay Get Transactions: SUCCESS'); var history = data.data.data || data.data; -// history['txs'] = _processTransactions(invoices, history.transactionList); + history['txs'] = _processTransactions(invoices, history.transactionList); return cb(null, history); }, function(data) { return cb(_setError('BitPay Card Error: Get Transactions', data)); }); -// }, function(data) { -// return cb(_setError('BitPay Card Error: Get Invoices', data)); -// }); + }, function(data) { + return cb(_setError('BitPay Card Error: Get Invoices', data)); + }); }); }; @@ -321,10 +323,13 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http, }); }; - root.logout = function(cb) { + root.remove = function(cb) { _setCredentials(); storageService.removeBitpayDebitCards(credentials.NETWORK, function(err) { - $log.info('BitPay Logout: SUCCESS'); + storageService.removeBitpayDebitCardsHistory(credentials.NETWORK, function(err) { + $log.info('BitPay Debit Cards Removed: SUCCESS'); + return cb(); + }); }); }; diff --git a/www/views/bitpayCard.html b/www/views/bitpayCard.html index 12c972d3e..f0bff2c17 100644 --- a/www/views/bitpayCard.html +++ b/www/views/bitpayCard.html @@ -2,7 +2,7 @@ - BitPay Card + BitPay Visa® Card
        -
        +
        diff --git a/www/views/preferencesBitpayCard.html b/www/views/preferencesBitpayCard.html index 12ae0a455..c20545f7b 100644 --- a/www/views/preferencesBitpayCard.html +++ b/www/views/preferencesBitpayCard.html @@ -2,14 +2,21 @@ - Preferences + BitPay Visa® Cards - -
          -
        • - Log out -
          • -
        + +
        +
        + Cards +
        +
        + xxxx-xxxx-xxxx-{{card.lastFourDigits}} +
        +
        +
        + Removes all data from this device +
        +
        From 222fbe57ff31dbcca1b79589ce4739d0c38c9be3 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 7 Oct 2016 19:21:46 -0300 Subject: [PATCH 035/110] Bitpay card config external json --- package.json | 1 + src/js/controllers/bitpayCardIntro.js | 7 +++-- src/js/services/bitpayCardService.js | 21 ++++++++++--- src/js/services/incomingData.js | 1 + util/buildExternalServices.js | 4 +++ www/views/bitpayCardIntro.html | 45 +++++++++++++++++++++++++++ www/views/tab-home.html | 2 +- 7 files changed, 73 insertions(+), 8 deletions(-) create mode 100644 www/views/bitpayCardIntro.html diff --git a/package.json b/package.json index c690d4989..4d770f788 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "angular-mocks": "1.4.10", "bezier-easing": "^2.0.3", "bhttp": "^1.2.1", + "bitauth": "^0.3.2", "bitcore-wallet-client": "4.3.1", "bower": "^1.7.9", "chai": "^3.5.0", diff --git a/src/js/controllers/bitpayCardIntro.js b/src/js/controllers/bitpayCardIntro.js index 09ea1a96c..fe87e4c4e 100644 --- a/src/js/controllers/bitpayCardIntro.js +++ b/src/js/controllers/bitpayCardIntro.js @@ -1,5 +1,5 @@ 'use strict'; -angular.module('copayApp.controllers').controller('bitpayCardIntroController', function($scope, $state, $timeout, $ionicHistory, storageService, externalLinkService, bitpayCardService, gettextCatalog, popupService) { +angular.module('copayApp.controllers').controller('bitpayCardIntroController', function($scope, $log, $state, $timeout, $ionicHistory, storageService, externalLinkService, bitpayCardService, gettextCatalog, popupService) { var checkOtp = function(obj, cb) { if (obj.otp) { @@ -48,7 +48,10 @@ angular.module('copayApp.controllers').controller('bitpayCardIntroController', f }); }); } else { - // TODO + // TEST TODO + bitpayCardService.testSession(function(err, session) { + if (err) $log.error(err); + }); } /* diff --git a/src/js/services/bitpayCardService.js b/src/js/services/bitpayCardService.js index 7c91bc8a4..3b4c1f7f8 100644 --- a/src/js/services/bitpayCardService.js +++ b/src/js/services/bitpayCardService.js @@ -1,24 +1,29 @@ 'use strict'; -angular.module('copayApp.services').factory('bitpayCardService', function($http, $log, lodash, storageService, bitauthService, platformInfo) { +angular.module('copayApp.services').factory('bitpayCardService', function($http, $log, $window, lodash, storageService, bitauthService, platformInfo) { var root = {}; var credentials = {}; var bpSession = {}; var pubkey, sin; var _setCredentials = function() { + if (!$window.externalServices || !$window.externalServices.bitpayCard) { + return; + } + + var bitpayCard = $window.externalServices.bitpayCard; /* * Development: 'testnet' * Production: 'livenet' */ credentials.NETWORK = 'livenet'; if (credentials.NETWORK == 'testnet') { - credentials.BITPAY_PRIV_KEY = ''; - credentials.BITPAY_API_URL = 'https://test.bitpay.com'; + credentials.BITPAY_PRIV_KEY = bitpayCard.sandbox.secret; + credentials.BITPAY_API_URL = bitpayCard.sandbox.host; } else { - credentials.BITPAY_PRIV_KEY = ''; - credentials.BITPAY_API_URL = 'https://bitpay.com'; + credentials.BITPAY_PRIV_KEY = bitpayCard.production.secret; + credentials.BITPAY_API_URL = bitpayCard.production.host; } try { pubkey = bitauthService.getPublicKeyFromPrivateKey(credentials.BITPAY_PRIV_KEY); @@ -87,6 +92,12 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http, return credentials.BITPAY_API_URL; }; + root.testSession = function(cb) { + _getSession(function(err, session) { + return cb(err, session); + }); + }; + var _postBitAuth = function(endpoint, data) { var dataToSign = credentials.BITPAY_API_URL + endpoint + JSON.stringify(data); var signedData = bitauthService.sign(dataToSign, credentials.BITPAY_PRIV_KEY); diff --git a/src/js/services/incomingData.js b/src/js/services/incomingData.js index 33c2de8a9..53a3c483b 100644 --- a/src/js/services/incomingData.js +++ b/src/js/services/incomingData.js @@ -70,6 +70,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni // Plain URL } else if (/^https?:\/\//.test(data)) { + if ($state.current.name == 'tabs.bitpayCardIntro' || $state.current.name == 'tabs.buyandsell.glidera') return false; $state.go('tabs.send'); $timeout(function() { $state.transitionTo('tabs.send.confirm', {paypro: data}); diff --git a/util/buildExternalServices.js b/util/buildExternalServices.js index 630d03609..68a338bad 100755 --- a/util/buildExternalServices.js +++ b/util/buildExternalServices.js @@ -24,6 +24,10 @@ if (externalServices.glidera && if (externalServices.glidera && (externalServices.glidera.sandbox.mobile.client_id || externalServices.glidera.sandbox.desktop.client_id)) console.log('Glidera Sandbox Enabled'); +if (externalServices.bitpayCard && externalServices.bitpayCard.production.secret) + console.log('BitPay Card Production Enabled'); +if (externalServices.bitpayCard && externalServices.bitpayCard.sandbox.secret) + console.log('BitPay Card Sandbox Enabled'); var content = 'window.externalServices=' + JSON.stringify(externalServices) + ';'; fs.writeFileSync("./src/js/externalServices.js", content); diff --git a/www/views/bitpayCardIntro.html b/www/views/bitpayCardIntro.html new file mode 100644 index 000000000..7b42f3611 --- /dev/null +++ b/www/views/bitpayCardIntro.html @@ -0,0 +1,45 @@ + + + + + + + + + + +
        + +
        + + +

        + Turn bitcoin into dollars, swipe anywhere Visa® is accepted. +

        +         + +

        + Get local cash anywhere you go, from any Visa®-compatible ATM. +

        + *ATM bank fees may apply +
        +

        +         + +

        + Pay 0% fees to turn bitcoin into dollars. +

        +         +         +
        + + +
        +         +         diff --git a/www/views/tab-home.html b/www/views/tab-home.html index a072aa704..e1754c82e 100644 --- a/www/views/tab-home.html +++ b/www/views/tab-home.html @@ -104,7 +104,7 @@
        From 252ebf45b3dabde51b66853c04234a6de04542e4 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 10 Oct 2016 11:12:26 -0300 Subject: [PATCH 036/110] Fix handle URL (mobile). Replaces visa-api by api --- app-template/config-template.xml | 5 +++-- src/js/controllers/bitpayCardIntro.js | 2 +- src/js/services/bitpayCardService.js | 6 +++--- src/js/services/incomingData.js | 14 ++++++++++++-- www/views/bitpayCardIntro.html | 2 +- 5 files changed, 20 insertions(+), 9 deletions(-) diff --git a/app-template/config-template.xml b/app-template/config-template.xml index 1db63c59a..98c36cf65 100644 --- a/app-template/config-template.xml +++ b/app-template/config-template.xml @@ -56,8 +56,9 @@ - - + + + diff --git a/src/js/controllers/bitpayCardIntro.js b/src/js/controllers/bitpayCardIntro.js index fe87e4c4e..4fc4589be 100644 --- a/src/js/controllers/bitpayCardIntro.js +++ b/src/js/controllers/bitpayCardIntro.js @@ -50,7 +50,7 @@ angular.module('copayApp.controllers').controller('bitpayCardIntroController', f } else { // TEST TODO bitpayCardService.testSession(function(err, session) { - if (err) $log.error(err); + if (err) popupService.showAlert(null, err); }); } diff --git a/src/js/services/bitpayCardService.js b/src/js/services/bitpayCardService.js index 3b4c1f7f8..bd29fa3c6 100644 --- a/src/js/services/bitpayCardService.js +++ b/src/js/services/bitpayCardService.js @@ -44,7 +44,7 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http, _setCredentials(); $http({ method: 'GET', - url: credentials.BITPAY_API_URL + '/visa-api/session', + url: credentials.BITPAY_API_URL + '/api/session', headers: { 'content-type': 'application/json' } @@ -154,12 +154,12 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http, code: obj.otp }; - var dataToSign = credentials.BITPAY_API_URL + '/visa-api/validateBitAuthPairingCode' + JSON.stringify(userData); + var dataToSign = credentials.BITPAY_API_URL + '/api/validateBitAuthPairingCode' + JSON.stringify(userData); var signedData = bitauthService.sign(dataToSign, credentials.BITPAY_PRIV_KEY); $http({ method: 'POST', - url: credentials.BITPAY_API_URL + '/visa-api/validateBitAuthPairingCode', + url: credentials.BITPAY_API_URL + '/api/validateBitAuthPairingCode', headers: { 'content-type': 'application/json', 'x-csrf-token': session.csrfToken, diff --git a/src/js/services/incomingData.js b/src/js/services/incomingData.js index 53a3c483b..c48157052 100644 --- a/src/js/services/incomingData.js +++ b/src/js/services/incomingData.js @@ -1,9 +1,18 @@ 'use strict'; -angular.module('copayApp.services').factory('incomingData', function($log, $ionicModal, $state, $window, $timeout, bitcore) { +angular.module('copayApp.services').factory('incomingData', function($log, $ionicModal, $state, $window, $timeout, bitcore, lodash) { var root = {}; + var ignoreState = [ + 'tabs.language', + 'tabs.about.translators', + 'tabs.bitpayCardIntro', + 'tabs.buyandsell.glidera', + 'tabs.giftcards.amazon', + 'tabs.giftcards.amazon.buy' + ]; + root.redir = function(data) { $log.debug('Processing incoming data:' +data); @@ -70,7 +79,8 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni // Plain URL } else if (/^https?:\/\//.test(data)) { - if ($state.current.name == 'tabs.bitpayCardIntro' || $state.current.name == 'tabs.buyandsell.glidera') return false; + var currentState = $state.current.name; + if (lodash.indexOf(ignoreState, currentState) != -1) return false; $state.go('tabs.send'); $timeout(function() { $state.transitionTo('tabs.send.confirm', {paypro: data}); diff --git a/www/views/bitpayCardIntro.html b/www/views/bitpayCardIntro.html index 7b42f3611..262a5f710 100644 --- a/www/views/bitpayCardIntro.html +++ b/www/views/bitpayCardIntro.html @@ -22,7 +22,7 @@

        Get local cash anywhere you go, from any Visa®-compatible ATM. -

        From c916babe25b3c4ceec4f87c3b40d19fd5bcf422e Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 13 Oct 2016 17:49:48 -0300 Subject: [PATCH 048/110] Minor bug fixes. New bitauth method for getting token --- src/js/controllers/bitpayCard.js | 38 ++++++++----- src/js/controllers/confirm.js | 13 ++++- src/js/controllers/tab-home.js | 12 ++++- src/js/services/bitpayCardService.js | 80 ++++++++++++++++------------ www/views/bitpayCard.html | 24 ++++----- www/views/confirm.html | 7 +-- 6 files changed, 105 insertions(+), 69 deletions(-) diff --git a/src/js/controllers/bitpayCard.js b/src/js/controllers/bitpayCard.js index 80d15b697..ef5364b0b 100644 --- a/src/js/controllers/bitpayCard.js +++ b/src/js/controllers/bitpayCard.js @@ -3,7 +3,7 @@ angular.module('copayApp.controllers').controller('bitpayCardController', function($scope, $timeout, $log, $state, lodash, bitpayCardService, moment, popupService, gettextCatalog, $ionicHistory) { var self = this; - $scope.dateRange = 'last30Days'; + $scope.dateRange = { value: 'last30Days'}; $scope.network = bitpayCardService.getEnvironment(); var getFromCache = function(cb) { @@ -42,7 +42,7 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi }; this.update = function() { - var dateRange = setDateRange($scope.dateRange); + var dateRange = setDateRange($scope.dateRange.value); $scope.loadingHistory = true; bitpayCardService.getHistory($scope.cardId, dateRange, function(err, history) { @@ -53,39 +53,49 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi return; } - self.bitpayCardTransactionHistory = history.txs; + var txs = lodash.clone(history.txs); + for (var i = 0; i < txs.length; i++) { + txs[i] = _getMerchantInfo(txs[i]); + txs[i].icon = _getIconName(txs[i]); + txs[i].desc = _processDescription(txs[i]); + } + self.bitpayCardTransactionHistory = txs; self.bitpayCardCurrentBalance = history.currentCardBalance; - var cacheHistory = { - balance: self.bitpayCardCurrentBalance, - transactions: self.bitpayCardTransactionHistory - }; - bitpayCardService.setBitpayDebitCardsHistory($scope.cardId, cacheHistory, {}, function(err) { - if (err) $log.error(err); - $scope.historyCached = true; - }); + if ($scope.dateRange.value == 'last30Days') { + $log.debug('BitPay Card: store cache history'); + var cacheHistory = { + balance: history.currentCardBalance, + transactions: history.txs + }; + bitpayCardService.setBitpayDebitCardsHistory($scope.cardId, cacheHistory, {}, function(err) { + if (err) $log.error(err); + $scope.historyCached = true; + }); + } $timeout(function() { $scope.$apply(); }); }); }; - this.getMerchantInfo = function(tx) { + var _getMerchantInfo = function(tx) { var bpTranCodes = bitpayCardService.bpTranCodes; lodash.keys(bpTranCodes).forEach(function(code) { if (tx.type.indexOf(code) === 0) { lodash.assign(tx, bpTranCodes[code]); } }); + return tx; }; - this.getIconName = function(tx) { + var _getIconName = function(tx) { var icon = tx.mcc || tx.category || null; if (!icon) return 'default'; return bitpayCardService.iconMap[icon]; }; - this.processDescription = function(tx) { + var _processDescription = function(tx) { if (lodash.isArray(tx.description)) { return tx.description[0]; } diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index 5ee30b1b9..0b8949f3a 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -374,11 +374,22 @@ angular.module('copayApp.controllers').controller('confirmController', function( }; $scope.onSuccessConfirm = function() { + var previousView = $ionicHistory.viewHistory().backView && $ionicHistory.viewHistory().backView.stateName; + var fromBitPayCard = previousView.match(/tabs.bitpayCard/) ? true : false; + $ionicHistory.nextViewOptions({ disableAnimate: true }); + $ionicHistory.removeBackView(); $scope.sendStatus = ''; - $state.go('tabs.send'); + + if (fromBitPayCard) { + $timeout(function() { + $state.transitionTo('tabs.bitpayCard', {id: $stateParams.cardId}); + }, 100); + } else { + $state.go('tabs.send'); + } }; function publishAndSign(wallet, txp, onSendStatusChange) { diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js index 3e8f5cdc9..3d67a56f4 100644 --- a/src/js/controllers/tab-home.js +++ b/src/js/controllers/tab-home.js @@ -203,11 +203,19 @@ angular.module('copayApp.controllers').controller('tabHomeController', var bitpayCardCache = function() { bitpayCardService.getBitpayDebitCards(function(err, data) { - if (err || lodash.isEmpty(data)) return; + if (err) return; + if (lodash.isEmpty(data)) { + $scope.bitpayCards = null; + return; + } $scope.bitpayCards = data.cards; }); bitpayCardService.getBitpayDebitCardsHistory(null, function(err, data) { - if (err || lodash.isEmpty(data)) return; + if (err) return; + if (lodash.isEmpty(data)) { + $scope.cardsHistory = null; + return; + } $scope.cardsHistory = data; }); }; diff --git a/src/js/services/bitpayCardService.js b/src/js/services/bitpayCardService.js index b0f9c5882..884b57cbe 100644 --- a/src/js/services/bitpayCardService.js +++ b/src/js/services/bitpayCardService.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.services').factory('bitpayCardService', function($http, $log, lodash, storageService, bitauthService, platformInfo) { +angular.module('copayApp.services').factory('bitpayCardService', function($http, $log, lodash, storageService, bitauthService, platformInfo, moment) { var root = {}; var BITPAY_CARD_NETWORK = 'livenet'; var BITPAY_CARD_API_URL = BITPAY_CARD_NETWORK == 'livenet' ? 'https://bitpay.com' : 'https://test.bitpay.com'; @@ -47,7 +47,6 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http, }; }; - var _post = function(endpoint, json, credentials) { var dataToSign = BITPAY_CARD_API_URL + endpoint + JSON.stringify(json); var signedData = bitauthService.sign(dataToSign, credentials.priv); @@ -64,26 +63,32 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http, }; }; - var _afterBitAuthSuccess = function(obj, credentials, cb) { - var json = { - method: 'getTokens' + var _postAuth = function(endpoint, json, credentials) { + json['params'].signature = bitauthService.sign(JSON.stringify(json.params), credentials.priv); + json['params'].pubkey = credentials.pub; + json['params'] = JSON.stringify(json.params); + + return { + method: 'POST', + url: BITPAY_CARD_API_URL + endpoint, + headers: { + 'content-type': 'application/json' + }, + data: json }; - // Get tokens - $http(_post('/api/v2/', json, credentials)).then(function(data) { - $log.info('BitPay Get Tokens: SUCCESS'); - var token = lodash.find(data.data.data, 'visaUser'); - if (lodash.isEmpty(token)) return cb(_setError('No token for visaUser')); - token = token.visaUser; - json['method'] = 'getDebitCards'; - // Get Debit Cards - $http(_post('/api/v2/' + token, json, credentials)).then(function(data) { - $log.info('BitPay Get Debit Cards: SUCCESS'); - return cb(data.data.error, {token: token, cards: data.data.data, email: obj.email}); - }, function(data) { - return cb(_setError('BitPay Card Error: Get Debit Cards', data)); - }); + }; + + var _afterBitAuthSuccess = function(token, obj, credentials, cb) { + var json = { + method: 'getDebitCards' + }; + // Get Debit Cards + $http(_post('/api/v2/' + token, json, credentials)).then(function(data) { + if (data && data.data.error) return cb(data.data.error); + $log.info('BitPay Get Debit Cards: SUCCESS'); + return cb(data.data.error, {token: token, cards: data.data.data, email: obj.email}); }, function(data) { - return cb(_setError('BitPay Card Error: Get Token', data)); + return cb(_setError('BitPay Card Error: Get Debit Cards', data)); }); }; @@ -96,16 +101,22 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http, matched = true; } } - if (!matched && ['paid', 'confirmed', 'complete'].indexOf(invoices[i].status) > -1) { + var isInvoiceLessThanOneDayOld = moment() < moment(new Date(invoices[i].invoiceTime)).add(1, 'day'); + if (!matched && isInvoiceLessThanOneDayOld) { + var isInvoiceUnderpaid = invoices[i].exceptionStatus === 'paidPartial'; - history.unshift({ - timestamp: invoices[i].invoiceTime, - description: invoices[i].itemDesc, - amount: invoices[i].price, - type: '00611 = Client Funded Deposit', - pending: true, - status: invoices[i].status - }); + if(['paid', 'confirmed', 'complete'].indexOf(invoices[i].status) >= 0 + || (invoices[i].status === 'invalid' || isInvoiceUnderpaid)) { + + history.unshift({ + timestamp: new Date(invoices[i].invoiceTime), + description: invoices[i].itemDesc, + amount: invoices[i].price, + type: '00611 = Client Funded Deposit', + pending: true, + status: invoices[i].status + }); + } } } return history; @@ -139,11 +150,12 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http, }; _getCredentials(function(err, credentials) { if (err) return cb(err); - $http(_post('/api/v2/', json, credentials)).then(function(data) { - $log.info('BitPay Card BitAuth: SUCCESS'); - _afterBitAuthSuccess(obj, credentials, cb); + $http(_postAuth('/api/v2/', json, credentials)).then(function(data) { + if (data && data.data.error) return cb(data.data.error); + $log.info('BitPay Card BitAuth Create Token: SUCCESS'); + _afterBitAuthSuccess(data.data.data, obj, credentials, cb); }, function(data) { - return cb(_setError('BitPay Card Error: BitAuth', data)); + return cb(_setError('BitPay Card Error Create Token: BitAuth', data)); }); }); }; @@ -164,7 +176,7 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http, // Get invoices $http(_post('/api/v2/' + card.token, json, credentials)).then(function(data) { $log.info('BitPay Get Invoices: SUCCESS'); - invoices = data.data.data; + invoices = data.data.data || []; if (lodash.isEmpty(invoices)) $log.info('No invoices'); json = { method: 'getTransactionHistory', diff --git a/www/views/bitpayCard.html b/www/views/bitpayCard.html index f0bff2c17..557b06869 100644 --- a/www/views/bitpayCard.html +++ b/www/views/bitpayCard.html @@ -21,7 +21,7 @@
        ${{bitpayCard.bitpayCardCurrentBalance}}
        - {{'Add Funds'|translate}} + {{'Add Funds'|translate}}
        @@ -45,20 +45,19 @@

        Your BitPay Card is ready. Add funds to your card to start using your card at stores and ATMs worldwide.

        -
        +
        -
        -
        - + ng-repeat="tx in bitpayCard.bitpayCardTransactionHistory | orderBy: ['pending','-timestamp']" + class="item row"> +
        +
        @@ -69,10 +68,8 @@ {{tx.merchant.city}}, {{tx.merchant.state}}
        -
        - {{desc}} +
        + {{tx.desc}}
        @@ -85,7 +82,8 @@ 'text-gray': tx.amount.indexOf('-') == -1 && tx.pending}"> {{tx.amount | currency:'$':2 }}
        - + + Pending
        diff --git a/www/views/confirm.html b/www/views/confirm.html index 531a397b5..49c70ce85 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -25,11 +25,8 @@ - -
        -         - {{toName}} - {{toAddress}} + {{toName}} + {{toAddress}}
        From 00ae5f094ed2ca2e5264a21a50ba784e42ea2b24 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 13 Oct 2016 20:11:02 -0300 Subject: [PATCH 049/110] Fix open external link --- src/js/controllers/bitpayCardIntro.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/js/controllers/bitpayCardIntro.js b/src/js/controllers/bitpayCardIntro.js index e2a6dd533..95d5cbfb2 100644 --- a/src/js/controllers/bitpayCardIntro.js +++ b/src/js/controllers/bitpayCardIntro.js @@ -61,14 +61,12 @@ angular.module('copayApp.controllers').controller('bitpayCardIntroController', f $scope.orderBitPayCard = function() { var url = 'https://bitpay.com/visa/'; - var target = '_system'; - externalLinkService.open(url, target); + externalLinkService.open(url); }; $scope.connectBitPayCard = function() { var url = 'https://bitpay.com/visa/login'; - var target = '_system'; - externalLinkService.open(url, target); + externalLinkService.open(url); }; }); From fa905cb7191a904eb1363b9c6383ee3e6e33930d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Thu, 13 Oct 2016 17:11:19 -0300 Subject: [PATCH 050/110] fix wallet icon amount view --- angular-pbkdf2/angular-pbkdf2.js | 6380 ++++++++++++++++++++++++++++++ src/js/controllers/amount.js | 3 +- src/js/controllers/tab-send.js | 3 +- src/js/routes.js | 2 +- www/views/amount.html | 6 +- 5 files changed, 6389 insertions(+), 5 deletions(-) create mode 100644 angular-pbkdf2/angular-pbkdf2.js diff --git a/angular-pbkdf2/angular-pbkdf2.js b/angular-pbkdf2/angular-pbkdf2.js new file mode 100644 index 000000000..40e059dba --- /dev/null +++ b/angular-pbkdf2/angular-pbkdf2.js @@ -0,0 +1,6380 @@ +(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o + * @license MIT + */ +/* eslint-disable no-proto */ + +'use strict' + +var base64 = require('base64-js') +var ieee754 = require('ieee754') +var isArray = require('isarray') + +exports.Buffer = Buffer +exports.SlowBuffer = SlowBuffer +exports.INSPECT_MAX_BYTES = 50 + +/** + * If `Buffer.TYPED_ARRAY_SUPPORT`: + * === true Use Uint8Array implementation (fastest) + * === false Use Object implementation (most compatible, even IE6) + * + * Browsers that support typed arrays are IE 10+, Firefox 4+, Chrome 7+, Safari 5.1+, + * Opera 11.6+, iOS 4.2+. + * + * Due to various browser bugs, sometimes the Object implementation will be used even + * when the browser supports typed arrays. + * + * Note: + * + * - Firefox 4-29 lacks support for adding new properties to `Uint8Array` instances, + * See: https://bugzilla.mozilla.org/show_bug.cgi?id=695438. + * + * - Chrome 9-10 is missing the `TypedArray.prototype.subarray` function. + * + * - IE10 has a broken `TypedArray.prototype.subarray` function which returns arrays of + * incorrect length in some situations. + + * We detect these buggy browsers and set `Buffer.TYPED_ARRAY_SUPPORT` to `false` so they + * get the Object implementation, which is slower but behaves correctly. + */ +Buffer.TYPED_ARRAY_SUPPORT = global.TYPED_ARRAY_SUPPORT !== undefined + ? global.TYPED_ARRAY_SUPPORT + : typedArraySupport() + +/* + * Export kMaxLength after typed array support is determined. + */ +exports.kMaxLength = kMaxLength() + +function typedArraySupport () { + try { + var arr = new Uint8Array(1) + arr.__proto__ = {__proto__: Uint8Array.prototype, foo: function () { return 42 }} + return arr.foo() === 42 && // typed array instances can be augmented + typeof arr.subarray === 'function' && // chrome 9-10 lack `subarray` + arr.subarray(1, 1).byteLength === 0 // ie10 has broken `subarray` + } catch (e) { + return false + } +} + +function kMaxLength () { + return Buffer.TYPED_ARRAY_SUPPORT + ? 0x7fffffff + : 0x3fffffff +} + +function createBuffer (that, length) { + if (kMaxLength() < length) { + throw new RangeError('Invalid typed array length') + } + if (Buffer.TYPED_ARRAY_SUPPORT) { + // Return an augmented `Uint8Array` instance, for best performance + that = new Uint8Array(length) + that.__proto__ = Buffer.prototype + } else { + // Fallback: Return an object instance of the Buffer class + if (that === null) { + that = new Buffer(length) + } + that.length = length + } + + return that +} + +/** + * The Buffer constructor returns instances of `Uint8Array` that have their + * prototype changed to `Buffer.prototype`. Furthermore, `Buffer` is a subclass of + * `Uint8Array`, so the returned instances will have all the node `Buffer` methods + * and the `Uint8Array` methods. Square bracket notation works as expected -- it + * returns a single octet. + * + * The `Uint8Array` prototype remains unmodified. + */ + +function Buffer (arg, encodingOrOffset, length) { + if (!Buffer.TYPED_ARRAY_SUPPORT && !(this instanceof Buffer)) { + return new Buffer(arg, encodingOrOffset, length) + } + + // Common case. + if (typeof arg === 'number') { + if (typeof encodingOrOffset === 'string') { + throw new Error( + 'If encoding is specified then the first argument must be a string' + ) + } + return allocUnsafe(this, arg) + } + return from(this, arg, encodingOrOffset, length) +} + +Buffer.poolSize = 8192 // not used by this implementation + +// TODO: Legacy, not needed anymore. Remove in next major version. +Buffer._augment = function (arr) { + arr.__proto__ = Buffer.prototype + return arr +} + +function from (that, value, encodingOrOffset, length) { + if (typeof value === 'number') { + throw new TypeError('"value" argument must not be a number') + } + + if (typeof ArrayBuffer !== 'undefined' && value instanceof ArrayBuffer) { + return fromArrayBuffer(that, value, encodingOrOffset, length) + } + + if (typeof value === 'string') { + return fromString(that, value, encodingOrOffset) + } + + return fromObject(that, value) +} + +/** + * Functionally equivalent to Buffer(arg, encoding) but throws a TypeError + * if value is a number. + * Buffer.from(str[, encoding]) + * Buffer.from(array) + * Buffer.from(buffer) + * Buffer.from(arrayBuffer[, byteOffset[, length]]) + **/ +Buffer.from = function (value, encodingOrOffset, length) { + return from(null, value, encodingOrOffset, length) +} + +if (Buffer.TYPED_ARRAY_SUPPORT) { + Buffer.prototype.__proto__ = Uint8Array.prototype + Buffer.__proto__ = Uint8Array + if (typeof Symbol !== 'undefined' && Symbol.species && + Buffer[Symbol.species] === Buffer) { + // Fix subarray() in ES2016. See: https://github.com/feross/buffer/pull/97 + Object.defineProperty(Buffer, Symbol.species, { + value: null, + configurable: true + }) + } +} + +function assertSize (size) { + if (typeof size !== 'number') { + throw new TypeError('"size" argument must be a number') + } else if (size < 0) { + throw new RangeError('"size" argument must not be negative') + } +} + +function alloc (that, size, fill, encoding) { + assertSize(size) + if (size <= 0) { + return createBuffer(that, size) + } + if (fill !== undefined) { + // Only pay attention to encoding if it's a string. This + // prevents accidentally sending in a number that would + // be interpretted as a start offset. + return typeof encoding === 'string' + ? createBuffer(that, size).fill(fill, encoding) + : createBuffer(that, size).fill(fill) + } + return createBuffer(that, size) +} + +/** + * Creates a new filled Buffer instance. + * alloc(size[, fill[, encoding]]) + **/ +Buffer.alloc = function (size, fill, encoding) { + return alloc(null, size, fill, encoding) +} + +function allocUnsafe (that, size) { + assertSize(size) + that = createBuffer(that, size < 0 ? 0 : checked(size) | 0) + if (!Buffer.TYPED_ARRAY_SUPPORT) { + for (var i = 0; i < size; ++i) { + that[i] = 0 + } + } + return that +} + +/** + * Equivalent to Buffer(num), by default creates a non-zero-filled Buffer instance. + * */ +Buffer.allocUnsafe = function (size) { + return allocUnsafe(null, size) +} +/** + * Equivalent to SlowBuffer(num), by default creates a non-zero-filled Buffer instance. + */ +Buffer.allocUnsafeSlow = function (size) { + return allocUnsafe(null, size) +} + +function fromString (that, string, encoding) { + if (typeof encoding !== 'string' || encoding === '') { + encoding = 'utf8' + } + + if (!Buffer.isEncoding(encoding)) { + throw new TypeError('"encoding" must be a valid string encoding') + } + + var length = byteLength(string, encoding) | 0 + that = createBuffer(that, length) + + var actual = that.write(string, encoding) + + if (actual !== length) { + // Writing a hex string, for example, that contains invalid characters will + // cause everything after the first invalid character to be ignored. (e.g. + // 'abxxcd' will be treated as 'ab') + that = that.slice(0, actual) + } + + return that +} + +function fromArrayLike (that, array) { + var length = array.length < 0 ? 0 : checked(array.length) | 0 + that = createBuffer(that, length) + for (var i = 0; i < length; i += 1) { + that[i] = array[i] & 255 + } + return that +} + +function fromArrayBuffer (that, array, byteOffset, length) { + array.byteLength // this throws if `array` is not a valid ArrayBuffer + + if (byteOffset < 0 || array.byteLength < byteOffset) { + throw new RangeError('\'offset\' is out of bounds') + } + + if (array.byteLength < byteOffset + (length || 0)) { + throw new RangeError('\'length\' is out of bounds') + } + + if (byteOffset === undefined && length === undefined) { + array = new Uint8Array(array) + } else if (length === undefined) { + array = new Uint8Array(array, byteOffset) + } else { + array = new Uint8Array(array, byteOffset, length) + } + + if (Buffer.TYPED_ARRAY_SUPPORT) { + // Return an augmented `Uint8Array` instance, for best performance + that = array + that.__proto__ = Buffer.prototype + } else { + // Fallback: Return an object instance of the Buffer class + that = fromArrayLike(that, array) + } + return that +} + +function fromObject (that, obj) { + if (Buffer.isBuffer(obj)) { + var len = checked(obj.length) | 0 + that = createBuffer(that, len) + + if (that.length === 0) { + return that + } + + obj.copy(that, 0, 0, len) + return that + } + + if (obj) { + if ((typeof ArrayBuffer !== 'undefined' && + obj.buffer instanceof ArrayBuffer) || 'length' in obj) { + if (typeof obj.length !== 'number' || isnan(obj.length)) { + return createBuffer(that, 0) + } + return fromArrayLike(that, obj) + } + + if (obj.type === 'Buffer' && isArray(obj.data)) { + return fromArrayLike(that, obj.data) + } + } + + throw new TypeError('First argument must be a string, Buffer, ArrayBuffer, Array, or array-like object.') +} + +function checked (length) { + // Note: cannot use `length < kMaxLength()` here because that fails when + // length is NaN (which is otherwise coerced to zero.) + if (length >= kMaxLength()) { + throw new RangeError('Attempt to allocate Buffer larger than maximum ' + + 'size: 0x' + kMaxLength().toString(16) + ' bytes') + } + return length | 0 +} + +function SlowBuffer (length) { + if (+length != length) { // eslint-disable-line eqeqeq + length = 0 + } + return Buffer.alloc(+length) +} + +Buffer.isBuffer = function isBuffer (b) { + return !!(b != null && b._isBuffer) +} + +Buffer.compare = function compare (a, b) { + if (!Buffer.isBuffer(a) || !Buffer.isBuffer(b)) { + throw new TypeError('Arguments must be Buffers') + } + + if (a === b) return 0 + + var x = a.length + var y = b.length + + for (var i = 0, len = Math.min(x, y); i < len; ++i) { + if (a[i] !== b[i]) { + x = a[i] + y = b[i] + break + } + } + + if (x < y) return -1 + if (y < x) return 1 + return 0 +} + +Buffer.isEncoding = function isEncoding (encoding) { + switch (String(encoding).toLowerCase()) { + case 'hex': + case 'utf8': + case 'utf-8': + case 'ascii': + case 'latin1': + case 'binary': + case 'base64': + case 'ucs2': + case 'ucs-2': + case 'utf16le': + case 'utf-16le': + return true + default: + return false + } +} + +Buffer.concat = function concat (list, length) { + if (!isArray(list)) { + throw new TypeError('"list" argument must be an Array of Buffers') + } + + if (list.length === 0) { + return Buffer.alloc(0) + } + + var i + if (length === undefined) { + length = 0 + for (i = 0; i < list.length; ++i) { + length += list[i].length + } + } + + var buffer = Buffer.allocUnsafe(length) + var pos = 0 + for (i = 0; i < list.length; ++i) { + var buf = list[i] + if (!Buffer.isBuffer(buf)) { + throw new TypeError('"list" argument must be an Array of Buffers') + } + buf.copy(buffer, pos) + pos += buf.length + } + return buffer +} + +function byteLength (string, encoding) { + if (Buffer.isBuffer(string)) { + return string.length + } + if (typeof ArrayBuffer !== 'undefined' && typeof ArrayBuffer.isView === 'function' && + (ArrayBuffer.isView(string) || string instanceof ArrayBuffer)) { + return string.byteLength + } + if (typeof string !== 'string') { + string = '' + string + } + + var len = string.length + if (len === 0) return 0 + + // Use a for loop to avoid recursion + var loweredCase = false + for (;;) { + switch (encoding) { + case 'ascii': + case 'latin1': + case 'binary': + return len + case 'utf8': + case 'utf-8': + case undefined: + return utf8ToBytes(string).length + case 'ucs2': + case 'ucs-2': + case 'utf16le': + case 'utf-16le': + return len * 2 + case 'hex': + return len >>> 1 + case 'base64': + return base64ToBytes(string).length + default: + if (loweredCase) return utf8ToBytes(string).length // assume utf8 + encoding = ('' + encoding).toLowerCase() + loweredCase = true + } + } +} +Buffer.byteLength = byteLength + +function slowToString (encoding, start, end) { + var loweredCase = false + + // No need to verify that "this.length <= MAX_UINT32" since it's a read-only + // property of a typed array. + + // This behaves neither like String nor Uint8Array in that we set start/end + // to their upper/lower bounds if the value passed is out of range. + // undefined is handled specially as per ECMA-262 6th Edition, + // Section 13.3.3.7 Runtime Semantics: KeyedBindingInitialization. + if (start === undefined || start < 0) { + start = 0 + } + // Return early if start > this.length. Done here to prevent potential uint32 + // coercion fail below. + if (start > this.length) { + return '' + } + + if (end === undefined || end > this.length) { + end = this.length + } + + if (end <= 0) { + return '' + } + + // Force coersion to uint32. This will also coerce falsey/NaN values to 0. + end >>>= 0 + start >>>= 0 + + if (end <= start) { + return '' + } + + if (!encoding) encoding = 'utf8' + + while (true) { + switch (encoding) { + case 'hex': + return hexSlice(this, start, end) + + case 'utf8': + case 'utf-8': + return utf8Slice(this, start, end) + + case 'ascii': + return asciiSlice(this, start, end) + + case 'latin1': + case 'binary': + return latin1Slice(this, start, end) + + case 'base64': + return base64Slice(this, start, end) + + case 'ucs2': + case 'ucs-2': + case 'utf16le': + case 'utf-16le': + return utf16leSlice(this, start, end) + + default: + if (loweredCase) throw new TypeError('Unknown encoding: ' + encoding) + encoding = (encoding + '').toLowerCase() + loweredCase = true + } + } +} + +// The property is used by `Buffer.isBuffer` and `is-buffer` (in Safari 5-7) to detect +// Buffer instances. +Buffer.prototype._isBuffer = true + +function swap (b, n, m) { + var i = b[n] + b[n] = b[m] + b[m] = i +} + +Buffer.prototype.swap16 = function swap16 () { + var len = this.length + if (len % 2 !== 0) { + throw new RangeError('Buffer size must be a multiple of 16-bits') + } + for (var i = 0; i < len; i += 2) { + swap(this, i, i + 1) + } + return this +} + +Buffer.prototype.swap32 = function swap32 () { + var len = this.length + if (len % 4 !== 0) { + throw new RangeError('Buffer size must be a multiple of 32-bits') + } + for (var i = 0; i < len; i += 4) { + swap(this, i, i + 3) + swap(this, i + 1, i + 2) + } + return this +} + +Buffer.prototype.swap64 = function swap64 () { + var len = this.length + if (len % 8 !== 0) { + throw new RangeError('Buffer size must be a multiple of 64-bits') + } + for (var i = 0; i < len; i += 8) { + swap(this, i, i + 7) + swap(this, i + 1, i + 6) + swap(this, i + 2, i + 5) + swap(this, i + 3, i + 4) + } + return this +} + +Buffer.prototype.toString = function toString () { + var length = this.length | 0 + if (length === 0) return '' + if (arguments.length === 0) return utf8Slice(this, 0, length) + return slowToString.apply(this, arguments) +} + +Buffer.prototype.equals = function equals (b) { + if (!Buffer.isBuffer(b)) throw new TypeError('Argument must be a Buffer') + if (this === b) return true + return Buffer.compare(this, b) === 0 +} + +Buffer.prototype.inspect = function inspect () { + var str = '' + var max = exports.INSPECT_MAX_BYTES + if (this.length > 0) { + str = this.toString('hex', 0, max).match(/.{2}/g).join(' ') + if (this.length > max) str += ' ... ' + } + return '' +} + +Buffer.prototype.compare = function compare (target, start, end, thisStart, thisEnd) { + if (!Buffer.isBuffer(target)) { + throw new TypeError('Argument must be a Buffer') + } + + if (start === undefined) { + start = 0 + } + if (end === undefined) { + end = target ? target.length : 0 + } + if (thisStart === undefined) { + thisStart = 0 + } + if (thisEnd === undefined) { + thisEnd = this.length + } + + if (start < 0 || end > target.length || thisStart < 0 || thisEnd > this.length) { + throw new RangeError('out of range index') + } + + if (thisStart >= thisEnd && start >= end) { + return 0 + } + if (thisStart >= thisEnd) { + return -1 + } + if (start >= end) { + return 1 + } + + start >>>= 0 + end >>>= 0 + thisStart >>>= 0 + thisEnd >>>= 0 + + if (this === target) return 0 + + var x = thisEnd - thisStart + var y = end - start + var len = Math.min(x, y) + + var thisCopy = this.slice(thisStart, thisEnd) + var targetCopy = target.slice(start, end) + + for (var i = 0; i < len; ++i) { + if (thisCopy[i] !== targetCopy[i]) { + x = thisCopy[i] + y = targetCopy[i] + break + } + } + + if (x < y) return -1 + if (y < x) return 1 + return 0 +} + +// Finds either the first index of `val` in `buffer` at offset >= `byteOffset`, +// OR the last index of `val` in `buffer` at offset <= `byteOffset`. +// +// Arguments: +// - buffer - a Buffer to search +// - val - a string, Buffer, or number +// - byteOffset - an index into `buffer`; will be clamped to an int32 +// - encoding - an optional encoding, relevant is val is a string +// - dir - true for indexOf, false for lastIndexOf +function bidirectionalIndexOf (buffer, val, byteOffset, encoding, dir) { + // Empty buffer means no match + if (buffer.length === 0) return -1 + + // Normalize byteOffset + if (typeof byteOffset === 'string') { + encoding = byteOffset + byteOffset = 0 + } else if (byteOffset > 0x7fffffff) { + byteOffset = 0x7fffffff + } else if (byteOffset < -0x80000000) { + byteOffset = -0x80000000 + } + byteOffset = +byteOffset // Coerce to Number. + if (isNaN(byteOffset)) { + // byteOffset: it it's undefined, null, NaN, "foo", etc, search whole buffer + byteOffset = dir ? 0 : (buffer.length - 1) + } + + // Normalize byteOffset: negative offsets start from the end of the buffer + if (byteOffset < 0) byteOffset = buffer.length + byteOffset + if (byteOffset >= buffer.length) { + if (dir) return -1 + else byteOffset = buffer.length - 1 + } else if (byteOffset < 0) { + if (dir) byteOffset = 0 + else return -1 + } + + // Normalize val + if (typeof val === 'string') { + val = Buffer.from(val, encoding) + } + + // Finally, search either indexOf (if dir is true) or lastIndexOf + if (Buffer.isBuffer(val)) { + // Special case: looking for empty string/buffer always fails + if (val.length === 0) { + return -1 + } + return arrayIndexOf(buffer, val, byteOffset, encoding, dir) + } else if (typeof val === 'number') { + val = val & 0xFF // Search for a byte value [0-255] + if (Buffer.TYPED_ARRAY_SUPPORT && + typeof Uint8Array.prototype.indexOf === 'function') { + if (dir) { + return Uint8Array.prototype.indexOf.call(buffer, val, byteOffset) + } else { + return Uint8Array.prototype.lastIndexOf.call(buffer, val, byteOffset) + } + } + return arrayIndexOf(buffer, [ val ], byteOffset, encoding, dir) + } + + throw new TypeError('val must be string, number or Buffer') +} + +function arrayIndexOf (arr, val, byteOffset, encoding, dir) { + var indexSize = 1 + var arrLength = arr.length + var valLength = val.length + + if (encoding !== undefined) { + encoding = String(encoding).toLowerCase() + if (encoding === 'ucs2' || encoding === 'ucs-2' || + encoding === 'utf16le' || encoding === 'utf-16le') { + if (arr.length < 2 || val.length < 2) { + return -1 + } + indexSize = 2 + arrLength /= 2 + valLength /= 2 + byteOffset /= 2 + } + } + + function read (buf, i) { + if (indexSize === 1) { + return buf[i] + } else { + return buf.readUInt16BE(i * indexSize) + } + } + + var i + if (dir) { + var foundIndex = -1 + for (i = byteOffset; i < arrLength; i++) { + if (read(arr, i) === read(val, foundIndex === -1 ? 0 : i - foundIndex)) { + if (foundIndex === -1) foundIndex = i + if (i - foundIndex + 1 === valLength) return foundIndex * indexSize + } else { + if (foundIndex !== -1) i -= i - foundIndex + foundIndex = -1 + } + } + } else { + if (byteOffset + valLength > arrLength) byteOffset = arrLength - valLength + for (i = byteOffset; i >= 0; i--) { + var found = true + for (var j = 0; j < valLength; j++) { + if (read(arr, i + j) !== read(val, j)) { + found = false + break + } + } + if (found) return i + } + } + + return -1 +} + +Buffer.prototype.includes = function includes (val, byteOffset, encoding) { + return this.indexOf(val, byteOffset, encoding) !== -1 +} + +Buffer.prototype.indexOf = function indexOf (val, byteOffset, encoding) { + return bidirectionalIndexOf(this, val, byteOffset, encoding, true) +} + +Buffer.prototype.lastIndexOf = function lastIndexOf (val, byteOffset, encoding) { + return bidirectionalIndexOf(this, val, byteOffset, encoding, false) +} + +function hexWrite (buf, string, offset, length) { + offset = Number(offset) || 0 + var remaining = buf.length - offset + if (!length) { + length = remaining + } else { + length = Number(length) + if (length > remaining) { + length = remaining + } + } + + // must be an even number of digits + var strLen = string.length + if (strLen % 2 !== 0) throw new TypeError('Invalid hex string') + + if (length > strLen / 2) { + length = strLen / 2 + } + for (var i = 0; i < length; ++i) { + var parsed = parseInt(string.substr(i * 2, 2), 16) + if (isNaN(parsed)) return i + buf[offset + i] = parsed + } + return i +} + +function utf8Write (buf, string, offset, length) { + return blitBuffer(utf8ToBytes(string, buf.length - offset), buf, offset, length) +} + +function asciiWrite (buf, string, offset, length) { + return blitBuffer(asciiToBytes(string), buf, offset, length) +} + +function latin1Write (buf, string, offset, length) { + return asciiWrite(buf, string, offset, length) +} + +function base64Write (buf, string, offset, length) { + return blitBuffer(base64ToBytes(string), buf, offset, length) +} + +function ucs2Write (buf, string, offset, length) { + return blitBuffer(utf16leToBytes(string, buf.length - offset), buf, offset, length) +} + +Buffer.prototype.write = function write (string, offset, length, encoding) { + // Buffer#write(string) + if (offset === undefined) { + encoding = 'utf8' + length = this.length + offset = 0 + // Buffer#write(string, encoding) + } else if (length === undefined && typeof offset === 'string') { + encoding = offset + length = this.length + offset = 0 + // Buffer#write(string, offset[, length][, encoding]) + } else if (isFinite(offset)) { + offset = offset | 0 + if (isFinite(length)) { + length = length | 0 + if (encoding === undefined) encoding = 'utf8' + } else { + encoding = length + length = undefined + } + // legacy write(string, encoding, offset, length) - remove in v0.13 + } else { + throw new Error( + 'Buffer.write(string, encoding, offset[, length]) is no longer supported' + ) + } + + var remaining = this.length - offset + if (length === undefined || length > remaining) length = remaining + + if ((string.length > 0 && (length < 0 || offset < 0)) || offset > this.length) { + throw new RangeError('Attempt to write outside buffer bounds') + } + + if (!encoding) encoding = 'utf8' + + var loweredCase = false + for (;;) { + switch (encoding) { + case 'hex': + return hexWrite(this, string, offset, length) + + case 'utf8': + case 'utf-8': + return utf8Write(this, string, offset, length) + + case 'ascii': + return asciiWrite(this, string, offset, length) + + case 'latin1': + case 'binary': + return latin1Write(this, string, offset, length) + + case 'base64': + // Warning: maxLength not taken into account in base64Write + return base64Write(this, string, offset, length) + + case 'ucs2': + case 'ucs-2': + case 'utf16le': + case 'utf-16le': + return ucs2Write(this, string, offset, length) + + default: + if (loweredCase) throw new TypeError('Unknown encoding: ' + encoding) + encoding = ('' + encoding).toLowerCase() + loweredCase = true + } + } +} + +Buffer.prototype.toJSON = function toJSON () { + return { + type: 'Buffer', + data: Array.prototype.slice.call(this._arr || this, 0) + } +} + +function base64Slice (buf, start, end) { + if (start === 0 && end === buf.length) { + return base64.fromByteArray(buf) + } else { + return base64.fromByteArray(buf.slice(start, end)) + } +} + +function utf8Slice (buf, start, end) { + end = Math.min(buf.length, end) + var res = [] + + var i = start + while (i < end) { + var firstByte = buf[i] + var codePoint = null + var bytesPerSequence = (firstByte > 0xEF) ? 4 + : (firstByte > 0xDF) ? 3 + : (firstByte > 0xBF) ? 2 + : 1 + + if (i + bytesPerSequence <= end) { + var secondByte, thirdByte, fourthByte, tempCodePoint + + switch (bytesPerSequence) { + case 1: + if (firstByte < 0x80) { + codePoint = firstByte + } + break + case 2: + secondByte = buf[i + 1] + if ((secondByte & 0xC0) === 0x80) { + tempCodePoint = (firstByte & 0x1F) << 0x6 | (secondByte & 0x3F) + if (tempCodePoint > 0x7F) { + codePoint = tempCodePoint + } + } + break + case 3: + secondByte = buf[i + 1] + thirdByte = buf[i + 2] + if ((secondByte & 0xC0) === 0x80 && (thirdByte & 0xC0) === 0x80) { + tempCodePoint = (firstByte & 0xF) << 0xC | (secondByte & 0x3F) << 0x6 | (thirdByte & 0x3F) + if (tempCodePoint > 0x7FF && (tempCodePoint < 0xD800 || tempCodePoint > 0xDFFF)) { + codePoint = tempCodePoint + } + } + break + case 4: + secondByte = buf[i + 1] + thirdByte = buf[i + 2] + fourthByte = buf[i + 3] + if ((secondByte & 0xC0) === 0x80 && (thirdByte & 0xC0) === 0x80 && (fourthByte & 0xC0) === 0x80) { + tempCodePoint = (firstByte & 0xF) << 0x12 | (secondByte & 0x3F) << 0xC | (thirdByte & 0x3F) << 0x6 | (fourthByte & 0x3F) + if (tempCodePoint > 0xFFFF && tempCodePoint < 0x110000) { + codePoint = tempCodePoint + } + } + } + } + + if (codePoint === null) { + // we did not generate a valid codePoint so insert a + // replacement char (U+FFFD) and advance only 1 byte + codePoint = 0xFFFD + bytesPerSequence = 1 + } else if (codePoint > 0xFFFF) { + // encode to utf16 (surrogate pair dance) + codePoint -= 0x10000 + res.push(codePoint >>> 10 & 0x3FF | 0xD800) + codePoint = 0xDC00 | codePoint & 0x3FF + } + + res.push(codePoint) + i += bytesPerSequence + } + + return decodeCodePointsArray(res) +} + +// Based on http://stackoverflow.com/a/22747272/680742, the browser with +// the lowest limit is Chrome, with 0x10000 args. +// We go 1 magnitude less, for safety +var MAX_ARGUMENTS_LENGTH = 0x1000 + +function decodeCodePointsArray (codePoints) { + var len = codePoints.length + if (len <= MAX_ARGUMENTS_LENGTH) { + return String.fromCharCode.apply(String, codePoints) // avoid extra slice() + } + + // Decode in chunks to avoid "call stack size exceeded". + var res = '' + var i = 0 + while (i < len) { + res += String.fromCharCode.apply( + String, + codePoints.slice(i, i += MAX_ARGUMENTS_LENGTH) + ) + } + return res +} + +function asciiSlice (buf, start, end) { + var ret = '' + end = Math.min(buf.length, end) + + for (var i = start; i < end; ++i) { + ret += String.fromCharCode(buf[i] & 0x7F) + } + return ret +} + +function latin1Slice (buf, start, end) { + var ret = '' + end = Math.min(buf.length, end) + + for (var i = start; i < end; ++i) { + ret += String.fromCharCode(buf[i]) + } + return ret +} + +function hexSlice (buf, start, end) { + var len = buf.length + + if (!start || start < 0) start = 0 + if (!end || end < 0 || end > len) end = len + + var out = '' + for (var i = start; i < end; ++i) { + out += toHex(buf[i]) + } + return out +} + +function utf16leSlice (buf, start, end) { + var bytes = buf.slice(start, end) + var res = '' + for (var i = 0; i < bytes.length; i += 2) { + res += String.fromCharCode(bytes[i] + bytes[i + 1] * 256) + } + return res +} + +Buffer.prototype.slice = function slice (start, end) { + var len = this.length + start = ~~start + end = end === undefined ? len : ~~end + + if (start < 0) { + start += len + if (start < 0) start = 0 + } else if (start > len) { + start = len + } + + if (end < 0) { + end += len + if (end < 0) end = 0 + } else if (end > len) { + end = len + } + + if (end < start) end = start + + var newBuf + if (Buffer.TYPED_ARRAY_SUPPORT) { + newBuf = this.subarray(start, end) + newBuf.__proto__ = Buffer.prototype + } else { + var sliceLen = end - start + newBuf = new Buffer(sliceLen, undefined) + for (var i = 0; i < sliceLen; ++i) { + newBuf[i] = this[i + start] + } + } + + return newBuf +} + +/* + * Need to make sure that buffer isn't trying to write out of bounds. + */ +function checkOffset (offset, ext, length) { + if ((offset % 1) !== 0 || offset < 0) throw new RangeError('offset is not uint') + if (offset + ext > length) throw new RangeError('Trying to access beyond buffer length') +} + +Buffer.prototype.readUIntLE = function readUIntLE (offset, byteLength, noAssert) { + offset = offset | 0 + byteLength = byteLength | 0 + if (!noAssert) checkOffset(offset, byteLength, this.length) + + var val = this[offset] + var mul = 1 + var i = 0 + while (++i < byteLength && (mul *= 0x100)) { + val += this[offset + i] * mul + } + + return val +} + +Buffer.prototype.readUIntBE = function readUIntBE (offset, byteLength, noAssert) { + offset = offset | 0 + byteLength = byteLength | 0 + if (!noAssert) { + checkOffset(offset, byteLength, this.length) + } + + var val = this[offset + --byteLength] + var mul = 1 + while (byteLength > 0 && (mul *= 0x100)) { + val += this[offset + --byteLength] * mul + } + + return val +} + +Buffer.prototype.readUInt8 = function readUInt8 (offset, noAssert) { + if (!noAssert) checkOffset(offset, 1, this.length) + return this[offset] +} + +Buffer.prototype.readUInt16LE = function readUInt16LE (offset, noAssert) { + if (!noAssert) checkOffset(offset, 2, this.length) + return this[offset] | (this[offset + 1] << 8) +} + +Buffer.prototype.readUInt16BE = function readUInt16BE (offset, noAssert) { + if (!noAssert) checkOffset(offset, 2, this.length) + return (this[offset] << 8) | this[offset + 1] +} + +Buffer.prototype.readUInt32LE = function readUInt32LE (offset, noAssert) { + if (!noAssert) checkOffset(offset, 4, this.length) + + return ((this[offset]) | + (this[offset + 1] << 8) | + (this[offset + 2] << 16)) + + (this[offset + 3] * 0x1000000) +} + +Buffer.prototype.readUInt32BE = function readUInt32BE (offset, noAssert) { + if (!noAssert) checkOffset(offset, 4, this.length) + + return (this[offset] * 0x1000000) + + ((this[offset + 1] << 16) | + (this[offset + 2] << 8) | + this[offset + 3]) +} + +Buffer.prototype.readIntLE = function readIntLE (offset, byteLength, noAssert) { + offset = offset | 0 + byteLength = byteLength | 0 + if (!noAssert) checkOffset(offset, byteLength, this.length) + + var val = this[offset] + var mul = 1 + var i = 0 + while (++i < byteLength && (mul *= 0x100)) { + val += this[offset + i] * mul + } + mul *= 0x80 + + if (val >= mul) val -= Math.pow(2, 8 * byteLength) + + return val +} + +Buffer.prototype.readIntBE = function readIntBE (offset, byteLength, noAssert) { + offset = offset | 0 + byteLength = byteLength | 0 + if (!noAssert) checkOffset(offset, byteLength, this.length) + + var i = byteLength + var mul = 1 + var val = this[offset + --i] + while (i > 0 && (mul *= 0x100)) { + val += this[offset + --i] * mul + } + mul *= 0x80 + + if (val >= mul) val -= Math.pow(2, 8 * byteLength) + + return val +} + +Buffer.prototype.readInt8 = function readInt8 (offset, noAssert) { + if (!noAssert) checkOffset(offset, 1, this.length) + if (!(this[offset] & 0x80)) return (this[offset]) + return ((0xff - this[offset] + 1) * -1) +} + +Buffer.prototype.readInt16LE = function readInt16LE (offset, noAssert) { + if (!noAssert) checkOffset(offset, 2, this.length) + var val = this[offset] | (this[offset + 1] << 8) + return (val & 0x8000) ? val | 0xFFFF0000 : val +} + +Buffer.prototype.readInt16BE = function readInt16BE (offset, noAssert) { + if (!noAssert) checkOffset(offset, 2, this.length) + var val = this[offset + 1] | (this[offset] << 8) + return (val & 0x8000) ? val | 0xFFFF0000 : val +} + +Buffer.prototype.readInt32LE = function readInt32LE (offset, noAssert) { + if (!noAssert) checkOffset(offset, 4, this.length) + + return (this[offset]) | + (this[offset + 1] << 8) | + (this[offset + 2] << 16) | + (this[offset + 3] << 24) +} + +Buffer.prototype.readInt32BE = function readInt32BE (offset, noAssert) { + if (!noAssert) checkOffset(offset, 4, this.length) + + return (this[offset] << 24) | + (this[offset + 1] << 16) | + (this[offset + 2] << 8) | + (this[offset + 3]) +} + +Buffer.prototype.readFloatLE = function readFloatLE (offset, noAssert) { + if (!noAssert) checkOffset(offset, 4, this.length) + return ieee754.read(this, offset, true, 23, 4) +} + +Buffer.prototype.readFloatBE = function readFloatBE (offset, noAssert) { + if (!noAssert) checkOffset(offset, 4, this.length) + return ieee754.read(this, offset, false, 23, 4) +} + +Buffer.prototype.readDoubleLE = function readDoubleLE (offset, noAssert) { + if (!noAssert) checkOffset(offset, 8, this.length) + return ieee754.read(this, offset, true, 52, 8) +} + +Buffer.prototype.readDoubleBE = function readDoubleBE (offset, noAssert) { + if (!noAssert) checkOffset(offset, 8, this.length) + return ieee754.read(this, offset, false, 52, 8) +} + +function checkInt (buf, value, offset, ext, max, min) { + if (!Buffer.isBuffer(buf)) throw new TypeError('"buffer" argument must be a Buffer instance') + if (value > max || value < min) throw new RangeError('"value" argument is out of bounds') + if (offset + ext > buf.length) throw new RangeError('Index out of range') +} + +Buffer.prototype.writeUIntLE = function writeUIntLE (value, offset, byteLength, noAssert) { + value = +value + offset = offset | 0 + byteLength = byteLength | 0 + if (!noAssert) { + var maxBytes = Math.pow(2, 8 * byteLength) - 1 + checkInt(this, value, offset, byteLength, maxBytes, 0) + } + + var mul = 1 + var i = 0 + this[offset] = value & 0xFF + while (++i < byteLength && (mul *= 0x100)) { + this[offset + i] = (value / mul) & 0xFF + } + + return offset + byteLength +} + +Buffer.prototype.writeUIntBE = function writeUIntBE (value, offset, byteLength, noAssert) { + value = +value + offset = offset | 0 + byteLength = byteLength | 0 + if (!noAssert) { + var maxBytes = Math.pow(2, 8 * byteLength) - 1 + checkInt(this, value, offset, byteLength, maxBytes, 0) + } + + var i = byteLength - 1 + var mul = 1 + this[offset + i] = value & 0xFF + while (--i >= 0 && (mul *= 0x100)) { + this[offset + i] = (value / mul) & 0xFF + } + + return offset + byteLength +} + +Buffer.prototype.writeUInt8 = function writeUInt8 (value, offset, noAssert) { + value = +value + offset = offset | 0 + if (!noAssert) checkInt(this, value, offset, 1, 0xff, 0) + if (!Buffer.TYPED_ARRAY_SUPPORT) value = Math.floor(value) + this[offset] = (value & 0xff) + return offset + 1 +} + +function objectWriteUInt16 (buf, value, offset, littleEndian) { + if (value < 0) value = 0xffff + value + 1 + for (var i = 0, j = Math.min(buf.length - offset, 2); i < j; ++i) { + buf[offset + i] = (value & (0xff << (8 * (littleEndian ? i : 1 - i)))) >>> + (littleEndian ? i : 1 - i) * 8 + } +} + +Buffer.prototype.writeUInt16LE = function writeUInt16LE (value, offset, noAssert) { + value = +value + offset = offset | 0 + if (!noAssert) checkInt(this, value, offset, 2, 0xffff, 0) + if (Buffer.TYPED_ARRAY_SUPPORT) { + this[offset] = (value & 0xff) + this[offset + 1] = (value >>> 8) + } else { + objectWriteUInt16(this, value, offset, true) + } + return offset + 2 +} + +Buffer.prototype.writeUInt16BE = function writeUInt16BE (value, offset, noAssert) { + value = +value + offset = offset | 0 + if (!noAssert) checkInt(this, value, offset, 2, 0xffff, 0) + if (Buffer.TYPED_ARRAY_SUPPORT) { + this[offset] = (value >>> 8) + this[offset + 1] = (value & 0xff) + } else { + objectWriteUInt16(this, value, offset, false) + } + return offset + 2 +} + +function objectWriteUInt32 (buf, value, offset, littleEndian) { + if (value < 0) value = 0xffffffff + value + 1 + for (var i = 0, j = Math.min(buf.length - offset, 4); i < j; ++i) { + buf[offset + i] = (value >>> (littleEndian ? i : 3 - i) * 8) & 0xff + } +} + +Buffer.prototype.writeUInt32LE = function writeUInt32LE (value, offset, noAssert) { + value = +value + offset = offset | 0 + if (!noAssert) checkInt(this, value, offset, 4, 0xffffffff, 0) + if (Buffer.TYPED_ARRAY_SUPPORT) { + this[offset + 3] = (value >>> 24) + this[offset + 2] = (value >>> 16) + this[offset + 1] = (value >>> 8) + this[offset] = (value & 0xff) + } else { + objectWriteUInt32(this, value, offset, true) + } + return offset + 4 +} + +Buffer.prototype.writeUInt32BE = function writeUInt32BE (value, offset, noAssert) { + value = +value + offset = offset | 0 + if (!noAssert) checkInt(this, value, offset, 4, 0xffffffff, 0) + if (Buffer.TYPED_ARRAY_SUPPORT) { + this[offset] = (value >>> 24) + this[offset + 1] = (value >>> 16) + this[offset + 2] = (value >>> 8) + this[offset + 3] = (value & 0xff) + } else { + objectWriteUInt32(this, value, offset, false) + } + return offset + 4 +} + +Buffer.prototype.writeIntLE = function writeIntLE (value, offset, byteLength, noAssert) { + value = +value + offset = offset | 0 + if (!noAssert) { + var limit = Math.pow(2, 8 * byteLength - 1) + + checkInt(this, value, offset, byteLength, limit - 1, -limit) + } + + var i = 0 + var mul = 1 + var sub = 0 + this[offset] = value & 0xFF + while (++i < byteLength && (mul *= 0x100)) { + if (value < 0 && sub === 0 && this[offset + i - 1] !== 0) { + sub = 1 + } + this[offset + i] = ((value / mul) >> 0) - sub & 0xFF + } + + return offset + byteLength +} + +Buffer.prototype.writeIntBE = function writeIntBE (value, offset, byteLength, noAssert) { + value = +value + offset = offset | 0 + if (!noAssert) { + var limit = Math.pow(2, 8 * byteLength - 1) + + checkInt(this, value, offset, byteLength, limit - 1, -limit) + } + + var i = byteLength - 1 + var mul = 1 + var sub = 0 + this[offset + i] = value & 0xFF + while (--i >= 0 && (mul *= 0x100)) { + if (value < 0 && sub === 0 && this[offset + i + 1] !== 0) { + sub = 1 + } + this[offset + i] = ((value / mul) >> 0) - sub & 0xFF + } + + return offset + byteLength +} + +Buffer.prototype.writeInt8 = function writeInt8 (value, offset, noAssert) { + value = +value + offset = offset | 0 + if (!noAssert) checkInt(this, value, offset, 1, 0x7f, -0x80) + if (!Buffer.TYPED_ARRAY_SUPPORT) value = Math.floor(value) + if (value < 0) value = 0xff + value + 1 + this[offset] = (value & 0xff) + return offset + 1 +} + +Buffer.prototype.writeInt16LE = function writeInt16LE (value, offset, noAssert) { + value = +value + offset = offset | 0 + if (!noAssert) checkInt(this, value, offset, 2, 0x7fff, -0x8000) + if (Buffer.TYPED_ARRAY_SUPPORT) { + this[offset] = (value & 0xff) + this[offset + 1] = (value >>> 8) + } else { + objectWriteUInt16(this, value, offset, true) + } + return offset + 2 +} + +Buffer.prototype.writeInt16BE = function writeInt16BE (value, offset, noAssert) { + value = +value + offset = offset | 0 + if (!noAssert) checkInt(this, value, offset, 2, 0x7fff, -0x8000) + if (Buffer.TYPED_ARRAY_SUPPORT) { + this[offset] = (value >>> 8) + this[offset + 1] = (value & 0xff) + } else { + objectWriteUInt16(this, value, offset, false) + } + return offset + 2 +} + +Buffer.prototype.writeInt32LE = function writeInt32LE (value, offset, noAssert) { + value = +value + offset = offset | 0 + if (!noAssert) checkInt(this, value, offset, 4, 0x7fffffff, -0x80000000) + if (Buffer.TYPED_ARRAY_SUPPORT) { + this[offset] = (value & 0xff) + this[offset + 1] = (value >>> 8) + this[offset + 2] = (value >>> 16) + this[offset + 3] = (value >>> 24) + } else { + objectWriteUInt32(this, value, offset, true) + } + return offset + 4 +} + +Buffer.prototype.writeInt32BE = function writeInt32BE (value, offset, noAssert) { + value = +value + offset = offset | 0 + if (!noAssert) checkInt(this, value, offset, 4, 0x7fffffff, -0x80000000) + if (value < 0) value = 0xffffffff + value + 1 + if (Buffer.TYPED_ARRAY_SUPPORT) { + this[offset] = (value >>> 24) + this[offset + 1] = (value >>> 16) + this[offset + 2] = (value >>> 8) + this[offset + 3] = (value & 0xff) + } else { + objectWriteUInt32(this, value, offset, false) + } + return offset + 4 +} + +function checkIEEE754 (buf, value, offset, ext, max, min) { + if (offset + ext > buf.length) throw new RangeError('Index out of range') + if (offset < 0) throw new RangeError('Index out of range') +} + +function writeFloat (buf, value, offset, littleEndian, noAssert) { + if (!noAssert) { + checkIEEE754(buf, value, offset, 4, 3.4028234663852886e+38, -3.4028234663852886e+38) + } + ieee754.write(buf, value, offset, littleEndian, 23, 4) + return offset + 4 +} + +Buffer.prototype.writeFloatLE = function writeFloatLE (value, offset, noAssert) { + return writeFloat(this, value, offset, true, noAssert) +} + +Buffer.prototype.writeFloatBE = function writeFloatBE (value, offset, noAssert) { + return writeFloat(this, value, offset, false, noAssert) +} + +function writeDouble (buf, value, offset, littleEndian, noAssert) { + if (!noAssert) { + checkIEEE754(buf, value, offset, 8, 1.7976931348623157E+308, -1.7976931348623157E+308) + } + ieee754.write(buf, value, offset, littleEndian, 52, 8) + return offset + 8 +} + +Buffer.prototype.writeDoubleLE = function writeDoubleLE (value, offset, noAssert) { + return writeDouble(this, value, offset, true, noAssert) +} + +Buffer.prototype.writeDoubleBE = function writeDoubleBE (value, offset, noAssert) { + return writeDouble(this, value, offset, false, noAssert) +} + +// copy(targetBuffer, targetStart=0, sourceStart=0, sourceEnd=buffer.length) +Buffer.prototype.copy = function copy (target, targetStart, start, end) { + if (!start) start = 0 + if (!end && end !== 0) end = this.length + if (targetStart >= target.length) targetStart = target.length + if (!targetStart) targetStart = 0 + if (end > 0 && end < start) end = start + + // Copy 0 bytes; we're done + if (end === start) return 0 + if (target.length === 0 || this.length === 0) return 0 + + // Fatal error conditions + if (targetStart < 0) { + throw new RangeError('targetStart out of bounds') + } + if (start < 0 || start >= this.length) throw new RangeError('sourceStart out of bounds') + if (end < 0) throw new RangeError('sourceEnd out of bounds') + + // Are we oob? + if (end > this.length) end = this.length + if (target.length - targetStart < end - start) { + end = target.length - targetStart + start + } + + var len = end - start + var i + + if (this === target && start < targetStart && targetStart < end) { + // descending copy from end + for (i = len - 1; i >= 0; --i) { + target[i + targetStart] = this[i + start] + } + } else if (len < 1000 || !Buffer.TYPED_ARRAY_SUPPORT) { + // ascending copy from start + for (i = 0; i < len; ++i) { + target[i + targetStart] = this[i + start] + } + } else { + Uint8Array.prototype.set.call( + target, + this.subarray(start, start + len), + targetStart + ) + } + + return len +} + +// Usage: +// buffer.fill(number[, offset[, end]]) +// buffer.fill(buffer[, offset[, end]]) +// buffer.fill(string[, offset[, end]][, encoding]) +Buffer.prototype.fill = function fill (val, start, end, encoding) { + // Handle string cases: + if (typeof val === 'string') { + if (typeof start === 'string') { + encoding = start + start = 0 + end = this.length + } else if (typeof end === 'string') { + encoding = end + end = this.length + } + if (val.length === 1) { + var code = val.charCodeAt(0) + if (code < 256) { + val = code + } + } + if (encoding !== undefined && typeof encoding !== 'string') { + throw new TypeError('encoding must be a string') + } + if (typeof encoding === 'string' && !Buffer.isEncoding(encoding)) { + throw new TypeError('Unknown encoding: ' + encoding) + } + } else if (typeof val === 'number') { + val = val & 255 + } + + // Invalid ranges are not set to a default, so can range check early. + if (start < 0 || this.length < start || this.length < end) { + throw new RangeError('Out of range index') + } + + if (end <= start) { + return this + } + + start = start >>> 0 + end = end === undefined ? this.length : end >>> 0 + + if (!val) val = 0 + + var i + if (typeof val === 'number') { + for (i = start; i < end; ++i) { + this[i] = val + } + } else { + var bytes = Buffer.isBuffer(val) + ? val + : utf8ToBytes(new Buffer(val, encoding).toString()) + var len = bytes.length + for (i = 0; i < end - start; ++i) { + this[i + start] = bytes[i % len] + } + } + + return this +} + +// HELPER FUNCTIONS +// ================ + +var INVALID_BASE64_RE = /[^+\/0-9A-Za-z-_]/g + +function base64clean (str) { + // Node strips out invalid characters like \n and \t from the string, base64-js does not + str = stringtrim(str).replace(INVALID_BASE64_RE, '') + // Node converts strings with length < 2 to '' + if (str.length < 2) return '' + // Node allows for non-padded base64 strings (missing trailing ===), base64-js does not + while (str.length % 4 !== 0) { + str = str + '=' + } + return str +} + +function stringtrim (str) { + if (str.trim) return str.trim() + return str.replace(/^\s+|\s+$/g, '') +} + +function toHex (n) { + if (n < 16) return '0' + n.toString(16) + return n.toString(16) +} + +function utf8ToBytes (string, units) { + units = units || Infinity + var codePoint + var length = string.length + var leadSurrogate = null + var bytes = [] + + for (var i = 0; i < length; ++i) { + codePoint = string.charCodeAt(i) + + // is surrogate component + if (codePoint > 0xD7FF && codePoint < 0xE000) { + // last char was a lead + if (!leadSurrogate) { + // no lead yet + if (codePoint > 0xDBFF) { + // unexpected trail + if ((units -= 3) > -1) bytes.push(0xEF, 0xBF, 0xBD) + continue + } else if (i + 1 === length) { + // unpaired lead + if ((units -= 3) > -1) bytes.push(0xEF, 0xBF, 0xBD) + continue + } + + // valid lead + leadSurrogate = codePoint + + continue + } + + // 2 leads in a row + if (codePoint < 0xDC00) { + if ((units -= 3) > -1) bytes.push(0xEF, 0xBF, 0xBD) + leadSurrogate = codePoint + continue + } + + // valid surrogate pair + codePoint = (leadSurrogate - 0xD800 << 10 | codePoint - 0xDC00) + 0x10000 + } else if (leadSurrogate) { + // valid bmp char, but last char was a lead + if ((units -= 3) > -1) bytes.push(0xEF, 0xBF, 0xBD) + } + + leadSurrogate = null + + // encode utf8 + if (codePoint < 0x80) { + if ((units -= 1) < 0) break + bytes.push(codePoint) + } else if (codePoint < 0x800) { + if ((units -= 2) < 0) break + bytes.push( + codePoint >> 0x6 | 0xC0, + codePoint & 0x3F | 0x80 + ) + } else if (codePoint < 0x10000) { + if ((units -= 3) < 0) break + bytes.push( + codePoint >> 0xC | 0xE0, + codePoint >> 0x6 & 0x3F | 0x80, + codePoint & 0x3F | 0x80 + ) + } else if (codePoint < 0x110000) { + if ((units -= 4) < 0) break + bytes.push( + codePoint >> 0x12 | 0xF0, + codePoint >> 0xC & 0x3F | 0x80, + codePoint >> 0x6 & 0x3F | 0x80, + codePoint & 0x3F | 0x80 + ) + } else { + throw new Error('Invalid code point') + } + } + + return bytes +} + +function asciiToBytes (str) { + var byteArray = [] + for (var i = 0; i < str.length; ++i) { + // Node's code seems to be doing this and not & 0x7F.. + byteArray.push(str.charCodeAt(i) & 0xFF) + } + return byteArray +} + +function utf16leToBytes (str, units) { + var c, hi, lo + var byteArray = [] + for (var i = 0; i < str.length; ++i) { + if ((units -= 2) < 0) break + + c = str.charCodeAt(i) + hi = c >> 8 + lo = c % 256 + byteArray.push(lo) + byteArray.push(hi) + } + + return byteArray +} + +function base64ToBytes (str) { + return base64.toByteArray(base64clean(str)) +} + +function blitBuffer (src, dst, offset, length) { + for (var i = 0; i < length; ++i) { + if ((i + offset >= dst.length) || (i >= src.length)) break + dst[i + offset] = src[i] + } + return i +} + +function isnan (val) { + return val !== val // eslint-disable-line no-self-compare +} + +}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {}) +},{"base64-js":4,"ieee754":12,"isarray":15}],4:[function(require,module,exports){ +'use strict' + +exports.byteLength = byteLength +exports.toByteArray = toByteArray +exports.fromByteArray = fromByteArray + +var lookup = [] +var revLookup = [] +var Arr = typeof Uint8Array !== 'undefined' ? Uint8Array : Array + +var code = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/' +for (var i = 0, len = code.length; i < len; ++i) { + lookup[i] = code[i] + revLookup[code.charCodeAt(i)] = i +} + +revLookup['-'.charCodeAt(0)] = 62 +revLookup['_'.charCodeAt(0)] = 63 + +function placeHoldersCount (b64) { + var len = b64.length + if (len % 4 > 0) { + throw new Error('Invalid string. Length must be a multiple of 4') + } + + // the number of equal signs (place holders) + // if there are two placeholders, than the two characters before it + // represent one byte + // if there is only one, then the three characters before it represent 2 bytes + // this is just a cheap hack to not do indexOf twice + return b64[len - 2] === '=' ? 2 : b64[len - 1] === '=' ? 1 : 0 +} + +function byteLength (b64) { + // base64 is 4/3 + up to two characters of the original data + return b64.length * 3 / 4 - placeHoldersCount(b64) +} + +function toByteArray (b64) { + var i, j, l, tmp, placeHolders, arr + var len = b64.length + placeHolders = placeHoldersCount(b64) + + arr = new Arr(len * 3 / 4 - placeHolders) + + // if there are placeholders, only get up to the last complete 4 chars + l = placeHolders > 0 ? len - 4 : len + + var L = 0 + + for (i = 0, j = 0; i < l; i += 4, j += 3) { + tmp = (revLookup[b64.charCodeAt(i)] << 18) | (revLookup[b64.charCodeAt(i + 1)] << 12) | (revLookup[b64.charCodeAt(i + 2)] << 6) | revLookup[b64.charCodeAt(i + 3)] + arr[L++] = (tmp >> 16) & 0xFF + arr[L++] = (tmp >> 8) & 0xFF + arr[L++] = tmp & 0xFF + } + + if (placeHolders === 2) { + tmp = (revLookup[b64.charCodeAt(i)] << 2) | (revLookup[b64.charCodeAt(i + 1)] >> 4) + arr[L++] = tmp & 0xFF + } else if (placeHolders === 1) { + tmp = (revLookup[b64.charCodeAt(i)] << 10) | (revLookup[b64.charCodeAt(i + 1)] << 4) | (revLookup[b64.charCodeAt(i + 2)] >> 2) + arr[L++] = (tmp >> 8) & 0xFF + arr[L++] = tmp & 0xFF + } + + return arr +} + +function tripletToBase64 (num) { + return lookup[num >> 18 & 0x3F] + lookup[num >> 12 & 0x3F] + lookup[num >> 6 & 0x3F] + lookup[num & 0x3F] +} + +function encodeChunk (uint8, start, end) { + var tmp + var output = [] + for (var i = start; i < end; i += 3) { + tmp = (uint8[i] << 16) + (uint8[i + 1] << 8) + (uint8[i + 2]) + output.push(tripletToBase64(tmp)) + } + return output.join('') +} + +function fromByteArray (uint8) { + var tmp + var len = uint8.length + var extraBytes = len % 3 // if we have 1 byte left, pad 2 bytes + var output = '' + var parts = [] + var maxChunkLength = 16383 // must be multiple of 3 + + // go through the array every three bytes, we'll deal with trailing stuff later + for (var i = 0, len2 = len - extraBytes; i < len2; i += maxChunkLength) { + parts.push(encodeChunk(uint8, i, (i + maxChunkLength) > len2 ? len2 : (i + maxChunkLength))) + } + + // pad the end with zeros, but make sure to not forget the extra bytes + if (extraBytes === 1) { + tmp = uint8[len - 1] + output += lookup[tmp >> 2] + output += lookup[(tmp << 4) & 0x3F] + output += '==' + } else if (extraBytes === 2) { + tmp = (uint8[len - 2] << 8) + (uint8[len - 1]) + output += lookup[tmp >> 10] + output += lookup[(tmp >> 4) & 0x3F] + output += lookup[(tmp << 2) & 0x3F] + output += '=' + } + + parts.push(output) + + return parts.join('') +} + +},{}],5:[function(require,module,exports){ +(function (Buffer){ +var Transform = require('stream').Transform +var inherits = require('inherits') +var StringDecoder = require('string_decoder').StringDecoder +module.exports = CipherBase +inherits(CipherBase, Transform) +function CipherBase (hashMode) { + Transform.call(this) + this.hashMode = typeof hashMode === 'string' + if (this.hashMode) { + this[hashMode] = this._finalOrDigest + } else { + this.final = this._finalOrDigest + } + this._decoder = null + this._encoding = null +} +CipherBase.prototype.update = function (data, inputEnc, outputEnc) { + if (typeof data === 'string') { + data = new Buffer(data, inputEnc) + } + var outData = this._update(data) + if (this.hashMode) { + return this + } + if (outputEnc) { + outData = this._toString(outData, outputEnc) + } + return outData +} + +CipherBase.prototype.setAutoPadding = function () {} + +CipherBase.prototype.getAuthTag = function () { + throw new Error('trying to get auth tag in unsupported state') +} + +CipherBase.prototype.setAuthTag = function () { + throw new Error('trying to set auth tag in unsupported state') +} + +CipherBase.prototype.setAAD = function () { + throw new Error('trying to set aad in unsupported state') +} + +CipherBase.prototype._transform = function (data, _, next) { + var err + try { + if (this.hashMode) { + this._update(data) + } else { + this.push(this._update(data)) + } + } catch (e) { + err = e + } finally { + next(err) + } +} +CipherBase.prototype._flush = function (done) { + var err + try { + this.push(this._final()) + } catch (e) { + err = e + } finally { + done(err) + } +} +CipherBase.prototype._finalOrDigest = function (outputEnc) { + var outData = this._final() || new Buffer('') + if (outputEnc) { + outData = this._toString(outData, outputEnc, true) + } + return outData +} + +CipherBase.prototype._toString = function (value, enc, fin) { + if (!this._decoder) { + this._decoder = new StringDecoder(enc) + this._encoding = enc + } + if (this._encoding !== enc) { + throw new Error('can\'t switch encodings') + } + var out = this._decoder.write(value) + if (fin) { + out += this._decoder.end() + } + return out +} + +}).call(this,require("buffer").Buffer) +},{"buffer":3,"inherits":13,"stream":39,"string_decoder":40}],6:[function(require,module,exports){ +(function (Buffer){ +// Copyright Joyent, Inc. and other Node contributors. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to permit +// persons to whom the Software is furnished to do so, subject to the +// following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +// USE OR OTHER DEALINGS IN THE SOFTWARE. + +// NOTE: These type checking functions intentionally don't use `instanceof` +// because it is fragile and can be easily faked with `Object.create()`. + +function isArray(arg) { + if (Array.isArray) { + return Array.isArray(arg); + } + return objectToString(arg) === '[object Array]'; +} +exports.isArray = isArray; + +function isBoolean(arg) { + return typeof arg === 'boolean'; +} +exports.isBoolean = isBoolean; + +function isNull(arg) { + return arg === null; +} +exports.isNull = isNull; + +function isNullOrUndefined(arg) { + return arg == null; +} +exports.isNullOrUndefined = isNullOrUndefined; + +function isNumber(arg) { + return typeof arg === 'number'; +} +exports.isNumber = isNumber; + +function isString(arg) { + return typeof arg === 'string'; +} +exports.isString = isString; + +function isSymbol(arg) { + return typeof arg === 'symbol'; +} +exports.isSymbol = isSymbol; + +function isUndefined(arg) { + return arg === void 0; +} +exports.isUndefined = isUndefined; + +function isRegExp(re) { + return objectToString(re) === '[object RegExp]'; +} +exports.isRegExp = isRegExp; + +function isObject(arg) { + return typeof arg === 'object' && arg !== null; +} +exports.isObject = isObject; + +function isDate(d) { + return objectToString(d) === '[object Date]'; +} +exports.isDate = isDate; + +function isError(e) { + return (objectToString(e) === '[object Error]' || e instanceof Error); +} +exports.isError = isError; + +function isFunction(arg) { + return typeof arg === 'function'; +} +exports.isFunction = isFunction; + +function isPrimitive(arg) { + return arg === null || + typeof arg === 'boolean' || + typeof arg === 'number' || + typeof arg === 'string' || + typeof arg === 'symbol' || // ES6 symbol + typeof arg === 'undefined'; +} +exports.isPrimitive = isPrimitive; + +exports.isBuffer = Buffer.isBuffer; + +function objectToString(o) { + return Object.prototype.toString.call(o); +} + +}).call(this,{"isBuffer":require("../../is-buffer/index.js")}) +},{"../../is-buffer/index.js":14}],7:[function(require,module,exports){ +(function (Buffer){ +'use strict'; +var inherits = require('inherits') +var md5 = require('./md5') +var rmd160 = require('ripemd160') +var sha = require('sha.js') + +var Base = require('cipher-base') + +function HashNoConstructor(hash) { + Base.call(this, 'digest') + + this._hash = hash + this.buffers = [] +} + +inherits(HashNoConstructor, Base) + +HashNoConstructor.prototype._update = function (data) { + this.buffers.push(data) +} + +HashNoConstructor.prototype._final = function () { + var buf = Buffer.concat(this.buffers) + var r = this._hash(buf) + this.buffers = null + + return r +} + +function Hash(hash) { + Base.call(this, 'digest') + + this._hash = hash +} + +inherits(Hash, Base) + +Hash.prototype._update = function (data) { + this._hash.update(data) +} + +Hash.prototype._final = function () { + return this._hash.digest() +} + +module.exports = function createHash (alg) { + alg = alg.toLowerCase() + if ('md5' === alg) return new HashNoConstructor(md5) + if ('rmd160' === alg || 'ripemd160' === alg) return new HashNoConstructor(rmd160) + + return new Hash(sha(alg)) +} + +}).call(this,require("buffer").Buffer) +},{"./md5":9,"buffer":3,"cipher-base":5,"inherits":13,"ripemd160":30,"sha.js":32}],8:[function(require,module,exports){ +(function (Buffer){ +'use strict'; +var intSize = 4; +var zeroBuffer = new Buffer(intSize); zeroBuffer.fill(0); +var chrsz = 8; + +function toArray(buf, bigEndian) { + if ((buf.length % intSize) !== 0) { + var len = buf.length + (intSize - (buf.length % intSize)); + buf = Buffer.concat([buf, zeroBuffer], len); + } + + var arr = []; + var fn = bigEndian ? buf.readInt32BE : buf.readInt32LE; + for (var i = 0; i < buf.length; i += intSize) { + arr.push(fn.call(buf, i)); + } + return arr; +} + +function toBuffer(arr, size, bigEndian) { + var buf = new Buffer(size); + var fn = bigEndian ? buf.writeInt32BE : buf.writeInt32LE; + for (var i = 0; i < arr.length; i++) { + fn.call(buf, arr[i], i * 4, true); + } + return buf; +} + +function hash(buf, fn, hashSize, bigEndian) { + if (!Buffer.isBuffer(buf)) buf = new Buffer(buf); + var arr = fn(toArray(buf, bigEndian), buf.length * chrsz); + return toBuffer(arr, hashSize, bigEndian); +} +exports.hash = hash; +}).call(this,require("buffer").Buffer) +},{"buffer":3}],9:[function(require,module,exports){ +'use strict'; +/* + * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message + * Digest Algorithm, as defined in RFC 1321. + * Version 2.1 Copyright (C) Paul Johnston 1999 - 2002. + * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet + * Distributed under the BSD License + * See http://pajhome.org.uk/crypt/md5 for more info. + */ + +var helpers = require('./helpers'); + +/* + * Calculate the MD5 of an array of little-endian words, and a bit length + */ +function core_md5(x, len) +{ + /* append padding */ + x[len >> 5] |= 0x80 << ((len) % 32); + x[(((len + 64) >>> 9) << 4) + 14] = len; + + var a = 1732584193; + var b = -271733879; + var c = -1732584194; + var d = 271733878; + + for(var i = 0; i < x.length; i += 16) + { + var olda = a; + var oldb = b; + var oldc = c; + var oldd = d; + + a = md5_ff(a, b, c, d, x[i+ 0], 7 , -680876936); + d = md5_ff(d, a, b, c, x[i+ 1], 12, -389564586); + c = md5_ff(c, d, a, b, x[i+ 2], 17, 606105819); + b = md5_ff(b, c, d, a, x[i+ 3], 22, -1044525330); + a = md5_ff(a, b, c, d, x[i+ 4], 7 , -176418897); + d = md5_ff(d, a, b, c, x[i+ 5], 12, 1200080426); + c = md5_ff(c, d, a, b, x[i+ 6], 17, -1473231341); + b = md5_ff(b, c, d, a, x[i+ 7], 22, -45705983); + a = md5_ff(a, b, c, d, x[i+ 8], 7 , 1770035416); + d = md5_ff(d, a, b, c, x[i+ 9], 12, -1958414417); + c = md5_ff(c, d, a, b, x[i+10], 17, -42063); + b = md5_ff(b, c, d, a, x[i+11], 22, -1990404162); + a = md5_ff(a, b, c, d, x[i+12], 7 , 1804603682); + d = md5_ff(d, a, b, c, x[i+13], 12, -40341101); + c = md5_ff(c, d, a, b, x[i+14], 17, -1502002290); + b = md5_ff(b, c, d, a, x[i+15], 22, 1236535329); + + a = md5_gg(a, b, c, d, x[i+ 1], 5 , -165796510); + d = md5_gg(d, a, b, c, x[i+ 6], 9 , -1069501632); + c = md5_gg(c, d, a, b, x[i+11], 14, 643717713); + b = md5_gg(b, c, d, a, x[i+ 0], 20, -373897302); + a = md5_gg(a, b, c, d, x[i+ 5], 5 , -701558691); + d = md5_gg(d, a, b, c, x[i+10], 9 , 38016083); + c = md5_gg(c, d, a, b, x[i+15], 14, -660478335); + b = md5_gg(b, c, d, a, x[i+ 4], 20, -405537848); + a = md5_gg(a, b, c, d, x[i+ 9], 5 , 568446438); + d = md5_gg(d, a, b, c, x[i+14], 9 , -1019803690); + c = md5_gg(c, d, a, b, x[i+ 3], 14, -187363961); + b = md5_gg(b, c, d, a, x[i+ 8], 20, 1163531501); + a = md5_gg(a, b, c, d, x[i+13], 5 , -1444681467); + d = md5_gg(d, a, b, c, x[i+ 2], 9 , -51403784); + c = md5_gg(c, d, a, b, x[i+ 7], 14, 1735328473); + b = md5_gg(b, c, d, a, x[i+12], 20, -1926607734); + + a = md5_hh(a, b, c, d, x[i+ 5], 4 , -378558); + d = md5_hh(d, a, b, c, x[i+ 8], 11, -2022574463); + c = md5_hh(c, d, a, b, x[i+11], 16, 1839030562); + b = md5_hh(b, c, d, a, x[i+14], 23, -35309556); + a = md5_hh(a, b, c, d, x[i+ 1], 4 , -1530992060); + d = md5_hh(d, a, b, c, x[i+ 4], 11, 1272893353); + c = md5_hh(c, d, a, b, x[i+ 7], 16, -155497632); + b = md5_hh(b, c, d, a, x[i+10], 23, -1094730640); + a = md5_hh(a, b, c, d, x[i+13], 4 , 681279174); + d = md5_hh(d, a, b, c, x[i+ 0], 11, -358537222); + c = md5_hh(c, d, a, b, x[i+ 3], 16, -722521979); + b = md5_hh(b, c, d, a, x[i+ 6], 23, 76029189); + a = md5_hh(a, b, c, d, x[i+ 9], 4 , -640364487); + d = md5_hh(d, a, b, c, x[i+12], 11, -421815835); + c = md5_hh(c, d, a, b, x[i+15], 16, 530742520); + b = md5_hh(b, c, d, a, x[i+ 2], 23, -995338651); + + a = md5_ii(a, b, c, d, x[i+ 0], 6 , -198630844); + d = md5_ii(d, a, b, c, x[i+ 7], 10, 1126891415); + c = md5_ii(c, d, a, b, x[i+14], 15, -1416354905); + b = md5_ii(b, c, d, a, x[i+ 5], 21, -57434055); + a = md5_ii(a, b, c, d, x[i+12], 6 , 1700485571); + d = md5_ii(d, a, b, c, x[i+ 3], 10, -1894986606); + c = md5_ii(c, d, a, b, x[i+10], 15, -1051523); + b = md5_ii(b, c, d, a, x[i+ 1], 21, -2054922799); + a = md5_ii(a, b, c, d, x[i+ 8], 6 , 1873313359); + d = md5_ii(d, a, b, c, x[i+15], 10, -30611744); + c = md5_ii(c, d, a, b, x[i+ 6], 15, -1560198380); + b = md5_ii(b, c, d, a, x[i+13], 21, 1309151649); + a = md5_ii(a, b, c, d, x[i+ 4], 6 , -145523070); + d = md5_ii(d, a, b, c, x[i+11], 10, -1120210379); + c = md5_ii(c, d, a, b, x[i+ 2], 15, 718787259); + b = md5_ii(b, c, d, a, x[i+ 9], 21, -343485551); + + a = safe_add(a, olda); + b = safe_add(b, oldb); + c = safe_add(c, oldc); + d = safe_add(d, oldd); + } + return Array(a, b, c, d); + +} + +/* + * These functions implement the four basic operations the algorithm uses. + */ +function md5_cmn(q, a, b, x, s, t) +{ + return safe_add(bit_rol(safe_add(safe_add(a, q), safe_add(x, t)), s),b); +} +function md5_ff(a, b, c, d, x, s, t) +{ + return md5_cmn((b & c) | ((~b) & d), a, b, x, s, t); +} +function md5_gg(a, b, c, d, x, s, t) +{ + return md5_cmn((b & d) | (c & (~d)), a, b, x, s, t); +} +function md5_hh(a, b, c, d, x, s, t) +{ + return md5_cmn(b ^ c ^ d, a, b, x, s, t); +} +function md5_ii(a, b, c, d, x, s, t) +{ + return md5_cmn(c ^ (b | (~d)), a, b, x, s, t); +} + +/* + * Add integers, wrapping at 2^32. This uses 16-bit operations internally + * to work around bugs in some JS interpreters. + */ +function safe_add(x, y) +{ + var lsw = (x & 0xFFFF) + (y & 0xFFFF); + var msw = (x >> 16) + (y >> 16) + (lsw >> 16); + return (msw << 16) | (lsw & 0xFFFF); +} + +/* + * Bitwise rotate a 32-bit number to the left. + */ +function bit_rol(num, cnt) +{ + return (num << cnt) | (num >>> (32 - cnt)); +} + +module.exports = function md5(buf) { + return helpers.hash(buf, core_md5, 16); +}; +},{"./helpers":8}],10:[function(require,module,exports){ +(function (Buffer){ +'use strict'; +var createHash = require('create-hash/browser'); +var inherits = require('inherits') + +var Transform = require('stream').Transform + +var ZEROS = new Buffer(128) +ZEROS.fill(0) + +function Hmac(alg, key) { + Transform.call(this) + alg = alg.toLowerCase() + if (typeof key === 'string') { + key = new Buffer(key) + } + + var blocksize = (alg === 'sha512' || alg === 'sha384') ? 128 : 64 + + this._alg = alg + this._key = key + + if (key.length > blocksize) { + key = createHash(alg).update(key).digest() + + } else if (key.length < blocksize) { + key = Buffer.concat([key, ZEROS], blocksize) + } + + var ipad = this._ipad = new Buffer(blocksize) + var opad = this._opad = new Buffer(blocksize) + + for (var i = 0; i < blocksize; i++) { + ipad[i] = key[i] ^ 0x36 + opad[i] = key[i] ^ 0x5C + } + + this._hash = createHash(alg).update(ipad) +} + +inherits(Hmac, Transform) + +Hmac.prototype.update = function (data, enc) { + this._hash.update(data, enc) + + return this +} + +Hmac.prototype._transform = function (data, _, next) { + this._hash.update(data) + + next() +} + +Hmac.prototype._flush = function (next) { + this.push(this.digest()) + + next() +} + +Hmac.prototype.digest = function (enc) { + var h = this._hash.digest() + + return createHash(this._alg).update(this._opad).update(h).digest(enc) +} + +module.exports = function createHmac(alg, key) { + return new Hmac(alg, key) +} + +}).call(this,require("buffer").Buffer) +},{"buffer":3,"create-hash/browser":7,"inherits":13,"stream":39}],11:[function(require,module,exports){ +// Copyright Joyent, Inc. and other Node contributors. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to permit +// persons to whom the Software is furnished to do so, subject to the +// following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +// USE OR OTHER DEALINGS IN THE SOFTWARE. + +function EventEmitter() { + this._events = this._events || {}; + this._maxListeners = this._maxListeners || undefined; +} +module.exports = EventEmitter; + +// Backwards-compat with node 0.10.x +EventEmitter.EventEmitter = EventEmitter; + +EventEmitter.prototype._events = undefined; +EventEmitter.prototype._maxListeners = undefined; + +// By default EventEmitters will print a warning if more than 10 listeners are +// added to it. This is a useful default which helps finding memory leaks. +EventEmitter.defaultMaxListeners = 10; + +// Obviously not all Emitters should be limited to 10. This function allows +// that to be increased. Set to zero for unlimited. +EventEmitter.prototype.setMaxListeners = function(n) { + if (!isNumber(n) || n < 0 || isNaN(n)) + throw TypeError('n must be a positive number'); + this._maxListeners = n; + return this; +}; + +EventEmitter.prototype.emit = function(type) { + var er, handler, len, args, i, listeners; + + if (!this._events) + this._events = {}; + + // If there is no 'error' event listener then throw. + if (type === 'error') { + if (!this._events.error || + (isObject(this._events.error) && !this._events.error.length)) { + er = arguments[1]; + if (er instanceof Error) { + throw er; // Unhandled 'error' event + } else { + // At least give some kind of context to the user + var err = new Error('Uncaught, unspecified "error" event. (' + er + ')'); + err.context = er; + throw err; + } + } + } + + handler = this._events[type]; + + if (isUndefined(handler)) + return false; + + if (isFunction(handler)) { + switch (arguments.length) { + // fast cases + case 1: + handler.call(this); + break; + case 2: + handler.call(this, arguments[1]); + break; + case 3: + handler.call(this, arguments[1], arguments[2]); + break; + // slower + default: + args = Array.prototype.slice.call(arguments, 1); + handler.apply(this, args); + } + } else if (isObject(handler)) { + args = Array.prototype.slice.call(arguments, 1); + listeners = handler.slice(); + len = listeners.length; + for (i = 0; i < len; i++) + listeners[i].apply(this, args); + } + + return true; +}; + +EventEmitter.prototype.addListener = function(type, listener) { + var m; + + if (!isFunction(listener)) + throw TypeError('listener must be a function'); + + if (!this._events) + this._events = {}; + + // To avoid recursion in the case that type === "newListener"! Before + // adding it to the listeners, first emit "newListener". + if (this._events.newListener) + this.emit('newListener', type, + isFunction(listener.listener) ? + listener.listener : listener); + + if (!this._events[type]) + // Optimize the case of one listener. Don't need the extra array object. + this._events[type] = listener; + else if (isObject(this._events[type])) + // If we've already got an array, just append. + this._events[type].push(listener); + else + // Adding the second element, need to change to array. + this._events[type] = [this._events[type], listener]; + + // Check for listener leak + if (isObject(this._events[type]) && !this._events[type].warned) { + if (!isUndefined(this._maxListeners)) { + m = this._maxListeners; + } else { + m = EventEmitter.defaultMaxListeners; + } + + if (m && m > 0 && this._events[type].length > m) { + this._events[type].warned = true; + console.error('(node) warning: possible EventEmitter memory ' + + 'leak detected. %d listeners added. ' + + 'Use emitter.setMaxListeners() to increase limit.', + this._events[type].length); + if (typeof console.trace === 'function') { + // not supported in IE 10 + console.trace(); + } + } + } + + return this; +}; + +EventEmitter.prototype.on = EventEmitter.prototype.addListener; + +EventEmitter.prototype.once = function(type, listener) { + if (!isFunction(listener)) + throw TypeError('listener must be a function'); + + var fired = false; + + function g() { + this.removeListener(type, g); + + if (!fired) { + fired = true; + listener.apply(this, arguments); + } + } + + g.listener = listener; + this.on(type, g); + + return this; +}; + +// emits a 'removeListener' event iff the listener was removed +EventEmitter.prototype.removeListener = function(type, listener) { + var list, position, length, i; + + if (!isFunction(listener)) + throw TypeError('listener must be a function'); + + if (!this._events || !this._events[type]) + return this; + + list = this._events[type]; + length = list.length; + position = -1; + + if (list === listener || + (isFunction(list.listener) && list.listener === listener)) { + delete this._events[type]; + if (this._events.removeListener) + this.emit('removeListener', type, listener); + + } else if (isObject(list)) { + for (i = length; i-- > 0;) { + if (list[i] === listener || + (list[i].listener && list[i].listener === listener)) { + position = i; + break; + } + } + + if (position < 0) + return this; + + if (list.length === 1) { + list.length = 0; + delete this._events[type]; + } else { + list.splice(position, 1); + } + + if (this._events.removeListener) + this.emit('removeListener', type, listener); + } + + return this; +}; + +EventEmitter.prototype.removeAllListeners = function(type) { + var key, listeners; + + if (!this._events) + return this; + + // not listening for removeListener, no need to emit + if (!this._events.removeListener) { + if (arguments.length === 0) + this._events = {}; + else if (this._events[type]) + delete this._events[type]; + return this; + } + + // emit removeListener for all listeners on all events + if (arguments.length === 0) { + for (key in this._events) { + if (key === 'removeListener') continue; + this.removeAllListeners(key); + } + this.removeAllListeners('removeListener'); + this._events = {}; + return this; + } + + listeners = this._events[type]; + + if (isFunction(listeners)) { + this.removeListener(type, listeners); + } else if (listeners) { + // LIFO order + while (listeners.length) + this.removeListener(type, listeners[listeners.length - 1]); + } + delete this._events[type]; + + return this; +}; + +EventEmitter.prototype.listeners = function(type) { + var ret; + if (!this._events || !this._events[type]) + ret = []; + else if (isFunction(this._events[type])) + ret = [this._events[type]]; + else + ret = this._events[type].slice(); + return ret; +}; + +EventEmitter.prototype.listenerCount = function(type) { + if (this._events) { + var evlistener = this._events[type]; + + if (isFunction(evlistener)) + return 1; + else if (evlistener) + return evlistener.length; + } + return 0; +}; + +EventEmitter.listenerCount = function(emitter, type) { + return emitter.listenerCount(type); +}; + +function isFunction(arg) { + return typeof arg === 'function'; +} + +function isNumber(arg) { + return typeof arg === 'number'; +} + +function isObject(arg) { + return typeof arg === 'object' && arg !== null; +} + +function isUndefined(arg) { + return arg === void 0; +} + +},{}],12:[function(require,module,exports){ +exports.read = function (buffer, offset, isLE, mLen, nBytes) { + var e, m + var eLen = nBytes * 8 - mLen - 1 + var eMax = (1 << eLen) - 1 + var eBias = eMax >> 1 + var nBits = -7 + var i = isLE ? (nBytes - 1) : 0 + var d = isLE ? -1 : 1 + var s = buffer[offset + i] + + i += d + + e = s & ((1 << (-nBits)) - 1) + s >>= (-nBits) + nBits += eLen + for (; nBits > 0; e = e * 256 + buffer[offset + i], i += d, nBits -= 8) {} + + m = e & ((1 << (-nBits)) - 1) + e >>= (-nBits) + nBits += mLen + for (; nBits > 0; m = m * 256 + buffer[offset + i], i += d, nBits -= 8) {} + + if (e === 0) { + e = 1 - eBias + } else if (e === eMax) { + return m ? NaN : ((s ? -1 : 1) * Infinity) + } else { + m = m + Math.pow(2, mLen) + e = e - eBias + } + return (s ? -1 : 1) * m * Math.pow(2, e - mLen) +} + +exports.write = function (buffer, value, offset, isLE, mLen, nBytes) { + var e, m, c + var eLen = nBytes * 8 - mLen - 1 + var eMax = (1 << eLen) - 1 + var eBias = eMax >> 1 + var rt = (mLen === 23 ? Math.pow(2, -24) - Math.pow(2, -77) : 0) + var i = isLE ? 0 : (nBytes - 1) + var d = isLE ? 1 : -1 + var s = value < 0 || (value === 0 && 1 / value < 0) ? 1 : 0 + + value = Math.abs(value) + + if (isNaN(value) || value === Infinity) { + m = isNaN(value) ? 1 : 0 + e = eMax + } else { + e = Math.floor(Math.log(value) / Math.LN2) + if (value * (c = Math.pow(2, -e)) < 1) { + e-- + c *= 2 + } + if (e + eBias >= 1) { + value += rt / c + } else { + value += rt * Math.pow(2, 1 - eBias) + } + if (value * c >= 2) { + e++ + c /= 2 + } + + if (e + eBias >= eMax) { + m = 0 + e = eMax + } else if (e + eBias >= 1) { + m = (value * c - 1) * Math.pow(2, mLen) + e = e + eBias + } else { + m = value * Math.pow(2, eBias - 1) * Math.pow(2, mLen) + e = 0 + } + } + + for (; mLen >= 8; buffer[offset + i] = m & 0xff, i += d, m /= 256, mLen -= 8) {} + + e = (e << mLen) | m + eLen += mLen + for (; eLen > 0; buffer[offset + i] = e & 0xff, i += d, e /= 256, eLen -= 8) {} + + buffer[offset + i - d] |= s * 128 +} + +},{}],13:[function(require,module,exports){ +if (typeof Object.create === 'function') { + // implementation from standard node.js 'util' module + module.exports = function inherits(ctor, superCtor) { + ctor.super_ = superCtor + ctor.prototype = Object.create(superCtor.prototype, { + constructor: { + value: ctor, + enumerable: false, + writable: true, + configurable: true + } + }); + }; +} else { + // old school shim for old browsers + module.exports = function inherits(ctor, superCtor) { + ctor.super_ = superCtor + var TempCtor = function () {} + TempCtor.prototype = superCtor.prototype + ctor.prototype = new TempCtor() + ctor.prototype.constructor = ctor + } +} + +},{}],14:[function(require,module,exports){ +/*! + * Determine if an object is a Buffer + * + * @author Feross Aboukhadijeh + * @license MIT + */ + +// The _isBuffer check is for Safari 5-7 support, because it's missing +// Object.prototype.constructor. Remove this eventually +module.exports = function (obj) { + return obj != null && (isBuffer(obj) || isSlowBuffer(obj) || !!obj._isBuffer) +} + +function isBuffer (obj) { + return !!obj.constructor && typeof obj.constructor.isBuffer === 'function' && obj.constructor.isBuffer(obj) +} + +// For Node v0.10 support. Remove this eventually. +function isSlowBuffer (obj) { + return typeof obj.readFloatLE === 'function' && typeof obj.slice === 'function' && isBuffer(obj.slice(0, 0)) +} + +},{}],15:[function(require,module,exports){ +var toString = {}.toString; + +module.exports = Array.isArray || function (arr) { + return toString.call(arr) == '[object Array]'; +}; + +},{}],16:[function(require,module,exports){ +(function (process,Buffer){ +var createHmac = require('create-hmac') +var checkParameters = require('./precondition') + +exports.pbkdf2 = function (password, salt, iterations, keylen, digest, callback) { + if (typeof digest === 'function') { + callback = digest + digest = undefined + } + + checkParameters(iterations, keylen) + if (typeof callback !== 'function') throw new Error('No callback provided to pbkdf2') + + setTimeout(function () { + callback(null, exports.pbkdf2Sync(password, salt, iterations, keylen, digest)) + }) +} + +var defaultEncoding +if (process.browser) { + defaultEncoding = 'utf-8' +} else { + var pVersionMajor = parseInt(process.version.split('.')[0].slice(1), 10) + + defaultEncoding = pVersionMajor >= 6 ? 'utf-8' : 'binary' +} + +exports.pbkdf2Sync = function (password, salt, iterations, keylen, digest) { + if (!Buffer.isBuffer(password)) password = new Buffer(password, defaultEncoding) + if (!Buffer.isBuffer(salt)) salt = new Buffer(salt, defaultEncoding) + + checkParameters(iterations, keylen) + + digest = digest || 'sha1' + + var hLen + var l = 1 + var DK = new Buffer(keylen) + var block1 = new Buffer(salt.length + 4) + salt.copy(block1, 0, 0, salt.length) + + var r + var T + + for (var i = 1; i <= l; i++) { + block1.writeUInt32BE(i, salt.length) + var U = createHmac(digest, password).update(block1).digest() + + if (!hLen) { + hLen = U.length + T = new Buffer(hLen) + l = Math.ceil(keylen / hLen) + r = keylen - (l - 1) * hLen + } + + U.copy(T, 0, 0, hLen) + + for (var j = 1; j < iterations; j++) { + U = createHmac(digest, password).update(U).digest() + for (var k = 0; k < hLen; k++) T[k] ^= U[k] + } + + var destPos = (i - 1) * hLen + var len = (i === l ? r : hLen) + T.copy(DK, destPos, 0, len) + } + + return DK +} + +}).call(this,require('_process'),require("buffer").Buffer) +},{"./precondition":17,"_process":19,"buffer":3,"create-hmac":10}],17:[function(require,module,exports){ +var MAX_ALLOC = Math.pow(2, 30) - 1 // default in iojs +module.exports = function (iterations, keylen) { + if (typeof iterations !== 'number') { + throw new TypeError('Iterations not a number') + } + + if (iterations < 0) { + throw new TypeError('Bad iterations') + } + + if (typeof keylen !== 'number') { + throw new TypeError('Key length not a number') + } + + if (keylen < 0 || keylen > MAX_ALLOC || keylen !== keylen) { /* eslint no-self-compare: 0 */ + throw new TypeError('Bad key length') + } +} + +},{}],18:[function(require,module,exports){ +(function (process){ +'use strict'; + +if (!process.version || + process.version.indexOf('v0.') === 0 || + process.version.indexOf('v1.') === 0 && process.version.indexOf('v1.8.') !== 0) { + module.exports = nextTick; +} else { + module.exports = process.nextTick; +} + +function nextTick(fn, arg1, arg2, arg3) { + if (typeof fn !== 'function') { + throw new TypeError('"callback" argument must be a function'); + } + var len = arguments.length; + var args, i; + switch (len) { + case 0: + case 1: + return process.nextTick(fn); + case 2: + return process.nextTick(function afterTickOne() { + fn.call(null, arg1); + }); + case 3: + return process.nextTick(function afterTickTwo() { + fn.call(null, arg1, arg2); + }); + case 4: + return process.nextTick(function afterTickThree() { + fn.call(null, arg1, arg2, arg3); + }); + default: + args = new Array(len - 1); + i = 0; + while (i < args.length) { + args[i++] = arguments[i]; + } + return process.nextTick(function afterTick() { + fn.apply(null, args); + }); + } +} + +}).call(this,require('_process')) +},{"_process":19}],19:[function(require,module,exports){ +// shim for using process in browser +var process = module.exports = {}; + +// cached from whatever global is present so that test runners that stub it +// don't break things. But we need to wrap it in a try catch in case it is +// wrapped in strict mode code which doesn't define any globals. It's inside a +// function because try/catches deoptimize in certain engines. + +var cachedSetTimeout; +var cachedClearTimeout; + +function defaultSetTimout() { + throw new Error('setTimeout has not been defined'); +} +function defaultClearTimeout () { + throw new Error('clearTimeout has not been defined'); +} +(function () { + try { + if (typeof setTimeout === 'function') { + cachedSetTimeout = setTimeout; + } else { + cachedSetTimeout = defaultSetTimout; + } + } catch (e) { + cachedSetTimeout = defaultSetTimout; + } + try { + if (typeof clearTimeout === 'function') { + cachedClearTimeout = clearTimeout; + } else { + cachedClearTimeout = defaultClearTimeout; + } + } catch (e) { + cachedClearTimeout = defaultClearTimeout; + } +} ()) +function runTimeout(fun) { + if (cachedSetTimeout === setTimeout) { + //normal enviroments in sane situations + return setTimeout(fun, 0); + } + // if setTimeout wasn't available but was latter defined + if ((cachedSetTimeout === defaultSetTimout || !cachedSetTimeout) && setTimeout) { + cachedSetTimeout = setTimeout; + return setTimeout(fun, 0); + } + try { + // when when somebody has screwed with setTimeout but no I.E. maddness + return cachedSetTimeout(fun, 0); + } catch(e){ + try { + // When we are in I.E. but the script has been evaled so I.E. doesn't trust the global object when called normally + return cachedSetTimeout.call(null, fun, 0); + } catch(e){ + // same as above but when it's a version of I.E. that must have the global object for 'this', hopfully our context correct otherwise it will throw a global error + return cachedSetTimeout.call(this, fun, 0); + } + } + + +} +function runClearTimeout(marker) { + if (cachedClearTimeout === clearTimeout) { + //normal enviroments in sane situations + return clearTimeout(marker); + } + // if clearTimeout wasn't available but was latter defined + if ((cachedClearTimeout === defaultClearTimeout || !cachedClearTimeout) && clearTimeout) { + cachedClearTimeout = clearTimeout; + return clearTimeout(marker); + } + try { + // when when somebody has screwed with setTimeout but no I.E. maddness + return cachedClearTimeout(marker); + } catch (e){ + try { + // When we are in I.E. but the script has been evaled so I.E. doesn't trust the global object when called normally + return cachedClearTimeout.call(null, marker); + } catch (e){ + // same as above but when it's a version of I.E. that must have the global object for 'this', hopfully our context correct otherwise it will throw a global error. + // Some versions of I.E. have different rules for clearTimeout vs setTimeout + return cachedClearTimeout.call(this, marker); + } + } + + + +} +var queue = []; +var draining = false; +var currentQueue; +var queueIndex = -1; + +function cleanUpNextTick() { + if (!draining || !currentQueue) { + return; + } + draining = false; + if (currentQueue.length) { + queue = currentQueue.concat(queue); + } else { + queueIndex = -1; + } + if (queue.length) { + drainQueue(); + } +} + +function drainQueue() { + if (draining) { + return; + } + var timeout = runTimeout(cleanUpNextTick); + draining = true; + + var len = queue.length; + while(len) { + currentQueue = queue; + queue = []; + while (++queueIndex < len) { + if (currentQueue) { + currentQueue[queueIndex].run(); + } + } + queueIndex = -1; + len = queue.length; + } + currentQueue = null; + draining = false; + runClearTimeout(timeout); +} + +process.nextTick = function (fun) { + var args = new Array(arguments.length - 1); + if (arguments.length > 1) { + for (var i = 1; i < arguments.length; i++) { + args[i - 1] = arguments[i]; + } + } + queue.push(new Item(fun, args)); + if (queue.length === 1 && !draining) { + runTimeout(drainQueue); + } +}; + +// v8 likes predictible objects +function Item(fun, array) { + this.fun = fun; + this.array = array; +} +Item.prototype.run = function () { + this.fun.apply(null, this.array); +}; +process.title = 'browser'; +process.browser = true; +process.env = {}; +process.argv = []; +process.version = ''; // empty string to avoid regexp issues +process.versions = {}; + +function noop() {} + +process.on = noop; +process.addListener = noop; +process.once = noop; +process.off = noop; +process.removeListener = noop; +process.removeAllListeners = noop; +process.emit = noop; + +process.binding = function (name) { + throw new Error('process.binding is not supported'); +}; + +process.cwd = function () { return '/' }; +process.chdir = function (dir) { + throw new Error('process.chdir is not supported'); +}; +process.umask = function() { return 0; }; + +},{}],20:[function(require,module,exports){ +module.exports = require("./lib/_stream_duplex.js") + +},{"./lib/_stream_duplex.js":21}],21:[function(require,module,exports){ +// a duplex stream is just a stream that is both readable and writable. +// Since JS doesn't have multiple prototypal inheritance, this class +// prototypally inherits from Readable, and then parasitically from +// Writable. + +'use strict'; + +/**/ + +var objectKeys = Object.keys || function (obj) { + var keys = []; + for (var key in obj) { + keys.push(key); + }return keys; +}; +/**/ + +module.exports = Duplex; + +/**/ +var processNextTick = require('process-nextick-args'); +/**/ + +/**/ +var util = require('core-util-is'); +util.inherits = require('inherits'); +/**/ + +var Readable = require('./_stream_readable'); +var Writable = require('./_stream_writable'); + +util.inherits(Duplex, Readable); + +var keys = objectKeys(Writable.prototype); +for (var v = 0; v < keys.length; v++) { + var method = keys[v]; + if (!Duplex.prototype[method]) Duplex.prototype[method] = Writable.prototype[method]; +} + +function Duplex(options) { + if (!(this instanceof Duplex)) return new Duplex(options); + + Readable.call(this, options); + Writable.call(this, options); + + if (options && options.readable === false) this.readable = false; + + if (options && options.writable === false) this.writable = false; + + this.allowHalfOpen = true; + if (options && options.allowHalfOpen === false) this.allowHalfOpen = false; + + this.once('end', onend); +} + +// the no-half-open enforcer +function onend() { + // if we allow half-open state, or if the writable side ended, + // then we're ok. + if (this.allowHalfOpen || this._writableState.ended) return; + + // no more data can be written. + // But allow more writes to happen in this tick. + processNextTick(onEndNT, this); +} + +function onEndNT(self) { + self.end(); +} + +function forEach(xs, f) { + for (var i = 0, l = xs.length; i < l; i++) { + f(xs[i], i); + } +} +},{"./_stream_readable":23,"./_stream_writable":25,"core-util-is":6,"inherits":13,"process-nextick-args":18}],22:[function(require,module,exports){ +// a passthrough stream. +// basically just the most minimal sort of Transform stream. +// Every written chunk gets output as-is. + +'use strict'; + +module.exports = PassThrough; + +var Transform = require('./_stream_transform'); + +/**/ +var util = require('core-util-is'); +util.inherits = require('inherits'); +/**/ + +util.inherits(PassThrough, Transform); + +function PassThrough(options) { + if (!(this instanceof PassThrough)) return new PassThrough(options); + + Transform.call(this, options); +} + +PassThrough.prototype._transform = function (chunk, encoding, cb) { + cb(null, chunk); +}; +},{"./_stream_transform":24,"core-util-is":6,"inherits":13}],23:[function(require,module,exports){ +(function (process){ +'use strict'; + +module.exports = Readable; + +/**/ +var processNextTick = require('process-nextick-args'); +/**/ + +/**/ +var isArray = require('isarray'); +/**/ + +/**/ +var Buffer = require('buffer').Buffer; +/**/ + +Readable.ReadableState = ReadableState; + +var EE = require('events'); + +/**/ +var EElistenerCount = function (emitter, type) { + return emitter.listeners(type).length; +}; +/**/ + +/**/ +var Stream; +(function () { + try { + Stream = require('st' + 'ream'); + } catch (_) {} finally { + if (!Stream) Stream = require('events').EventEmitter; + } +})(); +/**/ + +var Buffer = require('buffer').Buffer; + +/**/ +var util = require('core-util-is'); +util.inherits = require('inherits'); +/**/ + +/**/ +var debugUtil = require('util'); +var debug = undefined; +if (debugUtil && debugUtil.debuglog) { + debug = debugUtil.debuglog('stream'); +} else { + debug = function () {}; +} +/**/ + +var StringDecoder; + +util.inherits(Readable, Stream); + +var Duplex; +function ReadableState(options, stream) { + Duplex = Duplex || require('./_stream_duplex'); + + options = options || {}; + + // object stream flag. Used to make read(n) ignore n and to + // make all the buffer merging and length checks go away + this.objectMode = !!options.objectMode; + + if (stream instanceof Duplex) this.objectMode = this.objectMode || !!options.readableObjectMode; + + // the point at which it stops calling _read() to fill the buffer + // Note: 0 is a valid value, means "don't call _read preemptively ever" + var hwm = options.highWaterMark; + var defaultHwm = this.objectMode ? 16 : 16 * 1024; + this.highWaterMark = hwm || hwm === 0 ? hwm : defaultHwm; + + // cast to ints. + this.highWaterMark = ~ ~this.highWaterMark; + + this.buffer = []; + this.length = 0; + this.pipes = null; + this.pipesCount = 0; + this.flowing = null; + this.ended = false; + this.endEmitted = false; + this.reading = false; + + // a flag to be able to tell if the onwrite cb is called immediately, + // or on a later tick. We set this to true at first, because any + // actions that shouldn't happen until "later" should generally also + // not happen before the first write call. + this.sync = true; + + // whenever we return null, then we set a flag to say + // that we're awaiting a 'readable' event emission. + this.needReadable = false; + this.emittedReadable = false; + this.readableListening = false; + this.resumeScheduled = false; + + // Crypto is kind of old and crusty. Historically, its default string + // encoding is 'binary' so we have to make this configurable. + // Everything else in the universe uses 'utf8', though. + this.defaultEncoding = options.defaultEncoding || 'utf8'; + + // when piping, we only care about 'readable' events that happen + // after read()ing all the bytes and not getting any pushback. + this.ranOut = false; + + // the number of writers that are awaiting a drain event in .pipe()s + this.awaitDrain = 0; + + // if true, a maybeReadMore has been scheduled + this.readingMore = false; + + this.decoder = null; + this.encoding = null; + if (options.encoding) { + if (!StringDecoder) StringDecoder = require('string_decoder/').StringDecoder; + this.decoder = new StringDecoder(options.encoding); + this.encoding = options.encoding; + } +} + +var Duplex; +function Readable(options) { + Duplex = Duplex || require('./_stream_duplex'); + + if (!(this instanceof Readable)) return new Readable(options); + + this._readableState = new ReadableState(options, this); + + // legacy + this.readable = true; + + if (options && typeof options.read === 'function') this._read = options.read; + + Stream.call(this); +} + +// Manually shove something into the read() buffer. +// This returns true if the highWaterMark has not been hit yet, +// similar to how Writable.write() returns true if you should +// write() some more. +Readable.prototype.push = function (chunk, encoding) { + var state = this._readableState; + + if (!state.objectMode && typeof chunk === 'string') { + encoding = encoding || state.defaultEncoding; + if (encoding !== state.encoding) { + chunk = new Buffer(chunk, encoding); + encoding = ''; + } + } + + return readableAddChunk(this, state, chunk, encoding, false); +}; + +// Unshift should *always* be something directly out of read() +Readable.prototype.unshift = function (chunk) { + var state = this._readableState; + return readableAddChunk(this, state, chunk, '', true); +}; + +Readable.prototype.isPaused = function () { + return this._readableState.flowing === false; +}; + +function readableAddChunk(stream, state, chunk, encoding, addToFront) { + var er = chunkInvalid(state, chunk); + if (er) { + stream.emit('error', er); + } else if (chunk === null) { + state.reading = false; + onEofChunk(stream, state); + } else if (state.objectMode || chunk && chunk.length > 0) { + if (state.ended && !addToFront) { + var e = new Error('stream.push() after EOF'); + stream.emit('error', e); + } else if (state.endEmitted && addToFront) { + var e = new Error('stream.unshift() after end event'); + stream.emit('error', e); + } else { + var skipAdd; + if (state.decoder && !addToFront && !encoding) { + chunk = state.decoder.write(chunk); + skipAdd = !state.objectMode && chunk.length === 0; + } + + if (!addToFront) state.reading = false; + + // Don't add to the buffer if we've decoded to an empty string chunk and + // we're not in object mode + if (!skipAdd) { + // if we want the data now, just emit it. + if (state.flowing && state.length === 0 && !state.sync) { + stream.emit('data', chunk); + stream.read(0); + } else { + // update the buffer info. + state.length += state.objectMode ? 1 : chunk.length; + if (addToFront) state.buffer.unshift(chunk);else state.buffer.push(chunk); + + if (state.needReadable) emitReadable(stream); + } + } + + maybeReadMore(stream, state); + } + } else if (!addToFront) { + state.reading = false; + } + + return needMoreData(state); +} + +// if it's past the high water mark, we can push in some more. +// Also, if we have no data yet, we can stand some +// more bytes. This is to work around cases where hwm=0, +// such as the repl. Also, if the push() triggered a +// readable event, and the user called read(largeNumber) such that +// needReadable was set, then we ought to push more, so that another +// 'readable' event will be triggered. +function needMoreData(state) { + return !state.ended && (state.needReadable || state.length < state.highWaterMark || state.length === 0); +} + +// backwards compatibility. +Readable.prototype.setEncoding = function (enc) { + if (!StringDecoder) StringDecoder = require('string_decoder/').StringDecoder; + this._readableState.decoder = new StringDecoder(enc); + this._readableState.encoding = enc; + return this; +}; + +// Don't raise the hwm > 8MB +var MAX_HWM = 0x800000; +function computeNewHighWaterMark(n) { + if (n >= MAX_HWM) { + n = MAX_HWM; + } else { + // Get the next highest power of 2 + n--; + n |= n >>> 1; + n |= n >>> 2; + n |= n >>> 4; + n |= n >>> 8; + n |= n >>> 16; + n++; + } + return n; +} + +function howMuchToRead(n, state) { + if (state.length === 0 && state.ended) return 0; + + if (state.objectMode) return n === 0 ? 0 : 1; + + if (n === null || isNaN(n)) { + // only flow one buffer at a time + if (state.flowing && state.buffer.length) return state.buffer[0].length;else return state.length; + } + + if (n <= 0) return 0; + + // If we're asking for more than the target buffer level, + // then raise the water mark. Bump up to the next highest + // power of 2, to prevent increasing it excessively in tiny + // amounts. + if (n > state.highWaterMark) state.highWaterMark = computeNewHighWaterMark(n); + + // don't have that much. return null, unless we've ended. + if (n > state.length) { + if (!state.ended) { + state.needReadable = true; + return 0; + } else { + return state.length; + } + } + + return n; +} + +// you can override either this method, or the async _read(n) below. +Readable.prototype.read = function (n) { + debug('read', n); + var state = this._readableState; + var nOrig = n; + + if (typeof n !== 'number' || n > 0) state.emittedReadable = false; + + // if we're doing read(0) to trigger a readable event, but we + // already have a bunch of data in the buffer, then just trigger + // the 'readable' event and move on. + if (n === 0 && state.needReadable && (state.length >= state.highWaterMark || state.ended)) { + debug('read: emitReadable', state.length, state.ended); + if (state.length === 0 && state.ended) endReadable(this);else emitReadable(this); + return null; + } + + n = howMuchToRead(n, state); + + // if we've ended, and we're now clear, then finish it up. + if (n === 0 && state.ended) { + if (state.length === 0) endReadable(this); + return null; + } + + // All the actual chunk generation logic needs to be + // *below* the call to _read. The reason is that in certain + // synthetic stream cases, such as passthrough streams, _read + // may be a completely synchronous operation which may change + // the state of the read buffer, providing enough data when + // before there was *not* enough. + // + // So, the steps are: + // 1. Figure out what the state of things will be after we do + // a read from the buffer. + // + // 2. If that resulting state will trigger a _read, then call _read. + // Note that this may be asynchronous, or synchronous. Yes, it is + // deeply ugly to write APIs this way, but that still doesn't mean + // that the Readable class should behave improperly, as streams are + // designed to be sync/async agnostic. + // Take note if the _read call is sync or async (ie, if the read call + // has returned yet), so that we know whether or not it's safe to emit + // 'readable' etc. + // + // 3. Actually pull the requested chunks out of the buffer and return. + + // if we need a readable event, then we need to do some reading. + var doRead = state.needReadable; + debug('need readable', doRead); + + // if we currently have less than the highWaterMark, then also read some + if (state.length === 0 || state.length - n < state.highWaterMark) { + doRead = true; + debug('length less than watermark', doRead); + } + + // however, if we've ended, then there's no point, and if we're already + // reading, then it's unnecessary. + if (state.ended || state.reading) { + doRead = false; + debug('reading or ended', doRead); + } + + if (doRead) { + debug('do read'); + state.reading = true; + state.sync = true; + // if the length is currently zero, then we *need* a readable event. + if (state.length === 0) state.needReadable = true; + // call internal read method + this._read(state.highWaterMark); + state.sync = false; + } + + // If _read pushed data synchronously, then `reading` will be false, + // and we need to re-evaluate how much data we can return to the user. + if (doRead && !state.reading) n = howMuchToRead(nOrig, state); + + var ret; + if (n > 0) ret = fromList(n, state);else ret = null; + + if (ret === null) { + state.needReadable = true; + n = 0; + } + + state.length -= n; + + // If we have nothing in the buffer, then we want to know + // as soon as we *do* get something into the buffer. + if (state.length === 0 && !state.ended) state.needReadable = true; + + // If we tried to read() past the EOF, then emit end on the next tick. + if (nOrig !== n && state.ended && state.length === 0) endReadable(this); + + if (ret !== null) this.emit('data', ret); + + return ret; +}; + +function chunkInvalid(state, chunk) { + var er = null; + if (!Buffer.isBuffer(chunk) && typeof chunk !== 'string' && chunk !== null && chunk !== undefined && !state.objectMode) { + er = new TypeError('Invalid non-string/buffer chunk'); + } + return er; +} + +function onEofChunk(stream, state) { + if (state.ended) return; + if (state.decoder) { + var chunk = state.decoder.end(); + if (chunk && chunk.length) { + state.buffer.push(chunk); + state.length += state.objectMode ? 1 : chunk.length; + } + } + state.ended = true; + + // emit 'readable' now to make sure it gets picked up. + emitReadable(stream); +} + +// Don't emit readable right away in sync mode, because this can trigger +// another read() call => stack overflow. This way, it might trigger +// a nextTick recursion warning, but that's not so bad. +function emitReadable(stream) { + var state = stream._readableState; + state.needReadable = false; + if (!state.emittedReadable) { + debug('emitReadable', state.flowing); + state.emittedReadable = true; + if (state.sync) processNextTick(emitReadable_, stream);else emitReadable_(stream); + } +} + +function emitReadable_(stream) { + debug('emit readable'); + stream.emit('readable'); + flow(stream); +} + +// at this point, the user has presumably seen the 'readable' event, +// and called read() to consume some data. that may have triggered +// in turn another _read(n) call, in which case reading = true if +// it's in progress. +// However, if we're not ended, or reading, and the length < hwm, +// then go ahead and try to read some more preemptively. +function maybeReadMore(stream, state) { + if (!state.readingMore) { + state.readingMore = true; + processNextTick(maybeReadMore_, stream, state); + } +} + +function maybeReadMore_(stream, state) { + var len = state.length; + while (!state.reading && !state.flowing && !state.ended && state.length < state.highWaterMark) { + debug('maybeReadMore read 0'); + stream.read(0); + if (len === state.length) + // didn't get any data, stop spinning. + break;else len = state.length; + } + state.readingMore = false; +} + +// abstract method. to be overridden in specific implementation classes. +// call cb(er, data) where data is <= n in length. +// for virtual (non-string, non-buffer) streams, "length" is somewhat +// arbitrary, and perhaps not very meaningful. +Readable.prototype._read = function (n) { + this.emit('error', new Error('not implemented')); +}; + +Readable.prototype.pipe = function (dest, pipeOpts) { + var src = this; + var state = this._readableState; + + switch (state.pipesCount) { + case 0: + state.pipes = dest; + break; + case 1: + state.pipes = [state.pipes, dest]; + break; + default: + state.pipes.push(dest); + break; + } + state.pipesCount += 1; + debug('pipe count=%d opts=%j', state.pipesCount, pipeOpts); + + var doEnd = (!pipeOpts || pipeOpts.end !== false) && dest !== process.stdout && dest !== process.stderr; + + var endFn = doEnd ? onend : cleanup; + if (state.endEmitted) processNextTick(endFn);else src.once('end', endFn); + + dest.on('unpipe', onunpipe); + function onunpipe(readable) { + debug('onunpipe'); + if (readable === src) { + cleanup(); + } + } + + function onend() { + debug('onend'); + dest.end(); + } + + // when the dest drains, it reduces the awaitDrain counter + // on the source. This would be more elegant with a .once() + // handler in flow(), but adding and removing repeatedly is + // too slow. + var ondrain = pipeOnDrain(src); + dest.on('drain', ondrain); + + var cleanedUp = false; + function cleanup() { + debug('cleanup'); + // cleanup event handlers once the pipe is broken + dest.removeListener('close', onclose); + dest.removeListener('finish', onfinish); + dest.removeListener('drain', ondrain); + dest.removeListener('error', onerror); + dest.removeListener('unpipe', onunpipe); + src.removeListener('end', onend); + src.removeListener('end', cleanup); + src.removeListener('data', ondata); + + cleanedUp = true; + + // if the reader is waiting for a drain event from this + // specific writer, then it would cause it to never start + // flowing again. + // So, if this is awaiting a drain, then we just call it now. + // If we don't know, then assume that we are waiting for one. + if (state.awaitDrain && (!dest._writableState || dest._writableState.needDrain)) ondrain(); + } + + src.on('data', ondata); + function ondata(chunk) { + debug('ondata'); + var ret = dest.write(chunk); + if (false === ret) { + // If the user unpiped during `dest.write()`, it is possible + // to get stuck in a permanently paused state if that write + // also returned false. + if (state.pipesCount === 1 && state.pipes[0] === dest && src.listenerCount('data') === 1 && !cleanedUp) { + debug('false write response, pause', src._readableState.awaitDrain); + src._readableState.awaitDrain++; + } + src.pause(); + } + } + + // if the dest has an error, then stop piping into it. + // however, don't suppress the throwing behavior for this. + function onerror(er) { + debug('onerror', er); + unpipe(); + dest.removeListener('error', onerror); + if (EElistenerCount(dest, 'error') === 0) dest.emit('error', er); + } + // This is a brutally ugly hack to make sure that our error handler + // is attached before any userland ones. NEVER DO THIS. + if (!dest._events || !dest._events.error) dest.on('error', onerror);else if (isArray(dest._events.error)) dest._events.error.unshift(onerror);else dest._events.error = [onerror, dest._events.error]; + + // Both close and finish should trigger unpipe, but only once. + function onclose() { + dest.removeListener('finish', onfinish); + unpipe(); + } + dest.once('close', onclose); + function onfinish() { + debug('onfinish'); + dest.removeListener('close', onclose); + unpipe(); + } + dest.once('finish', onfinish); + + function unpipe() { + debug('unpipe'); + src.unpipe(dest); + } + + // tell the dest that it's being piped to + dest.emit('pipe', src); + + // start the flow if it hasn't been started already. + if (!state.flowing) { + debug('pipe resume'); + src.resume(); + } + + return dest; +}; + +function pipeOnDrain(src) { + return function () { + var state = src._readableState; + debug('pipeOnDrain', state.awaitDrain); + if (state.awaitDrain) state.awaitDrain--; + if (state.awaitDrain === 0 && EElistenerCount(src, 'data')) { + state.flowing = true; + flow(src); + } + }; +} + +Readable.prototype.unpipe = function (dest) { + var state = this._readableState; + + // if we're not piping anywhere, then do nothing. + if (state.pipesCount === 0) return this; + + // just one destination. most common case. + if (state.pipesCount === 1) { + // passed in one, but it's not the right one. + if (dest && dest !== state.pipes) return this; + + if (!dest) dest = state.pipes; + + // got a match. + state.pipes = null; + state.pipesCount = 0; + state.flowing = false; + if (dest) dest.emit('unpipe', this); + return this; + } + + // slow case. multiple pipe destinations. + + if (!dest) { + // remove all. + var dests = state.pipes; + var len = state.pipesCount; + state.pipes = null; + state.pipesCount = 0; + state.flowing = false; + + for (var _i = 0; _i < len; _i++) { + dests[_i].emit('unpipe', this); + }return this; + } + + // try to find the right one. + var i = indexOf(state.pipes, dest); + if (i === -1) return this; + + state.pipes.splice(i, 1); + state.pipesCount -= 1; + if (state.pipesCount === 1) state.pipes = state.pipes[0]; + + dest.emit('unpipe', this); + + return this; +}; + +// set up data events if they are asked for +// Ensure readable listeners eventually get something +Readable.prototype.on = function (ev, fn) { + var res = Stream.prototype.on.call(this, ev, fn); + + // If listening to data, and it has not explicitly been paused, + // then call resume to start the flow of data on the next tick. + if (ev === 'data' && false !== this._readableState.flowing) { + this.resume(); + } + + if (ev === 'readable' && !this._readableState.endEmitted) { + var state = this._readableState; + if (!state.readableListening) { + state.readableListening = true; + state.emittedReadable = false; + state.needReadable = true; + if (!state.reading) { + processNextTick(nReadingNextTick, this); + } else if (state.length) { + emitReadable(this, state); + } + } + } + + return res; +}; +Readable.prototype.addListener = Readable.prototype.on; + +function nReadingNextTick(self) { + debug('readable nexttick read 0'); + self.read(0); +} + +// pause() and resume() are remnants of the legacy readable stream API +// If the user uses them, then switch into old mode. +Readable.prototype.resume = function () { + var state = this._readableState; + if (!state.flowing) { + debug('resume'); + state.flowing = true; + resume(this, state); + } + return this; +}; + +function resume(stream, state) { + if (!state.resumeScheduled) { + state.resumeScheduled = true; + processNextTick(resume_, stream, state); + } +} + +function resume_(stream, state) { + if (!state.reading) { + debug('resume read 0'); + stream.read(0); + } + + state.resumeScheduled = false; + stream.emit('resume'); + flow(stream); + if (state.flowing && !state.reading) stream.read(0); +} + +Readable.prototype.pause = function () { + debug('call pause flowing=%j', this._readableState.flowing); + if (false !== this._readableState.flowing) { + debug('pause'); + this._readableState.flowing = false; + this.emit('pause'); + } + return this; +}; + +function flow(stream) { + var state = stream._readableState; + debug('flow', state.flowing); + if (state.flowing) { + do { + var chunk = stream.read(); + } while (null !== chunk && state.flowing); + } +} + +// wrap an old-style stream as the async data source. +// This is *not* part of the readable stream interface. +// It is an ugly unfortunate mess of history. +Readable.prototype.wrap = function (stream) { + var state = this._readableState; + var paused = false; + + var self = this; + stream.on('end', function () { + debug('wrapped end'); + if (state.decoder && !state.ended) { + var chunk = state.decoder.end(); + if (chunk && chunk.length) self.push(chunk); + } + + self.push(null); + }); + + stream.on('data', function (chunk) { + debug('wrapped data'); + if (state.decoder) chunk = state.decoder.write(chunk); + + // don't skip over falsy values in objectMode + if (state.objectMode && (chunk === null || chunk === undefined)) return;else if (!state.objectMode && (!chunk || !chunk.length)) return; + + var ret = self.push(chunk); + if (!ret) { + paused = true; + stream.pause(); + } + }); + + // proxy all the other methods. + // important when wrapping filters and duplexes. + for (var i in stream) { + if (this[i] === undefined && typeof stream[i] === 'function') { + this[i] = function (method) { + return function () { + return stream[method].apply(stream, arguments); + }; + }(i); + } + } + + // proxy certain important events. + var events = ['error', 'close', 'destroy', 'pause', 'resume']; + forEach(events, function (ev) { + stream.on(ev, self.emit.bind(self, ev)); + }); + + // when we try to consume some more bytes, simply unpause the + // underlying stream. + self._read = function (n) { + debug('wrapped _read', n); + if (paused) { + paused = false; + stream.resume(); + } + }; + + return self; +}; + +// exposed for testing purposes only. +Readable._fromList = fromList; + +// Pluck off n bytes from an array of buffers. +// Length is the combined lengths of all the buffers in the list. +function fromList(n, state) { + var list = state.buffer; + var length = state.length; + var stringMode = !!state.decoder; + var objectMode = !!state.objectMode; + var ret; + + // nothing in the list, definitely empty. + if (list.length === 0) return null; + + if (length === 0) ret = null;else if (objectMode) ret = list.shift();else if (!n || n >= length) { + // read it all, truncate the array. + if (stringMode) ret = list.join('');else if (list.length === 1) ret = list[0];else ret = Buffer.concat(list, length); + list.length = 0; + } else { + // read just some of it. + if (n < list[0].length) { + // just take a part of the first list item. + // slice is the same for buffers and strings. + var buf = list[0]; + ret = buf.slice(0, n); + list[0] = buf.slice(n); + } else if (n === list[0].length) { + // first list is a perfect match + ret = list.shift(); + } else { + // complex case. + // we have enough to cover it, but it spans past the first buffer. + if (stringMode) ret = '';else ret = new Buffer(n); + + var c = 0; + for (var i = 0, l = list.length; i < l && c < n; i++) { + var buf = list[0]; + var cpy = Math.min(n - c, buf.length); + + if (stringMode) ret += buf.slice(0, cpy);else buf.copy(ret, c, 0, cpy); + + if (cpy < buf.length) list[0] = buf.slice(cpy);else list.shift(); + + c += cpy; + } + } + } + + return ret; +} + +function endReadable(stream) { + var state = stream._readableState; + + // If we get here before consuming all the bytes, then that is a + // bug in node. Should never happen. + if (state.length > 0) throw new Error('endReadable called on non-empty stream'); + + if (!state.endEmitted) { + state.ended = true; + processNextTick(endReadableNT, state, stream); + } +} + +function endReadableNT(state, stream) { + // Check that we didn't get one last unshift. + if (!state.endEmitted && state.length === 0) { + state.endEmitted = true; + stream.readable = false; + stream.emit('end'); + } +} + +function forEach(xs, f) { + for (var i = 0, l = xs.length; i < l; i++) { + f(xs[i], i); + } +} + +function indexOf(xs, x) { + for (var i = 0, l = xs.length; i < l; i++) { + if (xs[i] === x) return i; + } + return -1; +} +}).call(this,require('_process')) +},{"./_stream_duplex":21,"_process":19,"buffer":3,"core-util-is":6,"events":11,"inherits":13,"isarray":15,"process-nextick-args":18,"string_decoder/":40,"util":2}],24:[function(require,module,exports){ +// a transform stream is a readable/writable stream where you do +// something with the data. Sometimes it's called a "filter", +// but that's not a great name for it, since that implies a thing where +// some bits pass through, and others are simply ignored. (That would +// be a valid example of a transform, of course.) +// +// While the output is causally related to the input, it's not a +// necessarily symmetric or synchronous transformation. For example, +// a zlib stream might take multiple plain-text writes(), and then +// emit a single compressed chunk some time in the future. +// +// Here's how this works: +// +// The Transform stream has all the aspects of the readable and writable +// stream classes. When you write(chunk), that calls _write(chunk,cb) +// internally, and returns false if there's a lot of pending writes +// buffered up. When you call read(), that calls _read(n) until +// there's enough pending readable data buffered up. +// +// In a transform stream, the written data is placed in a buffer. When +// _read(n) is called, it transforms the queued up data, calling the +// buffered _write cb's as it consumes chunks. If consuming a single +// written chunk would result in multiple output chunks, then the first +// outputted bit calls the readcb, and subsequent chunks just go into +// the read buffer, and will cause it to emit 'readable' if necessary. +// +// This way, back-pressure is actually determined by the reading side, +// since _read has to be called to start processing a new chunk. However, +// a pathological inflate type of transform can cause excessive buffering +// here. For example, imagine a stream where every byte of input is +// interpreted as an integer from 0-255, and then results in that many +// bytes of output. Writing the 4 bytes {ff,ff,ff,ff} would result in +// 1kb of data being output. In this case, you could write a very small +// amount of input, and end up with a very large amount of output. In +// such a pathological inflating mechanism, there'd be no way to tell +// the system to stop doing the transform. A single 4MB write could +// cause the system to run out of memory. +// +// However, even in such a pathological case, only a single written chunk +// would be consumed, and then the rest would wait (un-transformed) until +// the results of the previous transformed chunk were consumed. + +'use strict'; + +module.exports = Transform; + +var Duplex = require('./_stream_duplex'); + +/**/ +var util = require('core-util-is'); +util.inherits = require('inherits'); +/**/ + +util.inherits(Transform, Duplex); + +function TransformState(stream) { + this.afterTransform = function (er, data) { + return afterTransform(stream, er, data); + }; + + this.needTransform = false; + this.transforming = false; + this.writecb = null; + this.writechunk = null; + this.writeencoding = null; +} + +function afterTransform(stream, er, data) { + var ts = stream._transformState; + ts.transforming = false; + + var cb = ts.writecb; + + if (!cb) return stream.emit('error', new Error('no writecb in Transform class')); + + ts.writechunk = null; + ts.writecb = null; + + if (data !== null && data !== undefined) stream.push(data); + + cb(er); + + var rs = stream._readableState; + rs.reading = false; + if (rs.needReadable || rs.length < rs.highWaterMark) { + stream._read(rs.highWaterMark); + } +} + +function Transform(options) { + if (!(this instanceof Transform)) return new Transform(options); + + Duplex.call(this, options); + + this._transformState = new TransformState(this); + + // when the writable side finishes, then flush out anything remaining. + var stream = this; + + // start out asking for a readable event once data is transformed. + this._readableState.needReadable = true; + + // we have implemented the _read method, and done the other things + // that Readable wants before the first _read call, so unset the + // sync guard flag. + this._readableState.sync = false; + + if (options) { + if (typeof options.transform === 'function') this._transform = options.transform; + + if (typeof options.flush === 'function') this._flush = options.flush; + } + + this.once('prefinish', function () { + if (typeof this._flush === 'function') this._flush(function (er) { + done(stream, er); + });else done(stream); + }); +} + +Transform.prototype.push = function (chunk, encoding) { + this._transformState.needTransform = false; + return Duplex.prototype.push.call(this, chunk, encoding); +}; + +// This is the part where you do stuff! +// override this function in implementation classes. +// 'chunk' is an input chunk. +// +// Call `push(newChunk)` to pass along transformed output +// to the readable side. You may call 'push' zero or more times. +// +// Call `cb(err)` when you are done with this chunk. If you pass +// an error, then that'll put the hurt on the whole operation. If you +// never call cb(), then you'll never get another chunk. +Transform.prototype._transform = function (chunk, encoding, cb) { + throw new Error('not implemented'); +}; + +Transform.prototype._write = function (chunk, encoding, cb) { + var ts = this._transformState; + ts.writecb = cb; + ts.writechunk = chunk; + ts.writeencoding = encoding; + if (!ts.transforming) { + var rs = this._readableState; + if (ts.needTransform || rs.needReadable || rs.length < rs.highWaterMark) this._read(rs.highWaterMark); + } +}; + +// Doesn't matter what the args are here. +// _transform does all the work. +// That we got here means that the readable side wants more data. +Transform.prototype._read = function (n) { + var ts = this._transformState; + + if (ts.writechunk !== null && ts.writecb && !ts.transforming) { + ts.transforming = true; + this._transform(ts.writechunk, ts.writeencoding, ts.afterTransform); + } else { + // mark that we need a transform, so that any data that comes in + // will get processed, now that we've asked for it. + ts.needTransform = true; + } +}; + +function done(stream, er) { + if (er) return stream.emit('error', er); + + // if there's nothing in the write buffer, then that means + // that nothing more will ever be provided + var ws = stream._writableState; + var ts = stream._transformState; + + if (ws.length) throw new Error('calling transform done when ws.length != 0'); + + if (ts.transforming) throw new Error('calling transform done when still transforming'); + + return stream.push(null); +} +},{"./_stream_duplex":21,"core-util-is":6,"inherits":13}],25:[function(require,module,exports){ +(function (process){ +// A bit simpler than readable streams. +// Implement an async ._write(chunk, encoding, cb), and it'll handle all +// the drain event emission and buffering. + +'use strict'; + +module.exports = Writable; + +/**/ +var processNextTick = require('process-nextick-args'); +/**/ + +/**/ +var asyncWrite = !process.browser && ['v0.10', 'v0.9.'].indexOf(process.version.slice(0, 5)) > -1 ? setImmediate : processNextTick; +/**/ + +/**/ +var Buffer = require('buffer').Buffer; +/**/ + +Writable.WritableState = WritableState; + +/**/ +var util = require('core-util-is'); +util.inherits = require('inherits'); +/**/ + +/**/ +var internalUtil = { + deprecate: require('util-deprecate') +}; +/**/ + +/**/ +var Stream; +(function () { + try { + Stream = require('st' + 'ream'); + } catch (_) {} finally { + if (!Stream) Stream = require('events').EventEmitter; + } +})(); +/**/ + +var Buffer = require('buffer').Buffer; + +util.inherits(Writable, Stream); + +function nop() {} + +function WriteReq(chunk, encoding, cb) { + this.chunk = chunk; + this.encoding = encoding; + this.callback = cb; + this.next = null; +} + +var Duplex; +function WritableState(options, stream) { + Duplex = Duplex || require('./_stream_duplex'); + + options = options || {}; + + // object stream flag to indicate whether or not this stream + // contains buffers or objects. + this.objectMode = !!options.objectMode; + + if (stream instanceof Duplex) this.objectMode = this.objectMode || !!options.writableObjectMode; + + // the point at which write() starts returning false + // Note: 0 is a valid value, means that we always return false if + // the entire buffer is not flushed immediately on write() + var hwm = options.highWaterMark; + var defaultHwm = this.objectMode ? 16 : 16 * 1024; + this.highWaterMark = hwm || hwm === 0 ? hwm : defaultHwm; + + // cast to ints. + this.highWaterMark = ~ ~this.highWaterMark; + + this.needDrain = false; + // at the start of calling end() + this.ending = false; + // when end() has been called, and returned + this.ended = false; + // when 'finish' is emitted + this.finished = false; + + // should we decode strings into buffers before passing to _write? + // this is here so that some node-core streams can optimize string + // handling at a lower level. + var noDecode = options.decodeStrings === false; + this.decodeStrings = !noDecode; + + // Crypto is kind of old and crusty. Historically, its default string + // encoding is 'binary' so we have to make this configurable. + // Everything else in the universe uses 'utf8', though. + this.defaultEncoding = options.defaultEncoding || 'utf8'; + + // not an actual buffer we keep track of, but a measurement + // of how much we're waiting to get pushed to some underlying + // socket or file. + this.length = 0; + + // a flag to see when we're in the middle of a write. + this.writing = false; + + // when true all writes will be buffered until .uncork() call + this.corked = 0; + + // a flag to be able to tell if the onwrite cb is called immediately, + // or on a later tick. We set this to true at first, because any + // actions that shouldn't happen until "later" should generally also + // not happen before the first write call. + this.sync = true; + + // a flag to know if we're processing previously buffered items, which + // may call the _write() callback in the same tick, so that we don't + // end up in an overlapped onwrite situation. + this.bufferProcessing = false; + + // the callback that's passed to _write(chunk,cb) + this.onwrite = function (er) { + onwrite(stream, er); + }; + + // the callback that the user supplies to write(chunk,encoding,cb) + this.writecb = null; + + // the amount that is being written when _write is called. + this.writelen = 0; + + this.bufferedRequest = null; + this.lastBufferedRequest = null; + + // number of pending user-supplied write callbacks + // this must be 0 before 'finish' can be emitted + this.pendingcb = 0; + + // emit prefinish if the only thing we're waiting for is _write cbs + // This is relevant for synchronous Transform streams + this.prefinished = false; + + // True if the error was already emitted and should not be thrown again + this.errorEmitted = false; + + // count buffered requests + this.bufferedRequestCount = 0; + + // create the two objects needed to store the corked requests + // they are not a linked list, as no new elements are inserted in there + this.corkedRequestsFree = new CorkedRequest(this); + this.corkedRequestsFree.next = new CorkedRequest(this); +} + +WritableState.prototype.getBuffer = function writableStateGetBuffer() { + var current = this.bufferedRequest; + var out = []; + while (current) { + out.push(current); + current = current.next; + } + return out; +}; + +(function () { + try { + Object.defineProperty(WritableState.prototype, 'buffer', { + get: internalUtil.deprecate(function () { + return this.getBuffer(); + }, '_writableState.buffer is deprecated. Use _writableState.getBuffer ' + 'instead.') + }); + } catch (_) {} +})(); + +var Duplex; +function Writable(options) { + Duplex = Duplex || require('./_stream_duplex'); + + // Writable ctor is applied to Duplexes, though they're not + // instanceof Writable, they're instanceof Readable. + if (!(this instanceof Writable) && !(this instanceof Duplex)) return new Writable(options); + + this._writableState = new WritableState(options, this); + + // legacy. + this.writable = true; + + if (options) { + if (typeof options.write === 'function') this._write = options.write; + + if (typeof options.writev === 'function') this._writev = options.writev; + } + + Stream.call(this); +} + +// Otherwise people can pipe Writable streams, which is just wrong. +Writable.prototype.pipe = function () { + this.emit('error', new Error('Cannot pipe. Not readable.')); +}; + +function writeAfterEnd(stream, cb) { + var er = new Error('write after end'); + // TODO: defer error events consistently everywhere, not just the cb + stream.emit('error', er); + processNextTick(cb, er); +} + +// If we get something that is not a buffer, string, null, or undefined, +// and we're not in objectMode, then that's an error. +// Otherwise stream chunks are all considered to be of length=1, and the +// watermarks determine how many objects to keep in the buffer, rather than +// how many bytes or characters. +function validChunk(stream, state, chunk, cb) { + var valid = true; + + if (!Buffer.isBuffer(chunk) && typeof chunk !== 'string' && chunk !== null && chunk !== undefined && !state.objectMode) { + var er = new TypeError('Invalid non-string/buffer chunk'); + stream.emit('error', er); + processNextTick(cb, er); + valid = false; + } + return valid; +} + +Writable.prototype.write = function (chunk, encoding, cb) { + var state = this._writableState; + var ret = false; + + if (typeof encoding === 'function') { + cb = encoding; + encoding = null; + } + + if (Buffer.isBuffer(chunk)) encoding = 'buffer';else if (!encoding) encoding = state.defaultEncoding; + + if (typeof cb !== 'function') cb = nop; + + if (state.ended) writeAfterEnd(this, cb);else if (validChunk(this, state, chunk, cb)) { + state.pendingcb++; + ret = writeOrBuffer(this, state, chunk, encoding, cb); + } + + return ret; +}; + +Writable.prototype.cork = function () { + var state = this._writableState; + + state.corked++; +}; + +Writable.prototype.uncork = function () { + var state = this._writableState; + + if (state.corked) { + state.corked--; + + if (!state.writing && !state.corked && !state.finished && !state.bufferProcessing && state.bufferedRequest) clearBuffer(this, state); + } +}; + +Writable.prototype.setDefaultEncoding = function setDefaultEncoding(encoding) { + // node::ParseEncoding() requires lower case. + if (typeof encoding === 'string') encoding = encoding.toLowerCase(); + if (!(['hex', 'utf8', 'utf-8', 'ascii', 'binary', 'base64', 'ucs2', 'ucs-2', 'utf16le', 'utf-16le', 'raw'].indexOf((encoding + '').toLowerCase()) > -1)) throw new TypeError('Unknown encoding: ' + encoding); + this._writableState.defaultEncoding = encoding; +}; + +function decodeChunk(state, chunk, encoding) { + if (!state.objectMode && state.decodeStrings !== false && typeof chunk === 'string') { + chunk = new Buffer(chunk, encoding); + } + return chunk; +} + +// if we're already writing something, then just put this +// in the queue, and wait our turn. Otherwise, call _write +// If we return false, then we need a drain event, so set that flag. +function writeOrBuffer(stream, state, chunk, encoding, cb) { + chunk = decodeChunk(state, chunk, encoding); + + if (Buffer.isBuffer(chunk)) encoding = 'buffer'; + var len = state.objectMode ? 1 : chunk.length; + + state.length += len; + + var ret = state.length < state.highWaterMark; + // we must ensure that previous needDrain will not be reset to false. + if (!ret) state.needDrain = true; + + if (state.writing || state.corked) { + var last = state.lastBufferedRequest; + state.lastBufferedRequest = new WriteReq(chunk, encoding, cb); + if (last) { + last.next = state.lastBufferedRequest; + } else { + state.bufferedRequest = state.lastBufferedRequest; + } + state.bufferedRequestCount += 1; + } else { + doWrite(stream, state, false, len, chunk, encoding, cb); + } + + return ret; +} + +function doWrite(stream, state, writev, len, chunk, encoding, cb) { + state.writelen = len; + state.writecb = cb; + state.writing = true; + state.sync = true; + if (writev) stream._writev(chunk, state.onwrite);else stream._write(chunk, encoding, state.onwrite); + state.sync = false; +} + +function onwriteError(stream, state, sync, er, cb) { + --state.pendingcb; + if (sync) processNextTick(cb, er);else cb(er); + + stream._writableState.errorEmitted = true; + stream.emit('error', er); +} + +function onwriteStateUpdate(state) { + state.writing = false; + state.writecb = null; + state.length -= state.writelen; + state.writelen = 0; +} + +function onwrite(stream, er) { + var state = stream._writableState; + var sync = state.sync; + var cb = state.writecb; + + onwriteStateUpdate(state); + + if (er) onwriteError(stream, state, sync, er, cb);else { + // Check if we're actually ready to finish, but don't emit yet + var finished = needFinish(state); + + if (!finished && !state.corked && !state.bufferProcessing && state.bufferedRequest) { + clearBuffer(stream, state); + } + + if (sync) { + /**/ + asyncWrite(afterWrite, stream, state, finished, cb); + /**/ + } else { + afterWrite(stream, state, finished, cb); + } + } +} + +function afterWrite(stream, state, finished, cb) { + if (!finished) onwriteDrain(stream, state); + state.pendingcb--; + cb(); + finishMaybe(stream, state); +} + +// Must force callback to be called on nextTick, so that we don't +// emit 'drain' before the write() consumer gets the 'false' return +// value, and has a chance to attach a 'drain' listener. +function onwriteDrain(stream, state) { + if (state.length === 0 && state.needDrain) { + state.needDrain = false; + stream.emit('drain'); + } +} + +// if there's something in the buffer waiting, then process it +function clearBuffer(stream, state) { + state.bufferProcessing = true; + var entry = state.bufferedRequest; + + if (stream._writev && entry && entry.next) { + // Fast case, write everything using _writev() + var l = state.bufferedRequestCount; + var buffer = new Array(l); + var holder = state.corkedRequestsFree; + holder.entry = entry; + + var count = 0; + while (entry) { + buffer[count] = entry; + entry = entry.next; + count += 1; + } + + doWrite(stream, state, true, state.length, buffer, '', holder.finish); + + // doWrite is always async, defer these to save a bit of time + // as the hot path ends with doWrite + state.pendingcb++; + state.lastBufferedRequest = null; + state.corkedRequestsFree = holder.next; + holder.next = null; + } else { + // Slow case, write chunks one-by-one + while (entry) { + var chunk = entry.chunk; + var encoding = entry.encoding; + var cb = entry.callback; + var len = state.objectMode ? 1 : chunk.length; + + doWrite(stream, state, false, len, chunk, encoding, cb); + entry = entry.next; + // if we didn't call the onwrite immediately, then + // it means that we need to wait until it does. + // also, that means that the chunk and cb are currently + // being processed, so move the buffer counter past them. + if (state.writing) { + break; + } + } + + if (entry === null) state.lastBufferedRequest = null; + } + + state.bufferedRequestCount = 0; + state.bufferedRequest = entry; + state.bufferProcessing = false; +} + +Writable.prototype._write = function (chunk, encoding, cb) { + cb(new Error('not implemented')); +}; + +Writable.prototype._writev = null; + +Writable.prototype.end = function (chunk, encoding, cb) { + var state = this._writableState; + + if (typeof chunk === 'function') { + cb = chunk; + chunk = null; + encoding = null; + } else if (typeof encoding === 'function') { + cb = encoding; + encoding = null; + } + + if (chunk !== null && chunk !== undefined) this.write(chunk, encoding); + + // .end() fully uncorks + if (state.corked) { + state.corked = 1; + this.uncork(); + } + + // ignore unnecessary end() calls. + if (!state.ending && !state.finished) endWritable(this, state, cb); +}; + +function needFinish(state) { + return state.ending && state.length === 0 && state.bufferedRequest === null && !state.finished && !state.writing; +} + +function prefinish(stream, state) { + if (!state.prefinished) { + state.prefinished = true; + stream.emit('prefinish'); + } +} + +function finishMaybe(stream, state) { + var need = needFinish(state); + if (need) { + if (state.pendingcb === 0) { + prefinish(stream, state); + state.finished = true; + stream.emit('finish'); + } else { + prefinish(stream, state); + } + } + return need; +} + +function endWritable(stream, state, cb) { + state.ending = true; + finishMaybe(stream, state); + if (cb) { + if (state.finished) processNextTick(cb);else stream.once('finish', cb); + } + state.ended = true; + stream.writable = false; +} + +// It seems a linked list but it is not +// there will be only 2 of these for each stream +function CorkedRequest(state) { + var _this = this; + + this.next = null; + this.entry = null; + + this.finish = function (err) { + var entry = _this.entry; + _this.entry = null; + while (entry) { + var cb = entry.callback; + state.pendingcb--; + cb(err); + entry = entry.next; + } + if (state.corkedRequestsFree) { + state.corkedRequestsFree.next = _this; + } else { + state.corkedRequestsFree = _this; + } + }; +} +}).call(this,require('_process')) +},{"./_stream_duplex":21,"_process":19,"buffer":3,"core-util-is":6,"events":11,"inherits":13,"process-nextick-args":18,"util-deprecate":41}],26:[function(require,module,exports){ +module.exports = require("./lib/_stream_passthrough.js") + +},{"./lib/_stream_passthrough.js":22}],27:[function(require,module,exports){ +var Stream = (function (){ + try { + return require('st' + 'ream'); // hack to fix a circular dependency issue when used with browserify + } catch(_){} +}()); +exports = module.exports = require('./lib/_stream_readable.js'); +exports.Stream = Stream || exports; +exports.Readable = exports; +exports.Writable = require('./lib/_stream_writable.js'); +exports.Duplex = require('./lib/_stream_duplex.js'); +exports.Transform = require('./lib/_stream_transform.js'); +exports.PassThrough = require('./lib/_stream_passthrough.js'); + +},{"./lib/_stream_duplex.js":21,"./lib/_stream_passthrough.js":22,"./lib/_stream_readable.js":23,"./lib/_stream_transform.js":24,"./lib/_stream_writable.js":25}],28:[function(require,module,exports){ +module.exports = require("./lib/_stream_transform.js") + +},{"./lib/_stream_transform.js":24}],29:[function(require,module,exports){ +module.exports = require("./lib/_stream_writable.js") + +},{"./lib/_stream_writable.js":25}],30:[function(require,module,exports){ +(function (Buffer){ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +/** @preserve +(c) 2012 by Cédric Mesnil. All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + + - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +// constants table +var zl = [ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 7, 4, 13, 1, 10, 6, 15, 3, 12, 0, 9, 5, 2, 14, 11, 8, + 3, 10, 14, 4, 9, 15, 8, 1, 2, 7, 0, 6, 13, 11, 5, 12, + 1, 9, 11, 10, 0, 8, 12, 4, 13, 3, 7, 15, 14, 5, 6, 2, + 4, 0, 5, 9, 7, 12, 2, 10, 14, 1, 3, 8, 11, 6, 15, 13 +] + +var zr = [ + 5, 14, 7, 0, 9, 2, 11, 4, 13, 6, 15, 8, 1, 10, 3, 12, + 6, 11, 3, 7, 0, 13, 5, 10, 14, 15, 8, 12, 4, 9, 1, 2, + 15, 5, 1, 3, 7, 14, 6, 9, 11, 8, 12, 2, 10, 0, 4, 13, + 8, 6, 4, 1, 3, 11, 15, 0, 5, 12, 2, 13, 9, 7, 10, 14, + 12, 15, 10, 4, 1, 5, 8, 7, 6, 2, 13, 14, 0, 3, 9, 11 +] + +var sl = [ + 11, 14, 15, 12, 5, 8, 7, 9, 11, 13, 14, 15, 6, 7, 9, 8, + 7, 6, 8, 13, 11, 9, 7, 15, 7, 12, 15, 9, 11, 7, 13, 12, + 11, 13, 6, 7, 14, 9, 13, 15, 14, 8, 13, 6, 5, 12, 7, 5, + 11, 12, 14, 15, 14, 15, 9, 8, 9, 14, 5, 6, 8, 6, 5, 12, + 9, 15, 5, 11, 6, 8, 13, 12, 5, 12, 13, 14, 11, 8, 5, 6 +] + +var sr = [ + 8, 9, 9, 11, 13, 15, 15, 5, 7, 7, 8, 11, 14, 14, 12, 6, + 9, 13, 15, 7, 12, 8, 9, 11, 7, 7, 12, 7, 6, 15, 13, 11, + 9, 7, 15, 11, 8, 6, 6, 14, 12, 13, 5, 14, 13, 13, 7, 5, + 15, 5, 8, 11, 14, 14, 6, 14, 6, 9, 12, 9, 12, 5, 15, 8, + 8, 5, 12, 9, 12, 5, 14, 6, 8, 13, 6, 5, 15, 13, 11, 11 +] + +var hl = [0x00000000, 0x5A827999, 0x6ED9EBA1, 0x8F1BBCDC, 0xA953FD4E] +var hr = [0x50A28BE6, 0x5C4DD124, 0x6D703EF3, 0x7A6D76E9, 0x00000000] + +function bytesToWords (bytes) { + var words = [] + for (var i = 0, b = 0; i < bytes.length; i++, b += 8) { + words[b >>> 5] |= bytes[i] << (24 - b % 32) + } + return words +} + +function wordsToBytes (words) { + var bytes = [] + for (var b = 0; b < words.length * 32; b += 8) { + bytes.push((words[b >>> 5] >>> (24 - b % 32)) & 0xFF) + } + return bytes +} + +function processBlock (H, M, offset) { + // swap endian + for (var i = 0; i < 16; i++) { + var offset_i = offset + i + var M_offset_i = M[offset_i] + + // Swap + M[offset_i] = ( + (((M_offset_i << 8) | (M_offset_i >>> 24)) & 0x00ff00ff) | + (((M_offset_i << 24) | (M_offset_i >>> 8)) & 0xff00ff00) + ) + } + + // Working variables + var al, bl, cl, dl, el + var ar, br, cr, dr, er + + ar = al = H[0] + br = bl = H[1] + cr = cl = H[2] + dr = dl = H[3] + er = el = H[4] + + // computation + var t + for (i = 0; i < 80; i += 1) { + t = (al + M[offset + zl[i]]) | 0 + if (i < 16) { + t += f1(bl, cl, dl) + hl[0] + } else if (i < 32) { + t += f2(bl, cl, dl) + hl[1] + } else if (i < 48) { + t += f3(bl, cl, dl) + hl[2] + } else if (i < 64) { + t += f4(bl, cl, dl) + hl[3] + } else {// if (i<80) { + t += f5(bl, cl, dl) + hl[4] + } + t = t | 0 + t = rotl(t, sl[i]) + t = (t + el) | 0 + al = el + el = dl + dl = rotl(cl, 10) + cl = bl + bl = t + + t = (ar + M[offset + zr[i]]) | 0 + if (i < 16) { + t += f5(br, cr, dr) + hr[0] + } else if (i < 32) { + t += f4(br, cr, dr) + hr[1] + } else if (i < 48) { + t += f3(br, cr, dr) + hr[2] + } else if (i < 64) { + t += f2(br, cr, dr) + hr[3] + } else {// if (i<80) { + t += f1(br, cr, dr) + hr[4] + } + + t = t | 0 + t = rotl(t, sr[i]) + t = (t + er) | 0 + ar = er + er = dr + dr = rotl(cr, 10) + cr = br + br = t + } + + // intermediate hash value + t = (H[1] + cl + dr) | 0 + H[1] = (H[2] + dl + er) | 0 + H[2] = (H[3] + el + ar) | 0 + H[3] = (H[4] + al + br) | 0 + H[4] = (H[0] + bl + cr) | 0 + H[0] = t +} + +function f1 (x, y, z) { + return ((x) ^ (y) ^ (z)) +} + +function f2 (x, y, z) { + return (((x) & (y)) | ((~x) & (z))) +} + +function f3 (x, y, z) { + return (((x) | (~(y))) ^ (z)) +} + +function f4 (x, y, z) { + return (((x) & (z)) | ((y) & (~(z)))) +} + +function f5 (x, y, z) { + return ((x) ^ ((y) | (~(z)))) +} + +function rotl (x, n) { + return (x << n) | (x >>> (32 - n)) +} + +function ripemd160 (message) { + var H = [0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0] + + if (typeof message === 'string') { + message = new Buffer(message, 'utf8') + } + + var m = bytesToWords(message) + + var nBitsLeft = message.length * 8 + var nBitsTotal = message.length * 8 + + // Add padding + m[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32) + m[(((nBitsLeft + 64) >>> 9) << 4) + 14] = ( + (((nBitsTotal << 8) | (nBitsTotal >>> 24)) & 0x00ff00ff) | + (((nBitsTotal << 24) | (nBitsTotal >>> 8)) & 0xff00ff00) + ) + + for (var i = 0; i < m.length; i += 16) { + processBlock(H, m, i) + } + + // swap endian + for (i = 0; i < 5; i++) { + // shortcut + var H_i = H[i] + + // Swap + H[i] = (((H_i << 8) | (H_i >>> 24)) & 0x00ff00ff) | + (((H_i << 24) | (H_i >>> 8)) & 0xff00ff00) + } + + var digestbytes = wordsToBytes(H) + return new Buffer(digestbytes) +} + +module.exports = ripemd160 + +}).call(this,require("buffer").Buffer) +},{"buffer":3}],31:[function(require,module,exports){ +(function (Buffer){ +// prototype class for hash functions +function Hash (blockSize, finalSize) { + this._block = new Buffer(blockSize) + this._finalSize = finalSize + this._blockSize = blockSize + this._len = 0 + this._s = 0 +} + +Hash.prototype.update = function (data, enc) { + if (typeof data === 'string') { + enc = enc || 'utf8' + data = new Buffer(data, enc) + } + + var l = this._len += data.length + var s = this._s || 0 + var f = 0 + var buffer = this._block + + while (s < l) { + var t = Math.min(data.length, f + this._blockSize - (s % this._blockSize)) + var ch = (t - f) + + for (var i = 0; i < ch; i++) { + buffer[(s % this._blockSize) + i] = data[i + f] + } + + s += ch + f += ch + + if ((s % this._blockSize) === 0) { + this._update(buffer) + } + } + this._s = s + + return this +} + +Hash.prototype.digest = function (enc) { + // Suppose the length of the message M, in bits, is l + var l = this._len * 8 + + // Append the bit 1 to the end of the message + this._block[this._len % this._blockSize] = 0x80 + + // and then k zero bits, where k is the smallest non-negative solution to the equation (l + 1 + k) === finalSize mod blockSize + this._block.fill(0, this._len % this._blockSize + 1) + + if (l % (this._blockSize * 8) >= this._finalSize * 8) { + this._update(this._block) + this._block.fill(0) + } + + // to this append the block which is equal to the number l written in binary + // TODO: handle case where l is > Math.pow(2, 29) + this._block.writeInt32BE(l, this._blockSize - 4) + + var hash = this._update(this._block) || this._hash() + + return enc ? hash.toString(enc) : hash +} + +Hash.prototype._update = function () { + throw new Error('_update must be implemented by subclass') +} + +module.exports = Hash + +}).call(this,require("buffer").Buffer) +},{"buffer":3}],32:[function(require,module,exports){ +var exports = module.exports = function SHA (algorithm) { + algorithm = algorithm.toLowerCase() + + var Algorithm = exports[algorithm] + if (!Algorithm) throw new Error(algorithm + ' is not supported (we accept pull requests)') + + return new Algorithm() +} + +exports.sha = require('./sha') +exports.sha1 = require('./sha1') +exports.sha224 = require('./sha224') +exports.sha256 = require('./sha256') +exports.sha384 = require('./sha384') +exports.sha512 = require('./sha512') + +},{"./sha":33,"./sha1":34,"./sha224":35,"./sha256":36,"./sha384":37,"./sha512":38}],33:[function(require,module,exports){ +(function (Buffer){ +/* + * A JavaScript implementation of the Secure Hash Algorithm, SHA-0, as defined + * in FIPS PUB 180-1 + * This source code is derived from sha1.js of the same repository. + * The difference between SHA-0 and SHA-1 is just a bitwise rotate left + * operation was added. + */ + +var inherits = require('inherits') +var Hash = require('./hash') + +var K = [ + 0x5a827999, 0x6ed9eba1, 0x8f1bbcdc | 0, 0xca62c1d6 | 0 +] + +var W = new Array(80) + +function Sha () { + this.init() + this._w = W + + Hash.call(this, 64, 56) +} + +inherits(Sha, Hash) + +Sha.prototype.init = function () { + this._a = 0x67452301 + this._b = 0xefcdab89 + this._c = 0x98badcfe + this._d = 0x10325476 + this._e = 0xc3d2e1f0 + + return this +} + +function rotl5 (num) { + return (num << 5) | (num >>> 27) +} + +function rotl30 (num) { + return (num << 30) | (num >>> 2) +} + +function ft (s, b, c, d) { + if (s === 0) return (b & c) | ((~b) & d) + if (s === 2) return (b & c) | (b & d) | (c & d) + return b ^ c ^ d +} + +Sha.prototype._update = function (M) { + var W = this._w + + var a = this._a | 0 + var b = this._b | 0 + var c = this._c | 0 + var d = this._d | 0 + var e = this._e | 0 + + for (var i = 0; i < 16; ++i) W[i] = M.readInt32BE(i * 4) + for (; i < 80; ++i) W[i] = W[i - 3] ^ W[i - 8] ^ W[i - 14] ^ W[i - 16] + + for (var j = 0; j < 80; ++j) { + var s = ~~(j / 20) + var t = (rotl5(a) + ft(s, b, c, d) + e + W[j] + K[s]) | 0 + + e = d + d = c + c = rotl30(b) + b = a + a = t + } + + this._a = (a + this._a) | 0 + this._b = (b + this._b) | 0 + this._c = (c + this._c) | 0 + this._d = (d + this._d) | 0 + this._e = (e + this._e) | 0 +} + +Sha.prototype._hash = function () { + var H = new Buffer(20) + + H.writeInt32BE(this._a | 0, 0) + H.writeInt32BE(this._b | 0, 4) + H.writeInt32BE(this._c | 0, 8) + H.writeInt32BE(this._d | 0, 12) + H.writeInt32BE(this._e | 0, 16) + + return H +} + +module.exports = Sha + +}).call(this,require("buffer").Buffer) +},{"./hash":31,"buffer":3,"inherits":13}],34:[function(require,module,exports){ +(function (Buffer){ +/* + * A JavaScript implementation of the Secure Hash Algorithm, SHA-1, as defined + * in FIPS PUB 180-1 + * Version 2.1a Copyright Paul Johnston 2000 - 2002. + * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet + * Distributed under the BSD License + * See http://pajhome.org.uk/crypt/md5 for details. + */ + +var inherits = require('inherits') +var Hash = require('./hash') + +var K = [ + 0x5a827999, 0x6ed9eba1, 0x8f1bbcdc | 0, 0xca62c1d6 | 0 +] + +var W = new Array(80) + +function Sha1 () { + this.init() + this._w = W + + Hash.call(this, 64, 56) +} + +inherits(Sha1, Hash) + +Sha1.prototype.init = function () { + this._a = 0x67452301 + this._b = 0xefcdab89 + this._c = 0x98badcfe + this._d = 0x10325476 + this._e = 0xc3d2e1f0 + + return this +} + +function rotl1 (num) { + return (num << 1) | (num >>> 31) +} + +function rotl5 (num) { + return (num << 5) | (num >>> 27) +} + +function rotl30 (num) { + return (num << 30) | (num >>> 2) +} + +function ft (s, b, c, d) { + if (s === 0) return (b & c) | ((~b) & d) + if (s === 2) return (b & c) | (b & d) | (c & d) + return b ^ c ^ d +} + +Sha1.prototype._update = function (M) { + var W = this._w + + var a = this._a | 0 + var b = this._b | 0 + var c = this._c | 0 + var d = this._d | 0 + var e = this._e | 0 + + for (var i = 0; i < 16; ++i) W[i] = M.readInt32BE(i * 4) + for (; i < 80; ++i) W[i] = rotl1(W[i - 3] ^ W[i - 8] ^ W[i - 14] ^ W[i - 16]) + + for (var j = 0; j < 80; ++j) { + var s = ~~(j / 20) + var t = (rotl5(a) + ft(s, b, c, d) + e + W[j] + K[s]) | 0 + + e = d + d = c + c = rotl30(b) + b = a + a = t + } + + this._a = (a + this._a) | 0 + this._b = (b + this._b) | 0 + this._c = (c + this._c) | 0 + this._d = (d + this._d) | 0 + this._e = (e + this._e) | 0 +} + +Sha1.prototype._hash = function () { + var H = new Buffer(20) + + H.writeInt32BE(this._a | 0, 0) + H.writeInt32BE(this._b | 0, 4) + H.writeInt32BE(this._c | 0, 8) + H.writeInt32BE(this._d | 0, 12) + H.writeInt32BE(this._e | 0, 16) + + return H +} + +module.exports = Sha1 + +}).call(this,require("buffer").Buffer) +},{"./hash":31,"buffer":3,"inherits":13}],35:[function(require,module,exports){ +(function (Buffer){ +/** + * A JavaScript implementation of the Secure Hash Algorithm, SHA-256, as defined + * in FIPS 180-2 + * Version 2.2-beta Copyright Angel Marin, Paul Johnston 2000 - 2009. + * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet + * + */ + +var inherits = require('inherits') +var Sha256 = require('./sha256') +var Hash = require('./hash') + +var W = new Array(64) + +function Sha224 () { + this.init() + + this._w = W // new Array(64) + + Hash.call(this, 64, 56) +} + +inherits(Sha224, Sha256) + +Sha224.prototype.init = function () { + this._a = 0xc1059ed8 + this._b = 0x367cd507 + this._c = 0x3070dd17 + this._d = 0xf70e5939 + this._e = 0xffc00b31 + this._f = 0x68581511 + this._g = 0x64f98fa7 + this._h = 0xbefa4fa4 + + return this +} + +Sha224.prototype._hash = function () { + var H = new Buffer(28) + + H.writeInt32BE(this._a, 0) + H.writeInt32BE(this._b, 4) + H.writeInt32BE(this._c, 8) + H.writeInt32BE(this._d, 12) + H.writeInt32BE(this._e, 16) + H.writeInt32BE(this._f, 20) + H.writeInt32BE(this._g, 24) + + return H +} + +module.exports = Sha224 + +}).call(this,require("buffer").Buffer) +},{"./hash":31,"./sha256":36,"buffer":3,"inherits":13}],36:[function(require,module,exports){ +(function (Buffer){ +/** + * A JavaScript implementation of the Secure Hash Algorithm, SHA-256, as defined + * in FIPS 180-2 + * Version 2.2-beta Copyright Angel Marin, Paul Johnston 2000 - 2009. + * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet + * + */ + +var inherits = require('inherits') +var Hash = require('./hash') + +var K = [ + 0x428A2F98, 0x71374491, 0xB5C0FBCF, 0xE9B5DBA5, + 0x3956C25B, 0x59F111F1, 0x923F82A4, 0xAB1C5ED5, + 0xD807AA98, 0x12835B01, 0x243185BE, 0x550C7DC3, + 0x72BE5D74, 0x80DEB1FE, 0x9BDC06A7, 0xC19BF174, + 0xE49B69C1, 0xEFBE4786, 0x0FC19DC6, 0x240CA1CC, + 0x2DE92C6F, 0x4A7484AA, 0x5CB0A9DC, 0x76F988DA, + 0x983E5152, 0xA831C66D, 0xB00327C8, 0xBF597FC7, + 0xC6E00BF3, 0xD5A79147, 0x06CA6351, 0x14292967, + 0x27B70A85, 0x2E1B2138, 0x4D2C6DFC, 0x53380D13, + 0x650A7354, 0x766A0ABB, 0x81C2C92E, 0x92722C85, + 0xA2BFE8A1, 0xA81A664B, 0xC24B8B70, 0xC76C51A3, + 0xD192E819, 0xD6990624, 0xF40E3585, 0x106AA070, + 0x19A4C116, 0x1E376C08, 0x2748774C, 0x34B0BCB5, + 0x391C0CB3, 0x4ED8AA4A, 0x5B9CCA4F, 0x682E6FF3, + 0x748F82EE, 0x78A5636F, 0x84C87814, 0x8CC70208, + 0x90BEFFFA, 0xA4506CEB, 0xBEF9A3F7, 0xC67178F2 +] + +var W = new Array(64) + +function Sha256 () { + this.init() + + this._w = W // new Array(64) + + Hash.call(this, 64, 56) +} + +inherits(Sha256, Hash) + +Sha256.prototype.init = function () { + this._a = 0x6a09e667 + this._b = 0xbb67ae85 + this._c = 0x3c6ef372 + this._d = 0xa54ff53a + this._e = 0x510e527f + this._f = 0x9b05688c + this._g = 0x1f83d9ab + this._h = 0x5be0cd19 + + return this +} + +function ch (x, y, z) { + return z ^ (x & (y ^ z)) +} + +function maj (x, y, z) { + return (x & y) | (z & (x | y)) +} + +function sigma0 (x) { + return (x >>> 2 | x << 30) ^ (x >>> 13 | x << 19) ^ (x >>> 22 | x << 10) +} + +function sigma1 (x) { + return (x >>> 6 | x << 26) ^ (x >>> 11 | x << 21) ^ (x >>> 25 | x << 7) +} + +function gamma0 (x) { + return (x >>> 7 | x << 25) ^ (x >>> 18 | x << 14) ^ (x >>> 3) +} + +function gamma1 (x) { + return (x >>> 17 | x << 15) ^ (x >>> 19 | x << 13) ^ (x >>> 10) +} + +Sha256.prototype._update = function (M) { + var W = this._w + + var a = this._a | 0 + var b = this._b | 0 + var c = this._c | 0 + var d = this._d | 0 + var e = this._e | 0 + var f = this._f | 0 + var g = this._g | 0 + var h = this._h | 0 + + for (var i = 0; i < 16; ++i) W[i] = M.readInt32BE(i * 4) + for (; i < 64; ++i) W[i] = (gamma1(W[i - 2]) + W[i - 7] + gamma0(W[i - 15]) + W[i - 16]) | 0 + + for (var j = 0; j < 64; ++j) { + var T1 = (h + sigma1(e) + ch(e, f, g) + K[j] + W[j]) | 0 + var T2 = (sigma0(a) + maj(a, b, c)) | 0 + + h = g + g = f + f = e + e = (d + T1) | 0 + d = c + c = b + b = a + a = (T1 + T2) | 0 + } + + this._a = (a + this._a) | 0 + this._b = (b + this._b) | 0 + this._c = (c + this._c) | 0 + this._d = (d + this._d) | 0 + this._e = (e + this._e) | 0 + this._f = (f + this._f) | 0 + this._g = (g + this._g) | 0 + this._h = (h + this._h) | 0 +} + +Sha256.prototype._hash = function () { + var H = new Buffer(32) + + H.writeInt32BE(this._a, 0) + H.writeInt32BE(this._b, 4) + H.writeInt32BE(this._c, 8) + H.writeInt32BE(this._d, 12) + H.writeInt32BE(this._e, 16) + H.writeInt32BE(this._f, 20) + H.writeInt32BE(this._g, 24) + H.writeInt32BE(this._h, 28) + + return H +} + +module.exports = Sha256 + +}).call(this,require("buffer").Buffer) +},{"./hash":31,"buffer":3,"inherits":13}],37:[function(require,module,exports){ +(function (Buffer){ +var inherits = require('inherits') +var SHA512 = require('./sha512') +var Hash = require('./hash') + +var W = new Array(160) + +function Sha384 () { + this.init() + this._w = W + + Hash.call(this, 128, 112) +} + +inherits(Sha384, SHA512) + +Sha384.prototype.init = function () { + this._ah = 0xcbbb9d5d + this._bh = 0x629a292a + this._ch = 0x9159015a + this._dh = 0x152fecd8 + this._eh = 0x67332667 + this._fh = 0x8eb44a87 + this._gh = 0xdb0c2e0d + this._hh = 0x47b5481d + + this._al = 0xc1059ed8 + this._bl = 0x367cd507 + this._cl = 0x3070dd17 + this._dl = 0xf70e5939 + this._el = 0xffc00b31 + this._fl = 0x68581511 + this._gl = 0x64f98fa7 + this._hl = 0xbefa4fa4 + + return this +} + +Sha384.prototype._hash = function () { + var H = new Buffer(48) + + function writeInt64BE (h, l, offset) { + H.writeInt32BE(h, offset) + H.writeInt32BE(l, offset + 4) + } + + writeInt64BE(this._ah, this._al, 0) + writeInt64BE(this._bh, this._bl, 8) + writeInt64BE(this._ch, this._cl, 16) + writeInt64BE(this._dh, this._dl, 24) + writeInt64BE(this._eh, this._el, 32) + writeInt64BE(this._fh, this._fl, 40) + + return H +} + +module.exports = Sha384 + +}).call(this,require("buffer").Buffer) +},{"./hash":31,"./sha512":38,"buffer":3,"inherits":13}],38:[function(require,module,exports){ +(function (Buffer){ +var inherits = require('inherits') +var Hash = require('./hash') + +var K = [ + 0x428a2f98, 0xd728ae22, 0x71374491, 0x23ef65cd, + 0xb5c0fbcf, 0xec4d3b2f, 0xe9b5dba5, 0x8189dbbc, + 0x3956c25b, 0xf348b538, 0x59f111f1, 0xb605d019, + 0x923f82a4, 0xaf194f9b, 0xab1c5ed5, 0xda6d8118, + 0xd807aa98, 0xa3030242, 0x12835b01, 0x45706fbe, + 0x243185be, 0x4ee4b28c, 0x550c7dc3, 0xd5ffb4e2, + 0x72be5d74, 0xf27b896f, 0x80deb1fe, 0x3b1696b1, + 0x9bdc06a7, 0x25c71235, 0xc19bf174, 0xcf692694, + 0xe49b69c1, 0x9ef14ad2, 0xefbe4786, 0x384f25e3, + 0x0fc19dc6, 0x8b8cd5b5, 0x240ca1cc, 0x77ac9c65, + 0x2de92c6f, 0x592b0275, 0x4a7484aa, 0x6ea6e483, + 0x5cb0a9dc, 0xbd41fbd4, 0x76f988da, 0x831153b5, + 0x983e5152, 0xee66dfab, 0xa831c66d, 0x2db43210, + 0xb00327c8, 0x98fb213f, 0xbf597fc7, 0xbeef0ee4, + 0xc6e00bf3, 0x3da88fc2, 0xd5a79147, 0x930aa725, + 0x06ca6351, 0xe003826f, 0x14292967, 0x0a0e6e70, + 0x27b70a85, 0x46d22ffc, 0x2e1b2138, 0x5c26c926, + 0x4d2c6dfc, 0x5ac42aed, 0x53380d13, 0x9d95b3df, + 0x650a7354, 0x8baf63de, 0x766a0abb, 0x3c77b2a8, + 0x81c2c92e, 0x47edaee6, 0x92722c85, 0x1482353b, + 0xa2bfe8a1, 0x4cf10364, 0xa81a664b, 0xbc423001, + 0xc24b8b70, 0xd0f89791, 0xc76c51a3, 0x0654be30, + 0xd192e819, 0xd6ef5218, 0xd6990624, 0x5565a910, + 0xf40e3585, 0x5771202a, 0x106aa070, 0x32bbd1b8, + 0x19a4c116, 0xb8d2d0c8, 0x1e376c08, 0x5141ab53, + 0x2748774c, 0xdf8eeb99, 0x34b0bcb5, 0xe19b48a8, + 0x391c0cb3, 0xc5c95a63, 0x4ed8aa4a, 0xe3418acb, + 0x5b9cca4f, 0x7763e373, 0x682e6ff3, 0xd6b2b8a3, + 0x748f82ee, 0x5defb2fc, 0x78a5636f, 0x43172f60, + 0x84c87814, 0xa1f0ab72, 0x8cc70208, 0x1a6439ec, + 0x90befffa, 0x23631e28, 0xa4506ceb, 0xde82bde9, + 0xbef9a3f7, 0xb2c67915, 0xc67178f2, 0xe372532b, + 0xca273ece, 0xea26619c, 0xd186b8c7, 0x21c0c207, + 0xeada7dd6, 0xcde0eb1e, 0xf57d4f7f, 0xee6ed178, + 0x06f067aa, 0x72176fba, 0x0a637dc5, 0xa2c898a6, + 0x113f9804, 0xbef90dae, 0x1b710b35, 0x131c471b, + 0x28db77f5, 0x23047d84, 0x32caab7b, 0x40c72493, + 0x3c9ebe0a, 0x15c9bebc, 0x431d67c4, 0x9c100d4c, + 0x4cc5d4be, 0xcb3e42b6, 0x597f299c, 0xfc657e2a, + 0x5fcb6fab, 0x3ad6faec, 0x6c44198c, 0x4a475817 +] + +var W = new Array(160) + +function Sha512 () { + this.init() + this._w = W + + Hash.call(this, 128, 112) +} + +inherits(Sha512, Hash) + +Sha512.prototype.init = function () { + this._ah = 0x6a09e667 + this._bh = 0xbb67ae85 + this._ch = 0x3c6ef372 + this._dh = 0xa54ff53a + this._eh = 0x510e527f + this._fh = 0x9b05688c + this._gh = 0x1f83d9ab + this._hh = 0x5be0cd19 + + this._al = 0xf3bcc908 + this._bl = 0x84caa73b + this._cl = 0xfe94f82b + this._dl = 0x5f1d36f1 + this._el = 0xade682d1 + this._fl = 0x2b3e6c1f + this._gl = 0xfb41bd6b + this._hl = 0x137e2179 + + return this +} + +function Ch (x, y, z) { + return z ^ (x & (y ^ z)) +} + +function maj (x, y, z) { + return (x & y) | (z & (x | y)) +} + +function sigma0 (x, xl) { + return (x >>> 28 | xl << 4) ^ (xl >>> 2 | x << 30) ^ (xl >>> 7 | x << 25) +} + +function sigma1 (x, xl) { + return (x >>> 14 | xl << 18) ^ (x >>> 18 | xl << 14) ^ (xl >>> 9 | x << 23) +} + +function Gamma0 (x, xl) { + return (x >>> 1 | xl << 31) ^ (x >>> 8 | xl << 24) ^ (x >>> 7) +} + +function Gamma0l (x, xl) { + return (x >>> 1 | xl << 31) ^ (x >>> 8 | xl << 24) ^ (x >>> 7 | xl << 25) +} + +function Gamma1 (x, xl) { + return (x >>> 19 | xl << 13) ^ (xl >>> 29 | x << 3) ^ (x >>> 6) +} + +function Gamma1l (x, xl) { + return (x >>> 19 | xl << 13) ^ (xl >>> 29 | x << 3) ^ (x >>> 6 | xl << 26) +} + +function getCarry (a, b) { + return (a >>> 0) < (b >>> 0) ? 1 : 0 +} + +Sha512.prototype._update = function (M) { + var W = this._w + + var ah = this._ah | 0 + var bh = this._bh | 0 + var ch = this._ch | 0 + var dh = this._dh | 0 + var eh = this._eh | 0 + var fh = this._fh | 0 + var gh = this._gh | 0 + var hh = this._hh | 0 + + var al = this._al | 0 + var bl = this._bl | 0 + var cl = this._cl | 0 + var dl = this._dl | 0 + var el = this._el | 0 + var fl = this._fl | 0 + var gl = this._gl | 0 + var hl = this._hl | 0 + + for (var i = 0; i < 32; i += 2) { + W[i] = M.readInt32BE(i * 4) + W[i + 1] = M.readInt32BE(i * 4 + 4) + } + for (; i < 160; i += 2) { + var xh = W[i - 15 * 2] + var xl = W[i - 15 * 2 + 1] + var gamma0 = Gamma0(xh, xl) + var gamma0l = Gamma0l(xl, xh) + + xh = W[i - 2 * 2] + xl = W[i - 2 * 2 + 1] + var gamma1 = Gamma1(xh, xl) + var gamma1l = Gamma1l(xl, xh) + + // W[i] = gamma0 + W[i - 7] + gamma1 + W[i - 16] + var Wi7h = W[i - 7 * 2] + var Wi7l = W[i - 7 * 2 + 1] + + var Wi16h = W[i - 16 * 2] + var Wi16l = W[i - 16 * 2 + 1] + + var Wil = (gamma0l + Wi7l) | 0 + var Wih = (gamma0 + Wi7h + getCarry(Wil, gamma0l)) | 0 + Wil = (Wil + gamma1l) | 0 + Wih = (Wih + gamma1 + getCarry(Wil, gamma1l)) | 0 + Wil = (Wil + Wi16l) | 0 + Wih = (Wih + Wi16h + getCarry(Wil, Wi16l)) | 0 + + W[i] = Wih + W[i + 1] = Wil + } + + for (var j = 0; j < 160; j += 2) { + Wih = W[j] + Wil = W[j + 1] + + var majh = maj(ah, bh, ch) + var majl = maj(al, bl, cl) + + var sigma0h = sigma0(ah, al) + var sigma0l = sigma0(al, ah) + var sigma1h = sigma1(eh, el) + var sigma1l = sigma1(el, eh) + + // t1 = h + sigma1 + ch + K[j] + W[j] + var Kih = K[j] + var Kil = K[j + 1] + + var chh = Ch(eh, fh, gh) + var chl = Ch(el, fl, gl) + + var t1l = (hl + sigma1l) | 0 + var t1h = (hh + sigma1h + getCarry(t1l, hl)) | 0 + t1l = (t1l + chl) | 0 + t1h = (t1h + chh + getCarry(t1l, chl)) | 0 + t1l = (t1l + Kil) | 0 + t1h = (t1h + Kih + getCarry(t1l, Kil)) | 0 + t1l = (t1l + Wil) | 0 + t1h = (t1h + Wih + getCarry(t1l, Wil)) | 0 + + // t2 = sigma0 + maj + var t2l = (sigma0l + majl) | 0 + var t2h = (sigma0h + majh + getCarry(t2l, sigma0l)) | 0 + + hh = gh + hl = gl + gh = fh + gl = fl + fh = eh + fl = el + el = (dl + t1l) | 0 + eh = (dh + t1h + getCarry(el, dl)) | 0 + dh = ch + dl = cl + ch = bh + cl = bl + bh = ah + bl = al + al = (t1l + t2l) | 0 + ah = (t1h + t2h + getCarry(al, t1l)) | 0 + } + + this._al = (this._al + al) | 0 + this._bl = (this._bl + bl) | 0 + this._cl = (this._cl + cl) | 0 + this._dl = (this._dl + dl) | 0 + this._el = (this._el + el) | 0 + this._fl = (this._fl + fl) | 0 + this._gl = (this._gl + gl) | 0 + this._hl = (this._hl + hl) | 0 + + this._ah = (this._ah + ah + getCarry(this._al, al)) | 0 + this._bh = (this._bh + bh + getCarry(this._bl, bl)) | 0 + this._ch = (this._ch + ch + getCarry(this._cl, cl)) | 0 + this._dh = (this._dh + dh + getCarry(this._dl, dl)) | 0 + this._eh = (this._eh + eh + getCarry(this._el, el)) | 0 + this._fh = (this._fh + fh + getCarry(this._fl, fl)) | 0 + this._gh = (this._gh + gh + getCarry(this._gl, gl)) | 0 + this._hh = (this._hh + hh + getCarry(this._hl, hl)) | 0 +} + +Sha512.prototype._hash = function () { + var H = new Buffer(64) + + function writeInt64BE (h, l, offset) { + H.writeInt32BE(h, offset) + H.writeInt32BE(l, offset + 4) + } + + writeInt64BE(this._ah, this._al, 0) + writeInt64BE(this._bh, this._bl, 8) + writeInt64BE(this._ch, this._cl, 16) + writeInt64BE(this._dh, this._dl, 24) + writeInt64BE(this._eh, this._el, 32) + writeInt64BE(this._fh, this._fl, 40) + writeInt64BE(this._gh, this._gl, 48) + writeInt64BE(this._hh, this._hl, 56) + + return H +} + +module.exports = Sha512 + +}).call(this,require("buffer").Buffer) +},{"./hash":31,"buffer":3,"inherits":13}],39:[function(require,module,exports){ +// Copyright Joyent, Inc. and other Node contributors. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to permit +// persons to whom the Software is furnished to do so, subject to the +// following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +// USE OR OTHER DEALINGS IN THE SOFTWARE. + +module.exports = Stream; + +var EE = require('events').EventEmitter; +var inherits = require('inherits'); + +inherits(Stream, EE); +Stream.Readable = require('readable-stream/readable.js'); +Stream.Writable = require('readable-stream/writable.js'); +Stream.Duplex = require('readable-stream/duplex.js'); +Stream.Transform = require('readable-stream/transform.js'); +Stream.PassThrough = require('readable-stream/passthrough.js'); + +// Backwards-compat with node 0.4.x +Stream.Stream = Stream; + + + +// old-style streams. Note that the pipe method (the only relevant +// part of this class) is overridden in the Readable class. + +function Stream() { + EE.call(this); +} + +Stream.prototype.pipe = function(dest, options) { + var source = this; + + function ondata(chunk) { + if (dest.writable) { + if (false === dest.write(chunk) && source.pause) { + source.pause(); + } + } + } + + source.on('data', ondata); + + function ondrain() { + if (source.readable && source.resume) { + source.resume(); + } + } + + dest.on('drain', ondrain); + + // If the 'end' option is not supplied, dest.end() will be called when + // source gets the 'end' or 'close' events. Only dest.end() once. + if (!dest._isStdio && (!options || options.end !== false)) { + source.on('end', onend); + source.on('close', onclose); + } + + var didOnEnd = false; + function onend() { + if (didOnEnd) return; + didOnEnd = true; + + dest.end(); + } + + + function onclose() { + if (didOnEnd) return; + didOnEnd = true; + + if (typeof dest.destroy === 'function') dest.destroy(); + } + + // don't leave dangling pipes when there are errors. + function onerror(er) { + cleanup(); + if (EE.listenerCount(this, 'error') === 0) { + throw er; // Unhandled stream error in pipe. + } + } + + source.on('error', onerror); + dest.on('error', onerror); + + // remove all the event listeners that were added. + function cleanup() { + source.removeListener('data', ondata); + dest.removeListener('drain', ondrain); + + source.removeListener('end', onend); + source.removeListener('close', onclose); + + source.removeListener('error', onerror); + dest.removeListener('error', onerror); + + source.removeListener('end', cleanup); + source.removeListener('close', cleanup); + + dest.removeListener('close', cleanup); + } + + source.on('end', cleanup); + source.on('close', cleanup); + + dest.on('close', cleanup); + + dest.emit('pipe', source); + + // Allow for unix-like usage: A.pipe(B).pipe(C) + return dest; +}; + +},{"events":11,"inherits":13,"readable-stream/duplex.js":20,"readable-stream/passthrough.js":26,"readable-stream/readable.js":27,"readable-stream/transform.js":28,"readable-stream/writable.js":29}],40:[function(require,module,exports){ +// Copyright Joyent, Inc. and other Node contributors. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to permit +// persons to whom the Software is furnished to do so, subject to the +// following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +// USE OR OTHER DEALINGS IN THE SOFTWARE. + +var Buffer = require('buffer').Buffer; + +var isBufferEncoding = Buffer.isEncoding + || function(encoding) { + switch (encoding && encoding.toLowerCase()) { + case 'hex': case 'utf8': case 'utf-8': case 'ascii': case 'binary': case 'base64': case 'ucs2': case 'ucs-2': case 'utf16le': case 'utf-16le': case 'raw': return true; + default: return false; + } + } + + +function assertEncoding(encoding) { + if (encoding && !isBufferEncoding(encoding)) { + throw new Error('Unknown encoding: ' + encoding); + } +} + +// StringDecoder provides an interface for efficiently splitting a series of +// buffers into a series of JS strings without breaking apart multi-byte +// characters. CESU-8 is handled as part of the UTF-8 encoding. +// +// @TODO Handling all encodings inside a single object makes it very difficult +// to reason about this code, so it should be split up in the future. +// @TODO There should be a utf8-strict encoding that rejects invalid UTF-8 code +// points as used by CESU-8. +var StringDecoder = exports.StringDecoder = function(encoding) { + this.encoding = (encoding || 'utf8').toLowerCase().replace(/[-_]/, ''); + assertEncoding(encoding); + switch (this.encoding) { + case 'utf8': + // CESU-8 represents each of Surrogate Pair by 3-bytes + this.surrogateSize = 3; + break; + case 'ucs2': + case 'utf16le': + // UTF-16 represents each of Surrogate Pair by 2-bytes + this.surrogateSize = 2; + this.detectIncompleteChar = utf16DetectIncompleteChar; + break; + case 'base64': + // Base-64 stores 3 bytes in 4 chars, and pads the remainder. + this.surrogateSize = 3; + this.detectIncompleteChar = base64DetectIncompleteChar; + break; + default: + this.write = passThroughWrite; + return; + } + + // Enough space to store all bytes of a single character. UTF-8 needs 4 + // bytes, but CESU-8 may require up to 6 (3 bytes per surrogate). + this.charBuffer = new Buffer(6); + // Number of bytes received for the current incomplete multi-byte character. + this.charReceived = 0; + // Number of bytes expected for the current incomplete multi-byte character. + this.charLength = 0; +}; + + +// write decodes the given buffer and returns it as JS string that is +// guaranteed to not contain any partial multi-byte characters. Any partial +// character found at the end of the buffer is buffered up, and will be +// returned when calling write again with the remaining bytes. +// +// Note: Converting a Buffer containing an orphan surrogate to a String +// currently works, but converting a String to a Buffer (via `new Buffer`, or +// Buffer#write) will replace incomplete surrogates with the unicode +// replacement character. See https://codereview.chromium.org/121173009/ . +StringDecoder.prototype.write = function(buffer) { + var charStr = ''; + // if our last write ended with an incomplete multibyte character + while (this.charLength) { + // determine how many remaining bytes this buffer has to offer for this char + var available = (buffer.length >= this.charLength - this.charReceived) ? + this.charLength - this.charReceived : + buffer.length; + + // add the new bytes to the char buffer + buffer.copy(this.charBuffer, this.charReceived, 0, available); + this.charReceived += available; + + if (this.charReceived < this.charLength) { + // still not enough chars in this buffer? wait for more ... + return ''; + } + + // remove bytes belonging to the current character from the buffer + buffer = buffer.slice(available, buffer.length); + + // get the character that was split + charStr = this.charBuffer.slice(0, this.charLength).toString(this.encoding); + + // CESU-8: lead surrogate (D800-DBFF) is also the incomplete character + var charCode = charStr.charCodeAt(charStr.length - 1); + if (charCode >= 0xD800 && charCode <= 0xDBFF) { + this.charLength += this.surrogateSize; + charStr = ''; + continue; + } + this.charReceived = this.charLength = 0; + + // if there are no more bytes in this buffer, just emit our char + if (buffer.length === 0) { + return charStr; + } + break; + } + + // determine and set charLength / charReceived + this.detectIncompleteChar(buffer); + + var end = buffer.length; + if (this.charLength) { + // buffer the incomplete character bytes we got + buffer.copy(this.charBuffer, 0, buffer.length - this.charReceived, end); + end -= this.charReceived; + } + + charStr += buffer.toString(this.encoding, 0, end); + + var end = charStr.length - 1; + var charCode = charStr.charCodeAt(end); + // CESU-8: lead surrogate (D800-DBFF) is also the incomplete character + if (charCode >= 0xD800 && charCode <= 0xDBFF) { + var size = this.surrogateSize; + this.charLength += size; + this.charReceived += size; + this.charBuffer.copy(this.charBuffer, size, 0, size); + buffer.copy(this.charBuffer, 0, 0, size); + return charStr.substring(0, end); + } + + // or just emit the charStr + return charStr; +}; + +// detectIncompleteChar determines if there is an incomplete UTF-8 character at +// the end of the given buffer. If so, it sets this.charLength to the byte +// length that character, and sets this.charReceived to the number of bytes +// that are available for this character. +StringDecoder.prototype.detectIncompleteChar = function(buffer) { + // determine how many bytes we have to check at the end of this buffer + var i = (buffer.length >= 3) ? 3 : buffer.length; + + // Figure out if one of the last i bytes of our buffer announces an + // incomplete char. + for (; i > 0; i--) { + var c = buffer[buffer.length - i]; + + // See http://en.wikipedia.org/wiki/UTF-8#Description + + // 110XXXXX + if (i == 1 && c >> 5 == 0x06) { + this.charLength = 2; + break; + } + + // 1110XXXX + if (i <= 2 && c >> 4 == 0x0E) { + this.charLength = 3; + break; + } + + // 11110XXX + if (i <= 3 && c >> 3 == 0x1E) { + this.charLength = 4; + break; + } + } + this.charReceived = i; +}; + +StringDecoder.prototype.end = function(buffer) { + var res = ''; + if (buffer && buffer.length) + res = this.write(buffer); + + if (this.charReceived) { + var cr = this.charReceived; + var buf = this.charBuffer; + var enc = this.encoding; + res += buf.slice(0, cr).toString(enc); + } + + return res; +}; + +function passThroughWrite(buffer) { + return buffer.toString(this.encoding); +} + +function utf16DetectIncompleteChar(buffer) { + this.charReceived = buffer.length % 2; + this.charLength = this.charReceived ? 2 : 0; +} + +function base64DetectIncompleteChar(buffer) { + this.charReceived = buffer.length % 3; + this.charLength = this.charReceived ? 3 : 0; +} + +},{"buffer":3}],41:[function(require,module,exports){ +(function (global){ + +/** + * Module exports. + */ + +module.exports = deprecate; + +/** + * Mark that a method should not be used. + * Returns a modified function which warns once by default. + * + * If `localStorage.noDeprecation = true` is set, then it is a no-op. + * + * If `localStorage.throwDeprecation = true` is set, then deprecated functions + * will throw an Error when invoked. + * + * If `localStorage.traceDeprecation = true` is set, then deprecated functions + * will invoke `console.trace()` instead of `console.error()`. + * + * @param {Function} fn - the function to deprecate + * @param {String} msg - the string to print to the console when `fn` is invoked + * @returns {Function} a new "deprecated" version of `fn` + * @api public + */ + +function deprecate (fn, msg) { + if (config('noDeprecation')) { + return fn; + } + + var warned = false; + function deprecated() { + if (!warned) { + if (config('throwDeprecation')) { + throw new Error(msg); + } else if (config('traceDeprecation')) { + console.trace(msg); + } else { + console.warn(msg); + } + warned = true; + } + return fn.apply(this, arguments); + } + + return deprecated; +} + +/** + * Checks `localStorage` for boolean values for the given `name`. + * + * @param {String} name + * @returns {Boolean} + * @api private + */ + +function config (name) { + // accessing global.localStorage can trigger a DOMException in sandboxed iframes + try { + if (!global.localStorage) return false; + } catch (_) { + return false; + } + var val = global.localStorage[name]; + if (null == val) return false; + return String(val).toLowerCase() === 'true'; +} + +}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {}) +},{}]},{},[1]); diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js index 0f18ebcfc..41e56543a 100644 --- a/src/js/controllers/amount.js +++ b/src/js/controllers/amount.js @@ -22,6 +22,7 @@ angular.module('copayApp.controllers').controller('amountController', function($ $scope.toName = data.stateParams.toName; $scope.toEmail = data.stateParams.toEmail; $scope.showAlternativeAmount = !!$scope.cardId; + $scope.toColor = data.stateParams.toColor; if (!$scope.cardId && !$stateParams.toAddress) { $log.error('Bad params at amount') @@ -93,7 +94,7 @@ angular.module('copayApp.controllers').controller('amountController', function($ $scope.pushDigit = function(digit) { if ($scope.amount && $scope.amount.length >= LENGTH_EXPRESSION_LIMIT) return; if ($scope.amount.indexOf('.') > -1 && digit == '.') return; - if($scope.showAlternativeAmount && $scope.amount.indexOf('.') > -1 && $scope.amount[$scope.amount.indexOf('.') + 2]) return; + if ($scope.showAlternativeAmount && $scope.amount.indexOf('.') > -1 && $scope.amount[$scope.amount.indexOf('.') + 2]) return; $scope.amount = ($scope.amount + digit).replace('..', '.'); checkFontSize(); diff --git a/src/js/controllers/tab-send.js b/src/js/controllers/tab-send.js index 55e64b115..fed223c4e 100644 --- a/src/js/controllers/tab-send.js +++ b/src/js/controllers/tab-send.js @@ -102,7 +102,8 @@ angular.module('copayApp.controllers').controller('tabSendController', function( isWallet: item.isWallet, toAddress: addr, toName: item.name, - toEmail: item.email + toEmail: item.email, + toColor: item.color }) }); }); diff --git a/src/js/routes.js b/src/js/routes.js index b4c68d926..c169f218b 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -251,7 +251,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr */ .state('tabs.send.amount', { - url: '/amount/:isWallet/:toAddress/:toName/:toEmail', + url: '/amount/:isWallet/:toAddress/:toName/:toEmail/:toColor', views: { 'tab-send@tabs': { controller: 'amountController', diff --git a/www/views/amount.html b/www/views/amount.html index 9754e8867..ab7bd4325 100644 --- a/www/views/amount.html +++ b/www/views/amount.html @@ -13,14 +13,16 @@
        Recipient
        - + + +
        - {{toName || toAddress}} + {{toName || toAddress}}
        From 25f7408d3b65b58a491ff7825dcd853fa7a7e2bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Fri, 14 Oct 2016 10:05:04 -0300 Subject: [PATCH 051/110] fixes --- src/js/controllers/tab-home.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js index e276902ae..441817fcb 100644 --- a/src/js/controllers/tab-home.js +++ b/src/js/controllers/tab-home.js @@ -19,7 +19,7 @@ angular.module('copayApp.controllers').controller('tabHomeController', if (!$scope.homeTip) { storageService.getHomeTipAccepted(function(error, value) { - $scope.homeTip = (value == 'false') ? false : true; + $scope.homeTip = (value == 'accepted') ? false : true; }); } @@ -175,7 +175,7 @@ angular.module('copayApp.controllers').controller('tabHomeController', }; $scope.hideHomeTip = function() { - storageService.setHomeTipAccepted(JSON.stringify(false), function(error, value) { + storageService.setHomeTipAccepted('accepted', function() { $scope.homeTip = false; $timeout(function() { $scope.$apply(); From cb328de5c75e0b2181607c2533b4cfa2f35cf35a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Fri, 14 Oct 2016 10:24:20 -0300 Subject: [PATCH 052/110] enable pull to refresh only in android devices --- src/js/controllers/tab-home.js | 1 + src/js/controllers/walletDetails.js | 1 + www/views/tab-home.html | 2 +- www/views/walletDetails.html | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js index 441817fcb..53ccb892e 100644 --- a/src/js/controllers/tab-home.js +++ b/src/js/controllers/tab-home.js @@ -12,6 +12,7 @@ angular.module('copayApp.controllers').controller('tabHomeController', $scope.name = $window.appConfig.nameCase; $scope.homeTip = $stateParams.fromOnboarding; $scope.isCordova = platformInfo.isCordova; + $scope.isAndroid = platformInfo.isAndroid; $scope.$on("$ionicView.afterEnter", function() { startupService.ready(); diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index ef9f409c1..6a6e20de0 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -9,6 +9,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun $scope.completeTxHistory = []; $scope.openTxpModal = txpModalService.open; $scope.isCordova = platformInfo.isCordova; + $scope.isAndroid = platformInfo.isAndroid; $scope.openExternalLink = function(url, target) { externalLinkService.open(url, target); diff --git a/www/views/tab-home.html b/www/views/tab-home.html index 9b9cbdb14..b728c0b5b 100644 --- a/www/views/tab-home.html +++ b/www/views/tab-home.html @@ -5,7 +5,7 @@ diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index b0d2e784c..b73bd0501 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -12,7 +12,7 @@ From 1d82c50f14fcf26a69b41c85cc0bf205857f8388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Fri, 14 Oct 2016 10:25:52 -0300 Subject: [PATCH 053/110] increase loading animation time --- src/js/controllers/tab-home.js | 4 +++- src/js/controllers/walletDetails.js | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js index 53ccb892e..3eae9232a 100644 --- a/src/js/controllers/tab-home.js +++ b/src/js/controllers/tab-home.js @@ -211,7 +211,9 @@ angular.module('copayApp.controllers').controller('tabHomeController', }; $scope.onRefresh = function() { - $scope.$broadcast('scroll.refreshComplete'); + $timeout(function() { + $scope.$broadcast('scroll.refreshComplete'); + }, 300); updateAllWallets(); }; diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index 6a6e20de0..ecbf9651e 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -162,7 +162,9 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun }; $scope.onRefresh = function() { - $scope.$broadcast('scroll.refreshComplete'); + $timeout(function() { + $scope.$broadcast('scroll.refreshComplete'); + }, 300); $scope.updateAll(true); }; From 207f5db0eb8ce03d280d0130c4aa7c6be9178495 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Fri, 14 Oct 2016 09:42:46 -0400 Subject: [PATCH 054/110] finished receive view styling for phone sizes --- src/sass/views/includes/wallets.scss | 12 ++++++++ src/sass/views/tab-receive.scss | 43 ++++++++++++++++++++++++---- www/views/includes/wallets.html | 2 +- www/views/tab-receive.html | 2 +- 4 files changed, 51 insertions(+), 8 deletions(-) diff --git a/src/sass/views/includes/wallets.scss b/src/sass/views/includes/wallets.scss index ae1d52c83..dcb81f835 100644 --- a/src/sass/views/includes/wallets.scss +++ b/src/sass/views/includes/wallets.scss @@ -3,6 +3,15 @@ .swiper-container { width: 85% !important; overflow: visible; + position: absolute; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + @media (max-height: 600px){ + &{ + transform: translate(-50%, -58%); + } + } } .card { max-width: 350px; @@ -17,6 +26,9 @@ } .item{ padding:.6rem; + &.noBalance{ + padding:.6rem 1rem 1.7rem; + } span{ clear:both; width: 100%; diff --git a/src/sass/views/tab-receive.scss b/src/sass/views/tab-receive.scss index 404e67e25..50129fb9c 100644 --- a/src/sass/views/tab-receive.scss +++ b/src/sass/views/tab-receive.scss @@ -13,8 +13,19 @@ .scroll{height:100%;} #address { background: #fff; - height:80%; - article{height: 100%;position: relative;} + height: calc(100vh - 33vh); + display: flex; + align-items: center; + justify-content: center; + position: relative; + flex-flow: column; + @media(max-height: 600px){ + height: calc(100vh - 36vh); + } + article{ + flex:1; + width: 100%; + } #bit-address{ position: absolute; bottom:0; @@ -52,26 +63,41 @@ } } .qr { - padding: 13vh 0 5vh 0; + padding: calc(100vh - 85vh) 0 calc(100vh - 96vh); + @media(max-height: 700px){ + padding: calc(100vh - 90vh) 0 calc(100vh - 96vh); + } + div{ + display: flex; + justify-content: center; + align-items: center; + } + } + .share{ + flex:1; + max-width: 120px; + .item{ + i{left:25px;} + } } .backup { background-color: orange; color: #fff; position: absolute; - top: 5px; + top: 0; i { padding: 10px; } } @media (max-height: 600px){ &{ - height: 77%; .qr{ - padding:6.5vh 0 2vh; + padding:6vh 0 0; div{ transform: scale(.7); } } + #bit-address{position: realtive;} } } } @@ -89,6 +115,7 @@ position: absolute; left: 50%; transform: translateX(-50%); + z-index: 2; } } #first-time-tip { @@ -131,6 +158,10 @@ border-right: 1px solid rgb(228, 228, 228); padding-right: 10px; } + .wallets{ + position: relative; + height: calc(100vh - 83vh); + } } @keyframes fadeIn { diff --git a/www/views/includes/wallets.html b/www/views/includes/wallets.html index 6de2c5a5b..0b0deb799 100644 --- a/www/views/includes/wallets.html +++ b/www/views/includes/wallets.html @@ -2,7 +2,7 @@
        -
        +
        diff --git a/www/views/tab-receive.html b/www/views/tab-receive.html index 7649e9b0c..ae66023d0 100644 --- a/www/views/tab-receive.html +++ b/www/views/tab-receive.html @@ -60,7 +60,7 @@
        -
        +
        +
        *ATM bank fees may apply

        From b82bdaaafc284aa669e86970e056228d9c29592c Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 10 Oct 2016 15:00:29 -0300 Subject: [PATCH 037/110] Support appUri --- app-template/config-template.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-template/config-template.xml b/app-template/config-template.xml index 98c36cf65..faa71f449 100644 --- a/app-template/config-template.xml +++ b/app-template/config-template.xml @@ -58,7 +58,7 @@ - + From 87535b3f2430b9a6ea9dffebf1327d882eca4930 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 10 Oct 2016 18:25:07 -0300 Subject: [PATCH 038/110] Generate local priv key --- src/js/controllers/bitpayCard.js | 4 +- src/js/controllers/tab-home.js | 4 +- src/js/services/bitpayCardService.js | 115 ++++++++++----------------- src/js/services/storageService.js | 12 +++ util/buildExternalServices.js | 4 - 5 files changed, 61 insertions(+), 78 deletions(-) diff --git a/src/js/controllers/bitpayCard.js b/src/js/controllers/bitpayCard.js index 56d6750a8..51a1c1b00 100644 --- a/src/js/controllers/bitpayCard.js +++ b/src/js/controllers/bitpayCard.js @@ -4,7 +4,9 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi var self = this; $scope.dateRange = 'last30Days'; - $scope.network = bitpayCardService.getEnvironment(); + bitpayCardService.getEnvironment(function(err, network) { + $scope.network = network; + }); var getFromCache = function(cb) { bitpayCardService.getBitpayDebitCardsHistory($scope.cardId, function(err, data) { diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js index 996226957..3e8f5cdc9 100644 --- a/src/js/controllers/tab-home.js +++ b/src/js/controllers/tab-home.js @@ -203,11 +203,11 @@ angular.module('copayApp.controllers').controller('tabHomeController', var bitpayCardCache = function() { bitpayCardService.getBitpayDebitCards(function(err, data) { - if (err) return; + if (err || lodash.isEmpty(data)) return; $scope.bitpayCards = data.cards; }); bitpayCardService.getBitpayDebitCardsHistory(null, function(err, data) { - if (err ||  lodash.isEmpty(data)) return; + if (err || lodash.isEmpty(data)) return; $scope.cardsHistory = data; }); }; diff --git a/src/js/services/bitpayCardService.js b/src/js/services/bitpayCardService.js index bd29fa3c6..2ddd97c86 100644 --- a/src/js/services/bitpayCardService.js +++ b/src/js/services/bitpayCardService.js @@ -6,32 +6,38 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http, var bpSession = {}; var pubkey, sin; - var _setCredentials = function() { - if (!$window.externalServices || !$window.externalServices.bitpayCard) { - return; - } - - var bitpayCard = $window.externalServices.bitpayCard; + var _setCredentials = function(cb) { /* * Development: 'testnet' * Production: 'livenet' */ - credentials.NETWORK = 'livenet'; + credentials.NETWORK = 'testnet'; if (credentials.NETWORK == 'testnet') { - credentials.BITPAY_PRIV_KEY = bitpayCard.sandbox.secret; - credentials.BITPAY_API_URL = bitpayCard.sandbox.host; + credentials.BITPAY_API_URL = 'https://gustavo.bp:8088'; } else { - credentials.BITPAY_PRIV_KEY = bitpayCard.production.secret; - credentials.BITPAY_API_URL = bitpayCard.production.host; + credentials.BITPAY_API_URL = 'https://bitpay.com'; } - try { - pubkey = bitauthService.getPublicKeyFromPrivateKey(credentials.BITPAY_PRIV_KEY); - sin = bitauthService.getSinFromPublicKey(pubkey); - } - catch (e) { - $log.error(e); - }; + storageService.getBitpayDebitCardSin(credentials.NETWORK, function(err, data) { + if (err) return cb(err); + if (lodash.isString(data)) { + data = JSON.parse(data); + } + data = data || {}; + if (lodash.isEmpty(data) || (data && !data.priv)) { + data = bitauthService.generateSin(); + } + try { + credentials.BITPAY_PRIV_KEY = data.priv + pubkey = bitauthService.getPublicKeyFromPrivateKey(credentials.BITPAY_PRIV_KEY); + sin = bitauthService.getSinFromPublicKey(pubkey); + storageService.setBitpayDebitCardSin(credentials.NETWORK, JSON.stringify(data), function(err) {}); + } + catch (e) { + $log.error(e); + return cb(e); + }; + }); }; var _setError = function(msg, e) { @@ -41,7 +47,7 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http, }; var _getSession = function(cb) { - _setCredentials(); + _setCredentials(cb); $http({ method: 'GET', url: credentials.BITPAY_API_URL + '/api/session', @@ -50,15 +56,13 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http, } }).then(function(data) { $log.info('BitPay Get Session: SUCCESS'); - bpSession = data.data.data; - return cb(null, bpSession); + return cb(data.data.error, data.data.data); }, function(data) { return cb(_setError('BitPay Card Error: Get Session', data)); }); }; var _getBitPay = function(endpoint) { - _setCredentials(); return { method: 'GET', url: credentials.BITPAY_API_URL + endpoint, @@ -69,33 +73,13 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http, }; }; - var _postBitPay = function(endpoint, data) { - _setCredentials(); - return { - method: 'POST', - url: credentials.BITPAY_API_URL + endpoint, - headers: { - 'Content-Type': 'application/json', - 'x-csrf-token': bpSession.csrfToken - }, - data: data - }; - }; - - root.getEnvironment = function() { - _setCredentials(); - return credentials.NETWORK; - }; - - root.getApiUrl = function() { - _setCredentials(); - return credentials.BITPAY_API_URL; + root.getEnvironment = function(cb) { + _setCredentials(cb); + return cb(null, credentials.NETWORK); }; root.testSession = function(cb) { - _getSession(function(err, session) { - return cb(err, session); - }); + _getSession(cb); }; var _postBitAuth = function(endpoint, data) { @@ -209,6 +193,7 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http, method: 'getInvoiceHistory', params: JSON.stringify(params) }; + _setCredentials(cb); root.getBitpayDebitCards(function(err, data) { var card = lodash.find(data.cards, {id : cardId}); if (!card) return cb(_setError('No card available')); @@ -240,6 +225,7 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http, method: 'generateTopUpInvoice', params: JSON.stringify(params) }; + _setCredentials(cb); root.getBitpayDebitCards(function(err, data) { var card = lodash.find(data.cards, {id : cardId}); if (!card) return cb(_setError('No card available')); @@ -254,6 +240,7 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http, }; root.getInvoice = function(id, cb) { + _setCredentials(cb); $http(_getBitPay('/invoices/' + id)).then(function(data) { $log.info('BitPay Get Invoice: SUCCESS'); return cb(null, data.data.data); @@ -263,7 +250,7 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http, }; root.getBitpayDebitCards = function(cb) { - _setCredentials(); + _setCredentials(cb); storageService.getBitpayDebitCards(credentials.NETWORK, function(err, data) { if (err) return cb(err); if (lodash.isString(data)) { @@ -275,7 +262,7 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http, }; root.setBitpayDebitCards = function(data, cb) { - _setCredentials(); + _setCredentials(cb); data = JSON.stringify(data); storageService.setBitpayDebitCards(credentials.NETWORK, data, function(err) { if (err) return cb(err); @@ -283,16 +270,8 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http, }); }; - root.removeBitpayDebitCards = function(cb) { - _setCredentials(); - storageService.removeBitpayDebitCards(credentials.NETWORK, function(err) { - if (err) return cb(err); - return cb(); - }); - }; - root.getBitpayDebitCardsHistory = function(cardId, cb) { - _setCredentials(); + _setCredentials(cb); storageService.getBitpayDebitCardsHistory(credentials.NETWORK, function(err, data) { if (err) return cb(err); if (lodash.isString(data)) { @@ -305,7 +284,7 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http, }; root.setBitpayDebitCardsHistory = function(cardId, data, opts, cb) { - _setCredentials(); + _setCredentials(cb); storageService.getBitpayDebitCardsHistory(credentials.NETWORK, function(err, oldData) { if (lodash.isString(oldData)) { oldData = JSON.parse(oldData); @@ -326,20 +305,14 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http, }); }; - root.removeBitpayDebitCardsHistory = function(cb) { - _setCredentials(); - storageService.removeBitpayDebitCardsHistory(credentials.NETWORK, function(err) { - if (err) return cb(err); - return cb(); - }); - }; - root.remove = function(cb) { - _setCredentials(); - storageService.removeBitpayDebitCards(credentials.NETWORK, function(err) { - storageService.removeBitpayDebitCardsHistory(credentials.NETWORK, function(err) { - $log.info('BitPay Debit Cards Removed: SUCCESS'); - return cb(); + _setCredentials(cb); + storageService.removeBitpayDebitCardSin(credentials.NETWORK, function(err) { + storageService.removeBitpayDebitCards(credentials.NETWORK, function(err) { + storageService.removeBitpayDebitCardsHistory(credentials.NETWORK, function(err) { + $log.info('BitPay Debit Cards Removed: SUCCESS'); + return cb(); + }); }); }); }; diff --git a/src/js/services/storageService.js b/src/js/services/storageService.js index 1cce7006a..665d895a4 100644 --- a/src/js/services/storageService.js +++ b/src/js/services/storageService.js @@ -349,6 +349,18 @@ angular.module('copayApp.services') storage.remove('bitpayDebitCards-' + network, cb); }; + root.setBitpayDebitCardSin = function(network, data, cb) { + storage.set('bitpayDebitCardSin-' + network, data, cb); + }; + + root.getBitpayDebitCardSin = function(network, cb) { + storage.get('bitpayDebitCardSin-' + network, cb); + }; + + root.removeBitpayDebitCardSin = function(network, cb) { + storage.remove('bitpayDebitCardSin-' + network, cb); + }; + root.removeAllWalletData = function(walletId, cb) { root.clearLastAddress(walletId, function(err) { if (err) return cb(err); diff --git a/util/buildExternalServices.js b/util/buildExternalServices.js index 68a338bad..630d03609 100755 --- a/util/buildExternalServices.js +++ b/util/buildExternalServices.js @@ -24,10 +24,6 @@ if (externalServices.glidera && if (externalServices.glidera && (externalServices.glidera.sandbox.mobile.client_id || externalServices.glidera.sandbox.desktop.client_id)) console.log('Glidera Sandbox Enabled'); -if (externalServices.bitpayCard && externalServices.bitpayCard.production.secret) - console.log('BitPay Card Production Enabled'); -if (externalServices.bitpayCard && externalServices.bitpayCard.sandbox.secret) - console.log('BitPay Card Sandbox Enabled'); var content = 'window.externalServices=' + JSON.stringify(externalServices) + ';'; fs.writeFileSync("./src/js/externalServices.js", content); From 7edf1b28941b224456c37cc368a3e76217b1aab2 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 10 Oct 2016 18:37:07 -0300 Subject: [PATCH 039/110] Fix livenet --- src/js/services/bitpayCardService.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/services/bitpayCardService.js b/src/js/services/bitpayCardService.js index 2ddd97c86..49c9f97a2 100644 --- a/src/js/services/bitpayCardService.js +++ b/src/js/services/bitpayCardService.js @@ -11,9 +11,9 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http, * Development: 'testnet' * Production: 'livenet' */ - credentials.NETWORK = 'testnet'; + credentials.NETWORK = 'livenet'; if (credentials.NETWORK == 'testnet') { - credentials.BITPAY_API_URL = 'https://gustavo.bp:8088'; + credentials.BITPAY_API_URL = 'https://test.bitpay.com'; } else { credentials.BITPAY_API_URL = 'https://bitpay.com'; From 756e1aa48990defe45f962b25c9c9dd7a2f38cfd Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 11 Oct 2016 10:50:43 -0300 Subject: [PATCH 040/110] Adds node-webkit support to package.json, icons/favicon. Fix setup-win syntax. Adds new constants to templates --- app-template/apply.js | 1 + app-template/bitpay/appConfig.json | 3 +- app-template/bitpay/img/favicon.ico | Bin 0 -> 1150 bytes app-template/bitpay/img/icon-128.png | Bin 0 -> 10158 bytes app-template/copay/appConfig.json | 5 ++- app-template/copay/img/favicon.ico | Bin 0 -> 5430 bytes app-template/copay/img/icon-128.png | Bin 0 -> 5774 bytes app-template/package.json | 55 ++++++++++++++++++--------- app-template/setup-win.iss | 2 +- package.json | 35 ++++++++++++++--- webkitbuilds/setup-win.iss | 2 +- www/img/favicon.ico | Bin 5430 -> 1150 bytes www/img/icon-128.png | Bin 0 -> 10158 bytes 13 files changed, 75 insertions(+), 28 deletions(-) create mode 100644 app-template/bitpay/img/favicon.ico create mode 100644 app-template/bitpay/img/icon-128.png create mode 100644 app-template/copay/img/favicon.ico create mode 100644 app-template/copay/img/icon-128.png create mode 100644 www/img/icon-128.png diff --git a/app-template/apply.js b/app-template/apply.js index 14fdaab57..7ecad93d8 100755 --- a/app-template/apply.js +++ b/app-template/apply.js @@ -5,6 +5,7 @@ // var templates = { + 'package.json': '/', 'Makefile': 'cordova/', 'ProjectMakefile': 'cordova/', 'config-template.xml': '/', diff --git a/app-template/bitpay/appConfig.json b/app-template/bitpay/appConfig.json index 79eb58f52..54faf2203 100644 --- a/app-template/bitpay/appConfig.json +++ b/app-template/bitpay/appConfig.json @@ -5,12 +5,13 @@ "purposeLine": "Secure Bitcoin Wallet", "bundleName": "wallet", "appUri": "bitpay", - "name": "bitpay", "nameNoSpace": "bitpay", "nameCase": "BitPay", "nameCaseNoSpace": "BitPay", "gitHubRepoName": "bitpay-wallet", + "gitHubRepoUrl": "git://github.com/bitpay/bitpay-wallet.git", + "gitHubRepoBugs": "https://github.com/bitpay/bitpay-wallet/issues", "disclaimerUrl": "", "url": "https://bitpay.com", "appDescription": "Secure Bitcoin Wallet", diff --git a/app-template/bitpay/img/favicon.ico b/app-template/bitpay/img/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..166c0bcaf2ec99ad1d4623170ab46258b1195974 GIT binary patch literal 1150 zcmbW1TS${(7{}irlxF7K;oEuclsa|O5VHFqh>f=4OmQA!Ni3&>38ki{h8+mfE{ZZD zFQRS=x(rgh>Zb0x3+tu>ofga>!^r&ieDCM0bIhB*@%!HQd7j_@J6(*iUG!6{8J!(0 zv70f8F;-1bi#kf57RG3%Em7b#odQ-3@(J2B2->s?1?IVah`cQ{2v_J3vQySvhM;L5 z!nBV#q#TEQ>WNHqg%*OSLyu#oQiLsPbo)K%^0^VBYaG=SA?nnVr`vQzrq!W?OqA!aVYtHo#ho|ldX5mqrgy>o-tv*`rdq+;|`nKv`1Dh&`MycWc0 z{^-gi_a9CU;|ODTGJRR8Cx-Z3_C%()$_PP{`f=-C%ydM!pZV|(3v;)T{rrj7)6|b! zOCftAld3kMe}k0QjHE}8p(Za@HopI#->dk$wuXhfH__|XLUwX9=^8U~8K||O&smN) zFP`&zUT+Oxu+fb^S2@yN(>7PmogrUA*$?{dNLouUe``j0=d($iHWp#H!LiK~x#2ns zayeIT$AC+X*)IA9>+5*=_yN++GK^3^*Ax3uzZLn6`E3}fHQ~a+{kVF#5u?5>XDrX3 nsJEdIlMQx^`^*@tF%+DO%oKS$aq&O}WTqNyJ38Wj;D6VDcXRkY literal 0 HcmV?d00001 diff --git a/app-template/bitpay/img/icon-128.png b/app-template/bitpay/img/icon-128.png new file mode 100644 index 0000000000000000000000000000000000000000..6958667cdab43fc831fa2c55d636159a7a7fe4f0 GIT binary patch literal 10158 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 QFg=d`B5*SiW-Y`12P0^O!~g&Q literal 0 HcmV?d00001 diff --git a/app-template/copay/img/icon-128.png b/app-template/copay/img/icon-128.png new file mode 100644 index 0000000000000000000000000000000000000000..8624a018909ba87207259a38c979d01c7f716650 GIT binary patch literal 5774 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 literal 5430 zcmd5=|5H>|6n|#FHshbLKQ&Ed+1IK35`G^;16^1cLNpNqOB0t6#}Hca3(6M}kS`&K z8U!U@hE_Hc!hr_FZzPlsXdtF2nLrA`B7C~%(lXEY-oAai!q%C&``$h8obx&N+AUHRC5U-gAt{UYW!=pFISD@ul?s?B}O@&wJ6t zS`TZ`*htnS($%Ubm6PG7?2JZMk_o1$aBK|ng8$Mtr8?ri%;(k1=O8L90EuytD9B94 z$*V;-5BDBw7oIdA8SO2?_xz6dvQ9Nm5jgodXW$l0b_^(*(vd` zlow;e2g^0t>F>Lb!rZjSWGMzURpp2b^?!^n^mEXwtQX7BV z?M8maenq)p{X#{)*oL{Z5SN;MawsR(5x!pzRV{JYyAqoNn_+}pKMw<2E!7&!N&Ux`(~a3OnW|>36p%Fal0AY=98IYkH_4` zbL&$y-zvB>L3?b9=7!c=TZB8B}$HFBV%7I;*6m@e;XFP z=Bj_H*yNYrk~esMIJoC?6y;^0`eYd{UpR~ITU{6#vGTk=Ha3RdKkuRK*UPA{v7oFd zA2}(z5Fh<9{1(6Ns&5YUR(iYy%KgzB0+D2j!m;cFuv8S|LSr4eI<8@GU;w+fZFFcy zE&l(PZ(G?I>CVu4=^Tr53!8&Rc5Z%)^n@K)>+Lb6V=ODmcL^r}oo zs-w04^Z5pjPis8Xute4Fmi4}TUtDc%W@r4{s_++2%+IPEuf1>e|9m=~z z9qo#DELHn-x6(RRdvdhDh=zxTCUsrg!;|tUui7YfOUM(CM{3_upVr`m{yy$P?Wsz) zUJNf&brrghxhCl#AN)GNv;>1pMeJ_`rs zK%!*RR+;@k&)Gaa^qu4?iVHwKX|=CKj_M>L+6&u036k4pc;Nx>q2*!|m&;`Jx)!_6 z$P^#RUi4cd6E)`KB|M z{!^g&XgG5k`G*pbx_diLn@e%~<_&f?^>l>KYa(ajFO~IK_zJdfT8o?myLcU)pOJ_! zB0qwDzNWKpydGmQmD+Vj-&PAUEO*v^wz2a1i)z6Cvi>A|B2g{quqJYGZm8Cg)!(&( QFg=d`B5*SiW-Y`12P0^O!~g&Q diff --git a/www/img/icon-128.png b/www/img/icon-128.png new file mode 100644 index 0000000000000000000000000000000000000000..6958667cdab43fc831fa2c55d636159a7a7fe4f0 GIT binary patch literal 10158 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 Date: Tue, 11 Oct 2016 14:50:35 -0300 Subject: [PATCH 041/110] New pairing request --- src/js/controllers/bitpayCard.js | 8 +- src/js/controllers/bitpayCardIntro.js | 23 +-- src/js/services/bitpayCardService.js | 266 +++++++++++--------------- src/js/services/storageService.js | 12 +- 4 files changed, 130 insertions(+), 179 deletions(-) diff --git a/src/js/controllers/bitpayCard.js b/src/js/controllers/bitpayCard.js index 51a1c1b00..97f1ef402 100644 --- a/src/js/controllers/bitpayCard.js +++ b/src/js/controllers/bitpayCard.js @@ -4,9 +4,7 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi var self = this; $scope.dateRange = 'last30Days'; - bitpayCardService.getEnvironment(function(err, network) { - $scope.network = network; - }); + $scope.network = bitpayCardService.getEnvironment(); var getFromCache = function(cb) { bitpayCardService.getBitpayDebitCardsHistory($scope.cardId, function(err, data) { @@ -49,8 +47,8 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi $scope.loadingHistory = true; bitpayCardService.getHistory($scope.cardId, dateRange, function(err, history) { $scope.loadingHistory = false; - if (err || history.error) { - $log.error(err || history.error); + if (err) { + $log.error(err); $scope.error = gettextCatalog.getString('Could not get transactions'); return; } diff --git a/src/js/controllers/bitpayCardIntro.js b/src/js/controllers/bitpayCardIntro.js index 4fc4589be..f56f0360c 100644 --- a/src/js/controllers/bitpayCardIntro.js +++ b/src/js/controllers/bitpayCardIntro.js @@ -42,31 +42,22 @@ angular.module('copayApp.controllers').controller('bitpayCardIntroController', f disableAnimate: true }); $state.go('tabs.home'); + if (data.cards[0]) { + $timeout(function() { + $state.transitionTo('tabs.bitpayCard', {id: data.cards[0].id}); + }, 100); + } }); } }); }); }); } else { - // TEST TODO - bitpayCardService.testSession(function(err, session) { + bitpayCardService.getCredentials(function(err, credentials) { if (err) popupService.showAlert(null, err); + else $log.info('BitPay Debit Card Credentials: Ok.'); }); } - - /* - storageService.getNextStep('BitpayCard', function(err, value) { - if (value) { - $ionicHistory.nextViewOptions({ - disableAnimate: true - }); - $state.go('tabs.home'); - $timeout(function() { - $state.transitionTo('tabs.bitpayCard'); - }, 100); - } - }); - */ }); $scope.orderBitPayCard = function() { diff --git a/src/js/services/bitpayCardService.js b/src/js/services/bitpayCardService.js index 49c9f97a2..36b8f97ad 100644 --- a/src/js/services/bitpayCardService.js +++ b/src/js/services/bitpayCardService.js @@ -2,41 +2,32 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http, $log, $window, lodash, storageService, bitauthService, platformInfo) { var root = {}; - var credentials = {}; - var bpSession = {}; - var pubkey, sin; + var BITPAY_CARD_NETWORK = 'livenet'; + var BITPAY_CARD_API_URL = BITPAY_CARD_NETWORK == 'livenet' ? 'https://bitpay.com' : 'https://test.bitpay.com'; - var _setCredentials = function(cb) { - /* - * Development: 'testnet' - * Production: 'livenet' - */ - credentials.NETWORK = 'livenet'; - if (credentials.NETWORK == 'testnet') { - credentials.BITPAY_API_URL = 'https://test.bitpay.com'; - } - else { - credentials.BITPAY_API_URL = 'https://bitpay.com'; - } - storageService.getBitpayDebitCardSin(credentials.NETWORK, function(err, data) { + var _getCredentials = function(cb) { + var pubkey, sin, isNew; + storageService.getBitpayCardCredentials(BITPAY_CARD_NETWORK, function(err, data) { if (err) return cb(err); if (lodash.isString(data)) { data = JSON.parse(data); } - data = data || {}; - if (lodash.isEmpty(data) || (data && !data.priv)) { - data = bitauthService.generateSin(); + var credentials = data || {}; + if (lodash.isEmpty(credentials) || (credentials && !credentials.priv)) { + isNew = true; + credentials = bitauthService.generateSin(); } try { - credentials.BITPAY_PRIV_KEY = data.priv - pubkey = bitauthService.getPublicKeyFromPrivateKey(credentials.BITPAY_PRIV_KEY); + pubkey = bitauthService.getPublicKeyFromPrivateKey(credentials.priv); sin = bitauthService.getSinFromPublicKey(pubkey); - storageService.setBitpayDebitCardSin(credentials.NETWORK, JSON.stringify(data), function(err) {}); + if (isNew) + storageService.setBitpayCardCredentials(BITPAY_CARD_NETWORK, JSON.stringify(credentials), function(err) {}); } catch (e) { $log.error(e); return cb(e); }; + return cb(null, credentials); }); }; @@ -46,74 +37,48 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http, return error; }; - var _getSession = function(cb) { - _setCredentials(cb); - $http({ + var _get = function(endpoint) { + return { method: 'GET', - url: credentials.BITPAY_API_URL + '/api/session', + url: BITPAY_CARD_API_URL + endpoint, headers: { 'content-type': 'application/json' } - }).then(function(data) { - $log.info('BitPay Get Session: SUCCESS'); - return cb(data.data.error, data.data.data); - }, function(data) { - return cb(_setError('BitPay Card Error: Get Session', data)); - }); - }; - - var _getBitPay = function(endpoint) { - return { - method: 'GET', - url: credentials.BITPAY_API_URL + endpoint, - headers: { - 'content-type': 'application/json', - 'x-csrf-token': bpSession.csrfToken - } }; }; - root.getEnvironment = function(cb) { - _setCredentials(cb); - return cb(null, credentials.NETWORK); - }; - root.testSession = function(cb) { - _getSession(cb); - }; - - var _postBitAuth = function(endpoint, data) { - var dataToSign = credentials.BITPAY_API_URL + endpoint + JSON.stringify(data); - var signedData = bitauthService.sign(dataToSign, credentials.BITPAY_PRIV_KEY); + var _post = function(endpoint, json, credentials) { + var dataToSign = BITPAY_CARD_API_URL + endpoint + JSON.stringify(json); + var signedData = bitauthService.sign(dataToSign, credentials.priv); return { method: 'POST', - url: credentials.BITPAY_API_URL + endpoint, + url: BITPAY_CARD_API_URL + endpoint, headers: { 'content-type': 'application/json', - 'x-identity': pubkey, + 'x-identity': credentials.pub, 'x-signature': signedData }, - data: data + data: json }; }; - var _afterBitAuthSuccess = function(obj, cb) { - var data = { + var _afterBitAuthSuccess = function(obj, credentials, cb) { + var json = { method: 'getTokens' }; // Get tokens - $http(_postBitAuth('/api/v2/', data)).then(function(data) { + $http(_post('/api/v2/', json, credentials)).then(function(data) { $log.info('BitPay Get Tokens: SUCCESS'); var token = lodash.find(data.data.data, 'visaUser'); if (lodash.isEmpty(token)) return cb(_setError('No token for visaUser')); token = token.visaUser; - data['method'] = 'getDebitCards'; + json['method'] = 'getDebitCards'; // Get Debit Cards - $http(_postBitAuth('/api/v2/' + token, data)).then(function(data) { + $http(_post('/api/v2/' + token, json, credentials)).then(function(data) { $log.info('BitPay Get Debit Cards: SUCCESS'); - var cards = data.data.data; - return cb(null, {token: token, cards: cards, email: obj.email}); + return cb(data.data.error, {token: token, cards: data.data.data, email: obj.email}); }, function(data) { return cb(_setError('BitPay Card Error: Get Debit Cards', data)); }); @@ -122,46 +87,6 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http, }); }; - root.bitAuthPair = function(obj, cb) { - _getSession(function(err, session) { - if (err) return cb(err); - var deviceName = 'Unknow device'; - if (platformInfo.isNW) { - deviceName = require('os').platform(); - } else if (platformInfo.isCordova) { - deviceName = device.model; - } - var userData = { - csrf: session.csrfToken, - secret: obj.secret, - deviceName: deviceName, - code: obj.otp - }; - - var dataToSign = credentials.BITPAY_API_URL + '/api/validateBitAuthPairingCode' + JSON.stringify(userData); - var signedData = bitauthService.sign(dataToSign, credentials.BITPAY_PRIV_KEY); - - $http({ - method: 'POST', - url: credentials.BITPAY_API_URL + '/api/validateBitAuthPairingCode', - headers: { - 'content-type': 'application/json', - 'x-csrf-token': session.csrfToken, - 'x-identity': pubkey, - 'x-signature': signedData - }, - data: userData - }).then(function(data) { - $log.info('BitPay Card BitAuth: SUCCESS'); - // Get cards - _afterBitAuthSuccess(obj, cb); - }, function(data) { - return cb(_setError('BitPay Card Error: BitAuth', data)); - }); - - }); - }; - var _processTransactions = function(invoices, history) { invoices = invoices || []; for (var i = 0; i < invoices.length; i++) { @@ -186,72 +111,113 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http, return history; }; + root.getEnvironment = function() { + return BITPAY_CARD_NETWORK; + }; + + root.getCredentials = function(cb) { + _getCredentials(function(err, credentials) { + return cb(err, credentials); + }); + }; + + root.bitAuthPair = function(obj, cb) { + var deviceName = 'Unknow device'; + if (platformInfo.isNW) { + deviceName = require('os').platform(); + } else if (platformInfo.isCordova) { + deviceName = device.model; + } + var json = { + method: 'registerSinWithSecret', + params: { + secret: obj.secret, + deviceName: deviceName, + code: obj.otp + } + }; + _getCredentials(function(err, credentials) { + if (err) return cb(err); + $http(_post('/api/v2/', json, credentials)).then(function(data) { + $log.info('BitPay Card BitAuth: SUCCESS'); + _afterBitAuthSuccess(obj, credentials, cb); + }, function(data) { + return cb(_setError('BitPay Card Error: BitAuth', data)); + }); + }); + }; + root.getHistory = function(cardId, params, cb) { + var invoices, transactions; params = params || {}; - var json = {}; - json = { + var json = { method: 'getInvoiceHistory', params: JSON.stringify(params) }; - _setCredentials(cb); - root.getBitpayDebitCards(function(err, data) { - var card = lodash.find(data.cards, {id : cardId}); - if (!card) return cb(_setError('No card available')); - // Get invoices - $http(_postBitAuth('/api/v2/' + card.token, json)).then(function(data) { - $log.info('BitPay Get Invoices: SUCCESS'); - var invoices = data.data.data; - json = { - method: 'getTransactionHistory', - params: JSON.stringify(params) - }; - // Get transactions list - $http(_postBitAuth('/api/v2/' + card.token, json)).then(function(data) { - $log.info('BitPay Get Transactions: SUCCESS'); - var history = data.data.data || data.data; - history['txs'] = _processTransactions(invoices, history.transactionList); - return cb(null, history); + _getCredentials(function(err, credentials) { + if (err) return cb(err); + root.getBitpayDebitCards(function(err, data) { + if (err) return cb(err); + var card = lodash.find(data.cards, {id : cardId}); + if (!card) return cb(_setError('Not card found')); + // Get invoices + $http(_post('/api/v2/' + card.token, json, credentials)).then(function(data) { + $log.info('BitPay Get Invoices: SUCCESS'); + invoices = data.data.data; + if (lodash.isEmpty(invoices)) $log.info('No invoices'); + json = { + method: 'getTransactionHistory', + params: JSON.stringify(params) + }; + // Get transactions list + $http(_post('/api/v2/' + card.token, json, credentials)).then(function(data) { + $log.info('BitPay Get Transactions: SUCCESS'); + transactions = data.data.data || {}; + transactions['txs'] = _processTransactions(invoices, transactions.transactionList); + return cb(data.data.error, transactions); + }, function(data) { + return cb(_setError('BitPay Card Error: Get Transactions', data)); + }); }, function(data) { - return cb(_setError('BitPay Card Error: Get Transactions', data)); + return cb(_setError('BitPay Card Error: Get Invoices', data)); }); - }, function(data) { - return cb(_setError('BitPay Card Error: Get Invoices', data)); }); }); }; root.topUp = function(cardId, params, cb) { + params = params || {}; var json = { method: 'generateTopUpInvoice', params: JSON.stringify(params) }; - _setCredentials(cb); - root.getBitpayDebitCards(function(err, data) { - var card = lodash.find(data.cards, {id : cardId}); - if (!card) return cb(_setError('No card available')); - $http(_postBitAuth('/api/v2/' + card.token, json)).then(function(data) { - $log.info('BitPay TopUp: SUCCESS'); - var invoiceId = data.data.data.invoice; - return cb(null, invoiceId); - }, function(data) { - return cb(_setError('BitPay Card Error: TopUp', data)); + _getCredentials(function(err, credentials) { + if (err) return cb(err); + root.getBitpayDebitCards(function(err, data) { + if (err) return cb(err); + var card = lodash.find(data.cards, {id : cardId}); + if (!card) return cb(_setError('Not card found')); + $http(_post('/api/v2/' + card.token, json, credentials)).then(function(data) { + $log.info('BitPay TopUp: SUCCESS'); + return cb(data.data.error, data.data.data.invoice); + }, function(data) { + return cb(_setError('BitPay Card Error: TopUp', data)); + }); }); }); }; root.getInvoice = function(id, cb) { - _setCredentials(cb); - $http(_getBitPay('/invoices/' + id)).then(function(data) { + $http(_get('/invoices/' + id)).then(function(data) { $log.info('BitPay Get Invoice: SUCCESS'); - return cb(null, data.data.data); + return cb(data.data.error, data.data.data); }, function(data) { return cb(_setError('BitPay Card Error: Get Invoice', data)); }); }; root.getBitpayDebitCards = function(cb) { - _setCredentials(cb); - storageService.getBitpayDebitCards(credentials.NETWORK, function(err, data) { + storageService.getBitpayDebitCards(BITPAY_CARD_NETWORK, function(err, data) { if (err) return cb(err); if (lodash.isString(data)) { data = JSON.parse(data); @@ -262,17 +228,15 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http, }; root.setBitpayDebitCards = function(data, cb) { - _setCredentials(cb); data = JSON.stringify(data); - storageService.setBitpayDebitCards(credentials.NETWORK, data, function(err) { + storageService.setBitpayDebitCards(BITPAY_CARD_NETWORK, data, function(err) { if (err) return cb(err); return cb(); }); }; root.getBitpayDebitCardsHistory = function(cardId, cb) { - _setCredentials(cb); - storageService.getBitpayDebitCardsHistory(credentials.NETWORK, function(err, data) { + storageService.getBitpayDebitCardsHistory(BITPAY_CARD_NETWORK, function(err, data) { if (err) return cb(err); if (lodash.isString(data)) { data = JSON.parse(data); @@ -284,8 +248,7 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http, }; root.setBitpayDebitCardsHistory = function(cardId, data, opts, cb) { - _setCredentials(cb); - storageService.getBitpayDebitCardsHistory(credentials.NETWORK, function(err, oldData) { + storageService.getBitpayDebitCardsHistory(BITPAY_CARD_NETWORK, function(err, oldData) { if (lodash.isString(oldData)) { oldData = JSON.parse(oldData); } @@ -299,17 +262,16 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http, } inv = JSON.stringify(inv); - storageService.setBitpayDebitCardsHistory(credentials.NETWORK, inv, function(err) { + storageService.setBitpayDebitCardsHistory(BITPAY_CARD_NETWORK, inv, function(err) { return cb(err); }); }); }; root.remove = function(cb) { - _setCredentials(cb); - storageService.removeBitpayDebitCardSin(credentials.NETWORK, function(err) { - storageService.removeBitpayDebitCards(credentials.NETWORK, function(err) { - storageService.removeBitpayDebitCardsHistory(credentials.NETWORK, function(err) { + storageService.removeBitpayCardCredentials(BITPAY_CARD_NETWORK, function(err) { + storageService.removeBitpayDebitCards(BITPAY_CARD_NETWORK, function(err) { + storageService.removeBitpayDebitCardsHistory(BITPAY_CARD_NETWORK, function(err) { $log.info('BitPay Debit Cards Removed: SUCCESS'); return cb(); }); diff --git a/src/js/services/storageService.js b/src/js/services/storageService.js index 665d895a4..60f01a3c8 100644 --- a/src/js/services/storageService.js +++ b/src/js/services/storageService.js @@ -349,16 +349,16 @@ angular.module('copayApp.services') storage.remove('bitpayDebitCards-' + network, cb); }; - root.setBitpayDebitCardSin = function(network, data, cb) { - storage.set('bitpayDebitCardSin-' + network, data, cb); + root.setBitpayCardCredentials = function(network, data, cb) { + storage.set('bitpayCardCredentials-' + network, data, cb); }; - root.getBitpayDebitCardSin = function(network, cb) { - storage.get('bitpayDebitCardSin-' + network, cb); + root.getBitpayCardCredentials = function(network, cb) { + storage.get('bitpayCardCredentials-' + network, cb); }; - root.removeBitpayDebitCardSin = function(network, cb) { - storage.remove('bitpayDebitCardSin-' + network, cb); + root.removeBitpayCardCredentials = function(network, cb) { + storage.remove('bitpayCardCredentials-' + network, cb); }; root.removeAllWalletData = function(walletId, cb) { From bb6b11be783c70a8002a8f1247d0025316edf180 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 11 Oct 2016 17:07:02 -0300 Subject: [PATCH 042/110] Updates package.json --- app-template/package.json | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app-template/package.json b/app-template/package.json index 6b1c77033..a81a37f6d 100644 --- a/app-template/package.json +++ b/app-template/package.json @@ -45,6 +45,7 @@ "adm-zip": "^0.4.7", "angular": "1.4.6", "angular-mocks": "1.4.10", + "bezier-easing": "^2.0.3", "bhttp": "^1.2.1", "bitauth": "^0.3.2", "bitcore-wallet-client": "4.2.1", diff --git a/package.json b/package.json index b9099cefa..fd30b3f2e 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "//":" Modify it at app-template/", "name": "bitpay", - "description": "Secure Bitcoin Storage", + "description": "Secure Bitcoin Wallet", "author": "BitPay", "version": "0.14.0", "keywords": [ From 95c0371f9b9ee0021f6e2c015f69c4a5722d743f Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 12 Oct 2016 09:38:41 -0300 Subject: [PATCH 043/110] Ref and clean code --- src/js/controllers/bitpayCard.js | 2 +- src/js/controllers/bitpayCardIntro.js | 11 ++++--- src/js/services/bitpayCardService.js | 2 +- src/js/services/incomingData.js | 42 +++++++++++---------------- 4 files changed, 24 insertions(+), 33 deletions(-) diff --git a/src/js/controllers/bitpayCard.js b/src/js/controllers/bitpayCard.js index 97f1ef402..80d15b697 100644 --- a/src/js/controllers/bitpayCard.js +++ b/src/js/controllers/bitpayCard.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('bitpayCardController', function($scope, $timeout, $log, $state, lodash, bitpayCardService, configService, profileService, walletService, ongoingProcess, moment, popupService, gettextCatalog, bwcError, $ionicHistory) { +angular.module('copayApp.controllers').controller('bitpayCardController', function($scope, $timeout, $log, $state, lodash, bitpayCardService, moment, popupService, gettextCatalog, $ionicHistory) { var self = this; $scope.dateRange = 'last30Days'; diff --git a/src/js/controllers/bitpayCardIntro.js b/src/js/controllers/bitpayCardIntro.js index f56f0360c..e2a6dd533 100644 --- a/src/js/controllers/bitpayCardIntro.js +++ b/src/js/controllers/bitpayCardIntro.js @@ -1,5 +1,5 @@ 'use strict'; -angular.module('copayApp.controllers').controller('bitpayCardIntroController', function($scope, $log, $state, $timeout, $ionicHistory, storageService, externalLinkService, bitpayCardService, gettextCatalog, popupService) { +angular.module('copayApp.controllers').controller('bitpayCardIntroController', function($scope, $log, $state, $ionicHistory, storageService, externalLinkService, bitpayCardService, gettextCatalog, popupService) { var checkOtp = function(obj, cb) { if (obj.otp) { @@ -41,12 +41,11 @@ angular.module('copayApp.controllers').controller('bitpayCardIntroController', f $ionicHistory.nextViewOptions({ disableAnimate: true }); - $state.go('tabs.home'); - if (data.cards[0]) { - $timeout(function() { + $state.go('tabs.home').then(function() { + if (data.cards[0]) { $state.transitionTo('tabs.bitpayCard', {id: data.cards[0].id}); - }, 100); - } + } + }); }); } }); diff --git a/src/js/services/bitpayCardService.js b/src/js/services/bitpayCardService.js index 36b8f97ad..4b5c5b96f 100644 --- a/src/js/services/bitpayCardService.js +++ b/src/js/services/bitpayCardService.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.services').factory('bitpayCardService', function($http, $log, $window, lodash, storageService, bitauthService, platformInfo) { +angular.module('copayApp.services').factory('bitpayCardService', function($http, $log, lodash, storageService, bitauthService, platformInfo) { var root = {}; var BITPAY_CARD_NETWORK = 'livenet'; var BITPAY_CARD_API_URL = BITPAY_CARD_NETWORK == 'livenet' ? 'https://bitpay.com' : 'https://test.bitpay.com'; diff --git a/src/js/services/incomingData.js b/src/js/services/incomingData.js index c48157052..bb0f3a66d 100644 --- a/src/js/services/incomingData.js +++ b/src/js/services/incomingData.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.services').factory('incomingData', function($log, $ionicModal, $state, $window, $timeout, bitcore, lodash) { +angular.module('copayApp.services').factory('incomingData', function($log, $state, $window, bitcore, lodash) { var root = {}; @@ -45,10 +45,9 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni // data extensions for Payment Protocol with non-backwards-compatible request if ((/^bitcoin:\?r=[\w+]/).exec(data)) { data = decodeURIComponent(data.replace('bitcoin:?r=', '')); - $state.go('tabs.send'); - $timeout(function() { + $state.go('tabs.send').then(function() { $state.transitionTo('tabs.send.confirm', {paypro: data}); - }, 100); + }); return true; } @@ -63,8 +62,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni var amount = parsed.amount ? parsed.amount : ''; - $state.go('tabs.send'); - $timeout(function() { + $state.go('tabs.send').then(function() { if (parsed.r) { $state.transitionTo('tabs.send.confirm', {paypro: parsed.r}); } else { @@ -74,31 +72,28 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni $state.transitionTo('tabs.send.amount', {toAddress: addr}); } } - }, 100); + }); return true; // Plain URL } else if (/^https?:\/\//.test(data)) { var currentState = $state.current.name; if (lodash.indexOf(ignoreState, currentState) != -1) return false; - $state.go('tabs.send'); - $timeout(function() { + $state.go('tabs.send').then(function() { $state.transitionTo('tabs.send.confirm', {paypro: data}); - }, 100); + }); return true; // Plain Address } else if (bitcore.Address.isValid(data, 'livenet')) { - $state.go('tabs.send'); - $timeout(function() { + $state.go('tabs.send').then(function() { $state.transitionTo('tabs.send.amount', {toAddress: data}); - }, 100); + }); return true; } else if (bitcore.Address.isValid(data, 'testnet')) { - $state.go('tabs.send'); - $timeout(function() { + $state.go('tabs.send').then(function() { $state.transitionTo('tabs.send.amount', {toAddress: data}); - }, 100); + }); return true; // Protocol @@ -112,30 +107,27 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni var secret = getParameterByName('secret', data); var email = getParameterByName('email', data); var otp = getParameterByName('otp', data); - $state.go('tabs.home'); - $timeout(function() { + $state.go('tabs.home').then(function() { $state.transitionTo('tabs.bitpayCardIntro', { secret: secret, email: email, otp: otp }); - }, 100); + }); return true; // Join } else if (data && data.match(/^copay:[0-9A-HJ-NP-Za-km-z]{70,80}$/)) { - $state.go('tabs.home'); - $timeout(function() { + $state.go('tabs.home').then(function() { $state.transitionTo('tabs.add.join', {url: data}); - }, 100); + }); return true; // Old join } else if (data && data.match(/^[0-9A-HJ-NP-Za-km-z]{70,80}$/)) { - $state.go('tabs.home'); - $timeout(function() { + $state.go('tabs.home').then(function() { $state.transitionTo('tabs.add.join', {url: data}); - }, 100); + }); return true; } From 4ef66f65160c350b07bf023786a6aa46100360b1 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 12 Oct 2016 11:58:24 -0300 Subject: [PATCH 044/110] Updates package.json --- app-template/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-template/package.json b/app-template/package.json index a81a37f6d..ce57f4461 100644 --- a/app-template/package.json +++ b/app-template/package.json @@ -48,7 +48,7 @@ "bezier-easing": "^2.0.3", "bhttp": "^1.2.1", "bitauth": "^0.3.2", - "bitcore-wallet-client": "4.2.1", + "bitcore-wallet-client": "4.3.1", "bower": "^1.7.9", "chai": "^3.5.0", "cordova": "5.4.1", From b2086701d801707be4a186bf6cc9331244a2d661 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 12 Oct 2016 12:00:35 -0300 Subject: [PATCH 045/110] Not necessary anymore --- src/js/services/incomingData.js | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/js/services/incomingData.js b/src/js/services/incomingData.js index bb0f3a66d..b157704b8 100644 --- a/src/js/services/incomingData.js +++ b/src/js/services/incomingData.js @@ -4,15 +4,6 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat var root = {}; - var ignoreState = [ - 'tabs.language', - 'tabs.about.translators', - 'tabs.bitpayCardIntro', - 'tabs.buyandsell.glidera', - 'tabs.giftcards.amazon', - 'tabs.giftcards.amazon.buy' - ]; - root.redir = function(data) { $log.debug('Processing incoming data:' +data); @@ -77,8 +68,6 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat // Plain URL } else if (/^https?:\/\//.test(data)) { - var currentState = $state.current.name; - if (lodash.indexOf(ignoreState, currentState) != -1) return false; $state.go('tabs.send').then(function() { $state.transitionTo('tabs.send.confirm', {paypro: data}); }); From 9b32e50bb0d449561dd2dc8732cd84bb5aa5215f Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 12 Oct 2016 15:32:05 -0300 Subject: [PATCH 046/110] Updates bitauth pairing. Updates package.json --- app-template/package.json | 10 ++++------ src/js/services/bitpayCardService.js | 3 ++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app-template/package.json b/app-template/package.json index ce57f4461..6f535b9d5 100644 --- a/app-template/package.json +++ b/app-template/package.json @@ -51,8 +51,8 @@ "bitcore-wallet-client": "4.3.1", "bower": "^1.7.9", "chai": "^3.5.0", - "cordova": "5.4.1", "cordova-android": "5.1.1", + "cordova-custom-config": "^3.0.5", "cordova-plugin-qrscanner": "^2.3.1", "coveralls": "^2.11.9", "express": "^4.11.2", @@ -112,12 +112,10 @@ "clean-all": "git clean -dfx && npm install" }, "devDependencies": { - "androidmanifest": "^2.0.0", - "cordova": "^5.4.1", - "globby": "^6.0.0", + "cordova": "^6.3.1", + "grunt": "^1.0.1", "ionic": "^2.1.0", - "plist": "^2.0.1", "trash-cli": "^1.4.0", - "xcode": "^0.8.2" + "lodash": "^4.3.0" } } diff --git a/src/js/services/bitpayCardService.js b/src/js/services/bitpayCardService.js index 4b5c5b96f..b0f9c5882 100644 --- a/src/js/services/bitpayCardService.js +++ b/src/js/services/bitpayCardService.js @@ -129,9 +129,10 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http, deviceName = device.model; } var json = { - method: 'registerSinWithSecret', + method: 'createToken', params: { secret: obj.secret, + version: 2, deviceName: deviceName, code: obj.otp } From 8ee033436f696381ed13d5c2838a5fb5af3a66be Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 13 Oct 2016 14:41:37 -0300 Subject: [PATCH 047/110] Fix conflict --- www/views/confirm.html | 5 +-- www/views/tab-home.html | 68 ++++++++++++++++++++--------------------- 2 files changed, 37 insertions(+), 36 deletions(-) diff --git a/www/views/confirm.html b/www/views/confirm.html index 9886ca270..531a397b5 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -23,17 +23,18 @@
        To - + +
        {{toName}} + {{toAddress}}
        {{_paypro.domain}}
        - {{toAddress}}         diff --git a/www/views/tab-home.html b/www/views/tab-home.html index e1754c82e..0a0aa9233 100644 --- a/www/views/tab-home.html +++ b/www/views/tab-home.html @@ -78,41 +78,41 @@ {{wallet.m}}-of-{{wallet.n}} - +

        + + Incomplete + + + {{wallet.status.availableBalanceStr}} + [Balance Hidden] + +   +

        + +         -

        - - Incomplete - - - {{wallet.status.availableBalanceStr}} - [Balance Hidden] - -   -

        - - - - -
        -         -

        BitPay Visa® Card

        -

        {{cardsHistory[card.id].balance ? '$' + cardsHistory[card.id].balance : 'Add funds to get started'|translate}}

        - -         - - -
        -         -

        BitPay Visa® Card

        -

        Add your cards

        - -         + + +
        +         +

        BitPay Visa® Card

        +

        {{cardsHistory[card.id].balance ? '$' + cardsHistory[card.id].balance : 'Add funds to get started'|translate}}

        + +         + + +
        +         +

        BitPay Visa® Card

        +

        Add your cards

        + +         +