First pass in migrating from ttmath to Stint

ethp2p.nimble

@@ -13,8 +13,8 @@ requires "nim > 0.18.0",
          "secp256k1 >= 0.1.0",
          "eth_keys",
          "ranges",
-         "ttmath",
-         "https://github.com/status-im/byteutils"
+         "https://github.com/status-im/nim-stint",
+         "https://github.com/status-im/nim-byteutils"
 
 proc runTest(name: string, lang = "c") = exec "nim " & lang & " -r tests/" & name
 

ethp2p/discovery.nim

@@ -11,7 +11,7 @@
 from strutils import nil
 import asyncnet, asyncdispatch, net, times, nativesockets, algorithm, logging
 import kademlia, enode
-import eth_keys, rlp, ranges, ttmath, nimcrypto
+import eth_keys, rlp, ranges, stint, nimcrypto
 
 export Node
 

ethp2p/ethereum_types.nim

@@ -9,7 +9,7 @@
 #
 
 import
-  rlp/types, nimcrypto/hash, ttmath
+  rlp/types, nimcrypto/hash, stint
 
 export
   MDigest

ethp2p/kademlia.nim

@@ -14,7 +14,7 @@ from strutils import parseInt
 
 export sets # TODO: This should not be needed, but compilation fails otherwise
 
-import eth_keys, ttmath, nimcrypto, enode
+import eth_keys, stint, nimcrypto, enode
 
 type
   KademliaProtocol* [Wire] = ref object
@@ -156,11 +156,11 @@ proc computeSharedPrefixBits(nodes: openarray[Node]): int =
   if nodes.len < 2:
     return ID_SIZE
 
-  var mask, one: UInt256
-  mask.setZero()
-  one.setOne()
+  var mask = zero(UInt256)
+  let one = one(UInt256)
+
   for i in 1 .. ID_SIZE:
-    mask |= one shl uint64(ID_SIZE - i)
+    mask = mask or (one shl (ID_SIZE - i))
     let reference = nodes[0].id and mask
     for j in 1 .. nodes.high:
       if (nodes[j].id and mask) != reference: return i - 1
@@ -169,9 +169,7 @@ proc computeSharedPrefixBits(nodes: openarray[Node]): int =
 
 proc init(r: var RoutingTable, thisNode: Node) {.inline.} =
   r.thisNode = thisNode
-  var maxId: NodeId
-  maxId.setMax()
-  r.buckets = @[newKBucket(0.u256, maxId)]
+  r.buckets = @[newKBucket(0.u256, high(Uint256))]
 
 proc splitBucket(r: var RoutingTable, index: int) =
   let bucket = r.buckets[index]
@@ -394,7 +392,7 @@ proc lookup*(k: KademliaProtocol, nodeId: NodeId): Future[seq[Node]] {.async.} =
 
 proc lookupRandom*(k: KademliaProtocol): Future[seq[Node]] =
   var id: NodeId
-  discard randomBytes(addr id.table[0], sizeof(id.table))
+  discard randomBytes(addr id.table[0], sizeof(id.table)) ## TODO What is supposed to happen here?
   k.lookup(id)
 
 proc resolve*(k: KademliaProtocol, id: NodeId): Future[Node] {.async.} =

ethp2p/rlpx_protocols/eth.nim

@@ -9,7 +9,7 @@
 #
 
 import
-  rlp/types, ttmath, rlpx, ethereum_types
+  rlp/types, stint, rlpx, ethereum_types
 
 type
   P = UInt256