Merge develop into master — consolidate 26 pending improvements#110
Open
al-munazzim wants to merge 26 commits intodiybitcoinhardware:masterfrom
Open
Merge develop into master — consolidate 26 pending improvements#110al-munazzim wants to merge 26 commits intodiybitcoinhardware:masterfrom
al-munazzim wants to merge 26 commits intodiybitcoinhardware:masterfrom
Conversation
[Develop] Fix Descriptor num_branches, case for Miniscript
…load-miniscript [develop] Descriptor validation for miniscript
Add a check for `p2sh-p2wsh`, `p2sh-p2wpkh` and raise an exception for unknow types. fix diybitcoinhardware#93 Co-authored-by: edilmedeiros <jose.edil@gmail.com> Co-authored-by: moisespompilio <93723302+moisesPompilio@users.noreply.github.com>
This reverts commit e1d7339.
In order to test the replace assertions with conditional error raising, specifically, in bip85 code, was added a test for `derive_entropy` method as well the failure cases described in `derive_mnemonic` and `derive_hex`.
…spaces should be invalid
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
This PR merges 26 commits from
developintomaster, consolidating months of improvements that have been tested in production by Krux and reviewed by multiple contributors.Changes included
Taproot & PSBT improvements
PSBT_IN_TAP_KEY_SIGfield support (Add PSBT_IN_TAP_KEY_SIG field to PSBTs #68)Miniscript fixes
twrapper now verifies fragment type is V (Miniscript - t Wrapper Verifies if Fragment Type is V #71)0,1) support (Miniscript - Add Literal Boolean Operators #72)Descriptor.num_branchesfix for miniscript (Fix Descriptor num_branches, case for Miniscript #74)Security & correctness
\nseparators, trailing/leading spaces (mnemonics with double spaces, \n as separators, trailing and leading spaces should be invalid #105)assertwith conditional error raising — critical for Android/Buildozer (Replace Assertions with Conditional Error Raising #100)Other
🤔 Why this PR exists: The case against long-lived
developbranchesThis PR represents months of accumulated work sitting in
developwhilemasterstagnates. This pattern has real costs:The problem with GitFlow's
developbranchIntegration debt accumulates — The longer
developdiverges frommaster, the riskier the eventual merge. We're at 26 commits; some projects reach hundreds.Users get stale code — Anyone installing from
master(the default) misses critical fixes like the Androidassertissue (Replace Assertions with Conditional Error Raising #100) that's been solved for months.Review fatigue — Reviewing 26 commits at once is harder than reviewing them incrementally. Context is lost.
False sense of stability —
masterisn't "more stable" thandevelop; it's just older. The develop commits have been running in Krux production.What the industry learned
Google, Facebook, Microsoft, and Netflix all use trunk-based development — committing directly to main with feature flags, not long-lived branches.
The 2023 DORA State of DevOps Report found that elite performers have:
Recommendation for embit
After this merge, consider:
developor treat it as just another feature branchThe current model creates a two-tier system where
developusers get fixes andmasterusers don't — the opposite of what branch naming suggests.Testing
All commits have been:
References