Skip to content

backport: Merge bitcoin#22619, 22593 - #6071

Merged
PastaPastaPasta merged 2 commits into
dashpay:developfrom
vijaydasmp:bp23_98
Aug 28, 2024
Merged

backport: Merge bitcoin#22619, 22593#6071
PastaPastaPasta merged 2 commits into
dashpay:developfrom
vijaydasmp:bp23_98

Conversation

@vijaydasmp

Copy link
Copy Markdown

bitcoin backports

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

Copy link
Copy Markdown

This pull request has conflicts, please rebase.

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

Copy link
Copy Markdown
Author

Hello @UdjinM6 , @knst , @PastaPastaPasta for review

@UdjinM6UdjinM6 left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Comment threaddoc/release-notes-22570.md Outdated

@knstknstJul 23, 2024

Copy link
Copy Markdown
Collaborator

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

@vijaydasmpvijaydasmp changed the title backport: Merge bitcoin#22603,22619backport: Merge bitcoin#22619Jul 23, 2024
UdjinM6
UdjinM6 previously approved these changes Aug 5, 2024

@UdjinM6UdjinM6 left a comment

Copy link
Copy Markdown

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
Copy Markdown

This pull request has conflicts, please rebase.

@vijaydasmp

Copy link
Copy Markdown
Author

utACK 26ec2e4

had to rebase , requesting re-review

@vijaydasmp
vijaydasmp requested a review from UdjinM6August 9, 2024 03:31
@vijaydasmp
vijaydasmp marked this pull request as draft August 10, 2024 12:52
@vijaydasmp
vijaydasmpforce-pushed the bp23_98 branch 2 times, most recently from 86fb13f to 431a82fCompareAugust 17, 2024 02:30
@vijaydasmp
vijaydasmp marked this pull request as ready for review August 17, 2024 02:33
@vijaydasmp
vijaydasmpforce-pushed the bp23_98 branch 2 times, most recently from 16c39fe to f9bfc35CompareAugust 21, 2024 00:40
@vijaydasmp
vijaydasmp requested review from knst and kwvgAugust 21, 2024 07:14
Comment threadtest/functional/feature_asset_locks.py Outdated
Comment threadtest/functional/rpc_addresses_deprecation.py Outdated

@UdjinM6UdjinM6 left a comment

Copy link
Copy Markdown

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
Copy Markdown
Author

Hello @PastaPastaPasta, requesting review

MarcoFalkeand others added 2 commits August 25, 2024 07:55
…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.
closesbitcoin#22605
ACKs for top commit:
theStack:
Code-review ACK 5a1bef6 🔢
Tree-SHA512: 8f28076cf0580a0d02a156f3e1e94c9badd3d41c3fbdfb2b87cd8a761dde2c94faa5f4c448d6747b1ccc9111c3ef1a1d7b42a11c806b241fa0410b7529e2445f
Signed-off-by: Vijay <vijaydas.mp@gmail.com>
Signed-off-by: Vijay <vijaydas.mp@gmail.com>

@knstknst left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

utACK ad840ec

@kwvgkwvg left a comment

Copy link
Copy Markdown
Collaborator

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:developAug 28, 2024
@UdjinM6UdjinM6 added this to the 21.2 milestone Aug 30, 2024
@UdjinM6UdjinM6 modified the milestones: 21.2, 22Oct 29, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@vijaydasmp@knst@UdjinM6@kwvg@PastaPastaPasta