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

backport: Merge bitcoin#23142, (partial) bitcoin-core/gui#409, 23333, 23755, (partial) 22981 #6264

Merged
merged 4 commits into from
Sep 24, 2024

Conversation

vijaydasmp
Copy link

@vijaydasmp vijaydasmp commented Sep 10, 2024

backports from bitcoin

@vijaydasmp vijaydasmp changed the title backport : Merge bitcoin#23142, 23156 backport : Merge bitcoin#23142 Sep 11, 2024
@vijaydasmp vijaydasmp changed the title backport : Merge bitcoin#23142 backport : Merge bitcoin#23142, bitcoin-core/gui#409, 23333, 23755, 22981 Sep 11, 2024
@vijaydasmp vijaydasmp changed the title backport : Merge bitcoin#23142, bitcoin-core/gui#409, 23333, 23755, 22981 backport: Merge bitcoin#23142, bitcoin-core/gui#409, 23333, 23755, 22981 Sep 11, 2024
@vijaydasmp vijaydasmp marked this pull request as ready for review September 11, 2024 10:01
@vijaydasmp
Copy link
Author

Hello @UdjinM6 requesting review

src/wallet/walletdb.cpp Show resolved Hide resolved
src/qt/walletcontroller.cpp Show resolved Hide resolved
src/test/validation_block_tests.cpp Show resolved Hide resolved
laanwj and others added 4 commits September 12, 2024 18:57
0ab4c3b Return false on corrupt tx rather than asserting (Samuel Dobson)

Pull request description:

  Takes up bitcoin#19793

  Rather than asserting, we log an error and return CORRUPT so that the user is informed. This type of error isn't critical so it isn't worth `assert`ing.

ACKs for top commit:
  achow101:
    ACK 0ab4c3b
  laanwj:
    Code review ACK 0ab4c3b
  ryanofsky:
    Code review ACK 0ab4c3b. There may be room for more improvements later like better error messages or easier recovery options, but changing from an assert to an error seems like a clear improvement, and this seems to avoid all the pitfalls of the last PR that tried this.

Tree-SHA512: 4a1a412e7c473d176c4e09123b85f390a6b0ea195e78d28ebd50b13814b7852f8225a172511a2efb6affb555b11bd4e667c19eb8c78b060c5444b62f0fae5f7a
…ing window

01bff8f qt: Fix WalletControllerActivity progress dialog title (Shashwat)

Pull request description:

  Throughout the GUI, the title of the window, tells about the purpose of the window. This was not true for the title of wallet loading wallet.
  This PR fixes this issue by renaming the wallet loading window title to 'Open Wallet'

  Changes introduced in this PR (Runned Bitcoin-GUI on signet network)

  |Master|PR|
  |---|---|
  |![Screenshot from 2021-08-24 00-02-18](https://user-images.githubusercontent.com/85434418/130500309-2f0af2c9-55f0-4609-a92b-3156800fa92e.png)|![Screenshot from 2021-09-07 18-19-10](https://user-images.githubusercontent.com/85434418/132351394-1ee4a36c-3ba9-4d1a-a8f3-f17804fb856a.png)|

ACKs for top commit:
  jarolrod:
    ACK 01bff8f
  hebasto:
    ACK 01bff8f, tested on Linux Mint 20.2 (Qt 5.12.8).

Tree-SHA512: cd21c40752eb1c0afb5ec61b8a40e900bc3aa05749963f7957ece6024e4957f5bb37e0eb4f95aac488f5e08aea51fe13b023b05d8302a08c88dcc6790410ba64
fa24a3d rpc: Quote user supplied strings in error messages (MarcoFalke)

Pull request description:

  I can't see a downside doing this and this fixes a fuzzing crash

  Background:

  This is a follow-up to commit 926fc2a, which introduced the "starts_with-hack". Maybe an alternative to the hack would be to assign a unique error code to internal bugs? However, I think this can be done in an separate pull request and the changes here make sense even on their own.

ACKs for top commit:
  fanquake:
    ACK fa24a3d - to fix the fuzzers.

Tree-SHA512: d998626406a64396a037a6d1fce22fce3dadb7567c2f9638e450ebe8fb8ae77d134e15dd02555326732208f698d77b0028bc62be9ceee9c43282b61fe95fccbd
fac4947 doc: Fix incorrect C++ named args (MarcoFalke)

Pull request description:

  Incorrect named args are source of bugs, like bitcoin#22979.

  Fix that by correcting them and adjust the format, so that clang-tidy can check it.

ACKs for top commit:
  fanquake:
    ACK fac4947 - `run-clang-tidy` works for me now.

Tree-SHA512: 2694e17a1586394baf30bbc479a913e4bad361221e8470b8739caf30aacea736befc73820f3fe56f6207d9f5d969323278d43a647f58c3497e8e44cad79f8934
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin#23142, bitcoin-core/gui#409, 23333, 23755, 22981 backport: Merge bitcoin#23142, (partial) bitcoin-core/gui#409, 23333, 23755, (partial) 22981 Sep 12, 2024
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 71689fe

@vijaydasmp
Copy link
Author

Hello @PastaPastaPasta requesting review

@vijaydasmp
Copy link
Author

Hello @PastaPastaPasta, requesting review

@UdjinM6 UdjinM6 added this to the 21.2 milestone Sep 22, 2024
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 71689fe

@PastaPastaPasta PastaPastaPasta merged commit 6d61524 into dashpay:develop Sep 24, 2024
36 checks passed
Sign up for free to 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.

7 participants