Skip to content

Commit 0c27667

Browse files
committed
Merge branch 'main' into 00890-tck-c-implement-json-rpc-method-endpoint-for-transfertransaction
2 parents 6af640d + c7ee7b1 commit 0c27667

File tree

125 files changed

+2064
-387
lines changed

Some content is hidden

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

125 files changed

+2064
-387
lines changed

.github/workflows/zxc-build-library.yaml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050

5151
steps:
5252
- name: Harden Runner
53-
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
53+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
5454
with:
5555
egress-policy: audit
5656

@@ -114,7 +114,7 @@ jobs:
114114
run: mkdir -p "${{ github.workspace }}/b/vcpkg_cache"
115115

116116
- name: Install CMake & Ninja
117-
uses: lukka/get-cmake@5f6e04f5267c8133f1273bf2103583fc72c46b17 # v3.31.5
117+
uses: lukka/get-cmake@56d043d188c3612951d8755da8f4b709ec951ad6 # v3.31.6
118118
with:
119119
useCloudCache: true
120120

@@ -174,12 +174,13 @@ jobs:
174174
solo node keys -i node1 --gossip-keys --tls-keys
175175
solo cluster setup
176176
solo network deploy -i node1 -n solo-e2e
177-
solo node setup -i node1 -n solo-e2e -t v0.57.0
177+
solo node setup -i node1 -n solo-e2e -t v0.59.0
178178
solo node start -i node1 -n solo-e2e
179179
kubectl port-forward svc/haproxy-node1-svc -n "${SOLO_NAMESPACE}" 50211:50211 &
180180
solo mirror-node deploy -n "${SOLO_NAMESPACE}" --pinger true
181181
kubectl port-forward $(cut -d' ' -f1 <<<$(kubectl get pods -n solo-e2e | grep mirror-rest-)) 5551:5551 -n solo-e2e &
182182
kubectl port-forward $(cut -d' ' -f1 <<<$(kubectl get pods -n solo-e2e | grep mirror-web)) 8545:8545 -n solo-e2e &
183+
kubectl port-forward $(cut -d' ' -f1 <<<$(kubectl get pods -n solo-e2e | grep mirror-grpc)) 5600:5600 -n solo-e2e &
183184
184185
- name: Start CTest suite (Debug)
185186
run: ${{ steps.cgroup.outputs.exec }} ctest -j 6 -C Debug --test-dir build/${{ matrix.preset }}-debug --output-on-failure
@@ -194,7 +195,7 @@ jobs:
194195

195196
- name: Attach Artifact
196197
if: github.event.pull_request.merged == true
197-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
198+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
198199
with:
199200
name: hapi-library-${{ runner.os }}-${{ steps.sha.outputs.short }}
200201
path: package/
@@ -210,7 +211,7 @@ jobs:
210211

211212
steps:
212213
- name: Harden Runner
213-
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
214+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
214215
with:
215216
egress-policy: audit
216217

@@ -231,7 +232,7 @@ jobs:
231232
distribution: strawberry
232233

233234
- name: Setup-nasm
234-
uses: ilammy/setup-nasm@13cbeb366c45c4379d3478cdcbadd8295feb5028 # v1.5.1
235+
uses: ilammy/setup-nasm@72793074d3c8cdda771dba85f6deafe00623038b # v1.5.2
235236

236237
- name: Enable Git long paths
237238
run: git config --global core.longpaths true
@@ -256,7 +257,7 @@ jobs:
256257
Add-Content -Path $env:GITHUB_OUTPUT -Value "short=$short"
257258
258259
- name: Attach Artifact
259-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
260+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
260261
with:
261262
name: hapi-library-${{ runner.os }}-${{ steps.sha.outputs.short }}
262263
path: package/
@@ -271,7 +272,7 @@ jobs:
271272

272273
steps:
273274
- name: Harden Runner
274-
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
275+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
275276
with:
276277
egress-policy: audit
277278

@@ -299,7 +300,7 @@ jobs:
299300
run: echo "short=$(echo -n "${{ github.sha }}" | cut -c1-8)" >> $GITHUB_OUTPUT
300301

