From 00996e5aa930708429a9229f5f5e7ca2fb23b8b0 Mon Sep 17 00:00:00 2001 From: KhalilBellakrid Date: Thu, 3 Jan 2019 23:36:25 +0100 Subject: [PATCH 1/4] Support for XSN and activate Sapling for Komodo --- package.json | 2 +- src/commands/libcoreSignAndBroadcast.js | 4 ++-- src/config/cryptocurrencies.js | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index e342f101..2c9a4a14 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@ledgerhq/hw-app-xrp": "^4.32.0", "@ledgerhq/hw-transport": "^4.32.0", "@ledgerhq/hw-transport-node-hid": "^4.32.0", - "@ledgerhq/ledger-core": "2.0.0-rc.14", + "@ledgerhq/ledger-core": "2.0.0-rc.15", "@ledgerhq/live-common": "4.13.0", "animated": "^0.2.2", "async": "^2.6.1", diff --git a/src/commands/libcoreSignAndBroadcast.js b/src/commands/libcoreSignAndBroadcast.js index b683a58b..a5847864 100644 --- a/src/commands/libcoreSignAndBroadcast.js +++ b/src/commands/libcoreSignAndBroadcast.js @@ -110,7 +110,7 @@ async function signTransaction({ const additionals = [] let expiryHeight if (currency.id === 'bitcoin_cash' || currency.id === 'bitcoin_gold') additionals.push('bip143') - if (currency.id === 'zcash') { + if (currency.id === 'zcash' || currency.id === 'komodo') { expiryHeight = Buffer.from([0x00, 0x00, 0x00, 0x00]) if (blockHeight >= 419200) { additionals.push('sapling') @@ -121,7 +121,7 @@ async function signTransaction({ } const rawInputs = transaction.getInputs() - const hasExtraData = currency.id === 'zcash' + const hasExtraData = currency.id === 'zcash' || currency.id === 'komodo' const inputs = await Promise.all( rawInputs.map(async input => { diff --git a/src/config/cryptocurrencies.js b/src/config/cryptocurrencies.js index c29ccbc7..4c29f7b3 100644 --- a/src/config/cryptocurrencies.js +++ b/src/config/cryptocurrencies.js @@ -24,6 +24,7 @@ const supported: CryptoCurrencyIds[] = [ 'vertcoin', 'peercoin', 'viacoin', + 'stakenet', 'stealthcoin', 'poswallet', 'clubcoin', From df0e8f11da3207ccb503d075f87f6b7e06961ca5 Mon Sep 17 00:00:00 2001 From: KhalilBellakrid Date: Tue, 15 Jan 2019 11:39:15 +0100 Subject: [PATCH 2/4] Bump binding which now uses 1.1.9: fix getFees --- package.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package.json b/package.json index 2c9a4a14..ec88d558 100644 --- a/package.json +++ b/package.json @@ -40,8 +40,13 @@ "@ledgerhq/hw-app-xrp": "^4.32.0", "@ledgerhq/hw-transport": "^4.32.0", "@ledgerhq/hw-transport-node-hid": "^4.32.0", +<<<<<<< HEAD "@ledgerhq/ledger-core": "2.0.0-rc.15", "@ledgerhq/live-common": "4.13.0", +======= + "@ledgerhq/ledger-core": "2.0.0-rc.16", + "@ledgerhq/live-common": "4.8.0-beta.24", +>>>>>>> Bump binding which now uses 1.1.9: fix getFees "animated": "^0.2.2", "async": "^2.6.1", "axios": "^0.18.0", From 8387f9aa038e3ed8cbc1d6d163be148abd76cffd Mon Sep 17 00:00:00 2001 From: KhalilBellakrid Date: Tue, 15 Jan 2019 12:16:28 +0100 Subject: [PATCH 3/4] Bump hw-app-btc to 4.33.6 --- package.json | 7 +------ yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index ec88d558..82d00683 100644 --- a/package.json +++ b/package.json @@ -40,13 +40,8 @@ "@ledgerhq/hw-app-xrp": "^4.32.0", "@ledgerhq/hw-transport": "^4.32.0", "@ledgerhq/hw-transport-node-hid": "^4.32.0", -<<<<<<< HEAD - "@ledgerhq/ledger-core": "2.0.0-rc.15", - "@ledgerhq/live-common": "4.13.0", -======= "@ledgerhq/ledger-core": "2.0.0-rc.16", - "@ledgerhq/live-common": "4.8.0-beta.24", ->>>>>>> Bump binding which now uses 1.1.9: fix getFees + "@ledgerhq/live-common": "4.13.0", "animated": "^0.2.2", "async": "^2.6.1", "axios": "^0.18.0", diff --git a/yarn.lock b/yarn.lock index 1716e7bf..8b30bb86 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1722,10 +1722,10 @@ dependencies: events "^3.0.0" -"@ledgerhq/ledger-core@2.0.0-rc.14": - version "2.0.0-rc.14" - resolved "https://registry.yarnpkg.com/@ledgerhq/ledger-core/-/ledger-core-2.0.0-rc.14.tgz#538b771e9d837ce1d26aabaa1dfe58a6b882e3cd" - integrity sha512-WIq6DyOoqtPPt+pS8K6NQ8EJD9GIn/VD1HLehWvJYqZhUf1IOIEIaOqxCnayHMQ/7b4c68xANgmKggUBdQ0M+A== +"@ledgerhq/ledger-core@2.0.0-rc.16": + version "2.0.0-rc.16" + resolved "https://registry.yarnpkg.com/@ledgerhq/ledger-core/-/ledger-core-2.0.0-rc.16.tgz#51f141c0143edb020e38855bf2e2619e3446e74f" + integrity sha512-gmbeXRBg4NSqzH6+EajYTzaQlwN5ugaN1nH0SI6BvRqMfcorxNRE8byfh3F2u+7TNchBW72vOZnKPDShaR9/pQ== dependencies: bindings "^1.3.0" nan "^2.6.2" From c60c1506c25b03f10d8ea9a6657818b1706505c7 Mon Sep 17 00:00:00 2001 From: KhalilBellakrid Date: Thu, 24 Jan 2019 14:50:36 +0100 Subject: [PATCH 4/4] Bump hw-app-btc to 4.34.0: fix of decred --- package.json | 2 +- yarn.lock | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 82d00683..ac7bfe6c 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ } }, "dependencies": { - "@ledgerhq/hw-app-btc": "^4.32.0", + "@ledgerhq/hw-app-btc": "^4.34.0", "@ledgerhq/hw-app-eth": "^4.32.0", "@ledgerhq/hw-app-xrp": "^4.32.0", "@ledgerhq/hw-transport": "^4.32.0", diff --git a/yarn.lock b/yarn.lock index 8b30bb86..de3d8312 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1690,6 +1690,14 @@ "@ledgerhq/hw-transport" "^4.32.0" create-hash "^1.1.3" +"@ledgerhq/hw-app-btc@^4.34.0": + version "4.34.0" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-btc/-/hw-app-btc-4.34.0.tgz#0bbc46afd29de04ac6a73582fbf9a09fcf5ed117" + integrity sha512-xR4rH8o8YRvyhnTvb8g89NAJQQqXJkApiFtCvduBamu5V+rDvhHYlFu2B+CU6g8lzLFACMDIqJqXbmwT80AGjw== + dependencies: + "@ledgerhq/hw-transport" "^4.32.0" + create-hash "^1.1.3" + "@ledgerhq/hw-app-eth@^4.32.0": version "4.32.0" resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-eth/-/hw-app-eth-4.32.0.tgz#7d43ca2c7952f1fb726e02c3b4485be10af481a2"