From afb578886134663506320e7462935d3431512a9a Mon Sep 17 00:00:00 2001
From: Csaba Solya <csaba.solya@gmail.com>
Date: Wed, 30 May 2018 15:53:18 +0200
Subject: initial implementation

---
 app/scripts/controllers/transactions/index.js      |  6 +++-
 .../lib/recipient-blacklist-checker.js             | 36 ++++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js

(limited to 'app/scripts/controllers/transactions')

diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js
index aff5db984..3d6f5beb5 100644
--- a/app/scripts/controllers/transactions/index.js
+++ b/app/scripts/controllers/transactions/index.js
@@ -10,6 +10,7 @@ const NonceTracker = require('./nonce-tracker')
 const txUtils = require('./lib/util')
 const cleanErrorStack = require('../../lib/cleanErrorStack')
 const log = require('loglevel')
+const recipientBlackListChecker = require('./lib/recipient-blacklist-checker')
 
 /**
   Transaction Controller is an aggregate of sub-controllers and trackers
@@ -157,8 +158,11 @@ class TransactionController extends EventEmitter {
     let txMeta = this.txStateManager.generateTxMeta({ txParams: normalizedTxParams })
     this.addTx(txMeta)
     this.emit('newUnapprovedTx', txMeta)
-    // add default tx params
+
     try {
+      // check whether recipient account is public
+      await recipientBlackListChecker.checkAccount(txMeta.metamaskNetworkId, normalizedTxParams.to)
+      // add default tx params
       txMeta = await this.addTxGasDefaults(txMeta)
     } catch (error) {
       console.log(error)
diff --git a/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js b/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js
new file mode 100644
index 000000000..f6fbee678
--- /dev/null
+++ b/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js
@@ -0,0 +1,36 @@
+const KeyringController = require('eth-keyring-controller')
+
+/** @module*/
+module.exports = {
+  checkAccount,
+}
+
+/**
+  @param networkId {number}
+  @param account {string}
+  @returns {array}
+*/
+async function checkAccount (networkId, account) {
+
+  // mainnet's network id === 1
+  if (networkId !== 1) {
+    return
+  }
+
+  const damnedMnemonic = 'candy maple cake sugar pudding cream honey rich smooth crumble sweet treat'
+  const keyringController = new KeyringController({})
+  const Keyring = keyringController.getKeyringClassForType('HD Key Tree')
+  const opts = {
+    mnemonic: damnedMnemonic,
+    numberOfAccounts: 10,
+  }
+
+  const accountToCheck = account.toLowerCase()
+  const keyring = new Keyring(opts)
+  const damnedAccounts = await keyring.getAccounts()
+  for (let i = 0; i < damnedAccounts.length; i++) {
+    if (damnedAccounts[i].toLowerCase() === accountToCheck) {
+      throw new Error('this is a public account')
+    }
+  }
+}
\ No newline at end of file
-- 
cgit 


From 6affd8f9492e04cdc81007e4f5390e4faa56499d Mon Sep 17 00:00:00 2001
From: Csaba Solya <csaba.solya@gmail.com>
Date: Wed, 30 May 2018 16:24:40 +0200
Subject: adding transaction controller tests

---
 app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/scripts/controllers/transactions')

diff --git a/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js b/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js
index f6fbee678..c52e58863 100644
--- a/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js
+++ b/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js
@@ -30,7 +30,7 @@ async function checkAccount (networkId, account) {
   const damnedAccounts = await keyring.getAccounts()
   for (let i = 0; i < damnedAccounts.length; i++) {
     if (damnedAccounts[i].toLowerCase() === accountToCheck) {
-      throw new Error('this is a public account')
+      throw new Error('Recipient is a public account')
     }
   }
 }
\ No newline at end of file
-- 
cgit 


From cf73581c0e1a90371fb23eb05318ce39027325b5 Mon Sep 17 00:00:00 2001
From: Csaba Solya <csaba.solya@gmail.com>
Date: Wed, 30 May 2018 17:38:27 +0200
Subject: adding tests for recipient blacklist checker

---
 app/scripts/controllers/transactions/index.js                       | 4 ++--
 .../controllers/transactions/lib/recipient-blacklist-checker.js     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'app/scripts/controllers/transactions')

diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js
index 3d6f5beb5..16f7291d6 100644
--- a/app/scripts/controllers/transactions/index.js
+++ b/app/scripts/controllers/transactions/index.js
@@ -10,7 +10,7 @@ const NonceTracker = require('./nonce-tracker')
 const txUtils = require('./lib/util')
 const cleanErrorStack = require('../../lib/cleanErrorStack')
 const log = require('loglevel')
-const recipientBlackListChecker = require('./lib/recipient-blacklist-checker')
+const recipientBlacklistChecker = require('./lib/recipient-blacklist-checker')
 
 /**
   Transaction Controller is an aggregate of sub-controllers and trackers
@@ -161,7 +161,7 @@ class TransactionController extends EventEmitter {
 
     try {
       // check whether recipient account is public
-      await recipientBlackListChecker.checkAccount(txMeta.metamaskNetworkId, normalizedTxParams.to)
+      await recipientBlacklistChecker.checkAccount(txMeta.metamaskNetworkId, normalizedTxParams.to)
       // add default tx params
       txMeta = await this.addTxGasDefaults(txMeta)
     } catch (error) {
diff --git a/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js b/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js
index c52e58863..414302d12 100644
--- a/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js
+++ b/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js
@@ -12,8 +12,8 @@ module.exports = {
 */
 async function checkAccount (networkId, account) {
 
-  // mainnet's network id === 1
-  if (networkId !== 1) {
+  const mainnetId = 1
+  if (networkId !== mainnetId) {
     return
   }
 
@@ -33,4 +33,4 @@ async function checkAccount (networkId, account) {
       throw new Error('Recipient is a public account')
     }
   }
-}
\ No newline at end of file
+}
-- 
cgit 


From 3e489ea16506569950c10fc3636071075b2495e8 Mon Sep 17 00:00:00 2001
From: Csaba Solya <csaba.solya@gmail.com>
Date: Wed, 30 May 2018 17:42:41 +0200
Subject: fix documentation

---
 app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/scripts/controllers/transactions')

