feat: clean up p2p & implement missing peering functionality

.github/golangci.yml

@@ -79,6 +79,7 @@ issues:
         - gosec # Disabled linting of weak number generators
         - makezero # Disabled linting of intentional slice appends
         - goconst # Disabled linting of common mnemonics and test case strings
+        - unused # Disabled linting of unused mock methods
     - path: _\.gno
       linters:
         - errorlint # Disabled linting of error comparisons, because of lacking std lib support

contribs/gnodev/go.mod

@@ -80,6 +80,7 @@ require (
 	github.com/rogpeppe/go-internal v1.12.0 // indirect
 	github.com/rs/cors v1.11.1 // indirect
 	github.com/rs/xid v1.6.0 // indirect
+	github.com/sig-0/insertion-queue v0.0.0-20241004125609-6b3ca841346b // indirect
 	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
 	github.com/yuin/goldmark v1.5.4 // indirect

contribs/gnofaucet/go.mod

@@ -32,6 +32,7 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rs/cors v1.11.1 // indirect
 	github.com/rs/xid v1.6.0 // indirect
+	github.com/sig-0/insertion-queue v0.0.0-20241004125609-6b3ca841346b // indirect
 	go.opentelemetry.io/otel v1.29.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.29.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.29.0 // indirect

contribs/gnogenesis/go.mod

@@ -33,6 +33,7 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rs/cors v1.11.1 // indirect
 	github.com/rs/xid v1.6.0 // indirect
+	github.com/sig-0/insertion-queue v0.0.0-20241004125609-6b3ca841346b // indirect
 	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
 	github.com/zondax/hid v0.9.2 // indirect
 	github.com/zondax/ledger-go v0.14.3 // indirect
@@ -50,6 +51,7 @@ require (
 	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
 	golang.org/x/mod v0.20.0 // indirect
 	golang.org/x/net v0.28.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
 	golang.org/x/sys v0.24.0 // indirect
 	golang.org/x/term v0.23.0 // indirect
 	golang.org/x/text v0.17.0 // indirect

contribs/gnokeykc/go.mod

@@ -36,6 +36,7 @@ require (
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rs/xid v1.6.0 // indirect
+	github.com/sig-0/insertion-queue v0.0.0-20241004125609-6b3ca841346b // indirect
 	github.com/stretchr/testify v1.9.0 // indirect
 	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
 	github.com/zondax/hid v0.9.2 // indirect
@@ -53,6 +54,7 @@ require (
 	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
 	golang.org/x/mod v0.20.0 // indirect
 	golang.org/x/net v0.28.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
 	golang.org/x/sys v0.24.0 // indirect
 	golang.org/x/term v0.23.0 // indirect
 	golang.org/x/text v0.17.0 // indirect

contribs/gnomigrate/go.mod

@@ -30,6 +30,7 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rs/cors v1.11.1 // indirect
 	github.com/rs/xid v1.6.0 // indirect
+	github.com/sig-0/insertion-queue v0.0.0-20241004125609-6b3ca841346b // indirect
 	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
 	go.etcd.io/bbolt v1.3.11 // indirect
 	go.opentelemetry.io/otel v1.29.0 // indirect
@@ -45,6 +46,7 @@ require (
 	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
 	golang.org/x/mod v0.20.0 // indirect
 	golang.org/x/net v0.28.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
 	golang.org/x/sys v0.24.0 // indirect
 	golang.org/x/term v0.23.0 // indirect
 	golang.org/x/text v0.17.0 // indirect

gno.land/cmd/gnoland/config_get_test.go

@@ -289,14 +289,6 @@ func TestConfig_Get_Base(t *testing.T) {
 			},
 			true,
 		},
-		{
-			"filter peers flag fetched",
-			"filter_peers",
-			func(loadedCfg *config.Config, value []byte) {
-				assert.Equal(t, loadedCfg.FilterPeers, unmarshalJSONCommon[bool](t, value))
-			},
-			false,
-		},
 	}
 
 	verifyGetTestTableCommon(t, testTable)
@@ -616,27 +608,19 @@ func TestConfig_Get_P2P(t *testing.T) {
 			},
 			true,
 		},
-		{
-			"upnp toggle",
-			"p2p.upnp",
-			func(loadedCfg *config.Config, value []byte) {
-				assert.Equal(t, loadedCfg.P2P.UPNP, unmarshalJSONCommon[bool](t, value))
-			},
-			false,
-		},
 		{
 			"max inbound peers",
 			"p2p.max_num_inbound_peers",
 			func(loadedCfg *config.Config, value []byte) {
-				assert.Equal(t, loadedCfg.P2P.MaxNumInboundPeers, unmarshalJSONCommon[int](t, value))
+				assert.Equal(t, loadedCfg.P2P.MaxNumInboundPeers, unmarshalJSONCommon[uint64](t, value))
 			},
 			false,
 		},
 		{
 			"max outbound peers",
 			"p2p.max_num_outbound_peers",
 			func(loadedCfg *config.Config, value []byte) {
-				assert.Equal(t, loadedCfg.P2P.MaxNumOutboundPeers, unmarshalJSONCommon[int](t, value))
+				assert.Equal(t, loadedCfg.P2P.MaxNumOutboundPeers, unmarshalJSONCommon[uint64](t, value))
 			},
 			false,
 		},
@@ -676,15 +660,7 @@ func TestConfig_Get_P2P(t *testing.T) {
 			"pex reactor toggle",
 			"p2p.pex",
 			func(loadedCfg *config.Config, value []byte) {
-				assert.Equal(t, loadedCfg.P2P.PexReactor, unmarshalJSONCommon[bool](t, value))
-			},
-			false,
-		},
-		{
-			"seed mode",
-			"p2p.seed_mode",
-			func(loadedCfg *config.Config, value []byte) {
-				assert.Equal(t, loadedCfg.P2P.SeedMode, unmarshalJSONCommon[bool](t, value))
+				assert.Equal(t, loadedCfg.P2P.PeerExchange, unmarshalJSONCommon[bool](t, value))
 			},
 			false,
 		},
@@ -704,30 +680,6 @@ func TestConfig_Get_P2P(t *testing.T) {
 			},
 			true,
 		},
-		{
-			"allow duplicate IP",
-			"p2p.allow_duplicate_ip",
-			func(loadedCfg *config.Config, value []byte) {
-				assert.Equal(t, loadedCfg.P2P.AllowDuplicateIP, unmarshalJSONCommon[bool](t, value))
-			},
-			false,
-		},
-		{
-			"handshake timeout",
-			"p2p.handshake_timeout",
-			func(loadedCfg *config.Config, value []byte) {
-				assert.Equal(t, loadedCfg.P2P.HandshakeTimeout, unmarshalJSONCommon[time.Duration](t, value))
-			},
-			false,
-		},
-		{
-			"dial timeout",
-			"p2p.dial_timeout",
-			func(loadedCfg *config.Config, value []byte) {
-				assert.Equal(t, loadedCfg.P2P.DialTimeout, unmarshalJSONCommon[time.Duration](t, value))
-			},
-			false,
-		},
 	}
 
 	verifyGetTestTableCommon(t, testTable)

