8.1.0

.eslintignore

@@ -1,4 +1,5 @@
 **/_old/*
 **/npm/*
 **/npm-extended/*
-**/build/*
+**/build/*
+**/src/ts/*

.eslintrc

@@ -33,7 +33,7 @@
         "flowtype/use-flow-type": 1,
         "flowtype/object-type-delimiter": [
             2,
-            "comma"
+            "semicolon"
         ],
         "flowtype/delimiter-dangle": [
             2,

.flowconfig

@@ -9,6 +9,7 @@
 .*/npm/.*
 .*/npm-extended/.*
 .*/build/.*
+.*/tests/*
 
 [libs]
 ./node_modules/trezor-link/flowtype/chrome.js

.gitlab-ci.yml

@@ -1,16 +1,16 @@
-image: node:8.10
+image: node:12.14.1
 
 stages:
   - build
   - deploy
+  # - test-integration
 
 build:
   stage: build
   script:
-    - npm install -g yarn
     - yarn
     - yarn flow
-    - yarn eslint
+    - yarn lint
     - yarn test:unit
     - make build-connect
   artifacts:
@@ -38,3 +38,20 @@ deploy review:
     - branches
   tags:
     - deploy
+
+# todo: does not work yet. I would like not to use image with docker installed and rather use 
+# docker mounted from parent container https://docs.gitlab.com/ee/ci/docker/using_docker_build.html
+# but I'd say it is not configured on the runners at the moment 
+#
+# test integration:
+#   stage: test-integration
+#   dependencies: 
+#     - deploy review
+#   variables:
+#     DOCKER_TLS_CERTDIR: ''
+#   services:
+#     - docker:dind
+#   before_script:
+#     - docker info
+#   script: 
+#     - ./tests/run.sh ci

.travis.yml

@@ -3,15 +3,16 @@ language: node_js
 build: trusty
 
 node_js:
-  - "8.10"
+  - "12.14.1"
 
 script:
   - npm install -g yarn
   - yarn
   - yarn flow
-  - yarn eslint
+  - yarn lint
   - yarn test:unit
   - make build-connect
+  - ./tests/run.sh 3 ci
 
 notifications:
   webhooks:
@@ -20,3 +21,6 @@ notifications:
     on_success: always
     on_failure: always
     on_start: always
+
+services:
+  - docker

CHANGELOG.md

@@ -1,3 +1,22 @@
+# 8.1.0
+#### Added
+- Support for FW 1.9.0 and 2.3.0 (passphrase redesign)
+- Typescript types
+- `hex` parameter to `signMessage` and `verifyMessage` methods
+- Blockchain methods for fiat rates:
+    - `TrezorConnect.blockchainGetAccountBalanceHistory`
+    - `TrezorConnect.blockchainGetCurrentFiatRates`
+    - `TrezorConnect.blockchainGetFiatRatesForTimestamps`
+    - `TrezorConnect.blockchainSubscribeFiatRates`
+    - `TrezorConnect.blockchainUnsubscribeFiatRates`
+- `TrezorConnect.blockchainSetCustomBackend` method
+- `TrezorConnect.cancel` is now trying to send (post) 'Cancel' message to acquired device (not working with TrezorBridge < 2.0.29)
+- Implement @trezor/rollout module https://github.com/trezor/connect/issues/295
+#### Fixed
+- General cleanup in flowtype declarations
+- disableWebUsb method
+- trezor-link protobuf messages overrides
+- Fixed race condition in nodejs https://github.com/trezor/connect/issues/504
 # 8.0.15 (server side only)
 #### Fixed
 - `getAccountInfo` Bech32 accounts shouldn't be default #547

README.md

@@ -1,4 +1,4 @@
-# Trezor Connect API version 8.0.15
+# Trezor Connect API version 8.1.0
 [![Build Status](https://travis-ci.org/trezor/connect.png?branch=develop)](https://travis-ci.org/trezor/connect)
 [![NPM](https://img.shields.io/npm/v/trezor-connect.svg)](https://www.npmjs.org/package/trezor-connect)
 [![Known Vulnerabilities](https://snyk.io/test/github/trezor/connect/badge.svg?targetFile=package.json)](https://snyk.io/test/github/trezor/connect?targetFile=package.json)

docs/methods/signMessage.md

@@ -20,6 +20,7 @@ TrezorConnect.signMessage(params).then(function(result) {
 * `path` — *obligatory* `string | Array<number>` minimum length is `3`. [read more](path.md)
 * `message` - *obligatory* `string`
 * `coin` - *optional* `string` Determines network definition specified in [coins.json](../../src/data/coins.json) file. Coin `shortcut`, `name` or `label` can be used. If `coin` is not set API will try to get network definition from `path`.
+* `hex` - *optional* `boolean` convert message from hex
 
 ### Example
 ```javascript

docs/methods/verifyMessage.md

@@ -22,6 +22,7 @@ TrezorConnect.verifyMessage(params).then(function(result) {
 * `message` - *obligatory* `string` signed message,
 * `signature` - *obligatory* `string` signature in base64 format,
 * `coin` - *obligatory* `string` Determines network definition specified in [coins.json](../../src/data/coins.json) file. Coin `shortcut`, `name` or `label` can be used.
+* `hex` - *optional* `boolean` convert message from hex
 
 ### Example
 ```javascript

jest.config.integration.js

@@ -0,0 +1,14 @@
+/*
+ * Integration tests
+ */
+
+module.exports = {
+    rootDir: './',
+    moduleFileExtensions: ['js'],
+    testMatch: ['**/tests/device/**/*.test.(js)'],
+    modulePathIgnorePatterns: ['node_modules', '_old', 'src/types', 'src/ui', 'src/utils/ws.ts'],
+    setupFilesAfterEnv: ['<rootDir>/tests/jest.setup.js', '<rootDir>/tests/common.setup.js'],
+    transform: {
+        '^.+\\.js$': 'babel-jest',
+    },
+};

