Sync master

.github/workflows/ci.yml

@@ -28,6 +28,10 @@ jobs:
           - '.github/workflows/**'
           - 'Makefile'
           - 'libs/**'
+          - 'go.mod'
+          - 'go.sum'
+          - 'flake.nix'
+          - 'examples/**'
 
           v2:
           - 'waku/**'
@@ -37,6 +41,7 @@ jobs:
 
           docker:
           - 'docker/**'
+          - 'Dockerfile'
 
     outputs:
       common: ${{ steps.filter.outputs.common }}
@@ -161,8 +166,3 @@ jobs:
         run: |
           docker compose -f .github/docker-compose/ganache.yml up -d
           make test-onchain${{ matrix.tests == 'test-with-race' && '-with-race' || '' }}
-
-      - name: "Run tests with postgres"
-        run: |
-          docker compose -f .github/docker-compose/postgres.yml up -d
-          make test-postgres${{ matrix.tests == 'test-with-race' && '-with-race' || '' }}

.gitignore

@@ -26,8 +26,8 @@ pkg/*
 
 # output binaries
 go-waku
-examples/basic2/basic2
-examples/filter2/filter2
+examples/basic-relay/build/basic-relay
+examples/filter2/build/filter2
 examples/noise/build/
 examples/noise/noise
 

.gitmodules

@@ -3,4 +3,4 @@
 	url = https://github.com/waku-org/waku-rln-contract.git
 [submodule "waku/v2/protocol/waku-proto"]
 	path = waku/v2/protocol/waku-proto
-	url = git@github.com:waku-org/waku-proto.git
+	url = https://github.com/waku-org/waku-proto

Makefile

@@ -112,8 +112,8 @@ docker-image:
 	docker build --tag $(DOCKER_IMAGE_NAME) \
 		--build-arg="GIT_COMMIT=$(shell git rev-parse HEAD)" .
 
-build-example-basic2:
-	cd examples/basic2 && $(MAKE)
+build-example-basic-relay:
+	cd examples/basic-relay && $(MAKE)
 
 build-example-chat-2:
 	cd examples/chat2 && $(MAKE)
@@ -130,7 +130,7 @@ build-example-noise:
 build-example-rln:
 	cd examples/rln && $(MAKE)
 
-build-example: build-example-basic2 build-example-chat-2 build-example-filter2 build-example-c-bindings build-example-noise build-example-rln
+build-example: build-example-basic-relay build-example-chat-2 build-example-filter2 build-example-c-bindings build-example-noise build-example-rln
 
 static-library:
 	@echo "Building static library..."

README.md

@@ -40,7 +40,7 @@ nix develop
 docker run -i -t -p 60000:60000 -p 9000:9000/udp \
   wakuorg/go-waku:latest \ 
     --dns-discovery \
-    --dns-discovery-url enrtree://ANEDLO25QVUGJOUTQFRYKWX6P4Z4GKVESBMHML7DZ6YK4LGS5FC5O@prod.wakuv2.nodes.status.im \
+    --dns-discovery-url enrtree://AIRVQ5DDA4FFWLRBCHJWUWOO6X6S4ZTZ5B667LQ6AJU6PEYDLRD5O@sandbox.waku.nodes.status.im \
     --discv5-discovery
 ```
 or use the [image:tag](https://hub.docker.com/r/wakuorg/go-waku/tags) of your choice.

ci/Jenkinsfile.docker

@@ -66,55 +66,10 @@ pipeline {
     }
   }
   post {
-    success { script {
-      discordNotify(
-        header: 'Go-Waku build successful!',
-        cred: 'discord-waku-deployments-webhook',
-      )
-    } }
     always { cleanWs() }
   }
 }
 
-def discordNotify(Map args=[:]) {
-  def opts = [
-    header: args.header ?: 'Deployment successful!',
-    cred: args.cred ?: null,
-  ]
-  def repo = [
-    url: GIT_URL.minus('.git'),
-    branch: GIT_BRANCH.minus('origin/'),
-    commit: GIT_COMMIT.take(8),
-    prev: (
-      env.GIT_PREVIOUS_SUCCESSFUL_COMMIT ?: env.GIT_PREVIOUS_COMMIT ?: 'master'
-    ).take(8),
-  ]
-  wrap([$class: 'BuildUser']) {
-    BUILD_USER_ID = env.BUILD_USER_ID
-  }
-  withCredentials([
-    string(
-      credentialsId: opts.cred,
-      variable: 'DISCORD_WEBHOOK',
-    ),
-  ]) {
-    discordSend(
-      link: env.BUILD_URL,
-      result: currentBuild.currentResult,
-      webhookURL: env.DISCORD_WEBHOOK,
-      title: "${env.JOB_NAME}#${env.BUILD_NUMBER}",
-      description: """
-        ${opts.header}
-        Image: [`${IMAGE_NAME}:${IMAGE_TAG}`](https://hub.docker.com/r/${IMAGE_NAME}/tags?name=${IMAGE_TAG})
-        Branch: [`${repo.branch}`](${repo.url}/commits/${repo.branch})
-        Commit: [`${repo.commit}`](${repo.url}/commit/${repo.commit})
-        Diff: [`${repo.prev}...${repo.commit}`](${repo.url}/compare/${repo.prev}...${repo.commit})
-        By: [`${BUILD_USER_ID}`](${repo.url}/commits?author=${BUILD_USER_ID})
-      """,
-    )
-  }
-}
-
 def getDefaultImageTag(currentValue) {
   switch (env.JOB_BASE_NAME) {
     case 'docker-latest':  return 'latest'

ci/Jenkinsfile.nix-flake

@@ -2,7 +2,7 @@ library '[email protected]'
 
 pipeline {
   agent {
-    label 'linux && nix-2.14 && x86_64'
+    label 'linux && nix-2.19 && x86_64'
   }
 
   options {

cmd/waku/flags.go

@@ -6,6 +6,7 @@ import (
 	cli "github.com/urfave/cli/v2"
 	"github.com/urfave/cli/v2/altsrc"
 	"github.com/waku-org/go-waku/waku/cliutils"
+	"github.com/waku-org/go-waku/waku/v2/node"
 )
 
 var (
@@ -234,11 +235,18 @@ var (
 	})
 	AgentString = altsrc.NewStringFlag(&cli.StringFlag{
 		Name:        "agent-string",
-		Value:       "go-waku",
+		Value:       node.UserAgent,
 		Usage:       "client id to advertise",
 		Destination: &options.UserAgent,
 		EnvVars:     []string{"WAKUNODE2_AGENT_STRING"},
 	})
+	IPColocationLimit = altsrc.NewIntFlag(&cli.IntFlag{
+		Name:        "ip-colocation-limit",
+		Value:       node.DefaultMaxConnectionsPerIP,
+		Usage:       "max number of allowed peers from the same IP. Set it to 0 to remove the limitation.",
+		Destination: &options.IPColocationLimit,
+		EnvVars:     []string{"WAKUNODE2_IP_COLOCATION_LIMIT"},
+	})
 	Relay = altsrc.NewBoolFlag(&cli.BoolFlag{
 		Name:        "relay",
 		Value:       true,
@@ -264,15 +272,6 @@ var (
 		Destination: &options.Relay.ContentTopics,
 		EnvVars:     []string{"WAKUNODE2_CONTENT_TOPICS"},
 	})
-	BridgeTopics = altsrc.NewGenericFlag(&cli.GenericFlag{
-		Name:    "bridge-topics",
-		Usage:   "Bridge two pubsub topics, from_topic:to_topic. Argument may be repeated.",
-		EnvVars: []string{"WAKUNODE2_BRIDGE_TOPIC"},
-		Value: &cliutils.BridgeTopicSlice{
-			Values: &options.Relay.BridgeTopics,
-		},
-		Hidden: true,
-	})
 	ProtectedTopics = cliutils.NewGenericFlagMultiValue(&cli.GenericFlag{
 		Name:    "protected-topic",
 		Usage:   "Topics and its public key to be used for message validation, topic:pubkey. Argument may be repeated.",
@@ -295,6 +294,13 @@ var (
 		Destination: &options.Relay.MinRelayPeersToPublish,
 		EnvVars:     []string{"WAKUNODE2_MIN_RELAY_PEERS_TO_PUBLISH"},
 	})
+	MaxRelayMsgSize = altsrc.NewStringFlag(&cli.StringFlag{
+		Name:        "max-msg-size",
+		Value:       "150KB",
+		Usage:       "Maximum message size. Supported formats are B, KiB, KB, MiB. If no suffix, default is bytes",
+		Destination: &options.Relay.MaxMsgSize,
+		EnvVars:     []string{"WAKUNODE2_MAX_RELAY_MSG_SIZE"},
+	})
 	StoreNodeFlag = cliutils.NewGenericFlagMultiValue(&cli.GenericFlag{
 		Name:  "storenode",
 		Usage: "Multiaddr of a peer that supports store protocol. Option may be repeated",
@@ -358,26 +364,6 @@ var (
 		Destination: &options.Filter.Timeout,
 		EnvVars:     []string{"WAKUNODE2_FILTER_TIMEOUT"},
 	})
-	FilterLegacyFlag = altsrc.NewBoolFlag(&cli.BoolFlag{
-		Name:        "legacy-filter",
-		Usage:       "Use filter protocol (legacy)",
-		Destination: &options.Filter.UseV1,
-		EnvVars:     []string{"WAKUNODE2_USE_LEGACY_FILTER"},
-	})
-	FilterLegacyLightClient = altsrc.NewBoolFlag(&cli.BoolFlag{
-		Name:        "legacy-filter-light-client",
-		Usage:       "Don't accept legacy filter subscribers",
-		Destination: &options.Filter.DisableFullNode,
-		EnvVars:     []string{"WAKUNODE2_LEGACY_FILTER_LIGHT_CLIENT"},
-	})
-	FilterLegacyNode = cliutils.NewGenericFlagMultiValue(&cli.GenericFlag{
-		Name:  "legacy-filternode",
-		Usage: "Multiaddr of a peer that supports legacy filter protocol. Option may be repeated",
-		Value: &cliutils.MultiaddrSlice{
-			Values: &options.Filter.NodesV1,
-		},
-		EnvVars: []string{"WAKUNODE2_LEGACY_FILTERNODE"},
-	})
 	LightPush = altsrc.NewBoolFlag(&cli.BoolFlag{
 		Name:        "lightpush",
 		Usage:       "Enable lightpush protocol",
@@ -493,40 +479,6 @@ var (
 		Destination: &options.Metrics.Port,
 		EnvVars:     []string{"WAKUNODE2_METRICS_SERVER_PORT"},
 	})
-	RPCFlag = altsrc.NewBoolFlag(&cli.BoolFlag{
-		Name:        "rpc",
-		Usage:       "Enable the rpc server",
-		Destination: &options.RPCServer.Enable,
-		EnvVars:     []string{"WAKUNODE2_RPC"},
-	})
-	RPCPort = altsrc.NewIntFlag(&cli.IntFlag{
-		Name:        "rpc-port",
-		Value:       8545,
-		Usage:       "Listening port of the rpc server",
-		Destination: &options.RPCServer.Port,
-		EnvVars:     []string{"WAKUNODE2_RPC_PORT"},
-	})
-	RPCAddress = altsrc.NewStringFlag(&cli.StringFlag{
-		Name:        "rpc-address",
-		Value:       "127.0.0.1",
-		Usage:       "Listening address of the rpc server",
-		Destination: &options.RPCServer.Address,
-		EnvVars:     []string{"WAKUNODE2_RPC_ADDRESS"},
-	})
-	RPCRelayCacheCapacity = altsrc.NewIntFlag(&cli.IntFlag{
-		Name:        "rpc-relay-cache-capacity",
-		Value:       30,
-		Usage:       "Capacity of the Relay REST API message cache",
-		Destination: &options.RPCServer.RelayCacheCapacity,
-		EnvVars:     []string{"WAKUNODE2_RPC_RELAY_CACHE_CAPACITY"},
-	})
-	RPCAdmin = altsrc.NewBoolFlag(&cli.BoolFlag{
-		Name:        "rpc-admin",
-		Value:       false,
-		Usage:       "Enable access to JSON-RPC Admin API",
-		Destination: &options.RPCServer.Admin,
-		EnvVars:     []string{"WAKUNODE2_RPC_ADMIN"},
-	})
 	RESTFlag = altsrc.NewBoolFlag(&cli.BoolFlag{
 		Name:        "rest",
 		Usage:       "Enable Waku REST HTTP server",

cmd/waku/main.go

@@ -48,6 +48,7 @@ func main() {
 		ForceReachability,
 		ResourceScalingMemoryPercent,
 		ResourceScalingFDPercent,
+		IPColocationLimit,
 		LogLevel,
 		LogEncoding,
 		LogOutput,
@@ -56,10 +57,10 @@ func main() {
 		Topics,
 		ContentTopics,
 		PubSubTopics,
-		BridgeTopics,
 		ProtectedTopics,
 		RelayPeerExchange,
 		MinRelayPeersToPublish,
+		MaxRelayMsgSize,
 		StoreNodeFlag,
 		StoreFlag,
 		StoreMessageDBURL,
@@ -69,9 +70,6 @@ func main() {
 		FilterFlag,
 		FilterNode,
 		FilterTimeout,
-		FilterLegacyFlag,
-		FilterLegacyNode,
-		FilterLegacyLightClient,
 		LightPush,
 		LightPushNode,
 		Discv5Discovery,
@@ -89,11 +87,6 @@ func main() {
 		MetricsServer,
 		MetricsServerAddress,
 		MetricsServerPort,
-		RPCFlag,
-		RPCPort,
-		RPCAddress,
-		RPCRelayCacheCapacity,
-		RPCAdmin,
 		RESTFlag,
 		RESTAddress,
 		RESTPort,