Most test cases on JNI

2024-08-20 01:05:29 +02:00
parent af3f44f426
commit 08f0304d4c
3 changed files with 164 additions and 45 deletions
--- a/tests/src/commonTest/kotlin/fr/acinq/secp256k1/FrostTest.kt
+++ b/tests/src/commonTest/kotlin/fr/acinq/secp256k1/FrostTest.kt
@@ -120,21 +120,13 @@ class FrostTest: BaseTest() {
            }.toTypedArray()
        }

-        signerShareGenTestCase.jsonObject["signers"]!!.jsonArray.forEachIndexed { index, _signer ->
+        signerShareGenTestCase.jsonObject["signers"]!!.jsonArray.forEachIndexed { index, _ ->
            val assignedShares = signerShareGenTestCase.jsonObject["signers"]!!.jsonArray.map {
                Hex.decode(
                    it.jsonObject["expected"]!!.jsonObject["frost_share"]!!.jsonArray[index].jsonPrimitive.content
                )
            }

-            println("Indexs: $index")
-//            println(assignedShares.map { Hex.encode(it) })
-//            println(vssCommitments.map { vssCommitment ->
-//                vssCommitment.map { Hex.encode(it) }
-//            })
-//            println(
-//                Hex.encode(ids33[index])
-//            )
            val result = Secp256k1.frostShareAggregate(
                assignedShares.toTypedArray(),
                vssCommitments.toTypedArray(),
@@ -147,6 +139,7 @@ class FrostTest: BaseTest() {

            val expectedAggregateShare = expected.jsonObject["aggregate_share"]!!.jsonPrimitive.content
            val expectedPublicKey = expected.jsonObject["aggregate_public_key"]!!.jsonPrimitive.content
+            val expectedPublicShare = expected.jsonObject["public_share"]!!.jsonPrimitive.content

            assertEquals(
                expected = expectedAggregateShare,
@@ -158,34 +151,154 @@ class FrostTest: BaseTest() {
                actual = Hex.encode(result.second),
                "Unexpected $index:aggregate_public_key"
            )
-//            assertEquals(
-//                expected = 1,
-//                actual = Secp256k1.frostShareVerify(
-//                    threshold,
-//                    ids33[index],
-//                    assignedShares[index],
-//                    vssCommitments[index]
-//                ),
-//                message = "Couldn't verify share from $index signer"
-//            )
+
+            assertEquals(
+                expected = 1,
+                actual = Secp256k1.frostShareVerify(
+                    threshold,
+                    ids33[index],
+                    assignedShares[index],
+                    vssCommitments[index]
+                ),
+                message = "Couldn't verify share from $index signer"
+            )
+
+            assertEquals(
+                expected = expectedPublicShare,
+                actual = Hex.encode(
+                    Secp256k1.frostComputePublicShare(
+                        threshold,
+                        ids33[index],
+                        vssCommitments.toTypedArray(),
+                        nParticipants
+                    )
+                ),
+                message = "Couldn't verify share from $index signer"
+            )
        }

-
-
    }

    @Test
    fun `frost share verify`() {
+        val shareGenTests = readData("frost/share_gen_vectors.json")
+        val tests = readData("frost/share_agg_vectors.json")

+        val publicKeys = shareGenTests.jsonObject["pubkeys"]!!.jsonArray.map { Hex.decode(it.jsonPrimitive.content) }
+
+        val signerShareGenTestCase = shareGenTests.jsonObject["valid_signers_share_gen_test_case"]!!;
+
+        val keyIndices = signerShareGenTestCase.jsonObject["key_indices"]!!.jsonArray.map { it.jsonPrimitive.int }
+        val nParticipants = keyIndices.size
+        val threshold = signerShareGenTestCase.jsonObject["threshold"]!!.jsonPrimitive.int
+        val ids33 = keyIndices.map { publicKeys[it] }.toTypedArray()
+
+        val vssCommitments = signerShareGenTestCase.jsonObject["signers"]!!.jsonArray.map { signer ->
+            signer.jsonObject["expected"]!!.jsonObject["vss_commitment"]!!.jsonArray.map {
+                Hex.decode(it.jsonPrimitive.content)
+            }.toTypedArray()
+        }
+
+        signerShareGenTestCase.jsonObject["signers"]!!.jsonArray.forEachIndexed { index, _ ->
+            val assignedShares = signerShareGenTestCase.jsonObject["signers"]!!.jsonArray.map {
+                Hex.decode(
+                    it.jsonObject["expected"]!!.jsonObject["frost_share"]!!.jsonArray[index].jsonPrimitive.content
+                )
+            }
+
+            val result = Secp256k1.frostShareAggregate(
+                assignedShares.toTypedArray(),
+                vssCommitments.toTypedArray(),
+                nParticipants,
+                threshold,
+                ids33[index]
+            )
+
+            val expected = tests.jsonObject["expected"]!!.jsonArray[index];
+
+            val expectedAggregateShare = expected.jsonObject["aggregate_share"]!!.jsonPrimitive.content
+            val expectedPublicKey = expected.jsonObject["aggregate_public_key"]!!.jsonPrimitive.content
+            val expectedPublicShare = expected.jsonObject["public_share"]!!.jsonPrimitive.content
+
+            assertEquals(
+                expected = expectedAggregateShare,
+                actual = Hex.encode(result.first),
+                "Unexpected $index:aggregate_share"
+            )
+            assertEquals(
+                expected = expectedPublicKey,
+                actual = Hex.encode(result.second),
+                "Unexpected $index:aggregate_public_key"
+            )
+
+            assertEquals(
+                expected = 1,
+                actual = Secp256k1.frostShareVerify(
+                    threshold,
+                    ids33[index],
+                    assignedShares[index],
+                    vssCommitments[index]
+                ),
+                message = "Couldn't verify share from $index signer"
+            )
+
+            assertEquals(
+                expected = expectedPublicShare,
+                actual = Hex.encode(
+                    Secp256k1.frostComputePublicShare(
+                        threshold,
+                        ids33[index],
+                        vssCommitments.toTypedArray(),
+                        nParticipants
+                    )
+                ),
+                message = "Couldn't verify share from $index signer"
+            )
+        }
    }

    @Test
    fun `frost compute pubshare`() {
+        val shareGenTests = readData("frost/share_gen_vectors.json")
+        val tests = readData("frost/share_agg_vectors.json")

+        val publicKeys = shareGenTests.jsonObject["pubkeys"]!!.jsonArray.map { Hex.decode(it.jsonPrimitive.content) }
+
+        val signerShareGenTestCase = shareGenTests.jsonObject["valid_signers_share_gen_test_case"]!!;
+
+        val keyIndices = signerShareGenTestCase.jsonObject["key_indices"]!!.jsonArray.map { it.jsonPrimitive.int }
+        val nParticipants = keyIndices.size
+        val threshold = signerShareGenTestCase.jsonObject["threshold"]!!.jsonPrimitive.int
+        val ids33 = keyIndices.map { publicKeys[it] }.toTypedArray()
+
+        val vssCommitments = signerShareGenTestCase.jsonObject["signers"]!!.jsonArray.map { signer ->
+            signer.jsonObject["expected"]!!.jsonObject["vss_commitment"]!!.jsonArray.map {
+                Hex.decode(it.jsonPrimitive.content)
+            }.toTypedArray()
+        }
+
+        signerShareGenTestCase.jsonObject["signers"]!!.jsonArray.forEachIndexed { index, _ ->
+
+            val expected = tests.jsonObject["expected"]!!.jsonArray[index];
+
+            val expectedPublicShare = expected.jsonObject["public_share"]!!.jsonPrimitive.content
+
+            assertEquals(
+                expected = expectedPublicShare,
+                actual = Hex.encode(
+                    Secp256k1.frostComputePublicShare(
+                        threshold,
+                        ids33[index],
+                        vssCommitments.toTypedArray(),
+                        nParticipants
+                    )
+                ),
+                message = "Couldn't verify share from $index signer"
+            )
+        }
    }

    // Frost Tweak
-
    @Test
    fun `frost pubkey tweak`() {

--- a/tests/src/commonTest/resources/frost/share_agg_vectors.json
+++ b/tests/src/commonTest/resources/frost/share_agg_vectors.json
@@ -2,23 +2,28 @@
  "expected": [
    {
      "aggregate_share": "1cfa28492e84e945343f1167401cdce061202a59e47e050c0c2f7f0c56e8e148",
-      "aggregate_public_key": "bd5561ef6dbff52d3f73b8cb0c065328988b71d3386d23890744a0dd6ad27c15"
+      "aggregate_public_key": "bd5561ef6dbff52d3f73b8cb0c065328988b71d3386d23890744a0dd6ad27c15",
+      "public_share": "0493effba7e50d3885bb0c4665149abd4fd13622047412f1da4c0e3754ecb1a9183aaadfdf0f2f82e24641e6ed7a0f7ee22a4a8a47c6d2df66daad37a4880fffe2"
    },
    {
      "aggregate_share": "dd82fcc1806f1a968228c794a7001c18d209871fb3441bae80fd8229f6a9b0dd",
-      "aggregate_public_key": "bd5561ef6dbff52d3f73b8cb0c065328988b71d3386d23890744a0dd6ad27c15"
+      "aggregate_public_key": "bd5561ef6dbff52d3f73b8cb0c065328988b71d3386d23890744a0dd6ad27c15",
+      "public_share": "048482e27b533879d4f3d68bdb2038bf9480d4ce4cc614d7133238e55179c65a175c684afb7f983e60139542b80f0f12815f3194082f07c93e1f87f3cd1b1c0d8b"
    },
    {
      "aggregate_share": "5fe629d5f34fdb3ea2f6e545fc3d2cf1f5ce23a504b144e6ebe928793cc85cb4",
-      "aggregate_public_key": "bd5561ef6dbff52d3f73b8cb0c065328988b71d3386d23890744a0dd6ad27c15"
+      "aggregate_public_key": "bd5561ef6dbff52d3f73b8cb0c065328988b71d3386d23890744a0dd6ad27c15",
+      "public_share": "04d71784b58d8958141f8f405d56026f214a736e73f9c1f70776fc2e49f4e90fc0a9396bcc7471a83caf4076a18cb6ab4264aa37174ca19e142259aa5f6bb7fea3"
    },
    {
      "aggregate_share": "71181e5b46742333f12672d85d0e1472770a082f0a62d3d204c9e191fb45ef91",
-      "aggregate_public_key": "bd5561ef6dbff52d3f73b8cb0c065328988b71d3386d23890744a0dd6ad27c15"
+      "aggregate_public_key": "bd5561ef6dbff52d3f73b8cb0c065328988b71d3386d23890744a0dd6ad27c15",
+      "public_share": "04ec0fb2b4c1ac2d9b761f32cb2972e6d6fb74ed4195d872aeaaf4306bb64eb465580d03102849363ec49c3d1eecdd239337d0a66cdfc4d74c29c824c0f941832a"
    },
    {
      "aggregate_share": "15bc5e3eeb4ec318a718b3015b78e8496cc5ede81c05727936ade625532dce55",
-      "aggregate_public_key": "bd5561ef6dbff52d3f73b8cb0c065328988b71d3386d23890744a0dd6ad27c15"
+      "aggregate_public_key": "bd5561ef6dbff52d3f73b8cb0c065328988b71d3386d23890744a0dd6ad27c15",
+      "public_share": "04b3ad3909e919f1a27faff7a3aec8f04a9ca54a065d9774ae37c3b9903ad4a19b71f11e148b549ef168465d065279f773175b254f64573e7ce30f4aba0954be19"
    }
  ]
 }