Skip to content

Conversation

@doc-hex
Copy link
Contributor

@doc-hex doc-hex commented Jul 4, 2024

This will be a long-lived PR / branch containing "edge" firmware differences.

scgbckbone and others added 29 commits February 19, 2025 10:34
(cherry picked from commit 660b461)
(cherry picked from commit 7e6be45)
(cherry picked from commit 67febe2)
(cherry picked from commit d2636c7)
(cherry picked from commit 4515e68)
(cherry picked from commit 08bb978)
(cherry picked from commit 695c3b4)
(cherry picked from commit 262c4ea)
(cherry picked from commit 242641d)
remove msas (always allowed)
remove unsort_ms (always allowed)
rework fake_txn

# Conflicts:
#	cli/signit.py
#	releases/ChangeLog.md
#	releases/History-Mk4.md
#	releases/Next-ChangeLog.md
#	releases/signatures.txt
#	shared/actions.py
#	shared/address_explorer.py
#	shared/auth.py
#	shared/backups.py
#	shared/chains.py
#	shared/decoders.py
#	shared/descriptor.py
#	shared/display.py
#	shared/export.py
#	shared/flow.py
#	shared/lcd_display.py
#	shared/multisig.py
#	shared/nfc.py
#	shared/notes.py
#	shared/nvstore.py
#	shared/ownership.py
#	shared/paper.py
#	shared/psbt.py
#	shared/qrs.py
#	shared/seed.py
#	shared/serializations.py
#	shared/utils.py
#	shared/ux.py
#	shared/ux_mk4.py
#	shared/ux_q1.py
#	shared/version.py
#	shared/wallet.py
#	shared/xor_seed.py
#	stm32/COLDCARD_MK4/file_time.c
#	stm32/COLDCARD_Q1/file_time.c
#	stm32/MK4-Makefile
#	stm32/Q1-Makefile
#	testing/conftest.py
#	testing/helpers.py
#	testing/test_address_explorer.py
#	testing/test_backup.py
#	testing/test_bbqr.py
#	testing/test_export.py
#	testing/test_msg.py
#	testing/test_multisig.py
#	testing/test_notes.py
#	testing/test_ownership.py
#	testing/test_sign.py
#	testing/test_unit.py
#	testing/txn.py
scgbckbone and others added 30 commits October 30, 2025 01:27
(cherry picked from commit 0d1104d)
(cherry picked from commit efa8e1d)
(cherry picked from commit f966d3b)
(cherry picked from commit f235a83)
update embit<->firmware licensing
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.

7 participants