Merge branch 'main' into julien/go-header-clean

julienrbrt · web-flow · commit 514ba027552b · 2026-02-03T13:14:20.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## v1.0.0-rc.2
+
 ### Changes
 
 - Improve cache handling when there is a significant backlog of pending headers and data. ([#3030](https://github.com/evstack/ev-node/pull/3030))
diff --git a/apps/evm/go.mod b/apps/evm/go.mod
@@ -2,16 +2,16 @@ module github.com/evstack/ev-node/apps/evm
 
 go 1.25.0
 
-replace (
-	github.com/evstack/ev-node => ../../
-	github.com/evstack/ev-node/execution/evm => ../../execution/evm
-)
+//replace (
+//	github.com/evstack/ev-node => ../../
+//	github.com/evstack/ev-node/execution/evm => ../../execution/evm
+//)
 
 require (
 	github.com/ethereum/go-ethereum v1.16.8
-	github.com/evstack/ev-node v1.0.0-rc.1
+	github.com/evstack/ev-node v1.0.0-rc.2
 	github.com/evstack/ev-node/core v1.0.0-rc.1
-	github.com/evstack/ev-node/execution/evm v1.0.0-rc.1
+	github.com/evstack/ev-node/execution/evm v1.0.0-rc.2
 	github.com/ipfs/go-datastore v0.9.0
 	github.com/rs/zerolog v1.34.0
 	github.com/spf13/cobra v1.10.2
diff --git a/apps/evm/go.sum b/apps/evm/go.sum
@@ -409,8 +409,12 @@ github.com/ethereum/go-ethereum v1.16.8 h1:LLLfkZWijhR5m6yrAXbdlTeXoqontH+Ga2f9i
 github.com/ethereum/go-ethereum v1.16.8/go.mod h1:Fs6QebQbavneQTYcA39PEKv2+zIjX7rPUZ14DER46wk=
 github.com/ethereum/go-verkle v0.2.2 h1:I2W0WjnrFUIzzVPwm8ykY+7pL2d4VhlsePn4j7cnFk8=
 github.com/ethereum/go-verkle v0.2.2/go.mod h1:M3b90YRnzqKyyzBEWJGqj8Qff4IDeXnzFw0P9bFw3uk=
+github.com/evstack/ev-node v1.0.0-rc.2 h1:gUQzLTkCj6D751exm/FIR/yw2aXWiW2aEREEwtxMvw0=
+github.com/evstack/ev-node v1.0.0-rc.2/go.mod h1:Qa2nN1D6PJQRU2tiarv6X5Der5OZg/+2QGY/K2mA760=
 github.com/evstack/ev-node/core v1.0.0-rc.1 h1:Dic2PMUMAYUl5JW6DkDj6HXDEWYzorVJQuuUJOV0FjE=
 github.com/evstack/ev-node/core v1.0.0-rc.1/go.mod h1:n2w/LhYQTPsi48m6lMj16YiIqsaQw6gxwjyJvR+B3sY=
+github.com/evstack/ev-node/execution/evm v1.0.0-rc.2 h1:t7os7ksmPhf2rWY2psVBowyc+iuneMDPwBGQaxSckus=
+github.com/evstack/ev-node/execution/evm v1.0.0-rc.2/go.mod h1:ahxKQfPlJ5C7g15Eq9Mjn2tQnn59T0kIm9B10zDhcTI=
 github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
 github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
diff --git a/apps/grpc/go.mod b/apps/grpc/go.mod
@@ -2,13 +2,13 @@ module github.com/evstack/ev-node/apps/grpc
 
 go 1.25.0
 
-replace (
-	github.com/evstack/ev-node => ../../
-	github.com/evstack/ev-node/execution/grpc => ../../execution/grpc
-)
+//replace (
+//	github.com/evstack/ev-node => ../../
+//	github.com/evstack/ev-node/execution/grpc => ../../execution/grpc
+//)
 
 require (
-	github.com/evstack/ev-node v1.0.0-rc.1
+	github.com/evstack/ev-node v1.0.0-rc.2
 	github.com/evstack/ev-node/core v1.0.0-rc.1
 	github.com/evstack/ev-node/execution/grpc v1.0.0-rc.1
 	github.com/ipfs/go-datastore v0.9.0
diff --git a/apps/grpc/go.sum b/apps/grpc/go.sum
@@ -365,8 +365,12 @@ github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6Ni
 github.com/envoyproxy/protoc-gen-validate v0.10.1/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss=
 github.com/envoyproxy/protoc-gen-validate v1.0.1/go.mod h1:0vj8bNkYbSTNS2PIyH87KZaeN4x9zpL9Qt8fQC7d+vs=
 github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE=
+github.com/evstack/ev-node v1.0.0-rc.2 h1:gUQzLTkCj6D751exm/FIR/yw2aXWiW2aEREEwtxMvw0=
+github.com/evstack/ev-node v1.0.0-rc.2/go.mod h1:Qa2nN1D6PJQRU2tiarv6X5Der5OZg/+2QGY/K2mA760=
 github.com/evstack/ev-node/core v1.0.0-rc.1 h1:Dic2PMUMAYUl5JW6DkDj6HXDEWYzorVJQuuUJOV0FjE=
 github.com/evstack/ev-node/core v1.0.0-rc.1/go.mod h1:n2w/LhYQTPsi48m6lMj16YiIqsaQw6gxwjyJvR+B3sY=
+github.com/evstack/ev-node/execution/grpc v1.0.0-rc.1 h1:OzrWLDDY6/9+LWx0XmUqPzxs/CHZRJICOwQ0Me/i6dY=
+github.com/evstack/ev-node/execution/grpc v1.0.0-rc.1/go.mod h1:Pr/sF6Zx8am9ZeWFcoz1jYPs0kXmf+OmL8Tz2Gyq7E4=
 github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
 github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
diff --git a/apps/testapp/go.mod b/apps/testapp/go.mod
@@ -3,7 +3,7 @@ module github.com/evstack/ev-node/apps/testapp
 go 1.25.0
 
 require (
-	github.com/evstack/ev-node v1.0.0-rc.1
+	github.com/evstack/ev-node v1.0.0-rc.2
 	github.com/evstack/ev-node/core v1.0.0-rc.1
 	github.com/ipfs/go-datastore v0.9.0
 	github.com/rs/zerolog v1.34.0
diff --git a/apps/testapp/go.sum b/apps/testapp/go.sum
@@ -365,8 +365,8 @@ github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6Ni
 github.com/envoyproxy/protoc-gen-validate v0.10.1/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss=
 github.com/envoyproxy/protoc-gen-validate v1.0.1/go.mod h1:0vj8bNkYbSTNS2PIyH87KZaeN4x9zpL9Qt8fQC7d+vs=
 github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE=
-github.com/evstack/ev-node v1.0.0-rc.1 h1:MO7DT3y1X4WK7pTgl/867NroqhXJ/oe2NbmvMr3jqq8=
-github.com/evstack/ev-node v1.0.0-rc.1/go.mod h1:JtbvY2r6k6ZhGYMeDNZk7cx6ALj3d0f6dVyyJmJHBd4=
+github.com/evstack/ev-node v1.0.0-rc.2 h1:gUQzLTkCj6D751exm/FIR/yw2aXWiW2aEREEwtxMvw0=
+github.com/evstack/ev-node v1.0.0-rc.2/go.mod h1:Qa2nN1D6PJQRU2tiarv6X5Der5OZg/+2QGY/K2mA760=
 github.com/evstack/ev-node/core v1.0.0-rc.1 h1:Dic2PMUMAYUl5JW6DkDj6HXDEWYzorVJQuuUJOV0FjE=
 github.com/evstack/ev-node/core v1.0.0-rc.1/go.mod h1:n2w/LhYQTPsi48m6lMj16YiIqsaQw6gxwjyJvR+B3sY=
 github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
diff --git a/execution/evm/eth_rpc_client.go b/execution/evm/eth_rpc_client.go
@@ -20,6 +20,8 @@ func (e *ethRPCClient) HeaderByNumber(ctx context.Context, number *big.Int) (*ty
 	return e.client.HeaderByNumber(ctx, number)
 }
 
+// GetTxs works only on custom execution clients exposing txpoolExt_getTxs.
+// Standard Ethereum nodes do not support this RPC method.
 func (e *ethRPCClient) GetTxs(ctx context.Context) ([]string, error) {
 	var result []string
 	err := e.client.Client().CallContext(ctx, &result, "txpoolExt_getTxs")
diff --git a/execution/evm/eth_rpc_tracing.go b/execution/evm/eth_rpc_tracing.go
@@ -59,6 +59,8 @@ func (t *tracedEthRPCClient) HeaderByNumber(ctx context.Context, number *big.Int
 	return result, nil
 }
 
+// GetTxs works only on custom execution clients exposing txpoolExt_getTxs.
+// Standard Ethereum nodes do not support this RPC method.
 func (t *tracedEthRPCClient) GetTxs(ctx context.Context) ([]string, error) {
 	ctx, span := t.tracer.Start(ctx, "TxPool.GetTxs",
 		trace.WithAttributes(
diff --git a/execution/evm/go.mod b/execution/evm/go.mod
@@ -4,7 +4,7 @@ go 1.25.0
 
 require (
 	github.com/ethereum/go-ethereum v1.16.8
-	github.com/evstack/ev-node v1.0.0-rc.1
+	github.com/evstack/ev-node v1.0.0-rc.2
 	github.com/evstack/ev-node/core v1.0.0-rc.1
 	github.com/golang-jwt/jwt/v5 v5.3.0
 	github.com/ipfs/go-datastore v0.9.0
diff --git a/execution/evm/go.sum b/execution/evm/go.sum
@@ -76,8 +76,8 @@ github.com/ethereum/go-ethereum v1.16.8 h1:LLLfkZWijhR5m6yrAXbdlTeXoqontH+Ga2f9i
 github.com/ethereum/go-ethereum v1.16.8/go.mod h1:Fs6QebQbavneQTYcA39PEKv2+zIjX7rPUZ14DER46wk=
 github.com/ethereum/go-verkle v0.2.2 h1:I2W0WjnrFUIzzVPwm8ykY+7pL2d4VhlsePn4j7cnFk8=
 github.com/ethereum/go-verkle v0.2.2/go.mod h1:M3b90YRnzqKyyzBEWJGqj8Qff4IDeXnzFw0P9bFw3uk=
-github.com/evstack/ev-node v1.0.0-rc.1 h1:MO7DT3y1X4WK7pTgl/867NroqhXJ/oe2NbmvMr3jqq8=
-github.com/evstack/ev-node v1.0.0-rc.1/go.mod h1:JtbvY2r6k6ZhGYMeDNZk7cx6ALj3d0f6dVyyJmJHBd4=
+github.com/evstack/ev-node v1.0.0-rc.2 h1:gUQzLTkCj6D751exm/FIR/yw2aXWiW2aEREEwtxMvw0=
+github.com/evstack/ev-node v1.0.0-rc.2/go.mod h1:Qa2nN1D6PJQRU2tiarv6X5Der5OZg/+2QGY/K2mA760=
 github.com/evstack/ev-node/core v1.0.0-rc.1 h1:Dic2PMUMAYUl5JW6DkDj6HXDEWYzorVJQuuUJOV0FjE=
 github.com/evstack/ev-node/core v1.0.0-rc.1/go.mod h1:n2w/LhYQTPsi48m6lMj16YiIqsaQw6gxwjyJvR+B3sY=
 github.com/ferranbt/fastssz v0.1.4 h1:OCDB+dYDEQDvAgtAGnTSidK1Pe2tW3nFV40XyMkTeDY=
diff --git a/execution/evm/test/go.mod b/execution/evm/test/go.mod
@@ -72,7 +72,7 @@ require (
 	github.com/emicklei/dot v1.6.2 // indirect
 	github.com/ethereum/c-kzg-4844/v2 v2.1.5 // indirect
 	github.com/ethereum/go-verkle v0.2.2 // indirect
-	github.com/evstack/ev-node v1.0.0-rc.1 // indirect
+	github.com/evstack/ev-node v1.0.0-rc.2 // indirect
 	github.com/evstack/ev-node/core v1.0.0-rc.1 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/ferranbt/fastssz v0.1.4 // indirect
diff --git a/pkg/cmd/p2p.go b/pkg/cmd/p2p.go
@@ -96,9 +96,7 @@ var NetInfoCmd = &cobra.Command{
 		// Iterate through all listen addresses
 		fmt.Fprintf(w, "📡 Listen Addrs:")
 		for i, addr := range netInfo.ListenAddresses {
-			fullAddress := fmt.Sprintf("%s/p2p/%s", addr, nodeID)
 			fmt.Fprintf(w, "   [%d] Addr: \033[1;36m%s\033[0m\n", i+1, addr)
-			fmt.Fprintf(w, "       Full: \033[1;32m%s\033[0m\n", fullAddress)
 		}
 
 		fmt.Fprintf(w, "%s\n", strings.Repeat("-", 50))
diff --git a/pkg/cmd/p2p_test.go b/pkg/cmd/p2p_test.go
@@ -46,8 +46,9 @@ func TestNetInfoCmd_Success(t *testing.T) {
 	mockP2P := new(testmocks.MockP2PRPC)
 
 	mockNodeID := "12D3KooWExampleNodeID1234567890"
-	mockListenAddr1 := "/ip4/127.0.0.1/tcp/7676"
-	mockListenAddr2 := "/ip6/::1/tcp/7677"
+	// Listen addresses include peer ID (as returned by the P2P layer)
+	mockListenAddr1 := "/ip4/127.0.0.1/tcp/7676/p2p/" + mockNodeID
+	mockListenAddr2 := "/ip6/::1/tcp/7677/p2p/" + mockNodeID
 	mockPeerID1Str := "12D3KooWJHLDoXhmgYe6FEbujPzMQJvJ9JyGwRR2VjRM4f7Udvte"
 	mockPeerAddr1Str := "/ip4/192.168.1.100/tcp/7676"
 	mockPeerID2Str := "12D3KooWJHLDoXhmgYe6FEbujPzMQJvJ9JyGwRR2VjRM4f7Udvte"
@@ -114,9 +115,7 @@ func TestNetInfoCmd_Success(t *testing.T) {
 	assert.Contains(output, fmt.Sprintf("Node ID:      \033[1;36m%s\033[0m", mockNodeID))
 	assert.Contains(output, "Listen Addrs:")
 	assert.Contains(output, fmt.Sprintf("Addr: \033[1;36m%s\033[0m", mockListenAddr1))
-	assert.Contains(output, fmt.Sprintf("Full: \033[1;32m%s/p2p/%s\033[0m", mockListenAddr1, mockNodeID))
 	assert.Contains(output, fmt.Sprintf("Addr: \033[1;36m%s\033[0m", mockListenAddr2))
-	assert.Contains(output, fmt.Sprintf("Full: \033[1;32m%s/p2p/%s\033[0m", mockListenAddr2, mockNodeID))
 
 	assert.Contains(output, "CONNECTED PEERS: \033[1;33m2\033[0m")
 	assert.Contains(output, "PEER ID")
@@ -140,8 +139,9 @@ func TestNetInfoCmd_NoPeers(t *testing.T) {
 	mockP2P := new(testmocks.MockP2PRPC)
 
 	mockNodeID := "12D3KooWExampleNodeID1234567890"
-	mockListenAddr1 := "/ip4/127.0.0.1/tcp/7676"
-	mockListenAddr2 := "/ip6/::1/tcp/7677"
+	// Listen addresses include peer ID (as returned by the P2P layer)
+	mockListenAddr1 := "/ip4/127.0.0.1/tcp/7676/p2p/" + mockNodeID
+	mockListenAddr2 := "/ip6/::1/tcp/7677/p2p/" + mockNodeID
 
 	mockNetInfo := p2p.NetworkInfo{
 		ID:            mockNodeID,
@@ -192,9 +192,7 @@ func TestNetInfoCmd_NoPeers(t *testing.T) {
 	assert.Contains(output, fmt.Sprintf("Node ID:      \033[1;36m%s\033[0m", mockNodeID))
 	assert.Contains(output, "Listen Addrs:")
 	assert.Contains(output, fmt.Sprintf("Addr: \033[1;36m%s\033[0m", mockListenAddr1))
-	assert.Contains(output, fmt.Sprintf("Full: \033[1;32m%s/p2p/%s\033[0m", mockListenAddr1, mockNodeID))
 	assert.Contains(output, fmt.Sprintf("Addr: \033[1;36m%s\033[0m", mockListenAddr2))
-	assert.Contains(output, fmt.Sprintf("Full: \033[1;32m%s/p2p/%s\033[0m", mockListenAddr2, mockNodeID))
 
 	assert.Contains(output, "CONNECTED PEERS: \033[1;33m0\033[0m")
 	assert.Contains(output, "No peers connected")
diff --git a/pkg/p2p/client.go b/pkg/p2p/client.go
@@ -410,8 +410,13 @@ func (c *Client) GetPeers() ([]peer.AddrInfo, error) {
 
 func (c *Client) GetNetworkInfo() (NetworkInfo, error) {
 	var addrs []string
+	peerIDSuffix := "/p2p/" + c.host.ID().String()
 	for _, a := range c.host.Addrs() {
-		addr := fmt.Sprintf("%s/p2p/%s", a, c.host.ID())
+		addr := a.String()
+		// Only append peer ID if not already present
+		if !strings.HasSuffix(addr, peerIDSuffix) {
+			addr = addr + peerIDSuffix
+		}
 		addrs = append(addrs, addr)
 	}
 
diff --git a/scripts/run-evm-nodes.go b/scripts/run-evm-nodes.go
@@ -608,7 +608,7 @@ func isProjectRoot(dir string) bool {
 	markers := []string{
 		"apps/evm",
 		"execution/evm",
-		"da",
+		"block",
 		"scripts",
 		"go.mod",
 	}
diff --git a/scripts/run.go b/scripts/run.go
@@ -12,6 +12,7 @@ import (
 	"os/exec"
 	"os/signal"
 	"path/filepath"
+	"regexp"
 	"strings"
 	"syscall"
 	"time"
@@ -275,17 +276,14 @@ func main() {
 			lines := strings.Split(nodeInfoStr, "\n")
 
 			for _, line := range lines {
-				if strings.Contains(line, "Full:") {
-					// Extract the address part (after the color code)
-					parts := strings.Split(line, "Full:")
-					if len(parts) >= 2 {
-						// Clean up ANSI color codes and whitespace
-						cleanAddr := strings.TrimSpace(parts[1])
-						// Remove potential ANSI color codes
-						cleanAddr = strings.TrimPrefix(cleanAddr, "\033[1;32m")
-						cleanAddr = strings.TrimSuffix(cleanAddr, "\033[0m")
-						cleanAddr = strings.TrimSpace(cleanAddr)
-						aggregatorAddress = cleanAddr
+				if strings.Contains(line, "Addr:") && strings.Contains(line, "/p2p/") {
+					addrIdx := strings.Index(line, "Addr:")
+					if addrIdx == -1 {
+						continue
+					}
+					addrPart := strings.TrimSpace(line[addrIdx+5:])
+					if strings.Contains(addrPart, "/ip4/") && strings.Contains(addrPart, "/tcp/") {
+						aggregatorAddress = stripANSI(addrPart)
 						break
 					}
 				}
@@ -366,7 +364,7 @@ func findProjectRoot() (string, error) {
 func isProjectRoot(dir string) bool {
 	// Check for key directories/files that would indicate the project root
 	markers := []string{
-		"da",
+		"block",
 		"apps",
 		"scripts",
 		"go.mod",
@@ -379,3 +377,9 @@ func isProjectRoot(dir string) bool {
 	}
 	return true
 }
+
+// stripANSI removes ANSI escape sequences from a string.
+func stripANSI(str string) string {
+	ansiRegex := regexp.MustCompile(`\x1b\[[0-9;]*m`)
+	return ansiRegex.ReplaceAllString(str, "")
+}
diff --git a/test/e2e/go.mod b/test/e2e/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/cosmos/cosmos-sdk v0.53.5
 	github.com/cosmos/ibc-go/v8 v8.8.0
 	github.com/ethereum/go-ethereum v1.16.8
-	github.com/evstack/ev-node v1.0.0-rc.1
+	github.com/evstack/ev-node v1.0.0-rc.2
 	github.com/evstack/ev-node/execution/evm v0.0.0-20250602130019-2a732cf903a5
 	github.com/evstack/ev-node/execution/evm/test v0.0.0-00010101000000-000000000000
 	github.com/libp2p/go-libp2p v0.46.0

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@ func (e ethRPCClient) HeaderByNumber(ctx context.Context, number big.Int) (*ty`
`20`	`20`	`return e.client.HeaderByNumber(ctx, number)`
`21`	`21`	`}`
`22`	`22`
	`23`	`+// GetTxs works only on custom execution clients exposing txpoolExt_getTxs.`
	`24`	`+// Standard Ethereum nodes do not support this RPC method.`
`23`	`25`	`func (e *ethRPCClient) GetTxs(ctx context.Context) ([]string, error) {`
`24`	`26`	`var result []string`
`25`	`27`	`err := e.client.Client().CallContext(ctx, &result, "txpoolExt_getTxs")`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,8 @@ func (t tracedEthRPCClient) HeaderByNumber(ctx context.Context, number big.Int`
`59`	`59`	`return result, nil`
`60`	`60`	`}`
`61`	`61`
	`62`	`+// GetTxs works only on custom execution clients exposing txpoolExt_getTxs.`
	`63`	`+// Standard Ethereum nodes do not support this RPC method.`
`62`	`64`	`func (t *tracedEthRPCClient) GetTxs(ctx context.Context) ([]string, error) {`
`63`	`65`	`ctx, span := t.tracer.Start(ctx, "TxPool.GetTxs",`
`64`	`66`	`trace.WithAttributes(`