Merge pull request #28 from CicadaBank/fix/derive-path-nested-macro

Solve issue #27

Author: puchka

src/bips/bip32.clj

@@ -133,20 +133,25 @@
   :index 1000000000,
   :depth 5}`"
   [seed chain-path key-type]
-  (let [path-parts (str/split chain-path #"/")]
-    (loop [current-node (if (= "m" (first path-parts))
-                          `(derive-master-node ~seed)
-                          (throw (Exception.
-                                   (str "Invalid path: " (first path-parts)))))
-           parts (rest path-parts)]
-      (if (seq parts)
-        (let [part (first parts)
-              index (if (hardened? part)
-                      (hardened (Integer/parseInt (subs part 0 (- (count part) 1))))
-                      (Integer/parseInt part))]
-          (recur
-            `(CKDpriv ~current-node ~index)
-            (rest parts)))
-        (if (= :public key-type)
-          `(N ~current-node)
-          current-node)))))
+  (let [path-parts (gensym 'path-parts)
+        part (gensym 'part)
+        parts (gensym 'parts)
+        current-node (gensym 'current-node)
+        index (gensym 'index)]
+    `(let [~path-parts (str/split ~chain-path #"/")]
+       (loop [~current-node (if (= "m" (first ~path-parts))
+                              (derive-master-node ~seed)
+                              (throw (Exception.
+                                       (str "Invalid path: " (first ~path-parts)))))
+              ~parts (rest ~path-parts)]
+         (if (seq ~parts)
+           (let [~part (first ~parts)
+                 ~index (if (hardened? ~part)
+                          (hardened (Integer/parseInt (subs ~part 0 (- (count ~part) 1))))
+                          (Integer/parseInt ~part))]
+             (recur
+               (CKDpriv ~current-node ~index)
+               (rest ~parts)))
+           (if (= :public ~key-type)
+             (N ~current-node)
+             ~current-node))))))

test/bips/bip32_test.clj

@@ -78,8 +78,8 @@
        (doseq [i# (range (count (:derived-keys ~tv)))]
          (let [derived-key# (nth (:derived-keys ~tv) i#)
                path# (:path derived-key#)
-               extended-private-key# (eval `(derive-path ~seed# ~path# :private))
-               extended-public-key# (eval `(derive-path ~seed# ~path# :public))
+               extended-private-key# (derive-path seed# path# :private)
+               extended-public-key# (derive-path seed# path# :public)
                bip32-xprvkey# (:bip32-xprvkey derived-key#)
                bip32-xpubkey# (:bip32-xpubkey derived-key#)
                identifier# (:identifier derived-key#)
@@ -652,5 +652,13 @@
     (is (= "xpub6CTydV5ab9iSEgfY4hQqofu9YJiijeUs89T6jADgvA32Mk4oTvaV4pUJahHAGizYy2s3HyBRX1uiN2d94RsMawEgTMmRuDHLUR71EayS34i"
            bip32-xpub-grand-grandchild-public-key))))
 
+(deftest threading-macro-works-with-derive-path
+  (is (= (let [key "000102030405060708090a0b0c0d0e0f"
+               path "m/0H/1/2H/2/1000000000"
+               key-type :private]
+           (-> key
+               (derive-path path key-type)))
+         (derive-path "000102030405060708090a0b0c0d0e0f" "m/0H/1/2H/2/1000000000" :private))))
+
 (comment
   (clojure.test/run-all-tests))