Merge branch 'issue-1/fix-misc' into 'master'

Upgrade to latest dependencies, misc. quick fixes See merge request thorchain/asgardex-common/asgardex-binance!1
xchainjs · Oct 4, 2020 · 528bbb1 · 528bbb1
1 parent a91a1b6
commit 528bbb1
Show file tree

Hide file tree

Showing 10 changed files with 757 additions and 681 deletions.
diff --git a/packages/asgardex-binance/.eslintrc b/packages/asgardex-binance/.eslintrc
@@ -7,6 +7,7 @@
   "plugins": ["prettier"],
   "extends": ["plugin:@typescript-eslint/recommended", "prettier/@typescript-eslint", "plugin:prettier/recommended"],
   "rules": {
+    "@typescript-eslint/explicit-module-boundary-types": "off",
     "@typescript-eslint/explicit-function-return-type": "off",
     "@typescript-eslint/no-use-before-define": "warn",
     "@typescript-eslint/no-empty-function": "off",

diff --git a/packages/asgardex-binance/.gitignore b/packages/asgardex-binance/.gitignore
@@ -1 +1,6 @@
-node_modules/
+*.log
+.DS_Store
+node_modules
+npm-debug.log
+lib
+.env
diff --git a/packages/asgardex-binance/.gitignore copy b/packages/asgardex-binance/.gitignore copy
diff --git a/packages/asgardex-binance/.gitlab-ci.yml b/packages/asgardex-binance/.gitlab-ci.yml
@@ -28,6 +28,4 @@ build:
 test:
   stage: test
   script:
-    - yarn clean
-    - yarn build
     - yarn test
diff --git a/packages/asgardex-binance/.nvmrc b/packages/asgardex-binance/.nvmrc
@@ -1 +1 @@
-12.14.1
+13
diff --git a/packages/asgardex-binance/package.json b/packages/asgardex-binance/package.json
@@ -28,30 +28,30 @@
     "clean": "rimraf lib/**",
     "build": "rollup -c",
     "test": "jest",
+    "lint": "eslint \"{src,__tests__}/**/*.ts\" --fix",
     "prepublishOnly": "yarn build"
   },
   "devDependencies": {
-    "@binance-chain/javascript-sdk": "^2.16.4",
-    "@types/jest": "^25.1.5",
-    "@typescript-eslint/eslint-plugin": "^2.26.0",
-    "@typescript-eslint/parser": "^2.26.0",
-    "eslint": "^6.8.0",
-    "eslint-config-prettier": "^6.10.1",
-    "eslint-plugin-prettier": "^3.1.2",
-    "husky": "^4.2.3",
-    "jest": "^25.2.7",
-    "lerna": "^3.20.2",
-    "lint-staged": "^10.1.1",
-    "prettier": "^2.0.2",
-    "rollup": "^2.3.2",
+    "@types/jest": "^25.2.3",
+    "@typescript-eslint/eslint-plugin": "^3.0.0",
+    "@typescript-eslint/parser": "^3.0.0",
+    "eslint": "^7.1.0",
+    "eslint-config-prettier": "^6.11.0",
+    "eslint-plugin-prettier": "^3.1.3",
+    "husky": "^4.2.5",
+    "jest": "^26.0.1",
+    "lerna": "^3.22.0",
+    "lint-staged": "^10.2.6",
+    "prettier": "^2.0.5",
+    "rollup": "^2.10.9",
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-json": "^4.0.0",
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-peer-deps-external": "^2.2.2",
-    "rollup-plugin-typescript2": "^0.27.0",
-    "ts-jest": "^25.3.1",
-    "tslib": "^1.11.1",
-    "typescript": "^3.8.3",
+    "rollup-plugin-typescript2": "^0.27.1",
+    "ts-jest": "^26.0.0",
+    "tslib": "^2.0.0",
+    "typescript": "^3.9.3",
     "dotenv": "^8.2.0"
   },
   "publishConfig": {

diff --git a/packages/asgardex-binance/rollup.config.js b/packages/asgardex-binance/rollup.config.js
@@ -31,6 +31,19 @@ export default {
       exclude: '__tests__/**',
       clean: true,
     }),
-    commonjs(),
+    commonjs({
+      namedExports: {
+        // API of `u2f-api` is defined in `node_modules/u2f-api/lib/u2f-api.js`
+        // and re-imported in `node_modules/u2f-api/index.js`
+        'node_modules/u2f-api/index.js': [
+          'isSupported',
+          'ensureSupport',
+          'register',
+          'sign',
+          'ErrorCodes',
+          'ErrorNames',
+        ],
+      },
+    }),
   ],
 }
diff --git a/packages/asgardex-binance/src/client.ts b/packages/asgardex-binance/src/client.ts
@@ -19,6 +19,9 @@ export interface BinanceClient {
   getAddress(): string
   validateAddress(address: string): boolean
   getBalance(address?: Address): Promise<Balance>
+  // TODO Add return type
+  // https://gitlab.com/thorchain/asgardex-common/asgardex-binance/-/issues/2
+  /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
   getTransactions(date: number, address?: string): Promise<any[]>
   vaultTx(addressTo: Address, amount: number, asset: string, memo: string): Promise<TransferResult>
   normalTx(addressTo: Address, amount: number, asset: string): Promise<TransferResult>
@@ -138,6 +141,9 @@ class Client implements BinanceClient {
     return balance
   }
 
+  // TODO Add proper return type
+  // https://gitlab.com/thorchain/asgardex-common/asgardex-binance/-/issues/2
+  /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
   getTransactions = async (date: number, address?: string): Promise<any[]> => {
     const pathTx = '/api/v1/transactions?address='
     const startTime = '&startTime=' // 3 months back. might need to think this.

diff --git a/packages/asgardex-binance/src/types/binance.ts b/packages/asgardex-binance/src/types/binance.ts
@@ -478,6 +478,9 @@ export interface BncClient {
    *   Get Transactions
    * https://github.com/binance-chain/javascript-sdk/wiki/API-Documentation#bncclientgettransactionsaddress-offset--promise
    */
+  // TODO Add proper return type
+  // https://gitlab.com/thorchain/asgardex-common/asgardex-binance/-/issues/2
+  /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
   getTransactions(address: Address, offset: number): Promise<any>
 
   /**