v1.18: Simd 129: alt_bn128 syscalls - simplified error code (backport…

… of #294) (#872)
anza-xyz · Apr 24, 2024 · efc616a · efc616a
1 parent 8b7c2f9
commit efc616a
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 22 deletions.
diff --git a/programs/bpf_loader/src/syscalls/mod.rs b/programs/bpf_loader/src/syscalls/mod.rs
@@ -1573,14 +1573,24 @@ declare_builtin_function!(
             }
         };
 
+        let simplify_alt_bn128_syscall_error_codes = invoke_context
+            .feature_set
+            .is_active(&feature_set::simplify_alt_bn128_syscall_error_codes::id());
+
         let result_point = match calculation(input) {
             Ok(result_point) => result_point,
             Err(e) => {
-                return Ok(e.into());
+                return if simplify_alt_bn128_syscall_error_codes {
+                    Ok(1)
+                } else {
+                    Ok(e.into())
+                };
             }
         };
 
-        if result_point.len() != output {
+        // This can never happen and should be removed when the
+        // simplify_alt_bn128_syscall_error_codes feature gets activated
+        if result_point.len() != output && !simplify_alt_bn128_syscall_error_codes {
             return Ok(AltBn128Error::SliceOutOfBounds.into());
         }
 
@@ -1720,10 +1730,19 @@ declare_builtin_function!(
                 )
             })
             .collect::<Result<Vec<_>, Error>>()?;
+
+        let simplify_alt_bn128_syscall_error_codes = invoke_context
+            .feature_set
+            .is_active(&feature_set::simplify_alt_bn128_syscall_error_codes::id());
+
         let hash = match poseidon::hashv(parameters, endianness, inputs.as_slice()) {
             Ok(hash) => hash,
             Err(e) => {
-                return Ok(e.into());
+                return if simplify_alt_bn128_syscall_error_codes {
+                    Ok(1)
+                } else {
+                    Ok(e.into())
+                };
             }
         };
         hash_result.copy_from_slice(&hash.to_bytes());
@@ -1807,12 +1826,20 @@ declare_builtin_function!(
             invoke_context.get_check_aligned(),
         )?;
 
