Make use of 'is_blueprint' verification response for search

Author: rimrakhimov

eth-bytecode-db/eth-bytecode-db-server/src/types/source.rs

@@ -49,7 +49,7 @@ impl From<search::MatchContract> for SourceWrapper {
             compilation_artifacts: value.compilation_artifacts,
             creation_input_artifacts: value.creation_input_artifacts,
             deployed_bytecode_artifacts: value.deployed_bytecode_artifacts,
-            is_blueprint: false,
+            is_blueprint: value.is_blueprint,
         }
         .into()
     }
@@ -206,6 +206,7 @@ mod tests {
             deployed_bytecode_artifacts: Some("deployed_bytecode_artifacts".into()),
             raw_creation_input: vec![0u8, 1u8, 2u8, 3u8, 4u8],
             raw_deployed_bytecode: vec![5u8, 6u8, 7u8, 8u8],
+            is_blueprint: false,
         };
 
         let expected = proto::Source {

eth-bytecode-db/eth-bytecode-db-server/tests/database_search.rs

@@ -406,6 +406,7 @@ async fn search_blueprint_contracts() {
     /********** Setup **********/
 
     let mut test_data = test_input_data::basic(verification::SourceType::Solidity, MatchType::Full);
+    test_data.set_is_blueprint(true);
     test_data.set_bytecode(smart_contract_verifier_v2::verify_response::ExtraData {
         local_creation_input_parts: vec![
             smart_contract_verifier_v2::verify_response::extra_data::BytecodePart {

eth-bytecode-db/eth-bytecode-db-server/tests/verification_test_helpers/mod.rs

@@ -130,13 +130,8 @@ pub mod test_cases {
     {
         let db = init_db(test_suite_name, "test_propagates_is_blueprint_in_response").await;
 
-        let test_data = {
-            let test_data = test_input_data::basic(source_type, MatchType::Partial);
-            let mut source = test_data.eth_bytecode_db_response.source.unwrap();
-            let extra_data = test_data.verifier_response.extra_data.unwrap();
-            source.is_blueprint = true;
-            TestInputData::from_source_and_extra_data(source, extra_data)
-        };
+        let mut test_data = test_input_data::basic(source_type, MatchType::Partial);
+        test_data.set_is_blueprint(true);
 
         let db_url = db.db_url();
         let verifier_addr =

eth-bytecode-db/eth-bytecode-db-server/tests/verification_test_helpers/test_input_data.rs

@@ -132,6 +132,15 @@ impl TestInputData {
             .source_files
             .insert(file_name, content);
     }
+
+    pub fn set_is_blueprint(&mut self, is_blueprint: bool) {
+        self.verifier_response.source.as_mut().unwrap().is_blueprint = is_blueprint;
+        self.eth_bytecode_db_response
+            .source
+            .as_mut()
+            .unwrap()
+            .is_blueprint = is_blueprint;
+    }
 }
 
 pub fn basic(source_type: SourceType, match_type: MatchType) -> TestInputData {

eth-bytecode-db/eth-bytecode-db/src/search/alliance_db.rs

@@ -107,6 +107,7 @@ fn match_contract_from_model(
         // so for complexity reasons, we just ignore them for now
         raw_creation_input: vec![],
         raw_deployed_bytecode: vec![],
+        is_blueprint: false,
     };
 
     Ok(match_contract)

eth-bytecode-db/eth-bytecode-db/src/search/any_match.rs

@@ -14,11 +14,13 @@ where
     let bytecode_type = remote.bytecode_type.to_string();
     let label_values = &[bytecode_type.as_str()];
 
+    let mut is_blueprint = false;
     if let BytecodeType::CreationInput = remote.bytecode_type {
         if let Some(parsed_blueprint_code) =
             blueprint_contracts::from_creation_code(remote.data.clone())
         {
-            remote.data = parsed_blueprint_code
+            remote.data = parsed_blueprint_code;
+            is_blueprint = true;
         }
     }
 
@@ -28,6 +30,7 @@ where
         {
             remote.data = parsed_blueprint_code;
             remote.bytecode_type = BytecodeType::CreationInput;
+            is_blueprint = true;
         }
     }
 
@@ -37,6 +40,9 @@ where
             .start_timer();
         find_match_contracts(db, &remote).await?
     };
+    matches
+        .iter_mut()
+        .for_each(|value| value.is_blueprint = is_blueprint);
     metrics::ALL_MATCHES_COUNT
         .with_label_values(label_values)
         .observe(matches.len() as f64);

eth-bytecode-db/eth-bytecode-db/src/search/match_contract.rs

@@ -28,6 +28,7 @@ pub struct MatchContract {
     pub deployed_bytecode_artifacts: Option<String>,
     pub raw_creation_input: Vec<u8>,
     pub raw_deployed_bytecode: Vec<u8>,
+    pub is_blueprint: bool,
 }
 
 impl MatchContract {
@@ -100,6 +101,7 @@ impl MatchContract {
                 .map(|value| value.to_string()),
             raw_creation_input: source.raw_creation_input,
             raw_deployed_bytecode: source.raw_deployed_bytecode,
+            is_blueprint: false,
         };
 
         Ok(match_contract)