chore: remove double p2p setting (#3041)

remove next info

Author: tac0turtle

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))

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")

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)
 	}
 

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",
 	}

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, "")
+}