implement missing traits for G1/G2/Fr to be used as contracttype

Author: jayz22

soroban-sdk/src/bytes.rs

@@ -143,12 +143,6 @@ macro_rules! impl_bytesn_repr {
             }
         }
 
-        impl IntoVal<Env, Val> for $elem {
-            fn into_val(&self, e: &Env) -> Val {
-                self.0.into_val(e)
-            }
-        }
-
         impl TryFromVal<Env, Val> for $elem {
             type Error = ConversionError;
 
@@ -158,6 +152,28 @@ macro_rules! impl_bytesn_repr {
             }
         }
 
+        impl TryFromVal<Env, $elem> for Val {
+            type Error = ConversionError;
+
+            fn try_from_val(_env: &Env, elt: &$elem) -> Result<Self, Self::Error> {
+                Ok(elt.to_val())
+            }
+        }
+
+        #[cfg(not(target_family = "wasm"))]
+        impl From<&$elem> for ScVal {
+            fn from(v: &$elem) -> Self {
+                Self::from(&v.0)
+            }
+        }
+
+        #[cfg(not(target_family = "wasm"))]
+        impl From<$elem> for ScVal {
+            fn from(v: $elem) -> Self {
+                (&v).into()
+            }
+        }
+
         impl IntoVal<Env, BytesN<$size>> for $elem {
             fn into_val(&self, _e: &Env) -> BytesN<$size> {
                 self.0.clone()

soroban-sdk/src/crypto/bls12_381.rs

@@ -10,6 +10,9 @@ use core::{
     ops::{Add, Mul, Neg, Sub},
 };
 
+#[cfg(not(target_family = "wasm"))]
+use crate::xdr::ScVal;
+
 /// Bls12_381 provides access to curve and field arithmetics on the BLS12-381
 /// curve.
 pub struct Bls12_381 {
@@ -227,6 +230,14 @@ impl G1Affine {
     }
 }
 
+// impl TryFromVal<Env, Val> for G1Affine {
+//     type Error = ConversionError;
+
+//     fn try_from_val(env: &Env, v: &Val) -> Result<Self, Self::Error> {
+//         Ok(G1Affine(BytesN::try_from_val(env, v)?))
+//     }
+// }
+
 impl Add for G1Affine {
     type Output = G1Affine;
 

soroban-sdk/src/testutils/arbitrary.rs

@@ -320,6 +320,7 @@ mod objects {
 
     use crate::xdr::{Int256Parts, ScVal, UInt256Parts};
     use crate::{
+        crypto::bls12_381::{Fr, G1Affine, G2Affine},
         Address, Bytes, BytesN, Duration, Map, String, Symbol, Timepoint, Val, Vec, I256, U256,
     };
 
@@ -680,6 +681,64 @@ mod objects {
             Ok(sc_duration.into_val(env))
         }
     }
+
+    // For G1Affine (96 bytes)
+    #[derive(Arbitrary, Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
+    pub struct ArbitraryG1Affine {
+        bytes: [u8; 96],
+    }
+
+    impl SorobanArbitrary for G1Affine {
+        type Prototype = ArbitraryG1Affine;
+    }
+
+    impl TryFromVal<Env, ArbitraryG1Affine> for G1Affine {
+        type Error = ConversionError;
+
+        fn try_from_val(env: &Env, v: &ArbitraryG1Affine) -> Result<Self, Self::Error> {
+            let mut bytes = v.bytes;
+            bytes[0] &= 0b0001_1111; // Clear the top 3 bits
+            Ok(G1Affine::from_array(env, &bytes))
+        }
+    }
+
+    // For G2Affine (192 bytes)
+    #[derive(Arbitrary, Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
+    pub struct ArbitraryG2Affine {
+        bytes: [u8; 192],
+    }
+
+    impl SorobanArbitrary for G2Affine {
+        type Prototype = ArbitraryG2Affine;
+    }
+
+    impl TryFromVal<Env, ArbitraryG2Affine> for G2Affine {
+        type Error = ConversionError;
+
+        fn try_from_val(env: &Env, v: &ArbitraryG2Affine) -> Result<Self, Self::Error> {
+            let mut bytes = v.bytes;
+            bytes[0] &= 0b0001_1111; // Clear the top 3 bits
+            Ok(G2Affine::from_array(env, &bytes))
+        }
+    }
+
+    #[derive(Arbitrary, Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
+    pub struct ArbitraryFr {
+        bytes: [u8; 32],
+    }
+
+    impl SorobanArbitrary for Fr {
+        type Prototype = ArbitraryFr;
+    }
+
+    impl TryFromVal<Env, ArbitraryFr> for Fr {
+        type Error = ConversionError;
+
+        fn try_from_val(env: &Env, v: &ArbitraryFr) -> Result<Self, Self::Error> {
+            // Convert bytes to Fr via U256
+            Ok(Fr::from_bytes(BytesN::from_array(env, &v.bytes)))
+        }
+    }
 }
 
 /// Implementations of `soroban_sdk::testutils::arbitrary::api` for tuples of Soroban types.