diff options
author | kumavis <aaron@kumavis.me> | 2018-06-07 03:05:38 +0800 |
---|---|---|
committer | kumavis <aaron@kumavis.me> | 2018-06-07 03:05:38 +0800 |
commit | 2198276bd533bec767cad954ef8b21c47c0f8c09 (patch) | |
tree | 6e4ff66926a954815a8421c0062012842f236785 /app/scripts/controllers/transactions/index.js | |
parent | ffb8fa16497d0c4a48e3bd4b918dde1ac3adcd5d (diff) | |
parent | 1fb408f62eb081311937420bb42da6c835510590 (diff) | |
download | tangerine-wallet-browser-2198276bd533bec767cad954ef8b21c47c0f8c09.tar.gz tangerine-wallet-browser-2198276bd533bec767cad954ef8b21c47c0f8c09.tar.zst tangerine-wallet-browser-2198276bd533bec767cad954ef8b21c47c0f8c09.zip |
Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine
Diffstat (limited to 'app/scripts/controllers/transactions/index.js')
-rw-r--r-- | app/scripts/controllers/transactions/index.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js index 79241ed1a..c270be294 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 @@ -162,8 +163,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 blacklisted + recipientBlacklistChecker.checkAccount(txMeta.metamaskNetworkId, normalizedTxParams.to) + // add default tx params txMeta = await this.addTxGasDefaults(txMeta) } catch (error) { console.log(error) |