Skip to content

cmd/devp2p: accept txs in any order; non-empty blob txs #32834

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

cmd/devp2p: accept txs in any order; non-empty blob txs #32834

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
52 changes: 33 additions & 19 deletions cmd/devp2p/internal/ethtest/suite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,16 +250,23 @@ concurrently, with different request IDs.`)
t.Fatalf("unexpected request id in response: got %d, want %d", got, want)
}

// Check received headers for accuracy.
if expected, err := s.chain.GetHeaders(req1); err != nil {
t.Fatalf("failed to get expected headers for request 1: %v", err)
} else if !headersMatch(expected, headers1.BlockHeadersRequest) {
t.Fatalf("header mismatch: \nexpected %v \ngot %v", expected, headers1)
}
if expected, err := s.chain.GetHeaders(req2); err != nil {
t.Fatalf("failed to get expected headers for request 2: %v", err)
} else if !headersMatch(expected, headers2.BlockHeadersRequest) {
t.Fatalf("header mismatch: \nexpected %v \ngot %v", expected, headers2)
// Check if headers match.
if got, err := s.chain.GetHeaders(req1); err != nil {
t.Fatalf("failed to get expected block headers: %v", err)
} else if !headersMatch(headers1.BlockHeadersRequest, got) && !headersMatch(headers2.BlockHeadersRequest, got) {
t.Fatalf("header mismatch: \nexpected %v or %v \ngot %v", headers2, headers2, got)
} else if headersMatch(headers1.BlockHeadersRequest, got) {
if got2, err := s.chain.GetHeaders(req2); err != nil {
t.Fatalf("failed to get expected block headers: %v", err)
} else if !headersMatch(headers2.BlockHeadersRequest, got2) {
t.Fatalf("header mismatch: \nexpected %v \ngot %v", headers2, got2)
}
} else {
if got2, err := s.chain.GetHeaders(req2); err != nil {
t.Fatalf("failed to get expected block headers: %v", err)
} else if !headersMatch(headers1.BlockHeadersRequest, got2) {
t.Fatalf("header mismatch: \nexpected %v \ngot %v", headers1, got2)
}
}
}

Expand Down Expand Up @@ -318,15 +325,22 @@ same request ID. The node should handle the request by responding to both reques
}

// Check if headers match.
if expected, err := s.chain.GetHeaders(request1); err != nil {
if got, err := s.chain.GetHeaders(request1); err != nil {
t.Fatalf("failed to get expected block headers: %v", err)
} else if !headersMatch(expected, headers1.BlockHeadersRequest) {
t.Fatalf("header mismatch: \nexpected %v \ngot %v", expected, headers1)
}
if expected, err := s.chain.GetHeaders(request2); err != nil {
t.Fatalf("failed to get expected block headers: %v", err)
} else if !headersMatch(expected, headers2.BlockHeadersRequest) {
t.Fatalf("header mismatch: \nexpected %v \ngot %v", expected, headers2)
} else if !headersMatch(headers1.BlockHeadersRequest, got) && !headersMatch(headers2.BlockHeadersRequest, got) {
t.Fatalf("header mismatch: \nexpected %v or %v \ngot %v", headers2, headers2, got)
} else if headersMatch(headers1.BlockHeadersRequest, got) {
if got2, err := s.chain.GetHeaders(request2); err != nil {
t.Fatalf("failed to get expected block headers: %v", err)
} else if !headersMatch(headers2.BlockHeadersRequest, got2) {
t.Fatalf("header mismatch: \nexpected %v \ngot %v", headers2, got2)
}
} else {
if got2, err := s.chain.GetHeaders(request2); err != nil {
t.Fatalf("failed to get expected block headers: %v", err)
} else if !headersMatch(headers1.BlockHeadersRequest, got2) {
t.Fatalf("header mismatch: \nexpected %v \ngot %v", headers1, got2)
}
}
}

Expand Down Expand Up @@ -887,7 +901,7 @@ func (s *Suite) makeBlobTxs(count, blobs int, discriminator byte) (txs types.Tra
from, nonce := s.chain.GetSender(5)
for i := 0; i < count; i++ {
// Make blob data, max of 2 blobs per tx.
blobdata := make([]byte, blobs%3)
blobdata := make([]byte, min(blobs, 2))
for i := range blobdata {
blobdata[i] = discriminator
blobs -= 1
Expand Down