GRIN/nym
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5795 from nymtech/am/update-sqlx-0.8.6

Browse Source 
Update to sqlx 0.8.6
This commit is contained in:
Andrej Mihajlov
2025-06-02 13:23:09 +02:00
committed by GitHub
parent 814ee45b4d 64e3f066a7
commit 866d547745
120 changed files with 419 additions and 492 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+48 -61
View File
@@ -96,7 +96,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
dependencies = [
"cfg-if",
"getrandom 0.2.15",
"once_cell",
"version_check",
"zerocopy 0.7.35",
@@ -2679,6 +2678,12 @@ version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
name = "foldhash"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
[[package]]
name = "form_urlencoded"
version = "1.2.1"
@@ -3121,14 +3126,19 @@ name = "hashbrown"
version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
dependencies = [
"allocator-api2",
"equivalent",
"foldhash",
]
[[package]]
name = "hashlink"
version = "0.8.4"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7"
checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
dependencies = [
"hashbrown 0.14.5",
"hashbrown 0.15.2",
]
[[package]]
@@ -3182,9 +3192,6 @@ name = "heck"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
dependencies = [
"unicode-segmentation",
]
[[package]]
name = "heck"
@@ -4162,9 +4169,9 @@ dependencies = [
[[package]]
name = "libsqlite3-sys"
version = "0.27.0"
version = "0.30.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716"
checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149"
dependencies = [
"cc",
"pkg-config",
@@ -9298,6 +9305,9 @@ name = "smallvec"
version = "1.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
dependencies = [
"serde",
]
[[package]]
name = "smawk"
@@ -9382,21 +9392,11 @@ dependencies = [
"der",
]
[[package]]
name = "sqlformat"
version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7bba3a93db0cc4f7bdece8bb09e77e2e785c20bfebf79eb8340ed80708048790"
dependencies = [
"nom",
"unicode_categories",
]
[[package]]
name = "sqlx"
version = "0.7.4"
version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c9a2ccff1a000a5a59cd33da541d9f2fdcd9e6e8229cc200565942bff36d0aaa"
checksum = "1fefb893899429669dcdd979aff487bd78f4064e5e7907e4269081e0ef7d97dc"
dependencies = [
"sqlx-core",
"sqlx-macros",
@@ -9407,70 +9407,64 @@ dependencies = [
[[package]]
name = "sqlx-core"
version = "0.7.4"
version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6"
checksum = "ee6798b1838b6a0f69c007c133b8df5866302197e404e8b6ee8ed3e3a5e68dc6"
dependencies = [
"ahash",
"atoi",
"byteorder",
"base64 0.22.1",
"bytes",
"chrono",
"crc",
"crossbeam-queue",
"either",
"event-listener 2.5.3",
"futures-channel",
"event-listener 5.4.0",
"futures-core",
"futures-intrusive",
"futures-io",
"futures-util",
"hashbrown 0.15.2",
"hashlink",
"hex",
"indexmap 2.7.1",
"log",
"memchr",
"once_cell",
"paste",
"percent-encoding",
"rustls 0.21.12",
"rustls-pemfile 1.0.4",
"rustls 0.23.25",
"serde",
"serde_json",
"sha2 0.10.9",
"smallvec",
"sqlformat",
"thiserror 1.0.69",
"thiserror 2.0.12",
"time",
"tokio",
"tokio-stream",
"tracing",
"url",
"webpki-roots 0.25.4",
"webpki-roots 0.26.8",
]
[[package]]
name = "sqlx-macros"
version = "0.7.4"
version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ea40e2345eb2faa9e1e5e326db8c34711317d2b5e08d0d5741619048a803127"
checksum = "a2d452988ccaacfbf5e0bdbc348fb91d7c8af5bee192173ac3636b5fb6e6715d"
dependencies = [
"proc-macro2",
"quote",
"sqlx-core",
"sqlx-macros-core",
"syn 1.0.109",
"syn 2.0.98",
]
[[package]]
name = "sqlx-macros-core"
version = "0.7.4"
version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8"
checksum = "19a9c1841124ac5a61741f96e1d9e2ec77424bf323962dd894bdb93f37d5219b"
dependencies = [
"dotenvy",
"either",
"heck 0.4.1",
"heck 0.5.0",
"hex",
"once_cell",
"proc-macro2",
@@ -9482,20 +9476,19 @@ dependencies = [
"sqlx-mysql",
"sqlx-postgres",
"sqlx-sqlite",
"syn 1.0.109",
"tempfile",
"syn 2.0.98",
"tokio",
"url",
]
[[package]]
name = "sqlx-mysql"
version = "0.7.4"
version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ed31390216d20e538e447a7a9b959e06ed9fc51c37b514b46eb758016ecd418"
checksum = "aa003f0038df784eb8fecbbac13affe3da23b45194bd57dba231c8f48199c526"
dependencies = [
"atoi",
"base64 0.21.7",
"base64 0.22.1",
"bitflags 2.8.0",
"byteorder",
"bytes",
@@ -9526,7 +9519,7 @@ dependencies = [
"smallvec",
"sqlx-core",
"stringprep",
"thiserror 1.0.69",
"thiserror 2.0.12",
"time",
"tracing",
"whoami",
@@ -9534,12 +9527,12 @@ dependencies = [
[[package]]
name = "sqlx-postgres"
version = "0.7.4"
version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c824eb80b894f926f89a0b9da0c7f435d27cdd35b8c655b114e58223918577e"
checksum = "db58fcd5a53cf07c184b154801ff91347e4c30d17a3562a635ff028ad5deda46"
dependencies = [
"atoi",
"base64 0.21.7",
"base64 0.22.1",
"bitflags 2.8.0",
"byteorder",
"chrono",
@@ -9548,7 +9541,6 @@ dependencies = [
"etcetera",
"futures-channel",
"futures-core",
"futures-io",
"futures-util",
"hex",
"hkdf",
@@ -9566,7 +9558,7 @@ dependencies = [
"smallvec",
"sqlx-core",
"stringprep",
"thiserror 1.0.69",
"thiserror 2.0.12",
"time",
"tracing",
"whoami",
@@ -9574,9 +9566,9 @@ dependencies = [
[[package]]
name = "sqlx-sqlite"
version = "0.7.4"
version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa"
checksum = "c2d12fe70b2c1b4401038055f90f151b78208de1f9f89a7dbfd41587a10c3eea"
dependencies = [
"atoi",
"chrono",
@@ -9590,11 +9582,12 @@ dependencies = [
"log",
"percent-encoding",
"serde",
"serde_urlencoded",
"sqlx-core",
"thiserror 2.0.12",
"time",
"tracing",
"url",
"urlencoding",
]
[[package]]
@@ -10814,12 +10807,6 @@ version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
[[package]]
name = "unicode_categories"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
[[package]]
name = "uniffi"
version = "0.29.2"
Cargo.toml
+5 -3
View File
@@ -33,7 +33,8 @@ members = [
"common/commands",
"common/config",
"common/cosmwasm-smart-contracts/coconut-dkg",
"common/cosmwasm-smart-contracts/contracts-common", "common/cosmwasm-smart-contracts/easy_addr",
"common/cosmwasm-smart-contracts/contracts-common",
"common/cosmwasm-smart-contracts/easy_addr",
"common/cosmwasm-smart-contracts/ecash-contract",
"common/cosmwasm-smart-contracts/group-contract",
"common/cosmwasm-smart-contracts/mixnet-contract",
@@ -133,7 +134,8 @@ members = [
"tools/internal/testnet-manager",
"tools/internal/testnet-manager",
"tools/internal/testnet-manager/dkg-bypass-contract",
"tools/internal/testnet-manager/dkg-bypass-contract", "tools/internal/validator-status-check",
"tools/internal/testnet-manager/dkg-bypass-contract",
"tools/internal/validator-status-check",
"tools/nym-cli",
"tools/nym-id-cli",
"tools/nym-nr-query",
@@ -309,7 +311,7 @@ serde_yaml = "0.9.25"
sha2 = "0.10.9"
si-scale = "0.2.3"
sphinx-packet = "=0.6.0"
sqlx = "0.7.4"
sqlx = "0.8.6"
strum = "0.26"
strum_macros = "0.26"
subtle-encoding = "0.5"
common/client-core/gateways-storage/src/backend/fs_backend/manager.rs
+1 -1
View File
@@ -87,7 +87,7 @@ impl StorageManager {
sqlx::query!("SELECT EXISTS (SELECT 1 FROM registered_gateway WHERE gateway_id_bs58 = ?) AS 'exists'", gateway_id)
.fetch_one(&self.connection_pool)
.await
.map(|result| result.exists == Some(1))
.map(|result| result.exists == 1)
}
pub(crate) async fn maybe_get_registered_gateway(
common/gateway-stats-storage/src/lib.rs
+1 -1
View File
@@ -193,7 +193,7 @@ impl PersistentStatsStorage {
pub async fn get_started_sessions_count(
&self,
start_date: Date,
) -> Result<i32, StatsStorageError> {
) -> Result<i64, StatsStorageError> {
Ok(self
.session_manager
.get_started_sessions_count(start_date)
common/gateway-stats-storage/src/sessions.rs
+1 -1
View File
@@ -160,7 +160,7 @@ impl SessionManager {
.await
}
pub(crate) async fn get_started_sessions_count(&self, start_date: Date) -> Result<i32> {
pub(crate) async fn get_started_sessions_count(&self, start_date: Date) -> Result<i64> {
Ok(sqlx::query!(
"SELECT COUNT(*) as count FROM sessions_active WHERE date(start_time) = ?",
start_date
common/gateway-storage/.sqlx/query-03fe56298a6d60cdd5304a2953811a533d59b4f1f0e4efecd32c09256b657e24.json
Generated
-32
View File
@@ -1,32 +0,0 @@
{
"db_name": "SQLite",
"query": "\n SELECT \n id as \"id!\",\n client_address_bs58 as \"client_address_bs58!\",\n content as \"content!\" \n FROM message_store \n WHERE client_address_bs58 = ? AND id > ?\n ORDER BY id ASC\n LIMIT ?;\n ",
"describe": {
"columns": [
{
"name": "id!",
"ordinal": 0,
"type_info": "Int64"
},
{
"name": "client_address_bs58!",
"ordinal": 1,
"type_info": "Text"
},
{
"name": "content!",
"ordinal": 2,
"type_info": "Blob"
}
],
"parameters": {
"Right": 3
},
"nullable": [
false,
false,
false
]
},
"hash": "03fe56298a6d60cdd5304a2953811a533d59b4f1f0e4efecd32c09256b657e24"
}
common/gateway-storage/.sqlx/query-071fbde5277c0806ed47fa15a9c6288609379049828a94008f854b3daeed21d1.json
Generated
+12
View File
@@ -0,0 +1,12 @@
{
"db_name": "SQLite",
"query": "DELETE FROM message_store WHERE timestamp < ?",
"describe": {
"columns": [],
"parameters": {
"Right": 1
},
"nullable": []
},
"hash": "071fbde5277c0806ed47fa15a9c6288609379049828a94008f854b3daeed21d1"
}
common/gateway-storage/.sqlx/query-2a55441d4e6134975b2c75f0b43491e9cf7bb52f41644d45c92e4b83f60b65cc.json
Generated
+5 -5
View File
@@ -16,7 +16,7 @@
{
"name": "protocol_version",
"ordinal": 2,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "endpoint",
@@ -31,17 +31,17 @@
{
"name": "tx_bytes",
"ordinal": 5,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "rx_bytes",
"ordinal": 6,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "persistent_keepalive_interval",
"ordinal": 7,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "allowed_ips",
@@ -51,7 +51,7 @@
{
"name": "client_id",
"ordinal": 9,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
common/gateway-storage/.sqlx/query-36b5b40e6466b67f6027257068438e4e45dd6506d806a25ce3a4c69723216fd3.json
Generated
+1 -1
View File
@@ -6,7 +6,7 @@
{
"name": "signer_id",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
common/gateway-storage/.sqlx/query-451158af8f5602e30445986a8de22d2e065c4e9dce4e7463a875ca8c21ac97c1.json
Generated
+12
View File
@@ -0,0 +1,12 @@
{
"db_name": "SQLite",
"query": "UPDATE shared_keys SET last_used_authentication = ? WHERE client_id = ?;",
"describe": {
"columns": [],
"parameters": {
"Right": 2
},
"nullable": []
},
"hash": "451158af8f5602e30445986a8de22d2e065c4e9dce4e7463a875ca8c21ac97c1"
}
common/gateway-storage/.sqlx/query-564c7da81081fab34754b76eeeedd48f3bc18842c03ef5a5c331bbee4c41c71c.json
Generated
-38
View File
@@ -1,38 +0,0 @@
{
"db_name": "SQLite",
"query": "SELECT * FROM shared_keys WHERE client_address_bs58 = ?",
"describe": {
"columns": [
{
"name": "client_id",
"ordinal": 0,
"type_info": "Int64"
},
{
"name": "client_address_bs58",
"ordinal": 1,
"type_info": "Text"
},
{
"name": "derived_aes128_ctr_blake3_hmac_keys_bs58",
"ordinal": 2,
"type_info": "Text"
},
{
"name": "derived_aes256_gcm_siv_key",
"ordinal": 3,
"type_info": "Blob"
}
],
"parameters": {
"Right": 1
},
"nullable": [
false,
false,
true,
true
]
},
"hash": "564c7da81081fab34754b76eeeedd48f3bc18842c03ef5a5c331bbee4c41c71c"
}
common/gateway-storage/.sqlx/query-5ee58c3050595614d550558879f54696dfcbddfb1b8575f5cc9690c4c2bffe25.json
Generated
+1 -1
View File
@@ -6,7 +6,7 @@
{
"name": "client_id",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
common/gateway-storage/.sqlx/query-72b268030ca7409c86806d6b5b253272629a3ebda7b89feacf8ed07ecf2e2c13.json
Generated
+1 -1
View File
@@ -6,7 +6,7 @@
{
"name": "id",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "client_type: ClientType",
common/gateway-storage/.sqlx/query-73e111225be2ce63d05f1a439a1fc9cc0359a960fe17a135a1d7f8975ebe38ef.json
Generated
+1 -1
View File
@@ -6,7 +6,7 @@
{
"name": "ticket_id",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "data!",
common/gateway-storage/.sqlx/query-7f8af0799d7ae5f751b9964e9566589bf768e7079079f584beb0c1ba16d43a5c.json
Generated
+2 -2
View File
@@ -6,14 +6,14 @@
{
"name": "exists",
"ordinal": 0,
"type_info": "Int"
"type_info": "Integer"
}
],
"parameters": {
"Right": 1
},
"nullable": [
null
false
]
},
"hash": "7f8af0799d7ae5f751b9964e9566589bf768e7079079f584beb0c1ba16d43a5c"
common/gateway-storage/.sqlx/query-870e426955cf3d0e297522552a87af82979545975f9df3ac3584fd1bf56a46cd.json
Generated
+1 -1
View File
@@ -6,7 +6,7 @@
{
"name": "signer_id",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
common/gateway-storage/.sqlx/query-9450b5f34620ec901e555f418eec6e0f489ed72d6b4f2b70ae1d905b4c46f0df.json
Generated
+1 -1
View File
@@ -6,7 +6,7 @@
{
"name": "available",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
common/gateway-storage/.sqlx/query-af2a80cb05c0bff096e6eb830598fbb8ba0a69e0d7079e4600ff47db786e6642.json
Generated
+1 -1
View File
@@ -6,7 +6,7 @@
{
"name": "ticket_id",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "serial_number",
common/gateway-storage/.sqlx/query-be36bdf12b8f2145cefca3111f146c71205167f1edcaef624b2f80d30bf269cc.json
Generated
+1 -1
View File
@@ -6,7 +6,7 @@
{
"name": "ticket_id",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "serial_number",
common/gateway-storage/.sqlx/query-d968d8662a2327918b311d4017bf4c73f9e6f3b1be8ff81c1aebdf3791d59d4d.json
Generated
+5 -5
View File
@@ -16,7 +16,7 @@
{
"name": "protocol_version",
"ordinal": 2,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "endpoint",
@@ -31,17 +31,17 @@
{
"name": "tx_bytes",
"ordinal": 5,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "rx_bytes",
"ordinal": 6,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "persistent_keepalive_interval",
"ordinal": 7,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "allowed_ips",
@@ -51,7 +51,7 @@
{
"name": "client_id",
"ordinal": 9,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
common/gateway-storage/.sqlx/query-e3860c0c31ca03cc0b22ca34cef5f535a94c78d3491d44d7c8bf1b34a840839d.json
Generated
-32
View File
@@ -1,32 +0,0 @@
{
"db_name": "SQLite",
"query": "\n SELECT \n id as \"id!\",\n client_address_bs58 as \"client_address_bs58!\",\n content as \"content!\"\n FROM message_store\n WHERE client_address_bs58 = ?\n ORDER BY id ASC\n LIMIT ?;\n ",
"describe": {
"columns": [
{
"name": "id!",
"ordinal": 0,
"type_info": "Int64"
},
{
"name": "client_address_bs58!",
"ordinal": 1,
"type_info": "Text"
},
{
"name": "content!",
"ordinal": 2,
"type_info": "Blob"
}
],
"parameters": {
"Right": 2
},
"nullable": [
false,
false,
false
]
},
"hash": "e3860c0c31ca03cc0b22ca34cef5f535a94c78d3491d44d7c8bf1b34a840839d"
}
common/gateway-storage/.sqlx/query-ff485c6b7e02423511b1fa55d5dd81d6c2f7228daf031c4621937e47804ce5b3.json
Generated
+1 -1
View File
@@ -6,7 +6,7 @@
{
"name": "proposal_id",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
common/gateway-storage/src/models.rs
+5 -22
View File
@@ -1,6 +1,8 @@
// Copyright 2021-2024 - Nym Technologies SA <contact@nymtech.net>
// SPDX-License-Identifier: GPL-3.0-only
use std::time::SystemTime;
use crate::error::GatewayStorageError;
use nym_credentials_interface::{AvailableBandwidth, ClientTicket, CredentialSpendingData};
use nym_gateway_requests::shared_key::{LegacySharedKeys, SharedGatewayKey, SharedSymmetricKey};
@@ -113,7 +115,7 @@ pub struct WireguardPeer {
pub preshared_key: Option<String>,
pub protocol_version: Option<i64>,
pub endpoint: Option<String>,
pub last_handshake: Option<sqlx::types::chrono::NaiveDateTime>,
pub last_handshake: Option<OffsetDateTime>,
pub tx_bytes: i64,
pub rx_bytes: i64,
pub persistent_keepalive_interval: Option<i64>,
@@ -128,18 +130,7 @@ impl From<defguard_wireguard_rs::host::Peer> for WireguardPeer {
preshared_key: value.preshared_key.as_ref().map(|k| k.to_string()),
protocol_version: value.protocol_version.map(|v| v as i64),
endpoint: value.endpoint.map(|e| e.to_string()),
last_handshake: value.last_handshake.and_then(|t| {
if let Ok(d) = t.duration_since(std::time::UNIX_EPOCH) {
if let Ok(millis) = d.as_millis().try_into() {
sqlx::types::chrono::DateTime::from_timestamp_millis(millis)
.map(|d| d.naive_utc())
} else {
None
}
} else {
None
}
}),
last_handshake: value.last_handshake.map(OffsetDateTime::from),
tx_bytes: value.tx_bytes as i64,
rx_bytes: value.rx_bytes as i64,
persistent_keepalive_interval: value.persistent_keepalive_interval.map(|v| v as i64),
@@ -180,15 +171,7 @@ impl TryFrom<WireguardPeer> for defguard_wireguard_rs::host::Peer {
.map(|e| e.parse())
.transpose()
.map_err(|e| Self::Error::TypeConversion(format!("endpoint {e}")))?,
last_handshake: value.last_handshake.and_then(|t| {
let unix_time = std::time::UNIX_EPOCH;
if let Ok(millis) = t.and_utc().timestamp_millis().try_into() {
let duration = std::time::Duration::from_millis(millis);
unix_time.checked_add(duration)
} else {
None
}
}),
last_handshake: value.last_handshake.map(SystemTime::from),
tx_bytes: value
.tx_bytes
.try_into()
common/gateway-storage/src/tickets.rs
+1 -1
View File
@@ -92,7 +92,7 @@ impl TicketStorageManager {
)
.fetch_one(&self.connection_pool)
.await
.map(|result| result.exists == Some(1))
.map(|result| result.exists == 1)
}
pub(crate) async fn remove_binary_ticket_data(
common/nyxd-scraper/src/storage/manager.rs
+1 -1
View File
@@ -111,7 +111,7 @@ impl StorageManager {
consensus_address: &str,
start_height: i64,
end_height: i64,
) -> Result<i32, sqlx::Error> {
) -> Result<i64, sqlx::Error> {
trace!("get_signed_between");
let start = Instant::now();
common/nyxd-scraper/src/storage/mod.rs
+2 -2
View File
@@ -170,7 +170,7 @@ impl ScraperStorage {
consensus_address: &str,
start_height: i64,
end_height: i64,
) -> Result<i32, ScraperError> {
) -> Result<i64, ScraperError> {
Ok(self
.manager
.get_signed_between(consensus_address, start_height, end_height)
@@ -182,7 +182,7 @@ impl ScraperStorage {
consensus_address: &str,
start_time: OffsetDateTime,
end_time: OffsetDateTime,
) -> Result<i32, ScraperError> {
) -> Result<i64, ScraperError> {
let Some(block_start) = self.get_first_block_height_after(start_time).await? else {
return Ok(0);
};
nym-api/.sqlx/query-00d857b624e7edab1198114b17cbad1e16988a3f9989d135840500e1143ce5e5.json
Generated
+2 -2
View File
@@ -6,7 +6,7 @@
{
"name": "epoch_id: u32",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "serialised_signatures",
@@ -16,7 +16,7 @@
{
"name": "serialization_revision: u8",
"ordinal": 2,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
nym-api/.sqlx/query-0112296b190328a3856d1adf51aafa2525da6c0b871633aad80ad555db9cf47c.json
Generated
+2 -2
View File
@@ -6,7 +6,7 @@
{
"name": "epoch_id: u32",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "serialised_key",
@@ -16,7 +16,7 @@
{
"name": "serialization_revision: u8",
"ordinal": 2,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
nym-api/.sqlx/query-09b6a36cf4455e53188f0ddd2f664855ee541cf7e262d5bba8ccd1df8088762e.json
Generated
+2 -2
View File
@@ -6,12 +6,12 @@
{
"name": "id",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "mix_id",
"ordinal": 1,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "identity_key",
nym-api/.sqlx/query-0a2587e2c72175caa89823675c4f2b6437c700eb7cdc41215e6dcde9754920db.json
Generated
+1 -1
View File
@@ -6,7 +6,7 @@
{
"name": "count",
"ordinal": 0,
"type_info": "Int"
"type_info": "Integer"
}
],
"parameters": {
nym-api/.sqlx/query-158b6cf296627527806ca5cae7375bcfc73533bc24acc837211ff35bd00b9abc.json
Generated
+1 -1
View File
@@ -6,7 +6,7 @@
{
"name": "reliability: f32",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Null"
}
],
"parameters": {
nym-api/.sqlx/query-1d4535b58abdefaaca96bc7312fe14f63ccb56fa62976f7ce3d3b4f6eca8b711.json
Generated
+2 -2
View File
@@ -6,12 +6,12 @@
{
"name": "timestamp",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "reliability: u8",
"ordinal": 1,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
nym-api/.sqlx/query-1f72d6f538a3655a031a3a8706794559c4c0df6defdfd179c84d02d3b8a6c055.json
Generated
+1 -1
View File
@@ -6,7 +6,7 @@
{
"name": "epoch_id: u32",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "serialised_signatures",
nym-api/.sqlx/query-2db414dfc769ae63a63656500d574cb3eea7cd88eaf829643d71eff410ca5bd2.json
Generated
+1 -1
View File
@@ -6,7 +6,7 @@
{
"name": "count",
"ordinal": 0,
"type_info": "Int"
"type_info": "Integer"
}
],
"parameters": {
nym-api/.sqlx/query-2e1eecad52ef13bba5ab914be6d27a27d480d9f3f2269e42d5c4008e6e7ece2f.json
Generated
+1 -1
View File
@@ -11,7 +11,7 @@
{
"name": "uptime",
"ordinal": 1,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
nym-api/.sqlx/query-2ee8137d6a332c3cdfe720e91ec4d8e2fb6b4bce50bbc922ab663d062a9cff7c.json
Generated
+1 -1
View File
@@ -16,7 +16,7 @@
{
"name": "count: u32",
"ordinal": 2,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
nym-api/.sqlx/query-31d1bd7418ae15c30e2ce16eff253d43823f7ebd53429ccb0598f5bca16aa3c9.json
Generated
+1 -1
View File
@@ -6,7 +6,7 @@
{
"name": "id",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
nym-api/.sqlx/query-361f939f40c230052b063ababe582d08bfddfebc24dc4e809f97a5dba57dfcf9.json
Generated
+2 -2
View File
@@ -6,12 +6,12 @@
{
"name": "timestamp",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "reliability: u8",
"ordinal": 1,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
nym-api/.sqlx/query-38bb0c1c7875d00ab451ad67cb1aed19cc52cfa474a9d48cc2c30d9baba51e3e.json
Generated
+1 -1
View File
@@ -6,7 +6,7 @@
{
"name": "id",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
nym-api/.sqlx/query-4263e1fc5a3b44af8d7ae68f3082f47cef07820c9e8b77ca8e0d93a7924c57ee.json
Generated
+1 -1
View File
@@ -11,7 +11,7 @@
{
"name": "count: u32",
"ordinal": 1,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
nym-api/.sqlx/query-462afe192f5f9bb068a557aa1c5c5f49299eb403049ddef168fc25e3d59edf6f.json
Generated
+1 -1
View File
@@ -6,7 +6,7 @@
{
"name": "id",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
nym-api/.sqlx/query-4892b8ef3683e015a3f6fc5df9bcd96fd3fbe10e94393f61e4ed8af4d5700da6.json
Generated
+2 -2
View File
@@ -6,12 +6,12 @@
{
"name": "absolute_epoch_id: u32",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "eligible_mixnodes: u32",
"ordinal": 1,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
nym-api/.sqlx/query-5e3824763c4ef13194876e3cdd65c2da97193c60e8d1a1640c48ba65e18a9faa.json
Generated
+2 -2
View File
@@ -6,14 +6,14 @@
{
"name": "exists",
"ordinal": 0,
"type_info": "Int"
"type_info": "Integer"
}
],
"parameters": {
"Right": 0
},
"nullable": [
null
false
]
},
"hash": "5e3824763c4ef13194876e3cdd65c2da97193c60e8d1a1640c48ba65e18a9faa"
nym-api/.sqlx/query-5eb13bfbee53b50641f69d4d6b62383c7f43864bffe98642bb8d1cf7c259d7be.json
Generated
+1 -1
View File
@@ -6,7 +6,7 @@
{
"name": "epoch_id: u32",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "serialised_signatures",
nym-api/.sqlx/query-676299beb2004ab89f7b38cf21ffb84ab5e7d7435297573523e2532560c2e302.json
Generated
+3 -3
View File
@@ -6,12 +6,12 @@
{
"name": "node_id: NodeId",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "value: f32",
"ordinal": 1,
"type_info": "Int"
"type_info": "Null"
}
],
"parameters": {
@@ -19,7 +19,7 @@
},
"nullable": [
false,
true
null
]
},
"hash": "676299beb2004ab89f7b38cf21ffb84ab5e7d7435297573523e2532560c2e302"
nym-api/.sqlx/query-6b88e7f40bba38053e968d2a7198a0c9646120f24c07134ffb0a33cf2fb6b6ed.json
Generated
+8 -8
View File
@@ -6,7 +6,7 @@
{
"name": "db_id",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "identity_key",
@@ -16,37 +16,37 @@
{
"name": "reliability: u8",
"ordinal": 2,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "timestamp!",
"ordinal": 3,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "gateway_id!",
"ordinal": 4,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "layer1_mix_id!",
"ordinal": 5,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "layer2_mix_id!",
"ordinal": 6,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "layer3_mix_id!",
"ordinal": 7,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "monitor_run_id!",
"ordinal": 8,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
nym-api/.sqlx/query-6c894d98a2aaf5bec2261502ec3abf571fd6ae01fa2c1efff6e5ff786dd443f6.json
Generated
+1 -1
View File
@@ -6,7 +6,7 @@
{
"name": "id",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
nym-api/.sqlx/query-71c761aaf86fe395a3ec05704bf5e3bd84c594904011bbec53edb1523b1cc5c0.json
Generated
+2 -2
View File
@@ -6,7 +6,7 @@
{
"name": "deposit_id: DepositId",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "merkle_leaf",
@@ -16,7 +16,7 @@
{
"name": "merkle_index: u32",
"ordinal": 2,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
nym-api/.sqlx/query-73bb892f19060693d122774b66bfaa8059135fadc3632a3ba6201cfc5d96482e.json
Generated
+1 -1
View File
@@ -11,7 +11,7 @@
{
"name": "uptime",
"ordinal": 1,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
nym-api/.sqlx/query-73ca856950a0157acfd3e2ed07b11aca3d875f67c77e2e7c75653c3f337d594e.json
Generated
+2 -2
View File
@@ -6,12 +6,12 @@
{
"name": "timestamp",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "reliability: u8",
"ordinal": 1,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
nym-api/.sqlx/query-8b1978f7cd1a6281cc0d6528f8ea004e1047fe42b7d74d53c617d20b886e54c1.json
Generated
+2 -2
View File
@@ -6,12 +6,12 @@
{
"name": "timestamp",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "reliability: u8",
"ordinal": 1,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
nym-api/.sqlx/query-93db1709eb08a8badc95ce94e1c28ba3da889468e4b12807aaad117a741d3f11.json
Generated
+1 -1
View File
@@ -6,7 +6,7 @@
{
"name": "count",
"ordinal": 0,
"type_info": "Int"
"type_info": "Integer"
}
],
"parameters": {
nym-api/.sqlx/query-989b86c24c404f1ec7e0b962586a601b8e3d3ee03162b5319afb8359efab3c85.json
Generated
+2 -2
View File
@@ -11,12 +11,12 @@
{
"name": "node_id: NodeId",
"ordinal": 1,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "id",
"ordinal": 2,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
nym-api/.sqlx/query-9f65b370360ff2e0891fdf89233932212254708fec2973eb4d621179d6b975f4.json
Generated
+1 -1
View File
@@ -11,7 +11,7 @@
{
"name": "uptime!",
"ordinal": 1,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
nym-api/.sqlx/query-a77f7222a6fb9e7851b3bb71ef39685fde165003c552094b02f6b90dd947519b.json
Generated
+1 -1
View File
@@ -6,7 +6,7 @@
{
"name": "id",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
nym-api/.sqlx/query-af45b384ee5caa4f9bac1fa314239a8455e023dcdea1b0b2674cd1ea48d65919.json
Generated
+1 -1
View File
@@ -6,7 +6,7 @@
{
"name": "id",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
nym-api/.sqlx/query-af7b333e919cf139670c9c6436531a6bd450652e2a4e09e8be910b58ad61ee14.json
Generated
+1 -1
View File
@@ -6,7 +6,7 @@
{
"name": "reliability: f32",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Null"
}
],
"parameters": {
nym-api/.sqlx/query-b5cc0ec39c7474f73ebb903ff8269fd88f5b0ae3766034b29aeda8248b948d0e.json
Generated
+1 -1
View File
@@ -11,7 +11,7 @@
{
"name": "count: u32",
"ordinal": 1,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
nym-api/.sqlx/query-b657ab34d60dcda8a4bb1803db65d57002331d709068feac5ccad6632dbd046f.json
Generated
+1 -1
View File
@@ -6,7 +6,7 @@
{
"name": "node_id: NodeId",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
nym-api/.sqlx/query-b72420d03ee03ee3506e7b2a97667f1481269877ef2eea32a673f4ba2fbdb498.json
Generated
+2 -2
View File
@@ -11,12 +11,12 @@
{
"name": "mix_id: NodeId",
"ordinal": 1,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "id",
"ordinal": 2,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
nym-api/.sqlx/query-ba96344db31b0f2155e2af53eaaeafc9b5f64061b6c9a829e2912945b6cffc82.json
Generated
+2 -2
View File
@@ -6,7 +6,7 @@
{
"name": "epoch_id: u32",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "serialised_signatures",
@@ -16,7 +16,7 @@
{
"name": "serialization_revision: u8",
"ordinal": 2,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
nym-api/.sqlx/query-c19e1b3768bf2929407599e6e8783ead09f4d7319b7997fa2a9bb628f9404166.json
Generated
+3 -3
View File
@@ -6,12 +6,12 @@
{
"name": "mix_id: NodeId",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "value: f32",
"ordinal": 1,
"type_info": "Int64"
"type_info": "Null"
}
],
"parameters": {
@@ -19,7 +19,7 @@
},
"nullable": [
false,
true
null
]
},
"hash": "c19e1b3768bf2929407599e6e8783ead09f4d7319b7997fa2a9bb628f9404166"
nym-api/.sqlx/query-c89cfd911d0a2406e988bfcf95c5a6d398c23b20b6b91575f75fef228701c171.json
Generated
+1 -1
View File
@@ -6,7 +6,7 @@
{
"name": "id",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
nym-api/.sqlx/query-cdc99f6f23d058577bd587be49e5b80b949735e2f0fcc45bfcbd7c0d96e1c973.json
Generated
+1 -1
View File
@@ -6,7 +6,7 @@
{
"name": "id",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
nym-api/.sqlx/query-cf202aa0360254ef961b98070970713387eb2b87d211827cc3e48c51e1104083.json
Generated
+1 -1
View File
@@ -6,7 +6,7 @@
{
"name": "reliability: f32",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
nym-api/.sqlx/query-dcc526c3855fea0ffbd73a0fb563cf10c707e356c767f8399452b56f044a1f6e.json
Generated
+1 -1
View File
@@ -6,7 +6,7 @@
{
"name": "count",
"ordinal": 0,
"type_info": "Int"
"type_info": "Integer"
}
],
"parameters": {
nym-api/.sqlx/query-e55db4def70689c061d0e07115a21068431575afd2be8afafce1a7fb13507e7e.json
Generated
+2 -2
View File
@@ -6,14 +6,14 @@
{
"name": "exists",
"ordinal": 0,
"type_info": "Int"
"type_info": "Integer"
}
],
"parameters": {
"Right": 1
},
"nullable": [
null
false
]
},
"hash": "e55db4def70689c061d0e07115a21068431575afd2be8afafce1a7fb13507e7e"
nym-api/.sqlx/query-f055560483e843929fd93dc269f9650c707bc10db50aacc7988763320318bf2c.json
Generated
+1 -1
View File
@@ -6,7 +6,7 @@
{
"name": "count",
"ordinal": 0,
"type_info": "Int"
"type_info": "Integer"
}
],
"parameters": {
nym-api/.sqlx/query-f777c5a8b0a4c2b516b00c4dc582a86e9c93587a7acab0ac5149579bb1914569.json
Generated
+1 -1
View File
@@ -11,7 +11,7 @@
{
"name": "uptime!",
"ordinal": 1,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
nym-api/.sqlx/query-f94d1b21ee833f0619ba1c26b747bed54392c9064ac3eff35ae32933221aa33f.json
Generated
+9 -9
View File
@@ -6,12 +6,12 @@
{
"name": "db_id",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "mix_id!",
"ordinal": 1,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "identity_key",
@@ -21,37 +21,37 @@
{
"name": "reliability: u8",
"ordinal": 3,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "timestamp!",
"ordinal": 4,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "gateway_id!",
"ordinal": 5,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "layer1_mix_id!",
"ordinal": 6,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "layer2_mix_id!",
"ordinal": 7,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "layer3_mix_id!",
"ordinal": 8,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "monitor_run_id!",
"ordinal": 9,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
nym-api/nym-api-requests/src/models.rs
+2 -2
View File
@@ -105,7 +105,7 @@ impl MixnodeStatus {
)]
pub struct MixnodeCoreStatusResponse {
pub mix_id: NodeId,
pub count: i32,
pub count: i64,
}
#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, ToSchema)]
@@ -119,7 +119,7 @@ pub struct MixnodeCoreStatusResponse {
)]
pub struct GatewayCoreStatusResponse {
pub identity: String,
pub count: i32,
pub count: i64,
}
#[derive(Clone, Copy, Debug, Serialize, Deserialize, JsonSchema, ToSchema)]
nym-api/src/support/storage/manager.rs
+7 -7
View File
@@ -747,7 +747,7 @@ impl StorageManager {
&self,
db_mixnode_id: i64,
since: i64,
) -> Result<i32, sqlx::Error> {
) -> Result<i64, sqlx::Error> {
let count = sqlx::query!(
r#"
SELECT COUNT(*) as count FROM
@@ -786,7 +786,7 @@ impl StorageManager {
&self,
gateway_id: i64,
since: i64,
) -> Result<i32, sqlx::Error> {
) -> Result<i64, sqlx::Error> {
let count = sqlx::query!(
r#"
SELECT COUNT(*) as count FROM
@@ -824,7 +824,7 @@ impl StorageManager {
)
.fetch_one(&self.connection_pool)
.await
.map(|result| result.exists == Some(1))
.map(|result| result.exists == 1)
}
/// Creates new entry for mixnode historical uptime
@@ -966,7 +966,7 @@ impl StorageManager {
&self,
since: i64,
until: i64,
) -> Result<i32, sqlx::Error> {
) -> Result<i64, sqlx::Error> {
let count = sqlx::query!(
"SELECT COUNT(*) as count FROM monitor_run WHERE timestamp > ? AND timestamp < ?",
since,
@@ -1227,7 +1227,7 @@ impl StorageManager {
.await
}
pub(super) async fn get_mixnode_statuses_count(&self, db_id: i64) -> Result<i32, sqlx::Error> {
pub(super) async fn get_mixnode_statuses_count(&self, db_id: i64) -> Result<i64, sqlx::Error> {
sqlx::query!(
r#"
SELECT COUNT(*) as count
@@ -1279,7 +1279,7 @@ impl StorageManager {
.await
}
pub(super) async fn get_gateway_statuses_count(&self, db_id: i64) -> Result<i32, sqlx::Error> {
pub(super) async fn get_gateway_statuses_count(&self, db_id: i64) -> Result<i64, sqlx::Error> {
sqlx::query!(
r#"
SELECT COUNT(*) as count
@@ -1341,7 +1341,7 @@ pub(crate) mod v3_migration {
sqlx::query!("SELECT EXISTS (SELECT 1 FROM v3_migration_info) AS 'exists'",)
.fetch_one(&self.connection_pool)
.await
.map(|result| result.exists == Some(1))
.map(|result| result.exists == 1)
}
pub(crate) async fn set_v3_migration_completion(&self) -> Result<(), sqlx::Error> {
nym-api/src/support/storage/mod.rs
+2 -2
View File
@@ -679,7 +679,7 @@ impl NymApiStorage {
&self,
mix_id: NodeId,
since: Option<i64>,
) -> Result<i32, NymApiStorageError> {
) -> Result<i64, NymApiStorageError> {
let db_id = self.manager.get_mixnode_database_id(mix_id).await?;
if let Some(node_id) = db_id {
@@ -707,7 +707,7 @@ impl NymApiStorage {
&self,
identity: &str,
since: Option<i64>,
) -> Result<i32, NymApiStorageError> {
) -> Result<i64, NymApiStorageError> {
let node_id = self
.manager
.get_gateway_database_id_by_identity(identity)
nym-node-status-api/nym-node-status-api/.sqlx/query-021c6c65d1ed806d8430bef7883906b42a7e4b280c8efb32db15d7c6a51d7a27.json
Generated
+2 -2
View File
@@ -6,7 +6,7 @@
{
"name": "node_id",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "host",
@@ -16,7 +16,7 @@
{
"name": "http_api_port",
"ordinal": 2,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
nym-node-status-api/nym-node-status-api/.sqlx/query-06065394c157927e4002ddd5c7c1af626ae15728d615f539470cd7c189312385.json
Generated
+12
View File
@@ -0,0 +1,12 @@
{
"db_name": "SQLite",
"query": "\n INSERT INTO mixnode_description (\n mix_id, moniker, website, security_contact, details, last_updated_utc\n ) VALUES (?, ?, ?, ?, ?, ?)\n ON CONFLICT (mix_id) DO UPDATE SET\n moniker = excluded.moniker,\n website = excluded.website,\n security_contact = excluded.security_contact,\n details = excluded.details,\n last_updated_utc = excluded.last_updated_utc\n ",
"describe": {
"columns": [],
"parameters": {
"Right": 6
},
"nullable": []
},
"hash": "06065394c157927e4002ddd5c7c1af626ae15728d615f539470cd7c189312385"
}
nym-node-status-api/nym-node-status-api/.sqlx/query-124d45b9604439584650f401607c46bdbd162c7c689f74fe9ddfdfd48f5ddc07.json
Generated
+4 -4
View File
@@ -11,22 +11,22 @@
{
"name": "total_stake!: i64",
"ordinal": 1,
"type_info": "Int"
"type_info": "Integer"
},
{
"name": "total_packets_received!: i64",
"ordinal": 2,
"type_info": "Int"
"type_info": "Integer"
},
{
"name": "total_packets_sent!: i64",
"ordinal": 3,
"type_info": "Int"
"type_info": "Integer"
},
{
"name": "total_packets_dropped!: i64",
"ordinal": 4,
"type_info": "Int"
"type_info": "Integer"
}
],
"parameters": {
nym-node-status-api/nym-node-status-api/.sqlx/query-12524c93213c29a4f231785ba25a5b483d9e1a395c65c536fdc4596b69b4584b.json
Generated
-12
View File
@@ -1,12 +0,0 @@
{
"db_name": "SQLite",
"query": "DELETE FROM nym_nodes\n WHERE last_updated_utc < ?",
"describe": {
"columns": [],
"parameters": {
"Right": 1
},
"nullable": []
},
"hash": "12524c93213c29a4f231785ba25a5b483d9e1a395c65c536fdc4596b69b4584b"
}
nym-node-status-api/nym-node-status-api/.sqlx/query-1327b5118f9144dddbcf8edb11f7dc549cf503409fd6dfedcdc02dbcd61d5454.json
Generated
+1 -1
View File
@@ -16,7 +16,7 @@
{
"name": "last_updated_utc!",
"ordinal": 2,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
nym-node-status-api/nym-node-status-api/.sqlx/query-2236299f9f691376db54cbd58ec5ceb89b9925cba46efcf4ed79ef0759a01129.json
Generated
+1 -1
View File
@@ -6,7 +6,7 @@
{
"name": "id",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "gateway_identity_key",
nym-node-status-api/nym-node-status-api/.sqlx/query-227539374e7473f6f9642289c5b5d1bcd636315ab23537cb5f6d2f82a2bcb7bf.json
Generated
+1 -1
View File
@@ -6,7 +6,7 @@
{
"name": "node_id",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "bond_info: serde_json::Value",
nym-node-status-api/nym-node-status-api/.sqlx/query-283f49a65c7d70bf271702ff6a5c7ad6e68c81932d295ff18ed198c54706a57c.json
Generated
+3 -3
View File
@@ -6,7 +6,7 @@
{
"name": "node_id",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "ed25519_identity_pubkey",
@@ -16,7 +16,7 @@
{
"name": "total_stake",
"ordinal": 2,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "ip_addresses!: serde_json::Value",
@@ -26,7 +26,7 @@
{
"name": "mix_port",
"ordinal": 4,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "x25519_sphinx_pubkey",
nym-node-status-api/nym-node-status-api/.sqlx/query-3825020ab0ecbffe83270c57ec74fb7987a6807d3381a6068c79b127a668b190.json
Generated
-12
View File
@@ -1,12 +0,0 @@
{
"db_name": "SQLite",
"query": "\n INSERT INTO mixnode_description (\n mix_id, moniker, website, security_contact, details, last_updated_utc\n ) VALUES (?, ?, ?, ?, ?, ?)\n ON CONFLICT (mix_id) DO UPDATE SET\n moniker = excluded.moniker,\n website = excluded.website,\n security_contact = excluded.security_contact,\n details = excluded.details,\n last_updated_utc = excluded.last_updated_utc\n ",
"describe": {
"columns": [],
"parameters": {
"Right": 6
},
"nullable": []
},
"hash": "3825020ab0ecbffe83270c57ec74fb7987a6807d3381a6068c79b127a668b190"
}
nym-node-status-api/nym-node-status-api/.sqlx/query-3e7e987780937873cdb393b157d7708c9f01047b0689eb0d4f7a973b328c609d.json
Generated
+1 -1
View File
@@ -6,7 +6,7 @@
{
"name": "id!",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "gateway_identity_key!",
nym-node-status-api/nym-node-status-api/.sqlx/query-3eb1d8491bda3c1d6e071b6eb364b9a979f4bdb11ea81b2d0f022555bab51ecb.json
Generated
+4 -4
View File
@@ -11,12 +11,12 @@
{
"name": "bonded: bool",
"ordinal": 1,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "performance!",
"ordinal": 2,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "self_described?",
@@ -41,12 +41,12 @@
{
"name": "last_testrun_utc?",
"ordinal": 7,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "last_updated_utc!",
"ordinal": 8,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "moniker!",
nym-node-status-api/nym-node-status-api/.sqlx/query-3fc2baabf194b147b20be2a49401cc0c100a1d7a7c347393adde2410fa6f4dfe.json
Generated
+1 -1
View File
@@ -6,7 +6,7 @@
{
"name": "total_stake",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
nym-node-status-api/nym-node-status-api/.sqlx/query-5e9cbb39f5fb53774803270f422989e199aac4d4a71913c7074359b4bd676b02.json
Generated
+3 -3
View File
@@ -6,19 +6,19 @@
{
"name": "id!",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "gateway_id",
"ordinal": 1,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
"Right": 3
},
"nullable": [
true,
false,
false
]
},
nym-node-status-api/nym-node-status-api/.sqlx/query-670b7ed7d57a6986181b24be24ca667e8cacdf677ccb906415b3fe92be0c436b.json
Generated
+1 -1
View File
@@ -6,7 +6,7 @@
{
"name": "count(id)",
"ordinal": 0,
"type_info": "Int"
"type_info": "Integer"
}
],
"parameters": {
nym-node-status-api/nym-node-status-api/.sqlx/query-6a9780aad1f2f0c8ef780e51fe856679d5e28f95143f4e2a2b409009dc0f55ba.json
Generated
+12
View File
@@ -0,0 +1,12 @@
{
"db_name": "SQLite",
"query": "\n INSERT INTO nym_node_descriptions (\n node_id, moniker, website, security_contact, details, last_updated_utc\n ) VALUES (?, ?, ?, ?, ?, ?)\n ON CONFLICT (node_id) DO UPDATE SET\n moniker = excluded.moniker,\n website = excluded.website,\n security_contact = excluded.security_contact,\n details = excluded.details,\n last_updated_utc = excluded.last_updated_utc\n ",
"describe": {
"columns": [],
"parameters": {
"Right": 6
},
"nullable": []
},
"hash": "6a9780aad1f2f0c8ef780e51fe856679d5e28f95143f4e2a2b409009dc0f55ba"
}
nym-node-status-api/nym-node-status-api/.sqlx/query-7600823da7ce80b8ffda933608603a2752e28df775d1af8fd943a5fc8d7dc00d.json
Generated
+2 -2
View File
@@ -6,7 +6,7 @@
{
"name": "id!",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "date!",
@@ -16,7 +16,7 @@
{
"name": "timestamp_utc!",
"ordinal": 2,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "value_json!",
nym-node-status-api/nym-node-status-api/.sqlx/query-786b6a5d954e38b204cebf322711c74c8cf1c08e5e2896a1d6d5b85c91991753.json
Generated
+32
View File
@@ -0,0 +1,32 @@
{
"db_name": "SQLite",
"query": "\n SELECT\n COALESCE(packets_received, 0) as \"packets_received!: _\",\n COALESCE(packets_sent, 0) as \"packets_sent!: _\",\n COALESCE(packets_dropped, 0) as \"packets_dropped!: _\"\n FROM mixnode_packet_stats_raw\n WHERE mix_id = ?\n ORDER BY timestamp_utc DESC\n LIMIT 1 OFFSET 1\n ",
"describe": {
"columns": [
{
"name": "packets_received!: _",
"ordinal": 0,
"type_info": "Null"
},
{
"name": "packets_sent!: _",
"ordinal": 1,
"type_info": "Null"
},
{
"name": "packets_dropped!: _",
"ordinal": 2,
"type_info": "Null"
}
],
"parameters": {
"Right": 1
},
"nullable": [
null,
null,
null
]
},
"hash": "786b6a5d954e38b204cebf322711c74c8cf1c08e5e2896a1d6d5b85c91991753"
}
nym-node-status-api/nym-node-status-api/.sqlx/query-86ff64db477a1d6235179b0b88d86b86d1b9be62336c9eac0eef44987a5451b5.json
Generated
+1 -1
View File
@@ -6,7 +6,7 @@
{
"name": "count(id)",
"ordinal": 0,
"type_info": "Int"
"type_info": "Integer"
}
],
"parameters": {
nym-node-status-api/nym-node-status-api/.sqlx/query-8bdf85a61e443fa5f4835bffd0bffc8ed1011f56714fde6007e50951e569854b.json
Generated
+32
View File
@@ -0,0 +1,32 @@
{
"db_name": "SQLite",
"query": "\n SELECT\n COALESCE(packets_received, 0) as \"packets_received!: _\",\n COALESCE(packets_sent, 0) as \"packets_sent!: _\",\n COALESCE(packets_dropped, 0) as \"packets_dropped!: _\"\n FROM nym_nodes_packet_stats_raw\n WHERE node_id = ?\n ORDER BY timestamp_utc DESC\n LIMIT 1 OFFSET 1\n ",
"describe": {
"columns": [
{
"name": "packets_received!: _",
"ordinal": 0,
"type_info": "Null"
},
{
"name": "packets_sent!: _",
"ordinal": 1,
"type_info": "Null"
},
{
"name": "packets_dropped!: _",
"ordinal": 2,
"type_info": "Null"
}
],
"parameters": {
"Right": 1
},
"nullable": [
null,
null,
null
]
},
"hash": "8bdf85a61e443fa5f4835bffd0bffc8ed1011f56714fde6007e50951e569854b"
}
nym-node-status-api/nym-node-status-api/.sqlx/query-9104e50524ad5a103bd199a0531d73b74876e9aecda2117227e2e180258d91a1.json
Generated
-12
View File
@@ -1,12 +0,0 @@
{
"db_name": "SQLite",
"query": "\n INSERT INTO nym_node_descriptions (\n node_id, moniker, website, security_contact, details, last_updated_utc\n ) VALUES (?, ?, ?, ?, ?, ?)\n ON CONFLICT (node_id) DO UPDATE SET\n moniker = excluded.moniker,\n website = excluded.website,\n security_contact = excluded.security_contact,\n details = excluded.details,\n last_updated_utc = excluded.last_updated_utc\n ",
"describe": {
"columns": [],
"parameters": {
"Right": 6
},
"nullable": []
},
"hash": "9104e50524ad5a103bd199a0531d73b74876e9aecda2117227e2e180258d91a1"
}
nym-node-status-api/nym-node-status-api/.sqlx/query-930a41e612b4e964ae214843da190f6c66c14d4267a2cc2ca73354becc2c8bb8.json
Generated
+1 -1
View File
@@ -11,7 +11,7 @@
{
"name": "bonded: bool",
"ordinal": 1,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
nym-node-status-api/nym-node-status-api/.sqlx/query-9334f0c91252fcd7ec72558a271222615bb282e5334665700709ae475a5daea2.json
Generated
+3 -3
View File
@@ -6,7 +6,7 @@
{
"name": "node_id",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "ed25519_identity_pubkey",
@@ -16,7 +16,7 @@
{
"name": "total_stake",
"ordinal": 2,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "ip_addresses!: serde_json::Value",
@@ -26,7 +26,7 @@
{
"name": "mix_port",
"ordinal": 4,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "x25519_sphinx_pubkey",
nym-node-status-api/nym-node-status-api/.sqlx/query-97f4b340bb0f6c9c78d77b24d4f9d3d13ab61cbaac6f8c3cfc06c95e0f13252f.json
Generated
-32
View File
@@ -1,32 +0,0 @@
{
"db_name": "SQLite",
"query": "\n SELECT\n COALESCE(packets_received, 0) as packets_received,\n COALESCE(packets_sent, 0) as packets_sent,\n COALESCE(packets_dropped, 0) as packets_dropped\n FROM nym_nodes_packet_stats_raw\n WHERE node_id = ?\n ORDER BY timestamp_utc DESC\n LIMIT 1 OFFSET 1\n ",
"describe": {
"columns": [
{
"name": "packets_received",
"ordinal": 0,
"type_info": "Int64"
},
{
"name": "packets_sent",
"ordinal": 1,
"type_info": "Int64"
},
{
"name": "packets_dropped",
"ordinal": 2,
"type_info": "Int64"
}
],
"parameters": {
"Right": 1
},
"nullable": [
false,
false,
false
]
},
"hash": "97f4b340bb0f6c9c78d77b24d4f9d3d13ab61cbaac6f8c3cfc06c95e0f13252f"
}
nym-node-status-api/nym-node-status-api/.sqlx/query-a1d9eb816acd1a91ed0975c801c9295c01a78861a2a0597ad28b1579a14bf008.json
Generated
+5 -5
View File
@@ -6,22 +6,22 @@
{
"name": "id!",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "gateway_id!",
"ordinal": 1,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "status!",
"ordinal": 2,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "created_utc!",
"ordinal": 3,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "ip_address!",
@@ -36,7 +36,7 @@
{
"name": "last_assigned_utc",
"ordinal": 6,
"type_info": "Int64"
"type_info": "Integer"
}
],
"parameters": {
nym-node-status-api/nym-node-status-api/.sqlx/query-a79a61b87325f3f1d9c5a4fb386ccd585be0641e5878acb6283b879f22ed2b4c.json
Generated
+1 -1
View File
@@ -6,7 +6,7 @@
{
"name": "count: i64",
"ordinal": 0,
"type_info": "Int"
"type_info": "Integer"
}
],
"parameters": {
nym-node-status-api/nym-node-status-api/.sqlx/query-aa602604c0e7b6eef41ea3cd83c16610e15be2d7ee3f6c4d3debf23f95fb9c2e.json
Generated
+44
View File
@@ -0,0 +1,44 @@
{
"db_name": "SQLite",
"query": "SELECT\n nd.node_id,\n moniker,\n website,\n security_contact,\n details\n FROM\n nym_node_descriptions nd\n INNER JOIN\n nym_nodes\n WHERE\n bond_info IS NOT NULL\n ",
"describe": {
"columns": [
{
"name": "node_id",
"ordinal": 0,
"type_info": "Integer"
},
{
"name": "moniker",
"ordinal": 1,
"type_info": "Text"
},
{
"name": "website",
"ordinal": 2,
"type_info": "Text"
},
{
"name": "security_contact",
"ordinal": 3,
"type_info": "Text"
},
{
"name": "details",
"ordinal": 4,
"type_info": "Text"
}
],
"parameters": {
"Right": 0
},
"nullable": [
false,
true,
true,
true,
true
]
},
"hash": "aa602604c0e7b6eef41ea3cd83c16610e15be2d7ee3f6c4d3debf23f95fb9c2e"
}
nym-node-status-api/nym-node-status-api/.sqlx/query-7526390c3d17622564067f153867295a279179315650f6fb363d5f3177bf70e3.json → nym-node-status-api/nym-node-status-api/.sqlx/query-c7656b2b1b4328415772ce69d0568bd5438d6c8496ca9cbdcfb70bb5375b345e.json
Generated
+3 -3
View File
@@ -1,12 +1,12 @@
{
"db_name": "SQLite",
"query": "SELECT\n node_id,\n self_described as \"self_described: serde_json::Value\"\n FROM\n nym_nodes\n WHERE\n self_described IS NOT NULL\n ",
"query": "SELECT\n node_id,\n self_described as \"self_described: serde_json::Value\"\n FROM\n nym_nodes\n WHERE\n self_described IS NOT NULL\n ORDER BY\n node_id\n ",
"describe": {
"columns": [
{
"name": "node_id",
"ordinal": 0,
"type_info": "Int64"
"type_info": "Integer"
},
{
"name": "self_described: serde_json::Value",
@@ -22,5 +22,5 @@
true
]
},
"hash": "7526390c3d17622564067f153867295a279179315650f6fb363d5f3177bf70e3"
"hash": "c7656b2b1b4328415772ce69d0568bd5438d6c8496ca9cbdcfb70bb5375b345e"
}

Some files were not shown because too many files have changed in this diff Show More