Remove window.crypto, and update syntax

Anton Cheng · Anton Cheng · commit 895537a1e1fb · 2020-01-13T16:18:30.000+08:00
diff --git a/.eslintignore b/.eslintignore
@@ -1 +1,2 @@
-/packages/*/lib
+/packages/*/lib
+/packages/*/node_modules
diff --git a/packages/cws-wallet/package.json b/packages/cws-wallet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coolwallets/wallet",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
diff --git a/packages/cws-wallet/src/Wallet/index.js b/packages/cws-wallet/src/Wallet/index.js
@@ -1,63 +1,63 @@
-import * as pairing from '../pairing'
-import * as creation from '../create'
-import * as setting from '../settings'
-import { apdu } from '@coolwallets/core'
+import { apdu } from '@coolwallets/core';
+import * as pairing from '../pairing.js';
+import * as creation from '../create.js';
+import * as setting from '../settings.js';
 
 export default class CoolWallet {
   constructor(transport, appPrivateKey, appId = undefined) {
-    this.transport = transport
-    this.appPrivateKey = appPrivateKey
-    this.appId = appId
+    this.transport = transport;
+    this.appPrivateKey = appPrivateKey;
+    this.appId = appId;
 
-    this.setAppId = this.setAppId.bind(this)
-    this.getSEVersion = this.getSEVersion.bind(this)
-    this.register = this.register.bind(this)
-    this.resetCard = this.resetCard.bind(this)
-    this.getPairingPassword = this.getPairingPassword.bind(this)
+    this.setAppId = this.setAppId.bind(this);
+    this.getSEVersion = this.getSEVersion.bind(this);
+    this.register = this.register.bind(this);
+    this.resetCard = this.resetCard.bind(this);
+    this.getPairingPassword = this.getPairingPassword.bind(this);
   }
 
   setAppId(appId) {
-    this.appId = appId
+    this.appId = appId;
   }
 
   async getCardInfo() {
-    return await setting.getCardInfo(this.transport)
+    return setting.getCardInfo(this.transport);
   }
 
   async checkRegistered() {
-    return await apdu.control.sayHi(this.transport, this.appId)
+    return apdu.control.sayHi(this.transport, this.appId);
   }
 
   async getSEVersion() {
-    return await apdu.setting.getSEVersion(this.transport)
+    return apdu.setting.getSEVersion(this.transport);
   }
 
   async resetCard() {
-    return await apdu.setting.resetCard(this.transport)
+    return apdu.setting.resetCard(this.transport);
   }
 
   async register(appPublicKey, password, deviceName) {
-    return await pairing.register(this.transport, appPublicKey, password, deviceName)
+    return pairing.register(this.transport, appPublicKey, password, deviceName);
   }
 
   async getPairingPassword() {
-    return await pairing.getPairingPassword(this.transport, this.appId, this.appPrivateKey)
+    return pairing.getPairingPassword(this.transport, this.appId, this.appPrivateKey);
   }
 
   async getPairedApps() {
-    return await pairing.getPairedApps(this.transport, this.appId, this.appPrivateKey)
+    return pairing.getPairedApps(this.transport, this.appId, this.appPrivateKey);
   }
 
   // For wallet creation
   async createWallet(strength) {
-    return await creation.createWallet(this.transport, this.appId, this.appPrivateKey, strength)
+    return creation.createWallet(this.transport, this.appId, this.appPrivateKey, strength);
   }
 
-  async sendCheckSum(sum){
-      return await creation.sendCheckSum(this.transport, sum)
+  async sendCheckSum(sum) {
+    return creation.sendCheckSum(this.transport, sum);
   }
 
   async setSeed(seedHex) {
-    return await creation.setSeed(this.transport, this.appId, this.appPrivateKey, seedHex)
+    return creation.setSeed(this.transport, this.appId, this.appPrivateKey, seedHex);
   }
 }
diff --git a/packages/cws-wallet/src/create.js b/packages/cws-wallet/src/create.js
@@ -1,5 +1,8 @@
-import { apdu, core, crypto, config } from '@coolwallets/core'
-const SEPublicKey = config.KEY.SEPublicKey
+import {
+  apdu, core, crypto, config
+} from '@coolwallets/core';
+
+const { SEPublicKey } = config.KEY;
 
 /**
  * Create a new seed with SE.
@@ -10,11 +13,17 @@ const SEPublicKey = config.KEY.SEPublicKey
  * @return {Promise<boolean>}
  */
 export async function createWallet(transport, appId, appPrivateKey, strength) {
-  let strengthHex = strength.toString(16)
-  if (strengthHex.length % 2 > 0) strengthHex = '0' + strengthHex
-  const signature = await core.auth.generalAuthorization(transport, appId, appPrivateKey, 'CREATE_WALLET', strengthHex)
-  const strengthWithSig = strengthHex + signature
-  return await apdu.wallet.createWallet(transport, strengthWithSig)
+  let strengthHex = strength.toString(16);
+  if (strengthHex.length % 2 > 0) strengthHex = `0${strengthHex}`;
+  const signature = await core.auth.generalAuthorization(
+    transport,
+    appId,
+    appPrivateKey,
+    'CREATE_WALLET',
+    strengthHex
+  );
+  const strengthWithSig = strengthHex + signature;
+  return apdu.wallet.createWallet(transport, strengthWithSig);
 }
 
 /**
@@ -24,8 +33,8 @@ export async function createWallet(transport, appId, appPrivateKey, strength) {
  * @return {Promise<boolean>}
  */
 export async function sendCheckSum(transport, checkSum) {
-  let sumHex = checkSum.toString(16).padStart(8, '0')
-  return await apdu.wallet.submitCheckSum(transport, sumHex)
+  const sumHex = checkSum.toString(16).padStart(8, '0');
+  return apdu.wallet.submitCheckSum(transport, sumHex);
 }
 
 /**
@@ -36,8 +45,14 @@ export async function sendCheckSum(transport, checkSum) {
  * @return {Promise<boolean>}
  */
 export async function setSeed(transport, appId, appPrivateKey, seedHex) {
-  const encryptedSeed = crypto.encryption.ECIESenc(SEPublicKey, seedHex)
-  const signature = await core.auth.generalAuthorization(transport, appId, appPrivateKey, 'SET_SEED', encryptedSeed)
-  const signedSeed = encryptedSeed + signature
-  return await apdu.wallet.setSeed(transport, signedSeed)
+  const encryptedSeed = crypto.encryption.ECIESenc(SEPublicKey, seedHex);
+  const signature = await core.auth.generalAuthorization(
+    transport,
+    appId,
+    appPrivateKey,
+    'SET_SEED',
+    encryptedSeed
+  );
+  const signedSeed = encryptedSeed + signature;
+  return apdu.wallet.setSeed(transport, signedSeed);
 }
