mirror of
https://github.com/status-im/go-waku.git
synced 2025-02-11 13:06:47 +00:00
chore: downgrade to 1.19 for status-go
This commit is contained in:
parent
ff68934354
commit
585648c4ee
2
go.mod
2
go.mod
@ -1,6 +1,6 @@
|
||||
module github.com/waku-org/go-waku
|
||||
|
||||
go 1.20
|
||||
go 1.19
|
||||
|
||||
replace github.com/ethereum/go-ethereum v1.10.26 => github.com/status-im/go-ethereum v1.10.25-status.4
|
||||
|
||||
|
@ -11,7 +11,6 @@ import (
|
||||
golog "github.com/ipfs/go-log/v2"
|
||||
"github.com/libp2p/go-libp2p"
|
||||
"go.uber.org/zap"
|
||||
"golang.org/x/exp/maps"
|
||||
|
||||
"github.com/ethereum/go-ethereum/crypto"
|
||||
"github.com/ethereum/go-ethereum/p2p/enode"
|
||||
@ -325,13 +324,13 @@ func (w *WakuNode) watchMultiaddressChanges(ctx context.Context) {
|
||||
case <-ctx.Done():
|
||||
return
|
||||
case <-first:
|
||||
addr := maps.Keys(addrsSet)
|
||||
addr := utils.MultiAddrFromSet(addrsSet)
|
||||
w.log.Info("listening", logging.MultiAddrs("multiaddr", addr...))
|
||||
case <-w.addressChangesSub.Out():
|
||||
newAddrs := utils.MultiAddrSet(w.ListenAddresses()...)
|
||||
if !maps.Equal(addrsSet, newAddrs) {
|
||||
if !utils.MultiAddrSetEquals(addrsSet, newAddrs) {
|
||||
addrsSet = newAddrs
|
||||
addrs := maps.Keys(addrsSet)
|
||||
addrs := utils.MultiAddrFromSet(addrsSet)
|
||||
w.log.Info("listening addresses update received", logging.MultiAddrs("multiaddr", addrs...))
|
||||
err := w.setupENR(ctx, addrs)
|
||||
if err != nil {
|
||||
|
@ -24,3 +24,26 @@ func MultiAddrSet(addr ...multiaddr.Multiaddr) map[multiaddr.Multiaddr]struct{}
|
||||
}
|
||||
return r
|
||||
}
|
||||
|
||||
func MultiAddrSetEquals(m1 map[multiaddr.Multiaddr]struct{}, m2 map[multiaddr.Multiaddr]struct{}) bool {
|
||||
if len(m1) != len(m2) {
|
||||
return false
|
||||
}
|
||||
|
||||
for k := range m1 {
|
||||
_, ok := m2[k]
|
||||
if !ok {
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
func MultiAddrFromSet(m map[multiaddr.Multiaddr]struct{}) []multiaddr.Multiaddr {
|
||||
var r []multiaddr.Multiaddr
|
||||
for k := range m {
|
||||
r = append(r, k)
|
||||
}
|
||||
return r
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user