jest.config.js → jest.config.unit.js

@@ -6,10 +6,10 @@ module.exports = {
     rootDir: './',
     moduleFileExtensions: ['js'],
     testMatch: ['**/src/js/**/*.test.(js)'],
-    // coverageDirectory: './coverage/',
-    // collectCoverage: true,
-    // collectCoverageFrom: ['**/src/**/*.js'],
-    // modulePathIgnorePatterns: ['node_modules'],
+    testPathIgnorePatterns: ['<rootDir>/node_modules/', '<rootDir>/src/js/device/_old/'],
+    coverageDirectory: './coverage/',
+    collectCoverage: true,
+    modulePathIgnorePatterns: ['node_modules'],
     setupFiles: ['./tests/jest.setup.js'],
     transform: {
         '^.+\\.js$': 'babel-jest',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "trezor-connect",
-  "version": "8.0.15",
+  "version": "8.1.0",
   "author": "Trezor <info@trezor.io>",
   "homepage": "https://github.com/trezor/connect",
   "description": "High-level javascript interface for Trezor hardware wallet.",
@@ -39,93 +39,96 @@
     "build:npm-extended": "rm -rf npm-extended && babel-node ./scripts/build-npm-extended.js && babel ./npm-extended/lib --out-dir ./npm-extended/lib",
     "stats": "webpack --config ./webpack/config.prod.babel.js --json > build/stats.json",
     "test": "bash ./src/__tests__/run.sh",
-    "test:unit": "jest --verbose -c jest.config.js",
+    "test:unit": "jest --verbose -c jest.config.unit.js",
+    "test:integration": "./tests/run.sh",
     "flow": "flow check src/js",
     "flow-tests": "flow check src/__tests__",
-    "eslint": "eslint src/js",
-    "eslint-tests": "eslint src/__tests__",
-    "eslint-tests-fix": "eslint --fix src/__tests__",
-    "eslint-fix": "eslint --fix src/js"
+    "lint": "eslint src/js",
+    "lint:fix": "eslint --fix src/js",
+    "lint:tests": "eslint src/__tests__",
+    "lint:tests:fix": "eslint --fix src/__tests__"
   },
   "devDependencies": {
-    "@babel/cli": "^7.7.0",
-    "@babel/core": "^7.7.2",
-    "@babel/node": "^7.7.0",
-    "@babel/plugin-proposal-class-properties": "^7.7.0",
-    "@babel/plugin-proposal-object-rest-spread": "^7.6.2",
-    "@babel/plugin-transform-runtime": "^7.6.2",
-    "@babel/preset-env": "^7.7.1",
-    "@babel/preset-flow": "^7.0.0",
-    "@trezor/blockchain-link": "^1.0.6",
-    "@trezor/utxo-lib": "0.1.0",
+    "@babel/cli": "7.8.4",
+    "@babel/core": "7.8.7",
+    "@babel/node": "7.8.7",
+    "@babel/plugin-proposal-class-properties": "7.8.3",
+    "@babel/plugin-proposal-object-rest-spread": "7.8.3",
+    "@babel/plugin-transform-runtime": "7.8.3",
+    "@babel/preset-env": "7.8.7",
+    "@babel/preset-flow": "7.8.3",
+    "@trezor/blockchain-link": "^1.0.10",
+    "@trezor/rollout": "^1.0.4",
+    "@trezor/utxo-lib": "^0.1.0",
     "babel-collect-imports": "https://github.com/szymonlesisz/babel-collect-imports",
-    "babel-eslint": "^10.0.3",
-    "babel-jest": "^24.9.0",
+    "babel-eslint": "^10.1.0",
+    "babel-jest": "25.1.0",
     "babel-loader": "^8.0.0",
-    "bchaddrjs": "0.4.4",
+    "bchaddrjs": "0.4.7",
     "bignumber.js": "^9.0.0",
-    "bowser": "^2.7.0",
-    "copy-webpack-plugin": "^5.0.5",
-    "css-loader": "^3.2.0",
+    "bowser": "2.9.0",
+    "copy-webpack-plugin": "5.1.1",
+    "css-loader": "3.4.2",
     "es6-promise": "^4.2.2",
-    "eslint": "^6.6.0",
-    "eslint-plugin-flowtype": "^4.4.1",
-    "eslint-plugin-jest": "^23.0.3",
+    "eslint": "6.8.0",
+    "eslint-plugin-flowtype": "4.6.0",
+    "eslint-plugin-jest": "23.8.2",
     "eslint-plugin-promise": "^4.1.1",
     "eslint-plugin-standard": "^4.0.1",
-    "file-loader": "^4.2.0",
-    "flow-bin": "0.112.0",
+    "file-loader": "^6.0.0",
+    "flow-bin": "0.120.1",
     "fs-extra": "^8.1.0",
     "hd-wallet": "9.0.0",
     "html-webpack-plugin": "^3.2.0",
     "jasmine-core": "^3.5.0",
-    "jest": "^24.9.0",
+    "jest": "25.1.0",
     "karma": "^4.4.1",
     "karma-babel-preprocessor": "^8.0.0",
     "karma-chrome-launcher": "^3.1.0",
-    "karma-firefox-launcher": "^1.2.0",
-    "karma-jasmine": "^2.0.1",
+    "karma-firefox-launcher": "1.3.0",
+    "karma-jasmine": "3.1.1",
     "karma-jasmine-async": "^0.0.1",
     "karma-safari-launcher": "^1.0.0",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^4.0.2",
-    "keccak": "^2.0.0",
-    "less": "^3.10.3",
+    "keccak": "^3.0.0",
+    "less": "3.11.1",
     "less-loader": "^5.0.0",
     "less-plugin-autoprefix": "^2.0.0",
     "less-plugin-clean-css": "^1.5.1",
-    "mini-css-extract-plugin": "^0.8.0",
+    "mini-css-extract-plugin": "0.9.0",
     "node-fetch": "^2.6.0",
     "parse-uri": "^1.0.0",
-    "ripple-lib": "^1.4.0",
+    "ripple-lib": "1.6.5",
     "sharedworker-loader": "^2.1.1",
-    "style-loader": "^1.0.0",
-    "terser-webpack-plugin": "^2.2.1",
+    "style-loader": "1.1.3",
+    "terser-webpack-plugin": "2.3.5",
     "tiny-worker": "^2.3.0",
-    "trezor-link": "1.6.7",
+    "trezor-link": "1.7.0",
     "uglify-es": "3.3.9",
-    "version-bump-prompt": "^5.0.6",
-    "webpack": "^4.41.2",
-    "webpack-cli": "^3.3.10",
-    "webpack-dev-server": "^3.9.0",
-    "worker-loader": "^2.0.0"
+    "version-bump-prompt": "6.0.3",
+    "webpack": "^4.42.0",
+    "webpack-cli": "3.3.11",
+    "webpack-dev-server": "3.10.3",
+    "worker-loader": "2.0.0"
   },
   "dependencies": {
-    "@babel/runtime": "^7.7.2",
-    "events": "^3.0.0",
+    "@babel/runtime": "^7.8.7",
+    "events": "^3.1.0",
     "whatwg-fetch": "^3.0.0"
   },
   "extendedDependencies": {
-    "@trezor/blockchain-link": "^1.0.6",
-    "@trezor/utxo-lib": "0.1.0",
-    "bchaddrjs": "^0.4.4",
+    "@trezor/blockchain-link": "^1.0.10",
+    "@trezor/rollout": "^1.0.4",
+    "@trezor/utxo-lib": "^0.1.0",
+    "bchaddrjs": "0.4.7",
     "bignumber.js": "^9.0.0",
-    "bowser": "^2.7.0",
+    "bowser": "^2.9.0",
     "hd-wallet": "9.0.0",
-    "keccak": "^2.0.0",
+    "keccak": "^3.0.0",
     "node-fetch": "^2.6.0",
     "parse-uri": "^1.0.0",
     "tiny-worker": "^2.3.0",
-    "trezor-link": "1.6.7"
+    "trezor-link": "1.7.0"
   }
 }

scripts/build-npm-extended.js

@@ -3,16 +3,19 @@ import path from 'path';
 import packageJSON from '../package.json';
 
 const src = path.resolve(__dirname, '../src/js');
+const ts = path.resolve(__dirname, '../src/ts/types');
 const npm = path.resolve(__dirname, '../npm-extended');
 const lib = path.resolve(__dirname, '../npm-extended/lib');
 const dataSrc = path.resolve(__dirname, '../src/data');
 const data = path.resolve(__dirname, '../npm-extended/data');
 
+const ignored = ['__tests__', '_old', 'icons', 'udev'];
+const shouldIgnore = (src) => ignored.find(i => src.indexOf(i) >= 0);
+
 // copy all js files any make a copy with .flow extension
 fse.copySync(src, lib, {
     filter: function (src, dest) {
-        // do not copy "*/_old" directory
-        if (src.indexOf('_old') >= 0) return false;
+        if (shouldIgnore(src)) return false;
         const ext = src.split('.').pop();
         if (ext === 'js') {
             fse.copySync(src, dest + '.flow');
@@ -21,12 +24,19 @@ fse.copySync(src, lib, {
     },
 });
 
+// copy typescript
+fse.copySync(ts, `${lib}/typescript`, {
+    filter: function (src, dest) {
+        if (shouldIgnore(src)) return false;
+        if (src.indexOf('.json') >= 0) return false;
+        return true;
+    },
+});
+
 // copy assets (only json)
 fse.copySync(dataSrc, data, {
     filter: function (src, dest) {
-        const ext = src.split('.').pop();
-        const copy = ext === 'json' || ext.indexOf('/') >= 0;
-        return copy;
+        return !shouldIgnore(src);
     },
 });
 
@@ -42,6 +52,7 @@ delete packageJSON.bin;
 delete packageJSON.private;
 packageJSON.version = packageJSON.version + '-extended';
 packageJSON.main = 'lib/index.js';
+packageJSON.types = 'lib/typescript/index.d.ts';
 
 fse.writeFileSync(path.resolve(npm, 'package.json'), JSON.stringify(packageJSON, null, '  '), 'utf-8');
 

scripts/generate-typescript.js

@@ -0,0 +1,19 @@
+
+const convertFlowToTypescript = (srcFile, destFile) => {
+    fse.readFile(srcFile, 'utf8', function (err, data) {
+        if (err) return console.log(err);
+        const result = data
+            .replace('/* @flow */', '')
+            .replace(/import type/g, 'import')
+            .replace(/\$Shape</g, 'Partial<')
+            .replace(/\{\|/g, '{')
+            .replace(/\|\}/g, '}')
+            .replace(/\?: \?}/g, '?: ')
+            .replace(/: \?}/g, '?: ');
+
+        const dest = destFile.replace('.js', '.d.ts');
+        fse.writeFile(dest, result, 'utf8', function (err) {
+            if (err) return console.log(err);
+        });
+    });
+};