Merge branch 'mercury' of https://github.com/kvhnuke/etherwallet into…

… mercury

# By kvhnuke
# Via kvhnuke
* 'mercury' of https://github.com/kvhnuke/etherwallet:
  eip155 backwards compatibility
  added back the block numbers to footer
  url parameters case insensitive

app/includes/footer.tpl

@@ -41,6 +41,7 @@
     </p>
 
     <p><a data-toggle="modal" data-target="#disclaimerModal" translate="FOOTER_4"> Disclaimer </a></p>
+    <p ng-show="showBlocks" class="text-right" style="font-size: 10px">ETH Block#: {{ethBlockNumber}} &middot; ETC Block#: {{etcBlockNumber}}</p>
 
   </div>
 

app/scripts/controllers/footerCtrl.js

@@ -10,6 +10,6 @@ var footerCtrl = function($scope) {
         ajaxReq.getCurrentBlock(true, function(data){$scope.etcBlockNumber = data.data;});
     }
     $scope.setBlockNumbers();
-    setInterval($scope.setBlockNumbers,3000);
+    //setInterval($scope.setBlockNumbers,3000);
 };
 module.exports = footerCtrl;

app/scripts/ethFuncs.js

@@ -63,17 +63,19 @@ ethFuncs.getDataObj = function(to, func, arrVals) {
 		data: func + val
 	};
 }
-ethFuncs.ecSignEIP155 = function(msgHash, privateKey){
+ethFuncs.ecSignEIP155 = function(msgHash, privateKey, old){
   var sig = ethUtil.secp256k1.sign(msgHash, privateKey);
   var ret = {};
   ret.r = sig.signature.slice(0, 32);
   ret.s = sig.signature.slice(32, 64);
-  ret.v = sig.recovery + 37;
+  ret.v = old ? sig.recovery + 27 : sig.recovery + 37;
   return ret;
 }
-ethFuncs.hashEIP155 = function(tx){
+ethFuncs.hashEIP155 = function(tx, old){
     tx.raw[6] = 18;
-    return ethUtil.rlphash(tx.raw)
+    var toHash = tx.raw;
+    if(old) toHash = toHash.splice(0,6);
+    return ethUtil.rlphash(toHash);
 }
 ethFuncs.estimateGas = function(dataObj, isClassic, callback) {
     var gasLimit = 2000000;

app/scripts/globalFuncs.js

@@ -125,7 +125,8 @@ globalFuncs.isNumeric = function(n) {
 	return !isNaN(parseFloat(n)) && isFinite(n);
 }
 globalFuncs.urlGet = function(name) {
-	if (name = (new RegExp('[?&]' + encodeURIComponent(name) + '=([^&]*)')).exec(location.search)) return this.stripTags(decodeURIComponent(name[1]));
+    name = name.toLowerCase();
+	if (name = (new RegExp('[?&]' + encodeURIComponent(name) + '=([^&]*)')).exec(location.search.toLowerCase())) return this.stripTags(decodeURIComponent(name[1]));
 }
 globalFuncs.stripTags = function(str) {
 	var SCRIPT_REGEX = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi;

chrome-extension/cx-wallet.html

@@ -640,7 +640,12 @@ <h4 class="modal-title" translate="MNEM_1"> Please select the address you would
 <article class="tab-pane active" ng-if="globalService.currentTab==globalService.tabs.sendTransaction.id" ng-controller='sendTxCtrl'>
 
   <!-- Header -->
-  <p class="alert alert-info" translate="WARN_Send_Link" ng-show="hasQueryString"> You arrived via a link that has the address, amount, gas or data fields filled in for you. You can change any information before sending. Unlock your wallet to get started. </p>
+  <div class="alert alert-info" ng-show="hasQueryString">
+    <p translate="WARN_Send_Link" >You arrived via a link that has the address, amount, gas or data fields filled in for you. You can change any information before sending. Unlock your wallet to get started.</p>
+    <p translate="WARN_Send_Link_2" ng-show="hasInvalidSendModeAndData"> **Warning:** You can only include data if you are sending via "ETH (Standard Transaction)". Please remove the "sendMode" and/or "tokenSymbol" from the URI to send a transaction with data. </p>
+  </div>
+
+
 
   <article class="collapse-container">
     <div ng-click="wd = !wd">
@@ -2226,6 +2231,7 @@ <h4 translate="HELP_FAQ_Title">More Helpful Answers to Frequent Questions </h4>
     </p>
 
     <p><a data-toggle="modal" data-target="#disclaimerModal" translate="FOOTER_4"> Disclaimer </a></p>
+    <p ng-show="showBlocks" class="text-right" style="font-size: 10px">ETH Block#: {{ethBlockNumber}} &middot; ETC Block#: {{etcBlockNumber}}</p>
 
   </div>
 

chrome-extension/index.html

@@ -379,7 +379,12 @@ <h4 translate="x_Json">JSON File (Unencrypted)</h4>
 <article class="tab-pane active" ng-if="globalService.currentTab==globalService.tabs.sendTransaction.id" ng-controller='sendTxCtrl'>
 
   <!-- Header -->
-  <p class="alert alert-info" translate="WARN_Send_Link" ng-show="hasQueryString"> You arrived via a link that has the address, amount, gas or data fields filled in for you. You can change any information before sending. Unlock your wallet to get started. </p>
+  <div class="alert alert-info" ng-show="hasQueryString">
+    <p translate="WARN_Send_Link" >You arrived via a link that has the address, amount, gas or data fields filled in for you. You can change any information before sending. Unlock your wallet to get started.</p>
+    <p translate="WARN_Send_Link_2" ng-show="hasInvalidSendModeAndData"> **Warning:** You can only include data if you are sending via "ETH (Standard Transaction)". Please remove the "sendMode" and/or "tokenSymbol" from the URI to send a transaction with data. </p>
+  </div>
+
+
 
   <article class="collapse-container">
     <div ng-click="wd = !wd">
@@ -2036,6 +2041,7 @@ <h2 translate="BULK_SuccessMsg">Success! Your wallets have been generated.</h2>
     </p>
 
     <p><a data-toggle="modal" data-target="#disclaimerModal" translate="FOOTER_4"> Disclaimer </a></p>
+    <p ng-show="showBlocks" class="text-right" style="font-size: 10px">ETH Block#: {{ethBlockNumber}} &middot; ETC Block#: {{etcBlockNumber}}</p>
 
   </div>