Decoupling NIP01 methods from CryptoUtils

Decoupling Encryption and Decryptions from CryptoUtils
Decoupling live instances of JNI bindings for Secp and LibSodium from CryptoUtils
Decoupling key cache from CryptoUtils
Reorganizes NIP-04 to match new package structure
Adjusts test structures to match

quartz/src/androidTest/java/com/vitorpamplona/quartz/CryptoUtilsTest.kt

@@ -1,140 +0,0 @@
-/**
- * Copyright (c) 2024 Vitor Pamplona
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
- * Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package com.vitorpamplona.quartz
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair
-import com.vitorpamplona.quartz.nip01Core.hexToByteArray
-import com.vitorpamplona.quartz.nip01Core.toHexKey
-import org.junit.Assert.assertEquals
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class CryptoUtilsTest {
-    @Test
-    fun testGetPublicFromPrivateKey() {
-        val privateKey =
-            "f410f88bcec6cbfda04d6a273c7b1dd8bba144cd45b71e87109cfa11dd7ed561".hexToByteArray()
-        val publicKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
-        assertEquals("7d4b8806f1fd713c287235411bf95aa81b7242ead892733ec84b3f2719845be6", publicKey)
-    }
-
-    @Test
-    fun testSharedSecretCompatibilityWithCoracle() {
-        val privateKey = "f410f88bcec6cbfda04d6a273c7b1dd8bba144cd45b71e87109cfa11dd7ed561"
-        val publicKey = "765cd7cf91d3ad07423d114d5a39c61d52b2cdbc18ba055ddbbeec71fbe2aa2f"
-
-        val key =
-            CryptoUtils.nip44.v1.getSharedSecret(
-                privateKey = privateKey.hexToByteArray(),
-                pubKey = publicKey.hexToByteArray(),
-            )
-
-        assertEquals("577c966f499dddd8e8dcc34e8f352e283cc177e53ae372794947e0b8ede7cfd8", key.toHexKey())
-    }
-
-    @Test
-    fun testSharedSecret() {
-        val sender = KeyPair()
-        val receiver = KeyPair()
-
-        val sharedSecret1 = CryptoUtils.nip44.v1.getSharedSecret(sender.privKey!!, receiver.pubKey)
-        val sharedSecret2 = CryptoUtils.nip44.v1.getSharedSecret(receiver.privKey!!, sender.pubKey)
-
-        assertEquals(sharedSecret1.toHexKey(), sharedSecret2.toHexKey())
-
-        val secretKey1 = KeyPair(privKey = sharedSecret1)
-        val secretKey2 = KeyPair(privKey = sharedSecret2)
-
-        assertEquals(secretKey1.pubKey.toHexKey(), secretKey2.pubKey.toHexKey())
-        assertEquals(secretKey1.privKey?.toHexKey(), secretKey2.privKey?.toHexKey())
-    }
-
-    @Test
-    fun encryptDecryptNIP4Test() {
-        val msg = "Hi"
-
-        val privateKey = CryptoUtils.privkeyCreate()
-        val publicKey = CryptoUtils.pubkeyCreate(privateKey)
-
-        val encrypted = CryptoUtils.encryptNIP04(msg, privateKey, publicKey)
-        val decrypted = CryptoUtils.decryptNIP04(encrypted, privateKey, publicKey)
-
-        assertEquals(msg, decrypted)
-    }
-
-    @Test
-    fun encryptDecryptNIP44v1Test() {
-        val msg = "Hi"
-
-        val privateKey = CryptoUtils.privkeyCreate()
-        val publicKey = CryptoUtils.pubkeyCreate(privateKey)
-
-        val encrypted = CryptoUtils.nip44.v1.encrypt(msg, privateKey, publicKey)
-        val decrypted = CryptoUtils.nip44.v1.decrypt(encrypted, privateKey, publicKey)
-
-        assertEquals(msg, decrypted)
-    }
-
-    @Test
-    fun encryptSharedSecretDecryptNIP4Test() {
-        val msg = "Hi"
-
-        val privateKey = CryptoUtils.privkeyCreate()
-        val publicKey = CryptoUtils.pubkeyCreate(privateKey)
-
-        val encrypted = CryptoUtils.encryptNIP04(msg, privateKey, publicKey)
-        val decrypted = CryptoUtils.decryptNIP04(encrypted, privateKey, publicKey)
-
-        assertEquals(msg, decrypted)
-    }
-
-    @Test
-    fun encryptSharedSecretDecryptNIP44v1Test() {
-        val msg = "Hi"
-
-        val privateKey = CryptoUtils.privkeyCreate()
-        val publicKey = CryptoUtils.pubkeyCreate(privateKey)
-        val sharedSecret = CryptoUtils.nip44.v1.getSharedSecret(privateKey, publicKey)
-
-        val encrypted = CryptoUtils.nip44.v1.encrypt(msg, sharedSecret)
-        val decrypted = CryptoUtils.nip44.v1.decrypt(encrypted, sharedSecret)
-
-        assertEquals(msg, decrypted)
-    }
-
-    @Test
-    fun signString() {
-        val random = "319cc5596fdd6cd767e5a59d976e8e059c61306af90dff1e6ee1067b3a1fdbc0".hexToByteArray()
-        val message = "8e58c8251bb406b6ded69e9eb14f55282a9a53bdab16fc49a3218c2ad3abc887".hexToByteArray()
-        val keyPair = KeyPair("a5ab474552c8f9c46c2eda5a0b68f27430ad81f96cb405e0cb4e34bf0c6494a2".hexToByteArray())
-
-        val signedMessage = CryptoUtils.sign(message, keyPair.privKey!!, random).toHexKey()
-        val expectedValue = "0f9be7e01ba53d5ee6874b9180c7956269fda7a5be424634c3d17b5cfcea6da001be89183876415ba08b7dafa6cff4555e393dc228fb8769b384344e9a27b77c"
-        assertEquals(expectedValue, signedMessage)
-
-        val message2 = "Hello"
-        val signedMessage2 = CryptoUtils.signString(message2, keyPair.privKey!!, random).toHexKey()
-        val expectedValue2 = "7ec8194a585bfb513564113b6b7bfeaafa0254c99d24eaf92280657c2291bab908b1b7bc553c83276a0254aef5041bbe6a50e93381edc4de3d859efa1c3a5a1e"
-        assertEquals(expectedValue2, signedMessage2)
-    }
-}

quartz/src/androidTest/java/com/vitorpamplona/quartz/bloom/BloomFilter.kt

@@ -21,9 +21,10 @@
 package com.vitorpamplona.quartz.bloom
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.vitorpamplona.quartz.CryptoUtils
 import com.vitorpamplona.quartz.nip01Core.HexKey
+import com.vitorpamplona.quartz.nip01Core.crypto.Nip01
 import com.vitorpamplona.quartz.nip01Core.hexToByteArray
+import com.vitorpamplona.quartz.utils.RandomInstance
 import junit.framework.TestCase.assertEquals
 import junit.framework.TestCase.assertFalse
 import junit.framework.TestCase.assertTrue
@@ -41,7 +42,7 @@ class BloomFilter(
     private val size: Int,
     private val rounds: Int,
     private val bits: BitSet = BitSet(size),
-    private val salt: ByteArray = CryptoUtils.random(8),
+    private val salt: ByteArray = RandomInstance.bytes(8),
 ) {
     private val hash = MessageDigest.getInstance("SHA-256")
     private val lock = ReentrantReadWriteLock()
@@ -135,7 +136,7 @@ class BloomFilterTest {
 
         var failureCounter = 0
         for (seed in 0..1000000) {
-            if (bloomFilter.mightContains(CryptoUtils.pubkeyCreate(CryptoUtils.privkeyCreate()))) {
+            if (bloomFilter.mightContains(Nip01.pubKeyCreate(Nip01.privKeyCreate()))) {
                 failureCounter++
             }
         }

quartz/src/androidTest/java/com/vitorpamplona/quartz/nip01Core/Nip01Test.kt

@@ -22,25 +22,23 @@ package com.vitorpamplona.quartz.nip01Core
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.vitorpamplona.quartz.nip01Core.crypto.Nip01
-import com.vitorpamplona.quartz.utils.sha256Hash
-import fr.acinq.secp256k1.Secp256k1
+import com.vitorpamplona.quartz.utils.Secp256k1Instance
+import com.vitorpamplona.quartz.utils.sha256
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.security.SecureRandom
 
 @RunWith(AndroidJUnit4::class)
 class Nip01Test {
-    private val nip01 = Nip01(Secp256k1.get(), SecureRandom())
     private val privateKey = "f410f88bcec6cbfda04d6a273c7b1dd8bba144cd45b71e87109cfa11dd7ed561".hexToByteArray()
 
     @Test
     fun testGetPublicFromPrivateKey() {
         assertEquals(
             "7d4b8806f1fd713c287235411bf95aa81b7242ead892733ec84b3f2719845be6",
-            nip01.pubkeyCreate(privateKey).toHexKey(),
+            Nip01.pubKeyCreate(privateKey).toHexKey(),
         )
     }
 
@@ -49,7 +47,7 @@ class Nip01Test {
         val key = "e6159851715b4aa6190c22b899b0c792847de0a4435ac5b678f35738351c43b0".hexToByteArray()
         assertEquals(
             "029fa4ce8c87ca546b196e6518db80a6780e1bd5552b61f9f17bafee5d4e34e09b",
-            nip01.compressedPubkeyCreate(key).toHexKey(),
+            Secp256k1Instance.compressedPubKeyFor(key).toHexKey(),
         )
     }
 
@@ -58,7 +56,7 @@ class Nip01Test {
         val key = "65f039136f8da8d3e87b4818746b53318d5481e24b2673f162815144223a0b5a".hexToByteArray()
         assertEquals(
             "033dcef7585efbdb68747d919152bd481e21f5e952aaaef5a19604fbd096a93dd5",
-            nip01.compressedPubkeyCreate(key).toHexKey(),
+            Secp256k1Instance.compressedPubKeyFor(key).toHexKey(),
         )
     }
 
@@ -66,7 +64,7 @@ class Nip01Test {
     fun testDeterministicSign() {
         assertEquals(
             "1484d0e0bd62165e822e31f1f4cc8e1ce8e20c30a060e24fb0ecd7baf7c624f661fb7a3e4f0ddb43018e5f0b4892c929af64d8b7a86021aa081ec8231e3dfa37",
-            nip01.signDeterministic(sha256Hash("Test".toByteArray()), privateKey).toHexKey(),
+            Nip01.sign(sha256("Test".toByteArray()), privateKey, null).toHexKey(),
         )
     }
 
@@ -74,17 +72,17 @@ class Nip01Test {
     fun testSha256() {
         assertEquals(
             "532eaabd9574880dbf76b9b8cc00832c20a6ec113d682299550d7a6e0f345e25",
-            sha256Hash("Test".toByteArray()).toHexKey(),
+            sha256("Test".toByteArray()).toHexKey(),
         )
     }
 
     @Test
     fun testDeterministicVerify() {
         assertTrue(
-            nip01.verify(
+            Nip01.verify(
                 "1484d0e0bd62165e822e31f1f4cc8e1ce8e20c30a060e24fb0ecd7baf7c624f661fb7a3e4f0ddb43018e5f0b4892c929af64d8b7a86021aa081ec8231e3dfa37".hexToByteArray(),
-                sha256Hash("Test".toByteArray()),
-                nip01.pubkeyCreate(privateKey),
+                sha256("Test".toByteArray()),
+                Nip01.pubKeyCreate(privateKey),
             ),
         )
     }
@@ -93,18 +91,18 @@ class Nip01Test {
     fun testNonDeterministicSign() {
         assertNotEquals(
             "1484d0e0bd62165e822e31f1f4cc8e1ce8e20c30a060e24fb0ecd7baf7c624f661fb7a3e4f0ddb43018e5f0b4892c929af64d8b7a86021aa081ec8231e3dfa37",
-            nip01.sign(sha256Hash("Test".toByteArray()), privateKey).toHexKey(),
+            Nip01.sign(sha256("Test".toByteArray()), privateKey).toHexKey(),
         )
     }
 
     @Test
     fun testNonDeterministicSignVerify() {
-        val signature = nip01.sign(sha256Hash("Test".toByteArray()), privateKey)
+        val signature = Nip01.sign(sha256("Test".toByteArray()), privateKey)
         assertTrue(
-            nip01.verify(
+            Nip01.verify(
                 signature,
-                sha256Hash("Test".toByteArray()),
-                nip01.pubkeyCreate(privateKey),
+                sha256("Test".toByteArray()),
+                Nip01.pubKeyCreate(privateKey),
             ),
         )
     }

quartz/src/androidTest/java/com/vitorpamplona/quartz/nip01Core/crypto/Nip01CryptoTest.kt

@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) 2024 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.quartz.nip01Core.crypto
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.vitorpamplona.quartz.nip01Core.hexToByteArray
+import com.vitorpamplona.quartz.nip01Core.toHexKey
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class Nip01CryptoTest {
+    @Test
+    fun testGetPublicFromPrivateKey() {
+        val privateKey =
+            "f410f88bcec6cbfda04d6a273c7b1dd8bba144cd45b71e87109cfa11dd7ed561".hexToByteArray()
+        val publicKey = Nip01.pubKeyCreate(privateKey).toHexKey()
+        assertEquals("7d4b8806f1fd713c287235411bf95aa81b7242ead892733ec84b3f2719845be6", publicKey)
+    }
+}

quartz/src/androidTest/java/com/vitorpamplona/quartz/nip04Dm/EncryptionTest.kt

@@ -23,21 +23,19 @@ package com.vitorpamplona.quartz.nip04Dm
 import com.vitorpamplona.quartz.nip01Core.crypto.Nip01
 import com.vitorpamplona.quartz.nip01Core.hexToByteArray
 import com.vitorpamplona.quartz.nip01Core.toHexKey
-import fr.acinq.secp256k1.Secp256k1
+import com.vitorpamplona.quartz.nip04Dm.crypto.EncryptedInfo
+import com.vitorpamplona.quartz.nip04Dm.crypto.Encryption
 import junit.framework.TestCase.assertEquals
 import junit.framework.TestCase.assertTrue
 import org.junit.Test
-import java.security.SecureRandom
 
-class Nip04EncryptionTest {
-    private val random = SecureRandom()
-    private val nip01 = Nip01(Secp256k1.get(), random)
-    private val nip04 = Nip04Encryption(Secp256k1.get(), random)
+class EncryptionTest {
+    private val nip04 = Encryption()
 
     val sk1 = "91ba716fa9e7ea2fcbad360cf4f8e0d312f73984da63d90f524ad61a6a1e7dbe".hexToByteArray()
     val sk2 = "96f6fa197aa07477ab88f6981118466ae3a982faab8ad5db9d5426870c73d220".hexToByteArray()
-    val pk1 = nip01.pubkeyCreate(sk1)
-    val pk2 = nip01.pubkeyCreate(sk2)
+    val pk1 = Nip01.pubKeyCreate(sk1)
+    val pk2 = Nip01.pubKeyCreate(sk2)
 
     val expectedShared = "7ce22696eb0e303ddaa491bdf2a56b79d249f2d861b8e012a933e01dc4beba81"
 
@@ -89,17 +87,17 @@ class Nip04EncryptionTest {
 
     @Test
     fun isNIP04Encode() {
-        assertTrue(Nip04Encryption.isNIP04("Xj/oZZolaItdyQ5v7xYFpA==?iv=+a6zagBp+mr5m1aFbHQ8lA=="))
-        assertTrue(Nip04Encryption.isNIP04("zJxfaJ32rN5Dg1ODjOlEew==?iv=EV5bUjcc4OX2Km/zPp4ndQ=="))
+        assertTrue(EncryptedInfo.isNIP04("Xj/oZZolaItdyQ5v7xYFpA==?iv=+a6zagBp+mr5m1aFbHQ8lA=="))
+        assertTrue(EncryptedInfo.isNIP04("zJxfaJ32rN5Dg1ODjOlEew==?iv=EV5bUjcc4OX2Km/zPp4ndQ=="))
         assertTrue(
-            Nip04Encryption.isNIP04("6f8dMstm+udOu7yipSn33orTmwQpWbtfuY95NH+eTU1kArysWJIDkYgI2D25EAGIDJsNd45jOJ2NbVOhFiL3ZP/NWsTwXokk34iyHyA/lkjzugQ1bHXoMD1fP/Ay4hB4al1NHb8HXHKZaxPrErwdRDb8qa/I6dXb/1xxyVvNQBHHvmsM5yIFaPwnCN1DZqXf2KbTA/Ekz7Hy+7R+Sy3TXLQDFpWYqykppkXc7Fs0qSuPRyxz5+anuN0dxZa9GTwTEnBrZPbthKkNRrvZMdTGJ6WumOh9aUq8OJJWy9aOgsXvs7qjN1UqcCqQqYaVnEOhCaqWNDsVtsFrVDj+SaLIBvCiomwF4C4nIgngJ5I69tx0UNI0q+ZnvOGQZ7m1PpW2NYP7Yw43HJNdeUEQAmdCPnh/PJwzLTnIxHmQU7n7SPlMdV0SFa6H8y2HHvex697GAkyE5t8c2uO24OnqIwF1tR3blIqXzTSRl0GA6QvrSj2p4UtnWjvF7xT7RiIEyTtgU/AsihTrXyXzWWZaIBJogpgw6erlZqWjCH7sZy/WoGYEiblobOAqMYxax6vRbeuGtoYksr/myX+x9rfLrYuoDRTw4woXOLmMrrj+Mf0TbAgc3SjdkqdsPU1553rlSqIEZXuFgoWmxvVQDtekgTYyS97G81TDSK9nTJT5ilku8NVq2LgtBXGwsNIw/xekcOUzJke3kpnFPutNaexR1VF3ohIuqRKYRGcd8ADJP2lfwMcaGRiplAmFoaVS1YUhQwYFNq9rMLf7YauRGV4BJg/t9srdGxf5RoKCvRo+XM/nLxxysTR9MVaEP/3lDqjwChMxs+eWfLHE5vRWV8hUEqdrWNZV29gsx5nQpzJ4PARGZVu310pQzc6JAlc2XAhhFk6RamkYJnmCSMnb/RblzIATBi2kNrCVAlaXIon188inB62rEpZGPkRIP7PUfu27S/elLQHBHeGDsxOXsBRo1gl3te+raoBHsxo6zvRnYbwdAQa5taDE63eh+fT6kFI+xYmXNAQkU8Dp0MVhEh4JQI06Ni/AKrvYpC95TXXIphZcF+/Pv/vaGkhG2X9S3uhugwWK?iv=2vWkOQQi0WynNJz/aZ4k2g=="),
+            EncryptedInfo.isNIP04("6f8dMstm+udOu7yipSn33orTmwQpWbtfuY95NH+eTU1kArysWJIDkYgI2D25EAGIDJsNd45jOJ2NbVOhFiL3ZP/NWsTwXokk34iyHyA/lkjzugQ1bHXoMD1fP/Ay4hB4al1NHb8HXHKZaxPrErwdRDb8qa/I6dXb/1xxyVvNQBHHvmsM5yIFaPwnCN1DZqXf2KbTA/Ekz7Hy+7R+Sy3TXLQDFpWYqykppkXc7Fs0qSuPRyxz5+anuN0dxZa9GTwTEnBrZPbthKkNRrvZMdTGJ6WumOh9aUq8OJJWy9aOgsXvs7qjN1UqcCqQqYaVnEOhCaqWNDsVtsFrVDj+SaLIBvCiomwF4C4nIgngJ5I69tx0UNI0q+ZnvOGQZ7m1PpW2NYP7Yw43HJNdeUEQAmdCPnh/PJwzLTnIxHmQU7n7SPlMdV0SFa6H8y2HHvex697GAkyE5t8c2uO24OnqIwF1tR3blIqXzTSRl0GA6QvrSj2p4UtnWjvF7xT7RiIEyTtgU/AsihTrXyXzWWZaIBJogpgw6erlZqWjCH7sZy/WoGYEiblobOAqMYxax6vRbeuGtoYksr/myX+x9rfLrYuoDRTw4woXOLmMrrj+Mf0TbAgc3SjdkqdsPU1553rlSqIEZXuFgoWmxvVQDtekgTYyS97G81TDSK9nTJT5ilku8NVq2LgtBXGwsNIw/xekcOUzJke3kpnFPutNaexR1VF3ohIuqRKYRGcd8ADJP2lfwMcaGRiplAmFoaVS1YUhQwYFNq9rMLf7YauRGV4BJg/t9srdGxf5RoKCvRo+XM/nLxxysTR9MVaEP/3lDqjwChMxs+eWfLHE5vRWV8hUEqdrWNZV29gsx5nQpzJ4PARGZVu310pQzc6JAlc2XAhhFk6RamkYJnmCSMnb/RblzIATBi2kNrCVAlaXIon188inB62rEpZGPkRIP7PUfu27S/elLQHBHeGDsxOXsBRo1gl3te+raoBHsxo6zvRnYbwdAQa5taDE63eh+fT6kFI+xYmXNAQkU8Dp0MVhEh4JQI06Ni/AKrvYpC95TXXIphZcF+/Pv/vaGkhG2X9S3uhugwWK?iv=2vWkOQQi0WynNJz/aZ4k2g=="),
         )
     }
 
     @Test
     fun isNIP04EncodeWithBug() {
         assertTrue(
-            Nip04Encryption.isNIP04(
+            EncryptedInfo.isNIP04(
                 "QOAYBWa88ConWs2C4kSvNqAcowCtg0ZRtAl7FyLSv9VMaJH4oCiDx0h8VLBnV97HdE4lv" +
                     "TW7AYC1eEw8/t1dbe0qRc3XrOt7MrPAO8yqpy1/3lFB1+10kip0+KdgT8Quvv02wTP8Dqi" +
                     "xpr2fliAIG2ONvDn+O5V0q9aVUN9HitgL/myTyR0T42edmxWeZoMBEOKvJyO80FekSsgVL" +

quartz/src/androidTest/java/com/vitorpamplona/quartz/nip04Dm/Nip04Test.kt

@@ -0,0 +1,57 @@
+/**
+ * Copyright (c) 2024 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.quartz.nip04Dm
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.vitorpamplona.quartz.nip01Core.crypto.Nip01
+import com.vitorpamplona.quartz.nip04Dm.crypto.Nip04
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class Nip04Test {
+    @Test
+    fun encryptDecryptNIP4Test() {
+        val msg = "Hi"
+
+        val privateKey = Nip01.privKeyCreate()
+        val publicKey = Nip01.pubKeyCreate(privateKey)
+
+        val encrypted = Nip04.encrypt(msg, privateKey, publicKey)
+        val decrypted = Nip04.decrypt(encrypted, privateKey, publicKey)
+
+        assertEquals(msg, decrypted)
+    }
+
+    @Test
+    fun encryptSharedSecretDecryptNIP4Test() {
+        val msg = "Hi"
+
+        val privateKey = Nip01.privKeyCreate()
+        val publicKey = Nip01.pubKeyCreate(privateKey)
+
+        val encrypted = Nip04.encrypt(msg, privateKey, publicKey)
+        val decrypted = Nip04.decrypt(encrypted, privateKey, publicKey)
+
+        assertEquals(msg, decrypted)
+    }
+}

quartz/src/androidTest/java/com/vitorpamplona/quartz/nip06KeyDerivation/Bip32SeedDerivationTest.kt

@@ -22,14 +22,13 @@ package com.vitorpamplona.quartz.nip06KeyDerivation
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.vitorpamplona.quartz.nip01Core.toHexKey
-import fr.acinq.secp256k1.Secp256k1
 import junit.framework.TestCase.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 class Bip32SeedDerivationTest {
-    val seedDerivation = Bip32SeedDerivation(Secp256k1.get())
+    val seedDerivation = Bip32SeedDerivation()
 
     val masterBitcoin =
         seedDerivation.generate(

quartz/src/androidTest/java/com/vitorpamplona/quartz/nip06KeyDerivation/Bip39MnemonicsTest.kt

@@ -23,9 +23,9 @@ package com.vitorpamplona.quartz.nip06KeyDerivation
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import com.vitorpamplona.quartz.CryptoUtils
 import com.vitorpamplona.quartz.nip01Core.toHexKey
 import com.vitorpamplona.quartz.utils.Hex
+import com.vitorpamplona.quartz.utils.RandomInstance
 import junit.framework.TestCase.assertEquals
 import junit.framework.TestCase.assertTrue
 import junit.framework.TestCase.fail
@@ -69,7 +69,7 @@ class Bip39MnemonicsTest {
     fun validateMnemonicsValid() {
         for (i in 0..99) {
             for (length in listOf(16, 20, 24, 28, 32, 36, 40)) {
-                val mnemonics = Bip39Mnemonics.toMnemonics(CryptoUtils.random(length))
+                val mnemonics = Bip39Mnemonics.toMnemonics(RandomInstance.bytes(length))
                 Bip39Mnemonics.validate(mnemonics)
             }
         }

quartz/src/androidTest/java/com/vitorpamplona/quartz/nip06KeyDerivation/Nip06Test.kt

@@ -22,7 +22,6 @@ package com.vitorpamplona.quartz.nip06KeyDerivation
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.vitorpamplona.quartz.nip01Core.toHexKey
-import fr.acinq.secp256k1.Secp256k1
 import junit.framework.TestCase.assertEquals
 import org.junit.Ignore
 import org.junit.Test
@@ -30,7 +29,7 @@ import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 class Nip06Test {
-    val nip06 = Nip06(Secp256k1.get())
+    val nip06 = Nip06()
 
     // private key (hex): 7f7ff03d123792d6ac594bfa67bf6d0c0ab55b6b1fdb6249303fe861f1ccba9a
     // nsec: nsec10allq0gjx7fddtzef0ax00mdps9t2kmtrldkyjfs8l5xruwvh2dq0lhhkp

quartz/src/androidTest/java/com/vitorpamplona/quartz/nip44Encryption/Nip44v1Test.kt

@@ -0,0 +1,94 @@
+/**
+ * Copyright (c) 2024 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.quartz.nip44Encryption
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair
+import com.vitorpamplona.quartz.nip01Core.crypto.Nip01
+import com.vitorpamplona.quartz.nip01Core.hexToByteArray
+import com.vitorpamplona.quartz.nip01Core.toHexKey
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class Nip44v1Test {
+    private val nip44v1 = Nip44v1()
+
+    @Test
+    fun testSharedSecretCompatibilityWithCoracle() {
+        val privateKey = "f410f88bcec6cbfda04d6a273c7b1dd8bba144cd45b71e87109cfa11dd7ed561"
+        val publicKey = "765cd7cf91d3ad07423d114d5a39c61d52b2cdbc18ba055ddbbeec71fbe2aa2f"
+
+        val key =
+            nip44v1.getSharedSecret(
+                privateKey = privateKey.hexToByteArray(),
+                pubKey = publicKey.hexToByteArray(),
+            )
+
+        assertEquals("577c966f499dddd8e8dcc34e8f352e283cc177e53ae372794947e0b8ede7cfd8", key.toHexKey())
+    }
+
+    @Test
+    fun testSharedSecret() {
+        val sender = KeyPair()
+        val receiver = KeyPair()
+
+        val sharedSecret1 = nip44v1.getSharedSecret(sender.privKey!!, receiver.pubKey)
+        val sharedSecret2 = nip44v1.getSharedSecret(receiver.privKey!!, sender.pubKey)
+
+        assertEquals(sharedSecret1.toHexKey(), sharedSecret2.toHexKey())
+
+        val secretKey1 = KeyPair(privKey = sharedSecret1)
+        val secretKey2 = KeyPair(privKey = sharedSecret2)
+
+        assertEquals(secretKey1.pubKey.toHexKey(), secretKey2.pubKey.toHexKey())
+        assertEquals(secretKey1.privKey?.toHexKey(), secretKey2.privKey?.toHexKey())
+    }
+
+    @Test
+    fun encryptDecrypt() {
+        val msg = "Hi"
+
+        val privateKey = Nip01.privKeyCreate()
+        val publicKey = Nip01.pubKeyCreate(privateKey)
+
+        val encrypted = nip44v1.encrypt(msg, privateKey, publicKey)
+        val decrypted = nip44v1.decrypt(encrypted, privateKey, publicKey)
+
+        assertEquals(msg, decrypted)
+    }
+
+    @Test
+    fun encryptDecryptSharedSecret() {
+        val msg = "Hi"
+
+        val privateKey = Nip01.privKeyCreate()
+        val publicKey = Nip01.pubKeyCreate(privateKey)
+
+        val sharedSecret = nip44v1.getSharedSecret(privateKey, publicKey)
+
+        val encrypted = nip44v1.encrypt(msg, sharedSecret)
+        val decrypted = nip44v1.decrypt(encrypted, sharedSecret)
+
+        assertEquals(msg, decrypted)
+    }
+}

quartz/src/androidTest/java/com/vitorpamplona/quartz/nip44Encryption/Nip44v2Test.kt

@@ -27,18 +27,17 @@ import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair
 import com.vitorpamplona.quartz.nip01Core.crypto.Nip01
 import com.vitorpamplona.quartz.nip01Core.hexToByteArray
 import com.vitorpamplona.quartz.nip01Core.toHexKey
-import com.vitorpamplona.quartz.utils.sha256Hash
-import fr.acinq.secp256k1.Secp256k1
+import com.vitorpamplona.quartz.utils.RandomInstance
+import com.vitorpamplona.quartz.utils.sha256
 import junit.framework.TestCase.assertEquals
 import junit.framework.TestCase.assertNotNull
 import junit.framework.TestCase.assertNull
 import junit.framework.TestCase.fail
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.security.SecureRandom
 
 @RunWith(AndroidJUnit4::class)
-class NIP44v2Test {
+class Nip44v2Test {
     private val vectors: VectorFile =
         jacksonObjectMapper()
             .readValue(
@@ -46,9 +45,7 @@ class NIP44v2Test {
                 VectorFile::class.java,
             )
 
-    private val random = SecureRandom()
-    private val nip44v2 = Nip44v2(Secp256k1.get(), random)
-    private val nip01 = Nip01(Secp256k1.get(), random)
+    private val nip44v2 = Nip44v2()
 
     @Test
     fun conversationKeyTest() {
@@ -73,8 +70,8 @@ class NIP44v2Test {
         val privateKeyA = "f410f88bcec6cbfda04d6a273c7b1dd8bba144cd45b71e87109cfa11dd7ed561".hexToByteArray()
         val privateKeyB = "65f039136f8da8d3e87b4818746b53318d5481e24b2673f162815144223a0b5a".hexToByteArray()
 
-        val publicKeyA = nip01.pubkeyCreate(privateKeyA)
-        val publicKeyB = nip01.pubkeyCreate(privateKeyB)
+        val publicKeyA = Nip01.pubKeyCreate(privateKeyA)
+        val publicKeyB = Nip01.pubKeyCreate(privateKeyB)
 
         assertEquals(
             nip44v2.getConversationKey(privateKeyA, publicKeyB).toHexKey(),
@@ -87,8 +84,8 @@ class NIP44v2Test {
         val privateKeyA = "f410f88bcec6cbfda04d6a273c7b1dd8bba144cd45b71e87109cfa11dd7ed561".hexToByteArray()
         val privateKeyB = "e6159851715b4aa6190c22b899b0c792847de0a4435ac5b678f35738351c43b0".hexToByteArray()
 
-        val publicKeyA = nip01.pubkeyCreate(privateKeyA)
-        val publicKeyB = nip01.pubkeyCreate(privateKeyB)
+        val publicKeyA = Nip01.pubKeyCreate(privateKeyA)
+        val publicKeyB = Nip01.pubKeyCreate(privateKeyB)
 
         assertEquals(
             nip44v2.getConversationKey(privateKeyA, publicKeyB).toHexKey(),
@@ -149,8 +146,7 @@ class NIP44v2Test {
     @Test
     fun invalidMessageLengths() {
         for (v in vectors.v2?.invalid?.encryptMsgLengths!!) {
-            val key = ByteArray(32)
-            random.nextBytes(key)
+            val key = RandomInstance.bytes(32)
             try {
                 nip44v2.encrypt("a".repeat(v), key)
                 fail("Should Throw for $v")
@@ -185,5 +181,5 @@ class NIP44v2Test {
         }
     }
 
-    private fun sha256Hex(data: ByteArray) = sha256Hash(data).toHexKey()
+    private fun sha256Hex(data: ByteArray) = sha256(data).toHexKey()
 }

quartz/src/androidTest/java/com/vitorpamplona/quartz/nip49PrivKeyEnc/NIP49Test.kt

@@ -22,13 +22,11 @@ package com.vitorpamplona.quartz.nip49PrivKeyEnc
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.vitorpamplona.quartz.nip01Core.toHexKey
-import fr.acinq.secp256k1.Secp256k1
 import junit.framework.TestCase.assertEquals
 import junit.framework.TestCase.assertNotNull
 import junit.framework.TestCase.fail
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.security.SecureRandom
 
 @RunWith(AndroidJUnit4::class)
 public class NIP49Test {
@@ -53,8 +51,7 @@ public class NIP49Test {
             )
     }
 
-    val random = SecureRandom()
-    val nip49 = Nip49(Secp256k1.get(), random)
+    val nip49 = Nip49()
 
     @Test
     fun decodeBech32() {

quartz/src/androidTest/java/com/vitorpamplona/quartz/nip55AndroidSigner/SignStringTest.kt

@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) 2024 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.quartz.nip55AndroidSigner
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair
+import com.vitorpamplona.quartz.nip01Core.crypto.Nip01
+import com.vitorpamplona.quartz.nip01Core.hexToByteArray
+import com.vitorpamplona.quartz.nip01Core.toHexKey
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class SignStringTest {
+    @Test
+    fun signString() {
+        val random = "319cc5596fdd6cd767e5a59d976e8e059c61306af90dff1e6ee1067b3a1fdbc0".hexToByteArray()
+        val message = "8e58c8251bb406b6ded69e9eb14f55282a9a53bdab16fc49a3218c2ad3abc887".hexToByteArray()
+        val keyPair = KeyPair("a5ab474552c8f9c46c2eda5a0b68f27430ad81f96cb405e0cb4e34bf0c6494a2".hexToByteArray())
+
+        val signedMessage = Nip01.sign(message, keyPair.privKey!!, random).toHexKey()
+        val expectedValue = "0f9be7e01ba53d5ee6874b9180c7956269fda7a5be424634c3d17b5cfcea6da001be89183876415ba08b7dafa6cff4555e393dc228fb8769b384344e9a27b77c"
+        assertEquals(expectedValue, signedMessage)
+
+        val message2 = "Hello"
+        val signedMessage2 = signString(message2, keyPair.privKey!!, random).toHexKey()
+        val expectedValue2 = "7ec8194a585bfb513564113b6b7bfeaafa0254c99d24eaf92280657c2291bab908b1b7bc553c83276a0254aef5041bbe6a50e93381edc4de3d859efa1c3a5a1e"
+        assertEquals(expectedValue2, signedMessage2)
+    }
+}

quartz/src/androidTest/java/com/vitorpamplona/quartz/utils/HexEncodingTest.kt

@@ -21,7 +21,6 @@
 package com.vitorpamplona.quartz.utils
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.vitorpamplona.quartz.CryptoUtils
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
@@ -56,7 +55,7 @@ class HexEncodingTest {
     @Test
     fun testRandoms() {
         for (i in 0..1000) {
-            val bytes = CryptoUtils.privkeyCreate()
+            val bytes = RandomInstance.bytes(32)
             val hex =
                 fr.acinq.secp256k1.Hex
                     .encode(bytes)
@@ -90,7 +89,7 @@ class HexEncodingTest {
     @Test
     fun testRandomsIsHex() {
         for (i in 0..10000) {
-            val bytes = CryptoUtils.privkeyCreate()
+            val bytes = RandomInstance.bytes(32)
             val hex = bytes.toHexString(HexFormat.Default)
             assertTrue(hex, Hex.isHex(hex))
             val hexUpper = bytes.toHexString(HexFormat.UpperCase)
@@ -102,7 +101,7 @@ class HexEncodingTest {
     @Test
     fun testRandomsUppercase() {
         for (i in 0..1000) {
-            val bytes = CryptoUtils.privkeyCreate()
+            val bytes = RandomInstance.bytes(32)
             val hex = bytes.toHexString(HexFormat.UpperCase)
             assertEquals(
                 bytes.toList(),