Revert "Wallet: deprecate old hash to curve (#457)" (#458)

This reverts commit b06d93c5ff.

tests/test_crypto.py

@@ -1,11 +1,12 @@
 from cashu.core.crypto.b_dhke import (
     alice_verify_dleq,
     carol_verify_dleq,
+    carol_verify_dleq_domain_separated,
     hash_e,
     hash_to_curve,
-    hash_to_curve_deprecated,
+    hash_to_curve_domain_separated,
     step1_alice,
-    step1_alice_deprecated,
+    step1_alice_domain_separated,
     step2_bob,
     step2_bob_dleq,
     step3_alice,
@@ -21,11 +22,9 @@ def test_hash_to_curve():
     )
     assert (
         result.serialize().hex()
-        == "024cce997d3b518f739663b757deaec95bcd9473c30a14ac2fd04023a739d1a725"
+        == "0266687aadf862bd776c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925"
     )
 
-
-def test_hash_to_curve_iteration():
     result = hash_to_curve(
         bytes.fromhex(
             "0000000000000000000000000000000000000000000000000000000000000001"
@@ -33,7 +32,20 @@ def test_hash_to_curve_iteration():
     )
     assert (
         result.serialize().hex()
-        == "022e7158e11c9506f1aa4248bf531298daa7febd6194f003edcd9b93ade6253acf"
+        == "02ec4916dd28fc4c10d78e287ca5d9cc51ee1ae73cbfde08c6b37324cbfaac8bc5"
+    )
+
+
+def test_hash_to_curve_iteration():
+    """This input causes multiple rounds of the hash_to_curve algorithm."""
+    result = hash_to_curve(
+        bytes.fromhex(
+            "0000000000000000000000000000000000000000000000000000000000000002"
+        )
+    )
+    assert (
+        result.serialize().hex()
+        == "02076c988b353fcbb748178ecb286bc9d0b4acf474d4ba31ba62334e46c97c416a"
     )
 
 
@@ -50,7 +62,7 @@ def test_step1():
 
     assert (
         B_.serialize().hex()
-        == "025cc16fe33b953e2ace39653efb3e7a7049711ae1d8a2f7a9108753f1cdea742b"
+        == "02a9acc1e48c25eeeb9289b5031cc57da9fe72f3fe2861d264bdc074209b107ba2"
     )
     assert blinding_factor.private_key == bytes.fromhex(
         "0000000000000000000000000000000000000000000000000000000000000001"
@@ -76,7 +88,7 @@ def test_step2():
     C_, e, s = step2_bob(B_, a)
     assert (
         C_.serialize().hex()
-        == "025cc16fe33b953e2ace39653efb3e7a7049711ae1d8a2f7a9108753f1cdea742b"
+        == "02a9acc1e48c25eeeb9289b5031cc57da9fe72f3fe2861d264bdc074209b107ba2"
     )
 
 
@@ -85,7 +97,7 @@ def test_step3():
     # C_ from test_step2
     C_ = PublicKey(
         bytes.fromhex(
-            "025cc16fe33b953e2ace39653efb3e7a7049711ae1d8a2f7a9108753f1cdea742b"
+            "02a9acc1e48c25eeeb9289b5031cc57da9fe72f3fe2861d264bdc074209b107ba2"
         ),
         raw=True,
     )
@@ -106,7 +118,7 @@ def test_step3():
 
     assert (
         C.serialize().hex()
-        == "0271bf0d702dbad86cbe0af3ab2bfba70a0338f22728e412d88a830ed0580b9de4"
+        == "03c724d7e6a5443b39ac8acf11f40420adc4f99a02e7cc1b57703d9391f6d129cd"
     )
 
 
@@ -164,11 +176,11 @@ def test_dleq_step2_bob_dleq():
     e, s = step2_bob_dleq(B_, a, p_bytes)
     assert (
         e.serialize()
-        == "a608ae30a54c6d878c706240ee35d4289b68cfe99454bbfa6578b503bce2dbe1"
+        == "9818e061ee51d5c8edc3342369a554998ff7b4381c8652d724cdf46429be73d9"
     )
     assert (
         s.serialize()
-        == "a608ae30a54c6d878c706240ee35d4289b68cfe99454bbfa6578b503bce2dbe2"
+        == "9818e061ee51d5c8edc3342369a554998ff7b4381c8652d724cdf46429be73da"
     )  # differs from e only in least significant byte because `a = 0x1`
 
     # change `a`
@@ -181,11 +193,11 @@ def test_dleq_step2_bob_dleq():
     e, s = step2_bob_dleq(B_, a, p_bytes)
     assert (
         e.serialize()
-        == "076cbdda4f368053c33056c438df014d1875eb3c8b28120bece74b6d0e6381bb"
+        == "df1984d5c22f7e17afe33b8669f02f530f286ae3b00a1978edaf900f4721f65e"
     )
     assert (
         s.serialize()
-        == "b6d41ac1e12415862bf8cace95e5355e9262eab8a11d201dadd3b6e41584ea6e"
+        == "828404170c86f240c50ae0f5fc17bb6b82612d46b355e046d7cd84b0a3c934a0"
     )
 
 
@@ -294,47 +306,36 @@ def test_dleq_carol_verify_from_bob():
     assert carol_verify_dleq(secret_msg=secret_msg, C=C, r=r, e=e, s=s, A=A)
 
 
-# TESTS FOR DEPRECATED HASH TO CURVE
+# TESTS FOR DOMAIN SEPARATED HASH TO CURVE
 
 
-def test_hash_to_curve_deprecated():
-    result = hash_to_curve_deprecated(
+def test_hash_to_curve_domain_separated():
+    result = hash_to_curve_domain_separated(
         bytes.fromhex(
             "0000000000000000000000000000000000000000000000000000000000000000"
         )
     )
     assert (
         result.serialize().hex()
-        == "0266687aadf862bd776c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925"
+        == "024cce997d3b518f739663b757deaec95bcd9473c30a14ac2fd04023a739d1a725"
     )
 
-    result = hash_to_curve_deprecated(
+
+def test_hash_to_curve_domain_separated_iterative():
+    result = hash_to_curve_domain_separated(
         bytes.fromhex(
             "0000000000000000000000000000000000000000000000000000000000000001"
         )
     )
     assert (
         result.serialize().hex()
-        == "02ec4916dd28fc4c10d78e287ca5d9cc51ee1ae73cbfde08c6b37324cbfaac8bc5"
+        == "022e7158e11c9506f1aa4248bf531298daa7febd6194f003edcd9b93ade6253acf"
     )
 
 
-def test_hash_to_curve_iteration_deprecated():
-    """This input causes multiple rounds of the hash_to_curve algorithm."""
-    result = hash_to_curve_deprecated(
-        bytes.fromhex(
-            "0000000000000000000000000000000000000000000000000000000000000002"
-        )
-    )
-    assert (
-        result.serialize().hex()
-        == "02076c988b353fcbb748178ecb286bc9d0b4acf474d4ba31ba62334e46c97c416a"
-    )
-
-
-def test_step1_deprecated():
+def test_step1_domain_separated():
     secret_msg = "test_message"
-    B_, blinding_factor = step1_alice_deprecated(
+    B_, blinding_factor = step1_alice_domain_separated(
         secret_msg,
         blinding_factor=PrivateKey(
             privkey=bytes.fromhex(
@@ -345,15 +346,15 @@ def test_step1_deprecated():
 
     assert (
         B_.serialize().hex()
-        == "02a9acc1e48c25eeeb9289b5031cc57da9fe72f3fe2861d264bdc074209b107ba2"
+        == "025cc16fe33b953e2ace39653efb3e7a7049711ae1d8a2f7a9108753f1cdea742b"
     )
     assert blinding_factor.private_key == bytes.fromhex(
         "0000000000000000000000000000000000000000000000000000000000000001"
     )
 
 
-def test_step2_deprecated():
-    B_, _ = step1_alice_deprecated(
+def test_step2_domain_separated():
+    B_, _ = step1_alice_domain_separated(
         "test_message",
         blinding_factor=PrivateKey(
             privkey=bytes.fromhex(
@@ -371,16 +372,16 @@ def test_step2_deprecated():
     C_, e, s = step2_bob(B_, a)
     assert (
         C_.serialize().hex()
-        == "02a9acc1e48c25eeeb9289b5031cc57da9fe72f3fe2861d264bdc074209b107ba2"
+        == "025cc16fe33b953e2ace39653efb3e7a7049711ae1d8a2f7a9108753f1cdea742b"
     )
 
 
-def test_step3_deprecated():
+def test_step3_domain_separated():
     # C = C_ - A.mult(r)
-    # C_ from test_step2_deprecated
+    # C_ from test_step2
     C_ = PublicKey(
         bytes.fromhex(
-            "02a9acc1e48c25eeeb9289b5031cc57da9fe72f3fe2861d264bdc074209b107ba2"
+            "025cc16fe33b953e2ace39653efb3e7a7049711ae1d8a2f7a9108753f1cdea742b"
         ),
         raw=True,
     )
@@ -401,52 +402,32 @@ def test_step3_deprecated():
 
     assert (
         C.serialize().hex()
-        == "03c724d7e6a5443b39ac8acf11f40420adc4f99a02e7cc1b57703d9391f6d129cd"
+        == "0271bf0d702dbad86cbe0af3ab2bfba70a0338f22728e412d88a830ed0580b9de4"
     )
 
 
-def test_dleq_step2_bob_dleq_deprecated():
-    B_, _ = step1_alice_deprecated(
-        "test_message",
-        blinding_factor=PrivateKey(
-            privkey=bytes.fromhex(
-                "0000000000000000000000000000000000000000000000000000000000000001"
-            ),
-            raw=True,
-        ),
-    )
+def test_dleq_carol_verify_from_bob_domain_separated():
     a = PrivateKey(
         privkey=bytes.fromhex(
             "0000000000000000000000000000000000000000000000000000000000000001"
         ),
         raw=True,
     )
-    p_bytes = bytes.fromhex(
-        "0000000000000000000000000000000000000000000000000000000000000001"
-    )  # 32 bytes
-    e, s = step2_bob_dleq(B_, a, p_bytes)
-    assert (
-        e.serialize()
-        == "9818e061ee51d5c8edc3342369a554998ff7b4381c8652d724cdf46429be73d9"
-    )
-    assert (
-        s.serialize()
-        == "9818e061ee51d5c8edc3342369a554998ff7b4381c8652d724cdf46429be73da"
-    )  # differs from e only in least significant byte because `a = 0x1`
-
-    # change `a`
-    a = PrivateKey(
+    A = a.pubkey
+    assert A
+    secret_msg = "test_message"
+    r = PrivateKey(
         privkey=bytes.fromhex(
-            "0000000000000000000000000000000000000000000000000000000000001111"
+            "0000000000000000000000000000000000000000000000000000000000000001"
         ),
         raw=True,
     )
-    e, s = step2_bob_dleq(B_, a, p_bytes)
-    assert (
-        e.serialize()
-        == "df1984d5c22f7e17afe33b8669f02f530f286ae3b00a1978edaf900f4721f65e"
-    )
-    assert (
-        s.serialize()
-        == "828404170c86f240c50ae0f5fc17bb6b82612d46b355e046d7cd84b0a3c934a0"
+    B_, _ = step1_alice_domain_separated(secret_msg, r)
+    C_, e, s = step2_bob(B_, a)
+    assert alice_verify_dleq(B_, C_, e, s, A)
+    C = step3_alice(C_, r, A)
+
+    # carol does not know B_ and C_, but she receives C and r from Alice
+    assert carol_verify_dleq_domain_separated(
+        secret_msg=secret_msg, C=C, r=r, e=e, s=s, A=A
     )