Merging small fixes + blind sig attack

tezbox · Jan 16, 2019 · f04a150 · f04a150
1 parent 49e2daf
commit f04a150
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/app/app/controllers.js b/app/app/controllers.js
@@ -188,16 +188,16 @@ app
   }
   var refreshTransactions = function(){
     var maxTxs = 20;
-    $http.get("https://api4.tzscan.io/v1/operations/"+$scope.accounts[$scope.account].address+"?type=Transaction&p=0&number="+ (maxTxs+1)).then(function(r){
+    $http.get("https://api1.tzscan.io/v1/operations/"+$scope.accounts[$scope.account].address+"?type=Transaction&p=0&number="+ (maxTxs+1)).then(function(r){
       if (r.status == 200 && r.data.length > 0){
         if (r.data.length > maxTxs) {
-          r.data.splice(0,1);
+          r.data = r.data.slice(0, maxTxs);
           $scope.moreTxs = true;
         } else {
           $scope.moreTxs = false;
         }
         var txs = [];
-        for(var i = r.data.length-1; i >= 0; i--){
+        for(var i = 0; i < r.data.length; i++){
           for(var j = 0; j < r.data[i].type.operations.length; j++){
             if (r.data[i].type.operations[j].kind != 'transaction' || r.data[i].type.operations[j].failed) continue;
             txs.push({
@@ -687,7 +687,7 @@ app
   //init
   if (Storage.restored){
     window.showLoader();
-    $http.get("https://api4.tzscan.io/v1/operations/"+$scope.accounts[0].address+"?type=Origination").then(function(r){
+    $http.get("https://api1.tzscan.io/v1/operations/"+$scope.accounts[0].address+"?type=Origination").then(function(r){
       window.hideLoader();
       if (r.status == 200 && r.data.length > 0){
         SweetAlert.swal({
@@ -716,7 +716,9 @@ app
           }
         });
       }
-    });
+    }).catch(function(e){
+			window.hideLoader();
+		});
 
     if (Storage.ico) SweetAlert.swal(Lang.translate('awesome'), Lang.translate('ico_restore_success'), 'success');
     Storage.restored = false;

diff --git a/app/app/services/lang.js b/app/app/services/lang.js
@@ -9,7 +9,7 @@ app.service('Lang', ["$sce", function($sce) {
     ],
     _translations = {
       "english" : {
-        "first_operation" : "This account hasn't been revealed yet, which means your next operation will incur an additional fee of 0.001150XTZ",
+        "first_operation" : "This account hasn't been revealed yet, which means your next operation will incur an additional fee of ~0.001300XTZ",
         "error_please_enter_your_seed_words" : "Please enter your seed words",
         "error_seed_words_not_valid" : "Your seed words are not valid - please check to ensure you are not missing a word/letter, and you haven't included an extra space/line break. All words must be seperated by a space.",
         "error_enter_passphrase" : "Please enter your passphrase",

diff --git a/app/app/views/main.html b/app/app/views/main.html
@@ -132,8 +132,8 @@ <h1 class="balance">{{accountDetails.balance}} <a ng-click="refresh()"><i class=
                       <input ng-show="showCustom" type="number" class="form-control" ng-model="customFee">
                       <select ng-show="!showCustom" class="form-control" ng-model="fee" number-select>
                         <option value="1420">{{translate("low")}} - 1420μꜩ</option>
-                        <option value="2000">{{translate("medium")}} - 1500μꜩ</option>
-                        <option value="5000">{{translate("high")}} - 30000μꜩ</option>
+                        <option value="5000">{{translate("medium")}} - 5000μꜩ</option>
+                        <option value="30000">{{translate("high")}} - 30000μꜩ</option>
                       </select>
                     </div>
                   </div>
@@ -212,8 +212,8 @@ <h1 class="balance">{{accountDetails.balance}} <a ng-click="refresh()"><i class=
                         <input ng-show="showCustom" type="number" class="form-control" ng-model="customFee">
                         <select ng-show="!showCustom" class="form-control" ng-model="fee" number-select>
                         <option value="1420">{{translate("low")}} - 1420μꜩ</option>
-                        <option value="2000">{{translate("medium")}} - 1500μꜩ</option>
-                        <option value="5000">{{translate("high")}} - 30000μꜩ</option>
+                        <option value="5000">{{translate("medium")}} - 5000μꜩ</option>
+                        <option value="30000">{{translate("high")}} - 30000μꜩ</option>
                       </select>
                       </div>
                     </div>

diff --git a/app/skin/js/eztz.min.js b/app/skin/js/eztz.min.js