feat: use view function for verify

sismo-core · Jul 22, 2023 · 715d52e · 715d52e
1 parent b45c94a
commit 715d52e
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 50 deletions.
diff --git a/src/SismoConnectVerifier.sol b/src/SismoConnectVerifier.sol
@@ -49,7 +49,7 @@ contract SismoConnectVerifier is ISismoConnectVerifier, Initializable, Ownable {
     SismoConnectResponse memory response,
     SismoConnectRequest memory request,
     SismoConnectConfig memory config
-  ) external override returns (SismoConnectVerifiedResult memory) {
+  ) external view override returns (SismoConnectVerifiedResult memory) {
     if (response.appId != config.appId) {
       revert AppIdMismatch(response.appId, config.appId);
     }

diff --git a/src/interfaces/IBaseVerifier.sol b/src/interfaces/IBaseVerifier.sol
@@ -11,5 +11,5 @@ interface IBaseVerifier {
     bool isImpersonationMode,
     bytes memory signedMessage,
     SismoConnectProof memory sismoConnectProof
-  ) external returns (VerifiedAuth memory, VerifiedClaim memory);
+  ) external view returns (VerifiedAuth memory, VerifiedClaim memory);
 }
diff --git a/src/interfaces/ISismoConnectVerifier.sol b/src/interfaces/ISismoConnectVerifier.sol
@@ -15,7 +15,7 @@ interface ISismoConnectVerifier {
     SismoConnectResponse memory response,
     SismoConnectRequest memory request,
     SismoConnectConfig memory config
-  ) external returns (SismoConnectVerifiedResult memory);
+  ) external view returns (SismoConnectVerifiedResult memory);
 
   function SISMO_CONNECT_VERSION() external view returns (bytes32);
 }
