[net processing] Add m_our_services and m_their_services to Peer
ClosedPublic
Actions

Authored by PiRK on Nov 7 2023, 12:06.

Details

Reviewers

Fabien

Group Reviewers

Restricted Project

Commits

rABCf59dbfefff35: [net processing] Add m_our_services and m_their_services to Peer

Summary

Track services offered by us and the peer in the Peer object.

This is a partial backport of core#25514
https://github.com/bitcoin/bitcoin/pull/25514/commits/1f52c47d5c09b59fd3153700751c74e63edc7d7e

Test Plan

ninja all check-all

Diff Detail

Repository

rABC Bitcoin ABC

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 25562
Build 50705: Build Diff	lint-circular-dependencies · build-without-wallet · build-fuzzer · build-clang-tidy · build-debug · build-clang · build-diff
Build 50704: arc lint + arc unit

Event Timeline

PiRK created this revision.Nov 7 2023, 12:06

Herald added a reviewer: Restricted Project. · View Herald TranscriptNov 7 2023, 12:06

PiRK requested review of this revision.Nov 7 2023, 12:06

teamcity edited the summary of this revision. (Show Details)Nov 7 2023, 12:06

PiRK added a child revision: D14746: [tests] Connect peer in outbound_slow_chain_eviction by sending p2p messages.Nov 7 2023, 12:08

Harbormaster completed remote builds in B25547: Diff 42971.Nov 7 2023, 12:13

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

Tail of the build log:

[433/489] bitcoin: testing walletdb_tests
[434/489] bitcoin: testing merkle_tests
[435/489] Running utility command for check-bitcoin-walletdb_tests
[436/489] Running utility command for check-bitcoin-merkle_tests
[437/489] bitcoin: testing logging_tests
[438/489] bitcoin: testing miner_tests
[439/489] bitcoin: testing psbt_wallet_tests
[440/489] bitcoin: testing crypto_tests
[441/489] Running utility command for check-bitcoin-logging_tests
[442/489] Running utility command for check-bitcoin-miner_tests
[443/489] Running utility command for check-bitcoin-crypto_tests
[444/489] Running utility command for check-bitcoin-psbt_wallet_tests
[445/489] Running utility command for check-pow-aserti32d_tests
[446/489] bitcoin: testing cuckoocache_tests
[447/489] Running pow test suite
PASSED: pow test suite
[448/489] bitcoin: testing denialofservice_tests
[449/489] Running utility command for check-bitcoin-cuckoocache_tests
[450/489] Running utility command for check-bitcoin-denialofservice_tests
[451/489] bitcoin: testing uint256_tests
[452/489] bitcoin: testing init_tests
[453/489] Running utility command for check-bitcoin-uint256_tests
[454/489] bitcoin: testing coinstatsindex_tests
[455/489] Running utility command for check-bitcoin-init_tests
[456/489] Running utility command for check-bitcoin-coinstatsindex_tests
[457/489] Linking CXX executable src/seeder/test/test-seeder
[458/489] bitcoin: testing wallet_crypto_tests
[459/489] Running utility command for check-bitcoin-wallet_crypto_tests
[460/489] seeder: testing options_tests
[461/489] Linking CXX executable src/qt/test/test_bitcoin-qt
[462/489] seeder: testing message_writer_tests
[463/489] seeder: testing p2p_messaging_tests
[464/489] Running utility command for check-seeder-options_tests
[465/489] Running utility command for check-seeder-message_writer_tests
[466/489] Running utility command for check-seeder-p2p_messaging_tests
[467/489] bitcoin: testing rcu_tests
[468/489] seeder: testing write_name_tests
[469/489] seeder: testing parse_name_tests
[470/489] Running utility command for check-bitcoin-rcu_tests
[471/489] Running utility command for check-seeder-write_name_tests
[472/489] Running utility command for check-seeder-parse_name_tests
[473/489] Running seeder test suite
PASSED: seeder test suite
[474/489] bitcoin: testing txrequest_tests
[475/489] Running utility command for check-bitcoin-txrequest_tests
[476/489] bitcoin: testing blockcheck_tests
[477/489] Running utility command for check-bitcoin-blockcheck_tests
[478/489] bitcoin-qt: testing test_bitcoin-qt
[479/489] Running bitcoin-qt test suite
PASSED: bitcoin-qt test suite
[480/489] bitcoin: testing coinselector_tests
[481/489] Running utility command for check-bitcoin-coinselector_tests
[482/489] bitcoin: testing wallet_tests
[483/489] Running utility command for check-bitcoin-wallet_tests
[484/489] bitcoin: testing transaction_tests
[485/489] Running utility command for check-bitcoin-transaction_tests
[486/489] bitcoin: testing coins_tests
[487/489] Running utility command for check-bitcoin-coins_tests
ninja: build stopped: cannot make progress due to previous errors.
Build build-clang failed with exit code 1

The test failure is a segfault in an unrelated test. I'm going to have a look at it separately, and just rerun the tests here.

rebase

Harbormaster completed remote builds in B25551: Diff 42975.Nov 7 2023, 12:46

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

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

rebase

Harbormaster completed remote builds in B25562: Diff 42988.Nov 8 2023, 10:30

Closed by commit rABCf59dbfefff35: [net processing] Add m_our_services and m_their_services to Peer (authored by John Newbery <john@johnnewbery.com>, committed by PiRK). · Explain WhyNov 8 2023, 15:10

This revision was automatically updated to reflect the committed changes.

PiRK added a commit: rABCf59dbfefff35: [net processing] Add m_our_services and m_their_services to Peer.

@bot build-win64

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

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.18s
[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
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"
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."
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.
0130:fixme:winspool:PerfOpen (null): stub
0130:fixme:winspool:PerfCollect L"Global", 00007FFFFE2FEA98, 00007FFFFE2FEA7C, 00007FFFFE2FEA80: stub
0130: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  0130: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