Merge branch 'main' into release/v22.0.0-rc.3.0

Cargo.toml

@@ -24,19 +24,19 @@ soroban-ledger-snapshot = { version = "22.0.0-rc.3.0", path = "soroban-ledger-sn
 soroban-token-sdk = { version = "22.0.0-rc.3.0", path = "soroban-token-sdk" }
 
 [workspace.dependencies.soroban-env-common]
-version = "=22.0.0-rc.2"
+version = "=22.0.0-rc.3"
 #git = "https://github.com/stellar/rs-soroban-env"
-#rev = "60e9be87a157cc9b5132056e1314faabd485b5fb"
+#rev = "8911531dfb9a4331bc308ff8934c2223bc4e81ed"
 
 [workspace.dependencies.soroban-env-guest]
-version = "=22.0.0-rc.2"
+version = "=22.0.0-rc.3"
 #git = "https://github.com/stellar/rs-soroban-env"
-#rev = "60e9be87a157cc9b5132056e1314faabd485b5fb"
+#rev = "8911531dfb9a4331bc308ff8934c2223bc4e81ed"
 
 [workspace.dependencies.soroban-env-host]
-version = "=22.0.0-rc.2"
+version = "=22.0.0-rc.3"
 #git = "https://github.com/stellar/rs-soroban-env"
-#rev = "60e9be87a157cc9b5132056e1314faabd485b5fb"
+#rev = "8911531dfb9a4331bc308ff8934c2223bc4e81ed"
 
 [workspace.dependencies.stellar-strkey]
 version = "=0.0.9"

rust-toolchain.toml

@@ -1,4 +1,4 @@
 [toolchain]
-channel = "stable"
+channel = "1.81"
 targets = ["wasm32-unknown-unknown"]
 components = ["rustc", "cargo", "rustfmt", "clippy", "rust-src"]

soroban-sdk/Cargo.toml

@@ -15,6 +15,9 @@ exclude = ["test_snapshots/", "src/tests/"]
 [lib]
 doctest = false
 
+[build-dependencies]
+rustc_version = "0.4.1"
+
 [dependencies]
 soroban-sdk-macros = { workspace = true }
 bytes-lit = "0.0.5"

soroban-sdk/build.rs

@@ -0,0 +1,8 @@
+pub fn main() {
+    #[cfg(all(target_family = "wasm", target_os = "unknown"))]
+    if let Ok(version) = rustc_version::version() {
+        if version.major == 1 && version.minor >= 82 {
+            panic!("Rust compiler 1.82+ with target 'wasm32-unknown-unknown' is unsupported by the Soroban Environment, because the 'wasm32-unknown-unknown' target in Rust 1.82+ has features enabled that are not yet supported and not easily disabled: reference-types, multi-value. Use Rust 1.81 to build for the 'wasm32-unknown-unknown' target.");
+        }
+    }
+}

soroban-sdk/src/crypto/bls12_381.rs

@@ -1,10 +1,14 @@
 use crate::{
-    env::internal::{self, BytesObject, U64Val},
+    env::internal::{self, BytesObject, U256Val, U64Val},
     impl_bytesn_repr,
     unwrap::{UnwrapInfallible, UnwrapOptimized},
     Bytes, BytesN, ConversionError, Env, IntoVal, TryFromVal, Val, Vec, U256,
 };
-use core::{cmp::Ordering, fmt::Debug};
+use core::{
+    cmp::Ordering,
+    fmt::Debug,
+    ops::{Add, Mul, Sub},
+};
 
 /// Bls12_381 provides access to curve and field arithmetics on the BLS12-381
 /// curve.
@@ -84,6 +88,14 @@ pub struct Fp(BytesN<48>);
 #[repr(transparent)]
 pub struct Fp2(BytesN<96>);
 
+/// `Fr` represents an element in the BLS12-381 scalar field, which is a prime
+/// field of order `r` (the order of the G1 and G2 groups). The struct is
+/// internally represented with an `U256`, all arithmetic operations follow
+/// modulo `r`.
+#[derive(Clone)]
+#[repr(transparent)]
+pub struct Fr(U256);
+
 impl_bytesn_repr!(G1Affine, 96);
 impl_bytesn_repr!(G2Affine, 192);
 impl_bytesn_repr!(Fp, 48);
@@ -103,18 +115,18 @@ impl G1Affine {
     }
 }
 
