refactor: remove nimbaser and nim-base32 dependencies, use stew modules in their place (#58)

Closes issue #56.

.gitmodules

@@ -76,12 +76,6 @@
 [submodule "vendor/nim-task-runner"]
 	path = vendor/nim-task-runner
 	url = https://github.com/status-im/nim-task-runner.git
-[submodule "vendor/nbaser"]
-	path = vendor/nbaser
-	url = https://github.com/D-Nice/nbaser/
-[submodule "vendor/nim-base32"]
-	path = vendor/nim-base32
-	url = https://github.com/elktree/nim-base32
 [submodule "vendor/edn.nim"]
 	path = vendor/edn.nim
 	url = https://github.com/status-im/edn.nim

status/eth/stickers.nim

@@ -5,7 +5,6 @@ import # std libs
   json, json_serialization, chronicles, web3/ethtypes,
   stint, strutils
 from strutils import parseHexInt, parseInt
-import nbaser
 
 import # vendor libs
   json_serialization, chronicles, libp2p/[multihash, multicodec, cid], stint,

status/provider.nim

@@ -7,16 +7,14 @@ import statusgo_backend/core
 import statusgo_backend/settings as status_settings
 import json, json_serialization, sets, strutils
 import chronicles
-import nbaser
 import stew/byteutils
-from base32 import nil
+from stew/base32 import nil
+from stew/base58 import nil
 
 const HTTPS_SCHEME* = "https"
 const IPFS_GATEWAY* =  ".infura.status.im"
 const SWARM_GATEWAY* = "swarm-gateways.net"
 
-const base58* = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"
-
 logScope:
   topics = "provider-model"
 
@@ -264,19 +262,29 @@ proc postMessage*(self: ProviderModel, message: string): string =
     of RequestTypes.APIRequest: self.process(message.toAPIRequest())
     else:  """{"type":"TODO-IMPLEMENT-THIS"}""" ##################### TODO:
 
-proc ensResourceURL*(self: ProviderModel, ens: string, url: string): (string, string, string, string, bool) =
-    let contentHash = contenthash(ens)
-    if contentHash == "": # ENS does not have a content hash
-      return (url, url, HTTPS_SCHEME, "", false)
+proc ensResourceURL*(self: ProviderModel, ens: string, url: string):
+  (string, string, string, string, bool) =
 
-    let decodedHash = contentHash.decodeENSContentHash()
-    case decodedHash[0]:
+  let contentHash = contenthash(ens)
+  if contentHash == "": # ENS does not have a content hash
+    return (url, url, HTTPS_SCHEME, "", false)
+
+  let decodedHash = contentHash.decodeENSContentHash()
+
+  case decodedHash[0]:
     of ENSType.IPFS:
-      let base32Hash = base32.encode(string.fromBytes(base58.decode(decodedHash[1]))).toLowerAscii().replace("=", "")
+      let
+        base58bytes = base58.decode(base58.BTCBase58, decodedHash[1])
+        base32Hash = base32.encode(base32.Base32Lower, base58bytes)
+
       result = (url, base32Hash & IPFS_GATEWAY, HTTPS_SCHEME, "", true)
+
     of ENSType.SWARM:
-      result = (url, SWARM_GATEWAY, HTTPS_SCHEME, "/bzz:/" & decodedHash[1] & "/", true)
+      result = (url, SWARM_GATEWAY, HTTPS_SCHEME,
+        "/bzz:/" & decodedHash[1] & "/", true)
+
     of ENSType.IPNS:
       result = (url, decodedHash[1], HTTPS_SCHEME, "", true)
+
     else:
       warn "Unknown content for", ens, contentHash

status/updates.nim

@@ -1,8 +1,9 @@
 import ens, provider
 import stew/byteutils
-from base32 import nil
+from stew/base32 import nil
+from stew/base58 import nil
 import chronicles, httpclient, net
-import nbaser, strutils
+import strutils
 import semver
 import constants
 
@@ -13,30 +14,37 @@ type
     url*: string
 
 proc getLatestVersion*(): VersionInfo =
-    let contentHash = contenthash(APP_UPDATES_ENS)
-    if contentHash == "":
-      raise newException(ValueError, "ENS does not have a content hash")
+  let contentHash = contenthash(APP_UPDATES_ENS)
+  if contentHash == "":
+    raise newException(ValueError, "ENS does not have a content hash")
 
-    var url: string = ""
+  var url: string = ""
 
-    let decodedHash = contentHash.decodeENSContentHash()
-    case decodedHash[0]:
+  let decodedHash = contentHash.decodeENSContentHash()
+
+  case decodedHash[0]:
     of ENSType.IPFS:
-      let base32Hash = base32.encode(string.fromBytes(base58.decode(decodedHash[1]))).toLowerAscii().replace("=", "")
+      let
+        base58bytes = base58.decode(base58.BTCBase58, decodedHash[1])
+        base32Hash = base32.encode(base32.Base32Lower, base58bytes)
+
       url = "https://" & base32Hash & IPFS_GATEWAY
+
     of ENSType.SWARM:
       url = "https://" & SWARM_GATEWAY & "/bzz:/" & decodedHash[1]
+
     of ENSType.IPNS:
       url = "https://" & decodedHash[1]
+
     else:
       warn "Unknown content for", contentHash
       raise newException(ValueError, "Unknown content for " & contentHash)
 
-    # Read version from folder
-    let secureSSLContext = newContext()
-    let client = newHttpClient(sslContext = secureSSLContext, timeout = CHECK_VERSION_TIMEOUT_MS)
-    result.version = client.getContent(url & "/VERSION").strip()
-    result.url = url
+  # Read version from folder
+  let secureSSLContext = newContext()
+  let client = newHttpClient(sslContext = secureSSLContext, timeout = CHECK_VERSION_TIMEOUT_MS)
+  result.version = client.getContent(url & "/VERSION").strip()
+  result.url = url
 
 proc isNewer*(currentVersion, versionToCheck: string): bool =
   let lastVersion = parseVersion(versionToCheck)

vendor/nbaser

@@ -1 +0,0 @@
-Subproject commit 0c989e0d9580b4a6c14e11976dba3a0d503ecfcd

vendor/nim-base32

@@ -1 +0,0 @@
-Subproject commit 660680c1cbdf6b1294b669fdb8b6e9c89794cb5b