diff --git a/packages/cws-wallet/src/index.js b/packages/cws-wallet/src/index.js
@@ -1,5 +1,5 @@
-import CoolWallet from './Wallet'
-import { generateKeyPair } from './keypair'
+import CoolWallet from './Wallet/index.js';
+import { generateKeyPair } from './keypair.js';
 
-export { generateKeyPair }
-export default CoolWallet
+export { generateKeyPair };
+export default CoolWallet;
diff --git a/packages/cws-wallet/src/keypair.js b/packages/cws-wallet/src/keypair.js
@@ -1,11 +1,13 @@
-const elliptic = require('elliptic')
-const ec = new elliptic.ec('secp256k1')
+import crypto from 'crypto';
+
+const elliptic = require('elliptic');
+
+const ec = new elliptic.ec('secp256k1');
 
 export const generateKeyPair = () => {
-  let random = new Uint8Array(32)
-  window.crypto.getRandomValues(random)
-  const keyPair = ec.keyFromPrivate(random)
-  const publicKey = keyPair.getPublic(false, 'hex')
-  const privateKey = keyPair.getPrivate('hex')
-  return { privateKey, publicKey }
-}
+  const random = crypto.randomBytes(32);
+  const keyPair = ec.keyFromPrivate(random);
+  const publicKey = keyPair.getPublic(false, 'hex');
+  const privateKey = keyPair.getPrivate('hex');
+  return { privateKey, publicKey };
+};
diff --git a/packages/cws-wallet/src/pairing.js b/packages/cws-wallet/src/pairing.js
@@ -1,65 +1,77 @@
-import { apdu, crypto, config, core  } from '@coolwallets/core'
+import {
+  apdu, crypto, config, core
+} from '@coolwallets/core';
 
 /**
  * @param {Transport} transport
  * @param {string} appPublicKey
  * @param {String} password
- * @param {String} device_name
+ * @param {String} deviceName
  * @returns {Promise}
  */
