From 74082a3ee9b985cbe7a49ad8b4f78ea74619cde5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= Date: Thu, 26 Jul 2018 17:33:42 +0200 Subject: [PATCH] Fixes ZCash extraData related https://github.com/LedgerHQ/ledgerjs/pull/192 --- package.json | 2 +- src/commands/libcoreSignAndBroadcast.js | 3 ++ yarn.lock | 38 ++++++++++++++----------- 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 77a8f480..a4e1c7c7 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "webpack-sources": "1.0.1" }, "dependencies": { - "@ledgerhq/hw-app-btc": "4.20.0", + "@ledgerhq/hw-app-btc": "4.21.0", "@ledgerhq/hw-app-eth": "^4.14.0", "@ledgerhq/hw-app-xrp": "^4.13.0", "@ledgerhq/hw-transport": "^4.13.0", diff --git a/src/commands/libcoreSignAndBroadcast.js b/src/commands/libcoreSignAndBroadcast.js index 14a8f063..acc90a3e 100644 --- a/src/commands/libcoreSignAndBroadcast.js +++ b/src/commands/libcoreSignAndBroadcast.js @@ -82,6 +82,8 @@ async function signTransaction({ if (currencyId === 'zcash') expiryHeight = Buffer.from([0x00, 0x00, 0x00, 0x00]) const rawInputs = transaction.getInputs() + const hasExtraData = currencyId === 'zcash' + const inputs = await Promise.all( rawInputs.map(async input => { const rawPreviousTransaction = await input.getPreviousTransaction() @@ -90,6 +92,7 @@ async function signTransaction({ hexPreviousTransaction, supportsSegwit, hasTimestamp, + hasExtraData, ) const outputIndex = input.getPreviousOutputIndex() const sequence = input.getSequence() diff --git a/yarn.lock b/yarn.lock index 24da8782..6ebc432f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1474,11 +1474,11 @@ version "0.7.1" resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.7.1.tgz#e44e596d03c9f16ba3b127ad333a8a072bcb5a0a" -"@ledgerhq/hw-app-btc@4.20.0": - version "4.20.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-btc/-/hw-app-btc-4.20.0.tgz#116f841932c199c3a286563831154207a5aa656f" +"@ledgerhq/hw-app-btc@4.21.0": + version "4.21.0" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-btc/-/hw-app-btc-4.21.0.tgz#4f94571bb3d63cd785e31a7e1f77ce597c344516" dependencies: - "@ledgerhq/hw-transport" "^4.19.0" + "@ledgerhq/hw-transport" "^4.21.0" create-hash "^1.1.3" "@ledgerhq/hw-app-btc@^4.7.3": @@ -1489,23 +1489,23 @@ create-hash "^1.1.3" "@ledgerhq/hw-app-eth@^4.14.0": - version "4.19.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-eth/-/hw-app-eth-4.19.0.tgz#2a76556172b4e9522a9b92357a48b39e10e003a6" + version "4.21.0" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-eth/-/hw-app-eth-4.21.0.tgz#2d8bfbe5f09b92e8d6951ae685036d9d5aea96ff" dependencies: - "@ledgerhq/hw-transport" "^4.19.0" + "@ledgerhq/hw-transport" "^4.21.0" "@ledgerhq/hw-app-xrp@^4.13.0": - version "4.19.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-xrp/-/hw-app-xrp-4.19.0.tgz#67fc53e5ab7791f28481ed5406adcf7d92c7ca9b" + version "4.21.0" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-xrp/-/hw-app-xrp-4.21.0.tgz#259010f10bd7fdcb6eb24eb25aa5144545d1a402" dependencies: - "@ledgerhq/hw-transport" "^4.19.0" + "@ledgerhq/hw-transport" "^4.21.0" bip32-path "0.4.2" "@ledgerhq/hw-transport-node-hid@^4.13.0": - version "4.19.1" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-4.19.1.tgz#bc2cda4db0b4e8a3e26682bf5b81011f8eb53d82" + version "4.21.0" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-4.21.0.tgz#fffdae5314bb969473a763e59fe1dfdde3fd7aed" dependencies: - "@ledgerhq/hw-transport" "^4.19.0" + "@ledgerhq/hw-transport" "^4.21.0" node-hid "^0.7.2" "@ledgerhq/hw-transport-node-hid@^4.7.6": @@ -1515,7 +1515,13 @@ "@ledgerhq/hw-transport" "^4.15.0" node-hid "^0.7.2" -"@ledgerhq/hw-transport@^4.13.0", "@ledgerhq/hw-transport@^4.15.0", "@ledgerhq/hw-transport@^4.19.0": +"@ledgerhq/hw-transport@^4.13.0", "@ledgerhq/hw-transport@^4.21.0": + version "4.21.0" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-4.21.0.tgz#50f85cfe115ba3f9d5bf94755c701e927175794f" + dependencies: + events "^2.0.0" + +"@ledgerhq/hw-transport@^4.15.0": version "4.19.0" resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-4.19.0.tgz#19a804aee1bfc4abac1dc9a2a7a582e79273f991" dependencies: @@ -9723,8 +9729,8 @@ mimic-fn@^1.0.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" mimic-response@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.0.tgz#df3d3652a73fded6b9b0b24146e6fd052353458e" + version "1.0.1" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" min-document@^2.19.0: version "2.19.0"