Bump sea-orm to 1.1.19 and change async runtime to tokio

Cargo.toml

@@ -35,8 +35,9 @@ chacha20poly1305 = { version = "0.10.1", default-features = false, features = [
     "alloc",
     "stream",
 ] }
-futures = { version = "0.3", default-features = false, features = [
-    "executor",
+tokio = { version = "1", default-features = false, features = [
+    "rt",
+    "time",
 ] }
 generic-array = "=0.14.7"  # temporary pin while waiting for chacha20poly1305 update
 hex = { version = "0.4.3", default-features = false }
@@ -53,9 +54,9 @@ scrypt = { version = "0.11.0", default-features = false, features = [
     "simple",
     "std",
 ] }
-sea-orm = { version = "1.1.12", default-features = false, features = [
+sea-orm = { version = "1.1.19", default-features = false, features = [
     "macros",
-    "runtime-async-std-rustls",
+    "runtime-tokio-rustls",
     "sqlx-sqlite",
     "with-json",
 ] }

migration/Cargo.toml

@@ -17,13 +17,13 @@ name = "rgb_lib_migration"
 path = "src/lib.rs"
 
 [dependencies]
-async-std = { version = "1.13", default-features = false, features = [
-    "attributes",
-    "tokio1",
+tokio = { version = "1", default-features = false, features = [
+    "macros",
+    "rt-multi-thread",
 ] }
-sea-orm-migration = { version = "1.1.12", default-features = false, features = [
+sea-orm-migration = { version = "1.1.19", default-features = false, features = [
     "cli",
-    "runtime-async-std-rustls",
+    "runtime-tokio-rustls",
     "sqlx-mysql",
     "sqlx-postgres",
     "sqlx-sqlite",

migration/src/main.rs

@@ -1,6 +1,6 @@
 use sea_orm_migration::prelude::*;
 
-#[async_std::main]
+#[tokio::main]
 async fn main() {
     cli::run_cli(rgb_lib_migration::Migrator).await;
 }
@@ -16,7 +16,7 @@ mod tests {
 
     const TEST_DATA_DIR_PARTS: [&str; 3] = ["tests", "tmp", "test_db"];
 
-    #[async_std::test]
+    #[tokio::test]
     async fn test_migrations() {
         let db_path = PathBuf::from(TEST_DATA_DIR_PARTS.join(MAIN_SEPARATOR_STR));
         std::fs::create_dir_all(db_path.parent().unwrap()).unwrap();

src/database/entities/asset.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.12
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
 use sea_orm::entity::prelude::*;
 

src/database/entities/asset_transfer.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.12
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
 use sea_orm::entity::prelude::*;
 

src/database/entities/backup_info.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.12
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
 use sea_orm::entity::prelude::*;
 

src/database/entities/batch_transfer.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.12
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
 use sea_orm::entity::prelude::*;
 

src/database/entities/coloring.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.12
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
 use sea_orm::entity::prelude::*;
 

src/database/entities/media.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.12
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
 use sea_orm::entity::prelude::*;
 

src/database/entities/mod.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.12
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
 pub mod prelude;
 

src/database/entities/pending_witness_script.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.12
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
 use sea_orm::entity::prelude::*;
 

src/database/entities/prelude.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.12
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
 pub use super::asset::Entity as Asset;
 pub use super::asset_transfer::Entity as AssetTransfer;

src/database/entities/token.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.12
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
 use sea_orm::entity::prelude::*;
 

src/database/entities/token_media.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.12
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
 use sea_orm::entity::prelude::*;
 

src/database/entities/transfer.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.12
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
 use sea_orm::entity::prelude::*;
 

src/database/entities/transfer_transport_endpoint.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.12
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
 use sea_orm::entity::prelude::*;
 

src/database/entities/transport_endpoint.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.12
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
 use sea_orm::entity::prelude::*;
 

src/database/entities/txo.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.12
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
 use sea_orm::entity::prelude::*;
 

src/database/entities/wallet_transaction.rs

@@ -1,4 +1,4 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.12
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
 use sea_orm::entity::prelude::*;
 

src/lib.rs

@@ -100,7 +100,7 @@ use std::{
     panic,
     path::{Path, PathBuf},
     str::FromStr,
-    sync::Arc,
+    sync::{Arc, LazyLock},
     time::Duration,
 };
 
@@ -157,7 +157,6 @@ use chacha20poly1305::{
     aead::{generic_array::GenericArray, stream},
 };
 use file_format::FileFormat;
-use futures::executor::block_on;
 use psrgbt::{RgbOutExt, RgbPsbtExt};
 use rand::{Rng, distr::Alphanumeric};
 #[cfg(any(feature = "electrum", feature = "esplora"))]
@@ -294,3 +293,24 @@ use crate::{
         SCHEMA_ID_UDA,
     },
 };
+
+// sea-orm with runtime-tokio-rustls needs a tokio runtime for connection pool management
+static TOKIO_RUNTIME: LazyLock<tokio::runtime::Runtime> =
+    LazyLock::new(|| tokio::runtime::Runtime::new().expect("Failed to create Tokio runtime"));
+
+pub(crate) fn block_on<F>(future: F) -> F::Output
+where
+    F: std::future::Future + Send,
+    F::Output: Send,
+{
+    if tokio::runtime::Handle::try_current().is_ok() {
+        // Already inside a runtime - spawn thread without tokio context
+        std::thread::scope(|s| {
+            s.spawn(|| TOKIO_RUNTIME.block_on(future))
+                .join()
+                .expect("rgb-lib block_on thread panicked")
+        })
+    } else {
+        TOKIO_RUNTIME.block_on(future)
+    }
+}