Skip to content

No longer consider proof response with missing field as valid #777

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

Draft
tomaka wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

No longer consider proof response with missing field as valid #777

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions lib/src/network/protocol/storage_call_proof.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,18 +105,16 @@ pub fn decode_storage_or_call_proof_response(
StorageOrCallProof::StorageProof => 2,
};

// TODO: while the `proof` field is correctly optional, the `response` field isn't supposed to be optional; make it `#[required]` again once https://github.com/paritytech/substrate/pull/12732 has been merged and released

let mut parser = nom::combinator::all_consuming::<_, _, nom::error::Error<&[u8]>, _>(
nom::combinator::complete(protobuf::message_decode! {
#[optional] response = field_num => protobuf::message_tag_decode(protobuf::message_decode!{
#[required] response = field_num => protobuf::message_tag_decode(protobuf::message_decode!{
#[optional] proof = 2 => protobuf::bytes_tag_decode
}),
}),
);

let proof = match nom::Finish::finish(parser(response_bytes)) {
Ok((_, out)) => out.response.and_then(|r| r.proof),
Ok((_, out)) => out.response.proof,
Err(_) => return Err(DecodeStorageCallProofResponseError::ProtobufDecode),
};

Expand Down