Merge pull request #104 from codex-storage/update-to-nim-2-x

Update to nim 2 x

Author: emizzle

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        nim: [1.6.18]
+        nim: [2.0.14]
         os: [ubuntu-latest, macOS-latest, windows-latest]
     steps:
     - name: Checkout

.gitignore

@@ -13,3 +13,4 @@ NimBinaries
 .update.timestamp
 *.dSYM
 .vscode/*
+nimbledeps

codexdht.nimble

@@ -1,24 +1,25 @@
 # Package
 
-version       = "0.4.0"
+version       = "0.5.0"
 author        = "Status Research & Development GmbH"
 description   = "DHT based on Eth discv5 implementation"
 license       = "MIT"
 skipDirs      = @["tests"]
 
 # Dependencies
-requires "secp256k1#2acbbdcc0e63002a013fff49f015708522875832" # >= 0.5.2 & < 0.6.0
-requires "protobuf_serialization" # >= 0.2.0 & < 0.3.0
-requires "nimcrypto >= 0.5.4"
-requires "bearssl == 0.2.5"
+requires "nim >= 2.0.14 & < 3.0.0"
+requires "secp256k1 >= 0.6.0 & < 0.7.0"
+requires "protobuf_serialization >= 0.3.0 & < 0.4.0"
+requires "nimcrypto >= 0.6.2 & < 0.7.0"
+requires "bearssl >= 0.2.5 & < 0.3.0"
 requires "chronicles >= 0.10.2 & < 0.11.0"
 requires "chronos >= 4.0.3 & < 4.1.0"
-requires "libp2p == 1.5.0"
-requires "metrics"
-requires "stew#head"
-requires "stint"
-requires "https://github.com/codex-storage/nim-datastore >= 0.1.1 & < 0.2.0"
-requires "questionable"
+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 "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"
 
 task testAll, "Run all test suites":
   exec "nimble install -d -y"

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

@@ -11,7 +11,7 @@
 ## https://github.com/ethereum/devp2p/blob/master/discv5/discv5-theory.md#sessions
 ##
 
-{.push raises: [Defect].}
+{.push raises: [].}
 
 import
   std/[hashes, net, options, sugar, tables],

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

@@ -15,7 +15,7 @@
 ## To select the right address, a majority count is done. This is done over a
 ## sort of moving window as votes expire after `IpVoteTimeout`.
 
-{.push raises: [Defect].}
+{.push raises: [].}
 
 import
   std/[tables, options],

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

@@ -1,6 +1,6 @@
 import std/[tables, lists, options]
 
-{.push raises: [Defect].}
+{.push raises: [].}
 
 export tables, lists, options
 

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

@@ -10,7 +10,7 @@
 ## These messages get protobuf encoded, while in the spec they get RLP encoded.
 ##
 
-{.push raises: [Defect].}
+{.push raises: [].}
 
 import
   std/[hashes, net],

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

@@ -14,6 +14,7 @@ import
   stew/endians2,
   libp2p/routing_record,
   libp2p/signed_envelope,
+  libp2p/protobuf/minprotobuf,
   "."/[messages, spr, node],
   ../../../../dht/providers_encoding
 

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

@@ -5,7 +5,7 @@
 #   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
-{.push raises: [Defect].}
+{.push raises: [].}
 
 import
   std/hashes,
@@ -28,7 +28,7 @@ type
   NodeId* = UInt256
 
   Address* = object
-    ip*: ValidIpAddress
+    ip*: IpAddress
     port*: Port
 
   Stats* = object
@@ -69,7 +69,7 @@ func newNode*(
       id: ? pk.toNodeId(),
       pubkey: pk,
       record: record,
-      address: Address(ip: ValidIpAddress.init(ip), port: port).some)
+      address: Address(ip: ip, port: port).some)
 
   ok node
 
@@ -103,7 +103,7 @@ func newNode*(r: SignedPeerRecord): Result[Node, cstring] =
       record: r,
       address: none(Address)))
 
-proc update*(n: Node, pk: PrivateKey, ip: Option[ValidIpAddress],
+proc update*(n: Node, pk: PrivateKey, ip: Option[IpAddress],
     tcpPort, udpPort: Option[Port] = none[Port]()): Result[void, cstring] =
   ? n.record.update(pk, ip, tcpPort, udpPort)
 
@@ -154,7 +154,7 @@ func shortLog*(id: NodeId): string =
       result.add(sid[i])
 chronicles.formatIt(NodeId): shortLog(it)
 
-func hash*(ip: ValidIpAddress): Hash =
+func hash*(ip: IpAddress): Hash =
   case ip.family
   of IpAddressFamily.IPv6: hash(ip.address_v6)
   of IpAddressFamily.IPv4: hash(ip.address_v4)

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

@@ -1,4 +1,4 @@
-{.push raises: [Defect].}
+{.push raises: [].}
 
 import
   std/[sets, options],