Rework p2p req resp protocol

Makefile

@@ -211,10 +211,7 @@ devnet-logs: ## Displays logs for the local devnet
 .PHONY: devnet-logs
 
 test-unit: ## Runs unit tests for all components
-	make -C ./op-node test
-	make -C ./op-proposer test
-	make -C ./op-batcher test
-	make -C ./op-e2e test
+	just test-components
 	(cd packages/contracts-bedrock && just test)
 .PHONY: test-unit
 

go.mod

@@ -4,6 +4,8 @@ go 1.21
 
 require (
 	github.com/BurntSushi/toml v1.4.0
+	github.com/anacrolix/chansync v0.6.0
+	github.com/anacrolix/generics v0.0.3-0.20240902042256-7fb2702ef0ca
 	github.com/andybalholm/brotli v1.1.0
 	github.com/btcsuite/btcd v0.24.2
 	github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0
@@ -46,7 +48,7 @@ require (
 	github.com/stretchr/testify v1.9.0
 	github.com/urfave/cli/v2 v2.27.4
 	golang.org/x/crypto v0.27.0
-	golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa
+	golang.org/x/exp v0.0.0-20240823005443-9b4947da3948
 	golang.org/x/sync v0.8.0
 	golang.org/x/term v0.24.0
 	golang.org/x/time v0.6.0
@@ -59,6 +61,9 @@ require (
 	github.com/VictoriaMetrics/fastcache v1.12.2 // indirect
 	github.com/adrg/xdg v0.4.0 // indirect
 	github.com/allegro/bigcache v1.2.1 // indirect
+	github.com/anacrolix/envpprof v1.3.0 // indirect
+	github.com/anacrolix/missinggo/v2 v2.7.4-0.20240902050650-7985420302c7 // indirect
+	github.com/anacrolix/sync v0.5.2 // indirect
 	github.com/armon/go-metrics v0.4.1 // indirect
 	github.com/benbjohnson/clock v1.3.5 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
@@ -127,6 +132,7 @@ require (
 	github.com/hashicorp/raft-boltdb v0.0.0-20231211162105-6c830fa4535e // indirect
 	github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4 // indirect
 	github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
+	github.com/huandu/xstrings v1.3.2 // indirect
 	github.com/huin/goupnp v1.3.0 // indirect
 	github.com/influxdata/influxdb-client-go/v2 v2.4.0 // indirect
 	github.com/influxdata/influxdb1-client v0.0.0-20220302092344-a9ab5670611c // indirect

justfile

@@ -42,3 +42,10 @@ check-slither:
 
 upgrade-slither:
   jq '.slither = $v' --arg v $(just print-slither) <<<$(cat versions.json) > versions.json
+
+check:
+    go test -failfast -run @ ./... > /dev/null
+
+# Run unit tests for all components.
+test-components:
+    go test -failfast ./op-{node,proposer,batcher,e2e}/...

op-bootnode/bootnode/entrypoint.go

@@ -26,7 +26,7 @@ import (
 
 type gossipNoop struct{}
 
-func (g *gossipNoop) OnUnsafeL2Payload(_ context.Context, _ peer.ID, _ *eth.ExecutionPayloadEnvelope) error {
+func (g *gossipNoop) OnUnsafeL2Payload(_ context.Context, _ peer.ID, _ *eth.ExecutionPayloadEnvelope, _ p2p.PayloadSource) error {
 	return nil
 }
 
@@ -62,9 +62,9 @@ func Main(cliCtx *cli.Context) error {
 	if err != nil {
 		return fmt.Errorf("failed to load p2p config: %w", err)
 	}
-	if p2pConfig.EnableReqRespSync {
+	if p2pConfig.ReqRespSync.Enabled {
 		logger.Warn("req-resp sync is enabled, bootnode does not support this feature")
-		p2pConfig.EnableReqRespSync = false
+		p2pConfig.ReqRespSync.Enabled = false
 	}
 
 	p2pNode, err := p2p.NewNodeP2P(ctx, config, logger, p2pConfig, &gossipNoop{}, &l2Chain{}, &gossipConfig{}, m, false)

op-e2e/e2eutils/opnode/tracer.go

@@ -3,6 +3,8 @@ package opnode
 import (
 	"context"
 
+	"github.com/ethereum-optimism/optimism/op-node/p2p"
+
 	"github.com/libp2p/go-libp2p/core/peer"
 
 	"github.com/ethereum-optimism/optimism/op-node/node"
@@ -12,6 +14,7 @@ import (
 type FnTracer struct {
 	OnNewL1HeadFn        func(ctx context.Context, sig eth.L1BlockRef)
 	OnUnsafeL2PayloadFn  func(ctx context.Context, from peer.ID, payload *eth.ExecutionPayloadEnvelope)
+	L2PayloadInFunc      p2p.L2PayloadInFunc
 	OnPublishL2PayloadFn func(ctx context.Context, payload *eth.ExecutionPayloadEnvelope)
 }
 
@@ -21,10 +24,14 @@ func (n *FnTracer) OnNewL1Head(ctx context.Context, sig eth.L1BlockRef) {
 	}
 }
 
-func (n *FnTracer) OnUnsafeL2Payload(ctx context.Context, from peer.ID, payload *eth.ExecutionPayloadEnvelope) {
+func (n *FnTracer) OnUnsafeL2Payload(ctx context.Context, from peer.ID, payload *eth.ExecutionPayloadEnvelope, source p2p.PayloadSource) error {
 	if n.OnUnsafeL2PayloadFn != nil {
 		n.OnUnsafeL2PayloadFn(ctx, from, payload)
 	}
+	if n.L2PayloadInFunc != nil {
+		return n.L2PayloadInFunc(ctx, from, payload, source)
+	}
+	return nil
 }
 
 func (n *FnTracer) OnPublishL2Payload(ctx context.Context, payload *eth.ExecutionPayloadEnvelope) {

op-e2e/system/e2esys/setup.go

@@ -255,7 +255,7 @@ type SystemConfig struct {
 	P2PTopology map[string][]string
 
 	// Enables req-resp sync in the P2P nodes
-	P2PReqRespSync bool
+	P2PReqRespSync p2p.ReqRespSyncConfig
 
 	// If the proposer can make proposals for L2 blocks derived from L1 blocks which are not finalized on L1 yet.
 	NonFinalizedProposals bool
@@ -674,10 +674,10 @@ func (cfg SystemConfig) Start(t *testing.T, _opts ...SystemConfigOption) (*Syste
 			// TODO we can enable discv5 in the testnodes to test discovery of new peers.
 			// Would need to mock though, and the discv5 implementation does not provide nice mocks here.
 			p := &p2p.Prepared{
-				HostP2P:           h,
-				LocalNode:         nil,
-				UDPv5:             nil,
-				EnableReqRespSync: cfg.P2PReqRespSync,
+				HostP2P:     h,
+				LocalNode:   nil,
+				UDPv5:       nil,
+				ReqRespSync: cfg.P2PReqRespSync,
 			}
 			p2pNodes[name] = p
 			return p, nil