network: correct data modeling for headers messages #1425
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
|
Fixes the problem revealed by #1423. |
dconnolly
reviewed
Dec 2, 2020
hdevalence
commented
Dec 2, 2020
docker/Dockerfile.build
Outdated
| @@ -19,6 +19,7 @@ RUN cargo test --all --release; cargo build --release | |||
| # Runner image | |||
| FROM debian:buster-slim AS zebrad-release | |||
|
|
|||
| COPY --from=builder /zebra/otelcol-custom / | |||
There was a problem hiding this comment.
was this meant for this PR?
teor2345
reviewed
Dec 2, 2020
teor2345
previously approved these changes
Dec 2, 2020
This was referenced Dec 2, 2020
dconnolly
force-pushed
the
headers-fix
branch
from
ef898fe
to
6f66bb6
Compare
teor2345
previously approved these changes
Dec 2, 2020
We modeled a Bitcoin `headers` message as being a list of block headers. However, the actual data structure is slightly different: it's a list of (block header, transaction count) pairs. This caused zcashd to reject our headers messages. To fix this, introduce a new `CountedHeader` struct with a `block::Header` and transaction count `usize`, then thread it through the inbound service and the state. I tested this locally by running Zebra with these changes and inspecting a trace-level log of the span of a peer connection that requested a nontrivial headers packet from us, and verified that it did not reject our message.
hdevalence
force-pushed
the
headers-fix
branch
from
6f66bb6
to
50e350e
Compare
|
Rebased to pick up cargo fmt fixes in #1427 |
dconnolly
approved these changes
Dec 2, 2020
1 task
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.
We modeled a Bitcoin
headersmessage as being a list of block headers.However, the actual data structure is slightly different: it's a list of (block
header, transaction count) pairs. This caused zcashd to reject our headers
messages.
To fix this, introduce a new
CountedHeaderstruct with ablock::Headerandtransaction count
usize, then thread it through the inbound service and thestate.
I tested this locally by running Zebra with these changes and inspecting a
trace-level log of the span of a peer connection that requested a nontrivial
headers packet from us, and verified that it did not reject our message.
Closes #1424.
Closes #1409.
Closes #1398.