refactor(file name): implement project layout defined in witnet#126

BREAKING CHANGE: everyone need to update what they are working on in order to follow the new project structure fix witnet#144
anler · Jun 14, 2018 · 9119c24 · 9119c24
1 parent cc20f79
commit 9119c24
Show file tree

Hide file tree

Showing 73 changed files with 183 additions and 224 deletions.
diff --git a/.gitignore b/.gitignore
@@ -44,3 +44,4 @@ main.js.map
 
 .idea
 .vscode
+/config/tsconfig.tslint.json
diff --git a/app/lib/crypto/pbkdf2.ts b/app/lib/crypto/pbkdf2.ts
diff --git a/app/lib/chain/chainType.ts → app/main/chain/chainType.ts b/app/lib/chain/chainType.ts → app/main/chain/chainType.ts
diff --git a/app/lib/crypto/address/p2pkh.ts → app/main/crypto/address/p2pkh.ts b/app/lib/crypto/address/p2pkh.ts → app/main/crypto/address/p2pkh.ts
diff --git a/app/lib/crypto/constants.ts → app/main/crypto/constants.ts b/app/lib/crypto/constants.ts → app/main/crypto/constants.ts
diff --git a/app/lib/crypto/errors.ts → app/main/crypto/errors.ts b/app/lib/crypto/errors.ts → app/main/crypto/errors.ts
diff --git a/app/lib/crypto/hash.ts → app/main/crypto/hash.ts b/app/lib/crypto/hash.ts → app/main/crypto/hash.ts
diff --git a/app/lib/crypto/key/key.ts → app/main/crypto/key/key.ts b/app/lib/crypto/key/key.ts → app/main/crypto/key/key.ts
diff --git a/app/lib/crypto/key/privateKey.ts → app/main/crypto/key/privateKey.ts b/app/lib/crypto/key/privateKey.ts → app/main/crypto/key/privateKey.ts
diff --git a/app/lib/crypto/key/publicKey.ts → app/main/crypto/key/publicKey.ts b/app/lib/crypto/key/publicKey.ts → app/main/crypto/key/publicKey.ts
diff --git a/app/lib/crypto/keyPath.ts → app/main/crypto/keyPath.ts b/app/lib/crypto/keyPath.ts → app/main/crypto/keyPath.ts
@@ -1,5 +1,5 @@
-import {HARDENED_KEY_INDEX} from "./constants"
-import {Errors} from "./errors"
+import { HARDENED_KEY_INDEX } from "./constants"
+import { Errors } from "./errors"
 
 export type KeyPath = Array<number>
 

diff --git a/app/lib/crypto/mnemonic.ts → app/main/crypto/mnemonic.ts b/app/lib/crypto/mnemonic.ts → app/main/crypto/mnemonic.ts
diff --git a/app/main/crypto/pbkdf2.ts b/app/main/crypto/pbkdf2.ts
@@ -0,0 +1,61 @@
+import { Errors } from "./errors"
+
+const assert = require("assert")
+const crypto = require("crypto")
+
+/**
+ * PBKDF2
+ * https://github.com/stayradiated/pbkdf2-sha512
+ * @param {string | Buffer} key
+ * @param {string | Buffer} salt
+ * @param {number} iterations
+ * @param {number} dkLen
+ * @returns {Buffer}
+ */
+export const pbkdf2 =
+  (key: string | Buffer, salt: string | Buffer, iterations: number, dkLen: number) => {
+    const hLen = 64 // SHA512 Mac length
+    const validKeyLength = dkLen <= (Math.pow(2, 32) - 1) * hLen
+    assert(validKeyLength, Errors.INVALID_KEY_LENGTH)
+
+    const saltBuffer = (typeof salt === "string") ? Buffer.from(salt) : salt
+    const keyBuffer = (typeof key === "string") ? Buffer.from(key) : key
+
+    const DK = Buffer.alloc(dkLen)
+    const T = Buffer.alloc(hLen)
+
+    const block1 = Buffer.alloc(saltBuffer.length + 4)
+
+    const l = Math.ceil(dkLen / hLen)
+    const r = dkLen - (l - 1) * hLen
+
+    saltBuffer.copy(block1, 0, 0, saltBuffer.length)
+    for (let i = 1; i <= l; i++) {
+      block1[saltBuffer.length + 0] = (i >> 24 & 0xFF)
+      block1[saltBuffer.length + 1] = (i >> 16 & 0xFF)
+      block1[saltBuffer.length + 2] = (i >> 8 & 0xFF)
+      block1[saltBuffer.length + 3] = (i >> 0 & 0xFF)
+
+      let U = crypto.createHmac("sha512", keyBuffer)
+        .update(block1)
+        .digest()
+
+      U.copy(T, 0, 0, hLen)
+
+      for (let j = 1; j < iterations; j++) {
+        U = crypto.createHmac("sha512", keyBuffer)
+          .update(U)
+          .digest()
+
+        for (let k = 0; k < hLen; k++) {
+          T[k] ^= U[k]
+        }
+      }
+
+      const destPos = (i - 1) * hLen
+      const len = (i === l ? r : hLen)
+      T.copy(DK, destPos, 0, len)
+    }
+
+    return DK
+  }
diff --git a/app/lib/crypto/seed.ts → app/main/crypto/seed.ts b/app/lib/crypto/seed.ts → app/main/crypto/seed.ts
@@ -2,7 +2,7 @@ import * as Mnemonic from "./mnemonic"
 import * as Hash from "./hash"
 import * as assert from "assert"
 import * as bip39 from "bip39"
