diff --git a/Cargo.lock b/Cargo.lock index 1fe90814a8..2a9e8da639 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -113,6 +113,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", + "getrandom", "once_cell", "version_check", "zerocopy", @@ -373,9 +374,9 @@ dependencies = [ [[package]] name = "atoi" -version = "1.0.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7c57d12312ff59c811c0643f4d80830505833c9ffaebd193d819392b265be8e" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" dependencies = [ "num-traits", ] @@ -698,6 +699,9 @@ name = "bitflags" version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +dependencies = [ + "serde", +] [[package]] name = "bitvec" @@ -1577,7 +1581,7 @@ dependencies = [ "crossterm_winapi", "libc", "mio 0.8.11", - "parking_lot 0.12.3", + "parking_lot", "signal-hook", "signal-hook-mio", "winapi", @@ -1592,7 +1596,7 @@ dependencies = [ "bitflags 2.5.0", "crossterm_winapi", "libc", - "parking_lot 0.12.3", + "parking_lot", "winapi", ] @@ -1945,7 +1949,7 @@ dependencies = [ "hashbrown 0.14.5", "lock_api", "once_cell", - "parking_lot_core 0.9.10", + "parking_lot_core", "serde", ] @@ -1993,6 +1997,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" dependencies = [ "const-oid", + "pem-rfc7468", "zeroize", ] @@ -2097,33 +2102,13 @@ dependencies = [ "subtle 2.5.0", ] -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys 0.3.7", -] - [[package]] name = "dirs" version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" dependencies = [ - "dirs-sys 0.4.1", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", + "dirs-sys", ] [[package]] @@ -2203,7 +2188,7 @@ dependencies = [ "bytecodec", "bytes", "dashmap", - "dirs 5.0.1", + "dirs", "nym-sdk", "serde", "tokio", @@ -2351,6 +2336,17 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "etcetera" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +dependencies = [ + "cfg-if", + "home", + "windows-sys 0.48.0", +] + [[package]] name = "etherparse" version = "0.13.0" @@ -2559,13 +2555,12 @@ dependencies = [ [[package]] name = "flume" -version = "0.10.14" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ "futures-core", "futures-sink", - "pin-project", "spin 0.9.8", ] @@ -2658,13 +2653,13 @@ dependencies = [ [[package]] name = "futures-intrusive" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a604f7a68fbf8103337523b1fadc8ade7361ee3f112f7c680ad179651616aed5" +checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" dependencies = [ "futures-core", "lock_api", - "parking_lot 0.11.2", + "parking_lot", ] [[package]] @@ -3086,6 +3081,15 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + [[package]] name = "http" version = "0.2.12" @@ -3357,7 +3361,7 @@ dependencies = [ "anyhow", "bip39", "clap 4.5.18", - "dirs 5.0.1", + "dirs", "importer-contract", "nym-bin-common", "nym-mixnet-contract-common", @@ -3701,6 +3705,9 @@ name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +dependencies = [ + "spin 0.5.2", +] [[package]] name = "ledger-apdu" @@ -3763,9 +3770,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.24.2" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "898745e570c7d0453cc1fbc4a701eb6c662ed54e8fec8b7d14be137ebeeb9d14" +checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" dependencies = [ "cc", "pkg-config", @@ -4228,6 +4235,23 @@ dependencies = [ "winapi", ] +[[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand", + "smallvec", + "zeroize", +] + [[package]] name = "num-conv" version = "0.1.0" @@ -4245,6 +4269,26 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + [[package]] name = "num-traits" version = "0.2.19" @@ -4322,7 +4366,7 @@ dependencies = [ "cw2", "cw3", "cw4", - "dirs 5.0.1", + "dirs", "futures", "getset", "humantime-serde", @@ -4629,7 +4673,7 @@ version = "1.1.41" dependencies = [ "bs58", "clap 4.5.18", - "dirs 5.0.1", + "dirs", "futures", "log", "nym-bandwidth-controller", @@ -4877,7 +4921,7 @@ dependencies = [ name = "nym-config" version = "0.1.0" dependencies = [ - "dirs 5.0.1", + "dirs", "handlebars", "log", "nym-network-defaults", @@ -5200,7 +5244,7 @@ dependencies = [ "colored", "dashmap", "defguard_wireguard_rs", - "dirs 5.0.1", + "dirs", "dotenvy", "futures", "humantime-serde", @@ -5546,7 +5590,7 @@ dependencies = [ "clap 4.5.18", "colored", "cupid", - "dirs 5.0.1", + "dirs", "futures", "humantime-serde", "lazy_static", @@ -5677,7 +5721,7 @@ dependencies = [ "async-trait", "bs58", "clap 4.5.18", - "dirs 5.0.1", + "dirs", "futures", "humantime-serde", "ipnetwork 0.20.0", @@ -5931,7 +5975,7 @@ dependencies = [ "bytecodec", "bytes", "dashmap", - "dirs 5.0.1", + "dirs", "dotenvy", "futures", "hex", @@ -5956,7 +6000,7 @@ dependencies = [ "nym-task", "nym-topology", "nym-validator-client", - "parking_lot 0.12.3", + "parking_lot", "pretty_env_logger", "rand", "reqwest 0.12.4", @@ -6047,7 +6091,7 @@ name = "nym-socks5-client-core" version = "0.1.0" dependencies = [ "anyhow", - "dirs 5.0.1", + "dirs", "futures", "log", "nym-bandwidth-controller", @@ -6809,17 +6853,6 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - [[package]] name = "parking_lot" version = "0.12.3" @@ -6827,21 +6860,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", - "parking_lot_core 0.9.10", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", + "parking_lot_core", ] [[package]] @@ -6935,6 +6954,15 @@ dependencies = [ "regex", ] +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + [[package]] name = "percent-encoding" version = "2.3.1" @@ -7028,6 +7056,17 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] + [[package]] name = "pkcs8" version = "0.10.2" @@ -7252,7 +7291,7 @@ dependencies = [ "fnv", "lazy_static", "memchr", - "parking_lot 0.12.3", + "parking_lot", "protobuf", "thiserror", ] @@ -7463,15 +7502,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.4.1" @@ -7671,21 +7701,6 @@ dependencies = [ "subtle 2.5.0", ] -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", -] - [[package]] name = "ring" version = "0.17.8" @@ -7697,7 +7712,7 @@ dependencies = [ "getrandom", "libc", "spin 0.9.8", - "untrusted 0.9.0", + "untrusted", "windows-sys 0.52.0", ] @@ -7729,7 +7744,7 @@ dependencies = [ "memchr", "multer", "num_cpus", - "parking_lot 0.12.3", + "parking_lot", "pin-project-lite", "rand", "ref-cast", @@ -7837,6 +7852,26 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "rsa" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" +dependencies = [ + "const-oid", + "digest 0.10.7", + "num-bigint-dig", + "num-integer", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core 0.6.4", + "signature", + "spki", + "subtle 2.5.0", + "zeroize", +] + [[package]] name = "rust-embed" version = "8.4.0" @@ -7924,18 +7959,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "rustls" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" -dependencies = [ - "log", - "ring 0.16.20", - "sct", - "webpki", -] - [[package]] name = "rustls" version = "0.21.12" @@ -7943,7 +7966,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", - "ring 0.17.8", + "ring", "rustls-webpki 0.101.7", "sct", ] @@ -7955,7 +7978,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" dependencies = [ "log", - "ring 0.17.8", + "ring", "rustls-pki-types", "rustls-webpki 0.102.4", "subtle 2.5.0", @@ -8018,8 +8041,8 @@ version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", + "ring", + "untrusted", ] [[package]] @@ -8028,9 +8051,9 @@ version = "0.102.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" dependencies = [ - "ring 0.17.8", + "ring", "rustls-pki-types", - "untrusted 0.9.0", + "untrusted", ] [[package]] @@ -8158,8 +8181,8 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", + "ring", + "untrusted", ] [[package]] @@ -8657,77 +8680,79 @@ dependencies = [ [[package]] name = "sqlx" -version = "0.6.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8de3b03a925878ed54a954f621e64bf55a3c1bd29652d0d1a17830405350188" +checksum = "c9a2ccff1a000a5a59cd33da541d9f2fdcd9e6e8229cc200565942bff36d0aaa" dependencies = [ "sqlx-core", "sqlx-macros", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", ] [[package]] name = "sqlx-core" -version = "0.6.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa8241483a83a3f33aa5fff7e7d9def398ff9990b2752b6c6112b83c6d246029" +checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6" dependencies = [ - "ahash 0.7.8", + "ahash 0.8.11", "atoi", - "base64 0.13.1", - "bitflags 1.3.2", "byteorder", "bytes", "chrono", "crc", "crossbeam-queue", - "dirs 4.0.0", - "dotenvy", "either", "event-listener", - "flume", "futures-channel", "futures-core", - "futures-executor", "futures-intrusive", + "futures-io", "futures-util", "hashlink", "hex", - "hkdf", - "hmac", - "indexmap 1.9.3", - "itoa", - "libc", - "libsqlite3-sys", + "indexmap 2.2.6", "log", - "md-5", "memchr", "once_cell", "paste", "percent-encoding", - "rand", - "rustls 0.20.9", + "rustls 0.21.12", "rustls-pemfile 1.0.4", "serde", "serde_json", - "sha1", "sha2 0.10.8", "smallvec", "sqlformat", - "sqlx-rt", - "stringprep", "thiserror", "time", + "tokio", "tokio-stream", + "tracing", "url", - "webpki-roots 0.22.6", - "whoami", + "webpki-roots 0.25.4", ] [[package]] name = "sqlx-macros" -version = "0.6.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9966e64ae989e7e575b19d7265cb79d7fc3cbbdf179835cb0d716f294c2049c9" +checksum = "4ea40e2345eb2faa9e1e5e326db8c34711317d2b5e08d0d5741619048a803127" +dependencies = [ + "proc-macro2", + "quote", + "sqlx-core", + "sqlx-macros-core", + "syn 1.0.109", +] + +[[package]] +name = "sqlx-macros-core" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8" dependencies = [ "dotenvy", "either", @@ -8740,20 +8765,122 @@ dependencies = [ "serde_json", "sha2 0.10.8", "sqlx-core", - "sqlx-rt", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", "syn 1.0.109", + "tempfile", + "tokio", "url", ] [[package]] -name = "sqlx-rt" -version = "0.6.3" +name = "sqlx-mysql" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "804d3f245f894e61b1e6263c84b23ca675d96753b5abfd5cc8597d86806e8024" +checksum = "1ed31390216d20e538e447a7a9b959e06ed9fc51c37b514b46eb758016ecd418" dependencies = [ + "atoi", + "base64 0.21.7", + "bitflags 2.5.0", + "byteorder", + "bytes", + "chrono", + "crc", + "digest 0.10.7", + "dotenvy", + "either", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "generic-array 0.14.7", + "hex", + "hkdf", + "hmac", + "itoa", + "log", + "md-5", + "memchr", "once_cell", - "tokio", - "tokio-rustls 0.23.4", + "percent-encoding", + "rand", + "rsa", + "serde", + "sha1", + "sha2 0.10.8", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "time", + "tracing", + "whoami", +] + +[[package]] +name = "sqlx-postgres" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c824eb80b894f926f89a0b9da0c7f435d27cdd35b8c655b114e58223918577e" +dependencies = [ + "atoi", + "base64 0.21.7", + "bitflags 2.5.0", + "byteorder", + "chrono", + "crc", + "dotenvy", + "etcetera", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "hex", + "hkdf", + "hmac", + "home", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "rand", + "serde", + "serde_json", + "sha2 0.10.8", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "time", + "tracing", + "whoami", +] + +[[package]] +name = "sqlx-sqlite" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa" +dependencies = [ + "atoi", + "chrono", + "flume", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "libsqlite3-sys", + "log", + "percent-encoding", + "serde", + "sqlx-core", + "time", + "tracing", + "url", + "urlencoding", ] [[package]] @@ -9336,7 +9463,7 @@ dependencies = [ "bytes", "libc", "mio 1.0.1", - "parking_lot 0.12.3", + "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2", @@ -9366,17 +9493,6 @@ dependencies = [ "syn 2.0.66", ] -[[package]] -name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls 0.20.9", - "tokio", - "webpki", -] - [[package]] name = "tokio-rustls" version = "0.24.1" @@ -10141,12 +10257,6 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - [[package]] name = "untrusted" version = "0.9.0" @@ -10523,7 +10633,7 @@ checksum = "5f656cd8858a5164932d8a90f936700860976ec21eb00e0fe2aa8cab13f6b4cf" dependencies = [ "futures", "js-sys", - "parking_lot 0.12.3", + "parking_lot", "pin-utils", "slab", "wasm-bindgen", @@ -10539,25 +10649,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" -dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", -] - -[[package]] -name = "webpki-roots" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" -dependencies = [ - "webpki", -] - [[package]] name = "webpki-roots" version = "0.24.0" @@ -10599,7 +10690,6 @@ checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d" dependencies = [ "redox_syscall 0.5.1", "wasite", - "web-sys", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index d72cb74007..f64f8ddbb3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -305,7 +305,7 @@ serde_yaml = "0.9.25" sha2 = "0.10.8" si-scale = "0.2.3" sphinx-packet = "0.1.1" -sqlx = "0.6.3" +sqlx = "0.7.4" strum = "0.26" subtle-encoding = "0.5" syn = "1" @@ -397,6 +397,12 @@ web-sys = "0.3.70" # Profile settings for individual crates +# Compile-time verified queries do quite a bit of work at compile time. Incremental +# actions like cargo check and cargo build can be significantly faster when +# using an optimized build +[profile.dev.package.sqlx-macros] +opt-level = 3 + [profile.release.package.nym-socks5-listener] strip = true codegen-units = 1 diff --git a/common/client-core/gateways-storage/.sqlx/query-06e743d143fcc4be20ca2af5e99b19f15d22fff72490473587a14cdc046fda32.json b/common/client-core/gateways-storage/.sqlx/query-06e743d143fcc4be20ca2af5e99b19f15d22fff72490473587a14cdc046fda32.json new file mode 100644 index 0000000000..627c54341c --- /dev/null +++ b/common/client-core/gateways-storage/.sqlx/query-06e743d143fcc4be20ca2af5e99b19f15d22fff72490473587a14cdc046fda32.json @@ -0,0 +1,20 @@ +{ + "db_name": "SQLite", + "query": "SELECT EXISTS (SELECT 1 FROM registered_gateway WHERE gateway_id_bs58 = ?) AS 'exists'", + "describe": { + "columns": [ + { + "name": "exists", + "ordinal": 0, + "type_info": "Int" + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + null + ] + }, + "hash": "06e743d143fcc4be20ca2af5e99b19f15d22fff72490473587a14cdc046fda32" +} diff --git a/common/client-core/gateways-storage/.sqlx/query-0e85ec18da67cf4e3df04ad80136571f6e920eb2290f20b1b8c5b0ab4b489985.json b/common/client-core/gateways-storage/.sqlx/query-0e85ec18da67cf4e3df04ad80136571f6e920eb2290f20b1b8c5b0ab4b489985.json new file mode 100644 index 0000000000..61aa248946 --- /dev/null +++ b/common/client-core/gateways-storage/.sqlx/query-0e85ec18da67cf4e3df04ad80136571f6e920eb2290f20b1b8c5b0ab4b489985.json @@ -0,0 +1,44 @@ +{ + "db_name": "SQLite", + "query": "SELECT * FROM remote_gateway_details WHERE gateway_id_bs58 = ?", + "describe": { + "columns": [ + { + "name": "gateway_id_bs58", + "ordinal": 0, + "type_info": "Text" + }, + { + "name": "gateway_owner_address", + "ordinal": 1, + "type_info": "Text" + }, + { + "name": "gateway_listener", + "ordinal": 2, + "type_info": "Text" + }, + { + "name": "derived_aes128_ctr_blake3_hmac_keys_bs58", + "ordinal": 3, + "type_info": "Text" + }, + { + "name": "derived_aes256_gcm_siv_key", + "ordinal": 4, + "type_info": "Blob" + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + false, + true, + false, + true, + true + ] + }, + "hash": "0e85ec18da67cf4e3df04ad80136571f6e920eb2290f20b1b8c5b0ab4b489985" +} diff --git a/common/client-core/gateways-storage/.sqlx/query-0f1dfb89f1eb39f4a58787af0f53a7a93afb7e4d2e54e2d38fd79d31c8575a54.json b/common/client-core/gateways-storage/.sqlx/query-0f1dfb89f1eb39f4a58787af0f53a7a93afb7e4d2e54e2d38fd79d31c8575a54.json new file mode 100644 index 0000000000..7e5c8bf6fe --- /dev/null +++ b/common/client-core/gateways-storage/.sqlx/query-0f1dfb89f1eb39f4a58787af0f53a7a93afb7e4d2e54e2d38fd79d31c8575a54.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "\n UPDATE remote_gateway_details\n SET\n derived_aes128_ctr_blake3_hmac_keys_bs58 = ?,\n derived_aes256_gcm_siv_key = ?\n WHERE gateway_id_bs58 = ?\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 3 + }, + "nullable": [] + }, + "hash": "0f1dfb89f1eb39f4a58787af0f53a7a93afb7e4d2e54e2d38fd79d31c8575a54" +} diff --git a/common/client-core/gateways-storage/.sqlx/query-1da6904e72b5abb9abf75affb13af7974d7795b4cbdba234273345fe161df233.json b/common/client-core/gateways-storage/.sqlx/query-1da6904e72b5abb9abf75affb13af7974d7795b4cbdba234273345fe161df233.json new file mode 100644 index 0000000000..9d4281137b --- /dev/null +++ b/common/client-core/gateways-storage/.sqlx/query-1da6904e72b5abb9abf75affb13af7974d7795b4cbdba234273345fe161df233.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "DELETE FROM remote_gateway_details WHERE gateway_id_bs58 = ?", + "describe": { + "columns": [], + "parameters": { + "Right": 1 + }, + "nullable": [] + }, + "hash": "1da6904e72b5abb9abf75affb13af7974d7795b4cbdba234273345fe161df233" +} diff --git a/common/client-core/gateways-storage/.sqlx/query-4f78619aca933484cd67cb89a376b2a5bec1c191993ff58f0c71c03e3ef6d92d.json b/common/client-core/gateways-storage/.sqlx/query-4f78619aca933484cd67cb89a376b2a5bec1c191993ff58f0c71c03e3ef6d92d.json new file mode 100644 index 0000000000..eb2dc28e12 --- /dev/null +++ b/common/client-core/gateways-storage/.sqlx/query-4f78619aca933484cd67cb89a376b2a5bec1c191993ff58f0c71c03e3ef6d92d.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "DELETE FROM custom_gateway_details WHERE gateway_id_bs58 = ?", + "describe": { + "columns": [], + "parameters": { + "Right": 1 + }, + "nullable": [] + }, + "hash": "4f78619aca933484cd67cb89a376b2a5bec1c191993ff58f0c71c03e3ef6d92d" +} diff --git a/common/client-core/gateways-storage/.sqlx/query-54f552a9dbe95236f946ac2b6615e03504afa58e345ae16a128629d8e76f0a11.json b/common/client-core/gateways-storage/.sqlx/query-54f552a9dbe95236f946ac2b6615e03504afa58e345ae16a128629d8e76f0a11.json new file mode 100644 index 0000000000..b1d46fd96b --- /dev/null +++ b/common/client-core/gateways-storage/.sqlx/query-54f552a9dbe95236f946ac2b6615e03504afa58e345ae16a128629d8e76f0a11.json @@ -0,0 +1,26 @@ +{ + "db_name": "SQLite", + "query": "SELECT * FROM custom_gateway_details WHERE gateway_id_bs58 = ?", + "describe": { + "columns": [ + { + "name": "gateway_id_bs58", + "ordinal": 0, + "type_info": "Text" + }, + { + "name": "data", + "ordinal": 1, + "type_info": "Blob" + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + false, + true + ] + }, + "hash": "54f552a9dbe95236f946ac2b6615e03504afa58e345ae16a128629d8e76f0a11" +} diff --git a/common/client-core/gateways-storage/.sqlx/query-5661cf1ad8bd5ca062e855e1971a8787133ee41814bd3efdd501f9ee0c050f2b.json b/common/client-core/gateways-storage/.sqlx/query-5661cf1ad8bd5ca062e855e1971a8787133ee41814bd3efdd501f9ee0c050f2b.json new file mode 100644 index 0000000000..ad91647c9a --- /dev/null +++ b/common/client-core/gateways-storage/.sqlx/query-5661cf1ad8bd5ca062e855e1971a8787133ee41814bd3efdd501f9ee0c050f2b.json @@ -0,0 +1,20 @@ +{ + "db_name": "SQLite", + "query": "SELECT gateway_id_bs58 FROM registered_gateway", + "describe": { + "columns": [ + { + "name": "gateway_id_bs58", + "ordinal": 0, + "type_info": "Text" + } + ], + "parameters": { + "Right": 0 + }, + "nullable": [ + false + ] + }, + "hash": "5661cf1ad8bd5ca062e855e1971a8787133ee41814bd3efdd501f9ee0c050f2b" +} diff --git a/common/client-core/gateways-storage/.sqlx/query-80476cf2906eb0ecf7f66c16bc5682169b87f488b6927fa67fade6bf5abf7582.json b/common/client-core/gateways-storage/.sqlx/query-80476cf2906eb0ecf7f66c16bc5682169b87f488b6927fa67fade6bf5abf7582.json new file mode 100644 index 0000000000..02b9ef7426 --- /dev/null +++ b/common/client-core/gateways-storage/.sqlx/query-80476cf2906eb0ecf7f66c16bc5682169b87f488b6927fa67fade6bf5abf7582.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "UPDATE active_gateway SET active_gateway_id_bs58 = ?", + "describe": { + "columns": [], + "parameters": { + "Right": 1 + }, + "nullable": [] + }, + "hash": "80476cf2906eb0ecf7f66c16bc5682169b87f488b6927fa67fade6bf5abf7582" +} diff --git a/common/client-core/gateways-storage/.sqlx/query-8909fd329e7e5fb16c4989b15b3d3a12bba1569520e01f6f074178e23d6ee89e.json b/common/client-core/gateways-storage/.sqlx/query-8909fd329e7e5fb16c4989b15b3d3a12bba1569520e01f6f074178e23d6ee89e.json new file mode 100644 index 0000000000..eabf0e5fb9 --- /dev/null +++ b/common/client-core/gateways-storage/.sqlx/query-8909fd329e7e5fb16c4989b15b3d3a12bba1569520e01f6f074178e23d6ee89e.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "\n INSERT INTO registered_gateway(gateway_id_bs58, registration_timestamp, gateway_type) \n VALUES (?, ?, ?)\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 3 + }, + "nullable": [] + }, + "hash": "8909fd329e7e5fb16c4989b15b3d3a12bba1569520e01f6f074178e23d6ee89e" +} diff --git a/common/client-core/gateways-storage/.sqlx/query-a6939bea03b10cde810a9a099bd597b4f51092e30a41c4085a8f8668f039f7c0.json b/common/client-core/gateways-storage/.sqlx/query-a6939bea03b10cde810a9a099bd597b4f51092e30a41c4085a8f8668f039f7c0.json new file mode 100644 index 0000000000..b2e77df70a --- /dev/null +++ b/common/client-core/gateways-storage/.sqlx/query-a6939bea03b10cde810a9a099bd597b4f51092e30a41c4085a8f8668f039f7c0.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "\n INSERT INTO remote_gateway_details(gateway_id_bs58, derived_aes128_ctr_blake3_hmac_keys_bs58, derived_aes256_gcm_siv_key, gateway_owner_address, gateway_listener)\n VALUES (?, ?, ?, ?, ?)\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 5 + }, + "nullable": [] + }, + "hash": "a6939bea03b10cde810a9a099bd597b4f51092e30a41c4085a8f8668f039f7c0" +} diff --git a/common/client-core/gateways-storage/.sqlx/query-b059bc3688b6b7f83f47048db9897720fd4e6f3211bf74030a9638f7bf6738e4.json b/common/client-core/gateways-storage/.sqlx/query-b059bc3688b6b7f83f47048db9897720fd4e6f3211bf74030a9638f7bf6738e4.json new file mode 100644 index 0000000000..646b32adb8 --- /dev/null +++ b/common/client-core/gateways-storage/.sqlx/query-b059bc3688b6b7f83f47048db9897720fd4e6f3211bf74030a9638f7bf6738e4.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "\n INSERT INTO custom_gateway_details(gateway_id_bs58, data) \n VALUES (?, ?)\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 2 + }, + "nullable": [] + }, + "hash": "b059bc3688b6b7f83f47048db9897720fd4e6f3211bf74030a9638f7bf6738e4" +} diff --git a/common/client-core/gateways-storage/.sqlx/query-bf249752f08c283bf5942b6ff48125c24750b523cfcad1e5e9069dbf7050e2a1.json b/common/client-core/gateways-storage/.sqlx/query-bf249752f08c283bf5942b6ff48125c24750b523cfcad1e5e9069dbf7050e2a1.json new file mode 100644 index 0000000000..a1ae46b595 --- /dev/null +++ b/common/client-core/gateways-storage/.sqlx/query-bf249752f08c283bf5942b6ff48125c24750b523cfcad1e5e9069dbf7050e2a1.json @@ -0,0 +1,20 @@ +{ + "db_name": "SQLite", + "query": "SELECT active_gateway_id_bs58 FROM active_gateway", + "describe": { + "columns": [ + { + "name": "active_gateway_id_bs58", + "ordinal": 0, + "type_info": "Text" + } + ], + "parameters": { + "Right": 0 + }, + "nullable": [ + true + ] + }, + "hash": "bf249752f08c283bf5942b6ff48125c24750b523cfcad1e5e9069dbf7050e2a1" +} diff --git a/common/client-core/gateways-storage/.sqlx/query-f3ebe259e26c05ecdd33bd9085dbb91cd5046a8c9d4434cf085a4fa2ebf03e93.json b/common/client-core/gateways-storage/.sqlx/query-f3ebe259e26c05ecdd33bd9085dbb91cd5046a8c9d4434cf085a4fa2ebf03e93.json new file mode 100644 index 0000000000..e2cfa29a82 --- /dev/null +++ b/common/client-core/gateways-storage/.sqlx/query-f3ebe259e26c05ecdd33bd9085dbb91cd5046a8c9d4434cf085a4fa2ebf03e93.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "DELETE FROM registered_gateway WHERE gateway_id_bs58 = ?", + "describe": { + "columns": [], + "parameters": { + "Right": 1 + }, + "nullable": [] + }, + "hash": "f3ebe259e26c05ecdd33bd9085dbb91cd5046a8c9d4434cf085a4fa2ebf03e93" +} diff --git a/common/client-core/gateways-storage/src/backend/fs_backend/manager.rs b/common/client-core/gateways-storage/src/backend/fs_backend/manager.rs index 1bf78408f7..4b32c60936 100644 --- a/common/client-core/gateways-storage/src/backend/fs_backend/manager.rs +++ b/common/client-core/gateways-storage/src/backend/fs_backend/manager.rs @@ -29,11 +29,10 @@ impl StorageManager { })?; } - let mut opts = sqlx::sqlite::SqliteConnectOptions::new() + let opts = sqlx::sqlite::SqliteConnectOptions::new() .filename(database_path) - .create_if_missing(true); - - opts.disable_statement_logging(); + .create_if_missing(true) + .disable_statement_logging(); let connection_pool = sqlx::SqlitePool::connect_with(opts) .await @@ -82,7 +81,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 == 1) + .map(|result| result.exists == Some(1)) } pub(crate) async fn maybe_get_registered_gateway( diff --git a/common/client-core/surb-storage/src/backend/fs_backend/manager.rs b/common/client-core/surb-storage/src/backend/fs_backend/manager.rs index 8b663b5c9a..b6adadd3d5 100644 --- a/common/client-core/surb-storage/src/backend/fs_backend/manager.rs +++ b/common/client-core/surb-storage/src/backend/fs_backend/manager.rs @@ -1,9 +1,12 @@ // Copyright 2022 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -use crate::backend::fs_backend::error::StorageError; -use crate::backend::fs_backend::models::{ - ReplySurbStorageMetadata, StoredReplyKey, StoredReplySurb, StoredSenderTag, StoredSurbSender, +use crate::backend::fs_backend::{ + error::StorageError, + models::{ + ReplySurbStorageMetadata, StoredReplyKey, StoredReplySurb, StoredSenderTag, + StoredSurbSender, + }, }; use log::{error, info}; use sqlx::ConnectOptions; @@ -27,11 +30,10 @@ impl StorageManager { })?; } - let mut opts = sqlx::sqlite::SqliteConnectOptions::new() + let opts = sqlx::sqlite::SqliteConnectOptions::new() .filename(database_path) - .create_if_missing(fresh); - - opts.disable_statement_logging(); + .create_if_missing(fresh) + .disable_statement_logging(); let connection_pool = match sqlx::SqlitePool::connect_with(opts).await { Ok(pool) => pool, diff --git a/common/credential-storage/.sqlx/query-00d857b624e7edab1198114b17cbad1e16988a3f9989d135840500e1143ce5e5.json b/common/credential-storage/.sqlx/query-00d857b624e7edab1198114b17cbad1e16988a3f9989d135840500e1143ce5e5.json new file mode 100644 index 0000000000..9c0c64d664 --- /dev/null +++ b/common/credential-storage/.sqlx/query-00d857b624e7edab1198114b17cbad1e16988a3f9989d135840500e1143ce5e5.json @@ -0,0 +1,32 @@ +{ + "db_name": "SQLite", + "query": "\n SELECT epoch_id as \"epoch_id: u32\", serialised_signatures, serialization_revision as \"serialization_revision: u8\"\n FROM expiration_date_signatures\n WHERE expiration_date = ?\n ", + "describe": { + "columns": [ + { + "name": "epoch_id: u32", + "ordinal": 0, + "type_info": "Int64" + }, + { + "name": "serialised_signatures", + "ordinal": 1, + "type_info": "Blob" + }, + { + "name": "serialization_revision: u8", + "ordinal": 2, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + false, + false, + false + ] + }, + "hash": "00d857b624e7edab1198114b17cbad1e16988a3f9989d135840500e1143ce5e5" +} diff --git a/common/credential-storage/.sqlx/query-0112296b190328a3856d1adf51aafa2525da6c0b871633aad80ad555db9cf47c.json b/common/credential-storage/.sqlx/query-0112296b190328a3856d1adf51aafa2525da6c0b871633aad80ad555db9cf47c.json new file mode 100644 index 0000000000..c8fbd21911 --- /dev/null +++ b/common/credential-storage/.sqlx/query-0112296b190328a3856d1adf51aafa2525da6c0b871633aad80ad555db9cf47c.json @@ -0,0 +1,32 @@ +{ + "db_name": "SQLite", + "query": "\n SELECT epoch_id as \"epoch_id: u32\", serialised_key, serialization_revision as \"serialization_revision: u8\"\n FROM master_verification_key WHERE epoch_id = ?\n ", + "describe": { + "columns": [ + { + "name": "epoch_id: u32", + "ordinal": 0, + "type_info": "Int64" + }, + { + "name": "serialised_key", + "ordinal": 1, + "type_info": "Blob" + }, + { + "name": "serialization_revision: u8", + "ordinal": 2, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + false, + false, + false + ] + }, + "hash": "0112296b190328a3856d1adf51aafa2525da6c0b871633aad80ad555db9cf47c" +} diff --git a/common/credential-storage/.sqlx/query-16d10f0ac0ed9ce4239937f46df3797a6a9ee7db2aab9f1b5e55f7c13c53bcc1.json b/common/credential-storage/.sqlx/query-16d10f0ac0ed9ce4239937f46df3797a6a9ee7db2aab9f1b5e55f7c13c53bcc1.json new file mode 100644 index 0000000000..e4f26c5053 --- /dev/null +++ b/common/credential-storage/.sqlx/query-16d10f0ac0ed9ce4239937f46df3797a6a9ee7db2aab9f1b5e55f7c13c53bcc1.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "\n INSERT OR IGNORE INTO expiration_date_signatures(expiration_date, epoch_id, serialised_signatures, serialization_revision)\n VALUES (?, ?, ?, ?);\n UPDATE expiration_date_signatures\n SET\n serialised_signatures = ?,\n serialization_revision = ?\n WHERE expiration_date = ?\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 7 + }, + "nullable": [] + }, + "hash": "16d10f0ac0ed9ce4239937f46df3797a6a9ee7db2aab9f1b5e55f7c13c53bcc1" +} diff --git a/common/credential-storage/.sqlx/query-284b3ceae42f9320c30323dde47765854899103fd3c0fa670eb6809492270e02.json b/common/credential-storage/.sqlx/query-284b3ceae42f9320c30323dde47765854899103fd3c0fa670eb6809492270e02.json new file mode 100644 index 0000000000..6ee25bbc1a --- /dev/null +++ b/common/credential-storage/.sqlx/query-284b3ceae42f9320c30323dde47765854899103fd3c0fa670eb6809492270e02.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "\n INSERT INTO ecash_ticketbook\n (serialization_revision, ticketbook_data, expiration_date, ticketbook_type, epoch_id, total_tickets, used_tickets)\n VALUES (?, ?, ?, ?, ?, ?, ?)\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 7 + }, + "nullable": [] + }, + "hash": "284b3ceae42f9320c30323dde47765854899103fd3c0fa670eb6809492270e02" +} diff --git a/common/credential-storage/.sqlx/query-37f82c9ec26b53d01601a2d6df82038a77ec37cca9f9aef18008dcd03030c2c4.json b/common/credential-storage/.sqlx/query-37f82c9ec26b53d01601a2d6df82038a77ec37cca9f9aef18008dcd03030c2c4.json new file mode 100644 index 0000000000..ea79b11bbd --- /dev/null +++ b/common/credential-storage/.sqlx/query-37f82c9ec26b53d01601a2d6df82038a77ec37cca9f9aef18008dcd03030c2c4.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "DELETE FROM ecash_ticketbook WHERE expiration_date <= ?", + "describe": { + "columns": [], + "parameters": { + "Right": 1 + }, + "nullable": [] + }, + "hash": "37f82c9ec26b53d01601a2d6df82038a77ec37cca9f9aef18008dcd03030c2c4" +} diff --git a/common/credential-storage/.sqlx/query-5c5d4bfabf18bc6fa56e76a9b98e38b7f6ceb8e9191a7b9201922efcf6b07966.json b/common/credential-storage/.sqlx/query-5c5d4bfabf18bc6fa56e76a9b98e38b7f6ceb8e9191a7b9201922efcf6b07966.json new file mode 100644 index 0000000000..ea667b0bc6 --- /dev/null +++ b/common/credential-storage/.sqlx/query-5c5d4bfabf18bc6fa56e76a9b98e38b7f6ceb8e9191a7b9201922efcf6b07966.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "DELETE FROM pending_issuance WHERE deposit_id = ?", + "describe": { + "columns": [], + "parameters": { + "Right": 1 + }, + "nullable": [] + }, + "hash": "5c5d4bfabf18bc6fa56e76a9b98e38b7f6ceb8e9191a7b9201922efcf6b07966" +} diff --git a/common/credential-storage/.sqlx/query-81a12a8a419c88b1c28a5533fde4d63462e9ea0049e2edafea1dc3f8476b33e4.json b/common/credential-storage/.sqlx/query-81a12a8a419c88b1c28a5533fde4d63462e9ea0049e2edafea1dc3f8476b33e4.json new file mode 100644 index 0000000000..ae81f52d0e --- /dev/null +++ b/common/credential-storage/.sqlx/query-81a12a8a419c88b1c28a5533fde4d63462e9ea0049e2edafea1dc3f8476b33e4.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "\n INSERT INTO pending_issuance\n (deposit_id, serialization_revision, pending_ticketbook_data, expiration_date)\n VALUES (?, ?, ?, ?)\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 4 + }, + "nullable": [] + }, + "hash": "81a12a8a419c88b1c28a5533fde4d63462e9ea0049e2edafea1dc3f8476b33e4" +} diff --git a/common/credential-storage/.sqlx/query-84cad8b1078a4000830835e6349de3eb76fed954b7336530401db72cd008aff3.json b/common/credential-storage/.sqlx/query-84cad8b1078a4000830835e6349de3eb76fed954b7336530401db72cd008aff3.json new file mode 100644 index 0000000000..051c18bba2 --- /dev/null +++ b/common/credential-storage/.sqlx/query-84cad8b1078a4000830835e6349de3eb76fed954b7336530401db72cd008aff3.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "UPDATE ecash_ticketbook SET used_tickets = used_tickets + ? WHERE id = ?", + "describe": { + "columns": [], + "parameters": { + "Right": 2 + }, + "nullable": [] + }, + "hash": "84cad8b1078a4000830835e6349de3eb76fed954b7336530401db72cd008aff3" +} diff --git a/common/credential-storage/.sqlx/query-a5b18e66d77ff802e274623605e15dcfcffb502ba8398caefd56c481f44eb84e.json b/common/credential-storage/.sqlx/query-a5b18e66d77ff802e274623605e15dcfcffb502ba8398caefd56c481f44eb84e.json new file mode 100644 index 0000000000..5fd4e4f2e6 --- /dev/null +++ b/common/credential-storage/.sqlx/query-a5b18e66d77ff802e274623605e15dcfcffb502ba8398caefd56c481f44eb84e.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "\n INSERT OR IGNORE INTO master_verification_key(epoch_id, serialised_key, serialization_revision) VALUES (?, ?, ?);\n UPDATE master_verification_key\n SET\n serialised_key = ?,\n serialization_revision = ?\n WHERE epoch_id = ?\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 6 + }, + "nullable": [] + }, + "hash": "a5b18e66d77ff802e274623605e15dcfcffb502ba8398caefd56c481f44eb84e" +} diff --git a/common/credential-storage/.sqlx/query-ba96344db31b0f2155e2af53eaaeafc9b5f64061b6c9a829e2912945b6cffc82.json b/common/credential-storage/.sqlx/query-ba96344db31b0f2155e2af53eaaeafc9b5f64061b6c9a829e2912945b6cffc82.json new file mode 100644 index 0000000000..e2f05399ee --- /dev/null +++ b/common/credential-storage/.sqlx/query-ba96344db31b0f2155e2af53eaaeafc9b5f64061b6c9a829e2912945b6cffc82.json @@ -0,0 +1,32 @@ +{ + "db_name": "SQLite", + "query": "\n SELECT epoch_id as \"epoch_id: u32\", serialised_signatures, serialization_revision as \"serialization_revision: u8\"\n FROM coin_indices_signatures WHERE epoch_id = ?\n ", + "describe": { + "columns": [ + { + "name": "epoch_id: u32", + "ordinal": 0, + "type_info": "Int64" + }, + { + "name": "serialised_signatures", + "ordinal": 1, + "type_info": "Blob" + }, + { + "name": "serialization_revision: u8", + "ordinal": 2, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + false, + false, + false + ] + }, + "hash": "ba96344db31b0f2155e2af53eaaeafc9b5f64061b6c9a829e2912945b6cffc82" +} diff --git a/common/credential-storage/.sqlx/query-bc823c54143e2dc590b91347cd089dde284b38a3a4960afed758206d03ca1cf4.json b/common/credential-storage/.sqlx/query-bc823c54143e2dc590b91347cd089dde284b38a3a4960afed758206d03ca1cf4.json new file mode 100644 index 0000000000..ec7111bc5a --- /dev/null +++ b/common/credential-storage/.sqlx/query-bc823c54143e2dc590b91347cd089dde284b38a3a4960afed758206d03ca1cf4.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "\n UPDATE ecash_ticketbook\n SET used_tickets = used_tickets - ?\n WHERE id = ?\n AND used_tickets = ?\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 3 + }, + "nullable": [] + }, + "hash": "bc823c54143e2dc590b91347cd089dde284b38a3a4960afed758206d03ca1cf4" +} diff --git a/common/credential-storage/.sqlx/query-bd1973696121b6128bd75ae80fab253c071e04eb853d4b0f3b21782ea57c2f68.json b/common/credential-storage/.sqlx/query-bd1973696121b6128bd75ae80fab253c071e04eb853d4b0f3b21782ea57c2f68.json new file mode 100644 index 0000000000..a2077f76ae --- /dev/null +++ b/common/credential-storage/.sqlx/query-bd1973696121b6128bd75ae80fab253c071e04eb853d4b0f3b21782ea57c2f68.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "\n INSERT OR IGNORE INTO coin_indices_signatures(epoch_id, serialised_signatures, serialization_revision) VALUES (?, ?, ?);\n UPDATE coin_indices_signatures\n SET\n serialised_signatures = ?,\n serialization_revision = ?\n WHERE epoch_id = ?\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 6 + }, + "nullable": [] + }, + "hash": "bd1973696121b6128bd75ae80fab253c071e04eb853d4b0f3b21782ea57c2f68" +} diff --git a/common/credential-storage/src/persistent_storage/mod.rs b/common/credential-storage/src/persistent_storage/mod.rs index 8f5cf7610d..80e746b482 100644 --- a/common/credential-storage/src/persistent_storage/mod.rs +++ b/common/credential-storage/src/persistent_storage/mod.rs @@ -3,27 +3,35 @@ mod legacy_helpers; -use crate::backends::sqlite::{ - get_next_unspent_ticketbook, increase_used_ticketbook_tickets, SqliteEcashTicketbookManager, +use crate::{ + backends::sqlite::{ + get_next_unspent_ticketbook, increase_used_ticketbook_tickets, SqliteEcashTicketbookManager, + }, + error::StorageError, + models::{BasicTicketbookInformation, RetrievedPendingTicketbook, RetrievedTicketbook}, + persistent_storage::legacy_helpers::{ + deserialise_v1_coin_index_signatures, deserialise_v1_expiration_date_signatures, + deserialise_v1_master_verification_key, + }, + storage::Storage, }; -use crate::error::StorageError; -use crate::models::{BasicTicketbookInformation, RetrievedPendingTicketbook, RetrievedTicketbook}; -use crate::persistent_storage::legacy_helpers::{ - deserialise_v1_coin_index_signatures, deserialise_v1_expiration_date_signatures, - deserialise_v1_master_verification_key, -}; -use crate::storage::Storage; use async_trait::async_trait; use log::{debug, error}; -use nym_compact_ecash::scheme::coin_indices_signatures::AnnotatedCoinIndexSignature; -use nym_compact_ecash::scheme::expiration_date_signatures::AnnotatedExpirationDateSignature; -use nym_compact_ecash::VerificationKeyAuth; -use nym_credentials::ecash::bandwidth::serialiser::keys::EpochVerificationKey; -use nym_credentials::ecash::bandwidth::serialiser::signatures::{ - AggregatedCoinIndicesSignatures, AggregatedExpirationDateSignatures, +use nym_compact_ecash::{ + scheme::{ + coin_indices_signatures::AnnotatedCoinIndexSignature, + expiration_date_signatures::AnnotatedExpirationDateSignature, + }, + VerificationKeyAuth, +}; +use nym_credentials::{ + ecash::bandwidth::serialiser::{ + keys::EpochVerificationKey, + signatures::{AggregatedCoinIndicesSignatures, AggregatedExpirationDateSignatures}, + VersionedSerialise, + }, + IssuanceTicketBook, IssuedTicketBook, }; -use nym_credentials::ecash::bandwidth::serialiser::VersionedSerialise; -use nym_credentials::{IssuanceTicketBook, IssuedTicketBook}; use nym_ecash_time::{ecash_today, Date, EcashTime}; use sqlx::ConnectOptions; use std::path::Path; @@ -47,11 +55,10 @@ impl PersistentStorage { database_path.as_ref().as_os_str() ); - let mut opts = sqlx::sqlite::SqliteConnectOptions::new() + let opts = sqlx::sqlite::SqliteConnectOptions::new() .filename(database_path) - .create_if_missing(true); - - opts.disable_statement_logging(); + .create_if_missing(true) + .disable_statement_logging(); let connection_pool = match sqlx::SqlitePool::connect_with(opts).await { Ok(db) => db, @@ -179,7 +186,7 @@ impl Storage for PersistentStorage { // we don't want ticketbooks with expiration in the past let Some(raw) = - get_next_unspent_ticketbook(&mut tx, ticketbook_type, deadline, tickets).await? + get_next_unspent_ticketbook(&mut *tx, ticketbook_type, deadline, tickets).await? else { // make sure to finish our tx tx.commit().await?; @@ -194,7 +201,7 @@ impl Storage for PersistentStorage { )) })?; - increase_used_ticketbook_tickets(&mut tx, raw.id, tickets).await?; + increase_used_ticketbook_tickets(&mut *tx, raw.id, tickets).await?; tx.commit().await?; // set the number of spent tickets on the crypto object diff --git a/common/gateway-storage/.sqlx/query-03fe56298a6d60cdd5304a2953811a533d59b4f1f0e4efecd32c09256b657e24.json b/common/gateway-storage/.sqlx/query-03fe56298a6d60cdd5304a2953811a533d59b4f1f0e4efecd32c09256b657e24.json new file mode 100644 index 0000000000..32d90ac983 --- /dev/null +++ b/common/gateway-storage/.sqlx/query-03fe56298a6d60cdd5304a2953811a533d59b4f1f0e4efecd32c09256b657e24.json @@ -0,0 +1,32 @@ +{ + "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" +} diff --git a/common/gateway-storage/.sqlx/query-0aaf87e0bec011910fa23aefa9a487247eb416d4203ab22b787fdcf15e47e586.json b/common/gateway-storage/.sqlx/query-0aaf87e0bec011910fa23aefa9a487247eb416d4203ab22b787fdcf15e47e586.json new file mode 100644 index 0000000000..81ee664e71 --- /dev/null +++ b/common/gateway-storage/.sqlx/query-0aaf87e0bec011910fa23aefa9a487247eb416d4203ab22b787fdcf15e47e586.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "DELETE FROM ticket_verification WHERE ticket_id = ?", + "describe": { + "columns": [], + "parameters": { + "Right": 1 + }, + "nullable": [] + }, + "hash": "0aaf87e0bec011910fa23aefa9a487247eb416d4203ab22b787fdcf15e47e586" +} diff --git a/common/gateway-storage/.sqlx/query-10af1fe50f990be860548c7cc7ff051ab7d5cd812627a17758c0c8922593b9fd.json b/common/gateway-storage/.sqlx/query-10af1fe50f990be860548c7cc7ff051ab7d5cd812627a17758c0c8922593b9fd.json new file mode 100644 index 0000000000..644b1e4b06 --- /dev/null +++ b/common/gateway-storage/.sqlx/query-10af1fe50f990be860548c7cc7ff051ab7d5cd812627a17758c0c8922593b9fd.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "DELETE FROM message_store WHERE id = ?", + "describe": { + "columns": [], + "parameters": { + "Right": 1 + }, + "nullable": [] + }, + "hash": "10af1fe50f990be860548c7cc7ff051ab7d5cd812627a17758c0c8922593b9fd" +} diff --git a/common/gateway-storage/.sqlx/query-23775a52dcfb001d53ae045898522a8c19a121f11bae07b80bc88e557eb2275e.json b/common/gateway-storage/.sqlx/query-23775a52dcfb001d53ae045898522a8c19a121f11bae07b80bc88e557eb2275e.json new file mode 100644 index 0000000000..83b8b0f226 --- /dev/null +++ b/common/gateway-storage/.sqlx/query-23775a52dcfb001d53ae045898522a8c19a121f11bae07b80bc88e557eb2275e.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "\n DELETE FROM ticket_data\n WHERE ticket_id IN (\n SELECT ticket_id\n FROM verified_tickets\n WHERE proposal_id = ?\n )\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 1 + }, + "nullable": [] + }, + "hash": "23775a52dcfb001d53ae045898522a8c19a121f11bae07b80bc88e557eb2275e" +} diff --git a/common/gateway-storage/.sqlx/query-24ce2c053db635df05d98529023a84bf91a622d4b75ad173976e0234c6380a7d.json b/common/gateway-storage/.sqlx/query-24ce2c053db635df05d98529023a84bf91a622d4b75ad173976e0234c6380a7d.json new file mode 100644 index 0000000000..be56fee0ee --- /dev/null +++ b/common/gateway-storage/.sqlx/query-24ce2c053db635df05d98529023a84bf91a622d4b75ad173976e0234c6380a7d.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "\n INSERT OR IGNORE INTO wireguard_peer(public_key, preshared_key, protocol_version, endpoint, last_handshake, tx_bytes, rx_bytes, persistent_keepalive_interval, allowed_ips, client_id)\n VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?);\n\n UPDATE wireguard_peer \n SET preshared_key = ?, protocol_version = ?, endpoint = ?, last_handshake = ?, tx_bytes = ?, rx_bytes = ?, persistent_keepalive_interval = ?, allowed_ips = ?, client_id = ?\n WHERE public_key = ?\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 20 + }, + "nullable": [] + }, + "hash": "24ce2c053db635df05d98529023a84bf91a622d4b75ad173976e0234c6380a7d" +} diff --git a/common/gateway-storage/.sqlx/query-2a55441d4e6134975b2c75f0b43491e9cf7bb52f41644d45c92e4b83f60b65cc.json b/common/gateway-storage/.sqlx/query-2a55441d4e6134975b2c75f0b43491e9cf7bb52f41644d45c92e4b83f60b65cc.json new file mode 100644 index 0000000000..875f8594b4 --- /dev/null +++ b/common/gateway-storage/.sqlx/query-2a55441d4e6134975b2c75f0b43491e9cf7bb52f41644d45c92e4b83f60b65cc.json @@ -0,0 +1,74 @@ +{ + "db_name": "SQLite", + "query": "\n SELECT *\n FROM wireguard_peer;\n ", + "describe": { + "columns": [ + { + "name": "public_key", + "ordinal": 0, + "type_info": "Text" + }, + { + "name": "preshared_key", + "ordinal": 1, + "type_info": "Text" + }, + { + "name": "protocol_version", + "ordinal": 2, + "type_info": "Int64" + }, + { + "name": "endpoint", + "ordinal": 3, + "type_info": "Text" + }, + { + "name": "last_handshake", + "ordinal": 4, + "type_info": "Datetime" + }, + { + "name": "tx_bytes", + "ordinal": 5, + "type_info": "Int64" + }, + { + "name": "rx_bytes", + "ordinal": 6, + "type_info": "Int64" + }, + { + "name": "persistent_keepalive_interval", + "ordinal": 7, + "type_info": "Int64" + }, + { + "name": "allowed_ips", + "ordinal": 8, + "type_info": "Blob" + }, + { + "name": "client_id", + "ordinal": 9, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 0 + }, + "nullable": [ + false, + true, + true, + true, + true, + false, + false, + true, + false, + true + ] + }, + "hash": "2a55441d4e6134975b2c75f0b43491e9cf7bb52f41644d45c92e4b83f60b65cc" +} diff --git a/common/gateway-storage/.sqlx/query-36b5b40e6466b67f6027257068438e4e45dd6506d806a25ce3a4c69723216fd3.json b/common/gateway-storage/.sqlx/query-36b5b40e6466b67f6027257068438e4e45dd6506d806a25ce3a4c69723216fd3.json new file mode 100644 index 0000000000..e6da2236a2 --- /dev/null +++ b/common/gateway-storage/.sqlx/query-36b5b40e6466b67f6027257068438e4e45dd6506d806a25ce3a4c69723216fd3.json @@ -0,0 +1,20 @@ +{ + "db_name": "SQLite", + "query": "SELECT signer_id FROM ecash_signer WHERE epoch_id = ?", + "describe": { + "columns": [ + { + "name": "signer_id", + "ordinal": 0, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + false + ] + }, + "hash": "36b5b40e6466b67f6027257068438e4e45dd6506d806a25ce3a4c69723216fd3" +} diff --git a/common/gateway-storage/.sqlx/query-3fa406efeffd9952af3cb044b028eb6d1770c694cf84097222c2bcf299fec680.json b/common/gateway-storage/.sqlx/query-3fa406efeffd9952af3cb044b028eb6d1770c694cf84097222c2bcf299fec680.json new file mode 100644 index 0000000000..7d86e55145 --- /dev/null +++ b/common/gateway-storage/.sqlx/query-3fa406efeffd9952af3cb044b028eb6d1770c694cf84097222c2bcf299fec680.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "\n UPDATE available_bandwidth\n SET available = available - ?\n WHERE client_id = (SELECT client_id FROM received_ticket WHERE id = ?)\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 2 + }, + "nullable": [] + }, + "hash": "3fa406efeffd9952af3cb044b028eb6d1770c694cf84097222c2bcf299fec680" +} diff --git a/common/gateway-storage/.sqlx/query-4642e5d93b4bb38b980d02c4cec2569ee16c78e2a71d9bab04b64314aedf4ac0.json b/common/gateway-storage/.sqlx/query-4642e5d93b4bb38b980d02c4cec2569ee16c78e2a71d9bab04b64314aedf4ac0.json new file mode 100644 index 0000000000..16613c4edc --- /dev/null +++ b/common/gateway-storage/.sqlx/query-4642e5d93b4bb38b980d02c4cec2569ee16c78e2a71d9bab04b64314aedf4ac0.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "DELETE FROM shared_keys WHERE client_address_bs58 = ?", + "describe": { + "columns": [], + "parameters": { + "Right": 1 + }, + "nullable": [] + }, + "hash": "4642e5d93b4bb38b980d02c4cec2569ee16c78e2a71d9bab04b64314aedf4ac0" +} diff --git a/common/gateway-storage/.sqlx/query-4a142e21e2646dfcda32ed5dcd3f0b915bda6266a55b83c8c667fdbcfc90745b.json b/common/gateway-storage/.sqlx/query-4a142e21e2646dfcda32ed5dcd3f0b915bda6266a55b83c8c667fdbcfc90745b.json new file mode 100644 index 0000000000..0657bec82a --- /dev/null +++ b/common/gateway-storage/.sqlx/query-4a142e21e2646dfcda32ed5dcd3f0b915bda6266a55b83c8c667fdbcfc90745b.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "DELETE FROM verified_tickets WHERE proposal_id = ?", + "describe": { + "columns": [], + "parameters": { + "Right": 1 + }, + "nullable": [] + }, + "hash": "4a142e21e2646dfcda32ed5dcd3f0b915bda6266a55b83c8c667fdbcfc90745b" +} diff --git a/common/gateway-storage/.sqlx/query-52406dc7b69af59d206542105d3b87114e3b9eda6dfaad180f2d154bc258d6bf.json b/common/gateway-storage/.sqlx/query-52406dc7b69af59d206542105d3b87114e3b9eda6dfaad180f2d154bc258d6bf.json new file mode 100644 index 0000000000..fd595c8c16 --- /dev/null +++ b/common/gateway-storage/.sqlx/query-52406dc7b69af59d206542105d3b87114e3b9eda6dfaad180f2d154bc258d6bf.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "UPDATE redemption_proposals SET resolved_at = ?, rejected = ? WHERE proposal_id = ?", + "describe": { + "columns": [], + "parameters": { + "Right": 3 + }, + "nullable": [] + }, + "hash": "52406dc7b69af59d206542105d3b87114e3b9eda6dfaad180f2d154bc258d6bf" +} diff --git a/common/gateway-storage/.sqlx/query-564c7da81081fab34754b76eeeedd48f3bc18842c03ef5a5c331bbee4c41c71c.json b/common/gateway-storage/.sqlx/query-564c7da81081fab34754b76eeeedd48f3bc18842c03ef5a5c331bbee4c41c71c.json new file mode 100644 index 0000000000..308bbb2325 --- /dev/null +++ b/common/gateway-storage/.sqlx/query-564c7da81081fab34754b76eeeedd48f3bc18842c03ef5a5c331bbee4c41c71c.json @@ -0,0 +1,38 @@ +{ + "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" +} diff --git a/common/gateway-storage/.sqlx/query-58ba6fb669847d7b82440178bc3ffd8de03c0308d0fc9cb8615a5d151e785864.json b/common/gateway-storage/.sqlx/query-58ba6fb669847d7b82440178bc3ffd8de03c0308d0fc9cb8615a5d151e785864.json new file mode 100644 index 0000000000..19956cccf7 --- /dev/null +++ b/common/gateway-storage/.sqlx/query-58ba6fb669847d7b82440178bc3ffd8de03c0308d0fc9cb8615a5d151e785864.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "INSERT INTO message_store(client_address_bs58, content) VALUES (?, ?)", + "describe": { + "columns": [], + "parameters": { + "Right": 2 + }, + "nullable": [] + }, + "hash": "58ba6fb669847d7b82440178bc3ffd8de03c0308d0fc9cb8615a5d151e785864" +} diff --git a/common/gateway-storage/.sqlx/query-5ee58c3050595614d550558879f54696dfcbddfb1b8575f5cc9690c4c2bffe25.json b/common/gateway-storage/.sqlx/query-5ee58c3050595614d550558879f54696dfcbddfb1b8575f5cc9690c4c2bffe25.json new file mode 100644 index 0000000000..73f500093c --- /dev/null +++ b/common/gateway-storage/.sqlx/query-5ee58c3050595614d550558879f54696dfcbddfb1b8575f5cc9690c4c2bffe25.json @@ -0,0 +1,20 @@ +{ + "db_name": "SQLite", + "query": "SELECT client_id FROM shared_keys WHERE client_address_bs58 = ?", + "describe": { + "columns": [ + { + "name": "client_id", + "ordinal": 0, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + false + ] + }, + "hash": "5ee58c3050595614d550558879f54696dfcbddfb1b8575f5cc9690c4c2bffe25" +} diff --git a/common/gateway-storage/.sqlx/query-61c0a61db0eed4ccbe3c623de183a0df5fbe61dff0048b3ab4b6823a7b248239.json b/common/gateway-storage/.sqlx/query-61c0a61db0eed4ccbe3c623de183a0df5fbe61dff0048b3ab4b6823a7b248239.json new file mode 100644 index 0000000000..94d2364b20 --- /dev/null +++ b/common/gateway-storage/.sqlx/query-61c0a61db0eed4ccbe3c623de183a0df5fbe61dff0048b3ab4b6823a7b248239.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "\n UPDATE available_bandwidth\n SET expiration = ?\n WHERE client_id = ?\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 2 + }, + "nullable": [] + }, + "hash": "61c0a61db0eed4ccbe3c623de183a0df5fbe61dff0048b3ab4b6823a7b248239" +} diff --git a/common/gateway-storage/.sqlx/query-6c4a1c08a08714be34fe9bda2d2c9c7fb6a4e25272c1addfad87e26e7b16dfdc.json b/common/gateway-storage/.sqlx/query-6c4a1c08a08714be34fe9bda2d2c9c7fb6a4e25272c1addfad87e26e7b16dfdc.json new file mode 100644 index 0000000000..55f1b43bc4 --- /dev/null +++ b/common/gateway-storage/.sqlx/query-6c4a1c08a08714be34fe9bda2d2c9c7fb6a4e25272c1addfad87e26e7b16dfdc.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "INSERT INTO verified_tickets (ticket_id) VALUES (?)", + "describe": { + "columns": [], + "parameters": { + "Right": 1 + }, + "nullable": [] + }, + "hash": "6c4a1c08a08714be34fe9bda2d2c9c7fb6a4e25272c1addfad87e26e7b16dfdc" +} diff --git a/common/gateway-storage/.sqlx/query-72b268030ca7409c86806d6b5b253272629a3ebda7b89feacf8ed07ecf2e2c13.json b/common/gateway-storage/.sqlx/query-72b268030ca7409c86806d6b5b253272629a3ebda7b89feacf8ed07ecf2e2c13.json new file mode 100644 index 0000000000..45fa5f4a5d --- /dev/null +++ b/common/gateway-storage/.sqlx/query-72b268030ca7409c86806d6b5b253272629a3ebda7b89feacf8ed07ecf2e2c13.json @@ -0,0 +1,26 @@ +{ + "db_name": "SQLite", + "query": "\n SELECT id, client_type as \"client_type: ClientType\"\n FROM clients\n WHERE id = ?\n ", + "describe": { + "columns": [ + { + "name": "id", + "ordinal": 0, + "type_info": "Int64" + }, + { + "name": "client_type: ClientType", + "ordinal": 1, + "type_info": "Text" + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + false, + false + ] + }, + "hash": "72b268030ca7409c86806d6b5b253272629a3ebda7b89feacf8ed07ecf2e2c13" +} diff --git a/common/gateway-storage/.sqlx/query-73e111225be2ce63d05f1a439a1fc9cc0359a960fe17a135a1d7f8975ebe38ef.json b/common/gateway-storage/.sqlx/query-73e111225be2ce63d05f1a439a1fc9cc0359a960fe17a135a1d7f8975ebe38ef.json new file mode 100644 index 0000000000..ec245e2d27 --- /dev/null +++ b/common/gateway-storage/.sqlx/query-73e111225be2ce63d05f1a439a1fc9cc0359a960fe17a135a1d7f8975ebe38ef.json @@ -0,0 +1,26 @@ +{ + "db_name": "SQLite", + "query": "\n SELECT t1.ticket_id, t1.data as \"data!\"\n FROM ticket_data as t1\n LEFT JOIN verified_tickets as t2\n ON t1.ticket_id = t2.ticket_id\n WHERE\n t2.ticket_id IS NULL\n AND\n t1.data IS NOT NULL\n ", + "describe": { + "columns": [ + { + "name": "ticket_id", + "ordinal": 0, + "type_info": "Int64" + }, + { + "name": "data!", + "ordinal": 1, + "type_info": "Blob" + } + ], + "parameters": { + "Right": 0 + }, + "nullable": [ + false, + true + ] + }, + "hash": "73e111225be2ce63d05f1a439a1fc9cc0359a960fe17a135a1d7f8975ebe38ef" +} diff --git a/common/gateway-storage/.sqlx/query-76b91895b5cd8b4815f4e5b183117c16b6a36c180d9081ab2cce9992792e5a6a.json b/common/gateway-storage/.sqlx/query-76b91895b5cd8b4815f4e5b183117c16b6a36c180d9081ab2cce9992792e5a6a.json new file mode 100644 index 0000000000..b02aa2decc --- /dev/null +++ b/common/gateway-storage/.sqlx/query-76b91895b5cd8b4815f4e5b183117c16b6a36c180d9081ab2cce9992792e5a6a.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "\n UPDATE available_bandwidth\n SET available = available + ?\n WHERE client_id = ?\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 2 + }, + "nullable": [] + }, + "hash": "76b91895b5cd8b4815f4e5b183117c16b6a36c180d9081ab2cce9992792e5a6a" +} diff --git a/common/gateway-storage/.sqlx/query-7cd38d342eddd578f35116cf024901f94bbf5575595e36345e1d25085a79b039.json b/common/gateway-storage/.sqlx/query-7cd38d342eddd578f35116cf024901f94bbf5575595e36345e1d25085a79b039.json new file mode 100644 index 0000000000..5e5d719b82 --- /dev/null +++ b/common/gateway-storage/.sqlx/query-7cd38d342eddd578f35116cf024901f94bbf5575595e36345e1d25085a79b039.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "INSERT INTO ticket_data(ticket_id, serial_number, data) VALUES (?, ?, ?)", + "describe": { + "columns": [], + "parameters": { + "Right": 3 + }, + "nullable": [] + }, + "hash": "7cd38d342eddd578f35116cf024901f94bbf5575595e36345e1d25085a79b039" +} diff --git a/common/gateway-storage/.sqlx/query-7f8af0799d7ae5f751b9964e9566589bf768e7079079f584beb0c1ba16d43a5c.json b/common/gateway-storage/.sqlx/query-7f8af0799d7ae5f751b9964e9566589bf768e7079079f584beb0c1ba16d43a5c.json new file mode 100644 index 0000000000..d8931d6e6e --- /dev/null +++ b/common/gateway-storage/.sqlx/query-7f8af0799d7ae5f751b9964e9566589bf768e7079079f584beb0c1ba16d43a5c.json @@ -0,0 +1,20 @@ +{ + "db_name": "SQLite", + "query": "SELECT EXISTS (SELECT 1 FROM ticket_data WHERE serial_number = ?) AS 'exists'", + "describe": { + "columns": [ + { + "name": "exists", + "ordinal": 0, + "type_info": "Int" + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + null + ] + }, + "hash": "7f8af0799d7ae5f751b9964e9566589bf768e7079079f584beb0c1ba16d43a5c" +} diff --git a/common/gateway-storage/.sqlx/query-8412b95638509f59d2daa30399ba864263e24b2ab75e0d8a2afbde75da8b6d5a.json b/common/gateway-storage/.sqlx/query-8412b95638509f59d2daa30399ba864263e24b2ab75e0d8a2afbde75da8b6d5a.json new file mode 100644 index 0000000000..03dea6199c --- /dev/null +++ b/common/gateway-storage/.sqlx/query-8412b95638509f59d2daa30399ba864263e24b2ab75e0d8a2afbde75da8b6d5a.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "UPDATE received_ticket SET rejected = true WHERE id = ?", + "describe": { + "columns": [], + "parameters": { + "Right": 1 + }, + "nullable": [] + }, + "hash": "8412b95638509f59d2daa30399ba864263e24b2ab75e0d8a2afbde75da8b6d5a" +} diff --git a/common/gateway-storage/.sqlx/query-870e426955cf3d0e297522552a87af82979545975f9df3ac3584fd1bf56a46cd.json b/common/gateway-storage/.sqlx/query-870e426955cf3d0e297522552a87af82979545975f9df3ac3584fd1bf56a46cd.json new file mode 100644 index 0000000000..e54a2f1b02 --- /dev/null +++ b/common/gateway-storage/.sqlx/query-870e426955cf3d0e297522552a87af82979545975f9df3ac3584fd1bf56a46cd.json @@ -0,0 +1,20 @@ +{ + "db_name": "SQLite", + "query": "SELECT signer_id FROM ticket_verification WHERE ticket_id = ?", + "describe": { + "columns": [ + { + "name": "signer_id", + "ordinal": 0, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + false + ] + }, + "hash": "870e426955cf3d0e297522552a87af82979545975f9df3ac3584fd1bf56a46cd" +} diff --git a/common/gateway-storage/.sqlx/query-93fc72c1ee7cf5bbd1b69500ebb36928263d839ee515786cc9354cd8eac6f288.json b/common/gateway-storage/.sqlx/query-93fc72c1ee7cf5bbd1b69500ebb36928263d839ee515786cc9354cd8eac6f288.json new file mode 100644 index 0000000000..40ed3c0d24 --- /dev/null +++ b/common/gateway-storage/.sqlx/query-93fc72c1ee7cf5bbd1b69500ebb36928263d839ee515786cc9354cd8eac6f288.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "UPDATE ticket_data SET data = NULL WHERE ticket_id = ?", + "describe": { + "columns": [], + "parameters": { + "Right": 1 + }, + "nullable": [] + }, + "hash": "93fc72c1ee7cf5bbd1b69500ebb36928263d839ee515786cc9354cd8eac6f288" +} diff --git a/common/gateway-storage/.sqlx/query-9450b5f34620ec901e555f418eec6e0f489ed72d6b4f2b70ae1d905b4c46f0df.json b/common/gateway-storage/.sqlx/query-9450b5f34620ec901e555f418eec6e0f489ed72d6b4f2b70ae1d905b4c46f0df.json new file mode 100644 index 0000000000..36e35bba32 --- /dev/null +++ b/common/gateway-storage/.sqlx/query-9450b5f34620ec901e555f418eec6e0f489ed72d6b4f2b70ae1d905b4c46f0df.json @@ -0,0 +1,20 @@ +{ + "db_name": "SQLite", + "query": "SELECT available FROM available_bandwidth WHERE client_id = ?", + "describe": { + "columns": [ + { + "name": "available", + "ordinal": 0, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + false + ] + }, + "hash": "9450b5f34620ec901e555f418eec6e0f489ed72d6b4f2b70ae1d905b4c46f0df" +} diff --git a/common/gateway-storage/.sqlx/query-a2fef59c5d6176170920b940be39f7c98de25d36b7f6516fcc78037862aa7795.json b/common/gateway-storage/.sqlx/query-a2fef59c5d6176170920b940be39f7c98de25d36b7f6516fcc78037862aa7795.json new file mode 100644 index 0000000000..0d54f6fe35 --- /dev/null +++ b/common/gateway-storage/.sqlx/query-a2fef59c5d6176170920b940be39f7c98de25d36b7f6516fcc78037862aa7795.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "INSERT INTO available_bandwidth(client_id, available, expiration) VALUES (?, 0, ?)", + "describe": { + "columns": [], + "parameters": { + "Right": 2 + }, + "nullable": [] + }, + "hash": "a2fef59c5d6176170920b940be39f7c98de25d36b7f6516fcc78037862aa7795" +} diff --git a/common/gateway-storage/.sqlx/query-af2a80cb05c0bff096e6eb830598fbb8ba0a69e0d7079e4600ff47db786e6642.json b/common/gateway-storage/.sqlx/query-af2a80cb05c0bff096e6eb830598fbb8ba0a69e0d7079e4600ff47db786e6642.json new file mode 100644 index 0000000000..8dbd639d40 --- /dev/null +++ b/common/gateway-storage/.sqlx/query-af2a80cb05c0bff096e6eb830598fbb8ba0a69e0d7079e4600ff47db786e6642.json @@ -0,0 +1,26 @@ +{ + "db_name": "SQLite", + "query": "\n SELECT t1.ticket_id, t2.serial_number\n FROM verified_tickets as t1\n JOIN ticket_data as t2\n ON t1.ticket_id = t2.ticket_id\n JOIN received_ticket as t3\n ON t1.ticket_id = t3.id\n\n ORDER BY t3.received_at ASC\n LIMIT 65535\n ", + "describe": { + "columns": [ + { + "name": "ticket_id", + "ordinal": 0, + "type_info": "Int64" + }, + { + "name": "serial_number", + "ordinal": 1, + "type_info": "Blob" + } + ], + "parameters": { + "Right": 0 + }, + "nullable": [ + false, + false + ] + }, + "hash": "af2a80cb05c0bff096e6eb830598fbb8ba0a69e0d7079e4600ff47db786e6642" +} diff --git a/common/gateway-storage/.sqlx/query-b478ea151f9f82bb437fbaf697505c343f5eeedf602f21db6a292b174d3efe3e.json b/common/gateway-storage/.sqlx/query-b478ea151f9f82bb437fbaf697505c343f5eeedf602f21db6a292b174d3efe3e.json new file mode 100644 index 0000000000..4b5190eb07 --- /dev/null +++ b/common/gateway-storage/.sqlx/query-b478ea151f9f82bb437fbaf697505c343f5eeedf602f21db6a292b174d3efe3e.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "DELETE FROM ticket_data WHERE ticket_id = ?", + "describe": { + "columns": [], + "parameters": { + "Right": 1 + }, + "nullable": [] + }, + "hash": "b478ea151f9f82bb437fbaf697505c343f5eeedf602f21db6a292b174d3efe3e" +} diff --git a/common/gateway-storage/.sqlx/query-b83c2d75d90284c0f73e4ee1d46aa87273c8eb2e8e631020ed56969fbf5fa457.json b/common/gateway-storage/.sqlx/query-b83c2d75d90284c0f73e4ee1d46aa87273c8eb2e8e631020ed56969fbf5fa457.json new file mode 100644 index 0000000000..a223a4de0e --- /dev/null +++ b/common/gateway-storage/.sqlx/query-b83c2d75d90284c0f73e4ee1d46aa87273c8eb2e8e631020ed56969fbf5fa457.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "INSERT INTO redemption_proposals (proposal_id, created_at) VALUES (?, ?)", + "describe": { + "columns": [], + "parameters": { + "Right": 2 + }, + "nullable": [] + }, + "hash": "b83c2d75d90284c0f73e4ee1d46aa87273c8eb2e8e631020ed56969fbf5fa457" +} diff --git a/common/gateway-storage/.sqlx/query-be36bdf12b8f2145cefca3111f146c71205167f1edcaef624b2f80d30bf269cc.json b/common/gateway-storage/.sqlx/query-be36bdf12b8f2145cefca3111f146c71205167f1edcaef624b2f80d30bf269cc.json new file mode 100644 index 0000000000..4573da3fd8 --- /dev/null +++ b/common/gateway-storage/.sqlx/query-be36bdf12b8f2145cefca3111f146c71205167f1edcaef624b2f80d30bf269cc.json @@ -0,0 +1,26 @@ +{ + "db_name": "SQLite", + "query": "\n SELECT t1.ticket_id, t2.serial_number\n FROM verified_tickets as t1\n JOIN ticket_data as t2\n ON t1.ticket_id = t2.ticket_id\n WHERE t1.proposal_id = ?\n ", + "describe": { + "columns": [ + { + "name": "ticket_id", + "ordinal": 0, + "type_info": "Int64" + }, + { + "name": "serial_number", + "ordinal": 1, + "type_info": "Blob" + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + false, + false + ] + }, + "hash": "be36bdf12b8f2145cefca3111f146c71205167f1edcaef624b2f80d30bf269cc" +} diff --git a/common/gateway-storage/.sqlx/query-c2c7ca734c87d151f7f260fe7aa1bf6c4db4fd7ee5a90fc15a94099d9b8ebb56.json b/common/gateway-storage/.sqlx/query-c2c7ca734c87d151f7f260fe7aa1bf6c4db4fd7ee5a90fc15a94099d9b8ebb56.json new file mode 100644 index 0000000000..182a1d39c4 --- /dev/null +++ b/common/gateway-storage/.sqlx/query-c2c7ca734c87d151f7f260fe7aa1bf6c4db4fd7ee5a90fc15a94099d9b8ebb56.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "INSERT INTO clients(client_type) VALUES (?)", + "describe": { + "columns": [], + "parameters": { + "Right": 1 + }, + "nullable": [] + }, + "hash": "c2c7ca734c87d151f7f260fe7aa1bf6c4db4fd7ee5a90fc15a94099d9b8ebb56" +} diff --git a/common/gateway-storage/.sqlx/query-cbf1d857ffc607cbaef81faac1c35f75549c0f959d9ce944d68abc524523daad.json b/common/gateway-storage/.sqlx/query-cbf1d857ffc607cbaef81faac1c35f75549c0f959d9ce944d68abc524523daad.json new file mode 100644 index 0000000000..41ae9bd551 --- /dev/null +++ b/common/gateway-storage/.sqlx/query-cbf1d857ffc607cbaef81faac1c35f75549c0f959d9ce944d68abc524523daad.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "\n UPDATE available_bandwidth\n SET available = 0, expiration = ?\n WHERE client_id = ?\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 2 + }, + "nullable": [] + }, + "hash": "cbf1d857ffc607cbaef81faac1c35f75549c0f959d9ce944d68abc524523daad" +} diff --git a/common/gateway-storage/.sqlx/query-d968d8662a2327918b311d4017bf4c73f9e6f3b1be8ff81c1aebdf3791d59d4d.json b/common/gateway-storage/.sqlx/query-d968d8662a2327918b311d4017bf4c73f9e6f3b1be8ff81c1aebdf3791d59d4d.json new file mode 100644 index 0000000000..bbd32fe422 --- /dev/null +++ b/common/gateway-storage/.sqlx/query-d968d8662a2327918b311d4017bf4c73f9e6f3b1be8ff81c1aebdf3791d59d4d.json @@ -0,0 +1,74 @@ +{ + "db_name": "SQLite", + "query": "\n SELECT * FROM wireguard_peer\n WHERE public_key = ?\n LIMIT 1\n ", + "describe": { + "columns": [ + { + "name": "public_key", + "ordinal": 0, + "type_info": "Text" + }, + { + "name": "preshared_key", + "ordinal": 1, + "type_info": "Text" + }, + { + "name": "protocol_version", + "ordinal": 2, + "type_info": "Int64" + }, + { + "name": "endpoint", + "ordinal": 3, + "type_info": "Text" + }, + { + "name": "last_handshake", + "ordinal": 4, + "type_info": "Datetime" + }, + { + "name": "tx_bytes", + "ordinal": 5, + "type_info": "Int64" + }, + { + "name": "rx_bytes", + "ordinal": 6, + "type_info": "Int64" + }, + { + "name": "persistent_keepalive_interval", + "ordinal": 7, + "type_info": "Int64" + }, + { + "name": "allowed_ips", + "ordinal": 8, + "type_info": "Blob" + }, + { + "name": "client_id", + "ordinal": 9, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + false, + true, + true, + true, + true, + false, + false, + true, + false, + true + ] + }, + "hash": "d968d8662a2327918b311d4017bf4c73f9e6f3b1be8ff81c1aebdf3791d59d4d" +} diff --git a/common/gateway-storage/.sqlx/query-da51030965d8f9ff0e2511ba6d6b9feecd619c043f9d70752521143de4c14959.json b/common/gateway-storage/.sqlx/query-da51030965d8f9ff0e2511ba6d6b9feecd619c043f9d70752521143de4c14959.json new file mode 100644 index 0000000000..0d2a657865 --- /dev/null +++ b/common/gateway-storage/.sqlx/query-da51030965d8f9ff0e2511ba6d6b9feecd619c043f9d70752521143de4c14959.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "\n INSERT INTO ticket_verification (ticket_id, signer_id, verified_at, accepted)\n VALUES (?, ?, ?, ?)\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 4 + }, + "nullable": [] + }, + "hash": "da51030965d8f9ff0e2511ba6d6b9feecd619c043f9d70752521143de4c14959" +} diff --git a/common/gateway-storage/.sqlx/query-dd757b04743ab7e80948a60b6ee5ec36e716324498ec2178283a062d5b360464.json b/common/gateway-storage/.sqlx/query-dd757b04743ab7e80948a60b6ee5ec36e716324498ec2178283a062d5b360464.json new file mode 100644 index 0000000000..72a6be5a14 --- /dev/null +++ b/common/gateway-storage/.sqlx/query-dd757b04743ab7e80948a60b6ee5ec36e716324498ec2178283a062d5b360464.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "\n INSERT OR IGNORE INTO shared_keys(client_id, client_address_bs58, derived_aes128_ctr_blake3_hmac_keys_bs58, derived_aes256_gcm_siv_key) VALUES (?, ?, ?, ?);\n\n UPDATE shared_keys\n SET\n derived_aes128_ctr_blake3_hmac_keys_bs58 = ?,\n derived_aes256_gcm_siv_key = ?\n WHERE client_address_bs58 = ?\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 7 + }, + "nullable": [] + }, + "hash": "dd757b04743ab7e80948a60b6ee5ec36e716324498ec2178283a062d5b360464" +} diff --git a/common/gateway-storage/.sqlx/query-e23f7137e1d2c38deba4653b54269b7f58d6fe9c71a7f9ee2b64f8237b7004fb.json b/common/gateway-storage/.sqlx/query-e23f7137e1d2c38deba4653b54269b7f58d6fe9c71a7f9ee2b64f8237b7004fb.json new file mode 100644 index 0000000000..c37e270778 --- /dev/null +++ b/common/gateway-storage/.sqlx/query-e23f7137e1d2c38deba4653b54269b7f58d6fe9c71a7f9ee2b64f8237b7004fb.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "\n DELETE FROM wireguard_peer\n WHERE public_key = ?\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 1 + }, + "nullable": [] + }, + "hash": "e23f7137e1d2c38deba4653b54269b7f58d6fe9c71a7f9ee2b64f8237b7004fb" +} diff --git a/common/gateway-storage/.sqlx/query-e3860c0c31ca03cc0b22ca34cef5f535a94c78d3491d44d7c8bf1b34a840839d.json b/common/gateway-storage/.sqlx/query-e3860c0c31ca03cc0b22ca34cef5f535a94c78d3491d44d7c8bf1b34a840839d.json new file mode 100644 index 0000000000..c24cc93187 --- /dev/null +++ b/common/gateway-storage/.sqlx/query-e3860c0c31ca03cc0b22ca34cef5f535a94c78d3491d44d7c8bf1b34a840839d.json @@ -0,0 +1,32 @@ +{ + "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" +} diff --git a/common/gateway-storage/.sqlx/query-f02272f4f0e5a9f806532fa6e2f3323ef3edeeffdc30ce7f07608ba138d4bb02.json b/common/gateway-storage/.sqlx/query-f02272f4f0e5a9f806532fa6e2f3323ef3edeeffdc30ce7f07608ba138d4bb02.json new file mode 100644 index 0000000000..d56b8cf677 --- /dev/null +++ b/common/gateway-storage/.sqlx/query-f02272f4f0e5a9f806532fa6e2f3323ef3edeeffdc30ce7f07608ba138d4bb02.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "\n UPDATE available_bandwidth\n SET available = available - ?\n WHERE client_id = ?\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 2 + }, + "nullable": [] + }, + "hash": "f02272f4f0e5a9f806532fa6e2f3323ef3edeeffdc30ce7f07608ba138d4bb02" +} diff --git a/common/gateway-storage/.sqlx/query-f2b630b29a9e85003c0457dc8a07d24996c50a306b81ad2ae0b30af6683cda0d.json b/common/gateway-storage/.sqlx/query-f2b630b29a9e85003c0457dc8a07d24996c50a306b81ad2ae0b30af6683cda0d.json new file mode 100644 index 0000000000..9930c174fc --- /dev/null +++ b/common/gateway-storage/.sqlx/query-f2b630b29a9e85003c0457dc8a07d24996c50a306b81ad2ae0b30af6683cda0d.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "INSERT INTO received_ticket (client_id, received_at) VALUES (?, ?)", + "describe": { + "columns": [], + "parameters": { + "Right": 2 + }, + "nullable": [] + }, + "hash": "f2b630b29a9e85003c0457dc8a07d24996c50a306b81ad2ae0b30af6683cda0d" +} diff --git a/common/gateway-storage/.sqlx/query-ff485c6b7e02423511b1fa55d5dd81d6c2f7228daf031c4621937e47804ce5b3.json b/common/gateway-storage/.sqlx/query-ff485c6b7e02423511b1fa55d5dd81d6c2f7228daf031c4621937e47804ce5b3.json new file mode 100644 index 0000000000..b8efd9cfff --- /dev/null +++ b/common/gateway-storage/.sqlx/query-ff485c6b7e02423511b1fa55d5dd81d6c2f7228daf031c4621937e47804ce5b3.json @@ -0,0 +1,20 @@ +{ + "db_name": "SQLite", + "query": "SELECT proposal_id FROM redemption_proposals WHERE resolved_at IS NULL", + "describe": { + "columns": [ + { + "name": "proposal_id", + "ordinal": 0, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 0 + }, + "nullable": [ + false + ] + }, + "hash": "ff485c6b7e02423511b1fa55d5dd81d6c2f7228daf031c4621937e47804ce5b3" +} diff --git a/common/gateway-storage/src/bandwidth.rs b/common/gateway-storage/src/bandwidth.rs index 3554213ffd..1f1cdce1c8 100644 --- a/common/gateway-storage/src/bandwidth.rs +++ b/common/gateway-storage/src/bandwidth.rs @@ -111,14 +111,14 @@ impl BandwidthManager { amount, client_id ) - .execute(&mut tx) + .execute(&mut *tx) .await?; let remaining = sqlx::query!( "SELECT available FROM available_bandwidth WHERE client_id = ?", client_id ) - .fetch_one(&mut tx) + .fetch_one(&mut *tx) .await? .available; @@ -160,14 +160,14 @@ impl BandwidthManager { amount, client_id ) - .execute(&mut tx) + .execute(&mut *tx) .await?; let remaining = sqlx::query!( "SELECT available FROM available_bandwidth WHERE client_id = ?", client_id ) - .fetch_one(&mut tx) + .fetch_one(&mut *tx) .await? .available; diff --git a/common/gateway-storage/src/lib.rs b/common/gateway-storage/src/lib.rs index 86da88c69b..8d5fda0912 100644 --- a/common/gateway-storage/src/lib.rs +++ b/common/gateway-storage/src/lib.rs @@ -286,14 +286,13 @@ impl PersistentStorage { // TODO: we can inject here more stuff based on our gateway global config // struct. Maybe different pool size or timeout intervals? - let mut opts = sqlx::sqlite::SqliteConnectOptions::new() + let opts = sqlx::sqlite::SqliteConnectOptions::new() .filename(database_path) - .create_if_missing(true); + .create_if_missing(true) + .disable_statement_logging(); // TODO: do we want auto_vacuum ? - opts.disable_statement_logging(); - let connection_pool = match sqlx::SqlitePool::connect_with(opts).await { Ok(db) => db, Err(err) => { diff --git a/common/gateway-storage/src/tickets.rs b/common/gateway-storage/src/tickets.rs index ce68d44514..f8b9539b38 100644 --- a/common/gateway-storage/src/tickets.rs +++ b/common/gateway-storage/src/tickets.rs @@ -92,7 +92,7 @@ impl TicketStorageManager { ) .fetch_one(&self.connection_pool) .await - .map(|result| result.exists == 1) + .map(|result| result.exists == Some(1)) } pub(crate) async fn remove_binary_ticket_data( diff --git a/common/nyxd-scraper/src/storage/mod.rs b/common/nyxd-scraper/src/storage/mod.rs index c9ecd64d40..8ac0f07775 100644 --- a/common/nyxd-scraper/src/storage/mod.rs +++ b/common/nyxd-scraper/src/storage/mod.rs @@ -1,20 +1,24 @@ // Copyright 2023 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -use crate::block_processor::types::{FullBlockInformation, ParsedTransactionResponse}; -use crate::error::ScraperError; -use crate::storage::manager::{ - insert_block, insert_message, insert_precommit, insert_transaction, insert_validator, - prune_blocks, prune_messages, prune_pre_commits, prune_transactions, update_last_processed, - update_last_pruned, StorageManager, +use crate::{ + block_processor::types::{FullBlockInformation, ParsedTransactionResponse}, + error::ScraperError, + storage::{ + manager::{ + insert_block, insert_message, insert_precommit, insert_transaction, insert_validator, + prune_blocks, prune_messages, prune_pre_commits, prune_transactions, + update_last_processed, update_last_pruned, StorageManager, + }, + models::{CommitSignature, Validator}, + }, +}; +use sqlx::{types::time::OffsetDateTime, ConnectOptions, Sqlite, Transaction}; +use std::{fmt::Debug, path::Path}; +use tendermint::{ + block::{Commit, CommitSig}, + Block, }; -use crate::storage::models::{CommitSignature, Validator}; -use sqlx::types::time::OffsetDateTime; -use sqlx::{ConnectOptions, Sqlite, Transaction}; -use std::fmt::Debug; -use std::path::Path; -use tendermint::block::{Commit, CommitSig}; -use tendermint::Block; use tendermint_rpc::endpoint::validators; use tokio::time::Instant; use tracing::{debug, error, info, instrument, trace, warn}; @@ -46,14 +50,13 @@ pub(crate) fn log_db_operation_time(op_name: &str, start_time: Instant) { impl ScraperStorage { #[instrument] pub async fn init + Debug>(database_path: P) -> Result { - let mut opts = sqlx::sqlite::SqliteConnectOptions::new() + let opts = sqlx::sqlite::SqliteConnectOptions::new() .filename(database_path) - .create_if_missing(true); + .create_if_missing(true) + .disable_statement_logging(); // TODO: do we want auto_vacuum ? - opts.disable_statement_logging(); - let connection_pool = match sqlx::SqlitePool::connect_with(opts).await { Ok(db) => db, Err(err) => { @@ -90,11 +93,11 @@ impl ScraperStorage { let mut tx = self.begin_processing_tx().await?; - prune_messages(oldest_to_keep.into(), &mut tx).await?; - prune_transactions(oldest_to_keep.into(), &mut tx).await?; - prune_pre_commits(oldest_to_keep.into(), &mut tx).await?; - prune_blocks(oldest_to_keep.into(), &mut tx).await?; - update_last_pruned(current_height.into(), &mut tx).await?; + prune_messages(oldest_to_keep.into(), &mut *tx).await?; + prune_transactions(oldest_to_keep.into(), &mut *tx).await?; + prune_pre_commits(oldest_to_keep.into(), &mut *tx).await?; + prune_blocks(oldest_to_keep.into(), &mut *tx).await?; + update_last_pruned(current_height.into(), &mut *tx).await?; let commit_start = Instant::now(); tx.commit() @@ -234,7 +237,7 @@ pub async fn persist_block( // persist messages (inside the transactions) persist_messages(&block.transactions, tx).await?; - update_last_processed(block.block.header.height.into(), tx).await?; + update_last_processed(block.block.header.height.into(), tx.as_mut()).await?; Ok(()) } @@ -251,7 +254,7 @@ async fn persist_validators( insert_validator( consensus_address.to_string(), consensus_pubkey.to_string(), - &mut *tx, + tx.as_mut(), ) .await?; } @@ -274,7 +277,7 @@ async fn persist_block_data( total_gas, proposer_address, block.header.time.into(), - tx, + tx.as_mut(), ) .await?; Ok(()) @@ -320,7 +323,7 @@ async fn persist_commits( (*timestamp).into(), validator.power.into(), validator.proposer_priority.value(), - &mut *tx, + tx.as_mut(), ) .await?; } @@ -345,7 +348,7 @@ async fn persist_txs( chain_tx.tx_result.gas_wanted, chain_tx.tx_result.gas_used, chain_tx.tx_result.log.clone(), - &mut *tx, + tx.as_mut(), ) .await?; } @@ -366,7 +369,7 @@ async fn persist_messages( index as i64, msg.type_url.clone(), chain_tx.height.into(), - &mut *tx, + tx.as_mut(), ) .await? } diff --git a/nym-api/.sqlx/query-01c1251e3dba4db47ffbb83d5545fd75ead425f2ee10dbe28ace13a58cadd2e5.json b/nym-api/.sqlx/query-01c1251e3dba4db47ffbb83d5545fd75ead425f2ee10dbe28ace13a58cadd2e5.json new file mode 100644 index 0000000000..e01b4b406f --- /dev/null +++ b/nym-api/.sqlx/query-01c1251e3dba4db47ffbb83d5545fd75ead425f2ee10dbe28ace13a58cadd2e5.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "\n UPDATE epoch_credentials\n SET total_issued = 1, start_id = ?\n WHERE epoch_id = ?\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 2 + }, + "nullable": [] + }, + "hash": "01c1251e3dba4db47ffbb83d5545fd75ead425f2ee10dbe28ace13a58cadd2e5" +} diff --git a/nym-api/.sqlx/query-09b6a36cf4455e53188f0ddd2f664855ee541cf7e262d5bba8ccd1df8088762e.json b/nym-api/.sqlx/query-09b6a36cf4455e53188f0ddd2f664855ee541cf7e262d5bba8ccd1df8088762e.json new file mode 100644 index 0000000000..ba84fb0761 --- /dev/null +++ b/nym-api/.sqlx/query-09b6a36cf4455e53188f0ddd2f664855ee541cf7e262d5bba8ccd1df8088762e.json @@ -0,0 +1,32 @@ +{ + "db_name": "SQLite", + "query": "SELECT * FROM mixnode_details WHERE id = ?", + "describe": { + "columns": [ + { + "name": "id", + "ordinal": 0, + "type_info": "Int64" + }, + { + "name": "mix_id", + "ordinal": 1, + "type_info": "Int64" + }, + { + "name": "identity_key", + "ordinal": 2, + "type_info": "Text" + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + false, + false, + false + ] + }, + "hash": "09b6a36cf4455e53188f0ddd2f664855ee541cf7e262d5bba8ccd1df8088762e" +} diff --git a/nym-api/.sqlx/query-0a2587e2c72175caa89823675c4f2b6437c700eb7cdc41215e6dcde9754920db.json b/nym-api/.sqlx/query-0a2587e2c72175caa89823675c4f2b6437c700eb7cdc41215e6dcde9754920db.json new file mode 100644 index 0000000000..156de4067f --- /dev/null +++ b/nym-api/.sqlx/query-0a2587e2c72175caa89823675c4f2b6437c700eb7cdc41215e6dcde9754920db.json @@ -0,0 +1,20 @@ +{ + "db_name": "SQLite", + "query": "\n SELECT COUNT(*) as count\n FROM mixnode_status\n JOIN monitor_run ON mixnode_status.timestamp = monitor_run.timestamp\n JOIN testing_route ON monitor_run.id = testing_route.monitor_run_id\n WHERE mixnode_details_id = ?\n ", + "describe": { + "columns": [ + { + "name": "count", + "ordinal": 0, + "type_info": "Int" + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + false + ] + }, + "hash": "0a2587e2c72175caa89823675c4f2b6437c700eb7cdc41215e6dcde9754920db" +} diff --git a/nym-api/.sqlx/query-0ac0747bc2988ccc5ae95a78e626fcf79e6d090f667b150b101d0ca90e6ba9ea.json b/nym-api/.sqlx/query-0ac0747bc2988ccc5ae95a78e626fcf79e6d090f667b150b101d0ca90e6ba9ea.json new file mode 100644 index 0000000000..3d3f1c50ea --- /dev/null +++ b/nym-api/.sqlx/query-0ac0747bc2988ccc5ae95a78e626fcf79e6d090f667b150b101d0ca90e6ba9ea.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "DELETE FROM mixnode_status WHERE timestamp < ?", + "describe": { + "columns": [], + "parameters": { + "Right": 1 + }, + "nullable": [] + }, + "hash": "0ac0747bc2988ccc5ae95a78e626fcf79e6d090f667b150b101d0ca90e6ba9ea" +} diff --git a/nym-api/.sqlx/query-158b6cf296627527806ca5cae7375bcfc73533bc24acc837211ff35bd00b9abc.json b/nym-api/.sqlx/query-158b6cf296627527806ca5cae7375bcfc73533bc24acc837211ff35bd00b9abc.json new file mode 100644 index 0000000000..9ad6f6f437 --- /dev/null +++ b/nym-api/.sqlx/query-158b6cf296627527806ca5cae7375bcfc73533bc24acc837211ff35bd00b9abc.json @@ -0,0 +1,20 @@ +{ + "db_name": "SQLite", + "query": "\n SELECT AVG(reliability) as \"reliability: f32\" FROM mixnode_status\n WHERE mixnode_details_id= ? AND timestamp >= ? AND timestamp <= ?\n ", + "describe": { + "columns": [ + { + "name": "reliability: f32", + "ordinal": 0, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 3 + }, + "nullable": [ + true + ] + }, + "hash": "158b6cf296627527806ca5cae7375bcfc73533bc24acc837211ff35bd00b9abc" +} diff --git a/nym-api/.sqlx/query-16ebee4ef4d74e6fa3aaf611d2396a6445c9c69612515aeb51c519115a2064fd.json b/nym-api/.sqlx/query-16ebee4ef4d74e6fa3aaf611d2396a6445c9c69612515aeb51c519115a2064fd.json new file mode 100644 index 0000000000..4402e35940 --- /dev/null +++ b/nym-api/.sqlx/query-16ebee4ef4d74e6fa3aaf611d2396a6445c9c69612515aeb51c519115a2064fd.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "\n INSERT INTO testing_route\n (gateway_id, layer1_mix_id, layer2_mix_id, layer3_mix_id, monitor_run_id)\n VALUES (?, ?, ?, ?, ?);\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 5 + }, + "nullable": [] + }, + "hash": "16ebee4ef4d74e6fa3aaf611d2396a6445c9c69612515aeb51c519115a2064fd" +} diff --git a/nym-api/.sqlx/query-19e3f9bcf0adfea2b12fc50ab5bb7aa84ba3edc90ebcc49644ad52ebdc71e162.json b/nym-api/.sqlx/query-19e3f9bcf0adfea2b12fc50ab5bb7aa84ba3edc90ebcc49644ad52ebdc71e162.json new file mode 100644 index 0000000000..0709ae6d6a --- /dev/null +++ b/nym-api/.sqlx/query-19e3f9bcf0adfea2b12fc50ab5bb7aa84ba3edc90ebcc49644ad52ebdc71e162.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "INSERT INTO v3_migration_info(id) VALUES (0)", + "describe": { + "columns": [], + "parameters": { + "Right": 0 + }, + "nullable": [] + }, + "hash": "19e3f9bcf0adfea2b12fc50ab5bb7aa84ba3edc90ebcc49644ad52ebdc71e162" +} diff --git a/nym-api/.sqlx/query-1d4535b58abdefaaca96bc7312fe14f63ccb56fa62976f7ce3d3b4f6eca8b711.json b/nym-api/.sqlx/query-1d4535b58abdefaaca96bc7312fe14f63ccb56fa62976f7ce3d3b4f6eca8b711.json new file mode 100644 index 0000000000..2a2b8976de --- /dev/null +++ b/nym-api/.sqlx/query-1d4535b58abdefaaca96bc7312fe14f63ccb56fa62976f7ce3d3b4f6eca8b711.json @@ -0,0 +1,26 @@ +{ + "db_name": "SQLite", + "query": "\n SELECT timestamp, reliability as \"reliability: u8\"\n FROM gateway_status\n JOIN gateway_details\n ON gateway_status.gateway_details_id = gateway_details.id\n WHERE gateway_details.node_id=? AND gateway_status.timestamp > ?;\n ", + "describe": { + "columns": [ + { + "name": "timestamp", + "ordinal": 0, + "type_info": "Int64" + }, + { + "name": "reliability: u8", + "ordinal": 1, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 2 + }, + "nullable": [ + true, + true + ] + }, + "hash": "1d4535b58abdefaaca96bc7312fe14f63ccb56fa62976f7ce3d3b4f6eca8b711" +} diff --git a/nym-api/.sqlx/query-1f3fcc8fde2b9345ec08905eda07c142c49524eaecd846cdf4b84827efdc3f01.json b/nym-api/.sqlx/query-1f3fcc8fde2b9345ec08905eda07c142c49524eaecd846cdf4b84827efdc3f01.json new file mode 100644 index 0000000000..c5b2c975f2 --- /dev/null +++ b/nym-api/.sqlx/query-1f3fcc8fde2b9345ec08905eda07c142c49524eaecd846cdf4b84827efdc3f01.json @@ -0,0 +1,20 @@ +{ + "db_name": "SQLite", + "query": "SELECT mix_id as \"mix_id: NodeId\" FROM mixnode_details WHERE identity_key = ?", + "describe": { + "columns": [ + { + "name": "mix_id: NodeId", + "ordinal": 0, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + false + ] + }, + "hash": "1f3fcc8fde2b9345ec08905eda07c142c49524eaecd846cdf4b84827efdc3f01" +} diff --git a/nym-api/.sqlx/query-1f72d6f538a3655a031a3a8706794559c4c0df6defdfd179c84d02d3b8a6c055.json b/nym-api/.sqlx/query-1f72d6f538a3655a031a3a8706794559c4c0df6defdfd179c84d02d3b8a6c055.json new file mode 100644 index 0000000000..d1252da321 --- /dev/null +++ b/nym-api/.sqlx/query-1f72d6f538a3655a031a3a8706794559c4c0df6defdfd179c84d02d3b8a6c055.json @@ -0,0 +1,26 @@ +{ + "db_name": "SQLite", + "query": "\n SELECT epoch_id as \"epoch_id: u32\", serialised_signatures\n FROM partial_expiration_date_signatures\n WHERE expiration_date = ?\n ", + "describe": { + "columns": [ + { + "name": "epoch_id: u32", + "ordinal": 0, + "type_info": "Int64" + }, + { + "name": "serialised_signatures", + "ordinal": 1, + "type_info": "Blob" + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + false, + false + ] + }, + "hash": "1f72d6f538a3655a031a3a8706794559c4c0df6defdfd179c84d02d3b8a6c055" +} diff --git a/nym-api/.sqlx/query-22e69e450e12f72e2cf06b2e296913f1e22d90e63a57e6256a9c6669e7c27724.json b/nym-api/.sqlx/query-22e69e450e12f72e2cf06b2e296913f1e22d90e63a57e6256a9c6669e7c27724.json new file mode 100644 index 0000000000..a7e8cbc31e --- /dev/null +++ b/nym-api/.sqlx/query-22e69e450e12f72e2cf06b2e296913f1e22d90e63a57e6256a9c6669e7c27724.json @@ -0,0 +1,20 @@ +{ + "db_name": "SQLite", + "query": "\n INSERT OR IGNORE INTO mixnode_details(mix_id, identity_key) VALUES (?, ?);\n SELECT id FROM mixnode_details WHERE mix_id = ?;\n ", + "describe": { + "columns": [ + { + "name": "id", + "ordinal": 0, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 3 + }, + "nullable": [ + false + ] + }, + "hash": "22e69e450e12f72e2cf06b2e296913f1e22d90e63a57e6256a9c6669e7c27724" +} diff --git a/nym-api/.sqlx/query-22f87c049f002e4f5c9c1f00ddf4c1fc80c2cbb1662b576b0273af382dd7dbe2.json b/nym-api/.sqlx/query-22f87c049f002e4f5c9c1f00ddf4c1fc80c2cbb1662b576b0273af382dd7dbe2.json new file mode 100644 index 0000000000..cd7a5aef10 --- /dev/null +++ b/nym-api/.sqlx/query-22f87c049f002e4f5c9c1f00ddf4c1fc80c2cbb1662b576b0273af382dd7dbe2.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "DELETE FROM partial_bloomfilter WHERE date > ?", + "describe": { + "columns": [], + "parameters": { + "Right": 1 + }, + "nullable": [] + }, + "hash": "22f87c049f002e4f5c9c1f00ddf4c1fc80c2cbb1662b576b0273af382dd7dbe2" +} diff --git a/nym-api/.sqlx/query-24a3d608e8a727f863129371be6087976b741fb59d09382cbb09597c6cc44c43.json b/nym-api/.sqlx/query-24a3d608e8a727f863129371be6087976b741fb59d09382cbb09597c6cc44c43.json new file mode 100644 index 0000000000..0c35e15cc9 --- /dev/null +++ b/nym-api/.sqlx/query-24a3d608e8a727f863129371be6087976b741fb59d09382cbb09597c6cc44c43.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "\n INSERT INTO issued_ticketbook\n (epoch_id, deposit_id, partial_credential, signature, joined_private_commitments, expiration_date, ticketbook_type_repr)\n VALUES\n (?, ?, ?, ?, ?, ?, ?)\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 7 + }, + "nullable": [] + }, + "hash": "24a3d608e8a727f863129371be6087976b741fb59d09382cbb09597c6cc44c43" +} diff --git a/nym-api/.sqlx/query-25c7b3e68bc759093312045a3cb0c344e5a09224da60f015b48618f88d1a10e6.json b/nym-api/.sqlx/query-25c7b3e68bc759093312045a3cb0c344e5a09224da60f015b48618f88d1a10e6.json new file mode 100644 index 0000000000..4bf3e5e1c6 --- /dev/null +++ b/nym-api/.sqlx/query-25c7b3e68bc759093312045a3cb0c344e5a09224da60f015b48618f88d1a10e6.json @@ -0,0 +1,20 @@ +{ + "db_name": "SQLite", + "query": "\n INSERT OR IGNORE INTO gateway_details(node_id, identity) VALUES (?, ?);\n SELECT id FROM gateway_details WHERE identity = ?;\n ", + "describe": { + "columns": [ + { + "name": "id", + "ordinal": 0, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 3 + }, + "nullable": [ + false + ] + }, + "hash": "25c7b3e68bc759093312045a3cb0c344e5a09224da60f015b48618f88d1a10e6" +} diff --git a/nym-api/.sqlx/query-299e04e840beab437f84a0a9b82958f158751af79987d1cf6c992ff8384d2a06.json b/nym-api/.sqlx/query-299e04e840beab437f84a0a9b82958f158751af79987d1cf6c992ff8384d2a06.json new file mode 100644 index 0000000000..2d34d111eb --- /dev/null +++ b/nym-api/.sqlx/query-299e04e840beab437f84a0a9b82958f158751af79987d1cf6c992ff8384d2a06.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "INSERT INTO partial_coin_index_signatures(epoch_id, serialised_signatures) VALUES (?, ?)", + "describe": { + "columns": [], + "parameters": { + "Right": 2 + }, + "nullable": [] + }, + "hash": "299e04e840beab437f84a0a9b82958f158751af79987d1cf6c992ff8384d2a06" +} diff --git a/nym-api/.sqlx/query-2db414dfc769ae63a63656500d574cb3eea7cd88eaf829643d71eff410ca5bd2.json b/nym-api/.sqlx/query-2db414dfc769ae63a63656500d574cb3eea7cd88eaf829643d71eff410ca5bd2.json new file mode 100644 index 0000000000..72aabf9250 --- /dev/null +++ b/nym-api/.sqlx/query-2db414dfc769ae63a63656500d574cb3eea7cd88eaf829643d71eff410ca5bd2.json @@ -0,0 +1,20 @@ +{ + "db_name": "SQLite", + "query": "SELECT COUNT(*) as count FROM monitor_run WHERE timestamp > ? AND timestamp < ?", + "describe": { + "columns": [ + { + "name": "count", + "ordinal": 0, + "type_info": "Int" + } + ], + "parameters": { + "Right": 2 + }, + "nullable": [ + false + ] + }, + "hash": "2db414dfc769ae63a63656500d574cb3eea7cd88eaf829643d71eff410ca5bd2" +} diff --git a/nym-api/.sqlx/query-2e1eecad52ef13bba5ab914be6d27a27d480d9f3f2269e42d5c4008e6e7ece2f.json b/nym-api/.sqlx/query-2e1eecad52ef13bba5ab914be6d27a27d480d9f3f2269e42d5c4008e6e7ece2f.json new file mode 100644 index 0000000000..cc74ae3e4b --- /dev/null +++ b/nym-api/.sqlx/query-2e1eecad52ef13bba5ab914be6d27a27d480d9f3f2269e42d5c4008e6e7ece2f.json @@ -0,0 +1,26 @@ +{ + "db_name": "SQLite", + "query": "\n SELECT date, uptime\n FROM gateway_historical_uptime\n JOIN gateway_details\n ON gateway_historical_uptime.gateway_details_id = gateway_details.id\n WHERE gateway_details.node_id = ?\n ORDER BY date ASC\n ", + "describe": { + "columns": [ + { + "name": "date", + "ordinal": 0, + "type_info": "Text" + }, + { + "name": "uptime", + "ordinal": 1, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + true, + true + ] + }, + "hash": "2e1eecad52ef13bba5ab914be6d27a27d480d9f3f2269e42d5c4008e6e7ece2f" +} diff --git a/nym-api/.sqlx/query-3053010ee5c10dc98932c307ab5a8dc0ecf367793c602ed3622c699c54ca0445.json b/nym-api/.sqlx/query-3053010ee5c10dc98932c307ab5a8dc0ecf367793c602ed3622c699c54ca0445.json new file mode 100644 index 0000000000..d6e7ed3184 --- /dev/null +++ b/nym-api/.sqlx/query-3053010ee5c10dc98932c307ab5a8dc0ecf367793c602ed3622c699c54ca0445.json @@ -0,0 +1,20 @@ +{ + "db_name": "SQLite", + "query": "SELECT identity_key FROM mixnode_details WHERE mix_id = ?", + "describe": { + "columns": [ + { + "name": "identity_key", + "ordinal": 0, + "type_info": "Text" + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + false + ] + }, + "hash": "3053010ee5c10dc98932c307ab5a8dc0ecf367793c602ed3622c699c54ca0445" +} diff --git a/nym-api/.sqlx/query-30ff12a3e6b5d0344108bbd1f1634f92cca223ee334d546c5d91b1bb210b3e49.json b/nym-api/.sqlx/query-30ff12a3e6b5d0344108bbd1f1634f92cca223ee334d546c5d91b1bb210b3e49.json new file mode 100644 index 0000000000..13e8e84384 --- /dev/null +++ b/nym-api/.sqlx/query-30ff12a3e6b5d0344108bbd1f1634f92cca223ee334d546c5d91b1bb210b3e49.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "DELETE FROM gateway_status WHERE timestamp < ?", + "describe": { + "columns": [], + "parameters": { + "Right": 1 + }, + "nullable": [] + }, + "hash": "30ff12a3e6b5d0344108bbd1f1634f92cca223ee334d546c5d91b1bb210b3e49" +} diff --git a/nym-api/.sqlx/query-31d1bd7418ae15c30e2ce16eff253d43823f7ebd53429ccb0598f5bca16aa3c9.json b/nym-api/.sqlx/query-31d1bd7418ae15c30e2ce16eff253d43823f7ebd53429ccb0598f5bca16aa3c9.json new file mode 100644 index 0000000000..67dc8f42f0 --- /dev/null +++ b/nym-api/.sqlx/query-31d1bd7418ae15c30e2ce16eff253d43823f7ebd53429ccb0598f5bca16aa3c9.json @@ -0,0 +1,20 @@ +{ + "db_name": "SQLite", + "query": "SELECT id FROM gateway_details WHERE identity = ?", + "describe": { + "columns": [ + { + "name": "id", + "ordinal": 0, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + false + ] + }, + "hash": "31d1bd7418ae15c30e2ce16eff253d43823f7ebd53429ccb0598f5bca16aa3c9" +} diff --git a/nym-api/.sqlx/query-361f939f40c230052b063ababe582d08bfddfebc24dc4e809f97a5dba57dfcf9.json b/nym-api/.sqlx/query-361f939f40c230052b063ababe582d08bfddfebc24dc4e809f97a5dba57dfcf9.json new file mode 100644 index 0000000000..0f02120676 --- /dev/null +++ b/nym-api/.sqlx/query-361f939f40c230052b063ababe582d08bfddfebc24dc4e809f97a5dba57dfcf9.json @@ -0,0 +1,26 @@ +{ + "db_name": "SQLite", + "query": "\n SELECT timestamp, reliability as \"reliability: u8\"\n FROM gateway_status\n WHERE gateway_details_id=? AND timestamp > ? AND timestamp < ?;\n ", + "describe": { + "columns": [ + { + "name": "timestamp", + "ordinal": 0, + "type_info": "Int64" + }, + { + "name": "reliability: u8", + "ordinal": 1, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 3 + }, + "nullable": [ + true, + true + ] + }, + "hash": "361f939f40c230052b063ababe582d08bfddfebc24dc4e809f97a5dba57dfcf9" +} diff --git a/nym-api/.sqlx/query-387504dabdb660afb2890a9686dec225f877ee0e370d81ca65c7ed20c009b0ec.json b/nym-api/.sqlx/query-387504dabdb660afb2890a9686dec225f877ee0e370d81ca65c7ed20c009b0ec.json new file mode 100644 index 0000000000..3661c1a248 --- /dev/null +++ b/nym-api/.sqlx/query-387504dabdb660afb2890a9686dec225f877ee0e370d81ca65c7ed20c009b0ec.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "\n INSERT INTO gateway_status (gateway_details_id, reliability, timestamp) VALUES (?, ?, ?);\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 3 + }, + "nullable": [] + }, + "hash": "387504dabdb660afb2890a9686dec225f877ee0e370d81ca65c7ed20c009b0ec" +} diff --git a/nym-api/.sqlx/query-3f51747b87e7dca5c4da75a99edf04ea6df2b6a8dbc99845be2287fb9b2cec2b.json b/nym-api/.sqlx/query-3f51747b87e7dca5c4da75a99edf04ea6df2b6a8dbc99845be2287fb9b2cec2b.json new file mode 100644 index 0000000000..74ac1ae7d4 --- /dev/null +++ b/nym-api/.sqlx/query-3f51747b87e7dca5c4da75a99edf04ea6df2b6a8dbc99845be2287fb9b2cec2b.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "INSERT INTO monitor_run(timestamp) VALUES (?)", + "describe": { + "columns": [], + "parameters": { + "Right": 1 + }, + "nullable": [] + }, + "hash": "3f51747b87e7dca5c4da75a99edf04ea6df2b6a8dbc99845be2287fb9b2cec2b" +} diff --git a/nym-api/.sqlx/query-4077371f0dccf1b389da97b3f8b290a4095c807eaefd68f3863b0fcec67019e9.json b/nym-api/.sqlx/query-4077371f0dccf1b389da97b3f8b290a4095c807eaefd68f3863b0fcec67019e9.json new file mode 100644 index 0000000000..cc6b558567 --- /dev/null +++ b/nym-api/.sqlx/query-4077371f0dccf1b389da97b3f8b290a4095c807eaefd68f3863b0fcec67019e9.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "INSERT INTO gateway_historical_uptime(gateway_details_id, date, uptime) VALUES (?, ?, ?)", + "describe": { + "columns": [], + "parameters": { + "Right": 3 + }, + "nullable": [] + }, + "hash": "4077371f0dccf1b389da97b3f8b290a4095c807eaefd68f3863b0fcec67019e9" +} diff --git a/nym-api/.sqlx/query-462afe192f5f9bb068a557aa1c5c5f49299eb403049ddef168fc25e3d59edf6f.json b/nym-api/.sqlx/query-462afe192f5f9bb068a557aa1c5c5f49299eb403049ddef168fc25e3d59edf6f.json new file mode 100644 index 0000000000..6d6254d3ba --- /dev/null +++ b/nym-api/.sqlx/query-462afe192f5f9bb068a557aa1c5c5f49299eb403049ddef168fc25e3d59edf6f.json @@ -0,0 +1,20 @@ +{ + "db_name": "SQLite", + "query": "SELECT id FROM mixnode_details WHERE mix_id = ?", + "describe": { + "columns": [ + { + "name": "id", + "ordinal": 0, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + false + ] + }, + "hash": "462afe192f5f9bb068a557aa1c5c5f49299eb403049ddef168fc25e3d59edf6f" +} diff --git a/nym-api/.sqlx/query-4892b8ef3683e015a3f6fc5df9bcd96fd3fbe10e94393f61e4ed8af4d5700da6.json b/nym-api/.sqlx/query-4892b8ef3683e015a3f6fc5df9bcd96fd3fbe10e94393f61e4ed8af4d5700da6.json new file mode 100644 index 0000000000..c99e1af9d9 --- /dev/null +++ b/nym-api/.sqlx/query-4892b8ef3683e015a3f6fc5df9bcd96fd3fbe10e94393f61e4ed8af4d5700da6.json @@ -0,0 +1,26 @@ +{ + "db_name": "SQLite", + "query": "\n SELECT\n absolute_epoch_id as \"absolute_epoch_id: u32\",\n eligible_mixnodes as \"eligible_mixnodes: u32\"\n FROM rewarding_report\n WHERE absolute_epoch_id = ?\n ", + "describe": { + "columns": [ + { + "name": "absolute_epoch_id: u32", + "ordinal": 0, + "type_info": "Int64" + }, + { + "name": "eligible_mixnodes: u32", + "ordinal": 1, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + false, + false + ] + }, + "hash": "4892b8ef3683e015a3f6fc5df9bcd96fd3fbe10e94393f61e4ed8af4d5700da6" +} diff --git a/nym-api/.sqlx/query-498accd22c035ea1b0b887cdaab5d9b9e6c13bce4a2e093439fbfab72bcffc40.json b/nym-api/.sqlx/query-498accd22c035ea1b0b887cdaab5d9b9e6c13bce4a2e093439fbfab72bcffc40.json new file mode 100644 index 0000000000..6fcebdf6be --- /dev/null +++ b/nym-api/.sqlx/query-498accd22c035ea1b0b887cdaab5d9b9e6c13bce4a2e093439fbfab72bcffc40.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "INSERT INTO mixnode_historical_uptime(mixnode_details_id, date, uptime) VALUES (?, ?, ?)", + "describe": { + "columns": [], + "parameters": { + "Right": 3 + }, + "nullable": [] + }, + "hash": "498accd22c035ea1b0b887cdaab5d9b9e6c13bce4a2e093439fbfab72bcffc40" +} diff --git a/nym-api/.sqlx/query-4acb6507c571daff7c4eed6550976bbcd28c6113618a364c009ee92ea72e06aa.json b/nym-api/.sqlx/query-4acb6507c571daff7c4eed6550976bbcd28c6113618a364c009ee92ea72e06aa.json new file mode 100644 index 0000000000..440b559125 --- /dev/null +++ b/nym-api/.sqlx/query-4acb6507c571daff7c4eed6550976bbcd28c6113618a364c009ee92ea72e06aa.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "INSERT INTO partial_bloomfilter(date, parameters, bitmap) VALUES (?, ?, ?)", + "describe": { + "columns": [], + "parameters": { + "Right": 3 + }, + "nullable": [] + }, + "hash": "4acb6507c571daff7c4eed6550976bbcd28c6113618a364c009ee92ea72e06aa" +} diff --git a/nym-api/.sqlx/query-4b3ddffe1cb55032ef7d12bcf462d96b414e44e314d077baba11082d973342cf.json b/nym-api/.sqlx/query-4b3ddffe1cb55032ef7d12bcf462d96b414e44e314d077baba11082d973342cf.json new file mode 100644 index 0000000000..5d5f3d1cbf --- /dev/null +++ b/nym-api/.sqlx/query-4b3ddffe1cb55032ef7d12bcf462d96b414e44e314d077baba11082d973342cf.json @@ -0,0 +1,32 @@ +{ + "db_name": "SQLite", + "query": "\n SELECT epoch_id as \"epoch_id: u32\", start_id, total_issued as \"total_issued: u32\"\n FROM epoch_credentials\n WHERE epoch_id = ?\n ", + "describe": { + "columns": [ + { + "name": "epoch_id: u32", + "ordinal": 0, + "type_info": "Int64" + }, + { + "name": "start_id", + "ordinal": 1, + "type_info": "Int64" + }, + { + "name": "total_issued: u32", + "ordinal": 2, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + false, + false, + false + ] + }, + "hash": "4b3ddffe1cb55032ef7d12bcf462d96b414e44e314d077baba11082d973342cf" +} diff --git a/nym-api/.sqlx/query-4ebee7c6043a84afeb4425abefe58f8182edff025a38e25106e00d97659c522a.json b/nym-api/.sqlx/query-4ebee7c6043a84afeb4425abefe58f8182edff025a38e25106e00d97659c522a.json new file mode 100644 index 0000000000..2c65e43f17 --- /dev/null +++ b/nym-api/.sqlx/query-4ebee7c6043a84afeb4425abefe58f8182edff025a38e25106e00d97659c522a.json @@ -0,0 +1,20 @@ +{ + "db_name": "SQLite", + "query": "SELECT bitmap FROM partial_bloomfilter WHERE date = ? AND parameters = ?", + "describe": { + "columns": [ + { + "name": "bitmap", + "ordinal": 0, + "type_info": "Blob" + } + ], + "parameters": { + "Right": 2 + }, + "nullable": [ + false + ] + }, + "hash": "4ebee7c6043a84afeb4425abefe58f8182edff025a38e25106e00d97659c522a" +} diff --git a/nym-api/.sqlx/query-50f0fdb88474c1cddd70cda9457b62992859d4f585f2efe6c19894ec79ec3cbb.json b/nym-api/.sqlx/query-50f0fdb88474c1cddd70cda9457b62992859d4f585f2efe6c19894ec79ec3cbb.json new file mode 100644 index 0000000000..858733eecb --- /dev/null +++ b/nym-api/.sqlx/query-50f0fdb88474c1cddd70cda9457b62992859d4f585f2efe6c19894ec79ec3cbb.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "\n UPDATE epoch_credentials\n SET total_issued = total_issued + 1\n WHERE epoch_id = ?\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 1 + }, + "nullable": [] + }, + "hash": "50f0fdb88474c1cddd70cda9457b62992859d4f585f2efe6c19894ec79ec3cbb" +} diff --git a/nym-api/.sqlx/query-5125387e3d7383aec751904efe8325750974fe1274729c6981b05cd872121fe6.json b/nym-api/.sqlx/query-5125387e3d7383aec751904efe8325750974fe1274729c6981b05cd872121fe6.json new file mode 100644 index 0000000000..13ee3ffc8f --- /dev/null +++ b/nym-api/.sqlx/query-5125387e3d7383aec751904efe8325750974fe1274729c6981b05cd872121fe6.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "\n DELETE FROM gateway_historical_uptime WHERE gateway_details_id = ?;\n DELETE FROM gateway_status WHERE gateway_details_id = ?;\n DELETE FROM testing_route WHERE gateway_id = ?;\n DELETE FROM gateway_details WHERE id = ?;\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 4 + }, + "nullable": [] + }, + "hash": "5125387e3d7383aec751904efe8325750974fe1274729c6981b05cd872121fe6" +} diff --git a/nym-api/.sqlx/query-59daa1d46c0e24e474cf68a9c31c0689b6becc82c779c838ed608bbb61fcbe97.json b/nym-api/.sqlx/query-59daa1d46c0e24e474cf68a9c31c0689b6becc82c779c838ed608bbb61fcbe97.json new file mode 100644 index 0000000000..bc73184005 --- /dev/null +++ b/nym-api/.sqlx/query-59daa1d46c0e24e474cf68a9c31c0689b6becc82c779c838ed608bbb61fcbe97.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "INSERT INTO partial_expiration_date_signatures(expiration_date, epoch_id, serialised_signatures) VALUES (?, ?, ?)", + "describe": { + "columns": [], + "parameters": { + "Right": 3 + }, + "nullable": [] + }, + "hash": "59daa1d46c0e24e474cf68a9c31c0689b6becc82c779c838ed608bbb61fcbe97" +} diff --git a/nym-api/.sqlx/query-5c0481bd633f56e154a5cd81e3f691dd587208b876b3fa7d37b26f0c60461aa2.json b/nym-api/.sqlx/query-5c0481bd633f56e154a5cd81e3f691dd587208b876b3fa7d37b26f0c60461aa2.json new file mode 100644 index 0000000000..a69ea376f9 --- /dev/null +++ b/nym-api/.sqlx/query-5c0481bd633f56e154a5cd81e3f691dd587208b876b3fa7d37b26f0c60461aa2.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "\n INSERT INTO epoch_credentials\n (epoch_id, start_id, total_issued)\n VALUES (?, ?, ?);\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 3 + }, + "nullable": [] + }, + "hash": "5c0481bd633f56e154a5cd81e3f691dd587208b876b3fa7d37b26f0c60461aa2" +} diff --git a/nym-api/.sqlx/query-5ce6e1f02b4018fe587ae15bba8a2e051c87d6d9bdd228a2ab0604d4ab6d252c.json b/nym-api/.sqlx/query-5ce6e1f02b4018fe587ae15bba8a2e051c87d6d9bdd228a2ab0604d4ab6d252c.json new file mode 100644 index 0000000000..b1fcad92ae --- /dev/null +++ b/nym-api/.sqlx/query-5ce6e1f02b4018fe587ae15bba8a2e051c87d6d9bdd228a2ab0604d4ab6d252c.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "INSERT INTO global_expiration_date_signatures(expiration_date, epoch_id, serialised_signatures) VALUES (?, ?, ?)", + "describe": { + "columns": [], + "parameters": { + "Right": 3 + }, + "nullable": [] + }, + "hash": "5ce6e1f02b4018fe587ae15bba8a2e051c87d6d9bdd228a2ab0604d4ab6d252c" +} diff --git a/nym-api/.sqlx/query-5e3824763c4ef13194876e3cdd65c2da97193c60e8d1a1640c48ba65e18a9faa.json b/nym-api/.sqlx/query-5e3824763c4ef13194876e3cdd65c2da97193c60e8d1a1640c48ba65e18a9faa.json new file mode 100644 index 0000000000..9ff0d9cea2 --- /dev/null +++ b/nym-api/.sqlx/query-5e3824763c4ef13194876e3cdd65c2da97193c60e8d1a1640c48ba65e18a9faa.json @@ -0,0 +1,20 @@ +{ + "db_name": "SQLite", + "query": "SELECT EXISTS (SELECT 1 FROM v3_migration_info) AS 'exists'", + "describe": { + "columns": [ + { + "name": "exists", + "ordinal": 0, + "type_info": "Int" + } + ], + "parameters": { + "Right": 0 + }, + "nullable": [ + null + ] + }, + "hash": "5e3824763c4ef13194876e3cdd65c2da97193c60e8d1a1640c48ba65e18a9faa" +} diff --git a/nym-api/.sqlx/query-5eb13bfbee53b50641f69d4d6b62383c7f43864bffe98642bb8d1cf7c259d7be.json b/nym-api/.sqlx/query-5eb13bfbee53b50641f69d4d6b62383c7f43864bffe98642bb8d1cf7c259d7be.json new file mode 100644 index 0000000000..0f79148335 --- /dev/null +++ b/nym-api/.sqlx/query-5eb13bfbee53b50641f69d4d6b62383c7f43864bffe98642bb8d1cf7c259d7be.json @@ -0,0 +1,26 @@ +{ + "db_name": "SQLite", + "query": "\n SELECT epoch_id as \"epoch_id: u32\", serialised_signatures\n FROM global_expiration_date_signatures\n WHERE expiration_date = ?\n ", + "describe": { + "columns": [ + { + "name": "epoch_id: u32", + "ordinal": 0, + "type_info": "Int64" + }, + { + "name": "serialised_signatures", + "ordinal": 1, + "type_info": "Blob" + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + false, + false + ] + }, + "hash": "5eb13bfbee53b50641f69d4d6b62383c7f43864bffe98642bb8d1cf7c259d7be" +} diff --git a/nym-api/.sqlx/query-66c50aba8c76ef7d3798a3188f81bb16d3ae867f3f1689a6c63c9f75f8ed91ee.json b/nym-api/.sqlx/query-66c50aba8c76ef7d3798a3188f81bb16d3ae867f3f1689a6c63c9f75f8ed91ee.json new file mode 100644 index 0000000000..606a35be1c --- /dev/null +++ b/nym-api/.sqlx/query-66c50aba8c76ef7d3798a3188f81bb16d3ae867f3f1689a6c63c9f75f8ed91ee.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "\n INSERT INTO epoch_credentials\n (epoch_id, start_id, total_issued)\n VALUES (?, ?, ?);\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 3 + }, + "nullable": [] + }, + "hash": "66c50aba8c76ef7d3798a3188f81bb16d3ae867f3f1689a6c63c9f75f8ed91ee" +} diff --git a/nym-api/.sqlx/query-6932664a29aa1ea7ce79b5f584dcf143e2b6ef1831d1f2032e80124cc3986905.json b/nym-api/.sqlx/query-6932664a29aa1ea7ce79b5f584dcf143e2b6ef1831d1f2032e80124cc3986905.json new file mode 100644 index 0000000000..79c84d2924 --- /dev/null +++ b/nym-api/.sqlx/query-6932664a29aa1ea7ce79b5f584dcf143e2b6ef1831d1f2032e80124cc3986905.json @@ -0,0 +1,62 @@ +{ + "db_name": "SQLite", + "query": "\n SELECT\n id,\n epoch_id as \"epoch_id: u32\",\n deposit_id as \"deposit_id: DepositId\",\n partial_credential,\n signature,\n joined_private_commitments,\n expiration_date as \"expiration_date: Date\",\n ticketbook_type_repr as \"ticketbook_type_repr: u8\"\n FROM issued_ticketbook\n WHERE id > ?\n ORDER BY id\n LIMIT ?\n ", + "describe": { + "columns": [ + { + "name": "id", + "ordinal": 0, + "type_info": "Int64" + }, + { + "name": "epoch_id: u32", + "ordinal": 1, + "type_info": "Int64" + }, + { + "name": "deposit_id: DepositId", + "ordinal": 2, + "type_info": "Int64" + }, + { + "name": "partial_credential", + "ordinal": 3, + "type_info": "Blob" + }, + { + "name": "signature", + "ordinal": 4, + "type_info": "Blob" + }, + { + "name": "joined_private_commitments", + "ordinal": 5, + "type_info": "Blob" + }, + { + "name": "expiration_date: Date", + "ordinal": 6, + "type_info": "Date" + }, + { + "name": "ticketbook_type_repr: u8", + "ordinal": 7, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 2 + }, + "nullable": [ + false, + false, + false, + false, + false, + false, + false, + false + ] + }, + "hash": "6932664a29aa1ea7ce79b5f584dcf143e2b6ef1831d1f2032e80124cc3986905" +} diff --git a/nym-api/.sqlx/query-6b88e7f40bba38053e968d2a7198a0c9646120f24c07134ffb0a33cf2fb6b6ed.json b/nym-api/.sqlx/query-6b88e7f40bba38053e968d2a7198a0c9646120f24c07134ffb0a33cf2fb6b6ed.json new file mode 100644 index 0000000000..e063997beb --- /dev/null +++ b/nym-api/.sqlx/query-6b88e7f40bba38053e968d2a7198a0c9646120f24c07134ffb0a33cf2fb6b6ed.json @@ -0,0 +1,68 @@ +{ + "db_name": "SQLite", + "query": "\n SELECT\n gateway_details.id as \"db_id\",\n identity as \"identity_key\",\n reliability as \"reliability: u8\",\n monitor_run.timestamp as \"timestamp!\",\n gateway_id as \"gateway_id!\",\n layer1_mix_id as \"layer1_mix_id!\",\n layer2_mix_id as \"layer2_mix_id!\",\n layer3_mix_id as \"layer3_mix_id!\",\n monitor_run_id as \"monitor_run_id!\"\n FROM gateway_status\n JOIN gateway_details ON gateway_status.gateway_details_id = gateway_details.id\n JOIN monitor_run ON gateway_status.timestamp = monitor_run.timestamp\n JOIN testing_route ON monitor_run.id = testing_route.monitor_run_id\n WHERE identity = ?\n ORDER BY gateway_status.timestamp DESC\n LIMIT ? OFFSET ?\n ", + "describe": { + "columns": [ + { + "name": "db_id", + "ordinal": 0, + "type_info": "Int64" + }, + { + "name": "identity_key", + "ordinal": 1, + "type_info": "Text" + }, + { + "name": "reliability: u8", + "ordinal": 2, + "type_info": "Int64" + }, + { + "name": "timestamp!", + "ordinal": 3, + "type_info": "Int64" + }, + { + "name": "gateway_id!", + "ordinal": 4, + "type_info": "Int64" + }, + { + "name": "layer1_mix_id!", + "ordinal": 5, + "type_info": "Int64" + }, + { + "name": "layer2_mix_id!", + "ordinal": 6, + "type_info": "Int64" + }, + { + "name": "layer3_mix_id!", + "ordinal": 7, + "type_info": "Int64" + }, + { + "name": "monitor_run_id!", + "ordinal": 8, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 3 + }, + "nullable": [ + false, + false, + true, + false, + true, + true, + true, + true, + true + ] + }, + "hash": "6b88e7f40bba38053e968d2a7198a0c9646120f24c07134ffb0a33cf2fb6b6ed" +} diff --git a/nym-api/.sqlx/query-6c894d98a2aaf5bec2261502ec3abf571fd6ae01fa2c1efff6e5ff786dd443f6.json b/nym-api/.sqlx/query-6c894d98a2aaf5bec2261502ec3abf571fd6ae01fa2c1efff6e5ff786dd443f6.json new file mode 100644 index 0000000000..61c9dd9cd5 --- /dev/null +++ b/nym-api/.sqlx/query-6c894d98a2aaf5bec2261502ec3abf571fd6ae01fa2c1efff6e5ff786dd443f6.json @@ -0,0 +1,20 @@ +{ + "db_name": "SQLite", + "query": "SELECT id FROM gateway_details WHERE node_id = ?", + "describe": { + "columns": [ + { + "name": "id", + "ordinal": 0, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + false + ] + }, + "hash": "6c894d98a2aaf5bec2261502ec3abf571fd6ae01fa2c1efff6e5ff786dd443f6" +} diff --git a/nym-api/.sqlx/query-6fb96e0c0229f51fd77fc118841e1f2835a0ad378493b4fc006b7b47bea3bebe.json b/nym-api/.sqlx/query-6fb96e0c0229f51fd77fc118841e1f2835a0ad378493b4fc006b7b47bea3bebe.json new file mode 100644 index 0000000000..b4a035f070 --- /dev/null +++ b/nym-api/.sqlx/query-6fb96e0c0229f51fd77fc118841e1f2835a0ad378493b4fc006b7b47bea3bebe.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "\n INSERT INTO mixnode_status_v2 (mixnode_details_id, reliability, timestamp) VALUES (?, ?, ?);\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 3 + }, + "nullable": [] + }, + "hash": "6fb96e0c0229f51fd77fc118841e1f2835a0ad378493b4fc006b7b47bea3bebe" +} diff --git a/nym-api/.sqlx/query-7276658a125d298043bb2204272bbc68f6bf0e2cee7de52a10c430ea51469589.json b/nym-api/.sqlx/query-7276658a125d298043bb2204272bbc68f6bf0e2cee7de52a10c430ea51469589.json new file mode 100644 index 0000000000..e441e4e642 --- /dev/null +++ b/nym-api/.sqlx/query-7276658a125d298043bb2204272bbc68f6bf0e2cee7de52a10c430ea51469589.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "\n INSERT INTO rewarding_report\n (absolute_epoch_id, eligible_mixnodes)\n VALUES (?, ?);\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 2 + }, + "nullable": [] + }, + "hash": "7276658a125d298043bb2204272bbc68f6bf0e2cee7de52a10c430ea51469589" +} diff --git a/nym-api/.sqlx/query-73bb892f19060693d122774b66bfaa8059135fadc3632a3ba6201cfc5d96482e.json b/nym-api/.sqlx/query-73bb892f19060693d122774b66bfaa8059135fadc3632a3ba6201cfc5d96482e.json new file mode 100644 index 0000000000..e02d48f56e --- /dev/null +++ b/nym-api/.sqlx/query-73bb892f19060693d122774b66bfaa8059135fadc3632a3ba6201cfc5d96482e.json @@ -0,0 +1,26 @@ +{ + "db_name": "SQLite", + "query": "\n SELECT date, uptime\n FROM mixnode_historical_uptime\n JOIN mixnode_details\n ON mixnode_historical_uptime.mixnode_details_id = mixnode_details.id\n WHERE mixnode_details.mix_id = ?\n ORDER BY date ASC\n ", + "describe": { + "columns": [ + { + "name": "date", + "ordinal": 0, + "type_info": "Text" + }, + { + "name": "uptime", + "ordinal": 1, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + true, + true + ] + }, + "hash": "73bb892f19060693d122774b66bfaa8059135fadc3632a3ba6201cfc5d96482e" +} diff --git a/nym-api/.sqlx/query-73ca856950a0157acfd3e2ed07b11aca3d875f67c77e2e7c75653c3f337d594e.json b/nym-api/.sqlx/query-73ca856950a0157acfd3e2ed07b11aca3d875f67c77e2e7c75653c3f337d594e.json new file mode 100644 index 0000000000..aa72f67202 --- /dev/null +++ b/nym-api/.sqlx/query-73ca856950a0157acfd3e2ed07b11aca3d875f67c77e2e7c75653c3f337d594e.json @@ -0,0 +1,26 @@ +{ + "db_name": "SQLite", + "query": "\n SELECT timestamp, reliability as \"reliability: u8\"\n FROM mixnode_status\n JOIN mixnode_details\n ON mixnode_status.mixnode_details_id = mixnode_details.id\n WHERE mixnode_details.mix_id=? AND mixnode_status.timestamp > ?;\n ", + "describe": { + "columns": [ + { + "name": "timestamp", + "ordinal": 0, + "type_info": "Int64" + }, + { + "name": "reliability: u8", + "ordinal": 1, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 2 + }, + "nullable": [ + true, + true + ] + }, + "hash": "73ca856950a0157acfd3e2ed07b11aca3d875f67c77e2e7c75653c3f337d594e" +} diff --git a/nym-api/.sqlx/query-76f3b7ac8537b204607175fd75a63fafad22d5b00caca9cadf9b72f9068760a7.json b/nym-api/.sqlx/query-76f3b7ac8537b204607175fd75a63fafad22d5b00caca9cadf9b72f9068760a7.json new file mode 100644 index 0000000000..1ec491b658 --- /dev/null +++ b/nym-api/.sqlx/query-76f3b7ac8537b204607175fd75a63fafad22d5b00caca9cadf9b72f9068760a7.json @@ -0,0 +1,20 @@ +{ + "db_name": "SQLite", + "query": "SELECT serialised_signatures FROM partial_coin_index_signatures WHERE epoch_id = ?", + "describe": { + "columns": [ + { + "name": "serialised_signatures", + "ordinal": 0, + "type_info": "Blob" + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + false + ] + }, + "hash": "76f3b7ac8537b204607175fd75a63fafad22d5b00caca9cadf9b72f9068760a7" +} diff --git a/nym-api/.sqlx/query-89e5b5b5c1df6609301189e245d93b8498ca8c9960a964fc0ae1d0b07ef2f20f.json b/nym-api/.sqlx/query-89e5b5b5c1df6609301189e245d93b8498ca8c9960a964fc0ae1d0b07ef2f20f.json new file mode 100644 index 0000000000..326c19bc53 --- /dev/null +++ b/nym-api/.sqlx/query-89e5b5b5c1df6609301189e245d93b8498ca8c9960a964fc0ae1d0b07ef2f20f.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "\n INSERT INTO verified_tickets(ticket_data, serial_number, spending_date, verified_at, gateway_id)\n VALUES (?, ?, ?, ?, ?)\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 5 + }, + "nullable": [] + }, + "hash": "89e5b5b5c1df6609301189e245d93b8498ca8c9960a964fc0ae1d0b07ef2f20f" +} diff --git a/nym-api/.sqlx/query-8b1978f7cd1a6281cc0d6528f8ea004e1047fe42b7d74d53c617d20b886e54c1.json b/nym-api/.sqlx/query-8b1978f7cd1a6281cc0d6528f8ea004e1047fe42b7d74d53c617d20b886e54c1.json new file mode 100644 index 0000000000..ecdcbeb97b --- /dev/null +++ b/nym-api/.sqlx/query-8b1978f7cd1a6281cc0d6528f8ea004e1047fe42b7d74d53c617d20b886e54c1.json @@ -0,0 +1,26 @@ +{ + "db_name": "SQLite", + "query": "\n SELECT timestamp, reliability as \"reliability: u8\"\n FROM mixnode_status\n WHERE mixnode_details_id=? AND timestamp > ? AND timestamp < ?;\n ", + "describe": { + "columns": [ + { + "name": "timestamp", + "ordinal": 0, + "type_info": "Int64" + }, + { + "name": "reliability: u8", + "ordinal": 1, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 3 + }, + "nullable": [ + true, + true + ] + }, + "hash": "8b1978f7cd1a6281cc0d6528f8ea004e1047fe42b7d74d53c617d20b886e54c1" +} diff --git a/nym-api/.sqlx/query-924f8eb10c6cbb7f35da6c1bb77e1025442a594dcb5c6401b3dfac7df9c25073.json b/nym-api/.sqlx/query-924f8eb10c6cbb7f35da6c1bb77e1025442a594dcb5c6401b3dfac7df9c25073.json new file mode 100644 index 0000000000..c9cf3e5e09 --- /dev/null +++ b/nym-api/.sqlx/query-924f8eb10c6cbb7f35da6c1bb77e1025442a594dcb5c6401b3dfac7df9c25073.json @@ -0,0 +1,20 @@ +{ + "db_name": "SQLite", + "query": "SELECT identity FROM gateway_details WHERE node_id = ?", + "describe": { + "columns": [ + { + "name": "identity", + "ordinal": 0, + "type_info": "Text" + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + false + ] + }, + "hash": "924f8eb10c6cbb7f35da6c1bb77e1025442a594dcb5c6401b3dfac7df9c25073" +} diff --git a/nym-api/.sqlx/query-93db1709eb08a8badc95ce94e1c28ba3da889468e4b12807aaad117a741d3f11.json b/nym-api/.sqlx/query-93db1709eb08a8badc95ce94e1c28ba3da889468e4b12807aaad117a741d3f11.json new file mode 100644 index 0000000000..6ef9cdf7d2 --- /dev/null +++ b/nym-api/.sqlx/query-93db1709eb08a8badc95ce94e1c28ba3da889468e4b12807aaad117a741d3f11.json @@ -0,0 +1,20 @@ +{ + "db_name": "SQLite", + "query": "\n SELECT COUNT(*) as count FROM\n (\n SELECT monitor_run_id\n FROM testing_route\n WHERE testing_route.gateway_id = ?\n ) testing_route\n JOIN\n (\n SELECT id\n FROM monitor_run\n WHERE monitor_run.timestamp > ?\n ) monitor_run\n ON monitor_run.id = testing_route.monitor_run_id;\n ", + "describe": { + "columns": [ + { + "name": "count", + "ordinal": 0, + "type_info": "Int" + } + ], + "parameters": { + "Right": 2 + }, + "nullable": [ + false + ] + }, + "hash": "93db1709eb08a8badc95ce94e1c28ba3da889468e4b12807aaad117a741d3f11" +} diff --git a/nym-api/.sqlx/query-975fb3c6e38d29f1c9a7d2d67a218bb48f577b228a6053a55b7ac8049993f4f3.json b/nym-api/.sqlx/query-975fb3c6e38d29f1c9a7d2d67a218bb48f577b228a6053a55b7ac8049993f4f3.json new file mode 100644 index 0000000000..6e21adcd90 --- /dev/null +++ b/nym-api/.sqlx/query-975fb3c6e38d29f1c9a7d2d67a218bb48f577b228a6053a55b7ac8049993f4f3.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "\n INSERT INTO bloomfilter_parameters(num_hashes, bitmap_size,sip0_key0, sip0_key1, sip1_key0, sip1_key1)\n VALUES (?, ?, ?, ?, ?, ?)\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 6 + }, + "nullable": [] + }, + "hash": "975fb3c6e38d29f1c9a7d2d67a218bb48f577b228a6053a55b7ac8049993f4f3" +} diff --git a/nym-api/.sqlx/query-9e14089dbc02ea0f64545be769608c4d1ab1e01c3a0f7903cd2667738e0b77e7.json b/nym-api/.sqlx/query-9e14089dbc02ea0f64545be769608c4d1ab1e01c3a0f7903cd2667738e0b77e7.json new file mode 100644 index 0000000000..9b45447a08 --- /dev/null +++ b/nym-api/.sqlx/query-9e14089dbc02ea0f64545be769608c4d1ab1e01c3a0f7903cd2667738e0b77e7.json @@ -0,0 +1,20 @@ +{ + "db_name": "SQLite", + "query": "SELECT serialised_signatures FROM global_coin_index_signatures WHERE epoch_id = ?", + "describe": { + "columns": [ + { + "name": "serialised_signatures", + "ordinal": 0, + "type_info": "Blob" + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + false + ] + }, + "hash": "9e14089dbc02ea0f64545be769608c4d1ab1e01c3a0f7903cd2667738e0b77e7" +} diff --git a/nym-api/.sqlx/query-9f65b370360ff2e0891fdf89233932212254708fec2973eb4d621179d6b975f4.json b/nym-api/.sqlx/query-9f65b370360ff2e0891fdf89233932212254708fec2973eb4d621179d6b975f4.json new file mode 100644 index 0000000000..648001157d --- /dev/null +++ b/nym-api/.sqlx/query-9f65b370360ff2e0891fdf89233932212254708fec2973eb4d621179d6b975f4.json @@ -0,0 +1,26 @@ +{ + "db_name": "SQLite", + "query": "\n SELECT date as \"date!: Date\", uptime as \"uptime!\"\n FROM gateway_historical_uptime\n JOIN gateway_details\n ON gateway_historical_uptime.gateway_details_id = gateway_details.id\n WHERE\n gateway_details.node_id = ?\n AND\n gateway_historical_uptime.date = ?\n ", + "describe": { + "columns": [ + { + "name": "date!: Date", + "ordinal": 0, + "type_info": "Text" + }, + { + "name": "uptime!", + "ordinal": 1, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 2 + }, + "nullable": [ + true, + true + ] + }, + "hash": "9f65b370360ff2e0891fdf89233932212254708fec2973eb4d621179d6b975f4" +} diff --git a/nym-api/.sqlx/query-a100a49b9f24231e915c9f8237183a52545bf6abaa75c2af40a5d63d3b599b97.json b/nym-api/.sqlx/query-a100a49b9f24231e915c9f8237183a52545bf6abaa75c2af40a5d63d3b599b97.json new file mode 100644 index 0000000000..591877b4bd --- /dev/null +++ b/nym-api/.sqlx/query-a100a49b9f24231e915c9f8237183a52545bf6abaa75c2af40a5d63d3b599b97.json @@ -0,0 +1,62 @@ +{ + "db_name": "SQLite", + "query": "\n SELECT\n id,\n epoch_id as \"epoch_id: u32\",\n deposit_id as \"deposit_id: DepositId\",\n partial_credential,\n signature,\n joined_private_commitments,\n expiration_date as \"expiration_date: Date\",\n ticketbook_type_repr as \"ticketbook_type_repr: u8\"\n FROM issued_ticketbook\n WHERE deposit_id = ?\n ", + "describe": { + "columns": [ + { + "name": "id", + "ordinal": 0, + "type_info": "Int64" + }, + { + "name": "epoch_id: u32", + "ordinal": 1, + "type_info": "Int64" + }, + { + "name": "deposit_id: DepositId", + "ordinal": 2, + "type_info": "Int64" + }, + { + "name": "partial_credential", + "ordinal": 3, + "type_info": "Blob" + }, + { + "name": "signature", + "ordinal": 4, + "type_info": "Blob" + }, + { + "name": "joined_private_commitments", + "ordinal": 5, + "type_info": "Blob" + }, + { + "name": "expiration_date: Date", + "ordinal": 6, + "type_info": "Date" + }, + { + "name": "ticketbook_type_repr: u8", + "ordinal": 7, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + false, + false, + false, + false, + false, + false, + false, + false + ] + }, + "hash": "a100a49b9f24231e915c9f8237183a52545bf6abaa75c2af40a5d63d3b599b97" +} diff --git a/nym-api/.sqlx/query-a4054504b9b6088af3221fc04ec79c547933f2fc022d818dc8498396025666f3.json b/nym-api/.sqlx/query-a4054504b9b6088af3221fc04ec79c547933f2fc022d818dc8498396025666f3.json new file mode 100644 index 0000000000..9e5582fd3b --- /dev/null +++ b/nym-api/.sqlx/query-a4054504b9b6088af3221fc04ec79c547933f2fc022d818dc8498396025666f3.json @@ -0,0 +1,62 @@ +{ + "db_name": "SQLite", + "query": "\n SELECT\n id,\n epoch_id as \"epoch_id: u32\",\n deposit_id as \"deposit_id: DepositId\",\n partial_credential,\n signature,\n joined_private_commitments,\n expiration_date as \"expiration_date: Date\",\n ticketbook_type_repr as \"ticketbook_type_repr: u8\"\n FROM issued_ticketbook\n WHERE id = ?\n ", + "describe": { + "columns": [ + { + "name": "id", + "ordinal": 0, + "type_info": "Int64" + }, + { + "name": "epoch_id: u32", + "ordinal": 1, + "type_info": "Int64" + }, + { + "name": "deposit_id: DepositId", + "ordinal": 2, + "type_info": "Int64" + }, + { + "name": "partial_credential", + "ordinal": 3, + "type_info": "Blob" + }, + { + "name": "signature", + "ordinal": 4, + "type_info": "Blob" + }, + { + "name": "joined_private_commitments", + "ordinal": 5, + "type_info": "Blob" + }, + { + "name": "expiration_date: Date", + "ordinal": 6, + "type_info": "Date" + }, + { + "name": "ticketbook_type_repr: u8", + "ordinal": 7, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + false, + false, + false, + false, + false, + false, + false, + false + ] + }, + "hash": "a4054504b9b6088af3221fc04ec79c547933f2fc022d818dc8498396025666f3" +} diff --git a/nym-api/.sqlx/query-a4558a100c6fa20855b3475acb88f9d48a84c539c779057da0d044430e3835f3.json b/nym-api/.sqlx/query-a4558a100c6fa20855b3475acb88f9d48a84c539c779057da0d044430e3835f3.json new file mode 100644 index 0000000000..191109e1fc --- /dev/null +++ b/nym-api/.sqlx/query-a4558a100c6fa20855b3475acb88f9d48a84c539c779057da0d044430e3835f3.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "INSERT INTO ticket_providers(gateway_address) VALUES (?)", + "describe": { + "columns": [], + "parameters": { + "Right": 1 + }, + "nullable": [] + }, + "hash": "a4558a100c6fa20855b3475acb88f9d48a84c539c779057da0d044430e3835f3" +} diff --git a/nym-api/.sqlx/query-a59d870f936ab133f35bb0a49f8bc2406802120ef5135e86936d6f24155ff0b3.json b/nym-api/.sqlx/query-a59d870f936ab133f35bb0a49f8bc2406802120ef5135e86936d6f24155ff0b3.json new file mode 100644 index 0000000000..a17555d965 --- /dev/null +++ b/nym-api/.sqlx/query-a59d870f936ab133f35bb0a49f8bc2406802120ef5135e86936d6f24155ff0b3.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "UPDATE partial_bloomfilter SET bitmap = ? WHERE date = ?", + "describe": { + "columns": [], + "parameters": { + "Right": 2 + }, + "nullable": [] + }, + "hash": "a59d870f936ab133f35bb0a49f8bc2406802120ef5135e86936d6f24155ff0b3" +} diff --git a/nym-api/.sqlx/query-af45b384ee5caa4f9bac1fa314239a8455e023dcdea1b0b2674cd1ea48d65919.json b/nym-api/.sqlx/query-af45b384ee5caa4f9bac1fa314239a8455e023dcdea1b0b2674cd1ea48d65919.json new file mode 100644 index 0000000000..0e5185d864 --- /dev/null +++ b/nym-api/.sqlx/query-af45b384ee5caa4f9bac1fa314239a8455e023dcdea1b0b2674cd1ea48d65919.json @@ -0,0 +1,20 @@ +{ + "db_name": "SQLite", + "query": "\n INSERT OR IGNORE INTO mixnode_details_v2(node_id, identity_key) VALUES (?, ?);\n SELECT id FROM mixnode_details_v2 WHERE node_id = ?;\n ", + "describe": { + "columns": [ + { + "name": "id", + "ordinal": 0, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 3 + }, + "nullable": [ + false + ] + }, + "hash": "af45b384ee5caa4f9bac1fa314239a8455e023dcdea1b0b2674cd1ea48d65919" +} diff --git a/nym-api/.sqlx/query-af7b333e919cf139670c9c6436531a6bd450652e2a4e09e8be910b58ad61ee14.json b/nym-api/.sqlx/query-af7b333e919cf139670c9c6436531a6bd450652e2a4e09e8be910b58ad61ee14.json new file mode 100644 index 0000000000..58eb2b5b63 --- /dev/null +++ b/nym-api/.sqlx/query-af7b333e919cf139670c9c6436531a6bd450652e2a4e09e8be910b58ad61ee14.json @@ -0,0 +1,20 @@ +{ + "db_name": "SQLite", + "query": "\n SELECT AVG(reliability) as \"reliability: f32\" FROM gateway_status\n WHERE gateway_details_id= ? AND timestamp >= ? AND timestamp <= ?\n ", + "describe": { + "columns": [ + { + "name": "reliability: f32", + "ordinal": 0, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 3 + }, + "nullable": [ + true + ] + }, + "hash": "af7b333e919cf139670c9c6436531a6bd450652e2a4e09e8be910b58ad61ee14" +} diff --git a/nym-api/.sqlx/query-b657ab34d60dcda8a4bb1803db65d57002331d709068feac5ccad6632dbd046f.json b/nym-api/.sqlx/query-b657ab34d60dcda8a4bb1803db65d57002331d709068feac5ccad6632dbd046f.json new file mode 100644 index 0000000000..c7305db1cd --- /dev/null +++ b/nym-api/.sqlx/query-b657ab34d60dcda8a4bb1803db65d57002331d709068feac5ccad6632dbd046f.json @@ -0,0 +1,20 @@ +{ + "db_name": "SQLite", + "query": "SELECT node_id as \"node_id: NodeId\" FROM gateway_details WHERE identity = ?", + "describe": { + "columns": [ + { + "name": "node_id: NodeId", + "ordinal": 0, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + false + ] + }, + "hash": "b657ab34d60dcda8a4bb1803db65d57002331d709068feac5ccad6632dbd046f" +} diff --git a/nym-api/.sqlx/query-b72420d03ee03ee3506e7b2a97667f1481269877ef2eea32a673f4ba2fbdb498.json b/nym-api/.sqlx/query-b72420d03ee03ee3506e7b2a97667f1481269877ef2eea32a673f4ba2fbdb498.json new file mode 100644 index 0000000000..eb8e65e763 --- /dev/null +++ b/nym-api/.sqlx/query-b72420d03ee03ee3506e7b2a97667f1481269877ef2eea32a673f4ba2fbdb498.json @@ -0,0 +1,32 @@ +{ + "db_name": "SQLite", + "query": "\n SELECT DISTINCT identity_key, mix_id as \"mix_id: NodeId\", id\n FROM mixnode_details\n JOIN mixnode_status\n ON mixnode_details.id = mixnode_status.mixnode_details_id\n WHERE EXISTS (\n SELECT 1 FROM mixnode_status WHERE timestamp > ? AND timestamp < ?\n )\n ", + "describe": { + "columns": [ + { + "name": "identity_key", + "ordinal": 0, + "type_info": "Text" + }, + { + "name": "mix_id: NodeId", + "ordinal": 1, + "type_info": "Int64" + }, + { + "name": "id", + "ordinal": 2, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 2 + }, + "nullable": [ + false, + false, + false + ] + }, + "hash": "b72420d03ee03ee3506e7b2a97667f1481269877ef2eea32a673f4ba2fbdb498" +} diff --git a/nym-api/.sqlx/query-c19e1b3768bf2929407599e6e8783ead09f4d7319b7997fa2a9bb628f9404166.json b/nym-api/.sqlx/query-c19e1b3768bf2929407599e6e8783ead09f4d7319b7997fa2a9bb628f9404166.json new file mode 100644 index 0000000000..0c6d2f6072 --- /dev/null +++ b/nym-api/.sqlx/query-c19e1b3768bf2929407599e6e8783ead09f4d7319b7997fa2a9bb628f9404166.json @@ -0,0 +1,26 @@ +{ + "db_name": "SQLite", + "query": "\n SELECT\n d.mix_id as \"mix_id: NodeId\",\n AVG(s.reliability) as \"value: f32\"\n FROM\n mixnode_details d\n JOIN\n mixnode_status s on d.id = s.mixnode_details_id\n WHERE\n timestamp >= ? AND\n timestamp <= ?\n GROUP BY 1\n ", + "describe": { + "columns": [ + { + "name": "mix_id: NodeId", + "ordinal": 0, + "type_info": "Int64" + }, + { + "name": "value: f32", + "ordinal": 1, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 2 + }, + "nullable": [ + false, + true + ] + }, + "hash": "c19e1b3768bf2929407599e6e8783ead09f4d7319b7997fa2a9bb628f9404166" +} diff --git a/nym-api/.sqlx/query-c8927b6e408f470c2fc5d971e9a6a63bf5797c5d133414407b42bacbc75885db.json b/nym-api/.sqlx/query-c8927b6e408f470c2fc5d971e9a6a63bf5797c5d133414407b42bacbc75885db.json new file mode 100644 index 0000000000..fefa1d5f4e --- /dev/null +++ b/nym-api/.sqlx/query-c8927b6e408f470c2fc5d971e9a6a63bf5797c5d133414407b42bacbc75885db.json @@ -0,0 +1,20 @@ +{ + "db_name": "SQLite", + "query": "\n SELECT serial_number\n FROM verified_tickets\n WHERE gateway_id = ?\n AND verified_at > ?\n ORDER BY verified_at ASC\n LIMIT 65535\n ", + "describe": { + "columns": [ + { + "name": "serial_number", + "ordinal": 0, + "type_info": "Blob" + } + ], + "parameters": { + "Right": 2 + }, + "nullable": [ + false + ] + }, + "hash": "c8927b6e408f470c2fc5d971e9a6a63bf5797c5d133414407b42bacbc75885db" +} diff --git a/nym-api/.sqlx/query-c89cfd911d0a2406e988bfcf95c5a6d398c23b20b6b91575f75fef228701c171.json b/nym-api/.sqlx/query-c89cfd911d0a2406e988bfcf95c5a6d398c23b20b6b91575f75fef228701c171.json new file mode 100644 index 0000000000..e1e680e7bf --- /dev/null +++ b/nym-api/.sqlx/query-c89cfd911d0a2406e988bfcf95c5a6d398c23b20b6b91575f75fef228701c171.json @@ -0,0 +1,20 @@ +{ + "db_name": "SQLite", + "query": "\n INSERT OR IGNORE INTO gateway_details_v2(identity, node_id) VALUES (?, ?);\n SELECT id FROM gateway_details_v2 WHERE identity = ?;\n ", + "describe": { + "columns": [ + { + "name": "id", + "ordinal": 0, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 3 + }, + "nullable": [ + false + ] + }, + "hash": "c89cfd911d0a2406e988bfcf95c5a6d398c23b20b6b91575f75fef228701c171" +} diff --git a/nym-api/.sqlx/query-cf202aa0360254ef961b98070970713387eb2b87d211827cc3e48c51e1104083.json b/nym-api/.sqlx/query-cf202aa0360254ef961b98070970713387eb2b87d211827cc3e48c51e1104083.json new file mode 100644 index 0000000000..a31cc32c92 --- /dev/null +++ b/nym-api/.sqlx/query-cf202aa0360254ef961b98070970713387eb2b87d211827cc3e48c51e1104083.json @@ -0,0 +1,20 @@ +{ + "db_name": "SQLite", + "query": "\n SELECT AVG(reliability) as \"reliability: f32\" FROM mixnode_status_v2\n WHERE mixnode_details_id= ? AND timestamp >= ? AND timestamp <= ?\n ", + "describe": { + "columns": [ + { + "name": "reliability: f32", + "ordinal": 0, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 3 + }, + "nullable": [ + true + ] + }, + "hash": "cf202aa0360254ef961b98070970713387eb2b87d211827cc3e48c51e1104083" +} diff --git a/nym-api/.sqlx/query-d8d720912f74c3daf0d46dc4b5407e73d2584cc8a5a54e5dff82a0dbc1c9d908.json b/nym-api/.sqlx/query-d8d720912f74c3daf0d46dc4b5407e73d2584cc8a5a54e5dff82a0dbc1c9d908.json new file mode 100644 index 0000000000..7ef2c1c01d --- /dev/null +++ b/nym-api/.sqlx/query-d8d720912f74c3daf0d46dc4b5407e73d2584cc8a5a54e5dff82a0dbc1c9d908.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "\n INSERT INTO gateway_status_v2 (gateway_details_id, reliability, timestamp) VALUES (?, ?, ?);\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 3 + }, + "nullable": [] + }, + "hash": "d8d720912f74c3daf0d46dc4b5407e73d2584cc8a5a54e5dff82a0dbc1c9d908" +} diff --git a/nym-api/.sqlx/query-d95a42f50209863e51537e98f0e74f6ca036890aa01c26d01167642ea2d8ff3d.json b/nym-api/.sqlx/query-d95a42f50209863e51537e98f0e74f6ca036890aa01c26d01167642ea2d8ff3d.json new file mode 100644 index 0000000000..3b80faa506 --- /dev/null +++ b/nym-api/.sqlx/query-d95a42f50209863e51537e98f0e74f6ca036890aa01c26d01167642ea2d8ff3d.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "UPDATE gateway_details SET node_id = ? WHERE identity = ?", + "describe": { + "columns": [], + "parameters": { + "Right": 2 + }, + "nullable": [] + }, + "hash": "d95a42f50209863e51537e98f0e74f6ca036890aa01c26d01167642ea2d8ff3d" +} diff --git a/nym-api/.sqlx/query-dbf79ace08b8e6fe97df0899fd0177ba591e38b513ad5aa9ed4df70e6bf7afd7.json b/nym-api/.sqlx/query-dbf79ace08b8e6fe97df0899fd0177ba591e38b513ad5aa9ed4df70e6bf7afd7.json new file mode 100644 index 0000000000..a9160fa522 --- /dev/null +++ b/nym-api/.sqlx/query-dbf79ace08b8e6fe97df0899fd0177ba591e38b513ad5aa9ed4df70e6bf7afd7.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "INSERT INTO master_verification_key(epoch_id, serialised_key) VALUES (?, ?)", + "describe": { + "columns": [], + "parameters": { + "Right": 2 + }, + "nullable": [] + }, + "hash": "dbf79ace08b8e6fe97df0899fd0177ba591e38b513ad5aa9ed4df70e6bf7afd7" +} diff --git a/nym-api/.sqlx/query-dc78354f374f0fb71feef0b219cefb12a0b84ef905ab08ef0adcbc2535b3bbca.json b/nym-api/.sqlx/query-dc78354f374f0fb71feef0b219cefb12a0b84ef905ab08ef0adcbc2535b3bbca.json new file mode 100644 index 0000000000..ea3c140049 --- /dev/null +++ b/nym-api/.sqlx/query-dc78354f374f0fb71feef0b219cefb12a0b84ef905ab08ef0adcbc2535b3bbca.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "INSERT INTO global_coin_index_signatures(epoch_id, serialised_signatures) VALUES (?, ?)", + "describe": { + "columns": [], + "parameters": { + "Right": 2 + }, + "nullable": [] + }, + "hash": "dc78354f374f0fb71feef0b219cefb12a0b84ef905ab08ef0adcbc2535b3bbca" +} diff --git a/nym-api/.sqlx/query-dcc526c3855fea0ffbd73a0fb563cf10c707e356c767f8399452b56f044a1f6e.json b/nym-api/.sqlx/query-dcc526c3855fea0ffbd73a0fb563cf10c707e356c767f8399452b56f044a1f6e.json new file mode 100644 index 0000000000..3a8afcec25 --- /dev/null +++ b/nym-api/.sqlx/query-dcc526c3855fea0ffbd73a0fb563cf10c707e356c767f8399452b56f044a1f6e.json @@ -0,0 +1,20 @@ +{ + "db_name": "SQLite", + "query": "\n SELECT COUNT(*) as count\n FROM gateway_status\n JOIN monitor_run ON gateway_status.timestamp = monitor_run.timestamp\n JOIN testing_route ON monitor_run.id = testing_route.monitor_run_id\n WHERE gateway_details_id = ?\n ", + "describe": { + "columns": [ + { + "name": "count", + "ordinal": 0, + "type_info": "Int" + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + false + ] + }, + "hash": "dcc526c3855fea0ffbd73a0fb563cf10c707e356c767f8399452b56f044a1f6e" +} diff --git a/nym-api/.sqlx/query-e55db4def70689c061d0e07115a21068431575afd2be8afafce1a7fb13507e7e.json b/nym-api/.sqlx/query-e55db4def70689c061d0e07115a21068431575afd2be8afafce1a7fb13507e7e.json new file mode 100644 index 0000000000..8d314d07f8 --- /dev/null +++ b/nym-api/.sqlx/query-e55db4def70689c061d0e07115a21068431575afd2be8afafce1a7fb13507e7e.json @@ -0,0 +1,20 @@ +{ + "db_name": "SQLite", + "query": "SELECT EXISTS (SELECT 1 FROM mixnode_historical_uptime WHERE date = ?) AS 'exists'", + "describe": { + "columns": [ + { + "name": "exists", + "ordinal": 0, + "type_info": "Int" + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + null + ] + }, + "hash": "e55db4def70689c061d0e07115a21068431575afd2be8afafce1a7fb13507e7e" +} diff --git a/nym-api/.sqlx/query-f055560483e843929fd93dc269f9650c707bc10db50aacc7988763320318bf2c.json b/nym-api/.sqlx/query-f055560483e843929fd93dc269f9650c707bc10db50aacc7988763320318bf2c.json new file mode 100644 index 0000000000..661d52138e --- /dev/null +++ b/nym-api/.sqlx/query-f055560483e843929fd93dc269f9650c707bc10db50aacc7988763320318bf2c.json @@ -0,0 +1,20 @@ +{ + "db_name": "SQLite", + "query": "\n SELECT COUNT(*) as count FROM\n (\n SELECT monitor_run_id\n FROM testing_route\n WHERE testing_route.layer1_mix_id = ? OR testing_route.layer2_mix_id = ? OR testing_route.layer3_mix_id = ?\n ) testing_route\n JOIN\n (\n SELECT id\n FROM monitor_run\n WHERE monitor_run.timestamp > ?\n ) monitor_run\n ON monitor_run.id = testing_route.monitor_run_id;\n ", + "describe": { + "columns": [ + { + "name": "count", + "ordinal": 0, + "type_info": "Int" + } + ], + "parameters": { + "Right": 4 + }, + "nullable": [ + false + ] + }, + "hash": "f055560483e843929fd93dc269f9650c707bc10db50aacc7988763320318bf2c" +} diff --git a/nym-api/.sqlx/query-f19865730e1406df9bab136bab47c9bba85c3a07e7f5cd689a6926dcf269429d.json b/nym-api/.sqlx/query-f19865730e1406df9bab136bab47c9bba85c3a07e7f5cd689a6926dcf269429d.json new file mode 100644 index 0000000000..2409d0d31d --- /dev/null +++ b/nym-api/.sqlx/query-f19865730e1406df9bab136bab47c9bba85c3a07e7f5cd689a6926dcf269429d.json @@ -0,0 +1,20 @@ +{ + "db_name": "SQLite", + "query": "SELECT serialised_key FROM master_verification_key WHERE epoch_id = ?", + "describe": { + "columns": [ + { + "name": "serialised_key", + "ordinal": 0, + "type_info": "Blob" + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + false + ] + }, + "hash": "f19865730e1406df9bab136bab47c9bba85c3a07e7f5cd689a6926dcf269429d" +} diff --git a/nym-api/.sqlx/query-f777c5a8b0a4c2b516b00c4dc582a86e9c93587a7acab0ac5149579bb1914569.json b/nym-api/.sqlx/query-f777c5a8b0a4c2b516b00c4dc582a86e9c93587a7acab0ac5149579bb1914569.json new file mode 100644 index 0000000000..987eee80a8 --- /dev/null +++ b/nym-api/.sqlx/query-f777c5a8b0a4c2b516b00c4dc582a86e9c93587a7acab0ac5149579bb1914569.json @@ -0,0 +1,26 @@ +{ + "db_name": "SQLite", + "query": "\n SELECT date as \"date!: Date\", uptime as \"uptime!\"\n FROM mixnode_historical_uptime\n JOIN mixnode_details\n ON mixnode_historical_uptime.mixnode_details_id = mixnode_details.id\n WHERE\n mixnode_details.mix_id = ?\n AND\n mixnode_historical_uptime.date = ?\n ", + "describe": { + "columns": [ + { + "name": "date!: Date", + "ordinal": 0, + "type_info": "Text" + }, + { + "name": "uptime!", + "ordinal": 1, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 2 + }, + "nullable": [ + true, + true + ] + }, + "hash": "f777c5a8b0a4c2b516b00c4dc582a86e9c93587a7acab0ac5149579bb1914569" +} diff --git a/nym-api/.sqlx/query-f853af3ddd1e48f9805d9bf685b0b624bfee5089e0681208aa4ef0d9ae9a896e.json b/nym-api/.sqlx/query-f853af3ddd1e48f9805d9bf685b0b624bfee5089e0681208aa4ef0d9ae9a896e.json new file mode 100644 index 0000000000..72064216a0 --- /dev/null +++ b/nym-api/.sqlx/query-f853af3ddd1e48f9805d9bf685b0b624bfee5089e0681208aa4ef0d9ae9a896e.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "\n INSERT INTO mixnode_status (mixnode_details_id, reliability, timestamp) VALUES (?, ?, ?);\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 3 + }, + "nullable": [] + }, + "hash": "f853af3ddd1e48f9805d9bf685b0b624bfee5089e0681208aa4ef0d9ae9a896e" +} diff --git a/nym-api/.sqlx/query-f94d1b21ee833f0619ba1c26b747bed54392c9064ac3eff35ae32933221aa33f.json b/nym-api/.sqlx/query-f94d1b21ee833f0619ba1c26b747bed54392c9064ac3eff35ae32933221aa33f.json new file mode 100644 index 0000000000..3ef0dd10a6 --- /dev/null +++ b/nym-api/.sqlx/query-f94d1b21ee833f0619ba1c26b747bed54392c9064ac3eff35ae32933221aa33f.json @@ -0,0 +1,74 @@ +{ + "db_name": "SQLite", + "query": "\n SELECT\n mixnode_details.id as \"db_id\",\n mix_id as \"mix_id!\",\n identity_key,\n reliability as \"reliability: u8\",\n monitor_run.timestamp as \"timestamp!\",\n gateway_id as \"gateway_id!\",\n layer1_mix_id as \"layer1_mix_id!\",\n layer2_mix_id as \"layer2_mix_id!\",\n layer3_mix_id as \"layer3_mix_id!\",\n monitor_run_id as \"monitor_run_id!\"\n FROM mixnode_status\n JOIN mixnode_details ON mixnode_status.mixnode_details_id = mixnode_details.id\n JOIN monitor_run ON mixnode_status.timestamp = monitor_run.timestamp\n JOIN testing_route ON monitor_run.id = testing_route.monitor_run_id\n WHERE mix_id = ?\n ORDER BY mixnode_status.timestamp DESC\n LIMIT ? OFFSET ?\n ", + "describe": { + "columns": [ + { + "name": "db_id", + "ordinal": 0, + "type_info": "Int64" + }, + { + "name": "mix_id!", + "ordinal": 1, + "type_info": "Int64" + }, + { + "name": "identity_key", + "ordinal": 2, + "type_info": "Text" + }, + { + "name": "reliability: u8", + "ordinal": 3, + "type_info": "Int64" + }, + { + "name": "timestamp!", + "ordinal": 4, + "type_info": "Int64" + }, + { + "name": "gateway_id!", + "ordinal": 5, + "type_info": "Int64" + }, + { + "name": "layer1_mix_id!", + "ordinal": 6, + "type_info": "Int64" + }, + { + "name": "layer2_mix_id!", + "ordinal": 7, + "type_info": "Int64" + }, + { + "name": "layer3_mix_id!", + "ordinal": 8, + "type_info": "Int64" + }, + { + "name": "monitor_run_id!", + "ordinal": 9, + "type_info": "Int64" + } + ], + "parameters": { + "Right": 3 + }, + "nullable": [ + false, + false, + false, + true, + false, + true, + true, + true, + true, + true + ] + }, + "hash": "f94d1b21ee833f0619ba1c26b747bed54392c9064ac3eff35ae32933221aa33f" +} diff --git a/nym-api/.sqlx/query-fbf83213ff8ccd0b8c7de24a066842fdd1b57d9082e56d4c488cc12e415e5db7.json b/nym-api/.sqlx/query-fbf83213ff8ccd0b8c7de24a066842fdd1b57d9082e56d4c488cc12e415e5db7.json new file mode 100644 index 0000000000..632962c8c7 --- /dev/null +++ b/nym-api/.sqlx/query-fbf83213ff8ccd0b8c7de24a066842fdd1b57d9082e56d4c488cc12e415e5db7.json @@ -0,0 +1,20 @@ +{ + "db_name": "SQLite", + "query": "\n SELECT serial_number\n FROM verified_tickets\n WHERE spending_date = ?\n ", + "describe": { + "columns": [ + { + "name": "serial_number", + "ordinal": 0, + "type_info": "Blob" + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + false + ] + }, + "hash": "fbf83213ff8ccd0b8c7de24a066842fdd1b57d9082e56d4c488cc12e415e5db7" +} diff --git a/nym-api/.sqlx/query-fe9c8ec99f8a9c6a41087c870fb9e27a24aada3a8ac681f4f8c7f58941e35502.json b/nym-api/.sqlx/query-fe9c8ec99f8a9c6a41087c870fb9e27a24aada3a8ac681f4f8c7f58941e35502.json new file mode 100644 index 0000000000..802a97ff5f --- /dev/null +++ b/nym-api/.sqlx/query-fe9c8ec99f8a9c6a41087c870fb9e27a24aada3a8ac681f4f8c7f58941e35502.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "DELETE FROM verified_tickets WHERE spending_date > ?", + "describe": { + "columns": [], + "parameters": { + "Right": 1 + }, + "nullable": [] + }, + "hash": "fe9c8ec99f8a9c6a41087c870fb9e27a24aada3a8ac681f4f8c7f58941e35502" +} diff --git a/nym-api/src/ecash/storage/manager.rs b/nym-api/src/ecash/storage/manager.rs index 0e5169fe5c..68d39a6a92 100644 --- a/nym-api/src/ecash/storage/manager.rs +++ b/nym-api/src/ecash/storage/manager.rs @@ -43,7 +43,7 @@ pub trait EcashStorageManagerExt { credential_id: i64, ) -> Result<(), sqlx::Error>; - /// Attempts to retrieve an issued credential from the data store. + /// Attempts to retrieve an issued credential from the data store. /// /// # Arguments /// @@ -76,7 +76,7 @@ pub trait EcashStorageManagerExt { ticketbook_type_repr: u8, ) -> Result; - /// Attempts to retrieve issued credentials from the data store using provided ids. + /// Attempts to retrieve issued credentials from the data store using provided ids. /// /// # Arguments /// @@ -86,7 +86,7 @@ pub trait EcashStorageManagerExt { credential_ids: Vec, ) -> Result, sqlx::Error>; - /// Attempts to retrieve issued credentials from the data store using pagination specification. + /// Attempts to retrieve issued credentials from the data store using pagination specification. /// /// # Arguments /// @@ -260,7 +260,7 @@ impl EcashStorageManagerExt for StorageManager { sqlx::query!( r#" - INSERT INTO epoch_credentials + INSERT INTO epoch_credentials (epoch_id, start_id, total_issued) VALUES (?, ?, ?); "#, @@ -306,7 +306,7 @@ impl EcashStorageManagerExt for StorageManager { "#, epoch_id_downcasted ) - .fetch_optional(&mut tx) + .fetch_optional(&mut *tx) .await? { // the entry has existed before -> update it @@ -314,33 +314,33 @@ impl EcashStorageManagerExt for StorageManager { // no credentials has been issued -> we have to set the `start_id` sqlx::query!( r#" - UPDATE epoch_credentials + UPDATE epoch_credentials SET total_issued = 1, start_id = ? WHERE epoch_id = ? "#, credential_id, epoch_id_downcasted ) - .execute(&mut tx) + .execute(&mut *tx) .await?; } else { // we have issued credentials in this epoch before -> just increment `total_issued` sqlx::query!( r#" - UPDATE epoch_credentials - SET total_issued = total_issued + 1 + UPDATE epoch_credentials + SET total_issued = total_issued + 1 WHERE epoch_id = ? "#, epoch_id_downcasted ) - .execute(&mut tx) + .execute(&mut *tx) .await?; } } else { // the entry has never been created -> probably some race condition; create it instead sqlx::query!( r#" - INSERT INTO epoch_credentials + INSERT INTO epoch_credentials (epoch_id, start_id, total_issued) VALUES (?, ?, ?); "#, @@ -348,7 +348,7 @@ impl EcashStorageManagerExt for StorageManager { credential_id, 1 ) - .execute(&mut tx) + .execute(&mut *tx) .await?; } @@ -356,7 +356,7 @@ impl EcashStorageManagerExt for StorageManager { tx.commit().await } - /// Attempts to retrieve an issued credential from the data store. + /// Attempts to retrieve an issued credential from the data store. /// /// # Arguments /// @@ -368,7 +368,7 @@ impl EcashStorageManagerExt for StorageManager { sqlx::query_as!( IssuedTicketbook, r#" - SELECT + SELECT id, epoch_id as "epoch_id: u32", deposit_id as "deposit_id: DepositId", @@ -398,7 +398,7 @@ impl EcashStorageManagerExt for StorageManager { sqlx::query_as!( IssuedTicketbook, r#" - SELECT + SELECT id, epoch_id as "epoch_id: u32", deposit_id as "deposit_id: DepositId", @@ -440,7 +440,7 @@ impl EcashStorageManagerExt for StorageManager { Ok(row_id) } - /// Attempts to retrieve issued credentials from the data store using provided ids. + /// Attempts to retrieve issued credentials from the data store using provided ids. /// /// # Arguments /// @@ -461,7 +461,7 @@ impl EcashStorageManagerExt for StorageManager { query.fetch_all(&self.connection_pool).await } - /// Attempts to retrieve issued credentials from the data store using pagination specification. + /// Attempts to retrieve issued credentials from the data store using pagination specification. /// /// # Arguments /// @@ -475,7 +475,7 @@ impl EcashStorageManagerExt for StorageManager { sqlx::query_as!( IssuedTicketbook, r#" - SELECT + SELECT id, epoch_id as "epoch_id: u32", deposit_id as "deposit_id: DepositId", @@ -564,7 +564,7 @@ impl EcashStorageManagerExt for StorageManager { WHERE gateway_id = ? AND verified_at > ? ORDER BY verified_at ASC - LIMIT 65535 + LIMIT 65535 "#, provider_id, since @@ -582,7 +582,7 @@ impl EcashStorageManagerExt for StorageManager { r#" SELECT serial_number FROM verified_tickets - WHERE spending_date = ? + WHERE spending_date = ? "#, date ) diff --git a/nym-api/src/support/storage/manager.rs b/nym-api/src/support/storage/manager.rs index f3f79ce128..5b4093ecbe 100644 --- a/nym-api/src/support/storage/manager.rs +++ b/nym-api/src/support/storage/manager.rs @@ -553,7 +553,7 @@ impl StorageManager { mixnode_result.identity, mixnode_result.node_id, ) - .fetch_one(&mut tx) + .fetch_one(&mut *tx) .await? .id; @@ -566,7 +566,7 @@ impl StorageManager { mixnode_result.reliability, timestamp ) - .execute(&mut tx) + .execute(&mut *tx) .await?; } @@ -594,7 +594,7 @@ impl StorageManager { mixnode_result.identity, mixnode_result.node_id, ) - .fetch_one(&mut tx) + .fetch_one(&mut *tx) .await? .id; @@ -607,7 +607,7 @@ impl StorageManager { mixnode_result.reliability, timestamp ) - .execute(&mut tx) + .execute(&mut *tx) .await?; } @@ -643,7 +643,7 @@ impl StorageManager { gateway_result.identity, gateway_result.identity, ) - .fetch_one(&mut tx) + .fetch_one(&mut *tx) .await? .id; @@ -656,7 +656,7 @@ impl StorageManager { gateway_result.reliability, timestamp ) - .execute(&mut tx) + .execute(&mut *tx) .await?; } @@ -688,7 +688,7 @@ impl StorageManager { gateway_result.node_id, gateway_result.identity, ) - .fetch_one(&mut tx) + .fetch_one(&mut *tx) .await? .id; @@ -701,7 +701,7 @@ impl StorageManager { gateway_result.reliability, timestamp ) - .execute(&mut tx) + .execute(&mut *tx) .await?; } @@ -752,14 +752,14 @@ impl StorageManager { r#" SELECT COUNT(*) as count FROM ( - SELECT monitor_run_id - FROM testing_route + SELECT monitor_run_id + FROM testing_route WHERE testing_route.layer1_mix_id = ? OR testing_route.layer2_mix_id = ? OR testing_route.layer3_mix_id = ? ) testing_route - JOIN + JOIN ( - SELECT id - FROM monitor_run + SELECT id + FROM monitor_run WHERE monitor_run.timestamp > ? ) monitor_run ON monitor_run.id = testing_route.monitor_run_id; @@ -791,14 +791,14 @@ impl StorageManager { r#" SELECT COUNT(*) as count FROM ( - SELECT monitor_run_id - FROM testing_route + SELECT monitor_run_id + FROM testing_route WHERE testing_route.gateway_id = ? ) testing_route - JOIN + JOIN ( - SELECT id - FROM monitor_run + SELECT id + FROM monitor_run WHERE monitor_run.timestamp > ? ) monitor_run ON monitor_run.id = testing_route.monitor_run_id; @@ -824,7 +824,7 @@ impl StorageManager { ) .fetch_one(&self.connection_pool) .await - .map(|result| result.exists == 1) + .map(|result| result.exists == Some(1)) } /// Creates new entry for mixnode historical uptime @@ -1051,10 +1051,10 @@ impl StorageManager { sqlx::query_as!( RewardingReport, r#" - SELECT + SELECT absolute_epoch_id as "absolute_epoch_id: u32", eligible_mixnodes as "eligible_mixnodes: u32" - FROM rewarding_report + FROM rewarding_report WHERE absolute_epoch_id = ? "#, absolute_epoch_id @@ -1268,7 +1268,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 == 1) + .map(|result| result.exists == Some(1)) } pub(crate) async fn set_v3_migration_completion(&self) -> Result<(), sqlx::Error> { diff --git a/nym-api/src/support/storage/mod.rs b/nym-api/src/support/storage/mod.rs index e647adf7d0..60235f0a51 100644 --- a/nym-api/src/support/storage/mod.rs +++ b/nym-api/src/support/storage/mod.rs @@ -34,14 +34,13 @@ impl NymApiStorage { pub async fn init>(database_path: P) -> Result { // TODO: we can inject here more stuff based on our nym-api global config // struct. Maybe different pool size or timeout intervals? - let mut opts = sqlx::sqlite::SqliteConnectOptions::new() + let opts = sqlx::sqlite::SqliteConnectOptions::new() .filename(database_path) - .create_if_missing(true); + .create_if_missing(true) + .disable_statement_logging(); // TODO: do we want auto_vacuum ? - opts.disable_statement_logging(); - let connection_pool = match sqlx::SqlitePool::connect_with(opts).await { Ok(db) => db, Err(err) => { diff --git a/nym-data-observatory/.sqlx/query-249faa11b88b749f50342bb5c9cc41d20896db543eed74a6f320c041bcbb723d.json b/nym-data-observatory/.sqlx/query-249faa11b88b749f50342bb5c9cc41d20896db543eed74a6f320c041bcbb723d.json new file mode 100644 index 0000000000..a42f7b7e32 --- /dev/null +++ b/nym-data-observatory/.sqlx/query-249faa11b88b749f50342bb5c9cc41d20896db543eed74a6f320c041bcbb723d.json @@ -0,0 +1,16 @@ +{ + "db_name": "PostgreSQL", + "query": "INSERT INTO responses\n (joke_id, joke, date_created)\n VALUES\n ($1, $2, $3)\n ON CONFLICT(joke_id) DO UPDATE SET\n joke=excluded.joke,\n date_created=excluded.date_created;", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Varchar", + "Text", + "Int4" + ] + }, + "nullable": [] + }, + "hash": "249faa11b88b749f50342bb5c9cc41d20896db543eed74a6f320c041bcbb723d" +} diff --git a/nym-data-observatory/.sqlx/query-aff7fbd06728004d2f2226d20c32f1482df00de2dc1d2b4debbb2e12553d997b.json b/nym-data-observatory/.sqlx/query-aff7fbd06728004d2f2226d20c32f1482df00de2dc1d2b4debbb2e12553d997b.json new file mode 100644 index 0000000000..88e19ca1b9 --- /dev/null +++ b/nym-data-observatory/.sqlx/query-aff7fbd06728004d2f2226d20c32f1482df00de2dc1d2b4debbb2e12553d997b.json @@ -0,0 +1,34 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT joke_id, joke, date_created FROM responses WHERE joke_id = $1", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "joke_id", + "type_info": "Varchar" + }, + { + "ordinal": 1, + "name": "joke", + "type_info": "Text" + }, + { + "ordinal": 2, + "name": "date_created", + "type_info": "Int4" + } + ], + "parameters": { + "Left": [ + "Text" + ] + }, + "nullable": [ + false, + false, + false + ] + }, + "hash": "aff7fbd06728004d2f2226d20c32f1482df00de2dc1d2b4debbb2e12553d997b" +} diff --git a/nym-data-observatory/.sqlx/query-e53f479f8cead3dc8aa1875e5d450ad69686cf6a109e37d6c3f0623c3e9f91d0.json b/nym-data-observatory/.sqlx/query-e53f479f8cead3dc8aa1875e5d450ad69686cf6a109e37d6c3f0623c3e9f91d0.json new file mode 100644 index 0000000000..e770f72289 --- /dev/null +++ b/nym-data-observatory/.sqlx/query-e53f479f8cead3dc8aa1875e5d450ad69686cf6a109e37d6c3f0623c3e9f91d0.json @@ -0,0 +1,32 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT joke_id, joke, date_created FROM responses", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "joke_id", + "type_info": "Varchar" + }, + { + "ordinal": 1, + "name": "joke", + "type_info": "Text" + }, + { + "ordinal": 2, + "name": "date_created", + "type_info": "Int4" + } + ], + "parameters": { + "Left": [] + }, + "nullable": [ + false, + false, + false + ] + }, + "hash": "e53f479f8cead3dc8aa1875e5d450ad69686cf6a109e37d6c3f0623c3e9f91d0" +} diff --git a/nym-data-observatory/Cargo.toml b/nym-data-observatory/Cargo.toml index 0ef35d100f..220449bfb1 100644 --- a/nym-data-observatory/Cargo.toml +++ b/nym-data-observatory/Cargo.toml @@ -21,11 +21,13 @@ clap = { workspace = true, features = ["derive", "env"] } nym-bin-common = { path = "../common/bin-common" } nym-network-defaults = { path = "../common/network-defaults" } nym-task = { path = "../common/task" } -nym-node-requests = { path = "../nym-node/nym-node-requests", features = ["openapi"] } +nym-node-requests = { path = "../nym-node/nym-node-requests", features = [ + "openapi", +] } serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } -sqlx = { workspace = true, features = ["runtime-tokio-rustls", "postgres", "offline"] } -tokio = { workspace = true, features = ["process"] } +sqlx = { workspace = true, features = ["runtime-tokio-rustls", "postgres"] } +tokio = { workspace = true, features = ["process", "rt-multi-thread"] } tokio-util = { workspace = true } tracing = { workspace = true } tracing-subscriber = { workspace = true, features = ["env-filter"] } @@ -37,5 +39,5 @@ utoipauto = { workspace = true } [build-dependencies] anyhow = { workspace = true } -tokio = { workspace = true, features = ["macros" ] } +tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } sqlx = { workspace = true, features = ["runtime-tokio-rustls", "postgres"] } diff --git a/nym-data-observatory/README_SQLX.md b/nym-data-observatory/README_SQLX.md index 706f1d47ad..3e1021c8eb 100644 --- a/nym-data-observatory/README_SQLX.md +++ b/nym-data-observatory/README_SQLX.md @@ -39,35 +39,25 @@ If it's outside of code (i.e. when running `cargo check`) - make sure password doesn't have any special characters that could be interpreted by the command line/shell weirdly, like `$#\` etc. -## Cannot generate `sqlx-data.json` +## Offline query data looks like this -In order for `sqlx` to generate schema for "offline" work (without DB -connection), as of `v0.6.3` you first **need an active DB connection**. - -So make sure - -- DB is running -- `DATABASE_URL` is set correctly -- `SQLX_OFFLINE` isn't exported to true - -Then run `cargo sqlx prepare` - -After you have the file, you can ignore `DATABASE_URL` and terminate the DB -instance. This file represents the DB schema, so when your migrations change, -you'll need to re-generate it - -Make sure to commit the file to VCS if you want to avoid re-doing this again on -each machine (e.g. other developers, CI). - -## Generated `sqlx-data.json` looks like this - -```json -{ - "db": "PostgreSQL" -} +``` +.sqlx/ +├─ new_file +├─ query-249faa11b88b749f50342bb5c9cc41d20896db543eed74a6f320c041bcbb723d.json +├─ query-aff7fbd06728004d2f2226d20c32f1482df00de2dc1d2b4debbb2e12553d997b.json +├─ ... +├─ query-e53f479f8cead3dc8aa1875e5d450ad69686cf6a109e37d6c3f0623c3e9f91d0.json ``` -after running `cargo sqlx prepare` +The offline mode for the queries uses a separate file per `query!()` invocation + +Each workspace member that works with `sqlx` has `.sqlx` directory, containing +its own schema description. This allows compile-time checks without needing a +live DB connection (so called `OFFLINE_MODE`). + +To initialize those files, you need to run `cargo sqlx prepare` with a live +connection to DB (to pull schema information). ### Similar to: @@ -78,6 +68,17 @@ warning: no queries found; do you have the `offline` feature enabled ### Possible solutions - does your `sqlx-cli` version match `sqlx` version from `Cargo.toml`? +``` +cargo install sqlx-cli --version --force +``` +- is your crate a library? +``` +cargo sqlx prepare -- --lib +``` +- are your `query!` invocations hidden behind a feature? +``` +cargo sqlx prepare -- --features +``` - do you have `offline` cargo feature enabled? - make sure to `cargo clean` after these updates diff --git a/nym-data-observatory/build.rs b/nym-data-observatory/build.rs index f9c96061da..ba795cf1d0 100644 --- a/nym-data-observatory/build.rs +++ b/nym-data-observatory/build.rs @@ -14,9 +14,9 @@ async fn main() -> Result<()> { let db_url = format!("postgresql://{POSTGRES_USER}:{POSTGRES_PASSWORD}@localhost:5432/{POSTGRES_DB}"); + export_db_variables(&db_url)?; // if a live DB is reachable, use that if PgConnection::connect(&db_url).await.is_ok() { - export_db_variables(&db_url)?; println!("cargo::rustc-env=SQLX_OFFLINE=false"); run_migrations(&db_url).await?; } else { diff --git a/nym-data-observatory/pg_up.sh b/nym-data-observatory/pg_up.sh index 880131dd93..ca4e1f7e51 100755 --- a/nym-data-observatory/pg_up.sh +++ b/nym-data-observatory/pg_up.sh @@ -1,5 +1,6 @@ #!/bin/bash +# .env is generated in build.rs source .env # Launching a container in such a way that it's destroyed after you detach from the terminal: diff --git a/nym-data-observatory/sqlx-data.json b/nym-data-observatory/sqlx-data.json deleted file mode 100644 index 5164e48b6b..0000000000 --- a/nym-data-observatory/sqlx-data.json +++ /dev/null @@ -1,79 +0,0 @@ -{ - "db": "PostgreSQL", - "249faa11b88b749f50342bb5c9cc41d20896db543eed74a6f320c041bcbb723d": { - "describe": { - "columns": [], - "nullable": [], - "parameters": { - "Left": [ - "Varchar", - "Text", - "Int4" - ] - } - }, - "query": "INSERT INTO responses\n (joke_id, joke, date_created)\n VALUES\n ($1, $2, $3)\n ON CONFLICT(joke_id) DO UPDATE SET\n joke=excluded.joke,\n date_created=excluded.date_created;" - }, - "aff7fbd06728004d2f2226d20c32f1482df00de2dc1d2b4debbb2e12553d997b": { - "describe": { - "columns": [ - { - "name": "joke_id", - "ordinal": 0, - "type_info": "Varchar" - }, - { - "name": "joke", - "ordinal": 1, - "type_info": "Text" - }, - { - "name": "date_created", - "ordinal": 2, - "type_info": "Int4" - } - ], - "nullable": [ - false, - false, - false - ], - "parameters": { - "Left": [ - "Text" - ] - } - }, - "query": "SELECT joke_id, joke, date_created FROM responses WHERE joke_id = $1" - }, - "e53f479f8cead3dc8aa1875e5d450ad69686cf6a109e37d6c3f0623c3e9f91d0": { - "describe": { - "columns": [ - { - "name": "joke_id", - "ordinal": 0, - "type_info": "Varchar" - }, - { - "name": "joke", - "ordinal": 1, - "type_info": "Text" - }, - { - "name": "date_created", - "ordinal": 2, - "type_info": "Int4" - } - ], - "nullable": [ - false, - false, - false - ], - "parameters": { - "Left": [] - } - }, - "query": "SELECT joke_id, joke, date_created FROM responses" - } -} \ No newline at end of file diff --git a/nym-data-observatory/src/db/mod.rs b/nym-data-observatory/src/db/mod.rs index 3e35fe6c61..05c71a1728 100644 --- a/nym-data-observatory/src/db/mod.rs +++ b/nym-data-observatory/src/db/mod.rs @@ -17,11 +17,8 @@ impl Storage { pub async fn init(connection_url: Option) -> Result { let connection_url = connection_url.ok_or_else(|| anyhow!("Missing the connection url for database!"))?; - let connect_options = { - let mut connect_options = PgConnectOptions::from_str(&connection_url)?; - let connect_options = connect_options.disable_statement_logging(); - (*connect_options).clone() - }; + let connect_options = + PgConnectOptions::from_str(&connection_url)?.disable_statement_logging(); let pool = DbPool::connect_with(connect_options) .await diff --git a/nym-validator-rewarder/src/rewarder/storage/mod.rs b/nym-validator-rewarder/src/rewarder/storage/mod.rs index b002ab46e5..9557a3708d 100644 --- a/nym-validator-rewarder/src/rewarder/storage/mod.rs +++ b/nym-validator-rewarder/src/rewarder/storage/mod.rs @@ -1,17 +1,19 @@ // Copyright 2023 - Nym Technologies SA // SPDX-License-Identifier: GPL-3.0-only -use crate::error::NymRewarderError; -use crate::rewarder::credential_issuance::types::CredentialIssuer; -use crate::rewarder::epoch::Epoch; -use crate::rewarder::storage::manager::StorageManager; -use crate::rewarder::{EpochRewards, RewardingResult}; -use nym_validator_client::nym_api::IssuedTicketbookBody; -use nym_validator_client::nyxd::contract_traits::ecash_query_client::DepositId; -use nym_validator_client::nyxd::Coin; +use crate::{ + error::NymRewarderError, + rewarder::{ + credential_issuance::types::CredentialIssuer, epoch::Epoch, + storage::manager::StorageManager, EpochRewards, RewardingResult, + }, +}; +use nym_validator_client::{ + nym_api::IssuedTicketbookBody, + nyxd::{contract_traits::ecash_query_client::DepositId, Coin}, +}; use sqlx::ConnectOptions; -use std::fmt::Debug; -use std::path::Path; +use std::{fmt::Debug, path::Path}; use tracing::{error, info, instrument}; mod manager; @@ -24,14 +26,13 @@ pub struct RewarderStorage { impl RewarderStorage { #[instrument] pub async fn init + Debug>(database_path: P) -> Result { - let mut opts = sqlx::sqlite::SqliteConnectOptions::new() + let opts = sqlx::sqlite::SqliteConnectOptions::new() .filename(database_path) - .create_if_missing(true); + .create_if_missing(true) + .disable_statement_logging(); // TODO: do we want auto_vacuum ? - opts.disable_statement_logging(); - let connection_pool = match sqlx::SqlitePool::connect_with(opts).await { Ok(db) => db, Err(err) => { diff --git a/tools/internal/testnet-manager/src/manager/storage/mod.rs b/tools/internal/testnet-manager/src/manager/storage/mod.rs index 6faaab0070..c61f52070e 100644 --- a/tools/internal/testnet-manager/src/manager/storage/mod.rs +++ b/tools/internal/testnet-manager/src/manager/storage/mod.rs @@ -1,11 +1,15 @@ use std::fs; // Copyright 2024 - Nym Technologies SA // SPDX-License-Identifier: GPL-3.0-only -use crate::error::NetworkManagerError; -use crate::manager::contract::{Account, Contract, LoadedNymContracts}; -use crate::manager::network::{LoadedNetwork, Network, SpecialAddresses}; -use crate::manager::node::NymNode; -use crate::manager::storage::manager::StorageManager; +use crate::{ + error::NetworkManagerError, + manager::{ + contract::{Account, Contract, LoadedNymContracts}, + network::{LoadedNetwork, Network, SpecialAddresses}, + node::NymNode, + storage::manager::StorageManager, + }, +}; use sqlx::ConnectOptions; use std::path::Path; use tracing::{error, info}; @@ -34,14 +38,13 @@ impl NetworkManagerStorage { // TODO: we can inject here more stuff based on our nym-api global config // struct. Maybe different pool size or timeout intervals? - let mut opts = sqlx::sqlite::SqliteConnectOptions::new() + let opts = sqlx::sqlite::SqliteConnectOptions::new() .filename(database_path) - .create_if_missing(true); + .create_if_missing(true) + .disable_statement_logging(); // TODO: do we want auto_vacuum ? - opts.disable_statement_logging(); - let connection_pool = match sqlx::SqlitePool::connect_with(opts).await { Ok(db) => db, Err(err) => {