Merge branch 'main' into 10359-refactor-nft-methods-web3-tests

hiero-ledger · Feb 26, 2025 · aba778d · aba778d
2 parents 495c918 + 07e131f
commit aba778d
Show file tree

Hide file tree

Showing 190 changed files with 277 additions and 556 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -17,14 +17,9 @@ plugins {
 // Can't use typed variable syntax due to Dependabot limitations
 extra.apply {
     set("grpcVersion", "1.70.0")
-    set(
-        "jooq.version",
-        "3.20.1",
-    ) // Set whenever the version in buildSrc is different from the one in Spring Boot
-    set("json-smart.version", "2.5.2") // Temporary until next Spring Boot
+    set("jooq.version", "3.20.1") // Must match buildSrc/build.gradle.kts
     set("mapStructVersion", "1.6.3")
-    set("netty.version", "4.1.118.Final") // Temporary until next Spring Boot
-    set("nodeJsVersion", "18.20.5")
+    set("nodeJsVersion", "18.20.7")
     set("protobufVersion", "3.25.5")
     set("reactorGrpcVersion", "1.2.4")
     set("vertxVersion", "4.5.13")
@@ -192,7 +187,12 @@ spotless {
             .npmInstallCache(Paths.get("${rootProject.rootDir}", ".gradle", "spotless"))
             .config(mapOf("bracketSpacing" to false, "printWidth" to 120, "singleQuote" to true))
         target("hedera-mirror-rest/**/*.js", "hedera-mirror-test/k6/**/*.js", "tools/**/*.js")
-        targetExclude("**/build/**", "**/node_modules/**", "**/__tests__/integration/*.test.js")
+        targetExclude(
+            "**/build/**",
+            "**/node_modules/**",
+            "**/__tests__/integration/*.spec.test.js",
+            "tools/mirror-report/index.js",
+        )
     }
     java {
         endWithNewline()
@@ -252,20 +252,21 @@ spotless {
     format("shell") {
         endWithNewline()
         leadingTabsToSpaces(2)
-        licenseHeader(licenseHeader.replaceFirst("//", "#"), "^#!")
+        licenseHeader("#!/usr/bin/env bash\n\n" + licenseHeader.replaceFirst("//", "#"), "^[^#\\s]")
         target("**/*.sh")
         targetExclude("**/build/**", "**/node_modules/**")
         trimTrailingWhitespace()
     }
     sql {
         endWithNewline()
         leadingTabsToSpaces()
+        licenseHeader(licenseHeader.replaceFirst("//", "--"), "^[^-\\s]")
         target(
-            "hedera-mirror-common/**/*.sql",
+            "hedera-mirror-common/src/test/resources/*.sql",
             "hedera-mirror-importer/**/*.sql",
-            "hedera-mirror-rest/**/*.sql",
+            "hedera-mirror-rest/__tests__/data/**/*.sql",
         )
-        targetExclude("**/build/**", "**/node_modules/**")
+        targetExclude("**/build/**", "**/db/migration/**")
         trimTrailingWhitespace()
     }
     format("yaml") {

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -16,7 +16,6 @@ dependencies {
     // embedded in the plugin being used by testcontainers-postgresql
     implementation("com.github.docker-java:docker-java-api:$dockerJavaVersion")
     implementation("com.github.docker-java:docker-java-core:$dockerJavaVersion")
-
     implementation("com.bmuschko:gradle-docker-plugin:9.4.0")
     implementation("com.diffplug.spotless:spotless-plugin-gradle:7.0.2")
     implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.6")

diff --git a/charts/hedera-mirror-common/templates/configmap-dashboards.yaml b/charts/hedera-mirror-common/templates/configmap-dashboards.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if and .Values.prometheus.enabled .Values.prometheus.grafana.enabled -}}
+{{ if and .Values.prometheus.enabled .Values.prometheus.grafana.enabled -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:

diff --git a/charts/hedera-mirror-common/templates/configmap-log-alerts.yaml b/charts/hedera-mirror-common/templates/configmap-log-alerts.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if (gt (len .Values.loki.rules) 0) }}
+{{ if (gt (len .Values.loki.rules) 0) }}
 apiVersion: v1
 kind: ConfigMap
 metadata:

diff --git a/charts/hedera-mirror-common/templates/configmap-test-rest-java.yaml b/charts/hedera-mirror-common/templates/configmap-test-rest-java.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if .Values.testkube.enabled -}}
+{{ if .Values.testkube.enabled -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:

diff --git a/charts/hedera-mirror-common/templates/configmap-test-rest.yaml b/charts/hedera-mirror-common/templates/configmap-test-rest.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if .Values.testkube.enabled -}}
+{{ if .Values.testkube.enabled -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:

diff --git a/charts/hedera-mirror-common/templates/configmap-test-web3.yaml b/charts/hedera-mirror-common/templates/configmap-test-web3.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if .Values.testkube.enabled -}}
+{{ if .Values.testkube.enabled -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:

diff --git a/charts/hedera-mirror-common/templates/k6-custom-executor.yaml b/charts/hedera-mirror-common/templates/k6-custom-executor.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if .Values.testkube.enabled -}}
+{{ if .Values.testkube.enabled -}}
 apiVersion: executor.testkube.io/v1
 kind: Executor
 metadata:

diff --git a/charts/hedera-mirror-common/templates/prometheusrule.yaml b/charts/hedera-mirror-common/templates/prometheusrule.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if and .Values.prometheus.enabled .Values.stackgres.prometheusRules.enabled .Values.stackgres.enabled -}}
+{{ if and .Values.prometheus.enabled .Values.stackgres.prometheusRules.enabled .Values.stackgres.enabled -}}
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:

