Fix ZapSelectTx to sync wallet spends
ClosedPublic
Actions

Authored by PiRK on Aug 31 2021, 08:09.

Details

Reviewers

Fabien

Group Reviewers

Restricted Project

Commits

rABC392ddaff12ab: Fix ZapSelectTx to sync wallet spends

Summary

PR18850:

The motivation is mapWallet is used, in many places, without check (method at expects that hash presents) but that's not exactly true when mapTxSpends and mapWallet are out of sync. That can lead to crash/data loss in wallet.

PR19493 fixes clang build on Mac OS

This is a backport of core#18850 and core#19493

Test Plan

ninja all check-all

Diff Detail

Repository

rABC Bitcoin ABC

Branch

pr18850

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 16484
Build 32831: Build Diff	build-diff · lint-circular-dependencies · build-without-wallet · build-clang-tidy · build-debug · build-clang
Build 32830: arc lint + arc unit

Event Timeline

PiRK created this revision.Aug 31 2021, 08:09

Herald added a reviewer: Restricted Project. · View Herald TranscriptAug 31 2021, 08:09

PiRK requested review of this revision.Aug 31 2021, 08:09

teamcity edited the summary of this revision. (Show Details)Aug 31 2021, 08:09

Harbormaster completed remote builds in B16480: Diff 29671.Aug 31 2021, 08:24

Build Bitcoin ABC Diffs / Diff Testing (build-diff) failed.

Tail of the build log:

[0m[0;32mrpc_psbt.py                             | ✓ Passed  | 34 s
[0m[0;32mrpc_rawtransaction.py                   | ✓ Passed  | 13 s
[0m[0;32mrpc_scantxoutset.py                     | ✓ Passed  | 3 s
[0m[0;32mrpc_setban.py                           | ✓ Passed  | 2 s
[0m[0;32mrpc_signmessage.py                      | ✓ Passed  | 1 s
[0m[0;32mrpc_signrawtransaction.py               | ✓ Passed  | 2 s
[0m[0;32mrpc_txoutproof.py                       | ✓ Passed  | 2 s
[0m[0;32mrpc_uptime.py                           | ✓ Passed  | 1 s
[0m[0;32mrpc_users.py                            | ✓ Passed  | 5 s
[0m[0;32mrpc_whitelist.py                        | ✓ Passed  | 1 s
[0m[0;32mtool_wallet.py                          | ✓ Passed  | 4 s
[0m[0;32mwallet_abandonconflict.py               | ✓ Passed  | 7 s
[0m[0;32mwallet_address_types.py                 | ✓ Passed  | 15 s
[0m[0;32mwallet_avoidreuse.py                    | ✓ Passed  | 5 s
[0m[0;32mwallet_backup.py                        | ✓ Passed  | 31 s
[0m[0;32mwallet_balance.py                       | ✓ Passed  | 10 s
[0m[0;32mwallet_basic.py                         | ✓ Passed  | 32 s
[0m[0;32mwallet_coinbase_category.py             | ✓ Passed  | 1 s
[0m[0;32mwallet_create_tx.py                     | ✓ Passed  | 5 s
[0m[0;32mwallet_createwallet.py                  | ✓ Passed  | 2 s
[0m[0;32mwallet_createwallet.py --usecli         | ✓ Passed  | 2 s
[0m[0;32mwallet_descriptor.py                    | ✓ Passed  | 6 s
[0m[0;32mwallet_disable.py                       | ✓ Passed  | 1 s
[0m[0;32mwallet_dump.py                          | ✓ Passed  | 4 s
[0m[0;32mwallet_encryption.py                    | ✓ Passed  | 5 s
[0m[0;32mwallet_groups.py                        | ✓ Passed  | 26 s
[0m[0;32mwallet_hd.py                            | ✓ Passed  | 6 s
[0m[0;32mwallet_import_rescan.py                 | ✓ Passed  | 5 s
[0m[0;32mwallet_import_with_label.py             | ✓ Passed  | 1 s
[0m[0;32mwallet_importdescriptors.py             | ✓ Passed  | 4 s
[0m[0;32mwallet_importmulti.py                   | ✓ Passed  | 3 s
[0m[0;32mwallet_importprunedfunds.py             | ✓ Passed  | 2 s
[0m[0;32mwallet_keypool.py                       | ✓ Passed  | 3 s
[0m[0;32mwallet_keypool_topup.py                 | ✓ Passed  | 2 s
[0m[0;32mwallet_labels.py                        | ✓ Passed  | 1 s
[0m[0;32mwallet_listreceivedby.py                | ✓ Passed  | 26 s
[0m[0;32mwallet_listsinceblock.py                | ✓ Passed  | 3 s
[0m[0;32mwallet_listtransactions.py              | ✓ Passed  | 6 s
[0m[0;32mwallet_multiwallet.py                   | ✓ Passed  | 42 s
[0m[0;32mwallet_multiwallet.py --usecli          | ✓ Passed  | 15 s
[0m[0;32mwallet_reorgsrestore.py                 | ✓ Passed  | 3 s
[0m[0;32mwallet_resendwallettransactions.py      | ✓ Passed  | 5 s
[0m[0;32mwallet_txn_clone.py                     | ✓ Passed  | 1 s
[0m[0;32mwallet_txn_clone.py --mineblock         | ✓ Passed  | 3 s
[0m[0;32mwallet_txn_doublespend.py               | ✓ Passed  | 1 s
[0m[0;32mwallet_txn_doublespend.py --mineblock   | ✓ Passed  | 3 s
[0m[0;32mwallet_watchonly.py                     | ✓ Passed  | 1 s
[0m[0;32mwallet_watchonly.py --usecli            | ✓ Passed  | 1 s
[0m[0;32mwallet_zapwallettxes.py                 | ✓ Passed  | 4 s
[0m[1m
ALL                                     | ✓ Passed  | 984 s (accumulated) 
[0mRuntime: 197 s

----------------------------------------------------------------------
Ran 5 tests in 0.001s

OK

ninja: build stopped: cannot make progress due to previous errors.
Build build-diff failed with exit code 1