Paths

Table of Contentst

Differential D3194

Clean up Segwit Recovery feature
ClosedPublic
Actions

Authored by Mengerian on Jun 4 2019, 03:53.

Tags

None

Subscribers

Details

Reviewers

deadalnix
markblundeberg
Fabien
jasonbcox

Group Reviewers

Restricted Project

Maniphest Tasks

T653: Clean up past upgrades

Commits

rSTAGINGeeed14a7916c: Clean up Segwit Recovery feature
rABCeeed14a7916c: Clean up Segwit Recovery feature

Summary

Invert meaning of Segwit Recovery flag.
Remove segwit recovery activation
Make SCRIPT_DISALLOW_SEGWIT_RECOVERY a standard flag

Test Plan

make check
Did IBD on main net and testnet with checkpoints=0 -assumevalid=0.
Update functional test to check for accepting blocks containing segwit recovery transactions,
rejecting segwit recovery transactions from mempool acceptance, and correct network banning.

Diff Detail

Repository

rABC Bitcoin ABC

Branch

sr-squash

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 6156
Build 10360: Bitcoin ABC Buildbot (legacy)
Build 10359: arc lint + arc unit

Event Timeline

Mengerian created this revision.Jun 4 2019, 03:53

Herald added a reviewer: Restricted Project. · View Herald TranscriptJun 4 2019, 03:54

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

This is the same as D3148, D3065, and D3160 squashed into one change.

Mengerian mentioned this in D3065: Remove segwit recovery activation.Jun 4 2019, 04:01

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing failed.

Harbormaster failed remote builds in B6134: Diff 9114!Jun 4 2019, 04:04

Mengerian added a task: T653: Clean up past upgrades.Jun 4 2019, 04:27

markblundeberg added a subscriber: markblundeberg.Jun 4 2019, 05:06

markblundeberg added inline comments.

src/test/data/script_tests.json
3281 ↗	(On Diff #9114)	It may be worth in these messages clarifying it's a "v0 P2SH-P2WPKH segwit recovery"

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing passed.

Harbormaster completed remote builds in B6134: Diff 9114.Jun 4 2019, 06:27

deadalnix accepted this revision.Jun 5 2019, 01:21

This revision is now accepted and ready to land.Jun 5 2019, 01:21

Update script test comments per Mark's suggestion
Rebase

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

Mengerian mentioned this in D3148: Invert meaning of Segwit Recovery flag..Jun 5 2019, 05:06

Mengerian mentioned this in D3160: Make SCRIPT_DISALLOW_SEGWIT_RECOVERY a standard flag.Jun 5 2019, 05:10

Add more reviewers

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

Harbormaster completed remote builds in B6156: Diff 9145.Jun 5 2019, 05:19

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing passed.

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing passed.

Harbormaster completed remote builds in B6157: Diff 9146.Jun 5 2019, 05:32

markblundeberg accepted this revision.Jun 5 2019, 19:52

Closed by commit rABCeeed14a7916c: Clean up Segwit Recovery feature (authored by Mengerian). · Explain WhyJun 5 2019, 20:28

This revision was automatically updated to reflect the committed changes.

Mengerian added a commit: rABCeeed14a7916c: Clean up Segwit Recovery feature.

markblundeberg added a child revision: D3255: Remove unused great wall activation code.Jun 7 2019, 04:53

Mengerian mentioned this in D3258: Update timing.json Segwit Recovery functional test name.Jun 7 2019, 19:03

Mengerian mentioned this in rABC3c56495801af: Update timing.json Segwit Recovery functional test name.Jun 8 2019, 17:37

Mengerian added a commit: rSTAGINGeeed14a7916c: Clean up Segwit Recovery feature.Sep 19 2019, 00:04

Mengerian mentioned this in rSTAGING3c56495801af: Update timing.json Segwit Recovery functional test name.Sep 19 2019, 00:09

Revision Contents
Changeset List

Path

Size

src/

policy/

3 lines

script/

interpreter.cpp

7 lines

7 lines

2 lines

test/

data/

script_tests.json

94 lines

script_tests.cpp

147 lines

scriptflags.cpp

2 lines

sigcache_tests.cpp

2 lines

15 lines

test/

functional/

abc-segwit-recovery-activation.py

	abc-segwit-recovery.py
	abc-segwit-recovery-activation.py

123 lines

Diff 9145

src/policy/policy.h

Loading...

src/script/interpreter.cpp

Loading...

src/script/script_flags.h

Loading...

src/script/sigcache.cpp

Loading...

src/test/data/script_tests.json

Loading...

src/test/script_tests.cpp

Loading...

src/test/scriptflags.cpp

Loading...

src/test/sigcache_tests.cpp

Loading...

src/validation.cpp

Loading...

test/functional/abc-segwit-recovery-activation.py

Loading...

test/functional/abc-segwit-recovery.py

Loading...