Fix (#358)

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

Author: turuslan

cmake/Hunter/config.cmake

@@ -55,8 +55,8 @@ hunter_config(
 )
 
 hunter_config(libp2p
-    URL https://github.com/libp2p/cpp-libp2p/archive/8468ec2e77ffaf2f689b2516814931183553bdab.zip
-    SHA1 04a868164c18a0e1930b1b4a99e799051ff0c382
+    URL https://github.com/libp2p/cpp-libp2p/archive/909419207a99d7faab606ceb9a052920f7c6cc83.zip
+    SHA1 a203b7881ed5132f03c4f91f9bbff326b5d5f359
     CMAKE_ARGS TESTING=OFF EXAMPLES=OFF EXPOSE_MOCKS=ON
     KEEP_PACKAGE_SOURCES
     )

core/api/node_api.hpp

@@ -35,6 +35,7 @@ namespace fc::api {
   using primitives::ChainEpoch;
   using primitives::DealId;
   using primitives::EpochDuration;
+  using primitives::GasAmount;
   using primitives::RleBitset;
   using primitives::SectorNumber;
   using primitives::SectorSize;
@@ -195,12 +196,6 @@ namespace fc::api {
   };
 
   struct MessageSendSpec {
-    static TokenAmount maxFee(const boost::optional<MessageSendSpec> &spec) {
-      if (spec) {
-        return spec->max_fee;
-      }
-      return kFilecoinPrecision / 10;
-    };
     TokenAmount max_fee;
   };
 
@@ -255,6 +250,17 @@ namespace fc::api {
                const FileRef &)
     API_METHOD(ClientStartDeal, Wait<CID>, const StartDealParams &)
 
+    API_METHOD(GasEstimateFeeCap,
+               TokenAmount,
+               const UnsignedMessage &,
+               int64_t,
+               const TipsetKey &)
+    API_METHOD(GasEstimateGasPremium,
+               TokenAmount,
+               uint64_t,
+               const Address &,
+               GasAmount,
+               const TipsetKey &)
     API_METHOD(GasEstimateMessageGas,
                UnsignedMessage,
                const UnsignedMessage &,

core/api/utils.hpp

@@ -93,4 +93,4 @@ namespace fc::api {
 
   template <typename T>
   struct is_wait<Wait<T>> : std::true_type {};
-};  // namespace fc::api
+}  // namespace fc::api

core/api/visit.hpp

@@ -91,6 +91,8 @@ namespace fc::api {
     f(a.ClientQueryAsk);
     f(a.ClientRetrieve);
     f(a.ClientStartDeal);
+    f(a.GasEstimateFeeCap);
+    f(a.GasEstimateGasPremium);
     f(a.GasEstimateMessageGas);
     f(a.MarketReserveFunds);
     f(a.MinerCreateBlock);

core/blockchain/CMakeLists.txt

@@ -4,7 +4,6 @@
 #
 
 add_subdirectory(block_validator)
-add_subdirectory(message_pool)
 add_subdirectory(production)
 
 add_library(weight_calculator

core/blockchain/message_pool/CMakeLists.txt

@@ -3,8 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef CODEC_RLE_PLUS_HPP
-#define CODEC_RLE_PLUS_HPP
+#pragma once
 
 #include "codec/rle/rle_plus_decoding_stream.hpp"
 #include "codec/rle/rle_plus_encoding_stream.hpp"
@@ -53,6 +52,4 @@ namespace fc::codec::rle {
     }
     return data;
   }
-};  // namespace fc::codec::rle
-
-#endif
+}  // namespace fc::codec::rle

core/blockchain/message_pool/impl/gas_price_scored_message_storage.cpp

@@ -3,8 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef CODEC_RLE_PLUS_CONFIG_HPP
-#define CODEC_RLE_PLUS_CONFIG_HPP
+#pragma once
 
 namespace fc::codec::rle {
   /**
@@ -42,6 +41,4 @@ namespace fc::codec::rle {
    */
   const int OBJECT_MAX_SIZE = 0x100000;
 
-};  // namespace fc::codec::rle
-
-#endif
+}  // namespace fc::codec::rle

core/blockchain/message_pool/impl/gas_price_scored_message_storage.hpp

@@ -3,8 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef CPP_FILECOIN_RLE_PLUS_DECODING_STREAM_HPP
-#define CPP_FILECOIN_RLE_PLUS_DECODING_STREAM_HPP
+#pragma once
 
 #include <set>
 #include <vector>
@@ -172,6 +171,4 @@ namespace fc::codec::rle {
       magnitude_ = !magnitude_;
     }
   };
-};  // namespace fc::codec::rle
-
-#endif
+}  // namespace fc::codec::rle

core/blockchain/message_pool/impl/message_pool_error.cpp

@@ -3,8 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef CPP_FILECOIN_RLE_PLUS_ENCODING_STREAM_HPP
-#define CPP_FILECOIN_RLE_PLUS_ENCODING_STREAM_HPP
+#pragma once
 
 #include <set>
 #include <vector>
@@ -135,6 +134,4 @@ namespace fc::codec::rle {
   using Runs64 = std::vector<uint64_t>;
   Runs64 toRuns(const Set64 &set);
   Set64 fromRuns(const Runs64 &runs);
-};  // namespace fc::codec::rle
-
-#endif
+}  // namespace fc::codec::rle

core/blockchain/message_pool/message_pool_error.hpp

@@ -3,8 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef CRYPTO_BLS_PROVIDER_TYPES_HPP
-#define CRYPTO_BLS_PROVIDER_TYPES_HPP
+#pragma once
 
 #include "common/blob.hpp"
 #include "common/outcome.hpp"
@@ -35,8 +34,6 @@ namespace fc::crypto::bls {
     kInvalidPublicKey,
     kAggregateError,
   };
-};  // namespace fc::crypto::bls
+}  // namespace fc::crypto::bls
 
 OUTCOME_HPP_DECLARE_ERROR(fc::crypto::bls, Errors);
-
-#endif

core/blockchain/message_pool/message_storage.hpp

@@ -86,7 +86,7 @@ namespace fc::crypto::bls {
     }
     return ffi::array(response->signature.inner);
   }
-};  // namespace fc::crypto::bls
+}  // namespace fc::crypto::bls
 
 OUTCOME_CPP_DEFINE_CATEGORY(fc::crypto::bls, Errors, e) {
   using fc::crypto::bls::Errors;

core/codec/rle/rle_plus.hpp

@@ -18,7 +18,6 @@
 #include "storage/ipfs/graphsync/impl/graphsync_impl.hpp"
 #include "vm/actor/builtin/v0/market/market_actor.hpp"
 #include "vm/message/message.hpp"
-#include "vm/message/message_util.hpp"
 
 #define MOVE(x)  \
   x {            \
@@ -341,8 +340,9 @@ namespace fc::markets::storage::client {
         {}};
     OUTCOME_TRY(signed_message,
                 api_->MpoolPushMessage(unsigned_message, api::kPushNoSpec));
-    OUTCOME_TRY(message_cid, vm::message::cid(signed_message));
-    OUTCOME_TRY(msg_wait, api_->StateWaitMsg(message_cid, api::kNoConfidence));
+    OUTCOME_TRY(
+        msg_wait,
+        api_->StateWaitMsg(signed_message.getCid(), api::kNoConfidence));
     OUTCOME_TRY(msg_state, msg_wait.waitSync());
     if (msg_state.receipt.exit_code != VMExitCode::kOk) {
       return StorageMarketClientError::kAddFundsCallError;