Skip to content

πŸ”€ (release) [NO-ISSUE]: Backmerge release into develop - #1908

Merged
benruseau merged 10 commits into
developfrom
chore/backmerge
Sep 21, 2026
Merged

benruseau merged 10 commits into
developfrom
chore/backmerge

Conversation

@benruseau

Copy link
Copy Markdown
Contributor

πŸ”„ Backmerge Incoming!

A backmerge operation is being performed to integrate released packages back into the develop branch. This ensures that the develop branch stays up-to-date with the latest stable releases.

πŸ“‹ Backmerge Checklist

  • Create new branch from main: chore/backmerge
  • Create Pull Request targeting develop using template gh pr create -B develop --title "πŸ”€ (release) [NO-ISSUE]: Backmerge release into develop" -T .github/pull_request_backmerge_template.md
  • Revert private flags (revert-private.cjs)
    • Verify that all relevant packages have private: false set in their package.json files
  • Restore workspace deps (unpin-deps.cjs)
  • Update lockfile (pnpm install)
pnpm exec zx .cursor/scripts/release/revert-private.cjs
pnpm exec zx .cursor/scripts/release/unpin-deps.cjs
pnpm install
  • Commit the reset:
git commit -m "πŸ”§ (release): Reset private packages after release"
  • Fix conflicts with develop branch if needed:
    • ⚠️ NO REBASE! Merge develop into backmerge branch for fixing conflicts
    • Resolve all merge conflicts manually
    • Test resolution locally
  • Complete merge process
  • Create PR in Ledger Live with updated libs:
    • Adapt code if needed (breaking changes)
    • Update all released packages

