Closed
Conversation
Inspired by Jorge Timon's "Testchain: Don't check the genesis block", but restricted to just PoW check. Code by Matt Corallo, originally submitted as a patch to segwit.
Member
Author
|
Since github shows the commits sorted by author date rather than dependency order, here is a list of all commits:
Code to generate this list: |
Contains refactorings by Eric Lombrozo. Contains fixup by Nicolas Dorier.
Service bit logic by Nicolas Dorier.
Includes a fix by Suhas Daftuar
Includes simplifications by Eric Lombrozo.
Includes RPC field name changes by Luke-jr.
Includes changes by Suhas Daftuar and Luke-jr.
…en verify_script receives VERIFY_WITNESS flag script_tests: always test bitcoinconsensus_verify_script_with_amount if VERIFY_WITNESS isn't set Rename internal method + make it static trim bitcoinconsensus_ prefix Add SERIALIZE_TRANSACTION_WITNESS flag
Witness blocks can be greater than 2MiB, but cannot be validly greater than 4MB.
sipa
force-pushed
the
segwit-master
branch
2 times, most recently
from
8e3310c to
e847337
Compare
Member
Author
|
New merge on top of #7600. |
|
|
||
| { | ||
| LOCK(cs_main); | ||
| if (!IsWitnessEnabled(chainActive.Tip(), Params().GetConsensus()) && !GetBoolArg("-walletprematurewitness", false)) { |
Member
There was a problem hiding this comment.
Do we want to do a similar thing for createwitnessaddress?
Member
| // * witness (when witness enabled in flags and excludes coinbase) | ||
| nSigOpsCost += GetTransactionSigOpCost(tx, view, flags); | ||
| if (nSigOpsCost > MAX_BLOCK_SIGOPS_COST) | ||
| return state.DoS(100, error("ConnectBlock(): too many sigops"), |
Member
There was a problem hiding this comment.
Upgraded nodes don't ask for blocks from non-upgraded?
Member
Author
|
New merge after #8068 and #8179. See the details in #8149 (comment). |
Contributor
|
I udpated the sig cache PR (sipa#101) |
Member
Author
|
Merged as #8149. |
4 tasks
zkbot
added a commit
to zcash/zcash
that referenced
this pull request
Aug 17, 2021
ZIP 239 preparations 3 Cherry-picked from the following upstream PRs: - bitcoin/bitcoin#8080 - bitcoin/bitcoin#8082 - bitcoin/bitcoin#8126 - bitcoin/bitcoin#7910 - This is the unsquashed version of bitcoin/bitcoin#8149 - We take three cleanup commits to the protocol / `CInv` code. - bitcoin/bitcoin#8822 - bitcoin/bitcoin#8880 - Excluding the first commit (we don't have the comment it fixes yet). - bitcoin/bitcoin#19322
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
19 participants
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.
This is the complete code for segregated witness on top of master (implementing BIP141, BIP143, BIP144, BIP145). Apart from commentary and merging (see further), the code is never rewritten/squashed/rebased, in order not to invalidate review. A rebased/squashed version is available here: #8149.
See also the detailed and up-to-date list of commits here: #7910 (comment)
There are certainly some items left to do:
Many thanks to all contributors so far (including @jl2012, @NicolasDorier, @CodeShark, @sdaftuar, @morcos, @luke-jr, @afk11, @theuni, @TheBlueMatt, @MarcoFalke, @LongShao007, @jonasnick, @mruddy), the ideas it is based on (by @gmaxwell and @luke-jr), and many reviewers (including @SergioDemianLerner, @instagibbs, @dcousens, and @btcdrak).