Page MenuHomePhabricator
Differential D17646

wallet: avoid rescans if under the snapshot
ClosedPublic
Actions

Authored by PiRK on Thu, Feb 6, 15:11.

Details

Reviewers
Fabien
Group Reviewers
Restricted Project
Commits
rABC2069f3c76279: wallet: avoid rescans if under the snapshot
Summary

Refuse to load a wallet if it requires a rescan lower than the height of
an unvalidated snapshot we're running -- in more general terms, if we
don't have data for the blocks.

This is a backport of core#23997 and core#26282

Depends on D17645

Test Plan

ninja all check-all

Diff Detail

Event Timeline

PiRK created this revision.Thu, Feb 6, 15:11
Herald added a reviewer: Restricted Project. · View Herald TranscriptThu, Feb 6, 15:11
PiRK requested review of this revision.Thu, Feb 6, 15:11
teamcity edited the summary of this revision. (Show Details)Thu, Feb 6, 15:12
PiRK updated this revision to Diff 52557.Thu, Feb 6, 15:19
PiRK edited the summary of this revision. (Show Details)

squash with 26282 (more helpful error message)

Harbormaster completed remote builds in B32335: Diff 52554.Thu, Feb 6, 15:42
Harbormaster completed remote builds in B32338: Diff 52557.
PiRK updated this revision to Diff 52580.Sat, Feb 8, 10:33

rebase

Harbormaster completed remote builds in B32351: Diff 52580.Sat, Feb 8, 10:41
teamcity added a comment.Sat, Feb 8, 10:41
Build Bitcoin ABC Diffs / Diff Testing (build-without-wallet) failed.

Failed tests logs:

====== Bitcoin ABC functional tests: abc_p2p_getavaaddr.py ======