-import {Errors} from "./errors"
+import { Errors } from "./errors"
 
 export type Seed = {
   masterSecret: Buffer

diff --git a/app/lib/encoding/.gitkeep → app/main/encoding/.gitkeep b/app/lib/encoding/.gitkeep → app/main/encoding/.gitkeep
diff --git a/app/lib/encoding/slip32.ts → app/main/encoding/slip32.ts b/app/lib/encoding/slip32.ts → app/main/encoding/slip32.ts
@@ -2,8 +2,8 @@ import * as KeyPath from "../crypto/keyPath"
 import * as Key from "../crypto/key/key"
 import * as PrivateKey from "../crypto/key/privateKey"
 import * as PublicKey from "../crypto/key/publicKey"
-import {integerAsBuffer} from "../utils/conversions"
-import {privateKeyVerify, publicKeyVerify} from "secp256k1"
+import { integerAsBuffer } from "../utils/conversions"
+import { privateKeyVerify, publicKeyVerify } from "secp256k1"
 import * as Bech32 from "bech32"
 
 /*
@@ -35,9 +35,9 @@ type PrefixedBuffer = {
  * @returns {PrefixedBuffer}
  */
 export const decode = (encodedBech32: string): PrefixedBuffer => {
-  const {prefix: hrp, words} = Bech32.decode(encodedBech32, BECH32_LIMIT)
+  const { prefix: hrp, words } = Bech32.decode(encodedBech32, BECH32_LIMIT)
 
-  return {hrp, words}
+  return { hrp, words }
 }
 
 /**
@@ -46,7 +46,7 @@ export const decode = (encodedBech32: string): PrefixedBuffer => {
  * @param {Buffer} words
  * @returns {string}
  */
-export const encode = ({hrp, words}: PrefixedBuffer): string => {
+export const encode = ({ hrp, words }: PrefixedBuffer): string => {
   return Bech32.encode(hrp, Buffer.from(words), BECH32_LIMIT)
 }
 
@@ -72,9 +72,9 @@ export const exportKeyToSlip32 = (keyPath: KeyPath.KeyPath, extKey:
   // Encode hrp + words (5-bit)
   const words = Bech32.toWords(Buffer.concat(data))
   if (extKey.key.type === "private") {
-    return encode({hrp: "xprv", words})
+    return encode({ hrp: "xprv", words })
   } else {
-    return encode({hrp: "xpub", words})
+    return encode({ hrp: "xpub", words })
   }
 }
 
@@ -88,7 +88,7 @@ export const importKeyFromSlip32 = (slip32: string): {
   extendedKey: Key.ExtendedKey<PrivateKey.PrivateKey> | Key.ExtendedKey<PublicKey.PublicKey>
 } => {
   // Decode slip32
-  const {hrp, words}: { hrp: string, words: Buffer } = decode(slip32)
+  const { hrp, words }: { hrp: string, words: Buffer } = decode(slip32)
   // Check hrp
   if ((hrp !== "xprv") && (hrp !== "xpub")) {
     throw Error("Malformed slip32 serialized key: invalid hrp")

diff --git a/app/main.electron.js → app/main/index.js b/app/main.electron.js → app/main/index.js
diff --git a/app/lib/storage/encryptedStorage.ts → app/main/storage/encryptedStorage.ts b/app/lib/storage/encryptedStorage.ts → app/main/storage/encryptedStorage.ts
diff --git a/app/lib/storage/encryption.ts → app/main/storage/encryption.ts b/app/lib/storage/encryption.ts → app/main/storage/encryption.ts
@@ -42,7 +42,7 @@ export const defaultSettings: Settings = {
 const serialize = (buffers: Array<Buffer>): Buffer => {
   const parts: Array<Buffer> = []
 
-  buffers.forEach( (part: Buffer) => {
+  buffers.forEach((part: Buffer) => {
     const dataLength = Buffer.alloc(4)
     dataLength.writeUInt32BE(part.length, 0)
     parts.push(dataLength)
@@ -148,4 +148,4 @@ export const decrypt = (data: Buffer, settings: Settings): Buffer => {
   const plaintext = decipher.update(ciphertext)
 
   return Buffer.concat([plaintext, decipher.final()])
-}
+}
diff --git a/app/lib/storage/levelBackend.ts → app/main/storage/levelBackend.ts b/app/lib/storage/levelBackend.ts → app/main/storage/levelBackend.ts
@@ -1,4 +1,4 @@
-import {LevelUp} from "levelup"
+import { LevelUp } from "levelup"
 import IStorageBackend from "./storageBackend"
 
 /**
@@ -10,7 +10,7 @@ export default class LevelBackend implements IStorageBackend {
    * The LevelBackend constructor takes a reference to a LevelUp backend.
    * @param {levelup.LevelUp} connection
    */
-  constructor(private connection: LevelUp) {}
+  constructor(private connection: LevelUp) { }
 
   /**
    * Database closing method implementation for LevelDB.

diff --git a/app/lib/storage/levelEncryptedStorage.ts → app/main/storage/levelEncryptedStorage.ts b/app/lib/storage/levelEncryptedStorage.ts → app/main/storage/levelEncryptedStorage.ts
@@ -1,7 +1,7 @@
 import EncryptedStorage from "./encryptedStorage"
 import * as Encryption from "./encryption"
 import * as path from "path"
-import {homedir} from "os"
+import { homedir } from "os"
 import LevelBackend from "./levelBackend"
 import * as level from "level"
 
@@ -24,4 +24,4 @@ const levelEncryptedStorageFactory = async (
   return new EncryptedStorage(database, encryptionSettings)
 }
 
-export {levelEncryptedStorageFactory}
+export { levelEncryptedStorageFactory }
diff --git a/app/lib/storage/mockedBackend.ts → app/main/storage/mockedBackend.ts b/app/lib/storage/mockedBackend.ts → app/main/storage/mockedBackend.ts
diff --git a/app/lib/storage/storageBackend.ts → app/main/storage/storageBackend.ts b/app/lib/storage/storageBackend.ts → app/main/storage/storageBackend.ts
diff --git a/app/lib/storage/utils.ts → app/main/storage/utils.ts b/app/lib/storage/utils.ts → app/main/storage/utils.ts
diff --git a/app/lib/utils/conversions.ts → app/main/utils/conversions.ts b/app/lib/utils/conversions.ts → app/main/utils/conversions.ts
diff --git a/app/lib/utils/utils.ts → app/main/utils/utils.ts b/app/lib/utils/utils.ts → app/main/utils/utils.ts
@@ -14,6 +14,6 @@ export function kvSwap(obj: stringToNumber | numberToString | stringToString): a
   return Object
     .entries(obj)
     .reduce((acc, [key, value]) => {
-      return {...acc, [value]: key}
+      return { ...acc, [value]: key }
     }, {})
 }
diff --git a/app/actions/counter.ts → app/renderer/actions/counter.ts b/app/actions/counter.ts → app/renderer/actions/counter.ts
diff --git a/app/actions/helpers.ts → app/renderer/actions/helpers.ts b/app/actions/helpers.ts → app/renderer/actions/helpers.ts
diff --git a/app/components/Counter.scss → app/renderer/components/Counter.scss b/app/components/Counter.scss → app/renderer/components/Counter.scss
diff --git a/app/components/Counter.tsx → app/renderer/components/Counter.tsx b/app/components/Counter.tsx → app/renderer/components/Counter.tsx
diff --git a/app/components/Home.scss → app/renderer/components/Home.scss b/app/components/Home.scss → app/renderer/components/Home.scss
diff --git a/app/components/Home.tsx → app/renderer/components/Home.tsx b/app/components/Home.tsx → app/renderer/components/Home.tsx
diff --git a/app/containers/App.tsx → app/renderer/containers/App.tsx b/app/containers/App.tsx → app/renderer/containers/App.tsx
diff --git a/app/containers/CounterPage.tsx → app/renderer/containers/CounterPage.tsx b/app/containers/CounterPage.tsx → app/renderer/containers/CounterPage.tsx
diff --git a/app/containers/HomePage.tsx → app/renderer/containers/HomePage.tsx b/app/containers/HomePage.tsx → app/renderer/containers/HomePage.tsx
diff --git a/app/containers/Root.tsx → app/renderer/containers/Root.tsx b/app/containers/Root.tsx → app/renderer/containers/Root.tsx
diff --git a/app/index.tsx → app/renderer/index.tsx b/app/index.tsx → app/renderer/index.tsx
@@ -2,7 +2,7 @@ import * as React from "react"
 import { render } from "react-dom"
 import { AppContainer } from "react-hot-loader"
 import Root from "./containers/Root"
-import "./app.global.scss"
+import "./ui/app.global.scss"
 
 const { configureStore, history } = require("./store/configureStore")
 const store = configureStore()

diff --git a/app/reducers/counter.ts → app/renderer/reducers/counter.ts b/app/reducers/counter.ts → app/renderer/reducers/counter.ts
diff --git a/app/reducers/index.ts → app/renderer/reducers/index.ts b/app/reducers/index.ts → app/renderer/reducers/index.ts
diff --git a/app/routes.tsx → app/renderer/routes.tsx b/app/routes.tsx → app/renderer/routes.tsx
diff --git a/app/store/configureStore.development.ts → ...derer/store/configureStore.development.ts b/app/store/configureStore.development.ts → ...derer/store/configureStore.development.ts
diff --git a/app/store/configureStore.production.ts → ...nderer/store/configureStore.production.ts b/app/store/configureStore.production.ts → ...nderer/store/configureStore.production.ts
diff --git a/app/store/configureStore.ts → app/renderer/store/configureStore.ts b/app/store/configureStore.ts → app/renderer/store/configureStore.ts
diff --git a/app/app.global.scss → app/renderer/ui/app.global.scss b/app/app.global.scss → app/renderer/ui/app.global.scss
diff --git a/app/app.html → app/renderer/ui/app.html b/app/app.html → app/renderer/ui/app.html
@@ -8,8 +8,7 @@
         if (!process.env.HOT) {
           const link = document.createElement('link');
           link.rel = 'stylesheet';
-          link.href = './style.css';
-          // HACK: Writing the script path should be done with webpack
+          link.href = '<%= htmlWebpackPlugin.options.styleFilename %>';
           document.getElementsByTagName('head')[0].appendChild(link);
         }
       }());
@@ -23,8 +22,7 @@
         const port = process.env.PORT || 3000;
         script.src = (process.env.HOT)
           ? 'http://localhost:' + port + '/dist/bundle.js'
-          : './bundle.js';
-        // HACK: Writing the script path should be done with webpack
+          : '<%= htmlWebpackPlugin.options.bundleFilename %>';
         document.body.appendChild(script);
       }
     </script>

diff --git a/app/app.icns → app/renderer/ui/app.icns b/app/app.icns → app/renderer/ui/app.icns
diff --git a/app/utils/.gitkeep → app/renderer/utils/.gitkeep b/app/utils/.gitkeep → app/renderer/utils/.gitkeep
diff --git a/config/jest.js b/config/jest.js
@@ -6,10 +6,13 @@ module.exports = {
   "roots": ["<rootDir>/.."],
   "globals": {
     "ts-jest": {
-      "tsConfigFile": "../config/tsconfig.json"
+      "tsConfigFile": "../config/tsconfig.test.json"
     }
   },
   "moduleNameMapper": {
+    "appCommon\/(.*)$": "<rootDir>/../app/common/$1",
+    "appMain\/(.*)$": "<rootDir>/../app/main/$1",
+    "appRenderer\/(.*)$": "<rootDir>/../app/renderer/$1",
     "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/../test/__mocks__/fileMock.js",
     "\\.(css|less|sass|scss)$": "identity-obj-proxy"
   },
@@ -20,7 +23,7 @@ module.exports = {
   ],
   "moduleDirectories": [
     "<rootDir>/../node_modules",
-    "<rootDir>/../app/node_modules"
+    "<rootDir>/../app/lib"
   ],
   "transform": {
     "^.+\\.(ts|tsx)$": "ts-jest"

diff --git a/config/tsconfig.json b/config/tsconfig.json
@@ -28,13 +28,11 @@
     "outDir": "dist"
   },
   "files": [
-    "../app/index.tsx"
+    "../app/renderer/index.tsx"
   ],
   "include": [
     "../app/**/*.ts",
     "../app/**/*.tsx",
-    "../test/**/*.ts",
-    "../test/**/*.tsx",
     "../node_modules/@types/**/*.d.ts",
     "../typings/**/*.d.ts"
   ],

diff --git a/config/tsconfig.test.json b/config/tsconfig.test.json
@@ -0,0 +1,7 @@
+{
+  "extends": "./tsconfig",
+  "include": [
+    "../test/**/*.ts",
+    "../test/**/*.tsx"
+  ]
+}
diff --git a/config/webpack.main.js b/config/webpack.main.js
@@ -5,7 +5,7 @@
 const path = require("path");
 const webpack = require("webpack");
 const webpackMergeConfigs = require("webpack-merge");
-const HtmlWebpackPlugin = require("html-webpack-plugin");
+const webpackRenderer = require("./webpack.renderer");
 
 const port = process.env.PORT || 3000;
 const forProduction = process.env.NODE_ENV === "production";
@@ -14,7 +14,7 @@ const baseConfig = {
   devtool: "source-map",
   target: "electron-main",
 
-  entry: [path.resolve(__dirname, "../app/main.electron")],
+  entry: [path.resolve(__dirname, "../app/main/index.js")],
 
   resolve: {
     extensions: [".js", ".ts", ".json"]
@@ -34,20 +34,8 @@ const baseConfig = {
   },
 
   plugins: [
-    // Add source map support for stack traces in node
-    // https://github.com/evanw/node-source-map-support
-    new webpack.BannerPlugin(
-      { banner: "require(\"source-map-support\").install();", raw: true, entryOnly: false }
-    ),
-
     new webpack.DefinePlugin({
       "process.env.NODE_ENV": JSON.stringify(forProduction ? "production" : "development")
-    }),
-
-    new HtmlWebpackPlugin({
-      filename: path.resolve(__dirname, "../dist/app.html"),
-      template: path.resolve(__dirname, "../app/app.html"),
-      inject: false
     })
   ],
 
@@ -65,7 +53,14 @@ const productionConfig = {
 };
 
 const developmentConfig = {
-  mode: "development"
+  mode: "development",
+  plugins: [
+    // Add source map support for stack traces in node
+    // https://github.com/evanw/node-source-map-support
+    new webpack.BannerPlugin(
+      { banner: "require(\"source-map-support\").install();", raw: true, entryOnly: false }
+    )
+  ]
 };
 
 if (forProduction) {