aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Finlay <somniac@me.com>2016-10-06 06:48:57 +0800
committerGitHub <noreply@github.com>2016-10-06 06:48:57 +0800
commit7c006dac559d1c1bdd999cb3ca03bd1834dcace5 (patch)
treebfb20202c9ede3b88b664655fcb2afc3a9b8a80d
parent3e09e6a9176852faee5c73863a97019c0de0b21d (diff)
parent07c65ecf9d1d93e51ac277fd5094725f07bee936 (diff)
downloadtangerine-wallet-browser-7c006dac559d1c1bdd999cb3ca03bd1834dcace5.tar.gz
tangerine-wallet-browser-7c006dac559d1c1bdd999cb3ca03bd1834dcace5.tar.zst
tangerine-wallet-browser-7c006dac559d1c1bdd999cb3ca03bd1834dcace5.zip
Merge pull request #709 from MetaMask/i707-MixedCaseAddresses
Add tolerance for mixed case addresses
-rw-r--r--app/scripts/lib/id-management.js4
-rw-r--r--development/announcer.js2
-rw-r--r--package.json2
3 files changed, 4 insertions, 4 deletions
diff --git a/app/scripts/lib/id-management.js b/app/scripts/lib/id-management.js
index e250943a0..2d42e1e30 100644
--- a/app/scripts/lib/id-management.js
+++ b/app/scripts/lib/id-management.js
@@ -26,7 +26,7 @@ function IdManagement (opts) {
this.signTx = function (txParams) {
// normalize values
txParams.to = ethUtil.addHexPrefix(txParams.to)
- txParams.from = ethUtil.addHexPrefix(txParams.from)
+ txParams.from = ethUtil.addHexPrefix(txParams.from.toLowerCase())
txParams.value = ethUtil.addHexPrefix(txParams.value)
txParams.data = ethUtil.addHexPrefix(txParams.data)
txParams.gasLimit = ethUtil.addHexPrefix(txParams.gasLimit || txParams.gas)
@@ -51,7 +51,7 @@ function IdManagement (opts) {
this.signMsg = function (address, message) {
// sign message
- var privKeyHex = this.exportPrivateKey(address)
+ var privKeyHex = this.exportPrivateKey(address.toLowerCase())
var privKey = ethUtil.toBuffer(privKeyHex)
var msgSig = ethUtil.ecsign(new Buffer(message.replace('0x', ''), 'hex'), privKey)
var rawMsgSig = ethUtil.bufferToHex(concatSig(msgSig.v, msgSig.r, msgSig.s))
diff --git a/development/announcer.js b/development/announcer.js
index 8939244d3..273d5c90a 100644
--- a/development/announcer.js
+++ b/development/announcer.js
@@ -7,6 +7,6 @@ var changelog = fs.readFileSync(path.join(__dirname, '..', 'CHANGELOG.md')).toSt
var log = changelog.split(version)[1].split('##')[0].trim()
-let msg = `**MetaMask ${version}** now published to the Chrome Store! It should be available over the next hour!\n${log}`
+let msg = `*MetaMask ${version}* now published to the Chrome Store! It should be available over the next hour!\n${log}`
console.log(msg)
diff --git a/package.json b/package.json
index 4f531e8fe..273117f8a 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,7 @@
"through2": "^2.0.1",
"vreme": "^3.0.2",
"web3": "ethereum/web3.js#260ac6e78a8ce4b2e13f5bb0fdb65f4088585876",
- "web3-provider-engine": "^8.1.3",
+ "web3-provider-engine": "^8.1.5",
"web3-stream-provider": "^2.0.6",
"xtend": "^4.0.1"
},