+        let simplify_alt_bn128_syscall_error_codes = invoke_context
+            .feature_set
+            .is_active(&feature_set::simplify_alt_bn128_syscall_error_codes::id());
+
         match op {
             ALT_BN128_G1_COMPRESS => {
                 let result_point = match alt_bn128_g1_compress(input) {
                     Ok(result_point) => result_point,
                     Err(e) => {
-                        return Ok(e.into());
+                        return if simplify_alt_bn128_syscall_error_codes {
+                            Ok(1)
+                        } else {
+                            Ok(e.into())
+                        };
                     }
                 };
                 call_result.copy_from_slice(&result_point);
@@ -1822,7 +1849,11 @@ declare_builtin_function!(
                 let result_point = match alt_bn128_g1_decompress(input) {
                     Ok(result_point) => result_point,
                     Err(e) => {
-                        return Ok(e.into());
+                        return if simplify_alt_bn128_syscall_error_codes {
+                            Ok(1)
+                        } else {
+                            Ok(e.into())
+                        };
                     }
                 };
                 call_result.copy_from_slice(&result_point);
@@ -1832,7 +1863,11 @@ declare_builtin_function!(
                 let result_point = match alt_bn128_g2_compress(input) {
                     Ok(result_point) => result_point,
                     Err(e) => {
-                        return Ok(e.into());
+                        return if simplify_alt_bn128_syscall_error_codes {
+                            Ok(1)
+                        } else {
+                            Ok(e.into())
+                        };
                     }
                 };
                 call_result.copy_from_slice(&result_point);
@@ -1842,7 +1877,11 @@ declare_builtin_function!(
                 let result_point = match alt_bn128_g2_decompress(input) {
                     Ok(result_point) => result_point,
                     Err(e) => {
-                        return Ok(e.into());
+                        return if simplify_alt_bn128_syscall_error_codes {
+                            Ok(1)
+                        } else {
+                            Ok(e.into())
+                        };
                     }
                 };
                 call_result.copy_from_slice(&result_point);

diff --git a/sdk/program/src/alt_bn128/compression.rs b/sdk/program/src/alt_bn128/compression.rs
@@ -20,6 +20,8 @@ mod alt_bn128_compression_size {
     pub const G2_COMPRESSED: usize = 64;
 }
 
+// AltBn128CompressionError must be removed once the
+// simplify_alt_bn128_syscall_error_codes feature gets activated
 #[derive(Debug, Error, Clone, PartialEq, Eq)]
 pub enum AltBn128CompressionError {
     #[error("Unexpected error")]
@@ -51,13 +53,14 @@ impl From<u64> for AltBn128CompressionError {
 
 impl From<AltBn128CompressionError> for u64 {
     fn from(v: AltBn128CompressionError) -> u64 {
+        // note: should never return 0, as it risks to be confused with syscall success
         match v {
             AltBn128CompressionError::G1DecompressionFailed => 1,
             AltBn128CompressionError::G2DecompressionFailed => 2,
             AltBn128CompressionError::G1CompressionFailed => 3,
             AltBn128CompressionError::G2CompressionFailed => 4,
             AltBn128CompressionError::InvalidInputSize => 5,
-            AltBn128CompressionError::UnexpectedError => 0,
+            AltBn128CompressionError::UnexpectedError => 6,
         }
     }
 }
@@ -118,7 +121,7 @@ mod target_arch {
         .map_err(|_| AltBn128CompressionError::G1CompressionFailed)?;
         let mut g1_bytes = [0u8; alt_bn128_compression_size::G1_COMPRESSED];
         G1::serialize_compressed(&g1, g1_bytes.as_mut_slice())
-            .map_err(|_| AltBn128CompressionError::G2CompressionFailed)?;
+            .map_err(|_| AltBn128CompressionError::G1CompressionFailed)?;
         Ok(convert_endianness::<32, 32>(&g1_bytes))
     }
 
@@ -131,9 +134,12 @@ mod target_arch {
         if g2_bytes == [0u8; alt_bn128_compression_size::G2_COMPRESSED] {
             return Ok([0u8; alt_bn128_compression_size::G2]);
         }
-        let decompressed_g2 =
-            G2::deserialize_compressed(convert_endianness::<64, 64>(&g2_bytes).as_slice())
-                .map_err(|_| AltBn128CompressionError::G2DecompressionFailed)?;
+        let decompressed_g2 = G2::deserialize_with_mode(
+            convert_endianness::<64, 64>(&g2_bytes).as_slice(),
+            Compress::Yes,
+            Validate::No,
+        )
+        .map_err(|_| AltBn128CompressionError::G2DecompressionFailed)?;
         let mut decompressed_g2_bytes = [0u8; alt_bn128_compression_size::G2];
         decompressed_g2
             .x
@@ -160,7 +166,7 @@ mod target_arch {
             Compress::No,
             Validate::No,
         )
-        .map_err(|_| AltBn128CompressionError::G2DecompressionFailed)?;
+        .map_err(|_| AltBn128CompressionError::G2CompressionFailed)?;
         let mut g2_bytes = [0u8; alt_bn128_compression_size::G2_COMPRESSED];
         G2::serialize_compressed(&g2, g2_bytes.as_mut_slice())
             .map_err(|_| AltBn128CompressionError::G2CompressionFailed)?;
@@ -205,7 +211,7 @@ mod target_arch {
 
         match result {
             0 => Ok(result_buffer),
-            error => Err(AltBn128CompressionError::from(error)),
+            _ => Err(AltBn128CompressionError::UnexpectedError),
         }
     }
 
@@ -222,7 +228,7 @@ mod target_arch {
 
         match result {
             0 => Ok(result_buffer),
-            error => Err(AltBn128CompressionError::from(error)),
+            _ => Err(AltBn128CompressionError::UnexpectedError),
         }
     }
 
@@ -241,7 +247,7 @@ mod target_arch {
 
         match result {
             0 => Ok(result_buffer),
-            error => Err(AltBn128CompressionError::from(error)),
+            _ => Err(AltBn128CompressionError::UnexpectedError),
         }
     }
 
@@ -260,7 +266,7 @@ mod target_arch {
 
         match result {
             0 => Ok(result_buffer),
-            error => Err(AltBn128CompressionError::from(error)),
+            _ => Err(AltBn128CompressionError::UnexpectedError),
         }
     }
 }

diff --git a/sdk/program/src/alt_bn128/mod.rs b/sdk/program/src/alt_bn128/mod.rs
@@ -41,6 +41,8 @@ mod consts {
     pub const ALT_BN128_PAIRING: u64 = 3;
 }
 
+// AltBn128Error must be removed once the
+// simplify_alt_bn128_syscall_error_codes feature gets activated
 #[derive(Debug, Error, Clone, PartialEq, Eq)]
 pub enum AltBn128Error {
     #[error("The input data is invalid")]
@@ -72,13 +74,14 @@ impl From<u64> for AltBn128Error {
 
 impl From<AltBn128Error> for u64 {
     fn from(v: AltBn128Error) -> u64 {
+        // note: should never return 0, as it risks to be confused with syscall success
         match v {
             AltBn128Error::InvalidInputData => 1,
             AltBn128Error::GroupError => 2,
             AltBn128Error::SliceOutOfBounds => 3,
             AltBn128Error::TryIntoVecError(_) => 4,
             AltBn128Error::ProjectiveToG1Failed => 5,
-            AltBn128Error::UnexpectedError => 0,
+            AltBn128Error::UnexpectedError => 6,
         }
     }
 }
@@ -319,7 +322,7 @@ mod target_arch {
 
         match result {
             0 => Ok(result_buffer.to_vec()),
-            error => Err(AltBn128Error::from(error)),
+            _ => Err(AltBn128Error::UnexpectedError),
         }
     }
 
@@ -339,7 +342,7 @@ mod target_arch {
 
         match result {
             0 => Ok(result_buffer.to_vec()),
-            error => Err(AltBn128Error::from(error)),
+            _ => Err(AltBn128Error::UnexpectedError),
         }
     }
 
@@ -363,7 +366,7 @@ mod target_arch {
 
         match result {
             0 => Ok(result_buffer.to_vec()),
-            error => Err(AltBn128Error::from(error)),
+            _ => Err(AltBn128Error::UnexpectedError),
         }
     }
 }

diff --git a/sdk/program/src/poseidon.rs b/sdk/program/src/poseidon.rs
@@ -7,6 +7,8 @@ use thiserror::Error;
 /// Length of Poseidon hash result.
 pub const HASH_BYTES: usize = 32;
 
+// PoseidonSyscallError must be removed once the
+// simplify_alt_bn128_syscall_error_codes feature gets activated
 #[derive(Error, Debug)]
 pub enum PoseidonSyscallError {
     #[error("Invalid parameters.")]
@@ -267,7 +269,7 @@ pub fn hashv(
 
         match result {
             0 => Ok(PoseidonHash::new(hash_result)),
-            e => Err(PoseidonSyscallError::from(e)),
+            _ => Err(PoseidonSyscallError::Unexpected),
         }
     }
 }