chore: update seaorm to latest again after previously it was reverted

rust/main/Cargo.toml

@@ -34,6 +34,7 @@ async-rwlock = "1.3"
 auto_impl = "1.0"
 axum = "0.6.1"
 backtrace = "0.3"
+cc = "1.2.2"
 base64 = "0.21.2"
 bigdecimal = "0.4.2"
 bincode = "1.3"
@@ -80,7 +81,7 @@ hyperlane-cosmwasm-interface = "=0.0.6-rc6"
 injective-protobuf = "0.2.2"
 injective-std = "=0.1.5"
 itertools = "*"
-jobserver = "=0.1.26"
+jobserver = "0.1.32"
 jsonrpc-core = "18.0"
 k256 = { version = "0.13.4", features = ["arithmetic", "std", "ecdsa"] }
 lazy_static = "1.5.0"
@@ -106,14 +107,14 @@ reqwest = "0.11"
 ripemd = "0.1.3"
 rlp = "=0.5.2"
 rocksdb = "0.21.0"
-sea-orm = { version = "0.11.1", features = [
+sea-orm = { version = "1.1.1", features = [
   "sqlx-postgres",
   "runtime-tokio-native-tls",
   "with-bigdecimal",
   "with-time",
   "macros",
 ] }
-sea-orm-migration = { version = "0.11.1", features = [
+sea-orm-migration = { version = "1.1.1", features = [
   "sqlx-postgres",
   "runtime-tokio-native-tls",
 ] }

rust/main/agents/scraper/migration/bin/generate_entities.rs

@@ -7,7 +7,7 @@ mod common;
 
 const RAW_DB_PATH: &str = "./agents/scraper/src/db/generated";
 const DOCKER_NAME: &str = "scraper-entity-generator";
-const CLI_VERSION: &str = "0.12.3";
+const CLI_VERSION: &str = "1.1.1";
 
 struct PostgresDockerContainer;
 

rust/main/agents/scraper/migration/bin/init_db.rs

@@ -4,7 +4,7 @@ use common::*;
 
 mod common;
 
-#[tokio::main]
+#[tokio::main(flavor = "current_thread")]
 async fn main() -> Result<(), DbErr> {
     let db = init().await?;
 

rust/main/agents/scraper/migration/bin/recreate_db.rs

@@ -3,7 +3,7 @@ use common::*;
 
 mod common;
 
-#[tokio::main]
+#[tokio::main(flavor = "current_thread")]
 async fn main() -> Result<(), DbErr> {
     let db = init().await?;
 

rust/main/agents/scraper/migration/src/l20230309_types.rs

@@ -2,10 +2,10 @@ use sea_orm_migration::prelude::*;
 
 /// Hashes are to be stored as binary.
 #[allow(non_upper_case_globals)]
-pub const Hash: ColumnType = ColumnType::Binary(BlobSize::Tiny);
+pub const Hash: ColumnType = ColumnType::Blob;
 /// Addresses are to be stored as binary.
 #[allow(non_upper_case_globals)]
-pub const Address: ColumnType = ColumnType::Binary(BlobSize::Tiny);
+pub const Address: ColumnType = ColumnType::Blob;
 
 /// 256-bit integer as base-10 digits: ceil(log_10(2^256))
 const SIGNIFICANT_DIGITS_IN_256_BIT_INTEGER: u32 = 78;

rust/main/agents/scraper/migration/src/m20230309_000003_create_table_transaction.rs

@@ -53,11 +53,8 @@ impl MigrationTrait for Migration {
                     .col(ColumnDef::new_with_type(Transaction::GasUsed, Wei).not_null())
                     .col(ColumnDef::new_with_type(Transaction::CumulativeGasUsed, Wei).not_null())
                     .col(
-                        ColumnDef::new_with_type(
-                            Transaction::RawInputData,
-                            ColumnType::Binary(BlobSize::Blob(None)),
-                        )
-                        .borrow_mut(),
+                        ColumnDef::new_with_type(Transaction::RawInputData, ColumnType::Blob)
+                            .borrow_mut(),
                     )
                     .foreign_key(
                         ForeignKey::create()

rust/main/agents/scraper/src/db/generated/block.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.3
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.1
 
 use sea_orm::entity::prelude::*;
 
@@ -56,7 +56,7 @@ impl ColumnTrait for Column {
             Self::Id => ColumnType::BigInteger.def(),
             Self::TimeCreated => ColumnType::DateTime.def(),
             Self::Domain => ColumnType::Integer.def(),
-            Self::Hash => ColumnType::Binary(BlobSize::Blob(None)).def().unique(),
+            Self::Hash => ColumnType::VarBinary(StringLen::None).def().unique(),
             Self::Height => ColumnType::BigInteger.def(),
             Self::Timestamp => ColumnType::DateTime.def(),
         }

rust/main/agents/scraper/src/db/generated/cursor.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.3
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.1
 
 use sea_orm::entity::prelude::*;
 

rust/main/agents/scraper/src/db/generated/delivered_message.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.3
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.1
 
 use sea_orm::entity::prelude::*;
 
@@ -57,9 +57,9 @@ impl ColumnTrait for Column {
         match self {
             Self::Id => ColumnType::BigInteger.def(),
             Self::TimeCreated => ColumnType::DateTime.def(),
-            Self::MsgId => ColumnType::Binary(BlobSize::Blob(None)).def().unique(),
+            Self::MsgId => ColumnType::VarBinary(StringLen::None).def().unique(),
             Self::Domain => ColumnType::Integer.def(),
-            Self::DestinationMailbox => ColumnType::Binary(BlobSize::Blob(None)).def(),
+            Self::DestinationMailbox => ColumnType::VarBinary(StringLen::None).def(),
             Self::DestinationTxId => ColumnType::BigInteger.def(),
             Self::Sequence => ColumnType::BigInteger.def().null(),
         }

rust/main/agents/scraper/src/db/generated/domain.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.3
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.1
 
 use sea_orm::entity::prelude::*;
 
@@ -52,7 +52,6 @@ pub enum Relation {
     Block,
     Cursor,
     DeliveredMessage,
-    GasPayment,
     Message,
 }
 
@@ -78,7 +77,6 @@ impl RelationTrait for Relation {
             Self::Block => Entity::has_many(super::block::Entity).into(),
             Self::Cursor => Entity::has_many(super::cursor::Entity).into(),
             Self::DeliveredMessage => Entity::has_many(super::delivered_message::Entity).into(),
-            Self::GasPayment => Entity::has_many(super::gas_payment::Entity).into(),
             Self::Message => Entity::has_many(super::message::Entity).into(),
         }
     }
@@ -102,12 +100,6 @@ impl Related<super::delivered_message::Entity> for Entity {
     }
 }
 
-impl Related<super::gas_payment::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::GasPayment.def()
-    }
-}
-
 impl Related<super::message::Entity> for Entity {
     fn to() -> RelationDef {
         Relation::Message.def()

rust/main/agents/scraper/src/db/generated/gas_payment.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.3
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.1
 
 use sea_orm::entity::prelude::*;
 
@@ -11,6 +11,8 @@ impl EntityName for Entity {
     }
 }
 
+/// @NOTE: Replaced all occurrences of `Decimal` with `BigDecimal`
+/// due to the following issue: https://github.com/SeaQL/sea-orm/issues/1530
 #[derive(Clone, Debug, PartialEq, DeriveModel, DeriveActiveModel, Eq)]
 pub struct Model {
     pub id: i64,
@@ -57,8 +59,8 @@ impl PrimaryKeyTrait for PrimaryKey {
 
 #[derive(Copy, Clone, Debug, EnumIter)]
 pub enum Relation {
-    Domain,
-    Origin,
+    Domain2,
+    Domain1,
     Transaction,
 }
 
@@ -69,16 +71,14 @@ impl ColumnTrait for Column {
             Self::Id => ColumnType::BigInteger.def(),
             Self::TimeCreated => ColumnType::DateTime.def(),
             Self::Domain => ColumnType::Integer.def(),
-            Self::MsgId => ColumnType::Binary(BlobSize::Blob(None)).def(),
+            Self::MsgId => ColumnType::VarBinary(StringLen::None).def(),
             Self::Payment => ColumnType::Decimal(Some((78u32, 0u32))).def(),
             Self::GasAmount => ColumnType::Decimal(Some((78u32, 0u32))).def(),
             Self::TxId => ColumnType::BigInteger.def(),
             Self::LogIndex => ColumnType::BigInteger.def(),
             Self::Origin => ColumnType::Integer.def(),
             Self::Destination => ColumnType::Integer.def(),
-            Self::InterchainGasPaymaster => {
-                ColumnType::Binary(sea_orm::sea_query::BlobSize::Blob(None)).def()
-            }
+            Self::InterchainGasPaymaster => ColumnType::VarBinary(StringLen::None).def(),
             Self::Sequence => ColumnType::BigInteger.def().null(),
         }
     }
@@ -87,11 +87,11 @@ impl ColumnTrait for Column {
 impl RelationTrait for Relation {
     fn def(&self) -> RelationDef {
         match self {
-            Self::Domain => Entity::belongs_to(super::domain::Entity)
+            Self::Domain2 => Entity::belongs_to(super::domain::Entity)
                 .from(Column::Domain)
                 .to(super::domain::Column::Id)
                 .into(),
-            Self::Origin => Entity::belongs_to(super::domain::Entity)
+            Self::Domain1 => Entity::belongs_to(super::domain::Entity)
                 .from(Column::Origin)
                 .to(super::domain::Column::Id)
                 .into(),
@@ -103,12 +103,6 @@ impl RelationTrait for Relation {
     }
 }
 
-impl Related<super::domain::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Domain.def()
-    }
-}
-
 impl Related<super::transaction::Entity> for Entity {
     fn to() -> RelationDef {
         Relation::Transaction.def()

rust/main/agents/scraper/src/db/generated/message.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.3
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.1
 
 use sea_orm::entity::prelude::*;
 
@@ -65,14 +65,14 @@ impl ColumnTrait for Column {
         match self {
             Self::Id => ColumnType::BigInteger.def(),
             Self::TimeCreated => ColumnType::DateTime.def(),
-            Self::MsgId => ColumnType::Binary(BlobSize::Blob(None)).def(),
+            Self::MsgId => ColumnType::VarBinary(StringLen::None).def(),
             Self::Origin => ColumnType::Integer.def(),
             Self::Destination => ColumnType::Integer.def(),
             Self::Nonce => ColumnType::Integer.def(),
-            Self::Sender => ColumnType::Binary(BlobSize::Blob(None)).def(),
-            Self::Recipient => ColumnType::Binary(BlobSize::Blob(None)).def(),
-            Self::MsgBody => ColumnType::Binary(BlobSize::Blob(None)).def().null(),
-            Self::OriginMailbox => ColumnType::Binary(BlobSize::Blob(None)).def(),
+            Self::Sender => ColumnType::VarBinary(StringLen::None).def(),
+            Self::Recipient => ColumnType::VarBinary(StringLen::None).def(),
+            Self::MsgBody => ColumnType::VarBinary(StringLen::None).def().null(),
+            Self::OriginMailbox => ColumnType::VarBinary(StringLen::None).def(),
             Self::OriginTxId => ColumnType::BigInteger.def(),
         }
     }

rust/main/agents/scraper/src/db/generated/mod.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.3
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.1
 
 pub mod prelude;
 

rust/main/agents/scraper/src/db/generated/prelude.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.3
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.1
 #[allow(unused_imports)]
 pub use super::{
     block::Entity as Block, cursor::Entity as Cursor,

rust/main/agents/scraper/src/db/generated/transaction.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.3
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.1
 
 use sea_orm::entity::prelude::*;
 
@@ -11,6 +11,8 @@ impl EntityName for Entity {
     }
 }
 
+/// @NOTE: Replaced all occurrences of `Decimal` with `BigDecimal`
+/// due to the following issue: https://github.com/SeaQL/sea-orm/issues/1530
 #[derive(Clone, Debug, PartialEq, DeriveModel, DeriveActiveModel, Eq)]
 pub struct Model {
     pub id: i64,
@@ -75,19 +77,19 @@ impl ColumnTrait for Column {
         match self {
             Self::Id => ColumnType::BigInteger.def(),
             Self::TimeCreated => ColumnType::DateTime.def(),
-            Self::Hash => ColumnType::Binary(BlobSize::Blob(None)).def().unique(),
+            Self::Hash => ColumnType::VarBinary(StringLen::None).def().unique(),
             Self::BlockId => ColumnType::BigInteger.def(),
             Self::GasLimit => ColumnType::Decimal(Some((78u32, 0u32))).def(),
             Self::MaxPriorityFeePerGas => ColumnType::Decimal(Some((78u32, 0u32))).def().null(),
             Self::MaxFeePerGas => ColumnType::Decimal(Some((78u32, 0u32))).def().null(),
             Self::GasPrice => ColumnType::Decimal(Some((78u32, 0u32))).def().null(),
             Self::EffectiveGasPrice => ColumnType::Decimal(Some((78u32, 0u32))).def().null(),
             Self::Nonce => ColumnType::BigInteger.def(),
-            Self::Sender => ColumnType::Binary(BlobSize::Blob(None)).def(),
-            Self::Recipient => ColumnType::Binary(BlobSize::Blob(None)).def().null(),
+            Self::Sender => ColumnType::VarBinary(StringLen::None).def(),
+            Self::Recipient => ColumnType::VarBinary(StringLen::None).def().null(),
             Self::GasUsed => ColumnType::Decimal(Some((78u32, 0u32))).def(),
             Self::CumulativeGasUsed => ColumnType::Decimal(Some((78u32, 0u32))).def(),
-            Self::RawInputData => ColumnType::Binary(BlobSize::Blob(None)).def().null(),
+            Self::RawInputData => ColumnType::VarBinary(StringLen::None).def().null(),
         }
     }
 }

rust/main/hyperlane-base/Cargo.toml

@@ -44,6 +44,7 @@ warp.workspace = true
 ya-gcp.workspace = true
 
 backtrace = { workspace = true, optional = true }
+cc = { workspace = true, optional = true }
 backtrace-oneline = { path = "../utils/backtrace-oneline", optional = true }
 
 ethers-prometheus = { path = "../ethers-prometheus", features = ["serde"] }
@@ -73,6 +74,6 @@ vergen = { version = "8.3.2", features = ["build", "git", "gitcl"] }
 
 [features]
 default = ["oneline-errors", "color-eyre"]
-oneline-eyre = ["backtrace-oneline", "backtrace"]
+oneline-eyre = ["backtrace-oneline", "backtrace", "cc"]
 oneline-errors = ["oneline-eyre"]
 test-utils = ["dep:tempfile"]

rust/main/rust-toolchain

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.80.1"
+channel = "1.81.0"
 profile = "default"

rust/sealevel/Cargo.toml

@@ -48,7 +48,6 @@ borsh = "0.9"
 bs58 = "0.5.0"
 bytes = "1"
 clap = "4"
-color-eyre = "0.6"
 config = "0.13.3"
 console-subscriber = "0.2.0"
 convert_case = "0.6"
@@ -94,17 +93,6 @@ reqwest = "0.11"
 ripemd = "0.1.3"
 rlp = "=0.5.2"
 rocksdb = "0.21.0"
-sea-orm = { version = "0.11.1", features = [
-  "sqlx-postgres",
-  "runtime-tokio-native-tls",
-  "with-bigdecimal",
-  "with-time",
-  "macros",
-] }
-sea-orm-migration = { version = "0.11.1", features = [
-  "sqlx-postgres",
-  "runtime-tokio-native-tls",
-] }
 semver = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_bytes = "0.11"