Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 11 additions & 6 deletions beacon_chain/networking/eth2_network.nim
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ type
NetworkStateInitializer* = proc(network: Eth2Node): RootRef {.gcsafe, raises: [].}
OnPeerConnectedHandler* = proc(peer: Peer, incoming: bool): Future[void] {.async: (raises: [CancelledError]).}
OnPeerDisconnectedHandler* = proc(peer: Peer): Future[void] {.async: (raises: [CancelledError]).}
ThunkProc* = LPProtoHandler
MounterProc* = proc(network: Eth2Node) {.gcsafe, raises: [].}
MessageContentPrinter* = proc(msg: pointer): string {.gcsafe, raises: [].}

Expand Down Expand Up @@ -1896,7 +1895,10 @@ proc new(T: type Eth2Node,
quota: TokenBucket.new(maxGlobalQuota, fullReplenishTime)
)

proc peerHook(peerId: PeerId, event: ConnEvent): Future[void] {.gcsafe.} =
proc peerHook(
peerId: PeerId,
event: ConnEvent
): Future[void] {.async: (raises: [CancelledError], raw: true), gcsafe.} =
onConnEvent(node, peerId, event)

switch.addConnEventHandler(peerHook, ConnEventKind.Connected)
Expand Down Expand Up @@ -2097,10 +2099,13 @@ proc p2pProtocolBackendImpl*(p: P2PProtocol): Backend =
`userHandlerCall`

proc `protocolMounterName`(`networkVar`: `Eth2Node`) {.raises: [].} =
proc snappyThunk(`streamVar`: `Connection`,
`protocolVar`: string): Future[void] {.gcsafe.} =
return handleIncomingStream(`networkVar`, `streamVar`, `protocolVar`,
`MsgStrongRecName`)
proc snappyThunk(
`streamVar`: `Connection`,
`protocolVar`: string
): Future[void] {.
async: (raises: [CancelledError], raw: true), gcsafe.} =
handleIncomingStream(
`networkVar`, `streamVar`, `protocolVar`, `MsgStrongRecName`)