diff --git a/src/libs/sismo-connect/SismoConnectLib.sol b/src/libs/sismo-connect/SismoConnectLib.sol
@@ -79,7 +79,7 @@ contract SismoConnect {
     ClaimRequest memory claim,
     SignatureRequest memory signature,
     bytes16 namespace
-  ) internal returns (SismoConnectVerifiedResult memory) {
+  ) internal view returns (SismoConnectVerifiedResult memory) {
     SismoConnectResponse memory response = abi.decode(responseBytes, (SismoConnectResponse));
     SismoConnectRequest memory request = buildRequest(auth, claim, signature, namespace);
     return _sismoConnectVerifier.verify(response, request, config());
@@ -90,7 +90,7 @@ contract SismoConnect {
     AuthRequest memory auth,
     ClaimRequest memory claim,
     bytes16 namespace
-  ) internal returns (SismoConnectVerifiedResult memory) {
+  ) internal view returns (SismoConnectVerifiedResult memory) {
     SismoConnectResponse memory response = abi.decode(responseBytes, (SismoConnectResponse));
     SismoConnectRequest memory request = buildRequest(auth, claim, namespace);
     return _sismoConnectVerifier.verify(response, request, config());
@@ -101,7 +101,7 @@ contract SismoConnect {
     AuthRequest memory auth,
     SignatureRequest memory signature,
     bytes16 namespace
-  ) internal returns (SismoConnectVerifiedResult memory) {
+  ) internal view returns (SismoConnectVerifiedResult memory) {
     SismoConnectResponse memory response = abi.decode(responseBytes, (SismoConnectResponse));
     SismoConnectRequest memory request = buildRequest(auth, signature, namespace);
     return _sismoConnectVerifier.verify(response, request, config());
@@ -112,7 +112,7 @@ contract SismoConnect {
     ClaimRequest memory claim,
     SignatureRequest memory signature,
     bytes16 namespace
-  ) internal returns (SismoConnectVerifiedResult memory) {
+  ) internal view returns (SismoConnectVerifiedResult memory) {
     SismoConnectResponse memory response = abi.decode(responseBytes, (SismoConnectResponse));
     SismoConnectRequest memory request = buildRequest(claim, signature, namespace);
     return _sismoConnectVerifier.verify(response, request, config());
@@ -122,7 +122,7 @@ contract SismoConnect {
     bytes memory responseBytes,
     AuthRequest memory auth,
     bytes16 namespace
-  ) internal returns (SismoConnectVerifiedResult memory) {
+  ) internal view returns (SismoConnectVerifiedResult memory) {
     SismoConnectResponse memory response = abi.decode(responseBytes, (SismoConnectResponse));
     SismoConnectRequest memory request = buildRequest(auth, namespace);
     return _sismoConnectVerifier.verify(response, request, config());
@@ -132,7 +132,7 @@ contract SismoConnect {
     bytes memory responseBytes,
     ClaimRequest memory claim,
     bytes16 namespace
-  ) internal returns (SismoConnectVerifiedResult memory) {
+  ) internal view returns (SismoConnectVerifiedResult memory) {
     SismoConnectResponse memory response = abi.decode(responseBytes, (SismoConnectResponse));
     SismoConnectRequest memory request = buildRequest(claim, namespace);
     return _sismoConnectVerifier.verify(response, request, config());
@@ -143,7 +143,7 @@ contract SismoConnect {
     AuthRequest memory auth,
     ClaimRequest memory claim,
     SignatureRequest memory signature
-  ) internal returns (SismoConnectVerifiedResult memory) {
+  ) internal view returns (SismoConnectVerifiedResult memory) {
     SismoConnectResponse memory response = abi.decode(responseBytes, (SismoConnectResponse));
     SismoConnectRequest memory request = buildRequest(auth, claim, signature);
     return _sismoConnectVerifier.verify(response, request, config());
@@ -153,7 +153,7 @@ contract SismoConnect {
     bytes memory responseBytes,
     AuthRequest memory auth,
     ClaimRequest memory claim
-  ) internal returns (SismoConnectVerifiedResult memory) {
+  ) internal view returns (SismoConnectVerifiedResult memory) {
     SismoConnectResponse memory response = abi.decode(responseBytes, (SismoConnectResponse));
     SismoConnectRequest memory request = buildRequest(auth, claim);
     return _sismoConnectVerifier.verify(response, request, config());
@@ -163,7 +163,7 @@ contract SismoConnect {
     bytes memory responseBytes,
     AuthRequest memory auth,
     SignatureRequest memory signature
-  ) internal returns (SismoConnectVerifiedResult memory) {
+  ) internal view returns (SismoConnectVerifiedResult memory) {
     SismoConnectResponse memory response = abi.decode(responseBytes, (SismoConnectResponse));
     SismoConnectRequest memory request = buildRequest(auth, signature);
     return _sismoConnectVerifier.verify(response, request, config());
@@ -173,7 +173,7 @@ contract SismoConnect {
     bytes memory responseBytes,
     ClaimRequest memory claim,
     SignatureRequest memory signature
-  ) internal returns (SismoConnectVerifiedResult memory) {
+  ) internal view returns (SismoConnectVerifiedResult memory) {
     SismoConnectResponse memory response = abi.decode(responseBytes, (SismoConnectResponse));
     SismoConnectRequest memory request = buildRequest(claim, signature);
     return _sismoConnectVerifier.verify(response, request, config());
@@ -182,7 +182,7 @@ contract SismoConnect {
   function verify(
     bytes memory responseBytes,
     AuthRequest memory auth
-  ) internal returns (SismoConnectVerifiedResult memory) {
+  ) internal view returns (SismoConnectVerifiedResult memory) {
     SismoConnectResponse memory response = abi.decode(responseBytes, (SismoConnectResponse));
     SismoConnectRequest memory request = buildRequest(auth);
     return _sismoConnectVerifier.verify(response, request, config());
@@ -191,7 +191,7 @@ contract SismoConnect {
   function verify(
     bytes memory responseBytes,
     ClaimRequest memory claim
-  ) internal returns (SismoConnectVerifiedResult memory) {
+  ) internal view returns (SismoConnectVerifiedResult memory) {
     SismoConnectResponse memory response = abi.decode(responseBytes, (SismoConnectResponse));
     SismoConnectRequest memory request = buildRequest(claim);
     return _sismoConnectVerifier.verify(response, request, config());
@@ -200,7 +200,7 @@ contract SismoConnect {
   function verify(
     bytes memory responseBytes,
     SismoConnectRequest memory request
-  ) internal returns (SismoConnectVerifiedResult memory) {
+  ) internal view returns (SismoConnectVerifiedResult memory) {
     SismoConnectResponse memory response = abi.decode(responseBytes, (SismoConnectResponse));
     return _sismoConnectVerifier.verify(response, request, config());
   }
@@ -211,7 +211,7 @@ contract SismoConnect {
     ClaimRequest[] memory claims,
     SignatureRequest memory signature,
     bytes16 namespace
-  ) internal returns (SismoConnectVerifiedResult memory) {
+  ) internal view returns (SismoConnectVerifiedResult memory) {
     SismoConnectResponse memory response = abi.decode(responseBytes, (SismoConnectResponse));
     SismoConnectRequest memory request = buildRequest(auths, claims, signature, namespace);
     return _sismoConnectVerifier.verify(response, request, config());
@@ -222,7 +222,7 @@ contract SismoConnect {
     AuthRequest[] memory auths,
     ClaimRequest[] memory claims,
     bytes16 namespace
-  ) internal returns (SismoConnectVerifiedResult memory) {
+  ) internal view returns (SismoConnectVerifiedResult memory) {
     SismoConnectResponse memory response = abi.decode(responseBytes, (SismoConnectResponse));
     SismoConnectRequest memory request = buildRequest(auths, claims, namespace);
     return _sismoConnectVerifier.verify(response, request, config());
@@ -233,7 +233,7 @@ contract SismoConnect {
     AuthRequest[] memory auths,
     SignatureRequest memory signature,
     bytes16 namespace
-  ) internal returns (SismoConnectVerifiedResult memory) {
+  ) internal view returns (SismoConnectVerifiedResult memory) {
     SismoConnectResponse memory response = abi.decode(responseBytes, (SismoConnectResponse));
     SismoConnectRequest memory request = buildRequest(auths, signature, namespace);
     return _sismoConnectVerifier.verify(response, request, config());
@@ -244,7 +244,7 @@ contract SismoConnect {
     ClaimRequest[] memory claims,
     SignatureRequest memory signature,
     bytes16 namespace
-  ) internal returns (SismoConnectVerifiedResult memory) {
+  ) internal view returns (SismoConnectVerifiedResult memory) {
     SismoConnectResponse memory response = abi.decode(responseBytes, (SismoConnectResponse));
     SismoConnectRequest memory request = buildRequest(claims, signature, namespace);
     return _sismoConnectVerifier.verify(response, request, config());
@@ -254,7 +254,7 @@ contract SismoConnect {
     bytes memory responseBytes,
     AuthRequest[] memory auths,
     bytes16 namespace
-  ) internal returns (SismoConnectVerifiedResult memory) {
+  ) internal view returns (SismoConnectVerifiedResult memory) {
     SismoConnectResponse memory response = abi.decode(responseBytes, (SismoConnectResponse));
     SismoConnectRequest memory request = buildRequest(auths, namespace);
     return _sismoConnectVerifier.verify(response, request, config());
@@ -264,7 +264,7 @@ contract SismoConnect {
     bytes memory responseBytes,
     ClaimRequest[] memory claims,
     bytes16 namespace
-  ) internal returns (SismoConnectVerifiedResult memory) {
+  ) internal view returns (SismoConnectVerifiedResult memory) {
     SismoConnectResponse memory response = abi.decode(responseBytes, (SismoConnectResponse));
     SismoConnectRequest memory request = buildRequest(claims, namespace);
     return _sismoConnectVerifier.verify(response, request, config());
@@ -275,7 +275,7 @@ contract SismoConnect {
     AuthRequest[] memory auths,
     ClaimRequest[] memory claims,
     SignatureRequest memory signature
-  ) internal returns (SismoConnectVerifiedResult memory) {
+  ) internal view returns (SismoConnectVerifiedResult memory) {
     SismoConnectResponse memory response = abi.decode(responseBytes, (SismoConnectResponse));
     SismoConnectRequest memory request = buildRequest(auths, claims, signature);
     return _sismoConnectVerifier.verify(response, request, config());
@@ -285,7 +285,7 @@ contract SismoConnect {
     bytes memory responseBytes,
     AuthRequest[] memory auths,
     ClaimRequest[] memory claims
-  ) internal returns (SismoConnectVerifiedResult memory) {
+  ) internal view returns (SismoConnectVerifiedResult memory) {
     SismoConnectResponse memory response = abi.decode(responseBytes, (SismoConnectResponse));
     SismoConnectRequest memory request = buildRequest(auths, claims);
     return _sismoConnectVerifier.verify(response, request, config());
@@ -295,7 +295,7 @@ contract SismoConnect {
     bytes memory responseBytes,
     AuthRequest[] memory auths,
     SignatureRequest memory signature
-  ) internal returns (SismoConnectVerifiedResult memory) {
+  ) internal view returns (SismoConnectVerifiedResult memory) {
     SismoConnectResponse memory response = abi.decode(responseBytes, (SismoConnectResponse));
     SismoConnectRequest memory request = buildRequest(auths, signature);
     return _sismoConnectVerifier.verify(response, request, config());
@@ -305,7 +305,7 @@ contract SismoConnect {
     bytes memory responseBytes,
     ClaimRequest[] memory claims,
     SignatureRequest memory signature
-  ) internal returns (SismoConnectVerifiedResult memory) {
+  ) internal view returns (SismoConnectVerifiedResult memory) {
     SismoConnectResponse memory response = abi.decode(responseBytes, (SismoConnectResponse));
     SismoConnectRequest memory request = buildRequest(claims, signature);
     return _sismoConnectVerifier.verify(response, request, config());
@@ -314,7 +314,7 @@ contract SismoConnect {
   function verify(
     bytes memory responseBytes,
     AuthRequest[] memory auths
-  ) internal returns (SismoConnectVerifiedResult memory) {
+  ) internal view returns (SismoConnectVerifiedResult memory) {
     SismoConnectResponse memory response = abi.decode(responseBytes, (SismoConnectResponse));
     SismoConnectRequest memory request = buildRequest(auths);
     return _sismoConnectVerifier.verify(response, request, config());
@@ -323,7 +323,7 @@ contract SismoConnect {
   function verify(
     bytes memory responseBytes,
     ClaimRequest[] memory claims
-  ) internal returns (SismoConnectVerifiedResult memory) {
+  ) internal view returns (SismoConnectVerifiedResult memory) {
     SismoConnectResponse memory response = abi.decode(responseBytes, (SismoConnectResponse));
     SismoConnectRequest memory request = buildRequest(claims);
     return _sismoConnectVerifier.verify(response, request, config());

diff --git a/src/misc/CheatSheet.sol b/src/misc/CheatSheet.sol
@@ -15,7 +15,7 @@ contract CheatSheet is SismoConnect {
     SismoConnect(buildConfig({appId: _appId, isImpersonationMode: _isImpersonationMode}))
   {}
 
-  function verifySismoConnectResponse(bytes memory response) public {
+  function verifySismoConnectResponse(bytes memory response) public view {
     // Recreate the request made in the fontend to verify the proof
     AuthRequest[] memory auths = new AuthRequest[](6);
     auths[0] = _authRequestBuilder.build({authType: AuthType.VAULT});

diff --git a/src/verifiers/HydraS3Verifier.sol b/src/verifiers/HydraS3Verifier.sol
@@ -57,7 +57,7 @@ contract HydraS3Verifier is IHydraS3Verifier, IBaseVerifier, HydraS3SnarkVerifie
     bool isImpersonationMode,
     bytes memory signedMessage,
     SismoConnectProof memory sismoConnectProof
-  ) external returns (VerifiedAuth memory, VerifiedClaim memory) {
+  ) external view returns (VerifiedAuth memory, VerifiedClaim memory) {
     // Verify the sismoConnectProof version corresponds to the current verifier.
     if (sismoConnectProof.provingScheme != HYDRA_S3_VERSION) {
       revert InvalidVersion(sismoConnectProof.provingScheme);
@@ -288,24 +288,16 @@ contract HydraS3Verifier is IHydraS3Verifier, IBaseVerifier, HydraS3SnarkVerifie
     }
   }
 
-  function _checkSnarkProof(HydraS3ProofData memory snarkProofData) internal {
+  function _checkSnarkProof(HydraS3ProofData memory snarkProofData) internal view {
     // low-level call to the `verifyProof` function
     // since the function only accepts arguments located in calldata
-    (bool success, bytes memory result) = address(this).call(
-      abi.encodeWithSelector(
-        this.verifyProof.selector,
-        snarkProofData.proof.a,
-        snarkProofData.proof.b,
-        snarkProofData.proof.c,
-        snarkProofData.input
-      )
+    bool isVerified = this.verifyProof(
+      snarkProofData.proof.a,
+      snarkProofData.proof.b,
+      snarkProofData.proof.c,
+      snarkProofData.input
     );
 
-    if (!success) {
-      revert CallToVerifyProofFailed();
-    }
-    bool isVerified = abi.decode(result, (bool));
-
     if (!isVerified) {
       revert InvalidProof();
     }

diff --git a/test/harness/SismoConnectHarness.sol b/test/harness/SismoConnectHarness.sol
@@ -71,38 +71,38 @@ contract SismoConnectHarness is SismoConnect {
   function exposed_verify(
     bytes memory responseBytes,
     ClaimRequest memory claim
-  ) external returns (SismoConnectVerifiedResult memory) {
+  ) external view returns (SismoConnectVerifiedResult memory) {
     return verify({responseBytes: responseBytes, claim: claim});
   }
 
   function exposed_verify(
     bytes memory responseBytes,
     ClaimRequest memory claim,
     bytes16 namespace
-  ) external returns (SismoConnectVerifiedResult memory) {
+  ) external view returns (SismoConnectVerifiedResult memory) {
     return verify({responseBytes: responseBytes, claim: claim, namespace: namespace});
   }
 
   function exposed_verify(
     bytes memory responseBytes,
     ClaimRequest memory claim,
     SignatureRequest memory signature
-  ) external returns (SismoConnectVerifiedResult memory) {
+  ) external view returns (SismoConnectVerifiedResult memory) {
     return verify({responseBytes: responseBytes, claim: claim, signature: signature});
   }
 
   function exposed_verify(
     bytes memory responseBytes,
     AuthRequest memory auth,
     SignatureRequest memory signature
-  ) external returns (SismoConnectVerifiedResult memory) {
+  ) external view returns (SismoConnectVerifiedResult memory) {
     return verify({responseBytes: responseBytes, auth: auth, signature: signature});
   }
 
   function exposed_verify(
     bytes memory responseBytes,
     SismoConnectRequest memory request
-  ) external returns (SismoConnectVerifiedResult memory) {
+  ) external view returns (SismoConnectVerifiedResult memory) {
     return verify({responseBytes: responseBytes, request: request});
   }
 }
diff --git a/test/misc/UpgradeableExample.sol b/test/misc/UpgradeableExample.sol
@@ -36,7 +36,7 @@ contract UpgradeableExample is SismoConnect, Initializable {
   function exposed_verify(
     bytes memory responseBytes,
     SignatureRequest memory signature
-  ) external returns (SismoConnectVerifiedResult memory) {
+  ) external view returns (SismoConnectVerifiedResult memory) {
     ClaimRequest[] memory claims = new ClaimRequest[](_groupIds.length);
     for (uint256 i = 0; i < _groupIds.length; i++) {
       claims[i] = buildClaim(_groupIds[i]);