feat(eth-bytecode-db): update verifier alliance schema to v1 (#1134)

* chore: make use of fixed commit package for verifier-alliance-entity and verifier-alliance-migration crates * feat(verifier-alliance): update verifier-alliance-entity and verifier-alliance-migration to schema v1 * feat(verifier-alliance-database): initialize Extract all verifier-alliance database manipulations into separate crate. Will be used further by eth-bytecode-db service * chore: make use of git commit of verification-common-v1 * refactor(verifier-alliance-database): bump blockscout-service-launcher to v0.15.0; make use of its version of 'database' initialization macros
blockscout · Dec 18, 2024 · e24adcd · e24adcd
1 parent 0332b78
commit e24adcd
Show file tree

Hide file tree

Showing 46 changed files with 3,711 additions and 528 deletions.
diff --git a/eth-bytecode-db/Cargo.lock b/eth-bytecode-db/Cargo.lock
diff --git a/eth-bytecode-db/Cargo.toml b/eth-bytecode-db/Cargo.toml
@@ -8,6 +8,7 @@ members = [
     "eth-bytecode-db/migration",
     "eth-bytecode-db/verifier-alliance-entity",
     "eth-bytecode-db/verifier-alliance-migration",
+    "verifier-alliance-database",
 ]
 
 [workspace.dependencies]
@@ -16,8 +17,13 @@ eth-bytecode-db = { path = "eth-bytecode-db" }
 eth-bytecode-db-proto = { path = "eth-bytecode-db-proto" }
 eth-bytecode-db-server = { path = "eth-bytecode-db-server" }
 migration = { path = "eth-bytecode-db/migration" }
-verifier-alliance-entity = { path = "eth-bytecode-db/verifier-alliance-entity" }
-verifier-alliance-migration = { path = "eth-bytecode-db/verifier-alliance-migration" }
+verifier-alliance-entity = { git = "https://github.com/blockscout/blockscout-rs", rev = "ec1c755" }
+verifier-alliance-database = { path = "verifier-alliance-database" }
+verifier-alliance-migration = { git = "https://github.com/blockscout/blockscout-rs", rev = "ec1c755" }
+
+verifier-alliance-entity-v1 = { path = "eth-bytecode-db/verifier-alliance-entity", package = "verifier-alliance-entity" }
+verifier-alliance-migration-v1 = { path = "eth-bytecode-db/verifier-alliance-migration", package = "verifier-alliance-migration" }
+verification-common-v1 = { git = "https://github.com/blockscout/blockscout-rs", rev = "1164e09", package = "verification-common" }
 
 actix-prost = { git = "https://github.com/blockscout/actix-prost", rev = "4cbba2a" }
 actix-prost-macros = { git = "https://github.com/blockscout/actix-prost", rev = "4cbba2a" }
@@ -29,7 +35,7 @@ anyhow = { version = "1" }
 async-std = { version = "^1" }
 async-trait = { version = "0.1" }
 blockscout-display-bytes = { version = "1.1.0" }
-blockscout-service-launcher = { version = "0.14.0", features = ["database-1_0"] }
+blockscout-service-launcher = { version = "0.15.0", default-features = false, features = ["database-1_0"] }
 bytes = { version = "1.2" }
 ethabi = { version = "18.0" }
 ethers = { version = "2.0.0" }
@@ -56,9 +62,12 @@ semver = { version = "1.0" }
 serde = { version = "1" }
 serde_json = { version = "1.0" }
 serde_with = { version = "3.11.0" }
+sha2 = { version = "0.10.8" }
+sha3 = { version = "0.10.8" }
 smart-contract-verifier-proto = { git = "https://github.com/blockscout/blockscout-rs", rev = "7a6e9400" }
 solidity-metadata = { version = "1.0" }
 sourcify = { git = "https://github.com/blockscout/blockscout-rs", rev = "457af68" }
+strum = { version = "0.26.3", default-features = false, features = ["derive"] }
 thiserror = { version = "1" }
 tokio = { version = "1" }
 tokio-stream = { version = "0.1" }

diff --git a/eth-bytecode-db/eth-bytecode-db-server/Cargo.toml b/eth-bytecode-db/eth-bytecode-db-server/Cargo.toml
@@ -10,7 +10,7 @@ amplify = { workspace = true }
 anyhow = { workspace = true }
 async-trait = { workspace = true }
 blockscout-display-bytes = { workspace = true }
-blockscout-service-launcher = { workspace = true }
+blockscout-service-launcher = { workspace = true, features = ["launcher", "tracing"] }
 eth-bytecode-db = { workspace = true }
 eth-bytecode-db-proto = { workspace = true }
 ethers = { workspace = true, features = ["solc"] }

diff --git a/...code-db/eth-bytecode-db-server/tests/verification_test_helpers/verifier_alliance_setup.rs b/...code-db/eth-bytecode-db-server/tests/verification_test_helpers/verifier_alliance_setup.rs
@@ -64,7 +64,7 @@ impl<'a, Request> From<&'a Request> for RequestWrapper<'a, Request> {
     }
 }
 
