[FreshEyes] Segregated witness rebased #77

nully0x · 2024-05-21T16:24:23Z

The author sipa wrote the following PR called Segregated witness rebased, issue number 8149 in bitcoin/bitcoin cloned by FreshEyes below:

This PR is a rebased and squashed version of #7910. As this is the form (in pieces or in whole) that we expect it to be merged in, I'm opening a separate pull request for it. I will leave the old one open for discussion and history.

The tree here is identical to the resulting tree there:

$ git show -s --format="%T" 3cb46c1a4ac94f4a7f25368bc2ba3c784c901b89
8ddfe56cfedba64667c63dd0fef6ee9584889719
$ git show -s --format="%T" 17389dc466f2acf8bfa64ce0416f3b5281445a5c
8ddfe56cfedba64667c63dd0fef6ee9584889719

Where 3cb46c1 is #7910's tip commit, and 17389dc is this PR's tip commit.

Please make comments on #7910, so the history can be tracked, and everything stays in one place.

Contains refactorings by Eric Lombrozo. Contains fixup by Nicolas Dorier. Contains cleanup of CInv::GetCommand by Alex Morcos

Includes a fix by Suhas Daftuar and LongShao007

Service bit logic by Nicolas Dorier. Only download blocks from witness peers after fork.

This is a preparation for BIP143 support.

Includes simplifications by Eric Lombrozo.

Includes RPC field name changes by Luke-jr.

Includes changes by Suhas Daftuar, Luke-jr, and mruddy.

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

Includes logic for dealing with pruning by Suhas Daftuar.

Includes support for pushkeyhash wit v0 by Alex Morcos.

Including BIP143 P2WSH examples by jl2012.

Contains fix by Johnson Lau.

Amended by Pieter Wuille to use multisig 1-of-1 for P2WSH tests, and BIP9 based switchover logic. Fixes and py3 conversion by Marco Falke.

mininode now supports witness transactions/blocks, blocktools has a helper for adding witness commitments to blocks, and script has a function to calculate hashes for signature under sigversion 1, used by segwit. Py3 conversion by Marco Falke Test to make sure upgraded nodes don't ask for non-wit blocks by Gregory Sanders.

Add tests that witness signatures cover value

fresheyes-staging-bot · 2024-05-21T16:24:27Z

There were 15 comments left by 11 reviewers and the author for this pull request

fresheyes-staging-bot · 2024-05-21T16:24:30Z

src/test/sigopcount_tests.cpp

