Merge branch 'OpenElements:main' into master

Author: Ariho-Seth

.github/dependabot.yml

@@ -0,0 +1,8 @@
+---
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+...

.github/workflows/codeql.yml

@@ -0,0 +1,92 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL Advanced"
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+  schedule:
+    - cron: '38 17 * * 1'
+
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }})
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners (GitHub.com only)
+    # Consider using larger runners or machines with greater resources for possible analysis time improvements.
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    permissions:
+      # required for all workflows
+      security-events: write
+
+      # required to fetch internal or private CodeQL packs
+      packages: read
+
+      # only required for workflows in private repositories
+      actions: read
+      contents: read
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - language: java-kotlin
+          build-mode: none # This mode only analyzes Java. Set this to 'autobuild' or 'manual' to analyze Kotlin too.
+        # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
+        # Use `c-cpp` to analyze code written in C, C++ or both
+        # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
+        # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
+        # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
+        # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
+        # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
+        # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: ${{ matrix.language }}
+        build-mode: ${{ matrix.build-mode }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+    # If the analyze step fails for one of the languages you are analyzing with
+    # "We were unable to automatically build your code", modify the matrix above
+    # to set the build mode to "manual" for that language. Then modify this step
+    # to build your code.
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+    - if: matrix.build-mode == 'manual'
+      shell: bash
+      run: |
+        echo 'If you are using a "manual" build mode for one or more of the' \
+          'languages you are analyzing, replace this with the commands to build' \
+          'your code, for example:'
+        echo '  make bootstrap'
+        echo '  make release'
+        exit 1
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
+      with:
+        category: "/language:${{matrix.language}}"

.github/workflows/maven.yml

@@ -24,7 +24,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up JDK 21
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '21'
           distribution: 'temurin'

.github/workflows/scorecard.yml

@@ -0,0 +1,73 @@
+# This workflow uses actions that are not certified by GitHub. They are provided
+# by a third-party and are governed by separate terms of service, privacy
+# policy, and support documentation.
+
+name: Scorecard supply-chain security
+on:
+  # For Branch-Protection check. Only the default branch is supported. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
+  branch_protection_rule:
+  # To guarantee Maintained check is occasionally updated. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
+  schedule:
+    - cron: '40 19 * * 1'
+  push:
+    branches: [ "main" ]
+
+# Declare default permissions as read only.
+permissions: read-all
+
+jobs:
+  analysis:
+    name: Scorecard analysis
+    runs-on: ubuntu-latest
+    permissions:
+      # Needed to upload the results to code-scanning dashboard.
+      security-events: write
+      # Needed to publish results and get a badge (see publish_results below).
+      id-token: write
+      # Uncomment the permissions below if installing in a private repository.
+      # contents: read
+      # actions: read
+
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        with:
+          persist-credentials: false
+
+      - name: "Run analysis"
+        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
+        with:
+          results_file: results.sarif
+          results_format: sarif
+          # (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
+          # - you want to enable the Branch-Protection check on a *public* repository, or
+          # - you are installing Scorecard on a *private* repository
+          # To create the PAT, follow the steps in https://github.com/ossf/scorecard-action?tab=readme-ov-file#authentication-with-fine-grained-pat-optional.
+          # repo_token: ${{ secrets.SCORECARD_TOKEN }}
+
+          # Public repositories:
+          #   - Publish results to OpenSSF REST API for easy access by consumers
+          #   - Allows the repository to include the Scorecard badge.
+          #   - See https://github.com/ossf/scorecard-action#publishing-results.
+          # For private repositories:
+          #   - `publish_results` will always be set to `false`, regardless
+          #     of the value entered here.
+          publish_results: true
+
+      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
+      # format to the repository Actions tab.
+      - name: "Upload artifact"
+        uses: actions/upload-artifact@97a0fba1372883ab732affbe8f94b823f91727db # v3.pre.node20
+        with:
+          name: SARIF file
+          path: results.sarif
+          retention-days: 5
+
+      # Upload the results to GitHub's code scanning dashboard (optional).
+      # Commenting out will disable upload of results to your repo's Code Scanning dashboard
+      - name: "Upload to code-scanning"
+        uses: github/codeql-action/upload-sarif@v3
+        with:
+          sarif_file: results.sarif

hedera-base/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.open-elements.hedera</groupId>
     <artifactId>hedera-enterprise</artifactId>
-    <version>0.10.0-SNAPSHOT</version>
+    <version>0.11.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -22,6 +22,12 @@
     <dependency>
       <groupId>com.hedera.hashgraph</groupId>
       <artifactId>sdk</artifactId>
+    </dependency>
+	    <dependency>
+        <groupId>io.github.cdimascio</groupId>
+        <artifactId>dotenv-java</artifactId>
+        <version>2.3.2</version>
+        <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -47,11 +53,6 @@
       <artifactId>grpc-inprocess</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>io.github.cdimascio</groupId>
-      <artifactId>dotenv-java</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
@@ -75,4 +76,4 @@
     </plugins>
   </build>
 
-</project>
+</project>

hedera-base/src/main/java/com/openelements/hedera/base/AccountRepository.java

@@ -0,0 +1,34 @@
+package com.openelements.hedera.base;
+
+import com.hedera.hashgraph.sdk.AccountId;
+import com.openelements.hedera.base.mirrornode.AccountInfo;
+import org.jspecify.annotations.NonNull;
+
+import java.util.Objects;
+import java.util.Optional;
+
+/**
+ * Interface for interacting with a Hedera network. This interface provides methods for searching for Accounts.
+ */
+public interface AccountRepository {
+    /**
+     * Return the AccountInfo of a given accountId.
+     *
+     * @param accountId  id of the account
+     * @return {@link Optional} containing the found AccountInfo or null
+     * @throws HederaException if the search fails
+     */
+    Optional<AccountInfo> findById(@NonNull AccountId accountId) throws HederaException;
+
+    /**
+     * Return the AccountInfo of a given accountId.
+     *
+     * @param accountId  id of the account
+     * @return {@link Optional} containing the found AccountInfo or null
+     * @throws HederaException if the search fails
+     */
+    default Optional<AccountInfo> findById(@NonNull String accountId) throws HederaException {
+        Objects.requireNonNull(accountId, "accountId must not be null");
+        return findById(AccountId.fromString(accountId));
+    }
+}

hedera-base/src/main/java/com/openelements/hedera/base/TransactionRepository.java

@@ -0,0 +1,49 @@
+package com.openelements.hedera.base;
+
+import java.util.Objects;
+import java.util.Optional;
+
+import org.jspecify.annotations.NonNull;
+
+import com.hedera.hashgraph.sdk.AccountId;
+import com.openelements.hedera.base.mirrornode.Page;
+import com.openelements.hedera.base.mirrornode.TransactionInfo;
+
+/**
+ * Interface for interacting with transactions on a Hedera network.
+ * This interface provides methods for querying transactions.
+ */
+public interface TransactionRepository {
+    /**
+     * Find all transactions associated with a specific account.
+     *
+     * @param accountId id of the account
+     * @return page of transactions
+     * @throws HederaException if the search fails
+     */
+    @NonNull
+    Page<TransactionInfo> findByAccount(@NonNull AccountId accountId) throws HederaException;
+
+    /**
+     * Find all transactions associated with a specific account.
+     *
+     * @param accountId id of the account as a string
+     * @return page of transactions
+     * @throws HederaException if the search fails
+     */
+    @NonNull
+    default Page<TransactionInfo> findByAccount(@NonNull String accountId) throws HederaException {
+        Objects.requireNonNull(accountId, "accountId must not be null");
+        return findByAccount(AccountId.fromString(accountId));
+    }
+
+    /**
+     * Find a specific transaction by its ID.
+     *
+     * @param transactionId the transaction ID
+     * @return Optional containing the transaction if found
+     * @throws HederaException if the search fails
+     */
+    @NonNull
+    Optional<TransactionInfo> findById(@NonNull String transactionId) throws HederaException;
+}

hedera-base/src/main/java/com/openelements/hedera/base/implementation/AccountRepositoryImpl.java

@@ -0,0 +1,24 @@
+package com.openelements.hedera.base.implementation;
+
+import com.hedera.hashgraph.sdk.AccountId;
+import com.openelements.hedera.base.AccountRepository;
+import com.openelements.hedera.base.HederaException;
+import com.openelements.hedera.base.mirrornode.AccountInfo;
+import com.openelements.hedera.base.mirrornode.MirrorNodeClient;
+import org.jspecify.annotations.NonNull;
+
+import java.util.Objects;
+import java.util.Optional;
+
+public class AccountRepositoryImpl implements AccountRepository {
+    private final MirrorNodeClient mirrorNodeClient;
+
+    public AccountRepositoryImpl(@NonNull final MirrorNodeClient mirrorNodeClient) {
+        this.mirrorNodeClient = Objects.requireNonNull(mirrorNodeClient, "mirrorNodeClient must not be null");
+    }
+
+    @Override
+    public Optional<AccountInfo> findById(@NonNull AccountId accountId) throws HederaException {
+        return mirrorNodeClient.queryAccount(accountId);
+    }
+}

hedera-base/src/main/java/com/openelements/hedera/base/implementation/FileClientImpl.java

@@ -23,7 +23,7 @@
 
 public class FileClientImpl implements FileClient {
 
-    private final static Logger log = LoggerFactory.getLogger(FileClientImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(FileClientImpl.class);
 
     private final ProtocolLayerClient protocolLayerClient;
 

hedera-base/src/main/java/com/openelements/hedera/base/implementation/HederaNetwork.java

@@ -48,4 +48,4 @@ public String getName() {
     public String getMirrornodeEndpoint() {
         return mirrornodeEndpoint;
     }
-}
+}