Merge branch 'main' into 00990-add-customfeelimits-for-scheduled-transactions

Author: SimiHunjan

.github/workflows/zxc-build-library.yaml

@@ -54,7 +54,7 @@ jobs:
           egress-policy: audit
 
       - name: Checkout Code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Run Clang-Format
         uses: jidicula/clang-format-action@4726374d1aa3c6aecf132e5197e498979588ebc8 # v4.15.0
@@ -122,7 +122,7 @@ jobs:
           echo "exec=${CG_EXEC}" >> "${GITHUB_OUTPUT}"
 
       - name: Checkout Code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           submodules: true
 
@@ -140,7 +140,7 @@ jobs:
         run: mkdir -p "${{ github.workspace }}/b/vcpkg_cache"
 
       - name: Install CMake & Ninja
-        uses: lukka/get-cmake@6b3e96a9bc9976b8b546346fdd102effedae0ca8 # v4.02
+        uses: lukka/get-cmake@f3273e0bcecf2f2c0d3430de21bf02ab2752c47d # v4.02
         with:
           useCloudCache: true
 
@@ -180,7 +180,7 @@ jobs:
 
       - name: Prepare Hiero Solo
         id: solo
-        uses: hiero-ledger/hiero-solo-action@71219540ac7f578e6ea4fc3c17575c0295e56163 # v0.9
+        uses: hiero-ledger/hiero-solo-action@10ec96a107b8d2f5cd26b3e7ab47e65407b5c462 # v0.11.0
         with:
           installMirrorNode: true
           hieroVersion: v0.65.0
@@ -221,7 +221,7 @@ jobs:
           egress-policy: audit
 
       - name: Checkout Code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           fetch-depth: 0
 
@@ -231,7 +231,7 @@ jobs:
           msbuild-architecture: x64
 
       - name: Setup-perl
-        uses: shogo82148/actions-setup-perl@22423f01bde48fb88785c007e3166fbbbd8e892a # v1.34.0
+        uses: shogo82148/actions-setup-perl@5796a908661aa68fc0a5b8f55c6791af2376d72e # v1.35.0
         with:
           perl-version: "5.32"
           distribution: strawberry
@@ -282,7 +282,7 @@ jobs:
           egress-policy: audit
 
       - name: Checkout Code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           fetch-depth: 0
 

src/sdk/main/include/NodeUpdateTransaction.h

@@ -213,6 +213,13 @@ class NodeUpdateTransaction : public Transaction<NodeUpdateTransaction>
    */
   NodeUpdateTransaction& setGrpcWebProxyEndpoint(const Endpoint& endpoint);
 
+  /**
+   * Deletes the gRPC-Web proxy endpoint and sets it to null in the mirror node.
+   *
+   * @return A reference to this NodeUpdateTransaction with the gRPC-Web proxy endpoint cleared.
+   */
+  NodeUpdateTransaction& deleteGrpcWebProxyEndpoint();
+
 private:
   friend class WrappedTransaction;
 

src/sdk/main/src/NodeUpdateTransaction.cc

@@ -106,6 +106,14 @@ NodeUpdateTransaction& NodeUpdateTransaction::setGrpcWebProxyEndpoint(const Endp
   return *this;
 }
 
+//-----
+NodeUpdateTransaction& NodeUpdateTransaction::deleteGrpcWebProxyEndpoint()
+{
+  requireNotFrozen();
+  mGrpcWebProxyEndpoint.reset();
+  return *this;
+}
+
 //-----
 grpc::Status NodeUpdateTransaction::submitRequest(const proto::Transaction& request,
                                                   const std::shared_ptr<internal::Node>& node,

src/sdk/tests/unit/NodeUpdateTransactionUnitTests.cc

@@ -209,3 +209,20 @@ TEST_F(NodeUpdateTransactionUnitTests, SetAndGetGrpcWebProxyEndpoint)
   ASSERT_TRUE(transaction.getGrpcWebProxyEndpoint().has_value());
   ASSERT_EQ(transaction.getGrpcWebProxyEndpoint().value().getDomainName(), proxyEndpoint.getDomainName());
 }
+
+//-----
+TEST_F(NodeUpdateTransactionUnitTests, DeleteGrpcWebProxyEndpoint)
+{
+  // Given
+  Endpoint proxyEndpoint = Endpoint().setDomainName("grpc-web.example.com").setPort(443);
+  transaction.setGrpcWebProxyEndpoint(proxyEndpoint);
+
+  // Verify endpoint is initially set
+  ASSERT_TRUE(transaction.getGrpcWebProxyEndpoint().has_value());
+
+  // When
+  transaction.deleteGrpcWebProxyEndpoint();
+
+  // Then
+  ASSERT_FALSE(transaction.getGrpcWebProxyEndpoint().has_value());
+}

src/tck/CMakeLists.txt

@@ -1,6 +1,7 @@
 set(TCK_SERVER_NAME ${PROJECT_NAME}-tck)
 add_executable(${TCK_SERVER_NAME}
         src/account/AccountService.cc
+        src/file/FileService.cc
         src/json/JsonRpcException.cc
         src/json/JsonUtils.cc
         src/key/KeyService.cc

src/tck/include/file/FileService.h

@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: Apache-2.0
+#ifndef HIERO_TCK_CPP_FILE_SERVICE_H_
+#define HIERO_TCK_CPP_FILE_SERVICE_H_
+
+#include <nlohmann/json_fwd.hpp>
+
+namespace Hiero::TCK::FileService
+{
+/**
+ * Forward declarations.
+ */
+struct CreateFileParams;
+struct UpdateFileParams;
+
+/**
+ * Create a file.
+ *
+ * @param params The parameters to use to create a file.
+ * @return A JSON response containing the created file ID and the status of the file creation.
+ */
+nlohmann::json createFile(const CreateFileParams& params);
+
+/**
+ * Update a file.
+ *
+ * @param params The parameters to use to update a file.
+ * @return A JSON response containing the status of the file update.
+ */
+nlohmann::json updateFile(const UpdateFileParams& params);
+
+} // namespace Hiero::TCK::FileService
+
+#endif // HIERO_TCK_CPP_FILE_SERVICE_H_

src/tck/include/file/params/CreateFileParams.h

@@ -0,0 +1,69 @@
+// SPDX-License-Identifier: Apache-2.0
+#ifndef HIERO_TCK_CPP_CREATE_FILE_PARAMS_H_
+#define HIERO_TCK_CPP_CREATE_FILE_PARAMS_H_
+
+#include "common/CommonTransactionParams.h"
+#include "json/JsonUtils.h"
+
+#include <nlohmann/json.hpp>
+#include <optional>
+#include <string>
+#include <vector>
+
+namespace Hiero::TCK::FileService
+{
+/**
+ * Struct to hold the arguments for a `createFile` JSON-RPC method call.
+ */
+struct CreateFileParams
+{
+  /**
+   * The keys that must sign when mutating the new file.
+   */
+  std::optional<std::vector<std::string>> mKeys;
+
+  /**
+   * The contents of the new file.
+   */
+  std::optional<std::string> mContents;
+
+  /**
+   * The memo for the new file.
+   */
+  std::optional<std::string> mFileMemo;
+
+  /**
+   * The time at which the new file will expire.
+   */
+  std::optional<std::string> mExpirationTime;
+
+  /**
+   * Any parameters common to all transaction types.
+   */
+  std::optional<CommonTransactionParams> mCommonTxParams;
+};
+
+} // namespace Hiero::TCK::FileService
+
+namespace nlohmann
+{
+/**
+ * JSON serializer template specialization required to convert CreateFileParams arguments properly.
+ */
+template<>
+struct [[maybe_unused]] adl_serializer<Hiero::TCK::FileService::CreateFileParams>
+{
+  static void from_json(const json& jsonFrom, Hiero::TCK::FileService::CreateFileParams& params)
+  {
+    params.mKeys = Hiero::TCK::getOptionalJsonParameter<std::vector<std::string>>(jsonFrom, "keys");
+    params.mContents = Hiero::TCK::getOptionalJsonParameter<std::string>(jsonFrom, "contents");
+    params.mFileMemo = Hiero::TCK::getOptionalJsonParameter<std::string>(jsonFrom, "fileMemo");
+    params.mExpirationTime = Hiero::TCK::getOptionalJsonParameter<std::string>(jsonFrom, "expirationTime");
+    params.mCommonTxParams =
+      Hiero::TCK::getOptionalJsonParameter<Hiero::TCK::CommonTransactionParams>(jsonFrom, "commonTransactionParams");
+  }
+};
+
+} // namespace nlohmann
+
+#endif // HIERO_TCK_CPP_CREATE_FILE_PARAMS_H_

src/tck/include/file/params/UpdateFileParams.h

@@ -0,0 +1,75 @@
+// SPDX-License-Identifier: Apache-2.0
+#ifndef HIERO_TCK_CPP_UPDATE_FILE_PARAMS_H_
+#define HIERO_TCK_CPP_UPDATE_FILE_PARAMS_H_
+
+#include "common/CommonTransactionParams.h"
+#include "json/JsonUtils.h"
+
+#include <nlohmann/json.hpp>
+#include <optional>
+#include <string>
+#include <vector>
+
+namespace Hiero::TCK::FileService
+{
+/**
+ * Struct to hold the arguments for an `updateFile` JSON-RPC method call.
+ */
+struct UpdateFileParams
+{
+  /**
+   * The ID of the file to update.
+   */
+  std::optional<std::string> mFileId;
+
+  /**
+   * The keys that must sign when mutating the file.
+   */
+  std::optional<std::vector<std::string>> mKeys;
+
+  /**
+   * The new contents of the file.
+   */
+  std::optional<std::string> mContents;
+
+  /**
+   * The new memo for the file.
+   */
+  std::optional<std::string> mFileMemo;
+
+  /**
+   * The new time at which the file will expire.
+   */
+  std::optional<std::string> mExpirationTime;
+
+  /**
+   * Any parameters common to all transaction types.
+   */
+  std::optional<CommonTransactionParams> mCommonTxParams;
+};
+
+} // namespace Hiero::TCK::FileService
+
+namespace nlohmann
+{
+/**
+ * JSON serializer template specialization required to convert UpdateFileParams arguments properly.
+ */
+template<>
+struct [[maybe_unused]] adl_serializer<Hiero::TCK::FileService::UpdateFileParams>
+{
+  static void from_json(const json& jsonFrom, Hiero::TCK::FileService::UpdateFileParams& params)
+  {
+    params.mFileId = Hiero::TCK::getOptionalJsonParameter<std::string>(jsonFrom, "fileId");
+    params.mKeys = Hiero::TCK::getOptionalJsonParameter<std::vector<std::string>>(jsonFrom, "keys");
+    params.mContents = Hiero::TCK::getOptionalJsonParameter<std::string>(jsonFrom, "contents");
+    params.mFileMemo = Hiero::TCK::getOptionalJsonParameter<std::string>(jsonFrom, "fileMemo");
+    params.mExpirationTime = Hiero::TCK::getOptionalJsonParameter<std::string>(jsonFrom, "expirationTime");
+    params.mCommonTxParams =
+      Hiero::TCK::getOptionalJsonParameter<Hiero::TCK::CommonTransactionParams>(jsonFrom, "commonTransactionParams");
+  }
+};
+
+} // namespace nlohmann
+
+#endif // HIERO_TCK_CPP_UPDATE_FILE_PARAMS_H_

src/tck/src/TckServer.cc

@@ -9,6 +9,8 @@
 #include "account/params/DeleteAllowanceParams.h"
 #include "account/params/TransferCryptoParams.h"
 #include "account/params/UpdateAccountParams.h"
+#include "file/params/CreateFileParams.h"
+#include "file/params/UpdateFileParams.h"
 #include "key/params/GenerateKeyParams.h"
 #include "sdk/params/ResetParams.h"
 #include "sdk/params/SetupParams.h"
@@ -412,5 +414,9 @@ template TckServer::MethodHandle TckServer::getHandle<TokenService::UpdateTokenP
   nlohmann::json (*method)(const TokenService::UpdateTokenParams&));
 template TckServer::MethodHandle TckServer::getHandle<TokenService::WipeTokenParams>(
   nlohmann::json (*method)(const TokenService::WipeTokenParams&));
+template TckServer::MethodHandle TckServer::getHandle<FileService::CreateFileParams>(
+  nlohmann::json (*method)(const FileService::CreateFileParams&));
+template TckServer::MethodHandle TckServer::getHandle<FileService::UpdateFileParams>(
+  nlohmann::json (*method)(const FileService::UpdateFileParams&));
 
 } // namespace Hiero::TCK