build: bump version to 0.7.15

docs: start of database maintenance tips
improvement: drop queries that are running during a checkpoint
2022-12-27 17:04:48 -06:00 · 2022-12-27 17:00:14 -06:00 · 2022-12-27 15:24:10 -06:00 · 2022-12-27 10:28:56 -06:00 · 2022-12-27 10:13:14 -06:00 · 2022-12-27 09:48:07 -06:00
23 changed files with 1120 additions and 332 deletions
@@ -11,6 +11,6 @@ repos:
 - repo: https://github.com/doublify/pre-commit-rust
  rev: v1.0
  hooks:
-  - id: fmt
+#  - id: fmt
  - id: cargo-check
  - id: clippy
@@ -27,9 +27,9 @@ dependencies = [
 [[package]]
 name = "aho-corasick"
-version = "0.7.19"
+version = "0.7.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e"
+checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
 dependencies = [
 "memchr",
 ]
@@ -54,9 +54,9 @@ dependencies = [
 [[package]]
 name = "anyhow"
-version = "1.0.66"
+version = "1.0.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"
+checksum = "7724808837b77f4b4de9d283820f9d98bcf496d5692934b857a2399d31ff22e6"
 [[package]]
 name = "async-stream"
@@ -81,9 +81,9 @@ dependencies = [
 [[package]]
 name = "async-trait"
-version = "0.1.58"
+version = "0.1.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e805d94e6b5001b651426cf4cd446b1ab5f319d27bab5c644f61de0a804360c"
+checksum = "677d1d8ab452a3936018a687b20e6f7cf5363d713b732b8884001317b0e48aa3"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -107,9 +107,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 [[package]]
 name = "axum"
-version = "0.5.17"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acee9fd5073ab6b045a275b3e709c163dd36c90685219cb21804a147b58dba43"
+checksum = "08b108ad2665fa3f6e6a517c3d80ec3e77d224c47d605167aefaa5d7ef97fa48"
 dependencies = [
 "async-trait",
 "axum-core",
@@ -125,9 +125,9 @@ dependencies = [
 "mime",
 "percent-encoding",
 "pin-project-lite",
 "rustversion",
 "serde",
 "sync_wrapper",
 "tokio",
 "tower",
 "tower-http",
 "tower-layer",
@@ -136,9 +136,9 @@ dependencies = [
 [[package]]
 name = "axum-core"
-version = "0.2.9"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37e5939e02c56fecd5c017c37df4238c0a839fa76b7f97acdd7efb804fd181cc"
+checksum = "79b8558f5a0581152dc94dcd289132a1d377494bdeafcd41869b3258e3e2ad92"
 dependencies = [
 "async-trait",
 "bytes",
@@ -146,6 +146,7 @@ dependencies = [
 "http",
 "http-body",
 "mime",
 "rustversion",
 "tower-layer",
 "tower-service",
 ]
@@ -194,15 +195,15 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 [[package]]
 name = "bytes"
-version = "1.2.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db"
+checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c"
 [[package]]
 name = "cc"
-version = "1.0.74"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "581f5dba903aac52ea3feb5ec4810848460ee833876f1f9b0fdeab1f19091574"
+checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d"
 [[package]]
 name = "cfg-if"
@@ -212,9 +213,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 [[package]]
 name = "chrono"
-version = "0.4.22"
+version = "0.4.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1"
+checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"
 dependencies = [
 "iana-time-zone",
 "num-integer",
@@ -362,9 +363,9 @@ dependencies = [
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.12"
+version = "0.8.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac"
+checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f"
 dependencies = [
 "cfg-if",
 ]
@@ -381,9 +382,9 @@ dependencies = [
 [[package]]
 name = "cxx"
-version = "1.0.80"
+version = "1.0.84"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b7d4e43b25d3c994662706a1d4fcfc32aaa6afd287502c111b237093bb23f3a"
+checksum = "27874566aca772cb515af4c6e997b5fe2119820bca447689145e39bb734d19a0"
 dependencies = [
 "cc",
 "cxxbridge-flags",
@@ -393,9 +394,9 @@ dependencies = [
 [[package]]
 name = "cxx-build"
-version = "1.0.80"
+version = "1.0.84"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84f8829ddc213e2c1368e51a2564c552b65a8cb6a28f31e576270ac81d5e5827"
+checksum = "e7bb951f2523a49533003656a72121306b225ec16a49a09dc6b0ba0d6f3ec3c0"
 dependencies = [
 "cc",
 "codespan-reporting",
@@ -408,15 +409,15 @@ dependencies = [
 [[package]]
 name = "cxxbridge-flags"
-version = "1.0.80"
+version = "1.0.84"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e72537424b474af1460806647c41d4b6d35d09ef7fe031c5c2fa5766047cc56a"
+checksum = "be778b6327031c1c7b61dd2e48124eee5361e6aa76b8de93692f011b08870ab4"
 [[package]]
 name = "cxxbridge-macro"
-version = "1.0.80"
+version = "1.0.84"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "309e4fb93eed90e1e14bea0da16b209f81813ba9fc7830c20ed151dd7bc0a4d7"
+checksum = "7b8a2b87662fe5a0a0b38507756ab66aff32638876a0866e5a5fc82ceb07ee49"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -438,9 +439,9 @@ dependencies = [
 [[package]]
 name = "digest"
-version = "0.10.5"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c"
+checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
 dependencies = [
 "block-buffer",
 "crypto-common",
@@ -484,9 +485,9 @@ dependencies = [
 [[package]]
 name = "flate2"
-version = "1.0.24"
+version = "1.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6"
+checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
 dependencies = [
 "crc32fast",
 "miniz_oxide",
@@ -789,9 +790,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 [[package]]
 name = "hyper"
-version = "0.14.22"
+version = "0.14.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abfba89e19b959ca163c7752ba59d737c1ceea53a5d31a149c805446fc958064"
+checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c"
 dependencies = [
 "bytes",
 "futures-channel",
@@ -872,9 +873,9 @@ dependencies = [
 [[package]]
 name = "indexmap"
-version = "1.9.1"
+version = "1.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
+checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
 dependencies = [
 "autocfg 1.1.0",
 "hashbrown 0.12.3",
@@ -900,9 +901,9 @@ dependencies = [
 [[package]]
 name = "itoa"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"
+checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
 [[package]]
 name = "js-sys"
@@ -932,9 +933,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 [[package]]
 name = "libc"
-version = "0.2.137"
+version = "0.2.138"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
+checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8"
 [[package]]
 name = "libsqlite3-sys"
@@ -949,9 +950,9 @@ dependencies = [
 [[package]]
 name = "link-cplusplus"
-version = "1.0.7"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369"
+checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
 dependencies = [
 "cc",
 ]
@@ -1010,9 +1011,9 @@ dependencies = [
 [[package]]
 name = "matchit"
-version = "0.5.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73cbba799671b762df5a175adf59ce145165747bb891505c43d09aefbbf38beb"
+checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40"
 [[package]]
 name = "memchr"
@@ -1034,9 +1035,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 [[package]]
 name = "miniz_oxide"
-version = "0.5.4"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34"
+checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
 dependencies = [
 "adler",
 ]
@@ -1095,7 +1096,7 @@ checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21"
 [[package]]
 name = "nostr-rs-relay"
-version = "0.7.1"
+version = "0.7.15"
 dependencies = [
 "anyhow",
 "bitcoin_hashes",
@@ -1224,9 +1225,9 @@ checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
 [[package]]
 name = "openssl"
-version = "0.10.42"
+version = "0.10.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12fc0523e3bd51a692c8850d075d74dc062ccf251c0110668cbd921917118a13"
+checksum = "29d971fd5722fec23977260f6e81aa67d2f22cadbdc2aa049f1022d9a3be1566"
 dependencies = [
 "bitflags",
 "cfg-if",
@@ -1256,9 +1257,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 [[package]]
 name = "openssl-sys"
-version = "0.9.77"
+version = "0.9.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b03b84c3b2d099b81f0953422b4d4ad58761589d0229b5506356afca05a3670a"
+checksum = "5454462c0eced1e97f2ec09036abc8da362e66802f66fd20f86854d9d8cbcbc4"
 dependencies = [
 "autocfg 1.1.0",
 "cc",
@@ -1289,9 +1290,9 @@ dependencies = [
 [[package]]
 name = "parking_lot_core"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0"
+checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba"
 dependencies = [
 "cfg-if",
 "libc",
@@ -1325,9 +1326,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
 [[package]]
 name = "pest"
-version = "2.4.1"
+version = "2.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a528564cc62c19a7acac4d81e01f39e53e25e17b934878f4c6d25cc2836e62f8"
+checksum = "cc8bed3549e0f9b0a2a78bf7c0018237a2cdf085eecbbc048e52612438e4e9d0"
 dependencies = [
 "thiserror",
 "ucd-trie",
@@ -1335,9 +1336,9 @@ dependencies = [
 [[package]]
 name = "pest_derive"
-version = "2.4.1"
+version = "2.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5fd9bc6500181952d34bd0b2b0163a54d794227b498be0b7afa7698d0a7b18f"
+checksum = "cdc078600d06ff90d4ed238f0119d84ab5d43dbaad278b0e33a8820293b32344"
 dependencies = [
 "pest",
 "pest_generator",
@@ -1345,9 +1346,9 @@ dependencies = [
 [[package]]
 name = "pest_generator"
-version = "2.4.1"
+version = "2.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2610d5ac5156217b4ff8e46ddcef7cdf44b273da2ac5bca2ecbfa86a330e7c4"
+checksum = "28a1af60b1c4148bb269006a750cff8e2ea36aff34d2d96cf7be0b14d1bed23c"
 dependencies = [
 "pest",
 "pest_meta",
@@ -1358,9 +1359,9 @@ dependencies = [
 [[package]]
 name = "pest_meta"
-version = "2.4.1"
+version = "2.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "824749bf7e21dd66b36fbe26b3f45c713879cccd4a009a917ab8e045ca8246fe"
+checksum = "fec8605d59fc2ae0c6c1aefc0c7c7a9769732017c0ce07f7a9cfffa7b4404f20"
 dependencies = [
 "once_cell",
 "pest",
@@ -1413,18 +1414,18 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 [[package]]
 name = "proc-macro2"
-version = "1.0.47"
+version = "1.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
+checksum = "e9d89e5dba24725ae5678020bf8f1357a9aa7ff10736b551adbcd3f8d17d766f"
 dependencies = [
 "unicode-ident",
 ]
 [[package]]
 name = "prost"
-version = "0.11.2"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0841812012b2d4a6145fae9a6af1534873c32aa67fff26bd09f8fa42c83f95a"
+checksum = "c0b18e655c21ff5ac2084a5ad0611e827b3f92badf79f4910b5a5c58f4d87ff0"
 dependencies = [
 "bytes",
 "prost-derive",
@@ -1471,9 +1472,9 @@ dependencies = [
 [[package]]
 name = "quote"
-version = "1.0.21"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
+checksum = "556d0f47a940e895261e77dc200d5eadfc6ef644c179c6f5edfc105e3a2292c8"
 dependencies = [
 "proc-macro2",
 ]
@@ -1664,9 +1665,9 @@ dependencies = [
 [[package]]
 name = "regex"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
+checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -1684,9 +1685,9 @@ dependencies = [
 [[package]]
 name = "regex-syntax"
-version = "0.6.27"
+version = "0.6.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
+checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
 [[package]]
 name = "remove_dir_all"
@@ -1734,10 +1735,16 @@ dependencies = [
 ]
 [[package]]
-name = "ryu"
+name = "rustversion"
 version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
+checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70"
 [[package]]
 name = "ryu"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
 [[package]]
 name = "schannel"
@@ -1766,9 +1773,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 [[package]]
 name = "scratch"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
+checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2"
 [[package]]
 name = "secp256k1"
@@ -1816,18 +1823,18 @@ dependencies = [
 [[package]]
 name = "serde"
-version = "1.0.147"
+version = "1.0.151"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965"
+checksum = "97fed41fc1a24994d044e6db6935e69511a1153b52c15eb42493b26fa87feba0"
 dependencies = [
 "serde_derive",
 ]
 [[package]]
 name = "serde_derive"
-version = "1.0.147"
+version = "1.0.151"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852"
+checksum = "255abe9a125a985c05190d687b320c12f9b1f0b99445e608c21ba0782c719ad8"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1836,9 +1843,9 @@ dependencies = [
 [[package]]
 name = "serde_json"
-version = "1.0.87"
+version = "1.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45"
+checksum = "8778cc0b528968fe72abec38b5db5a20a70d148116cd9325d2bc5f5180ca3faf"
 dependencies = [
 "indexmap",
 "itoa",
@@ -1848,9 +1855,9 @@ dependencies = [
 [[package]]
 name = "sha-1"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f"
+checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c"
 dependencies = [
 "cfg-if",
 "cpufeatures",
@@ -1913,9 +1920,9 @@ dependencies = [
 [[package]]
 name = "syn"
-version = "1.0.103"
+version = "1.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d"
+checksum = "09ee3a69cd2c7e06684677e5629b3878b253af05e4714964204279c6bc02cf0b"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1953,18 +1960,18 @@ dependencies = [
 [[package]]
 name = "thiserror"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
+checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
 dependencies = [
 "thiserror-impl",
 ]
 [[package]]
 name = "thiserror-impl"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
+checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1997,9 +2004,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 [[package]]
 name = "tokio"
-version = "1.21.2"
+version = "1.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099"
+checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46"
 dependencies = [
 "autocfg 1.1.0",
 "bytes",
@@ -2013,7 +2020,7 @@ dependencies = [
 "socket2",
 "tokio-macros",
 "tracing",
- "winapi",
+ "windows-sys 0.42.0",
 ]
 [[package]]
@@ -2028,9 +2035,9 @@ dependencies = [
 [[package]]
 name = "tokio-macros"
-version = "1.8.0"
+version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484"
+checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2086,18 +2093,18 @@ dependencies = [
 [[package]]
 name = "toml"
-version = "0.5.9"
+version = "0.5.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
+checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f"
 dependencies = [
 "serde",
 ]
 [[package]]
 name = "tonic"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55b9af819e54b8f33d453655bef9b9acc171568fb49523078d0cc4e7484200ec"
+checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb"
 dependencies = [
 "async-stream",
 "async-trait",
@@ -2147,9 +2154,9 @@ dependencies = [
 [[package]]
 name = "tower-http"
-version = "0.3.4"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c530c8675c1dbf98facee631536fa116b5fb6382d7dd6dc1b118d970eafe3ba"
+checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858"
 dependencies = [
 "bitflags",
 "bytes",
@@ -2305,9 +2312,9 @@ dependencies = [
 [[package]]
 name = "typenum"
-version = "1.15.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
+checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
 [[package]]
 name = "ucd-trie"
@@ -2323,9 +2330,9 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
 [[package]]
 name = "unicode-ident"
-version = "1.0.5"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
+checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
 [[package]]
 name = "unicode-normalization"
@@ -2367,9 +2374,9 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 [[package]]
 name = "uuid"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "feb41e78f93363bb2df8b0e86a2ca30eed7806ea16ea0c790d757cf93f79be83"
+checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c"
 dependencies = [
 "getrandom",
 ]
@@ -1,7 +1,15 @@
 [package]
 name = "nostr-rs-relay"
-version = "0.7.1"
+version = "0.7.15"
 edition = "2021"
 authors = ["Greg Heartsfield <scsibug@imap.cc>"]
 description = "A relay implementation for the Nostr protocol"
 readme = "README.md"
 homepage = "https://sr.ht/~gheartsfield/nostr-rs-relay/"
 repository = "https://git.sr.ht/~gheartsfield/nostr-rs-relay"
 license = "MIT"
 keywords = ["nostr", "server"]
 categories = ["network-programming", "web-programming"]
 [dependencies]
 tracing = "0.1.36"
@@ -20,7 +28,7 @@ secp256k1 = {version = "0.21", features = ["rand", "rand-std", "serde", "bitcoin
 serde = { version = "1.0", features = ["derive"] }
 serde_json = {version = "1.0", features = ["preserve_order"]}
 hex = "0.4"
-rusqlite = { version = "0.26", features = ["limits","bundled"]}
+rusqlite = { version = "0.26", features = ["limits","bundled","modern_sqlite", "trace"]}
 r2d2 = "0.8"
 r2d2_sqlite = "0.19"
 lazy_static = "1.4"
@@ -1,18 +1,23 @@
-FROM docker.io/library/rust:1.65.0@sha256:1bca14676a365d0ed37a1e2a1da86c2bcf883fdf6e6886469434763d94d4afd5 as builder
+FROM docker.io/library/rust:1.66.0 as builder
 RUN USER=root cargo install cargo-auditable
 RUN USER=root cargo new --bin nostr-rs-relay
 WORKDIR ./nostr-rs-relay
 COPY ./Cargo.toml ./Cargo.toml
 COPY ./Cargo.lock ./Cargo.lock
-RUN cargo build --release
+# build dependencies only (caching)
 RUN cargo auditable build --release --locked
 # get rid of starter project code
 RUN rm src/*.rs
 # copy project source code
 COPY ./src ./src
 # build auditable release using locked deps
 RUN rm ./target/release/deps/nostr*relay*
-RUN cargo build --release
+RUN cargo auditable build --release --locked
-FROM docker.io/library/debian:bullseye-20221024-slim@sha256:76cdda8fe5eb597ef5e712e4c9a9f5f1fb119e69f353daaa7bd6d0f6e66e541d
+FROM docker.io/library/debian:bullseye-slim
 ARG APP=/usr/src/app
 ARG APP_DATA=/usr/src/app/db
@@ -1,8 +1,8 @@
 # [nostr-rs-relay](https://git.sr.ht/~gheartsfield/nostr-rs-relay)
-This is a [nostr](https://github.com/nostr-protocol/nostr) relay, written in
+This is a [nostr](https://github.com/nostr-protocol/nostr) relay,
-Rust.  It currently supports the entire relay protocol, and has a
+written in Rust.  It currently supports the entire relay protocol, and
-SQLite persistence layer.
+persists data with SQLite.
 The project master repository is available on
 [sourcehut](https://sr.ht/~gheartsfield/nostr-rs-relay/), and is
@@ -26,8 +26,10 @@ mirrored on [GitHub](https://github.com/scsibug/nostr-rs-relay).
 - [x] NIP-12: [Generic Tag Queries](https://github.com/nostr-protocol/nips/blob/master/12.md)
 - [x] NIP-15: [End of Stored Events Notice](https://github.com/nostr-protocol/nips/blob/master/15.md)
 - [x] NIP-16: [Event Treatment](https://github.com/nostr-protocol/nips/blob/master/16.md)
 - [x] NIP-20: [Command Results](https://github.com/nostr-protocol/nips/blob/master/20.md)
 - [x] NIP-22: [Event `created_at` limits](https://github.com/nostr-protocol/nips/blob/master/22.md) (_future-dated events only_)
 - [x] NIP-26: [Event Delegation](https://github.com/nostr-protocol/nips/blob/master/26.md)
 - [x] NIP-28: [Public Chat](https://github.com/nostr-protocol/nips/blob/master/28.md)
 ## Quick Start
@@ -36,15 +38,32 @@ application.  Use a bind mount to store the SQLite database outside of
 the container image, and map the container's 8080 port to a host port
 (7000 in the example below).
 The examples below start a rootless podman container, mapping a local
 data directory and config file.
 ```console
-$ docker build -t nostr-rs-relay .
+$ podman build -t nostr-rs-relay .
-$ docker run -it -p 7000:8080 \
+$ mkdir data
  --mount src=$(pwd)/data,target=/usr/src/app/db,type=bind nostr-rs-relay
-[2021-12-31T19:58:31Z INFO  nostr_rs_relay] listening on: 0.0.0.0:8080
+$ podman unshare chown 100:100 data
-[2021-12-31T19:58:31Z INFO  nostr_rs_relay::db] opened database "/usr/src/app/db/nostr.db" for writing
+
-[2021-12-31T19:58:31Z INFO  nostr_rs_relay::db] DB version = 2
+$ podman run -it --rm -p 7000:8080 \
  --user=100:100 \
  -v $(pwd)/data:/usr/src/app/db:Z \
  -v $(pwd)/config.toml:/usr/src/app/config.toml:ro,Z \
  --name nostr-relay nostr-rs-relay:latest
 Nov 19 15:31:15.013  INFO nostr_rs_relay: Starting up from main
 Nov 19 15:31:15.017  INFO nostr_rs_relay::server: listening on: 0.0.0.0:8080
 Nov 19 15:31:15.019  INFO nostr_rs_relay::server: db writer created
 Nov 19 15:31:15.019  INFO nostr_rs_relay::server: control message listener started
 Nov 19 15:31:15.019  INFO nostr_rs_relay::db: Built a connection pool "event writer" (min=1, max=4)
 Nov 19 15:31:15.019  INFO nostr_rs_relay::db: opened database "/usr/src/app/db/nostr.db" for writing
 Nov 19 15:31:15.019  INFO nostr_rs_relay::schema: DB version = 0
 Nov 19 15:31:15.054  INFO nostr_rs_relay::schema: database pragma/schema initialized to v7, and ready
 Nov 19 15:31:15.054  INFO nostr_rs_relay::schema: All migration scripts completed successfully.  Welcome to v7.
 Nov 19 15:31:15.521  INFO nostr_rs_relay::db: Built a connection pool "client query" (min=4, max=128)
 ```
 Use a `nostr` client such as
@@ -63,6 +82,38 @@ Text Note [81cf...2652] from 296a...9b92 5 seconds ago
 A pre-built container is also available on DockerHub:
 https://hub.docker.com/r/scsibug/nostr-rs-relay
 ## Build and Run (without Docker)
 Building `nostr-rs-relay` requires an installation of Cargo & Rust: https://www.rust-lang.org/tools/install
 Clone this repository, and then build a release version of the relay:
 ```console
 $ git clone -q https://git.sr.ht/\~gheartsfield/nostr-rs-relay
 $ cd nostr-rs-relay
 $ cargo build -q -r
 ```
 The relay executable is now located in
 `target/release/nostr-rs-relay`.  In order to run it with logging
 enabled, execute it with the `RUST_LOG` variable set:
 ```console
 $ RUST_LOG=warn,nostr_rs_relay=info ./target/release/nostr-rs-relay
 Dec 26 10:31:56.455  INFO nostr_rs_relay: Starting up from main
 Dec 26 10:31:56.464  INFO nostr_rs_relay::server: listening on: 0.0.0.0:8080
 Dec 26 10:31:56.466  INFO nostr_rs_relay::server: db writer created
 Dec 26 10:31:56.466  INFO nostr_rs_relay::db: Built a connection pool "event writer" (min=1, max=2)
 Dec 26 10:31:56.466  INFO nostr_rs_relay::db: opened database "./nostr.db" for writing
 Dec 26 10:31:56.466  INFO nostr_rs_relay::schema: DB version = 11
 Dec 26 10:31:56.467  INFO nostr_rs_relay::db: Built a connection pool "maintenance writer" (min=1, max=2)
 Dec 26 10:31:56.467  INFO nostr_rs_relay::server: control message listener started
 Dec 26 10:31:56.468  INFO nostr_rs_relay::db: Built a connection pool "client query" (min=4, max=8)
 ```
 You now have a running relay, on port `8080`.  Use a `nostr` client or
 `websocat` to connect and send/query for events.
 ## Configuration
 The sample [`config.toml`](config.toml) file demonstrates the
@@ -36,8 +36,9 @@ data_directory = "."
 # Minimum number of SQLite reader connections
 #min_conn = 4
-# Maximum number of SQLite reader connections
+# Maximum number of SQLite reader connections.  Recommend setting this
-#max_conn = 128
+# to approx the number of cores.
 #max_conn = 8
 [network]
 # Bind to this network address
@@ -62,8 +63,24 @@ reject_future_seconds = 1800
 [limits]
 # Limit events created per second, averaged over one minute.  Must be
-# an integer.  If not set (or set to 0), defaults to unlimited.
+# an integer.  If not set (or set to 0), defaults to unlimited.  Note:
-#messages_per_sec = 0
+# this is for the server as a whole, not per-connection.
 # messages_per_sec = 0
 # Limit client subscriptions created per second, averaged over one
 # minute.  Must be an integer.  If not set (or set to 0), defaults to
 # unlimited.
 #subscriptions_per_min = 0
 # UNIMPLEMENTED...
 # Limit how many concurrent database connections a client can have.
 # This prevents a single client from starting too many expensive
 # database queries.  Must be an integer.  If not set (or set to 0),
 # defaults to unlimited (subject to subscription limits).
 #db_conns_per_client = 0
 # Limit blocking threads used for database connections.  Defaults to 16.
 #max_blocking_threads = 16
 # Limit the maximum size of an EVENT message.  Defaults to 128 KB.
 # Set to 0 for unlimited.
@@ -0,0 +1,125 @@
 # Database Maintenance
 `nostr-rs-relay` uses the SQLite embedded database to minimize
 dependencies and overall footprint of running a relay.  If traffic is
 light, the relay should just run with very little need for
 intervention.  For heavily trafficked relays, there are a number of
 steps that the operator may need to take to maintain performance and
 limit disk usage.
 This maintenance guide is current as of version `0.7.14`.  Future
 versions may incorporate and automate some of these steps.
 ## Backing Up the Database
 To prevent data loss, the database should be backed up regularly.  The
 recommended method is to use the `sqlite3` command to perform an
 "Online Backup".  This can be done while the relay is running, queries
 can still run and events will be persisted during the backup.
 The following commands will perform a backup of the database to a
 dated file, and then compress to minimize size:
 ```console
 BACKUP_FILE=/var/backups/nostr/`date +%Y%m%d_%H%M`.db
 sqlite3 -readonly /apps/nostr-relay/nostr.db ".backup $BACKUP_FILE
 sqlite3 $BACKUP_FILE "vacuum;"
 bzip2 -9 $BACKUP_FILE
 ```
 Nostr events are very compressible.  Expect a compression ratio on the
 order of 4:1, resulting in a 75% space saving.
 ## Vacuuming the Database
 As the database is updated, it can become fragmented.  Performing a
 full `vacuum` will rebuild the entire database file, and can reduce
 space.  Running this may reduce the size of the database file,
 especially if a large amount of data was updated or deleted.
 ```console
 vacuum;
 ```
 ## Clearing Hidden Events
 When events are deleted, either through deletion events, metadata or
 follower updates, or a replaceable event kind, the event is not
 actually removed from the database.  Instead, a flag `HIDDEN` is set
 to true for the event, which excludes it from search results.  The
 original intent was to ensure that subsequent rebroadcasts of the
 event would be easily detected as having been deleted, and would not
 need to be stored again.  In practice, this decision causes excessive
 growth of the `tags` table, since all the previous followers are
 retained for those `HIDDEN` events.
 The `event` and especially the `tag` table can be significantly
 reduced in size by running these commands:
 ```console
 PRAGMA foreign_keys = ON;
 delete from event where HIDDEN=true;
 ```
 ## Manually Removing Events
 For a variety of reasons, an operator may wish to remove some events
 from the database.  The only way of achieving this today is with
 manually run SQL commands.
 It is recommended to have a good backup prior to manually running SQL
 commands!
 In all cases, it is mandatory to enable foreign keys, and this must be
 done for every connection.  Otherwise, you will likely orphan rows in
 the `tag` table.
 ### Deleting Specific Event
 ```console
 PRAGMA foreign_keys = ON;
 delete from event where event_hash=x'00000000000c1271675dc86e3e1dd1336827bccabb90dc4c9d3b4465efefe00e';
 ```
 ### Deleting All Events for Pubkey
 ```console
 PRAGMA foreign_keys = ON;
 delete from event where author=x'000000000002c7831d9c5a99f183afc2813a6f69a16edda7f6fc0ed8110566e6';
 ```
 ### Deleting All Events of a Kind
 ```console
 PRAGMA foreign_keys = ON;
 delete from event where kind=70202;
 ```
 ### Deleting Old Events
 In this scenario, we wish to delete any event that has been stored by
 our relay for more than 1 month.  Crucially, this is based on when the
 event was stored, not when the event says it was created.  If an event
 has a `created` field of 2 years ago, but was first sent to our relay
 yesterday, it would not be deleted in this scenario.  Keep in mind, we
 do not track anything for re-broadcast events that we already have, so
 this is not a very effective way of implementing a "least recently
 seen" policy.
 ```console
 PRAGMA foreign_keys = ON;
 TODO!
 ```
 ### Delete Profile Events with No Recent Events
 Many users create profiles, post a "hello world" event, and then never
 appear again (likely using an ephemeral keypair that was lost in the
 browser cache).  We can find these accounts and remove them after some
 time.
 ```console
 PRAGMA foreign_keys = ON;
 TODO!
 ```
@@ -1,3 +0,0 @@
 #!/usr/bin/env bash
 sed -E 's/@sha256:[[:alnum:]]+//g' Dockerfile > Dockerfile.any-platform
 echo "Created platform-agnostic Dockerfile in 'Dockerfile.any-platform'"
@@ -1 +1,4 @@
 edition = "2021"
 #max_width = 140
 #chain_width = 100
 #fn_call_width = 100
@@ -52,6 +52,9 @@ pub struct Retention {
 #[allow(unused)]
 pub struct Limits {
    pub messages_per_sec: Option<u32>, // Artificially slow down event writing to limit disk consumption (averaged over 1 minute)
    pub subscriptions_per_min: Option<u32>, // Artificially slow down request (db query) creation to prevent abuse (averaged over 1 minute)
    pub db_conns_per_client: Option<u32>, // How many concurrent database queries (not subscriptions) may a client have?
    pub max_blocking_threads: usize,
    pub max_event_bytes: Option<usize>, // Maximum size of an EVENT message
    pub max_ws_message_bytes: Option<usize>,
    pub max_ws_frame_bytes: Option<usize>,
@@ -204,7 +207,7 @@ impl Default for Settings {
                data_directory: ".".to_owned(),
                in_memory: false,
                min_conn: 4,
-                max_conn: 128,
+                max_conn: 8,
            },
            network: Network {
                port: 8080,
@@ -214,6 +217,9 @@ impl Default for Settings {
            },
            limits: Limits {
                messages_per_sec: None,
                subscriptions_per_min: None,
                db_conns_per_client: None,
                max_blocking_threads: 16,
                max_event_bytes: Some(2 << 17),      // 128K
                max_ws_message_bytes: Some(2 << 17), // 128K
                max_ws_frame_bytes: Some(2 << 17),   // 128K
@@ -2,11 +2,10 @@
 use crate::close::Close;
 use crate::error::Error;
 use crate::error::Result;
 use crate::event::Event;
 use crate::subscription::Subscription;
 use std::collections::HashMap;
-use tracing::{debug, info};
+use tracing::{debug, trace};
 use uuid::Uuid;
 /// A subscription identifier has a maximum length
@@ -43,6 +42,15 @@ impl ClientConn {
        }
    }
    pub fn subscriptions(&self) -> &HashMap<String, Subscription> {
        &self.subscriptions
    }
    /// Check if the given subscription already exists
    pub fn has_subscription(&self, sub: &Subscription) -> bool {
        self.subscriptions.values().any(|x| x == sub)
    }
    /// Get a short prefix of the client's unique identifier, suitable
    /// for logging.
    #[must_use]
@@ -55,18 +63,6 @@ impl ClientConn {
        &self.client_ip
    }
    /// Find all matching subscriptions.
    #[must_use]
    pub fn get_matching_subscriptions(&self, e: &Event) -> Vec<&str> {
        let mut v: Vec<&str> = vec![];
        for (id, sub) in &self.subscriptions {
            if sub.interested_in_event(e) {
                v.push(id);
            }
        }
        v
    }
    /// Add a new subscription for this connection.
    /// # Errors
    ///
@@ -78,7 +74,7 @@ impl ClientConn {
        // prevent arbitrarily long subscription identifiers from
        // being used.
        if sub_id_len > MAX_SUBSCRIPTION_ID_LEN {
-            info!(
+            debug!(
                "ignoring sub request with excessive length: ({})",
                sub_id_len
            );
@@ -87,8 +83,12 @@ impl ClientConn {
        // check if an existing subscription exists, and replace if so
        if self.subscriptions.contains_key(&k) {
            self.subscriptions.remove(&k);
-            self.subscriptions.insert(k, s);
+            self.subscriptions.insert(k, s.clone());
-            debug!("replaced existing subscription");
+            trace!(
                "replaced existing subscription (cid: {}, sub: {:?})",
                self.get_client_prefix(),
                s.get_id()
            );
            return Ok(());
        }
@@ -98,9 +98,10 @@ impl ClientConn {
        }
        // add subscription
        self.subscriptions.insert(k, s);
-        debug!(
+        trace!(
-            "registered new subscription, currently have {} active subs",
+            "registered new subscription, currently have {} active subs (cid: {})",
-            self.subscriptions.len()
+            self.subscriptions.len(),
            self.get_client_prefix(),
        );
        Ok(())
    }
@@ -109,10 +110,10 @@ impl ClientConn {
    pub fn unsubscribe(&mut self, c: &Close) {
        // TODO: return notice if subscription did not exist.
        self.subscriptions.remove(&c.id);
-        debug!(
+        trace!(
-            "removed subscription, currently have {} active subs (cid={:?})",
+            "removed subscription, currently have {} active subs (cid: {})",
            self.subscriptions.len(),
-            self.client_id
+            self.get_client_prefix(),
        );
    }
 }
@@ -6,6 +6,7 @@ use crate::event::{single_char_tagname, Event};
 use crate::hexrange::hex_range;
 use crate::hexrange::HexSearch;
 use crate::nip05;
 use crate::notice::Notice;
 use crate::schema::{upgrade_db, STARTUP_SQL};
 use crate::subscription::ReqFilter;
 use crate::subscription::Subscription;
@@ -18,8 +19,10 @@ use r2d2_sqlite::SqliteConnectionManager;
 use rusqlite::params;
 use rusqlite::types::ToSql;
 use rusqlite::OpenFlags;
 use tokio::sync::{Mutex, MutexGuard};
 use std::fmt::Write as _;
 use std::path::Path;
 use std::sync::Arc;
 use std::thread;
 use std::time::Duration;
 use std::time::Instant;
@@ -32,12 +35,19 @@ pub type PooledConnection = r2d2::PooledConnection<r2d2_sqlite::SqliteConnection
 /// Events submitted from a client, with a return channel for notices
 pub struct SubmittedEvent {
    pub event: Event,
-    pub notice_tx: tokio::sync::mpsc::Sender<String>,
+    pub notice_tx: tokio::sync::mpsc::Sender<Notice>,
 }
 /// Database file
 pub const DB_FILE: &str = "nostr.db";
 /// How frequently to attempt checkpointing
 pub const CHECKPOINT_FREQ_SEC: u64 = 60;
 /// How many persisted events before we pause for backups.
 /// It isn't clear this is enough to make the online backup API work yet.
 pub const EVENT_COUNT_BACKUP_PAUSE_TRIGGER: usize = 1000;
 /// Build a database connection pool.
 /// # Panics
 ///
@@ -75,6 +85,7 @@ pub fn build_pool(
        .test_on_check_out(true) // no noticeable performance hit
        .min_idle(Some(min_size))
        .max_size(max_size)
        .max_lifetime(Some(Duration::from_secs(30)))
        .build(manager)
        .unwrap();
    info!(
@@ -84,6 +95,56 @@ pub fn build_pool(
    pool
 }
 /// Display database pool stats every 1 minute
 pub async fn monitor_pool(name: &str, pool: SqlitePool) {
    let sleep_dur = Duration::from_secs(60);
    loop {
 	log_pool_stats(name, &pool);
 	tokio::time::sleep(sleep_dur).await;
    }
 }
 /// Perform normal maintenance
 pub fn optimize_db(conn: &mut PooledConnection) -> Result<()> {
    let start = Instant::now();
    conn.execute_batch("PRAGMA optimize;")?;
    info!("optimize ran in {:?}", start.elapsed());
    Ok(())
 }
 #[derive(Debug)]
 enum SqliteStatus {
    Ok,
    Busy,
    Error,
    Other(u64),
 }
 /// Checkpoint/Truncate WAL.  Returns the number of WAL pages remaining.
 pub fn checkpoint_db(conn: &mut PooledConnection) -> Result<usize> {
    let query = "PRAGMA wal_checkpoint(TRUNCATE);";
    let start = Instant::now();
    let (cp_result, wal_size, _frames_checkpointed) = conn.query_row(query, [], |row| {
        let checkpoint_result: u64 = row.get(0)?;
        let wal_size: u64 = row.get(1)?;
        let frames_checkpointed: u64 = row.get(2)?;
        Ok((checkpoint_result, wal_size, frames_checkpointed))
    })?;
    let result = match cp_result {
        0 => SqliteStatus::Ok,
        1 => SqliteStatus::Busy,
        2 => SqliteStatus::Error,
        x => SqliteStatus::Other(x),
    };
    info!(
        "checkpoint ran in {:?} (result: {:?}, WAL size: {})",
        start.elapsed(),
        result,
        wal_size
    );
    Ok(wal_size as usize)
 }
 /// Spawn a database writer that persists events to the SQLite store.
 pub async fn db_writer(
    settings: Settings,
@@ -106,7 +167,7 @@ pub async fn db_writer(
            &settings,
            OpenFlags::SQLITE_OPEN_READ_WRITE | OpenFlags::SQLITE_OPEN_CREATE,
            1,
-            4,
+            2,
            false,
        );
        if settings.database.in_memory {
@@ -123,6 +184,10 @@ pub async fn db_writer(
        let rps_setting = settings.limits.messages_per_sec;
        let mut most_recent_rate_limit = Instant::now();
        let mut lim_opt = None;
        // Constant writing has interfered with online backups.  Keep
        // track of how long since we've given the backups a chance to
        // run.
        let mut backup_pause_counter: usize = 0;
        let clock = governor::clock::QuantaClock::default();
        if let Some(rps) = rps_setting {
            if rps > 0 {
@@ -158,7 +223,10 @@ pub async fn db_writer(
                        event.get_event_id_prefix()
                    );
                    notice_tx
-                        .try_send("pubkey is not allowed to publish to this relay".to_owned())
+                        .try_send(Notice::blocked(
                            event.id,
                            "pubkey is not allowed to publish to this relay",
                        ))
                        .ok();
                    continue;
                }
@@ -184,15 +252,16 @@ pub async fn db_writer(
                                event.get_author_prefix()
                            );
                        } else {
-                            info!("rejecting event, author ({:?} / {:?}) verification invalid (expired/wrong domain)",
+                            info!(
-                                  uv.name.to_string(),
+                                "rejecting event, author ({:?} / {:?}) verification invalid (expired/wrong domain)",
-                                  event.get_author_prefix()
+                                uv.name.to_string(),
                                event.get_author_prefix()
                            );
                            notice_tx
-                                .try_send(
+                                .try_send(Notice::blocked(
-                                    "NIP-05 verification is no longer valid (expired/wrong domain)"
+                                    event.id,
-                                        .to_owned(),
+                                    "NIP-05 verification is no longer valid (expired/wrong domain)",
-                                )
+                                ))
                                .ok();
                            continue;
                        }
@@ -203,7 +272,10 @@ pub async fn db_writer(
                            event.get_author_prefix()
                        );
                        notice_tx
-                            .try_send("NIP-05 verification needed to publish events".to_owned())
+                            .try_send(Notice::blocked(
                                event.id,
                                "NIP-05 verification needed to publish events",
                            ))
                            .ok();
                        continue;
                    }
@@ -218,20 +290,22 @@ pub async fn db_writer(
            if event.kind >= 20000 && event.kind < 30000 {
                bcast_tx.send(event.clone()).ok();
                info!(
-                    "published ephemeral event {:?} from {:?} in {:?}",
+                    "published ephemeral event: {:?} from: {:?} in: {:?}",
                    event.get_event_id_prefix(),
                    event.get_author_prefix(),
                    start.elapsed()
                );
                event_write = true
            } else {
                log_pool_stats("writer", &pool);
                match write_event(&mut pool.get()?, &event) {
                    Ok(updated) => {
                        if updated == 0 {
                            trace!("ignoring duplicate or deleted event");
                            notice_tx.try_send(Notice::duplicate(event.id)).ok();
                        } else {
                            info!(
-                                "persisted event {:?} from {:?} in {:?}",
+                                "persisted event: {:?} from: {:?} in: {:?}",
                                event.get_event_id_prefix(),
                                event.get_author_prefix(),
                                start.elapsed()
@@ -239,18 +313,21 @@ pub async fn db_writer(
                            event_write = true;
                            // send this out to all clients
                            bcast_tx.send(event.clone()).ok();
                            notice_tx.try_send(Notice::saved(event.id)).ok();
                        }
                    }
                    Err(err) => {
                        warn!("event insert failed: {:?}", err);
-                        notice_tx
+                        let msg = "relay experienced an error trying to publish the latest event";
-                            .try_send(
+                        notice_tx.try_send(Notice::error(event.id, msg)).ok();
                                "relay experienced an error trying to publish the latest event"
                                    .to_owned(),
                            )
                            .ok();
                    }
                }
                backup_pause_counter += 1;
                if backup_pause_counter > EVENT_COUNT_BACKUP_PAUSE_TRIGGER {
                    info!("pausing db write thread for a moment...");
                    thread::sleep(Duration::from_millis(500));
                    backup_pause_counter = 0
                }
            }
            // use rate limit, if defined, and if an event was actually written.
@@ -297,7 +374,8 @@ pub fn write_event(conn: &mut PooledConnection, e: &Event) -> Result<usize> {
    )?;
    if ins_count == 0 {
        // if the event was a duplicate, no need to insert event or
-        // pubkey references.  This will abort the txn.
+        // pubkey references.
        tx.rollback().ok();
        return Ok(ins_count);
    }
    // remember primary key of the event most recently inserted.
@@ -315,9 +393,9 @@ pub fn write_event(conn: &mut PooledConnection, e: &Event) -> Result<usize> {
                    // if tagvalue is lowercase hex;
                    if is_lower_hex(tagval) && (tagval.len() % 2 == 0) {
                        tx.execute(
-			    "INSERT OR IGNORE INTO tag (event_id, name, value_hex) VALUES (?1, ?2, ?3)",
+                            "INSERT OR IGNORE INTO tag (event_id, name, value_hex) VALUES (?1, ?2, ?3)",
-			    params![ev_id, &tagname, hex::decode(tagval).ok()],
+                            params![ev_id, &tagname, hex::decode(tagval).ok()],
-			)?;
+                        )?;
                    } else {
                        tx.execute(
                            "INSERT OR IGNORE INTO tag (event_id, name, value) VALUES (?1, ?2, ?3)",
@@ -332,7 +410,7 @@ pub fn write_event(conn: &mut PooledConnection, e: &Event) -> Result<usize> {
    // if this event is replaceable update, hide every other replaceable
    // event with the same kind from the same author that was issued
    // earlier than this.
-    if e.kind == 0 || e.kind == 3 || (e.kind >= 10000 && e.kind < 20000) {
+    if e.kind == 0 || e.kind == 3 || e.kind == 41 || (e.kind >= 10000 && e.kind < 20000) {
        let update_count = tx.execute(
            "UPDATE event SET hidden=TRUE WHERE id!=? AND kind=? AND author=? AND created_at <= ? and hidden!=TRUE",
            params![ev_id, e.kind, hex::decode(&e.pubkey).ok(), e.created_at],
@@ -423,14 +501,13 @@ fn query_from_filter(f: &ReqFilter) -> (String, Vec<Box<dyn ToSql>>) {
    // if the filter is malformed, don't return anything.
    if f.force_no_match {
-        let empty_query =
+        let empty_query = "SELECT e.content, e.created_at FROM event e WHERE 1=0".to_owned();
            "SELECT DISTINCT(e.content), e.created_at FROM event e WHERE 1=0".to_owned();
        // query parameters for SQLite
        let empty_params: Vec<Box<dyn ToSql>> = vec![];
        return (empty_query, empty_params);
    }
-    let mut query = "SELECT DISTINCT(e.content), e.created_at FROM event e  ".to_owned();
+    let mut query = "SELECT e.content, e.created_at FROM event e".to_owned();
    // query parameters for SQLite
    let mut params: Vec<Box<dyn ToSql>> = vec![];
@@ -466,8 +543,14 @@ fn query_from_filter(f: &ReqFilter) -> (String, Vec<Box<dyn ToSql>>) {
                }
            }
        }
-        let authors_clause = format!("({})", auth_searches.join(" OR "));
+        if !authvec.is_empty() {
-        filter_components.push(authors_clause);
+            let authors_clause = format!("({})", auth_searches.join(" OR "));
            filter_components.push(authors_clause);
        } else {
            // if the authors list was empty, we should never return
            // any results.
            filter_components.push("false".to_owned());
        }
    }
    // Query for Kind
    if let Some(ks) = &f.kinds {
@@ -500,8 +583,14 @@ fn query_from_filter(f: &ReqFilter) -> (String, Vec<Box<dyn ToSql>>) {
                }
            }
        }
-        let id_clause = format!("({})", id_searches.join(" OR "));
+        if !idvec.is_empty() {
-        filter_components.push(id_clause);
+            let id_clause = format!("({})", id_searches.join(" OR "));
            filter_components.push(id_clause);
        } else {
            // if the ids list was empty, we should never return
            // any results.
            filter_components.push("false".to_owned());
        }
    }
    // Query for tags
    if let Some(map) = &f.tags {
@@ -521,7 +610,10 @@ fn query_from_filter(f: &ReqFilter) -> (String, Vec<Box<dyn ToSql>>) {
            let str_clause = format!("value IN ({})", repeat_vars(str_vals.len()));
            let blob_clause = format!("value_hex IN ({})", repeat_vars(blob_vals.len()));
            // find evidence of the target tag name/value existing for this event.
-            let tag_clause = format!("e.id IN (SELECT e.id FROM event e LEFT JOIN tag t on e.id=t.event_id WHERE hidden!=TRUE and (name=? AND ({} OR {})))", str_clause, blob_clause);
+            let tag_clause = format!(
                "e.id IN (SELECT e.id FROM event e LEFT JOIN tag t on e.id=t.event_id WHERE hidden!=TRUE and (name=? AND ({} OR {})))",
                str_clause, blob_clause
            );
            // add the tag name as the first parameter
            params.push(Box::new(key.to_string()));
            // add all tag values that are plain strings as params
@@ -574,13 +666,90 @@ fn query_from_sub(sub: &Subscription) -> (String, Vec<Box<dyn ToSql>>) {
    // encapsulate subqueries into select statements
    let subqueries_selects: Vec<String> = subqueries
        .iter()
-        .map(|s| format!("SELECT content, created_at FROM ({})", s))
+        .map(|s| format!("SELECT distinct content, created_at FROM ({})", s))
        .collect();
    let query: String = subqueries_selects.join(" UNION ");
    debug!("final query string: {}", query);
    (query, params)
 }
 /// Check if the pool is fully utilized
 fn _pool_at_capacity(pool: &SqlitePool) -> bool {
    let state: r2d2::State = pool.state();
    state.idle_connections == 0
 }
 /// Log pool stats
 fn log_pool_stats(name: &str, pool: &SqlitePool) {
    let state: r2d2::State = pool.state();
    let in_use_cxns = state.connections - state.idle_connections;
    debug!(
        "DB pool {:?} usage (in_use: {}, available: {}, max: {})",
        name,
        in_use_cxns,
        state.connections,
 	pool.max_size()
    );
 }
 /// Perform database maintenance on a regular basis
 pub async fn db_optimize_task(pool: SqlitePool) {
    tokio::task::spawn(async move {
        loop {
            tokio::select! {
                _ = tokio::time::sleep(Duration::from_secs(60*60)) => {
                    if let Ok(mut conn) = pool.get() {
 			// the busy timer will block writers, so don't set
 			// this any higher than you want max latency for event
 			// writes.
                        info!("running database optimizer");
                        optimize_db(&mut conn).ok();
                    }
 		}
            };
        }
    });
 }
 /// Perform database WAL checkpoint on a regular basis
 pub async fn db_checkpoint_task(pool: SqlitePool, safe_to_read: Arc<Mutex<u64>>) {
    tokio::task::spawn(async move {
 	// WAL size in pages.
 	let mut current_wal_size = 0;
 	// WAL threshold for more aggressive checkpointing (10,000 pages, or about 40MB)
 	let wal_threshold = 1000*10;
 	// default threshold for the busy timer
 	let busy_wait_default = Duration::from_secs(1);
 	// if the WAL file is getting too big, switch to this
 	let busy_wait_default_long = Duration::from_secs(10);
        loop {
            tokio::select! {
                _ = tokio::time::sleep(Duration::from_secs(CHECKPOINT_FREQ_SEC)) => {
                    if let Ok(mut conn) = pool.get() {
                        let mut _guard:Option<MutexGuard<u64>> = None;
 			// the busy timer will block writers, so don't set
 			// this any higher than you want max latency for event
 			// writes.
 			if current_wal_size <= wal_threshold {
 			    conn.busy_timeout(busy_wait_default).ok();
 			} else {
 			    // if the wal size has exceeded a threshold, increase the busy timeout.
 			    conn.busy_timeout(busy_wait_default_long).ok();
 			    // take a lock that will prevent new readers.
 			    info!("blocking new readers to perform wal_checkpoint");
 			    _guard = Some(safe_to_read.lock().await);
 			}
                        debug!("running wal_checkpoint(TRUNCATE)");
                        if let Ok(new_size) = checkpoint_db(&mut conn) {
 			    current_wal_size = new_size;
 			}
                    }
 		}
            };
        }
    });
 }
 /// Perform a database query using a subscription.
 ///
 /// The [`Subscription`] is converted into a SQL query.  Each result
@@ -593,46 +762,124 @@ pub async fn db_query(
    pool: SqlitePool,
    query_tx: tokio::sync::mpsc::Sender<QueryResult>,
    mut abandon_query_rx: tokio::sync::oneshot::Receiver<()>,
    safe_to_read: Arc<Mutex<u64>>,
 ) {
    let pre_spawn_start = Instant::now();
    task::spawn_blocking(move || {
-        debug!("going to query for: {:?}", sub);
+	{
-        let mut row_count: usize = 0;
+	    // if we are waiting on a checkpoint, stop until it is complete
 	    let _ = safe_to_read.blocking_lock();
 	}
        let db_queue_time = pre_spawn_start.elapsed();
        // if the queue time was very long (>5 seconds), spare the DB and abort.
        if db_queue_time > Duration::from_secs(5) {
            info!(
                "shedding DB query load from {:?} (cid: {}, sub: {:?})",
                db_queue_time, client_id, sub.id
            );
            return Ok(());
        }
        // otherwise, report queuing time if it is slow
        else if db_queue_time > Duration::from_secs(1) {
            debug!(
                "(slow) DB query queued for {:?} (cid: {}, sub: {:?})",
                db_queue_time, client_id, sub.id
            );
        }
        let start = Instant::now();
        let mut row_count: usize = 0;
        // generate SQL query
        let (q, p) = query_from_sub(&sub);
-        debug!("SQL generated in {:?}", start.elapsed());
+        let sql_gen_elapsed = start.elapsed();
-        // show pool stats
+        if sql_gen_elapsed > Duration::from_millis(10) {
-        debug!("DB pool stats: {:?}", pool.state());
+            debug!("SQL (slow) generated in {:?}", start.elapsed());
        }
        // cutoff for displaying slow queries
        let slow_cutoff = Duration::from_millis(2000);
        // any client that doesn't cause us to generate new rows in 5
        // seconds gets dropped.
        let abort_cutoff = Duration::from_secs(5);
        let start = Instant::now();
-        if let Ok(conn) = pool.get() {
+        let mut slow_first_event;
-            // execute the query. Don't cache, since queries vary so much.
+        let mut last_successful_send = Instant::now();
-            let mut stmt = conn.prepare(&q)?;
+        if let Ok(mut conn) = pool.get() {
            // execute the query.
            // make the actual SQL query (with parameters inserted) available
            conn.trace(Some(|x| {trace!("SQL trace: {:?}", x)}));
            let mut stmt = conn.prepare_cached(&q)?;
            let mut event_rows = stmt.query(rusqlite::params_from_iter(p))?;
            let mut first_result = true;
            while let Some(row) = event_rows.next()? {
                let first_event_elapsed = start.elapsed();
                slow_first_event = first_event_elapsed >= slow_cutoff;
                if first_result {
                    debug!(
-                        "time to first result: {:?} (cid={}, sub={:?})",
+                        "first result in {:?} (cid: {}, sub: {:?})",
-                        start.elapsed(),
+                        first_event_elapsed, client_id, sub.id
                        client_id,
                        sub.id
                    );
                    first_result = false;
                }
-                // check if this is still active
+                // logging for slow queries; show sub and SQL.
-                // TODO:  check every N rows
+                // to reduce logging; only show 1/16th of clients (leading 0)
-                if abandon_query_rx.try_recv().is_ok() {
+                if row_count == 0 && slow_first_event && client_id.starts_with('0') {
-                    debug!("query aborted (sub={:?})", sub.id);
+                    debug!(
                        "query req (slow): {:?} (cid: {}, sub: {:?})",
                        sub, client_id, sub.id
                    );
 		}
 		// check if a checkpoint is trying to run, and abort
 		if row_count % 100 == 0 {
 		    {
 			if let Err(_) = safe_to_read.try_lock() {
 			    // lock was held, abort this query
 			    debug!("query aborted due to checkpoint (cid: {}, sub: {:?})", client_id, sub.id);
 			    return Ok(());
 			}
 		    }
 		}
                // check if this is still active; every 100 rows
                if row_count % 100 == 0 && abandon_query_rx.try_recv().is_ok() {
                    debug!("query aborted (cid: {}, sub: {:?})", client_id, sub.id);
                    return Ok(());
                }
                row_count += 1;
                let event_json = row.get(0)?;
                loop {
                    if query_tx.capacity() != 0 {
                        // we have capacity to add another item
                        break;
                    } else {
                        // the queue is full
                        trace!("db reader thread is stalled");
                        if last_successful_send + abort_cutoff < Instant::now() {
                            // the queue has been full for too long, abort
                            info!("aborting database query due to slow client (cid: {}, sub: {:?})",
 				  client_id, sub.id);
                            let ok: Result<()> = Ok(());
                            return ok;
                        }
 			// check if a checkpoint is trying to run, and abort
 			if let Err(_) = safe_to_read.try_lock() {
 			    // lock was held, abort this query
 			    debug!("query aborted due to checkpoint (cid: {}, sub: {:?})", client_id, sub.id);
 			    return Ok(());
 			}
                        // give the queue a chance to clear before trying again
                        thread::sleep(Duration::from_millis(100));
                    }
                }
                // TODO: we could use try_send, but we'd have to juggle
                // getting the query result back as part of the error
                // result.
                query_tx
                    .blocking_send(QueryResult {
                        sub_id: sub.get_id(),
                        event: event_json,
                    })
                    .ok();
                last_successful_send = Instant::now();
            }
            query_tx
                .blocking_send(QueryResult {
@@ -641,11 +888,12 @@ pub async fn db_query(
                })
                .ok();
            debug!(
-                "query completed ({} rows) in {:?} (cid={}, sub={:?})",
+                "query completed in {:?} (cid: {}, sub: {:?}, db_time: {:?}, rows: {})",
-                row_count,
+                pre_spawn_start.elapsed(),
                start.elapsed(),
                client_id,
-                sub.id
+                sub.id,
                start.elapsed(),
                row_count
            );
        } else {
            warn!("Could not get a database connection for querying");
@@ -80,7 +80,7 @@ impl FromStr for Operator {
 #[derive(Serialize, Deserialize, PartialEq, Eq, Debug, Clone)]
 pub struct ConditionQuery {
-    pub(crate) conditions: Vec<Condition>,
+    pub conditions: Vec<Condition>,
 }
 impl ConditionQuery {
@@ -137,9 +137,9 @@ pub fn validate_delegation(
 /// An example complex condition would be:  kind=1,2,3&created_at<1665265999
 #[derive(Serialize, Deserialize, PartialEq, Eq, Debug, Clone)]
 pub struct Condition {
-    pub(crate) field: Field,
+    pub field: Field,
-    pub(crate) operator: Operator,
+    pub operator: Operator,
-    pub(crate) values: Vec<u64>,
+    pub values: Vec<u64>,
 }
 impl Condition {
@@ -332,19 +332,6 @@ mod tests {
        assert_eq!(parsed, cq);
        Ok(())
    }
    fn simple_event() -> Event {
        Event {
            id: "0".to_owned(),
            pubkey: "0".to_owned(),
            delegated_by: None,
            created_at: 0,
            kind: 0,
            tags: vec![],
            content: "".to_owned(),
            sig: "0".to_owned(),
            tagidx: None,
        }
    }
    // Check for condition logic on event w/ empty values
    #[test]
    fn condition_with_empty_values() {
@@ -353,7 +340,7 @@ mod tests {
            operator: Operator::GreaterThan,
            values: vec![],
        };
-        let e = simple_event();
+        let e = Event::simple_event();
        assert!(!c.allows_event(&e));
        c.operator = Operator::LessThan;
        assert!(!c.allows_event(&e));
@@ -373,7 +360,7 @@ mod tests {
            operator: Operator::GreaterThan,
            values: vec![10],
        };
-        let mut e = simple_event();
+        let mut e = Event::simple_event();
        // kind is not greater than 10, not allowed
        e.kind = 1;
        assert!(!c.allows_event(&e));
@@ -392,7 +379,7 @@ mod tests {
            operator: Operator::Equals,
            values: vec![0, 10, 20],
        };
-        let mut e = simple_event();
+        let mut e = Event::simple_event();
        // Allow if event kind is in list for Equals
        e.kind = 10;
        assert!(c.allows_event(&e));
@@ -17,10 +17,16 @@ pub enum Error {
    ConnWriteError,
    #[error("EVENT parse failed")]
    EventParseFailed,
-    #[error("ClOSE message parse failed")]
+    #[error("CLOSE message parse failed")]
    CloseParseFailed,
-    #[error("Event validation failed")]
+    #[error("Event invalid signature")]
-    EventInvalid,
+    EventInvalidSignature,
    #[error("Event invalid id")]
    EventInvalidId,
    #[error("Event malformed pubkey")]
    EventMalformedPubkey,
    #[error("Event could not canonicalize")]
    EventCouldNotCanonicalize,
    #[error("Event too large")]
    EventMaxLengthError(usize),
    #[error("Subscription identifier max length exceeded")]
@@ -27,23 +27,29 @@ pub struct EventCmd {
    event: Event,
 }
 impl EventCmd {
    pub fn event_id(&self) -> &str {
        &self.event.id
    }
 }
 /// Parsed nostr event.
 #[derive(Serialize, Deserialize, PartialEq, Eq, Debug, Clone)]
 pub struct Event {
    pub id: String,
-    pub(crate) pubkey: String,
+    pub pubkey: String,
    #[serde(skip)]
-    pub(crate) delegated_by: Option<String>,
+    pub delegated_by: Option<String>,
-    pub(crate) created_at: u64,
+    pub created_at: u64,
-    pub(crate) kind: u64,
+    pub kind: u64,
    #[serde(deserialize_with = "tag_from_string")]
    // NOTE: array-of-arrays may need to be more general than a string container
-    pub(crate) tags: Vec<Vec<String>>,
+    pub tags: Vec<Vec<String>>,
-    pub(crate) content: String,
+    pub content: String,
-    pub(crate) sig: String,
+    pub sig: String,
    // Optimization for tag search, built on demand.
    #[serde(skip)]
-    pub(crate) tagidx: Option<HashMap<char, HashSet<String>>>,
+    pub tagidx: Option<HashMap<char, HashSet<String>>>,
 }
 /// Simple tag type for array of array of strings.
@@ -83,18 +89,33 @@ impl From<EventCmd> for Result<Event> {
        // ensure command is correct
        if ec.cmd != "EVENT" {
            Err(CommandUnknownError)
        } else if ec.event.is_valid() {
            let mut e = ec.event;
            e.build_index();
            e.update_delegation();
            Ok(e)
        } else {
-            Err(EventInvalid)
+            ec.event.validate().map(|_| {
                let mut e = ec.event;
                e.build_index();
                e.update_delegation();
                e
            })
        }
    }
 }
 impl Event {
    #[cfg(test)]
    pub fn simple_event() -> Event {
        Event {
            id: "0".to_owned(),
            pubkey: "0".to_owned(),
            delegated_by: None,
            created_at: 0,
            kind: 0,
            tags: vec![],
            content: "".to_owned(),
            sig: "0".to_owned(),
            tagidx: None,
        }
    }
    pub fn is_kind_metadata(&self) -> bool {
        self.kind == 0
    }
@@ -220,7 +241,7 @@ impl Event {
    }
    /// Check if this event has a valid signature.
-    fn is_valid(&self) -> bool {
+    pub fn validate(&self) -> Result<()> {
        // TODO: return a Result with a reason for invalid events
        // validation is performed by:
        // * parsing JSON string into event fields
@@ -229,8 +250,8 @@ impl Event {
        // * serialize with no spaces/newlines
        let c_opt = self.to_canonical();
        if c_opt.is_none() {
-            debug!("event could not be canonicalized");
+            debug!("could not canonicalize");
-            return false;
+            return Err(EventCouldNotCanonicalize);
        }
        let c = c_opt.unwrap();
        // * compute the sha256sum.
@@ -239,21 +260,21 @@ impl Event {
        // * ensure the id matches the computed sha256sum.
        if self.id != hex_digest {
            debug!("event id does not match digest");
-            return false;
+            return Err(EventInvalidId);
        }
        // * validate the message digest (sig) using the pubkey & computed sha256 message hash.
        let sig = schnorr::Signature::from_str(&self.sig).unwrap();
        if let Ok(msg) = secp256k1::Message::from_slice(digest.as_ref()) {
            if let Ok(pubkey) = XOnlyPublicKey::from_str(&self.pubkey) {
-                let verify = SECP.verify_schnorr(&sig, &msg, &pubkey);
+                SECP.verify_schnorr(&sig, &msg, &pubkey)
-                matches!(verify, Ok(()))
+                    .map_err(|_| EventInvalidSignature)
            } else {
                debug!("client sent malformed pubkey");
-                false
+                Err(EventMalformedPubkey)
            }
        } else {
            info!("error converting digest to secp256k1 message");
-            false
+            Err(EventInvalidSignature)
        }
    }
@@ -313,31 +334,18 @@ impl Event {
 #[cfg(test)]
 mod tests {
    use super::*;
    fn simple_event() -> Event {
        Event {
            id: "0".to_owned(),
            pubkey: "0".to_owned(),
            delegated_by: None,
            created_at: 0,
            kind: 0,
            tags: vec![],
            content: "".to_owned(),
            sig: "0".to_owned(),
            tagidx: None,
        }
    }
    #[test]
    fn event_creation() {
        // create an event
-        let event = simple_event();
+        let event = Event::simple_event();
        assert_eq!(event.id, "0");
    }
    #[test]
    fn event_serialize() -> Result<()> {
        // serialize an event to JSON string
-        let event = simple_event();
+        let event = Event::simple_event();
        let j = serde_json::to_string(&event)?;
        assert_eq!(j, "{\"id\":\"0\",\"pubkey\":\"0\",\"created_at\":0,\"kind\":0,\"tags\":[],\"content\":\"\",\"sig\":\"0\"}");
        Ok(())
@@ -345,14 +353,14 @@ mod tests {
    #[test]
    fn empty_event_tag_match() {
-        let event = simple_event();
+        let event = Event::simple_event();
        assert!(!event
            .generic_tag_val_intersect('e', &HashSet::from(["foo".to_owned(), "bar".to_owned()])));
    }
    #[test]
    fn single_event_tag_match() {
-        let mut event = simple_event();
+        let mut event = Event::simple_event();
        event.tags = vec![vec!["e".to_owned(), "foo".to_owned()]];
        event.build_index();
        assert_eq!(
@@ -367,7 +375,7 @@ mod tests {
    #[test]
    fn event_tags_serialize() -> Result<()> {
        // serialize an event with tags to JSON string
-        let mut event = simple_event();
+        let mut event = Event::simple_event();
        event.tags = vec![
            vec![
                "e".to_owned(),
@@ -3,7 +3,7 @@ use crate::utils::is_hex;
 use hex;
 /// Types of hexadecimal queries.
-#[derive(PartialEq, Eq, Debug, Clone)]
+#[derive(PartialEq, Eq, PartialOrd, Ord, Debug, Clone)]
 pub enum HexSearch {
    // when no range is needed, exact 32-byte
    Exact(Vec<u8>),
@@ -35,7 +35,7 @@ impl From<config::Info> for RelayInfo {
            description: i.description,
            pubkey: i.pubkey,
            contact: i.contact,
-            supported_nips: Some(vec![1, 2, 9, 11, 12, 15, 16, 22, 26]),
+            supported_nips: Some(vec![1, 2, 9, 11, 12, 15, 16, 20, 22, 26]),
            software: Some("https://git.sr.ht/~gheartsfield/nostr-rs-relay".to_owned()),
            version: CARGO_PKG_VERSION.map(|x| x.to_owned()),
        }
@@ -8,6 +8,7 @@ pub mod event;
 pub mod hexrange;
 pub mod info;
 pub mod nip05;
 pub mod notice;
 pub mod schema;
 pub mod subscription;
 pub mod utils;
@@ -517,7 +517,7 @@ impl Verifier {
                Ok(updated) => {
                    if updated != 0 {
                        info!(
-                            "persisted event: {:?} in {:?}",
+                            "persisted event (new verified pubkey): {:?} in {:?}",
                            event.get_event_id_prefix(),
                            start.elapsed()
                        );
@@ -721,7 +721,7 @@ pub fn query_oldest_user_verification(
    earliest: u64,
 ) -> Result<VerificationRecord> {
    let tx = conn.transaction()?;
-    let query = "SELECT v.id, v.name, e.event_hash, e.author, e.created_at, v.verified_at, v.failed_at, v.failure_count FROM user_verification v LEFT JOIN event e ON e.id=v.metadata_event WHERE (v.verified_at < ? OR v.verified_at IS NULL) AND (v.failed_at < ? OR v.failed_at IS NULL) ORDER BY v.verified_at ASC, v.failed_at ASC LIMIT 1;";
+    let query = "SELECT v.id, v.name, e.event_hash, e.author, e.created_at, v.verified_at, v.failed_at, v.failure_count FROM user_verification v INNER JOIN event e ON e.id=v.metadata_event WHERE (v.verified_at < ? OR v.verified_at IS NULL) AND (v.failed_at < ? OR v.failed_at IS NULL) ORDER BY v.verified_at ASC, v.failed_at ASC LIMIT 1;";
    let mut stmt = tx.prepare_cached(query)?;
    let fields = stmt.query_row(params![earliest, earliest], |r| {
        let rowid: u64 = r.get(0)?;
@@ -0,0 +1,86 @@
 pub enum EventResultStatus {
    Saved,
    Duplicate,
    Invalid,
    Blocked,
    RateLimited,
    Error,
 }
 pub struct EventResult {
    pub id: String,
    pub msg: String,
    pub status: EventResultStatus,
 }
 pub enum Notice {
    Message(String),
    EventResult(EventResult),
 }
 impl EventResultStatus {
    pub fn to_bool(&self) -> bool {
        match self {
            Self::Saved => true,
            Self::Duplicate => true,
            Self::Invalid => false,
            Self::Blocked => false,
            Self::RateLimited => false,
            Self::Error => false,
        }
    }
    pub fn prefix(&self) -> &'static str {
        match self {
            Self::Saved => "saved",
            Self::Duplicate => "duplicate",
            Self::Invalid => "invalid",
            Self::Blocked => "blocked",
            Self::RateLimited => "rate-limited",
            Self::Error => "error",
        }
    }
 }
 impl Notice {
    //pub fn err(err: error::Error, id: String) -> Notice {
    //    Notice::err_msg(format!("{}", err), id)
    //}
    pub fn message(msg: String) -> Notice {
        Notice::Message(msg)
    }
    fn prefixed(id: String, msg: &str, status: EventResultStatus) -> Notice {
        let msg = format!("{}: {}", status.prefix(), msg);
        Notice::EventResult(EventResult { id, msg, status })
    }
    pub fn invalid(id: String, msg: &str) -> Notice {
        Notice::prefixed(id, msg, EventResultStatus::Invalid)
    }
    pub fn blocked(id: String, msg: &str) -> Notice {
        Notice::prefixed(id, msg, EventResultStatus::Blocked)
    }
    pub fn rate_limited(id: String, msg: &str) -> Notice {
        Notice::prefixed(id, msg, EventResultStatus::RateLimited)
    }
    pub fn duplicate(id: String) -> Notice {
        Notice::prefixed(id, "", EventResultStatus::Duplicate)
    }
    pub fn error(id: String, msg: &str) -> Notice {
        Notice::prefixed(id, msg, EventResultStatus::Error)
    }
    pub fn saved(id: String) -> Notice {
        Notice::EventResult(EventResult {
            id,
            msg: "".into(),
            status: EventResultStatus::Saved,
        })
    }
 }
@@ -16,11 +16,11 @@ pub const STARTUP_SQL: &str = r##"
 PRAGMA main.synchronous=NORMAL;
 PRAGMA foreign_keys = ON;
 PRAGMA journal_size_limit=32768;
-pragma mmap_size = 536870912; -- 512MB of mmap
+pragma mmap_size = 17179869184; -- cap mmap at 16GB
 "##;
 /// Latest database version
-pub const DB_VERSION: usize = 7;
+pub const DB_VERSION: usize = 11;
 /// Schema definition
 const INIT_SQL: &str = formatcp!(
@@ -48,10 +48,10 @@ content TEXT NOT NULL -- serialized json of event object
 -- Event Indexes
 CREATE UNIQUE INDEX IF NOT EXISTS event_hash_index ON event(event_hash);
 CREATE INDEX IF NOT EXISTS created_at_index ON event(created_at);
 CREATE INDEX IF NOT EXISTS author_index ON event(author);
 CREATE INDEX IF NOT EXISTS created_at_index ON event(created_at);
 CREATE INDEX IF NOT EXISTS delegated_by_index ON event(delegated_by);
-CREATE INDEX IF NOT EXISTS kind_index ON event(kind);
+CREATE INDEX IF NOT EXISTS event_composite_index ON event(kind,created_at);
 -- Tag Table
 -- Tag values are stored as either a BLOB (if they come in as a
@@ -67,6 +67,8 @@ FOREIGN KEY(event_id) REFERENCES event(id) ON UPDATE CASCADE ON DELETE CASCADE
 );
 CREATE INDEX IF NOT EXISTS tag_val_index ON tag(value);
 CREATE INDEX IF NOT EXISTS tag_val_hex_index ON tag(value_hex);
 CREATE INDEX IF NOT EXISTS tag_composite_index ON tag(event_id,name,value_hex,value);
 CREATE INDEX IF NOT EXISTS tag_name_eid_index ON tag(name,event_id,value_hex);
 -- NIP-05 User Validation
 CREATE TABLE IF NOT EXISTS user_verification (
@@ -157,6 +159,19 @@ pub fn upgrade_db(conn: &mut PooledConnection) -> Result<()> {
            if curr_version == 6 {
                curr_version = mig_6_to_7(conn)?;
            }
            if curr_version == 7 {
                curr_version = mig_7_to_8(conn)?;
            }
            if curr_version == 8 {
                curr_version = mig_8_to_9(conn)?;
            }
            if curr_version == 9 {
                curr_version = mig_9_to_10(conn)?;
            }
            if curr_version == 10 {
                curr_version = mig_10_to_11(conn)?;
            }
            if curr_version == DB_VERSION {
                info!(
                    "All migration scripts completed successfully.  Welcome to v{}.",
@@ -373,3 +388,84 @@ PRAGMA user_version = 7;
    }
    Ok(7)
 }
 fn mig_7_to_8(conn: &mut PooledConnection) -> Result<usize> {
    info!("database schema needs update from 7->8");
    // Remove redundant indexes, and add a better multi-column index.
    let upgrade_sql = r##"
 DROP INDEX IF EXISTS created_at_index;
 DROP INDEX IF EXISTS kind_index;
 CREATE INDEX IF NOT EXISTS event_composite_index ON event(kind,created_at);
 PRAGMA user_version = 8;
 "##;
    match conn.execute_batch(upgrade_sql) {
        Ok(()) => {
            info!("database schema upgraded v7 -> v8");
        }
        Err(err) => {
            error!("update failed: {}", err);
            panic!("database could not be upgraded");
        }
    }
    Ok(8)
 }
 fn mig_8_to_9(conn: &mut PooledConnection) -> Result<usize> {
    info!("database schema needs update from 8->9");
    // Those old indexes were actually helpful...
    let upgrade_sql = r##"
 CREATE INDEX IF NOT EXISTS created_at_index ON event(created_at);
 CREATE INDEX IF NOT EXISTS event_composite_index ON event(kind,created_at);
 PRAGMA user_version = 9;
 "##;
    match conn.execute_batch(upgrade_sql) {
        Ok(()) => {
            info!("database schema upgraded v8 -> v9");
        }
        Err(err) => {
            error!("update failed: {}", err);
            panic!("database could not be upgraded");
        }
    }
    Ok(9)
 }
 fn mig_9_to_10(conn: &mut PooledConnection) -> Result<usize> {
    info!("database schema needs update from 9->10");
    // Those old indexes were actually helpful...
    let upgrade_sql = r##"
 CREATE INDEX IF NOT EXISTS tag_composite_index ON tag(event_id,name,value_hex,value);
 PRAGMA user_version = 10;
 "##;
    match conn.execute_batch(upgrade_sql) {
        Ok(()) => {
            info!("database schema upgraded v9 -> v10");
        }
        Err(err) => {
            error!("update failed: {}", err);
            panic!("database could not be upgraded");
        }
    }
    Ok(10)
 }
 fn mig_10_to_11(conn: &mut PooledConnection) -> Result<usize> {
    info!("database schema needs update from 10->11");
    // Those old indexes were actually helpful...
    let upgrade_sql = r##"
 CREATE INDEX IF NOT EXISTS tag_name_eid_index ON tag(name,event_id,value_hex);
 reindex;
 pragma optimize;
 PRAGMA user_version = 11;
 "##;
    match conn.execute_batch(upgrade_sql) {
        Ok(()) => {
            info!("database schema upgraded v10 -> v11");
        }
        Err(err) => {
            error!("update failed: {}", err);
            panic!("database could not be upgraded");
        }
    }
    Ok(11)
 }
@@ -10,9 +10,11 @@ use crate::event::Event;
 use crate::event::EventCmd;
 use crate::info::RelayInfo;
 use crate::nip05;
 use crate::notice::Notice;
 use crate::subscription::Subscription;
 use futures::SinkExt;
 use futures::StreamExt;
 use governor::{Jitter, Quota, RateLimiter};
 use http::header::HeaderMap;
 use hyper::header::ACCEPT;
 use hyper::service::{make_service_fn, service_fn};
@@ -20,12 +22,16 @@ use hyper::upgrade::Upgraded;
 use hyper::{
    header, server::conn::AddrStream, upgrade, Body, Request, Response, Server, StatusCode,
 };
 use rusqlite::OpenFlags;
 use serde::{Deserialize, Serialize};
 use serde_json::json;
 use tokio::sync::Mutex;
 use std::collections::HashMap;
 use std::convert::Infallible;
 use std::net::SocketAddr;
 use std::path::Path;
 use std::sync::Arc;
 use std::sync::atomic::Ordering;
 use std::sync::mpsc::Receiver as MpscReceiver;
 use std::time::Duration;
 use std::time::Instant;
@@ -50,6 +56,7 @@ async fn handle_web_request(
    broadcast: Sender<Event>,
    event_tx: tokio::sync::mpsc::Sender<SubmittedEvent>,
    shutdown: Receiver<()>,
    safe_to_read: Arc<Mutex<u64>>,
 ) -> Result<Response<Body>, Infallible> {
    match (
        request.uri().path(),
@@ -85,6 +92,7 @@ async fn handle_web_request(
                                    Some(config),
                                )
                                .await;
                                let origin = get_header_string("origin", request.headers());
                                let user_agent = get_header_string("user-agent", request.headers());
                                // determine the remote IP from headers if the exist
                                let header_ip = settings
@@ -98,6 +106,7 @@ async fn handle_web_request(
                                let client_info = ClientInfo {
                                    remote_ip,
                                    user_agent,
                                    origin,
                                };
                                // spawn a nostr server with our websocket
                                tokio::spawn(nostr_server(
@@ -108,6 +117,7 @@ async fn handle_web_request(
                                    broadcast,
                                    event_tx,
                                    shutdown,
 				    safe_to_read,
                                ));
                            }
                            // todo: trace, don't print...
@@ -242,7 +252,20 @@ pub fn start_server(settings: Settings, shutdown_rx: MpscReceiver<()>) -> Result
    // configure tokio runtime
    let rt = Builder::new_multi_thread()
        .enable_all()
-        .thread_name("tokio-ws")
+        .thread_name_fn(|| {
 	    // give each thread a unique numeric name
 	    static ATOMIC_ID: std::sync::atomic::AtomicUsize = std::sync::atomic::AtomicUsize::new(0);
 	    let id = ATOMIC_ID.fetch_add(1,Ordering::SeqCst);
 	    format!("tokio-ws-{}", id)
 		})
        // limit concurrent SQLite blocking threads
        .max_blocking_threads(settings.limits.max_blocking_threads)
        .on_thread_start(|| {
            trace!("started new thread: {:?}", std::thread::current().name());
        })
        .on_thread_stop(|| {
 	    trace!("stopped thread: {:?}", std::thread::current().name());
        })
        .build()
        .unwrap();
    // start tokio
@@ -300,6 +323,23 @@ pub fn start_server(settings: Settings, shutdown_rx: MpscReceiver<()>) -> Result
                }
            }
        }
        // build a connection pool for DB maintenance
        let maintenance_pool = db::build_pool(
            "maintenance writer",
            &settings,
            OpenFlags::SQLITE_OPEN_READ_WRITE | OpenFlags::SQLITE_OPEN_CREATE,
            1,
            2,
            false,
        );
 	// Create a mutex that will block readers, so that a
 	// checkpoint can be performed quickly.
 	let safe_to_read = Arc::new(Mutex::new(0));
        db::db_optimize_task(maintenance_pool.clone()).await;
        db::db_checkpoint_task(maintenance_pool, safe_to_read.clone()).await;
        // listen for (external to tokio) shutdown request
        let controlled_shutdown = invoke_shutdown.clone();
        tokio::spawn(async move {
@@ -310,6 +350,7 @@ pub fn start_server(settings: Settings, shutdown_rx: MpscReceiver<()>) -> Result
                    controlled_shutdown.send(()).ok();
                }
                Err(std::sync::mpsc::RecvError) => {
                    // FIXME: spurious error on startup?
                    debug!("shutdown requestor is disconnected");
                }
            };
@@ -328,12 +369,15 @@ pub fn start_server(settings: Settings, shutdown_rx: MpscReceiver<()>) -> Result
        let pool = db::build_pool(
            "client query",
            &settings,
-            rusqlite::OpenFlags::SQLITE_OPEN_READ_ONLY
+            rusqlite::OpenFlags::SQLITE_OPEN_READ_ONLY,
                | rusqlite::OpenFlags::SQLITE_OPEN_SHARED_CACHE,
            db_min_conn,
            db_max_conn,
            true,
        );
 	// spawn a task to check the pool size.
 	let pool_monitor = pool.clone();
 	tokio::spawn(async move {db::monitor_pool("reader", pool_monitor).await;});
        // A `Service` is needed for every connection, so this
        // creates one from our `handle_request` function.
        let make_svc = make_service_fn(|conn: &AddrStream| {
@@ -343,6 +387,7 @@ pub fn start_server(settings: Settings, shutdown_rx: MpscReceiver<()>) -> Result
            let event = event_tx.clone();
            let stop = invoke_shutdown.clone();
            let settings = settings.clone();
            let safe_to_read = safe_to_read.clone();
            async move {
                // service_fn converts our function into a `Service`
                Ok::<_, Infallible>(service_fn(move |request: Request<Body>| {
@@ -354,6 +399,7 @@ pub fn start_server(settings: Settings, shutdown_rx: MpscReceiver<()>) -> Result
                        bcast.clone(),
                        event.clone(),
                        stop.subscribe(),
 			safe_to_read.clone(),
                    )
                }))
            }
@@ -405,13 +451,19 @@ fn convert_to_msg(msg: String, max_bytes: Option<usize>) -> Result<NostrMessage>
 }
 /// Turn a string into a NOTICE message ready to send over a WebSocket
-fn make_notice_message(msg: &str) -> Message {
+fn make_notice_message(notice: Notice) -> Message {
-    Message::text(json!(["NOTICE", msg]).to_string())
+    let json = match notice {
        Notice::Message(ref msg) => json!(["NOTICE", msg]),
        Notice::EventResult(ref res) => json!(["OK", res.id, res.status.to_bool(), res.msg]),
    };
    Message::text(json.to_string())
 }
 struct ClientInfo {
    remote_ip: String,
    user_agent: Option<String>,
    origin: Option<String>,
 }
 /// Handle new client connections.  This runs through an event loop
@@ -424,18 +476,36 @@ async fn nostr_server(
    broadcast: Sender<Event>,
    event_tx: mpsc::Sender<SubmittedEvent>,
    mut shutdown: Receiver<()>,
    safe_to_read: Arc<Mutex<u64>>,
 ) {
    // the time this websocket nostr server started
    let orig_start = Instant::now();
    // get a broadcast channel for clients to communicate on
    let mut bcast_rx = broadcast.subscribe();
    // Track internal client state
    let mut conn = conn::ClientConn::new(client_info.remote_ip);
    // subscription creation rate limiting
    let mut sub_lim_opt = None;
    // 100ms jitter when the rate limiter returns
    let jitter = Jitter::up_to(Duration::from_millis(100));
    let sub_per_min_setting = settings.limits.subscriptions_per_min;
    if let Some(sub_per_min) = sub_per_min_setting {
        if sub_per_min > 0 {
            trace!("Rate limits for sub creation ({}/min)", sub_per_min);
            let quota_time = core::num::NonZeroU32::new(sub_per_min).unwrap();
            let quota = Quota::per_minute(quota_time);
            sub_lim_opt = Some(RateLimiter::direct(quota));
        }
    }
    // Use the remote IP as the client identifier
    let cid = conn.get_client_prefix();
    // Create a channel for receiving query results from the database.
    // we will send out the tx handle to any query we generate.
-    let (query_tx, mut query_rx) = mpsc::channel::<db::QueryResult>(256);
+    // this has capacity for some of the larger requests we see, which
    // should allow the DB thread to release the handle earlier.
    let (query_tx, mut query_rx) = mpsc::channel::<db::QueryResult>(20000);
    // Create channel for receiving NOTICEs
-    let (notice_tx, mut notice_rx) = mpsc::channel::<String>(32);
+    let (notice_tx, mut notice_rx) = mpsc::channel::<Notice>(128);
    // last time this client sent data (message, ping, etc.)
    let mut last_message_time = Instant::now();
@@ -453,19 +523,23 @@ async fn nostr_server(
    // when these subscriptions are cancelled, make a message
    // available to the executing query so it knows to stop.
    let mut running_queries: HashMap<String, oneshot::Sender<()>> = HashMap::new();
    // for stats, keep track of how many events the client published,
    // and how many it received from queries.
    let mut client_published_event_count: usize = 0;
    let mut client_received_event_count: usize = 0;
-    debug!("new connection for client: {:?}, ip: {:?}", cid, conn.ip());
+    debug!("new client connection (cid: {}, ip: {:?})", cid, conn.ip());
-    if let Some(ua) = client_info.user_agent {
+    let origin = client_info.origin.unwrap_or_else(|| "<unspecified>".into());
-        debug!("client: {:?} has user-agent: {:?}", cid, ua);
+    let user_agent = client_info
-    }
+        .user_agent
        .unwrap_or_else(|| "<unspecified>".into());
    debug!(
        "cid: {}, origin: {:?}, user-agent: {:?}",
        cid, origin, user_agent
    );
    loop {
        tokio::select! {
            _ = shutdown.recv() => {
-        info!("Shutting client connection down due to shutdown: {:?}, ip: {:?}", cid, conn.ip());
+        info!("Close connection down due to shutdown, client: {}, ip: {:?}, connected: {:?}", cid, conn.ip(), orig_start.elapsed());
                // server shutting down, exit loop
                break;
            },
@@ -480,7 +554,7 @@ async fn nostr_server(
                ws_stream.send(Message::Ping(Vec::new())).await.ok();
            },
            Some(notice_msg) = notice_rx.recv() => {
-                ws_stream.send(make_notice_message(&notice_msg)).await.ok();
+                ws_stream.send(make_notice_message(notice_msg)).await.ok();
            },
            Some(query_result) = query_rx.recv() => {
                // database informed us of a query result we asked for
@@ -499,12 +573,15 @@ async fn nostr_server(
            Ok(global_event) = bcast_rx.recv() => {
                // an event has been broadcast to all clients
                // first check if there is a subscription for this event.
-                let matching_subs = conn.get_matching_subscriptions(&global_event);
+                for (s, sub) in conn.subscriptions() {
-                for s in matching_subs {
+                    if !sub.interested_in_event(&global_event) {
                        continue;
                    }
                    // TODO: serialize at broadcast time, instead of
                    // once for each consumer.
                    if let Ok(event_str) = serde_json::to_string(&global_event) {
-                        debug!("sub match for client: {:?}, sub: {:?}, event: {:?}",
+                        trace!("sub match for client: {}, sub: {:?}, event: {:?}",
                               cid, s,
                               global_event.get_event_id_prefix());
                        // create an event response and send it
@@ -525,7 +602,7 @@ async fn nostr_server(
                    },
            Some(Ok(Message::Binary(_))) => {
            ws_stream.send(
-                make_notice_message("binary messages are not accepted")).await.ok();
+                make_notice_message(Notice::message("binary messages are not accepted".into()))).await.ok();
                        continue;
                    },
                    Some(Ok(Message::Ping(_) | Message::Pong(_))) => {
@@ -535,8 +612,7 @@ async fn nostr_server(
                    },
            Some(Err(WsError::Capacity(MessageTooLong{size, max_size}))) => {
            ws_stream.send(
-                make_notice_message(
+                make_notice_message(Notice::message(format!("message too large ({} > {})",size, max_size)))).await.ok();
                &format!("message too large ({} > {})",size, max_size))).await.ok();
                        continue;
            },
                    None |
@@ -544,17 +620,17 @@ async fn nostr_server(
             Err(WsError::AlreadyClosed | WsError::ConnectionClosed |
                 WsError::Protocol(tungstenite::error::ProtocolError::ResetWithoutClosingHandshake)))
                        => {
-                            debug!("websocket close from client: {:?}, ip: {:?}",cid, conn.ip());
+                            debug!("websocket close from client (cid: {}, ip: {:?})",cid, conn.ip());
                        break;
                    },
                    Some(Err(WsError::Io(e))) => {
                        // IO errors are considered fatal
-                        warn!("IO error (client: {:?}, ip: {:?}): {:?}", cid, conn.ip(), e);
+                        warn!("IO error (cid: {}, ip: {:?}): {:?}", cid, conn.ip(), e);
                        break;
                    }
                    x => {
                        // default condition on error is to close the client connection
-                        info!("unknown error (client: {:?}, ip: {:?}): {:?} (closing conn)", cid, conn.ip(), x);
+                        info!("unknown error (cid: {}, ip: {:?}): {:?} (closing conn)", cid, conn.ip(), x);
                        break;
                    }
                };
@@ -564,11 +640,12 @@ async fn nostr_server(
                    Ok(NostrMessage::EventMsg(ec)) => {
                        // An EventCmd needs to be validated to be converted into an Event
                        // handle each type of message
                        let evid = ec.event_id().to_owned();
                        let parsed : Result<Event> = Result::<Event>::from(ec);
                        match parsed {
                            Ok(e) => {
                                let id_prefix:String = e.id.chars().take(8).collect();
-                                debug!("successfully parsed/validated event: {:?} from client: {:?}", id_prefix, cid);
+                                debug!("successfully parsed/validated event: {:?} (cid: {})", id_prefix, cid);
                                // check if the event is too far in the future.
                                if e.is_valid_timestamp(settings.options.reject_future_seconds) {
                                    // Write this to the database.
@@ -576,39 +653,52 @@ async fn nostr_server(
                                    event_tx.send(submit_event).await.ok();
                                    client_published_event_count += 1;
                } else {
-                    info!("client {:?} sent a far future-dated event", cid);
+                    info!("client: {} sent a far future-dated event", cid);
                    if let Some(fut_sec) = settings.options.reject_future_seconds {
-                    ws_stream.send(make_notice_message(&format!("The event created_at field is out of the acceptable range (+{}sec) for this relay and was not stored.",fut_sec))).await.ok();
+                        let msg = format!("The event created_at field is out of the acceptable range (+{}sec) for this relay.",fut_sec);
                        let notice = Notice::invalid(e.id, &msg);
                        ws_stream.send(make_notice_message(notice)).await.ok();
                    }
                }
                            },
-                            Err(_) => {
+                            Err(e) => {
-                                info!("client: {:?} sent an invalid event", cid);
+                                info!("client sent an invalid event (cid: {})", cid);
-                                ws_stream.send(make_notice_message("event was invalid")).await.ok();
+                                ws_stream.send(make_notice_message(Notice::invalid(evid, &format!("{}", e)))).await.ok();
                            }
                        }
                    },
                    Ok(NostrMessage::SubMsg(s)) => {
-                        debug!("client {} requesting a subscription", cid);
+                        debug!("subscription requested (cid: {}, sub: {:?})", cid, s.id);
                        // subscription handling consists of:
                        // * check for rate limits
                        // * registering the subscription so future events can be matched
                        // * making a channel to cancel to request later
                        // * sending a request for a SQL query
-                        let (abandon_query_tx, abandon_query_rx) = oneshot::channel::<()>();
+            // Do nothing if the sub already exists.
-                        match conn.subscribe(s.clone()) {
+            if !conn.has_subscription(&s) {
-                            Ok(()) => {
+                if let Some(ref lim) = sub_lim_opt {
-                                // when we insert, if there was a previous query running with the same name, cancel it.
+                lim.until_ready_with_jitter(jitter).await;
-                                if let Some(previous_query) = running_queries.insert(s.id.to_owned(), abandon_query_tx) {
+                }
-                                    previous_query.send(()).ok();
+                            let (abandon_query_tx, abandon_query_rx) = oneshot::channel::<()>();
-                                }
+                            match conn.subscribe(s.clone()) {
-                                // start a database query
+                Ok(()) => {
-                                db::db_query(s, cid.to_owned(), pool.clone(), query_tx.clone(), abandon_query_rx).await;
+                                    // when we insert, if there was a previous query running with the same name, cancel it.
-                            },
+                                    if let Some(previous_query) = running_queries.insert(s.id.to_owned(), abandon_query_tx) {
-                            Err(e) => {
+                    previous_query.send(()).ok();
-                                info!("Subscription error: {}", e);
+                                    }
-                                ws_stream.send(make_notice_message(&e.to_string())).await.ok();
+		    if s.needs_historical_events() {
                                    // start a database query.  this spawns a blocking database query on a worker thread.
 					db::db_query(s, cid.to_owned(), pool.clone(), query_tx.clone(), abandon_query_rx,safe_to_read.clone()).await;
 				    }
                },
                Err(e) => {
                    info!("Subscription error: {} (cid: {}, sub: {:?})", e, cid, s.id);
                                    ws_stream.send(make_notice_message(Notice::message(format!("Subscription error: {}", e)))).await.ok();
                }
                            }
-                        }
+            } else {
        info!("client sent duplicate subscription, ignoring (cid: {}, sub: {:?})", cid, s.id);
        }
                    },
                    Ok(NostrMessage::CloseMsg(cc)) => {
                        // closing a request simply removes the subscription.
@@ -625,23 +715,23 @@ async fn nostr_server(
                                conn.unsubscribe(&c);
                            } else {
                                info!("invalid command ignored");
-                                ws_stream.send(make_notice_message("could not parse command")).await.ok();
+                                ws_stream.send(make_notice_message(Notice::message("could not parse command".into()))).await.ok();
                            }
                    },
                    Err(Error::ConnError) => {
-                        debug!("got connection close/error, disconnecting client: {:?}, ip: {:?}",cid, conn.ip());
+                        debug!("got connection close/error, disconnecting cid: {}, ip: {:?}",cid, conn.ip());
                        break;
                    }
                    Err(Error::EventMaxLengthError(s)) => {
-                        info!("client {:?} sent event larger ({} bytes) than max size", cid, s);
+                        info!("client sent event larger ({} bytes) than max size (cid: {})", s, cid);
-                        ws_stream.send(make_notice_message("event exceeded max size")).await.ok();
+                        ws_stream.send(make_notice_message(Notice::message("event exceeded max size".into()))).await.ok();
                    },
                    Err(Error::ProtoParseError) => {
-                        info!("client {:?} sent event that could not be parsed", cid);
+                        info!("client sent event that could not be parsed (cid: {})", cid);
-                        ws_stream.send(make_notice_message("could not parse command")).await.ok();
+                        ws_stream.send(make_notice_message(Notice::message("could not parse command".into()))).await.ok();
                    },
                    Err(e) => {
-                        info!("got non-fatal error from client: {:?}, error: {:?}", cid, e);
+                        info!("got non-fatal error from client (cid: {}, error: {:?}", cid, e);
                    },
                }
            },
@@ -652,10 +742,11 @@ async fn nostr_server(
        stop_tx.send(()).ok();
    }
    info!(
-        "stopping connection for client: {:?}, ip: {:?} (client sent {} event(s), received {})",
+        "stopping client connection (cid: {}, ip: {:?}, sent: {} events, recv: {} events, connected: {:?})",
        cid,
        conn.ip(),
        client_published_event_count,
-        client_received_event_count
+        client_received_event_count,
 	orig_start.elapsed()
    );
 }
@@ -37,6 +37,9 @@ pub struct ReqFilter {
    #[serde(skip)]
    pub tags: Option<HashMap<char, HashSet<String>>>,
    /// Force no matches due to malformed data
    // we can't represent it in the req filter, so we don't want to
    // erroneously match.  This basically indicates the req tried to
    // do something invalid.
    pub force_no_match: bool,
 }
@@ -62,12 +65,21 @@ impl<'de> Deserialize<'de> for ReqFilter {
            tags: None,
            force_no_match: false,
        };
 	let empty_string = "".into();
        let mut ts = None;
        // iterate through each key, and assign values that exist
        for (key, val) in filter.into_iter() {
            // ids
            if key == "ids" {
-                rf.ids = Deserialize::deserialize(val).ok();
+		let raw_ids: Option<Vec<String>>= Deserialize::deserialize(val).ok();
 		if let Some(a) = raw_ids.as_ref() {
 		    if a.contains(&empty_string) {
 		    return Err(serde::de::Error::invalid_type(
                Unexpected::Other("prefix matches must not be empty strings"),
                &"a json object"));
 		    }
 		}
 		rf.ids =raw_ids;
            } else if key == "kinds" {
                rf.kinds = Deserialize::deserialize(val).ok();
            } else if key == "since" {
@@ -77,7 +89,15 @@ impl<'de> Deserialize<'de> for ReqFilter {
            } else if key == "limit" {
                rf.limit = Deserialize::deserialize(val).ok();
            } else if key == "authors" {
-                rf.authors = Deserialize::deserialize(val).ok();
+                let raw_authors: Option<Vec<String>>= Deserialize::deserialize(val).ok();
 		if let Some(a) = raw_authors.as_ref() {
 		    if a.contains(&empty_string) {
 			return Err(serde::de::Error::invalid_type(
 			    Unexpected::Other("prefix matches must not be empty strings"),
 			    &"a json object"));
 		    }
 		}
 		rf.authors = raw_authors;
            } else if key.starts_with('#') && key.len() > 1 && val.is_array() {
                if let Some(tag_search) = tag_search_char_from_filter(key) {
                    if ts.is_none() {
@@ -180,6 +200,13 @@ impl Subscription {
    pub fn get_id(&self) -> String {
        self.id.clone()
    }
    /// Determine if any filter is requesting historical (database)
    /// queries.  If every filter has limit:0, we do not need to query the DB.
    pub fn needs_historical_events(&self) -> bool {
 	self.filters.iter().any(|f| f.limit!=Some(0))
    }
    /// Determine if this subscription matches a given [`Event`].  Any
    /// individual filter match is sufficient.
    pub fn interested_in_event(&self, event: &Event) -> bool {
@@ -291,6 +318,24 @@ mod tests {
        assert!(serde_json::from_str::<Subscription>(raw_json).is_err());
    }
    #[test]
    fn req_empty_authors_prefix() {
 	let raw_json = "[\"REQ\",\"some-id\",{\"authors\": [\"\"]}]";
        assert!(serde_json::from_str::<Subscription>(raw_json).is_err());
    }
    #[test]
    fn req_empty_ids_prefix() {
 	let raw_json = "[\"REQ\",\"some-id\",{\"ids\": [\"\"]}]";
        assert!(serde_json::from_str::<Subscription>(raw_json).is_err());
    }
    #[test]
    fn req_empty_ids_prefix_mixed() {
 	let raw_json = "[\"REQ\",\"some-id\",{\"ids\": [\"\",\"aaa\"]}]";
        assert!(serde_json::from_str::<Subscription>(raw_json).is_err());
    }
    #[test]
    fn legacy_filter() {
        // legacy field in filter
Author	SHA1	Message	Date
Greg Heartsfield	104ef2b9e1	build: bump version to 0.7.15	2022-12-27 17:04:48 -06:00
Greg Heartsfield	c06139ec99	docs: start of database maintenance tips	2022-12-27 17:00:14 -06:00
Greg Heartsfield	19ec89593d	improvement: drop queries that are running during a checkpoint	2022-12-27 15:24:10 -06:00
Greg Heartsfield	27902bc5f4	improvement: move reader mutex closer to DB connection acquisition	2022-12-27 10:28:56 -06:00
Greg Heartsfield	d2adddaee4	improvement: extend allowed wal_checkpoint timeout to 10 sec	2022-12-27 10:13:14 -06:00
Greg Heartsfield	b23b3ce8ec	improvement: block new readers when WAL is large	2022-12-27 09:48:07 -06:00
Greg Heartsfield	5f9fe1ce59	improvement: do not send realtime only filters to the DB (limit:0)	2022-12-26 12:20:36 -06:00
Greg Heartsfield	6a8c4ed1b5	build: bump version to 0.7.14	2022-12-26 11:26:48 -06:00
Greg Heartsfield	966c853700	docs: non-docker quick start	2022-12-26 10:34:09 -06:00
Greg Heartsfield	65fd0ed08b	feat: increase wal_checkpoint time when WAL is large	2022-12-26 10:03:51 -06:00
Greg Heartsfield	0b51675b38	improvement: change suggestion and default for max sqlite DB readers	2022-12-25 11:17:08 -06:00
Greg Heartsfield	2e22334631	refactor: formatting	2022-12-25 11:06:30 -06:00
Greg Heartsfield	cb2ac4bf0f	improvement: give threads unique names	2022-12-25 10:47:32 -06:00
Greg Heartsfield	38dc7789dc	improvement: cleaner slow query logs	2022-12-25 10:47:32 -06:00
Greg Heartsfield	ce0e00ffb3	feat: log reader DB pool stats every minute	2022-12-25 10:47:32 -06:00
Greg Heartsfield	3e4ae4aeec	feat: cache prepared statements and trace expanded SQL queries	2022-12-25 10:47:32 -06:00
Greg Heartsfield	c6a8807485	improvement: send error on empty-string prefix author/id searches	2022-12-25 10:47:32 -06:00
Greg Heartsfield	8137b6211c	refactor: clippy suggestions	2022-12-24 10:29:47 -06:00
Greg Heartsfield	29effaae23	build: remove pre-commit rustfmt check	2022-12-24 10:29:30 -06:00
Greg Heartsfield	e5074f2e46	feat(NIP-28): replaceable kind 41 channel metadata events	2022-12-24 10:14:43 -06:00
Blake Jakopovic	4fd7643907	feat: change pub(crate) to pub for use as a library	2022-12-23 07:14:58 -06:00
Greg Heartsfield	1e1ec69175	build: remove unnecessary dockerfile mod script	2022-12-23 06:52:09 -06:00
benthecarman	e08647867c	refactor: remove code duplication for simple_event	2022-12-23 06:39:50 -06:00
Greg Heartsfield	ae0f7171ed	build: remove digest-locked docker base images	2022-12-23 06:30:59 -06:00
Greg Heartsfield	4f1a912f36	feat: log origin header from websocket requests fixes: https://todo.sr.ht/~gheartsfield/nostr-rs-relay/33	2022-12-22 16:55:53 -06:00
Greg Heartsfield	95748647f0	build: bump version to 0.7.13	2022-12-22 16:27:34 -06:00
Greg Heartsfield	25480e837f	fix: do not block writers for more than 1 second during checkpoints	2022-12-22 16:10:49 -06:00
Greg Heartsfield	b80b54cd9d	improvement: reduce logging, especially for database pool size	2022-12-22 15:47:33 -06:00
Greg Heartsfield	8ea732cbe5	feat: perform regular database maintenance (60sec), without blocking main writer thread	2022-12-22 15:16:21 -06:00
Greg Heartsfield	0f68c4e5c2	refactor: formatting	2022-12-22 15:15:45 -06:00
Greg Heartsfield	dab2cd5792	wip: future changes to rustfmt	2022-12-22 15:13:54 -06:00
Greg Heartsfield	f411aa6fc2	fix: do not re-verify NIP-05 entries where metadata was deleted	2022-12-22 13:01:48 -06:00
Greg Heartsfield	d31bbda087	improvement: reduce lifetime of database connections	2022-12-22 13:01:12 -06:00
Greg Heartsfield	5917bc53b2	improvement: run maintenance every 60 seconds instead of by event count	2022-12-22 11:40:17 -06:00
Greg Heartsfield	91177c61a1	improvement: log reason for new event creation from nip05	2022-12-22 10:48:30 -06:00
Greg Heartsfield	53c2a8051c	improvement: reduce logging	2022-12-22 10:29:27 -06:00
Greg Heartsfield	168cf513ac	feat: perform full checkpoints and truncate WAL every 2k events	2022-12-22 10:11:05 -06:00
Greg Heartsfield	ea204761c9	fix: do not show slow queries more than once per sub	2022-12-20 15:41:50 -06:00
Greg Heartsfield	c270ae1434	improvement: reduce event count for db writer pauses	2022-12-20 15:25:24 -06:00
Greg Heartsfield	64bd983cb6	perf: every 5000 persisted events, pause for 500ms for backups I have observed backups running for a very long time under heavy load, this introduces some artificial delay to give the online backup enough time to make progress.	2022-12-20 15:05:04 -06:00
Greg Heartsfield	1c153bc784	perf: shed DB query load when queue gets large	2022-12-20 13:23:21 -06:00
Greg Heartsfield	dc11d9a619	improvement: explicitly rollback transaction on duplicate event	2022-12-20 13:23:04 -06:00
Greg Heartsfield	cd1557787b	improvement: log write pool	2022-12-20 13:21:57 -06:00
Greg Heartsfield	86bb7aeb9a	improvement: function to check pool capacity	2022-12-20 10:07:01 -06:00
Greg Heartsfield	ce37fc1a2d	build: bump version to 0.7.12	2022-12-19 14:50:42 -06:00
Greg Heartsfield	2cfd384339	perf: drop db handles that are not quickly read	2022-12-19 00:18:39 -06:00
Greg Heartsfield	8c013107f9	perf: increase upper bound for sqlite mmap	2022-12-18 23:19:43 -06:00
Greg Heartsfield	64a4466d30	perf: backing down on max_blocking_threads	2022-12-18 23:14:41 -06:00
Greg Heartsfield	1596c23eb4	perf: increase blocking threads now that contention is reduced	2022-12-18 22:46:32 -06:00
Greg Heartsfield	129badd4e1	perf: reduce per thread mmap allocation for DB	2022-12-18 22:45:32 -06:00
Greg Heartsfield	6f7c080180	improvement: reduce number of writer blocking threads from 4->2	2022-12-18 22:32:31 -06:00
Greg Heartsfield	af92561ef6	perf: remove shared cache mode (experiment)	2022-12-18 22:15:50 -06:00
Greg Heartsfield	d833a3e40d	perf: reduce logging	2022-12-18 22:11:46 -06:00
Greg Heartsfield	462eb46642	build: bump version to 0.7.11	2022-12-18 20:52:01 -06:00
Greg Heartsfield	cf144d503d	perf: reduce logging for slow queries	2022-12-18 20:47:11 -06:00
Greg Heartsfield	fb8375aef2	build: bump version to 0.7.10	2022-12-18 13:46:18 -06:00
Greg Heartsfield	88ac31b549	perf: increase channel size for DB communication	2022-12-18 13:44:28 -06:00
Greg Heartsfield	677b7d39e9	improvement: log slow requests that return zero results	2022-12-18 13:42:31 -06:00
Greg Heartsfield	b24d2f9aaa	perf: set default blocking threads to lower value	2022-12-18 12:20:57 -06:00
Greg Heartsfield	7a3899d852	build: bump version to 0.7.9	2022-12-18 09:21:07 -06:00
Greg Heartsfield	818108b793	improvement: upgrade multiple dependencies Updating anyhow v1.0.66 -> v1.0.67 Updating async-trait v0.1.59 -> v0.1.60 Updating cxx v1.0.83 -> v1.0.84 Updating cxx-build v1.0.83 -> v1.0.84 Updating cxxbridge-flags v1.0.83 -> v1.0.84 Updating cxxbridge-macro v1.0.83 -> v1.0.84 Updating itoa v1.0.4 -> v1.0.5 Updating link-cplusplus v1.0.7 -> v1.0.8 Updating proc-macro2 v1.0.47 -> v1.0.48 Updating quote v1.0.21 -> v1.0.22 Updating rustversion v1.0.9 -> v1.0.11 Updating ryu v1.0.11 -> v1.0.12 Updating scratch v1.0.2 -> v1.0.3 Updating serde v1.0.150 -> v1.0.151 Updating serde_derive v1.0.150 -> v1.0.151 Updating serde_json v1.0.89 -> v1.0.90 Updating syn v1.0.105 -> v1.0.106 Updating thiserror v1.0.37 -> v1.0.38 Updating thiserror-impl v1.0.37 -> v1.0.38 Updating unicode-ident v1.0.5 -> v1.0.6	2022-12-18 09:16:09 -06:00
Greg Heartsfield	d10348f7e1	feat: configurable blocking threads	2022-12-18 09:14:04 -06:00
Greg Heartsfield	8598e443d8	wip: add configuration for future feature (client concurrent db limits)	2022-12-17 23:19:48 -06:00
Greg Heartsfield	43222d44e5	feat: perform optimization after seeing many events	2022-12-17 23:18:54 -06:00
Greg Heartsfield	7c1516c4fb	perf: add index for tags	2022-12-17 23:17:53 -06:00
Greg Heartsfield	0c72053a49	perf: increase mmap size to 1GB	2022-12-17 23:17:16 -06:00
Greg Heartsfield	3f32ff67ab	improvement: minor logging	2022-12-17 23:11:14 -06:00
Greg Heartsfield	0b9778d6ca	refactor: simplify tracking of subscriptions	2022-12-17 20:46:58 -06:00
Greg Heartsfield	9be04120c7	build: bump version to 0.7.8	2022-12-17 12:01:43 -06:00
Greg Heartsfield	cc06167e06	perf: add composite index for tag table	2022-12-17 12:01:20 -06:00
Greg Heartsfield	b6e33f044f	improvement: limit db connection max lifetime	2022-12-17 10:47:35 -06:00
Greg Heartsfield	1b2c6f9fca	build: bump version to 0.7.7	2022-12-17 10:09:44 -06:00
Greg Heartsfield	0d8d39ad22	feat: add rate limiting setting for subscription creation	2022-12-17 09:27:29 -06:00
Greg Heartsfield	0e851d4f71	build: bump version to 0.7.6	2022-12-17 07:51:57 -06:00
Greg Heartsfield	3c880b2f49	perf: pull distinct to outermost SQL	2022-12-17 07:49:28 -06:00
Greg Heartsfield	7a4c9266ec	improvement: make hexsearch structs sortable	2022-12-17 07:49:05 -06:00
Greg Heartsfield	e8557d421b	build: bump version to 0.7.5	2022-12-16 17:21:00 -06:00
Greg Heartsfield	7ca9c864f2	improvement: DB pool logging shows used connections directly	2022-12-16 17:01:49 -06:00
Greg Heartsfield	838aafd079	improvement: consistent log messages for client/sub ids	2022-12-16 15:22:27 -06:00
Greg Heartsfield	e554b10ac2	improvement: tweak sub/sql logging for slow queries	2022-12-16 14:55:45 -06:00
Greg Heartsfield	b0bfaa48fc	improvement: ignore duplicate REQ messages	2022-12-16 14:37:02 -06:00
Greg Heartsfield	2e9b1b6ba7	docs: comment reason for force_no_match	2022-12-16 14:35:21 -06:00
Greg Heartsfield	4d9012d94c	improvement: upgrade docker builder and base images	2022-12-16 14:33:08 -06:00
Greg Heartsfield	ffe7aac066	improvement: upgrade multiple dependencies Updating aho-corasick v0.7.19 -> v0.7.20 Updating async-trait v0.1.58 -> v0.1.59 Updating axum v0.5.17 -> v0.6.1 Updating axum-core v0.2.9 -> v0.3.0 Updating bytes v1.2.1 -> v1.3.0 Updating cc v1.0.76 -> v1.0.78 Updating crossbeam-utils v0.8.12 -> v0.8.14 Updating cxx v1.0.82 -> v1.0.83 Updating cxx-build v1.0.82 -> v1.0.83 Updating cxxbridge-flags v1.0.82 -> v1.0.83 Updating cxxbridge-macro v1.0.82 -> v1.0.83 Updating flate2 v1.0.24 -> v1.0.25 Updating libc v0.2.137 -> v0.2.138 Updating matchit v0.5.0 -> v0.7.0 Updating miniz_oxide v0.5.4 -> v0.6.2 Updating openssl v0.10.42 -> v0.10.44 Updating openssl-sys v0.9.77 -> v0.9.79 Updating parking_lot_core v0.9.4 -> v0.9.5 Updating pest v2.4.1 -> v2.5.1 Updating pest_derive v2.4.1 -> v2.5.1 Updating pest_generator v2.4.1 -> v2.5.1 Updating pest_meta v2.4.1 -> v2.5.1 Updating prost v0.11.2 -> v0.11.3 Adding rustversion v1.0.9 Updating serde v1.0.147 -> v1.0.150 Updating serde_derive v1.0.147 -> v1.0.150 Updating serde_json v1.0.88 -> v1.0.89 Updating sha-1 v0.10.0 -> v0.10.1 Updating syn v1.0.103 -> v1.0.105 Updating tokio v1.22.0 -> v1.23.0 Updating tokio-macros v1.8.0 -> v1.8.2 Updating toml v0.5.9 -> v0.5.10 Updating tonic v0.8.2 -> v0.8.3 Updating tower-http v0.3.4 -> v0.3.5 Updating typenum v1.15.0 -> v1.16.0	2022-12-16 11:17:05 -06:00
Greg Heartsfield	f9695bd0a9	fix: db schema version updates correctly for v9	2022-12-16 10:01:49 -06:00
Greg Heartsfield	7c4bf5cc8f	fix: run db migration for v9	2022-12-16 08:21:00 -06:00
Greg Heartsfield	e2de162931	feat: only show SQL in logs for slow queries unless tracing	2022-12-16 08:17:39 -06:00
Greg Heartsfield	4f606615eb	perf: indexing improvement	2022-12-16 08:16:49 -06:00
Greg Heartsfield	84a58ebbcd	build: bump version to 0.7.3	2022-12-16 06:32:00 -06:00
Greg Heartsfield	c48e45686d	perf: schema updates for better event indexing	2022-12-15 08:48:35 -06:00
Greg Heartsfield	bbe359364a	refactor: clippy warnings	2022-12-15 08:43:36 -06:00
Greg Heartsfield	9e9c494367	perf: significant query speedup when using `kinds`. fixes: https://todo.sr.ht/~gheartsfield/nostr-rs-relay/51	2022-12-14 21:04:49 -06:00
Greg Heartsfield	5fa24bc9f1	fix: send EOSE when ids list is empty in subscriptions Fixes: https://todo.sr.ht/~gheartsfield/nostr-rs-relay/50	2022-11-19 10:35:00 -06:00
Greg Heartsfield	4de7490d97	fix: send EOSE when authors list is empty in subscriptions Fixes: https://todo.sr.ht/~gheartsfield/nostr-rs-relay/49	2022-11-19 10:00:38 -06:00
Greg Heartsfield	d0f63dc66e	docs: update container instructions for rootless podman	2022-11-19 09:32:26 -06:00
Greg Heartsfield	06078648c8	build: bump version to 0.7.2	2022-11-19 07:55:52 -06:00
Greg Heartsfield	cc0fcc5d66	docs: add Cargo package metadata	2022-11-19 07:32:17 -06:00
Greg Heartsfield	dfb2096653	improvement: build auditable binary in docker	2022-11-19 07:11:39 -06:00
Greg Heartsfield	486508d192	improvement: upgrade multiple dependencies Updating crates.io index Updating cc v1.0.74 -> v1.0.76 Updating chrono v0.4.22 -> v0.4.23 Updating cxx v1.0.80 -> v1.0.82 Updating cxx-build v1.0.80 -> v1.0.82 Updating cxxbridge-flags v1.0.80 -> v1.0.82 Updating cxxbridge-macro v1.0.80 -> v1.0.82 Updating digest v0.10.5 -> v0.10.6 Updating hyper v0.14.22 -> v0.14.23 Updating indexmap v1.9.1 -> v1.9.2 Updating regex v1.6.0 -> v1.7.0 Updating regex-syntax v0.6.27 -> v0.6.28 Updating serde_json v1.0.87 -> v1.0.88 Updating tokio v1.21.2 -> v1.22.0 Updating uuid v1.2.1 -> v1.2.2	2022-11-19 06:52:06 -06:00
Greg Heartsfield	84b43c144b	improvement: use locked cargo packages to build container images	2022-11-19 06:29:13 -06:00
Greg Heartsfield	110500bb46	feat(NIP-20): advertise support for NIP-20 in relay info/readme	2022-11-12 09:22:43 -06:00
Greg Heartsfield	83f6b11de7	refactor: clippy fix	2022-11-12 09:22:24 -06:00
William Casarin	6d1244434b	feat(NIP-20): improve invalid event error messages Instead of returning a NOTICE for invalid events, return a `OK false` command result with a reason as to why the event is invalid.	2022-11-12 09:13:22 -06:00
William Casarin	5a91419d34	feat(NIP-20): send command results to clients When submitting events to relays, clients currently have no way to know if an event was successfully committed to the database. This NIP introduces the concept of command results which are like NOTICE's except provide more information about if an event was accepted or rejected. A command result is a JSON object with the following structure that is returned when an event is successfully saved to the database or rejected: ["OK", <event_id>, <true\|false>, <message>] nip20: https://github.com/nostr-protocol/nips/pull/62	2022-11-12 09:12:35 -06:00
William Casarin	7adc5c9af7	perf: dont create intermediate vecs when matching subs Avoid creating intermediate vectors when matching subscriptions. We can just iterate over the hashmap directly.	2022-11-09 07:30:43 -06:00
Greg Heartsfield	9dd4571bee	refactor: reduce level of some common DB logs	2022-11-06 13:49:32 -06:00
Greg Heartsfield	9db5a26b9c	refactor: more consistent logging messages	2022-11-05 16:11:20 -05:00
Greg Heartsfield	ac345b5744	refactor: do not quote server-generated client id in logs	2022-11-05 15:59:39 -05:00