Skip to content

Commit 318b87b

Browse files
ibankovibankov
committed
Merge branch 'main' into record-path-test
2 parents 661de14 + 15aada6 commit 318b87b

File tree

191 files changed

+4738
-1217
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

191 files changed

+4738
-1217
lines changed

‎.github/workflows/support/citr/Taskfile.citr.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ tasks:
413413
silent: true
414414
cmds:
415415
- |
416-
if ! kubectl get svc -l app.kubernetes.io/instance=minio-operator --all-namespaces --no-headers | grep -q . ; then
416+
if ! kubectl get pods -l app.kubernetes.io/instance=minio-operator -l app.kubernetes.io/name=operator --all-namespaces --no-headers | grep -q . ; then
417417
echo "No services found with label app.kubernetes.io/name=operator app.kubernetes.io/instance=minio-operator"
418418
echo "--minio" > {{ .minio_flag_file }}
419419
else
@@ -431,9 +431,9 @@ tasks:
431431
- |
432432
export MINIO_FLAG=$(cat {{ .minio_flag_file }})
433433
if [[ "{{ .solo_ge_0440 }}" == "true" ]]; then
434-
SOLO_HOME_DIR=${SOLO_HOME_DIR} solo cluster-ref config setup --cluster-setup-namespace "${SOLO_CLUSTER_SETUP_NAMESPACE}" ${MINIO_FLAG} ${SOLO_CHARTS_DIR_FLAG} ${CLUSTER_TLS_FLAGS} -q --dev
434+
SOLO_HOME_DIR=${SOLO_HOME_DIR} solo cluster-ref config setup --cluster-setup-namespace "${SOLO_CLUSTER_SETUP_NAMESPACE}" ${MINIO_FLAG} ${SOLO_CHARTS_DIR_FLAG} ${CLUSTER_TLS_FLAGS} --no-prometheus-stack -q --dev
435435
else
436-
SOLO_HOME_DIR=${SOLO_HOME_DIR} solo cluster-ref setup --cluster-setup-namespace "${SOLO_CLUSTER_SETUP_NAMESPACE}" ${MINIO_FLAG} ${SOLO_CHARTS_DIR_FLAG} ${CLUSTER_TLS_FLAGS} -q --dev
436+
SOLO_HOME_DIR=${SOLO_HOME_DIR} solo cluster-ref setup --cluster-setup-namespace "${SOLO_CLUSTER_SETUP_NAMESPACE}" ${MINIO_FLAG} ${SOLO_CHARTS_DIR_FLAG} ${CLUSTER_TLS_FLAGS} --no-prometheus-stack -q --dev
437437
fi
438438
439439
solo:node:addresses:

‎.github/workflows/support/citr/Taskfile.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ env:
2626
#EXPLORER_CLUSTER_CONTEXT: "kind-solo-cluster"
2727
SOLO_DEPLOYMENT: %SOLO_NAMESPACE%-test
2828
CLUSTER_REF: %SOLO_NAMESPACE%-ref
29-
SOLO_CLUSTER_RELEASE_NAME: cluster_name
29+
SOLO_CLUSTER_RELEASE_NAME: solo-cluster-setup
3030
CONTEXT: hashgraph.teleport.sh-k8s.pft.chi.lat.ope.eng.hashgraph.io
3131
SOLO_CLUSTER_SETUP_NAMESPACE: solo-setup
3232
SOLO_CLUSTER_NAME: solo-cluster-name

‎.github/workflows/support/citr/log4j2.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<RollingFile name="BlockNodeCommsFile" fileName="output/blocknode-comms.log"
8080
filePattern="output/blocknode-comms-%i.log">
8181
<PatternLayout>
82-
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p %-4L %c{1} - %m{nolookups}%n</pattern>
82+
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p %-4L %c{1} - [%t] %m{nolookups}%n</pattern>
8383
</PatternLayout>
8484
<Policies>
8585
<SizeBasedTriggeringPolicy size="100 MB"/>

‎hedera-node/configuration/compose/log4j2.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<RollingFile name="BlockNodeCommsFile" fileName="output/blocknode-comms.log"
7878
filePattern="output/blocknode-comms-%i.log">
7979
<PatternLayout>
80-
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p %-4L %c{1} - %m{nolookups}%n</pattern>
80+
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p %-4L %c{1} - [%t] %m{nolookups}%n</pattern>
8181
</PatternLayout>
8282
<Policies>
8383
<SizeBasedTriggeringPolicy size="100 MB"/>

‎hedera-node/configuration/dev/log4j2.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<RollingFile name="BlockNodeCommsFile" fileName="output/blocknode-comms.log"
8686
filePattern="output/blocknode-comms-%i.log">
8787
<PatternLayout>
88-
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p %-4L %c{1} - %m{nolookups}%n</pattern>
88+
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p %-4L %c{1} - [%t] %m{nolookups}%n</pattern>
8989
</PatternLayout>
9090
<Policies>
9191
<SizeBasedTriggeringPolicy size="100 MB"/>

‎hedera-node/configuration/mainnet/log4j2.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<RollingFile name="BlockNodeCommsFile" fileName="output/blocknode-comms.log"
8686
filePattern="output/blocknode-comms-%i.log">
8787
<PatternLayout>
88-
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p %-4L %c{1} - %m{nolookups}%n</pattern>
88+
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p %-4L %c{1} - [%t] %m{nolookups}%n</pattern>
8989
</PatternLayout>
9090
<Policies>
9191
<SizeBasedTriggeringPolicy size="100 MB"/>

‎hedera-node/configuration/preprod/log4j2.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<RollingFile name="BlockNodeCommsFile" fileName="output/blocknode-comms.log"
8686
filePattern="output/blocknode-comms-%i.log">
8787
<PatternLayout>
88-
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p %-4L %c{1} - %m{nolookups}%n</pattern>
88+
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p %-4L %c{1} - [%t] %m{nolookups}%n</pattern>
8989
</PatternLayout>
9090
<Policies>
9191
<SizeBasedTriggeringPolicy size="100 MB"/>

‎hedera-node/configuration/previewnet/log4j2.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<RollingFile name="BlockNodeCommsFile" fileName="output/blocknode-comms.log"
8686
filePattern="output/blocknode-comms-%i.log">
8787
<PatternLayout>
88-
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p %-4L %c{1} - %m{nolookups}%n</pattern>
88+
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p %-4L %c{1} - [%t] %m{nolookups}%n</pattern>
8989
</PatternLayout>
9090
<Policies>
9191
<SizeBasedTriggeringPolicy size="100 MB"/>

‎hedera-node/configuration/testnet/log4j2.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<RollingFile name="BlockNodeCommsFile" fileName="output/blocknode-comms.log"
8686
filePattern="output/blocknode-comms-%i.log">
8787
<PatternLayout>
88-
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p %-4L %c{1} - %m{nolookups}%n</pattern>
88+
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p %-4L %c{1} - [%t] %m{nolookups}%n</pattern>
8989
</PatternLayout>
9090
<Policies>
9191
<SizeBasedTriggeringPolicy size="100 MB"/>

‎hedera-node/hapi-fees/src/main/java/module-info.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
exports com.hedera.node.app.hapi.fees.calc;
1515
exports com.hedera.node.app.hapi.fees.usage.contract;
1616
exports com.hedera.node.app.hapi.fees.usage.token.entities;
17+
exports org.hiero.hapi.fees;
1718

1819
requires transitive com.hedera.node.app.hapi.utils;
1920
requires transitive com.hedera.node.hapi;

0 commit comments

Comments
 (0)