Add multiple metadata test

smart-contract-verifier/smart-contract-verifier-proto/proto/v2/smart-contract-verifier.proto

@@ -231,8 +231,8 @@ message LookupMethodsRequest {
 message LookupMethodsResponse {
   message Method {
     string file_name = 1;
-    int32 file_offset = 2;
-    int32 length = 3;
+    uint32 file_offset = 2;
+    uint32 length = 3;
   }
   map<string, Method> methods = 1;
 }

smart-contract-verifier/smart-contract-verifier-proto/swagger/v2/smart-contract-verifier.swagger.yaml

@@ -226,10 +226,10 @@ definitions:
         type: string
       fileOffset:
         type: integer
-        format: int32
+        format: int64
       length:
         type: integer
-        format: int32
+        format: int64
   SourceMatchType:
     type: string
     enum:

smart-contract-verifier/smart-contract-verifier-server/src/types/lookup_methods.rs

@@ -39,14 +39,14 @@ impl From<LookupMethodsResponse> for LookupMethodsResponseWrapper {
         Self(proto::LookupMethodsResponse {
             methods: response
                 .methods
-                .iter()
+                .into_iter()
                 .map(|(selector, method)| {
                     (
-                        selector.clone(),
+                        selector,
                         proto::lookup_methods_response::Method {
-                            file_name: method.filename.clone(),
-                            file_offset: method.offset as i32,
-                            length: method.length as i32,
+                            file_name: method.filename,
+                            file_offset: method.offset as u32,
+                            length: method.length as u32,
                         },
                     )
                 })

smart-contract-verifier/smart-contract-verifier-server/tests/lookup_methods.rs

@@ -2,7 +2,7 @@ use blockscout_service_launcher::{
     launcher::ConfigSettings,
     test_server::{get_test_server_settings, init_server, send_post_request},
 };
-use ethers_solc::{CompilerInput, CompilerOutput, EvmVersion, Solc};
+use ethers_solc::{artifacts::Severity, CompilerInput, CompilerOutput, EvmVersion, Solc};
 use lazy_static::lazy_static;
 use rstest::rstest;
 use serde::Deserialize;
@@ -102,6 +102,14 @@ async fn test_lookup_methods(#[files("tests/test_cases_lookup_methods/*")] test_
     let inputs = CompilerInput::new(test_dir).expect("failed to read dir");
     let input = inputs[0].clone().evm_version(EvmVersion::London);
     let output = solc.compile(&input).expect("failed to compile");
+    let errors = output
+        .errors
+        .iter()
+        .filter(|e| e.severity == Severity::Error)
+        .collect::<Vec<_>>();
+    if !errors.is_empty() {
+        panic!("errors during compilation: {:?}", errors);
+    }
 
     let (request, methods) = process_compiler_output(&output, &test_case.contract_name).unwrap();
     let res: LookupMethodsResponse = send_post_request(&base, ROUTE, &request).await;

smart-contract-verifier/smart-contract-verifier-server/tests/test_cases_lookup_methods/multiple_metadata/Main.sol

@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity =0.8.7;
+
+contract A {
+    function a() public pure returns (bytes memory) {
+        return "";
+    }
+}
+
+contract B {
+    bytes code;
+
+    constructor() {
+        code = type(A).creationCode;
+    }
+
+    function a() public pure returns (bytes memory) {
+        return type(A).creationCode;
+    }
+}

smart-contract-verifier/smart-contract-verifier-server/tests/test_cases_lookup_methods/multiple_metadata/config.json

@@ -0,0 +1,4 @@
+{
+  "version": "0.8.7",
+  "contract_name": "B"
+}

smart-contract-verifier/smart-contract-verifier/src/lookup_methods/find_methods.rs

@@ -21,12 +21,11 @@ pub struct LookupMethodsResponse {
 pub fn find_methods(request: LookupMethodsRequest) -> LookupMethodsResponse {
     let methods = parse_selectors(request.abi);
     let opcodes = disassemble_bytecode(&request.bytecode);
-    let opcodes = opcodes.as_slice();
 
     let methods = methods
         .into_iter()
         .filter_map(|(func_sig, selector)| {
-            let func_index = match find_src_map_index(&selector, opcodes) {
+            let func_index = match find_src_map_index(&selector, &opcodes) {
                 Some(i) => i,
                 None => {
                     tracing::warn!(func_sig, "function not found");
@@ -49,7 +48,7 @@ pub fn find_methods(request: LookupMethodsRequest) -> LookupMethodsResponse {
             };
             Some((hex::encode(selector), method))
         })
-        .collect::<BTreeMap<String, Method>>();
+        .collect();
     LookupMethodsResponse { methods }
 }