gno.land/cmd/gnoland/config_set_test.go

@@ -244,19 +244,6 @@ func TestConfig_Set_Base(t *testing.T) {
 				assert.Equal(t, value, loadedCfg.ProfListenAddress)
 			},
 		},
-		{
-			"filter peers flag updated",
-			[]string{
-				"filter_peers",
-				"true",
-			},
-			func(loadedCfg *config.Config, value string) {
-				boolVal, err := strconv.ParseBool(value)
-				require.NoError(t, err)
-
-				assert.Equal(t, boolVal, loadedCfg.FilterPeers)
-			},
-		},
 	}
 
 	verifySetTestTableCommon(t, testTable)
@@ -505,19 +492,6 @@ func TestConfig_Set_P2P(t *testing.T) {
 				assert.Equal(t, value, loadedCfg.P2P.PersistentPeers)
 			},
 		},
-		{
-			"upnp toggle updated",
-			[]string{
-				"p2p.upnp",
-				"false",
-			},
-			func(loadedCfg *config.Config, value string) {
-				boolVal, err := strconv.ParseBool(value)
-				require.NoError(t, err)
-
-				assert.Equal(t, boolVal, loadedCfg.P2P.UPNP)
-			},
-		},
 		{
 			"max inbound peers updated",
 			[]string{
@@ -588,20 +562,7 @@ func TestConfig_Set_P2P(t *testing.T) {
 				boolVal, err := strconv.ParseBool(value)
 				require.NoError(t, err)
 
-				assert.Equal(t, boolVal, loadedCfg.P2P.PexReactor)
-			},
-		},
-		{
-			"seed mode updated",
-			[]string{
-				"p2p.seed_mode",
-				"false",
-			},
-			func(loadedCfg *config.Config, value string) {
-				boolVal, err := strconv.ParseBool(value)
-				require.NoError(t, err)
-
-				assert.Equal(t, boolVal, loadedCfg.P2P.SeedMode)
+				assert.Equal(t, boolVal, loadedCfg.P2P.PeerExchange)
 			},
 		},
 		{
@@ -614,39 +575,6 @@ func TestConfig_Set_P2P(t *testing.T) {
 				assert.Equal(t, value, loadedCfg.P2P.PrivatePeerIDs)
 			},
 		},
-		{
-			"allow duplicate IPs updated",
-			[]string{
-				"p2p.allow_duplicate_ip",
-				"false",
-			},
-			func(loadedCfg *config.Config, value string) {
-				boolVal, err := strconv.ParseBool(value)
-				require.NoError(t, err)
-
-				assert.Equal(t, boolVal, loadedCfg.P2P.AllowDuplicateIP)
-			},
-		},
-		{
-			"handshake timeout updated",
-			[]string{
-				"p2p.handshake_timeout",
-				"1s",
-			},
-			func(loadedCfg *config.Config, value string) {
-				assert.Equal(t, value, loadedCfg.P2P.HandshakeTimeout.String())
-			},
-		},
-		{
-			"dial timeout updated",
-			[]string{
-				"p2p.dial_timeout",
-				"1s",
-			},
-			func(loadedCfg *config.Config, value string) {
-				assert.Equal(t, value, loadedCfg.P2P.DialTimeout.String())
-			},
-		},
 	}
 
 	verifySetTestTableCommon(t, testTable)

