Ensure public keys are constructed correctly

AndrewKishino · May 28, 2020 · 17c7bd4 · 17c7bd4
1 parent 6150609
commit 17c7bd4
Show file tree

Hide file tree

Showing 8 changed files with 632 additions and 315 deletions.
diff --git a/dist/node/index.js b/dist/node/index.js
diff --git a/dist/types/index.d.ts b/dist/types/index.d.ts
@@ -1,8 +1,8 @@
-import Sotez from "./sotez";
-export { default as Key } from "./key";
-export { default as crypto } from "./crypto";
-export { default as forge } from "./forge";
-export { default as utility } from "./utility";
-export { default as ledger } from "./ledger";
-export { default as constants } from "./constants";
+import Sotez from './sotez';
+export { default as Key } from './key';
+export { default as crypto } from './crypto';
+export { default as forge } from './forge';
+export { default as utility } from './utility';
+export { default as ledger } from './ledger';
+export { default as constants } from './constants';
 export default Sotez;
diff --git a/dist/web/index.js b/dist/web/index.js
diff --git a/lib/key.js b/lib/key.js
@@ -147,10 +147,14 @@ export default class Key {
                         .toArray()[31] % 2
                         ? 3
                         : 2;
-                    this._publicKey = toBuffer(new Uint8Array([prefixVal].concat(keyPair
+                    // Need to pad keypair array to maintain a length of 32
+                    const pad = [0, 0];
+                    this._publicKey = toBuffer(new Uint8Array([prefixVal].concat(pad
+                        .concat(keyPair
                         .getPublic()
                         .getX()
-                        .toArray())));
+                        .toArray())
+                        .slice(-32))));
                 }
                 else if (this._curve === 'p2') {
                     const keyPair = new elliptic.ec('p256').keyFromPrivate(constructedKey);
@@ -160,10 +164,14 @@ export default class Key {
                         .toArray()[31] % 2
                         ? 3
                         : 2;
-                    this._publicKey = toBuffer(new Uint8Array([prefixVal].concat(keyPair
+                    // Need to pad keypair array to maintain a length of 32
+                    const pad = [0, 0];
+                    this._publicKey = toBuffer(new Uint8Array([prefixVal].concat(pad
+                        .concat(keyPair
                         .getPublic()
                         .getX()
-                        .toArray())));
+                        .toArray())
+                        .slice(-32))));
                 }
                 else {
                     throw new Error('Invalid key');