Feature/mv builtin actors (#87)

Signed-off-by: Alexey-N-Chernyshov <[email protected]>

Author: Alexey-N-Chernyshov

core/codec/cbor/cbor_decode_stream.hpp

@@ -88,6 +88,15 @@ namespace fc::codec::cbor {
       return *this;
     }
 
+    /// Decodes elements to map
+    template <typename T>
+    CborDecodeStream &operator>>(std::map<std::string, T> &items) {
+      for (auto &m : map()) {
+         m.second >> items[m.first];
+      }
+      return *this;
+    }
+
     /** Decodes bytes */
     CborDecodeStream &operator>>(std::vector<uint8_t> &bytes);
     /** Decodes string */

core/codec/cbor/cbor_encode_stream.hpp

@@ -61,6 +61,16 @@ namespace fc::codec::cbor {
       return *this << l;
     }
 
+    /// Encodes elements into map
+    template <typename T>
+    CborEncodeStream &operator<<(const std::map<std::string, T> &items) {
+      auto m = map();
+      for (auto &item : items) {
+        m[item.first] << item.second;
+      }
+      return *this << m;
+    }
+
     /// Encodes vector into list
     template <typename T>
     CborEncodeStream &operator<<(const std::vector<T> &values) {

core/vm/actor/CMakeLists.txt

@@ -6,18 +6,17 @@
 add_subdirectory(builtin)
 
 add_library(actor
-    account_actor.cpp
     actor.cpp
-    init_actor.cpp
-    cron_actor.cpp
     impl/invoker_impl.cpp
-    storage_power_actor.cpp
     )
 target_link_libraries(actor
+    account_actor
     address
+    buffer
     cid
     exit_code
-    hamt
-    power_table
+    init_actor
     multisig_actor
+    storage_power_actor
+    cron_actor
     )

core/vm/actor/builtin/CMakeLists.txt

@@ -3,4 +3,8 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
+add_subdirectory(account)
+add_subdirectory(cron)
+add_subdirectory(init)
 add_subdirectory(multisig)
+add_subdirectory(storage_power)

core/vm/actor/builtin/account/CMakeLists.txt

@@ -0,0 +1,12 @@
+#
+# Copyright Soramitsu Co., Ltd. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+
+add_library(account_actor
+    account_actor.cpp
+    )
+target_link_libraries(account_actor
+    actor
+    outcome
+    )

core/vm/actor/account_actor.cpp renamed to core/vm/actor/builtin/account/account_actor.cpp

@@ -3,11 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "vm/actor/account_actor.hpp"
+#include "vm/actor/builtin/account/account_actor.hpp"
 
 #include "vm/exit_code/exit_code.hpp"
 
-namespace fc::vm::actor {
+namespace fc::vm::actor::builtin::account {
+
   outcome::result<Actor> AccountActor::create(
       const std::shared_ptr<StateTree> &state_tree, const Address &address) {
     if (!address.isKeyType()) {
@@ -40,4 +41,4 @@ namespace fc::vm::actor {
                 state_tree->getStore()->getCbor<AccountActorState>(actor.head));
     return account_actor_state.address;
   }
-}  // namespace fc::vm::actor
+}  // namespace fc::vm::actor::builtin::account

core/vm/actor/account_actor.hpp renamed to core/vm/actor/builtin/account/account_actor.hpp

@@ -9,7 +9,8 @@
 #include "primitives/address/address_codec.hpp"
 #include "vm/state/state_tree.hpp"
 
-namespace fc::vm::actor {
+namespace fc::vm::actor::builtin::account {
+
   using primitives::address::Address;
   using primitives::address::Protocol;
   using state::StateTree;
@@ -47,6 +48,6 @@ namespace fc::vm::actor {
     static outcome::result<Address> resolveToKeyAddress(
         const std::shared_ptr<StateTree> &state_tree, const Address &address);
   };
-}  // namespace fc::vm::actor
+}  // namespace fc::vm::actor::builtin::account
 
 #endif  // CPP_FILECOIN_CORE_VM_ACTOR_ACCOUNT_ACTOR_HPP

core/vm/actor/builtin/cron/CMakeLists.txt

@@ -0,0 +1,12 @@
+#
+# Copyright Soramitsu Co., Ltd. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+
+add_library(cron_actor
+    cron_actor.cpp
+    )
+target_link_libraries(cron_actor
+    actor
+    outcome
+    )

core/vm/actor/cron_actor.cpp renamed to core/vm/actor/builtin/cron/cron_actor.cpp

@@ -3,15 +3,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "vm/actor/cron_actor.hpp"
+#include "vm/actor/builtin/cron/cron_actor.hpp"
 
-namespace fc::vm::actor::cron_actor {
+namespace fc::vm::actor::builtin::cron {
   /**
    * Entries is a set of actors (and corresponding methods) to call during
    * EpochTick
    */
   std::vector<CronTableEntry> entries = {
-      {kStoragePowerAddress, {SpaMethods::CHECK_PROOF_SUBMISSIONS}}};
+      {kStoragePowerAddress,
+       {storage_power::SpaMethods::CHECK_PROOF_SUBMISSIONS}}};
 
   outcome::result<InvocationOutput> epochTick(const Actor &actor,
                                               Runtime &runtime,
@@ -29,4 +30,4 @@ namespace fc::vm::actor::cron_actor {
   const ActorExports exports = {
       {kEpochTickMethodNumber, ActorMethod(epochTick)},
   };
-}  // namespace fc::vm::actor::cron_actor
+}  // namespace fc::vm::actor::builtin::cron

core/vm/actor/cron_actor.hpp renamed to core/vm/actor/builtin/cron/cron_actor.hpp

@@ -7,9 +7,10 @@
 #define CPP_FILECOIN_CORE_VM_ACTOR_CRON_ACTOR_HPP
 
 #include "vm/actor/actor_method.hpp"
-#include "vm/actor/storage_power_actor.hpp"
+#include "vm/actor/builtin/storage_power/storage_power_actor.hpp"
+
+namespace fc::vm::actor::builtin::cron {
 
-namespace fc::vm::actor::cron_actor {
   struct CronTableEntry {
     Address to_addr;
     MethodNumber method_num{};
@@ -30,6 +31,6 @@ namespace fc::vm::actor::cron_actor {
 
   extern const ActorExports exports;
 
-}  // namespace fc::vm::actor::cron_actor
+}  // namespace fc::vm::actor::builtin::cron
 
 #endif  // CPP_FILECOIN_CORE_VM_ACTOR_CRON_ACTOR_HPP