chore(ipa-multipoint): switch to LE bytes (#145)

Signed-off-by: Dragan Pilipovic <[email protected]>
hyperledger · Feb 1, 2024 · 8ddd0df · 8ddd0df
1 parent dc5d0a9
commit 8ddd0df
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 29 deletions.
diff --git a/ipa-multipoint/ipa_multipoint_jni/src/lib.rs b/ipa-multipoint/ipa_multipoint_jni/src/lib.rs
@@ -78,19 +78,15 @@ pub extern "system" fn Java_org_hyperledger_besu_nativelib_ipamultipoint_LibIpaM
     _class: JClass<'_>,
     input: jbyteArray,
 ) -> jbyteArray {
-    let mut input = env
+    let input = env
         .convert_byte_array(input)
         .expect("Cannot convert jbyteArray to rust array");
 
     let committer = &CONFIG.committer;
 
-    reverse_scalars_endian(&mut input);
     let commitment = ffi_interface::commit_to_scalars(committer, &input).unwrap();
 
-    let mut hash = ffi_interface::hash_commitment(commitment);
-    // TODO(Big-Endian): The output of `hash_commitment` is a scalar serialized
-    // TODO(Big-Endian): in little endian. The previous implementation used big endian.
-    hash.reverse();
+    let hash = ffi_interface::hash_commitment(commitment);
 
     env.byte_array_from_slice(&hash)
         .expect("Couldn't convert to byte array")
@@ -104,27 +100,15 @@ pub extern "system" fn Java_org_hyperledger_besu_nativelib_ipamultipoint_LibIpaM
     _class: JClass<'_>,
     input: jbyteArray,
 ) -> jbyteArray {
-    let mut input = env
+    let input = env
         .convert_byte_array(input)
         .expect("Cannot convert jbyteArray to rust array");
 
     let committer = &CONFIG.committer;
-    reverse_scalars_endian(&mut input);
 
     let commitment = ffi_interface::commit_to_scalars(committer, &input).unwrap();
     let hash = ffi_interface::deprecated_serialize_commitment(commitment);
 
     env.byte_array_from_slice(&hash)
         .expect("Couldn't convert to byte array")
 }
