update ledger functions to use ledgerjs-hw-app-cardano 3.x api (#1379)

* update ledger functions to use ledgerjs-hw-app-cardano 3.0.0 api * flow fixes * lint + remaining flow errors * fixes
Emurgo · Jun 16, 2021 · f40cf47 · f40cf47
1 parent 43f9315
commit f40cf47
Show file tree

Hide file tree

Showing 12 changed files with 245 additions and 226 deletions.
diff --git a/.flowconfig b/.flowconfig
@@ -22,7 +22,6 @@ node_modules/warning/.*
 .*/node_modules/@react-native-community/cli/.*/.*
 
 ; Ignore @ledgerhq/react-native-hw-transport-ble
-.*/node_modules/@ledgerhq/react-native-hw-transport-ble/src/BleTransport.js
 .*/node_modules/@ledgerhq/react-native-hw-transport-ble/lib/BleTransport.js.flow
 
 ; Ignore @emurgo/cardano-serialization-lib-nodejs

diff --git a/package.json b/package.json
@@ -30,11 +30,11 @@
     "@babel/core": "7.12.10",
     "@babel/node": "7.12.6",
     "@babel/runtime": "7.12.5",
-    "@cardano-foundation/ledgerjs-hw-app-cardano": "2.2.1",
+    "@cardano-foundation/ledgerjs-hw-app-cardano": "3.2.0",
     "@emurgo/cip14-js": "2.0.0",
     "@emurgo/cip4-js": "1.0.5",
     "@emurgo/react-native-haskell-shelley": "1.1.4",
-    "@ledgerhq/react-native-hw-transport-ble": "5.41.0",
+    "@ledgerhq/react-native-hw-transport-ble": "5.51.1",
     "@react-native-async-storage/async-storage": "1.15.5",
     "@react-native-community/clipboard": "1.5.1",
     "@react-native-community/masked-view": "0.1.10",

diff --git a/src/components/Ledger/DeviceItem.js b/src/components/Ledger/DeviceItem.js
@@ -11,7 +11,7 @@ import {compose, withHandlers, withStateHandlers} from 'recompose'
 import {COLORS} from '../../styles/config'
 
 import type {ComponentType} from 'react'
-import type {Device} from '@ledgerhq/react-native-hw-transport-ble'
+import type {Device} from './types'
 
 const styles = StyleSheet.create({
   deviceItem: {

diff --git a/src/components/Ledger/LedgerConnect.js b/src/components/Ledger/LedgerConnect.js
@@ -29,7 +29,7 @@ import styles from './styles/LedgerConnect.style'
 import bleImage from '../../assets/img/bluetooth.png'
 import usbImage from '../../assets/img/ledger-nano-usb.png'
 
-import type {Device} from '@ledgerhq/react-native-hw-transport-ble'
+import type {Device} from './types'
 import type {DeviceId, DeviceObj} from '../../crypto/shelley/ledgerUtils'
 
 const messages = defineMessages({

diff --git a/src/components/Ledger/types.js b/src/components/Ledger/types.js
@@ -0,0 +1,6 @@
+// @flow
+
+//
+export type Device = {
+  id: number,
+}
diff --git a/src/components/Receive/AddressView.js b/src/components/Receive/AddressView.js
@@ -28,6 +28,7 @@ import {errorMessages} from '../../i18n/global-messages'
 import LocalizableError from '../../i18n/LocalizableError'
 import {Logger} from '../../utils/logging'
 import {CONFIG} from '../../config/config'
+import {getCardanoByronConfig} from '../../config/networks'
 
 import styles from './styles/AddressView.style'
 import infoIcon from '../../assets/img/icon/info.png'
@@ -59,6 +60,7 @@ const _handleOnVerifyAddress = async (
       await verifyAddress(
         walletMeta.walletImplementationId,
         walletMeta.networkId,
+        getCardanoByronConfig().PROTOCOL_MAGIC,
         address,
         addressingInfo,
         hwDeviceInfo,

diff --git a/src/components/WalletInit/ConnectNanoX/ConnectNanoXScreen.js b/src/components/WalletInit/ConnectNanoX/ConnectNanoXScreen.js
@@ -18,7 +18,7 @@ import LocalizableError from '../../../i18n/LocalizableError'
 import styles from './styles/ConnectNanoXScreen.style'
 
 import type {ComponentType} from 'react'
-import type {Device} from '@ledgerhq/react-native-hw-transport-ble'
+import type {Device} from '../../Ledger/types'
 import type {Navigation} from '../../../types/navigation'
 import type {DeviceId, DeviceObj} from '../../../crypto/shelley/ledgerUtils'
 

diff --git a/src/config/config.js b/src/config/config.js
@@ -92,7 +92,7 @@ const HARDWARE_WALLETS = {
     MODEL: 'Nano',
     ENABLE_USB_TRANSPORT: true,
     USB_MIN_SDK: 24, // USB transport officially supported for Android SDK >= 24
-    MIN_ADA_APP_VERSION: '2.1.0',
+    MIN_ADA_APP_VERSION: '2.2.1',
   },
 }
 

diff --git a/src/crypto/shelley/ShelleyWallet.js b/src/crypto/shelley/ShelleyWallet.js
@@ -830,7 +830,8 @@ export default class ShelleyWallet extends Wallet implements WalletInterface {
     const ledgerSignTxPayload = await createLedgerSignTxPayload({
       signRequest: request,
       byronNetworkMagic: getCardanoByronConfig().PROTOCOL_MAGIC,
-      networkId: Number.parseInt(this._getChainNetworkId(), 10),
+      // to not confuse with wallet's network id
+      chainNetworkId: Number.parseInt(this._getChainNetworkId(), 10),
       addressingMap,
     })