diff --git a/package.json b/package.json index 7c9b11dc..82192516 100644 --- a/package.json +++ b/package.json @@ -35,12 +35,12 @@ } }, "dependencies": { - "@ledgerhq/hw-app-btc": "^4.27.0", + "@ledgerhq/hw-app-btc": "^v4.30.0", "@ledgerhq/hw-app-eth": "^4.24.0", "@ledgerhq/hw-app-xrp": "^4.25.0", "@ledgerhq/hw-transport": "^4.24.0", "@ledgerhq/hw-transport-node-hid": "4.24.0", - "@ledgerhq/ledger-core": "2.0.0-rc.11", + "@ledgerhq/ledger-core": "2.0.0-rc.12", "@ledgerhq/live-common": "4.6.0", "animated": "^0.2.2", "async": "^2.6.1", diff --git a/src/commands/libcoreSignAndBroadcast.js b/src/commands/libcoreSignAndBroadcast.js index e91d35a9..c9413694 100644 --- a/src/commands/libcoreSignAndBroadcast.js +++ b/src/commands/libcoreSignAndBroadcast.js @@ -115,6 +115,9 @@ async function signTransaction({ if (blockHeight >= 419200) { additionals.push('sapling') } + } else if (currency.id === 'decred') { + expiryHeight = Buffer.from([0x00, 0x00, 0x00, 0x00]) + additionals.push('decred') } const rawInputs = transaction.getInputs() @@ -129,6 +132,7 @@ async function signTransaction({ true, // set to true allow both segwit AND non-segwit hasTimestamp, hasExtraData, + additionals, ) const outputIndex = input.getPreviousOutputIndex() const sequence = input.getSequence() diff --git a/src/components/modals/Send/steps/04-step-confirmation.js b/src/components/modals/Send/steps/04-step-confirmation.js index f39881b9..50b762cc 100644 --- a/src/components/modals/Send/steps/04-step-confirmation.js +++ b/src/components/modals/Send/steps/04-step-confirmation.js @@ -34,6 +34,7 @@ const Title = styled(Box).attrs({ mt: 2, })` text-align: center; + word-break: break-word; ` const Text = styled(Box).attrs({ diff --git a/src/config/cryptocurrencies.js b/src/config/cryptocurrencies.js index 4c6d1ea5..c29ccbc7 100644 --- a/src/config/cryptocurrencies.js +++ b/src/config/cryptocurrencies.js @@ -27,6 +27,7 @@ const supported: CryptoCurrencyIds[] = [ 'stealthcoin', 'poswallet', 'clubcoin', + 'decred', 'bitcoin_testnet', ] diff --git a/yarn.lock b/yarn.lock index 92a193a0..9afa1d4a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1677,7 +1677,7 @@ camelcase "^5.0.0" prettier "^1.13.7" -"@ledgerhq/hw-app-btc@^4.24.0", "@ledgerhq/hw-app-btc@^4.27.0": +"@ledgerhq/hw-app-btc@^4.24.0": version "4.27.0" resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-btc/-/hw-app-btc-4.27.0.tgz#11fc822bd34a47a39b1a7ae03ced69cf1d432796" integrity sha512-7Ck48wCBb6nd9UXarNeGOsOqbOTi2cs4AxFhbDNrVLvPiBSH0yEiNQEF95J6u5BxKkAdM1GV9LoRumR4KhZGqQ== @@ -1693,6 +1693,14 @@ "@ledgerhq/hw-transport" "^4.15.0" create-hash "^1.1.3" +"@ledgerhq/hw-app-btc@^v4.30.0": + version "4.30.0" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-btc/-/hw-app-btc-4.30.0.tgz#50cef544c361072ce12b12b1e8166d7a8b0d9dbd" + integrity sha512-xVXcI4cvBZiqx2o6fB+3tt0HhzJwGH17EoGP3PRJoFvIRi3Mnf3R0CU5k8Y7xFzISvmBEO2GKcetjg4dfgqDKw== + dependencies: + "@ledgerhq/hw-transport" "^4.24.0" + create-hash "^1.1.3" + "@ledgerhq/hw-app-eth@^4.24.0": version "4.24.0" resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-eth/-/hw-app-eth-4.24.0.tgz#b62514e0d18672d6d35d76dfbeaf93b67d2e5324" @@ -1748,10 +1756,10 @@ dependencies: events "^3.0.0" -"@ledgerhq/ledger-core@2.0.0-rc.11": - version "2.0.0-rc.11" - resolved "https://registry.yarnpkg.com/@ledgerhq/ledger-core/-/ledger-core-2.0.0-rc.11.tgz#5b314e222f487dfa8f525ba1ef008ae30b289339" - integrity sha512-HmtUd3WrVhJQtjNe6qO/hGrnzrE2YbdaTQnLhsQyD3qN1vUwHmanHjqOqVLFRI8a3KqVdMFqYMvn3N5c0hsLuQ== +"@ledgerhq/ledger-core@2.0.0-rc.12": + version "2.0.0-rc.12" + resolved "https://registry.yarnpkg.com/@ledgerhq/ledger-core/-/ledger-core-2.0.0-rc.12.tgz#bdd3e4b601acb0c74c640f40bea2609bb5e4b0f4" + integrity sha512-nwPAmDlGGSx/nRzwxKodmN1KBKtFmElE0FkbbAn1s0xiX6C8wMPRWPtD7oTufJ5MsfSfJg4ELsscEiaHFbZFKA== dependencies: "@ledgerhq/hw-app-btc" "^4.7.3" "@ledgerhq/hw-transport-node-hid" "^4.7.6"