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

Use contract id in slot key #321

Merged
merged 5 commits into from
Jan 24, 2024
Merged

Use contract id in slot key #321

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
80c0c9c
Add BlockInfo#first_cons_time_of_current_block
tinker-michaelj Dec 8, 2023
5bbc9e6
Update SlotKey message to use ContractID instead of an int64, in orde…
kimbor Jan 3, 2024
d0cbb97
Rename contract_number -> contractID
kimbor Jan 3, 2024
29ddb37
Merge remote-tracking branch 'origin/add-pbj-types-for-state' into us…
povolev15 Jan 23, 2024
8857802
Merge branch 'add-pbj-types-for-state' into use-ContractID-in-SlotKey
kimbor Jan 24, 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
5 changes: 5 additions & 0 deletions services/state/blockrecords/block_info.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,9 @@ message BlockInfo {
* should happen during the first transaction handled by the node.
*/
bool migration_records_streamed = 5;
/**
* The consensus time of the first transaction in the current block; necessary for reconnecting nodes to detect
* when the current block is finished.
*/
Timestamp first_cons_time_of_current_block = 6;
}
4 changes: 3 additions & 1 deletion services/state/contract/storage_slot.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ option java_package = "com.hederahashgraph.api.proto.java";
// <<<pbj.java_package = "com.hedera.hapi.node.state.contract">>> This comment is special code for setting PBJ Compiler java package
option java_multiple_files = true;

import "basic_types.proto";

/**
* The key of a storage slot. A slot is scoped to a specific contract number.
*
Expand All @@ -35,7 +37,7 @@ message SlotKey {
/**
* The number of the contract whose storage this slot belongs to.
*/
int64 contract_number = 1;
ContractID contractID = 1;

/**
* The EVM key of this slot, when left-padded with zeros to form a 256-bit word.
Expand Down