Skip to content
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

Get rid of inaccurate ScriptSigArgsExpected #7387

Merged
merged 1 commit into from Jan 22, 2016
Merged

Conversation

@sipa
Copy link
Member

sipa commented Jan 21, 2016

ScriptSigArgsExpected was originally introduced to avoid a form of malleability (stuffing scriptSigs with superfluous arguments). This is no longer needed since the SCRIPT_VERIFY_CLEANSTACK and SCRIPT_VERIFY_SIGPUSHONLY cover all its use case more accurately and more efficiently.

@dcousens
Copy link
Contributor

dcousens commented Jan 21, 2016

utACK 5bfec00

@sipa sipa force-pushed the sipa:inaccscriptargs branch to 52b29dc Jan 21, 2016
@sipa
Copy link
Member Author

sipa commented Jan 21, 2016

@dcousens Some tests were failing, I updated the commit.

@dcousens

This comment has been minimized.

Copy link

dcousens commented on src/test/script_P2SH_tests.cpp in 52b29dc Jan 21, 2016

should this fail still?

This comment has been minimized.

Copy link
Owner Author

sipa replied Jan 21, 2016

?

This comment has been minimized.

Copy link

dcousens replied Jan 21, 2016

would this relax the rules a in regards to the exact templates that people might use?

This comment has been minimized.

Copy link
Owner Author

sipa replied Jan 21, 2016

No, it doesn't change anything. It's just enforced by a script verification flag during normal script execution rather than in the IsStandard check.

@laanwj laanwj added this to the 0.12.0 milestone Jan 21, 2016
@laanwj
Copy link
Member

laanwj commented Jan 21, 2016

utACK

@dcousens
Copy link
Contributor

dcousens commented Jan 21, 2016

re-ACK 52b29dc

@gmaxwell
Copy link
Contributor

gmaxwell commented Jan 21, 2016

ACK 52b29dc

Constructed effectively the same patch on my own.

@laanwj laanwj merged commit 52b29dc into bitcoin:0.12 Jan 22, 2016
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
laanwj added a commit that referenced this pull request Jan 22, 2016
52b29dc Get rid of inaccurate ScriptSigArgsExpected (Pieter Wuille)
@laanwj
Copy link
Member

laanwj commented Feb 2, 2016

This was cherry-picked into master via 5d74309 (#7453)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.