waku-org
/
nwaku
mirror of https://github.com/waku-org/nwaku.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update submodules (#424) 

Update submodules and fix issues
This commit is contained in:
Hanno Cornelius 2021-03-17 10:52:27 +02:00 committed by GitHub
parent d64aadc8ad
commit 714bbebbc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -31,3 +31,5 @@
rln rln
*.log *.log
package-lock.json
node_modules/

2
.gitmodules vendored
View File

@ -12,7 +12,7 @@
path = vendor/nim-libp2p path = vendor/nim-libp2p
url = https://github.com/status-im/nim-libp2p.git url = https://github.com/status-im/nim-libp2p.git
ignore = dirty ignore = dirty
branch = unstable branch = master
[submodule "vendor/nim-stew"] [submodule "vendor/nim-stew"]
path = vendor/nim-stew path = vendor/nim-stew
url = https://github.com/status-im/nim-stew.git url = https://github.com/status-im/nim-stew.git

2
examples/v1/example.nim
View File

@ -33,7 +33,7 @@ let
# Create Ethereum Node # Create Ethereum Node
var node = newEthereumNode(config.nodekey, # Node identifier var node = newEthereumNode(config.nodekey, # Node identifier
address, # Address reachable for incoming requests address, # Address reachable for incoming requests
1, # Network Id, only applicable for ETH protocol NetworkId(1), # Network Id, only applicable for ETH protocol
nil, # Database, not required for Waku nil, # Database, not required for Waku
clientId, # Client id string clientId, # Client id string
addAllCapabilities = false, # Disable default all RLPx capabilities addAllCapabilities = false, # Disable default all RLPx capabilities

2
tests/test_helpers.nim
View File

@ -15,7 +15,7 @@ proc setupTestNode*(
rng: ref BrHmacDrbgContext, rng: ref BrHmacDrbgContext,
capabilities: varargs[ProtocolInfo, `protocolInfo`]): EthereumNode = capabilities: varargs[ProtocolInfo, `protocolInfo`]): EthereumNode =
let keys1 = keys.KeyPair.random(rng[]) let keys1 = keys.KeyPair.random(rng[])
result = newEthereumNode(keys1, localAddress(nextPort), 1, nil, result = newEthereumNode(keys1, localAddress(nextPort), NetworkId(1), nil,
addAllCapabilities = false, rng = rng) addAllCapabilities = false, rng = rng)
nextPort.inc nextPort.inc
for capability in capabilities: for capability in capabilities:

2
tests/v1/test_rpc_waku.nim
View File