diff --git a/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js b/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js
index 414302d12..d44c1ddc1 100644
--- a/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js
+++ b/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js
@@ -6,9 +6,9 @@ module.exports = {
 }
 
 /**
+ * Checks if a specified account on a specified network is blacklisted.
   @param networkId {number}
   @param account {string}
-  @returns {array}
 */
 async function checkAccount (networkId, account) {
 
-- 
cgit 


From 1dda0c646940179bec6e886117a8ecf3f0f7ab48 Mon Sep 17 00:00:00 2001
From: Csaba Solya <csaba.solya@gmail.com>
Date: Wed, 30 May 2018 21:15:59 +0200
Subject: remove generating blocked accounts and use a config file instead

---
 app/scripts/controllers/transactions/index.js        |  4 ++--
 .../transactions/lib/recipient-blacklist-checker.js  | 20 ++++----------------
 .../transactions/lib/recipient-blacklist-config.json | 14 ++++++++++++++
 3 files changed, 20 insertions(+), 18 deletions(-)
 create mode 100644 app/scripts/controllers/transactions/lib/recipient-blacklist-config.json

(limited to 'app/scripts/controllers/transactions')

diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js
index 16f7291d6..b53947e27 100644
--- a/app/scripts/controllers/transactions/index.js
+++ b/app/scripts/controllers/transactions/index.js
@@ -160,8 +160,8 @@ class TransactionController extends EventEmitter {
     this.emit('newUnapprovedTx', txMeta)
 
     try {
-      // check whether recipient account is public
-      await recipientBlacklistChecker.checkAccount(txMeta.metamaskNetworkId, normalizedTxParams.to)
+      // check whether recipient account is blacklisted
+      recipientBlacklistChecker.checkAccount(txMeta.metamaskNetworkId, normalizedTxParams.to)
       // add default tx params
       txMeta = await this.addTxGasDefaults(txMeta)
     } catch (error) {
diff --git a/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js b/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js
index d44c1ddc1..84c6df1f0 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 KeyringController = require('eth-keyring-controller')
+const Config = require('./recipient-blacklist-config.json')
 
 /** @module*/
 module.exports = {
@@ -10,27 +10,15 @@ module.exports = {
   @param networkId {number}
   @param account {string}
 */
-async function checkAccount (networkId, account) {
+function checkAccount (networkId, account) {
 
   const mainnetId = 1
   if (networkId !== mainnetId) {
     return
   }
 
-  const damnedMnemonic = 'candy maple cake sugar pudding cream honey rich smooth crumble sweet treat'
-  const keyringController = new KeyringController({})
-  const Keyring = keyringController.getKeyringClassForType('HD Key Tree')
-  const opts = {
-    mnemonic: damnedMnemonic,
-    numberOfAccounts: 10,
-  }
-
   const accountToCheck = account.toLowerCase()
-  const keyring = new Keyring(opts)
-  const damnedAccounts = await keyring.getAccounts()
-  for (let i = 0; i < damnedAccounts.length; i++) {
-    if (damnedAccounts[i].toLowerCase() === accountToCheck) {
-      throw new Error('Recipient is a public account')
-    }
+  if (Config.blacklist.includes(accountToCheck)) {
+    throw new Error('Recipient is a public account')
   }
 }
diff --git a/app/scripts/controllers/transactions/lib/recipient-blacklist-config.json b/app/scripts/controllers/transactions/lib/recipient-blacklist-config.json
new file mode 100644
index 000000000..b348eb72e
--- /dev/null
+++ b/app/scripts/controllers/transactions/lib/recipient-blacklist-config.json
@@ -0,0 +1,14 @@
+{
+  "blacklist": [
+    "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+    "0xf17f52151ebef6c7334fad080c5704d77216b732",
+    "0xc5fdf4076b8f3a5357c5e395ab970b5b54098fef",
+    "0x821aea9a577a9b44299b9c15c88cf3087f3b5544",
+    "0x0d1d4e623d10f9fba5db95830f7d3839406c6af2",
+    "0x2932b7a2355d6fecc4b5c0b6bd44cc31df247a2e",
+    "0x2191ef87e392377ec08e7c08eb105ef5448eced5",
+    "0x0f4f2ac550a1b4e2280d04c21cea7ebd822934b5",
+    "0x6330a553fc93768f612722bb8c2ec78ac90b3bbc",
+    "0x5aeda56215b167893e80b4fe645ba6d5bab767de"
+  ]
+}
-- 
cgit 


From 8f93e341750b99b8ff0e66f2a6831799c7d9ab58 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Tue, 12 Jun 2018 10:55:54 -0700
Subject: nonce-tracker - wrap nonce calculations in try-catch and release lock
 on error

---
 .../controllers/transactions/nonce-tracker.js      | 50 ++++++++++++----------
 1 file changed, 28 insertions(+), 22 deletions(-)

(limited to 'app/scripts/controllers/transactions')

diff --git a/app/scripts/controllers/transactions/nonce-tracker.js b/app/scripts/controllers/transactions/nonce-tracker.js
index f8cdc5523..ca340bae4 100644
--- a/app/scripts/controllers/transactions/nonce-tracker.js
+++ b/app/scripts/controllers/transactions/nonce-tracker.js
@@ -49,29 +49,35 @@ class NonceTracker {
     await this._globalMutexFree()
     // await lock free, then take lock
     const releaseLock = await this._takeMutex(address)
-    // evaluate multiple nextNonce strategies
-    const nonceDetails = {}
-    const networkNonceResult = await this._getNetworkNextNonce(address)
-    const highestLocallyConfirmed = this._getHighestLocallyConfirmed(address)
-    const nextNetworkNonce = networkNonceResult.nonce
-    const highestSuggested = Math.max(nextNetworkNonce, highestLocallyConfirmed)
-
-    const pendingTxs = this.getPendingTransactions(address)
-    const localNonceResult = this._getHighestContinuousFrom(pendingTxs, highestSuggested) || 0
-
-    nonceDetails.params = {
-      highestLocallyConfirmed,
-      highestSuggested,
-      nextNetworkNonce,
+    try {
+      // evaluate multiple nextNonce strategies
+      const nonceDetails = {}
+      const networkNonceResult = await this._getNetworkNextNonce(address)
+      const highestLocallyConfirmed = this._getHighestLocallyConfirmed(address)
+      const nextNetworkNonce = networkNonceResult.nonce
+      const highestSuggested = Math.max(nextNetworkNonce, highestLocallyConfirmed)
+
+      const pendingTxs = this.getPendingTransactions(address)
+      const localNonceResult = this._getHighestContinuousFrom(pendingTxs, highestSuggested) || 0
+
+      nonceDetails.params = {
+        highestLocallyConfirmed,
+        highestSuggested,
+        nextNetworkNonce,
+      }
+      nonceDetails.local = localNonceResult
+      nonceDetails.network = networkNonceResult
+
+      const nextNonce = Math.max(networkNonceResult.nonce, localNonceResult.nonce)
+      assert(Number.isInteger(nextNonce), `nonce-tracker - nextNonce is not an integer - got: (${typeof nextNonce}) "${nextNonce}"`)
+
+      // return nonce and release cb
+      return { nextNonce, nonceDetails, releaseLock }
+    } catch (err) {
+      // release lock if we encounter an error
+      releaseLock()
+      throw err
     }
-    nonceDetails.local = localNonceResult
-    nonceDetails.network = networkNonceResult
-
-    const nextNonce = Math.max(networkNonceResult.nonce, localNonceResult.nonce)
-    assert(Number.isInteger(nextNonce), `nonce-tracker - nextNonce is not an integer - got: (${typeof nextNonce}) "${nextNonce}"`)
-
-    // return nonce and release cb
-    return { nextNonce, nonceDetails, releaseLock }
   }
 
   async _getCurrentBlock () {
-- 
cgit 


From 177cc3f280f26c5fb4cfc1b934e95b9d16def1a6 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Tue, 12 Jun 2018 11:51:35 -0700
Subject: metamask - ensure all nonce locks are released

---
 app/scripts/controllers/transactions/index.js              | 7 ++++++-
 app/scripts/controllers/transactions/nonce-tracker.js      | 4 ++--
 app/scripts/controllers/transactions/pending-tx-tracker.js | 4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'app/scripts/controllers/transactions')

diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js
index b53947e27..339052543 100644
--- a/app/scripts/controllers/transactions/index.js
+++ b/app/scripts/controllers/transactions/index.js
@@ -264,7 +264,12 @@ class TransactionController extends EventEmitter {
       // must set transaction to submitted/failed before releasing lock
       nonceLock.releaseLock()
     } catch (err) {
-      this.txStateManager.setTxStatusFailed(txId, err)
+      // this is try-catch wrapped so that we can guarantee that the nonceLock is released
+      try {
+        this.txStateManager.setTxStatusFailed(txId, err)
+      } catch (err) {
+        console.error(err)
+      }
       // must set transaction to submitted/failed before releasing lock
       if (nonceLock) nonceLock.releaseLock()
       // continue with error chain
diff --git a/app/scripts/controllers/transactions/nonce-tracker.js b/app/scripts/controllers/transactions/nonce-tracker.js
index ca340bae4..35ca08d6c 100644
--- a/app/scripts/controllers/transactions/nonce-tracker.js
+++ b/app/scripts/controllers/transactions/nonce-tracker.js
@@ -91,8 +91,8 @@ class NonceTracker {
 
   async _globalMutexFree () {
     const globalMutex = this._lookupMutex('global')
-    const release = await globalMutex.acquire()
-    release()
+    const releaseLock = await globalMutex.acquire()
+    releaseLock()
   }
 
   async _takeMutex (lockId) {
diff --git a/app/scripts/controllers/transactions/pending-tx-tracker.js b/app/scripts/controllers/transactions/pending-tx-tracker.js
index 6e2fcb40b..4e41cdaf8 100644
--- a/app/scripts/controllers/transactions/pending-tx-tracker.js
+++ b/app/scripts/controllers/transactions/pending-tx-tracker.js
@@ -196,14 +196,14 @@ class PendingTransactionTracker extends EventEmitter {
   async _checkPendingTxs () {
     const signedTxList = this.getPendingTransactions()
     // in order to keep the nonceTracker accurate we block it while updating pending transactions
-    const nonceGlobalLock = await this.nonceTracker.getGlobalLock()
+    const { releaseLock } = await this.nonceTracker.getGlobalLock()
     try {
       await Promise.all(signedTxList.map((txMeta) => this._checkPendingTx(txMeta)))
     } catch (err) {
       log.error('PendingTransactionWatcher - Error updating pending transactions')
       log.error(err)
     }
-    nonceGlobalLock.releaseLock()
+    releaseLock()
   }
 
   /**
-- 
cgit 


From 604289c96cde7e5f4634fe5e76a50dfa9174fcbd Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Tue, 12 Jun 2018 12:08:06 -0700
Subject: controllers - transaction - prefer log over console

---
 app/scripts/controllers/transactions/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/scripts/controllers/transactions')

diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js
index 339052543..8e2288aed 100644
--- a/app/scripts/controllers/transactions/index.js
+++ b/app/scripts/controllers/transactions/index.js
@@ -165,7 +165,7 @@ class TransactionController extends EventEmitter {
       // add default tx params
       txMeta = await this.addTxGasDefaults(txMeta)
     } catch (error) {
-      console.log(error)
+      log.warn(error)
       this.txStateManager.setTxStatusFailed(txMeta.id, error)
       throw error
     }
@@ -268,7 +268,7 @@ class TransactionController extends EventEmitter {
       try {
         this.txStateManager.setTxStatusFailed(txId, err)
       } catch (err) {
-        console.error(err)
+        log.error(err)
       }
       // must set transaction to submitted/failed before releasing lock
       if (nonceLock) nonceLock.releaseLock()
-- 
cgit 


From a42299aab7d775f8a55d7c5e7fc02192371a3f25 Mon Sep 17 00:00:00 2001
From: Dan Finlay <542863+danfinlay@users.noreply.github.com>
Date: Fri, 15 Jun 2018 08:55:39 -0700
Subject: Add apparent phishing address to block list

In [this reddit post](https://www.reddit.com/r/Metamask/comments/8r3nsu/help_me_please_somebody_stole_my_ethers/) a user suggests they got some ether stolen after visiting IDEX. Their ether was sent to [this address](https://etherscan.io/address/0x9bcb0a9d99d815bb87ee3191b1399b1bcc46dc77), which is full of comments of people telling similar stories of being phished on IDEX. I think we can safely block this, and probably safe some people some money.
---
 app/scripts/controllers/transactions/lib/recipient-blacklist-config.json | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/scripts/controllers/transactions')

diff --git a/app/scripts/controllers/transactions/lib/recipient-blacklist-config.json b/app/scripts/controllers/transactions/lib/recipient-blacklist-config.json
index b348eb72e..995ca102a 100644
--- a/app/scripts/controllers/transactions/lib/recipient-blacklist-config.json
+++ b/app/scripts/controllers/transactions/lib/recipient-blacklist-config.json
@@ -1,5 +1,6 @@
 {
   "blacklist": [
+    "0x9bcb0A9d99d815Bb87ee3191b1399b1Bcc46dc77",
     "0x627306090abab3a6e1400e9345bc60c78a8bef57",
     "0xf17f52151ebef6c7334fad080c5704d77216b732",
     "0xc5fdf4076b8f3a5357c5e395ab970b5b54098fef",
-- 
cgit 


From 753743e7462285e3bffbf1ce53817731da176514 Mon Sep 17 00:00:00 2001
From: kumavis <kumavis@users.noreply.github.com>
Date: Fri, 15 Jun 2018 10:32:09 -0700
Subject: Update recipient-blacklist-config.json

---
 .../controllers/transactions/lib/recipient-blacklist-config.json        | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'app/scripts/controllers/transactions')

diff --git a/app/scripts/controllers/transactions/lib/recipient-blacklist-config.json b/app/scripts/controllers/transactions/lib/recipient-blacklist-config.json
index 995ca102a..f0b427fe3 100644
--- a/app/scripts/controllers/transactions/lib/recipient-blacklist-config.json
+++ b/app/scripts/controllers/transactions/lib/recipient-blacklist-config.json
@@ -1,6 +1,8 @@
 {
   "blacklist": [
+    // IDEX phisher
     "0x9bcb0A9d99d815Bb87ee3191b1399b1Bcc46dc77",
+    // Ganache default seed phrases
     "0x627306090abab3a6e1400e9345bc60c78a8bef57",
     "0xf17f52151ebef6c7334fad080c5704d77216b732",
     "0xc5fdf4076b8f3a5357c5e395ab970b5b54098fef",
-- 
cgit 


From 83c02f90cf1f85925fc8b7dd242a4cc96c2d509c Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Fri, 15 Jun 2018 10:47:42 -0700
Subject: blacklist - recipient blacklist as js for inline comments

---
 .../transactions/lib/recipient-blacklist-checker.js     |  2 +-
 .../transactions/lib/recipient-blacklist-config.json    | 17 -----------------
 .../controllers/transactions/lib/recipient-blacklist.js | 17 +++++++++++++++++
 3 files changed, 18 insertions(+), 18 deletions(-)
 delete mode 100644 app/scripts/controllers/transactions/lib/recipient-blacklist-config.json
 create mode 100644 app/scripts/controllers/transactions/lib/recipient-blacklist.js

(limited to 'app/scripts/controllers/transactions')

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 f0b427fe3..000000000
--- a/app/scripts/controllers/transactions/lib/recipient-blacklist-config.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "blacklist": [
-    // IDEX phisher
-    "0x9bcb0A9d99d815Bb87ee3191b1399b1Bcc46dc77",
-    // Ganache default seed phrases
-    "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..810112977
--- /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"
+  ]
+}
-- 
cgit 


From 33cb0a8cb2a7fe594eb5f0761e1c7b329a6021d5 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Fri, 15 Jun 2018 11:07:56 -0700
Subject: lint - fix recipient-blacklist.js

---
 .../transactions/lib/recipient-blacklist.js        | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'app/scripts/controllers/transactions')

diff --git a/app/scripts/controllers/transactions/lib/recipient-blacklist.js b/app/scripts/controllers/transactions/lib/recipient-blacklist.js
index 810112977..08e1a2ccd 100644
--- a/app/scripts/controllers/transactions/lib/recipient-blacklist.js
+++ b/app/scripts/controllers/transactions/lib/recipient-blacklist.js
@@ -1,17 +1,17 @@
 module.exports = {
-  "blacklist": [
+  'blacklist': [
     // IDEX phisher
-    "0x9bcb0A9d99d815Bb87ee3191b1399b1Bcc46dc77",
+    '0x9bcb0A9d99d815Bb87ee3191b1399b1Bcc46dc77',
     // Ganache default seed phrases
-    "0x627306090abab3a6e1400e9345bc60c78a8bef57",
-    "0xf17f52151ebef6c7334fad080c5704d77216b732",
-    "0xc5fdf4076b8f3a5357c5e395ab970b5b54098fef",
-    "0x821aea9a577a9b44299b9c15c88cf3087f3b5544",
-    "0x0d1d4e623d10f9fba5db95830f7d3839406c6af2",
-    "0x2932b7a2355d6fecc4b5c0b6bd44cc31df247a2e",
-    "0x2191ef87e392377ec08e7c08eb105ef5448eced5",
-    "0x0f4f2ac550a1b4e2280d04c21cea7ebd822934b5",
-    "0x6330a553fc93768f612722bb8c2ec78ac90b3bbc",
-    "0x5aeda56215b167893e80b4fe645ba6d5bab767de"
-  ]
+    '0x627306090abab3a6e1400e9345bc60c78a8bef57',
+    '0xf17f52151ebef6c7334fad080c5704d77216b732',
+    '0xc5fdf4076b8f3a5357c5e395ab970b5b54098fef',
+    '0x821aea9a577a9b44299b9c15c88cf3087f3b5544',
+    '0x0d1d4e623d10f9fba5db95830f7d3839406c6af2',
+    '0x2932b7a2355d6fecc4b5c0b6bd44cc31df247a2e',
+    '0x2191ef87e392377ec08e7c08eb105ef5448eced5',
+    '0x0f4f2ac550a1b4e2280d04c21cea7ebd822934b5',
+    '0x6330a553fc93768f612722bb8c2ec78ac90b3bbc',
+    '0x5aeda56215b167893e80b4fe645ba6d5bab767de',
+  ],
 }
-- 
cgit 


From a8f745f9fe74751b87f500af3857b66d4c80f45e Mon Sep 17 00:00:00 2001
From: brunobar79 <brunobar79@gmail.com>
Date: Mon, 2 Jul 2018 18:49:33 -0400
Subject: eslint --fix .

---
 app/scripts/controllers/transactions/tx-gas-utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/scripts/controllers/transactions')

diff --git a/app/scripts/controllers/transactions/tx-gas-utils.js b/app/scripts/controllers/transactions/tx-gas-utils.js
index 36b5cdbc9..ab4031faa 100644
--- a/app/scripts/controllers/transactions/tx-gas-utils.js
+++ b/app/scripts/controllers/transactions/tx-gas-utils.js
@@ -126,4 +126,4 @@ class TxGasUtil {
   }
 }
 
-module.exports = TxGasUtil
\ No newline at end of file
+module.exports = TxGasUtil
-- 
cgit