diff --git a/charts/hedera-mirror-common/templates/test-rest-java.yaml b/charts/hedera-mirror-common/templates/test-rest-java.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if .Values.testkube.enabled -}}
+{{ if .Values.testkube.enabled -}}
 {{- range $idx, $target := $.Values.testkube.test.targets }}
 ---
 apiVersion: tests.testkube.io/v3

diff --git a/charts/hedera-mirror-common/templates/test-rest.yaml b/charts/hedera-mirror-common/templates/test-rest.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if .Values.testkube.enabled -}}
+{{ if .Values.testkube.enabled -}}
 {{- range $idx, $target := $.Values.testkube.test.targets }}
 ---
 apiVersion: tests.testkube.io/v3

diff --git a/charts/hedera-mirror-common/templates/test-suite-rest.yaml b/charts/hedera-mirror-common/templates/test-suite-rest.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if .Values.testkube.enabled -}}
+{{ if .Values.testkube.enabled -}}
 {{- range $idx, $target := $.Values.testkube.test.targets }}
 ---
 apiVersion: tests.testkube.io/v3

diff --git a/charts/hedera-mirror-common/templates/test-trigger-rest.yaml b/charts/hedera-mirror-common/templates/test-trigger-rest.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if and .Values.testkube.enabled .Values.testkube.trigger.enabled -}}
+{{ if and .Values.testkube.enabled .Values.testkube.trigger.enabled -}}
 {{- range $idx, $target := $.Values.testkube.test.targets }}
 ---
 apiVersion: tests.testkube.io/v1

diff --git a/charts/hedera-mirror-common/templates/test-web3.yaml b/charts/hedera-mirror-common/templates/test-web3.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if .Values.testkube.enabled -}}
+{{ if .Values.testkube.enabled -}}
 {{- range $idx, $target := $.Values.testkube.test.targets }}
 ---
 apiVersion: tests.testkube.io/v3

diff --git a/charts/hedera-mirror-common/templates/zfs/configmap-init.yaml b/charts/hedera-mirror-common/templates/zfs/configmap-init.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if .Values.zfs.enabled -}}
+{{ if .Values.zfs.enabled -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:

diff --git a/charts/hedera-mirror-common/templates/zfs/daemonset.yaml b/charts/hedera-mirror-common/templates/zfs/daemonset.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if .Values.zfs.enabled -}}
+{{ if .Values.zfs.enabled -}}
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:

diff --git a/charts/hedera-mirror-common/templates/zfs/rbac.yaml b/charts/hedera-mirror-common/templates/zfs/rbac.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if .Values.zfs.enabled -}}
+{{ if .Values.zfs.enabled -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:

diff --git a/charts/hedera-mirror-common/templates/zfs/serviceaccount.yaml b/charts/hedera-mirror-common/templates/zfs/serviceaccount.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if .Values.zfs.enabled -}}
+{{ if .Values.zfs.enabled -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata:

diff --git a/charts/hedera-mirror-common/templates/zfs/storageclass.yaml b/charts/hedera-mirror-common/templates/zfs/storageclass.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if .Values.zfs.enabled -}}
+{{ if .Values.zfs.enabled -}}
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:

diff --git a/charts/hedera-mirror-common/templates/zfs/volumesnaphotclass.yaml b/charts/hedera-mirror-common/templates/zfs/volumesnaphotclass.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if .Values.zfs.enabled -}}
+{{ if .Values.zfs.enabled -}}
 apiVersion: snapshot.storage.k8s.io/v1
 kind: VolumeSnapshotClass
 metadata:

diff --git a/charts/hedera-mirror-graphql/templates/alertmanagerconfig.yaml b/charts/hedera-mirror-graphql/templates/alertmanagerconfig.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if .Values.alertmanager.inhibitRules.enabled -}}
+{{ if .Values.alertmanager.inhibitRules.enabled -}}
 apiVersion: monitoring.coreos.com/v1alpha1
 kind: AlertmanagerConfig
 metadata:

diff --git a/charts/hedera-mirror-graphql/templates/gcpbackendpolicy.yaml b/charts/hedera-mirror-graphql/templates/gcpbackendpolicy.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if and .Values.global.gateway.enabled .Values.gateway.gcp.enabled (not (empty .Values.gateway.gcp.backendPolicy)) -}}
+{{ if and .Values.global.gateway.enabled .Values.gateway.gcp.enabled (not (empty .Values.gateway.gcp.backendPolicy)) -}}
 apiVersion: networking.gke.io/v1
 kind: GCPBackendPolicy
 metadata:

diff --git a/charts/hedera-mirror-graphql/templates/healthcheckpolicy.yaml b/charts/hedera-mirror-graphql/templates/healthcheckpolicy.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if and .Values.global.gateway.enabled .Values.gateway.gcp.enabled (not (empty .Values.gateway.gcp.healthCheckPolicy)) -}}
+{{ if and .Values.global.gateway.enabled .Values.gateway.gcp.enabled (not (empty .Values.gateway.gcp.healthCheckPolicy)) -}}
 apiVersion: networking.gke.io/v1
 kind: HealthCheckPolicy
 metadata:

diff --git a/charts/hedera-mirror-graphql/templates/hpa.yaml b/charts/hedera-mirror-graphql/templates/hpa.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if .Values.hpa.enabled -}}
+{{ if .Values.hpa.enabled -}}
 apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:

diff --git a/charts/hedera-mirror-graphql/templates/httproute-http.yaml b/charts/hedera-mirror-graphql/templates/httproute-http.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if and .Values.global.gateway.enabled .Values.global.gateway.http.enabled -}}
+{{ if and .Values.global.gateway.enabled .Values.global.gateway.http.enabled -}}
 apiVersion: gateway.networking.k8s.io/v1
 kind: HTTPRoute
 metadata:

diff --git a/charts/hedera-mirror-graphql/templates/httproute-https.yaml b/charts/hedera-mirror-graphql/templates/httproute-https.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if and .Values.global.gateway.enabled .Values.global.gateway.https.enabled -}}
+{{ if and .Values.global.gateway.enabled .Values.global.gateway.https.enabled -}}
 apiVersion: gateway.networking.k8s.io/v1
 kind: HTTPRoute
 metadata:

diff --git a/charts/hedera-mirror-graphql/templates/ingress.yaml b/charts/hedera-mirror-graphql/templates/ingress.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if .Values.ingress.enabled -}}
+{{ if .Values.ingress.enabled -}}
 {{- $fullName := include "hedera-mirror-graphql.fullname" $ -}}
 {{- $hostname := .Values.global.hostname -}}
 {{- $servicePort := .Values.service.port -}}

diff --git a/charts/hedera-mirror-graphql/templates/middleware.yaml b/charts/hedera-mirror-graphql/templates/middleware.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if and .Values.global.middleware .Values.middleware -}}
+{{ if and .Values.global.middleware .Values.middleware -}}
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:

diff --git a/charts/hedera-mirror-graphql/templates/poddisruptionbudget.yaml b/charts/hedera-mirror-graphql/templates/poddisruptionbudget.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if .Values.podDisruptionBudget.enabled -}}
+{{ if .Values.podDisruptionBudget.enabled -}}
 apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:

diff --git a/charts/hedera-mirror-graphql/templates/prometheusrule.yaml b/charts/hedera-mirror-graphql/templates/prometheusrule.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if .Values.prometheusRules.enabled -}}
+{{ if .Values.prometheusRules.enabled -}}
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:

