Retry recursive message delivery on timeout

network-tests/test_subaccount_auth.py

@@ -336,7 +336,7 @@ def test_revoke_subaccount(omq, random_sn, sk, exclude):
                         f"revoked_subaccounts{ts}".encode(), encoder=Base64Encoder
                     ).signature.decode(),
                 }
-            ).encode(),
+            ).encode()
         ],
     ).get()
     assert len(r) == 1
@@ -408,15 +408,14 @@ def test_revoke_subaccount(omq, random_sn, sk, exclude):
                         f"revoked_subaccounts{ts}".encode(), encoder=Base64Encoder
                     ).signature.decode(),
                 }
-            ).encode(),
+            ).encode()
         ],
     ).get()
     assert len(r) == 1
     r = json.loads(r[0])
     assert len(r["revoked_subaccounts"]) == 1
     assert r["revoked_subaccounts"][0] == b64(dude_token)
 
-
     # But the one in the revoked-keys-allowed namespace should work:
     r = omq.request_future(
         conn,
@@ -511,7 +510,7 @@ def test_revoke_subaccount(omq, random_sn, sk, exclude):
                         f"revoked_subaccounts{ts}".encode(), encoder=Base64Encoder
                     ).signature.decode(),
                 }
-            ).encode(),
+            ).encode()
         ],
     ).get()
     assert len(r) == 1

oxenss/common/pubkey.cpp

@@ -1,11 +1,23 @@
 #include "pubkey.h"
 #include "mainnet.h"
+#include "oxenc/endian.h"
 #include <oxenc/hex.h>
 #include <charconv>
 #include <cassert>
 
 namespace oxenss {
 
+uint64_t pubkey_to_swarm_space(const user_pubkey& pk) {
+    const auto bytes = pk.raw();
+    assert(bytes.size() == 32);
+
+    uint64_t res = 0;
+    for (size_t i = 0; i < bytes.size(); i += 8)
+        res ^= oxenc::load_big_to_host<uint64_t>(bytes.data() + i);
+
+    return res;
+}
+
 user_pubkey& user_pubkey::load(std::string_view pk) {
     if (pk.size() == USER_PUBKEY_SIZE_HEX && oxenc::is_hex(pk)) {
         uint8_t netid;

oxenss/common/pubkey.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cstdint>
 #include <string>
 
 namespace oxenss {
@@ -13,14 +14,14 @@ class user_pubkey {
     int network_ = -1;
     std::string pubkey_;
 
-    user_pubkey(int network, std::string raw_pk) : network_{network}, pubkey_{std::move(raw_pk)} {}
-
     friend class DatabaseImpl;
 
   public:
     // Default constructor; constructs an invalid pubkey
     user_pubkey() = default;
 
+    user_pubkey(int network, std::string raw_pk) : network_{network}, pubkey_{std::move(raw_pk)} {}
+
     // bool conversion: returns true if this object contains a valid pubkey
     explicit operator bool() const { return !pubkey_.empty(); }
 
@@ -57,6 +58,10 @@ class user_pubkey {
     std::string prefixed_raw() const;
 };
 
+/// Maps a pubkey into a 64-bit "swarm space" value; the swarm you belong to is whichever one
+/// has a swarm id closest to this pubkey-derived value.
+uint64_t pubkey_to_swarm_space(const user_pubkey& pk);
+
 }  // namespace oxenss
 
 namespace std {

oxenss/crypto/keys.h

@@ -3,7 +3,6 @@
 #include <array>
 #include <cstddef>
 #include <functional>
-#include <optional>
 #include <string>
 #include <string_view>
 

oxenss/daemon/command_line.cpp

@@ -175,6 +175,11 @@ parse_result parse_cli_args(int argc, char* argv[]) {
             "--force-start",
             options.force_start,
             "Ignore the initialisation ready check (primarily for debugging).");
+    cli.add_flag(
+            "--skip-bootstrap-nodes",
+            options.skip_bootstrap,
+            "Skip the contacting of bootstrap seed nodes on startup (primarily for private node "
+            "networks)");
     cli.add_option(
                "--stats-access-key",
                options.stats_access_keys,

oxenss/daemon/command_line.h

@@ -12,6 +12,7 @@ struct command_line_options {
     uint16_t https_port = 22021;
     uint16_t omq_quic_port = 22020;
     std::string oxend_omq_rpc;  // Defaults to ipc://$HOME/.oxen/[testnet/]oxend.sock
+    bool skip_bootstrap = false;
     bool force_start = false;
     bool testnet = false;
     std::string log_level = "info";

oxenss/daemon/oxen-storage.cpp

@@ -153,7 +153,12 @@ int main(int argc, char* argv[]) {
         auto& oxenmq_server = *oxenmq_server_ptr;
 
         snode::ServiceNode service_node{
-                l_keys, me, oxenmq_server, options.data_dir, options.force_start};
+                l_keys,
+                me,
+                oxenmq_server,
+                options.data_dir,
+                options.force_start,
+                options.skip_bootstrap};
 
         rpc::RequestHandler request_handler{service_node, channel_encryption, ed_keys.sec};
 

oxenss/rpc/client_rpc_endpoints.h

@@ -541,9 +541,9 @@ struct delete_before final : recursive {
 };
 
 /// Updates (shortens) the expiry of all stored messages, and broadcasts the update request to all
-/// other swarm members.  Note that this will not extend existing expiries, it will only shorten the
-/// expiry of any messages that have expiries after the requested value.  (To extend expiries of one
-/// or more individual messages use the `expire` endpoint).
+/// other swarm members. Note that this will not extend existing expiries, it will only shorten the
+/// expiry of any messages that have expiries after the requested value. (To extend expiries of one
+/// or more individual messages use the `expire_msgs` endpoint).
 ///
 /// Takes parameters of:
 /// - pubkey -- the pubkey whose messages shall have their expiries reduced, in hex (66) or bytes
@@ -625,8 +625,8 @@ struct expire_all final : recursive {
 ///       ("expire" || ShortenOrExtend || expiry || messages[0] || ... || messages[N])
 ///   where `expiry` is the expiry timestamp expressed as a string, for a single expiry, or the
 ///   expiries concatenated together (expiry[0] || expiry[1] || ...) for multiple expiries.
-///   `ShortenOrExtend` is string "shorten" if the shorten option is given (and true), "extend" if
-///   `extend` is true, and empty otherwise. The signature must be base64 encoded (json) or bytes
+///   `ShortenOrExtend` is the string "shorten" if the shorten option is given (and true), "extend"
+///   if `extend` is true, and empty otherwise. The signature must be base64 encoded (json) or bytes
 ///   (bt).
 ///
 /// Returns dict of: