Fix library conflicts

This commit is contained in:
Jazz Turner-Baggs 2025-09-03 11:24:48 -07:00
parent ea14260c90
commit 4aca889119
No known key found for this signature in database
5 changed files with 10 additions and 13 deletions

2
.gitmodules vendored
View File

@ -1,3 +1,3 @@
[submodule "vendor/waku"]
path = vendor/waku
url = git@github.com:waku-org/nwaku.git
url = https://jazzz@github.com/jazzz/nwaku

View File

@ -17,13 +17,13 @@ task initialize, "Initialize the project after cloning":
requires "nim >= 2.2.4"
requires "protobuf_serialization >= 0.1.0"
requires "secp256k1 >= 0.6.0.3.2"
requires "protobuf_serialization"
requires "secp256k1"
requires "blake2"
requires "chronicles"
requires "libp2p >= 1.11.0"
requires "libp2p"
requires "nimchacha20poly1305" # TODO: remove
requires "confutils >= 0.1.0"
requires "eth >= 0.8.0"
requires "regex >= 0.26.3"
requires "web3 >= 0.7.0"
requires "confutils"
requires "eth"
requires "regex"
requires "web3"

View File

@ -118,7 +118,7 @@ proc buildWakuNode(cfg: WakuConfig): WakuNode =
builder.withNetworkConfigurationDetails(ip, Port(cfg.port)).tryGet()
let node = builder.build().tryGet()
node.mountMetadata(cfg.clusterId).expect("failed to mount waku metadata protocol")
node.mountMetadata(cfg.clusterId, @[1'u16, 2'u16]).expect("failed to mount waku metadata protocol")
result = node

View File

@ -61,9 +61,6 @@ proc main() {.async.} =
cfg_saro.staticPeers.add(cfg_raya.getMultiAddr())
cfg_raya.staticPeers.add(cfg_saro.getMultiAddr())
info "CFG", cfg = cfg_raya
info "CFG", cfg = cfg_saro
# Start Clients
var saro = newClient("Saro", cfg_saro)
saro.onNewMessage(proc(convo: Conversation, msg: ContentFrame) {.async.} =

2
vendor/waku vendored

@ -1 +1 @@
Subproject commit 3fb21ae079f7c3390844c4f7a6841b5d34cb833a
Subproject commit 41bdc3ceec946d31c4c05d64bbf384019c389243