From d4fe6c81dec8b4c2f3db5214b55bd7c9d89fe085 Mon Sep 17 00:00:00 2001
From: Duke Leto <duke@leto.net>
Date: Tue, 27 Apr 2021 19:58:51 -0400
Subject: [PATCH] addrv2 changes

---
 src/addrman.h      | 5 ++++-
 src/netaddress.cpp | 4 +---
 src/netbase.cpp    | 4 +++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/addrman.h b/src/addrman.h
index 7c2fc2dc1..2a77bb117 100644
--- a/src/addrman.h
+++ b/src/addrman.h
@@ -309,7 +309,10 @@ public:
 
     /**
      * serialized format:
-     * * version byte (1 for pre-asmap files, 2 for files including asmap version)
+     * * version byte:
+          version 1 for pre-asmap files
+          version 2 for files including asmap version
+          version 3 for asmap + addrv2 (Tor v3/i2p/cjdns/etc)
      * * 0x20 + nKey (serialized as if it were a vector, for backward compatibility)
      * * nNew
      * * nTried
diff --git a/src/netaddress.cpp b/src/netaddress.cpp
index b8b662760..a4221330f 100644
--- a/src/netaddress.cpp
+++ b/src/netaddress.cpp
@@ -5,7 +5,6 @@
 // file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 
 #include <netaddress.h>
-
 #include <crypto/common.h>
 #include <crypto/sha3.h>
 #include <hash.h>
@@ -14,7 +13,6 @@
 #include <util/asmap.h>
 #include <util/strencodings.h>
 #include <util/string.h>
-
 #include <algorithm>
 #include <array>
 #include <cstdint>
@@ -147,7 +145,7 @@ void CNetAddr::SetIP(const CNetAddr& ipIn)
         assert(false);
     } // no default case, so the compiler can warn about missing cases
 
-    m_net = ipIn.m_net;
+    m_net  = ipIn.m_net;
     m_addr = ipIn.m_addr;
 }
 
diff --git a/src/netbase.cpp b/src/netbase.cpp
index 23e9a5833..551cff149 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -667,11 +667,13 @@ void CNetAddr::SetRaw(Network network, const uint8_t *ip_in)
     switch(network)
     {
         case NET_IPV4:
+            m_net = NET_IPV4;
             memcpy(ip, pchIPv4, 12);
             memcpy(ip+12, ip_in, 4);
             break;
         case NET_IPV6:
-            memcpy(ip, ip_in, 16);
+            //memcpy(ip, ip_in, 16);
+            SetLegacyIPv6(ip_in);
             break;
         default:
             assert(!"invalid network");