diff --git a/app/includes/footer.tpl b/app/includes/footer.tpl index 5b40c09a80..42adc9cf0d 100644 --- a/app/includes/footer.tpl +++ b/app/includes/footer.tpl @@ -41,6 +41,7 @@

Disclaimer

+

ETH Block#: {{ethBlockNumber}} · ETC Block#: {{etcBlockNumber}}

diff --git a/app/scripts/controllers/footerCtrl.js b/app/scripts/controllers/footerCtrl.js index 694cea9d50..f2ff38f5f7 100644 --- a/app/scripts/controllers/footerCtrl.js +++ b/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; diff --git a/app/scripts/ethFuncs.js b/app/scripts/ethFuncs.js index c0a05d6efa..bec7b06bb7 100644 --- a/app/scripts/ethFuncs.js +++ b/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; diff --git a/app/scripts/globalFuncs.js b/app/scripts/globalFuncs.js index c0a92300e5..f7bbf84a26 100644 --- a/app/scripts/globalFuncs.js +++ b/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>/gi; diff --git a/chrome-extension/cx-wallet.html b/chrome-extension/cx-wallet.html index c6040bffda..00d4460b08 100644 --- a/chrome-extension/cx-wallet.html +++ b/chrome-extension/cx-wallet.html @@ -640,7 +640,12 @@