Payment api v2 (#1468)

* Add support of payment api v2

* Fix runtime dispatch info encoding

* Add wrappers to specify integer encoding - Fixed and Compact

Author: Harrm

core/api/jrpc/value_converter.hpp

@@ -60,7 +60,9 @@ namespace kagome::api {
   inline jsonrpc::Value makeValue(const common::Buffer &);
   inline jsonrpc::Value makeValue(common::BufferView);
   inline jsonrpc::Value makeValue(const primitives::Extrinsic &);
-  inline jsonrpc::Value makeValue(const primitives::RuntimeDispatchInfo &v);
+  template <typename Weight>
+  inline jsonrpc::Value makeValue(
+      const primitives::RuntimeDispatchInfo<Weight> &v);
   inline jsonrpc::Value makeValue(const primitives::DigestItem &);
   inline jsonrpc::Value makeValue(const primitives::BlockData &);
   inline jsonrpc::Value makeValue(const primitives::BlockHeader &);
@@ -90,6 +92,17 @@ namespace kagome::api {
     return ret;
   }
 
+  // TODO(Harrm): refactor to work specifically with Balance type
+  inline jsonrpc::Value makeValue(const primitives::Balance &val) {
+    jsonrpc::Value ret((*val).str());
+    return ret;
+  }
+
+  inline jsonrpc::Value makeValue(const primitives::OldWeight &val) {
+    jsonrpc::Value ret(static_cast<int64_t>(*val));
+    return ret;
+  }
+
   template <typename T>
   inline jsonrpc::Value makeValue(std::remove_reference_t<T> &&val) {
     return makeValue(val);
@@ -233,11 +246,13 @@ namespace kagome::api {
     return data;
   }
 
-  inline jsonrpc::Value makeValue(const primitives::RuntimeDispatchInfo &v) {
+  template <typename Weight>
+  inline jsonrpc::Value makeValue(
+      const primitives::RuntimeDispatchInfo<Weight> &v) {
     jStruct res;
     res["weight"] = makeValue(v.weight);
     res["partialFee"] = makeValue(v.partial_fee);
-    using Class = primitives::RuntimeDispatchInfo::DispatchClass;
+    using Class = primitives::DispatchClass;
     switch (v.dispatch_class) {
       case Class::Normal:
         res["class"] = "normal";

core/api/service/author/author_api.hpp

@@ -26,7 +26,6 @@ namespace kagome::api {
     using Hash256 = common::Hash256;
     using Buffer = common::Buffer;
     using Extrinsic = primitives::Extrinsic;
-    using Metadata = primitives::Metadata;
     using SubscriptionId = primitives::SubscriptionId;
     using ExtrinsicKey = primitives::ExtrinsicKey;
     using TransactionSource = primitives::TransactionSource;

core/api/service/payment/impl/payment_api_impl.cpp

@@ -19,10 +19,10 @@ namespace kagome::api {
     BOOST_ASSERT(block_tree_);
   }
 
-  outcome::result<primitives::RuntimeDispatchInfo> PaymentApiImpl::queryInfo(
-      const primitives::Extrinsic &extrinsic,
-      uint32_t len,
-      OptionalHashRef at) const {
+  outcome::result<primitives::RuntimeDispatchInfo<primitives::OldWeight>>
+  PaymentApiImpl::queryInfo(const primitives::Extrinsic &extrinsic,
+                            uint32_t len,
+                            OptionalHashRef at) const {
     if (at.has_value()) {
       return api_->query_info(at.value(), extrinsic, len);
     }

core/api/service/payment/impl/payment_api_impl.hpp

@@ -24,10 +24,10 @@ namespace kagome::api {
                    std::shared_ptr<const blockchain::BlockTree> block_tree);
     ~PaymentApiImpl() override = default;
 
-    outcome::result<primitives::RuntimeDispatchInfo> queryInfo(
-        const primitives::Extrinsic &extrinsic,
-        uint32_t len,
-        OptionalHashRef at) const override;
+    outcome::result<primitives::RuntimeDispatchInfo<primitives::OldWeight>>
+    queryInfo(const primitives::Extrinsic &extrinsic,
+              uint32_t len,
+              OptionalHashRef at) const override;
 
    private:
     std::shared_ptr<runtime::TransactionPaymentApi> api_;

core/api/service/payment/payment_api.hpp

@@ -22,10 +22,11 @@ namespace kagome::api {
 
     virtual ~PaymentApi() = default;
 
-    virtual outcome::result<primitives::RuntimeDispatchInfo> queryInfo(
-        const primitives::Extrinsic &extrinsic,
-        uint32_t len,
-        OptionalHashRef at) const = 0;
+    virtual outcome::result<
+        primitives::RuntimeDispatchInfo<primitives::OldWeight>>
+    queryInfo(const primitives::Extrinsic &extrinsic,
+              uint32_t len,
+              OptionalHashRef at) const = 0;
   };
 
 }  // namespace kagome::api

core/api/service/payment/requests/query_info.hpp

@@ -16,29 +16,31 @@
 namespace kagome::api::payment::request {
 
   class QueryInfo final
-      : public details::RequestType<primitives::RuntimeDispatchInfo,
-                                    std::string,
-                                    std::string> {
+      : public details::RequestType<
+            primitives::RuntimeDispatchInfo<primitives::OldWeight>,
+            std::string,
+            std::string> {
    public:
     explicit QueryInfo(std::shared_ptr<PaymentApi> api) : api_(std::move(api)) {
       BOOST_ASSERT(api_);
     };
 
-    outcome::result<primitives::RuntimeDispatchInfo> execute() override {
+    outcome::result<primitives::RuntimeDispatchInfo<primitives::OldWeight>>
+    execute() override {
       auto ext_hex = getParam<0>();
       OUTCOME_TRY(ext_bytes, common::unhexWith0x(ext_hex));
-      auto len = ext_bytes.size();
+
       OUTCOME_TRY(extrinsic, scale::decode<primitives::Extrinsic>(ext_bytes));
 
       auto at_hex = getParam<1>();
       if (at_hex.empty()) {
-        return api_->queryInfo(extrinsic, len, std::nullopt);
+        return api_->queryInfo(extrinsic, ext_bytes.size(), std::nullopt);
       }
       common::Hash256 at_hash;
       OUTCOME_TRY(at, common::unhexWith0x(at_hex));
       BOOST_ASSERT(at.size() == common::Hash256::size());
       std::copy_n(at.cbegin(), common::Hash256::size(), at_hash.begin());
-      return api_->queryInfo(extrinsic, len, std::cref(at_hash));
+      return api_->queryInfo(extrinsic, ext_bytes.size(), std::cref(at_hash));
     }
 
    private:

core/common/CMakeLists.txt

@@ -32,8 +32,8 @@ target_link_libraries(fd_limit
     )
 
 add_library(mp_utils
-    mp_utils.cpp
-    mp_utils.hpp
+    int_serialization.cpp
+    int_serialization.hpp
     )
 target_link_libraries(mp_utils
     Boost::boost

core/common/mp_utils.cpp core/common/int_serialization.cppcore/common/mp_utils.cpp renamed to core/common/int_serialization.cpp

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "common/mp_utils.hpp"
+#include "common/int_serialization.hpp"
 
 #include <gsl/gsl_util>
 

core/common/mp_utils.hpp core/common/int_serialization.hppcore/common/mp_utils.hpp renamed to core/common/int_serialization.hpp

@@ -13,7 +13,7 @@ extern "C" {
 #include <gsl/span>
 
 #include "common/blob.hpp"
-#include "common/mp_utils.hpp"
+#include "common/int_serialization.hpp"
 #include "scale/tie.hpp"
 
 namespace kagome::crypto {