-
Notifications
You must be signed in to change notification settings - Fork 5.9k
BIP 360 - Pay to Tapscript Hash (P2TSH) #1670
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
cryptoquick
wants to merge
133
commits into
bitcoin:master
Choose a base branch
from
cryptoquick:p2qrh
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+9,242
−0
Open
Changes from 48 commits
Commits
Show all changes
133 commits
Select commit
Hold shift + click to select a range
1fa2485
QuBit - P2QRH spending rules - Final draft before submitting upstream…
cryptoquick 6f67a3d
Add pqNTRUsign to .typos.toml.
cryptoquick d83c29d
QuBit - P2QRH
cryptoquick ae0936a
typo fix
jlopp d89b7c5
Merge pull request #13 from jlopp/patch-3
cryptoquick b4c329b
QuBit - P2QRH spending rules
cryptoquick 53d497e
Adds clarity and brevity
0a2ed4a
Apply suggestions from review
cryptoquick c92a9b0
QuBit - P2QRH spending rules
cryptoquick e1b7007
Add details on attestation structure and parsing. (#14)
cryptoquick 60d7294
MediaWiki formatting fixes
cryptoquick 2d098d9
MediaWiki formatting fixes
cryptoquick ed4e862
MediaWiki fixes, remove redundant sections. (#16)
cryptoquick f2426c6
Update title and formatting.
cryptoquick 2e4ad81
More wrestling with MediaWiki formatting...
cryptoquick 9935005
I give up. Removing code and pre blocks.
cryptoquick cc47f9e
More formatting fixes.
cryptoquick ff4d2c2
Apply suggestions from code review
cryptoquick f206b97
Address Murch feedback.
cryptoquick 70649ea
Merge branch 'p2qrh' of github.com:cryptoquick/bips into p2qrh
cryptoquick feff847
MediaWiki formatting.
cryptoquick e186b52
Swap layer and title.
cryptoquick d500124
Apply suggestions from code review
cryptoquick 85a347b
Update to use merkle tree for attestation commitment. Update LR & SR …
cryptoquick 85348c0
P2QRH assigned BIP number 360.
cryptoquick a4f3dc6
Apply suggestions from code review
cryptoquick 2b641b8
Address feedback from vostrnad.
cryptoquick 4b8b647
Update typos list.
cryptoquick 990d8a8
Fixes, typos, formatting.
cryptoquick 0fdd8c3
Updates based on Murch and vostrnad feedback.
cryptoquick 208a987
Fix title change in README.
cryptoquick 8eb35c8
Apply suggestions from code review
cryptoquick d9bb0ff
Fix broken link.
cryptoquick 0ae69db
Remove Canary section.
cryptoquick 81e1838
Apply suggestions from code review
cryptoquick c1b9047
Address suggestions from jonatack's review.
cryptoquick b75003e
Remove SQIsign from consideration due to significant performance conc…
cryptoquick 5e568e3
Fix typo.
cryptoquick 8c0f798
Fix typo.
cryptoquick 32c0a3d
Updates based on Antoine Riard's feedback and others.
cryptoquick 913cf79
Apply suggestions from jonasnick code review
cryptoquick 5a1459b
Updates based on Jonas Nick's feedback.
cryptoquick 6f3748e
Merge branch 'master' into p2qrh to fix BIP-119 linter issue
cryptoquick 48eaf8f
Updates - 2025/03/12 (#19)
cryptoquick 61faee6
Correct inconsistencies in commitment and attestation structure. Swit…
cryptoquick e6e7207
Update descriptor format.
cryptoquick c43487d
bip-0360: test vectors
jbride dc044da
p2qrh; fixes:
jbride 3751cb2
p2qrh: enabling serde and rand features of bitcoin crate
jbride 458d2e6
p2qrh: change name of test to reflect current focus on construction o…
jbride e4aae53
p2qrh: initial draft of p2qrh spend related test vectors
jbride f139a5f
p2qrh: rust-bitcoin modification overview
jbride f7d2931
p2qrh: moving location of test vector data
jbride a6c6449
p2qrh: separating rust from python test vectors
jbride fb89286
p2qrh: fixed documentation error in docs/rust_bitcoin_p2pqrh_changes.md
jbride b37d1d3
p2qrh: adding asm representation and description to test-vector leaf …
jbride 3f32617
p2qrh test vectors: simple lightning contract
jbride 2cbe246
p2qrh test vectors: specify Bitcoin network for generating p2qrh add…
jbride 7438d08
p2qrh-testvectors: first draft of performance testing & failure analysis
jbride 0793e2d
p2qrh: github action fix
jbride 25a0f56
p2qrh: updates stack_element_size_performance_tests.adoc based on
jbride a7419a1
Remove dashes in BIP numbers and change to SegWit version 2
dplusplus1024 4ed8dcb
Removed more dashes and continued changes for moving version to 2
dplusplus1024 32cf0bd
p2qrh: pure p2tr script path spend test vector
jbride a375b65
Changes BIP-360 to use tapscript (#21)
EthanHeilman 77dbeee
Update changelog and acknowledgements with the new developments in BI…
cryptoquick 99dc227
p2qrh: removing experimental tests pertaining to descriptors
jbride 2412aa3
p2qrh: modified spend test to reflect p2qrh specification requirement…
jbride 107fb97
Changes BIP-360 to use tapscript (#21)
EthanHeilman 4c5e836
Update changelog and acknowledgements with the new developments in BI…
cryptoquick f0123ea
Small typo fix to p2qrh related documentation.
jbride c10cd6c
p2qrh: add test vector and reference code to bip0360
jbride ac8e24f
p2qrh: spend functionality moved out of test and into a library for r…
jbride fa7bdad
p2qrh: first draft of end-to-end p2qrh spend scenario
jbride 3ab1e3e
p2qrh: first successfull fund, spend and mine in bitcoin core.
jbride 1b3f3de
P2QRH:
jbride 63b41c3
p2qrh: p2qrh construction related test vectors now account for "Quant…
jbride 478ebf1
p2qrh: remove reference to merkle root and replace with quantum_root
jbride 8903528
pqrh: small modification to docs
jbride 44778df
Fix duplicate acknowledgement
EthanHeilman 06c2103
p2qrh: working on multi-leaf taptree example in rust for
jbride 11f2936
p2qrh: new "common" directory to share test vector artifacts between…
jbride a1ef895
p2qrh: multi-leaf p2tr example now works
jbride 1c2fb22
Fix itemize by using mediawiki splat
EthanHeilman 5ef52b6
p2qrh: multi-leaf p2qrh example now works
jbride 01e9d06
Use consistent naming for script path spend and key path spend.
EthanHeilman 26113f1
Hyphenate 32-byte
EthanHeilman eddf8f9
Use leaf rather than tapleaf when describing leaf tapscripts in the t…
EthanHeilman 1f65b67
Minor terminology fixes
EthanHeilman e3e64a6
Minor terminology fixes
EthanHeilman c3bd091
Remove qubit name
EthanHeilman 1668064
Merge branch 'p2qrh' into patch-6
dplusplus1024 7306021
More fun with dashes
dplusplus1024 c4b81ea
Merge pull request #23 from dplusplus1024/patch-6
EthanHeilman eb3c3d3
Add ack + change log
EthanHeilman 9a6e068
Fix label ordering
EthanHeilman 7ab0d68
Correct Bitcoin capitalization
EthanHeilman 13a8dc2
Consistent Taproot caps
EthanHeilman d8b3f7c
p2qrh: bitcoin core build instructions in end-to-end docs
jbride 4095d33
Add example P2QRH address
EthanHeilman 66aa330
bip-0360: test vectors
jbride c16554c
p2qrh; fixes:
jbride 49fa15c
p2qrh: enabling serde and rand features of bitcoin crate
jbride a662e97
p2qrh: change name of test to reflect current focus on construction o…
jbride 35c0229
p2qrh: initial draft of p2qrh spend related test vectors
jbride 0e0feb0
p2qrh: rust-bitcoin modification overview
jbride 0751f95
p2qrh: moving location of test vector data
jbride 026d73c
p2qrh: separating rust from python test vectors
jbride 9877a85
p2qrh: fixed documentation error in docs/rust_bitcoin_p2pqrh_changes.md
jbride 794ca6f
p2qrh: adding asm representation and description to test-vector leaf …
jbride 4658012
p2qrh test vectors: simple lightning contract
jbride 773434b
p2qrh test vectors: specify Bitcoin network for generating p2qrh add…
jbride 26ab582
p2qrh-testvectors: first draft of performance testing & failure analysis
jbride 86ad55f
p2qrh: github action fix
jbride 27f35be
p2qrh: updates stack_element_size_performance_tests.adoc based on
jbride 5deb96f
p2qrh: pure p2tr script path spend test vector
jbride 46c91d3
p2qrh: removing experimental tests pertaining to descriptors
jbride 8d4d553
p2qrh: modified spend test to reflect p2qrh specification requirement…
jbride 5a5d260
p2qrh: rust related test vectors and examples.
jbride bdcbb30
added org document for bip360
notmike-5 3da571d
revert to jbride changelist
notmike-5 c9aa764
Update BIP 360 entry in README
cryptoquick 599a5f8
CI fixes
cryptoquick 63c94ab
CI fixes - field order
cryptoquick c65a96a
Fix jbride typo
cryptoquick 4c7a81e
Fix accidental status change of other entries.
cryptoquick 56be885
BIP 360 P2TSH rewrite and general copyediting (#38)
cryptoquick 532acfb
P2tsh pqc merge (#39)
jbride 36fc007
Address review comments on links, wording and emdashes
EthanHeilman 7ee326b
Address reviews, clarify wording and terminology
EthanHeilman 6743610
Fix bug in verification, minor review comments and adopt [[bip-0003.m…
EthanHeilman 21a2fe5
Merge branch 'master' into p2qrh
EthanHeilman c7b11d7
Fix header order
EthanHeilman File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -1169,6 +1169,13 @@ Those proposing changes should consider that ultimately consent may rest with th | |||||
| | Matt Corallo, Bastien Teinturier | ||||||
| | Standard | ||||||
| | Draft | ||||||
jonatack marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||||||
| |- | ||||||
| | [[bip-0360.mediawiki|360]] | ||||||
| | Consensus (soft fork) | ||||||
| | Pay to Quantum Resistant Hash | ||||||
| | Hunter Beast, Ethan Heilman | ||||||
| | Standard | ||||||
|
||||||
| | Standard | |
| | Specification |
Contributor
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed in 6743610
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since the BIP 3 deployment updated all existing BIPs and the table in the README, there is now a merge conflict here. It would probably be the easiest to rebase this PR on the latest master branch.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ended up doing a merge, rebase kept breaking vscode for some reason.