chore(verifier): bump dependencies (#1238)

* chore(verifier): bump alloy dependencies to v0.8.20 * chore(verifier): bump verification-common to rev '8d9cf0e'
blockscout · Feb 7, 2025 · dbc91b6 · dbc91b6
1 parent a7571da
commit dbc91b6
Show file tree

Hide file tree

Showing 8 changed files with 168 additions and 147 deletions.
diff --git a/smart-contract-verifier/Cargo.lock b/smart-contract-verifier/Cargo.lock
diff --git a/smart-contract-verifier/Cargo.toml b/smart-contract-verifier/Cargo.toml
@@ -17,8 +17,8 @@ actix-prost = { version = "0.1.0" }
 actix-prost-build = { version = "0.1.0" }
 actix-prost-macros = { version = "0.1.0" }
 actix-web = { version = "4" }
-alloy-dyn-abi = { version = "0.6.4" }
-alloy-json-abi = { version = "0.6.4" }
+alloy-dyn-abi = { version = "0.8.20" }
+alloy-json-abi = { version = "0.8.20" }
 amplify = { version = "4.6.0" }
 anyhow = { version = "1.0" }
 async-trait = { version = "0.1" }
@@ -71,5 +71,5 @@ tonic-build = { version = "0.12" }
 tracing = { version = "0.1" }
 url = { version = "2.4" }
 uuid = { version = "1.6.1" }
-verification-common = { git = "https://github.com/blockscout/blockscout-rs/", rev = "bd6352d" }
+verification-common = { git = "https://github.com/blockscout/blockscout-rs/", rev = "8d9cf0e" }
 wiremock = { version = "0.5" }
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
@@ -170,9 +170,10 @@ fn process_verification_result(
 }
 
 fn process_match(internal_match: verifier_alliance::Match) -> Match {
-    let match_type = match internal_match.r#type {
-        verifier_alliance::MatchType::Full => MatchType::Full,
-        verifier_alliance::MatchType::Partial => MatchType::Partial,
+    let match_type = if internal_match.metadata_match {
+        MatchType::Full
+    } else {
+        MatchType::Partial
     };
     Match {
         r#type: match_type.into(),

diff --git a/.../smart-contract-verifier-server/tests/test_cases_zksync_solidity/era_solidity_0.8.28.json b/.../smart-contract-verifier-server/tests/test_cases_zksync_solidity/era_solidity_0.8.28.json
@@ -10,15 +10,15 @@
     "expected_sources": {
         "src/Greeter.sol": "//SPDX-License-Identifier: Unlicense\npragma solidity ^0.8.0;\n\ncontract Greeter {\n    string private greeting;\n\n    constructor(string memory _greeting) {\n        greeting = _greeting;\n    }\n\n    function greet() public view returns (string memory) {\n        return greeting;\n    }\n\n    function setGreeting(string memory _greeting) public {\n        greeting = _greeting;\n    }\n}\n\n"
     },
-    "expected_compilation_artifacts": {"abi":[{"inputs":[{"internalType":"string","name":"_greeting","type":"string"}],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[],"name":"greet","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"_greeting","type":"string"}],"name":"setGreeting","outputs":[],"stateMutability":"nonpayable","type":"function"}],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1},"storageLayout":{"storage":[{"astId":3,"contract":"src/Greeter.sol:Greeter","label":"greeting","offset":0,"slot":"0","type":"t_string_storage"}],"types":{"t_string_storage":{"encoding":"bytes","label":"string","numberOfBytes":"32"}}}},
-    "expected_creation_code_artifacts": {},
-    "expected_runtime_code_artifacts": {},
+    "expected_compilation_artifacts": {"abi":[{"inputs":[{"internalType":"string","name":"_greeting","type":"string"}],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[],"name":"greet","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"_greeting","type":"string"}],"name":"setGreeting","outputs":[],"stateMutability":"nonpayable","type":"function"}],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1},"storageLayout":{"storage":[{"astId":3,"contract":"src/Greeter.sol:Greeter","label":"greeting","offset":0,"slot":"0","type":"t_string_storage"}],"types":{"t_string_storage":{"encoding":"bytes","label":"string","numberOfBytes":"32"}}},"sources":null},
+    "expected_creation_code_artifacts": {"cborAuxdata":null,"linkReferences":null,"sourceMap":null},
+    "expected_runtime_code_artifacts": {"cborAuxdata":null,"linkReferences":null,"immutableReferences":null,"sourceMap":null},
 
     "expected_creation_match_type": "full",
     "expected_creation_transformations": [
         {
             "type": "insert",
-            "reason": "constructor",
+            "reason": "constructorArguments",
             "offset": 4512
         }
     ],

diff --git a/...smart-contract-verifier-server/tests/test_cases_zksync_solidity/simple_standard_json.json b/...smart-contract-verifier-server/tests/test_cases_zksync_solidity/simple_standard_json.json
@@ -10,15 +10,15 @@
     "expected_sources": {
         "contracts/Greeter.sol": "//SPDX-License-Identifier: Unlicense\npragma solidity ^0.8.0;\n\ncontract Greeter {\n    string private greeting;\n\n    constructor(string memory _greeting) {\n        greeting = _greeting;\n    }\n\n    function greet() public view returns (string memory) {\n        return greeting;\n    }\n\n    function setGreeting(string memory _greeting) public {\n        greeting = _greeting;\n    }\n}\n"
     },
-    "expected_compilation_artifacts": {"abi":[{"inputs":[{"internalType":"string","name":"_greeting","type":"string"}],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[],"name":"greet","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"_greeting","type":"string"}],"name":"setGreeting","outputs":[],"stateMutability":"nonpayable","type":"function"}],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1},"storageLayout":{"storage":[{"astId":3,"contract":"contracts/Greeter.sol:Greeter","label":"greeting","offset":0,"slot":"0","type":"t_string_storage"}],"types":{"t_string_storage":{"encoding":"bytes","label":"string","numberOfBytes":"32"}}}},
-    "expected_creation_code_artifacts": {},
-    "expected_runtime_code_artifacts": {},
+    "expected_compilation_artifacts": {"abi":[{"inputs":[{"internalType":"string","name":"_greeting","type":"string"}],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[],"name":"greet","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"_greeting","type":"string"}],"name":"setGreeting","outputs":[],"stateMutability":"nonpayable","type":"function"}],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1},"storageLayout":{"storage":[{"astId":3,"contract":"contracts/Greeter.sol:Greeter","label":"greeting","offset":0,"slot":"0","type":"t_string_storage"}],"types":{"t_string_storage":{"encoding":"bytes","label":"string","numberOfBytes":"32"}}},"sources":null},
+    "expected_creation_code_artifacts": {"cborAuxdata":null,"linkReferences":null,"sourceMap":null},
+    "expected_runtime_code_artifacts": {"cborAuxdata":null,"linkReferences":null,"immutableReferences":null,"sourceMap":null},
 
     "expected_creation_match_type": "full",
     "expected_creation_transformations": [
         {
             "type": "insert",
-            "reason": "constructor",
+            "reason": "constructorArguments",
             "offset": 4192
         }
     ],

diff --git a/...erifier/smart-contract-verifier-server/tests/test_cases_zksync_solidity/zksolc_1_3_5.json b/...erifier/smart-contract-verifier-server/tests/test_cases_zksync_solidity/zksolc_1_3_5.json
@@ -10,15 +10,15 @@
     "expected_sources": {
         "contracts/Greeter.sol": "//SPDX-License-Identifier: Unlicensed\npragma solidity ^0.8.0;\n\ncontract Greeter {\n    string private greeting;\n\n    constructor(string memory _greeting) {\n        greeting = _greeting;\n    }\n\n    function greet() public view returns (string memory) {\n        return greeting;\n    }\n\n    function setGreeting(string memory _greeting) public {\n        greeting = _greeting;\n    }\n}\n"
     },
-    "expected_compilation_artifacts": {"abi":[{"inputs":[{"internalType":"string","name":"_greeting","type":"string"}],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[],"name":"greet","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"_greeting","type":"string"}],"name":"setGreeting","outputs":[],"stateMutability":"nonpayable","type":"function"}],"storageLayout":{"storage":[{"astId":3,"contract":"contracts/Greeter.sol:Greeter","label":"greeting","offset":0,"slot":"0","type":"t_string_storage"}],"types":{"t_string_storage":{"encoding":"bytes","label":"string","numberOfBytes":"32"}}}},
-    "expected_creation_code_artifacts": {},
-    "expected_runtime_code_artifacts": {},
+    "expected_compilation_artifacts": {"abi":[{"inputs":[{"internalType":"string","name":"_greeting","type":"string"}],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[],"name":"greet","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"_greeting","type":"string"}],"name":"setGreeting","outputs":[],"stateMutability":"nonpayable","type":"function"}],"storageLayout":{"storage":[{"astId":3,"contract":"contracts/Greeter.sol:Greeter","label":"greeting","offset":0,"slot":"0","type":"t_string_storage"}],"types":{"t_string_storage":{"encoding":"bytes","label":"string","numberOfBytes":"32"}}},"userdoc":null,"devdoc":null,"sources":null},
+    "expected_creation_code_artifacts": {"cborAuxdata":null,"linkReferences":null,"sourceMap":null},
+    "expected_runtime_code_artifacts": {"cborAuxdata":null,"linkReferences":null,"immutableReferences":null,"sourceMap":null},
 
     "expected_creation_match_type": "full",
     "expected_creation_transformations": [
         {
             "type": "insert",
-            "reason": "constructor",
+            "reason": "constructorArguments",
             "offset": 4704
         }
     ],

diff --git a/smart-contract-verifier/smart-contract-verifier/src/batch_verifier/transformations.rs b/smart-contract-verifier/smart-contract-verifier/src/batch_verifier/transformations.rs
@@ -210,7 +210,7 @@ fn process_constructor_arguments(
 
     let constructor = match compilation_artifacts.abi.as_ref() {
         Some(abi) => {
-            alloy_json_abi::JsonAbi::from_json_str(&abi.to_string())
+            alloy_json_abi::JsonAbi::deserialize(abi)
                 .context("parse json abi from compilation artifacts")?
                 .constructor
         }

diff --git a/smart-contract-verifier/smart-contract-verifier/src/zksync/implementation.rs b/smart-contract-verifier/smart-contract-verifier/src/zksync/implementation.rs
@@ -163,12 +163,22 @@ fn verify_compiler_output(
                 contract,
             )? {
                 Ok(success) => {
+                    let creation_match_type = success.creation_match.as_ref().map(|v| {
+                        if v.metadata_match {
+                            "full"
+                        } else {
+                            "partial"
+                        }
+                    });
+                    let runtime_match_type = if success.runtime_match.metadata_match {
+                        "full"
+                    } else {
+                        "partial"
+                    };
                     tracing::trace!(
                         file = success.file_path,
                         contract = success.contract_name,
-                        "contract matches; creation_match={:?}, runtime_match={}",
-                        success.creation_match.as_ref().map(|v| &v.r#type),
-                        success.runtime_match.r#type
+                        "contract matches; creation_match={creation_match_type:?}, runtime_match={runtime_match_type}",
                     );
                     successes.push(success);
                 }