Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: Correct locations of various TSS protos #15780

Merged
merged 25 commits into from
Oct 9, 2024
Merged

chore: Correct locations of various TSS protos #15780

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
798ac83
TSS Proto Comments: keywords and copyright corrections
mhess-swl Oct 2, 2024
4c18dfc
Restore tss protos to correct packages
mhess-swl Oct 3, 2024
4319f96
Merge branch 'develop' into tss-protobufs
mhess-swl Oct 3, 2024
11555a6
Fix proto compilation
mhess-swl Oct 3, 2024
2e71218
Designate TSS transactions as services auxiliary
mhess-swl Oct 4, 2024
9fc1c9e
Merge branch 'develop' into tss-protobufs
mhess-swl Oct 4, 2024
a5476e4
fixes
mhess-swl Oct 4, 2024
9c1a0fc
Move to auxiliary/tss
mhess-swl Oct 4, 2024
7d300b8
Import correct classes
mhess-swl Oct 5, 2024
bd6b4f5
message map, vote map keys to state/tss
mhess-swl Oct 5, 2024
2b2bb8a
re-instate comments and add specs
thomas-swirlds-labs Oct 7, 2024
991aa90
re-instate comments and add specs
thomas-swirlds-labs Oct 7, 2024
56747ab
small updates to specs
thomas-swirlds-labs Oct 7, 2024
8d96f3a
Merge branch 'develop' into tss-protobufs
thomas-swirlds-labs Oct 7, 2024
3432a72
small updates to specs
thomas-swirlds-labs Oct 7, 2024
5281b7a
Merge remote-tracking branch 'origin/tss-protobufs' into tss-protobufs
thomas-swirlds-labs Oct 7, 2024
64f5e21
Another file location fix...
mhess-swl Oct 7, 2024
e8b31f8
Update hapi/hedera-protobufs/services/auxiliary/tss/tss_message.proto
thomas-swirlds-labs Oct 8, 2024
1028a1c
review comments #2
thomas-swirlds-labs Oct 8, 2024
46eed8f
Merge remote-tracking branch 'origin/tss-protobufs' into tss-protobufs
thomas-swirlds-labs Oct 8, 2024
efb9091
Merge branch 'develop' into tss-protobufs
thomas-swirlds-labs Oct 8, 2024
0a90fe5
Update hapi/hedera-protobufs/services/auxiliary/tss/tss_message.proto
thomas-swirlds-labs Oct 8, 2024
5691af3
Update hapi/hedera-protobufs/services/state/tss/tss_message_map_key.p…
thomas-swirlds-labs Oct 8, 2024
64c7348
Update hapi/hedera-protobufs/services/state/tss/tss_vote_map_key.proto
thomas-swirlds-labs Oct 8, 2024
c4306fe
Merge branch 'develop' into tss-protobufs
thomas-swirlds-labs Oct 8, 2024
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
6 changes: 3 additions & 3 deletions ...fs/services/tss_message_transaction.proto → ...tform/event/tss_message_transaction.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*/
syntax = "proto3";

package proto;
package com.hedera.hapi.platform.event;
lpetrovic05 marked this conversation as resolved.
Show resolved Hide resolved

/*
* Copyright (C) 2024 Hedera Hashgraph, LLC
Expand All @@ -28,8 +28,8 @@ package proto;
* limitations under the License.
*/

option java_package = "com.hederahashgraph.api.proto.java";
// <<<pbj.java_package = "com.hedera.hapi.node.tss">>> This comment is special code for setting PBJ Compiler java package
option java_package = "com.hedera.hapi.platform.event.legacy";
// <<<pbj.java_package = "com.hedera.hapi.platform.event">>> This comment is special code for setting PBJ Compiler java package

option java_multiple_files = true;

Expand Down
6 changes: 3 additions & 3 deletions ...obufs/services/tss_vote_transaction.proto → ...platform/event/tss_vote_transaction.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*/
syntax = "proto3";

package proto;
package com.hedera.hapi.platform.event;

/*
* Copyright (C) 2024 Hedera Hashgraph, LLC
Expand All @@ -28,8 +28,8 @@ package proto;
* limitations under the License.
*/

option java_package = "com.hederahashgraph.api.proto.java";
// <<<pbj.java_package = "com.hedera.hapi.node.tss">>> This comment is special code for setting PBJ Compiler java package
option java_package = "com.hedera.hapi.platform.event.legacy";
// <<<pbj.java_package = "com.hedera.hapi.platform.event">>> This comment is special code for setting PBJ Compiler java package
option java_multiple_files = true;

/**
Expand Down
8 changes: 3 additions & 5 deletions ...vices/state/tss/tss_message_map_key.proto → ...fs/platform/tss/tss_message_map_key.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,9 @@
*/
syntax = "proto3";

package com.hedera.hapi.node.state.tss;
package com.hedera.hapi.platform.tss;
thomas-swirlds-labs marked this conversation as resolved.
Show resolved Hide resolved

/*
* Hedera Network Services Protobuf
*
* Copyright (C) 2024 Hedera Hashgraph, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -30,8 +28,8 @@ package com.hedera.hapi.node.state.tss;
* limitations under the License.
*/

option java_package = "com.hederahashgraph.api.proto.java";
// <<<pbj.java_package = "com.hedera.hapi.node.state.tss">>> This comment is special code for setting PBJ Compiler java package
option java_package = "com.hedera.hapi.platform.tss.legacy";
// <<<pbj.java_package = "com.hedera.hapi.platform.tss">>> This comment is special code for setting PBJ Compiler java package
option java_multiple_files = true;

/**
Expand Down
8 changes: 3 additions & 5 deletions ...services/state/tss/tss_vote_map_key.proto → ...obufs/platform/tss/tss_vote_map_key.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,9 @@
*/
syntax = "proto3";

package com.hedera.hapi.node.state.tss;
package com.hedera.hapi.platform.tss;
thomas-swirlds-labs marked this conversation as resolved.
Show resolved Hide resolved

/*
* Hedera Network Services Protobuf
*
* Copyright (C) 2024 Hedera Hashgraph, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -30,8 +28,8 @@ package com.hedera.hapi.node.state.tss;
* limitations under the License.
*/

option java_package = "com.hederahashgraph.api.proto.java";
// <<<pbj.java_package = "com.hedera.hapi.node.state.tss">>> This comment is special code for setting PBJ Compiler java package
option java_package = "com.hedera.hapi.platform.tss.legacy";
// <<<pbj.java_package = "com.hedera.hapi.platform.tss">>> This comment is special code for setting PBJ Compiler java package
option java_multiple_files = true;

/**
Expand Down
8 changes: 4 additions & 4 deletions hapi/hedera-protobufs/services/transaction_body.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ import "node_create.proto";
import "node_update.proto";
import "node_delete.proto";

import "tss_message_transaction.proto";
import "tss_vote_transaction.proto";
import "event/tss_message_transaction.proto";
import "event/tss_vote_transaction.proto";

/**
* A single transaction. All transaction types are possible here.
Expand Down Expand Up @@ -425,11 +425,11 @@ message TransactionBody {
/**
* A transaction body for a `tssMessage` request.
*/
TssMessageTransactionBody tssMessage = 61;
com.hedera.hapi.platform.event.TssMessageTransactionBody tssMessage = 61;

/**
* A transaction body for a `tssVote` request.
*/
TssVoteTransactionBody tssVote = 62;
com.hedera.hapi.platform.event.TssVoteTransactionBody tssVote = 62;
}
}
Loading