diff --git a/charts/hedera-mirror-graphql/templates/role.yaml b/charts/hedera-mirror-graphql/templates/role.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if .Values.rbac.enabled -}}
+{{ if .Values.rbac.enabled -}}
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:

diff --git a/charts/hedera-mirror-graphql/templates/rolebinding.yaml b/charts/hedera-mirror-graphql/templates/rolebinding.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if .Values.rbac.enabled -}}
+{{ if .Values.rbac.enabled -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:

diff --git a/charts/hedera-mirror-graphql/templates/serviceaccount.yaml b/charts/hedera-mirror-graphql/templates/serviceaccount.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if .Values.serviceAccount.create -}}
+{{ if .Values.serviceAccount.create -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata:

diff --git a/charts/hedera-mirror-graphql/templates/servicemonitor.yaml b/charts/hedera-mirror-graphql/templates/servicemonitor.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if .Values.serviceMonitor.enabled -}}
+{{ if .Values.serviceMonitor.enabled -}}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:

diff --git a/charts/hedera-mirror-graphql/templates/tests/configmap.yaml b/charts/hedera-mirror-graphql/templates/tests/configmap.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if .Values.test.enabled -}}
+{{ if .Values.test.enabled -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:

diff --git a/charts/hedera-mirror-graphql/templates/tests/pod.yaml b/charts/hedera-mirror-graphql/templates/tests/pod.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if .Values.test.enabled -}}
+{{ if .Values.test.enabled -}}
 apiVersion: v1
 kind: Pod
 metadata:

diff --git a/charts/hedera-mirror-grpc/templates/alertmanagerconfig.yaml b/charts/hedera-mirror-grpc/templates/alertmanagerconfig.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if .Values.alertmanager.inhibitRules.enabled -}}
+{{ if .Values.alertmanager.inhibitRules.enabled -}}
 apiVersion: monitoring.coreos.com/v1alpha1
 kind: AlertmanagerConfig
 metadata:

diff --git a/charts/hedera-mirror-grpc/templates/gcpbackendpolicy.yaml b/charts/hedera-mirror-grpc/templates/gcpbackendpolicy.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if and .Values.global.gateway.enabled .Values.gateway.gcp.enabled (not (empty .Values.gateway.gcp.backendPolicy)) -}}
+{{ if and .Values.global.gateway.enabled .Values.gateway.gcp.enabled (not (empty .Values.gateway.gcp.backendPolicy)) -}}
 apiVersion: networking.gke.io/v1
 kind: GCPBackendPolicy
 metadata:

diff --git a/charts/hedera-mirror-grpc/templates/grpcroute.yaml b/charts/hedera-mirror-grpc/templates/grpcroute.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if and .Values.global.gateway.enabled .Values.global.gateway.http.enabled -}}
+{{ if and .Values.global.gateway.enabled .Values.global.gateway.http.enabled -}}
 apiVersion: gateway.networking.k8s.io/v1
 kind: GrpcRoute
 metadata:

diff --git a/charts/hedera-mirror-grpc/templates/healthcheckpolicy.yaml b/charts/hedera-mirror-grpc/templates/healthcheckpolicy.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if and .Values.global.gateway.enabled .Values.gateway.gcp.enabled (not (empty .Values.gateway.gcp.healthCheckPolicy)) -}}
+{{ if and .Values.global.gateway.enabled .Values.gateway.gcp.enabled (not (empty .Values.gateway.gcp.healthCheckPolicy)) -}}
 apiVersion: networking.gke.io/v1
 kind: HealthCheckPolicy
 metadata:

diff --git a/charts/hedera-mirror-grpc/templates/hpa.yaml b/charts/hedera-mirror-grpc/templates/hpa.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if .Values.hpa.enabled -}}
+{{ if .Values.hpa.enabled -}}
 apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:

diff --git a/charts/hedera-mirror-grpc/templates/ingress.yaml b/charts/hedera-mirror-grpc/templates/ingress.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if .Values.ingress.enabled -}}
+{{ if .Values.ingress.enabled -}}
 {{- $fullName := include "hedera-mirror-grpc.fullname" $ -}}
 {{- $hostname := .Values.global.hostname -}}
 {{- $servicePort := .Values.service.port -}}

diff --git a/charts/hedera-mirror-grpc/templates/middleware.yaml b/charts/hedera-mirror-grpc/templates/middleware.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-{{- if and .Values.global.middleware .Values.middleware -}}
+{{ if and .Values.global.middleware .Values.middleware -}}
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata: