Skip to content

refactor: complete nwaku integration (timesource) #7148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: develop
Choose a base branch
from
+8 −8
Open

refactor: complete nwaku integration (timesource) #7148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a4169aa
chore: update waku-go-bindings ref
Ivansete-status Nov 25, 2025
ca9c52f
chore: use timesource from waku-go-bindings
Ivansete-status Nov 25, 2025
0ecf1c0
chore: update default nix sha value
Ivansete-status Nov 25, 2025
8b03267
chore: go mod tidy
Ivansete-status Nov 26, 2025
0c8383c
chore: update waku-go-bindings in go.mod
Ivansete-status Dec 4, 2025
3980cc5
chore: after go mod tidy
Ivansete-status Dec 4, 2025
194bbd1
chore: update sha default nix
Ivansete-status Dec 4, 2025
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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ require (
github.com/status-im/go-wallet-sdk v0.0.0-20251027141302-43edbd6abc92
github.com/waku-org/go-waku v0.10.1-0.20251003225121-06c9af60f35b
github.com/waku-org/sds-go-bindings v0.0.0-20251119184907-e78f76307965
github.com/waku-org/waku-go-bindings v0.0.0-20251030105913-aa64c47d2bf3
github.com/waku-org/waku-go-bindings v0.0.0-20251202095947-63b01b7d0ca9
github.com/wk8/go-ordered-map/v2 v2.1.7
go.uber.org/atomic v1.11.0
go.uber.org/mock v0.6.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2416,8 +2416,8 @@ github.com/waku-org/go-zerokit-rln-x86_64 v0.0.0-20230916171518-2a77c3734dd1 h1:
github.com/waku-org/go-zerokit-rln-x86_64 v0.0.0-20230916171518-2a77c3734dd1/go.mod h1:+LeEYoW5/uBUTVjtBGLEVCUe9mOYAlu5ZPkIxLOSr5Y=
github.com/waku-org/sds-go-bindings v0.0.0-20251119184907-e78f76307965 h1:1xx0AQeLfxSLxuGvu7em1LrNM5lVXTU6PiuaPfTkbpA=
github.com/waku-org/sds-go-bindings v0.0.0-20251119184907-e78f76307965/go.mod h1:rC5yaoM7ee8h/zEyCGfdnYTOEhyW3jpdck7maoiRQQE=
github.com/waku-org/waku-go-bindings v0.0.0-20251030105913-aa64c47d2bf3 h1:VimYvS377VZh/b/kipnv2rp0a2r8Dd7D+4ihVd3hipI=
github.com/waku-org/waku-go-bindings v0.0.0-20251030105913-aa64c47d2bf3/go.mod h1:v6ogkMCyQRUTazRyQR5LIouukY4/2bkjjHpnBKBxcAY=
github.com/waku-org/waku-go-bindings v0.0.0-20251202095947-63b01b7d0ca9 h1:x4SKQ8zceFNhSBG02yULii7m/bFtGDuqX5XuahpSTCo=
github.com/waku-org/waku-go-bindings v0.0.0-20251202095947-63b01b7d0ca9/go.mod h1:v6ogkMCyQRUTazRyQR5LIouukY4/2bkjjHpnBKBxcAY=
github.com/wealdtech/go-ens/v3 v3.6.0 h1:EAByZlHRQ3vxqzzwNi0GvEq1AjVozfWO4DMldHcoVg8=
github.com/wealdtech/go-ens/v3 v3.6.0/go.mod h1:hcmMr9qPoEgVSEXU2Bwzrn/9NczTWZ1rE53jIlqUpzw=
github.com/wealdtech/go-multicodec v1.4.0 h1:iq5PgxwssxnXGGPTIK1srvt6U5bJwIp7k6kBrudIWxg=
Expand Down
8 changes: 4 additions & 4 deletions messaging/waku/nwaku.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,18 @@ import (
"github.com/waku-org/go-waku/waku/v2/api/missing"
"github.com/waku-org/go-waku/waku/v2/api/publish"
"github.com/waku-org/go-waku/waku/v2/dnsdisc"
"github.com/waku-org/go-waku/waku/v2/node"
"github.com/waku-org/go-waku/waku/v2/onlinechecker"
"github.com/waku-org/go-waku/waku/v2/peermanager"
wps "github.com/waku-org/go-waku/waku/v2/peerstore"
"github.com/waku-org/go-waku/waku/v2/protocol"
gowakutimesource "github.com/waku-org/go-waku/waku/v2/timesource"

"github.com/waku-org/go-waku/waku/v2/protocol/relay"
"github.com/waku-org/go-waku/waku/v2/protocol/store"

"github.com/waku-org/waku-go-bindings/waku"
bindingscommon "github.com/waku-org/waku-go-bindings/waku/common"
wakutimesource "github.com/waku-org/waku-go-bindings/waku/timesource"

gocommon "github.com/status-im/status-go/common"
"github.com/status-im/status-go/connection"
Expand All @@ -65,7 +66,6 @@ import (
"github.com/status-im/status-go/messaging/waku/common"
"github.com/status-im/status-go/messaging/waku/types"

"github.com/waku-org/go-waku/waku/v2/node"
"github.com/waku-org/go-waku/waku/v2/protocol/pb"
)

Expand Down Expand Up @@ -155,7 +155,7 @@ type Waku struct {

logger *zap.Logger

timesource gowakutimesource.Timesource
timesource wakutimesource.Timesource

// seededBootnodesForDiscV5 indicates whether we manage to retrieve discovery
// bootnodes successfully
Expand Down Expand Up @@ -209,7 +209,7 @@ func New(nodeKey *ecdsa.PrivateKey, cfg *Config, logger *zap.Logger, ts timesour
}
}

var wakuTimeSource gowakutimesource.Timesource
var wakuTimeSource wakutimesource.Timesource
if ts != nil {
wakuTimeSource = timesourceAdapter{ts}
} else {
Expand Down
2 changes: 1 addition & 1 deletion nix/pkgs/status-go/library/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ let
in pkgs.buildGoModule {
pname = "status-go";
src = builtins.path { path = ./../../../..; name = "status-go-library"; };
vendorHash = "sha256-t6dtjRx3xBg15WhNe7oenkPPHTZrsajvc60pWnj1OxY=";
vendorHash = "sha256-4FJc5hV+DBgEkTm14xzpaQVOuQu+ahAkIL+lde3dWHk=";

inherit meta version;

Expand Down
Loading