aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/manifest.json2
-rw-r--r--app/scripts/lib/id-management.js14
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')
}
+