Merge branch 'develop' into test/community-ownership-transfer

Author: AYAHASSAN287

.github/workflows/pr.yml

@@ -57,11 +57,11 @@ jobs:
         uses: golangci/golangci-lint-action@v8
         with:
           version: v2.3.1
-          args: --build-tags=gowaku_no_rln,lint,use_logos_storage
+          args: --build-tags=gowaku_no_rln,lint,use_logos_storage,use_torrent
 
       - name: lint-panics
         run: |
-          make lint-panics USE_LOGOS_STORAGE=true
+          make lint-panics USE_LOGOS_STORAGE=true USE_TORRENT=true
 
       - name: go mod tidy
         run: go mod tidy && git diff --exit-code

.nvim.lua

@@ -0,0 +1,124 @@
+local status_go_root = vim.fn.fnamemodify(debug.getinfo(1, "S").source:sub(2), ":p:h")
+local native_root = vim.fs.dirname(status_go_root)
+local logos_storage_lib_dir = vim.env.LOGOS_STORAGE_LIB_DIR or native_root .. "/logos-storage-nim/build"
+local logos_storage_inc_dir = vim.env.LOGOS_STORAGE_INC_DIR or native_root .. "/logos-storage-nim/library"
+local nim_sds_lib_dir = vim.env.NIM_SDS_LIB_DIR or native_root .. "/nim-sds/build"
+local nim_sds_inc_dir = vim.env.NIM_SDS_INC_DIR or native_root .. "/nim-sds/library"
+local cgo_cflags = vim.env.CGO_CFLAGS and vim.env.CGO_CFLAGS .. " " or ""
+local cgo_ldflags = vim.env.CGO_LDFLAGS and vim.env.CGO_LDFLAGS .. " " or ""
+
+local function append_unique_path_list(existing, paths)
+	local seen = {}
+	local result = {}
+
+	for path in string.gmatch(existing or "", "[^:]+") do
+		if not seen[path] then
+			table.insert(result, path)
+			seen[path] = true
+		end
+	end
+
+	for _, path in ipairs(paths) do
+		if not seen[path] then
+			table.insert(result, path)
+			seen[path] = true
+		end
+	end
+
+	return table.concat(result, ":")
+end
+
+local native_env = {
+	LOGOS_STORAGE_LIB_DIR = logos_storage_lib_dir,
+	LOGOS_STORAGE_INC_DIR = logos_storage_inc_dir,
+	NIM_SDS_LIB_DIR = nim_sds_lib_dir,
+	NIM_SDS_INC_DIR = nim_sds_inc_dir,
+	CGO_CFLAGS = cgo_cflags .. "-I" .. logos_storage_inc_dir .. " -I" .. nim_sds_inc_dir,
+	CGO_LDFLAGS = cgo_ldflags .. "-L" .. logos_storage_lib_dir .. " -lstorage -Wl,-rpath," .. logos_storage_lib_dir .. " -L" .. nim_sds_lib_dir .. " -lsds",
+	LD_LIBRARY_PATH = append_unique_path_list(vim.env.LD_LIBRARY_PATH, { logos_storage_lib_dir, nim_sds_lib_dir }),
+}
+
+for key, value in pairs(native_env) do
+	vim.env[key] = value
+end
+
+vim.lsp.config("gopls", {
+	cmd_env = native_env,
+	settings = {
+		gopls = {
+			env = native_env,
+			analyses = {
+				ST1000 = false,
+				ST1003 = false,
+			},
+			buildFlags = {
+				"-tags=gowaku_skip_migrations,gowaku_no_rln,use_logos_storage,use_torrent",
+			},
+		},
+	},
+})
+
+local function find_golangci_lint()
+	for dir in string.gmatch(vim.env.PATH or "", "[^:]+") do
+		local exe = dir .. "/golangci-lint"
+		if vim.fn.executable(exe) == 1 and not string.find(exe, "/mason/", 1, true) then
+			return exe
+		end
+	end
+end
+
+local function remove_golangci_lint(lint)
+	local go_linters = lint.linters_by_ft.go
+	if not go_linters then
+		return
+	end
+
+	local filtered = {}
+	for _, linter in ipairs(go_linters) do
+		if linter ~= "golangcilint" then
+			table.insert(filtered, linter)
+		end
+	end
+	lint.linters_by_ft.go = filtered
+end
+
+local function configure_golangci_lint()
+	local ok, lint = pcall(require, "lint")
+	if not ok or not lint.linters.golangcilint then
+		return
+	end
+
+	local golangci_lint = find_golangci_lint()
+	if not golangci_lint then
+		remove_golangci_lint(lint)
+		return
+	end
+
+	lint.linters.golangcilint.cmd = golangci_lint
+	lint.linters.golangcilint.cwd = status_go_root
+	lint.linters.golangcilint.args = {
+		"--build-tags",
+		"gowaku_no_rln lint",
+		"run",
+		"./...",
+		"--output.json.path=stdout",
+		"--output.text.path=",
+		"--output.tab.path=",
+		"--output.html.path=",
+		"--output.checkstyle.path=",
+		"--output.code-climate.path=",
+		"--output.junit-xml.path=",
+		"--output.teamcity.path=",
+		"--output.sarif.path=",
+		"--issues-exit-code=0",
+		"--show-stats=false",
+		"--path-mode=abs",
+	}
+end
+
+configure_golangci_lint()
+
+vim.api.nvim_create_autocmd("User", {
+	pattern = "VeryLazy",
+	callback = configure_golangci_lint,
+})

