Feature/tipsets (#72)

* start implementing tipset

Signed-off-by: Yura Zarudniy <[email protected]>

* implement feature

Signed-off-by: Yura Zarudniy <[email protected]>

* fix clang-tidy issues

Signed-off-by: Yura Zarudniy <[email protected]>

* use new libp2p version, correct encodeKey function

Signed-off-by: Yura Zarudniy <[email protected]>

* refactore CID::toString()

Signed-off-by: Yura Zarudniy <[email protected]>

* temporary fix for failing github

Signed-off-by: Yura Zarudniy <[email protected]>

* remove redundant decodeKey function

Signed-off-by: Yura Zarudniy <[email protected]>

* start adding tests

Signed-off-by: Yura Zarudniy <[email protected]>

* refactore tipsetkey

Signed-off-by: Yura Zarudniy <[email protected]>

* remove commented out code

Signed-off-by: Yura Zarudniy <[email protected]>

* fix blockheader, add tipset tests

Signed-off-by: Yura Zarudniy <[email protected]>

* fix review issues

Signed-off-by: Yura Zarudniy <[email protected]>

* fix  problem

Signed-off-by: Yura Zarudniy <[email protected]>

* fix create tipset test

Signed-off-by: Yura Zarudniy <[email protected]>

* fix review issues, use new libp2p version, add tests for tipsetkey

Signed-off-by: Yura Zarudniy <[email protected]>

* fix review issues

Signed-off-by: Yura Zarudniy <[email protected]>

* fix comment

Signed-off-by: Yura Zarudniy <[email protected]>

Author: Yura Zarudniy

.github/workflows/ci.yml

@@ -49,7 +49,7 @@ jobs:
           sudo apt-get install -y ninja-build
         fi
 
-        sudo python3 -m pip install --upgrade pip
+        pip3 -V || sudo python3 -m pip install --upgrade pip
         sudo pip3 install scikit-build cmake requests gitpython gcovr pyyaml
         sudo curl https://sh.rustup.rs -sSf | sh -s -- -y
     - name: cmake

cmake/Hunter/config.cmake

@@ -30,7 +30,7 @@ hunter_config(
 )
 
 hunter_config(libp2p
-    URL https://github.com/soramitsu/libp2p/archive/40b257824d3c88c30e474267222955db0a5fccfc.zip
-    SHA1 40e2713d976858d31637f123a54896d25a78661d
+    URL https://github.com/soramitsu/libp2p/archive/cdc092fe74ef5d8eeedf42e3e949488ff5052cb4.zip
+    SHA1 16605084e4f018ebdb09018e906a54aa1909c8e1
     CMAKE_ARGS TESTING=OFF
     )

core/codec/cbor/cbor_encode_stream.hpp

@@ -53,14 +53,26 @@ namespace fc::codec::cbor {
 
     /// Encodes elements into list
     template <typename T>
-    CborEncodeStream &operator<<(const std::vector<T> &values) {
+    CborEncodeStream &operator<<(const gsl::span<T> &values) {
       auto l = list();
       for (auto &value : values) {
         l << value;
       }
       return *this << l;
     }
 
+    /// Encodes vector into list
+    template <typename T>
+    CborEncodeStream &operator<<(const std::vector<T> &values) {
+      return *this << gsl::make_span(values);
+    }
+
+    /// Encodes array into list
+    template <class T, size_t size>
+    CborEncodeStream &operator<<(const std::array<T, size> &values) {
+      return *this << gsl::make_span(values);
+    }
+
     /** Encodes bytes */
     CborEncodeStream &operator<<(const std::vector<uint8_t> &bytes);
     /** Encodes bytes */

core/primitives/CMakeLists.txt

@@ -7,3 +7,4 @@ add_subdirectory(address)
 add_subdirectory(block)
 add_subdirectory(cid)
 add_subdirectory(ticket)
+add_subdirectory(tipset)

core/primitives/address/address.cpp

@@ -18,9 +18,8 @@ OUTCOME_CPP_DEFINE_CATEGORY(fc::primitives::address, AddressError, e) {
     case (AddressError::UNKNOWN_NETWORK):
       return "Failed to create address: network must either be MAINNET or "
              "TESTNET";
-    default:
-      return "Failed to create address: unknown error";
-  };
+  }
+  return "Failed to create address: unknown error";
 }
 
 namespace fc::primitives::address {

core/primitives/block/CMakeLists.txt

@@ -7,5 +7,6 @@ add_library(block INTERFACE)
 target_link_libraries(block INTERFACE
     address
     cbor
+    signature
     tickets
     )

core/primitives/block/block.hpp

@@ -8,14 +8,14 @@
 #include "primitives/ticket/epost_ticket_codec.hpp"
 #include "primitives/ticket/ticket.hpp"
 #include "primitives/ticket/ticket_codec.hpp"
+#include "crypto/signature/signature.hpp"
 
 namespace fc::primitives::block {
   using primitives::BigInt;
   using primitives::address::Address;
   using primitives::ticket::EPostProof;
   using primitives::ticket::Ticket;
-
-  // TODO(turuslan): FIL-72 signature
+  // TODO (yuraz) : FIL-142 replace by crypto::signature::Signature
   using Signature = std::vector<uint8_t>;
 
   struct BlockHeader {
@@ -31,8 +31,21 @@ namespace fc::primitives::block {
     Signature bls_aggregate;
     uint64_t timestamp;
     boost::optional<Signature> block_sig;
+    uint64_t fork_signaling;
   };
 
+  inline bool operator==(const BlockHeader &lhs, const BlockHeader &rhs) {
+    return lhs.miner == rhs.miner && lhs.ticket == rhs.ticket
+           && lhs.epost_proof == rhs.epost_proof && lhs.parents == rhs.parents
+           && lhs.parent_weight == rhs.parent_weight && lhs.height == rhs.height
+           && lhs.parent_state_root == rhs.parent_state_root
+           && lhs.parent_message_receipts == rhs.parent_message_receipts
+           && lhs.messages == rhs.messages
+           && lhs.bls_aggregate == rhs.bls_aggregate
+           && lhs.timestamp == rhs.timestamp && lhs.block_sig == rhs.block_sig
+           && lhs.fork_signaling == rhs.fork_signaling;
+  }
+
   template <class Stream,
             typename = std::enable_if_t<
                 std::remove_reference_t<Stream>::is_cbor_encoder_stream>>
@@ -42,7 +55,7 @@ namespace fc::primitives::block {
                           << block.height << block.parent_state_root
                           << block.parent_message_receipts << block.messages
                           << block.bls_aggregate << block.timestamp
-                          << block.block_sig);
+                          << block.block_sig << block.fork_signaling);
   }
 
   template <class Stream,
@@ -53,7 +66,7 @@ namespace fc::primitives::block {
         >> block.parents >> block.parent_weight >> block.height
         >> block.parent_state_root >> block.parent_message_receipts
         >> block.messages >> block.bls_aggregate >> block.timestamp
-        >> block.block_sig;
+        >> block.block_sig >> block.fork_signaling;
     return s;
   }
 }  // namespace fc::primitives::block

core/primitives/cid/cid.cpp

@@ -5,6 +5,7 @@
 
 #include "primitives/cid/cid.hpp"
 
+#include <libp2p/multi/content_identifier_codec.hpp>
 #include "crypto/blake2/blake2b160.hpp"
 
 namespace fc {
@@ -13,6 +14,15 @@ namespace fc {
           {}, {}, libp2p::multi::Multihash::create({}, {}).value()) {}
 
   CID::CID(const ContentIdentifier &cid) : ContentIdentifier(cid) {}
+
+  outcome::result<std::string> CID::toString() const {
+    return libp2p::multi::ContentIdentifierCodec::toString(*this);
+  }
+
+  outcome::result<std::vector<uint8_t>> CID::toBytes() const {
+    return libp2p::multi::ContentIdentifierCodec::encode(*this);
+  }
+
 }  // namespace fc
 
 namespace fc::common {

core/primitives/cid/cid.hpp

@@ -23,6 +23,17 @@ namespace fc {
      */
     CID();
     CID(const ContentIdentifier &cid);
+    /**
+     * @brief string-encodes cid
+     * @return encoded value or error
+     */
+    outcome::result<std::string> toString() const;
+
+    /**
+     * @brief encodes CID to bytes
+     * @return byte-representation of CID
+     */
+    outcome::result<std::vector<uint8_t>> toBytes() const;
   };
 }  // namespace fc
 

core/primitives/cid/cid_of_cbor.hpp

@@ -0,0 +1,27 @@
+/**
+ * Copyright Soramitsu Co., Ltd. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef CPP_FILECOIN_CORE_PRIMITIVES_CID_CID_OF_CBOR_HPP
+#define CPP_FILECOIN_CORE_PRIMITIVES_CID_CID_OF_CBOR_HPP
+
+#include "primitives/cid/cid.hpp"
+#include "codec/cbor/cbor.hpp"
+
+namespace fc::primitives::cid {
+
+  /**
+   * @brief helper function to calculate cid of an object
+   * @tparam T object type
+   * @param value object instance reference
+   * @return calculated cid or error
+   */
+  template <class T>
+  outcome::result<CID> getCidOfCbor(const T &value) {
+    OUTCOME_TRY(bytes, fc::codec::cbor::encode(value));
+    return common::getCidOf(bytes);
+  }
+}  // namespace fc::primitives::cid
+
+#endif  // CPP_FILECOIN_CORE_PRIMITIVES_CID_CID_OF_CBOR_HPP