301302
- name: Attach Artifact
302-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
303+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
303304
with:
304305
name: hapi-library-${{ runner.os }}-${{ steps.sha.outputs.short }}
305306
path: package/

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -885,6 +885,7 @@ src/proto/*.proto
885885
/proto/mirror
886886
/proto/state
887887
/proto/auxiliary
888+
/proto/event
888889

889890
### Ignore Generated Package Files
890891
package

HieroApi.cmake

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
set(HAPI_VERSION_TAG "v0.57.0" CACHE STRING "Use the configured version tag for the Hiero API protobufs")
1+
set(HAPI_VERSION_TAG "v0.59.0" CACHE STRING "Use the configured version tag for the Hiero API protobufs")
22

33
if (HAPI_VERSION_TAG STREQUAL "")
4-
set(HAPI_VERSION_TAG "v0.57.0")
4+
set(HAPI_VERSION_TAG "v0.59.0")
55
endif ()
66

77
# Fetch the protobuf definitions
88
FetchContent_Declare(
99
HProto
10-
GIT_REPOSITORY https://github.com/hashgraph/hedera-services.git
10+
GIT_REPOSITORY https://github.com/hiero-ledger/hiero-consensus-node.git
1111
GIT_TAG ${HAPI_VERSION_TAG}
1212
)
1313
set(FETCHCONTENT_QUIET OFF)
@@ -50,6 +50,7 @@ endif()
5050

5151
file(INSTALL ${PROJECT_SOURCE_DIR}/proto/service-external-proto/mirror/ DESTINATION ${PROTO_SRC}/mirror)
5252
file(INSTALL ${hproto_SOURCE_DIR}/hapi/hedera-protobufs/services/ DESTINATION ${PROTO_SRC})
53+
file(INSTALL ${hproto_SOURCE_DIR}/hapi/hedera-protobufs/platform/ DESTINATION ${PROTO_SRC})
5354
file(INSTALL ${PROJECT_SOURCE_DIR}/proto/service-external-proto/sdk/ DESTINATION ${PROTO_SRC})
5455

5556
add_subdirectory(proto)

proto/CMakeLists.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ set(PROTO_FILES
9898
token_update_nfts.proto
9999
token_wipe_account.proto
100100
transaction.proto
101-
transaction_body.proto
102101
transaction_contents.proto
103102
transaction_get_fast_record.proto
104103
transaction_get_receipt.proto
@@ -111,10 +110,16 @@ set(PROTO_FILES
111110
util_prng.proto
112111
util_service.proto
113112

113+
auxiliary/history/history_proof_signature.proto
114+
auxiliary/history/history_proof_key_publication.proto
115+
auxiliary/history/history_proof_vote.proto
114116
auxiliary/tss/tss_message.proto
115-
auxiliary/tss/tss_share_signature.proto
116117
auxiliary/tss/tss_vote.proto
117118

119+
event/state_signature_transaction.proto
120+
121+
state/history/history_types.proto
122+
118123
mirror/consensus_service.proto
119124
mirror/mirror_network_service.proto)
120125
# End Protobuf Definitions

src/sdk/examples/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ set(MULTI_APP_TRANSFER_EXAMPLE_NAME ${PROJECT_NAME}-multi-app-transfer-example)
4444
set(MULTI_SIG_OFFLINE_EXAMPLE_NAME ${PROJECT_NAME}-multi-sig-offline-example)
4545
set(NFT_ADD_REMOVE_ALLOWANCES_EXAMPLE_NAME ${PROJECT_NAME}-nft-add-remove-allowances-example)
4646
set(PRNG_EXAMPLE_NAME ${PROJECT_NAME}-prng-example)
47+
set(REVENUE_GENERATING_TOPICS_EXAMPLE_NAME ${PROJECT_NAME}-revenue-generating-topics-example)
4748
set(SCHEDULE_EXAMPLE_NAME ${PROJECT_NAME}-schedule-example)
4849
set(SCHEDULE_IDENTICAL_TRANSACTION_EXAMPLE_NAME ${PROJECT_NAME}-schedule-identical-transaction-example)
4950
set(SCHEDULE_MULTI_SIG_TRANSACTION_EXAMPLE_NAME ${PROJECT_NAME}-schedule-multisig-transaction-example)
@@ -101,6 +102,7 @@ add_executable(${MULTI_APP_TRANSFER_EXAMPLE_NAME} MultiAppTransferExample.cc)
101102
add_executable(${MULTI_SIG_OFFLINE_EXAMPLE_NAME} MultiSigOfflineExample.cc)
102103
add_executable(${NFT_ADD_REMOVE_ALLOWANCES_EXAMPLE_NAME} NftAddRemoveAllowancesExample.cc)
103104
add_executable(${PRNG_EXAMPLE_NAME} PrngExample.cc)
105+
add_executable(${REVENUE_GENERATING_TOPICS_EXAMPLE_NAME} RevenueGeneratingTopicsExample.cc)
104106
add_executable(${SCHEDULE_EXAMPLE_NAME} ScheduleExample.cc)
105107
add_executable(${SCHEDULE_IDENTICAL_TRANSACTION_EXAMPLE_NAME} ScheduleIdenticalTransactionExample.cc)
106108
add_executable(${SCHEDULE_MULTI_SIG_TRANSACTION_EXAMPLE_NAME} ScheduleMultiSigTransactionExample.cc)
@@ -180,6 +182,7 @@ target_link_libraries(${MULTI_APP_TRANSFER_EXAMPLE_NAME} PUBLIC ${PROJECT_NAME})
180182
target_link_libraries(${MULTI_SIG_OFFLINE_EXAMPLE_NAME} PUBLIC ${PROJECT_NAME})
181183
target_link_libraries(${NFT_ADD_REMOVE_ALLOWANCES_EXAMPLE_NAME} PUBLIC ${PROJECT_NAME})
182184
target_link_libraries(${PRNG_EXAMPLE_NAME} PUBLIC ${PROJECT_NAME})
185+
target_link_libraries(${REVENUE_GENERATING_TOPICS_EXAMPLE_NAME} PUBLIC ${PROJECT_NAME})
183186
target_link_libraries(${SCHEDULE_EXAMPLE_NAME} PUBLIC ${PROJECT_NAME})
184187
target_link_libraries(${SCHEDULE_IDENTICAL_TRANSACTION_EXAMPLE_NAME} PUBLIC ${PROJECT_NAME})
185188
target_link_libraries(${SCHEDULE_MULTI_SIG_TRANSACTION_EXAMPLE_NAME} PUBLIC ${PROJECT_NAME})
@@ -239,6 +242,7 @@ install(TARGETS
239242
${MULTI_SIG_OFFLINE_EXAMPLE_NAME}
240243
${NFT_ADD_REMOVE_ALLOWANCES_EXAMPLE_NAME}
241244
${PRNG_EXAMPLE_NAME}
245+
${REVENUE_GENERATING_TOPICS_EXAMPLE_NAME}
242246
${SCHEDULE_EXAMPLE_NAME}
243247
${SCHEDULE_IDENTICAL_TRANSACTION_EXAMPLE_NAME}
244248
${SCHEDULE_MULTI_SIG_TRANSACTION_EXAMPLE_NAME}

0 commit comments

Comments
 (0)