1
0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-22 07:28:10 +00:00

Merge branch 'release/22.11'

Conflicts:
	common/defs/coins_details.json
	core/src/apps/ethereum/networks.py
	core/src/apps/ethereum/tokens.py
	tests/ui_tests/fixtures.json
This commit is contained in:
Martin Milata 2022-11-16 17:15:05 +01:00
commit 1a9f3c18dd
23 changed files with 2145 additions and 537 deletions

File diff suppressed because it is too large Load Diff

@ -1 +1 @@
Subproject commit 39ac26299b83d94a4661d2d85234022ff12aeaff
Subproject commit 4ba4ca129c4d8b1b01179bfa50ad74c2a5b51b72

@ -1 +1 @@
Subproject commit 055f22d3b76f743788f94be13fe242e90f451045
Subproject commit 6a7ec4967b797f90e024296ef27c58480bf1b8ca

View File

@ -161,7 +161,6 @@
"bitcoin:tSMART": "1.7.1",
"erc20:avax:AVAX": "1.11.2",
"erc20:avax:USDT": "1.11.2",
"erc20:ella:MINING": "1.11.2",
"erc20:esn:DGT": "1.7.1",
"erc20:esn:TOPM": "1.7.1",
"erc20:etc:BEC": "1.6.2",
@ -170,6 +169,7 @@
"erc20:etc:UVCX": "1.9.3",
"erc20:eth:$FFC": "1.6.2",
"erc20:eth:$TEAK": "1.6.2",
"erc20:eth:00": "1.11.3",
"erc20:eth:0xBTC": "1.6.2",
"erc20:eth:1SG": "1.8.0",
"erc20:eth:1ST": "1.6.2",
@ -398,7 +398,6 @@
"erc20:eth:CCO": "1.8.0",
"erc20:eth:CCT": "1.8.0",
"erc20:eth:CDL": "1.6.2",
"erc20:eth:CDT": "1.6.2",
"erc20:eth:CEEK": "1.6.2",
"erc20:eth:CELR": "1.9.0",
"erc20:eth:CEN": "1.8.4",
@ -1027,6 +1026,7 @@
"erc20:eth:ODE": "1.6.3",
"erc20:eth:OGK": "1.9.0",
"erc20:eth:OGN": "1.9.0",
"erc20:eth:OGV": "1.11.3",
"erc20:eth:OIKOS": "1.8.4",
"erc20:eth:OJX": "1.6.2",
"erc20:eth:OKB": "1.9.5",
@ -1493,6 +1493,7 @@
"erc20:eth:WMK": "1.6.3",
"erc20:eth:WNK": "1.6.3",
"erc20:eth:WOC": "1.8.0",
"erc20:eth:WOUSD": "1.11.3",
"erc20:eth:WPC": "1.6.2",
"erc20:eth:WPR": "1.6.2",
"erc20:eth:WRC": "1.8.0",
@ -1953,6 +1954,7 @@
"erc20:eth:usZRX2x": "1.9.0",
"erc20:eth:usZRX3x": "1.9.0",
"erc20:eth:usZRX4x": "1.9.0",
"erc20:eth:veOGV": "1.11.3",
"erc20:eth:xDOT": "1.9.0",
"erc20:eth:xEDG": "1.9.0",
"erc20:eth:xGRAM": "1.9.0",
@ -2054,6 +2056,7 @@
"eth:AKA": "1.6.3",
"eth:AMBROS": "1.11.2",
"eth:AME": "1.11.2",
"eth:APTA": "1.11.3",
"eth:AQUA": "1.8.2",
"eth:ASK": "1.10.4",
"eth:ASTR": "1.11.2",
@ -2273,7 +2276,6 @@
"eth:WTT": "1.10.5",
"eth:XDC": "1.9.5",
"eth:XERO": "1.9.4",
"eth:XIN": "1.11.2",
"eth:XT": "1.11.2",
"eth:XVM": "1.11.2",
"eth:YCC": "1.11.2",
@ -2376,6 +2378,8 @@
"erc20:eth:CCC (CryptoCrashCourse)": "(AUTO) duplicate key",
"erc20:eth:CCS:1da4": "(AUTO) duplicate key",
"erc20:eth:CCS:315c": "(AUTO) duplicate key",
"erc20:eth:CDT:177d": "(AUTO) duplicate key",
"erc20:eth:CDT:1dcf": "(AUTO) duplicate key",
"erc20:eth:CDX:2cb1": "(AUTO) duplicate key",
"erc20:eth:CDX:6fff": "(AUTO) duplicate key",
"erc20:eth:CIG:0038": "(AUTO) duplicate key",
@ -2607,6 +2611,7 @@
"eth:ETH:42161": "duplicate key",
"eth:ETH:42170": "eth collision",
"eth:ETH:5551": "eth collision",
"eth:ETH:73927": "duplicate key",
"eth:ETH:980": "eth collision",
"eth:GAR:91": "duplicate key",
"eth:GAR:92": "duplicate key",
@ -2691,6 +2696,7 @@
"eth:tEOS": "(AUTO) exclude testnet",
"eth:tETH:1313161555": "(AUTO) exclude testnet",
"eth:tETH:28": "(AUTO) exclude testnet",
"eth:tETH:280": "(AUTO) exclude testnet",
"eth:tETH:420": "(AUTO) exclude testnet",
"eth:tETH:5553": "(AUTO) exclude testnet",
"eth:tEUN": "(AUTO) exclude testnet",
@ -2845,7 +2851,6 @@
"bitcoin:tSMART": "2.0.8",
"erc20:avax:AVAX": "2.5.2",
"erc20:avax:USDT": "2.5.2",
"erc20:ella:MINING": "2.0.7",
"erc20:esn:DGT": "2.0.8",
"erc20:esn:TOPM": "2.0.8",
"erc20:etc:BEC": "2.0.7",
@ -2854,6 +2859,7 @@
"erc20:etc:UVCX": "2.3.3",
"erc20:eth:$FFC": "2.0.7",
"erc20:eth:$TEAK": "2.0.7",
"erc20:eth:00": "2.5.3",
"erc20:eth:0xBTC": "2.0.7",
"erc20:eth:1SG": "2.0.11",
"erc20:eth:1ST": "2.0.7",
@ -3082,7 +3088,6 @@
"erc20:eth:CCO": "2.0.10",
"erc20:eth:CCT": "2.0.10",
"erc20:eth:CDL": "2.0.7",
"erc20:eth:CDT": "2.0.7",
"erc20:eth:CEEK": "2.0.7",
"erc20:eth:CELR": "2.3.0",
"erc20:eth:CEN": "2.1.8",
@ -3711,6 +3716,7 @@
"erc20:eth:ODE": "2.0.8",
"erc20:eth:OGK": "2.3.0",
"erc20:eth:OGN": "2.3.0",
"erc20:eth:OGV": "2.5.3",
"erc20:eth:OIKOS": "2.1.8",
"erc20:eth:OJX": "2.0.7",
"erc20:eth:OKB": "2.3.7",
@ -4177,6 +4183,7 @@
"erc20:eth:WMK": "2.0.8",
"erc20:eth:WNK": "2.0.8",
"erc20:eth:WOC": "2.0.11",
"erc20:eth:WOUSD": "2.5.3",
"erc20:eth:WPC": "2.0.7",
"erc20:eth:WPR": "2.0.7",
"erc20:eth:WRC": "2.0.10",
@ -4637,6 +4644,7 @@
"erc20:eth:usZRX2x": "2.3.0",
"erc20:eth:usZRX3x": "2.3.0",
"erc20:eth:usZRX4x": "2.3.0",
"erc20:eth:veOGV": "2.5.3",
"erc20:eth:xDOT": "2.3.0",
"erc20:eth:xEDG": "2.3.0",
"erc20:eth:xGRAM": "2.3.0",
@ -4738,6 +4746,7 @@
"eth:AKA": "2.0.8",
"eth:AMBROS": "2.5.2",
"eth:AME": "2.5.2",
"eth:APTA": "2.5.3",
"eth:AQUA": "2.1.1",
"eth:ASK": "2.4.3",
"eth:ASTR": "2.5.2",
@ -4957,7 +4966,6 @@
"eth:WTT": "2.4.4",
"eth:XDC": "2.3.7",
"eth:XERO": "2.3.5",
"eth:XIN": "2.5.2",
"eth:XT": "2.5.2",
"eth:XVM": "2.5.2",
"eth:YCC": "2.5.2",
@ -5068,6 +5076,8 @@
"erc20:eth:CCC (CryptoCrashCourse)": "(AUTO) duplicate key",
"erc20:eth:CCS:1da4": "(AUTO) duplicate key",
"erc20:eth:CCS:315c": "(AUTO) duplicate key",
"erc20:eth:CDT:177d": "(AUTO) duplicate key",
"erc20:eth:CDT:1dcf": "(AUTO) duplicate key",
"erc20:eth:CDX:2cb1": "(AUTO) duplicate key",
"erc20:eth:CDX:6fff": "(AUTO) duplicate key",
"erc20:eth:CIG:0038": "(AUTO) duplicate key",
@ -5299,6 +5309,7 @@
"eth:ETH:42161": "duplicate key",
"eth:ETH:42170": "eth collision",
"eth:ETH:5551": "eth collision",
"eth:ETH:73927": "duplicate key",
"eth:ETH:980": "eth collision",
"eth:GAR:91": "duplicate key",
"eth:GAR:92": "duplicate key",
@ -5383,6 +5394,7 @@
"eth:tEOS": "(AUTO) exclude testnet",
"eth:tETH:1313161555": "(AUTO) exclude testnet",
"eth:tETH:28": "(AUTO) exclude testnet",
"eth:tETH:280": "(AUTO) exclude testnet",
"eth:tETH:420": "(AUTO) exclude testnet",
"eth:tETH:5553": "(AUTO) exclude testnet",
"eth:tEUN": "(AUTO) exclude testnet",

