Update ledger app and fix typo

vacuumlabs · Nov 25, 2020 · 40c9268 · 40c9268
1 parent 50e890e
commit 40c9268
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -33,7 +33,7 @@
   "homepage": "https://github.com/vacuumlabs/cardano-hw-cli#readme",
   "dependencies": {
     "@babel/runtime": "^7.11.2",
-    "@cardano-foundation/ledgerjs-hw-app-cardano": "https://github.com/vacuumlabs/ledgerjs-cardano-shelley/releases/download/v2.0.2-rc.1/cardano-foundation-ledgerjs-hw-app-cardano-2.0.2-rc.1.tgz",
+    "@cardano-foundation/ledgerjs-hw-app-cardano": "https://github.com/vacuumlabs/ledgerjs-cardano-shelley/releases/download/v2.0.2-rc.2/cardano-foundation-ledgerjs-hw-app-cardano-2.0.2-rc.1.tgz",
     "@ledgerhq/hw-transport-node-hid": "^5.25.0",
     "argparse": "^2.0.1",
     "bignumber": "^1.1.0",

diff --git a/src/crypto-providers/trezorCryptoProvider.ts b/src/crypto-providers/trezorCryptoProvider.ts
@@ -273,8 +273,8 @@ const TrezorCryptoProvider: () => Promise<CryptoProvider> = async () => {
       certificates,
       withdrawals,
     })
-    if (response.error || !response.success) {
-      throw Error(Errors.TrezorSignTxError)
+    if (!response.success) {
+      throw Error(response.payload.error)
     }
     if (response.payload.hash !== txAux.getId()) {
       throw Error(Errors.TxSerializationMismatchError)

diff --git a/src/crypto-providers/util.ts b/src/crypto-providers/util.ts
@@ -85,7 +85,7 @@ const findSigningPath = (
   return signingFile?.path
 }
 
-const txHasPoolPoolRegistrationCert = (
+const txHasStakePoolRegistrationCert = (
   certs: _Certificate[],
 ): boolean => certs.some(
   ({ type }) => type === TxCertificateKeys.STAKEPOOL_REGISTRATION,
@@ -125,7 +125,7 @@ const validateWitnessing = (
     stakeSigningFiles,
   } = filterSigningFiles(signingFiles)
   validateTx(txAux, paymentSigningFiles, stakeSigningFiles)
-  if (txHasPoolPoolRegistrationCert(txAux.certificates)) {
+  if (txHasStakePoolRegistrationCert(txAux.certificates)) {
     validateTxWithPoolRegistration(txAux, paymentSigningFiles, stakeSigningFiles)
   }
 }
@@ -137,7 +137,7 @@ const validateSigning = (
     paymentSigningFiles,
     stakeSigningFiles,
   } = filterSigningFiles(signingFiles)
-  if (txHasPoolPoolRegistrationCert(txAux.certificates)) throw Error(Errors.CantSignTxWithPoolRegError)
+  if (txHasStakePoolRegistrationCert(txAux.certificates)) throw Error(Errors.CantSignTxWithPoolRegError)
   validateTx(txAux, paymentSigningFiles, stakeSigningFiles)
   if (!paymentSigningFiles.length) throw Error(Errors.MissingPaymentSigningFileError)
 }

diff --git a/src/errors.ts b/src/errors.ts
@@ -1,6 +1,5 @@
 /* eslint-disable max-len */
 enum Errors {
-  TrezorSignTxError = 'Error occured while signing the transaction with Trezor',
   HwTransportNotFoundError = 'Error occured while trying to find hw transport, make sure Ledger or Trezor is connected to you computer',
   InvalidPathError = 'Can not parse path',
   InvalidFileTypeError = 'Invalid file type of hw-signing-file',

diff --git a/yarn.lock b/yarn.lock
@@ -51,6 +51,17 @@
     bech32 "^1.1.4"
     node-int64 "^0.4.0"
 
+"@cardano-foundation/ledgerjs-hw-app-cardano@https://github.com/vacuumlabs/ledgerjs-cardano-shelley/releases/download/v2.0.2-rc.2/cardano-foundation-ledgerjs-hw-app-cardano-2.0.2-rc.1.tgz":
+  version "2.0.2-rc.1"
+  resolved "https://github.com/vacuumlabs/ledgerjs-cardano-shelley/releases/download/v2.0.2-rc.2/cardano-foundation-ledgerjs-hw-app-cardano-2.0.2-rc.1.tgz#015e0223559a3788868f396a73e2e2490b162487"
+  dependencies:
+    "@ledgerhq/hw-transport" "^5.12.0"
+    babel-polyfill "^6.26.0"
+    babel-runtime "^6.26.0"
+    base-x "^3.0.5"
+    bech32 "^1.1.4"
+    node-int64 "^0.4.0"
+
 "@eslint/eslintrc@^0.2.1":
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.1.tgz#f72069c330461a06684d119384435e12a5d76e3c"