From 34ae8b2bb0f1e70bb78d5ad96c6b174c5e09249f Mon Sep 17 00:00:00 2001 From: "Peter D. Gray" Date: Tue, 25 Jun 2024 14:19:54 -0400 Subject: [PATCH] move NFC PushTx into settings from Adv/Tools --- docs/nfc-pushtx.md | 7 +++++-- releases/Next-ChangeLog.md | 2 +- shared/flow.py | 2 +- stm32/COLDCARD_MK4/file_time.c | 6 +++--- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/docs/nfc-pushtx.md b/docs/nfc-pushtx.md index f6927f4d..3367f314 100644 --- a/docs/nfc-pushtx.md +++ b/docs/nfc-pushtx.md @@ -13,7 +13,9 @@ Bitcoin node (or similar) and send the transaction on the public Bitcoin network. This feature is available on Q and Mk4 and requires NFC to be enabled. -See `Advanced/Tools > NFC Push Tx` +See `Settings > NFC Push Tx`. + +See the latest on our feature minisite: [PushTx.org](https://pushtx.org) ## Protocol Spec @@ -76,7 +78,8 @@ it is now waiting in the mempool. You can host this file anywhere your phone can reach, and then use that URL in your COLDCARD settings. It uses your phone's browser to submit directly to `mempool.space` and `blockstream.info` sites (both at same time). It is equivalent - to the page hosted at `https://coldcard.com/pushtx#` + to the page hosted at `https://coldcard.com/pushtx#`. Full source code is published here: + [github.com/Coldcard/push-tx](https://github.com/Coldcard/push-tx) ### Notes diff --git a/releases/Next-ChangeLog.md b/releases/Next-ChangeLog.md index 1881060c..c6bab0ec 100644 --- a/releases/Next-ChangeLog.md +++ b/releases/Next-ChangeLog.md @@ -6,7 +6,7 @@ This lists the new changes that have not yet been published in a normal release. - New Feature: PushTX: once enabled with a service provider's URL, you can tap the COLDCARD and your phone will open a webpage that transmits your freshly-signed transaction onto - the blockchain. See `Tools > NFC Push Tx` to enable and select service provider, or your + the blockchain. See `Settings > NFC Push Tx` to enable and select service provider, or your own webpage. More at . You can also use this to broadcast on any transaction on the MicroSD card (See `Tools > NFC Tools > Push Transaction`) - New Feature: Transaction Output Explorer: allows viewing all output details for diff --git a/shared/flow.py b/shared/flow.py index 4161c585..99344c6d 100644 --- a/shared/flow.py +++ b/shared/flow.py @@ -138,6 +138,7 @@ SettingsMenu = [ MenuItem('Hardware On/Off', menu=HWTogglesMenu), NonDefaultMenuItem('Multisig Wallets', 'multisig', menu=make_multisig_menu, predicate=has_secrets), + NonDefaultMenuItem('NFC Push Tx', 'ptxurl', menu=pushtx_setup_menu), MenuItem('Display Units', chooser=value_resolution_chooser), MenuItem('Max Network Fee', chooser=max_fee_chooser), MenuItem('Idle Timeout', chooser=idle_timeout_chooser), @@ -356,7 +357,6 @@ AdvancedNormalMenu = [ f=drv_entro_start), MenuItem("View Identity", f=view_ident), MenuItem("Temporary Seed", menu=make_ephemeral_seed_menu), - NonDefaultMenuItem('NFC Push Tx', 'ptxurl', menu=pushtx_setup_menu), MenuItem('Paper Wallets', f=make_paper_wallet), ToggleMenuItem('Enable HSM', 'hsmcmd', ['Default Off', 'Enable'], story=("Enable HSM? Enables all user management commands, and other HSM-only USB commands. " diff --git a/stm32/COLDCARD_MK4/file_time.c b/stm32/COLDCARD_MK4/file_time.c index 80ee572b..b514c276 100644 --- a/stm32/COLDCARD_MK4/file_time.c +++ b/stm32/COLDCARD_MK4/file_time.c @@ -2,12 +2,12 @@ // // AUTO-generated. // -// built: 2024-05-09 -// version: 5.3.1 +// built: 2024-06-25 +// version: 5.3.2 // #include // this overrides ports/stm32/fatfs_port.c uint32_t get_fattime(void) { - return 0x58a92860UL; + return 0x58d92860UL; }