fixes for spring

Author: hendrikebbers

hiero-base/src/main/java/com/openelements/hiero/base/config/HieroConfig.java

@@ -33,7 +33,9 @@ default Client createClient() {
         if (hieroNetwork != HieroNetwork.CUSTOM) {
             try {
                 log.debug("Hiero network '{}' will be used", hieroNetwork.getName());
-                Client client = Client.forName(hieroNetwork.getName());
+
+                //TODO: Hack since the Client is still Hedera specific and not migrated to Hiero
+                Client client = Client.forName(hieroNetwork.getName().substring("hedera-".length()));
                 client.setOperator(getOperatorAccount().accountId(), getOperatorAccount().privateKey());
                 return client;
             } catch (Exception e) {

hiero-base/src/main/java/com/openelements/hiero/base/implementation/HieroNetwork.java

@@ -24,8 +24,7 @@ public enum HieroNetwork {
     private final String relayUrl;
 
     /**
-     * Name of the Hiero network. Compatible with {@link com.hedera.hashgraph.sdk.Client#forName(String)} and similar
-     * methods.
+     * Name of the Hiero network.
      */
     private final String name;
 

hiero-spring/src/main/java/com/openelements/hiero/spring/implementation/HieroAutoConfiguration.java

@@ -24,6 +24,8 @@
 import com.openelements.hiero.base.protocol.ProtocolLayerClient;
 import java.net.URI;
 import java.net.URL;
+import java.util.List;
+import java.util.Objects;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
@@ -90,14 +92,16 @@ NftClient nftClient(final ProtocolLayerClient protocolLayerClient, Account opera
     @Bean
     @ConditionalOnProperty(prefix = "spring.hiero", name = "mirrorNodeSupported",
             havingValue = "true", matchIfMissing = true)
-    MirrorNodeClient mirrorNodeClient(final HieroConfig hieroConfig) {
+    MirrorNodeClient mirrorNodeClient(final Client client, final HieroNetwork hieroNetwork) {
         final String mirrorNodeEndpoint;
-        if (!hieroConfig.getMirrornodeAddresses().isEmpty()) {
-            mirrorNodeEndpoint = hieroConfig.getMirrornodeAddresses().get(0);
-        } else if (hieroConfig.getNetwork().getMirrornodeEndpoint() != null) {
-            mirrorNodeEndpoint = hieroConfig.getNetwork().getMirrornodeEndpoint();
+        if (Objects.equals(hieroNetwork, HieroNetwork.CUSTOM)) {
+            final List<String> mirrorNetwork = client.getMirrorNetwork();
+            if (mirrorNetwork.isEmpty()) {
+                throw new IllegalArgumentException("Mirror node endpoint must be set");
+            }
+            mirrorNodeEndpoint = mirrorNetwork.get(0);
         } else {
-            throw new IllegalArgumentException("Mirror node endpoint must be set");
+            mirrorNodeEndpoint = hieroNetwork.getMirrornodeEndpoint();
         }
 
         final String baseUri;

hiero-spring/src/test/resources/application.properties

@@ -1,6 +1,6 @@
 spring.config.import=optional:file:.env[.properties]
 spring.hiero.accountId=${HEDERA_ACCOUNT_ID:0.0.4457570}
 spring.hiero.privateKey=${HEDERA_PRIVATE_KEY}
-spring.hiero.network.name=${HEDERA_NETWORK:testnet}
+spring.hiero.network.name=${HEDERA_NETWORK:hedera-testnet}
 logging.level.com.openelements=DEBUG
 logging.pattern.console=%d{HH:mm:ss.SSS} %logger{36} - %msg%n