diff options
| author | fanquake <fanquake@gmail.com> | 2022-08-05 08:58:09 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-08-05 09:03:33 +0100 |
| commit | e03860558581adda52949e1fd3ed3f923e7c49e7 (patch) | |
| tree | bac7d8d06f7f513b41cd924cbc792aff6e7817cf /src/rpc | |
| parent | 2c3115d4f568b2719daa44d8eb2504a8cd7691fe (diff) | |
| parent | fadd8b2676f6d68ec87189871461c9a6a6aa3cac (diff) | |
Merge bitcoin/bitcoin#24662: addrman: Use system time instead of adjusted network time
fadd8b2676f6d68ec87189871461c9a6a6aa3cac addrman: Use system time instead of adjusted network time (MarcoFalke)
Pull request description:
This changes addrman to use system time for address relay instead of the network adjusted time.
This is an improvement, because network time has multiple issues:
* It is non-monotonic, even if the system time is monotonic.
* It may be wrong, even if the system time is correct.
* It may be wrong, if the system time is wrong. For example, when the node has limited number of connections (`4`), or the system time is wrong by too much (more than +-70 minutes), or the system time only got wrong after timedata collected more than half of the entries while the time was correct, ...)
This may slightly degrade addr relay for nodes where timedata successfully adjusted the time. Addr relay can already deal with minor offsets of up to 10 minutes. Offsets larger than this should still allow addr relay and not result in a DoS.
ACKs for top commit:
dergoegge:
Code review ACK fadd8b2676f6d68ec87189871461c9a6a6aa3cac
Tree-SHA512: b6c178fa01161544e5bc76c4cb23e11bcc30391f7b7a64accce864923766647bcfce2e8ae21d36fb1ffc1afa07bc46415aca612405bd8d4cc1f319c92a08498f
Diffstat (limited to 'src/rpc')
| -rw-r--r-- | src/rpc/net.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp index 0ee905a77a..3b234bc317 100644 --- a/src/rpc/net.cpp +++ b/src/rpc/net.cpp @@ -23,6 +23,7 @@ #include <timedata.h> #include <util/strencodings.h> #include <util/string.h> +#include <util/time.h> #include <util/translation.h> #include <validation.h> #include <version.h> @@ -945,7 +946,7 @@ static RPCHelpMan addpeeraddress() if (LookupHost(addr_string, net_addr, false)) { CAddress address{{net_addr, port}, ServiceFlags{NODE_NETWORK | NODE_WITNESS}}; - address.nTime = AdjustedTime(); + address.nTime = Now<NodeSeconds>(); // The source address is set equal to the address. This is equivalent to the peer // announcing itself. if (node.addrman->Add({address}, address)) { |