Add some types

Ignore linting on a couple of files. We should add types for these too,
and re-enable linting.

Author: intelliot

.travis.yml

@@ -6,5 +6,5 @@ node_js:
 - 13
 script:
 - yarn compile
-- yarn test
 - yarn lint
+- yarn test

package.json

@@ -19,7 +19,7 @@
   },
   "devDependencies": {
     "@types/mocha": "^5.2.7",
-    "@types/node": "^13.1.5",
+    "@types/node": "^13.5.2",
     "@typescript-eslint/eslint-plugin": "^2.16.0",
     "@typescript-eslint/parser": "^2.16.0",
     "eslint": "^6.8.0",

src/index.ts

@@ -18,14 +18,14 @@ function generateSeed(
     entropy?: Uint8Array
     algorithm?: 'ed25519' | 'secp256k1'
   } = {},
-) {
+): string {
   assert(!options.entropy || options.entropy.length >= 16, 'entropy too short')
   const entropy = options.entropy ? options.entropy.slice(0, 16) : brorand(16)
   const type = options.algorithm === 'ed25519' ? 'ed25519' : 'secp256k1'
   return addressCodec.encodeSeed(entropy, type)
 }
 
-function hash(message) {
+function hash(message): number[] {
   return hashjs
     .sha512()
     .update(message)
@@ -34,7 +34,13 @@ function hash(message) {
 }
 
 const secp256k1 = {
-  deriveKeypair(entropy, options) {
+  deriveKeypair(
+    entropy,
+    options,
+  ): {
+    privateKey: string
+    publicKey: string
+  } {
     const prefix = '00'
 
     const privateKey =
@@ -51,21 +57,26 @@ const secp256k1 = {
     return { privateKey, publicKey }
   },
 
-  sign(message, privateKey) {
+  sign(message, privateKey): string {
     return bytesToHex(
       Secp256k1.sign(hash(message), hexToBytes(privateKey), {
         canonical: true,
       }).toDER(),
     )
   },
 
-  verify(message, signature, publicKey) {
+  verify(message, signature, publicKey): boolean {
     return Secp256k1.verify(hash(message), signature, hexToBytes(publicKey))
   },
 }
 
 const ed25519 = {
-  deriveKeypair(entropy) {
+  deriveKeypair(
+    entropy,
+  ): {
+    privateKey: string
+    publicKey: string
+  } {
     const prefix = 'ED'
     const rawPrivateKey = hash(entropy)
     const privateKey = prefix + bytesToHex(rawPrivateKey)
@@ -74,7 +85,7 @@ const ed25519 = {
     return { privateKey, publicKey }
   },
 
-  sign(message, privateKey) {
+  sign(message, privateKey): string {
     // caution: Ed25519.sign interprets all strings as hex, stripping
     // any non-hex characters without warning
     assert(Array.isArray(message), 'message must be array of octets')
@@ -83,7 +94,7 @@ const ed25519 = {
     )
   },
 
-  verify(message, signature, publicKey) {
+  verify(message, signature, publicKey): boolean {
     return Ed25519.verify(
       message,
       hexToBytes(signature),
@@ -92,12 +103,19 @@ const ed25519 = {
   },
 }
 
-function select(algorithm) {
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function select(algorithm): any {
   const methods = { 'ecdsa-secp256k1': secp256k1, ed25519 }
   return methods[algorithm]
 }
 
-function deriveKeypair(seed, options) {
+function deriveKeypair(
+  seed,
+  options,
+): {
+  publicKey: string
+  privateKey: string
+} {
   const decoded = addressCodec.decodeSeed(seed)
   const algorithm = decoded.type === 'ed25519' ? 'ed25519' : 'ecdsa-secp256k1'
   const method = select(algorithm)
@@ -111,42 +129,42 @@ function deriveKeypair(seed, options) {
   return keypair
 }
 
-function getAlgorithmFromKey(key) {
+function getAlgorithmFromKey(key): 'ed25519' | 'ecdsa-secp256k1' {
   const bytes = hexToBytes(key)
   return bytes.length === 33 && bytes[0] === 0xed
     ? 'ed25519'
     : 'ecdsa-secp256k1'
 }
 
-function sign(messageHex, privateKey) {
+function sign(messageHex, privateKey): string {
   const algorithm = getAlgorithmFromKey(privateKey)
   return select(algorithm).sign(hexToBytes(messageHex), privateKey)
 }
 
-function verify(messageHex, signature, publicKey) {
+function verify(messageHex, signature, publicKey): boolean {
   const algorithm = getAlgorithmFromKey(publicKey)
   return select(algorithm).verify(hexToBytes(messageHex), signature, publicKey)
 }
 
-function deriveAddressFromBytes(publicKeyBytes: Buffer) {
+function deriveAddressFromBytes(publicKeyBytes: Buffer): string {
   return addressCodec.encodeAccountID(
     utils.computePublicKeyHash(publicKeyBytes),
   )
 }
 
-function deriveAddress(publicKey) {
-  return deriveAddressFromBytes(hexToBytes(publicKey))
+function deriveAddress(publicKey): string {
+  return deriveAddressFromBytes(Buffer.from(hexToBytes(publicKey)))
 }
 
-function deriveNodeAddress(publicKey) {
+function deriveNodeAddress(publicKey): string {
   const generatorBytes = addressCodec.decodeNodePublic(publicKey)
   const accountPublicBytes = accountPublicFromPublicGenerator(generatorBytes)
   return deriveAddressFromBytes(accountPublicBytes)
 }
 
 const { decodeSeed } = addressCodec
 
-module.exports = {
+export {
   generateSeed,
   deriveKeypair,
   sign,

src/secp256k1.ts

@@ -1,3 +1,5 @@
+/* eslint-disable */
+
 import * as elliptic from 'elliptic'
 import Sha512 from './sha512'
 

src/sha512.ts

@@ -1,3 +1,5 @@
+/* eslint-disable */
+
 import * as hashjs from 'hash.js'
 import * as BigNum from 'bn.js'
 

src/utils.ts

@@ -2,7 +2,7 @@ import * as assert from 'assert'
 import * as hashjs from 'hash.js'
 import * as BN from 'bn.js'
 
-function bytesToHex(a) {
+function bytesToHex(a): string {
   return a
     .map((byteValue) => {
       const hex = byteValue.toString(16).toUpperCase()
@@ -11,7 +11,7 @@ function bytesToHex(a) {
     .join('')
 }
 
-function hexToBytes(a) {
+function hexToBytes(a): number[] {
   assert(a.length % 2 === 0)
   return new BN(a, 16).toArray(null, a.length / 2)
 }

yarn.lock

@@ -154,10 +154,10 @@
   resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-5.2.7.tgz#315d570ccb56c53452ff8638738df60726d5b6ea"
   integrity sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ==
 
-"@types/node@^13.1.5":
-  version "13.5.1"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.5.1.tgz#6fae50892d1841f4b38b298e2f78fb68c5960cb9"
-  integrity sha512-Jj2W7VWQ2uM83f8Ls5ON9adxN98MvyJsMSASYFuSvrov8RMRY64Ayay7KV35ph1TSGIJ2gG9ZVDdEq3c3zaydA==
+"@types/node@^13.5.2":
+  version "13.5.2"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.5.2.tgz#3de53b55fd39efc428a901a0f6db31f761cfa131"
+  integrity sha512-Fr6a47c84PRLfd7M7u3/hEknyUdQrrBA6VoPmkze0tcflhU5UnpWEX2kn12ktA/lb+MNHSqFlSiPHIHsaErTPA==
 
 "@typescript-eslint/eslint-plugin@^2.16.0":
   version "2.18.0"