Skip to content

p2p/protocols/eth, p2p/sentry/libsentry, node/direct: derive msgid tables instead of triple-maintaining them #22175

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
yperbasis wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

p2p/protocols/eth, p2p/sentry/libsentry, node/direct: derive msgid tables instead of triple-maintaining them #22175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c602f52
p2p/protocols/eth, p2p/protocols/wit, p2p/sentry/libsentry: golden te…
yperbasis Jul 2, 2026
e2e7909
p2p/protocols/eth, p2p/protocols/wit, p2p/sentry/libsentry, node/dire…
yperbasis Jul 2, 2026
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
34 changes: 11 additions & 23 deletions node/direct/sentry_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,37 +28,25 @@ import (

"github.com/erigontech/erigon/node/gointerfaces/sentryproto"
"github.com/erigontech/erigon/node/gointerfaces/typesproto"
"github.com/erigontech/erigon/p2p/protocols/eth"
"github.com/erigontech/erigon/p2p/protocols/wit"
"github.com/erigontech/erigon/p2p/sentry/libsentry"
)

const (
ETH68 = 68
ETH69 = 69
ETH70 = 70
ETH71 = 71
ETH68 = eth.ETH68
ETH69 = eth.ETH69
ETH70 = eth.ETH70
ETH71 = eth.ETH71

WIT0 = 1
WIT0 = wit.WIT1
)

var (
ProtocolToUintMap = map[sentryproto.Protocol]uint{
sentryproto.Protocol_ETH68: ETH68,
sentryproto.Protocol_ETH69: ETH69,
sentryproto.Protocol_ETH70: ETH70,
sentryproto.Protocol_ETH71: ETH71,
}
UintToProtocolMap = map[uint]sentryproto.Protocol{
ETH68: sentryproto.Protocol_ETH68,
ETH69: sentryproto.Protocol_ETH69,
ETH70: sentryproto.Protocol_ETH70,
ETH71: sentryproto.Protocol_ETH71,
}
SupportedSideProtocols = map[sentryproto.Protocol]struct{}{
sentryproto.Protocol_WIT0: {},
}
UintToSideProtocolMap = map[uint]sentryproto.Protocol{
WIT0: sentryproto.Protocol_WIT0,
}
ProtocolToUintMap = libsentry.ProtocolToUintMap
UintToProtocolMap = libsentry.UintToProtocolMap
SupportedSideProtocols = libsentry.SupportedSideProtocols
UintToSideProtocolMap = libsentry.UintToSideProtocolMap
)

//go:generate mockgen -typed=true -destination=./sentry_client_mock.go -package=direct . SentryClient
Expand Down
2 changes: 1 addition & 1 deletion p2p/protocols/eth/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ const NoSizeLimit = math.MaxInt
// ReceiptQueryOpts controls the behavior differences between eth protocol versions
// when answering GetReceipts queries.
type ReceiptQueryOpts struct {
// EthVersion is the protocol version (e.g. direct.ETH68, direct.ETH69, direct.ETH70).
// EthVersion is the protocol version (e.g. ETH68, ETH69, ETH70).
// eth/69+ uses encoding without the Bloom field.
EthVersion uint
// FirstBlockReceiptIndex skips this many receipts from the first block (eth/70).
Expand Down
3 changes: 1 addition & 2 deletions p2p/protocols/eth/handlers_receipts_query_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import (
"github.com/erigontech/erigon/execution/chain"
"github.com/erigontech/erigon/execution/rlp"
"github.com/erigontech/erigon/execution/types"
"github.com/erigontech/erigon/node/direct"
)

// Per the devp2p spec, a Receipts response carries one receipt list per requested
Expand Down Expand Up @@ -97,7 +96,7 @@ func answerQuery(t *testing.T, f *receiptsQueryFixture) ([]rlp.RawValue, bool, e
tx, err := db.BeginTemporalRo(context.Background())
require.NoError(t, err)
defer tx.Rollback()
opts := ReceiptQueryOpts{EthVersion: direct.ETH68, SizeLimit: NoSizeLimit}
opts := ReceiptQueryOpts{EthVersion: ETH68, SizeLimit: NoSizeLimit}
return AnswerGetReceiptsQuery(context.Background(), chain.TestChainBerlinConfig, f.getter, f.br, tx, f.query, nil, opts)
}

Expand Down
212 changes: 76 additions & 136 deletions p2p/protocols/eth/protocol.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,30 @@ package eth
import (
"fmt"
"io"
"maps"
"math/big"

"github.com/holiman/uint256"

"github.com/erigontech/erigon/common"
"github.com/erigontech/erigon/execution/rlp"
"github.com/erigontech/erigon/execution/types"
"github.com/erigontech/erigon/node/direct"
"github.com/erigontech/erigon/node/gointerfaces/sentryproto"
"github.com/erigontech/erigon/p2p/forkid"
)

const (
ETH68 = 68
ETH69 = 69
ETH70 = 70
ETH71 = 71
)

var ProtocolToString = map[uint]string{
direct.ETH68: "eth68",
direct.ETH69: "eth69",
direct.ETH70: "eth70",
direct.ETH71: "eth71",
ETH68: "eth68",
ETH69: "eth69",
ETH70: "eth70",
ETH71: "eth71",
}

// ProtocolName is the official short name of the `eth` protocol used during
Expand All @@ -49,7 +56,7 @@ const ProtocolName = "eth"
const maxMessageSize = 10 * 1024 * 1024
const ProtocolMaxMsgSize = maxMessageSize

var ProtocolLengths = map[uint]uint64{direct.ETH68: 17, direct.ETH69: 18, direct.ETH70: 18, direct.ETH71: 20}
var ProtocolLengths = map[uint]uint64{ETH68: 17, ETH69: 18, ETH70: 18, ETH71: 20}

const (
// Protocol messages in eth/64
Expand All @@ -75,137 +82,70 @@ const (
BlockAccessListsMsg = 0x13
)

var toProto68 = map[uint64]sentryproto.MessageId{
GetBlockHeadersMsg: sentryproto.MessageId_GET_BLOCK_HEADERS_66,
BlockHeadersMsg: sentryproto.MessageId_BLOCK_HEADERS_66,
GetBlockBodiesMsg: sentryproto.MessageId_GET_BLOCK_BODIES_66,
BlockBodiesMsg: sentryproto.MessageId_BLOCK_BODIES_66,
GetReceiptsMsg: sentryproto.MessageId_GET_RECEIPTS_66,
ReceiptsMsg: sentryproto.MessageId_RECEIPTS_66,
NewBlockHashesMsg: sentryproto.MessageId_NEW_BLOCK_HASHES_66,
NewBlockMsg: sentryproto.MessageId_NEW_BLOCK_66,
TransactionsMsg: sentryproto.MessageId_TRANSACTIONS_66,
NewPooledTransactionHashesMsg: sentryproto.MessageId_NEW_POOLED_TRANSACTION_HASHES_68,
GetPooledTransactionsMsg: sentryproto.MessageId_GET_POOLED_TRANSACTIONS_66,
PooledTransactionsMsg: sentryproto.MessageId_POOLED_TRANSACTIONS_66,
}

var toProto69 = withDelta(toProto68, map[uint64]sentryproto.MessageId{
StatusMsg: sentryproto.MessageId_STATUS_69,
GetReceiptsMsg: sentryproto.MessageId_GET_RECEIPTS_69,
BlockRangeUpdateMsg: sentryproto.MessageId_BLOCK_RANGE_UPDATE_69,
})

var toProto70 = withDelta(toProto69, map[uint64]sentryproto.MessageId{
GetReceiptsMsg: sentryproto.MessageId_GET_RECEIPTS_70,
ReceiptsMsg: sentryproto.MessageId_RECEIPTS_70,
})

var toProto71 = withDelta(toProto70, map[uint64]sentryproto.MessageId{
GetBlockAccessListsMsg: sentryproto.MessageId_GET_BLOCK_ACCESS_LISTS_71,
BlockAccessListsMsg: sentryproto.MessageId_BLOCK_ACCESS_LISTS_71,
})

var ToProto = map[uint]map[uint64]sentryproto.MessageId{
direct.ETH68: {
GetBlockHeadersMsg: sentryproto.MessageId_GET_BLOCK_HEADERS_66,
BlockHeadersMsg: sentryproto.MessageId_BLOCK_HEADERS_66,
GetBlockBodiesMsg: sentryproto.MessageId_GET_BLOCK_BODIES_66,
BlockBodiesMsg: sentryproto.MessageId_BLOCK_BODIES_66,
GetReceiptsMsg: sentryproto.MessageId_GET_RECEIPTS_66,
ReceiptsMsg: sentryproto.MessageId_RECEIPTS_66,
NewBlockHashesMsg: sentryproto.MessageId_NEW_BLOCK_HASHES_66,
NewBlockMsg: sentryproto.MessageId_NEW_BLOCK_66,
TransactionsMsg: sentryproto.MessageId_TRANSACTIONS_66,
NewPooledTransactionHashesMsg: sentryproto.MessageId_NEW_POOLED_TRANSACTION_HASHES_68, // Modified in eth/68
GetPooledTransactionsMsg: sentryproto.MessageId_GET_POOLED_TRANSACTIONS_66,
PooledTransactionsMsg: sentryproto.MessageId_POOLED_TRANSACTIONS_66,
},
direct.ETH69: {
StatusMsg: sentryproto.MessageId_STATUS_69,
GetBlockHeadersMsg: sentryproto.MessageId_GET_BLOCK_HEADERS_66,
BlockHeadersMsg: sentryproto.MessageId_BLOCK_HEADERS_66,
GetBlockBodiesMsg: sentryproto.MessageId_GET_BLOCK_BODIES_66,
BlockBodiesMsg: sentryproto.MessageId_BLOCK_BODIES_66,
GetReceiptsMsg: sentryproto.MessageId_GET_RECEIPTS_69, // Modified in eth/69
ReceiptsMsg: sentryproto.MessageId_RECEIPTS_66,
NewBlockHashesMsg: sentryproto.MessageId_NEW_BLOCK_HASHES_66,
NewBlockMsg: sentryproto.MessageId_NEW_BLOCK_66,
TransactionsMsg: sentryproto.MessageId_TRANSACTIONS_66,
NewPooledTransactionHashesMsg: sentryproto.MessageId_NEW_POOLED_TRANSACTION_HASHES_68,
GetPooledTransactionsMsg: sentryproto.MessageId_GET_POOLED_TRANSACTIONS_66,
PooledTransactionsMsg: sentryproto.MessageId_POOLED_TRANSACTIONS_66,
BlockRangeUpdateMsg: sentryproto.MessageId_BLOCK_RANGE_UPDATE_69, // Modified in eth/69
},
direct.ETH70: {
StatusMsg: sentryproto.MessageId_STATUS_69,
GetBlockHeadersMsg: sentryproto.MessageId_GET_BLOCK_HEADERS_66,
BlockHeadersMsg: sentryproto.MessageId_BLOCK_HEADERS_66,
GetBlockBodiesMsg: sentryproto.MessageId_GET_BLOCK_BODIES_66,
BlockBodiesMsg: sentryproto.MessageId_BLOCK_BODIES_66,
GetReceiptsMsg: sentryproto.MessageId_GET_RECEIPTS_70, // Modified in eth/70
ReceiptsMsg: sentryproto.MessageId_RECEIPTS_70, // Modified in eth/70
NewBlockHashesMsg: sentryproto.MessageId_NEW_BLOCK_HASHES_66,
NewBlockMsg: sentryproto.MessageId_NEW_BLOCK_66,
TransactionsMsg: sentryproto.MessageId_TRANSACTIONS_66,
NewPooledTransactionHashesMsg: sentryproto.MessageId_NEW_POOLED_TRANSACTION_HASHES_68,
GetPooledTransactionsMsg: sentryproto.MessageId_GET_POOLED_TRANSACTIONS_66,
PooledTransactionsMsg: sentryproto.MessageId_POOLED_TRANSACTIONS_66,
BlockRangeUpdateMsg: sentryproto.MessageId_BLOCK_RANGE_UPDATE_69,
},
direct.ETH71: {
StatusMsg: sentryproto.MessageId_STATUS_69,
GetBlockHeadersMsg: sentryproto.MessageId_GET_BLOCK_HEADERS_66,
BlockHeadersMsg: sentryproto.MessageId_BLOCK_HEADERS_66,
GetBlockBodiesMsg: sentryproto.MessageId_GET_BLOCK_BODIES_66,
BlockBodiesMsg: sentryproto.MessageId_BLOCK_BODIES_66,
GetReceiptsMsg: sentryproto.MessageId_GET_RECEIPTS_70,
ReceiptsMsg: sentryproto.MessageId_RECEIPTS_70,
NewBlockHashesMsg: sentryproto.MessageId_NEW_BLOCK_HASHES_66,
NewBlockMsg: sentryproto.MessageId_NEW_BLOCK_66,
TransactionsMsg: sentryproto.MessageId_TRANSACTIONS_66,
NewPooledTransactionHashesMsg: sentryproto.MessageId_NEW_POOLED_TRANSACTION_HASHES_68,
GetPooledTransactionsMsg: sentryproto.MessageId_GET_POOLED_TRANSACTIONS_66,
PooledTransactionsMsg: sentryproto.MessageId_POOLED_TRANSACTIONS_66,
BlockRangeUpdateMsg: sentryproto.MessageId_BLOCK_RANGE_UPDATE_69,
// Added in eth/71 (EIP-8159 Block Access List Exchange)
GetBlockAccessListsMsg: sentryproto.MessageId_GET_BLOCK_ACCESS_LISTS_71,
BlockAccessListsMsg: sentryproto.MessageId_BLOCK_ACCESS_LISTS_71,
},
}

var FromProto = map[uint]map[sentryproto.MessageId]uint64{
direct.ETH68: {
sentryproto.MessageId_GET_BLOCK_HEADERS_66: GetBlockHeadersMsg,
sentryproto.MessageId_BLOCK_HEADERS_66: BlockHeadersMsg,
sentryproto.MessageId_GET_BLOCK_BODIES_66: GetBlockBodiesMsg,
sentryproto.MessageId_BLOCK_BODIES_66: BlockBodiesMsg,
sentryproto.MessageId_GET_RECEIPTS_66: GetReceiptsMsg,
sentryproto.MessageId_RECEIPTS_66: ReceiptsMsg,
sentryproto.MessageId_NEW_BLOCK_HASHES_66: NewBlockHashesMsg,
sentryproto.MessageId_NEW_BLOCK_66: NewBlockMsg,
sentryproto.MessageId_TRANSACTIONS_66: TransactionsMsg,
sentryproto.MessageId_NEW_POOLED_TRANSACTION_HASHES_68: NewPooledTransactionHashesMsg,
sentryproto.MessageId_GET_POOLED_TRANSACTIONS_66: GetPooledTransactionsMsg,
sentryproto.MessageId_POOLED_TRANSACTIONS_66: PooledTransactionsMsg,
},
direct.ETH69: {
sentryproto.MessageId_GET_BLOCK_HEADERS_66: GetBlockHeadersMsg,
sentryproto.MessageId_BLOCK_HEADERS_66: BlockHeadersMsg,
sentryproto.MessageId_GET_BLOCK_BODIES_66: GetBlockBodiesMsg,
sentryproto.MessageId_BLOCK_BODIES_66: BlockBodiesMsg,
sentryproto.MessageId_GET_RECEIPTS_69: GetReceiptsMsg,
sentryproto.MessageId_RECEIPTS_66: ReceiptsMsg,
sentryproto.MessageId_NEW_BLOCK_HASHES_66: NewBlockHashesMsg,
sentryproto.MessageId_NEW_BLOCK_66: NewBlockMsg,
sentryproto.MessageId_TRANSACTIONS_66: TransactionsMsg,
sentryproto.MessageId_NEW_POOLED_TRANSACTION_HASHES_68: NewPooledTransactionHashesMsg,
sentryproto.MessageId_GET_POOLED_TRANSACTIONS_66: GetPooledTransactionsMsg,
sentryproto.MessageId_POOLED_TRANSACTIONS_66: PooledTransactionsMsg,
sentryproto.MessageId_BLOCK_RANGE_UPDATE_69: BlockRangeUpdateMsg,
},
direct.ETH70: {
sentryproto.MessageId_GET_BLOCK_HEADERS_66: GetBlockHeadersMsg,
sentryproto.MessageId_BLOCK_HEADERS_66: BlockHeadersMsg,
sentryproto.MessageId_GET_BLOCK_BODIES_66: GetBlockBodiesMsg,
sentryproto.MessageId_BLOCK_BODIES_66: BlockBodiesMsg,
sentryproto.MessageId_GET_RECEIPTS_70: GetReceiptsMsg,
sentryproto.MessageId_RECEIPTS_70: ReceiptsMsg,
sentryproto.MessageId_NEW_BLOCK_HASHES_66: NewBlockHashesMsg,
sentryproto.MessageId_NEW_BLOCK_66: NewBlockMsg,
sentryproto.MessageId_TRANSACTIONS_66: TransactionsMsg,
sentryproto.MessageId_NEW_POOLED_TRANSACTION_HASHES_68: NewPooledTransactionHashesMsg,
sentryproto.MessageId_GET_POOLED_TRANSACTIONS_66: GetPooledTransactionsMsg,
sentryproto.MessageId_POOLED_TRANSACTIONS_66: PooledTransactionsMsg,
sentryproto.MessageId_BLOCK_RANGE_UPDATE_69: BlockRangeUpdateMsg,
},
direct.ETH71: {
sentryproto.MessageId_GET_BLOCK_HEADERS_66: GetBlockHeadersMsg,
sentryproto.MessageId_BLOCK_HEADERS_66: BlockHeadersMsg,
sentryproto.MessageId_GET_BLOCK_BODIES_66: GetBlockBodiesMsg,
sentryproto.MessageId_BLOCK_BODIES_66: BlockBodiesMsg,
sentryproto.MessageId_GET_RECEIPTS_70: GetReceiptsMsg,
sentryproto.MessageId_RECEIPTS_70: ReceiptsMsg,
sentryproto.MessageId_NEW_BLOCK_HASHES_66: NewBlockHashesMsg,
sentryproto.MessageId_NEW_BLOCK_66: NewBlockMsg,
sentryproto.MessageId_TRANSACTIONS_66: TransactionsMsg,
sentryproto.MessageId_NEW_POOLED_TRANSACTION_HASHES_68: NewPooledTransactionHashesMsg,
sentryproto.MessageId_GET_POOLED_TRANSACTIONS_66: GetPooledTransactionsMsg,
sentryproto.MessageId_POOLED_TRANSACTIONS_66: PooledTransactionsMsg,
sentryproto.MessageId_BLOCK_RANGE_UPDATE_69: BlockRangeUpdateMsg,
// Added in eth/71 (EIP-8159 Block Access List Exchange)
sentryproto.MessageId_GET_BLOCK_ACCESS_LISTS_71: GetBlockAccessListsMsg,
sentryproto.MessageId_BLOCK_ACCESS_LISTS_71: BlockAccessListsMsg,
},
ETH68: toProto68,
ETH69: toProto69,
ETH70: toProto70,
ETH71: toProto71,
}

var FromProto = inverseWithoutStatus(ToProto)

func withDelta(prev, changes map[uint64]sentryproto.MessageId) map[uint64]sentryproto.MessageId {
next := maps.Clone(prev)
maps.Copy(next, changes)
return next
}

// Status is handshake-only: FromProto omits it so that SendMessageById can
// never emit a status frame.
func inverseWithoutStatus(toProto map[uint]map[uint64]sentryproto.MessageId) map[uint]map[sentryproto.MessageId]uint64 {
fromProto := make(map[uint]map[sentryproto.MessageId]uint64, len(toProto))
for version, codes := range toProto {
inv := make(map[sentryproto.MessageId]uint64, len(codes))
for code, id := range codes {
if code == StatusMsg {
continue
}
if _, ok := inv[id]; ok {
panic(fmt.Sprintf("eth/%d: message id %s mapped from multiple message codes", version, id))
}
inv[id] = code
}
fromProto[version] = inv
}
return fromProto
}

// Packet represents a p2p message in the `eth` protocol.
Expand Down
Loading
Loading