diff --git a/releases/.gitignore b/releases/.gitignore new file mode 100644 index 00000000..d485e070 --- /dev/null +++ b/releases/.gitignore @@ -0,0 +1 @@ +*.dfu diff --git a/releases/2019-12-19T1623-v3.0.6-coldcard.dfu b/releases/2019-12-19T1623-v3.0.6-coldcard.dfu deleted file mode 100644 index bf147951..00000000 Binary files a/releases/2019-12-19T1623-v3.0.6-coldcard.dfu and /dev/null differ diff --git a/releases/2021-01-07T1439-v3.2.1-coldcard.dfu b/releases/2021-01-07T1439-v3.2.1-coldcard.dfu deleted file mode 100644 index 0f0d022b..00000000 Binary files a/releases/2021-01-07T1439-v3.2.1-coldcard.dfu and /dev/null differ diff --git a/releases/2021-01-14T1617-v3.2.2-coldcard.dfu b/releases/2021-01-14T1617-v3.2.2-coldcard.dfu deleted file mode 100644 index 0e735115..00000000 Binary files a/releases/2021-01-14T1617-v3.2.2-coldcard.dfu and /dev/null differ diff --git a/releases/2021-03-29T1927-v4.0.1-coldcard.dfu b/releases/2021-03-29T1927-v4.0.1-coldcard.dfu deleted file mode 100644 index 3a434eb4..00000000 Binary files a/releases/2021-03-29T1927-v4.0.1-coldcard.dfu and /dev/null differ diff --git a/releases/2021-04-07T1424-v4.0.2-coldcard.dfu b/releases/2021-04-07T1424-v4.0.2-coldcard.dfu deleted file mode 100644 index d50a8740..00000000 Binary files a/releases/2021-04-07T1424-v4.0.2-coldcard.dfu and /dev/null differ diff --git a/releases/ChangeLog.md b/releases/ChangeLog.md index 6b92573e..2e31d2b4 100644 --- a/releases/ChangeLog.md +++ b/releases/ChangeLog.md @@ -1,4 +1,4 @@ -## 4.1.0 - April XX, 2021 +## 4.1.0 - April 30, 2021 - New feature: Seed XOR -- split you secret BIP-39 seed into 2 (or 3 or 4) new seed phrases - any combination of found seed word phrases is a fully working wallet (great for duress) @@ -11,7 +11,7 @@ are available at - Enhancement: Add support for BIP-48 derivations when exporting generic JSON (including the accounts number) under Advanced > MicroSD Card > Export Wallet > Generic JSON. - These would are targeted towards multisig wallets, such as + These are targeted towards multisig wallets, such as [Sparrow](https://sparrowwallet.com/docs/coldcard-wallet.html) - Enhancement: Ask for account number when creating Multisig Wallets via air-gapped Coldcards. Use account zero for compatibility with previous versions. No need to diff --git a/releases/README.md b/releases/README.md index a67f1cea..e453c95d 100644 --- a/releases/README.md +++ b/releases/README.md @@ -1,9 +1,5 @@ - # Coldcard Releases -Here we keep only the current binary release, useful older -releases, and some documentation: - `ChangeLog.md` - recent changes and feature announcements @@ -16,5 +12,10 @@ releases, and some documentation: `signatures.txt` -- PGP signed hashs (SHA-256) of the above files and the firmwares themselves. +- PGP signed hashes (SHA-256) of the above files and the firmware files themselves. +## Looking for Firmware Binaries? + +[Go to our website for the latest binaries.](https://coldcardwallet.com/docs/upgrade) + +Please do check the signatures using the files here. diff --git a/stm32/Makefile b/stm32/Makefile index 94d7c7d3..51dc4f7d 100644 --- a/stm32/Makefile +++ b/stm32/Makefile @@ -34,7 +34,7 @@ BOOTLOADER_BASE = 0x08000000 FILESYSTEM_BASE = 0x080e0000 # Our version for this release. -VERSION_STRING = 4.0.3 +VERSION_STRING = 4.1.0 # # Sign and merge various parts @@ -123,6 +123,7 @@ code-committed: git diff --stat --exit-code . @echo '... yes' +# Sign a message with the contents of ../releases on the developer's machine .PHONY: sign-release sign-release: (cd ../releases; shasum -a 256 *.dfu *.md | sort -rk 2 | \ @@ -132,16 +133,14 @@ sign-release: # Tag source code associate with built release version. # - do "make release" before this step! # - also edit/commit ChangeLog text too -# - this target will "git add" the new binary in ../release/*dfu # - update & sign signatures file # - and tag everything tag-source: PUBLIC_VERSION = $(shell $(SIGNIT) version built/production.bin) tag-source: sign-release code-committed - git add ../releases/$(PUBLIC_VERSION)-coldcard.dfu - git commit -am "New release: "$(PUBLIC_VERSION) - git push + git commit --allow-empty -am "New release: "$(PUBLIC_VERSION) echo "Taging version: " $(PUBLIC_VERSION) git tag -a $(PUBLIC_VERSION) -m "Release "$(PUBLIC_VERSION) + git push git push --tags # DFU file of boot and main code