Merge branch 'master' into usb-detect

LedgerHQ · Jul 26, 2018 · ae6f5c5 · ae6f5c5
2 parents 64dad39 + 3381d3c
commit ae6f5c5
Show file tree

Hide file tree

Showing 22 changed files with 64 additions and 93 deletions.
diff --git a/lerna.json b/lerna.json
@@ -3,7 +3,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "4.20.0",
+  "version": "4.21.0",
   "npmClient": "yarn",
   "useWorkspaces": true
 }
diff --git a/packages/example-browser/package.json b/packages/example-browser/package.json
@@ -6,9 +6,9 @@
     "build": "cross-env NODE_ENV=production parcel build index.html --no-minify --public-url /"
   },
   "dependencies": {
-    "@ledgerhq/hw-app-btc": "^4.20.0",
-    "@ledgerhq/hw-app-eth": "^4.19.0",
-    "@ledgerhq/hw-transport-u2f": "^4.20.0",
+    "@ledgerhq/hw-app-btc": "^4.21.0",
+    "@ledgerhq/hw-app-eth": "^4.21.0",
+    "@ledgerhq/hw-transport-u2f": "^4.21.0",
     "react": "^16.2.0",
     "react-dom": "^16.2.0"
   },
@@ -19,5 +19,5 @@
     "parcel-bundler": "^1.6.2"
   },
   "private": true,
-  "version": "4.20.0"
+  "version": "4.21.0"
 }
