-
Notifications
You must be signed in to change notification settings - Fork 50
fix(dpp): validate encrypted_note length in structure validation #3368
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
85e05ad
fix(dpp): validate encrypted_note length in structure validation
QuantumExplorer ec86d05
chore: sort shielded error codes numerically
QuantumExplorer 03352ff
refactor(dpp): make ENCRYPTED_NOTE_SIZE the single source of truth
QuantumExplorer 0b7ee63
fix(dpp): add ShieldedEncryptedNoteSizeMismatchError to wasm-dpp match
QuantumExplorer 6f940d7
test(dpp): assert error payload values in encrypted_note tests
QuantumExplorer 444de8d
fix(drive-abci): update encrypted_note tests for earlier DPP validation
QuantumExplorer File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
46 changes: 46 additions & 0 deletions
46
...rc/errors/consensus/basic/state_transition/shielded_encrypted_note_size_mismatch_error.rs
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| use crate::consensus::basic::BasicError; | ||
| use crate::consensus::ConsensusError; | ||
| use crate::errors::ProtocolError; | ||
| use bincode::{Decode, Encode}; | ||
| use platform_serialization_derive::{PlatformDeserialize, PlatformSerialize}; | ||
| use thiserror::Error; | ||
|
|
||
| #[derive( | ||
| Error, Debug, Clone, PartialEq, Eq, Encode, Decode, PlatformSerialize, PlatformDeserialize, | ||
| )] | ||
| #[error( | ||
| "Shielded action encrypted_note has invalid size: expected {expected_size} bytes, got {actual_size} bytes" | ||
| )] | ||
| #[platform_serialize(unversioned)] | ||
| pub struct ShieldedEncryptedNoteSizeMismatchError { | ||
| /* | ||
|
|
||
| DO NOT CHANGE ORDER OF FIELDS WITHOUT INTRODUCING OF NEW VERSION | ||
|
|
||
| */ | ||
| expected_size: u32, | ||
| actual_size: u32, | ||
| } | ||
|
|
||
| impl ShieldedEncryptedNoteSizeMismatchError { | ||
| pub fn new(expected_size: u32, actual_size: u32) -> Self { | ||
| Self { | ||
| expected_size, | ||
| actual_size, | ||
| } | ||
| } | ||
|
|
||
| pub fn expected_size(&self) -> u32 { | ||
| self.expected_size | ||
| } | ||
|
|
||
| pub fn actual_size(&self) -> u32 { | ||
| self.actual_size | ||
| } | ||
| } | ||
|
|
||
| impl From<ShieldedEncryptedNoteSizeMismatchError> for ConsensusError { | ||
| fn from(err: ShieldedEncryptedNoteSizeMismatchError) -> Self { | ||
| Self::BasicError(BasicError::ShieldedEncryptedNoteSizeMismatchError(err)) | ||
| } | ||
| } |
This file contains hidden or 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
This file contains hidden or 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
2 changes: 1 addition & 1 deletion
2
packages/rs-dpp/src/state_transition/state_transitions/shielded/mod.rs
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.