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

fix(qt): allow refreshing wallet data without crashing #6456

Merged
merged 1 commit into from
Dec 6, 2024
Merged

fix(qt): allow refreshing wallet data without crashing #6456

merged 1 commit into from
Dec 6, 2024

Conversation

UdjinM6
Copy link

@UdjinM6 UdjinM6 commented Dec 6, 2024 •
edited
Loading

Issue being fixed or feature implemented

We re-use refreshWallet method to optimise loading for huge wallets #5453.
However gui121 backport (via 25f87b9) added a condition that prevents this logic. Fix it by allowing explicit wallet refresh (force=true).

What was done?

How Has This Been Tested?

Open a wallet with 10k+ txes, do rescanblockchain via rpc console

Breaking Changes

Checklist:

  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated relevant unit/integration/functional/e2e tests
  • I have made corresponding changes to the documentation
  • I have assigned this pull request to a milestone (for repository code-owners and collaborators only)

@UdjinM6 UdjinM6 added this to the 22 milestone Dec 6, 2024
@UdjinM6 UdjinM6 marked this pull request as draft December 6, 2024 20:54
@UdjinM6 UdjinM6 force-pushed the fix_refresh_crash branch 3 times, most recently from 3f27e98 to ec55834 Compare December 6, 2024 21:35
@UdjinM6 UdjinM6 marked this pull request as ready for review December 6, 2024 21:47
PastaPastaPasta
PastaPastaPasta approved these changes Dec 6, 2024
View reviewed changes
Copy link
Member

@PastaPastaPasta PastaPastaPasta left a comment

Choose a reason for hiding this comment

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

utACK d296005;

Unable to ensure this bug doesn't re-appear, as it's not super reproducible, however, loaded up the testnet faucet wallet, and it doesn't seem to have any regressions

@UdjinM6
Copy link
Author

UdjinM6 commented Dec 6, 2024

Updated PR description with steps to reproduce the issue

Open a wallet with 10k+ txes, do rescanblockchain via rpc console

@PastaPastaPasta
Copy link
Member

Reproduced crash again without this patch, then with it works :)

@PastaPastaPasta PastaPastaPasta merged commit 96c97bb into dashpay:develop Dec 6, 2024
19 of 20 checks passed
PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request Dec 6, 2024
@PastaPastaPasta
Merge dashpay#6456: fix(qt): allow refreshing wallet data without cra…
fa29ed5 
…shing

d296005 fix(qt): allow refreshing wallet data without crashing (UdjinM6)

Pull request description:

  ## Issue being fixed or feature implemented
  We re-use `refreshWallet` method to optimise loading for huge wallets dashpay#5453.
  However gui121 backport (via 25f87b9) added a condition that prevents this logic. Fix it by allowing explicit wallet refresh (force=true).

  ## What was done?

  ## How Has This Been Tested?
  Open a wallet with 10k+ txes, do `rescanblockchain` via rpc console

  ## Breaking Changes

  ## Checklist:
  - [ ] I have performed a self-review of my own code
  - [ ] I have commented my code, particularly in hard-to-understand areas
  - [ ] I have added or updated relevant unit/integration/functional/e2e tests
  - [ ] I have made corresponding changes to the documentation
  - [ ] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  PastaPastaPasta:
    utACK d296005;

Tree-SHA512: d308b3fe9c4fbbfbf2e2339aa14c825aa6f69c72d1f04dab7a14dc1c8721138beca47c7b3801db9782d6cecf2c54023a19a6d22e04b84615f9bddb0b8ec1696c
PastaPastaPasta added a commit that referenced this pull request Dec 6, 2024
@PastaPastaPasta
Merge #6454: [v22.0.x] backport: 22.0.0 rc.4 backports
9d3f22a 
fa29ed5 Merge #6456: fix(qt): allow refreshing wallet data without crashing (pasta)
758cd64 Merge #6452: fix: store ready queues on the mixing masternode (pasta)
395447b Merge #6451: depends: update 'src/dashbls' to dashpay/bls-signatures@7e747e8a as 62fa665 (pasta)

Pull request description:

  ## Issue being fixed or feature implemented
  batch of backports to go into rc.4

  ## What was done?
  Bls library updated to compile on freebsd, fix for mixing

  ## How Has This Been Tested?

  ## Breaking Changes

  ## Checklist:
    _Go over all the following points, and put an `x` in all the boxes that apply._
  - [ ] I have performed a self-review of my own code
  - [ ] I have commented my code, particularly in hard-to-understand areas
  - [ ] I have added or updated relevant unit/integration/functional/e2e tests
  - [ ] I have made corresponding changes to the documentation
  - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  UdjinM6:
    utACK fa29ed5

