bump stew

`results` is its own package

codexdht.nimble

@@ -16,7 +16,7 @@ requires "chronicles >= 0.10.2 & < 0.11.0"
 requires "chronos >= 4.0.3 & < 4.1.0"
 requires "libp2p >= 1.5.0 & < 2.0.0"
 requires "metrics >= 0.1.0 & < 0.2.0"
-requires "stew >= 0.2.0 & < 0.3.0"
+requires "stew >= 0.2.0"
 requires "stint >= 0.8.1 & < 0.9.0"
 requires "https://github.com/codex-storage/nim-datastore >= 0.2.0 & < 0.3.0"
 requires "questionable >= 0.10.15 & < 0.11.0"

codexdht/private/eth/p2p/discoveryv5/crypto.nim

@@ -1,7 +1,8 @@
 import
   std/sugar,
   libp2p/crypto/[crypto, secp],
-  stew/[byteutils, objects, results, ptrops]
+  stew/[byteutils, objects, ptrops],
+  results
 
 # from secp256k1 import ecdh, SkEcdhSecretSize, toRaw, SkSecretKey, SkPublicKey
 import secp256k1

codexdht/private/eth/p2p/discoveryv5/encoding.nim

@@ -18,13 +18,14 @@ import
   stew/endians2,
   bearssl/rand,
   chronicles,
-  stew/[results, byteutils],
+  stew/[byteutils],
   stint,
   libp2p/crypto/crypto as libp2p_crypto,
   libp2p/crypto/secp,
   libp2p/signed_envelope,
   metrics,
   nimcrypto,
+  results,
   "."/[messages, messages_encoding, node, spr, hkdf, sessions],
   "."/crypto
 

codexdht/private/eth/p2p/discoveryv5/node.nim

@@ -88,7 +88,9 @@ func newNode*(r: SignedPeerRecord): Result[Node, cstring] =
     nodeId = ? pk.get().toNodeId()
 
   if r.ip.isSome() and r.udp.isSome():
-    let a = Address(ip: ipv4(r.ip.get()), port: Port(r.udp.get()))
+    let a = Address(
+      ip: IpAddress(family: IPv4, address_v4: r.ip.get()), port: Port(r.udp.get())
+    )
 
     ok(Node(
       id: nodeId,

codexdht/private/eth/p2p/discoveryv5/nodes_verification.nim

@@ -1,8 +1,8 @@
 {.push raises: [].}
 
 import
-  std/[sets, options],
+  std/[net, sets, options],
-  stew/results, stew/shims/net, chronicles, chronos,
+  results, chronicles, chronos,
   "."/[node, spr, routing_table]
 
 logScope:

codexdht/private/eth/p2p/discoveryv5/protocol.nim

@@ -74,15 +74,15 @@
 {.push raises: [].}
 
 import
-  std/[tables, sets, options, math, sequtils, algorithm, strutils],
+  std/[net, tables, sets, options, math, sequtils, algorithm, strutils],
-  stew/shims/net as stewNet,
   json_serialization/std/net,
-  stew/[base64, endians2, results],
+  stew/[base64, endians2],
   pkg/[chronicles, chronicles/chronos_tools],
   pkg/chronos,
   pkg/stint,
   pkg/bearssl/rand,
-  pkg/metrics
+  pkg/metrics,
+  pkg/results
 
 import "."/[
   messages,

codexdht/private/eth/p2p/discoveryv5/providers/manager.nim

@@ -14,7 +14,6 @@ import pkg/datastore
 import pkg/chronos
 import pkg/libp2p
 import pkg/chronicles
-import pkg/stew/results as rs
 import pkg/stew/byteutils
 import pkg/questionable
 import pkg/questionable/results

codexdht/private/eth/p2p/discoveryv5/routing_table.nim

@@ -8,8 +8,8 @@
 {.push raises: [].}
 
 import
-  std/[algorithm, times, sequtils, bitops, sets, options, tables],
+  std/[algorithm, net, times, sequtils, bitops, sets, options, tables],
-  stint, chronicles, metrics, bearssl/rand, chronos, stew/shims/net as stewNet,
+  stint, chronicles, metrics, bearssl/rand, chronos,
   "."/[node, random2, spr]
 
 export options

codexdht/private/eth/p2p/discoveryv5/sessions.nim

@@ -19,8 +19,8 @@
 {.push raises: [].}
 
 import
-  std/options,
+  std/[net, options],
-  stint, stew/endians2, stew/shims/net,
+  stint, stew/endians2,
   node, lru
 
 export lru

codexdht/private/eth/p2p/discoveryv5/spr.nim

@@ -6,10 +6,10 @@
 #
 import
   chronicles,
-  std/[options, strutils, sugar],
+  results,
-  pkg/stew/[results, byteutils, arrayops],
+  std/[net, options, strutils, sugar],
+  pkg/stew/[byteutils, arrayops],
   stew/endians2,
-  stew/shims/net,
   stew/base64,
   libp2p/crypto/crypto,
   libp2p/crypto/secp,
@@ -122,9 +122,13 @@ proc update*(
                                  .mapErr((e: string) => e.cstring)
       existingIp =
         if existingNetProtoFam == MultiCodec.codec("ip6"):
-          ipv6 array[16, byte].initCopyFrom(existingNetProtoAddr)
+          IpAddress(
+            family: IPv6, address_v6: array[16, byte].initCopyFrom(existingNetProtoAddr)
+          )
         else:
-          ipv4 array[4, byte].initCopyFrom(existingNetProtoAddr)
+          IpAddress(
+            family: IPv4, address_v4: array[4, byte].initCopyFrom(existingNetProtoAddr)
+          )
 
       ipAddr = ip.get(existingIp)
 

codexdht/private/eth/p2p/discoveryv5/transport.nim

@@ -6,13 +6,12 @@
 
 # Everything below the handling of ordinary messages
 import
-  std/[tables, options, sets],
+  std/[net, tables, options, sets],
   bearssl/rand,
   chronos,
   chronicles,
   metrics,
   libp2p/crypto/crypto,
-  stew/shims/net,
   "."/[node, encoding, sessions]
 
 const