------- Stdout: -------
2025-02-08T10:38:53.843000Z TestFramework (INFO): Initializing test directory /work/abc-ci-builds/build-without-wallet/test/tmp/test_runner_₿₵_🏃_20250208_103852/abc_p2p_getavaaddr_5
2025-02-08T10:39:57.912000Z TestFramework.utils (ERROR): wait_until() failed. Predicate: ''''
        def test_function():
            if check_connected:
                assert self.is_connected
            return test_function_in()
'''
2025-02-08T10:39:57.912000Z TestFramework (ERROR): Assertion failed
Traceback (most recent call last):
  File "/work/test/functional/test_framework/test_framework.py", line 149, in main
    self._run_test_internal()
  File "/work/test/functional/test_framework/test_framework.py", line 139, in _run_test_internal
    self.run_test()
  File "/work/test/functional/abc_p2p_getavaaddr.py", line 554, in run_test
    self.getavaaddr_interval_test()
  File "/work/test/functional/abc_p2p_getavaaddr.py", line 173, in getavaaddr_interval_test
    requester.wait_until(requester.addr_received)
  File "/work/test/functional/test_framework/p2p.py", line 582, in wait_until
    wait_until_helper(
  File "/work/test/functional/test_framework/util.py", line 296, in wait_until_helper
    raise AssertionError(
AssertionError: Predicate ''''
        def test_function():
            if check_connected:
                assert self.is_connected
            return test_function_in()
''' not true after 60.0 seconds
2025-02-08T10:39:57.963000Z TestFramework (INFO): Stopping nodes
2025-02-08T10:39:58.114000Z TestFramework (WARNING): Not cleaning up dir /work/abc-ci-builds/build-without-wallet/test/tmp/test_runner_₿₵_🏃_20250208_103852/abc_p2p_getavaaddr_5
2025-02-08T10:39:58.114000Z TestFramework (ERROR): Test failed. Test logging available at /work/abc-ci-builds/build-without-wallet/test/tmp/test_runner_₿₵_🏃_20250208_103852/abc_p2p_getavaaddr_5/test_framework.log
2025-02-08T10:39:58.114000Z TestFramework (ERROR): 
2025-02-08T10:39:58.115000Z TestFramework (ERROR): Hint: Call /work/test/functional/combine_logs.py '/work/abc-ci-builds/build-without-wallet/test/tmp/test_runner_₿₵_🏃_20250208_103852/abc_p2p_getavaaddr_5' to consolidate all logs
2025-02-08T10:39:58.115000Z TestFramework (ERROR): 
2025-02-08T10:39:58.115000Z TestFramework (ERROR): If this failure happened unexpectedly or intermittently, please file a bug and provide a link or upload of the combined log.
2025-02-08T10:39:58.115000Z TestFramework (ERROR): https://github.com/Bitcoin-ABC/bitcoin-abc/issues
2025-02-08T10:39:58.115000Z TestFramework (ERROR):

Each failure log is accessible here:
Bitcoin ABC functional tests: abc_p2p_getavaaddr.py

teamcity added a comment.Sat, Feb 8, 10:43
Build Bitcoin ABC Diffs / Diff Testing (build-debug) failed.

Failed tests logs:

====== Bitcoin ABC functional tests: feature_assumevalid.py ======

------- Stdout: -------
2025-02-08T10:38:41.532000Z TestFramework (INFO): Initializing test directory /work/abc-ci-builds/build-debug/test/tmp/test_runner_₿₵_🏃_20250208_103630/feature_assumevalid_43
2025-02-08T10:39:47.642000Z TestFramework.utils (ERROR): wait_until() failed. Predicate: ''''
        self.wait_until(lambda: self.nodes[0].getblockcount() >= COINBASE_MATURITY + 1)
'''
2025-02-08T10:39:47.643000Z TestFramework (ERROR): Assertion failed
Traceback (most recent call last):
  File "/work/test/functional/test_framework/test_framework.py", line 149, in main
    self._run_test_internal()
  File "/work/test/functional/test_framework/test_framework.py", line 139, in _run_test_internal
    self.run_test()
  File "/work/test/functional/feature_assumevalid.py", line 158, in run_test
    self.wait_until(lambda: self.nodes[0].getblockcount() >= COINBASE_MATURITY + 1)
  File "/work/test/functional/test_framework/test_framework.py", line 871, in wait_until
    return wait_until_helper(
           ^^^^^^^^^^^^^^^^^^
  File "/work/test/functional/test_framework/util.py", line 296, in wait_until_helper
    raise AssertionError(
AssertionError: Predicate ''''
        self.wait_until(lambda: self.nodes[0].getblockcount() >= COINBASE_MATURITY + 1)
''' not true after 60.0 seconds
2025-02-08T10:39:47.695000Z TestFramework (INFO): Stopping nodes
2025-02-08T10:39:48.049000Z TestFramework (WARNING): Not cleaning up dir /work/abc-ci-builds/build-debug/test/tmp/test_runner_₿₵_🏃_20250208_103630/feature_assumevalid_43
2025-02-08T10:39:48.050000Z TestFramework (ERROR): Test failed. Test logging available at /work/abc-ci-builds/build-debug/test/tmp/test_runner_₿₵_🏃_20250208_103630/feature_assumevalid_43/test_framework.log
2025-02-08T10:39:48.050000Z TestFramework (ERROR): 
2025-02-08T10:39:48.050000Z TestFramework (ERROR): Hint: Call /work/test/functional/combine_logs.py '/work/abc-ci-builds/build-debug/test/tmp/test_runner_₿₵_🏃_20250208_103630/feature_assumevalid_43' to consolidate all logs
2025-02-08T10:39:48.050000Z TestFramework (ERROR): 
2025-02-08T10:39:48.050000Z TestFramework (ERROR): If this failure happened unexpectedly or intermittently, please file a bug and provide a link or upload of the combined log.
2025-02-08T10:39:48.050000Z TestFramework (ERROR): https://github.com/Bitcoin-ABC/bitcoin-abc/issues
2025-02-08T10:39:48.050000Z TestFramework (ERROR):

Each failure log is accessible here:
Bitcoin ABC functional tests: feature_assumevalid.py

PiRK planned changes to this revision.Sat, Feb 8, 16:46

need to investigate that CI second failure (the first one is clearly unrelated)

PiRK updated this revision to Diff 52606.Tue, Feb 11, 08:34

rebase. I'm convinced the feature_assumevalid.py failure is unrelated to this diff

Harbormaster completed remote builds in B32372: Diff 52606.Tue, Feb 11, 08:41
teamcity added a comment.Tue, Feb 11, 08:41
Build Bitcoin ABC Diffs / Diff Testing (build-without-wallet) failed.

Failed tests logs:

====== Bitcoin ABC functional tests: abc_p2p_getavaaddr.py ======

------- Stdout: -------
2025-02-11T08:38:27.907000Z TestFramework (INFO): Initializing test directory /work/abc-ci-builds/build-without-wallet/test/tmp/test_runner_₿₵_🏃_20250211_083825/abc_p2p_getavaaddr_4
2025-02-11T08:39:31.354000Z TestFramework.utils (ERROR): wait_until() failed. Predicate: ''''
        def test_function():
            if check_connected:
                assert self.is_connected
            return test_function_in()
'''
2025-02-11T08:39:31.354000Z TestFramework (ERROR): Assertion failed
Traceback (most recent call last):
  File "/work/test/functional/test_framework/test_framework.py", line 149, in main
    self._run_test_internal()
  File "/work/test/functional/test_framework/test_framework.py", line 139, in _run_test_internal
    self.run_test()
  File "/work/test/functional/abc_p2p_getavaaddr.py", line 554, in run_test
    self.getavaaddr_interval_test()
  File "/work/test/functional/abc_p2p_getavaaddr.py", line 173, in getavaaddr_interval_test
    requester.wait_until(requester.addr_received)
  File "/work/test/functional/test_framework/p2p.py", line 582, in wait_until
    wait_until_helper(
  File "/work/test/functional/test_framework/util.py", line 296, in wait_until_helper
    raise AssertionError(
AssertionError: Predicate ''''
        def test_function():
            if check_connected:
                assert self.is_connected
            return test_function_in()
''' not true after 60.0 seconds
2025-02-11T08:39:31.406000Z TestFramework (INFO): Stopping nodes
2025-02-11T08:39:31.508000Z TestFramework (WARNING): Not cleaning up dir /work/abc-ci-builds/build-without-wallet/test/tmp/test_runner_₿₵_🏃_20250211_083825/abc_p2p_getavaaddr_4
2025-02-11T08:39:31.508000Z TestFramework (ERROR): Test failed. Test logging available at /work/abc-ci-builds/build-without-wallet/test/tmp/test_runner_₿₵_🏃_20250211_083825/abc_p2p_getavaaddr_4/test_framework.log
2025-02-11T08:39:31.508000Z TestFramework (ERROR): 
2025-02-11T08:39:31.508000Z TestFramework (ERROR): Hint: Call /work/test/functional/combine_logs.py '/work/abc-ci-builds/build-without-wallet/test/tmp/test_runner_₿₵_🏃_20250211_083825/abc_p2p_getavaaddr_4' to consolidate all logs
2025-02-11T08:39:31.508000Z TestFramework (ERROR): 
2025-02-11T08:39:31.508000Z TestFramework (ERROR): If this failure happened unexpectedly or intermittently, please file a bug and provide a link or upload of the combined log.
2025-02-11T08:39:31.508000Z TestFramework (ERROR): https://github.com/Bitcoin-ABC/bitcoin-abc/issues
2025-02-11T08:39:31.508000Z TestFramework (ERROR):

Each failure log is accessible here:
Bitcoin ABC functional tests: abc_p2p_getavaaddr.py

teamcity added a comment.Tue, Feb 11, 08:44
Build Bitcoin ABC Diffs / Diff Testing (build-debug) failed.

Failed tests logs:

====== Bitcoin ABC functional tests: abc_p2p_getavaaddr.py ======

------- Stdout: -------
2025-02-11T08:38:38.445000Z TestFramework (INFO): Initializing test directory /work/abc-ci-builds/build-debug/test/tmp/test_runner_₿₵_🏃_20250211_083835/abc_p2p_getavaaddr_4
2025-02-11T08:39:46.322000Z TestFramework.utils (ERROR): wait_until() failed. Predicate: ''''
        def test_function():
            if check_connected:
                assert self.is_connected
            return test_function_in()
'''
2025-02-11T08:39:46.322000Z TestFramework (ERROR): Assertion failed
Traceback (most recent call last):
  File "/work/test/functional/test_framework/test_framework.py", line 149, in main
    self._run_test_internal()
  File "/work/test/functional/test_framework/test_framework.py", line 139, in _run_test_internal
    self.run_test()
  File "/work/test/functional/abc_p2p_getavaaddr.py", line 554, in run_test
    self.getavaaddr_interval_test()
  File "/work/test/functional/abc_p2p_getavaaddr.py", line 192, in getavaaddr_interval_test
    requester.wait_until(requester.addr_received)
  File "/work/test/functional/test_framework/p2p.py", line 582, in wait_until
    wait_until_helper(
  File "/work/test/functional/test_framework/util.py", line 296, in wait_until_helper
    raise AssertionError(
AssertionError: Predicate ''''
        def test_function():
            if check_connected:
                assert self.is_connected
            return test_function_in()
''' not true after 60.0 seconds
2025-02-11T08:39:46.374000Z TestFramework (INFO): Stopping nodes
2025-02-11T08:39:46.576000Z TestFramework (WARNING): Not cleaning up dir /work/abc-ci-builds/build-debug/test/tmp/test_runner_₿₵_🏃_20250211_083835/abc_p2p_getavaaddr_4
2025-02-11T08:39:46.576000Z TestFramework (ERROR): Test failed. Test logging available at /work/abc-ci-builds/build-debug/test/tmp/test_runner_₿₵_🏃_20250211_083835/abc_p2p_getavaaddr_4/test_framework.log
2025-02-11T08:39:46.576000Z TestFramework (ERROR): 
2025-02-11T08:39:46.576000Z TestFramework (ERROR): Hint: Call /work/test/functional/combine_logs.py '/work/abc-ci-builds/build-debug/test/tmp/test_runner_₿₵_🏃_20250211_083835/abc_p2p_getavaaddr_4' to consolidate all logs
2025-02-11T08:39:46.577000Z TestFramework (ERROR): 
2025-02-11T08:39:46.577000Z TestFramework (ERROR): If this failure happened unexpectedly or intermittently, please file a bug and provide a link or upload of the combined log.
2025-02-11T08:39:46.577000Z TestFramework (ERROR): https://github.com/Bitcoin-ABC/bitcoin-abc/issues
2025-02-11T08:39:46.577000Z TestFramework (ERROR):

Each failure log is accessible here:
Bitcoin ABC functional tests: abc_p2p_getavaaddr.py

PiRK updated this revision to Diff 52613.Tue, Feb 11, 14:04

rebase again

Harbormaster completed remote builds in B32377: Diff 52613.Tue, Feb 11, 14:21
Fabien accepted this revision.Tue, Feb 11, 14:33
This revision is now accepted and ready to land.Tue, Feb 11, 14:33
Closed by commit rABC2069f3c76279: wallet: avoid rescans if under the snapshot (authored by James O'Beirne <james.obeirne@gmail.com>, committed by PiRK). · Explain WhyTue, Feb 11, 14:43
This revision was automatically updated to reflect the committed changes.
PiRK added a commit: rABC2069f3c76279: wallet: avoid rescans if under the snapshot.

Revision Contents
Changeset List

PathSize
src/
interfaces/
3 lines
node/
3 lines
wallet/
34 lines

Diff 52606

View Options

src/interfaces/chain.h

Loading...
View Options

src/node/interfaces.cpp

Loading...
View Options

src/wallet/wallet.cpp

Loading...