Tree-SHA512: 6a050bca13ca2e5324a6a8a7966d2d6aa3c0c97ee3c884aa35102f949dfef62e976d053cd05a549908c30e8bb6a81d996a82181852841809d8959ca78c96e823
PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request Dec 14, 2024
@PastaPastaPasta
Merge dashpay#6484: chore: Merge master 22.0.0 back into develop
779e429 
1c7bfcb chore: set release true (pasta)
c90339e Merge dashpay#6459: docs: add release notes for v22.0.0 (pasta)
a6f1fc5 Merge dashpay#6475: chore: bumped chain assumed sizes based on latest usage (pasta)
d7cd9f1 Merge dashpay#6464: chore: update man pages for v22 (pasta)
212f91c Merge dashpay#6461: docs: update supported versions in SECURITY.md (pasta)
9a8b685 Merge dashpay#6460: chore: Translations 2024-12 (pasta)
2f71f4d Merge dashpay#6458: chore: bump MIN_MASTERNODE_PROTO_VERSION to latest proto (pasta)
fa29ed5 Merge dashpay#6456: fix(qt): allow refreshing wallet data without crashing (pasta)
758cd64 Merge dashpay#6452: fix: store ready queues on the mixing masternode (pasta)
395447b Merge dashpay#6451: depends: update 'src/dashbls' to dashpay/bls-signatures@7e747e8a as 62fa665 (pasta)
c7b0d80 Merge dashpay#6441: fix: hold wallet shared pointer in CJ Manager/Sessions to prevent concurrent unload (pasta)
c074e09 Merge dashpay#6444: fix: add platform transfer to "most common" filter (pasta)
cb04114 Merge dashpay#6442: fix: coin selection with `include_unsafe` option should respect `nCoinType` (pasta)
db5b53a Merge dashpay#6434: fix: early EHF and buried EHF are indistinguish (pasta)
8b88ff7 Merge dashpay#6414: chore: bump seeds for v22 (pasta)
02ad523 Merge dashpay#6411: chore: update nMinimumChainWork, defaultAssumeValid, checkpointData, chainTxData for mainnet and testnet (pasta)
3bbcd3d Merge dashpay#6393: docs: mention building for some HOSTs only in `release-process.md` (pasta)
18f636f Merge dashpay#6426: fix: respect SENDDSQUEUE message, move DSQ relay into net processing / peerman (pasta)
9fed456 Merge dashpay#6407: fix: dataraces (pasta)
86105da Merge dashpay#6408: refactor: removed pre-MN_RR logic of validation of CL (pasta)
a1f7e96 Merge dashpay#6406: ci: use `actions/cache` to manage depends cache (pasta)
90a3807 Merge dashpay#6402: ci: cache built (pasta)
66f6787 Merge dashpay#6401: ci: deduplicate depends building (pasta)
7ca5663 Merge dashpay#6397: ci: add powerpc64 to GH Guix job matrix (pasta)

Pull request description:

  ## Issue being fixed or feature implemented

  ## What was done?
  Suppressed changes from 1c7bfcb and resolved merge conflicts.

  ```
  Auto-merging .github/workflows/build.yml
  Auto-merging configure.ac
  Auto-merging src/chainparams.cpp
  Auto-merging src/coinjoin/client.cpp
  CONFLICT (content): Merge conflict in src/coinjoin/client.cpp
  Auto-merging src/coinjoin/client.h
  CONFLICT (content): Merge conflict in src/coinjoin/client.h
  Auto-merging src/coinjoin/util.cpp
  CONFLICT (content): Merge conflict in src/coinjoin/util.cpp
  Auto-merging src/coinjoin/util.h
  CONFLICT (content): Merge conflict in src/coinjoin/util.h
  Auto-merging src/evo/specialtxman.cpp
  Auto-merging src/init.cpp
  Auto-merging src/net_processing.cpp
  CONFLICT (content): Merge conflict in src/net_processing.cpp
  Auto-merging src/net_processing.h
  Auto-merging src/qt/transactiontablemodel.cpp
  Auto-merging src/wallet/wallet.cpp
  Auto-merging src/wallet/wallet.h
  CONFLICT (content): Merge conflict in src/wallet/wallet.h
  Auto-merging test/functional/feature_llmq_chainlocks.py
  CONFLICT (content): Merge conflict in test/functional/feature_llmq_chainlocks.py
  ```

  ## How Has This Been Tested?

  ## Breaking Changes

  ## Checklist:
  - [ ] I have performed a self-review of my own code
  - [ ] I have commented my code, particularly in hard-to-understand areas
  - [ ] I have added or updated relevant unit/integration/functional/e2e tests
  - [ ] I have made corresponding changes to the documentation
  - [ ] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  PastaPastaPasta:
    utACK d108579; no diff to develop

Tree-SHA512: 3f063011224880fee35edb04ce265dff33a52273c3d45ef1dbcebcecb22c25d8ad7c91b83514f36142716a6fbd0ddd3a8a3f2a9b59ce78ce975bbce69a2a13b5
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PastaPastaPasta PastaPastaPasta PastaPastaPasta 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.
2 participants
@UdjinM6 @PastaPastaPasta