Merge branch 'release/23.11'

trezor · Nov 14, 2023 · 32f3597 · 32f3597
2 parents 1c69644 + 2c7cc6e
commit 32f3597
Show file tree

Hide file tree

Showing 10 changed files with 56 additions and 7 deletions.
diff --git a/common/defs/ethereum/released-definitions-timestamp.txt b/common/defs/ethereum/released-definitions-timestamp.txt
@@ -1 +1 @@
-2023-09-06T12:08:21+00:00
+2023-11-01T12:53:06+00:00
diff --git a/core/.changelog.d/2888.changed b/core/.changelog.d/2888.changed
diff --git a/core/.changelog.d/2919.added b/core/.changelog.d/2919.added
diff --git a/core/.changelog.d/3242.added b/core/.changelog.d/3242.added
diff --git a/core/.changelog.d/3311.fixed b/core/.changelog.d/3311.fixed
diff --git a/core/.changelog.d/3377.added b/core/.changelog.d/3377.added
diff --git a/core/CHANGELOG.T2B1.md b/core/CHANGELOG.T2B1.md
@@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [2.6.3] (2nd November 2023)
+
+### Added
+- Support interaction-less upgrade.  [#2919]
+- Allowed non-zero address index in Cardano staking paths.  [#3242]
+- Turn the screen off when device is locked, to prolong OLED life.  [#3377]
+
+### Changed
+
+### Fixed
+
+
 ## [2.6.2] (internal release)
 
 ### Added
@@ -783,7 +795,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 [#2818]: https://github.com/trezor/trezor-firmware/pull/2818
 [#2834]: https://github.com/trezor/trezor-firmware/pull/2834
 [#2841]: https://github.com/trezor/trezor-firmware/pull/2841
+[#2888]: https://github.com/trezor/trezor-firmware/pull/2888
 [#2899]: https://github.com/trezor/trezor-firmware/pull/2899
+[#2919]: https://github.com/trezor/trezor-firmware/pull/2919
 [#2937]: https://github.com/trezor/trezor-firmware/pull/2937
 [#2955]: https://github.com/trezor/trezor-firmware/pull/2955
 [#2989]: https://github.com/trezor/trezor-firmware/pull/2989
@@ -793,6 +807,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 [#3216]: https://github.com/trezor/trezor-firmware/pull/3216
 [#3218]: https://github.com/trezor/trezor-firmware/pull/3218
 [#3237]: https://github.com/trezor/trezor-firmware/pull/3237
+[#3242]: https://github.com/trezor/trezor-firmware/pull/3242
 [#3255]: https://github.com/trezor/trezor-firmware/pull/3255
 [#3256]: https://github.com/trezor/trezor-firmware/pull/3256
 [#3296]: https://github.com/trezor/trezor-firmware/pull/3296
+[#3311]: https://github.com/trezor/trezor-firmware/pull/3311
+[#3377]: https://github.com/trezor/trezor-firmware/pull/3377
diff --git a/core/CHANGELOG.T2T1.md b/core/CHANGELOG.T2T1.md
@@ -4,6 +4,19 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [2.6.3] (2nd November 2023)
+
+### Added
+- Support interaction-less upgrade.  [#2919]
+- Allowed non-zero address index in Cardano staking paths.  [#3242]
+
+### Changed
+- Adjust buttons used for scrolling multipage content.  [#2888]
+
+### Fixed
+- Fixed backlight flickering at the end of PIN loader animation.  [#3311]
+
+
 ## [2.6.2] (internal release)
 
 ### Added
@@ -782,7 +795,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 [#2818]: https://github.com/trezor/trezor-firmware/pull/2818
 [#2834]: https://github.com/trezor/trezor-firmware/pull/2834
 [#2841]: https://github.com/trezor/trezor-firmware/pull/2841
+[#2888]: https://github.com/trezor/trezor-firmware/pull/2888
 [#2899]: https://github.com/trezor/trezor-firmware/pull/2899
+[#2919]: https://github.com/trezor/trezor-firmware/pull/2919
 [#2937]: https://github.com/trezor/trezor-firmware/pull/2937
 [#2955]: https://github.com/trezor/trezor-firmware/pull/2955
 [#2989]: https://github.com/trezor/trezor-firmware/pull/2989
@@ -792,6 +807,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 [#3216]: https://github.com/trezor/trezor-firmware/pull/3216
 [#3218]: https://github.com/trezor/trezor-firmware/pull/3218
 [#3237]: https://github.com/trezor/trezor-firmware/pull/3237
+[#3242]: https://github.com/trezor/trezor-firmware/pull/3242
 [#3255]: https://github.com/trezor/trezor-firmware/pull/3255
 [#3256]: https://github.com/trezor/trezor-firmware/pull/3256
 [#3296]: https://github.com/trezor/trezor-firmware/pull/3296
+[#3311]: https://github.com/trezor/trezor-firmware/pull/3311
+[#3377]: https://github.com/trezor/trezor-firmware/pull/3377
diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
@@ -4,6 +4,20 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [2.6.3] (15th November 2023)
+
+### Added
+- Support interaction-less upgrade.  [#2919]
+- Allowed non-zero address index in Cardano staking paths.  [#3242]
+- [T2B1] Turn the screen off when device is locked, to prolong OLED life.  [#3377]
+
+### Changed
+- [T2T1] Adjust buttons used for scrolling multipage content.  [#2888]
+
+### Fixed
+- [T2T1] Fixed backlight flickering at the end of PIN loader animation.  [#3311]
+
+
 ## [2.6.2] (internal release)
 
 ### Added
@@ -786,7 +800,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 [#2818]: https://github.com/trezor/trezor-firmware/pull/2818
 [#2834]: https://github.com/trezor/trezor-firmware/pull/2834
 [#2841]: https://github.com/trezor/trezor-firmware/pull/2841
+[#2888]: https://github.com/trezor/trezor-firmware/pull/2888
 [#2899]: https://github.com/trezor/trezor-firmware/pull/2899
+[#2919]: https://github.com/trezor/trezor-firmware/pull/2919
 [#2937]: https://github.com/trezor/trezor-firmware/pull/2937
 [#2955]: https://github.com/trezor/trezor-firmware/pull/2955
 [#2989]: https://github.com/trezor/trezor-firmware/pull/2989
@@ -796,6 +812,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 [#3216]: https://github.com/trezor/trezor-firmware/pull/3216
 [#3218]: https://github.com/trezor/trezor-firmware/pull/3218
 [#3237]: https://github.com/trezor/trezor-firmware/pull/3237
+[#3242]: https://github.com/trezor/trezor-firmware/pull/3242
 [#3255]: https://github.com/trezor/trezor-firmware/pull/3255
 [#3256]: https://github.com/trezor/trezor-firmware/pull/3256
 [#3296]: https://github.com/trezor/trezor-firmware/pull/3296
+[#3311]: https://github.com/trezor/trezor-firmware/pull/3311
+[#3377]: https://github.com/trezor/trezor-firmware/pull/3377
diff --git a/core/src/apps/ethereum/definitions_constants.py b/core/src/apps/ethereum/definitions_constants.py
@@ -9,7 +9,7 @@
     b"\xb8\xd2\xb2\x1d\xe2\x71\x24\xf0\x51\x1f\x90\x3a\xe7\xe6\x0e\x07\x96\x18\x10\xa0\xb8\xf2\x8e\xa7\x55\xfa\x50\x36\x7a\x8a\x2b\x8b",
 )
 
-MIN_DATA_VERSION = 1694002101
+MIN_DATA_VERSION = 1698843186
 FORMAT_VERSION = b"trzd1"
 
 if __debug__:
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		2023-09-06T12:08:21+00:00
		2023-11-01T12:53:06+00:00