From 4275edcb5147ebcfff081bc6e6e3bd7074435ec3 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Tue, 23 Oct 2018 20:26:31 +0300 Subject: [PATCH 1/5] Update POA explorer links to Blockscout --- app/scripts/nodes.js | 4 +-- chrome-extension/js/etherwallet-master.js | 42 +++++++++++++++++++++++ dist/js/etherwallet-master.js | 42 +++++++++++++++++++++++ 3 files changed, 86 insertions(+), 2 deletions(-) diff --git a/app/scripts/nodes.js b/app/scripts/nodes.js index ded15e6944..fe71ec6c75 100644 --- a/app/scripts/nodes.js +++ b/app/scripts/nodes.js @@ -254,8 +254,8 @@ nodes.nodeList = { }, poa: { name: "POA", - blockExplorerTX: "https://poaexplorer.com/tx/[[txHash]]", - blockExplorerAddr: "https://poaexplorer.com/address/[[address]]", + blockExplorerTX: "https://blockscout.com/poa/core/tx/[[txHash]]", + blockExplorerAddr: "https://blockscout.com/poa/core/address/[[address]]", type: nodes.nodeTypes.POA, eip155: true, chainId: 99, diff --git a/chrome-extension/js/etherwallet-master.js b/chrome-extension/js/etherwallet-master.js index c5f4dc6e12..5ed5451f83 100644 --- a/chrome-extension/js/etherwallet-master.js +++ b/chrome-extension/js/etherwallet-master.js @@ -988,6 +988,8 @@ bity.post = function (path, data, callback) { module.exports = bity; },{}],27:[function(require,module,exports){ +"use strict"; + var darklist = function darklist() { return [{ address: "0x8abe0a9b8A1C8a003354E61F3ed8befdeb7D2CEc", @@ -9265,6 +9267,8 @@ var walletGenCtrl = function walletGenCtrl($scope) { module.exports = walletGenCtrl; },{}],51:[function(require,module,exports){ +'use strict'; + // For token sale holders: // 1. Add the address users are sending to // 2. Add the gas limit users should use to send successfully (this avoids OOG errors) @@ -10014,6 +10018,8 @@ var walletDecryptDrtv = function walletDecryptDrtv() { module.exports = walletDecryptDrtv; },{"./walletDecryptDrtv.html":60}],62:[function(require,module,exports){ +'use strict'; + var ens = require('./ens'); var domainsaleInterface = require('./domainsaleConfigs/domainsaleABI.json'); @@ -10595,6 +10601,8 @@ module.exports=[ },{}],64:[function(require,module,exports){ (function (Buffer){ +'use strict'; + function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; } var uts46 = require('idna-uts46'); @@ -14138,6 +14146,8 @@ module.exports={ } },{}],77:[function(require,module,exports){ +'use strict'; + function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; } var mainKyberNetworkABI = require('./kyberConfig/KyberNetworkABI.json'); @@ -17444,6 +17454,8 @@ var walletService = function walletService() { module.exports = walletService; },{}],98:[function(require,module,exports){ +'use strict'; + var f = require('./formatters'); var SolidityType = require('./type'); @@ -17472,6 +17484,8 @@ SolidityTypeAddress.prototype.isType = function (name) { module.exports = SolidityTypeAddress; },{"./formatters":104,"./type":109}],99:[function(require,module,exports){ +'use strict'; + var f = require('./formatters'); var SolidityType = require('./type'); @@ -17500,6 +17514,8 @@ SolidityTypeBool.prototype.isType = function (name) { module.exports = SolidityTypeBool; },{"./formatters":104,"./type":109}],100:[function(require,module,exports){ +'use strict'; + var f = require('./formatters'); var SolidityType = require('./type'); @@ -17531,6 +17547,8 @@ SolidityTypeBytes.prototype.isType = function (name) { module.exports = SolidityTypeBytes; },{"./formatters":104,"./type":109}],101:[function(require,module,exports){ +'use strict'; + /* This file is part of web3.js. @@ -17782,6 +17800,8 @@ var coder = new SolidityCoder([new SolidityTypeAddress(), new SolidityTypeBool() module.exports = coder; },{"./address":98,"./bool":99,"./bytes":100,"./dynamicbytes":103,"./formatters":104,"./int":105,"./real":107,"./string":108,"./uint":110,"./ureal":111,"./utils":112}],102:[function(require,module,exports){ +'use strict'; + /* This file is part of web3.js. @@ -17833,6 +17853,8 @@ module.exports = { }; },{"bignumber.js":370}],103:[function(require,module,exports){ +'use strict'; + var f = require('./formatters'); var SolidityType = require('./type'); @@ -17855,6 +17877,8 @@ SolidityTypeDynamicBytes.prototype.isDynamicType = function () { module.exports = SolidityTypeDynamicBytes; },{"./formatters":104,"./type":109}],104:[function(require,module,exports){ +'use strict'; + /* This file is part of web3.js. @@ -18108,6 +18132,8 @@ module.exports = { }; },{"./config":102,"./param":106,"./utils":112,"bignumber.js":370}],105:[function(require,module,exports){ +'use strict'; + var f = require('./formatters'); var SolidityType = require('./type'); @@ -18142,6 +18168,8 @@ SolidityTypeInt.prototype.isType = function (name) { module.exports = SolidityTypeInt; },{"./formatters":104,"./type":109}],106:[function(require,module,exports){ +'use strict'; + /* This file is part of web3.js. @@ -18293,6 +18321,8 @@ SolidityParam.encodeList = function (params) { module.exports = SolidityParam; },{"./utils":112}],107:[function(require,module,exports){ +'use strict'; + var f = require('./formatters'); var SolidityType = require('./type'); @@ -18327,6 +18357,8 @@ SolidityTypeReal.prototype.isType = function (name) { module.exports = SolidityTypeReal; },{"./formatters":104,"./type":109}],108:[function(require,module,exports){ +'use strict'; + var f = require('./formatters'); var SolidityType = require('./type'); @@ -18349,6 +18381,8 @@ SolidityTypeString.prototype.isDynamicType = function () { module.exports = SolidityTypeString; },{"./formatters":104,"./type":109}],109:[function(require,module,exports){ +'use strict'; + var f = require('./formatters'); var SolidityParam = require('./param'); @@ -18601,6 +18635,8 @@ SolidityType.prototype.decode = function (bytes, offset, name) { module.exports = SolidityType; },{"./formatters":104,"./param":106}],110:[function(require,module,exports){ +'use strict'; + var f = require('./formatters'); var SolidityType = require('./type'); @@ -18635,6 +18671,8 @@ SolidityTypeUInt.prototype.isType = function (name) { module.exports = SolidityTypeUInt; },{"./formatters":104,"./type":109}],111:[function(require,module,exports){ +'use strict'; + var f = require('./formatters'); var SolidityType = require('./type'); @@ -18669,6 +18707,8 @@ SolidityTypeUReal.prototype.isType = function (name) { module.exports = SolidityTypeUReal; },{"./formatters":104,"./type":109}],112:[function(require,module,exports){ +'use strict'; + var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; /* @@ -19795,6 +19835,8 @@ module.exports = Ledger3; }).call(this,require("buffer").Buffer) },{"buffer":415}],118:[function(require,module,exports){ +'use strict'; + var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } diff --git a/dist/js/etherwallet-master.js b/dist/js/etherwallet-master.js index c5f4dc6e12..5ed5451f83 100644 --- a/dist/js/etherwallet-master.js +++ b/dist/js/etherwallet-master.js @@ -988,6 +988,8 @@ bity.post = function (path, data, callback) { module.exports = bity; },{}],27:[function(require,module,exports){ +"use strict"; + var darklist = function darklist() { return [{ address: "0x8abe0a9b8A1C8a003354E61F3ed8befdeb7D2CEc", @@ -9265,6 +9267,8 @@ var walletGenCtrl = function walletGenCtrl($scope) { module.exports = walletGenCtrl; },{}],51:[function(require,module,exports){ +'use strict'; + // For token sale holders: // 1. Add the address users are sending to // 2. Add the gas limit users should use to send successfully (this avoids OOG errors) @@ -10014,6 +10018,8 @@ var walletDecryptDrtv = function walletDecryptDrtv() { module.exports = walletDecryptDrtv; },{"./walletDecryptDrtv.html":60}],62:[function(require,module,exports){ +'use strict'; + var ens = require('./ens'); var domainsaleInterface = require('./domainsaleConfigs/domainsaleABI.json'); @@ -10595,6 +10601,8 @@ module.exports=[ },{}],64:[function(require,module,exports){ (function (Buffer){ +'use strict'; + function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; } var uts46 = require('idna-uts46'); @@ -14138,6 +14146,8 @@ module.exports={ } },{}],77:[function(require,module,exports){ +'use strict'; + function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; } var mainKyberNetworkABI = require('./kyberConfig/KyberNetworkABI.json'); @@ -17444,6 +17454,8 @@ var walletService = function walletService() { module.exports = walletService; },{}],98:[function(require,module,exports){ +'use strict'; + var f = require('./formatters'); var SolidityType = require('./type'); @@ -17472,6 +17484,8 @@ SolidityTypeAddress.prototype.isType = function (name) { module.exports = SolidityTypeAddress; },{"./formatters":104,"./type":109}],99:[function(require,module,exports){ +'use strict'; + var f = require('./formatters'); var SolidityType = require('./type'); @@ -17500,6 +17514,8 @@ SolidityTypeBool.prototype.isType = function (name) { module.exports = SolidityTypeBool; },{"./formatters":104,"./type":109}],100:[function(require,module,exports){ +'use strict'; + var f = require('./formatters'); var SolidityType = require('./type'); @@ -17531,6 +17547,8 @@ SolidityTypeBytes.prototype.isType = function (name) { module.exports = SolidityTypeBytes; },{"./formatters":104,"./type":109}],101:[function(require,module,exports){ +'use strict'; + /* This file is part of web3.js. @@ -17782,6 +17800,8 @@ var coder = new SolidityCoder([new SolidityTypeAddress(), new SolidityTypeBool() module.exports = coder; },{"./address":98,"./bool":99,"./bytes":100,"./dynamicbytes":103,"./formatters":104,"./int":105,"./real":107,"./string":108,"./uint":110,"./ureal":111,"./utils":112}],102:[function(require,module,exports){ +'use strict'; + /* This file is part of web3.js. @@ -17833,6 +17853,8 @@ module.exports = { }; },{"bignumber.js":370}],103:[function(require,module,exports){ +'use strict'; + var f = require('./formatters'); var SolidityType = require('./type'); @@ -17855,6 +17877,8 @@ SolidityTypeDynamicBytes.prototype.isDynamicType = function () { module.exports = SolidityTypeDynamicBytes; },{"./formatters":104,"./type":109}],104:[function(require,module,exports){ +'use strict'; + /* This file is part of web3.js. @@ -18108,6 +18132,8 @@ module.exports = { }; },{"./config":102,"./param":106,"./utils":112,"bignumber.js":370}],105:[function(require,module,exports){ +'use strict'; + var f = require('./formatters'); var SolidityType = require('./type'); @@ -18142,6 +18168,8 @@ SolidityTypeInt.prototype.isType = function (name) { module.exports = SolidityTypeInt; },{"./formatters":104,"./type":109}],106:[function(require,module,exports){ +'use strict'; + /* This file is part of web3.js. @@ -18293,6 +18321,8 @@ SolidityParam.encodeList = function (params) { module.exports = SolidityParam; },{"./utils":112}],107:[function(require,module,exports){ +'use strict'; + var f = require('./formatters'); var SolidityType = require('./type'); @@ -18327,6 +18357,8 @@ SolidityTypeReal.prototype.isType = function (name) { module.exports = SolidityTypeReal; },{"./formatters":104,"./type":109}],108:[function(require,module,exports){ +'use strict'; + var f = require('./formatters'); var SolidityType = require('./type'); @@ -18349,6 +18381,8 @@ SolidityTypeString.prototype.isDynamicType = function () { module.exports = SolidityTypeString; },{"./formatters":104,"./type":109}],109:[function(require,module,exports){ +'use strict'; + var f = require('./formatters'); var SolidityParam = require('./param'); @@ -18601,6 +18635,8 @@ SolidityType.prototype.decode = function (bytes, offset, name) { module.exports = SolidityType; },{"./formatters":104,"./param":106}],110:[function(require,module,exports){ +'use strict'; + var f = require('./formatters'); var SolidityType = require('./type'); @@ -18635,6 +18671,8 @@ SolidityTypeUInt.prototype.isType = function (name) { module.exports = SolidityTypeUInt; },{"./formatters":104,"./type":109}],111:[function(require,module,exports){ +'use strict'; + var f = require('./formatters'); var SolidityType = require('./type'); @@ -18669,6 +18707,8 @@ SolidityTypeUReal.prototype.isType = function (name) { module.exports = SolidityTypeUReal; },{"./formatters":104,"./type":109}],112:[function(require,module,exports){ +'use strict'; + var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; /* @@ -19795,6 +19835,8 @@ module.exports = Ledger3; }).call(this,require("buffer").Buffer) },{"buffer":415}],118:[function(require,module,exports){ +'use strict'; + var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } From d10acf90bb663101b04f806b60cf8e352be38a9f Mon Sep 17 00:00:00 2001 From: gamalielhere Date: Tue, 23 Oct 2018 15:42:03 -0700 Subject: [PATCH 2/5] Add 22x, Spice, and BCAP tokens --- CHANGELOG.md | 9 ++++++++- app/scripts/tokens/ethTokens.json | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 53c34fc5ac..41cff7556f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,11 @@ -### Rlease v3.23.1 +### New + +- Update POA block explorrer [#2111](https://github.com/kvhnuke/etherwallet/pull/2111) +- Fix trezor signing [#2109](https://github.com/kvhnuke/etherwallet/pull/2109) +- Add Credits custom gas [#2107](https://github.com/kvhnuke/etherwallet/pull/2107) +- Add 22x, Spice, and BCAP tokens [#2112](https://github.com/kvhnuke/etherwallet/pull/2112) + +### Release v3.23.1 ### Hotfix diff --git a/app/scripts/tokens/ethTokens.json b/app/scripts/tokens/ethTokens.json index e3bd1759b6..8829adc7b2 100644 --- a/app/scripts/tokens/ethTokens.json +++ b/app/scripts/tokens/ethTokens.json @@ -47,6 +47,12 @@ "decimal": 8, "type": "default" }, + { + "address": "0x0073e5E52E2B4fE218D75d994eE2B3c82f9C87EA", + "symbol": "22x", + "decimal": 8, + "type": "default" + }, { "address": "0x9fC0583220eB44fAeE9e2dc1E63F39204DDD9090", "symbol": "2DC", @@ -515,6 +521,12 @@ "decimal": 18, "type": "default" }, + { + "address": "0x1f41e42d0a9e3c0dd3ba15b527342783b43200a9", + "symbol": "BCAP", + "decimal": 0, + "type": "default" + }, { "address": "0xff3519eeeea3e76f1f699ccce5e23ee0bdda41ac", "symbol": "BCAP", @@ -5321,6 +5333,12 @@ "decimal": 18, "type": "default" }, + { + "address": "0x0324dd195d0cd53f9f07bee6a48ee7a20bad738f", + "symbol": "SPICE", + "decimal": 8, + "type": "default" + }, { "address": "0x20F7A3DdF244dc9299975b4Da1C39F8D5D75f05A", "symbol": "SPN", From 8832b75de3cab4b169e1fca95b868a3767879c43 Mon Sep 17 00:00:00 2001 From: gamalielhere Date: Tue, 23 Oct 2018 16:18:24 -0700 Subject: [PATCH 3/5] Add TTA and ORME tokens --- CHANGELOG.md | 2 +- app/scripts/tokens/ethTokens.json | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41cff7556f..2619ae6c25 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ - Update POA block explorrer [#2111](https://github.com/kvhnuke/etherwallet/pull/2111) - Fix trezor signing [#2109](https://github.com/kvhnuke/etherwallet/pull/2109) - Add Credits custom gas [#2107](https://github.com/kvhnuke/etherwallet/pull/2107) -- Add 22x, Spice, and BCAP tokens [#2112](https://github.com/kvhnuke/etherwallet/pull/2112) +- Add TTA, ORME, 22x, Spice, and BCAP tokens [#2112](https://github.com/kvhnuke/etherwallet/pull/2112) ### Release v3.23.1 diff --git a/app/scripts/tokens/ethTokens.json b/app/scripts/tokens/ethTokens.json index 8829adc7b2..db04edcc93 100644 --- a/app/scripts/tokens/ethTokens.json +++ b/app/scripts/tokens/ethTokens.json @@ -4211,6 +4211,12 @@ "decimal": 18, "type": "default" }, + { + "address": "0x516E5436bAfdc11083654DE7Bb9b95382d08d5DE", + "symbol": "ORME", + "decimal": 8, + "type": "default" + }, { "address": "0xeb9a4b185816c354db92db09cc3b50be60b901b6", "symbol": "ORS", @@ -5795,9 +5801,15 @@ "decimal": 18, "type": "default" }, + { + "address": "0xaab606817809841e8b1168be8779eeaf6744ef64", + "symbol": "TTA", + "decimal": 18, + "type": "default" + }, { "address": "0x9389434852b94bbad4c8afed5b7bdbc5ff0c2275", - "symbol": "TTC) (TTC", + "symbol": "TTC (TTC)", "decimal": 18, "type": "default" }, From 87996ec585e33c005a72a74019b0d18b38f3325a Mon Sep 17 00:00:00 2001 From: gamalielhere Date: Thu, 25 Oct 2018 11:41:12 -0700 Subject: [PATCH 4/5] Remove old BCAP token --- app/scripts/tokens/ethTokens.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/scripts/tokens/ethTokens.json b/app/scripts/tokens/ethTokens.json index db04edcc93..d2fa6db70a 100644 --- a/app/scripts/tokens/ethTokens.json +++ b/app/scripts/tokens/ethTokens.json @@ -527,12 +527,6 @@ "decimal": 0, "type": "default" }, - { - "address": "0xff3519eeeea3e76f1f699ccce5e23ee0bdda41ac", - "symbol": "BCAP", - "decimal": 0, - "type": "default" - }, { "address": "0x7367a68039d4704f30bfbf6d948020c3b07dfc59", "symbol": "BCBC", From 4e45556f1c60c945a1724490a4555c0815eab269 Mon Sep 17 00:00:00 2001 From: gamalielhere Date: Thu, 25 Oct 2018 15:47:09 -0700 Subject: [PATCH 5/5] Update darklist --- app/scripts/constants/darkListConst.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/scripts/constants/darkListConst.js b/app/scripts/constants/darkListConst.js index 778a4928a0..f424a26a33 100644 --- a/app/scripts/constants/darkListConst.js +++ b/app/scripts/constants/darkListConst.js @@ -3475,6 +3475,11 @@ const darklist = function() { comment: "Scam address of phishing email sent to leaked Everex investor database", date: "2017-09-05" + }, + { + address: "0xDdd6854A002A6fbcDF695385cD5ed630c9E27C3e", + comment: "Scam address contacted Trust Wallet users in Telegram group depicting admin image and username", + date: "2018-10-25" } ]; };