Miner actor related (#111)

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

Author: turuslan

core/adt/balance_table_hamt.hpp

@@ -8,18 +8,17 @@
 
 #include "common/outcome.hpp"
 #include "primitives/address/address.hpp"
-#include "primitives/big_int.hpp"
 #include "primitives/cid/cid.hpp"
+#include "primitives/types.hpp"
 #include "storage/hamt/hamt.hpp"
 #include "storage/ipfs/datastore.hpp"
 
 namespace fc::adt {
 
-  using primitives::BigInt;
+  using primitives::TokenAmount;
   using primitives::address::Address;
   using storage::hamt::Hamt;
   using storage::ipfs::IpfsDatastore;
-  using TokenAmount = BigInt;
 
   /**
    * Stores miner balances

core/codec/cbor/cbor_decode_stream.hpp

@@ -26,6 +26,12 @@ namespace fc::codec::cbor {
         typename T,
         typename = std::enable_if_t<std::is_integral_v<T> || std::is_enum_v<T>>>
     CborDecodeStream &operator>>(T &num) {
+      if constexpr (std::is_enum_v<T>) {
+        std::underlying_type_t<T> value;
+        *this >> value;
+        num = T{value};
+        return *this;
+      }
       if constexpr (std::is_same_v<T, bool>) {
         if (!cbor_value_is_boolean(&value_)) {
           outcome::raise(CborDecodeError::WRONG_TYPE);

core/codec/cbor/cbor_encode_stream.hpp

@@ -13,6 +13,8 @@
 
 #include <cbor.h>
 
+#include "common/enum.hpp"
+
 namespace fc::codec::cbor {
   /** Encodes CBOR */
   class CborEncodeStream {
@@ -24,6 +26,9 @@ namespace fc::codec::cbor {
         typename T,
         typename = std::enable_if_t<std::is_integral_v<T> || std::is_enum_v<T>>>
     CborEncodeStream &operator<<(T num) {
+      if constexpr (std::is_enum_v<T>) {
+        return *this << common::to_int(num);
+      }
       addCount(1);
       std::array<uint8_t, 9> buffer{0};
       CborEncoder encoder;

core/crypto/randomness/randomness_types.hpp

@@ -21,7 +21,9 @@ namespace fc::crypto::randomness {
   enum class DomainSeparationTag : size_t {
     TicketDrawingDST = 1,
     TicketProductionDST = 2,
-    PoStDST = 3
+    PoStDST = 3,
+    SealRandomness = 4,
+    InteractiveSealChallengeSeed = 5,
   };
 
 }  // namespace fc::crypto::randomness

core/primitives/address/address.cpp

@@ -62,6 +62,10 @@ namespace fc::primitives::address {
     return {network, BLSPublicKeyHash{public_key}};
   }
 
+  uint64_t Address::getId() const {
+    return boost::get<uint64_t>(data);
+  }
+
   bool Address::verifySyntax(gsl::span<const uint8_t> seed_data) const {
     return visit_in_place(
         data,
@@ -86,8 +90,7 @@ namespace fc::primitives::address {
   }
 
   bool operator==(const Address &lhs, const Address &rhs) {
-    return lhs.network == rhs.network
-           && lhs.data == rhs.data;
+    return lhs.network == rhs.network && lhs.data == rhs.data;
   }
 
   bool operator!=(const Address &lhs, const Address &rhs) {

core/primitives/address/address.hpp

@@ -84,6 +84,8 @@ namespace fc::primitives::address {
     static Address makeBls(const BlsPublicKey &public_key,
                            Network network = kDefaultNetwork);
 
+    uint64_t getId() const;
+
     bool verifySyntax(gsl::span<const uint8_t> seed_data) const;
 
     Network network;

core/primitives/chain_epoch/chain_epoch.hpp

@@ -6,7 +6,7 @@
 #ifndef CPP_FILECOIN_PRIMITIVES_CHAIN_EPOCH_HPP
 #define CPP_FILECOIN_PRIMITIVES_CHAIN_EPOCH_HPP
 
-#include "primitives/big_int.hpp"
+#include <cstdint>
 
 namespace fc::primitives {
 

core/primitives/chain_epoch/chain_epoch_codec.cpp

@@ -11,11 +11,15 @@ namespace fc::primitives::chain_epoch {
 
   using libp2p::multi::UVarint;
 
+  std::string uvarintKey(uint64_t value) {
+    UVarint uvarint{value};
+    auto encoded = uvarint.toBytes();
+    return std::string(encoded.begin(), encoded.end());
+  }
+
   std::string encodeToByteString(const ChainEpoch &epoch) {
     // TODO (a.chernyshov) actor-specs uses Protobuf Varint encoding
-    UVarint number(epoch);
-    auto encoded = number.toBytes();
-    return std::string(encoded.begin(), encoded.end());
+    return uvarintKey(epoch);
   }
 
 }  // namespace fc::primitives::chain_epoch

core/primitives/chain_epoch/chain_epoch_codec.hpp

@@ -6,11 +6,14 @@
 #ifndef CPP_FILECOIN_PRIMITIVES_CHAIN_EPOCH_CODEC_HPP
 #define CPP_FILECOIN_PRIMITIVES_CHAIN_EPOCH_CODEC_HPP
 
+#include <string>
+
 #include "primitives/chain_epoch/chain_epoch.hpp"
 
 namespace fc::primitives::chain_epoch {
+  std::string uvarintKey(uint64_t value);
 
   std::string encodeToByteString(const ChainEpoch &epoch);
-}
+}  // namespace fc::primitives::chain_epoch
 
 #endif  // CPP_FILECOIN_PRIMITIVES_CHAIN_EPOCH_CODEC_HPP

core/primitives/types.hpp

@@ -0,0 +1,37 @@
+/**
+ * Copyright Soramitsu Co., Ltd. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef CPP_FILECOIN_CORE_PRIMITIVES_TYPES_HPP
+#define CPP_FILECOIN_CORE_PRIMITIVES_TYPES_HPP
+
+#include <cstdint>
+
+#include "codec/cbor/streams_annotation.hpp"
+#include "primitives/big_int.hpp"
+#include "primitives/chain_epoch/chain_epoch.hpp"
+
+namespace fc::primitives {
+  using ActorId = uint64_t;
+
+  using TokenAmount = BigInt;
+
+  using SectorSize = uint64_t;
+
+  using SectorNumber = uint64_t;
+
+  using DealWeight = BigInt;
+
+  using DealId = uint64_t;
+
+  struct SectorStorageWeightDesc {
+    SectorSize sector_size;
+    EpochDuration duration;
+    DealWeight deal_weight;
+  };
+
+  CBOR_TUPLE(SectorStorageWeightDesc, sector_size, duration, deal_weight)
+}  // namespace fc::primitives
+
+#endif  // CPP_FILECOIN_CORE_PRIMITIVES_TYPES_HPP