Change allowance maps on Account PBJ Object
#269
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Neeharika-Sompalli
requested review from
nickpoorman,
jnels124,
rbair23,
tinker-michaelj,
a team,
mhess-swl,
jsync-swirlds and
jasperpotts
and removed request for
a team
tinker-michaelj
approved these changes
Apr 17, 2023
There was a problem hiding this comment.
LGTM! I noticed old types were awkward when writing this Merkle-to-PBJ leaf converter. 😝
jsync-swirlds
approved these changes
Apr 17, 2023
povolev15
approved these changes
Apr 18, 2023
nathanklick
pushed a commit
that referenced
this pull request
Mar 7, 2024
* Initial draft of PBJ types for token state (#263) * 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> * file proto (#267) * 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> * Change allowance maps on `Account` PBJ Object (#269) * change allowances * change allowances * change allowances * change allowances * change allowances * change allowances * fix some comments on file proto (#268) * 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> * Add missing fields in Account (#270) * add missing fields and change allowance names * change to bits * address review comments * address review comments * address review comments * Add the TransactionRecordEntry type for the record cache. * Add payer account ID * Include `ContractService` state types (#273) * 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> * Added state for blocks and running hashes (#276) * 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> * Add `StakingNodeInfo` for MerkleStakingInfo (#277) add staking node info * add schedule proto (#280) * 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> * Fixing incorrect case for Timestamp. (#282) Signed-off-by: Joseph Sinclair <joseph.sinclair@swirldslabs.com> * Adding missed import statement. (#283) Signed-off-by: Joseph Sinclair <joseph.sinclair@swirldslabs.com> * Fix package name for state/schedule (#284) 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> * change topic number to topicID (#286) Signed-off-by: Lev Povolotsky <lev@swirldslabs.com> * Update file.proto to use FileID type instead of long for file identification (#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> * Adjusting the state Schedule message to improve implementation. (#288) * 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> * Change nft owner and spender identifier from long to AccountID (#289) * 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> * Update common.proto, token.proto, token-relation.protp and classes that 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 * Use NftID instead of UniqueTokenId (#292) Signed-off-by: Kim Rader <kim.rader@swirldslabs.com> * changed auto_renew_account_number to auto_renew_account_id in topic.proto (#293) changed auto_renew_account_number to auto_renew_account_id * Add Staking Reward related fields from `MerkleNetworkContext` (#295) * add fields from MerkleNetworkContext * add fields from MerkleNetworkContext * doc update * doc update * doc update * doc update * use snake case throughout protobufs (#294) * Updated last_block_number in BlockInfo to match all others * Added staked_id, removed staked_number. * updated number * Update Schedule state protobuf to add a wait_for_expiry flag. (#297) 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> * update account ids (#291) Update account.proto to use IDs instead of longs Signed-off-by: Kim Rader <kim.rader@swirldslabs.com> * Add Protobuf messages for primitive values and a list of Schedules. (#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> * Fix the "java_package" (#302) * fix path Signed-off-by: Neeharika-Sompalli <neeharika.sompalli@swirldslabs.com> * fix comment --------- Signed-off-by: Neeharika-Sompalli <neeharika.sompalli@swirldslabs.com> * protobuf cleanup (#298) Signed-off-by: Kim Rader <kim.rader@swirldslabs.com> * Add TransactionGetFastRecord to HederaFunctionality (#303) * Add TransactionGetFastRecord to HederaFunctionality Signed-off-by: Kim Rader <kim.rader@swirldslabs.com> --------- Signed-off-by: Kim Rader <kim.rader@swirldslabs.com> * Revert `NftID#tokenId` to `NftID#tokenID` (#306) * Revert NftID#tokenId to NftID#tokenID Signed-off-by: Michael Tinker <michael.tinker@swirldslabs.com> * add pre_system_delete_expiration_second Signed-off-by: Lev Povolotsky <lev@swirldslabs.com> --------- Signed-off-by: Michael Tinker <michael.tinker@swirldslabs.com> Signed-off-by: Lev Povolotsky <lev@swirldslabs.com> Co-authored-by: Lev Povolotsky <lev@swirldslabs.com> * Add throttle and congestion types (#304) * Add ThrottleUsageSnapshots type Signed-off-by: Miroslav Gatsanoga <miroslav.gatsanoga@limechain.tech> * Add CongestionLevelStarts type Signed-off-by: Miroslav Gatsanoga <miroslav.gatsanoga@limechain.tech> --------- Signed-off-by: Miroslav Gatsanoga <miroslav.gatsanoga@limechain.tech> * Add migration properties to BlockInfo (#310) Update `BlockInfo` to also include properties needed for migration records Signed-off-by: Matt Hess <matt.hess@swirldslabs.com> * Sync with updates from `main` branch (#314) feat: HIP-844 - add signer_nonce field to message ContractFunctionResult (#312) add signer_nonce field to message ContractFunctionResult Signed-off-by: Stoyan Panayotov <stoyan.panayotov@limechain.tech> Co-authored-by: Stoyan Panayotov <stoyan.panayotov@limechain.tech> * Sync with changes from main (#317) * feat: HIP-844 - add signer_nonce field to message ContractFunctionResult (#312) add signer_nonce field to message ContractFunctionResult Signed-off-by: Stoyan Panayotov <stoyan.panayotov@limechain.tech> * 315 Added fully-qualified name for a type of `ContractFunctionResult.signer_nonce` (#316) 315 Added fully-qualified name for a type of `ContractFunctionResult.signer_nonce`. Signed-off-by: Ivan Malygin <ivan@swirldslabs.com> --------- Signed-off-by: Stoyan Panayotov <stoyan.panayotov@limechain.tech> Signed-off-by: Ivan Malygin <ivan@swirldslabs.com> Signed-off-by: Neeharika-Sompalli <neeharika.sompalli@swirldslabs.com> Co-authored-by: Stoyan Panayotov <stoyan.panayotov@limechain.tech> Co-authored-by: Ivan Malygin <ivan@swirldslabs.com> * Protobuf changes for implementation of metadata hips 646, 657 and 765 (#313) Signed-off-by: Thomas Moran <152873392+thomas-swirlds-labs@users.noreply.github.com> * Add `BlockInfo#first_cons_time_of_current_block` (#311) Add BlockInfo#first_cons_time_of_current_block Signed-off-by: Michael Tinker <michael.tinker@swirldslabs.com> * Add pending rewards per node (#320) * add pending rewards per node * deleted flag for nodes * Metadata hips 646 657 765 (#319) * Protobuf changes for implementation of metadata hips 646, 657 and 765 Signed-off-by: Thomas Moran <152873392+thomas-swirlds-labs@users.noreply.github.com> * adding endpoint for updating an NFT, metadata and key field to getTokenInfo Signed-off-by: Thomas Moran <152873392+thomas-swirlds-labs@users.noreply.github.com> * Temporary workaround for google.protobuf.BytesValue PBJ bug Signed-off-by: Thomas Moran <152873392+thomas-swirlds-labs@users.noreply.github.com> * Addition of metadata to Token Entity Signed-off-by: Thomas Moran <152873392+thomas-swirlds-labs@users.noreply.github.com> * Adding Invalid Metadata Key Response Code Signed-off-by: Thomas Moran <152873392+thomas-swirlds-labs@users.noreply.github.com> * Removing partition verbiage Signed-off-by: Thomas Moran <152873392+thomas-swirlds-labs@users.noreply.github.com> * Reverting to used google.protobuf.BytesValue Signed-off-by: Thomas Moran <152873392+thomas-swirlds-labs@users.noreply.github.com> --------- Signed-off-by: Thomas Moran <152873392+thomas-swirlds-labs@users.noreply.github.com> * Revert "Metadata hips 646 657 765 (#319)" (#322) This reverts commit ffbd48e. * Use contract id in slot key (#321) * Add BlockInfo#first_cons_time_of_current_block Signed-off-by: Michael Tinker <michael.tinker@swirldslabs.com> * Update SlotKey message to use ContractID instead of an int64, in order to be future-proof for sharding Signed-off-by: Kim Rader <kim.rader@swirldslabs.com> * Rename contract_number -> contractID Signed-off-by: Kim Rader <kim.rader@swirldslabs.com> --------- Signed-off-by: Michael Tinker <michael.tinker@swirldslabs.com> Signed-off-by: Kim Rader <kim.rader@swirldslabs.com> Co-authored-by: Michael Tinker <michael.tinker@swirldslabs.com> Co-authored-by: Lev Povolotsky <lev@swirldslabs.com> --------- Signed-off-by: Michael Tinker <michael.tinker@swirldslabs.com> Signed-off-by: Lev Povolotsky <lev@swirldslabs.com> Signed-off-by: jasperpotts <jasperpotts@users.noreply.github.com> Signed-off-by: Joseph Sinclair <joseph.sinclair@swirldslabs.com> Signed-off-by: Kim Rader <kim.rader@swirldslabs.com> Signed-off-by: Neeharika-Sompalli <neeharika.sompalli@swirldslabs.com> Signed-off-by: Miroslav Gatsanoga <miroslav.gatsanoga@limechain.tech> Signed-off-by: Matt Hess <matt.hess@swirldslabs.com> Signed-off-by: Stoyan Panayotov <stoyan.panayotov@limechain.tech> Signed-off-by: Ivan Malygin <ivan@swirldslabs.com> Signed-off-by: Thomas Moran <152873392+thomas-swirlds-labs@users.noreply.github.com> Co-authored-by: Neeha <52669918+Neeharika-Sompalli@users.noreply.github.com> Co-authored-by: Michael Tinker <michael.tinker@swirldslabs.com> Co-authored-by: Richard Bair <rbair23@users.noreply.github.com> Co-authored-by: Lev Povolotsky <16233475+povolev15@users.noreply.github.com> Co-authored-by: Neeharika-Sompalli <neeharika.sompalli@swirldslabs.com> Co-authored-by: Jasper Potts <1466205+jasperpotts@users.noreply.github.com> Co-authored-by: jasperpotts <jasperpotts@users.noreply.github.com> Co-authored-by: Joseph Sinclair <121976561+jsync-swirlds@users.noreply.github.com> Co-authored-by: Kim Rader <kimrader@gmail.com> Co-authored-by: Iris Simon <122310714+iwsimon@users.noreply.github.com> Co-authored-by: Kim Rader <kim.rader@swirldslabs.com> Co-authored-by: Lev Povolotsky <lev@swirldslabs.com> Co-authored-by: Miroslav Gatsanoga <miroslav.gatsanoga@limechain.tech> Co-authored-by: Matt Hess <matt.hess@swirldslabs.com> Co-authored-by: Stoyan Panayotov <stoyan.panayotov@limechain.tech> Co-authored-by: Ivan Malygin <ivan@swirldslabs.com> Co-authored-by: Thomas Moran <152873392+thomas-swirlds-labs@users.noreply.github.com>
netopyr
pushed a commit
that referenced
this pull request
Mar 12, 2024
* Initial draft of PBJ types for token state (#263) * 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> * file proto (#267) * 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> * Change allowance maps on `Account` PBJ Object (#269) * change allowances * change allowances * change allowances * change allowances * change allowances * change allowances * fix some comments on file proto (#268) * 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> * Add missing fields in Account (#270) * add missing fields and change allowance names * change to bits * address review comments * address review comments * address review comments * Add the TransactionRecordEntry type for the record cache. * Add payer account ID * Include `ContractService` state types (#273) * 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> * Added state for blocks and running hashes (#276) * 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> * Add `StakingNodeInfo` for MerkleStakingInfo (#277) add staking node info * add schedule proto (#280) * 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> * Fixing incorrect case for Timestamp. (#282) Signed-off-by: Joseph Sinclair <joseph.sinclair@swirldslabs.com> * Adding missed import statement. (#283) Signed-off-by: Joseph Sinclair <joseph.sinclair@swirldslabs.com> * Fix package name for state/schedule (#284) 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> * change topic number to topicID (#286) Signed-off-by: Lev Povolotsky <lev@swirldslabs.com> * Update file.proto to use FileID type instead of long for file identification (#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> * Adjusting the state Schedule message to improve implementation. (#288) * 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> * Change nft owner and spender identifier from long to AccountID (#289) * 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> * Update common.proto, token.proto, token-relation.protp and classes that 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 * Use NftID instead of UniqueTokenId (#292) Signed-off-by: Kim Rader <kim.rader@swirldslabs.com> * changed auto_renew_account_number to auto_renew_account_id in topic.proto (#293) changed auto_renew_account_number to auto_renew_account_id * Add Staking Reward related fields from `MerkleNetworkContext` (#295) * add fields from MerkleNetworkContext * add fields from MerkleNetworkContext * doc update * doc update * doc update * doc update * use snake case throughout protobufs (#294) * Updated last_block_number in BlockInfo to match all others * Added staked_id, removed staked_number. * updated number * Update Schedule state protobuf to add a wait_for_expiry flag. (#297) 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> * update account ids (#291) Update account.proto to use IDs instead of longs Signed-off-by: Kim Rader <kim.rader@swirldslabs.com> * Add Protobuf messages for primitive values and a list of Schedules. (#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> * Fix the "java_package" (#302) * fix path Signed-off-by: Neeharika-Sompalli <neeharika.sompalli@swirldslabs.com> * fix comment --------- Signed-off-by: Neeharika-Sompalli <neeharika.sompalli@swirldslabs.com> * protobuf cleanup (#298) Signed-off-by: Kim Rader <kim.rader@swirldslabs.com> * Add TransactionGetFastRecord to HederaFunctionality (#303) * Add TransactionGetFastRecord to HederaFunctionality Signed-off-by: Kim Rader <kim.rader@swirldslabs.com> --------- Signed-off-by: Kim Rader <kim.rader@swirldslabs.com> * Revert `NftID#tokenId` to `NftID#tokenID` (#306) * Revert NftID#tokenId to NftID#tokenID Signed-off-by: Michael Tinker <michael.tinker@swirldslabs.com> * add pre_system_delete_expiration_second Signed-off-by: Lev Povolotsky <lev@swirldslabs.com> --------- Signed-off-by: Michael Tinker <michael.tinker@swirldslabs.com> Signed-off-by: Lev Povolotsky <lev@swirldslabs.com> Co-authored-by: Lev Povolotsky <lev@swirldslabs.com> * Add throttle and congestion types (#304) * Add ThrottleUsageSnapshots type Signed-off-by: Miroslav Gatsanoga <miroslav.gatsanoga@limechain.tech> * Add CongestionLevelStarts type Signed-off-by: Miroslav Gatsanoga <miroslav.gatsanoga@limechain.tech> --------- Signed-off-by: Miroslav Gatsanoga <miroslav.gatsanoga@limechain.tech> * Add migration properties to BlockInfo (#310) Update `BlockInfo` to also include properties needed for migration records Signed-off-by: Matt Hess <matt.hess@swirldslabs.com> * Add BlockInfo#first_cons_time_of_current_block Signed-off-by: Michael Tinker <michael.tinker@swirldslabs.com> * Update SlotKey message to use ContractID instead of an int64, in order to be future-proof for sharding Signed-off-by: Kim Rader <kim.rader@swirldslabs.com> * Rename contract_number -> contractID Signed-off-by: Kim Rader <kim.rader@swirldslabs.com> * Sync with updates from `main` branch (#314) feat: HIP-844 - add signer_nonce field to message ContractFunctionResult (#312) add signer_nonce field to message ContractFunctionResult Signed-off-by: Stoyan Panayotov <stoyan.panayotov@limechain.tech> Co-authored-by: Stoyan Panayotov <stoyan.panayotov@limechain.tech> * Sync with changes from main (#317) * feat: HIP-844 - add signer_nonce field to message ContractFunctionResult (#312) add signer_nonce field to message ContractFunctionResult Signed-off-by: Stoyan Panayotov <stoyan.panayotov@limechain.tech> * 315 Added fully-qualified name for a type of `ContractFunctionResult.signer_nonce` (#316) 315 Added fully-qualified name for a type of `ContractFunctionResult.signer_nonce`. Signed-off-by: Ivan Malygin <ivan@swirldslabs.com> --------- Signed-off-by: Stoyan Panayotov <stoyan.panayotov@limechain.tech> Signed-off-by: Ivan Malygin <ivan@swirldslabs.com> Signed-off-by: Neeharika-Sompalli <neeharika.sompalli@swirldslabs.com> Co-authored-by: Stoyan Panayotov <stoyan.panayotov@limechain.tech> Co-authored-by: Ivan Malygin <ivan@swirldslabs.com> * Protobuf changes for implementation of metadata hips 646, 657 and 765 (#313) Signed-off-by: Thomas Moran <152873392+thomas-swirlds-labs@users.noreply.github.com> * Add `BlockInfo#first_cons_time_of_current_block` (#311) Add BlockInfo#first_cons_time_of_current_block Signed-off-by: Michael Tinker <michael.tinker@swirldslabs.com> * Add pending rewards per node (#320) * add pending rewards per node * deleted flag for nodes * Metadata hips 646 657 765 (#319) * Protobuf changes for implementation of metadata hips 646, 657 and 765 Signed-off-by: Thomas Moran <152873392+thomas-swirlds-labs@users.noreply.github.com> * adding endpoint for updating an NFT, metadata and key field to getTokenInfo Signed-off-by: Thomas Moran <152873392+thomas-swirlds-labs@users.noreply.github.com> * Temporary workaround for google.protobuf.BytesValue PBJ bug Signed-off-by: Thomas Moran <152873392+thomas-swirlds-labs@users.noreply.github.com> * Addition of metadata to Token Entity Signed-off-by: Thomas Moran <152873392+thomas-swirlds-labs@users.noreply.github.com> * Adding Invalid Metadata Key Response Code Signed-off-by: Thomas Moran <152873392+thomas-swirlds-labs@users.noreply.github.com> * Removing partition verbiage Signed-off-by: Thomas Moran <152873392+thomas-swirlds-labs@users.noreply.github.com> * Reverting to used google.protobuf.BytesValue Signed-off-by: Thomas Moran <152873392+thomas-swirlds-labs@users.noreply.github.com> --------- Signed-off-by: Thomas Moran <152873392+thomas-swirlds-labs@users.noreply.github.com> * Revert "Metadata hips 646 657 765 (#319)" (#322) This reverts commit ffbd48e. * Use contract id in slot key (#321) * Add BlockInfo#first_cons_time_of_current_block Signed-off-by: Michael Tinker <michael.tinker@swirldslabs.com> * Update SlotKey message to use ContractID instead of an int64, in order to be future-proof for sharding Signed-off-by: Kim Rader <kim.rader@swirldslabs.com> * Rename contract_number -> contractID Signed-off-by: Kim Rader <kim.rader@swirldslabs.com> --------- Signed-off-by: Michael Tinker <michael.tinker@swirldslabs.com> Signed-off-by: Kim Rader <kim.rader@swirldslabs.com> Co-authored-by: Michael Tinker <michael.tinker@swirldslabs.com> Co-authored-by: Lev Povolotsky <lev@swirldslabs.com> * Replay metadata change after merge from add-pbj-types-for-state Signed-off-by: Thomas Moran <152873392+thomas-swirlds-labs@users.noreply.github.com> * Adding response code for no metadata key on update Signed-off-by: Thomas Moran <152873392+thomas-swirlds-labs@users.noreply.github.com> * Adding missing token metadata reponseCode Signed-off-by: Thomas Moran <152873392+thomas-swirlds-labs@users.noreply.github.com> * Update NFT transaction body with tokenId and SerialNumbers Signed-off-by: Thomas Moran <152873392+thomas-swirlds-labs@users.noreply.github.com> * Updating token_update_nft message comment description Signed-off-by: Thomas Moran <152873392+thomas-swirlds-labs@users.noreply.github.com> * Adding new TokenUpdateNftTransactionBody to transaction_body message Signed-off-by: Thomas Moran <152873392+thomas-swirlds-labs@users.noreply.github.com> * Importing TokenUpdateNftTransactionBody to transaction_body Signed-off-by: Thomas Moran <152873392+thomas-swirlds-labs@users.noreply.github.com> * Adding TokenUpdateNft to HederaFunctionality Signed-off-by: Thomas Moran <152873392+thomas-swirlds-labs@users.noreply.github.com> * Adding updateNfts grpc endpoint Signed-off-by: Thomas Moran <152873392+thomas-swirlds-labs@users.noreply.github.com> * Updated comments on key signage Signed-off-by: Thomas Moran <152873392+thomas-swirlds-labs@users.noreply.github.com> * Change update nfts transaction definition Signed-off-by: Thomas Moran <152873392+thomas-swirlds-labs@users.noreply.github.com> * Change update nfts transaction body Signed-off-by: Thomas Moran <152873392+thomas-swirlds-labs@users.noreply.github.com> * Implement PR review feedback Signed-off-by: Thomas Moran <152873392+thomas-swirlds-labs@users.noreply.github.com> * update comment * Missing import in schedulable_transaction_body Signed-off-by: Thomas Moran <152873392+thomas-swirlds-labs@users.noreply.github.com> * update response code --------- Signed-off-by: Michael Tinker <michael.tinker@swirldslabs.com> Signed-off-by: Lev Povolotsky <lev@swirldslabs.com> Signed-off-by: jasperpotts <jasperpotts@users.noreply.github.com> Signed-off-by: Joseph Sinclair <joseph.sinclair@swirldslabs.com> Signed-off-by: Kim Rader <kim.rader@swirldslabs.com> Signed-off-by: Neeharika-Sompalli <neeharika.sompalli@swirldslabs.com> Signed-off-by: Miroslav Gatsanoga <miroslav.gatsanoga@limechain.tech> Signed-off-by: Matt Hess <matt.hess@swirldslabs.com> Signed-off-by: Stoyan Panayotov <stoyan.panayotov@limechain.tech> Signed-off-by: Ivan Malygin <ivan@swirldslabs.com> Signed-off-by: Thomas Moran <152873392+thomas-swirlds-labs@users.noreply.github.com> Co-authored-by: Neeha <52669918+Neeharika-Sompalli@users.noreply.github.com> Co-authored-by: Michael Tinker <michael.tinker@swirldslabs.com> Co-authored-by: Richard Bair <rbair23@users.noreply.github.com> Co-authored-by: Lev Povolotsky <16233475+povolev15@users.noreply.github.com> Co-authored-by: Neeharika-Sompalli <neeharika.sompalli@swirldslabs.com> Co-authored-by: Jasper Potts <1466205+jasperpotts@users.noreply.github.com> Co-authored-by: jasperpotts <jasperpotts@users.noreply.github.com> Co-authored-by: Joseph Sinclair <121976561+jsync-swirlds@users.noreply.github.com> Co-authored-by: Kim Rader <kimrader@gmail.com> Co-authored-by: Iris Simon <122310714+iwsimon@users.noreply.github.com> Co-authored-by: Kim Rader <kim.rader@swirldslabs.com> Co-authored-by: Lev Povolotsky <lev@swirldslabs.com> Co-authored-by: Miroslav Gatsanoga <miroslav.gatsanoga@limechain.tech> Co-authored-by: Matt Hess <matt.hess@swirldslabs.com> Co-authored-by: Stoyan Panayotov <stoyan.panayotov@limechain.tech> Co-authored-by: Ivan Malygin <ivan@swirldslabs.com>
iwsimon
added a commit
that referenced
this pull request
Apr 26, 2024
* Initial draft of PBJ types for token state (#263) * 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> * file proto (#267) * 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> * Change allowance maps on `Account` PBJ Object (#269) * change allowances * change allowances * change allowances * change allowances * change allowances * change allowances * fix some comments on file proto (#268) * 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> * Add missing fields in Account (#270) * add missing fields and change allowance names * change to bits * address review comments * address review comments * address review comments * Add the TransactionRecordEntry type for the record cache. * Add payer account ID * Include `ContractService` state types (#273) * 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> * Added state for blocks and running hashes (#276) * 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> * Add `StakingNodeInfo` for MerkleStakingInfo (#277) add staking node info * add schedule proto (#280) * 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> * Fixing incorrect case for Timestamp. (#282) Signed-off-by: Joseph Sinclair <joseph.sinclair@swirldslabs.com> * Adding missed import statement. (#283) Signed-off-by: Joseph Sinclair <joseph.sinclair@swirldslabs.com> * Fix package name for state/schedule (#284) 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> * change topic number to topicID (#286) Signed-off-by: Lev Povolotsky <lev@swirldslabs.com> * Update file.proto to use FileID type instead of long for file identification (#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> * Adjusting the state Schedule message to improve implementation. (#288) * 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> * Change nft owner and spender identifier from long to AccountID (#289) * 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> * Update common.proto, token.proto, token-relation.protp and classes that 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 * Use NftID instead of UniqueTokenId (#292) Signed-off-by: Kim Rader <kim.rader@swirldslabs.com> * changed auto_renew_account_number to auto_renew_account_id in topic.proto (#293) changed auto_renew_account_number to auto_renew_account_id * Add Staking Reward related fields from `MerkleNetworkContext` (#295) * add fields from MerkleNetworkContext * add fields from MerkleNetworkContext * doc update * doc update * doc update * doc update * use snake case throughout protobufs (#294) * Updated last_block_number in BlockInfo to match all others * Added staked_id, removed staked_number. * updated number * Update Schedule state protobuf to add a wait_for_expiry flag. (#297) 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> * update account ids (#291) Update account.proto to use IDs instead of longs Signed-off-by: Kim Rader <kim.rader@swirldslabs.com> * Add Protobuf messages for primitive values and a list of Schedules. (#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> * Fix the "java_package" (#302) * fix path Signed-off-by: Neeharika-Sompalli <neeharika.sompalli@swirldslabs.com> * fix comment --------- Signed-off-by: Neeharika-Sompalli <neeharika.sompalli@swirldslabs.com> * protobuf cleanup (#298) Signed-off-by: Kim Rader <kim.rader@swirldslabs.com> * Add TransactionGetFastRecord to HederaFunctionality (#303) * Add TransactionGetFastRecord to HederaFunctionality Signed-off-by: Kim Rader <kim.rader@swirldslabs.com> --------- Signed-off-by: Kim Rader <kim.rader@swirldslabs.com> * Revert `NftID#tokenId` to `NftID#tokenID` (#306) * Revert NftID#tokenId to NftID#tokenID Signed-off-by: Michael Tinker <michael.tinker@swirldslabs.com> * add pre_system_delete_expiration_second Signed-off-by: Lev Povolotsky <lev@swirldslabs.com> --------- Signed-off-by: Michael Tinker <michael.tinker@swirldslabs.com> Signed-off-by: Lev Povolotsky <lev@swirldslabs.com> Co-authored-by: Lev Povolotsky <lev@swirldslabs.com> * Add throttle and congestion types (#304) * Add ThrottleUsageSnapshots type Signed-off-by: Miroslav Gatsanoga <miroslav.gatsanoga@limechain.tech> * Add CongestionLevelStarts type Signed-off-by: Miroslav Gatsanoga <miroslav.gatsanoga@limechain.tech> --------- Signed-off-by: Miroslav Gatsanoga <miroslav.gatsanoga@limechain.tech> * Dynamic address book HAPI change * Dynamic address book HAPI change Signed-off-by: Iris Simon <iris.simon@swirldslabs.com> * update change Signed-off-by: Iris Simon <iris.simon@swirldslabs.com> * update to CamelCase. Signed-off-by: Iris Simon <iris.simon@swirldslabs.com> * Revert "update to CamelCase." This reverts commit d3c7074. * updated names and types by review comments. Signed-off-by: Iris Simon <iris.simon@swirldslabs.com> * updated with mandatory/optional fields in create node Signed-off-by: Iris Simon <iris.simon@swirldslabs.com> * updated transaction_receipt.proto with added node_id Signed-off-by: Iris Simon <iris.simon@swirldslabs.com> * updated with discussions from Dynamic Address Book Record Stream Requirements call today. Signed-off-by: Iris Simon <iris.simon@swirldslabs.com> * Added to schedulable_transaction_body.proto Signed-off-by: Iris Simon <iris.simon@swirldslabs.com> * more updates Signed-off-by: Iris Simon <iris.simon@swirldslabs.com> * Add migration properties to BlockInfo (#310) Update `BlockInfo` to also include properties needed for migration records Signed-off-by: Matt Hess <matt.hess@swirldslabs.com> * Update with review comments. Signed-off-by: Iris Simon <iris.simon@swirldslabs.com> * Update with review comments. Signed-off-by: Iris Simon <iris.simon@swirldslabs.com> * Updated according to Mark's confirmation posted on #dynamic-addressbook today. Signed-off-by: Iris Simon <iris.simon@swirldslabs.com> * Commented out status field. Signed-off-by: Iris Simon <iris.simon@swirldslabs.com> * Updated Signed-off-by: Iris Simon <iris.simon@swirldslabs.com> * Updates Signed-off-by: Iris Simon <iris.simon@swirldslabs.com> * Updated with HIP draft changes. Signed-off-by: Iris Simon <iris.simon@swirldslabs.com> * Updated with HIP draft changes. Signed-off-by: Iris Simon <iris.simon@swirldslabs.com> * Updated with latest HIP and merged with main branch. Signed-off-by: Iris Simon <iris.simon@swirldslabs.com> * format. Signed-off-by: Iris Simon <iris.simon@swirldslabs.com> * updated node state with latest HIP. Signed-off-by: Iris Simon <iris.simon@swirldslabs.com> * added getNodeInfo query Signed-off-by: Iris Simon <iris.simon@swirldslabs.com> * update with reviews Signed-off-by: Iris Simon <iris.simon@swirldslabs.com> * updated with review comments Signed-off-by: Iris Simon <iris.simon@swirldslabs.com> * updated with review comments Signed-off-by: Iris Simon <iris.simon@swirldslabs.com> * Updated. Signed-off-by: Iris Simon <iris.simon@swirldslabs.com> * Updated. Signed-off-by: Iris Simon <iris.simon@swirldslabs.com> * Updated with review comments. Signed-off-by: Iris Simon <iris.simon@swirldslabs.com> * Updated from DAB p2 & PFX meeting today Signed-off-by: Iris Simon <iris.simon@swirldslabs.com> * Added more response codes. Signed-off-by: Iris Simon <iris.simon@swirldslabs.com> * Updated. Signed-off-by: Iris Simon <iris.simon@swirldslabs.com> * Updated with review comments. Signed-off-by: Iris Simon <iris.simon@swirldslabs.com> * Corrected an accident change during the call. Signed-off-by: Iris Simon <iris.simon@swirldslabs.com> * Changed pbj.java_package to com.hedera.hapi.node.addressbook and NodeService to AddressBookService. Signed-off-by: Iris Simon <iris.simon@swirldslabs.com> * Updated with reviews. Signed-off-by: Iris Simon <iris.simon@swirldslabs.com> --------- Signed-off-by: Michael Tinker <michael.tinker@swirldslabs.com> Signed-off-by: Lev Povolotsky <lev@swirldslabs.com> Signed-off-by: jasperpotts <jasperpotts@users.noreply.github.com> Signed-off-by: Joseph Sinclair <joseph.sinclair@swirldslabs.com> Signed-off-by: Kim Rader <kim.rader@swirldslabs.com> Signed-off-by: Neeharika-Sompalli <neeharika.sompalli@swirldslabs.com> Signed-off-by: Miroslav Gatsanoga <miroslav.gatsanoga@limechain.tech> Signed-off-by: Iris Simon <iris.simon@swirldslabs.com> Signed-off-by: Matt Hess <matt.hess@swirldslabs.com> Co-authored-by: Neeha <52669918+Neeharika-Sompalli@users.noreply.github.com> Co-authored-by: Michael Tinker <michael.tinker@swirldslabs.com> Co-authored-by: Richard Bair <rbair23@users.noreply.github.com> Co-authored-by: Lev Povolotsky <16233475+povolev15@users.noreply.github.com> Co-authored-by: Neeharika-Sompalli <neeharika.sompalli@swirldslabs.com> Co-authored-by: Jasper Potts <1466205+jasperpotts@users.noreply.github.com> Co-authored-by: jasperpotts <jasperpotts@users.noreply.github.com> Co-authored-by: Joseph Sinclair <121976561+jsync-swirlds@users.noreply.github.com> Co-authored-by: Kim Rader <kimrader@gmail.com> Co-authored-by: Kim Rader <kim.rader@swirldslabs.com> Co-authored-by: Lev Povolotsky <lev@swirldslabs.com> Co-authored-by: Miroslav Gatsanoga <miroslav.gatsanoga@limechain.tech> Co-authored-by: Matt Hess <matt.hess@swirldslabs.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Since
Ownerfield is not required for the allowances map on a specific account, added new messages withoutOwnerfield inAccountPBJ Object for state.