diff --git a/packages/example-node/package.json b/packages/example-node/package.json
@@ -1,13 +1,13 @@
 {
   "private": true,
   "name": "@ledgerhq/example-node",
-  "version": "4.20.0",
+  "version": "4.21.0",
   "main": "index.js",
   "license": "Apache-2.0",
   "dependencies": {
-    "@ledgerhq/hw-app-btc": "^4.20.0",
-    "@ledgerhq/hw-app-eth": "^4.19.0",
-    "@ledgerhq/hw-transport-node-hid": "^4.19.1"
+    "@ledgerhq/hw-app-btc": "^4.21.0",
+    "@ledgerhq/hw-app-eth": "^4.21.0",
+    "@ledgerhq/hw-transport-node-hid": "^4.21.0"
   },
   "devDependencies": {
     "flow-bin": "^0.68.0",

diff --git a/packages/hw-app-ada/package.json b/packages/hw-app-ada/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/hw-app-ada",
-  "version": "4.19.1",
+  "version": "4.21.0",
   "description": "Ledger Hardware Wallet Cardano ADA API",
   "main": "lib/Ada.js",
   "repository": "git+ssh://git@github.com/LedgerHQ/ledgerjs.git",
@@ -17,11 +17,11 @@
   "author": "HiddenField Ltd <info@hiddenfield.com>",
   "license": "Apache-2.0",
   "dependencies": {
-    "@ledgerhq/hw-transport": "^4.19.0",
+    "@ledgerhq/hw-transport": "^4.21.0",
     "node-int64": "^0.4.0"
   },
   "devDependencies": {
-    "@ledgerhq/hw-transport-node-hid": "^4.19.1",
+    "@ledgerhq/hw-transport-node-hid": "^4.21.0",
     "chai": "^4.1.2",
     "chalk": "^2.3.1",
     "flow-bin": "^0.68.0",

diff --git a/packages/hw-app-btc/package.json b/packages/hw-app-btc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/hw-app-btc",
-  "version": "4.20.0",
+  "version": "4.21.0",
   "description": "Ledger Hardware Wallet Bitcoin Application API",
   "keywords": [
     "Ledger",
@@ -25,7 +25,7 @@
   "main": "lib/Btc.js",
   "license": "Apache-2.0",
   "dependencies": {
-    "@ledgerhq/hw-transport": "^4.19.0",
+    "@ledgerhq/hw-transport": "^4.21.0",
     "create-hash": "^1.1.3"
   },
   "devDependencies": {

diff --git a/packages/hw-app-btc/src/Btc.js b/packages/hw-app-btc/src/Btc.js
@@ -960,7 +960,8 @@ const tx1 = btc.splitTransaction("01000000014ea60aeac5252c14291d428915bd7ccd1bfc
   splitTransaction(
     transactionHex: string,
     isSegwitSupported: ?boolean = false,
-    hasTimestamp?: boolean = false
+    hasTimestamp?: boolean = false,
+    hasExtraData?: boolean = false
   ): Transaction {
     const inputs = [];
     const outputs = [];
@@ -1023,10 +1024,12 @@ const tx1 = btc.splitTransaction("01000000014ea60aeac5252c14291d428915bd7ccd1bfc
     } else {
       locktime = transaction.slice(offset, offset + 4);
     }
+    offset += 4;
     if (overwinter) {
-      offset += 4;
       nExpiryHeight = transaction.slice(offset, offset + 4);
       offset += 4;
+    }
+    if (hasExtraData) {
       extraData = transaction.slice(offset);
     }
     return {

diff --git a/packages/hw-app-eth/package.json b/packages/hw-app-eth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/hw-app-eth",
-  "version": "4.19.0",
+  "version": "4.21.0",
   "description": "Ledger Hardware Wallet Ethereum Application API",
   "keywords": [
     "Ledger",
@@ -25,7 +25,7 @@
   "main": "lib/Eth.js",
   "license": "Apache-2.0",
   "dependencies": {
-    "@ledgerhq/hw-transport": "^4.19.0"
+    "@ledgerhq/hw-transport": "^4.21.0"
   },
   "devDependencies": {
     "flow-bin": "^0.68.0",

diff --git a/packages/hw-app-str/package.json b/packages/hw-app-str/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/hw-app-str",
-  "version": "4.19.0",
+  "version": "4.21.0",
   "description": "Ledger Hardware Wallet Stellar Application API",
   "keywords": [
     "Ledger",
@@ -25,7 +25,7 @@
   "main": "lib/Str.js",
   "license": "Apache-2.0",
   "dependencies": {
-    "@ledgerhq/hw-transport": "^4.19.0",
+    "@ledgerhq/hw-transport": "^4.21.0",
     "base32.js": "^0.1.0",
     "sha.js": "^2.3.6",
     "tweetnacl": "^1.0.0"

diff --git a/packages/hw-app-xrp/package.json b/packages/hw-app-xrp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/hw-app-xrp",
-  "version": "4.19.0",
+  "version": "4.21.0",
   "description": "Ledger Hardware Wallet Ripple Application API",
   "keywords": [
     "Ledger",
@@ -25,7 +25,7 @@
   "main": "lib/Xrp.js",
   "license": "Apache-2.0",
   "dependencies": {
-    "@ledgerhq/hw-transport": "^4.19.0",
+    "@ledgerhq/hw-transport": "^4.21.0",
     "bip32-path": "0.4.2"
   },
   "devDependencies": {

diff --git a/packages/hw-hid-cli/package.json b/packages/hw-hid-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/hw-hid-cli",
-  "version": "4.19.1",
+  "version": "4.21.0",
   "description": "Ledger Hardware Wallet cli utility to send apdu to hid",
   "keywords": [
     "Ledger",
@@ -29,7 +29,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@ledgerhq/hw-transport-node-hid": "^4.19.1"
+    "@ledgerhq/hw-transport-node-hid": "^4.21.0"
   },
   "devDependencies": {
     "flow-bin": "^0.68.0",

diff --git a/packages/hw-http-proxy-devserver/package.json b/packages/hw-http-proxy-devserver/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/hw-http-proxy-devserver",
-  "version": "4.19.1",
+  "version": "4.21.0",
   "description": "Ledger Hardware Wallet debug communication layer http proxy (for development only)",
   "keywords": [
     "Ledger",
@@ -29,7 +29,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@ledgerhq/hw-transport-node-hid": "^4.19.1",
+    "@ledgerhq/hw-transport-node-hid": "^4.21.0",
     "body-parser": "^1.18.2",
     "cors": "^2.8.4",
     "express": "^4.16.3"

diff --git a/packages/hw-transport-http/package.json b/packages/hw-transport-http/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/hw-transport-http",
-  "version": "4.19.0",
+  "version": "4.21.0",
   "description": "Ledger Hardware Wallet communication layer over http",
   "keywords": [
     "Ledger",
@@ -25,7 +25,7 @@
   "main": "lib/HttpTransport.js",
   "license": "Apache-2.0",
   "dependencies": {
-    "@ledgerhq/hw-transport": "^4.19.0"
+    "@ledgerhq/hw-transport": "^4.21.0"
   },
   "devDependencies": {
     "flow-bin": "^0.68.0",

diff --git a/packages/hw-transport-mocker/package.json b/packages/hw-transport-mocker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/hw-transport-mocker",
-  "version": "4.19.0",
+  "version": "4.21.0",
   "description": "Ledger Hardware Wallet mocker utilities used for tests",
   "keywords": [
     "Ledger",
@@ -23,7 +23,7 @@
   "main": "lib/index.js",
   "license": "Apache-2.0",
   "dependencies": {
-    "@ledgerhq/hw-transport": "^4.19.0"
+    "@ledgerhq/hw-transport": "^4.21.0"
   },
   "devDependencies": {
     "flow-bin": "^0.68.0",

diff --git a/packages/hw-transport-node-hid/package.json b/packages/hw-transport-node-hid/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/hw-transport-node-hid",
-  "version": "4.19.1",
+  "version": "4.21.0",
   "description": "Ledger Hardware Wallet Node implementation of the communication layer, using node-hid",
   "keywords": [
     "Ledger",
@@ -25,7 +25,7 @@
   "main": "lib/TransportNodeHid.js",
   "license": "Apache-2.0",
   "dependencies": {
-    "@ledgerhq/hw-transport": "^4.19.0",
+    "@ledgerhq/hw-transport": "^4.21.0",
     "lodash": "^4.17.10",
     "node-hid": "^0.7.2",
     "usb": "^1.3.2"

diff --git a/packages/hw-transport-u2f/package.json b/packages/hw-transport-u2f/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/hw-transport-u2f",
-  "version": "4.20.0",
+  "version": "4.21.0",
   "description": "Ledger Hardware Wallet Web implementation of the communication layer, using U2F api",
   "keywords": [
     "Ledger",
@@ -26,7 +26,7 @@
   "main": "lib/TransportU2F.js",
   "license": "Apache-2.0",
   "dependencies": {
-    "@ledgerhq/hw-transport": "^4.19.0",
+    "@ledgerhq/hw-transport": "^4.21.0",
     "u2f-api": "0.2.7"
   },
   "devDependencies": {

diff --git a/packages/hw-transport/package.json b/packages/hw-transport/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/hw-transport",
-  "version": "4.19.0",
+  "version": "4.21.0",
   "description": "Ledger Hardware Wallet common interface of the communication layer",
   "keywords": [
     "Ledger",

diff --git a/packages/react-native-hid/package.json b/packages/react-native-hid/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/react-native-hid",
-  "version": "4.19.0",
+  "version": "4.21.0",
   "nativePackage": true,
   "description": "Ledger Hardware Wallet Web implementation of the communication layer, using U2F api",
   "keywords": [
@@ -27,7 +27,7 @@
   "main": "lib/index.js",
   "license": "Apache-2.0",
   "dependencies": {
-    "@ledgerhq/hw-transport": "^4.19.0"
+    "@ledgerhq/hw-transport": "^4.21.0"
   },
   "devDependencies": {
     "flow-bin": "^0.68.0",

diff --git a/packages/react-native-hw-transport-ble/package.json b/packages/react-native-hw-transport-ble/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/react-native-hw-transport-ble",
-  "version": "4.19.0",
+  "version": "4.21.0",
   "description": "Ledger Hardware Wallet bluetooth BLE implementation of the transport layer",
   "keywords": [
     "Ledger",
@@ -26,7 +26,7 @@
     "react-native-ble-plx": "^0.8.0"
   },
   "dependencies": {
-    "@ledgerhq/hw-transport": "^4.19.0",
+    "@ledgerhq/hw-transport": "^4.21.0",
     "invariant": "^2.2.4"
   },
   "devDependencies": {

diff --git a/packages/test/package.json b/packages/test/package.json
@@ -1,17 +1,17 @@
 {
   "private": true,
   "name": "@ledgerhq/test",
-  "version": "4.20.0",
+  "version": "4.21.0",
   "main": "index.js",
   "license": "Apache-2.0",
   "dependencies": {
-    "@ledgerhq/hw-app-ada": "^4.19.1",
-    "@ledgerhq/hw-app-btc": "^4.20.0",
-    "@ledgerhq/hw-app-eth": "^4.19.0",
-    "@ledgerhq/hw-app-str": "^4.19.0",
-    "@ledgerhq/hw-app-xrp": "^4.19.0",
-    "@ledgerhq/hw-transport-mocker": "^4.19.0",
-    "@ledgerhq/hw-transport-node-hid": "^4.19.1",
+    "@ledgerhq/hw-app-ada": "^4.21.0",
+    "@ledgerhq/hw-app-btc": "^4.21.0",
+    "@ledgerhq/hw-app-eth": "^4.21.0",
+    "@ledgerhq/hw-app-str": "^4.21.0",
+    "@ledgerhq/hw-app-xrp": "^4.21.0",
+    "@ledgerhq/hw-transport-mocker": "^4.21.0",
+    "@ledgerhq/hw-transport-node-hid": "^4.21.0",
     "budo": "^11.0.1"
   },
   "devDependencies": {