Merge pull request #52 from DECENTfoundation/develop

Develop
DECENTfoundation · Mar 21, 2019 · 56a2ef1 · 56a2ef1
2 parents 91cadc8 + 65d0709
commit 56a2ef1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dcorejs-lib",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "Low level javascript library for Decent blockchain",
   "browser": {
     "ws": false,
@@ -36,7 +36,7 @@
     "ReconnectingWebSocket": "git+https://github.com/bitshares/reconnecting-websocket.git",
     "bigi": "^1.4.1",
     "bs58": "^3.1.0",
-    "bytebuffer": "^5.0.0",
+    "bytebuffer": "^5.0.1",
     "create-hash": "^1.1.2",
     "create-hmac": "^1.1.4",
     "crypto-js": "^3.1.9-1",

diff --git a/src/ecc/src/ecdsa.js b/src/ecc/src/ecdsa.js
@@ -12,7 +12,7 @@ function deterministicGenerateK(curve, hash, d, checkSig, nonce) {
     enforceType(BigInteger, d);
 
     if (nonce) {
-        hash = sha256(Buffer.concat([hash, Buffer.from(nonce)]))
+        hash = sha256(Buffer.concat([hash, Buffer.from([nonce+''])]))
     }
 
     // sanity check
@@ -29,13 +29,13 @@ function deterministicGenerateK(curve, hash, d, checkSig, nonce) {
     k.fill(0);
 
     // Step D
-    k = HmacSHA256(Buffer.concat([v, Buffer.from([0]), x, hash]), k);
+    k = HmacSHA256(Buffer.concat([v, Buffer.from([0+'']), x, hash]), k);
 
     // Step E
     v = HmacSHA256(v, k);
 
     // Step F
-    k = HmacSHA256(Buffer.concat([v, Buffer.from([1]), x, hash]), k);
+    k = HmacSHA256(Buffer.concat([v, Buffer.from([1+'']), x, hash]), k);
 
     // Step G
     v = HmacSHA256(v, k);
@@ -48,7 +48,7 @@ function deterministicGenerateK(curve, hash, d, checkSig, nonce) {
 
     // Step H3, repeat until T is within the interval [1, n - 1]
     while ((T.signum() <= 0) || (T.compareTo(curve.n) >= 0) || !checkSig(T)) {
-        k = HmacSHA256(Buffer.concat([v, Buffer.from([0])]), k);
+        k = HmacSHA256(Buffer.concat([v, Buffer.from([0+''])]), k);
         v = HmacSHA256(v, k);
 
         // Step H1/H2a, again, ignored as tlen === qlen (256 bit)

diff --git a/src/serializer/src/FastParser.js b/src/serializer/src/FastParser.js
@@ -28,7 +28,7 @@ class FastParser {
             let buffer = public_key.toBuffer();
             b.append(buffer.toString('binary'), 'binary');
         } else {
-            buffer = FastParser.fixed_data(b, 33);
+            let buffer = FastParser.fixed_data(b, 33);
             return PublicKey.fromBuffer(buffer);
         }
     }