try fix build

Signed-off-by: turuslan <[email protected]>

Author: turuslan

.github/workflows/ci.yml

@@ -47,6 +47,8 @@ jobs:
         CXX: ${{ matrix.compiler.cxx }}
       run: cmake . -Bbuild
     - name: build
+      env:
+        CURL_SSL_BACKEND: SecureTransport
       run: cmake --build build -- -j4
     - name: test
       env:

.github/workflows/clang-tidy.yml

@@ -25,6 +25,8 @@ jobs:
         sudo python3 -m pip install scikit-build 
         sudo python3 -m pip install cmake requests gitpython gcovr pyyaml
     - name: run checks
+      env:
+        CURL_SSL_BACKEND: SecureTransport
       run: |
         #!/bin/bash
         LLVM_DIR=/usr/local/Cellar/llvm

cmake/Hunter/init.cmake

@@ -31,7 +31,7 @@ set(
 include(${CMAKE_CURRENT_LIST_DIR}/HunterGate.cmake)
 
 HunterGate(
-    URL  https://github.com/qdrvm/hunter/archive/refs/tags/v0.23.257-qdrvm10.tar.gz
-    SHA1 72b446a4424ba28ea90f9a68a9134b0f8e44b5b2
+    URL  https://github.com/qdrvm/hunter/archive/refs/tags/v0.25.3-qdrvm5.zip
+    SHA1 ae75fdf1850bd21dead239b8580012b6091be855
     LOCAL
 )

cmake/toolchain/clang-15_cxx17.cmake

@@ -6,6 +6,8 @@
 
 #pragma once
 
+#include <optional>
+
 #include <libp2p/basic/read_buffer.hpp>
 #include <libp2p/basic/write_queue.hpp>
 #include <libp2p/common/metrics/instance_count.hpp>

include/libp2p/muxer/yamux/yamux_stream.hpp

@@ -95,78 +95,3 @@ struct fmt::formatter<boost::system::error_code> {
     return std::copy(std::begin(message), std::end(message), ctx.out());
   }
 };
-
-// Remove after it will be added to libp2p (will be happened compilation error)
-template <typename T>
-struct fmt::formatter<outcome::success_type<T>> {
-  // Parses format specifications. Must be empty
-  constexpr auto parse(format_parse_context &ctx) -> decltype(ctx.begin()) {
-    // Parse the presentation format and store it in the formatter:
-    auto it = ctx.begin(), end = ctx.end();
-
-    // Check if reached the end of the range:
-    if (it != end && *it != '}') {
-      throw format_error("invalid format");
-    }
-
-    // Return an iterator past the end of the parsed range:
-    return it;
-  }
-
-  // Formats the success<non_void_type>
-  template <typename OutputIt>
-  typename std::enable_if_t<not std::is_void_v<T>, OutputIt> format_impl(
-      OutputIt out, const outcome::success_type<T> &success) const {
-    return fmt::format_to(out, "{}", success.value());
-  }
-
-  // Formats the success<void>
-  template <typename OutputIt>
-  typename std::enable_if_t<std::is_void_v<T>, OutputIt> format_impl(
-      OutputIt out, const outcome::success_type<void> &) const {
-    static constexpr string_view message("<success>");
-    return std::copy(std::begin(message), std::end(message), out);
-  }
-
-  // Formats the success<T>
-  template <typename FormatContext>
-  auto format(const outcome::success_type<T> &success, FormatContext &ctx) const
-      -> decltype(ctx.out()) {
-    return format_impl(ctx.out(), success);
-  }
-};
-
-template <typename Result, typename Failure>
-struct fmt::formatter<outcome::result<Result, Failure>> {
-  // Parses format specifications. Must be empty
-  constexpr auto parse(format_parse_context &ctx) -> decltype(ctx.begin()) {
-    // Parse the presentation format and store it in the formatter:
-    auto it = ctx.begin(), end = ctx.end();
-
-    // Check if reached the end of the range:
-    if (it != end && *it != '}') {
-      throw format_error("invalid format");
-    }
-
-    // Return an iterator past the end of the parsed range:
-    return it;
-  }
-
-  // Formats the outcome result
-  template <typename FormatContext>
-  auto format(const outcome::result<Result, Failure> &res,
-              FormatContext &ctx) const -> decltype(ctx.out()) {
-    // ctx.out() is an output iterator to write to.
-
-    if (res.has_value()) {
-      if constexpr (not std::is_void_v<Result>) {
-        return fmt::format_to(ctx.out(), "{}", res.value());
-      } else {
-        static constexpr string_view message("<success>");
-        return std::copy(std::begin(message), std::end(message), ctx.out());
-      }
-    } else {
-      return fmt::format_to(ctx.out(), "{}", res.error());
-    }
-  }
-};

