feat: account serialization overhaul #12794
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
pugachAG
force-pushed
the
rework-account-ser
branch
5 times, most recently
from
ee8d576 to
2fb8991
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #12794 +/- ##
==========================================
- Coverage 70.46% 70.45% -0.01%
==========================================
Files 847 847
Lines 175079 174994 -85
Branches 175079 174994 -85
==========================================
- Hits 123369 123296 -73
+ Misses 46451 46445 -6
+ Partials 5259 5253 -6
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
pugachAG
force-pushed
the
rework-account-ser
branch
from
2fb8991 to
76cd99b
Compare
staffik
approved these changes
Jan 27, 2025
| pub fn set_permanent_storage_bytes(&mut self, permanent_storage_bytes: StorageUsage) { | ||
| self.permanent_storage_bytes = permanent_storage_bytes; | ||
| match self { | ||
| Self::V1(v1) => { |
There was a problem hiding this comment.
Not sure about this, because permanent storage bytes can only be set for V2 accounts and at the time of their creation. But anyway, plan to remove NEP-491 so feel free to leave it as it is.
core/primitives-core/src/account.rs
Outdated
| permanent_storage_bytes, | ||
| code_hash: self.code_hash(), | ||
| storage_usage: self.storage_usage(), | ||
| version: version, |
core/primitives-core/src/account.rs
Outdated
| }) | ||
| let versioned_account = BorshVersionedAccount::deserialize_reader(rd)?; | ||
| let account = match versioned_account { | ||
| BorshVersionedAccount::V2(account_v1) => Account::V2(account_v1), |
There was a problem hiding this comment.
should not be V2(account_v2) ?
stedfn
reviewed
Jan 27, 2025
core/primitives-core/src/account.rs
Outdated
| return Err(serde::de::Error::custom( | ||
| "permanent storage bytes positive amount exists for account version older than V2", | ||
| "permanent storage bytes exists for V1 account", |
There was a problem hiding this comment.
nit: the err message is a bit unclear
Suggested change
| "permanent storage bytes exists for V1 account", | |
| "permanent storage bytes should not be set for V1 account", |
There was a problem hiding this comment.
good point, thanks!
stedfn
approved these changes
Jan 27, 2025
Merged
github-merge-queue bot
pushed a commit
that referenced
this pull request
Jan 30, 2025
There is ongoing work on [global contracts](#12716) that addresses the problem near/NEPs#491 was originally designed to solve. NEP-491 code is quite messy and has been around for about a year. We no longer see external interest in this feature, but if the need arises in the future, we can always restore the code. Reverts most of (because some part is used by #12794): - #9600 - #10701 Also, #11005 can be closed.
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.
Change
Accountto be enum and use different representations for serde and borsh ser/deser:SerdeAccountis introduced for serde to maintain backward and forward compatibility. PreviouslyAccountstruct was directly annotated to support serde, we are opting out of this.BorshVersionedAccountis introduced for borsh serialization. Accounts in old format are serialized directly asAccountV1. Note that we continue serializing in old format when possible to avoid 16 bytes overhead of sentinel padding.Account::SERIALIZATION_SENTINELhack is preserved for borsh serialization as I could not find a better way to handle backward compatibility.This is part of #12716, in a separate PR global contracts related fields will be added as part of Account.