diff --git a/beacon_chain/networking/eth2_network.nim b/beacon_chain/networking/eth2_network.nim
index a1fcb3a773..b9d3d37970 100644
--- a/beacon_chain/networking/eth2_network.nim
+++ b/beacon_chain/networking/eth2_network.nim
@@ -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: [].}
 
@@ -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)
@@ -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,
diff --git a/vendor/nim-libp2p b/vendor/nim-libp2p
index b0f83fd48c..e67744bf2a 160000
--- a/vendor/nim-libp2p
+++ b/vendor/nim-libp2p
@@ -1 +1 @@
-Subproject commit b0f83fd48c90224a30679f6079af60767c30f8e1
+Subproject commit e67744bf2a3cbc14f554e63eda6c26e82701c0cd