-impl<'a, Request> RequestWrapper<'a, Request> {
+impl<Request> RequestWrapper<'_, Request> {
     pub fn header(&mut self, key: &str, value: &str) {
         let key = reqwest::header::HeaderName::from_str(key)
             .expect("Error converting key string into header name");

diff --git a/eth-bytecode-db/eth-bytecode-db/src/verification/handlers/mod.rs b/eth-bytecode-db/eth-bytecode-db/src/verification/handlers/mod.rs
@@ -167,7 +167,7 @@ impl<'a> VerifierAllianceDbAction<'a> {
     }
 }
 
-impl<'a> VerifierAllianceDbAction<'a> {
+impl VerifierAllianceDbAction<'_> {
     fn contract_address(&self) -> Option<blockscout_display_bytes::Bytes> {
         match self {
             VerifierAllianceDbAction::IgnoreDb => None,

diff --git a/eth-bytecode-db/eth-bytecode-db/verifier-alliance-entity/src/code.rs b/eth-bytecode-db/eth-bytecode-db/verifier-alliance-entity/src/code.rs
@@ -11,6 +11,12 @@ pub struct Model {
         column_type = "VarBinary(StringLen::None)"
     )]
     pub code_hash: Vec<u8>,
+    pub created_at: DateTimeWithTimeZone,
+    pub updated_at: DateTimeWithTimeZone,
+    pub created_by: String,
+    pub updated_by: String,
+    #[sea_orm(column_type = "VarBinary(StringLen::None)")]
+    pub code_hash_keccak: Vec<u8>,
     #[sea_orm(column_type = "VarBinary(StringLen::None)", nullable)]
     pub code: Option<Vec<u8>>,
 }

diff --git a/eth-bytecode-db/eth-bytecode-db/verifier-alliance-entity/src/compiled_contracts.rs b/eth-bytecode-db/eth-bytecode-db/verifier-alliance-entity/src/compiled_contracts.rs
@@ -17,8 +17,6 @@ pub struct Model {
     pub name: String,
     pub fully_qualified_name: String,
     #[sea_orm(column_type = "JsonBinary")]
-    pub sources: Json,
-    #[sea_orm(column_type = "JsonBinary")]
     pub compiler_settings: Json,
     #[sea_orm(column_type = "JsonBinary")]
     pub compilation_artifacts: Json,
@@ -50,10 +48,18 @@ pub enum Relation {
         on_delete = "NoAction"
     )]
     Code1,
+    #[sea_orm(has_many = "super::compiled_contracts_sources::Entity")]
+    CompiledContractsSources,
     #[sea_orm(has_many = "super::verified_contracts::Entity")]
     VerifiedContracts,
 }
 
+impl Related<super::compiled_contracts_sources::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::CompiledContractsSources.def()
+    }
+}
+
 impl Related<super::verified_contracts::Entity> for Entity {
     fn to() -> RelationDef {
         Relation::VerifiedContracts.def()

diff --git a/eth-bytecode-db/eth-bytecode-db/verifier-alliance-entity/src/compiled_contracts_sources.rs b/eth-bytecode-db/eth-bytecode-db/verifier-alliance-entity/src/compiled_contracts_sources.rs
@@ -0,0 +1,48 @@
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.0
+
+use sea_orm::entity::prelude::*;
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[sea_orm(table_name = "compiled_contracts_sources")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: Uuid,
+    pub compilation_id: Uuid,
+    #[sea_orm(column_type = "VarBinary(StringLen::None)")]
+    pub source_hash: Vec<u8>,
+    pub path: String,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::compiled_contracts::Entity",
+        from = "Column::CompilationId",
+        to = "super::compiled_contracts::Column::Id",
+        on_update = "NoAction",
+        on_delete = "NoAction"
+    )]
+    CompiledContracts,
+    #[sea_orm(
+        belongs_to = "super::sources::Entity",
+        from = "Column::SourceHash",
+        to = "super::sources::Column::SourceHash",
+        on_update = "NoAction",
+        on_delete = "NoAction"
+    )]
+    Sources,
+}
+
+impl Related<super::compiled_contracts::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::CompiledContracts.def()
+    }
+}
+
+impl Related<super::sources::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Sources.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/eth-bytecode-db/eth-bytecode-db/verifier-alliance-entity/src/contract_deployments.rs b/eth-bytecode-db/eth-bytecode-db/verifier-alliance-entity/src/contract_deployments.rs
@@ -7,6 +7,10 @@ use sea_orm::entity::prelude::*;
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
     pub id: Uuid,
+    pub created_at: DateTimeWithTimeZone,
+    pub updated_at: DateTimeWithTimeZone,
+    pub created_by: String,
+    pub updated_by: String,
     pub chain_id: Decimal,
     #[sea_orm(column_type = "VarBinary(StringLen::None)")]
     pub address: Vec<u8>,

diff --git a/eth-bytecode-db/eth-bytecode-db/verifier-alliance-entity/src/contracts.rs b/eth-bytecode-db/eth-bytecode-db/verifier-alliance-entity/src/contracts.rs
@@ -7,6 +7,10 @@ use sea_orm::entity::prelude::*;
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
     pub id: Uuid,
+    pub created_at: DateTimeWithTimeZone,
+    pub updated_at: DateTimeWithTimeZone,
+    pub created_by: String,
+    pub updated_by: String,
     #[sea_orm(column_type = "VarBinary(StringLen::None)")]
     pub creation_code_hash: Vec<u8>,
     #[sea_orm(column_type = "VarBinary(StringLen::None)")]

diff --git a/eth-bytecode-db/eth-bytecode-db/verifier-alliance-entity/src/lib.rs b/eth-bytecode-db/eth-bytecode-db/verifier-alliance-entity/src/lib.rs
@@ -4,6 +4,8 @@ pub mod prelude;
 
 pub mod code;
 pub mod compiled_contracts;
+pub mod compiled_contracts_sources;
 pub mod contract_deployments;
 pub mod contracts;
+pub mod sources;
 pub mod verified_contracts;
diff --git a/eth-bytecode-db/eth-bytecode-db/verifier-alliance-entity/src/prelude.rs b/eth-bytecode-db/eth-bytecode-db/verifier-alliance-entity/src/prelude.rs
@@ -2,6 +2,7 @@
 
 pub use super::{
     code::Entity as Code, compiled_contracts::Entity as CompiledContracts,
+    compiled_contracts_sources::Entity as CompiledContractsSources,
     contract_deployments::Entity as ContractDeployments, contracts::Entity as Contracts,
-    verified_contracts::Entity as VerifiedContracts,
+    sources::Entity as Sources, verified_contracts::Entity as VerifiedContracts,
 };
diff --git a/eth-bytecode-db/eth-bytecode-db/verifier-alliance-entity/src/sources.rs b/eth-bytecode-db/eth-bytecode-db/verifier-alliance-entity/src/sources.rs
@@ -0,0 +1,35 @@
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.0
+
+use sea_orm::entity::prelude::*;
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[sea_orm(table_name = "sources")]
+pub struct Model {
+    #[sea_orm(
+        primary_key,
+        auto_increment = false,
+        column_type = "VarBinary(StringLen::None)"
+    )]
+    pub source_hash: Vec<u8>,
+    #[sea_orm(column_type = "VarBinary(StringLen::None)")]
+    pub source_hash_keccak: Vec<u8>,
+    pub content: String,
+    pub created_at: DateTimeWithTimeZone,
+    pub updated_at: DateTimeWithTimeZone,
+    pub created_by: String,
+    pub updated_by: String,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(has_many = "super::compiled_contracts_sources::Entity")]
+    CompiledContractsSources,
+}
+
+impl Related<super::compiled_contracts_sources::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::CompiledContractsSources.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/eth-bytecode-db/eth-bytecode-db/verifier-alliance-entity/src/verified_contracts.rs b/eth-bytecode-db/eth-bytecode-db/verifier-alliance-entity/src/verified_contracts.rs
@@ -18,11 +18,13 @@ pub struct Model {
     pub creation_values: Option<Json>,
     #[sea_orm(column_type = "JsonBinary", nullable)]
     pub creation_transformations: Option<Json>,
+    pub creation_metadata_match: Option<bool>,
     pub runtime_match: bool,
     #[sea_orm(column_type = "JsonBinary", nullable)]
     pub runtime_values: Option<Json>,
     #[sea_orm(column_type = "JsonBinary", nullable)]
     pub runtime_transformations: Option<Json>,
+    pub runtime_metadata_match: Option<bool>,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]