Merge pull request #1025 from eswarasai/master

Initial commit to check for valid address

src/app/tabs/run-tab.js

@@ -12,6 +12,7 @@ var copyToClipboard = require('../ui/copy-to-clipboard')
 var Recorder = require('../../recorder')
 var EventManager = remixLib.EventManager
 var addTooltip = require('../ui/tooltip')
+var ethJSUtil = require('ethereumjs-util')
 
 var csjs = require('csjs-inject')
 var css = require('./styles/run-tab-styles')
@@ -311,6 +312,12 @@ function contractDropdown (events, appAPI, appEvents, instanceContainer) {
     noInstancesText.style.display = 'none'
     var contractNames = document.querySelector(`.${css.contractNames.classNames[0]}`)
     var address = atAddressButtonInput.value
+    if (!ethJSUtil.isValidAddress(address)) {
+      return modalDialogCustom.alert('Invalid address.')
+    }
+    if (/[a-f]/.test(address) && /[A-F]/.test(address) && !ethJSUtil.isValidChecksumAddress(address)) {
+      return modalDialogCustom.alert('Invalid checksum address.')
+    }
     if (/.(.abi)$/.exec(appAPI.currentFile())) {
       modalDialogCustom.confirm(null, 'Do you really want to interact with ' + address + ' using the current ABI definition ?', () => {
         var abi

test-browser/helpers/contracts.js

@@ -161,16 +161,19 @@ function setEditorValue (value, callback) {
   return this
 }
 
-function addInstance (browser, address, callback) {
+function addInstance (browser, address, isValidFormat, isValidChecksum, callback) {
-  browser.setValue('.ataddressinput', address, function () {
+  browser.clearValue('.ataddressinput').setValue('.ataddressinput', address, function () {
     browser.click('div[class^="atAddress"]')
-      .perform((client, done) => {
+      .execute(function () {
-        browser.execute(function () {
+        var ret = document.querySelector('div[class^="modalBody"] div').innerHTML
-          document.querySelector('#modal-footer-ok').click()
+        document.querySelector('#modal-footer-ok').click()
-        }, [], function (result) {
+        return ret
-          done()
+      }, [], function (result) {
-        })
+        if (!isValidFormat) {
-      }).perform(() => {
+          browser.assert.equal(result.value, 'Invalid address.')
+        } else if (!isValidChecksum) {
+          browser.assert.equal(result.value, 'Invalid checksum address.')
+        }
         callback()
       })
   })

test-browser/tests/ballot.js

@@ -72,8 +72,14 @@ function runTests (browser, testData) {
         })
       })
       .perform((client, done) => {
-        console.log('addInstance 0x692a70d2e424a56d2c6c27aa97d1a86395877b3a')
+        console.log('addInstance invalid checksum address 0x692a70D2e424a56D2C6C27aA97D1a86395877b3B')
-        contractHelper.addInstance(browser, '0x692a70d2e424a56d2c6c27aa97d1a86395877b3a', () => {
+        contractHelper.addInstance(browser, '0x692a70D2e424a56D2C6C27aA97D1a86395877b3B', true, false, () => {
+          done()
+        })
+      })
+      .perform((client, done) => {
+        console.log('addInstance 0x692a70D2e424a56D2C6C27aA97D1a86395877b3A')
+        contractHelper.addInstance(browser, '0x692a70D2e424a56D2C6C27aA97D1a86395877b3A', true, true, () => {
           done()
         })
       })