blockscout · rimrakhimov · Oct 28, 2024 · Oct 28, 2024 · Oct 28, 2024 · Oct 28, 2024
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
@@ -29,7 +29,7 @@ anyhow = { version = "1" }
 async-std = { version = "^1" }
 async-trait = { version = "0.1" }
 blockscout-display-bytes = { version = "1.0" }
-blockscout-service-launcher = { version = "0.14.0" }
+blockscout-service-launcher = { version = "0.14.0", features = ["database-1_0"] }
 bytes = { version = "1.2" }
 ethabi = { version = "18.0" }
 ethers = { version = "2.0.0" }
@@ -50,8 +50,8 @@ reqwest = { version = "0.11" }
 reqwest-middleware = { version = "0.2" }
 reqwest-retry = { version = "0.3" }
 rstest = { version = "0.18.0" }
-sea-orm = { version = "0.12.2" }
-sea-orm-migration = { version = "0.12.2" }
+sea-orm = { version = "1.1.0" }
+sea-orm-migration = { version = "1.1.0" }
 semver = { version = "1.0" }
 serde = { version = "1" }
 serde_json = { version = "1.0" }

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, features = [ "database-0_12" ] }
+blockscout-service-launcher = { workspace = true }
 eth-bytecode-db = { workspace = true }
 eth-bytecode-db-proto = { workspace = true }
 ethers = { workspace = true, features = ["solc"] }

