evo: ensure the ADDRV2 serialization is always used in NetInfoEntry

Author: kwvg

src/evo/netinfo.h

@@ -7,6 +7,7 @@
 
 #include <netaddress.h>
 #include <serialize.h>
+#include <streams.h>
 
 #include <variant>
 
@@ -72,8 +73,9 @@ class NetInfoEntry
     bool operator!=(const NetInfoEntry& rhs) const { return !(*this == rhs); }
 
     template <typename Stream>
-    void Serialize(Stream& s) const
+    void Serialize(Stream& s_) const
     {
+        OverrideStream<Stream> s(&s_, /*nType=*/0, s_.GetVersion() | ADDRV2_FORMAT);
         if (const auto* data_ptr{std::get_if<CService>(&m_data)};
             m_type == NetInfoType::Service && data_ptr && data_ptr->IsValid()) {
             s << m_type << *data_ptr;
@@ -83,8 +85,9 @@ class NetInfoEntry
     }
 
     template <typename Stream>
-    void Unserialize(Stream& s)
+    void Unserialize(Stream& s_)
     {
+        OverrideStream<Stream> s(&s_, /*nType=*/0, s_.GetVersion() | ADDRV2_FORMAT);
         s >> m_type;
         if (m_type == NetInfoType::Service) {
             m_data = CService{};

src/test/evo_netinfo_tests.cpp

@@ -95,7 +95,7 @@ BOOST_AUTO_TEST_CASE(netinfo_ser)
 
     {
         // A valid CService should be constructable, readable and pass validation
-        CDataStream ds(SER_DISK, CLIENT_VERSION);
+        CDataStream ds(SER_DISK, CLIENT_VERSION | ADDRV2_FORMAT);
         CService service{LookupNumeric("1.1.1.1", Params().GetDefaultPort())};
         BOOST_CHECK(service.IsValid());
         NetInfoEntry entry{service}, entry2{};
@@ -105,6 +105,28 @@ BOOST_AUTO_TEST_CASE(netinfo_ser)
         BOOST_CHECK(!entry.IsEmpty() && entry.IsTriviallyValid());
         BOOST_CHECK(entry.GetAddrPort().value() == service);
     }
+
+    {
+        // NetInfoEntry should be able to read and write ADDRV2 addresses
+        CService service{};
+        service.SetSpecial("pg6mmjiyjmcrsslvykfwnntlaru7p5svn6y2ymmju6nubxndf4pscryd.onion");
+        BOOST_CHECK(service.IsValid() && service.IsTor());
+
+        CDataStream ds(SER_DISK, CLIENT_VERSION | ADDRV2_FORMAT);
+        ds << NetInfoEntry::NetInfoType::Service << service;
+        ds.SetVersion(CLIENT_VERSION); // Drop the explicit format flag
+
+        NetInfoEntry entry{};
+        ds >> entry;
+        BOOST_CHECK(!entry.IsEmpty() && entry.IsTriviallyValid());
+        BOOST_CHECK(entry.GetAddrPort().value() == service);
+        ds.clear();
+
+        NetInfoEntry entry2{};
+        ds << entry;
+        ds >> entry2;
+        BOOST_CHECK(entry == entry2 && entry2.GetAddrPort().value() == service);
+    }
 }
 
 BOOST_AUTO_TEST_CASE(netinfo_retvals)