Add geth + Ethereum Wallet integration into Brave

.gitignore

@@ -57,6 +57,7 @@ Brave.tar.bz2
 app/extensions/gen
 app/extensions/brave/gen
 app/extensions/torrent/gen
+app/extensions/ethwallet
 *.pfx
 js/constants/buildConfig.js
 
@@ -80,3 +81,6 @@ app/extensions/brave/content/scripts/sync.js
 
 # script used for signing for widevine
 signature_generator.py
+
+# geth binary download
+app/extensions/bin/geth*

app/browser/tabs.js

@@ -626,7 +626,7 @@ const api = {
         // forget last active trail in window tab
         // is detaching from
         const oldTab = getTabValue(oldTabId)
-        const detachedFromWindowId = oldTab.get('windowId')
+        const detachedFromWindowId = oldTab ? oldTab.get('windowId') : undefined
         if (detachedFromWindowId != null) {
           activeTabHistory.clearTabFromWindow(detachedFromWindowId, oldTabId)
         }
@@ -804,6 +804,9 @@ const api = {
   },
 
   loadURLInActiveTab: (state, windowId, url) => {
+    if (windowId == null) {
+      windowId = BrowserWindow.getActiveWindow().id
+    }
     const tabValue = tabState.getActiveTab(state, windowId)
     if (tabValue) {
       api.loadURLInTab(state, tabValue.get('tabId'), url)

app/extensions.js

@@ -16,7 +16,10 @@ const fs = require('fs')
 const path = require('path')
 const l10n = require('../js/l10n')
 const {bravifyText} = require('./renderer/lib/extensionsUtil')
-const {componentUpdater, session} = require('electron')
+const {app, componentUpdater, session, ipcMain} = require('electron')
+const {spawn} = require('child_process')
+const ledgerState = require('./common/state/ledgerState')
+const net = require('net')
 
 // Takes Content Security Policy flags, for example { 'default-src': '*' }
 // Returns a CSP string, for example 'default-src: *;'
@@ -267,6 +270,45 @@ let generateTorrentManifest = () => {
   }
 }
 
+let generateEthwalletManifest = () => {
+  let cspDirectives = {
+    'default-src': '\'self\'',
+    'style-src': '\'self\' \'unsafe-inline\'',
+    'connect-src': 'blob: \'self\' http://localhost:* https://min-api.cryptocompare.com https://mini-api.cryptocompare.com',
+    'img-src': '\'self\' data:',
+    'script-src': '\'sha256-7B6rTuXUsu9shBeECmDFH4h7RDsfogQ3kIonJnIL40o=\' \'sha256-dHk4wOUZR8kQPod/eH4V2U8eAnISQFg5bqkG8wdrqiA=\' \'self\''
+  }
+
+  if (process.env.NODE_ENV === 'development') {
+    // allow access to webpack dev server resources
+    let devServer = 'localhost:' + process.env.npm_package_config_port
+    cspDirectives['default-src'] += ' http://' + devServer + ' ' + 'ws://' + devServer
+  }
+
+  return {
+    name: 'Ethereum Wallet',
+    description: l10n.translation('ethwalletDesc'),
+    manifest_version: 2,
+    version: '1.0',
+    content_security_policy: concatCSP(cspDirectives),
+    icons: {
+      128: 'ethereum-128.png',
+      48: 'ethereum-48.png',
+      16: 'ethereum-16.png'
+    },
+    browser_action: {
+      default_icon: {
+        38: 'ethereum-38.png',
+        19: 'ethereum-19.png'
+      },
+      default_popup: 'ethwallet-popup.html',
+      default_title: 'Ethereum Wallet'
+    },
+    incognito: 'split',
+    key: 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzrdMUtpj4PkN7uoeRC7pXsJyNC65iCWJObISzDQ/mCXerD3ATL54Y8TCkE1mS9O2tiZFY+og4g0GqLjT/M9GJ/Rjlj6cQqIaa9MnQ65H789V6rqPlTQyrd3udIylPJbr5aJ9RvuMcX8BKpT7SKcYvRSwZblKQ/OZ/a/5ylfM+QPyS5ZzooEq921I8eB4JF80aic/3cdU+Xmpyo/jdEe804/MemQ6kqlErXdNaFVU7fQ3lvCzWWcI+I3A1QbKSC2+G1HiToxllxU1gv+rAOsoHYwSkL2ZBTPkvnVBuV5vTS91GF3jGF9TMbw4m3TRNPJZkU32nfJy2JNaa1Ssnws+bQIDAQAB'
+  }
+}
+
 let generateSyncManifest = () => {
   let cspDirectives = {
     'default-src': '\'self\'',
@@ -480,7 +522,7 @@ module.exports.init = () => {
     }
     if (!extensionInfo.isLoaded(extensionId) && !extensionInfo.isLoading(extensionId)) {
       extensionInfo.setState(extensionId, extensionStates.LOADING)
-      if (extensionId === config.braveExtensionId || extensionId === config.torrentExtensionId || extensionId === config.cryptoTokenExtensionId || extensionId === config.syncExtensionId) {
+      if (extensionId === config.braveExtensionId || extensionId === config.torrentExtensionId || extensionId === config.ethwalletExtensionId || extensionId === config.cryptoTokenExtensionId || extensionId === config.syncExtensionId) {
         session.defaultSession.extensions.load(extensionPath, manifest, manifestLocation)
         return
       }
@@ -528,6 +570,68 @@ module.exports.init = () => {
   extensionInfo.setState(config.syncExtensionId, extensionStates.REGISTERED)
   loadExtension(config.syncExtensionId, getExtensionsPath('brave'), generateSyncManifest(), 'unpacked')
 
+  if (getSetting(settings.ETHWALLET_ENABLED)) {
+    var gethArgs = [
+      '--light',
+      '--rpc',
+      '--rpccorsdomain',
+      'chrome-extension://dakeiobolocmlkdebloniehpglcjkgcp',
+      '--datadir',
+      path.join(app.getPath('userData'), 'ethereum'),
+      '--ipcpath',
+      path.join(app.getPath('userData'), 'ethereum', 'geth.ipc')
+    ]
+    if (process.env.ETHEREUM_NETWORK === 'ropsten') {
+      gethArgs.push('--testnet')
+    }
+    var geth
+    if (process.platform === 'win32') {
+      geth = spawn(path.join(getExtensionsPath('bin'), 'geth.exe'), gethArgs)
+    } else {
+      geth = spawn(path.join(getExtensionsPath('bin'), 'geth'), gethArgs)
+    }
+    geth.stdout.on('data', (data) => {
+      console.warn(data.toString())
+    })
+    geth.on('exit', function (code, signal) {
+      geth.stdout.destroy()
+    })
+    geth.on('close', function (code, signal) {
+      geth.stdout.destroy()
+    })
+    extensionInfo.setState(config.ethwalletExtensionId, extensionStates.REGISTERED)
+    loadExtension(config.ethwalletExtensionId, getExtensionsPath('ethwallet'), generateEthwalletManifest(), 'component')
+    let popupWebContents = null
+    ipcMain.on('get-popup-bat-balance', (e) => {
+      const appState = appStore.getState()
+      const ledgerInfo = ledgerState.getInfoProps(appState)
+      popupWebContents = e.sender
+      e.sender.send('popup-bat-balance',
+        ledgerInfo.get('balance'),
+        ledgerInfo.getIn(['addresses', 'BAT']))
+    })
+    // Forward index load messages to the popup
+    ipcMain.on('ethwallet-index-loaded', () => {
+      if (popupWebContents) {
+        popupWebContents.send('ethwallet-index-loaded')
+      }
+    })
+    ipcMain.on('create-wallet', (e, pwd) => {
+      var client = net.createConnection(path.join(app.getPath('userData'), 'ethereum', 'geth.ipc'))
+
+      client.on('connect', () => {
+        client.write(JSON.stringify({ 'method': 'personal_newAccount', 'params': [pwd], 'id': 1, 'jsonrpc': '2.0' }))
+      })
+
+      client.on('data', (data) => {
+        client.end()
+      })
+    })
+  } else {
+    extensionInfo.setState(config.ethwalletExtensionId, extensionStates.DISABLED)
+    extensionActions.extensionDisabled(config.ethwalletExtensionId)
+  }
+
   if (getSetting(settings.TORRENT_VIEWER_ENABLED)) {
     extensionInfo.setState(config.torrentExtensionId, extensionStates.REGISTERED)
     loadExtension(config.torrentExtensionId, getExtensionsPath('torrent'), generateTorrentManifest(), 'component')

app/extensions/brave/ethwallet-main.js

@@ -0,0 +1,51 @@
+'use strict'
+
+const ipc = window.chrome.ipcRenderer
+
+window.addEventListener('load', () => {
+  document.body.style.zoom = '120%'
+  ipc.send('ethwallet-index-loaded')
+})
+
+Meteor.startup(function() {
+    Tracker.autorun(function(){
+        // If on ropsten, add the testnet BAT token, only once.
+        if (!localStorage['dapp_hasBAT'] && Session.get('network') === 'ropsten'){
+            localStorage.setItem('dapp_hasBAT', true)
+
+            // wait 5s, to allow the tokens to be loaded from the localstorage first
+            Meteor.setTimeout(function(){
+                const batToken = '0x60b10c134088ebd63f80766874e2cade05fc987b'
+                const tokenId = Helpers.makeId('token', batToken)
+                Tokens.upsert(tokenId, {$set: {
+                    address: batToken,
+                    name: 'BAT Ropsten',
+                    symbol: 'BATr',
+                    balances: {},
+                    decimals: 18
+                }})
+            }, 5000)
+
+        // If on main net, add the BAT token, only once.
+        } else if (!localStorage['dapp_hasBAT'] && Session.get('network') === 'main'){
+            localStorage.setItem('dapp_hasBAT', true)
+
+            // wait 5s, to allow the tokens to be loaded from the localstorage first
+            Meteor.setTimeout(function(){
+                const batToken = '0x0D8775F648430679A709E98d2b0Cb6250d2887EF'
+                const tokenId = Helpers.makeId('token', batToken)
+                Tokens.upsert(tokenId, {$set: {
+                    address: batToken,
+                    name: 'Basic Attention Token',
+                    symbol: 'BAT',
+                    balances: {},
+                    decimals: 18
+                }})
+            }, 5000)
+        }
+    })
+})
+
+
+var sheet = document.styleSheets[0]
+sheet.insertRule('body { filter: invert(100%) }', 1)

app/extensions/brave/ethwallet-popup.html

@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<html>
+  <head>
+    <style>
+      html, body {
+        background: #222;
+      }
+      button {
+        font-size: 14px;
+        font-weight: bold;
+        padding: 10px;
+        margin: 10px;
+        margin-left: 8px;
+        margin-top: 6px;
+        text-align: center;
+        width: 250px;
+      }
+      input {
+        font-size: 15px;
+        margin-left: 8px;
+        margin-bottom: 8px;
+        margin-top: 8px;
+        width: 240px;
+      }
+      #label {
+        font-size: 14px;
+        font-weight: bold;
+        margin-left: 8px;
+        color: white;
+      }
+      .hidden {
+        display: none;
+      }
+      .visible {
+        display: block;
+      }
+    </style>
+    <script src="ethwallet-popup.js" async></script>
+  </head>
+  <body>
+      <div id="appContainer" class="visible">
+          <div id='batBalance'></div>
+          <div>
+            <button id="openEthwallet">Open Ethereum Wallet</button>
+          </div>
+          <div>
+            <button id="transferFunds">Transfer Funds to Brave Wallet...</button>
+          </div>
+          <div>
+            <button id="createWallet">Create Ethereum Wallet...</button>
+          </div>
+      </div>
+      <div id="create" class="hidden">
+        <div id="label">Enter Wallet Password: </div>
+        <div>
+          <input type="password" id="pwd" />
+        </div>
+        <div>
+          <button id="createEthWallet">Create</button>
+        </div>
+        <div>
+          <button id="back">Back</button>
+        </div>
+      </div>
+  </body>
+</html>

app/extensions/brave/ethwallet-popup.js

@@ -0,0 +1,65 @@
+'use strict'
+
+const ipc = window.chrome.ipcRenderer
+let batAddress = null
+const indexUrl = `${window.location.origin}/index.html`
+
+ipc.send('get-popup-bat-balance')
+ipc.on('popup-bat-balance', (e, amount, walletAddress) => {
+  /*
+  if (amount) {
+    document.getElementById('batBalance').innerText = `Brave Wallet Balance: ${amount} BAT`
+  }
+  */
+  batAddress = walletAddress
+})
+
+const doAction = (message, args) => {
+  args.actionType = message
+  ipc.send('dispatch-action', JSON.stringify([args]))
+}
+
+const onBack = () => {
+   document.getElementById('create').classList.remove('visible')
+   document.getElementById('create').classList.add('hidden')
+   document.getElementById('appContainer').classList.remove('hidden')
+   document.getElementById('appContainer').classList.add('visible')
+}
+
+document.getElementById('createEthWallet').onclick = () => {
+  var pwd = document.getElementById('pwd').value
+  ipc.send('create-wallet', pwd)
+  onBack()
+}
+
+document.getElementById('createWallet').onclick = () => {
+   document.getElementById('create').classList.add('visible')
+   document.getElementById('create').classList.remove('hidden')
+   document.getElementById('appContainer').classList.add('hidden')
+   document.getElementById('appContainer').classList.remove('visible')
+}
+
+document.getElementById('back').onclick = onBack
+
+document.getElementById('openEthwallet').onclick = () => {
+  doAction('app-create-tab-requested', {
+    createProperties: {
+      url: indexUrl
+    }
+  })
+}
+
+document.getElementById('transferFunds').onclick = () => {
+  const sendUrl = `${window.location.origin}/#!send/${batAddress || ''}`
+  doAction('app-create-tab-requested', {
+    createProperties: {
+      url: indexUrl
+    }
+  })
+  // Meteor can't load sendUrl until indexUrl has already been loaded :(
+  ipc.once('ethwallet-index-loaded', () => {
+    doAction('app-load-url-in-active-tab-requested', {
+      url: sendUrl
+    })
+  })
+}

app/extensions/brave/locales/en-US/extensions.properties

@@ -33,5 +33,7 @@ sync= Brave Sync
 syncDesc=
 torrent= Torrent Viewer
 torrentDesc=Uses WebTorrent to display torrents directly in the browser. Supports torrent files and magnet links.
+ethwallet=Ethereum Wallet
+ethwalletDesc=Local Ethereum Wallet with hardware wallet support, based on https://wallet.ethereum.org.
 vimium= Vimium
-vimiumDesc=
+vimiumDesc=

app/locale.js

@@ -256,6 +256,7 @@ var rendererIdentifiers = function () {
     'downloadPaused',
     'noDownloads',
     'torrentDesc',
+    'ethwalletDesc',
     'multiSelectionBookmarks',
     // Caption buttons in titlebar (min/max/close - Windows only)
     'windowCaptionButtonMinimize',