chore: make language to be enum in zk VerificationSuccess

blockscout · Jul 10, 2024 · 71d706e · 71d706e
1 parent ac7f0be
commit 71d706e
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 7 deletions.
diff --git a/smart-contract-verifier/smart-contract-verifier-proto/proto/v2/zksync-solidity.proto b/smart-contract-verifier/smart-contract-verifier-proto/proto/v2/zksync-solidity.proto
@@ -27,16 +27,22 @@ message VerificationFailure {
 }
 
 message VerificationSuccess {
+  string file_name = 1;
+  string contract_name = 2;
+
   message Compiler {
     string compiler = 1;
     string version = 2;
   }
-
-  string file_name = 1;
-  string contract_name = 2;
   Compiler zk_compiler = 3;
   Compiler evm_compiler = 4;
-  string language = 5;
+
+  enum Language {
+    LANGUAGE_UNKNOWN = 0;
+    SOLIDITY = 1;
+  }
+  Language language = 5;
+
   string compiler_settings = 6;
   map <string, string> sources = 7;
   string compilation_artifacts = 8;

diff --git a/...ct-verifier/smart-contract-verifier-proto/swagger/v2/smart-contract-verifier.swagger.yaml b/...ct-verifier/smart-contract-verifier-proto/swagger/v2/smart-contract-verifier.swagger.yaml
@@ -454,7 +454,7 @@ definitions:
       evmCompiler:
         $ref: '#/definitions/solidityVerificationSuccessCompiler'
       language:
-        type: string
+        $ref: '#/definitions/solidityVerificationSuccessLanguage'
       compilerSettings:
         type: string
       sources:
@@ -478,6 +478,12 @@ definitions:
         type: string
       version:
         type: string
+  solidityVerificationSuccessLanguage:
+    type: string
+    enum:
+      - LANGUAGE_UNKNOWN
+      - SOLIDITY
+    default: LANGUAGE_UNKNOWN
   solidityVerifyStandardJsonRequest:
     type: object
     properties:

diff --git a/...contract-verifier/smart-contract-verifier-server/src/services/zksync_solidity_verifier.rs b/...contract-verifier/smart-contract-verifier-server/src/services/zksync_solidity_verifier.rs
@@ -109,6 +109,14 @@ fn process_verification_result(
     match result {
         Ok(result) => match zksync::choose_best_success(result.successes) {
             Some(success) => {
+                let language = match result.language.as_str() {
+                    "solidity" => verification_success::Language::Solidity,
+                    language => {
+                        return Err(Status::internal(format!(
+                            "invalid language returned from verifier: {language}"
+                        )))
+                    }
+                };
                 let proto_success = VerificationSuccess {
                     file_name: success.file_path,
                     contract_name: success.contract_name,
@@ -120,7 +128,7 @@ fn process_verification_result(
                         compiler: result.evm_compiler,
                         version: result.evm_compiler_version.to_string(),
                     }),
-                    language: result.language,
+                    language: language.into(),
                     compiler_settings: result.compiler_settings.to_string(),
                     sources: result.sources,
                     compilation_artifacts: serde_json::Value::from(success.compilation_artifacts)

diff --git a/smart-contract-verifier/smart-contract-verifier-server/tests/zksync_integration/types.rs b/smart-contract-verifier/smart-contract-verifier-server/tests/zksync_integration/types.rs
@@ -102,7 +102,7 @@ impl TestCase for StandardJson {
                 Input::deserialize(&self.input).expect("expected language field deserialization");
             assert_eq!(
                 input.language.to_lowercase(),
-                success.language.to_lowercase(),
+                success.language().as_str_name().to_lowercase(),
                 "invalid language"
             );
         }