Skip to content

Commit

Permalink
🚨 Hotfix merge conflicts (#7177)
Browse files Browse the repository at this point in the history
* chore(hotfix) 🚀 entering hotfix mode

* Polkadot generic app support (#6326)

* getAddress support

* fix: add metadata support

* fix: get polkadot app version

* fix: refactoring

* fix: refactoring

* fix: refactoring

* fix: refactoring

* fix: small refactoring

* fix: update doc

* feat: add Polkadot coin configuration

Signed-off-by: Stéphane Prohaszka <[email protected]>

* polkadot config location

* fix: polkadot transaction craft

* remove useless code

* fix: refactoring

* fix: runtime upgrade transaction

* fix: update doc

* fix: unit tests

* fix: update changelog

* fix: update pnpm-lock

* fix: update polkadot integration test APDU

---------

Signed-off-by: Stéphane Prohaszka <[email protected]>
Co-authored-by: hzheng-ledger <[email protected]>
Co-authored-by: Stéphane Prohaszka <[email protected]>
Co-authored-by: lvndry <[email protected]>

* chore(hotfix): 🔥 hotfix prerelease [LLD(2.82.1-hotfix.0), LLM(3.45.1-hotfix.0)]

* fix(llm): improve typing of ReceiveFunds/02-SelectAccount and fix crash case (#7148)

* chore(hotfix): 🔥 hotfix prerelease [LLD(2.82.1-hotfix.0), LLM(3.45.1-hotfix.1)]

* chore(hotfix): 🔥 hotfix release [skip ci]

* fix: update pnpm-lock

---------

Signed-off-by: Stéphane Prohaszka <[email protected]>
Co-authored-by: live-github-bot[bot] <105061298+live-github-bot[bot]@users.noreply.github.com>
Co-authored-by: Hedi EDELBLOUTE <[email protected]>
Co-authored-by: hzheng-ledger <[email protected]>
Co-authored-by: Stéphane Prohaszka <[email protected]>
Co-authored-by: lvndry <[email protected]>
Co-authored-by: @greweb <[email protected]>
  • Loading branch information
6 people authored Jun 24, 2024
1 parent 1339b5f commit 5195f78
Show file tree
Hide file tree
Showing 18 changed files with 149 additions and 9 deletions.
14 changes: 14 additions & 0 deletions apps/cli/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# @ledgerhq/live-cli

## 24.3.1

### Patch Changes

- Updated dependencies [[`b0c7b8d`](https://github.com/LedgerHQ/ledger-live/commit/b0c7b8dcc7088853ad73518cb470e8b5b05be4de)]:
- @ledgerhq/live-common@34.4.0

## 24.3.1-hotfix.0

### Patch Changes

- Updated dependencies [[`b0c7b8d`](https://github.com/LedgerHQ/ledger-live/commit/b0c7b8dcc7088853ad73518cb470e8b5b05be4de)]:
- @ledgerhq/live-common@34.4.0-hotfix.0

## 24.3.0

### Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion apps/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ledgerhq/live-cli",
"version": "24.3.0",
"version": "24.3.1",
"description": "ledger-live CLI version",
"repository": {
"type": "git",
Expand Down
14 changes: 14 additions & 0 deletions apps/ledger-live-desktop/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# ledger-live-desktop

## 2.82.1

### Patch Changes

- Updated dependencies [[`b0c7b8d`](https://github.com/LedgerHQ/ledger-live/commit/b0c7b8dcc7088853ad73518cb470e8b5b05be4de)]:
- @ledgerhq/[email protected]

## 2.82.1-hotfix.0

### Patch Changes

- Updated dependencies [[`b0c7b8d`](https://github.com/LedgerHQ/ledger-live/commit/b0c7b8dcc7088853ad73518cb470e8b5b05be4de)]:
- @ledgerhq/[email protected]

## 2.82.0

### Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion apps/ledger-live-desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"license": "MIT",
"private": true,
"main": "./.webpack/main.bundle.js",
"version": "2.82.0",
"version": "2.82.1",
"scripts": {
"start:prod": "electron ./.webpack/main.bundle.js",
"start": "cross-env NODE_ENV=development node ./tools/main.js",
Expand Down
22 changes: 22 additions & 0 deletions apps/ledger-live-mobile/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,27 @@
# live-mobile

## 3.45.1

### Patch Changes

- [#7153](https://github.com/LedgerHQ/ledger-live/pull/7153) [`33d26a9`](https://github.com/LedgerHQ/ledger-live/commit/33d26a9847d15571cce19f8159e29958398bb3a0) Thanks [@live-github-bot](https://github.com/apps/live-github-bot)! - bugfix crash case in ReceiveFunds/02-SelectAccount

- Updated dependencies [[`b0c7b8d`](https://github.com/LedgerHQ/ledger-live/commit/b0c7b8dcc7088853ad73518cb470e8b5b05be4de)]:
- @ledgerhq/[email protected]

## 3.45.1-hotfix.1

### Patch Changes

- [#7153](https://github.com/LedgerHQ/ledger-live/pull/7153) [`33d26a9`](https://github.com/LedgerHQ/ledger-live/commit/33d26a9847d15571cce19f8159e29958398bb3a0) Thanks [@live-github-bot](https://github.com/apps/live-github-bot)! - bugfix crash case in ReceiveFunds/02-SelectAccount

## 3.45.1-hotfix.0

### Patch Changes

- Updated dependencies [[`b0c7b8d`](https://github.com/LedgerHQ/ledger-live/commit/b0c7b8dcc7088853ad73518cb470e8b5b05be4de)]:
- @ledgerhq/[email protected]

## 3.45.0

### Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion apps/ledger-live-mobile/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "live-mobile",
"version": "3.45.0",
"version": "3.45.1",
"private": true,
"scripts": {
"postinstall": "zx ./scripts/post.mjs",
Expand Down
14 changes: 14 additions & 0 deletions apps/web-tools/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# web-tools

## 0.6.1

### Patch Changes

- Updated dependencies [[`b0c7b8d`](https://github.com/LedgerHQ/ledger-live/commit/b0c7b8dcc7088853ad73518cb470e8b5b05be4de)]:
- @ledgerhq/live-common@34.4.0

## 0.6.1-hotfix.0

### Patch Changes

- Updated dependencies [[`b0c7b8d`](https://github.com/LedgerHQ/ledger-live/commit/b0c7b8dcc7088853ad73518cb470e8b5b05be4de)]:
- @ledgerhq/live-common@34.4.0-hotfix.0

## 0.6.0

### Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion apps/web-tools/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ledgerhq/web-tools",
"version": "0.6.0",
"version": "0.6.1",
"private": true,
"browser": {
"fs": false,
Expand Down
12 changes: 12 additions & 0 deletions libs/coin-modules/coin-polkadot/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# @ledgerhq/coin-polkadot

## 0.8.0

### Minor Changes

- [#7153](https://github.com/LedgerHQ/ledger-live/pull/7153) [`b0c7b8d`](https://github.com/LedgerHQ/ledger-live/commit/b0c7b8dcc7088853ad73518cb470e8b5b05be4de) Thanks [@live-github-bot](https://github.com/apps/live-github-bot)! - polkadot generic nano app support

## 0.8.0-hotfix.0

### Minor Changes

- [#7153](https://github.com/LedgerHQ/ledger-live/pull/7153) [`b0c7b8d`](https://github.com/LedgerHQ/ledger-live/commit/b0c7b8dcc7088853ad73518cb470e8b5b05be4de) Thanks [@live-github-bot](https://github.com/apps/live-github-bot)! - polkadot generic nano app support

## 0.7.0

### Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion libs/coin-modules/coin-polkadot/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ledgerhq/coin-polkadot",
"version": "0.7.0",
"version": "0.8.0",
"description": "Ledger Polkadot Coin integration",
"keywords": [
"Ledger",
Expand Down
24 changes: 24 additions & 0 deletions libs/ledger-live-common/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,29 @@
# @ledgerhq/live-common

## 34.4.0

### Minor Changes

- [#7153](https://github.com/LedgerHQ/ledger-live/pull/7153) [`b0c7b8d`](https://github.com/LedgerHQ/ledger-live/commit/b0c7b8dcc7088853ad73518cb470e8b5b05be4de) Thanks [@live-github-bot](https://github.com/apps/live-github-bot)! - polkadot generic nano app support

### Patch Changes

- Updated dependencies [[`b0c7b8d`](https://github.com/LedgerHQ/ledger-live/commit/b0c7b8dcc7088853ad73518cb470e8b5b05be4de)]:
- @ledgerhq/[email protected]
- @ledgerhq/[email protected]

## 34.4.0-hotfix.0

### Minor Changes

- [#7153](https://github.com/LedgerHQ/ledger-live/pull/7153) [`b0c7b8d`](https://github.com/LedgerHQ/ledger-live/commit/b0c7b8dcc7088853ad73518cb470e8b5b05be4de) Thanks [@live-github-bot](https://github.com/apps/live-github-bot)! - polkadot generic nano app support

### Patch Changes

- Updated dependencies [[`b0c7b8d`](https://github.com/LedgerHQ/ledger-live/commit/b0c7b8dcc7088853ad73518cb470e8b5b05be4de)]:
- @ledgerhq/[email protected]
- @ledgerhq/[email protected]

## 34.3.0

### Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion libs/ledger-live-common/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@ledgerhq/live-common",
"description": "Common ground for the Ledger Live apps",
"version": "34.3.0",
"version": "34.4.0",
"repository": {
"type": "git",
"url": "https://github.com/LedgerHQ/ledger-live.git"
Expand Down
12 changes: 12 additions & 0 deletions libs/ledgerjs/packages/hw-app-polkadot/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# @ledgerhq/hw-app-polkadot

## 6.30.0

### Minor Changes

- [#7153](https://github.com/LedgerHQ/ledger-live/pull/7153) [`b0c7b8d`](https://github.com/LedgerHQ/ledger-live/commit/b0c7b8dcc7088853ad73518cb470e8b5b05be4de) Thanks [@live-github-bot](https://github.com/apps/live-github-bot)! - polkadot generic nano app support

## 6.30.0-hotfix.0

### Minor Changes

- [#7153](https://github.com/LedgerHQ/ledger-live/pull/7153) [`b0c7b8d`](https://github.com/LedgerHQ/ledger-live/commit/b0c7b8dcc7088853ad73518cb470e8b5b05be4de) Thanks [@live-github-bot](https://github.com/apps/live-github-bot)! - polkadot generic nano app support

## 6.29.0

### Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion libs/ledgerjs/packages/hw-app-polkadot/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ledgerhq/hw-app-polkadot",
"version": "6.29.0",
"version": "6.30.0",
"description": "Ledger Hardware Wallet Polkadot Application API",
"keywords": [
"Ledger",
Expand Down
14 changes: 14 additions & 0 deletions libs/test-utils/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# @ledgerhq/test-utils

## 0.2.1

### Patch Changes

- Updated dependencies [[`b0c7b8d`](https://github.com/LedgerHQ/ledger-live/commit/b0c7b8dcc7088853ad73518cb470e8b5b05be4de)]:
- @ledgerhq/live-common@34.4.0

## 0.2.1-hotfix.0

### Patch Changes

- Updated dependencies [[`b0c7b8d`](https://github.com/LedgerHQ/ledger-live/commit/b0c7b8dcc7088853ad73518cb470e8b5b05be4de)]:
- @ledgerhq/live-common@34.4.0-hotfix.0

## 0.2.0

### Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion libs/test-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ledgerhq/test-utils",
"version": "0.2.0",
"version": "0.2.1",
"private": true,
"description": "Dummy apps and utils for tests",
"keywords": [
Expand Down
14 changes: 14 additions & 0 deletions tests/dummy-wallet-app/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# dummy-wallet-app

## 0.3.1

### Patch Changes

- Updated dependencies [[`b0c7b8d`](https://github.com/LedgerHQ/ledger-live/commit/b0c7b8dcc7088853ad73518cb470e8b5b05be4de)]:
- @ledgerhq/live-common@34.4.0

## 0.3.1-hotfix.0

### Patch Changes

- Updated dependencies [[`b0c7b8d`](https://github.com/LedgerHQ/ledger-live/commit/b0c7b8dcc7088853ad73518cb470e8b5b05be4de)]:
- @ledgerhq/live-common@34.4.0-hotfix.0

## 0.3.0

### Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy-wallet-app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ledgerhq/dummy-wallet-app",
"version": "0.3.0",
"version": "0.3.1",
"private": true,
"dependencies": {
"@ledgerhq/hw-app-eth": "workspace:*",
Expand Down

0 comments on commit 5195f78

Please sign in to comment.