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

feat: Dynamic Address Book Phase 2 protobufs changes #344

Merged
merged 74 commits into from
Apr 26, 2024
Merged

feat: Dynamic Address Book Phase 2 protobufs changes #344

merged 74 commits into from
Apr 26, 2024

Conversation

iwsimon
Copy link
Contributor

@iwsimon iwsimon commented Apr 22, 2024

Description:

Related issue(s):

Fixes #343

Notes for reviewer:

Checklist

  • Documented (Code comments, README, etc.)
  • Tested (unit, integration, etc.)

Neeharika-Sompalli and others added 30 commits April 12, 2023 18:15
@Neeharika-Sompalli @tinker-michaelj @rbair23
Initial draft of PBJ types for token state (#263)
8f63739 
* Add HCS state proto

Signed-off-by: Michael Tinker <michael.tinker@swirldslabs.com>

* Add running hash, delete EntityNumber

Signed-off-by: Michael Tinker <michael.tinker@swirldslabs.com>

* add account and token

* add account and token

* add token

* add tokenRelation

* add some javadocs

* add some javadocs

* address review comments

* fix missing import

* address comments

* address review comments

* Update services/state/token/account.proto

Co-authored-by: Richard Bair <rbair23@users.noreply.github.com>

* Update services/state/token/account.proto

Co-authored-by: Richard Bair <rbair23@users.noreply.github.com>

* address some review comments

* move back under services

* change package name

* some docs and revert java package name

* revert docs

* add javadocs

* add javadocs

* re-order the first 16

---------

Signed-off-by: Michael Tinker <michael.tinker@swirldslabs.com>
Co-authored-by: Michael Tinker <michael.tinker@swirldslabs.com>
Co-authored-by: Richard Bair <rbair23@users.noreply.github.com>
@povolev15
file proto (#267)
618854f 
* 265 - file proto

Signed-off-by: Lev Povolotsky <lev@swirldslabs.com>

* 265 - packaging

Signed-off-by: Lev Povolotsky <lev@swirldslabs.com>

* 265 - comments

Signed-off-by: Lev Povolotsky <lev@swirldslabs.com>

---------

Signed-off-by: Lev Povolotsky <lev@swirldslabs.com>
@Neeharika-Sompalli
Change allowance maps on Account PBJ Object (#269)
7bbf1d5 
* change allowances

* change allowances

* change allowances

* change allowances

* change allowances

* change allowances
@povolev15
fix some comments on file proto (#268)
f6aadf0 
* 265 - file proto

Signed-off-by: Lev Povolotsky <lev@swirldslabs.com>

* 265 - packaging

Signed-off-by: Lev Povolotsky <lev@swirldslabs.com>

* 265 - comments

Signed-off-by: Lev Povolotsky <lev@swirldslabs.com>

* 265 - comments fix

Signed-off-by: Lev Povolotsky <lev@swirldslabs.com>

---------

Signed-off-by: Lev Povolotsky <lev@swirldslabs.com>
@Neeharika-Sompalli
Add missing fields in Account (#270)
d336767 
* add missing fields and change allowance names

* change to bits

* address review comments

* address review comments

* address review comments
@rbair23
Add the TransactionRecordEntry type for the record cache.
ad7d2c0
@rbair23
Add payer account ID
4a6c9ff
@Neeharika-Sompalli
Merge branch 'main' into add-pbj-types-for-state
f471f22
@tinker-michaelj
Include ContractService state types (#273)
c858be6 
* Add bytecode and storage slot representations

Signed-off-by: Michael Tinker <michael.tinker@swirldslabs.com>

* Add Nft type

Signed-off-by: Michael Tinker <michael.tinker@swirldslabs.com>

* Add EntityNumber

Signed-off-by: Michael Tinker <michael.tinker@swirldslabs.com>

* Use bytes instead of Int256Value

Signed-off-by: Michael Tinker <michael.tinker@swirldslabs.com>

* Fix typo

Signed-off-by: Michael Tinker <michael.tinker@swirldslabs.com>

* Remove superfluous Int256Value type

Signed-off-by: Michael Tinker <michael.tinker@swirldslabs.com>

* Rename Id -> UniqueTokenId

Signed-off-by: Michael Tinker <michael.tinker@swirldslabs.com>

* Don't store code_hash, can be cached on load

Signed-off-by: Michael Tinker <michael.tinker@swirldslabs.com>

---------

Signed-off-by: Michael Tinker <michael.tinker@swirldslabs.com>
@jasperpotts
Added state for blocks and running hashes (#276)
96774e9 
* Added state for blocks and running hashes

Signed-off-by: jasperpotts <jasperpotts@users.noreply.github.com>

---------

Signed-off-by: jasperpotts <jasperpotts@users.noreply.github.com>
Co-authored-by: jasperpotts <jasperpotts@users.noreply.github.com>
@Neeharika-Sompalli
Add StakingNodeInfo for MerkleStakingInfo (#277)
2bbbee4 
add staking node info
@povolev15
add schedule proto (#280)
5bcd7e8 
* new schedule proto

Signed-off-by: Lev Povolotsky <lev@swirldslabs.com>

* addresspe comments

Signed-off-by: Lev Povolotsky <lev@swirldslabs.com>

* address comments

Signed-off-by: Lev Povolotsky <lev@swirldslabs.com>

---------

Signed-off-by: Lev Povolotsky <lev@swirldslabs.com>
@jsync-swirlds
Fixing incorrect case for Timestamp. (#282)
0adaa8b 
Signed-off-by: Joseph Sinclair <joseph.sinclair@swirldslabs.com>
@jsync-swirlds
Adding missed import statement. (#283)
413f7cd 
Signed-off-by: Joseph Sinclair <joseph.sinclair@swirldslabs.com>
@jsync-swirlds
Fix package name for state/schedule (#284)
faee2f6 
Original commit of this file uses package com.hedera.hapi.node.state.file
The correct package is com.hedera.hapi.node.state.schedule.

Signed-off-by: Joseph Sinclair <joseph.sinclair@swirldslabs.com>
@povolev15
change topic number to topicID (#286)
3568673 
Signed-off-by: Lev Povolotsky <lev@swirldslabs.com>
@kimbor @povolev15
Update file.proto to use FileID type instead of long for file identif…
70ca376 
…ication (#285)

* Initial commit

* Replace instead of deprecate previous field

* change topic number to topicID (#286)

Signed-off-by: Lev Povolotsky <lev@swirldslabs.com>

* Initial commit

* Replace instead of deprecate previous field

---------

Signed-off-by: Lev Povolotsky <lev@swirldslabs.com>
Co-authored-by: Lev Povolotsky <16233475+povolev15@users.noreply.github.com>
@jsync-swirlds
Adjusting the state Schedule message to improve implementation. (#288)
c524a89 
* Changed body_bytes to original_create_transaction
   * Changed type to TransactionBody
 * Updated comments to clarify several items and correct language

Signed-off-by: Joseph Sinclair <joseph.sinclair@swirldslabs.com>
@kimbor
Change nft owner and spender identifier from long to AccountID (#289)
280f440 
* Change nft owner and spender identifier from long to AccountID

* Import basic_types.proto for AccountID

Signed-off-by: Kim Rader <kim.rader@swirldslabs.com>

---------

Signed-off-by: Kim Rader <kim.rader@swirldslabs.com>
@iwsimon
Update common.proto, token.proto, token-relation.protp and classes th…
89b75cb 
…at rely on it to use AccountID and TokenID (#290)

* Updated common.proto to use use AccountID and TokenID instead of long

* Updated token.proto to use use AccountID and TokenID instead of long

* Updated token_relation.proto to use use AccountID and TokenID instead of long
@kimbor
Use NftID instead of UniqueTokenId (#292)
e1b59db 
Signed-off-by: Kim Rader <kim.rader@swirldslabs.com>
@iwsimon
changed auto_renew_account_number to auto_renew_account_id in topic.p…
095591b 
…roto (#293)

changed auto_renew_account_number to auto_renew_account_id
@Neeharika-Sompalli
Add Staking Reward related fields from MerkleNetworkContext (#295)
2554e80 
* add fields from MerkleNetworkContext

* add fields from MerkleNetworkContext

* doc update

* doc update

* doc update

* doc update
@iwsimon
use snake case throughout protobufs (#294)
7051729 
* Updated last_block_number in BlockInfo to match all others

* Added staked_id, removed staked_number.

* updated number
@jsync-swirlds
Update Schedule state protobuf to add a wait_for_expiry flag. (#297)
003ff39 
Updated Schedule state protobuf to add a wait_for_expiry flag.
 * This protobuf is not yet used, so the fields were renumbered for efficient representation.
 * This is in support of resolving Issue #5518

Signed-off-by: Joseph Sinclair <joseph.sinclair@swirldslabs.com>
@kimbor
update account ids (#291)
0bb5c4b 
Update account.proto to use IDs instead of longs

Signed-off-by: Kim Rader <kim.rader@swirldslabs.com>
@jsync-swirlds
Add Protobuf messages for primitive values and a list of Schedules. (#…
91a53b3 
…299)

* Added primitive.proto which includes ProtoLong, ProtoInteger, ProtoBoolen, ProtoString, and ProtoBytes.
* Added ScheduleList message to schedule.proto

Signed-off-by: Joseph Sinclair <joseph.sinclair@swirldslabs.com>
@Neeharika-Sompalli
Fix the "java_package" (#302)
b22750f 
* fix path

Signed-off-by: Neeharika-Sompalli <neeharika.sompalli@swirldslabs.com>

* fix comment

---------

Signed-off-by: Neeharika-Sompalli <neeharika.sompalli@swirldslabs.com>
@kimbor
protobuf cleanup (#298)
813199c 
Signed-off-by: Kim Rader <kim.rader@swirldslabs.com>
@tinker-michaelj
Merge branch 'main' into add-pbj-types-for-state
c222122
@iwsimon
Updated.
dd5787e 
Signed-off-by: Iris Simon <iris.simon@swirldslabs.com>
@iwsimon
Updated with review comments.
c3b1d13 
Signed-off-by: Iris Simon <iris.simon@swirldslabs.com>
steven-sheehy
steven-sheehy previously approved these changes Apr 25, 2024
View reviewed changes
Copy link
Member

@steven-sheehy steven-sheehy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

jsync-swirlds
jsync-swirlds previously approved these changes Apr 25, 2024
View reviewed changes
@iwsimon
Corrected an accident change during the call.
17d234f 
Signed-off-by: Iris Simon <iris.simon@swirldslabs.com>
jsync-swirlds
jsync-swirlds previously approved these changes Apr 25, 2024
View reviewed changes
@iwsimon
Changed pbj.java_package to com.hedera.hapi.node.addressbook and Node…
89e0eae 
…Service to AddressBookService.

Signed-off-by: Iris Simon <iris.simon@swirldslabs.com>
jsync-swirlds
jsync-swirlds previously approved these changes Apr 26, 2024
View reviewed changes
steven-sheehy
steven-sheehy previously approved these changes Apr 26, 2024
View reviewed changes
Neeharika-Sompalli
Neeharika-Sompalli previously approved these changes Apr 26, 2024
View reviewed changes
Copy link
Member

@Neeharika-Sompalli Neeharika-Sompalli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM ! Thanks @iwsimon

Neeharika-Sompalli
Neeharika-Sompalli reviewed Apr 26, 2024
View reviewed changes
Copy link
Member

@Neeharika-Sompalli Neeharika-Sompalli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this has new response codes added, when you merge it might break services develop. Please open PR in Services for the compile errors before you merge it.

jsync-swirlds
jsync-swirlds reviewed Apr 26, 2024
View reviewed changes
services/node_get_info.proto Outdated Show resolved Hide resolved
services/node_get_info.proto Outdated Show resolved Hide resolved
@iwsimon
Updated with reviews.
f7b2e43 
Signed-off-by: Iris Simon <iris.simon@swirldslabs.com>
@iwsimon
Copy link
Contributor Author

iwsimon commented Apr 26, 2024

Current hedera-services, develop branch uses hedera-protobufs, v0.50.0-release branch. The main branch will be used after release .50 branch cut. There will be another hedera-services PR merged after release .50 branch cut.

@iwsimon iwsimon merged commit e650477 into main Apr 26, 2024
1 check passed
@iwsimon iwsimon deleted the 9796-DAB-change branch April 26, 2024 21:17
iwsimon added a commit that referenced this pull request May 24, 2024
@iwsimon
Revert "feat: Dynamic Address Book Phase 2 protobufs changes (#344)"
c7861b0 
This reverts commit e650477 as hedera-servives #13265 asked.

Signed-off-by: Iris Simon <iris.simon@swirldslabs.com>
iwsimon added a commit that referenced this pull request May 29, 2024
@iwsimon
feat: Back out protobuf-changes to dynamic address book for release 0…
6096d43 
….51 (#358)

* Revert "feat: added NodeGetInfoResponse to response.proto (#355)"

This reverts commit 43d9159.

* Revert "Added NodeGetInfo (#347)"

This reverts commit 17fb148.

* Revert "feat: Dynamic Address Book Phase 2 protobufs changes (#344)"

This reverts commit e650477 as hedera-servives #13265 asked.

Signed-off-by: Iris Simon <iris.simon@swirldslabs.com>

* Align the code.

Signed-off-by: Iris Simon <iris.simon@swirldslabs.com>

* Changed INVALID_MAX_AUTO_ASSOCIATIONS back to 346 by review request.

Signed-off-by: Iris Simon <iris.simon@swirldslabs.com>

---------

Signed-off-by: Iris Simon <iris.simon@swirldslabs.com>
netopyr added a commit that referenced this pull request Jul 18, 2024
@netopyr
Merge branch 'main' into tmp-hip796-protos-test
146d477 
* main: (21 commits)
  feat: 13135 Added PlatformState protobuf representation (#349)
  feat: Change AddressBookService package to proto (#386)
  feat: add admin_key to node_create.proto, node_update.proto and node.proto (#380)
  HIP 904 proto updates for token reject (#367)
  chore: Updated codeowners to include devops-ci (#384)
  feat: remove node_get_info.proto (#378)
  fixed INVALID_GOSSIP_CA_CERTIFICATE (#375)
  fix: Fixing single-letter mismatch to expectations (#373)
  feat: Update specification text for address book service (#346)
  feat: Add more response codes for Dynamic Address Book Phase 2 (#370)
  feat: maxAutoAssociations updates for contract transactions (#359)
  Added more response codes for Dynamic Address Book Phase 2 (#364)
  feat: Add back Dynamic Address Book Phase 2 protobufs change (#361)
  feat: Back out protobuf-changes to dynamic address book for release 0.51 (#358)
  feat: added NodeGetInfoResponse to response.proto (#355)
  feat: HIP-904 maxAutoAssociations updates (#348)
  chore: added consensus data protobuf (#350)
  Added NodeGetInfo (#347)
  feat: Dynamic Address Book Phase 2 protobufs changes (#344)
  feat: define event protobufs (#338)
  ...

# Conflicts:
#	services/basic_types.proto
#	services/schedulable_transaction_body.proto
#	services/token_service.proto
#	services/transaction_body.proto
#	services/transaction_receipt.proto
netopyr added a commit that referenced this pull request Jul 18, 2024
@netopyr
Merge branch 'main' into tmp-hip796-protos
1e2cea0 
* main: (21 commits)
  feat: 13135 Added PlatformState protobuf representation (#349)
  feat: Change AddressBookService package to proto (#386)
  feat: add admin_key to node_create.proto, node_update.proto and node.proto (#380)
  HIP 904 proto updates for token reject (#367)
  chore: Updated codeowners to include devops-ci (#384)
  feat: remove node_get_info.proto (#378)
  fixed INVALID_GOSSIP_CA_CERTIFICATE (#375)
  fix: Fixing single-letter mismatch to expectations (#373)
  feat: Update specification text for address book service (#346)
  feat: Add more response codes for Dynamic Address Book Phase 2 (#370)
  feat: maxAutoAssociations updates for contract transactions (#359)
  Added more response codes for Dynamic Address Book Phase 2 (#364)
  feat: Add back Dynamic Address Book Phase 2 protobufs change (#361)
  feat: Back out protobuf-changes to dynamic address book for release 0.51 (#358)
  feat: added NodeGetInfoResponse to response.proto (#355)
  feat: HIP-904 maxAutoAssociations updates (#348)
  chore: added consensus data protobuf (#350)
  Added NodeGetInfo (#347)
  feat: Dynamic Address Book Phase 2 protobufs changes (#344)
  feat: define event protobufs (#338)
  ...
vtronkov pushed a commit that referenced this pull request Jul 23, 2024
@iwsimon @vtronkov
feat: Back out protobuf-changes to dynamic address book for release 0…
8c3623c 
….51 (#358)

* Revert "feat: added NodeGetInfoResponse to response.proto (#355)"

This reverts commit 43d9159.

* Revert "Added NodeGetInfo (#347)"

This reverts commit 17fb148.

* Revert "feat: Dynamic Address Book Phase 2 protobufs changes (#344)"

This reverts commit e650477 as hedera-servives #13265 asked.

Signed-off-by: Iris Simon <iris.simon@swirldslabs.com>

* Align the code.

Signed-off-by: Iris Simon <iris.simon@swirldslabs.com>

* Changed INVALID_MAX_AUTO_ASSOCIATIONS back to 346 by review request.

Signed-off-by: Iris Simon <iris.simon@swirldslabs.com>

---------

Signed-off-by: Iris Simon <iris.simon@swirldslabs.com>
Signed-off-by: Valentin Tronkov <99957253+vtronkov@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@povolev15 povolev15 povolev15 approved these changes

@Neeharika-Sompalli Neeharika-Sompalli Neeharika-Sompalli approved these changes

@jsync-swirlds jsync-swirlds jsync-swirlds approved these changes

@steven-sheehy steven-sheehy steven-sheehy left review comments

@thomas-swirlds-labs thomas-swirlds-labs Awaiting requested review from thomas-swirlds-labs thomas-swirlds-labs is a code owner automatically assigned from hashgraph/hedera-services

@edwin-greene edwin-greene Awaiting requested review from edwin-greene edwin-greene is a code owner automatically assigned from hashgraph/mirror-node

@netopyr netopyr Awaiting requested review from netopyr

Assignees

@iwsimon iwsimon

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Dynamic Address Book Phase 2 protobufs changes