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.

Sign up for GitHub

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

Jump to bottom

[Script] Optimize and Cleanup CScript::FindAndDelete #1249

Merged
merged 1 commit into from
Feb 17, 2020
Merged

[Script] Optimize and Cleanup CScript::FindAndDelete #1249

merged 1 commit into from
Feb 17, 2020

Conversation

akshaynexus
Copy link

Backport of bitcoin#7907

@akshaynexus
Copy link
Author

Has some errors, will update here once fixed

random-zebra
random-zebra reviewed Jan 15, 2020
View reviewed changes
Copy link

@random-zebra random-zebra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd suggest backporting also Bitcoin's PR 5264, which seems to be only partially included here.

src/core_io.h Outdated Show resolved Hide resolved
src/script/interpreter.h Outdated Show resolved Hide resolved
@random-zebra random-zebra added this to the 4.1.0 milestone Jan 15, 2020
@random-zebra
Copy link

@akshaynexus are you still working on this one?

@akshaynexus
Copy link
Author

Yes,I'll update it later today

@random-zebra
Copy link

Removed last commit and script_GetScriptAsm test in the first one (SCriptToAsmStr is not needed here and can be added back if/when bitcoin-5264 is ported).
Squashed and rebased on master.

@random-zebra random-zebra changed the title Optimize and Cleanup CScript::FindAndDelete [Script] Optimize and Cleanup CScript::FindAndDelete Feb 13, 2020
furszy
furszy approved these changes Feb 17, 2020
View reviewed changes
Copy link

@furszy furszy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 769cb13.

Mrs-X
Mrs-X approved these changes Feb 17, 2020
View reviewed changes
Copy link

@Mrs-X Mrs-X left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK 769cb13

random-zebra
random-zebra approved these changes Feb 17, 2020
View reviewed changes
Copy link

@random-zebra random-zebra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 769cb13 and merging...

random-zebra added a commit that referenced this pull request Feb 17, 2020
@random-zebra
Merge #1249: [Script] Optimize and Cleanup CScript::FindAndDelete
fbcc530 
769cb13 Optimize and Cleanup CScript::FindAndDelete (Akshay)

Pull request description:

  Backport of bitcoin#7907

ACKs for top commit:
  furszy:
    ACK 769cb13.
  Mrs-X:
    utACK 769cb13
  random-zebra:
    ACK 769cb13 and merging...

Tree-SHA512: 72a1335c1dad832806bacc0bd6fd8882180841a568d2ce784812ed9179050c22659dffa184ba5f53a873a801f6f6157dbf2da9f5c8d1a958a39e7592b1f1eaed
@random-zebra random-zebra merged commit 769cb13 into PIVX-Project:master Feb 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mrs-X Mrs-X Mrs-X approved these changes

@random-zebra random-zebra random-zebra approved these changes

@furszy furszy furszy approved these changes

@Fuzzbawls Fuzzbawls Awaiting requested review from Fuzzbawls

Assignees

@random-zebra random-zebra

Labels
Upstream Validation
Projects
None yet
Milestone
4.1.0
Development

Successfully merging this pull request may close these issues.
4 participants
@akshaynexus @random-zebra @furszy @Mrs-X