Skip to content

backport: Merge bitcoin#22619, 22593 #6071

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
Merged
PastaPastaPasta merged 2 commits into from
Aug 28, 2024
Merged

backport: Merge bitcoin#22619, 22593 #6071

PastaPastaPasta merged 2 commits into from
Aug 28, 2024

Conversation

@vijaydasmp
Copy link

@vijaydasmp vijaydasmp commented Jun 21, 2024

bitcoin backports

@vijaydasmp vijaydasmp changed the title backport : backport : Merge bitcoin#22603,22619, 21500, 22337, 21800 Jun 21, 2024
@vijaydasmp vijaydasmp changed the title backport : Merge bitcoin#22603,22619, 21500, 22337, 21800 backport: Merge bitcoin#22603,22619, 21500, 22337, 21800 Jun 21, 2024
@vijaydasmp vijaydasmp force-pushed the bp23_98 branch 3 times, most recently from d1bf903 to 969a9ed Compare June 22, 2024 01:27
@github-actions
Copy link

github-actions bot commented Jul 6, 2024

This pull request has conflicts, please rebase.

@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin#22603,22619, 21500, 22337, 21800 backport: Merge bitcoin#22603,22619, 21500, 22337, 21800, 21679 Jul 6, 2024
@vijaydasmp vijaydasmp force-pushed the bp23_98 branch 4 times, most recently from 38bf780 to bb5cfcc Compare July 7, 2024 07:12
@vijaydasmp vijaydasmp force-pushed the bp23_98 branch 6 times, most recently from e5bc737 to 0020e72 Compare July 19, 2024 16:36
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin#22603,22619, 21500, 22337, 21800, 21679 backport: Merge bitcoin#22603,22619 Jul 20, 2024
@vijaydasmp vijaydasmp marked this pull request as ready for review July 21, 2024 03:06
@vijaydasmp
Copy link
Author

vijaydasmp commented Jul 22, 2024

Hello @UdjinM6 , @knst , @PastaPastaPasta for review

@UdjinM6 UdjinM6 mentioned this pull request Jul 22, 2024
Merged
5 tasks
UdjinM6
UdjinM6 requested changes Jul 22, 2024
View reviewed changes
Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

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

pls see UdjinM6@35b39cf

knst
knst reviewed Jul 23, 2024
View reviewed changes
doc/release-notes-22570.md Outdated
Copy link
Collaborator

@knst knst Jul 23, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

22570 has been already released with version Dash Core v20: #5574
without release notes, too late to update it now.

DNM 22603

@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin#22603,22619 backport: Merge bitcoin#22619 Jul 23, 2024
UdjinM6
UdjinM6 previously approved these changes Aug 5, 2024
View reviewed changes
Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

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

utACK 26ec2e4a14045291c96c7e2dc04db9c318599977

@github-actions
Copy link

github-actions bot commented Aug 5, 2024

This pull request has conflicts, please rebase.

@vijaydasmp
Copy link
Author

vijaydasmp commented Aug 9, 2024

utACK 26ec2e4

had to rebase , requesting re-review

@vijaydasmp vijaydasmp requested a review from UdjinM6 August 9, 2024 03:31
@vijaydasmp vijaydasmp marked this pull request as draft August 10, 2024 12:52
@vijaydasmp vijaydasmp force-pushed the bp23_98 branch 2 times, most recently from 86fb13f to 431a82f Compare August 17, 2024 02:30
@vijaydasmp vijaydasmp marked this pull request as ready for review August 17, 2024 02:33
@vijaydasmp vijaydasmp force-pushed the bp23_98 branch 2 times, most recently from 16c39fe to f9bfc35 Compare August 21, 2024 00:40
@vijaydasmp vijaydasmp requested review from knst and kwvg August 21, 2024 07:14
UdjinM6
UdjinM6 requested changes Aug 21, 2024
View reviewed changes
@vijaydasmp vijaydasmp requested a review from UdjinM6 August 22, 2024 11:00
UdjinM6
UdjinM6 approved these changes Aug 22, 2024
View reviewed changes
Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

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

utACK a6ec9bcc3793e0579ee039a204c6d971cfbc797e

@vijaydasmp
Copy link
Author

vijaydasmp commented Aug 22, 2024

Hello @PastaPastaPasta, requesting review

MarcoFalke and others added 2 commits August 25, 2024 07:55
@vijaydasmp
Merge bitcoin#22619: test: refactor: use consistent bytes <-> hex-str…
cbc4c63 
…ing conversion in functional test framework

5a1bef6 test: refactor: remove binascii from test_framework (Zero-1729)

Pull request description:

  This PR continues the work started in PR bitcoin#22593, regarding using the `bytes` built-in module. In this PR specifically, instances of `binascii`'s methods `hexlify`, `unhexlify`,  and `a2b_hex` have been replaced with the build-in `bytes` module's `hex` and `fromhex` methods where appropriate to make bytes <-> hex-string conversions consistent across the functional test files and test_framework.

  Additionally, certain changes made are based on the following assumption:

  ```
  bytes.hex(data) == binascii.hexlify(data).decode()
  bytes.hex(data).encode() == binascii.hexlify(data)
  ```

  Ran the functional tests to ensure behaviour is still consistent and changes didn't break existing tests.

  closes bitcoin#22605

ACKs for top commit:
  theStack:
    Code-review ACK 5a1bef6 🔢

Tree-SHA512: 8f28076cf0580a0d02a156f3e1e94c9badd3d41c3fbdfb2b87cd8a761dde2c94faa5f4c448d6747b1ccc9111c3ef1a1d7b42a11c806b241fa0410b7529e2445f
Signed-off-by: Vijay <[email protected]>
@kwvg @vijaydasmp
Merge bitcoin#22593: remove hex_str_to_bytes helper
ad840ec 
Signed-off-by: Vijay <[email protected]>
knst
knst approved these changes Aug 27, 2024
View reviewed changes
Copy link
Collaborator

@knst knst left a comment

Choose a reason for hiding this comment

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

utACK ad840ec

kwvg
kwvg approved these changes Aug 27, 2024
View reviewed changes
Copy link
Collaborator

@kwvg kwvg left a comment

Choose a reason for hiding this comment

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

utACK ad840ec

@PastaPastaPasta PastaPastaPasta merged commit b9a2f08 into dashpay:develop Aug 28, 2024
@UdjinM6 UdjinM6 added this to the 21.2 milestone Aug 30, 2024
@UdjinM6 UdjinM6 modified the milestones: 21.2, 22 Oct 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@knst knst knst approved these changes

@UdjinM6 UdjinM6 UdjinM6 approved these changes

@kwvg kwvg kwvg approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

22

Development

Successfully merging this pull request may close these issues.

5 participants

@vijaydasmp @knst @UdjinM6 @kwvg @PastaPastaPasta