diff options
| author | Frankie <frankie.pangilinan@consensys.net> | 2016-06-23 06:44:30 +0800 |
|---|---|---|
| committer | Frankie <frankie.pangilinan@consensys.net> | 2016-06-23 06:44:30 +0800 |
| commit | 9e42f1f3a75536c43cb9dc7bdb735258f04d6365 (patch) | |
| tree | f41a34805f6adbb4273a4900b6393101282f1eb8 /app | |
| parent | f0e64112771612a79ed7c23bc8147e692c7f8356 (diff) | |
| parent | a4ebb7656af0c11bf706689f4447ec0785d39c48 (diff) | |
| download | tangerine-wallet-browser-9e42f1f3a75536c43cb9dc7bdb735258f04d6365.tar tangerine-wallet-browser-9e42f1f3a75536c43cb9dc7bdb735258f04d6365.tar.gz tangerine-wallet-browser-9e42f1f3a75536c43cb9dc7bdb735258f04d6365.tar.bz2 tangerine-wallet-browser-9e42f1f3a75536c43cb9dc7bdb735258f04d6365.tar.lz tangerine-wallet-browser-9e42f1f3a75536c43cb9dc7bdb735258f04d6365.tar.xz tangerine-wallet-browser-9e42f1f3a75536c43cb9dc7bdb735258f04d6365.tar.zst tangerine-wallet-browser-9e42f1f3a75536c43cb9dc7bdb735258f04d6365.zip | |
Merge branch 'master' into fontChange
Diffstat (limited to 'app')
| -rw-r--r-- | app/manifest.json | 2 | ||||
| -rw-r--r-- | app/scripts/lib/id-management.js | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/app/manifest.json b/app/manifest.json index dede7402a..a0c3a7e8f 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "__MSG_appName__", "short_name": "Metamask", - "version": "2.4.1", + "version": "2.4.2", "manifest_version": 2, "description": "__MSG_appDescription__", "icons": { diff --git a/app/scripts/lib/id-management.js b/app/scripts/lib/id-management.js index 30ea866f4..cc50bd649 100644 --- a/app/scripts/lib/id-management.js +++ b/app/scripts/lib/id-management.js @@ -69,10 +69,12 @@ function padWithZeroes (number, length) { } function concatSig (v, r, s) { - r = padWithZeroes(ethUtil.fromSigned(r), 64) - s = padWithZeroes(ethUtil.fromSigned(s), 64) - r = ethUtil.stripHexPrefix(r.toString('hex')) - s = ethUtil.stripHexPrefix(s.toString('hex')) - v = ethUtil.stripHexPrefix(ethUtil.intToHex(v)) - return ethUtil.addHexPrefix(r.concat(s, v)) + const rSig = ethUtil.fromSigned(r) + const sSig = ethUtil.fromSigned(s) + const vSig = ethUtil.bufferToInt(v) + const rStr = padWithZeroes(ethUtil.toUnsigned(rSig).toString('hex'), 64) + const sStr = padWithZeroes(ethUtil.toUnsigned(sSig).toString('hex'), 64) + const vStr = ethUtil.stripHexPrefix(ethUtil.intToHex(vSig)) + return ethUtil.addHexPrefix(rStr.concat(sStr, vStr)).toString('hex') } + |