diff options
| author | Dan Finlay <flyswatter@users.noreply.github.com> | 2017-01-18 04:08:03 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-18 04:08:03 +0800 |
| commit | a245fb7d22a5fe08c4fc8c2c1c64d406805018a8 (patch) | |
| tree | ffcd05bfa6d1fb42ef8fdd20381e054a13c93517 /app/scripts | |
| parent | 4bc09be6473539c4889143621af6681ac3a838b6 (diff) | |
| parent | 56070cd13856a870193bb5f4256ab45189b89bdd (diff) | |
| download | tangerine-wallet-browser-a245fb7d22a5fe08c4fc8c2c1c64d406805018a8.tar tangerine-wallet-browser-a245fb7d22a5fe08c4fc8c2c1c64d406805018a8.tar.gz tangerine-wallet-browser-a245fb7d22a5fe08c4fc8c2c1c64d406805018a8.tar.bz2 tangerine-wallet-browser-a245fb7d22a5fe08c4fc8c2c1c64d406805018a8.tar.lz tangerine-wallet-browser-a245fb7d22a5fe08c4fc8c2c1c64d406805018a8.tar.xz tangerine-wallet-browser-a245fb7d22a5fe08c4fc8c2c1c64d406805018a8.tar.zst tangerine-wallet-browser-a245fb7d22a5fe08c4fc8c2c1c64d406805018a8.zip | |
Merge pull request #1019 from MetaMask/i1014-FixSigning
dev - fix signing
Diffstat (limited to 'app/scripts')
| -rw-r--r-- | app/scripts/keyring-controller.js | 1 | ||||
| -rw-r--r-- | app/scripts/keyrings/hd.js | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js index 79cfe6fbd..4be00a5a5 100644 --- a/app/scripts/keyring-controller.js +++ b/app/scripts/keyring-controller.js @@ -397,6 +397,7 @@ module.exports = class KeyringController extends EventEmitter { }).then((rawSig) => { cb(null, rawSig) approvalCb(null, true) + messageManager.confirmMsg(msgId) return rawSig }) } catch (e) { diff --git a/app/scripts/keyrings/hd.js b/app/scripts/keyrings/hd.js index 80b713b58..1b9796e07 100644 --- a/app/scripts/keyrings/hd.js +++ b/app/scripts/keyrings/hd.js @@ -76,7 +76,7 @@ class HdKeyring extends EventEmitter { // For eth_sign, we need to sign transactions: signMessage (withAccount, data) { const wallet = this._getWalletForAccount(withAccount) - const message = ethUtil.removeHexPrefix(data) + const message = ethUtil.stripHexPrefix(data) var privKey = wallet.getPrivateKey() var msgSig = ethUtil.ecsign(new Buffer(message, 'hex'), privKey) var rawMsgSig = ethUtil.bufferToHex(sigUtil.concatSig(msgSig.v, msgSig.r, msgSig.s)) |