Merge branch 'main' into ma/nix-env-use-mold

hotshot-query-service/Cargo.toml

@@ -23,7 +23,11 @@ default = ["file-system-data-source", "metrics-data-source", "sql-data-source"]
 # Enables support for an embedded SQLite database instead of PostgreSQL.
 # Ideal for lightweight nodes that benefit from pruning and merklized state storage,
 # offering advantages over file system storage.
-embedded-db = []
+embedded-db = ["sqlx/sqlite"]
+
+# As above, enables support for an embedded SQLite database instead of PostgreSQL.
+# But uses system SQlite instead of compiling the bundled version
+sqlite-unbundled = ["sqlx/sqlite-unbundled"]
 
 # Enable the availability data source backed by the local file system.
 file-system-data-source = ["atomic_store"]
@@ -108,7 +112,6 @@ sqlx = { version = "0.8", features = [
     "bit-vec",
     "postgres",
     "runtime-tokio",
-    "sqlite",
     "tls-native-tls",
 ], optional = true }
 

sequencer-sqlite/Cargo.toml

@@ -6,8 +6,13 @@ name = "sequencer-sqlite"
 version = "0.1.0"
 edition = "2021"
 
+[features]
+default = ["embedded-db"]
+sqlite-unbundled = ["sequencer/sqlite-unbundled"]
+embedded-db = ["sequencer/embedded-db"]
+
 [dependencies]
-sequencer = { path = "../sequencer" , features = ["embedded-db"] }
+sequencer = { path = "../sequencer" }
 tokio = { version = "1", default-features = false, features = [
 	"rt-multi-thread",
 	"macros",

sequencer/Cargo.toml

@@ -15,7 +15,8 @@ testing = [
     "hotshot-query-service/testing"
 ]
 benchmarking = []
-embedded-db = ["hotshot-query-service/embedded-db"]
+embedded-db = ["hotshot-query-service/embedded-db", "sqlx/sqlite"]
+sqlite-unbundled = ["hotshot-query-service/sqlite-unbundled", "sqlx/sqlite-unbundled"]
 fee = []
 pos = []
 marketplace = []
@@ -109,7 +110,6 @@ sqlx = { workspace = true, features = [
 	"bit-vec",
 	"postgres",
 	"runtime-tokio",
-	"sqlite",
 	"tls-native-tls",
 ] }
 static_assertions = "1"