diff --git a/libs/coin-modules/coin-cosmos/src/specs.ts b/libs/coin-modules/coin-cosmos/src/specs.ts index eb44598a49fc..1bdcb6b4e225 100644 --- a/libs/coin-modules/coin-cosmos/src/specs.ts +++ b/libs/coin-modules/coin-cosmos/src/specs.ts @@ -604,6 +604,7 @@ const cryptoOrg = { ...generateGenericCosmosTest("crypto_org", false, { minViableAmount: cryptoOrgMinimalTransactionAmount, mutations: cosmosLikeMutations(cryptoOrgMinimalTransactionAmount), + testTimeout: 4 * 60 * 1000, skipOperationHistory: true, }), }; diff --git a/libs/ledger-live-common/src/generated/bridge/js.ts b/libs/ledger-live-common/src/generated/bridge/js.ts index 98d8aaec2c12..4b902b98ac2f 100644 --- a/libs/ledger-live-common/src/generated/bridge/js.ts +++ b/libs/ledger-live-common/src/generated/bridge/js.ts @@ -1,6 +1,5 @@ import casper from "../../families/casper/bridge/js"; import celo from "../../families/celo/bridge/js"; -import crypto_org from "../../families/crypto_org/bridge/js"; import { bridge as algorand } from "../../families/algorand/setup"; import { bridge as bitcoin } from "../../families/bitcoin/setup"; import { bridge as cardano } from "../../families/cardano/setup"; @@ -25,11 +24,6 @@ import { bridge as xrp } from "../../families/xrp/setup"; export default { casper, celo, -<<<<<<< HEAD - crypto_org, -======= - internet_computer, ->>>>>>> 83ebc75b9f (fix: move crypto org into cosmos coin module) algorand, bitcoin, cardano, diff --git a/libs/ledger-live-common/src/generated/deviceTransactionConfig.ts b/libs/ledger-live-common/src/generated/deviceTransactionConfig.ts index ad56db292289..2e87853bee5c 100644 --- a/libs/ledger-live-common/src/generated/deviceTransactionConfig.ts +++ b/libs/ledger-live-common/src/generated/deviceTransactionConfig.ts @@ -1,6 +1,5 @@ import casper from "../families/casper/deviceTransactionConfig"; import celo from "../families/celo/deviceTransactionConfig"; -import crypto_org from "../families/crypto_org/deviceTransactionConfig"; import algorand from "@ledgerhq/coin-algorand/deviceTransactionConfig"; import bitcoin from "@ledgerhq/coin-bitcoin/deviceTransactionConfig"; import cardano from "@ledgerhq/coin-cardano/deviceTransactionConfig"; @@ -24,11 +23,6 @@ import xrp from "@ledgerhq/coin-xrp/deviceTransactionConfig"; export default { casper, celo, -<<<<<<< HEAD - crypto_org, -======= - internet_computer, ->>>>>>> 83ebc75b9f (fix: move crypto org into cosmos coin module) algorand, bitcoin, cardano, diff --git a/libs/ledger-live-common/src/generated/hw-getAddress.ts b/libs/ledger-live-common/src/generated/hw-getAddress.ts index 4acd9d00db1e..047bf2e26dff 100644 --- a/libs/ledger-live-common/src/generated/hw-getAddress.ts +++ b/libs/ledger-live-common/src/generated/hw-getAddress.ts @@ -1,6 +1,5 @@ import casper from "../families/casper/hw-getAddress"; import celo from "../families/celo/hw-getAddress"; -import crypto_org from "../families/crypto_org/hw-getAddress"; import { resolver as algorand } from "../families/algorand/setup"; import { resolver as bitcoin } from "../families/bitcoin/setup"; import { resolver as cardano } from "../families/cardano/setup"; @@ -25,11 +24,6 @@ import { resolver as xrp } from "../families/xrp/setup"; export default { casper, celo, -<<<<<<< HEAD - crypto_org, -======= - internet_computer, ->>>>>>> 83ebc75b9f (fix: move crypto org into cosmos coin module) algorand, bitcoin, cardano, diff --git a/libs/ledger-live-common/src/generated/specs.ts b/libs/ledger-live-common/src/generated/specs.ts index 0b62feff84d4..b17dc560ca9f 100644 --- a/libs/ledger-live-common/src/generated/specs.ts +++ b/libs/ledger-live-common/src/generated/specs.ts @@ -1,6 +1,5 @@ import casper from "../families/casper/specs"; import celo from "../families/celo/specs"; -import crypto_org from "../families/crypto_org/specs"; import algorand from "@ledgerhq/coin-algorand/specs"; import bitcoin from "@ledgerhq/coin-bitcoin/specs"; import cardano from "@ledgerhq/coin-cardano/specs"; @@ -25,11 +24,6 @@ import xrp from "@ledgerhq/coin-xrp/specs"; export default { casper, celo, -<<<<<<< HEAD - crypto_org, -======= - internet_computer, ->>>>>>> 83ebc75b9f (fix: move crypto org into cosmos coin module) algorand, bitcoin, cardano, diff --git a/libs/ledger-live-common/src/generated/transaction.ts b/libs/ledger-live-common/src/generated/transaction.ts index 991b019da0c8..08d1d04d2832 100644 --- a/libs/ledger-live-common/src/generated/transaction.ts +++ b/libs/ledger-live-common/src/generated/transaction.ts @@ -1,6 +1,5 @@ import casper from "../families/casper/transaction"; import celo from "../families/celo/transaction"; -import crypto_org from "../families/crypto_org/transaction"; import algorand from "@ledgerhq/coin-algorand/transaction"; import bitcoin from "@ledgerhq/coin-bitcoin/transaction"; import cardano from "@ledgerhq/coin-cardano/transaction"; @@ -25,11 +24,6 @@ import xrp from "@ledgerhq/coin-xrp/transaction"; export default { casper, celo, -<<<<<<< HEAD - crypto_org, -======= - internet_computer, ->>>>>>> 83ebc75b9f (fix: move crypto org into cosmos coin module) algorand, bitcoin, cardano, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 969e6e953779..61ab802655e4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2580,6 +2580,85 @@ importers: specifier: ^29.1.1 version: 29.1.5(jest@29.7.0)(typescript@5.4.3) + libs/coin-modules/coin-internet_computer: + dependencies: + '@dfinity/agent': + specifier: ^0.21.0 + version: 0.21.4(@dfinity/candid@0.21.4(@dfinity/principal@0.15.7(typescript@5.4.3)))(@dfinity/principal@0.15.7(typescript@5.4.3)) + '@dfinity/candid': + specifier: ^0.21.0 + version: 0.21.4(@dfinity/principal@0.15.7(typescript@5.4.3)) + '@dfinity/principal': + specifier: ^0.15.6 + version: 0.15.7(typescript@5.4.3) + '@ledgerhq/coin-framework': + specifier: workspace:^ + version: link:../../coin-framework + '@ledgerhq/cryptoassets': + specifier: workspace:^ + version: link:../../ledgerjs/packages/cryptoassets + '@ledgerhq/devices': + specifier: workspace:* + version: link:../../ledgerjs/packages/devices + '@ledgerhq/errors': + specifier: workspace:^ + version: link:../../ledgerjs/packages/errors + '@ledgerhq/live-env': + specifier: workspace:^ + version: link:../../env + '@ledgerhq/live-network': + specifier: workspace:^ + version: link:../../live-network + '@ledgerhq/logs': + specifier: workspace:^ + version: link:../../ledgerjs/packages/logs + '@ledgerhq/types-live': + specifier: workspace:^ + version: link:../../ledgerjs/packages/types-live + big-integer: + specifier: ^1.6.51 + version: 1.6.52 + bignumber.js: + specifier: ^9.1.2 + version: 9.1.2 + expect: + specifier: ^27.4.6 + version: 27.5.1 + invariant: + specifier: ^2.2.2 + version: 2.2.4 + lodash: + specifier: ^4.17.21 + version: 4.17.21 + rxjs: + specifier: ^7.8.1 + version: 7.8.1 + simple-cbor: + specifier: ^0.4.1 + version: 0.4.1 + devDependencies: + '@types/invariant': + specifier: ^2.2.2 + version: 2.2.37 + '@types/jest': + specifier: ^29.5.10 + version: 29.5.14 + '@types/lodash': + specifier: ^4.14.191 + version: 4.17.7 + '@types/semver': + specifier: ^7.5.8 + version: 7.5.8 + axios: + specifier: 1.7.7 + version: 1.7.7 + jest: + specifier: ^29.7.0 + version: 29.7.0 + ts-jest: + specifier: ^29.1.1 + version: 29.2.5(jest@29.7.0)(typescript@5.4.3) + libs/coin-modules/coin-near: dependencies: '@ledgerhq/coin-framework': @@ -3826,6 +3905,9 @@ importers: '@ledgerhq/coin-icon': specifier: workspace:^ version: link:../coin-modules/coin-icon + '@ledgerhq/coin-internet_computer': + specifier: workspace:^ + version: link:../coin-modules/coin-internet_computer '@ledgerhq/coin-near': specifier: workspace:^ version: link:../coin-modules/coin-near @@ -12562,6 +12644,8 @@ packages: '@react-native/babel-preset@0.74.87': resolution: {integrity: sha512-hyKpfqzN2nxZmYYJ0tQIHG99FQO0OWXp/gVggAfEUgiT+yNKas1C60LuofUsK7cd+2o9jrpqgqW4WzEDZoBlTg==} engines: {node: '>=18'} + peerDependencies: + '@babel/core': '*' '@react-native/babel-preset@0.74.88': resolution: {integrity: sha512-SQODiFGlyblFTvdvePUDrQ+qlSzhcOm7It/yW2CVKxw5zRUf50+Cj3DBkRFhQDqF3ri2EnWsLnJ3oNE7hqDUxg==} @@ -19129,11 +19213,6 @@ packages: engines: {node: '>=0.10.0'} hasBin: true - ejs@3.1.9: - resolution: {integrity: sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==} - engines: {node: '>=0.10.0'} - hasBin: true - electron-app-universal-protocol-client@1.3.0: resolution: {integrity: sha512-8txI5+PP4sFIYooTmBOP1imsMx1Mov7ouEebT+mwikoENq70e6tflOOXBCNJVxsbp93+BQ/l/+WT5BiPvRFXZA==} peerDependencies: @@ -33188,11 +33267,37 @@ snapshots: buffer: 6.0.3(patch_hash=2xnca52oxhztvr7iaoovwclcze) simple-cbor: 0.4.1 + '@dfinity/agent@0.21.4(@dfinity/candid@0.21.4(@dfinity/principal@0.15.7(typescript@5.4.3)))(@dfinity/principal@0.15.7(typescript@5.4.3))': + dependencies: + '@dfinity/candid': 0.21.4(@dfinity/principal@0.15.7(typescript@5.4.3)) + '@dfinity/principal': 0.15.7(typescript@5.4.3) + '@noble/curves': 1.6.0 + '@noble/hashes': 1.5.0 + base64-arraybuffer: 0.2.0 + borc: 2.1.2 + buffer: 6.0.3(patch_hash=2xnca52oxhztvr7iaoovwclcze) + simple-cbor: 0.4.1 + '@dfinity/candid@0.21.4(@dfinity/principal@0.15.7(@types/node@20.12.12)(typescript@5.1.3))': dependencies: '@dfinity/principal': 0.15.7(@types/node@20.12.12)(typescript@5.1.3) + '@dfinity/candid@0.21.4(@dfinity/principal@0.15.7(typescript@5.4.3))': + dependencies: + '@dfinity/principal': 0.15.7(typescript@5.4.3) + '@dfinity/principal@0.15.7(@types/node@20.12.12)(typescript@5.1.3)': + dependencies: + js-sha256: 0.9.0 + ts-node: 10.9.2(@types/node@20.12.12)(typescript@5.1.3) + transitivePeerDependencies: + - '@swc/core' + - '@swc/wasm' + - '@types/node' + - source-map-support + - typescript + + '@dfinity/principal@0.15.7(typescript@5.4.3)': dependencies: js-sha256: 0.9.0 ts-node: 10.9.2(typescript@5.4.3) @@ -38455,7 +38560,7 @@ snapshots: - '@babel/preset-env' - supports-color - '@react-native/babel-preset@0.74.87': + '@react-native/babel-preset@0.74.87(@babel/core@7.24.3)': dependencies: '@babel/core': 7.24.3 '@babel/plugin-proposal-async-generator-functions': 7.20.7(@babel/core@7.24.3) @@ -38789,7 +38894,7 @@ snapshots: '@react-native/metro-babel-transformer@0.74.87': dependencies: '@babel/core': 7.24.3 - '@react-native/babel-preset': 0.74.87 + '@react-native/babel-preset': 0.74.87(@babel/core@7.24.3) hermes-parser: 0.19.1 nullthrows: 1.1.1 transitivePeerDependencies: @@ -43714,7 +43819,7 @@ snapshots: '@types/testing-library__jest-dom@5.14.9': dependencies: - '@types/jest': 29.5.12 + '@types/jest': 29.5.14 '@types/tough-cookie@4.0.5': {} @@ -45028,7 +45133,7 @@ snapshots: chromium-pickle-js: 0.2.0 debug: 4.3.4 dmg-builder: 24.13.3(lodash@4.17.21) - ejs: 3.1.9 + ejs: 3.1.10 electron-publish: 24.13.1 form-data: 4.0.0 fs-extra: 10.1.0 @@ -45658,7 +45763,7 @@ snapshots: '@babel/plugin-transform-parameters': 7.24.1(@babel/core@7.24.3) '@babel/preset-react': 7.24.1(@babel/core@7.24.3) '@babel/preset-typescript': 7.24.1(@babel/core@7.24.3) - '@react-native/babel-preset': 0.74.87 + '@react-native/babel-preset': 0.74.87(@babel/core@7.24.3) babel-plugin-react-compiler: 0.0.0-experimental-592953e-20240517 babel-plugin-react-native-web: 0.19.10 react-refresh: 0.14.2 @@ -48325,10 +48430,6 @@ snapshots: dependencies: jake: 10.8.7 - ejs@3.1.9: - dependencies: - jake: 10.8.7 - electron-app-universal-protocol-client@1.3.0(electron@32.0.2): dependencies: electron: 32.0.2