From d02b2c4b4a4a33d399db94fd62a5e4e7b8eb2589 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Wed, 5 Oct 2016 11:10:39 -0700 Subject: Correct async link --- app/scripts/lib/inpage-provider.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'app/scripts/lib') diff --git a/app/scripts/lib/inpage-provider.js b/app/scripts/lib/inpage-provider.js index 4f9fa1a7d..bcde333d0 100644 --- a/app/scripts/lib/inpage-provider.js +++ b/app/scripts/lib/inpage-provider.js @@ -33,7 +33,7 @@ function MetamaskInpageProvider (connectionStream) { }) asyncProvider.on('error', console.error.bind(console)) self.asyncProvider = asyncProvider - + self.idMap = {} // handle sendAsync requests via asyncProvider self.sendAsync = function(payload, cb){ @@ -61,7 +61,7 @@ function MetamaskInpageProvider (connectionStream) { MetamaskInpageProvider.prototype.send = function (payload) { const self = this - + let selectedAddress let result = null switch (payload.method) { @@ -80,8 +80,8 @@ MetamaskInpageProvider.prototype.send = function (payload) { // throw not-supported Error default: - var message = 'The MetaMask Web3 object does not support synchronous methods like ' + payload.method + - '. See https://github.com/MetaMask/faq/blob/master/DEVELOPERS.md#all-async---think-of-metamask-as-a-light-client for details.' + var link = 'https://github.com/MetaMask/faq/blob/master/DEVELOPERS.md#dizzy-all-async---think-of-metamask-as-a-light-client' + var message = `The MetaMask Web3 object does not support synchronous methods like ${payload.method}. See ${link} for details.` throw new Error(message) } -- cgit v1.2.3 From f21170c7c39a684697b99a2d97ed3e72f549b57e Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Wed, 5 Oct 2016 15:26:26 -0700 Subject: Add tolerance for sending from mixed-case addresses. We had to convert to lower case, and also had to modify the new provider-engine sanitizer to tolerate mixed case addresses. Fixes #707 --- app/scripts/lib/id-management.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/scripts/lib') 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)) -- cgit v1.2.3