refactor: move CAddress-without-nTime logic to net_processing
ClosedPublic
Actions

Authored by PiRK on Nov 8 2023, 08:08.

Details

Reviewers

Fabien

Group Reviewers

Restricted Project

Commits

rABCb9b72a7667d2: refactor: move CAddress-without-nTime logic to net_processing

Summary

Historically, the VERSION message contains an "addrMe" and an "addrYou". As
these are sent before version negotiation is complete, the protocol version is
INIT_PROTO_VERSION (209), and in that protocol, CAddress is serialized without
nTime.

This is in fact the only situation left where a CAddress is (de)serialized
without nTime. As it's such a simple structure (CService for ip/port + uint64_t
for nServices), just inline that structure in the few places where it occurs,
and remove the logic for dealing with missing nTime from CAddress.

This is a backport of core#20541
with a minor net_tests.cpp change from core#20196 (backported out of sequence in D14690)

Depends on D14752

Test Plan

ninja all check-all

Diff Detail

Repository

rABC Bitcoin ABC

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

PiRK created this revision.Nov 8 2023, 08:08

Herald added a reviewer: Restricted Project. · View Herald TranscriptNov 8 2023, 08:08

PiRK requested review of this revision.Nov 8 2023, 08:08

teamcity edited the summary of this revision. (Show Details)Nov 8 2023, 08:08

Harbormaster completed remote builds in B25560: Diff 42985.Nov 8 2023, 08:27

Fabien accepted this revision.Nov 8 2023, 10:08

This revision is now accepted and ready to land.Nov 8 2023, 10:08

PiRK mentioned this in D14746: [tests] Connect peer in outbound_slow_chain_eviction by sending p2p messages.Nov 8 2023, 10:17

Closed by commit rABCb9b72a7667d2: refactor: move CAddress-without-nTime logic to net_processing (authored by Pieter Wuille <pieter@wuille.net>, committed by PiRK). · Explain WhyNov 8 2023, 15:10

This revision was automatically updated to reflect the committed changes.

PiRK added a commit: rABCb9b72a7667d2: refactor: move CAddress-without-nTime logic to net_processing.

@bot build-win64

teamcity awarded a token.Nov 8 2023, 18:42

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

Tail of the build log:

warning: some crates are on edition 2021 which defaults to `resolver = "2"`, but virtual workspaces default to `resolver = "1"`
note: to keep the current resolver, specify `workspace.resolver = "1"` in the workspace root's manifest
note: to use the edition 2021 resolver, specify `workspace.resolver = "2"` in the workspace root's manifest
    Finished release [optimized] target(s) in 0.11s
