Added getShardAccountCell method

Author: kdimentionaltree

config/static_config.yaml

@@ -142,6 +142,13 @@ components_manager:
       cache_size: 4096
       cache_ways: 16
       cache_ttl: 1s
+    handler-GetShardAccountCellHandler:
+      path: /api/v2/getShardAccountCell
+      method: GET,POST
+      cache_enabled: true
+      cache_size: 4096
+      cache_ways: 16
+      cache_ttl: 1s
     handler-GetWalletInformation:
       path: /api/v2/getWalletInformation
       method: GET,POST

patches/ton_001.patch

@@ -1,8 +1,8 @@
 diff --git a/tonlib/tonlib/TonlibClient.cpp b/tonlib/tonlib/TonlibClient.cpp
-index 4ddcbbfa..5dd1c9cc 100644
+index 1591b872..455c1499 100644
 --- a/tonlib/tonlib/TonlibClient.cpp
 +++ b/tonlib/tonlib/TonlibClient.cpp
-@@ -3302,7 +3302,7 @@ td::Status TonlibClient::do_request(const tonlib_api::raw_sendMessage& request,
+@@ -3456,7 +3456,7 @@ td::Status TonlibClient::do_request(const tonlib_api::raw_sendMessage& request,
    TRY_RESULT_PREFIX(body, vm::std_boc_deserialize(request.body_), TonlibError::InvalidBagOfCells("body"));
    std::ostringstream os;
    block::gen::t_Message_Any.print_ref(os, body);
@@ -11,11 +11,11 @@ index 4ddcbbfa..5dd1c9cc 100644
    make_request(int_api::SendMessage{std::move(body)}, to_any_promise(std::move(promise)));
    return td::Status::OK();
  }
-@@ -4837,6 +4837,7 @@ td::Status TonlibClient::do_request(const tonlib_api::smc_runGetMethod& request,
+@@ -5003,6 +5003,7 @@ td::Status TonlibClient::do_request(const tonlib_api::smc_runGetMethod& request,
    args.set_extra_currencies(it->second->get_extra_currencies());
    args.set_now(it->second->get_sync_time());
    args.set_address(it->second->get_address());
 +  args.set_limits(vm::GasLimits(4000000, 4000000));
 
-   client_.with_last_config([self = this, smc = std::move(smc), args = std::move(args), promise = std::move(promise)
-   ](td::Result<LastConfigState> r_state) mutable {
+   client_.with_last_config([self = this, smc = std::move(smc), args = std::move(args),
+                             promise = std::move(promise)](td::Result<LastConfigState> r_state) mutable {

ton-http-api/CMakeLists.txt

@@ -119,6 +119,8 @@ set(TON_HTTP_API_CPP_SOURCE
         src/handlers/runmethod/RunGetMethodStdHandler.cpp
         src/handlers/send/EstimateFeeHandler.cpp
         src/handlers/runmethod/RunGetMethodHandler.cpp
+        src/handlers/accounts/GetShardAccountCellHandler.cpp
+        src/handlers/accounts/GetShardAccountCellHandler.h
 )
 add_executable(${PROJECT_NAME} ${TON_HTTP_API_CPP_SOURCE})
 target_include_directories(${PROJECT_NAME}

ton-http-api/schemas/v2.yaml

@@ -9,7 +9,7 @@ info:
     The response contains a JSON object, which always has a boolean field `ok` and either `error` or `result`. If `ok` equals true, the request was successful and the result of the query can be found in the `result` field. In case of an unsuccessful request, `ok` equals false and the error is explained in the `error`.
     
     API Key should be sent either as `api_key` query parameter or `X-API-Key` header
-  version: '2.1.1'
+  version: '2.1.11'
 paths:
   /api/v2/jsonRPC:
     post:
@@ -310,6 +310,52 @@ paths:
       security:
         - APIKeyHeader: [ ]
         - APIKeyQuery: [ ]
+  /api/v2/getShardAccountCell:
+    get:
+      tags:
+        - accounts
+      summary: Get Shard Address Cell
+      description: Get raw TVM cell with shard account
+      operationId: getShardAccountCell_get
+      parameters:
+        - $ref: '#/components/parameters/address'
+        - $ref: '#/components/parameters/seqnoOptional'
+      responses:
+        200:
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/TonlibResponse'
+        default:
+          $ref: '#/components/responses/default'
+      security:
+        - APIKeyHeader: [ ]
+        - APIKeyQuery: [ ]
+    post:
+      tags:
+        - rpc
+      summary: Get Shard Address Cell
+      description: Get raw TVM cell with shard account
+      operationId: getShardAccountCell_post
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/ShardAccountCellRequest'
+        required: true
+      responses:
+        200:
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/TonlibResponse'
+        default:
+          $ref: '#/components/responses/default'
+      security:
+        - APIKeyHeader: [ ]
+        - APIKeyQuery: [ ]
   /api/v2/getWalletInformation:
     get:
       tags:
@@ -1790,6 +1836,8 @@ components:
       $ref: '#/components/schemas/AddressRequest'
     AddressInformationRequest:
       $ref: '#/components/schemas/AddressWithSeqnoRequest'
+    ShardAccountCellRequest:
+      $ref: '#/components/schemas/AddressWithSeqnoRequest'
     ExtendedAddressInformationRequest:
       $ref: '#/components/schemas/AddressWithSeqnoRequest'
     WalletInformationRequest:
@@ -3281,6 +3329,7 @@ components:
         - $ref: '#/components/schemas/ResultOk'
         - $ref: '#/components/schemas/RunGetMethodStdResult'
         - $ref: '#/components/schemas/RunGetMethodResult'
+        - $ref: '#/components/schemas/TvmCell'
       discriminator:
         propertyName: '@type'
         mapping:
@@ -3313,6 +3362,7 @@ components:
           'ok': '#/components/schemas/ResultOk'
           'smc.runResult': '#/components/schemas/RunGetMethodStdResult'
           'ext.runResult': '#/components/schemas/RunGetMethodResult'
+          'tvm.cell': '#/components/schemas/TvmCell'
     TonlibResponse:
       type: object
       title: TonlibResponse

ton-http-api/src/core/tonlib_worker.h

@@ -46,6 +46,11 @@ class TonlibWorker {
     std::optional<std::int32_t> seqno = std::nullopt,
     multiclient::SessionPtr session = nullptr
   ) const;
+  [[nodiscard]] td::Result<tonlib_api::getShardAccountCell::ReturnType> getShardAccountCell(
+    const std::string& address,
+    std::optional<std::int32_t> seqno = std::nullopt,
+    multiclient::SessionPtr session = nullptr
+  ) const;
   [[nodiscard]] td::Result<tonlib_api::blocks_lookupBlock::ReturnType> lookupBlock(
     const std::int32_t& workchain,
     const std::int64_t& shard,

ton-http-api/src/core/tonlib_worker_accounts.cpp

@@ -88,4 +88,47 @@ td::Result<tonlib_api::getAccountState::ReturnType> TonlibWorker::getExtendedAdd
   TRY_RESULT(result, send_request_function(std::move(request), true));
   return ton::move_tl_object_as<tonlib_api::fullAccountState>(result);
 }
+td::Result<tonlib_api::getShardAccountCell::ReturnType> TonlibWorker::getShardAccountCell(
+  const std::string& address, std::optional<std::int32_t> seqno, multiclient::SessionPtr session
+) const {
+  tonlib_api::object_ptr<tonlib_api::ton_blockIdExt> with_block;
+  if (seqno.has_value()) {
+    TRY_RESULT_ASSIGN(
+      with_block, lookupBlock(ton::masterchainId, ton::shardIdAll, seqno.value(), std::nullopt, std::nullopt, session)
+    );
+  }
+  if (!with_block) {
+    auto request = multiclient::RequestFunction<tonlib_api::getShardAccountCell>{
+      .parameters = {.mode = multiclient::RequestMode::Single},
+      .request_creator =
+        [address_ = address] {
+          return tonlib_api::make_object<tonlib_api::getShardAccountCell>(
+            tonlib_api::make_object<tonlib_api::accountAddress>(address_)
+          );
+      },
+    .session = session
+  };
+    return send_request_function(std::move(request), true);
+  }
+  auto request = multiclient::RequestFunction<tonlib_api::withBlock>{
+    .parameters = {.mode = multiclient::RequestMode::Single},
+    .request_creator =
+      [address_ = address,
+       workchain_ = with_block->workchain_,
+       shard_ = with_block->shard_,
+       seqno_ = with_block->seqno_,
+       root_hash_ = with_block->root_hash_,
+       file_hash_ = with_block->file_hash_] {
+        return tonlib_api::make_object<tonlib_api::withBlock>(
+          tonlib_api::make_object<tonlib_api::ton_blockIdExt>(workchain_, shard_, seqno_, root_hash_, file_hash_),
+          tonlib_api::make_object<tonlib_api::getShardAccountCell>(
+            tonlib_api::make_object<tonlib_api::accountAddress>(address_)
+          )
+        );
+    },
+  .session = session
+};
+  TRY_RESULT(result, send_request_function(std::move(request), true));
+  return ton::move_tl_object_as<tonlib_api::tvm_cell>(result);
+}
 }  // namespace ton_http::core

ton-http-api/src/handlers/accounts/GetShardAccountCellHandler.cpp

@@ -0,0 +1,55 @@
+#include "GetShardAccountCellHandler.h"
+
+#include <boost/lexical_cast.hpp>
+#include "converters/convert.hpp"
+#include "utils/wallets.hpp"
+
+ton_http::handlers::GetShardAccountCellHandler::GetShardAccountCellHandler(
+  const userver::components::ComponentConfig& config, const userver::components::ComponentContext& context
+) :
+    TonlibRequestHandler(config, context) {
+}
+
+ton_http::schemas::v2::AddressInformationRequest ton_http::handlers::GetShardAccountCellHandler::
+  ParseTonlibGetRequest(const HttpRequest& request, RequestContext&) const {
+  schemas::v2::AddressInformationRequest req;
+
+  req.address = userver::chaotic::convert::Convert(
+    request.GetArg("address"), userver::chaotic::convert::To<ton_http::types::ton_addr>{}
+  );
+  if (request.HasArg("seqno")) {
+    try {
+      req.seqno = boost::lexical_cast<std::int32_t>(request.GetArg("seqno"));
+    } catch (std::exception& exc) {
+      throw utils::TonlibException("failed to parse seqno", 422);
+    }
+  }
+  return req;
+}
+td::Status ton_http::handlers::GetShardAccountCellHandler::ValidateRequest(
+  const schemas::v2::ShardAccountCellRequest& request
+) const {
+  if (request.address.empty()) {
+    return td::Status::Error(422, "empty address");
+  }
+  if (request.seqno.has_value() && request.seqno.value() <= 0) {
+    return td::Status::Error(422, "seqno should be positive");
+  }
+  return td::Status::OK();
+}
+td::Result<ton_http::schemas::v2::TvmCell>
+ton_http::handlers::GetShardAccountCellHandler::HandleRequestTonlibThrow(
+  schemas::v2::ShardAccountCellRequest& request, multiclient::SessionPtr& session
+) const {
+  auto result = tonlib_component_.DoRequest(
+    &core::TonlibWorker::getShardAccountCell, request.address.GetUnderlying(), request.seqno, session
+  );
+  if (result.is_error()) {
+    return result.move_as_error();
+  }
+  auto result_ok = result.move_as_ok();
+
+  // prepare response
+  auto response = converters::Convert(result_ok);
+  return response;
+}

ton-http-api/src/handlers/accounts/GetShardAccountCellHandler.h

@@ -0,0 +1,27 @@
+#pragma once
+#include "handlers/TonlibRequestHandler.h"
+#include "schemas/v2.hpp"
+
+
+namespace ton_http::handlers {
+
+class GetShardAccountCellHandler
+    : public TonlibRequestHandler<schemas::v2::ShardAccountCellRequest, schemas::v2::TvmCell> {
+public:
+  static constexpr std::string_view kName = "handler-GetShardAccountCellHandler";
+
+  GetShardAccountCellHandler(
+    const userver::components::ComponentConfig& config, const userver::components::ComponentContext& context
+  );
+
+  td::Status ValidateRequest(const schemas::v2::AddressInformationRequest& request) const override;
+  schemas::v2::ShardAccountCellRequest ParseTonlibGetRequest(
+    const HttpRequest& request, RequestContext& context
+  ) const override;
+
+  td::Result<schemas::v2::TvmCell> HandleRequestTonlibThrow(
+    schemas::v2::ShardAccountCellRequest& request, multiclient::SessionPtr& session
+  ) const override;
+};
+
+}  // namespace ton_http::handlers

ton-http-api/src/main.cpp

@@ -16,6 +16,7 @@
 #include "handlers/accounts/GetAddressInformationHandler.h"
 #include "handlers/accounts/GetAddressStateHandler.h"
 #include "handlers/accounts/GetExtendedAddressInformationHandler.h"
+#include "handlers/accounts/GetShardAccountCellHandler.h"
 #include "handlers/accounts/GetTokenDataHandler.h"
 #include "handlers/accounts/GetWalletInformationHandler.h"
 #include "handlers/blocks/GetBlockHeaderHandler.h"
@@ -76,6 +77,7 @@ int main(int argc, char* argv[]) {
   // accounts
   component_list.Append<ton_http::handlers::GetAddressInformationHandler>();
   component_list.Append<ton_http::handlers::GetExtendedAddressInformationHandler>();
+  component_list.Append<ton_http::handlers::GetShardAccountCellHandler>();
   component_list.Append<ton_http::handlers::GetWalletInformationHandler>();
   component_list.Append<ton_http::handlers::GetAddressBalanceHandler>();
   component_list.Append<ton_http::handlers::GetAddressStateHandler>();