dashpay / dash

Dash - Reinventing Cryptocurrency
https://www.dash.org
MIT License
1.49k stars 1.2k forks source link

backport: Merge bitcoin/bitcoin#22337 #6130

Closed vijaydasmp closed 1 week ago

vijaydasmp commented 1 month ago

bitcoin backport

github-actions[bot] commented 1 month ago

This pull request has conflicts, please rebase.

vijaydasmp commented 1 month ago

Hello @UdjinM6, @knst , @PastaPastaPasta requesting review

vijaydasmp commented 3 weeks ago

Hello @UdjinM6 , @PastaPastaPasta requesting review

UdjinM6 commented 3 weeks ago

Needs rebase to fix Check Merge Fast-Forward Only

PastaPastaPasta commented 1 week ago

For some reason you rebased this on a commit from like a month ago? can you rebase on latest develop? I like the added signature though!

Note: the rebase to https://github.com/dashpay/dash/pull/6130/commits/62b11c49e5cc16470ffb888723b60ffb1d0ff86c looks clean, commit is same, but I'd prefer not merging in from a really old based branch

vijaydasmp commented 1 week ago

rebased from latest , @UdjinM6 had approved the changes earlier , rebasing removed the approval, I will request again