mirror of
https://github.com/logos-messaging/logos-chat.git
synced 2026-03-16 20:13:09 +00:00
Fix library conflicts
This commit is contained in:
parent
bcada9527e
commit
1d2aa3453f
2
.gitmodules
vendored
2
.gitmodules
vendored
@ -1,3 +1,3 @@
|
|||||||
[submodule "vendor/waku"]
|
[submodule "vendor/waku"]
|
||||||
path = vendor/waku
|
path = vendor/waku
|
||||||
url = git@github.com:waku-org/nwaku.git
|
url = https://jazzz@github.com/jazzz/nwaku
|
||||||
|
|||||||
@ -17,13 +17,13 @@ task initialize, "Initialize the project after cloning":
|
|||||||
|
|
||||||
requires "nim >= 2.2.4"
|
requires "nim >= 2.2.4"
|
||||||
|
|
||||||
requires "protobuf_serialization >= 0.1.0"
|
requires "protobuf_serialization"
|
||||||
requires "secp256k1 >= 0.6.0.3.2"
|
requires "secp256k1"
|
||||||
requires "blake2"
|
requires "blake2"
|
||||||
requires "chronicles"
|
requires "chronicles"
|
||||||
requires "libp2p >= 1.11.0"
|
requires "libp2p"
|
||||||
requires "nimchacha20poly1305" # TODO: remove
|
requires "nimchacha20poly1305" # TODO: remove
|
||||||
requires "confutils >= 0.1.0"
|
requires "confutils"
|
||||||
requires "eth >= 0.8.0"
|
requires "eth"
|
||||||
requires "regex >= 0.26.3"
|
requires "regex"
|
||||||
requires "web3 >= 0.7.0"
|
requires "web3"
|
||||||
|
|||||||
@ -118,7 +118,7 @@ proc buildWakuNode(cfg: WakuConfig): WakuNode =
|
|||||||
builder.withNetworkConfigurationDetails(ip, Port(cfg.port)).tryGet()
|
builder.withNetworkConfigurationDetails(ip, Port(cfg.port)).tryGet()
|
||||||
let node = builder.build().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
|
result = node
|
||||||
|
|
||||||
|
|||||||
@ -61,9 +61,6 @@ proc main() {.async.} =
|
|||||||
cfg_saro.staticPeers.add(cfg_raya.getMultiAddr())
|
cfg_saro.staticPeers.add(cfg_raya.getMultiAddr())
|
||||||
cfg_raya.staticPeers.add(cfg_saro.getMultiAddr())
|
cfg_raya.staticPeers.add(cfg_saro.getMultiAddr())
|
||||||
|
|
||||||
info "CFG", cfg = cfg_raya
|
|
||||||
info "CFG", cfg = cfg_saro
|
|
||||||
|
|
||||||
# Start Clients
|
# Start Clients
|
||||||
var saro = newClient("Saro", cfg_saro)
|
var saro = newClient("Saro", cfg_saro)
|
||||||
saro.onNewMessage(proc(convo: Conversation, msg: ContentFrame) {.async.} =
|
saro.onNewMessage(proc(convo: Conversation, msg: ContentFrame) {.async.} =
|
||||||
|
|||||||
2
vendor/waku
vendored
2
vendor/waku
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 3fb21ae079f7c3390844c4f7a6841b5d34cb833a
|
Subproject commit 41bdc3ceec946d31c4c05d64bbf384019c389243
|
||||||
Loading…
x
Reference in New Issue
Block a user