From ab7e45c735772db1d8422f0413f00cbdcb3c7e37 Mon Sep 17 00:00:00 2001 From: Richard Ramos Date: Tue, 12 Sep 2023 15:14:08 -0400 Subject: [PATCH] feat: make RLN available by default --- .golangci.full.yaml | 4 ---- .golangci.yaml | 3 --- Makefile | 14 +++++++------- cmd/waku/flags_no_rln.go | 4 ++-- cmd/waku/flags_rln.go | 4 ++-- cmd/waku/node_no_rln.go | 4 ++-- cmd/waku/node_rln.go | 4 ++-- cmd/waku/rlngenerate/command_no_rln.go | 4 ++-- cmd/waku/rlngenerate/command_rln.go | 4 ++-- cmd/waku/rlngenerate/flags.go | 4 ++-- cmd/waku/rlngenerate/web3.go | 4 ++-- cmd/waku/server/no_rln.go | 4 ++-- cmd/waku/server/rln.go | 4 ++-- examples/chat2/Makefile | 2 +- examples/rln/Makefile | 2 +- flake.nix | 1 + waku/v2/node/wakunode2_no_rln.go | 4 ++-- waku/v2/node/wakunode2_rln.go | 4 ++-- waku/v2/node/wakuoptions_rln.go | 6 ++---- 19 files changed, 36 insertions(+), 44 deletions(-) delete mode 100644 .golangci.yaml diff --git a/.golangci.full.yaml b/.golangci.full.yaml index 0e6afaf9..ece7d58e 100644 --- a/.golangci.full.yaml +++ b/.golangci.full.yaml @@ -1,7 +1,3 @@ -run: - build-tags: - - gowaku_rln - issues: include: - EXC0012 diff --git a/.golangci.yaml b/.golangci.yaml deleted file mode 100644 index 0b27243b..00000000 --- a/.golangci.yaml +++ /dev/null @@ -1,3 +0,0 @@ -run: - build-tags: - - gowaku_rln diff --git a/Makefile b/Makefile index bce0115b..98632e6f 100644 --- a/Makefile +++ b/Makefile @@ -42,8 +42,8 @@ BUILD_FLAGS ?= $(shell echo "-ldflags='\ ANDROID_TARGET ?= 23 # control rln code compilation -ifeq ($(RLN), true) -BUILD_TAGS := gowaku_rln +ifeq ($(NO_RLN), true) +BUILD_TAGS := gowaku_no_rln endif all: build @@ -58,7 +58,7 @@ build: chat2: pushd ./examples/chat2 && \ - ${GOBIN} build -tags="gowaku_rln" -o ../../build/chat2 . && \ + ${GOBIN} build -o ../../build/chat2 . && \ popd vendor: @@ -130,7 +130,7 @@ static-library: @echo "Building static library..." ${GOBIN} build \ -buildmode=c-archive \ - -tags="${BUILD_TAGS}" \ + -tags="${BUILD_TAGS} gowaku_no_rln" \ -o ./build/lib/libgowaku.a \ ./library/c/ @echo "Static library built:" @@ -146,7 +146,7 @@ dynamic-library: rm -f ./build/lib/libgowaku.$(GOBIN_SHARED_LIB_EXT)* $(GOBIN_SHARED_LIB_CFLAGS) $(GOBIN_SHARED_LIB_CGO_LDFLAGS) ${GOBIN} build \ -buildmode=c-shared \ - -tags="${BUILD_TAGS}" \ + -tags="${BUILD_TAGS} gowaku_no_rln" \ -o ./build/lib/libgowaku.$(GOBIN_SHARED_LIB_EXT) \ ./library/c/ ifeq ($(detected_OS),Darwin) @@ -166,14 +166,14 @@ mobile-android: @echo "Android target: ${ANDROID_TARGET} (override with ANDROID_TARGET var)" gomobile init && \ ${GOBIN} get -d golang.org/x/mobile/cmd/gomobile && \ - gomobile bind -v -target=android -androidapi=${ANDROID_TARGET} -ldflags="-s -w" -tags="${BUILD_TAGS}" $(BUILD_FLAGS) -o ./build/lib/gowaku.aar ./library/mobile + CGO=1 gomobile bind -v -target=android -androidapi=${ANDROID_TARGET} -ldflags="-s -w" -tags="${BUILD_TAGS} gowaku_no_rln" $(BUILD_FLAGS) -o ./build/lib/gowaku.aar ./library/mobile @echo "Android library built:" @ls -la ./build/lib/*.aar ./build/lib/*.jar mobile-ios: gomobile init && \ ${GOBIN} get -d golang.org/x/mobile/cmd/gomobile && \ - gomobile bind -target=ios -ldflags="-s -w" -tags="nowatchdog ${BUILD_TAGS}" $(BUILD_FLAGS) -o ./build/lib/Gowaku.xcframework ./library/mobile + gomobile bind -target=ios -ldflags="-s -w" -tags="nowatchdog ${BUILD_TAGS} gowaku_no_rln" $(BUILD_FLAGS) -o ./build/lib/Gowaku.xcframework ./library/mobile @echo "IOS library built:" @ls -la ./build/lib/*.xcframework diff --git a/cmd/waku/flags_no_rln.go b/cmd/waku/flags_no_rln.go index 7bbb48a8..e1e0e034 100644 --- a/cmd/waku/flags_no_rln.go +++ b/cmd/waku/flags_no_rln.go @@ -1,5 +1,5 @@ -//go:build !gowaku_rln -// +build !gowaku_rln +//go:build gowaku_no_rln +// +build gowaku_no_rln package main diff --git a/cmd/waku/flags_rln.go b/cmd/waku/flags_rln.go index 3d73d6e1..be76c35a 100644 --- a/cmd/waku/flags_rln.go +++ b/cmd/waku/flags_rln.go @@ -1,5 +1,5 @@ -//go:build gowaku_rln -// +build gowaku_rln +//go:build !gowaku_no_rln +// +build !gowaku_no_rln package main diff --git a/cmd/waku/node_no_rln.go b/cmd/waku/node_no_rln.go index 92d64ff9..de285e5a 100644 --- a/cmd/waku/node_no_rln.go +++ b/cmd/waku/node_no_rln.go @@ -1,5 +1,5 @@ -//go:build !gowaku_rln -// +build !gowaku_rln +//go:build gowaku_no_rln +// +build gowaku_no_rln package main diff --git a/cmd/waku/node_rln.go b/cmd/waku/node_rln.go index 72192258..703660f2 100644 --- a/cmd/waku/node_rln.go +++ b/cmd/waku/node_rln.go @@ -1,5 +1,5 @@ -//go:build gowaku_rln -// +build gowaku_rln +//go:build !gowaku_no_rln +// +build !gowaku_no_rln package main diff --git a/cmd/waku/rlngenerate/command_no_rln.go b/cmd/waku/rlngenerate/command_no_rln.go index edd287f6..38d86c8a 100644 --- a/cmd/waku/rlngenerate/command_no_rln.go +++ b/cmd/waku/rlngenerate/command_no_rln.go @@ -1,5 +1,5 @@ -//go:build !gowaku_rln -// +build !gowaku_rln +//go:build gowaku_no_rln +// +build gowaku_no_rln package rlngenerate diff --git a/cmd/waku/rlngenerate/command_rln.go b/cmd/waku/rlngenerate/command_rln.go index 7e580d8f..8a05cea9 100644 --- a/cmd/waku/rlngenerate/command_rln.go +++ b/cmd/waku/rlngenerate/command_rln.go @@ -1,5 +1,5 @@ -//go:build gowaku_rln -// +build gowaku_rln +//go:build !gowaku_no_rln +// +build !gowaku_no_rln package rlngenerate diff --git a/cmd/waku/rlngenerate/flags.go b/cmd/waku/rlngenerate/flags.go index 2f5f0680..447fb62c 100644 --- a/cmd/waku/rlngenerate/flags.go +++ b/cmd/waku/rlngenerate/flags.go @@ -1,5 +1,5 @@ -//go:build gowaku_rln -// +build gowaku_rln +//go:build !gowaku_no_rln +// +build !gowaku_no_rln package rlngenerate diff --git a/cmd/waku/rlngenerate/web3.go b/cmd/waku/rlngenerate/web3.go index 535311fe..5990c961 100644 --- a/cmd/waku/rlngenerate/web3.go +++ b/cmd/waku/rlngenerate/web3.go @@ -1,5 +1,5 @@ -//go:build gowaku_rln -// +build gowaku_rln +//go:build !gowaku_no_rln +// +build !gowaku_no_rln package rlngenerate diff --git a/cmd/waku/server/no_rln.go b/cmd/waku/server/no_rln.go index ab094e60..78aac317 100644 --- a/cmd/waku/server/no_rln.go +++ b/cmd/waku/server/no_rln.go @@ -1,5 +1,5 @@ -//go:build !gowaku_rln -// +build !gowaku_rln +//go:build gowaku_no_rln +// +build gowaku_no_rln package server diff --git a/cmd/waku/server/rln.go b/cmd/waku/server/rln.go index d0c24770..b203f91e 100644 --- a/cmd/waku/server/rln.go +++ b/cmd/waku/server/rln.go @@ -1,5 +1,5 @@ -//go:build gowaku_rln -// +build gowaku_rln +//go:build !gowaku_no_rln +// +build !gowaku_no_rln package server diff --git a/examples/chat2/Makefile b/examples/chat2/Makefile index bacb3499..9d47d514 100644 --- a/examples/chat2/Makefile +++ b/examples/chat2/Makefile @@ -3,7 +3,7 @@ all: build build: - go build -tags="gowaku_rln" -o build/chat2 . + go build -o build/chat2 . run: ./build/chat2 \ No newline at end of file diff --git a/examples/rln/Makefile b/examples/rln/Makefile index 73207b72..29602055 100644 --- a/examples/rln/Makefile +++ b/examples/rln/Makefile @@ -1,6 +1,6 @@ .PHONY: all build build: - go build -tags="gowaku_rln" -o build/rln . + go build -o build/rln . all: build \ No newline at end of file diff --git a/flake.nix b/flake.nix index f0249d26..fde4446b 100644 --- a/flake.nix +++ b/flake.nix @@ -22,6 +22,7 @@ name = "go-waku"; src = self; inherit subPackages; + tags = [ "gowaku_no_rln" ]; ldflags = [ "-X github.com/waku-org/go-waku/waku/v2/node.GitCommit=${commit}" "-X github.com/waku-org/go-waku/waku/v2/node.Version=${version}" diff --git a/waku/v2/node/wakunode2_no_rln.go b/waku/v2/node/wakunode2_no_rln.go index d6da3e98..c74e1360 100644 --- a/waku/v2/node/wakunode2_no_rln.go +++ b/waku/v2/node/wakunode2_no_rln.go @@ -1,5 +1,5 @@ -//go:build !gowaku_rln -// +build !gowaku_rln +//go:build gowaku_no_rln +// +build gowaku_no_rln package node diff --git a/waku/v2/node/wakunode2_rln.go b/waku/v2/node/wakunode2_rln.go index 5b637478..695cb214 100644 --- a/waku/v2/node/wakunode2_rln.go +++ b/waku/v2/node/wakunode2_rln.go @@ -1,5 +1,5 @@ -//go:build gowaku_rln -// +build gowaku_rln +//go:build !gowaku_no_rln +// +build !gowaku_no_rln package node diff --git a/waku/v2/node/wakuoptions_rln.go b/waku/v2/node/wakuoptions_rln.go index 0f2df3e6..70f94a6d 100644 --- a/waku/v2/node/wakuoptions_rln.go +++ b/waku/v2/node/wakuoptions_rln.go @@ -1,5 +1,5 @@ -//go:build gowaku_rln -// +build gowaku_rln +//go:build !gowaku_no_rln +// +build !gowaku_no_rln package node @@ -10,7 +10,6 @@ import ( ) // WithStaticRLNRelay enables the Waku V2 RLN protocol in offchain mode -// Requires the `gowaku_rln` build constrain (or the env variable RLN=true if building go-waku) func WithStaticRLNRelay(memberIndex *r.MembershipIndex, spamHandler rln.SpamHandler) WakuNodeOption { return func(params *WakuNodeParameters) error { params.enableRLN = true @@ -22,7 +21,6 @@ func WithStaticRLNRelay(memberIndex *r.MembershipIndex, spamHandler rln.SpamHand } // WithDynamicRLNRelay enables the Waku V2 RLN protocol in onchain mode. -// Requires the `gowaku_rln` build constrain (or the env variable RLN=true if building go-waku) func WithDynamicRLNRelay(keystorePath string, keystorePassword string, treePath string, membershipContract common.Address, membershipIndex *uint, spamHandler rln.SpamHandler, ethClientAddress string) WakuNodeOption { return func(params *WakuNodeParameters) error { params.enableRLN = true