Use default peers during local development

The change keeps default peers in local dev mode instead of clearing
them, while adding a global pubsub logger and updating bootstrap peer
config.
This commit is contained in:
anonpenguin 2025-08-12 08:04:58 +03:00
parent d08626856f
commit dfd1862cfd
3 changed files with 67 additions and 54 deletions

View File

@ -136,22 +136,22 @@ type ClientConfig struct {
// DefaultClientConfig returns a default client configuration // DefaultClientConfig returns a default client configuration
func DefaultClientConfig(appName string) *ClientConfig { func DefaultClientConfig(appName string) *ClientConfig {
// Base defaults // Base defaults
peers := []string{} peers := DefaultBootstrapPeers()
endpoints := DefaultDatabaseEndpoints() endpoints := DefaultDatabaseEndpoints()
// Development local-only override via env // Development local-only override via env
if isTruthyEnv("NETWORK_DEV_LOCAL") { if isTruthyEnv("NETWORK_DEV_LOCAL") {
port := 5001 port := 5001
if v := os.Getenv("RQLITE_PORT"); v != "" { if v := os.Getenv("RQLITE_PORT"); v != "" {
if n, err := strconv.Atoi(v); err == nil && n > 0 { port = n } if n, err := strconv.Atoi(v); err == nil && n > 0 {
port = n
}
} }
endpoints = []string{fmt.Sprintf("http://127.0.0.1:%d", port)} endpoints = []string{fmt.Sprintf("http://127.0.0.1:%d", port)}
if ma := os.Getenv("LOCAL_BOOTSTRAP_MULTIADDR"); ma != "" { if ma := os.Getenv("LOCAL_BOOTSTRAP_MULTIADDR"); ma != "" {
peers = []string{ma} peers = []string{ma}
} else {
// Leave peers empty if no local bootstrap multiaddr provided
peers = []string{}
} }
// else: keep the peers from DefaultBootstrapPeers() which handles NETWORK_DEV_LOCAL appropriately
} }
return &ClientConfig{ return &ClientConfig{

View File

@ -33,12 +33,14 @@ func init() {
func setDefaultBootstrapConfig() { func setDefaultBootstrapConfig() {
// Check if we're in production environment // Check if we're in production environment
BootstrapPeerIDs = []string{ BootstrapPeerIDs = []string{
"12D3KooWNxt9bNvqftdqXg98JcUHreGxedWSZRUbyqXJ6CW7GaD4", // "12D3KooWNxt9bNvqftdqXg98JcUHreGxedWSZRUbyqXJ6CW7GaD4",
"12D3KooWGbdnA22bN24X2gyY1o9jozwTBq9wbfvwtJ7G4XQ9JgFm", // "12D3KooWGbdnA22bN24X2gyY1o9jozwTBq9wbfvwtJ7G4XQ9JgFm",
"12D3KooWDL6LSjwwP5FwboV9JaTZzuxr8EhjbcZGFfnyFMDt1UDx",
} }
BootstrapAddresses = []string{ BootstrapAddresses = []string{
"/ip4/57.129.81.31/tcp/4001/p2p/12D3KooWNxt9bNvqftdqXg98JcUHreGxedWSZRUbyqXJ6CW7GaD4", // "/ip4/57.129.81.31/tcp/4001/p2p/12D3KooWNxt9bNvqftdqXg98JcUHreGxedWSZRUbyqXJ6CW7GaD4",
"/ip4/38.242.250.186/tcp/4001/p2p/12D3KooWGbdnA22bN24X2gyY1o9jozwTBq9wbfvwtJ7G4XQ9JgFm", // "/ip4/38.242.250.186/tcp/4001/p2p/12D3KooWGbdnA22bN24X2gyY1o9jozwTBq9wbfvwtJ7G4XQ9JgFm",
"/ip4/127.0.0.1/tcp/4001/p2p/12D3KooWDL6LSjwwP5FwboV9JaTZzuxr8EhjbcZGFfnyFMDt1UDx",
} }
BootstrapPort = 4001 BootstrapPort = 4001

View File

@ -1,6 +1,17 @@
package pubsub package pubsub
import "go.uber.org/zap" import (
"fmt"
"go.uber.org/zap"
)
// Logf is a package-level logger function used by pubsub internals.
// By default it is a no-op to avoid polluting stdout; applications can
// assign it (e.g., to a UI-backed logger) to surface logs as needed.
var Logf = func(format string, args ...interface{}) { _ = fmt.Sprintf(format, args...) }
// SetLogFunc allows applications to provide a custom logger sink.
func SetLogFunc(f func(string, ...interface{})) { if f != nil { Logf = f } }
// newPubSubLogger creates a zap.Logger for pubsub components. // newPubSubLogger creates a zap.Logger for pubsub components.
// Quiet mode can be handled by callers by using production config externally; // Quiet mode can be handled by callers by using production config externally;