.vscode/settings.json

@@ -5,14 +5,15 @@ Thank you for considering contributing to our project! We appreciate your time a
 ## Table of Contents
 1. [Workflow](#workflow)
 2. [Code Style](#code-style)
-3. [Keep History Clean](#keep-history-clean)
-4. [Testing](#testing)
+3. [IDE Setup](#ide-setup)
+4. [Keep History Clean](#keep-history-clean)
+5. [Testing](#testing)
    - [Test Validation](#test-validation)
    - [Area of Impact](#area-of-impact)
-5. [Pull Request Description](#pull-request-description)
+6. [Pull Request Description](#pull-request-description)
    - [Feature Flags](#feature-flags)
    - [Removing Feature Flags](#removing-feature-flags)
-6. [Test Coverage](#test-coverage)
+7. [Test Coverage](#test-coverage)
    - [Maintaining Test Coverage](#maintaining-test-coverage)
    - [Metrics for Test Coverage](#metrics-for-test-coverage)
 
@@ -28,6 +29,18 @@ Thank you for considering contributing to our project! We appreciate your time a
 
 Please note that we follow [Effective Go](https://golang.org/doc/effective_go.html) and [CodeReviewComments](https://github.com/golang/go/wiki/CodeReviewComments) in our code.
 
+## IDE Setup
+
+### Neovim
+
+The repository includes a `.nvim.lua` at the root that auto-configures the Neovim environment for `status-go` development. When `status-go` is opened as a project in Neovim, this script:
+
+- Sets `CGO_CFLAGS`, `CGO_LDFLAGS`, and `LD_LIBRARY_PATH` for the native C dependencies (`libsds` and `libstorage`).
+- Configures `gopls` with the correct build tags (`gowaku_skip_migrations`, `gowaku_no_rln`, `use_logos_storage`, `use_torrent`).
+- Integrates `golangci-lint` with the project's lint settings.
+
+It supports both paths provided by the Nix development shell (via environment variables) and fallbacks to locally built native libraries. This is the recommended way to work with Neovim on this project, as direct `go test` or `gopls` may fail to resolve native symbols without these flags.
+
 ## Keep History Clean
 
 1. **Squash PR before merging**: You can do it either with GitHub API by merging with "Squash and merge" or locally if you want to preserve your signature. It is ok to merge multiple commits with "Rebase and merge" if they are logically separate.

CONTRIBUTING.md

@@ -53,8 +53,9 @@ ARG enable_go_cache=true
 RUN if [ "$enable_go_cache" = "true" ]; then \
     go env -w GOCACHE=/root/.cache/go-build; \
     fi
+ARG use_torrent=false
 RUN --mount=type=cache,target="/root/.cache/go-build",id=statusgo-build-$cache_id \
-    make $build_target BUILD_TAGS="$build_tags" BUILD_FLAGS="$build_flags" USE_LOGOS_STORAGE="$use_logos_storage"
+    make $build_target BUILD_TAGS="$build_tags" BUILD_FLAGS="$build_flags" USE_LOGOS_STORAGE="$use_logos_storage" USE_TORRENT="$use_torrent"
 
 # Stage runtime shared libraries required by built binaries.
 RUN mkdir -p /tmp/status-runtime-libs \

Dockerfile

@@ -1,8 +1,8 @@
 .PHONY: statusgo all test clean help
 .PHONY: statusgo-ios-library statusgo-android-library
 .PHONY: build-libsds clean-libsds rebuild-libsds
-.PHONY: clone-storage build-storage clean-storage test-storage
-.PHONY: storage-help
+.PHONY: clone-storage build-storage clean-storage test-storage test-torrent
+.PHONY: history-archive-help
 
 # Clear any GOROOT set outside of the Nix shell
 export GOROOT=
@@ -107,7 +107,8 @@ BUILD_TAGS ?= gowaku_no_rln
 # Pin nim-sds revision here. Can be a tag (default) or commit hash.
 NIM_SDS_VERSION ?= v0.2.4
 
-# Option 1: Provide NIM_SDS_SOURCE_DIR. Make clones it if missing.
+# Option 1: Provide NIM_SDS_SOURCE_DIR. Make force-reclones a fresh copy (with submodules)
+# to guarantee a clean checkout on every build.
 NIM_SDS_SOURCE_DIR ?= $(GIT_ROOT)/../nim-sds
 # Normalize path separators for Windows (backslashes cause issues when passed through shells)
 ifeq ($(mkspecs),win32)
@@ -137,10 +138,12 @@ CGO_LDFLAGS+=-L$(NIM_SDS_LIB_DIR) -lsds
 
 # `logos-storage` variables (opt-in)
 USE_LOGOS_STORAGE ?= false
+USE_TORRENT ?= false
 LOGOS_STORAGE_VERSION ?= 3c09f008bb5266a669fd19f18368f9e8b861b664
 LOGOS_STORAGE_SOURCE_DIR ?= $(GIT_ROOT)/../logos-storage-nim
 
-# Option 1: Provide LOGOS_STORAGE_SOURCE_DIR. Make clones it if missing.
+# Option 1: Provide LOGOS_STORAGE_SOURCE_DIR. Make force-reclones a fresh copy (with submodules)
+# to guarantee a clean checkout on every build.
 # Option 2: Provide LOGOS_STORAGE_LIB_DIR and LOGOS_STORAGE_INC_DIR.
 ifdef LOGOS_STORAGE_LIB_DIR
 ifdef LOGOS_STORAGE_INC_DIR
@@ -159,28 +162,38 @@ LIBSTORAGE ?= $(LOGOS_STORAGE_LIB_DIR)/libstorage.$(LIB_EXT)
 RUNTIME_LIB_DIRS := $(NIM_SDS_LIB_DIR)
 LOGOS_STORAGE_BUILD_DEPS :=
 ifeq ($(USE_LOGOS_STORAGE),true)
-	BUILD_TAGS += use_logos_storage
+	override BUILD_TAGS += use_logos_storage
 	CGO_CFLAGS += -I$(LOGOS_STORAGE_INC_DIR)
 	CGO_LDFLAGS += -L$(LOGOS_STORAGE_LIB_DIR) -lstorage -Wl,-rpath,$(LOGOS_STORAGE_LIB_DIR)
 	RUNTIME_LIB_DIRS := $(LOGOS_STORAGE_LIB_DIR):$(RUNTIME_LIB_DIRS)
 	LOGOS_STORAGE_BUILD_DEPS += $(LIBSTORAGE)
 endif
 
+ifeq ($(USE_TORRENT),true)
+	override BUILD_TAGS += use_torrent
+endif
+
 clone-storage: ##@build Clone or update logos-storage-nim
 ifeq ($(LOGOS_STORAGE_BUILD_FROM_SOURCE),true)
 	@echo "Cloning or updating logos-storage-nim ..."
 	if [ ! -d "$(LOGOS_STORAGE_SOURCE_DIR)" ]; then \
-		git clone --recurse-submodules https://github.com/logos-storage/logos-storage-nim.git $(LOGOS_STORAGE_SOURCE_DIR); \
+		git clone --recurse-submodules https://github.com/logos-storage/logos-storage-nim.git "$(LOGOS_STORAGE_SOURCE_DIR)"; \
 	else \
-		cd $(LOGOS_STORAGE_SOURCE_DIR) && git fetch --tags; \
+		cd "$(LOGOS_STORAGE_SOURCE_DIR)" && git fetch --tags; \
 	fi
-	cd $(LOGOS_STORAGE_SOURCE_DIR) && git checkout $(LOGOS_STORAGE_VERSION) && git submodule update --init --recursive
+	cd "$(LOGOS_STORAGE_SOURCE_DIR)" && \
+		git switch --force --detach "$(LOGOS_STORAGE_VERSION)" && \
+		git clean -fdx && \
+		git submodule update --init --recursive --force
 endif
 
 $(LIBSTORAGE): clone-storage
 ifeq ($(LOGOS_STORAGE_BUILD_FROM_SOURCE),true)
 	@echo "Building logos-storage: $(LIBSTORAGE)"
-	$(MAKE) -C $(LOGOS_STORAGE_SOURCE_DIR) libstorage
+	$(MAKE) -C $(LOGOS_STORAGE_SOURCE_DIR) libstorage USE_SYSTEM_NIM=$(USE_SYSTEM_NIM) SHELL=$(MAKE_SHELL)
+	@test -f $(LIBSTORAGE) || (echo "Error: libstorage not found at $(LIBSTORAGE) after build" && exit 1)
+else
+	@test -f $(LIBSTORAGE) || (echo "Error: libstorage not found at $(LIBSTORAGE)" && exit 1)
 endif
 
 build-storage: $(LIBSTORAGE)
@@ -190,14 +203,29 @@ ifeq ($(LOGOS_STORAGE_BUILD_FROM_SOURCE),true)
 	@rm -f "$(LOGOS_STORAGE_LIB_DIR)"/libstorage.*
 endif
 
-test-storage: build-storage $(LIBSDS) generate ##@tests Run logosstorage package tests via gotestsum
-	LD_LIBRARY_PATH="$(LOGOS_STORAGE_LIB_DIR):$(RUNTIME_LIB_DIRS)" \
+STORAGE_TEST_ENV := LD_LIBRARY_PATH="$(LOGOS_STORAGE_LIB_DIR):$(RUNTIME_LIB_DIRS)" \
 	CGO_LDFLAGS="$(CGO_LDFLAGS) -L$(LOGOS_STORAGE_LIB_DIR) -lstorage -Wl,-rpath,$(LOGOS_STORAGE_LIB_DIR)" \
-	CGO_CFLAGS="$(CGO_CFLAGS) -I$(LOGOS_STORAGE_INC_DIR)" \
-	gotestsum --packages="./services/logosstorage" -f testname -- -count 1 -tags "use_logos_storage $(BUILD_TAGS) gowaku_skip_migrations"
+	CGO_CFLAGS="$(CGO_CFLAGS) -I$(LOGOS_STORAGE_INC_DIR)"
+STORAGE_TEST_TAGS := use_logos_storage $(BUILD_TAGS) gowaku_skip_migrations
+
+test-storage: build-storage $(LIBSDS) generate ##@tests Run logosstorage package tests via gotestsum
+	$(STORAGE_TEST_ENV) gotestsum --packages="./services/logosstorage" -f testname -- -count 1 -tags "$(STORAGE_TEST_TAGS)"
+	$(STORAGE_TEST_ENV) gotestsum --packages="./protocol/communities/archive/logosstorage" -f testname -- -count 1 -tags "$(STORAGE_TEST_TAGS)"
+	$(STORAGE_TEST_ENV) gotestsum --packages="./protocol" -f testname -- -count 1 -tags "$(STORAGE_TEST_TAGS)" \
+	-run TestMessengerCommunitiesTokenPermissionsSuite/TestUploadDownloadLogosStorageHistoryArchives
+
+TORRENT_TEST_ENV := LD_LIBRARY_PATH="$(RUNTIME_LIB_DIRS)" \
+	CGO_LDFLAGS="$(CGO_LDFLAGS)" \
+	CGO_CFLAGS="$(CGO_CFLAGS)"
+TORRENT_TEST_TAGS := $(BUILD_TAGS) use_torrent gowaku_skip_migrations
+
+test-torrent: $(LIBSDS) generate ##@tests Run torrent archive package tests via gotestsum
+	$(TORRENT_TEST_ENV) gotestsum --packages="./protocol/communities/archive/torrent" -f testname -- -count 1 -tags "$(TORRENT_TEST_TAGS)"
+	$(TORRENT_TEST_ENV) gotestsum --packages="./protocol" -f testname -- -count 1 -tags "$(TORRENT_TEST_TAGS)" \
+	-run TestMessengerCommunitiesTokenPermissionsSuite/TestImportDecryptedArchiveMessages
 
-storage-help: ##@build Show logos-storage build/test toggles and env vars
-	@cat services/logosstorage/README.md
+history-archive-help: ##@build Show history archive build/test toggles and env vars
+	@cat protocol/communities/archive/README.md
 
 # mbedtls configuration for go-sqlcipher
 ifeq ($(detected_OS),Windows)
@@ -298,18 +326,22 @@ clone-nim-sds: ##@build Clone or update nim-sds
 ifeq ($(NIM_SDS_BUILD_FROM_SOURCE),true)
 	@echo "Cloning or updating nim-sds ..."
 	if [ ! -d "$(NIM_SDS_SOURCE_DIR)" ]; then \
-		git clone https://github.com/waku-org/nim-sds.git $(NIM_SDS_SOURCE_DIR); \
+		git clone --recurse-submodules https://github.com/waku-org/nim-sds.git "$(NIM_SDS_SOURCE_DIR)"; \
 	else \
-		cd $(NIM_SDS_SOURCE_DIR) && git fetch --tags; \
+		cd "$(NIM_SDS_SOURCE_DIR)" && git fetch --tags; \
 	fi
-	cd $(NIM_SDS_SOURCE_DIR) && git checkout $(NIM_SDS_VERSION)
+	cd "$(NIM_SDS_SOURCE_DIR)" && \
+		git switch --force --detach "$(NIM_SDS_VERSION)" && \
+		git clean -fdx && \
+		git submodule update --init --recursive --force
 endif
 
 $(LIBSDS): clone-nim-sds
 ifeq ($(NIM_SDS_BUILD_FROM_SOURCE),true)
 	@echo "Building nim-sds: $(LIBSDS)"
 	$(MAKE) -C $(NIM_SDS_SOURCE_DIR) update USE_SYSTEM_NIM=$(USE_SYSTEM_NIM)
 	$(MAKE) -C $(NIM_SDS_SOURCE_DIR) libsds USE_SYSTEM_NIM=$(USE_SYSTEM_NIM) NIMFLAGS=-d:noSignalHandler SHELL=$(MAKE_SHELL)
+	@test -f $(LIBSDS) || (echo "Error: libsds not found at $(LIBSDS) after build" && exit 1)
 else
 	@test -f $(LIBSDS) || (echo "Error: libsds not found at $(LIBSDS)" && exit 1)
 endif
@@ -521,7 +553,7 @@ test-unit: ##@tests Run unit and integration tests
 
 test-single: test-unit-prep
 	LD_LIBRARY_PATH="$(RUNTIME_LIB_DIRS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" CGO_CFLAGS="$(CGO_CFLAGS)" \
-	go test -v $(PKG) -testify.m $(TEST)
+	go test -v -tags '$(BUILD_TAGS)' $(PKG) -run '$(TEST)' $(if $(TESTIFY_M),-testify.m '$(TESTIFY_M)')
 
 test-unit-network: test-unit-prep
 test-unit-network: export UNIT_TEST_RERUN_FAILS ?= false
@@ -536,6 +568,7 @@ test-functional: generate
 test-functional: export FUNCTIONAL_TESTS_DOCKER_UID ?= $(call sh, id -u)
 test-functional: export FUNCTIONAL_TESTS_REPORT_CODECOV ?= false
 test-functional: export USE_LOGOS_STORAGE := $(USE_LOGOS_STORAGE)
+test-functional: export USE_TORRENT := $(USE_TORRENT)
 test-functional:
 	@./scripts/run_functional_tests.sh
 
@@ -544,7 +577,7 @@ test-functional-compatibility: export FUNCTIONAL_TESTS_DOCKER_UID ?= $(call sh,
 test-functional-compatibility: export FUNCTIONAL_TESTS_REPORT_CODECOV ?= false
 test-functional-compatibility: export USE_LOGOS_STORAGE := $(USE_LOGOS_STORAGE)
 test-functional-compatibility: export FUNCTIONAL_TESTS_MARKER := compatibility
-test-functional-compatibility: export FUNCTIONAL_TESTS_RERUNS := 1
+test-functional-compatibility: export FUNCTIONAL_TESTS_RERUNS := 6
 test-functional-compatibility: ##@tests Cross-version chat compatibility smoke tests (set PEER_IMAGES or PEER_REFS)
 	@./scripts/run_functional_tests.sh