diff --git a/eth-bytecode-db/eth-bytecode-db/Cargo.toml b/eth-bytecode-db/eth-bytecode-db/Cargo.toml
@@ -41,7 +41,7 @@ tracing-subscriber = { workspace = true, features = ["env-filter"], optional = t
 
 [dev-dependencies]
 async-trait = { workspace = true }
-blockscout-service-launcher = { workspace = true, features = [ "test-database", "database-0_12" ] }
+blockscout-service-launcher = { workspace = true, features = [ "test-database" ] }
 migration = { workspace = true }
 pretty_assertions = { workspace = true }
 rstest = { workspace = true }

diff --git a/eth-bytecode-db/eth-bytecode-db/entity/src/bytecode_parts.rs b/eth-bytecode-db/eth-bytecode-db/entity/src/bytecode_parts.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.0
 
 use sea_orm::entity::prelude::*;
 

diff --git a/eth-bytecode-db/eth-bytecode-db/entity/src/bytecodes.rs b/eth-bytecode-db/eth-bytecode-db/entity/src/bytecodes.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.0
 
 use super::sea_orm_active_enums::BytecodeType;
 use sea_orm::entity::prelude::*;

diff --git a/eth-bytecode-db/eth-bytecode-db/entity/src/events.rs b/eth-bytecode-db/eth-bytecode-db/entity/src/events.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.0
 
 use sea_orm::entity::prelude::*;
 
@@ -9,7 +9,7 @@ pub struct Model {
     pub id: i64,
     pub created_at: DateTime,
     pub updated_at: DateTime,
-    #[sea_orm(column_type = "Binary(BlobSize::Blob(None))")]
+    #[sea_orm(column_type = "VarBinary(StringLen::None)")]
     pub selector: Vec<u8>,
     pub name: String,
     #[sea_orm(column_type = "JsonBinary")]

diff --git a/eth-bytecode-db/eth-bytecode-db/entity/src/files.rs b/eth-bytecode-db/eth-bytecode-db/entity/src/files.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.0
 
 use sea_orm::entity::prelude::*;
 

diff --git a/eth-bytecode-db/eth-bytecode-db/entity/src/lib.rs b/eth-bytecode-db/eth-bytecode-db/entity/src/lib.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.0
 
 pub mod prelude;
 

diff --git a/eth-bytecode-db/eth-bytecode-db/entity/src/parts.rs b/eth-bytecode-db/eth-bytecode-db/entity/src/parts.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.0
 
 use super::sea_orm_active_enums::PartType;
 use sea_orm::entity::prelude::*;
@@ -11,7 +11,7 @@ pub struct Model {
     pub created_at: DateTime,
     pub updated_at: DateTime,
     pub part_type: PartType,
-    #[sea_orm(column_type = "Binary(BlobSize::Blob(None))")]
+    #[sea_orm(column_type = "VarBinary(StringLen::None)")]
     pub data: Vec<u8>,
     #[sea_orm(column_type = "Text")]
     pub data_text: String,

diff --git a/eth-bytecode-db/eth-bytecode-db/entity/src/prelude.rs b/eth-bytecode-db/eth-bytecode-db/entity/src/prelude.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.0
 
 pub use super::{
     bytecode_parts::Entity as BytecodeParts, bytecodes::Entity as Bytecodes,

diff --git a/eth-bytecode-db/eth-bytecode-db/entity/src/sea_orm_active_enums.rs b/eth-bytecode-db/eth-bytecode-db/entity/src/sea_orm_active_enums.rs
@@ -1,16 +1,16 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.0
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, DeriveDisplay)]
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
 #[sea_orm(rs_type = "String", db_type = "Enum", enum_name = "bytecode_type")]
 pub enum BytecodeType {
     #[sea_orm(string_value = "creation_input")]
     CreationInput,
     #[sea_orm(string_value = "deployed_bytecode")]
     DeployedBytecode,
 }
-#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, DeriveDisplay)]
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
 #[sea_orm(rs_type = "String", db_type = "Enum", enum_name = "part_type")]
 pub enum PartType {
     #[sea_orm(string_value = "main")]
@@ -28,7 +28,7 @@ pub enum SourceType {
     #[sea_orm(string_value = "yul")]
     Yul,
 }
-#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, DeriveDisplay)]
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
 #[sea_orm(rs_type = "String", db_type = "Enum", enum_name = "verification_type")]
 pub enum VerificationType {
     #[sea_orm(string_value = "flattened_contract")]

diff --git a/eth-bytecode-db/eth-bytecode-db/entity/src/source_files.rs b/eth-bytecode-db/eth-bytecode-db/entity/src/source_files.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.0
 
 use sea_orm::entity::prelude::*;
 

diff --git a/eth-bytecode-db/eth-bytecode-db/entity/src/sources.rs b/eth-bytecode-db/eth-bytecode-db/entity/src/sources.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.0
 
 use super::sea_orm_active_enums::SourceType;
 use sea_orm::entity::prelude::*;
@@ -18,9 +18,9 @@ pub struct Model {
     pub contract_name: String,
     #[sea_orm(column_type = "JsonBinary", nullable)]
     pub abi: Option<Json>,
-    #[sea_orm(column_type = "Binary(BlobSize::Blob(None))")]
+    #[sea_orm(column_type = "VarBinary(StringLen::None)")]
     pub raw_creation_input: Vec<u8>,
-    #[sea_orm(column_type = "Binary(BlobSize::Blob(None))")]
+    #[sea_orm(column_type = "VarBinary(StringLen::None)")]
     pub raw_deployed_bytecode: Vec<u8>,
     pub file_ids_hash: Uuid,
     #[sea_orm(column_type = "JsonBinary", nullable)]

diff --git a/eth-bytecode-db/eth-bytecode-db/entity/src/verified_contracts.rs b/eth-bytecode-db/eth-bytecode-db/entity/src/verified_contracts.rs
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.2
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.0
 
 use super::sea_orm_active_enums::{BytecodeType, VerificationType};
 use sea_orm::entity::prelude::*;
@@ -11,14 +11,14 @@ pub struct Model {
     pub created_at: DateTime,
     pub updated_at: DateTime,
     pub source_id: i64,
-    #[sea_orm(column_type = "Binary(BlobSize::Blob(None))")]
+    #[sea_orm(column_type = "VarBinary(StringLen::None)")]
     pub raw_bytecode: Vec<u8>,
     pub bytecode_type: BytecodeType,
     #[sea_orm(column_type = "JsonBinary")]
     pub verification_settings: Json,
     pub verification_type: VerificationType,
     pub chain_id: Option<i64>,
-    #[sea_orm(column_type = "Binary(BlobSize::Blob(None))", nullable)]
+    #[sea_orm(column_type = "VarBinary(StringLen::None)", nullable)]
     pub contract_address: Option<Vec<u8>>,
 }
 

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
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.11
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.0
 
 use sea_orm::entity::prelude::*;
 
@@ -8,10 +8,10 @@ pub struct Model {
     #[sea_orm(
         primary_key,
         auto_increment = false,
-        column_type = "Binary(BlobSize::Blob(None))"
+        column_type = "VarBinary(StringLen::None)"
     )]
     pub code_hash: Vec<u8>,
-    #[sea_orm(column_type = "Binary(BlobSize::Blob(None))", nullable)]
+    #[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
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.11
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.0
 
 use sea_orm::entity::prelude::*;
 
@@ -22,11 +22,11 @@ pub struct Model {
     pub compiler_settings: Json,
     #[sea_orm(column_type = "JsonBinary")]
     pub compilation_artifacts: Json,
-    #[sea_orm(column_type = "Binary(BlobSize::Blob(None))")]
+    #[sea_orm(column_type = "VarBinary(StringLen::None)")]
     pub creation_code_hash: Vec<u8>,
     #[sea_orm(column_type = "JsonBinary")]
     pub creation_code_artifacts: Json,
-    #[sea_orm(column_type = "Binary(BlobSize::Blob(None))")]
+    #[sea_orm(column_type = "VarBinary(StringLen::None)")]
     pub runtime_code_hash: Vec<u8>,
     #[sea_orm(column_type = "JsonBinary")]
     pub runtime_code_artifacts: Json,

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
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.11
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.0
 
 use sea_orm::entity::prelude::*;
 
@@ -8,13 +8,13 @@ pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
     pub id: Uuid,
     pub chain_id: Decimal,
-    #[sea_orm(column_type = "Binary(BlobSize::Blob(None))")]
+    #[sea_orm(column_type = "VarBinary(StringLen::None)")]
     pub address: Vec<u8>,
-    #[sea_orm(column_type = "Binary(BlobSize::Blob(None))")]
+    #[sea_orm(column_type = "VarBinary(StringLen::None)")]
     pub transaction_hash: Vec<u8>,
     pub block_number: Decimal,
     pub transaction_index: Decimal,
-    #[sea_orm(column_type = "Binary(BlobSize::Blob(None))")]
+    #[sea_orm(column_type = "VarBinary(StringLen::None)")]
     pub deployer: Vec<u8>,
     pub contract_id: Uuid,
 }

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
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.11
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.0
 
 use sea_orm::entity::prelude::*;
 
@@ -7,9 +7,9 @@ use sea_orm::entity::prelude::*;
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
     pub id: Uuid,
-    #[sea_orm(column_type = "Binary(BlobSize::Blob(None))")]
+    #[sea_orm(column_type = "VarBinary(StringLen::None)")]
     pub creation_code_hash: Vec<u8>,
-    #[sea_orm(column_type = "Binary(BlobSize::Blob(None))")]
+    #[sea_orm(column_type = "VarBinary(StringLen::None)")]
     pub runtime_code_hash: Vec<u8>,
 }
 

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
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.11
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.0
 
 pub mod prelude;
 

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
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.11
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.0
 
 pub use super::{
     code::Entity as Code, compiled_contracts::Entity as CompiledContracts,

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
@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.11
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.0
 
 use sea_orm::entity::prelude::*;