refactor: simplify precompile structure

SigmaGmbH · Mar 14, 2024 · e28cf8e · e28cf8e
1 parent 181ccad
commit e28cf8e
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 54 deletions.
diff --git a/sgxvm/src/precompiles/compliance_bridge.rs b/sgxvm/src/precompiles/compliance_bridge.rs
@@ -26,18 +26,17 @@ impl LinearCostPrecompileWithQuerier for ComplianceBridge {
         )?;
 
         handle.record_cost(cost)?;
-        let (exit_status, output) = Self::raw_execute(querier, handle.input(), cost)?;
+        let (exit_status, output) = execute_inner(querier, handle.input())?;
         Ok(PrecompileOutput {
             exit_status,
             output,
         })
     }
+}
 
-    fn raw_execute(
-        querier: *mut GoQuerier,
-        input: &[u8],
-        _: u64,
-    ) -> Result<(ExitSucceed, Vec<u8>), PrecompileFailure> {
-        Ok((ExitSucceed::Returned, Vec::default()))
-    }
+fn execute_inner(
+    querier: *mut GoQuerier,
+    input: &[u8],
+) -> Result<(ExitSucceed, Vec<u8>), PrecompileFailure> {
+    Ok((ExitSucceed::Returned, Vec::default()))
 }
diff --git a/sgxvm/src/precompiles/identity.rs b/sgxvm/src/precompiles/identity.rs
@@ -84,61 +84,60 @@ impl LinearCostPrecompileWithQuerier for Identity {
         )?;
 
         handle.record_cost(cost)?;
-        let (exit_status, output) = Self::raw_execute(querier, handle.input(), cost)?;
+        let (exit_status, output) = execute_inner(querier, handle.input())?;
         Ok(PrecompileOutput {
             exit_status,
             output,
         })
     }
+}
 
-    fn raw_execute(
-        querier: *mut GoQuerier,
-        input: &[u8],
-        _: u64,
-    ) -> Result<(ExitSucceed, Vec<u8>), PrecompileFailure> {
-        // Expects to receive RLP-encoded JWT proof for Verifiable Credential
-        let jwt: String = rlp::decode(input).map_err(|_| PrecompileFailure::Error {
-            exit_status: ExitError::Other("cannot decode provided JWT proof".into()),
-        })?;
+fn execute_inner(
+    querier: *mut GoQuerier,
+    input: &[u8],
+) -> Result<(ExitSucceed, Vec<u8>), PrecompileFailure> {
+    // Expects to receive RLP-encoded JWT proof for Verifiable Credential
+    let jwt: String = rlp::decode(input).map_err(|_| PrecompileFailure::Error {
+        exit_status: ExitError::Other("cannot decode provided JWT proof".into()),
+    })?;
 
-        // Split JWT into parts
-        let (header, payload, signature, data) = split_jwt(jwt.as_str())?;
+    // Split JWT into parts
+    let (header, payload, signature, data) = split_jwt(jwt.as_str())?;
 
-        // Parse and validate header
-        let header: Header = serde_json::from_str(header.as_str()).map_err(|_| PrecompileFailure::Error {
-            exit_status: ExitError::Other("Cannot parse JWT header".into()),
-        })?;
+    // Parse and validate header
+    let header: Header = serde_json::from_str(header.as_str()).map_err(|_| PrecompileFailure::Error {
+        exit_status: ExitError::Other("Cannot parse JWT header".into()),
+    })?;
 
-        // Validate header
-        header.validate()?;
+    // Validate header
+    header.validate()?;
 
-        // Parse payload
-        let parsed_payload: VerifiableCredential = serde_json::from_str(payload.as_str()).map_err(|_| PrecompileFailure::Error {
-            exit_status: ExitError::Other("Cannot parse JWT payload".into()),
-        })?;
+    // Parse payload
+    let parsed_payload: VerifiableCredential = serde_json::from_str(payload.as_str()).map_err(|_| PrecompileFailure::Error {
+        exit_status: ExitError::Other("Cannot parse JWT payload".into()),
+    })?;
 
-        // Since we issue VC without expiration date, verify nbf (not valid before) field of JWT, it should be less than current timestamp 
-        validate_nbf(parsed_payload.nbf)?;
+    // Since we issue VC without expiration date, verify nbf (not valid before) field of JWT, it should be less than current timestamp
+    validate_nbf(parsed_payload.nbf)?;
 
-        // Extract issuer from payload and obtain verification material
-        let verification_materials = get_verification_material(querier, parsed_payload.iss.clone())?;
+    // Extract issuer from payload and obtain verification material
+    let verification_materials = get_verification_material(querier, parsed_payload.iss.clone())?;
 
-        // Find appropriate verification material
-        let vm = verification_materials
-            .iter()
-            .find(|verification_method| verification_method.verificationMethodType == "Ed25519VerificationKey2020" || verification_method.verificationMethodType == "Ed25519VerificationKey2018")
-            .and_then(|method| Some(method.verificationMaterial.clone()))
-            .ok_or(PrecompileFailure::Error {
-                exit_status: ExitError::Other("Cannot find appropriate verification method".into()),
-            })?;
-
-        verify_signature(&data, &signature, &vm)?;
+    // Find appropriate verification material
+    let vm = verification_materials
+        .iter()
+        .find(|verification_method| verification_method.verificationMethodType == "Ed25519VerificationKey2020" || verification_method.verificationMethodType == "Ed25519VerificationKey2018")
+        .and_then(|method| Some(method.verificationMaterial.clone()))
+        .ok_or(PrecompileFailure::Error {
+            exit_status: ExitError::Other("Cannot find appropriate verification method".into()),
+        })?;
 
-        let credential_subject = convert_bech32_address(parsed_payload.vc.credential_subject.user_address)?;
-        let output = encode_output(credential_subject, parsed_payload.iss);
+    verify_signature(&data, &signature, &vm)?;
 
-        Ok((ExitSucceed::Returned, output))
-    }
+    let credential_subject = convert_bech32_address(parsed_payload.vc.credential_subject.user_address)?;
+    let output = encode_output(credential_subject, parsed_payload.iss);
+
+    Ok((ExitSucceed::Returned, output))
 }
 
 /// Splits provided JWT into header, payload, signature and data.

diff --git a/sgxvm/src/precompiles/mod.rs b/sgxvm/src/precompiles/mod.rs
@@ -46,12 +46,6 @@ pub trait LinearCostPrecompileWithQuerier {
     const WORD: u64;
 
     fn execute(querier: *mut GoQuerier, handle: &mut impl PrecompileHandle) -> PrecompileResult;
-
-    fn raw_execute(
-        querier: *mut GoQuerier,
-        input: &[u8],
-        cost: u64,
-    ) -> Result<(ExitSucceed, Vec<u8>), PrecompileFailure>;
 }
 
 impl<T: LinearCostPrecompile> Precompile for T {