Move from multihash to multiformats library (#418)

And bump cas-client to nextjournal/cas-client@4eefd77 (which is also using multihash).

Fixes #417.

Co-authored-by: Paolo Holinski <[email protected]>
Co-authored-by: Martin Kavalar <[email protected]>

Author: 3 people

bb.edn

@@ -1,9 +1,7 @@
 {:min-bb-version "0.9.159"
  :paths ["bb"]
  :deps {io.github.nextjournal/dejavu {:git/sha "4980e0cc18c9b09fb220874ace94ba6b57a749ca"}
-        io.github.nextjournal/cas-client {:git/sha "534d8c6679cc005fd9ad99cfe3d5aeaa6411aee8"}
-        mvxcvi/multihash {:git/url "https://github.com/borkdude/clj-multihash"
-                          :git/sha "7cd4d1fc1301aeea36d5ba80e65ebe2fdbaaa392"}}
+        io.github.nextjournal/cas-client {:git/sha "4eefd77dd981b908591d91d518ba3f43bd8c361e"}}
  :tasks
  {:requires
   ([tasks :as t]

deps.edn

@@ -13,8 +13,8 @@
         io.github.nextjournal/dejavu {:git/sha "4980e0cc18c9b09fb220874ace94ba6b57a749ca"}
 
         com.taoensso/nippy {:mvn/version "3.2.0"}
-        mvxcvi/multihash {:mvn/version "2.0.3"}
-        javax.xml.bind/jaxb-api {:mvn/version "2.3.1"} ;; needed to make multihash work on JDK11+
+
+        mvxcvi/multiformats {:mvn/version "0.2.1"}
         com.pngencoder/pngencoder {:mvn/version "0.13.1"}
 
         http-kit/http-kit {:mvn/version "2.6.0"}
@@ -41,7 +41,7 @@
                               binaryage/devtools {:mvn/version "1.0.3"}
                               cider/cider-nrepl {:mvn/version "0.29.0"}
                               com.clojure-goes-fast/clj-async-profiler {:mvn/version "1.0.3"}
-                              io.github.nextjournal/cas-client {:git/sha "534d8c6679cc005fd9ad99cfe3d5aeaa6411aee8"}
+                              io.github.nextjournal/cas-client {:git/sha "4eefd77dd981b908591d91d518ba3f43bd8c361e"}
                               org.slf4j/slf4j-nop {:mvn/version "1.7.36"}
                               org.babashka/cli {:mvn/version "0.5.40"}}
                  :extra-paths ["dev" "notebooks"]
@@ -70,9 +70,10 @@
                                io.github.nextjournal/clerk-slideshow {:git/sha "5fe197ca0c8f28128379849dc677cd718be71524"}}}
 
            :build {:deps {io.github.nextjournal/clerk {:local/root "."}
-                          io.github.nextjournal/cas-client {:git/sha "534d8c6679cc005fd9ad99cfe3d5aeaa6411aee8"}
+                          ;; :exclusions needed until https://github.com/greglook/clj-multiformats/pull/2 is merged
+                          io.github.nextjournal/cas-client {:git/sha "4eefd77dd981b908591d91d518ba3f43bd8c361e"
+                                                            :exclusions [mvxcvi/multiformats]}
                           io.github.clojure/tools.build {:git/tag "v0.6.1" :git/sha "515b334"}
-                          io.github.slipset/deps-deploy {:git/sha "b4359c5d67ca002d9ed0c4b41b710d7e5a82e3bf"}
-                          mvxcvi/multihash {:mvn/version "2.0.3"}}
+                          io.github.slipset/deps-deploy {:git/sha "b4359c5d67ca002d9ed0c4b41b710d7e5a82e3bf"}}
                    :extra-paths ["bb" "src" "resources"] ;; for loading lookup-url in build
                    :ns-default build}}}

src/nextjournal/clerk/analyzer.clj

@@ -12,8 +12,8 @@
             [clojure.tools.analyzer.ast :as ana-ast]
             [clojure.tools.analyzer.jvm :as ana-jvm]
             [clojure.tools.analyzer.utils :as ana-utils]