try:
mount `networkVar`.switch,
Expand Down
2 changes: 1 addition & 1 deletion vendor/nim-libp2p
Submodule nim-libp2p updated 99 files
+0 −12 .github/scripts/colors.sh
+0 −4 .github/scripts/commit_check.sh
+0 −30 .github/scripts/parse_commits.sh
+8 −0 .github/workflows/ci.yml
+0 −77 .github/workflows/commit_lint.yml
+3 −0 .github/workflows/interop.yml
+7 −14 .github/workflows/linters.yml
+1 −0 .pinned
+2 −3 README.md
+16 −9 examples/circuitrelay.nim
+11 −6 examples/directchat.nim
+11 −6 examples/helloworld.nim
+9 −4 examples/tutorial_2_customproto.nim
+12 −6 examples/tutorial_3_protobuf.nim
+1 −2 examples/tutorial_4_gossipsub.nim
+9 −3 examples/tutorial_5_discovery.nim
+22 −21 examples/tutorial_6_game.nim
+3 −2 libp2p.nimble
+37 −29 libp2p/connmanager.nim
+3 −6 libp2p/crypto/hkdf.nim
+261 −50 libp2p/daemon/daemonapi.nim
+13 −5 libp2p/daemon/transpool.nim
+10 −6 libp2p/dial.nim
+81 −58 libp2p/dialer.nim
+19 −9 libp2p/discovery/discoverymngr.nim
+6 −2 libp2p/discovery/rendezvousinterface.nim
+2 −0 libp2p/muxers/mplex/lpchannel.nim
+1 −1 libp2p/muxers/mplex/mplex.nim
+1 −1 libp2p/muxers/muxer.nim
+8 −5 libp2p/muxers/yamux/yamux.nim
+1 −1 libp2p/nameresolving/dnsresolver.nim
+2 −2 libp2p/peerinfo.nim
+10 −1 libp2p/peerstore.nim
+37 −8 libp2p/protocols/connectivity/autonat/client.nim
+26 −14 libp2p/protocols/connectivity/autonat/server.nim
+26 −12 libp2p/protocols/connectivity/autonat/service.nim
+1 −1 libp2p/protocols/connectivity/dcutr/client.nim
+3 −1 libp2p/protocols/connectivity/dcutr/core.nim
+4 −1 libp2p/protocols/connectivity/dcutr/server.nim
+35 −18 libp2p/protocols/connectivity/relay/client.nim
+32 −17 libp2p/protocols/connectivity/relay/relay.nim
+54 −26 libp2p/protocols/connectivity/relay/rtransport.nim
+10 −5 libp2p/protocols/connectivity/relay/utils.nim
+13 −4 libp2p/protocols/identify.nim
+1 −1 libp2p/protocols/perf/client.nim
+4 −2 libp2p/protocols/perf/server.nim
+7 −2 libp2p/protocols/ping.nim
+11 −7 libp2p/protocols/protocol.nim
+4 −5 libp2p/protocols/pubsub/floodsub.nim
+5 −6 libp2p/protocols/pubsub/gossipsub.nim
+1 −2 libp2p/protocols/pubsub/gossipsub/behavior.nim
+10 −4 libp2p/protocols/pubsub/pubsub.nim
+4 −4 libp2p/protocols/pubsub/pubsubpeer.nim
+4 −4 libp2p/protocols/pubsub/rpc/message.nim
+59 −31 libp2p/protocols/rendezvous.nim
+1 −1 libp2p/protocols/secure/plaintext.nim
+2 −2 libp2p/protocols/secure/secure.nim
+41 −19 libp2p/services/autorelayservice.nim
+27 −12 libp2p/services/hpservice.nim
+6 −4 libp2p/services/wildcardresolverservice.nim
+1 −2 libp2p/stream/bufferstream.nim
+1 −0 libp2p/stream/lpstream.nim
+61 −28 libp2p/switch.nim
+48 −26 libp2p/transports/quictransport.nim
+182 −206 libp2p/transports/tcptransport.nim
+562 −0 libp2p/transports/tls/certificate.nim
+68 −40 libp2p/transports/tortransport.nim
+30 −5 libp2p/transports/transport.nim
+56 −36 libp2p/transports/wstransport.nim
+1 −17 libp2p/utility.nim
+13 −9 libp2p/utils/future.nim
+4 −4 libp2p/utils/semaphore.nim
+4 −3 libp2p/wire.nim
+102 −48 tests/commoninterop.nim
+4 −0 tests/hole-punching-interop/Dockerfile
+2 −2 tests/pubsub/testgossipsub.nim
+2 −2 tests/pubsub/testgossipsub2.nim
+6 −2 tests/pubsub/utils.nim
+4 −2 tests/stubs/autonatclientstub.nim
+2 −2 tests/stubs/switchstub.nim
+16 −8 tests/testautonat.nim
+10 −10 tests/testautonatservice.nim
+3 −1 tests/testdaemon.nim
+6 −6 tests/testdcutr.nim
+23 −0 tests/testdialer.nim
+3 −1 tests/testfuture.nim
+2 −2 tests/testhpservice.nim
+2 −4 tests/testinterop.nim
+60 −18 tests/testmultistream.nim
+11 −5 tests/testnoise.nim
+3 −1 tests/testpeerinfo.nim
+14 −7 tests/testping.nim
+14 −6 tests/testrelayv1.nim
+132 −71 tests/testrelayv2.nim
+6 −6 tests/testrendezvous.nim
+94 −42 tests/testswitch.nim
+14 −8 tests/testtortransport.nim
+4 −0 tests/transport-interop/Dockerfile
+20 −0 tests/transports/tls/testcertificate.nim