+{
+    ScriptError error;
+    CTransaction inputi(input);
+    bool ret = VerifyScript(inputi.vin[0].scriptSig, output.vout[0].scriptPubKey, inputi.wit.vtxinwit.size() > 0 ? &inputi.wit.vtxinwit[0].scriptWitness : NULL, flags, TransactionSignatureChecker(&inputi, 0, output.vout[0].nValue), &error);


An author commented here with:

comment link https://github.com/bitcoin/bitcoin/pull/8149#discussion_r66020110 at 2016/06/07, 07:14:49 UTC.

fresheyes-staging-bot · 2024-05-21T16:24:33Z

src/main.cpp

 }

 void MaybeSetPeerAsAnnouncingHeaderAndIDs(const CNodeState* nodestate, CNode* pfrom) {
+    if (nLocalServices & NODE_WITNESS) {


2 authors commented here with:

comment link https://github.com/bitcoin/bitcoin/pull/8149#discussion_r76172305 at 2016/08/25, 02:35:48 UTC

comment link https://github.com/bitcoin/bitcoin/pull/8149#discussion_r76187086 at 2016/08/25, 06:32:22 UTC.

fresheyes-staging-bot · 2024-05-21T16:24:36Z

src/main.cpp


+uint32_t GetFetchFlags(CNode* pfrom, CBlockIndex* pprev, const Consensus::Params& chainparams) {
+    uint32_t nFetchFlags = 0;
+    if (IsWitnessEnabled(pprev, chainparams) && State(pfrom->GetId())->fHaveWitness) {


2 authors commented here with:

comment link https://github.com/bitcoin/bitcoin/pull/8149#discussion_r76216046 at 2016/08/25, 10:10:41 UTC

comment link https://github.com/bitcoin/bitcoin/pull/8149#discussion_r76216704 at 2016/08/25, 10:13:27 UTC.

fresheyes-staging-bot · 2024-05-21T16:24:39Z

src/main.cpp

+        if((pfrom->nServices & NODE_WITNESS))
+        {
+            LOCK(cs_main);
+            State(pfrom->GetId())->fHaveWitness = true;


An author commented here with:

comment link https://github.com/bitcoin/bitcoin/pull/8149#discussion_r76397641 at 2016/08/26, 10:24:02 UTC.

fresheyes-staging-bot · 2024-05-21T16:24:42Z

src/main.cpp

-                        nodestate->nBlocksInFlight < MAX_BLOCKS_IN_TRANSIT_PER_PEER) {
-                        if (nodestate->fProvidesHeaderAndIDs)
+                        nodestate->nBlocksInFlight < MAX_BLOCKS_IN_TRANSIT_PER_PEER &&
+                        (!IsWitnessEnabled(chainActive.Tip(), chainparams.GetConsensus()) || State(pfrom->GetId())->fHaveWitness)) {


3 authors commented here with:

comment link https://github.com/bitcoin/bitcoin/pull/8149#discussion_r76398254 at 2016/08/26, 10:30:13 UTC

comment link https://github.com/bitcoin/bitcoin/pull/8149#discussion_r76398705 at 2016/08/26, 10:34:35 UTC

comment link https://github.com/bitcoin/bitcoin/pull/8149#discussion_r76400290 at 2016/08/26, 10:51:44 UTC.

fresheyes-staging-bot · 2024-05-21T16:24:45Z

src/init.cpp

+        nLocalServices = ServiceFlags(nLocalServices | NODE_WITNESS);
+        // Only care about others providing witness capabilities if there is a softfork
+        // defined.
+        nRelevantServices = ServiceFlags(nRelevantServices | NODE_WITNESS);


An author commented here with:

comment link https://github.com/bitcoin/bitcoin/pull/8149#discussion_r79103769 at 2016/09/16, 04:05:51 UTC.

fresheyes-staging-bot · 2024-05-21T16:24:48Z

src/main.cpp

            if (chain.Contains(pindex))
                return pindex;
+            if (pindex->GetAncestor(chain.Height()) == chain.Tip()) {
+                return chain.Tip();


An author commented here with:

comment link https://github.com/bitcoin/bitcoin/pull/8149#discussion_r86138998 at 2016/11/02, 13:23:26 UTC.

sipa and others added 27 commits June 22, 2016 15:42

--- [SEGWIT] begin: P2P/node/consensus ---

ecacfd9

BIP144: Serialization, hashes, relay (sender side)

7030d9e

Contains refactorings by Eric Lombrozo. Contains fixup by Nicolas Dorier. Contains cleanup of CInv::GetCommand by Alex Morcos

BIP141: Witness program

449f9b8

BIP141: Commitment structure and deployment

8b49040

Includes a fix by Suhas Daftuar and LongShao007

BIP144: Handshake and relay (receiver side)

b8a9749

Service bit logic by Nicolas Dorier. Only download blocks from witness peers after fork.

Refactor script validation to observe amounts

0ef1dd3

This is a preparation for BIP143 support.

BIP143: Verification logic

3dd4102

Includes simplifications by Eric Lombrozo.

[RPC] Return witness data in blockchain RPCs

7c4bf77

Includes RPC field name changes by Luke-jr.

BIP141: Other consensus critical limits, and BIP145

2b1f6f9

Includes changes by Suhas Daftuar, Luke-jr, and mruddy.

[libconsensus] Script verification API with amounts

b7dbeb2

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

Add rewind logic to deal with post-fork software updates

6032f69

Includes logic for dealing with pruning by Suhas Daftuar.

Do not use compact blocks when segwit is enabled

af87a67

--- [SEGWIT] begin: wallet ---

9757b57

BIP143: Signing logic

605e847

[RPC] Add wallet support for witness transactions (using P2SH)

f4691ab

Includes support for pushkeyhash wit v0 by Alex Morcos.

[RPC] signrawtransaction can sign P2WSH

745eb67

--- [SEGWIT] begin: tests ---

978e200

[qa] Witness version 0 signing unit tests

0aa9207

[qa] Add transaction tests for segwit

00f46cb

Including BIP143 P2WSH examples by jl2012.

[qa] Add segwit support to script_tests

06d3805

Contains fix by Johnson Lau.

[qa] Autogeneration support for witness in script_tests

66cca79

[qa] Add rpc test for segwit

4f7ff00

Amended by Pieter Wuille to use multisig 1-of-1 for P2WSH tests, and BIP9 based switchover logic. Fixes and py3 conversion by Marco Falke.

[qa] script_tests: witness tests can specify tx amount

d846e02

Add tests that witness signatures cover value

[qa] Add GetTransactionSigOpCost unit tests

fdb43df

--- [SEGWIT] begin: deployment ---

070dbc4

BIP9 parameters for testnet

f852813

fresheyes-staging-bot bot reviewed May 21, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[FreshEyes] Segregated witness rebased #77

[FreshEyes] Segregated witness rebased #77

Uh oh!

nully0x commented May 21, 2024

Uh oh!

fresheyes-staging-bot bot commented May 21, 2024

Uh oh!

fresheyes-staging-bot bot May 21, 2024

Uh oh!

fresheyes-staging-bot bot May 21, 2024

Uh oh!

fresheyes-staging-bot bot May 21, 2024

Uh oh!

fresheyes-staging-bot bot May 21, 2024

Uh oh!

fresheyes-staging-bot bot May 21, 2024

Uh oh!

fresheyes-staging-bot bot May 21, 2024

Uh oh!

fresheyes-staging-bot bot May 21, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

[FreshEyes] Segregated witness rebased #77

Are you sure you want to change the base?

[FreshEyes] Segregated witness rebased #77

Uh oh!

Conversation

nully0x commented May 21, 2024

Uh oh!

fresheyes-staging-bot bot commented May 21, 2024

Uh oh!

fresheyes-staging-bot bot May 21, 2024

Choose a reason for hiding this comment

Uh oh!

fresheyes-staging-bot bot May 21, 2024

Choose a reason for hiding this comment

Uh oh!

fresheyes-staging-bot bot May 21, 2024

Choose a reason for hiding this comment

Uh oh!

fresheyes-staging-bot bot May 21, 2024

Choose a reason for hiding this comment

Uh oh!

fresheyes-staging-bot bot May 21, 2024

Choose a reason for hiding this comment

Uh oh!

fresheyes-staging-bot bot May 21, 2024

Choose a reason for hiding this comment

Uh oh!

fresheyes-staging-bot bot May 21, 2024

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants