Merge branch 'main' into 00901-hip-551-batch-transactions

Author: gsstoykov

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

@@ -36,6 +36,32 @@ permissions:
   contents: read
 
 jobs:
+  lint:
+    name: Lint
+    runs-on: hiero-client-sdk-linux-large
+    strategy:
+      matrix:
+        include:
+          - type: sdk
+            check-path: "src/sdk/main"
+          - type: tck
+            check-path: "src/tck"
+
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@c6295a65d1254861815972266d5933fd6e532bdf # v2.11.1
+        with:
+          egress-policy: audit
+
+      - name: Checkout Code
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: Run Clang-Format
+        uses: jidicula/clang-format-action@4726374d1aa3c6aecf132e5197e498979588ebc8 # v4.15.0
+        with:
+          clang-format-version: "17"
+          check-path: ${{ matrix.check-path }}
+
   build:
     name: Build
     runs-on: hiero-client-sdk-linux-large
@@ -101,7 +127,7 @@ jobs:
           submodules: true
 
       - name: Use Node.js 22
-        uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version: 22
 
@@ -114,7 +140,7 @@ jobs:
         run: mkdir -p "${{ github.workspace }}/b/vcpkg_cache"
 
       - name: Install CMake & Ninja
-        uses: lukka/get-cmake@56d043d188c3612951d8755da8f4b709ec951ad6 # v3.31.6
+        uses: lukka/get-cmake@57c20a23a6cac5b90f31864439996e5b206df9dc # v4.0.1
         with:
           useCloudCache: true
 
@@ -156,7 +182,7 @@ jobs:
         run: sudo npm install -g @hashgraph/solo@0.34.0
 
       - name: Install Solo Required Tools
-        run: | 
+        run: |
           sudo curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
           sudo chmod +x ./kubectl
           sudo mv ./kubectl /usr/local/bin/kubectl
@@ -226,7 +252,7 @@ jobs:
           msbuild-architecture: x64
 
       - name: Setup-perl
-        uses: shogo82148/actions-setup-perl@49c14f24551d2de3bf56fb107a869c3760b1875e # v1.33.0
+        uses: shogo82148/actions-setup-perl@22423f01bde48fb88785c007e3166fbbbd8e892a # v1.34.0
         with:
           perl-version: "5.32"
           distribution: strawberry
@@ -294,7 +320,7 @@ jobs:
         run: |
           cmake --preset macos-arm64-release
           cmake --build --preset macos-arm64-release -j 4
-          
+
       - name: Compute Short SHA
         id: sha
         run: echo "short=$(echo -n "${{ github.sha }}" | cut -c1-8)" >> $GITHUB_OUTPUT
@@ -304,4 +330,4 @@ jobs:
         with:
           name: hapi-library-${{ runner.os }}-${{ steps.sha.outputs.short }}
           path: package/
-          if-no-files-found: warn
+          if-no-files-found: warn

CMakeLists.txt

@@ -20,7 +20,6 @@ find_package(Protobuf CONFIG REQUIRED)
 find_package(gRPC CONFIG REQUIRED)
 find_package(re2 CONFIG REQUIRED)
 find_package(absl CONFIG REQUIRED)
-find_package(upb CONFIG REQUIRED)
 find_package(Threads REQUIRED)
 find_package(nlohmann_json CONFIG REQUIRED)
 find_package(EXPAT CONFIG REQUIRED)

src/sdk/main/CMakeLists.txt

@@ -321,17 +321,6 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
         absl::time
         absl::time_zone)
 
-target_link_libraries(${PROJECT_NAME} PRIVATE
-        upb::upb
-        upb::descriptor_upb_proto
-        upb::extension_registry
-        upb::fastdecode
-        upb::json
-        upb::mini_table
-        upb::reflection
-        upb::textformat
-        upb::utf8_range)
-
 target_link_libraries(${PROJECT_NAME} PRIVATE
         c-ares::cares
         re2::re2

src/sdk/main/include/Client.h

@@ -70,9 +70,13 @@ class Client
    *
    * @param mirrorNetwork The mirror node network from which to grab the address book and initialize the Client's
    *                      consensus network.
-   * @return A Client with the input mirror network and the corresponding address book consensus network
+   * @param realm         The realm of the network from which to grab the address book.
+   * @param shard         The shard of the network from which to grab the address book.
+   * @return A Client with the input mirror network and the corresponding address book consensus network.
    */
-  [[nodiscard]] static Client forMirrorNetwork(const std::vector<std::string>& mirrorNetwork);
+  [[nodiscard]] static Client forMirrorNetwork(const std::vector<std::string>& mirrorNetwork,
+                                               int64_t realm = 0LL,
+                                               int64_t shard = 0LL);
 
   /**
    * Construct a Client by a name. The name must be one of "mainnet", "testnet", or "previewnet", otherwise this will

src/sdk/main/include/FileId.h

@@ -3,6 +3,7 @@
 #define HIERO_SDK_CPP_FILE_ID_H_
 
 #include <cstddef>
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <string_view>
@@ -43,6 +44,33 @@ class FileId
    */
   [[maybe_unused]] static const FileId EXCHANGE_RATES;
 
+  /**
+   * Get the address book file ID for a particular realm and/or shard.
+   *
+   * @param realm The realm from which to get the address book file.
+   * @param shard The shard from which to get the address book file.
+   * @return The ID of the address book file from the input realm and/or shard.
+   */
+  [[nodiscard]] static FileId getAddressBookFileIdFor(int64_t realm, int64_t shard);
+
+  /**
+   * Get the fee schedule file ID for a particular realm and/or shard.
+   *
+   * @param realm The realm from which to get the fee schedule file.
+   * @param shard The shard from which to get the fee schedule file.
+   * @return The ID of the fee schedule file from the input realm and/or shard.
+   */
+  [[nodiscard]] static FileId getFeeScheduleFileIdFor(int64_t realm, int64_t shard);
+
+  /**
+   * Get the exchange rates file ID for a particular realm and/or shard.
+   *
+   * @param realm The realm from which to get the exchange rates file.
+   * @param shard The shard from which to get the exchange rates file.
+   * @return The ID of the exchange rates file from the input realm and/or shard.
+   */
+  [[nodiscard]] static FileId getExchangeRatesFileIdFor(int64_t realm, int64_t shard);
+
   /**
    * Construct with a file number.
    *

src/sdk/main/src/Client.cc

@@ -157,13 +157,14 @@ Client Client::forNetwork(const std::unordered_map<std::string, AccountId>& netw
 }
 
 //-----
-Client Client::forMirrorNetwork(const std::vector<std::string>& mirrorNetwork)
+Client Client::forMirrorNetwork(const std::vector<std::string>& mirrorNetwork, int64_t realm, int64_t shard)
 {
   Client client;
   client.setMirrorNetwork(mirrorNetwork);
   client.mImpl->mNetwork =
     std::make_shared<internal::Network>(internal::Network::forNetwork(internal::Network::getNetworkFromAddressBook(
-      AddressBookQuery().setFileId(FileId::ADDRESS_BOOK).execute(client), internal::BaseNodeAddress::PORT_NODE_PLAIN)));
+      AddressBookQuery().setFileId(FileId::getAddressBookFileIdFor(realm, shard)).execute(client),
+      internal::BaseNodeAddress::PORT_NODE_PLAIN)));
 
   return client;
 }

src/sdk/main/src/FileId.cc

@@ -10,14 +10,42 @@
 
 namespace Hiero
 {
+namespace
+{
+// The entity number of the address book file.
+const uint64_t ADDRESS_BOOK_ENTITY_NUM = 102ULL;
+// The entity number of the fee schedule file.
+const uint64_t FEE_SCHEDULE_ENTITY_NUM = 111ULL;
+// The entity number of the exchange rates file.
+const uint64_t EXCHANGE_RATES_ENTITY_NUM = 112ULL;
+}
+
+//-----
+const FileId FileId::ADDRESS_BOOK = FileId(ADDRESS_BOOK_ENTITY_NUM);
+
 //-----
-const FileId FileId::ADDRESS_BOOK = FileId(0ULL, 0ULL, 102ULL);
+const FileId FileId::FEE_SCHEDULE = FileId(FEE_SCHEDULE_ENTITY_NUM);
 
 //-----
-const FileId FileId::FEE_SCHEDULE = FileId(0ULL, 0ULL, 111ULL);
+const FileId FileId::EXCHANGE_RATES = FileId(EXCHANGE_RATES_ENTITY_NUM);
 
 //-----
-const FileId FileId::EXCHANGE_RATES = FileId(0ULL, 0ULL, 112ULL);
+FileId FileId::getAddressBookFileIdFor(int64_t realm, int64_t shard)
+{
+  return FileId(shard, realm, ADDRESS_BOOK_ENTITY_NUM);
+}
+
+//-----
+FileId FileId::getFeeScheduleFileIdFor(int64_t realm, int64_t shard)
+{
+  return FileId(shard, realm, FEE_SCHEDULE_ENTITY_NUM);
+}
+
+//-----
+FileId FileId::getExchangeRatesFileIdFor(int64_t realm, int64_t shard)
+{
+  return FileId(shard, realm, EXCHANGE_RATES_ENTITY_NUM);
+}
 
 //-----
 FileId::FileId(uint64_t num)

src/sdk/main/src/impl/MirrorNodeContractQuery.cc

@@ -81,9 +81,10 @@ MirrorNodeContractQuery& MirrorNodeContractQuery::setEstimate(bool estimate)
 //-----
 void MirrorNodeContractQuery::populateContractEvmAddress(const Client& client)
 {
-  const json contractInfo = internal::MirrorNodeGateway::MirrorNodeQuery(client.getClientMirrorNetwork()->getNetwork()[0],
-                                                                   { getContractId().value().toString() },
-                                                                   internal::MirrorNodeGateway::CONTRACT_INFO_QUERY);
+  const json contractInfo =
+    internal::MirrorNodeGateway::MirrorNodeQuery(client.getClientMirrorNetwork()->getNetwork()[0],
+                                                 { getContractId().value().toString() },
+                                                 internal::MirrorNodeGateway::CONTRACT_INFO_QUERY);
 
   if (contractInfo.contains("evm_address"))
   {

vcpkg

@@ -1,7 +1,7 @@
 {
   "name": "hiero-sdk-cpp",
   "version-string": "0.1.0",
-  "builtin-baseline": "fba75d09065fcc76a25dcf386b1d00d33f5175af",
+  "builtin-baseline": "ce613c41372b23b1f51333815feb3edd87ef8a8b",
   "dependencies": [
     {
       "name": "openssl",
@@ -23,10 +23,6 @@
       "name": "grpc",
       "version>=": "1.49.0"
     },
-    {
-      "name": "upb",
-      "version>=": "2022-06-21"
-    },
     {
       "name": "nlohmann-json"
     },