Page MenuHomePhabricator
Differential D1601

Pass flags down to GetSigOpCount
ClosedPublic
Actions

Authored by deadalnix on Jul 26 2018, 00:31.

Details

Reviewers
jasonbcox
schancel
Group Reviewers
Restricted Project
Commits
rSTAGING3eba1135b26f: Pass flags down to GetSigOpCount
rABC3eba1135b26f: Pass flags down to GetSigOpCount
Summary

This will ensure we can use flags to tweak the way sigops are counted in the future. This is necessary for the activation of OP_CHECKDATASIG.

Test Plan

Added test cases to ensure behavior changes as expected when the P2SH flags is flipped.

Diff Detail

Repository
rABC Bitcoin ABC
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

deadalnix created this revision.Jul 26 2018, 00:31
Herald added a reviewer: Restricted Project. · View Herald TranscriptJul 26 2018, 00:31
teamcity added a subscriber: teamcity.Jul 26 2018, 00:32

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

teamcity added a comment.Jul 26 2018, 01:15

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

Harbormaster completed remote builds in B2965: Diff 4433.Jul 26 2018, 01:15
deadalnix retitled this revision from Pass filags down to GetSigOpCount to Pass flags down to GetSigOpCount.Jul 26 2018, 01:18
deadalnix added a child revision: D1605: Count OP_CHECKDATASIG and OP_CHECKDATASIGVERIFY as sigops when the proper flag is set..Jul 26 2018, 20:56
jasonbcox accepted this revision.Jul 27 2018, 17:20
This revision is now accepted and ready to land.Jul 27 2018, 17:20
schancel requested changes to this revision.Jul 27 2018, 17:23
schancel added a subscriber: schancel.
schancel added inline comments.
src/script/script.cpp
381 ↗(On Diff #4433)

Why is this passed in? Why doesn't this count the SigOps from the current CScript also?

382 ↗(On Diff #4433)

Do we need a ScriptFlags type? Also why is this being added now?

This revision now requires changes to proceed.Jul 27 2018, 17:23
schancel accepted this revision.Jul 29 2018, 19:35
This revision is now accepted and ready to land.Jul 29 2018, 19:35
Closed by commit rABC3eba1135b26f: Pass flags down to GetSigOpCount (authored by deadalnix). · Explain WhyJul 29 2018, 21:19
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
src/
policy/
5 lines
script/
4 lines
14 lines
2 lines
test/
21 lines
6 lines

Diff 4469

View Options

src/policy/policy.cpp

Loading...
View Options

src/script/script.h

Loading...
View Options

src/script/script.cpp

Loading...
View Options

src/script/sigencoding.cpp

Loading...
View Options

src/test/sigopcount_tests.cpp

Loading...
View Options

src/validation.cpp

Loading...