gno.land/cmd/gnoland/secrets_common.go

@@ -8,7 +8,7 @@ import (
 	"github.com/gnolang/gno/tm2/pkg/amino"
 	"github.com/gnolang/gno/tm2/pkg/bft/privval"
 	"github.com/gnolang/gno/tm2/pkg/crypto"
-	"github.com/gnolang/gno/tm2/pkg/p2p"
+	"github.com/gnolang/gno/tm2/pkg/p2p/types"
 )
 
 var (
@@ -54,7 +54,7 @@ func isValidDirectory(dirPath string) bool {
 }
 
 type secretData interface {
-	privval.FilePVKey | privval.FilePVLastSignState | p2p.NodeKey
+	privval.FilePVKey | privval.FilePVLastSignState | types.NodeKey
 }
 
 // readSecretData reads the secret data from the given path
@@ -145,7 +145,7 @@ func validateValidatorStateSignature(
 }
 
 // validateNodeKey validates the node's p2p key
-func validateNodeKey(key *p2p.NodeKey) error {
+func validateNodeKey(key *types.NodeKey) error {
 	if key.PrivKey == nil {
 		return errInvalidNodeKey
 	}

gno.land/cmd/gnoland/secrets_common_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/gnolang/gno/tm2/pkg/crypto"
-	"github.com/gnolang/gno/tm2/pkg/p2p"
+	"github.com/gnolang/gno/tm2/pkg/p2p/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -26,7 +26,7 @@ func TestCommon_SaveReadData(t *testing.T) {
 	t.Run("invalid data read path", func(t *testing.T) {
 		t.Parallel()
 
-		readData, err := readSecretData[p2p.NodeKey]("")
+		readData, err := readSecretData[types.NodeKey]("")
 		assert.Nil(t, readData)
 
 		assert.ErrorContains(
@@ -44,7 +44,7 @@ func TestCommon_SaveReadData(t *testing.T) {
 
 		require.NoError(t, saveSecretData("totally valid key", path))
 
-		readData, err := readSecretData[p2p.NodeKey](path)
+		readData, err := readSecretData[types.NodeKey](path)
 		require.Nil(t, readData)
 
 		assert.ErrorContains(t, err, "unable to unmarshal data")
@@ -59,7 +59,7 @@ func TestCommon_SaveReadData(t *testing.T) {
 
 		require.NoError(t, saveSecretData(key, path))
 
-		readKey, err := readSecretData[p2p.NodeKey](path)
+		readKey, err := readSecretData[types.NodeKey](path)
 		require.NoError(t, err)
 
 		assert.Equal(t, key, readKey)