@ -20,7 +20,7 @@ proc setupNode(capabilities: varargs[ProtocolInfo, `protocolInfo`],
srvAddress = Address(ip: parseIpAddress("0.0.0.0"), tcpPort: Port(30303), srvAddress = Address(ip: parseIpAddress("0.0.0.0"), tcpPort: Port(30303),
udpPort: Port(30303)) udpPort: Port(30303))
result = newEthereumNode(keypair, srvAddress, 1, nil, "waku test rpc", result = newEthereumNode(keypair, srvAddress, NetworkId(1), nil, "waku test rpc",
addAllCapabilities = false, rng = rng) addAllCapabilities = false, rng = rng)
for capability in capabilities: for capability in capabilities:
result.addCapability capability result.addCapability capability

3
tests/v2/test_jsonrpc_waku.nim
View File

@ -206,7 +206,7 @@ procSuite "Waku v2 JSON-RPC API":
asyncTest "Store API: retrieve historical messages": asyncTest "Store API: retrieve historical messages":
waitFor node.start() waitFor node.start()
node.mountRelay(@[defaultTopic]) node.mountRelay()
# RPC server setup # RPC server setup
let let
@ -231,6 +231,7 @@ procSuite "Waku v2 JSON-RPC API":
node.wakuStore.setPeer(listenSwitch.peerInfo) node.wakuStore.setPeer(listenSwitch.peerInfo)
listenSwitch.mount(node.wakuRelay)
listenSwitch.mount(node.wakuStore) listenSwitch.mount(node.wakuStore)
var subscriptions = newTable[string, MessageNotificationSubscription]() var subscriptions = newTable[string, MessageNotificationSubscription]()

2
vendor/nim-bearssl vendored

@ -1 +1 @@
Subproject commit eebf730ccda5b5fade2a8f48b3da1496f2c47ba5 Subproject commit 0a7401ad466d70bab31c5d6dc82d1d584e4ebd1f

2
vendor/nim-chronos vendored

@ -1 +1 @@
Subproject commit c1f6e7276e3810cee4bf7358a36a3444fb4bd75e Subproject commit 0b78606e4142affbdc0e0e94bc1b8c39a8705737

2
vendor/nim-eth vendored

@ -1 +1 @@
Subproject commit 4e58eb48ce1b1a06d28802ad22215de9ff92a916 Subproject commit be5e088b21e06a85cac4826454412db8459ed4f1

2
vendor/nim-faststreams vendored

@ -1 +1 @@
Subproject commit 9138f6a8bb9a089790319753895722c2569707b0 Subproject commit 99e89eb1e5c973ea5162342384408434b7f5715a

2
vendor/nim-http-utils vendored

@ -1 +1 @@
Subproject commit 1639ac79035c291688174a2037f7d695aa3ff6f3 Subproject commit 422026688405940a1304d5cdaf68353d93263035

2
vendor/nim-json-rpc vendored

@ -1 +1 @@
Subproject commit ded863fcb1741483f285e3bbf27541efdc32c78c Subproject commit 4eb39203ebd391c77d16a1c387dc8a6b7d90bc69

2
vendor/nim-libbacktrace vendored

@ -1 +1 @@
Subproject commit 8121c08e0e7bdf92f86012b4af2330434fa7ed5d Subproject commit 829a65ca3d99c18230598de5d9fc7659f321586c

2
vendor/nim-libp2p vendored

@ -1 +1 @@
Subproject commit 090ea91cb06ac6e35fd1401c2214871b24a77363 Subproject commit 3bf6acef2348162448b1b988a2ba06f0f2e10103

2
vendor/nim-secp256k1 vendored

@ -1 +1 @@
Subproject commit ac96054870eb7cbc2cf72dd03fe5d5336b2e5dd9 Subproject commit 67ebdfa8014e1c6011f14d7fc5eb341684eb3b32

2
vendor/nim-serialization vendored

@ -1 +1 @@
Subproject commit 4e2ffe3f6df5b753d7b11fef83cc5ee14f296c1c Subproject commit 261de741b73601821cb6e749fc9b4092f1cc5377

2
vendor/nim-stew vendored

@ -1 +1 @@
Subproject commit 6d3e6a21caf4110d0d432b82f14e41e0271cd76b Subproject commit 6bcb21184aeb96ce6c62e187a64d678b74609f1e

2
vendor/nim-web3 vendored

@ -1 +1 @@
Subproject commit dde382f70e811d964a000bdd4d86151615f9d4c0 Subproject commit 21b465fcd58460e6018dcb1048254f2514696778

2
vendor/nimbus-build-system vendored

@ -1 +1 @@
Subproject commit 9c4c4d3acf8f13e8d973180548837cc738e14aa2 Subproject commit 2c1e94d595b80a2d247875fe813242bbe6a0ade7

2
vendor/nimcrypto vendored

@ -1 +1 @@
Subproject commit a065c1741836462762d18d2fced1fedd46095b02 Subproject commit b602bd469b66f6968f1d1b474f843a75d1ca6627

2
waku/common/wakubridge.nim
View File

@ -42,7 +42,7 @@ proc startWakuV1(config: WakuNodeConf, rng: ref BrHmacDrbgContext):
udpPort: Port(config.udpPort + config.portsShift)) udpPort: Port(config.udpPort + config.portsShift))
# Set-up node # Set-up node
var node = newEthereumNode(config.nodekeyv1, address, 1, nil, clientIdV1, var node = newEthereumNode(config.nodekeyv1, address, NetworkId(1), nil, clientIdV1,
addAllCapabilities = false, rng = rng) addAllCapabilities = false, rng = rng)
node.addCapability Waku # Always enable Waku protocol node.addCapability Waku # Always enable Waku protocol
# Set up the Waku configuration. # Set up the Waku configuration.

2
waku/v1/node/wakunode1.nim
View File

@ -27,7 +27,7 @@ proc run(config: WakuNodeConf, rng: ref BrHmacDrbgContext) =
udpPort: Port(config.udpPort + config.portsShift)) udpPort: Port(config.udpPort + config.portsShift))
# Set-up node # Set-up node
var node = newEthereumNode(config.nodekey, address, 1, nil, clientId, var node = newEthereumNode(config.nodekey, address, NetworkId(1), nil, clientId,
addAllCapabilities = false, rng = rng) addAllCapabilities = false, rng = rng)
if not config.bootnodeOnly: if not config.bootnodeOnly:
node.addCapability Waku # Always enable Waku protocol node.addCapability Waku # Always enable Waku protocol