-impl core::ops::Add for G1Affine {
+impl Add for G1Affine {
     type Output = G1Affine;
 
     fn add(self, rhs: Self) -> Self::Output {
         self.env().crypto().bls12_381().g1_add(&self, &rhs)
     }
 }
 
-impl core::ops::Mul<U256> for G1Affine {
+impl Mul<Fr> for G1Affine {
     type Output = G1Affine;
 
-    fn mul(self, rhs: U256) -> Self::Output {
+    fn mul(self, rhs: Fr) -> Self::Output {
         self.env().crypto().bls12_381().g1_mul(&self, &rhs)
     }
 }
@@ -133,18 +145,18 @@ impl G2Affine {
     }
 }
 
-impl core::ops::Add for G2Affine {
+impl Add for G2Affine {
     type Output = G2Affine;
 
     fn add(self, rhs: Self) -> Self::Output {
         self.env().crypto().bls12_381().g2_add(&self, &rhs)
     }
 }
 
-impl core::ops::Mul<U256> for G2Affine {
+impl Mul<Fr> for G2Affine {
     type Output = G2Affine;
 
-    fn mul(self, rhs: U256) -> Self::Output {
+    fn mul(self, rhs: Fr) -> Self::Output {
         self.env().crypto().bls12_381().g2_mul(&self, &rhs)
     }
 }
@@ -169,6 +181,113 @@ impl Fp2 {
     }
 }
 
+impl Fr {
+    pub fn env(&self) -> &Env {
+        self.0.env()
+    }
+
+    pub fn from_u256(value: U256) -> Self {
+        value.into()
+    }
+
+    pub fn to_u256(&self) -> U256 {
+        self.0.clone()
+    }
+
+    pub fn as_u256(&self) -> &U256 {
+        &self.0
+    }
+
+    pub fn from_bytes(bytes: BytesN<32>) -> Self {
+        U256::from_be_bytes(bytes.env(), bytes.as_ref()).into()
+    }
+
+    pub fn to_bytes(&self) -> BytesN<32> {
+        self.as_u256().to_be_bytes().try_into().unwrap_optimized()
+    }
+
+    pub fn as_val(&self) -> &Val {
+        self.0.as_val()
+    }
+
+    pub fn to_val(&self) -> Val {
+        self.0.to_val()
+    }
+
+    pub fn pow(&self, rhs: u64) -> Self {
+        self.env().crypto().bls12_381().fr_pow(self, rhs)
+    }
+
+    pub fn inv(&self) -> Self {
+        self.env().crypto().bls12_381().fr_inv(self)
+    }
+}
+
+impl From<U256> for Fr {
+    fn from(value: U256) -> Self {
+        Self(value)
+    }
+}
+
+impl From<&Fr> for U256Val {
+    fn from(value: &Fr) -> Self {
+        value.as_u256().into()
+    }
+}
+
+impl IntoVal<Env, Val> for Fr {
+    fn into_val(&self, e: &Env) -> Val {
+        self.0.into_val(e)
+    }
+}
+
+impl TryFromVal<Env, Val> for Fr {
+    type Error = ConversionError;
+
+    fn try_from_val(env: &Env, val: &Val) -> Result<Self, Self::Error> {
+        let u = U256::try_from_val(env, val)?;
+        Ok(Fr(u))
+    }
+}
+
+impl Eq for Fr {}
+
+impl PartialEq for Fr {
+    fn eq(&self, other: &Self) -> bool {
+        self.as_u256().partial_cmp(other.as_u256()) == Some(Ordering::Equal)
+    }
+}
+
+impl Debug for Fr {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        write!(f, "Fr({:?})", self.as_u256())
+    }
+}
+
+impl Add for Fr {
+    type Output = Fr;
+
+    fn add(self, rhs: Self) -> Self::Output {
+        self.env().crypto().bls12_381().fr_add(&self, &rhs)
+    }
+}
+
+impl Sub for Fr {
+    type Output = Fr;
+
+    fn sub(self, rhs: Self) -> Self::Output {
+        self.env().crypto().bls12_381().fr_sub(&self, &rhs)
+    }
+}
+
+impl Mul for Fr {
+    type Output = Fr;
+
+    fn mul(self, rhs: Self) -> Self::Output {
+        self.env().crypto().bls12_381().fr_mul(&self, &rhs)
+    }
+}
+
 impl Bls12_381 {
     pub(crate) fn new(env: &Env) -> Bls12_381 {
         Bls12_381 { env: env.clone() }
@@ -217,15 +336,15 @@ impl Bls12_381 {
     }
 
     /// Multiplies a point `p0` in G1 by a scalar.
-    pub fn g1_mul(&self, p0: &G1Affine, scalar: &U256) -> G1Affine {
+    pub fn g1_mul(&self, p0: &G1Affine, scalar: &Fr) -> G1Affine {
         let env = self.env();
         let bin =
             internal::Env::bls12_381_g1_mul(env, p0.to_object(), scalar.into()).unwrap_infallible();
         unsafe { G1Affine::from_bytes(BytesN::unchecked_new(env.clone(), bin)) }
     }
 
     /// Performs a multi-scalar multiplication (MSM) operation in G1.
-    pub fn g1_msm(&self, vp: Vec<G1Affine>, vs: Vec<U256>) -> G1Affine {
+    pub fn g1_msm(&self, vp: Vec<G1Affine>, vs: Vec<Fr>) -> G1Affine {
         let env = self.env();
         let bin = internal::Env::bls12_381_g1_msm(env, vp.into(), vs.into()).unwrap_infallible();
         unsafe { G1Affine::from_bytes(BytesN::unchecked_new(env.clone(), bin)) }
@@ -285,15 +404,15 @@ impl Bls12_381 {
     }
 
     /// Multiplies a point `p0` in G2 by a scalar.
-    pub fn g2_mul(&self, p0: &G2Affine, scalar: &U256) -> G2Affine {
+    pub fn g2_mul(&self, p0: &G2Affine, scalar: &Fr) -> G2Affine {
         let env = self.env();
         let bin =
             internal::Env::bls12_381_g2_mul(env, p0.to_object(), scalar.into()).unwrap_infallible();
         unsafe { G2Affine::from_bytes(BytesN::unchecked_new(env.clone(), bin)) }
     }
 
     /// Performs a multi-scalar multiplication (MSM) operation in G2.
-    pub fn g2_msm(&self, vp: Vec<G2Affine>, vs: Vec<U256>) -> G2Affine {
+    pub fn g2_msm(&self, vp: Vec<G2Affine>, vs: Vec<Fr>) -> G2Affine {
         let env = self.env();
         let bin = internal::Env::bls12_381_g2_msm(env, vp.into(), vs.into()).unwrap_infallible();
         unsafe { G2Affine::from_bytes(BytesN::unchecked_new(env.clone(), bin)) }
@@ -338,38 +457,38 @@ impl Bls12_381 {
     // scalar arithmetic
 
     /// Adds two scalars in the BLS12-381 scalar field `Fr`.
-    pub fn fr_add(&self, lhs: &U256, rhs: &U256) -> U256 {
+    pub fn fr_add(&self, lhs: &Fr, rhs: &Fr) -> Fr {
         let env = self.env();
         let v = internal::Env::bls12_381_fr_add(env, lhs.into(), rhs.into()).unwrap_infallible();
-        U256::try_from_val(env, &v).unwrap_infallible()
+        U256::try_from_val(env, &v).unwrap_infallible().into()
     }
 
     /// Subtracts one scalar from another in the BLS12-381 scalar field `Fr`.
-    pub fn fr_sub(&self, lhs: &U256, rhs: &U256) -> U256 {
+    pub fn fr_sub(&self, lhs: &Fr, rhs: &Fr) -> Fr {
         let env = self.env();
         let v = internal::Env::bls12_381_fr_sub(env, lhs.into(), rhs.into()).unwrap_infallible();
-        U256::try_from_val(env, &v).unwrap_infallible()
+        U256::try_from_val(env, &v).unwrap_infallible().into()
     }
 
     /// Multiplies two scalars in the BLS12-381 scalar field `Fr`.
-    pub fn fr_mul(&self, lhs: &U256, rhs: &U256) -> U256 {
+    pub fn fr_mul(&self, lhs: &Fr, rhs: &Fr) -> Fr {
         let env = self.env();
         let v = internal::Env::bls12_381_fr_mul(env, lhs.into(), rhs.into()).unwrap_infallible();
-        U256::try_from_val(env, &v).unwrap_infallible()
+        U256::try_from_val(env, &v).unwrap_infallible().into()
     }
 
     /// Raises a scalar to the power of a given exponent in the BLS12-381 scalar field `Fr`.
-    pub fn fr_pow(&self, lhs: &U256, rhs: u64) -> U256 {
+    pub fn fr_pow(&self, lhs: &Fr, rhs: u64) -> Fr {
         let env = self.env();
         let rhs = U64Val::try_from_val(env, &rhs).unwrap_optimized();
         let v = internal::Env::bls12_381_fr_pow(env, lhs.into(), rhs).unwrap_infallible();
-        U256::try_from_val(env, &v).unwrap_infallible()
+        U256::try_from_val(env, &v).unwrap_infallible().into()
     }
 
     /// Computes the multiplicative inverse of a scalar in the BLS12-381 scalar field `Fr`.
-    pub fn fr_inv(&self, lhs: &U256) -> U256 {
+    pub fn fr_inv(&self, lhs: &Fr) -> Fr {
         let env = self.env();
         let v = internal::Env::bls12_381_fr_inv(env, lhs.into()).unwrap_infallible();
-        U256::try_from_val(env, &v).unwrap_infallible()
+        U256::try_from_val(env, &v).unwrap_infallible().into()
     }
 }