-export const register = async (transport, appPublicKey, password, device_name) => {
-  let nameToUTF = Buffer.from(device_name, 'utf8')
-  const maxLen = 30
+export const register = async (transport, appPublicKey, password, deviceName) => {
+  let nameToUTF = Buffer.from(deviceName, 'utf8');
+  const maxLen = 30;
 
   if (nameToUTF.length < maxLen) {
-    let diff = maxLen - nameToUTF.length
-    let temp = Buffer.allocUnsafe(diff)
-    temp.fill(0)
-    nameToUTF = Buffer.concat([temp, nameToUTF])
+    const diff = maxLen - nameToUTF.length;
+    const temp = Buffer.allocUnsafe(diff);
+    temp.fill(0);
+    nameToUTF = Buffer.concat([temp, nameToUTF]);
   } else {
-    nameToUTF = nameToUTF.slice(0, maxLen)
+    nameToUTF = nameToUTF.slice(0, maxLen);
   }
-  const addedPassword = password.padStart(8, 'F')
+  const addedPassword = password.padStart(8, 'F');
 
-  nameToUTF = nameToUTF.toString('hex')
-  let data = addedPassword + appPublicKey + nameToUTF,
-    P1 = '00'
+  nameToUTF = nameToUTF.toString('hex');
+  let data = addedPassword + appPublicKey + nameToUTF;
+  let P1 = '00';
 
-  const supportEncryptedRegister = true
+  const supportEncryptedRegister = true;
   if (supportEncryptedRegister) {
-    data = crypto.encryption.ECIESenc(config.KEY.SEPublicKey, data)
-    P1 = '01'
+    data = crypto.encryption.ECIESenc(config.KEY.SEPublicKey, data);
+    P1 = '01';
   }
-  const appId = await apdu.pairing.registerDevice(transport, data, P1)
-  return appId
-}
+  const appId = await apdu.pairing.registerDevice(transport, data, P1);
+  return appId;
+};
 
 /**
- * 
- * @param {Transport} transport 
- * @param {string} appId 
+ *
+ * @param {Transport} transport
+ * @param {string} appId
  * @param {string} appPrivKey
  * @return {Promise<Array<{appId:string, }>>}
  */
 export const getPairedApps = async (transport, appId, appPrivKey) => {
-  const signature = await core.auth.generalAuthorization(transport, appId, appPrivKey, 'GET_PAIRED_DEVICES');
-  const apps  = await apdu.pairing.getPairedApps(transport, signature)
-  return apps
-}
+  const signature = await core.auth.generalAuthorization(
+    transport,
+    appId,
+    appPrivKey,
+    'GET_PAIRED_DEVICES'
+  );
+  const apps = await apdu.pairing.getPairedApps(transport, signature);
+  return apps;
+};
 
 /**
  * Get Pairing password for current device
- * @param {Transport} transport 
- * @param {string} appId 
- * @param {string} appPrivKey 
+ * @param {Transport} transport
+ * @param {string} appId
+ * @param {string} appPrivKey
  * @return {Promise<string>}
  */
 export const getPairingPassword = async (transport, appId, appPrivKey) => {
-  const signature = await core.auth.generalAuthorization(transport, appId, appPrivKey, 'GET_PAIR_PWD');
+  const signature = await core.auth.generalAuthorization(
+    transport,
+    appId,
+    appPrivKey,
+    'GET_PAIR_PWD'
+  );
   const encryptedPassword = await apdu.pairing.getPairingPassword(transport, signature);
-  await apdu.control.powerOff(transport)
-  
+  await apdu.control.powerOff(transport);
+
   let password = crypto.encryption.ECIESDec(appPrivKey, encryptedPassword);
   password = password.replace(/f/gi, '');
-  return password
-}
+  return password;
+};

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-/packages/*/lib`
	`1`	`+/packages/*/lib`
	`2`	`+/packages/*/node_modules`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@coolwallets/wallet",`
`3`		`- "version": "0.0.13",`
	`3`	`+ "version": "0.0.14",`
`4`	`4`	`"description": "",`
`5`	`5`	`"main": "lib/index.js",`
`6`	`6`	`"scripts": {`