apply lokid config section

llarp/config.cpp

@@ -364,6 +364,9 @@ extern "C"
         {"netdb", conf->impl.netdb},         {"api", conf->impl.api},
         {"services", conf->impl.services}};
 
+    for(const auto item : conf->impl.lokid)
+      iter->visit(iter, "lokid", item.first.c_str(), item.second.c_str());
+
     for(const auto item : conf->impl.router)
       iter->visit(iter, "router", item.first.c_str(), item.second.c_str());
 

llarp/router/router.cpp

@@ -412,7 +412,10 @@ namespace llarp
   {
     if(!EnsureEncryptionKey())
       return false;
-    return llarp_findOrCreateIdentity(&crypto, ident_keyfile, identity);
+    if(usingSNSeed)
+      return llarp_loadServiceNodeIdentityKey(&crypto, ident_keyfile, identity);
+    else
+      return llarp_findOrCreateIdentity(&crypto, ident_keyfile, identity);
   }
 
   bool
@@ -1488,6 +1491,11 @@ namespace llarp
     }
     else if(StrEq(section, "lokid"))
     {
+      if(StrEq(key, "service-node-seed"))
+      {
+        self->usingSNSeed   = true;
+        self->ident_keyfile = val;
+      }
       if(StrEq(key, "enabled"))
       {
         self->whitelistRouters = IsTrueValue(val);
@@ -1568,7 +1576,7 @@ namespace llarp
       {
         self->transport_keyfile = val;
       }
-      if(StrEq(key, "ident-privkey"))
+      if(StrEq(key, "ident-privkey") && !self->usingSNSeed)
       {
         self->ident_keyfile = val;
       }

llarp/router/router.hpp

@@ -85,6 +85,9 @@ namespace llarp
     // our router contact
     llarp::RouterContact _rc;
 
+    /// are we using the lokid service node seed ?
+    bool usingSNSeed = false;
+
     /// should we obey the service node whitelist?
     bool whitelistRouters = false;