From 408addb1b2a795515149dbde8131fa40cba721f4 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 16 Jun 2016 11:46:35 -0700
Subject: [PATCH] Fixed signing of hashes

Signing now always takes a 64 digit hex string, and returns a message signature which appropriately pads r, s, and v with zeroes.

Need to verify with Denis that this is the behavior he requires.
---
 app/scripts/lib/id-management.js | 23 ++++++++++-------------
 test/unit/id-management-test.js  | 10 ++++++----
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/app/scripts/lib/id-management.js b/app/scripts/lib/id-management.js
index 0edd2e336..30a3141f1 100644
--- a/app/scripts/lib/id-management.js
+++ b/app/scripts/lib/id-management.js
@@ -39,16 +39,14 @@ function IdManagement(opts) {
     return rawTx
   }
 
-  this.signMsg = function(address, message){
+  this.signMsg = function (address, message) {
     // sign message
-    var privKeyHex = this.exportPrivateKey(address)
-    var privKey = ethUtil.toBuffer(privKeyHex)
-    var msgHash = ethUtil.sha3(message)
-    var msgBuffer = new Buffer(message.replace('0x',''), 'hex')
-    var msgSig = ethUtil.ecsign(msgBuffer, privKey)
-    var rawMsgSig = ethUtil.bufferToHex(concatSig(msgSig.v, msgSig.r, msgSig.s))
-    return rawMsgSig
-  }
+    var privKeyHex = this.exportPrivateKey(address);
+    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));
+    return rawMsgSig;
+  };
 
   this.getSeed = function(){
     return this.keyStore.getSeed(this.derivedKey)
@@ -71,9 +69,8 @@ function pad_with_zeroes(number, length){
 function concatSig(v, r, s) {
   r = pad_with_zeroes(ethUtil.fromSigned(r), 64)
   s = pad_with_zeroes(ethUtil.fromSigned(s), 64)
-  v = ethUtil.bufferToInt(v)
-  r = ethUtil.toUnsigned(r).toString('hex')
-  s = ethUtil.toUnsigned(s).toString('hex')
+  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).toString("hex"))
+  return ethUtil.addHexPrefix(r.concat(s, v))
 }
diff --git a/test/unit/id-management-test.js b/test/unit/id-management-test.js
index ca1f0ffaa..61cdf4d8b 100644
--- a/test/unit/id-management-test.js
+++ b/test/unit/id-management-test.js
@@ -17,15 +17,17 @@ describe('IdManagement', function() {
 
   describe('#signMsg', function () {
     const address = '0x926cD0393816429a580037475ec23eD65fDC893B'
-    const message = '0x0987654321abcdef'
+    const message = '0x96b8d442f4c09a08d266bf37b18219465cfb341c1b3ab9792a6103a93583fdf7'
     const privateKey = '0xd291f7aa01b94941b446f260bca42c0752762571428ad4ed6239613c66365cf4'
-    const expectedResult = 'foo'
+    const expectedResult = '0x04881196121781472543750166203264808665659193717384627772472141185319786561270240926993050673320157359365329096037150419976876479876332927284781689204045461c'
 
     const idManagement = new IdManagement()
-    const exportKeyStub = sinon.stub(idManagement, 'exportPrivateKey', () => privateKey)
+    const exportKeyStub = sinon.stub(idManagement, 'exportPrivateKey', (addr) => {
+      assert.equal(addr, address)
+      return privateKey
+    })
 
     const result = idManagement.signMsg(address, message)
-    console.log(result)
     assert.equal(result, expectedResult)
   })
 })