StoragePowerActor - 0-2 methods (#106)

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

Author: Alexey-N-Chernyshov

core/adt/impl/balance_table_hamt.cpp

@@ -12,7 +12,7 @@ using fc::primitives::address::encodeToByteString;
 
 BalanceTableHamt::BalanceTableHamt(std::shared_ptr<IpfsDatastore> datastore,
                                    const CID &new_root)
-    : root{new_root}, hamt_{datastore} {}
+    : root{new_root}, hamt_{datastore, new_root} {}
 
 fc::outcome::result<TokenAmount> BalanceTableHamt::get(
     const Address &key) const {

core/vm/actor/builtin/CMakeLists.txt

@@ -10,4 +10,5 @@ add_subdirectory(miner)
 add_subdirectory(multisig)
 add_subdirectory(payment_channel)
 add_subdirectory(reward)
+add_subdirectory(shared)
 add_subdirectory(storage_power)

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

@@ -4,15 +4,15 @@
  */
 
 #include "vm/actor/builtin/cron/cron_actor.hpp"
+#include "vm/actor/builtin/storage_power/storage_power_actor_export.hpp"
 
 namespace fc::vm::actor::builtin::cron {
   /**
    * Entries is a set of actors (and corresponding methods) to call during
    * EpochTick
    */
   std::vector<CronTableEntry> entries = {
-      {kStoragePowerAddress,
-       {storage_power::SpaMethods::CHECK_PROOF_SUBMISSIONS}}};
+      {kStoragePowerAddress, {storage_power::kOnEpochTickEndMethodNumber}}};
 
   outcome::result<InvocationOutput> epochTick(const Actor &actor,
                                               Runtime &runtime,

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

@@ -7,7 +7,6 @@
 #define CPP_FILECOIN_CORE_VM_ACTOR_CRON_ACTOR_HPP
 
 #include "vm/actor/actor_method.hpp"
-#include "vm/actor/builtin/storage_power/storage_power_actor_state.hpp"
 
 namespace fc::vm::actor::builtin::cron {
 

core/vm/actor/builtin/miner/miner_actor.hpp

@@ -6,11 +6,24 @@
 #ifndef CPP_FILECOIN_CORE_VM_ACTOR_BUILTIN_MINER_MINER_ACTOR_HPP
 #define CPP_FILECOIN_CORE_VM_ACTOR_BUILTIN_MINER_MINER_ACTOR_HPP
 
-#include "vm/actor/actor_method.hpp"
+#include "codec/cbor/streams_annotation.hpp"
+#include "primitives/address/address.hpp"
+#include "primitives/address/address_codec.hpp"
+#include "vm/actor/actor.hpp"
 #include "vm/actor/builtin/miner/types.hpp"
 
 namespace fc::vm::actor::builtin::miner {
+
+  constexpr MethodNumber kGetControlAddresses{2};
   constexpr MethodNumber kSubmitElectionPoStMethodNumber{20};
+
+  struct GetControlAddressesReturn {
+    Address owner;
+    Address worker;
+  };
+
+  CBOR_TUPLE(GetControlAddressesReturn, owner, worker);
+
 }  // namespace fc::vm::actor::builtin::miner
 
 #endif  // CPP_FILECOIN_CORE_VM_ACTOR_BUILTIN_MINER_MINER_ACTOR_HPP

core/vm/actor/builtin/miner/types.hpp

@@ -10,6 +10,7 @@
 
 #include "primitives/address/address_codec.hpp"
 #include "primitives/big_int.hpp"
+#include "primitives/chain_epoch/chain_epoch.hpp"
 #include "primitives/rle_bitset/rle_bitset.hpp"
 #include "proofs/proofs.hpp"
 

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

@@ -0,0 +1,13 @@
+#
+# Copyright Soramitsu Co., Ltd. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+
+add_library(builtin_shared
+    shared.cpp
+    )
+target_link_libraries(builtin_shared
+    actor
+    address
+    runtime
+    )

core/vm/actor/builtin/shared/shared.cpp

@@ -0,0 +1,26 @@
+/**
+ * Copyright Soramitsu Co., Ltd. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "vm/actor/builtin/shared/shared.hpp"
+#include "adt/balance_table_hamt.hpp"
+#include "codec/cbor/cbor.hpp"
+
+namespace fc::vm::actor::builtin {
+
+  using adt::TokenAmount;
+  using power::Address;
+  using miner::kGetControlAddresses;
+  using runtime::Runtime;
+  using codec::cbor::decode;
+
+  fc::outcome::result<GetControlAddressesReturn> requestMinerControlAddress(
+      Runtime &runtime, const Address &miner) {
+    OUTCOME_TRY(result,
+                runtime.send(miner, kGetControlAddresses, {}, TokenAmount{0}));
+    OUTCOME_TRY(addresses, decode<GetControlAddressesReturn>(result.return_value.toVector()));
+    return std::move(addresses);
+  }
+
+}  // namespace fc::vm::actor::builtin

core/vm/actor/builtin/shared/shared.hpp

@@ -0,0 +1,32 @@
+/**
+ * Copyright Soramitsu Co., Ltd. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef CPP_FILECOIN_SHARED_HPP
+#define CPP_FILECOIN_SHARED_HPP
+
+#include "primitives/address/address.hpp"
+#include "vm/actor/builtin/miner/miner_actor.hpp"
+#include "vm/runtime/runtime.hpp"
+
+/**
+ * Code shared by multiple built-in actors
+ */
+
+namespace fc::vm::actor::builtin {
+
+  using miner::GetControlAddressesReturn;
+  using runtime::Runtime;
+
+  /**
+   * Get worker address
+   * @param runtime
+   * @param miner
+   * @return
+   */
+  fc::outcome::result<GetControlAddressesReturn> requestMinerControlAddress(
+      Runtime &runtime, const Address &miner);
+}  // namespace fc::vm::actor::builtin
+
+#endif  // CPP_FILECOIN_SHARED_HPP

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

@@ -5,9 +5,11 @@
 
 add_library(storage_power_actor
     storage_power_actor_state.cpp
+    storage_power_actor_export.cpp
     )
 target_link_libraries(storage_power_actor
     actor
+    builtin_shared
     chain_epoch_codec
     balance_table_hamt
     hamt