include/libp2p/outcome/outcome.hpp

@@ -6,6 +6,7 @@
 
 #pragma once
 
+#include <optional>
 #include <vector>
 
 #include <libp2p/connection/stream.hpp>

include/libp2p/protocol/echo/client_echo_session.hpp

@@ -22,14 +22,56 @@
 #include <libp2p/multi/multibase_codec/codecs/base58.hpp>
 #include <libp2p/multi/uvarint.hpp>
 
-// TODO(turuslan): qtils
+// TODO(turuslan): qtils, https://github.com/qdrvm/kagome/issues/1813
 namespace qtils {
   inline std::string_view byte2str(const libp2p::BytesIn &s) {
     // NOLINT(cppcoreguidelines-pro-type-reinterpret-cast)
     return {reinterpret_cast<const char *>(s.data()), s.size()};
   }
 }  // namespace qtils
 
+// https://github.com/multiformats/rust-multiaddr/blob/3c7e813c3b1fdd4187a9ca9ff67e10af0e79231d/src/protocol.rs#L613-L622
+inline void percentEncode(std::string &out, std::string_view str) {
+  constexpr uint32_t mask[4]{0xffffffff, 0xd000802d, 0x00000000, 0xa8000001};
+  for (auto &c : str) {
+    if ((mask[c / 32] & (1 << (c % 32))) != 0) {
+      fmt::format_to(std::back_inserter(out), "%{:02X}", c);
+    } else {
+      out += c;
+    }
+  }
+}
+
+// https://github.com/multiformats/rust-multiaddr/blob/3c7e813c3b1fdd4187a9ca9ff67e10af0e79231d/src/protocol.rs#L203-L212
+inline std::string percentDecode(std::string_view str) {
+  auto f = [&](char c) -> std::optional<uint8_t> {
+    if (c >= '0' && c <= '9') {
+      return c - '0';
+    }
+    if (c >= 'A' && c <= 'F') {
+      return c - 'A' + 10;
+    }
+    if (c >= 'a' && c <= 'f') {
+      return c - 'a' + 10;
+    }
+    return std::nullopt;
+  };
+  std::string out;
+  while (not str.empty()) {
+    if (str[0] == '%' and str.size() >= 3) {
+      auto x1 = f(str[1]), x2 = f(str[2]);
+      if (x1 and x2) {
+        out += (*x1 << 4) | *x2;
+        str.remove_prefix(3);
+        continue;
+      }
+    }
+    out += str[0];
+    str.remove_prefix(1);
+  }
+  return out;
+}
+
 namespace libp2p::multi::converters {
 
   outcome::result<Bytes> multiaddrToBytes(std::string_view str) {
@@ -115,9 +157,10 @@ namespace libp2p::multi::converters {
       case Protocol::Code::DNS6:
       case Protocol::Code::DNS_ADDR:
       case Protocol::Code::UNIX:
+        return DnsConverter::addressToBytes(addr);
       case Protocol::Code::X_PARITY_WS:
       case Protocol::Code::X_PARITY_WSS:
-        return DnsConverter::addressToBytes(addr);
+        return DnsConverter::addressToBytes(percentDecode(addr));
 
       case Protocol::Code::IP6_ZONE:
       case Protocol::Code::ONION3:
@@ -198,9 +241,7 @@ namespace libp2p::multi::converters {
         case Protocol::Code::X_PARITY_WSS: {
           OUTCOME_TRY(data, read_uvar());
           results += "/";
-          // TODO(turuslan): percent encoding
-          // https://github.com/multiformats/rust-multiaddr/blob/3c7e813c3b1fdd4187a9ca9ff67e10af0e79231d/src/protocol.rs#L613-L622
-          results += qtils::byte2str(data);
+          percentEncode(results, qtils::byte2str(data));
           break;
         }