From d0f8a14acec274e97d35d9f7a63605581ad21511 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Wed, 1 Jun 2016 16:14:49 -0700 Subject: [PATCH 1/2] Add test case for sample hashed address --- test/unit/util_test.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/unit/util_test.js b/test/unit/util_test.js index f003395b3..6ad27ed81 100644 --- a/test/unit/util_test.js +++ b/test/unit/util_test.js @@ -77,6 +77,13 @@ describe('util', function() { assert.ok(!result) }) + it('should recognize this sample hashed address', function() { + const address = '0x5Fda30Bb72B8Dfe20e48A00dFc108d0915BE9BbA' + const result = util.isValidAddress(address) + const hashed = ethUtil.toChecksumAddress(address) + assert.equal(hashed, address, 'example is hashed correctly') + assert.ok(result) + }) }) describe('numericBalance', function() { From 272bea31b5983a64c26fdc28c827ccd456bc778f Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Thu, 2 Jun 2016 18:42:09 -0700 Subject: [PATCH 2/2] Fix hashed address validation --- test/unit/util_test.js | 6 +++--- ui/app/util.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/unit/util_test.js b/test/unit/util_test.js index 6ad27ed81..12a16999e 100644 --- a/test/unit/util_test.js +++ b/test/unit/util_test.js @@ -78,11 +78,11 @@ describe('util', function() { }) it('should recognize this sample hashed address', function() { - const address = '0x5Fda30Bb72B8Dfe20e48A00dFc108d0915BE9BbA' + const address = '0x5Fda30Bb72B8Dfe20e48A00dFc108d0915BE9Bb0' const result = util.isValidAddress(address) - const hashed = ethUtil.toChecksumAddress(address) + const hashed = ethUtil.toChecksumAddress(address.toLowerCase()) assert.equal(hashed, address, 'example is hashed correctly') - assert.ok(result) + assert.ok(result, 'is valid by our check') }) }) diff --git a/ui/app/util.js b/ui/app/util.js index 91f85e43f..6ece28a9e 100644 --- a/ui/app/util.js +++ b/ui/app/util.js @@ -52,7 +52,7 @@ function addressSummary(address) { function isValidAddress(address) { var prefixed = ethUtil.addHexPrefix(address) - return isAllOneCase(prefixed) && ethUtil.isValidAddress(prefixed) || ethUtil.isValidChecksumAddress(prefixed) + return (isAllOneCase(prefixed) && ethUtil.isValidAddress(prefixed)) || ethUtil.isValidChecksumAddress(prefixed) } function isAllOneCase(address) {