Promotes accounts hash to a strong type #28930
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
brooksprumo
commented
Nov 22, 2022
| @@ -684,7 +685,7 @@ mod test_bank_serialize { | |||
|
|
|||
| // This some what long test harness is required to freeze the ABI of | |||
| // Bank's serialization due to versioned nature | |||
| #[frozen_abi(digest = "B9ui5cFeJ5NGtXAVFXRCSX4GJ77yLc3izv1E8QE34TdQ")] | |||
| #[frozen_abi(digest = "464v92sAyLDZWCXjH6cuQfgrSNuB3PY8cmoVu2dciXvV")] | |||
There was a problem hiding this comment.
ABI digest changed due to giving the accounts hash a type.
diff serde_snapshot__tests__test_bank_serialize__BankAbiTestWrapperNewer_frozen_abi__test_abi_digest_* -bc
--- 1702,1708 ----
! field accounts_hash: solana_program::hash::Hash
struct Hash([u8; 32]) (newtype)
tuple (elements = 32)
element u8
*** 1702,1709 ****
! field accounts_hash: solana_runtime::accounts_hash::AccountsHash
! struct AccountsHash(solana_program::hash::Hash) (newtype)
struct Hash([u8; 32]) (newtype)
tuple (elements = 32)
element u8
brooksprumo
commented
Nov 22, 2022
| @@ -1152,7 +1152,7 @@ impl BankHashStats { | |||
| #[derive(Clone, Default, Debug, Serialize, Deserialize, PartialEq, Eq, AbiExample)] | |||
| pub struct BankHashInfo { | |||
| pub accounts_delta_hash: Hash, | |||
| pub accounts_hash: Hash, | |||
| pub accounts_hash: AccountsHash, | |||
There was a problem hiding this comment.
The heart of the change.
brooksprumo
force-pushed
the
iah/accounts-hash
branch
from
1da7740 to
ea548fb
Compare
brooksprumo
force-pushed
the
iah/accounts-hash
branch
from
ea548fb to
d7eb953
Compare
| @@ -141,7 +141,7 @@ fn main() { | |||
| } | |||
| println!( | |||
| "hash,{},{},{},{}%", | |||
| results.0, | |||
| results.0 .0, | |||
There was a problem hiding this comment.
fmt here? Not sure what formatter is doing.
There was a problem hiding this comment.
Yah, fmt adds a space when there are multiple tuple indirections. Always makes me look twice...
jeffwashington
approved these changes
Nov 27, 2022
gnapoli23
pushed a commit
to gnapoli23/solana
that referenced
this pull request
Dec 16, 2022
nickfrosty
pushed a commit
to nickfrosty/solana
that referenced
this pull request
Jan 4, 2023
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.
Problem
The accounts hash is used as a plain
Hashin the code base. To add support for Incremental Accounts Hash, we'll need to distinguish between different flavors of accounts hashes. Without any type information, this will be error-prone.Summary of Changes
Promote accounts hash to a strong type:
AccountsHash.(Future work for Incremental Accounts Hash will expand/alter this type)