Merge branch 'main' into newsoloversion

Author: Ndacyayisenga-droid

.github/workflows/main.yml

@@ -0,0 +1,43 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
+
+# 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: Deploy SBOM to Dependencytrack
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ "main" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+          cache: maven
+
+      - name: Build with Maven
+        run: ./mvnw org.cyclonedx:cyclonedx-maven-plugin:makeAggregateBom
+
+      - name: deploy SBOM to Dependencytrack
+        uses: DependencyTrack/gh-upload-sbom@v3
+        with:
+          serverHostname: 'api.dependencytrack.open-elements.cloud'
+          apiKey: ${{ secrets.DEPENDENCYTRACK_API_KEY }}
+          projectName: 'hiero-enterprise-java'
+          projectVersion: 'main'
+          bomFilename: "target/bom.xml"
+          autoCreate: true
+

.github/workflows/scorecard.yml

@@ -37,7 +37,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
+        uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
         with:
           results_file: results.sarif
           results_format: sarif

hiero-enterprise-base/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.open-elements.hiero</groupId>
     <artifactId>hiero-enterprise</artifactId>
-    <version>0.19.0-SNAPSHOT</version>
+    <version>0.20.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -68,16 +68,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.jreleaser</groupId>
-        <artifactId>jreleaser-maven-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>

hiero-enterprise-base/src/main/java/com/openelements/hiero/base/config/implementation/EnvBasedHieroConfig.java

@@ -0,0 +1,93 @@
+package com.openelements.hiero.base.config.implementation;
+
+import com.hedera.hashgraph.sdk.AccountId;
+import com.hedera.hashgraph.sdk.PrivateKey;
+import com.hedera.hashgraph.sdk.PublicKey;
+import com.openelements.hiero.base.config.ConsensusNode;
+import com.openelements.hiero.base.config.HieroConfig;
+import com.openelements.hiero.base.data.Account;
+import java.util.Optional;
+import java.util.Set;
+import org.jspecify.annotations.NonNull;
+
+public class EnvBasedHieroConfig implements HieroConfig {
+
+    private final AccountId operatorAccountId;
+    private final PublicKey operatorPublicKey;
+    private final PrivateKey operatorPrivateKey;
+    private final String mirrorNodeAddress;
+
+    private final String consensusNodeIp;
+    private final String consensusNodePort;
+    private final String consensusNodeAccount;
+
+    private final String relayUrl;
+
+    private final Long chainId;
+
+    public EnvBasedHieroConfig() {
+        operatorAccountId = getEnv("HEDERA_OPERATOR_ACCOUNT_ID")
+                .map(AccountId::fromString)
+                .orElseThrow(() -> new IllegalStateException("HEDERA_OPERATOR_ACCOUNT_ID is not set"));
+        operatorPublicKey = getEnv("HEDERA_OPERATOR_PUBLIC_KEY")
+                .map(PublicKey::fromString)
+                .orElseThrow(() -> new IllegalStateException("HEDERA_OPERATOR_PUBLIC_KEY is not set"));
+        operatorPrivateKey = getEnv("HEDERA_OPERATOR_PRIVATE_KEY")
+                .map(PrivateKey::fromString)
+                .orElseThrow(() -> new IllegalStateException("HEDERA_OPERATOR_PRIVATE_KEY is not set"));
+        mirrorNodeAddress = getEnv("HEDERA_MIRROR_NODE_ADDRESS")
+                .orElse(null);
+        consensusNodeIp = getEnv("HEDERA_CONSENSUS_NODE_IP")
+                .orElseThrow(() -> new IllegalStateException("HEDERA_CONSENSUS_NODE_IP is not set"));
+        consensusNodePort = getEnv("HEDERA_CONSENSUS_NODE_PORT")
+                .orElseThrow(() -> new IllegalStateException("HEDERA_CONSENSUS_NODE_PORT is not set"));
+        consensusNodeAccount = getEnv("HEDERA_CONSENSUS_NODE_ACCOUNT")
+                .orElseThrow(() -> new IllegalStateException("HEDERA_CONSENSUS_NODE_ACCOUNT is not set"));
+        relayUrl = getEnv("HEDERA_RELAY_URL").orElse(null);
+        chainId = getEnv("HEDERA_CHAIN_ID")
+                .map(Long::valueOf)
+                .orElse(null);
+    }
+
+    private Optional<String> getEnv(String key) {
+        return Optional.ofNullable(System.getenv(key));
+    }
+
+    @Override
+    public @NonNull Account getOperatorAccount() {
+        return new Account(operatorAccountId, operatorPublicKey, operatorPrivateKey);
+    }
+
+    @Override
+    public @NonNull Optional<String> getNetworkName() {
+        return Optional.empty();
+    }
+
+    @Override
+    public @NonNull Set<String> getMirrorNodeAddresses() {
+        if (mirrorNodeAddress == null) {
+            return Set.of();
+        }
+        return Set.of(mirrorNodeAddress);
+    }
+
+    @Override
+    public @NonNull Set<ConsensusNode> getConsensusNodes() {
+        ConsensusNode node = new ConsensusNode(
+                consensusNodeIp,
+                consensusNodePort,
+                consensusNodeAccount
+        );
+        return Set.of(node);
+    }
+
+    @Override
+    public @NonNull Optional<Long> chainId() {
+        return Optional.ofNullable(chainId);
+    }
+
+    @Override
+    public @NonNull Optional<String> relayUrl() {
+        return Optional.ofNullable(relayUrl);
+    }
+}

hiero-enterprise-base/src/main/java/com/openelements/hiero/base/config/implementation/NetworkSettingsBasedHieroConfig.java

@@ -0,0 +1,54 @@
+package com.openelements.hiero.base.config.implementation;
+
+import com.openelements.hiero.base.config.ConsensusNode;
+import com.openelements.hiero.base.config.HieroConfig;
+import com.openelements.hiero.base.config.NetworkSettings;
+import com.openelements.hiero.base.data.Account;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import org.jspecify.annotations.NonNull;
+
+public class NetworkSettingsBasedHieroConfig implements HieroConfig {
+
+    private final Account operatorAccount;
+
+    private final NetworkSettings networkSetting;
+
+    public NetworkSettingsBasedHieroConfig(@NonNull final Account operatorAccount, @NonNull final String networkName) {
+        this.operatorAccount = Objects.requireNonNull(operatorAccount, "operatorAccount must not be null");
+        Objects.requireNonNull(networkName, "networkName must not be null");
+        this.networkSetting = NetworkSettings.forIdentifier(networkName)
+                .orElseThrow(() -> new IllegalStateException("Network settings for '" + networkName + "' not found"));
+    }
+
+    @Override
+    public @NonNull Account getOperatorAccount() {
+        return operatorAccount;
+    }
+
+    @Override
+    public @NonNull Optional<String> getNetworkName() {
+        return networkSetting.getNetworkName();
+    }
+
+    @Override
+    public @NonNull Set<String> getMirrorNodeAddresses() {
+        return networkSetting.getMirrorNodeAddresses();
+    }
+
+    @Override
+    public @NonNull Set<ConsensusNode> getConsensusNodes() {
+        return networkSetting.getConsensusNodes();
+    }
+
+    @Override
+    public @NonNull Optional<Long> chainId() {
+        return networkSetting.chainId();
+    }
+
+    @Override
+    public @NonNull Optional<String> relayUrl() {
+        return networkSetting.relayUrl();
+    }
+}