-            [multihash.core :as multihash]
-            [multihash.digest :as digest]
+            [multiformats.base.b58 :as b58]
+            [multiformats.hash :as hash]
             [nextjournal.clerk.parser :as parser]
             [nextjournal.clerk.classpath :as cp]
             [nextjournal.clerk.config :as config]
@@ -46,7 +46,10 @@
 #_(no-cache? '^{:nextjournal.clerk/no-cache false} (def ^:nextjournal.clerk/no-cache my-rand (rand-int 10)))
 
 (defn sha1-base58 [s]
-  (-> s digest/sha1 multihash/base58))
+  (->> s hash/sha1 hash/encode b58/format-btc))
+
+(defn sha2-base58 [s]
+  (->> s hash/sha2-512 hash/encode b58/format-btc))
 
 #_(sha1-base58 "hello")
 
@@ -265,7 +268,7 @@
   (let [id->count @!id->count
         id (if var
              var
-             (let [hash-fn #(-> % nippy/fast-freeze digest/sha1 multihash/base58)]
+             (let [hash-fn #(-> % nippy/fast-freeze sha1-base58)]
                (symbol (str *ns*)
                        (case type
                          :code (str "anon-expr-" (hash-fn (cond-> form (instance? clojure.lang.IObj form) (with-meta {}))))
@@ -587,12 +590,11 @@
   ([value] (valuehash :sha512 value))
   ([hash-type value]
    (let [digest-fn (case hash-type
-                     :sha1 digest/sha1
-                     :sha512 digest/sha2-512)]
+                     :sha1 sha1-base58
+                     :sha512 sha2-base58)]
      (-> value
          nippy/fast-freeze
-         digest-fn
-         multihash/base58))))
+         digest-fn))))
 
 #_(valuehash (range 100))
 #_(valuehash :sha1 (range 100))

src/nextjournal/clerk/eval.clj

@@ -4,8 +4,7 @@
             [clojure.java.io :as io]
             [clojure.main :as main]
             [clojure.string :as str]
-            [multihash.core :as multihash]
-            [multihash.digest :as digest]
+            [multiformats.base.b58 :as b58]
             [nextjournal.clerk.analyzer :as analyzer]
             [nextjournal.clerk.config :as config]
             [nextjournal.clerk.parser :as parser]
@@ -32,13 +31,13 @@
 
 (defn wrapped-with-metadata [value hash]
   (cond-> {:nextjournal/value value}
-    hash (assoc :nextjournal/blob-id (cond-> hash (not (string? hash)) multihash/base58))))
+    hash (assoc :nextjournal/blob-id (cond-> hash (not (string? hash)) b58/format-btc))))
 
 #_(wrap-with-blob-id :test "foo")
 
 (defn hash+store-in-cas! [x]
   (let [^bytes ba (nippy/freeze x)
-        multihash (multihash/base58 (digest/sha2-512 ba))
+        multihash (analyzer/sha2-base58 ba)
         file (->cache-file multihash)]
     (when-not (fs/exists? file)
       (with-open [out (io/output-stream (io/file file))]

src/nextjournal/clerk/viewer.cljc

@@ -7,8 +7,6 @@
             #?@(:clj [[babashka.fs :as fs]
                       [clojure.repl :refer [demunge]]
                       [editscript.edit]
-                      [multihash.core :as multihash]
-                      [multihash.digest :as digest]
                       [nextjournal.clerk.config :as config]
                       [nextjournal.clerk.analyzer :as analyzer]]
                 :cljs [[goog.crypt]
@@ -406,7 +404,7 @@
 #?(:clj
    (defn store+get-cas-url! [{:keys [out-path ext]} content]
      (assert out-path) (assert ext)
-     (let [cas-url (str "_data/" (multihash/base58 (digest/sha2-512 content)) "." ext)
+     (let [cas-url (str "_data/" (analyzer/sha2-base58 content) "." ext)
            cas-path (fs/path out-path cas-url)]
        (fs/create-dirs (fs/parent cas-path))
        (when-not (fs/exists? cas-path)