benruseau and others added 9 commits September 21, 2026 15:04
…er-wallet,signer-eth,contacts-kit,signer-sol

Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
… 1.9.1, Ledger Wallet 0.6.0, Context Module 2.6.0, Signer ETH 1.18.1, Signer SOL 1.13.1, Signer TRON 0.3.0 (#1907)
Co-authored-by: Cursor <cursoragent@cursor.com>
@benruseau
benruseau requested a review from a team as a code owner September 21, 2026 14:45
Copilot AI lite review requested due to automatic review settings September 21, 2026 14:45
@vercel

vercel Bot commented Sep 21, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated
device-sdk-ts-sample Ready Ready Preview Sep 21, 2026 3:17pm UTC
doc-device-management-kit Ready Ready Preview Sep 21, 2026 3:17pm UTC

Request Review

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot review overview

🟑 Changes recommended

Changelog formatting issues were introduced (misplaced header text and broken list indentation) that should be corrected before merging.

Get a fresh assessment by requesting another Copilot review.

Review effort: Lite
Findings: 2 Low severity

Open (2)
What changed in this PR

Backmerge PR that syncs develop with the latest release state from main, primarily by updating published package versions/changelogs, refreshing the lockfile, and cleaning up consumed changesets.

Changes:

  • Bump versions + update changelogs for multiple packages included in the release.
  • Update docs β€œLibraries” index to reflect newly released versions.
  • Refresh pnpm-lock.yaml and remove consumed .changeset/* entries.
File Description
pnpm-lock.yaml Lockfile adjustments from the backmerge install state.
packages/​signer/​signer-trx/​package.json Bump @ledgerhq/device-signer-kit-tron version to 0.3.0.
packages/​signer/​signer-trx/​CHANGELOG.md Add 0.3.0 release notes (needs minor formatting fix).
packages/​signer/​signer-solana/​package.json Bump @ledgerhq/device-signer-kit-solana version to 1.13.1.
packages/​signer/​signer-solana/​CHANGELOG.md Add 1.13.1 release notes.
packages/​signer/​signer-eth/​package.json Bump @ledgerhq/device-signer-kit-ethereum version to 1.18.1.
packages/​signer/​signer-eth/​CHANGELOG.md Add 1.18.1 release notes.
packages/​signer/​context-module/​package.json Bump @ledgerhq/context-module version to 2.6.0.
packages/​signer/​context-module/​CHANGELOG.md Add 2.6.0 release notes.
packages/​ledger-wallet/​package.json Bump @ledgerhq/dmk-ledger-wallet version to 0.6.0.
packages/​ledger-wallet/​CHANGELOG.md Add 0.6.0 release notes (needs list indentation fix).
packages/​device-management-kit/​package.json Bump @ledgerhq/device-management-kit version to 1.9.1.
packages/​device-management-kit/​CHANGELOG.md Add 1.9.1 release notes.
packages/​device-contacts-kit/​package.json Bump @ledgerhq/device-contacts-kit version to 0.5.0.
packages/​device-contacts-kit/​CHANGELOG.md Add 0.5.0 release notes.
apps/​docs/​content/​docs/​index.mdx Update displayed library versions to match released packages.
.changeset/​tame-cities-sneeze.md Remove consumed changeset entry.
.changeset/​stale-bikes-cry.md Remove consumed changeset entry.
.changeset/​solana-hide-rules-owner-assoc.md Remove consumed changeset entry.
.changeset/​solana-alt-hide-rule-owner-requirements.md Remove consumed changeset entry.
.changeset/​slimy-vans-unite.md Remove consumed changeset entry.
.changeset/​plenty-crabs-flow.md Remove consumed changeset entry.
.changeset/​plain-books-wait.md Remove consumed changeset entry.
.changeset/​odd-buses-mate.md Remove consumed changeset entry.
.changeset/​new-bees-trade.md Remove consumed changeset entry.
.changeset/​late-jeans-glow.md Remove consumed changeset entry.
.changeset/​icy-mangos-knock.md Remove consumed changeset entry.
.changeset/​full-clouds-sort.md Remove consumed changeset entry.
.changeset/​flashmcu-bootloader-recovery.md Remove consumed changeset entry.
.changeset/​fix-onboarding-state-byte-mapping.md Remove consumed changeset entry.
.changeset/​fine-birds-notice.md Remove consumed changeset entry.
.changeset/​fair-jeans-cheat.md Remove consumed changeset entry.
.changeset/​every-eagles-tell.md Remove consumed changeset entry.
.changeset/​dull-baths-poke.md Remove consumed changeset entry.
.changeset/​crazy-comics-dress.md Remove consumed changeset entry.
Files not reviewed (1)
  • pnpm-lock.yaml: Generated file

πŸ’‘ Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

Comment on lines +7 to +17
- [#1901](https://github.com/LedgerHQ/device-sdk-ts/pull/1901) [`b5fc8f0`](https://github.com/LedgerHQ/device-sdk-ts/commit/b5fc8f0d39bfe71741265a4be220eb59b8625e71) Thanks [@benruseau](https://github.com/benruseau)! - Add a bootloader recovery mode to `FlashMcuDeviceAction`. `FlashMcuDAInput` now
takes a `mode`: `{ mode: "osUpdate", finalFirmware }` keeps the previous
behaviour, while `{ mode: "bootloaderRecovery" }` resolves the MCU from what the
device reports, for a device stuck in bootloader mode with no known update path.

The forced MCU versions are now per mode, matching the two legacy flows: an OS
update only aliases a bootloader reporting no version, and resolves everything
else from the MCU catalog constrained by the firmware being installed, while a
recovery keeps the full set of hops. An OS update on a device reporting
bootloader `0.6`, `0.7` or `0.9` previously skipped the catalog and ignored the
final firmware.
Comment on lines 1 to 19
# Changelog

## 0.3.0

### Minor Changes

- [#1902](https://github.com/LedgerHQ/device-sdk-ts/pull/1902) [`698f5e7`](https://github.com/LedgerHQ/device-sdk-ts/commit/698f5e72a568bb1bd65d4d25b30d9b5a10139b96) Thanks [@aussedatlo](https://github.com/aussedatlo)! - Show a saved contact name in place of the raw recipient address when reviewing a Tron transaction, matched against the address book given to `withAddressBook`. Only the transaction recipient is matched, and a contact the device rejects never costs the signature. `encodeTronAddress` and `decodeTronAddress` are exported alongside, since registering a contact through the contacts kit takes the raw address bytes an address book holds as base58.

- [#1893](https://github.com/LedgerHQ/device-sdk-ts/pull/1893) [`7ea891a`](https://github.com/LedgerHQ/device-sdk-ts/commit/7ea891a8d637d481de39bc20f6e4c0a0404d5199) Thanks [@aussedatlo](https://github.com/aussedatlo)! - Provide TRC10 token names to the device when signing a transaction, so TRC10 transfers are clear-signed instead of blind-signed

### Patch Changes

- Updated dependencies [[`acf298b`](https://github.com/LedgerHQ/device-sdk-ts/commit/acf298b8deadbed10c516553d4b824015618a0d3), [`ac41ccc`](https://github.com/LedgerHQ/device-sdk-ts/commit/ac41ccc40158ac1edd3493bf88a7d7c25f2c60b9), [`5030e85`](https://github.com/LedgerHQ/device-sdk-ts/commit/5030e85dea4f36a2307609dcabe20eee607f08ab), [`1fe060e`](https://github.com/LedgerHQ/device-sdk-ts/commit/1fe060e78f76b03960c0a23c6bb93fa54cad8915), [`f275d1e`](https://github.com/LedgerHQ/device-sdk-ts/commit/f275d1ea15dc3a4fd58379c47a5219b1f84967de), [`c6a2056`](https://github.com/LedgerHQ/device-sdk-ts/commit/c6a205652ebb21f154b26f6dda2b22d7119ccbaa), [`f4a3bee`](https://github.com/LedgerHQ/device-sdk-ts/commit/f4a3beea6aa3c3764771fbb01caee16c0d2becb7), [`856461c`](https://github.com/LedgerHQ/device-sdk-ts/commit/856461cb582efdcb52ddd371797a646ee20264fe), [`acd0c05`](https://github.com/LedgerHQ/device-sdk-ts/commit/acd0c050d9fbf6f306cd4bf43ad3594272da6b20), [`762139e`](https://github.com/LedgerHQ/device-sdk-ts/commit/762139ee3348882aef30bc17a07328b697c9725f)]:
- @ledgerhq/device-contacts-kit@0.5.0
- @ledgerhq/context-module@2.6.0
- @ledgerhq/device-management-kit@1.9.1

All notable changes to this project will be documented in this file.

@github-actions

github-actions Bot commented Sep 21, 2026

Copy link
Copy Markdown
Contributor

Danger Check Results

Messages

⚠️

No changeset file found. Please make sure this is intended or add a changeset file.

βœ…

Danger: All checks passed successfully! πŸŽ‰

Generated by 🚫 dangerJS against 7d4e389

Co-authored-by: Cursor <cursoragent@cursor.com>
@sonarqubecloud

Copy link
Copy Markdown

@benruseau
benruseau added this pull request to the merge queue Sep 21, 2026
Merged via the queue into develop with commit 1ead47e Sep 21, 2026
33 of 34 checks passed
@benruseau
benruseau deleted the chore/backmerge branch September 21, 2026 15:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants