diff --git a/libs/ledger-live-common/package.json b/libs/ledger-live-common/package.json index 2a54002fef80..5ea4e035fcc4 100644 --- a/libs/ledger-live-common/package.json +++ b/libs/ledger-live-common/package.json @@ -110,7 +110,7 @@ "https": false }, "dependencies": { - "@cardano-foundation/ledgerjs-hw-app-cardano": "^5.1.0", + "@cardano-foundation/ledgerjs-hw-app-cardano": "^6.0.0", "@celo/connect": "^3.0.1", "@celo/contractkit": "^3.0.1", "@celo/utils": "^3.0.1", @@ -302,4 +302,4 @@ "uuid": "^8.3.2", "ws": "7" } -} +} \ No newline at end of file diff --git a/libs/ledger-live-common/src/families/cardano/hw-getAddress.ts b/libs/ledger-live-common/src/families/cardano/hw-getAddress.ts index 230c07ba6359..ced4508fae35 100644 --- a/libs/ledger-live-common/src/families/cardano/hw-getAddress.ts +++ b/libs/ledger-live-common/src/families/cardano/hw-getAddress.ts @@ -1,6 +1,6 @@ import type { Resolver } from "../../hw/getAddress/types"; import Ada, { Networks, AddressType } from "@cardano-foundation/ledgerjs-hw-app-cardano"; -import { str_to_path } from "@cardano-foundation/ledgerjs-hw-app-cardano/dist/utils"; +import { str_to_path } from "@cardano-foundation/ledgerjs-hw-app-cardano/dist/utils/address"; import { getBipPathFromString, getBipPathString } from "./logic"; import { StakeChain } from "./types"; import { STAKING_ADDRESS_INDEX } from "./constants"; diff --git a/libs/ledger-live-common/src/families/cardano/js-synchronisation.ts b/libs/ledger-live-common/src/families/cardano/js-synchronisation.ts index 7f0938cc8d94..d5186e78b08f 100644 --- a/libs/ledger-live-common/src/families/cardano/js-synchronisation.ts +++ b/libs/ledger-live-common/src/families/cardano/js-synchronisation.ts @@ -9,7 +9,7 @@ import { encodeAccountId, inferSubOperations } from "@ledgerhq/coin-framework/ac import BigNumber from "bignumber.js"; import Ada, { ExtendedPublicKey } from "@cardano-foundation/ledgerjs-hw-app-cardano"; -import { str_to_path } from "@cardano-foundation/ledgerjs-hw-app-cardano/dist/utils"; +import { str_to_path } from "@cardano-foundation/ledgerjs-hw-app-cardano/dist/utils/address"; import { utils as TyphonUtils } from "@stricahq/typhonjs"; import { APITransaction, HashType } from "./api/api-types"; import { diff --git a/libs/ledger-live-common/src/families/cardano/logic.ts b/libs/ledger-live-common/src/families/cardano/logic.ts index acfca8396d04..4cb214661b73 100644 --- a/libs/ledger-live-common/src/families/cardano/logic.ts +++ b/libs/ledger-live-common/src/families/cardano/logic.ts @@ -38,7 +38,7 @@ import { TxOutputDestination, TxOutputDestinationType, } from "@cardano-foundation/ledgerjs-hw-app-cardano"; -import { str_to_path } from "@cardano-foundation/ledgerjs-hw-app-cardano/dist/utils"; +import { str_to_path } from "@cardano-foundation/ledgerjs-hw-app-cardano/dist/utils/address"; /** * returns BipPath object with account, chain and index field for cardano diff --git a/libs/ledger-live-common/src/families/cardano/tx-helpers.ts b/libs/ledger-live-common/src/families/cardano/tx-helpers.ts index 00a3714be89e..4ca23b19cfe4 100644 --- a/libs/ledger-live-common/src/families/cardano/tx-helpers.ts +++ b/libs/ledger-live-common/src/families/cardano/tx-helpers.ts @@ -6,7 +6,7 @@ import { StakeDeregistrationParams, Withdrawal, } from "@cardano-foundation/ledgerjs-hw-app-cardano"; -import { str_to_path } from "@cardano-foundation/ledgerjs-hw-app-cardano/dist/utils"; +import { str_to_path } from "@cardano-foundation/ledgerjs-hw-app-cardano/dist/utils/address"; import { types as TyphonTypes, address as TyphonAddress } from "@stricahq/typhonjs"; import groupBy from "lodash/groupBy"; import { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 86092679b10a..53e2ee9d7b97 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,9 +1,5 @@ lockfileVersion: '6.0' -settings: - autoInstallPeers: false - excludeLinksFromLockfile: false - overrides: stellar-base>sodium-native: ^3.2.1 remove-flow-types-loader>flow-remove-types: ^2 @@ -1939,8 +1935,8 @@ importers: libs/ledger-live-common: dependencies: '@cardano-foundation/ledgerjs-hw-app-cardano': - specifier: ^5.1.0 - version: 5.1.0 + specifier: ^6.0.0 + version: 6.0.0 '@celo/connect': specifier: ^3.0.1 version: 3.0.1 @@ -11181,14 +11177,12 @@ packages: resolution: {integrity: sha512-i9TxOEnZdK4npHY9rR3VSNG51VErpZ2GTAg5RIwMFmcOb+9/Q2oWyUGg50ZSiflUi0nfnakuodhSpugS96k7pQ==} dev: false - /@cardano-foundation/ledgerjs-hw-app-cardano@5.1.0: - resolution: {integrity: sha512-ucuz/XbS/0ZD0Bal/GI/kiTm9jDIl8J+A7ypEqcAcBDGicFsyWmtPotOTwuDovTsiM8+eA/5OGTFX0oRqzxstQ==} + /@cardano-foundation/ledgerjs-hw-app-cardano@6.0.0: + resolution: {integrity: sha512-aiWlERF5sXMzygE62YH9AXrVePu5ZG+QKGv/ZhvYec35vUhDFJK8qPiLzXmTy6MdoDKSqbYVRPd6jY3KKs5pOg==} dependencies: - '@ledgerhq/hw-transport': 5.51.1 - '@types/ledgerhq__hw-transport': 4.21.4 + '@ledgerhq/hw-transport': 6.28.8 base-x: 3.0.9 bech32: 1.1.4 - blake2: 4.1.1 int64-buffer: 1.0.1 dev: false @@ -25167,12 +25161,6 @@ packages: dependencies: '@types/node': 18.16.19 - /@types/ledgerhq__hw-transport@4.21.4: - resolution: {integrity: sha512-vep+6yZnGv6owAthIY0w3f72w4dJIb4+yE5PCHveInTlZE9wukvU6Wc5Eig0OUUxcdhTazzeZx1xUaNVLqyQSg==} - dependencies: - '@types/node': 18.16.19 - dev: false - /@types/libsodium-wrappers@0.7.9: resolution: {integrity: sha512-LisgKLlYQk19baQwjkBZZXdJL0KbeTpdEnrAfz5hQACbklCY0gVFnsKUyjfNWF1UQsCSjw93Sj5jSbiO8RPfdw==} dev: false @@ -29709,14 +29697,6 @@ packages: readable-stream: 3.6.2 dev: false - /blake2@4.1.1: - resolution: {integrity: sha512-HUmkY0MUDUVgejJVNrpNKAva8C4IWD/Rd862sdexoSibu86b6iu0gO0/RjovO2lM5+w6JqjIEmkuAgGhfHlnJw==} - engines: {node: '>= 8.0.0'} - requiresBuild: true - dependencies: - nan: 2.17.0 - dev: false - /blake2b-wasm@1.1.7: resolution: {integrity: sha512-oFIHvXhlz/DUgF0kq5B1CqxIDjIJwh9iDeUUGQUcvgiGz7Wdw03McEO7CfLBy7QKGdsydcMCgO9jFNBAFCtFcA==} dependencies: @@ -48431,6 +48411,7 @@ packages: /nan@2.17.0: resolution: {integrity: sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==} requiresBuild: true + optional: true /nano-json-stream-parser@0.1.2: resolution: {integrity: sha512-9MqxMH/BSJC7dnLsEMPyfN5Dvoo49IsPFYMcHw3Bcfc2kN0lpHRBSzlMSVx4HGyJ7s9B31CyBTVehWJoQ8Ctew==} @@ -63348,6 +63329,7 @@ packages: resolution: {directory: libs/ui/packages/crypto-icons, type: directory} id: file:libs/ui/packages/crypto-icons name: '@ledgerhq/crypto-icons-ui' + version: 0.5.1 peerDependencies: '@types/react': '*' react: '*' @@ -63367,6 +63349,7 @@ packages: resolution: {directory: libs/ui/packages/icons, type: directory} id: file:libs/ui/packages/icons name: '@ledgerhq/icons-ui' + version: 0.6.1 peerDependencies: '@types/react': '*' react: '*' @@ -63390,3 +63373,7 @@ packages: dependencies: commander: 2.20.3 dev: false + +settings: + autoInstallPeers: false + excludeLinksFromLockfile: false