resolve conflicts with main branch

Author: jorgeantonio21

Cargo.lock

@@ -53,13 +53,13 @@ serde_json                  = "1.0.140"
 serde_yaml                  = "0.9.34"
 serial_test                 = "3.1.1"
 shared-crypto               = { git = "https://github.com/mystenlabs/sui", package = "shared-crypto", tag = "testnet-v1.48.1" }
-sqlx                        = { version = "0.8.5", features = [ "postgres", "runtime-tokio-native-tls" ] }
+sqlx                        = { version = "0.8.6", features = [ "postgres", "runtime-tokio-native-tls" ] }
 sui-keys                    = { git = "https://github.com/mystenlabs/sui", package = "sui-keys", tag = "testnet-v1.47.0" }
 sui-sdk                     = { git = "https://github.com/mystenlabs/sui", package = "sui-sdk", tag = "testnet-v1.47.0" }
 sui-sdk-types               = "0.0.2"
 thiserror                   = "2.0.12"
 tokenizers                  = "0.21.0"
-tokio                       = "1.45.0"
+tokio                       = "1.45.1"
 toml                        = "0.8.19"
 tonic                       = "0.12"
 topology                    = { git = "https://github.com/atoma-network/nvrust", branch = "main" }
@@ -72,7 +72,7 @@ tracing-opentelemetry       = "0.28.0"
 tracing-subscriber          = "0.3.18"
 url                         = "2.5.4"
 utoipa                      = "5.3.1"
-utoipa-swagger-ui           = "9.0.1"
+utoipa-swagger-ui           = "9.0.2"
 uuid                        = "1.15.1"
 validator                   = { version = "0.20.0", features = [ "derive" ] }
 x25519-dalek                = "2.0.1"