Merge branch 'vanity' into dev

contrib/py/vanity/readme.md

@@ -5,6 +5,6 @@ installing deps:
     sudo apt install libsodium-dev
     pip3 install --user -r requirements.txt
 
-to generate a nonce with a prefix `^loki` using 8 cpu threads:
+to generate a nonce with a prefix `^7oki` using 8 cpu threads:
 
-    python3 lokinet-vanity.py keyfile.private loki 8
+    python3 lokinet-vanity.py keyfile.private 7oki 8

include/llarp/service/Info.hpp

@@ -13,9 +13,10 @@ namespace llarp
      private:
       llarp::PubKey enckey;
       llarp::PubKey signkey;
-      VanityNonce vanity;
-
+    
      public:
+      VanityNonce vanity;
+      
       ServiceInfo() = default;
 
       ServiceInfo(ServiceInfo&& other)

llarp/service.cpp

@@ -262,9 +262,11 @@ namespace llarp
       inf.read((char*)buf.base, sz);
       if(!BDecode(&buf))
         return false;
-      // update pubkey
+      // update pubkeys
       pub.Update(llarp::seckey_topublic(enckey),
                  llarp::seckey_topublic(signkey));
+      // update vanity nonce
+      pub.vanity = vanity;
       return true;
     }