Proofs v24 (#162)

* Updated filecoin-ffi version

Signed-off-by: artyom-yurin <[email protected]>

* Updated bls-provider

Signed-off-by: artyom-yurin <[email protected]>

* Added CURL for downloading proofs
Returned proof param provider
Renamed dir of header

Signed-off-by: artyom-yurin <[email protected]>

* Added error indicator in proof param provider
Added getSectorSize function for getting actual size from ProofType

Signed-off-by: artyom-yurin <[email protected]>

* Added util functions

Signed-off-by: artyom-yurin <[email protected]>

* Proofs v24: changes (#163)

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

Co-authored-by: Ruslan Tushov <[email protected]>

Author: ortyomka

.github/workflows/ci.yml

@@ -39,7 +39,7 @@ jobs:
       uses: actions/[email protected]
       env:
         cache-name: cache-filecoin-ffi-proofs
-        version: v23
+        version: v24
       with:
         path: /var/tmp/filecoin-proof-parameters
         key: build-${{ env.cache-name }}-${{ env.version }}

.github/workflows/lsan.yml

@@ -18,7 +18,7 @@ jobs:
       uses: actions/[email protected]
       env:
         cache-name: cache-filecoin-ffi-proofs
-        version: v23
+        version: v24
       with:
         path: /var/tmp/filecoin-proof-parameters
         key: build-${{ env.cache-name }}-${{ env.version }}

.github/workflows/tsan.yml

@@ -18,7 +18,7 @@ jobs:
       uses: actions/[email protected]
       env:
         cache-name: cache-filecoin-ffi-proofs
-        version: v23
+        version: v24
       with:
         path: /var/tmp/filecoin-proof-parameters
         key: build-${{ env.cache-name }}-${{ env.version }}

.github/workflows/ubsan.yml

@@ -18,7 +18,7 @@ jobs:
       uses: actions/[email protected]
       env:
         cache-name: cache-filecoin-ffi-proofs
-        version: v23
+        version: v24
       with:
         path: /var/tmp/filecoin-proof-parameters
         key: build-${{ env.cache-name }}-${{ env.version }}

cmake/Hunter/config.cmake

@@ -10,6 +10,12 @@ hunter_config(
     CMAKE_ARGS "CMAKE_CXX_FLAGS=-Wno-deprecated-copy"
 )
 
+hunter_config(
+    CURL
+    VERSION 7.60.0-p2
+    CMAKE_ARGS "HTTP_ONLY=ON"
+)
+
 hunter_config(
     spdlog
     URL https://github.com/gabime/spdlog/archive/v1.4.2.zip

cmake/dependencies.cmake

@@ -18,6 +18,10 @@ find_package(Microsoft.GSL CONFIG REQUIRED)
 hunter_add_package(OpenSSL)
 find_package(OpenSSL REQUIRED)
 
+# https://hunter.readthedocs.io/en/latest/packages/pkg/CURL.html#pkg-curl
+hunter_add_package(CURL)
+find_package(CURL CONFIG REQUIRED)
+
 # https://developers.google.com/protocol-buffers/
 hunter_add_package(Protobuf)
 find_package(Protobuf CONFIG REQUIRED)

core/common/blob.hpp

@@ -10,7 +10,9 @@
 
 #include <boost/format.hpp>
 #include <boost/functional/hash.hpp>
+
 #include "common/hexutil.hpp"
+#include "common/span.hpp"
 
 namespace fc::common {
 
@@ -74,14 +76,7 @@ namespace fc::common {
      * @return result containing Blob object if string has proper size
      */
     static outcome::result<Blob<size_>> fromString(std::string_view data) {
-      if (data.size() != size_) {
-        return BlobError::INCORRECT_LENGTH;
-      }
-
-      Blob<size_> b;
-      std::copy(data.begin(), data.end(), b.begin());
-
-      return b;
+      return fromSpan(span::cbytes(data));
     }
 
     /**

core/common/ffi.hpp

@@ -0,0 +1,32 @@
+/**
+ * Copyright Soramitsu Co., Ltd. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef CPP_FILECOIN_CORE_COMMON_FFI_HPP
+#define CPP_FILECOIN_CORE_COMMON_FFI_HPP
+
+#include <memory>
+
+#include "common/blob.hpp"
+
+namespace fc::common::ffi {
+  template <typename T, typename D>
+  auto wrap(T *ptr, D deleter) {
+    return std::unique_ptr<T, D>(ptr, deleter);
+  }
+
+  template <size_t size>
+  auto array(const uint8_t (&rhs)[size]) {
+    Blob<size> lhs;
+    std::copy(std::begin(rhs), std::end(rhs), std::begin(lhs));
+    return lhs;
+  }
+
+  template <size_t size>
+  void array(uint8_t (&lhs)[size], const std::array<uint8_t, size> rhs) {
+    std::copy(std::begin(rhs), std::end(rhs), std::begin(lhs));
+  }
+}  // namespace fc::common::ffi
+
+#endif  // CPP_FILECOIN_CORE_COMMON_FFI_HPP

core/common/span.hpp

@@ -11,6 +11,7 @@
 namespace fc::common::span {
   template <typename To, typename From>
   constexpr auto cast(gsl::span<From> span) {
+    static_assert(sizeof(To) == 1);
     // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
     return gsl::make_span(reinterpret_cast<To *>(span.data()), span.size());
   }

core/crypto/bls/CMakeLists.txt

@@ -8,6 +8,7 @@ add_library(bls_provider
     )
 
 target_link_libraries(bls_provider
+    blob
     filecoin_ffi
     outcome
     )