[2/12] Running utility command for _cargo-build_chronik-lib
[3/12] Generating ../cargo/build/x86_64-pc-windows-gnu/cxxbridge/chronik-bridge/src/ffi.rs.cc, ../cargo/build/x86_64-pc-windows-gnu/cxxbridge/chronik-lib/src/ffi.rs.cc
Generating cxx bridge files
[3/4] Run CPack packaging tool...
CPack: Create package using NSIS
CPack: Install projects
CPack: - Install directory: /work/doc
CPack: - Install project: bitcoin-abc []
CPack: Create package
CPack: - package: /work/abc-ci-builds/build-win64/bitcoin-abc-0.28.3-x86_64-w64-mingw32.exe generated.
CPack: Create package using ZIP
CPack: Install projects
CPack: - Install directory: /work/doc
CPack: - Install project: bitcoin-abc []
CPack: Create package
CPack: - package: /work/abc-ci-builds/build-win64/bitcoin-abc-0.28.3-x86_64-w64-mingw32.zip generated.
wine: created the configuration directory '/root/.wine'
002c:fixme:actctx:parse_depend_manifests Could not find dependent assembly L"Microsoft.Windows.Common-Controls" (6.0.0.0)
002c:fixme:winediag:loader_init wine-staging 8.19 is a testing version containing experimental patches.
002c:fixme:winediag:loader_init Please mention your exact version when filing bug reports on winehq.org.
004c:fixme:actctx:parse_depend_manifests Could not find dependent assembly L"Microsoft.Windows.Common-Controls" (6.0.0.0)
004c:err:winediag:nodrv_CreateWindow Application tried to create a window, but no driver could be loaded.
004c:err:winediag:nodrv_CreateWindow L"The explorer process failed to start."
004c:err:systray:initialize_systray Could not create tray window
004c:err:ole:StdMarshalImpl_MarshalInterface Failed to create ifstub, hr 0x80004002
004c:err:ole:CoMarshalInterface Failed to marshal the interface {6d5140c1-7436-11ce-8034-00aa006009fa}, hr 0x80004002
004c:err:ole:apartment_get_local_server_stream Failed: 0x80004002
002c:err:winediag:nodrv_CreateWindow Application tried to create a window, but no driver could be loaded.
002c:err:winediag:nodrv_CreateWindow L"Make sure that your X server is running and that $DISPLAY is set correctly."
0044:err:winediag:nodrv_CreateWindow Application tried to create a window, but no driver could be loaded.
0044:err:winediag:nodrv_CreateWindow L"Make sure that your X server is running and that $DISPLAY is set correctly."
0070:err:ntoskrnl:ServiceMain Failed to load L"C:\\windows\\system32\\win32k.sys"
0070:err:ntoskrnl:ServiceMain Failed to load L"C:\\windows\\system32\\drivers\\dxgkrnl.sys"
0070:err:ntoskrnl:ServiceMain Failed to load L"C:\\windows\\system32\\drivers\\dxgmms1.sys"
0088:err:winediag:nodrv_CreateWindow Application tried to create a window, but no driver could be loaded.
0088:err:winediag:nodrv_CreateWindow L"Make sure that your X server is running and that $DISPLAY is set correctly."
0090:err:winediag:nodrv_CreateWindow Application tried to create a window, but no driver could be loaded.
0090:err:winediag:nodrv_CreateWindow L"Make sure that your X server is running and that $DISPLAY is set correctly."
00d8:fixme:msg:pack_message msg 14 (WM_ERASEBKGND) not supported yet
00d8:err:winediag:nodrv_CreateWindow Application tried to create a window, but no driver could be loaded.
00d8:err:winediag:nodrv_CreateWindow L"Make sure that your X server is running and that $DISPLAY is set correctly."
0100:fixme:hid:handle_IRP_MN_QUERY_ID Unhandled type 00000005
0100:fixme:hid:handle_IRP_MN_QUERY_ID Unhandled type 00000005
0100:fixme:hid:handle_IRP_MN_QUERY_ID Unhandled type 00000005
0100:fixme:hid:handle_IRP_MN_QUERY_ID Unhandled type 00000005
wine: configuration in L"/root/.wine" has been updated.
0128:fixme:winspool:PerfOpen (null): stub
0128:fixme:winspool:PerfCollect L"Global", 00007FFFFE2FEA98, 00007FFFFE2FEA7C, 00007FFFFE2FEA80: stub
0128:fixme:winspool:PerfClose stub
Running 582 test cases...
0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0128:fixme:file:NtLockFile I/O completion on lock not implemented yet
0070:fixme:mountmgr:harddisk_ioctl Unsupported ioctl 90064 (device=9 access=0 func=19 method=0)
0  0070:fixme:mountmgr:harddisk_ioctl Unsupported ioctl 90064 (device=9 access=0 func=19 method=0)
0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  Assertion failed: nPreferredDownload == 0, file ../../src/net_processing.cpp, line 1997

Build build-win64 failed with exit code 3

PiRK mentioned this in D14856: [seeder] handle CAddress-without-nTime logic.Nov 27 2023, 16:46

PiRK mentioned this in rABC833c5794ea37: [seeder] handle CAddress-without-nTime logic.Nov 29 2023, 07:37