Merge pull request #1786 from MetaMask/turnOffAutoFaucet

turn off auto faucet

3 files changed, 1 insertions, 24 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7b6316db..ddb07e6a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Current Master
 
+- No longer automatically request 1 ropsten ether for the first account in a new vault.
 - Now redirects from known malicious sites faster.
 - Added a link to our new support page to the help screen.
 
diff --git a/app/scripts/lib/auto-faucet.js b/app/scripts/lib/auto-faucet.js
deleted file mode 100644
index 38d54ba5e..000000000
--- a/app/scripts/lib/auto-faucet.js
+++ /dev/null
@@ -1,20 +0,0 @@
-const uri = 'https://faucet.metamask.io/'
-const METAMASK_DEBUG = 'GULP_METAMASK_DEBUG'
-const env = process.env.METAMASK_ENV
-
-module.exports = function (address) {
-  // Don't faucet in development or test
-  if (METAMASK_DEBUG === true || env === 'test') return
-  global.log.info('auto-fauceting:', address)
-  const data = address
-  const headers = new Headers()
-  headers.append('Content-type', 'application/rawdata')
-  fetch(uri, {
-    method: 'POST',
-    headers,
-    body: data,
-  })
-  .catch((err) => {
-    console.error(err)
-  })
-}
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index c6c3fde1e..11dcde2c1 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -20,7 +20,6 @@ const MessageManager = require('./lib/message-manager')
 const PersonalMessageManager = require('./lib/personal-message-manager')
 const TransactionController = require('./controllers/transactions')
 const ConfigManager = require('./lib/config-manager')
-const autoFaucet = require('./lib/auto-faucet')
 const nodeify = require('./lib/nodeify')
 const accountImporter = require('./account-import-strategies')
 const getBuyEthUrl = require('./lib/buy-eth-url')
@@ -90,9 +89,6 @@ module.exports = class MetamaskController extends EventEmitter {
     this.keyringController.on('newAccount', (address) => {
       this.preferencesController.setSelectedAddress(address)
     })
-    this.keyringController.on('newVault', (address) => {
-      autoFaucet(address)
-    })
 
     // address book controller
     this.addressBookController = new AddressBookController({