diff options
| author | Thomas <thomas.b.huang@gmail.com> | 2018-06-19 03:37:01 +0800 |
|---|---|---|
| committer | Thomas <thomas.b.huang@gmail.com> | 2018-06-19 03:37:01 +0800 |
| commit | ea0dcdd3124ec65d3145f0ac7790a6172603d88c (patch) | |
| tree | b071efe391d00f40805bb36a5c0f137eca14b8b7 /app/scripts/controllers | |
| parent | ef31eeccb244592aa17dd677e854e106c9bb5848 (diff) | |
| parent | d910c35e90d0d725e86b7743538b6c6c429f26f0 (diff) | |
| download | tangerine-wallet-browser-ea0dcdd3124ec65d3145f0ac7790a6172603d88c.tar tangerine-wallet-browser-ea0dcdd3124ec65d3145f0ac7790a6172603d88c.tar.gz tangerine-wallet-browser-ea0dcdd3124ec65d3145f0ac7790a6172603d88c.tar.bz2 tangerine-wallet-browser-ea0dcdd3124ec65d3145f0ac7790a6172603d88c.tar.lz tangerine-wallet-browser-ea0dcdd3124ec65d3145f0ac7790a6172603d88c.tar.xz tangerine-wallet-browser-ea0dcdd3124ec65d3145f0ac7790a6172603d88c.tar.zst tangerine-wallet-browser-ea0dcdd3124ec65d3145f0ac7790a6172603d88c.zip | |
Merge branch 'develop' into v4.8.0
Diffstat (limited to 'app/scripts/controllers')
3 files changed, 18 insertions, 15 deletions
diff --git a/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js b/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js index 84c6df1f0..e4df2367e 100644 --- a/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js +++ b/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js @@ -1,4 +1,4 @@ -const Config = require('./recipient-blacklist-config.json') +const Config = require('./recipient-blacklist.js') /** @module*/ module.exports = { diff --git a/app/scripts/controllers/transactions/lib/recipient-blacklist-config.json b/app/scripts/controllers/transactions/lib/recipient-blacklist-config.json deleted file mode 100644 index b348eb72e..000000000 --- a/app/scripts/controllers/transactions/lib/recipient-blacklist-config.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "blacklist": [ - "0x627306090abab3a6e1400e9345bc60c78a8bef57", - "0xf17f52151ebef6c7334fad080c5704d77216b732", - "0xc5fdf4076b8f3a5357c5e395ab970b5b54098fef", - "0x821aea9a577a9b44299b9c15c88cf3087f3b5544", - "0x0d1d4e623d10f9fba5db95830f7d3839406c6af2", - "0x2932b7a2355d6fecc4b5c0b6bd44cc31df247a2e", - "0x2191ef87e392377ec08e7c08eb105ef5448eced5", - "0x0f4f2ac550a1b4e2280d04c21cea7ebd822934b5", - "0x6330a553fc93768f612722bb8c2ec78ac90b3bbc", - "0x5aeda56215b167893e80b4fe645ba6d5bab767de" - ] -} diff --git a/app/scripts/controllers/transactions/lib/recipient-blacklist.js b/app/scripts/controllers/transactions/lib/recipient-blacklist.js new file mode 100644 index 000000000..08e1a2ccd --- /dev/null +++ b/app/scripts/controllers/transactions/lib/recipient-blacklist.js @@ -0,0 +1,17 @@ +module.exports = { + 'blacklist': [ + // IDEX phisher + '0x9bcb0A9d99d815Bb87ee3191b1399b1Bcc46dc77', + // Ganache default seed phrases + '0x627306090abab3a6e1400e9345bc60c78a8bef57', + '0xf17f52151ebef6c7334fad080c5704d77216b732', + '0xc5fdf4076b8f3a5357c5e395ab970b5b54098fef', + '0x821aea9a577a9b44299b9c15c88cf3087f3b5544', + '0x0d1d4e623d10f9fba5db95830f7d3839406c6af2', + '0x2932b7a2355d6fecc4b5c0b6bd44cc31df247a2e', + '0x2191ef87e392377ec08e7c08eb105ef5448eced5', + '0x0f4f2ac550a1b4e2280d04c21cea7ebd822934b5', + '0x6330a553fc93768f612722bb8c2ec78ac90b3bbc', + '0x5aeda56215b167893e80b4fe645ba6d5bab767de', + ], +} |