Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/zxc-build-library.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ jobs:
solo node keys -i node1 --gossip-keys --tls-keys
solo cluster setup
solo network deploy -i node1 -n solo-e2e
solo node setup -i node1 -n solo-e2e -t v0.60.0-alpha.0
solo node setup -i node1 -n solo-e2e -t v0.61.4
solo node start -i node1 -n solo-e2e
kubectl port-forward svc/haproxy-node1-svc -n "${SOLO_NAMESPACE}" 50211:50211 &
solo mirror-node deploy -n "${SOLO_NAMESPACE}" --pinger true
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -883,9 +883,12 @@ src/proto/*.proto
### Ignore Proto Files From Services Repo
/proto/*.proto
/proto/mirror
/proto/services
/proto/state
/proto/auxiliary
/proto/event
/proto/sdk
/proto/platform

### Ignore Generated Package Files
package
Expand Down
9 changes: 5 additions & 4 deletions HieroApi.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
set(HAPI_VERSION_TAG "v0.60.0-alpha.0" CACHE STRING "Use the configured version tag for the Hiero API protobufs")
set(HAPI_VERSION_TAG "v0.61.4" CACHE STRING "Use the configured version tag for the Hiero API protobufs")

if (HAPI_VERSION_TAG STREQUAL "")
set(HAPI_VERSION_TAG "v0.60.0-alpha.0")
set(HAPI_VERSION_TAG "v0.61.4")
endif ()

# Fetch the protobuf definitions
Expand Down Expand Up @@ -49,10 +49,11 @@ if (FILES_TO_REMOVE)
endif()

file(INSTALL ${PROJECT_SOURCE_DIR}/proto/service-external-proto/mirror/ DESTINATION ${PROTO_SRC}/mirror)
file(INSTALL ${hproto_SOURCE_DIR}/hapi/hedera-protobufs/services/ DESTINATION ${PROTO_SRC})
file(INSTALL ${hproto_SOURCE_DIR}/hapi/hedera-protobufs/platform/ DESTINATION ${PROTO_SRC})
file(INSTALL ${PROJECT_SOURCE_DIR}/proto/service-external-proto/sdk/ DESTINATION ${PROTO_SRC})

file(INSTALL ${hproto_SOURCE_DIR}/hapi/hedera-protobuf-java-api/src/main/proto/platform/ DESTINATION ${PROTO_SRC}/platform)
file(INSTALL ${hproto_SOURCE_DIR}/hapi/hedera-protobuf-java-api/src/main/proto/services/ DESTINATION ${PROTO_SRC}/services)

add_subdirectory(proto)

set(HAPI_ROOT_DIR ${CMAKE_CURRENT_BINARY_DIR}/proto)
Expand Down
246 changes: 124 additions & 122 deletions proto/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,132 +1,134 @@
# Begin Protobuf Definitions
set(PROTO_FILES
address_book_service.proto
basic_types.proto
consensus_create_topic.proto
consensus_delete_topic.proto
consensus_get_topic_info.proto
consensus_service.proto
consensus_submit_message.proto
consensus_topic_info.proto
consensus_update_topic.proto
contract_call.proto
contract_call_local.proto
contract_create.proto
contract_delete.proto
contract_get_bytecode.proto
contract_get_info.proto
contract_get_records.proto
contract_update.proto
contract_types.proto
crypto_add_live_hash.proto
crypto_approve_allowance.proto
crypto_create.proto
crypto_delete.proto
crypto_delete_allowance.proto
crypto_delete_live_hash.proto
crypto_get_account_balance.proto
crypto_get_account_records.proto
crypto_get_info.proto
crypto_get_live_hash.proto
crypto_get_stakers.proto
crypto_service.proto
crypto_transfer.proto
crypto_update.proto
custom_fees.proto
duration.proto
ethereum_transaction.proto
exchange_rate.proto
file_append.proto
file_create.proto
file_delete.proto
file_get_contents.proto
file_get_info.proto
file_service.proto
file_update.proto
freeze.proto
freeze_service.proto
freeze_type.proto
get_account_details.proto
get_by_key.proto
get_by_solidity_id.proto
network_get_execution_time.proto
network_get_version_info.proto
network_service.proto
node_create.proto
node_delete.proto
node_stake_update.proto
node_update.proto
query.proto
query_header.proto
response.proto
response_code.proto
response_header.proto
schedulable_transaction_body.proto
schedule_create.proto
schedule_delete.proto
schedule_get_info.proto
schedule_service.proto
schedule_sign.proto
smart_contract_service.proto
system_delete.proto
system_undelete.proto
throttle_definitions.proto
timestamp.proto
token_airdrop.proto
token_associate.proto
token_burn.proto
token_cancel_airdrop.proto
token_claim_airdrop.proto
token_create.proto
token_delete.proto
token_dissociate.proto
token_fee_schedule_update.proto
token_freeze_account.proto
token_get_account_nft_infos.proto
token_get_info.proto
token_get_nft_info.proto
token_get_nft_infos.proto
token_grant_kyc.proto
token_mint.proto
token_pause.proto
token_reject.proto
token_revoke_kyc.proto
token_service.proto
token_unfreeze_account.proto
token_unpause.proto
token_update.proto
token_update_nfts.proto
token_wipe_account.proto
transaction.proto
transaction_contents.proto
transaction_get_fast_record.proto
transaction_get_receipt.proto
transaction_get_record.proto
transaction_list.proto
transaction_receipt.proto
transaction_record.proto
transaction_response.proto
unchecked_submit.proto
util_prng.proto
util_service.proto

auxiliary/hints/crs_publication.proto
auxiliary/hints/hints_key_publication.proto
auxiliary/hints/hints_partial_signature.proto
auxiliary/hints/hints_preprocessing_vote.proto
auxiliary/history/history_proof_signature.proto
auxiliary/history/history_proof_key_publication.proto
auxiliary/history/history_proof_vote.proto
auxiliary/tss/tss_message.proto
auxiliary/tss/tss_vote.proto
mirror/consensus_service.proto
mirror/mirror_network_service.proto

event/state_signature_transaction.proto
platform/event/state_signature_transaction.proto

state/hints/hints_types.proto
state/history/history_types.proto
services/address_book_service.proto
services/basic_types.proto
services/consensus_create_topic.proto
services/consensus_delete_topic.proto
services/consensus_get_topic_info.proto
services/consensus_service.proto
services/consensus_submit_message.proto
services/consensus_topic_info.proto
services/consensus_update_topic.proto
services/contract_call.proto
services/contract_call_local.proto
services/contract_create.proto
services/contract_delete.proto
services/contract_get_bytecode.proto
services/contract_get_info.proto
services/contract_get_records.proto
services/contract_update.proto
services/contract_types.proto
services/crypto_add_live_hash.proto
services/crypto_approve_allowance.proto
services/crypto_create.proto
services/crypto_delete.proto
services/crypto_delete_allowance.proto
services/crypto_delete_live_hash.proto
services/crypto_get_account_balance.proto
services/crypto_get_account_records.proto
services/crypto_get_info.proto
services/crypto_get_live_hash.proto
services/crypto_get_stakers.proto
services/crypto_service.proto
services/crypto_transfer.proto
services/crypto_update.proto
services/custom_fees.proto
services/duration.proto
services/ethereum_transaction.proto
services/exchange_rate.proto
services/file_append.proto
services/file_create.proto
services/file_delete.proto
services/file_get_contents.proto
services/file_get_info.proto
services/file_service.proto
services/file_update.proto
services/freeze.proto
services/freeze_service.proto
services/freeze_type.proto
services/get_account_details.proto
services/get_by_key.proto
services/get_by_solidity_id.proto
services/network_get_execution_time.proto
services/network_get_version_info.proto
services/network_service.proto
services/node_create.proto
services/node_delete.proto
services/node_stake_update.proto
services/node_update.proto
services/query.proto
services/query_header.proto
services/response.proto
services/response_code.proto
services/response_header.proto
services/schedulable_transaction_body.proto
services/schedule_create.proto
services/schedule_delete.proto
services/schedule_get_info.proto
services/schedule_service.proto
services/schedule_sign.proto
services/smart_contract_service.proto
services/system_delete.proto
services/system_undelete.proto
services/throttle_definitions.proto
services/timestamp.proto
services/token_airdrop.proto
services/token_associate.proto
services/token_burn.proto
services/token_cancel_airdrop.proto
services/token_claim_airdrop.proto
services/token_create.proto
services/token_delete.proto
services/token_dissociate.proto
services/token_fee_schedule_update.proto
services/token_freeze_account.proto
services/token_get_account_nft_infos.proto
services/token_get_info.proto
services/token_get_nft_info.proto
services/token_get_nft_infos.proto
services/token_grant_kyc.proto
services/token_mint.proto
services/token_pause.proto
services/token_reject.proto
services/token_revoke_kyc.proto
services/token_service.proto
services/token_unfreeze_account.proto
services/token_unpause.proto
services/token_update.proto
services/token_update_nfts.proto
services/token_wipe_account.proto
services/transaction.proto
services/transaction_contents.proto
services/transaction_get_fast_record.proto
services/transaction_get_receipt.proto
services/transaction_get_record.proto
services/transaction_receipt.proto
services/transaction_record.proto
services/transaction_response.proto
services/unchecked_submit.proto
services/util_prng.proto
services/util_service.proto

mirror/consensus_service.proto
mirror/mirror_network_service.proto)
services/auxiliary/hints/crs_publication.proto
services/auxiliary/hints/hints_key_publication.proto
services/auxiliary/hints/hints_partial_signature.proto
services/auxiliary/hints/hints_preprocessing_vote.proto
services/auxiliary/history/history_proof_signature.proto
services/auxiliary/history/history_proof_key_publication.proto
services/auxiliary/history/history_proof_vote.proto
services/auxiliary/tss/tss_message.proto
services/auxiliary/tss/tss_vote.proto

services/state/hints/hints_types.proto
services/state/history/history_types.proto
)
# End Protobuf Definitions

add_library(hapi STATIC ${PROTO_FILES})
Expand Down
6 changes: 3 additions & 3 deletions proto/service-external-proto/mirror/consensus_service.proto
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ option java_multiple_files = true;

option java_package = "com.hedera.mirror.api.proto";

import "basic_types.proto";
import "timestamp.proto";
import "consensus_submit_message.proto";
import "services/basic_types.proto";
import "services/timestamp.proto";
import "services/consensus_submit_message.proto";

message ConsensusTopicQuery {
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ package com.hedera.mirror.api.proto;
option java_multiple_files = true; // Required for the reactor-grpc generator to work correctly
option java_package = "com.hedera.mirror.api.proto";

import "basic_types.proto";
import "timestamp.proto";
import "services/basic_types.proto";
import "services/timestamp.proto";

/**
* Request object to query an address book for its list of nodes
Expand Down
2 changes: 1 addition & 1 deletion proto/service-external-proto/sdk/transaction_list.proto
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package proto;
option java_package = "com.hedera.hashgraph.sdk.proto";
option java_multiple_files = true;

import "transaction.proto";
import "services/transaction.proto";

/**
* A simple protobuf wrapper to store a list of transactions. This is used by
Expand Down
Loading
Loading