View File

@ -1 +0,0 @@
Fix sending XMR transaction to an integrated address

View File

@ -1 +0,0 @@
Add SLIP-0025 CoinJoin accounts.

View File

@ -1 +0,0 @@
Show red error header when USB data pins are not connected

View File

@ -1 +0,0 @@
Add support for Zcash unified addresses

View File

@ -1 +0,0 @@
Using hardware acceleration (dma2d) for rendering

View File

@ -1 +0,0 @@
Add stack overflow detection

View File

@ -1 +0,0 @@
Show fee rate when replacing transaction

View File

@ -1 +0,0 @@
Support SetBusy message.

View File

@ -1 +0,0 @@
Fix XMR primary address display

View File

@ -1 +0,0 @@
Extend decimals of fee rate to 2 digits

View File

@ -1 +0,0 @@
Display only sat instead of sat BTC

View File

@ -1 +0,0 @@
Add serialize option to SignTx.

View File

@ -1 +0,0 @@
Support for Cardano CIP-36 governance registration format

View File

@ -1 +0,0 @@
Remove old BulletProof code from Monero

View File

@ -1 +0,0 @@
Implement CoinJoin requests.

View File

@ -1 +0,0 @@
Optimize touch controller communication

View File

@ -4,6 +4,31 @@ 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.5.3] (16th November 2022)
### Added
- Optimize touch controller communication. [#262]
- Add SLIP-0025 CoinJoin accounts. [#2289]
- Show red error header when USB data pins are not connected. [#2366]
- Add support for Zcash unified addresses. [#2398]
- Using hardware acceleration (dma2d) for rendering. [#2414]
- Add stack overflow detection. [#2427]
- Show fee rate when replacing transaction. [#2442]
- Support SetBusy message. [#2445]
- Add serialize option to SignTx. [#2507]
- Support for Cardano CIP-36 governance registration format. [#2561]
- Implement CoinJoin requests. [#2577]
### Changed
- Extend decimals of fee rate to 2 digits. [#2486]
- Display only sat instead of sat BTC. [#2487]
- Remove old BulletProof code from Monero. [#2570]
### Fixed
- Fix sending XMR transaction to an integrated address. [#2213]
- Fix XMR primary address display. [#2453]
## [2.5.2] (17th August 2022)
### Added
@ -515,6 +540,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- First public release.
[#24]: https://github.com/trezor/trezor-firmware/pull/24
[#262]: https://github.com/trezor/trezor-firmware/pull/262
[#379]: https://github.com/trezor/trezor-firmware/pull/379
[#642]: https://github.com/trezor/trezor-firmware/pull/642
[#741]: https://github.com/trezor/trezor-firmware/pull/741
@ -635,6 +661,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
[#2166]: https://github.com/trezor/trezor-firmware/pull/2166
[#2167]: https://github.com/trezor/trezor-firmware/pull/2167
[#2181]: https://github.com/trezor/trezor-firmware/pull/2181
[#2213]: https://github.com/trezor/trezor-firmware/pull/2213
[#2230]: https://github.com/trezor/trezor-firmware/pull/2230
[#2232]: https://github.com/trezor/trezor-firmware/pull/2232
[#2239]: https://github.com/trezor/trezor-firmware/pull/2239
@ -642,14 +669,28 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
[#2249]: https://github.com/trezor/trezor-firmware/pull/2249
[#2261]: https://github.com/trezor/trezor-firmware/pull/2261
[#2284]: https://github.com/trezor/trezor-firmware/pull/2284
[#2289]: https://github.com/trezor/trezor-firmware/pull/2289
[#2297]: https://github.com/trezor/trezor-firmware/pull/2297
[#2300]: https://github.com/trezor/trezor-firmware/pull/2300
[#2313]: https://github.com/trezor/trezor-firmware/pull/2313
[#2324]: https://github.com/trezor/trezor-firmware/pull/2324
[#2354]: https://github.com/trezor/trezor-firmware/pull/2354
[#2355]: https://github.com/trezor/trezor-firmware/pull/2355
[#2366]: https://github.com/trezor/trezor-firmware/pull/2366
[#2380]: https://github.com/trezor/trezor-firmware/pull/2380
[#2394]: https://github.com/trezor/trezor-firmware/pull/2394
[#2398]: https://github.com/trezor/trezor-firmware/pull/2398
[#2414]: https://github.com/trezor/trezor-firmware/pull/2414
[#2415]: https://github.com/trezor/trezor-firmware/pull/2415
[#2422]: https://github.com/trezor/trezor-firmware/pull/2422
[#2427]: https://github.com/trezor/trezor-firmware/pull/2427
[#2433]: https://github.com/trezor/trezor-firmware/pull/2433
[#2442]: https://github.com/trezor/trezor-firmware/pull/2442
[#2445]: https://github.com/trezor/trezor-firmware/pull/2445
[#2453]: https://github.com/trezor/trezor-firmware/pull/2453
[#2486]: https://github.com/trezor/trezor-firmware/pull/2486
[#2487]: https://github.com/trezor/trezor-firmware/pull/2487
[#2507]: https://github.com/trezor/trezor-firmware/pull/2507
[#2561]: https://github.com/trezor/trezor-firmware/pull/2561
[#2570]: https://github.com/trezor/trezor-firmware/pull/2570
[#2577]: https://github.com/trezor/trezor-firmware/pull/2577

View File

@ -1046,7 +1046,7 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
1246, # chain_id
60, # slip44
"OM", # shortcut
"OM Chain", # name
"OM Platform", # name
False, # rskip60
)
yield (
@ -1651,13 +1651,6 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
"Energy Web Volta Testnet", # name
False, # rskip60
)
yield (
73927, # chain_id
60, # slip44
"XIN", # shortcut
"Mixin Virtual Machine", # name
False, # rskip60
)
yield (
78110, # chain_id
60, # slip44
@ -1826,6 +1819,13 @@ def _networks_iterator() -> Iterator[NetworkInfoTuple]:
"OpenChain", # name
False, # rskip60
)
yield (
846000, # chain_id
60, # slip44
"APTA", # shortcut
"4GoodNetwork", # name
False, # rskip60
)
yield (
888888, # chain_id
60, # slip44

View File

@ -45,6 +45,11 @@ def _token_iterator(chain_id: int) -> Iterator[tuple[bytes, str, int]]:
"$TEAK",
18,
)
yield ( # address, symbol, decimals
b"\x88\x1b\xa0\x5d\xe1\xe7\x8f\x54\x9c\xc6\x3a\x8f\x6c\xab\xb1\xd4\xad\x32\x25\x0d",
"00",
18,
)
yield ( # address, symbol, decimals
b"\xb6\xed\x76\x44\xc6\x94\x16\xd6\x7b\x52\x2e\x20\xbc\x29\x4a\x9a\x9b\x40\x5b\x31",
"0xBTC",
@ -1250,11 +1255,6 @@ def _token_iterator(chain_id: int) -> Iterator[tuple[bytes, str, int]]:
"CDL",
18,
)
yield ( # address, symbol, decimals
b"\x17\x7d\x39\xac\x67\x6e\xd1\xc6\x7a\x2b\x26\x8a\xd7\xf1\xe5\x88\x26\xe5\xb0\xaf",
"CDT",
18,
)
yield ( # address, symbol, decimals
b"\xb0\x56\xc3\x8f\x6b\x7d\xc4\x06\x43\x67\x40\x3e\x26\x42\x4c\xd2\xc6\x06\x55\xe1",
"CEEK",
@ -4760,6 +4760,11 @@ def _token_iterator(chain_id: int) -> Iterator[tuple[bytes, str, int]]:
"OGN",
18,
)
yield ( # address, symbol, decimals
b"\x9c\x35\x45\x03\xc3\x84\x81\xa7\xa7\xa5\x16\x29\x14\x29\x63\xf9\x8e\xcc\x12\xd0",
"OGV",
18,
)
yield ( # address, symbol, decimals
b"\x21\xe1\x3c\xb3\xf3\xf2\x6f\x92\xa6\x2a\xc7\xad\xab\x40\x93\xe8\x99\x7d\x1f\xb1",
"OIKOS",
@ -8320,6 +8325,11 @@ def _token_iterator(chain_id: int) -> Iterator[tuple[bytes, str, int]]:
"VENUS",
3,
)
yield ( # address, symbol, decimals
b"\x0c\x45\x76\xca\x1c\x36\x58\x68\xe1\x62\x55\x4a\xf8\xe3\x85\xdc\x3e\x7c\x66\xd9",
"veOGV",
18,
)
yield ( # address, symbol, decimals
b"\x8f\x34\x70\xa7\x38\x8c\x05\xee\x4e\x7a\xf3\xd0\x1d\x8c\x72\x2b\x0f\xf5\x23\x74",
"VERI",
@ -8595,6 +8605,11 @@ def _token_iterator(chain_id: int) -> Iterator[tuple[bytes, str, int]]:
"WOC",
0,
)
yield ( # address, symbol, decimals
b"\xd2\xaf\x83\x0e\x8c\xbd\xfe\xd6\xcc\x11\xba\xb6\x97\xbb\x25\x49\x6e\xd6\xfa\x62",
"WOUSD",
18,
)
yield ( # address, symbol, decimals
b"\x62\x08\x72\x45\x08\x71\x25\xd3\xdb\x5b\x9a\x3d\x71\x3d\x78\xe7\xbb\xc3\x1e\x54",
"WPC",
@ -9446,12 +9461,6 @@ def _token_iterator(chain_id: int) -> Iterator[tuple[bytes, str, int]]:
"UVCX",
18,
)
if chain_id == 64:
yield ( # address, symbol, decimals
b"\x99\x1e\x7f\xe4\xb0\x5f\x2b\x3d\xb1\xd7\x88\xe7\x05\x96\x3f\x5d\x64\x7b\x00\x44",
"MINING",
18,
)
if chain_id == 31102:
yield ( # address, symbol, decimals
b"\x72\xea\x35\x08\xd9\xd8\x17\xa9\x14\x65\xab\xb5\x9b\xe1\x0f\xef\x98\x57\xa0\x55",