Merge pull request #569 from ethereum/showAccountBalances

src/app.js

@@ -770,6 +770,15 @@ var run = function () {
     },
     getAccounts: (callback) => {
       udapp.getAccounts(callback)
+    },
+    getBalance: (address, callback) => {
+      udapp.getBalance(address, (error, balance) => {
+        if (error) {
+          callback(error)
+        } else {
+          callback(null, executionContext.web3().fromWei(balance, 'ether'))
+        }
+      })
     }
   }
   var renderer = new Renderer(rendererAPI, compiler.event)

src/app/renderer.js

@@ -3,6 +3,7 @@
 var $ = require('jquery')
 
 var utils = require('./utils')
+var helper = require('../lib/helper.js')
 
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
@@ -61,6 +62,7 @@ function Renderer (appAPI, compilerEvent) {
       })
     }
   })
+  setInterval(() => { updateAccountBalances(self, appAPI) }, 1000)
 }
 
 Renderer.prototype.clear = function () {
@@ -344,4 +346,17 @@ Renderer.prototype.contracts = function (data, source) {
   $('.' + css.col2 + ' input,textarea').click(function () { this.select() })
 }
 
+function updateAccountBalances (self, appAPI) {
+  var accounts = $('#txorigin').children('option')
+  accounts.each(function (index, value) {
+    (function (acc) {
+      appAPI.getBalance(accounts[acc].value, function (err, res) {
+        if (!err) {
+          accounts[acc].innerText = helper.shortenAddress(accounts[acc].value, res)
+        }
+      })
+    })(index)
+  })
+}
+
 module.exports = Renderer

src/lib/helper.js

+module.exports = {
+  shortenAddress: function (address, etherBalance) {
+    var len = address.length
+    return address.slice(0, 5) + '...' + address.slice(len - 5, len) + (etherBalance ? ' (' + etherBalance.toString() + ' ether)' : '')
+  }
+}

src/universal-dapp.js

@@ -9,6 +9,7 @@ var EventManager = require('ethereum-remix').lib.EventManager
 var crypto = require('crypto')
 var async = require('async')
 var TxRunner = require('./app/txRunner')
+var helper = require('./lib/helper')
 var yo = require('yo-yo')
 
 // copy to copyToClipboard
@@ -353,8 +354,7 @@ UniversalDApp.prototype.getInstanceInterface = function (contract, address, $tar
     var context = self.executionContext.isVM() ? 'memory' : 'blockchain'
 
     address = (address.slice(0, 2) === '0x' ? '' : '0x') + address.toString('hex')
-    var len = address.length
-    var shortAddress = address.slice(0, 5) + '...' + address.slice(len - 5, len)
+    var shortAddress = helper.shortenAddress(address)
     var title = yo`
       <div class="${cssInstance.title}" onclick=${toggleClass}>
         <div class="${cssInstance.titleText}"> ${contract.name} at ${shortAddress} (${context}) </div>
@@ -366,7 +366,7 @@ UniversalDApp.prototype.getInstanceInterface = function (contract, address, $tar
     }
 
     function copyToClipboard (event) {
-      event.stopPropagation();
+      event.stopPropagation()
       copy(address)
     }