Add check for storage of nonstorable values #3397
Closed
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
Cadence Benchstat comparisonThis branch with compared with the base branch onflow:master commit 81170a2 Collapsed results for better readability
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
turbolent
reviewed
Jun 5, 2024
| @@ -2952,6 +2973,10 @@ func (v *ArrayValue) Storable( | |||
| return v.array.Storable(storage, address, maxInlineSize) | |||
| } | |||
|
|
|||
| func (*ArrayValue) IsStorable() bool { | |||
| return true | |||
There was a problem hiding this comment.
This should probably recursively check the elements
There was a problem hiding this comment.
Is this necessary? For some reason (I don't fully get why) the test I added for this case that tries to store an array of references already fails even when this is true. Are the individual elements of the array already being checked for storability when they are being put into the atree array perhaps?
| @@ -19682,6 +19743,10 @@ func (v *DictionaryValue) Storable( | |||
| return v.dictionary.Storable(storage, address, maxInlineSize) | |||
| } | |||
|
|
|||
| func (*DictionaryValue) IsStorable() bool { | |||
| return true | |||
There was a problem hiding this comment.
Same question as above
| @@ -142,6 +142,7 @@ type Value interface { | |||
| // NOTE: memory metering is unnecessary for Clone methods | |||
| Clone(interpreter *Interpreter) Value | |||
| IsImportable(interpreter *Interpreter, locationRange LocationRange) bool | |||
| IsStorable() bool | |||
There was a problem hiding this comment.
Please add some interpreter tests for this new function
There was a problem hiding this comment.
CompositeValue already has a IsStorable function, but it needs to be adjusted to also recursively check fields.
Until now, CompositeValue.IsStorable was called during encoding, in the phase converting from interpreter.Value to atree.Storable, in CompositeValue.Storable(). The existing function was sufficient, because atree calls Storable() recursively, so indirectly checking for storability (some Storable() implementations return an error when the value is non-storable).
This recursive checking, which is also needed for other containers (see below), is potentially expensive.
Co-authored-by: Bastian Müller <[email protected]>
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.
Part of https://github.com/dapperlabs/cadence-internal/issues/235
Prevents sticking nonstorable things in storage by casting them through
AnyStructThanks @bluesign for the report
masterbranchFiles changedin the Github PR explorer