Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -131,3 +131,6 @@ pkg/sentry/SENTRY_PRODUCTION
# Don't ignore generated files in the vendor/ directory
!vendor/**/*.pb.go
!vendor/**/migrations.go

go.work
go.work.sum
12 changes: 8 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,11 @@ GO_CMD_BUILDS := $(addprefix build/bin/, $(GO_CMD_NAMES))
# Location of symlinks to derivations that should not be garbage collected
export _NIX_GCROOTS = ./.nix-gcroots

# Location of waku-go-bindings and nwaku
WAKU_GO_BINDINGS_DIR := $(shell go list -m -f '{{.Dir}}' github.com/waku-org/waku-go-bindings)
NWAKU_DIR := $(WAKU_GO_BINDINGS_DIR)/third_party/nwaku
LIBWAKU := $(NWAKU_DIR)/libwaku.$(LIBWAKU_EXT)

#----------------
# Nix targets
#----------------
Expand Down Expand Up @@ -163,19 +168,18 @@ nix-purge: ##@nix Completely remove Nix setup, including /nix directory
all: $(GO_CMD_NAMES)

.PHONY: $(GO_CMD_NAMES) $(GO_CMD_PATHS) $(GO_CMD_BUILDS)
$(GO_CMD_BUILDS): generate
$(GO_CMD_BUILDS): generate $(LIBWAKU)
$(GO_CMD_BUILDS): ##@build Build any Go project from cmd folder
go build -mod=vendor -v \
-tags '$(BUILD_TAGS)' $(BUILD_FLAGS) \
-o ./$@ ./cmd/$(notdir $@)
@echo "Compilation done."
@echo "Run \"build/bin/$(notdir $@) -h\" to view available commands."

LIBWAKU := $(CURDIR)/vendor/github.com/waku-org/waku-go-bindings/third_party/nwaku/build/libwaku.$(LIBWAKU_EXT)
$(LIBWAKU):
ifeq ($(USE_NWAKU),true)
@echo "Building libwaku"
$(MAKE) -C $(CURDIR)/vendor/github.com/waku-org/waku-go-bindings/waku SHELL=/bin/bash
@echo "Building libwaku in $(NWAKU_DIR)"
$(MAKE) -C "$(WAKU_GO_BINDINGS_DIR)/waku"
endif

statusgo: ##@build Build status-go as status-backend server
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ require (
github.com/status-im/extkeys v1.4.0
github.com/status-im/go-wallet-sdk v0.0.0-20250912130226-d334ec9bff18
github.com/waku-org/go-waku v0.8.1-0.20250825172353-0c3d6dc0a8cc
github.com/waku-org/waku-go-bindings v0.0.0-20250714110306-6feba5b0df4d
github.com/waku-org/waku-go-bindings v0.0.0-20250929211451-e3bf2dd864e3
github.com/wk8/go-ordered-map/v2 v2.1.7
go.lsp.dev/jsonrpc2 v0.10.0
go.lsp.dev/protocol v0.12.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -2189,8 +2189,8 @@ github.com/waku-org/go-zerokit-rln-arm v0.0.0-20230916171929-1dd9494ff065 h1:Sd7
github.com/waku-org/go-zerokit-rln-arm v0.0.0-20230916171929-1dd9494ff065/go.mod h1:7cSGUoGVIla1IpnChrLbkVjkYgdOcr7rcifEfh4ReR4=
github.com/waku-org/go-zerokit-rln-x86_64 v0.0.0-20230916171518-2a77c3734dd1 h1:4HSdWMFMufpRo3ECTX6BrvA+VzKhXZf7mS0rTa5cCWU=
github.com/waku-org/go-zerokit-rln-x86_64 v0.0.0-20230916171518-2a77c3734dd1/go.mod h1:+LeEYoW5/uBUTVjtBGLEVCUe9mOYAlu5ZPkIxLOSr5Y=
github.com/waku-org/waku-go-bindings v0.0.0-20250714110306-6feba5b0df4d h1:k22pZ7dnQ5vTplQ7ZwTfkaZgEUl9IwO9NlbwzRsg73M=
github.com/waku-org/waku-go-bindings v0.0.0-20250714110306-6feba5b0df4d/go.mod h1:v6ogkMCyQRUTazRyQR5LIouukY4/2bkjjHpnBKBxcAY=
github.com/waku-org/waku-go-bindings v0.0.0-20250929211451-e3bf2dd864e3 h1:CV8iZ3NItF0UbJIgN89HgsJn8YwBcpZeE/GZnkVLjZc=
github.com/waku-org/waku-go-bindings v0.0.0-20250929211451-e3bf2dd864e3/go.mod h1:v6ogkMCyQRUTazRyQR5LIouukY4/2bkjjHpnBKBxcAY=
github.com/wealdtech/go-ens/v3 v3.5.0 h1:Huc9GxBgiGweCOGTYomvsg07K2QggAqZpZ5SuiZdC8o=
github.com/wealdtech/go-ens/v3 v3.5.0/go.mod h1:bVuYoWYEEeEu7Zy95rIMjPR34QFJarxt8p84ywSo0YM=
github.com/wealdtech/go-multicodec v1.4.0 h1:iq5PgxwssxnXGGPTIK1srvt6U5bJwIp7k6kBrudIWxg=
Expand Down
45 changes: 26 additions & 19 deletions vendor/github.com/waku-org/waku-go-bindings/waku/Makefile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions vendor/github.com/waku-org/waku-go-bindings/waku/nwaku.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1185,7 +1185,7 @@ github.com/waku-org/go-zerokit-rln-x86_64/libs/x86_64-pc-windows-gnu
github.com/waku-org/go-zerokit-rln-x86_64/libs/x86_64-unknown-linux-gnu
github.com/waku-org/go-zerokit-rln-x86_64/libs/x86_64-unknown-linux-musl
github.com/waku-org/go-zerokit-rln-x86_64/rln
# github.com/waku-org/waku-go-bindings v0.0.0-20250714110306-6feba5b0df4d
# github.com/waku-org/waku-go-bindings v0.0.0-20250929211451-e3bf2dd864e3
## explicit; go 1.21
github.com/waku-org/waku-go-bindings/utils
github.com/waku-org/waku-go-bindings/waku
Expand Down