-
-// TODO(Big-Endian): rust-verkle now uses Little-Endian for scalars.
-// TODO(Big-Endian): We switch the endianness here to match the old implementation.
-// TODO(Big-Endian): Doing the switch here allows use to restrict the changes to just this part of the code, until
-// TODO(Big-Endian): we are ready to change besu-verkle and other parts of the code to use little endian input.
-fn reverse_scalars_endian(scalars: &mut [u8]) {
-    const SCALAR_SIZE: usize = 32;
-    for scalar in scalars.chunks_exact_mut(SCALAR_SIZE) {
-        scalar.reverse();
-    }
-}
diff --git a/...ultipoint/src/test/java/org/hyperledger/besu/nativelib/ipa_multipoint/CommitRootTest.java b/...ultipoint/src/test/java/org/hyperledger/besu/nativelib/ipa_multipoint/CommitRootTest.java
@@ -51,7 +51,7 @@ public void TestPolynomialCommitments(TestData testData) {
         List<Bytes> FrBytes = new ArrayList<>();
         for (int i = 0; i < 256; i++) {
             Bytes32 value = Bytes32.fromHexString(testData.frs.get(i));
-            FrBytes.add(value);
+            FrBytes.add(value.reverse());
         }
         byte[] input = Bytes.concatenate(FrBytes).toArray();
         Bytes32 result = Bytes32.wrap(LibIpaMultipoint.commitRoot(input));

diff --git a/...int/src/test/java/org/hyperledger/besu/nativelib/ipa_multipoint/LibIpaMultipointTest.java b/...int/src/test/java/org/hyperledger/besu/nativelib/ipa_multipoint/LibIpaMultipointTest.java
@@ -26,43 +26,43 @@ public class LibIpaMultipointTest {
 
     @Test
     public void testCallLibrary() {
-        Bytes32 input = Bytes32.fromHexString("0x0cfe0000");
+        Bytes32 input = Bytes32.fromHexString("0x0000fe0c00000000000000000000000000000000000000000000000000000000");
         Bytes32 result = Bytes32.wrap(LibIpaMultipoint.commit(input.toArray()));
         Bytes32 expected = Bytes32.fromHexString("0x11169fb6b9dab0b5984ce0b02c9f2c9a3a5adf6f9a95b597bca42ac2a8d8e89f");
-        assertThat(result).isEqualTo(expected);
+        assertThat(result).isEqualTo(expected.reverse());
     }
 
     @Test
     public void testCallLibraryCommitRoot() {
-        Bytes32 input = Bytes32.fromHexString("0x00e31f7a565a390b48fdd24569ac10d43562d19de37ea951c7f9f250a339d059");
+        Bytes32 input = Bytes32.fromHexString("0x59d039a350f2f9c751a97ee39dd16235d410ac6945d2fd480b395a567a1fe300");
         Bytes32 result = Bytes32.wrap(LibIpaMultipoint.commitRoot(input.toArray()));
         Bytes32 expected = Bytes32.fromHexString("0x3337896554fd3960bef9a4d0ff658ee8ee470cf9ca88a3c807cbe128536c5c05");
         assertThat(result).isEqualTo(expected);
     }
 
     @Test
     public void testCallLibraryWithManyElements() {
-        Bytes32 element = Bytes32.fromHexString("0x0cfe3041fb6512c87922e2146c8308b372f3bf967f889e69ad116ce7c7ec00");
+        Bytes32 element = Bytes32.fromHexString("0x00ecc7e76c11ad699e887f96bff372b308836c14e22279c81265fb4130fe0c00");
         Bytes32[] arr = new Bytes32[128];
         for (int i = 0; i < 128; i++) {
             arr[i] = element;
         }
         Bytes input = Bytes.concatenate(arr);
         Bytes32 result = Bytes32.wrap(LibIpaMultipoint.commit(input.toArray()));
-        Bytes32 expected = Bytes32.fromHexString("0x1b8a1c8c25323f9a58d9221b521f9618e78bb253866de6a3d1c16398678dfa26");
+        Bytes32 expected = Bytes32.fromHexString("0x26fa8d679863c1d1a3e66d8653b28be718961f521b22d9589a3f32258c1c8a1b");
         assertThat(result).isEqualTo(expected);
     }
 
     @Test
     public void testCallLibraryWithMaxElements() {
-        Bytes32 element = Bytes32.fromHexString("0x006f20567f74f607d9252186ff8efed04de4578d1ddb3de4fe6c5e4249e0045b");
+        Bytes32 element = Bytes32.fromHexString("0x5b04e049425e6cfee43ddb1d8d57e44dd0fe8eff862125d907f6747f56206f00");
         Bytes32[] arr = new Bytes32[256];
         for (int i = 0; i < 256; i++) {
             arr[i] = element;
         }
         Bytes input = Bytes.concatenate(arr);
         Bytes32 result = Bytes32.wrap(LibIpaMultipoint.commit(input.toArray()));
-        Bytes32 expected = Bytes32.fromHexString("0x148badc53042581c95e71f21b2b85826bc2f4088e617cd18f488ab664af1d043");
+        Bytes32 expected = Bytes32.fromHexString("0x43d0f14a66ab88f418cd17e688402fbc2658b8b2211fe7951c584230c5ad8b14");
         assertThat(result).isEqualTo(expected);
     }
 

diff --git a/...t/src/test/java/org/hyperledger/besu/nativelib/ipa_multipoint/PedersenCommitmentTest.java b/...t/src/test/java/org/hyperledger/besu/nativelib/ipa_multipoint/PedersenCommitmentTest.java
@@ -14,6 +14,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigInteger;
+import java.nio.ByteOrder;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -37,10 +38,10 @@ public void TestPolynomialCommitments(TestData testData) {
         List<Bytes> FrBytes = new ArrayList<>();
         for (int i = 0 ; i < 256; i++ ) {
             BigInteger decimalBigInt = new BigInteger(testData.frs.get(i));
-            FrBytes.add(Bytes32.leftPad(Bytes.wrap(decimalBigInt.toByteArray())));
+            FrBytes.add(Bytes32.leftPad(Bytes.wrap(decimalBigInt.toByteArray())).reverse());
         }
         byte[] input = Bytes.concatenate(FrBytes).toArray();
-        BigInteger result = Bytes32.wrap(LibIpaMultipoint.commit(input)).toBigInteger();
+        BigInteger result = Bytes32.wrap(LibIpaMultipoint.commit(input)).toBigInteger(ByteOrder.LITTLE_ENDIAN);
         BigInteger expected = new BigInteger(testData.commitment);
         assertThat(result).isEqualTo(expected);
     }