build: bump version to 0.8.9

docs: add systemd service file and guide
improvement: switch to jemalloc allocator
2025-09-01 03:40:46 -04:00 · 2023-04-22 13:47:08 -05:00 · 2023-04-19 18:37:16 -05:00 · 2023-04-06 18:33:30 -05:00 · 2023-03-03 09:04:35 -06:00 · 2023-03-03 08:57:23 -06:00
36 changed files with 2846 additions and 550 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 **/target/
 nostr.db
+nostr.db-*
+justfile
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8,6 +8,17 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"

+[[package]]
+name = "aes"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241"
+dependencies = [
+ "cfg-if",
+ "cipher",
+ "cpufeatures",
+]
+
 [[package]]
 name = "ahash"
 version = "0.4.7"
@@ -286,6 +297,18 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445"

+[[package]]
+name = "bitcoin"
+version = "0.29.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0694ea59225b0c5f3cb405ff3f670e4828358ed26aec49dc352f730f0cb1a8a3"
+dependencies = [
+ "bech32",
+ "bitcoin_hashes 0.11.0",
+ "secp256k1 0.24.3",
+ "serde",
+]
+
 [[package]]
 name = "bitcoin_hashes"
 version = "0.10.0"
@@ -295,6 +318,15 @@ dependencies = [
 "serde",
 ]

+[[package]]
+name = "bitcoin_hashes"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90064b8dee6815a6470d60bad07bbbaee885c0e12d04177138fa3291a01b7bc4"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -310,6 +342,15 @@ dependencies = [
 "generic-array",
 ]

+[[package]]
+name = "block-padding"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a90ec2df9600c28a01c56c4784c9207a96d2451833aeceb8cc97e4c9548bb78"
+dependencies = [
+ "generic-array",
+]
+
 [[package]]
 name = "blocking"
 version = "1.3.0"
@@ -342,6 +383,15 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"

+[[package]]
+name = "cbc"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6"
+dependencies = [
+ "cipher",
+]
+
 [[package]]
 name = "cc"
 version = "1.0.79"
@@ -354,6 +404,12 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

+[[package]]
+name = "checked_int_cast"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17cc5e6b5ab06331c33589842070416baa137e8b0eb912b008cfd4a78ada7919"
+
 [[package]]
 name = "chrono"
 version = "0.4.23"
@@ -369,6 +425,16 @@ dependencies = [
 "winapi",
 ]

+[[package]]
+name = "cipher"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e"
+dependencies = [
+ "crypto-common",
+ "inout",
+]
+
 [[package]]
 name = "clap"
 version = "4.1.4"
@@ -973,8 +1039,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
 dependencies = [
 "cfg-if",
+ "js-sys",
 "libc",
 "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasm-bindgen",
 ]

 [[package]]
@@ -1282,6 +1350,16 @@ dependencies = [
 "unicode-width",
 ]

+[[package]]
+name = "inout"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
+dependencies = [
+ "block-padding",
+ "generic-array",
+]
+
 [[package]]
 name = "instant"
 version = "0.1.12"
@@ -1289,6 +1367,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
 dependencies = [
 "cfg-if",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
 ]

 [[package]]
@@ -1548,15 +1629,36 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21"

+[[package]]
+name = "nostr"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28f6282699b1a163c0ac3f12cc1297974d0f60602fa057a3e047a6439ed741b0"
+dependencies = [
+ "aes",
+ "base64 0.21.0",
+ "bitcoin",
+ "cbc",
+ "getrandom",
+ "instant",
+ "log",
+ "once_cell",
+ "regex",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "url",
+]
+
 [[package]]
 name = "nostr-rs-relay"
-version = "0.8.7"
+version = "0.8.9"
 dependencies = [
 "anyhow",
 "async-std",
 "async-trait",
 "bech32",
- "bitcoin_hashes",
+ "bitcoin_hashes 0.10.0",
 "chrono",
 "clap",
 "config",
@@ -1572,19 +1674,22 @@ dependencies = [
 "indicatif",
 "lazy_static",
 "nonzero_ext",
+ "nostr",
 "parse_duration",
 "prometheus",
 "prost",
+ "qrcode",
 "r2d2",
 "r2d2_sqlite",
 "rand 0.8.5",
 "regex",
 "rusqlite",
- "secp256k1",
+ "secp256k1 0.21.3",
 "serde",
 "serde_json",
 "sqlx",
 "thiserror",
+ "tikv-jemallocator",
 "tokio",
 "tokio-tungstenite",
 "tonic",
@@ -2076,6 +2181,15 @@ version = "2.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94"

+[[package]]
+name = "qrcode"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16d2f1455f3630c6e5107b4f2b94e74d76dea80736de0981fd27644216cff57f"
+dependencies = [
+ "checked_int_cast",
+]
+
 [[package]]
 name = "quanta"
 version = "0.9.3"
@@ -2475,9 +2589,21 @@ version = "0.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c42e6f1735c5f00f51e43e28d6634141f2bcad10931b2609ddd74a86d751260"
 dependencies = [
- "bitcoin_hashes",
+ "bitcoin_hashes 0.10.0",
 "rand 0.6.5",
- "secp256k1-sys",
+ "secp256k1-sys 0.4.2",
+ "serde",
+]
+
+[[package]]
+name = "secp256k1"
+version = "0.24.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62"
+dependencies = [
+ "bitcoin_hashes 0.11.0",
+ "rand 0.8.5",
+ "secp256k1-sys 0.6.1",
 "serde",
 ]

@@ -2490,6 +2616,15 @@ dependencies = [
 "cc",
 ]

+[[package]]
+name = "secp256k1-sys"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83080e2c2fc1006e625be82e5d1eb6a43b7fd9578b617fcc55814daf286bba4b"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "security-framework"
 version = "2.8.2"
@@ -2824,6 +2959,26 @@ dependencies = [
 "once_cell",
 ]

+[[package]]
+name = "tikv-jemalloc-sys"
+version = "0.5.3+5.3.0-patched"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a678df20055b43e57ef8cddde41cdfda9a3c1a060b67f4c5836dfb1d78543ba8"
+dependencies = [
+ "cc",
+ "libc",
+]
+
+[[package]]
+name = "tikv-jemallocator"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20612db8a13a6c06d57ec83953694185a367e16945f66565e8028d2c0bd76979"
+dependencies = [
+ "libc",
+ "tikv-jemalloc-sys",
+]
+
 [[package]]
 name = "time"
 version = "0.1.45"
@@ -3254,6 +3409,7 @@ dependencies = [
 "form_urlencoded",
 "idna",
 "percent-encoding",
+ "serde",
 ]

 [[package]]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nostr-rs-relay"
-version = "0.8.7"
+version = "0.8.9"
 edition = "2021"
 authors = ["Greg Heartsfield <scsibug@imap.cc>"]
 description = "A relay implementation for the Nostr protocol"
@@ -52,6 +52,10 @@ prometheus = "0.13.3"
 indicatif = "0.17.3"
 bech32 = "0.9.1"
 url = "2.3.1"
+qrcode = { version = "0.12.0", default-features = false, features = ["svg"] }
+nostr = { version = "0.18.0", default-features = false, features = ["base", "nip04", "nip19"] }
+[target.'cfg(not(target_env = "msvc"))'.dependencies]
+tikv-jemallocator = "0.5"

 [dev-dependencies]
 anyhow = "1"
--- a/README.md
+++ b/README.md
@@ -35,6 +35,7 @@ mirrored on [GitHub](https://github.com/scsibug/nostr-rs-relay).
 - [ ] NIP-26: [Event Delegation](https://github.com/nostr-protocol/nips/blob/master/26.md) (_implemented, but currently disabled_)
 - [x] NIP-28: [Public Chat](https://github.com/nostr-protocol/nips/blob/master/28.md)
 - [x] NIP-33: [Parameterized Replaceable Events](https://github.com/nostr-protocol/nips/blob/master/33.md)
+- [x] NIP-40: [Expiration Timestamp](https://github.com/nostr-protocol/nips/blob/master/40.md)
 - [x] NIP-42: [Authentication of clients to relays](https://github.com/nostr-protocol/nips/blob/master/42.md)

 ## Quick Start
--- a/build.rs
+++ b/build.rs
@@ -2,9 +2,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
    tonic_build::configure()
        .build_server(false)
        .protoc_arg("--experimental_allow_proto3_optional")
-        .compile(
-            &["proto/nauthz.proto"],
-            &["proto"],
-        )?;
+        .compile(&["proto/nauthz.proto"], &["proto"])?;
    Ok(())
 }
--- a/config.toml
+++ b/config.toml
@@ -52,6 +52,7 @@ description = "A newly created nostr-rs-relay.\n\nCustomize this with your own i
 # sqlite.
 #connection = "postgresql://postgres:nostr@localhost:7500/nostr"

+
 [grpc]
 # gRPC interfaces for externalized decisions and other extensions to
 # functionality.
@@ -132,6 +133,11 @@ reject_future_seconds = 1800
 #    70202,
 #]

+# Event kind allowlist. Events other than these kinds will be discarded.
+#event_kind_allowlist = [
+#    0, 1, 2, 3, 7, 40, 41, 42, 43, 44, 30023,
+#]
+
 [authorization]
 # Pubkey addresses in this array are whitelisted for event publishing.
 # Only valid events by these authors will be accepted, if the variable
@@ -142,6 +148,8 @@ reject_future_seconds = 1800
 #]
 # Enable NIP-42 authentication
 #nip42_auth = false
+# Send DMs events (kind 4) only to their authenticated recipients
+#nip42_dms = false

 [verified_users]
 # NIP-05 verification of users.  Can be "enabled" to require NIP-05
@@ -168,3 +176,42 @@ reject_future_seconds = 1800
 # How many consecutive failed checks before we give up on verifying
 # this author.
 #max_consecutive_failures = 20
+
+[pay_to_relay]
+# Enable pay to relay
+#enabled = false
+
+# The cost to be admitted to relay
+#admission_cost = 4200
+
+# The cost in sats per post
+#cost_per_event = 0
+
+# Url of lnbits api
+#node_url = "<node url>"
+
+# LNBits api secret
+#api_secret = "<ln bits api>"
+
+# Terms of service
+#terms_message = """
+#This service (and supporting services) are provided "as is", without warranty of any kind, express or implied.
+#
+#By using this service, you agree:
+#* Not to engage in spam or abuse the relay service
+#* Not to disseminate illegal content
+#* That requests to delete content cannot be guaranteed
+#* To use the service in compliance with all applicable laws
+#* To grant necessary rights to your content for unlimited time
+#* To be of legal age and have capacity to use this service
+#* That the service may be terminated at any time without notice
+#* That the content you publish may be removed at any time without notice
+#* To have your IP address collected to detect abuse or misuse
+#* To cooperate with the relay to combat abuse or misuse
+#* You may be exposed to content that you might find triggering or distasteful
+#* The relay operator is not liable for content produced by users of the relay
+#"""
+
+# Whether or not new sign ups should be allowed
+#sign_ups = false
+#secret_key = "<nostr nsec>"
--- a/contrib/nostr-rs-relay.service
+++ b/contrib/nostr-rs-relay.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=nostr-rs-relay
+[Service]
+User=REPLACE_WITH_YOUR_USERNAME
+WorkingDirectory=/usr/bin/
+Environment=RUST_LOG=warn,nostr_rs_relay=info
+ExecStart=nostr-rs-relay --config /etc/nostr-rs-relay/config.toml
+TimeoutStopSec=10
+Restart=on-failure
+RestartSec=5
+[Install]
+WantedBy=multi-user.target
--- a/docs/pay-to-relay.md
+++ b/docs/pay-to-relay.md
@@ -0,0 +1,85 @@
+# Pay to Relay Design Document
+
+The relay with use payment as a form of spam prevention. In order to post to the relay a user must pay a set rate. There is also the option to require a payment for each note posted to the relay. There is no cost to read from the relay.
+
+## Configuration
+
+Currently, [LNBits](https://github.com/lnbits/lnbits) is implemented as the payment processor.  LNBits exposes a simple API for creating invoices, to use this API create a wallet and on the right side find "API info" you will need to add the invoice/read key to this relays config file.
+
+The below configuration will need to be added to config.toml
+```
+[pay_to_relay]
+# Enable pay to relay
+enabled = true
+# The cost to be admitted to relay
+admission_cost = 1000
+# The cost in sats per post
+cost_per_event = 0
+# Url of lnbits api
+node_url = "https://<IP of node>:5001/api/v1/payments"
+# LNBits api secret
+api_secret = "<LNbits api key>"
+# Terms of service
+terms_message = """This service ....
+"""
+# Whether or not new sign ups should be allowed 
+sign_ups = true 
+secret_key = "<nostr secret key to send dms>"
+```
+
+The LNBits instance must have a signed HTTPS a self signed certificate will not work.  
+
+## Design Overview
+
+### Concepts
+
+All authors are initially not admitted to write to the relay.  There are two ways to gain access write to the relay. The first is by attempting to post the the relay, upon receiving an event from an author that is not admitted, the relay will send a direct message including the terms of service of the relay and a lighting invoice for the admission cost.  Once this invoice is payed the author can write to the relay. For this method to work the author must be reading from the relay. An author can also pay and accept the terms of service via a webpage `https://<relay-url>/join`.
+
+## Design Details
+
+Authors are stored in a dedicated table. This tracks:
+
+* `pubkey`
+* `is_admitted` whether on no the admission invoice has been paid, accepting the terms of service.
+* `balance` the current balance in sats of the author, used if there is a cost per post
+* `tos_accepted_at` the timestamp of when the author accepted the tos
+
+Invoice information is stored in a dedicated table. This tracks:
+* `payment_hash` the payment hash of the lighting invoice
+* `pubkey` of the author the invoice is issued to
+* `invoice` bolt11 invoice
+* `amount` in sats
+* `status` (Paid/Unpaid/Expired)
+* `description`
+* `created_at` timestamp of creation
+* `confirmed_at` timestamp of payment
+
+### Event Handling 
+
+If "pay to relay" is enabled, all incoming events are evaluated to determine whether the author is on the relay's whitelist or if they have paid the admission fee and accepted the terms. If "pay per note" is enabled, there is an additional check to ensure that the author has enough balance, which is then reduced by the cost per note. If the author is on the whitelist, this balance check is not necessary.
+
+### Integration
+
+We have an existing database writer thread, which receives events and
+attempts to persist them to disk.  Once validated and persisted, these
+events are broadcast to all subscribers.
+
+When "pay to relay" is enabled, the writer must check if the author is admitted to post. If the author is not admitted to post the event is forwarded to the payment module. Where an invoice is generated, persisted and broadcast as an direct message to the author.
+
+### Threat Scenarios
+
+Some of these mitigation's are fully implemented, others are documented
+simply to demonstrate a mitigation is possible.
+
+### Sign up Spamming
+
+*Threat*: An attacker generates a large number of new pubkeys publishing to the relays. Causing a large number of new invoices to be created for each new pubkey.
+
+*Mitigation*: Rate limit number of new sign ups
+
+### Admitted Author Spamming 
+
+*Threat*: An attacker gains write access by paying the admission fee, and then floods the relay with a large number of spam events.
+
+*Mitigation*: The attacker's admission can be revoked and their admission fee will not be refunded. Enabling "cost per event" and increasing the admission cost can also discourage this type of behavior.
+
--- a/docs/reverse-proxy.md
+++ b/docs/reverse-proxy.md
@@ -1,8 +1,8 @@
 # Reverse Proxy Setup Guide

 It is recommended to run `nostr-rs-relay` behind a reverse proxy such
-as `haproxy` or `nginx` to provide TLS termination.  Simple examples
-of `haproxy` and `nginx` configurations are documented here.
+as `haproxy`, `nginx` or `traefik` to provide TLS termination.  Simple examples
+for `haproxy`, `nginx` and `traefik` configurations are documented here.

 ## Minimal HAProxy Configuration

@@ -109,3 +109,91 @@ The above configuration was tested on `nginx` `1.18.0` on `Ubuntu` `20.04` and `
 For help installing `nginx` on `Ubuntu`, see [this guide](https://www.digitalocean.com/community/tutorials/how-to-install-nginx-on-ubuntu-20-04).

 For guidance on using `letsencrypt` to obtain a cert on `Ubuntu`, including an `nginx` plugin, see [this post](https://www.digitalocean.com/community/tutorials/how-to-secure-nginx-with-let-s-encrypt-on-ubuntu-20-04).
+
+
+## Example Traefik Configuration
+
+Assumptions:
+
+* `Traefik` version is `2.9` (other versions not tested).
+* `Traefik` is used for provisioning of Let's Encrypt certificates.
+* `Traefik` is running in `Docker`, using `docker compose` and labels for the static configuration. An equivalent setup useing a Traefik config file is possible too (but not covered here).
+* Strict Transport Security is enabled.
+* Hostname for the relay is `relay.example.com`, email adres for ACME certificates provider is `name@example.com`.
+* ipv6 is enabled, a viable private ipv6 subnet is specified in the example below. 
+* Relay is running on port `8080`.
+
+```
+version: '3'
+
+networks:
+  nostr:
+    enable_ipv6: true
+    ipam:
+      config:
+        - subnet: fd00:db8:a::/64
+          gateway: fd00:db8:a::1
+
+services:
+  traefik:
+    image: traefik:v2.9
+    networks:
+      nostr:
+    command:
+      - "--log.level=ERROR"
+      # letsencrypt configuration
+      - "--certificatesResolvers.http.acme.email==name@example.com"
+      - "--certificatesResolvers.http.acme.storage=/certs/acme.json"
+      - "--certificatesResolvers.http.acme.httpChallenge.entryPoint=http"
+      # define entrypoints
+      - "--entryPoints.http.address=:80"
+      - "--entryPoints.http.http.redirections.entryPoint.to=https"
+      - "--entryPoints.http.http.redirections.entryPoint.scheme=https"
+      - "--entryPoints.https.address=:443"
+      - "--entryPoints.https.forwardedHeaders.insecure=true"
+      - "--entryPoints.https.proxyProtocol.insecure=true"
+      # docker provider (get configuration from container labels)
+      - "--providers.docker.endpoint=unix:///var/run/docker.sock"
+      - "--providers.docker.exposedByDefault=false"
+      - "--providers.file.directory=/config"
+      - "--providers.file.watch=true"
+    ports:
+      - "80:80"
+      - "443:443"
+    volumes:
+      - "/var/run/docker.sock:/var/run/docker.sock:ro"
+      - "$(pwd)/traefik/certs:/certs"
+      - "$(pwd)/traefik/config:/config"
+    logging:
+      driver: "local"
+    restart: always
+
+  # example nostr config. only labels: section is relevant for Traefik config
+  nostr:
+   image: nostr-rs-relay:latest
+   container_name: nostr-relay
+   networks:
+     nostr:
+   restart: always
+   user: 100:100
+   volumes:
+   - '$(pwd)/nostr/data:/usr/src/app/db:Z'
+   - '$(pwd)/nostr/config/config.toml:/usr/src/app/config.toml:ro,Z'
+   labels:
+     - "traefik.enable=true"
+     - "traefik.http.routers.nostr.entrypoints=https"
+     - "traefik.http.routers.nostr.rule=Host(`relay.example.com`)"
+     - "traefik.http.routers.nostr.tls.certresolver=http"
+     - "traefik.http.routers.nostr.service=nostr"
+     - "traefik.http.services.nostr.loadbalancer.server.port=8080"
+     - "traefik.http.services.nostr.loadbalancer.passHostHeader=true"
+     - "traefik.http.middlewares.nostr.headers.sslredirect=true"
+     - "traefik.http.middlewares.nostr.headers.stsincludesubdomains=true"
+     - "traefik.http.middlewares.nostr.headers.stspreload=true"
+     - "traefik.http.middlewares.nostr.headers.stsseconds=63072000"
+     - "traefik.http.routers.nostr.middlewares=nostr"
+```
+
+### Traefik Notes
+
+Traefik will take care of the provisioning and renewal of certificates. In case of an ipv4-only relay, simply detele the `enable_ipv6:` and `ipam:` entries in the `networks:` section of the docker-compose file.
--- a/docs/run-as-linux-system-process.md
+++ b/docs/run-as-linux-system-process.md
@@ -0,0 +1,39 @@
+# Run as a linux system process
+
+Docker makes it easy to spin up and down environments but it's also possible to run `nostr-rs-relay` as a systemd linux process.
+This guide assumes you're on a Linux machine and that Rust is already installed.
+
+## Instructions
+
+### Build nostr-rs-relay from source
+Start by building the application from source. Here is how to do that:
+1. `git clone https://github.com/scsibug/nostr-rs-relay.git`
+2. `cd nostr-rs-relay`
+3. `cargo build --release`
+
+### Place the files where they belong
+We want to palce the nostr-rs-relay binary and the config.toml file where they belong. While still in the root level of the nostr-rs-relay folder you cloned in last step, run the following commands:
+1. `sudo cp target/release/nostr-rs-relay /usr/local/bin/`
+2. `sudo mkdir /etc/nostr-rs-relay`
+2. `sudo cp config.toml /etc/nostr-rs-relay`
+
+### Create the Systemd service file
+We need to create a new Systemd service file. These files are placed in the `/etc/systemd/system/` folder where you will find many other services running. 
+
+1. `sudo vim /etc/systemd/system/nostr-rs-relay.service`
+2. Paste in the contents of [this service file](../contrib/nostr-rs-relay.service). Remember to replace the `User` value with your own username.
+3. Save the file and exit your text editor
+
+
+### Run the service
+To get the service running, we need to reload the systemd daemon and enable the service.
+
+1. `sudo systemctl daemon-reload`
+2. `sudo systemctl start nostr-rs-relay.service`
+3. `sudo systemctl status nostr-rs-relay.service`
+
+
+### Tips
+
+#### Logs
+The application will write logs to the journal. To read it, execute `sudo journalctl -f -u nostr-rs-relay`
--- a/src/bin/bulkloader.rs
+++ b/src/bin/bulkloader.rs
@@ -1,16 +1,16 @@
+use nostr_rs_relay::config;
+use nostr_rs_relay::error::{Error, Result};
+use nostr_rs_relay::event::{single_char_tagname, Event};
+use nostr_rs_relay::repo::sqlite::{build_pool, PooledConnection};
+use nostr_rs_relay::repo::sqlite_migration::{curr_db_version, DB_VERSION};
+use nostr_rs_relay::utils::is_lower_hex;
+use rusqlite::params;
+use rusqlite::{OpenFlags, Transaction};
 use std::io;
 use std::path::Path;
-use nostr_rs_relay::utils::is_lower_hex;
-use tracing::info;
-use nostr_rs_relay::config;
-use nostr_rs_relay::event::{Event,single_char_tagname};
-use nostr_rs_relay::error::{Error, Result};
-use nostr_rs_relay::repo::sqlite::{PooledConnection, build_pool};
-use nostr_rs_relay::repo::sqlite_migration::{curr_db_version, DB_VERSION};
-use rusqlite::{OpenFlags, Transaction};
 use std::sync::mpsc;
 use std::thread;
-use rusqlite::params;
+use tracing::info;

 /// Bulk load JSONL data from STDIN to the database specified in config.toml (or ./nostr.db as a default).
 /// The database must already exist, this will not create a new one.
@@ -26,89 +26,95 @@ pub fn main() -> Result<()> {
        return Err(Error::DatabaseDirError);
    }
    // Get a database pool
-    let pool = build_pool("bulk-loader", &settings, OpenFlags::SQLITE_OPEN_READ_WRITE | OpenFlags::SQLITE_OPEN_CREATE, 1,4,false);
+    let pool = build_pool(
+        "bulk-loader",
+        &settings,
+        OpenFlags::SQLITE_OPEN_READ_WRITE | OpenFlags::SQLITE_OPEN_CREATE,
+        1,
+        4,
+        false,
+    );
    {
-	// check for database schema version
-	let mut conn: PooledConnection = pool.get()?;
-	let version = curr_db_version(&mut conn)?;
-	info!("current version is: {:?}", version);
-	// ensure the schema version is current.
-	if version != DB_VERSION {
-	    info!("version is not current, exiting");
-	    panic!("cannot write to schema other than v{DB_VERSION}");
-	}
+        // check for database schema version
+        let mut conn: PooledConnection = pool.get()?;
+        let version = curr_db_version(&mut conn)?;
+        info!("current version is: {:?}", version);
+        // ensure the schema version is current.
+        if version != DB_VERSION {
+            info!("version is not current, exiting");
+            panic!("cannot write to schema other than v{DB_VERSION}");
+        }
    }
    // this channel will contain parsed events ready to be inserted
    let (event_tx, event_rx) = mpsc::sync_channel(100_000);
    // Thread for reading events
    let _stdin_reader_handler = thread::spawn(move || {
-	let stdin = io::stdin();
-	for readline in stdin.lines() {
-	    if let Ok(line) = readline {
-		// try to parse a nostr event
-		let eres: Result<Event, serde_json::Error> = serde_json::from_str(&line);
-		if let Ok(mut e) = eres {
-		    if let Ok(()) = e.validate() {
-			e.build_index();
-			//debug!("Event: {:?}", e);
-			event_tx.send(Some(e)).ok();
-		    } else {
-			info!("could not validate event");
-		    }
-		} else {
-		    info!("error reading event: {:?}", eres);
-		}
-	    } else {
-		// error reading
-		info!("error reading: {:?}", readline);
-	    }
-	}
-	info!("finished parsing events");
-	event_tx.send(None).ok();
-	let ok: Result<()> = Ok(());
+        let stdin = io::stdin();
+        for readline in stdin.lines() {
+            if let Ok(line) = readline {
+                // try to parse a nostr event
+                let eres: Result<Event, serde_json::Error> = serde_json::from_str(&line);
+                if let Ok(mut e) = eres {
+                    if let Ok(()) = e.validate() {
+                        e.build_index();
+                        //debug!("Event: {:?}", e);
+                        event_tx.send(Some(e)).ok();
+                    } else {
+                        info!("could not validate event");
+                    }
+                } else {
+                    info!("error reading event: {:?}", eres);
+                }
+            } else {
+                // error reading
+                info!("error reading: {:?}", readline);
+            }
+        }
+        info!("finished parsing events");
+        event_tx.send(None).ok();
+        let ok: Result<()> = Ok(());
        ok
    });
    let mut conn: PooledConnection = pool.get()?;
    let mut events_read = 0;
-    let event_batch_size =50_000;
+    let event_batch_size = 50_000;
    let mut new_events = 0;
    let mut has_more_events = true;
    while has_more_events {
-	// begin a transaction
-	let tx = conn.transaction()?;
-	// read in batch_size events and commit
-	for _ in 0..event_batch_size {
-	    match event_rx.recv() {
-		Ok(Some(e)) => {
-		    events_read += 1;
-		    // ignore ephemeral events
-		    if !(e.kind >= 20000 && e.kind < 30000) {
-			match write_event(&tx, e) {
-			    Ok(c) => {
-				new_events += c;
-			    },
-			    Err(e) => {
-				info!("error inserting event: {:?}", e);
-			    }
-			}
-		    }
-		},
-		Ok(None) => {
-		    // signal that the sender will never produce more
-		    // events
-		    has_more_events=false;
-		    break;
-		},
-		Err(_) => {
-		    info!("sender is closed");
-		    // sender is done
-		}
-	    }
-	}
-	info!("committed {} events...", new_events);
-	tx.commit()?;
-	conn.execute_batch("pragma wal_checkpoint(truncate)")?;
-
+        // begin a transaction
+        let tx = conn.transaction()?;
+        // read in batch_size events and commit
+        for _ in 0..event_batch_size {
+            match event_rx.recv() {
+                Ok(Some(e)) => {
+                    events_read += 1;
+                    // ignore ephemeral events
+                    if !(e.kind >= 20000 && e.kind < 30000) {
+                        match write_event(&tx, e) {
+                            Ok(c) => {
+                                new_events += c;
+                            }
+                            Err(e) => {
+                                info!("error inserting event: {:?}", e);
+                            }
+                        }
+                    }
+                }
+                Ok(None) => {
+                    // signal that the sender will never produce more
+                    // events
+                    has_more_events = false;
+                    break;
+                }
+                Err(_) => {
+                    info!("sender is closed");
+                    // sender is done
+                }
+            }
+        }
+        info!("committed {} events...", new_events);
+        tx.commit()?;
+        conn.execute_batch("pragma wal_checkpoint(truncate)")?;
    }
    info!("processed {} events", events_read);
    info!("stored {} new events", new_events);
@@ -131,7 +137,7 @@ fn write_event(tx: &Transaction, e: Event) -> Result<usize> {
 	params![id_blob, e.created_at, e.kind, pubkey_blob, delegator_blob, event_str]
    )?;
    if ins_count == 0 {
-	return Ok(0);
+        return Ok(0);
    }
    // we want to capture the event_id that had the tag, the tag name, and the tag hex value.
    let event_id = tx.last_insert_rowid();
@@ -140,30 +146,30 @@ fn write_event(tx: &Transaction, e: Event) -> Result<usize> {
        let tagname = t.get(0).unwrap();
        let tagnamechar_opt = single_char_tagname(tagname);
        if tagnamechar_opt.is_none() {
-	    continue;
+            continue;
        }
        // safe because len was > 1
        let tagval = t.get(1).unwrap();
        // insert as BLOB if we can restore it losslessly.
        // this means it needs to be even length and lowercase.
        if (tagval.len() % 2 == 0) && is_lower_hex(tagval) {
-	    tx.execute(
+            tx.execute(
                "INSERT INTO tag (event_id, name, value_hex) VALUES (?1, ?2, ?3);",
                params![event_id, tagname, hex::decode(tagval).ok()],
-	    )?;
+            )?;
        } else {
-	    // otherwise, insert as text
-	    tx.execute(
+            // otherwise, insert as text
+            tx.execute(
                "INSERT INTO tag (event_id, name, value) VALUES (?1, ?2, ?3);",
                params![event_id, tagname, &tagval],
            )?;
        }
    }
    if e.is_replaceable() {
-	//let query = "SELECT id FROM event WHERE kind=? AND author=? ORDER BY created_at DESC LIMIT 1;";
-	//let count: usize = tx.query_row(query, params![e.kind, pubkey_blob], |row| row.get(0))?;
-	//info!("found {} rows that /would/ be preserved", count);
-	match tx.execute(
+        //let query = "SELECT id FROM event WHERE kind=? AND author=? ORDER BY created_at DESC LIMIT 1;";
+        //let count: usize = tx.query_row(query, params![e.kind, pubkey_blob], |row| row.get(0))?;
+        //info!("found {} rows that /would/ be preserved", count);
+        match tx.execute(
 	    "DELETE FROM event WHERE kind=? and author=? and id NOT IN (SELECT id FROM event WHERE kind=? AND author=? ORDER BY created_at DESC LIMIT 1);",
 	    params![e.kind, pubkey_blob, e.kind, pubkey_blob],
 	) {
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -7,14 +7,14 @@ pub struct CLIArgs {
        short,
        long,
        help = "Use the <directory> as the location of the database",
-        required = false,
+        required = false
    )]
    pub db: Option<String>,
    #[arg(
        short,
        long,
        help = "Use the <file name> as the location of the config file",
-        required = false,
+        required = false
    )]
    pub config: Option<String>,
 }
--- a/src/config.rs
+++ b/src/config.rs
@@ -4,6 +4,8 @@ use serde::{Deserialize, Serialize};
 use std::time::Duration;
 use tracing::warn;

+use crate::payment::Processor;
+
 #[derive(Debug, Serialize, Deserialize, Clone)]
 #[allow(unused)]
 pub struct Info {
@@ -69,14 +71,30 @@ pub struct Limits {
    pub max_ws_frame_bytes: Option<usize>,
    pub broadcast_buffer: usize, // events to buffer for subscribers (prevents slow readers from consuming memory)
    pub event_persist_buffer: usize, // events to buffer for database commits (block senders if database writes are too slow)
-    pub event_kind_blacklist: Option<Vec<u64>>
+    pub event_kind_blacklist: Option<Vec<u64>>,
+    pub event_kind_allowlist: Option<Vec<u64>>,
 }

 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[allow(unused)]
 pub struct Authorization {
    pub pubkey_whitelist: Option<Vec<String>>, // If present, only allow these pubkeys to publish events
-    pub nip42_auth: bool, // if true enables NIP-42 authentication
+    pub nip42_auth: bool,                      // if true enables NIP-42 authentication
+    pub nip42_dms: bool,                       // if true send DMs only to their authenticated recipients
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[allow(unused)]
+pub struct PayToRelay {
+    pub enabled: bool,
+    pub admission_cost: u64, // Cost to have pubkey whitelisted
+    pub cost_per_event: u64, // Cost author to pay per event
+    pub node_url: String,
+    pub api_secret: String,
+    pub terms_message: String,
+    pub sign_ups: bool, // allow new users to sign up to relay
+    pub secret_key: String,
+    pub processor: Processor,
 }

 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -157,6 +175,7 @@ pub struct Settings {
    pub network: Network,
    pub limits: Limits,
    pub authorization: Authorization,
+    pub pay_to_relay: PayToRelay,
    pub verified_users: VerifiedUsers,
    pub retention: Retention,
    pub options: Options,
@@ -177,18 +196,20 @@ impl Settings {
        }
    }

-
-    fn new_from_default(default: &Settings, config_file_name: &Option<String>) -> Result<Self, ConfigError> {
+    fn new_from_default(
+        default: &Settings,
+        config_file_name: &Option<String>,
+    ) -> Result<Self, ConfigError> {
        let default_config_file_name = "config.toml".to_string();
        let config: &String = match config_file_name {
            Some(value) => value,
-            None => &default_config_file_name
+            None => &default_config_file_name,
        };
        let builder = Config::builder();
        let config: Config = builder
-        // use defaults
+            // use defaults
            .add_source(Config::try_from(default)?)
-        // override with file contents
+            // override with file contents
            .add_source(File::with_name(config))
            .build()?;
        let mut settings: Settings = config.try_deserialize()?;
@@ -206,6 +227,16 @@ impl Settings {
        );
        // initialize durations for verified users
        settings.verified_users.init();
+
+        // Validate pay to relay settings
+        if settings.pay_to_relay.enabled {
+            assert_ne!(settings.pay_to_relay.api_secret, "");
+            // Should check that url is valid
+            assert_ne!(settings.pay_to_relay.node_url, "");
+            assert_ne!(settings.pay_to_relay.terms_message, "");
+            assert_ne!(settings.pay_to_relay.secret_key, "");
+        }
+
        Ok(settings)
    }
 }
@@ -228,7 +259,7 @@ impl Default for Settings {
                in_memory: false,
                min_conn: 4,
                max_conn: 8,
-		connection: "".to_owned(),
+                connection: "".to_owned(),
            },
            grpc: Grpc {
                event_admission_server: None,
@@ -250,10 +281,23 @@ impl Default for Settings {
                broadcast_buffer: 16384,
                event_persist_buffer: 4096,
                event_kind_blacklist: None,
+                event_kind_allowlist: None,
            },
            authorization: Authorization {
                pubkey_whitelist: None, // Allow any address to publish
-                nip42_auth: false, // Disable NIP-42 authentication
+                nip42_auth: false,      // Disable NIP-42 authentication
+                nip42_dms: false,       // Send DMs to everybody
+            },
+            pay_to_relay: PayToRelay {
+                enabled: false,
+                admission_cost: 4200,
+                cost_per_event: 0,
+                terms_message: "".to_string(),
+                node_url: "".to_string(),
+                api_secret: "".to_string(),
+                sign_ups: false,
+                secret_key: "".to_string(),
+                processor: Processor::LNBits,
            },
            verified_users: VerifiedUsers {
                mode: VerifiedUsersMode::Disabled,
--- a/src/conn.rs
+++ b/src/conn.rs
@@ -161,12 +161,12 @@ impl ClientConn {
            Challenge(_) => (),
            AuthPubkey(_) => {
                // already authenticated
-                return Ok(())
-            },
+                return Ok(());
+            }
            NoAuth => {
                // unexpected AUTH request
                return Err(Error::AuthFailure);
-            },
+            }
        }
        match event.validate() {
            Ok(_) => {
--- a/src/db.rs
+++ b/src/db.rs
@@ -2,21 +2,24 @@
 use crate::config::Settings;
 use crate::error::{Error, Result};
 use crate::event::Event;
-use crate::notice::Notice;
-use crate::server::NostrMetrics;
 use crate::nauthz;
+use crate::notice::Notice;
+use crate::payment::PaymentMessage;
+use crate::repo::postgres::{PostgresPool, PostgresRepo};
+use crate::repo::sqlite::SqliteRepo;
+use crate::repo::NostrRepo;
+use crate::server::NostrMetrics;
 use governor::clock::Clock;
 use governor::{Quota, RateLimiter};
+use nostr::key::FromPkStr;
+use nostr::key::Keys;
 use r2d2;
-use std::sync::Arc;
-use std::thread;
 use sqlx::pool::PoolOptions;
 use sqlx::postgres::PgConnectOptions;
 use sqlx::ConnectOptions;
-use crate::repo::sqlite::SqliteRepo;
-use crate::repo::postgres::{PostgresRepo,PostgresPool};
-use crate::repo::NostrRepo;
-use std::time::{Instant, Duration};
+use std::sync::Arc;
+use std::thread;
+use std::time::{Duration, Instant};
 use tracing::log::LevelFilter;
 use tracing::{debug, info, trace, warn};

@@ -42,8 +45,8 @@ pub const DB_FILE: &str = "nostr.db";
 /// Will panic if the pool could not be created.
 pub async fn build_repo(settings: &Settings, metrics: NostrMetrics) -> Arc<dyn NostrRepo> {
    match settings.database.engine.as_str() {
-        "sqlite" => {Arc::new(build_sqlite_pool(settings, metrics).await)},
-        "postgres" => {Arc::new(build_postgres_pool(settings, metrics).await)},
+        "sqlite" => Arc::new(build_sqlite_pool(settings, metrics).await),
+        "postgres" => Arc::new(build_postgres_pool(settings, metrics).await),
        _ => panic!("Unknown database engine"),
    }
 }
@@ -83,6 +86,7 @@ pub async fn db_writer(
    mut event_rx: tokio::sync::mpsc::Receiver<SubmittedEvent>,
    bcast_tx: tokio::sync::broadcast::Sender<Event>,
    metadata_tx: tokio::sync::broadcast::Sender<Event>,
+    payment_tx: tokio::sync::broadcast::Sender<PaymentMessage>,
    mut shutdown: tokio::sync::broadcast::Receiver<()>,
 ) -> Result<()> {
    // are we performing NIP-05 checking?
@@ -90,6 +94,10 @@ pub async fn db_writer(
    // are we requriing NIP-05 user verification?
    let nip05_enabled = settings.verified_users.is_enabled();

+    let pay_to_relay_enabled = settings.pay_to_relay.enabled;
+    let cost_per_event = settings.pay_to_relay.cost_per_event;
+    debug!("Pay to relay: {}", pay_to_relay_enabled);
+
    //upgrade_db(&mut pool.get()?)?;

    // Make a copy of the whitelist
@@ -116,8 +124,8 @@ pub async fn db_writer(
    };

    //let gprc_client = settings.grpc.event_admission_server.map(|s| {
-//        event_admitter_connect(&s);
-//    });
+    //        event_admitter_connect(&s);
+    //    });

    loop {
        if shutdown.try_recv().is_ok() {
@@ -136,24 +144,6 @@ pub async fn db_writer(
        let subm_event = next_event.unwrap();
        let event = subm_event.event;
        let notice_tx = subm_event.notice_tx;
-        // check if this event is authorized.
-        if let Some(allowed_addrs) = whitelist {
-            // TODO: incorporate delegated pubkeys
-            // if the event address is not in allowed_addrs.
-            if !allowed_addrs.contains(&event.pubkey) {
-                debug!(
-                    "rejecting event: {}, unauthorized author",
-                    event.get_event_id_prefix()
-                );
-                notice_tx
-                    .try_send(Notice::blocked(
-                        event.id,
-                        "pubkey is not allowed to publish to this relay",
-                    ))
-                    .ok();
-                continue;
-            }
-        }

        // Check that event kind isn't blacklisted
        let kinds_blacklist = &settings.limits.event_kind_blacklist.clone();
@@ -165,15 +155,113 @@ pub async fn db_writer(
                    &event.kind
                );
                notice_tx
-                    .try_send(Notice::blocked(
-                        event.id,
-                        "event kind is blocked by relay"
-                    ))
+                    .try_send(Notice::blocked(event.id, "event kind is blocked by relay"))
                    .ok();
                continue;
            }
        }

+        // Check that event kind isn't allowlisted
+        let kinds_allowlist = &settings.limits.event_kind_allowlist.clone();
+        if let Some(event_kind_allowlist) = kinds_allowlist {
+            if !event_kind_allowlist.contains(&event.kind) {
+                debug!(
+                    "rejecting event: {}, allowlist kind: {}",
+                    &event.get_event_id_prefix(),
+                    &event.kind
+                );
+                notice_tx
+                    .try_send(Notice::blocked(event.id, "event kind is blocked by relay"))
+                    .ok();
+                continue;
+            }
+        }
+
+        // Set to none until balance is got from db
+        // Will stay none if user in whitelisted and does not have to pay to post
+        // When pay to relay is enabled the whitelist is not a list of who can post
+        // It is a list of who can post for free
+        let mut user_balance: Option<u64> = None;
+        if !pay_to_relay_enabled {
+            // check if this event is authorized.
+            if let Some(allowed_addrs) = whitelist {
+                // TODO: incorporate delegated pubkeys
+                // if the event address is not in allowed_addrs.
+                if !allowed_addrs.contains(&event.pubkey) {
+                    debug!(
+                        "rejecting event: {}, unauthorized author",
+                        event.get_event_id_prefix()
+                    );
+                    notice_tx
+                        .try_send(Notice::blocked(
+                            event.id,
+                            "pubkey is not allowed to publish to this relay",
+                        ))
+                        .ok();
+                    continue;
+                }
+            }
+        } else {
+            // If the user is on whitelist there is no need to check if the user is admitted or has balance to post
+            if whitelist.is_none()
+                || (whitelist.is_some() && !whitelist.as_ref().unwrap().contains(&event.pubkey))
+            {
+                let key = Keys::from_pk_str(&event.pubkey).unwrap();
+                match repo.get_account_balance(&key).await {
+                    Ok((user_admitted, balance)) => {
+                        // Checks to make sure user is admitted
+                        if !user_admitted {
+                            debug!("user: {}, is not admitted", &event.pubkey);
+
+                            // If the user is in DB but not admitted
+                            // Send meeage to payment thread to check if outstanding invoice has been paid
+                            payment_tx
+                                .send(PaymentMessage::CheckAccount(event.pubkey))
+                                .ok();
+                            notice_tx
+                                .try_send(Notice::blocked(event.id, "User is not admitted"))
+                                .ok();
+                            continue;
+                        }
+
+                        // Checks that user has enough balance to post
+                        // TODO: this should send an invoice to user to top up
+                        if balance < cost_per_event {
+                            debug!("user: {}, does not have a balance", &event.pubkey,);
+                            notice_tx
+                                .try_send(Notice::blocked(event.id, "Insufficient balance"))
+                                .ok();
+                            continue;
+                        }
+                        user_balance = Some(balance);
+                        debug!("User balance: {:?}", user_balance);
+                    }
+                    Err(
+                        Error::SqlError(rusqlite::Error::QueryReturnedNoRows)
+                        | Error::SqlxError(sqlx::Error::RowNotFound),
+                    ) => {
+                        // User does not exist
+                        info!("Unregistered user");
+                        if settings.pay_to_relay.sign_ups {
+                            payment_tx
+                                .send(PaymentMessage::NewAccount(event.pubkey))
+                                .ok();
+                        }
+                        let msg = "Pubkey not registered";
+                        notice_tx.try_send(Notice::error(event.id, msg)).ok();
+                        continue;
+                    }
+                    Err(err) => {
+                        warn!("Error checking admission status: {:?}", err);
+                        let msg = "relay experienced an error checking your admission status";
+                        notice_tx.try_send(Notice::error(event.id, msg)).ok();
+                        // Other error
+                        continue;
+                    }
+                }
+            }
+        }
+
        // send any metadata events to the NIP-05 verifier
        if nip05_active && event.is_kind_metadata() {
            // we are sending this prior to even deciding if we
@@ -200,7 +288,6 @@ pub async fn db_writer(
                            uv.name.to_string(),
                            event.get_author_prefix()
                        );
-
                    } else {
                        info!(
                            "rejecting event, author ({:?} / {:?}) verification invalid (expired/wrong domain)",
@@ -216,7 +303,10 @@ pub async fn db_writer(
                        continue;
                    }
                }
-                Err(Error::SqlError(rusqlite::Error::QueryReturnedNoRows)) => {
+                Err(
+                    Error::SqlError(rusqlite::Error::QueryReturnedNoRows)
+                    | Error::SqlxError(sqlx::Error::RowNotFound),
+                ) => {
                    debug!(
                        "no verification records found for pubkey: {:?}",
                        event.get_author_prefix()
@@ -237,27 +327,44 @@ pub async fn db_writer(
        }

        // nip05 address
-        let nip05_address : Option<crate::nip05::Nip05Name> = validation.and_then(|x| x.ok().map(|y| y.name));
+        let nip05_address: Option<crate::nip05::Nip05Name> =
+            validation.and_then(|x| x.ok().map(|y| y.name));

        // GRPC check
        if let Some(ref mut c) = grpc_client {
            trace!("checking if grpc permits");
            let grpc_start = Instant::now();
-            let decision_res = c.admit_event(&event, &subm_event.source_ip, subm_event.origin, subm_event.user_agent, nip05_address, subm_event.auth_pubkey).await;
+            let decision_res = c
+                .admit_event(
+                    &event,
+                    &subm_event.source_ip,
+                    subm_event.origin,
+                    subm_event.user_agent,
+                    nip05_address,
+                    subm_event.auth_pubkey,
+                )
+                .await;
            match decision_res {
                Ok(decision) => {
                    if !decision.permitted() {
                        // GPRC returned a decision to reject this event
-                        info!("GRPC rejected event: {:?} (kind: {}) from: {:?} in: {:?} (IP: {:?})",
-                              event.get_event_id_prefix(),
-                              event.kind,
-                              event.get_author_prefix(),
-                              grpc_start.elapsed(),
-                              subm_event.source_ip);
-                        notice_tx.try_send(Notice::blocked(event.id, &decision.message().unwrap_or_else(|| "".to_string()))).ok();
+                        info!(
+                            "GRPC rejected event: {:?} (kind: {}) from: {:?} in: {:?} (IP: {:?})",
+                            event.get_event_id_prefix(),
+                            event.kind,
+                            event.get_author_prefix(),
+                            grpc_start.elapsed(),
+                            subm_event.source_ip
+                        );
+                        notice_tx
+                            .try_send(Notice::blocked(
+                                event.id,
+                                &decision.message().unwrap_or_else(|| "".to_string()),
+                            ))
+                            .ok();
                        continue;
                    }
-                },
+                }
                Err(e) => {
                    warn!("GRPC server error: {:?}", e);
                }
@@ -306,6 +413,17 @@ pub async fn db_writer(

        // use rate limit, if defined, and if an event was actually written.
        if event_write {
+            // If pay to relay is diabaled or the cost per event is 0
+            // No need to update user balance
+            if pay_to_relay_enabled && cost_per_event > 0 {
+                // If the user balance is some, user was not on whitelist
+                // Their balance should be reduced by the cost per event
+                if let Some(_balance) = user_balance {
+                    let pubkey = Keys::from_pk_str(&event.pubkey)?;
+                    repo.update_account_balance(&pubkey, false, cost_per_event)
+                        .await?;
+                }
+            }
            if let Some(ref lim) = lim_opt {
                if let Err(n) = lim.check() {
                    let wait_for = n.wait_time_from(clock.now());
--- a/src/delegation.rs
+++ b/src/delegation.rs
@@ -84,7 +84,8 @@ pub struct ConditionQuery {
 }

 impl ConditionQuery {
-    #[must_use] pub fn allows_event(&self, event: &Event) -> bool {
+    #[must_use]
+    pub fn allows_event(&self, event: &Event) -> bool {
        // check each condition, to ensure that the event complies
        // with the restriction.
        for c in &self.conditions {
@@ -101,7 +102,8 @@ impl ConditionQuery {
 }

 // Verify that the delegator approved the delegation; return a ConditionQuery if so.
-#[must_use] pub fn validate_delegation(
+#[must_use]
+pub fn validate_delegation(
    delegator: &str,
    delegatee: &str,
    cond_query: &str,
@@ -144,7 +146,8 @@ pub struct Condition {

 impl Condition {
    /// Check if this condition allows the given event to be delegated
-    #[must_use] pub fn allows_event(&self, event: &Event) -> bool {
+    #[must_use]
+    pub fn allows_event(&self, event: &Event) -> bool {
        // determine what the right-hand side of the operator is
        let resolved_field = match &self.field {
            Field::Kind => event.kind,
--- a/src/error.rs
+++ b/src/error.rs
@@ -72,6 +72,16 @@ pub enum Error {
    AuthFailure,
    #[error("I/O Error")]
    IoError(std::io::Error),
+    #[error("Event builder error")]
+    EventError(nostr::event::builder::Error),
+    #[error("Nostr key error")]
+    NostrKeyError(nostr::key::Error),
+    #[error("Payment hash mismatch")]
+    PaymentHash,
+    #[error("Error parsing url")]
+    URLParseError(url::ParseError),
+    #[error("HTTP error")]
+    HTTPError(http::Error),
    #[error("Unknown/Undocumented")]
    UnknownError,
 }
@@ -153,3 +163,30 @@ impl From<std::io::Error> for Error {
        Error::IoError(r)
    }
 }
+impl From<nostr::event::builder::Error> for Error {
+    /// Wrap event builder error
+    fn from(r: nostr::event::builder::Error) -> Self {
+        Error::EventError(r)
+    }
+}
+
+impl From<nostr::key::Error> for Error {
+    /// Wrap nostr key error
+    fn from(r: nostr::key::Error) -> Self {
+        Error::NostrKeyError(r)
+    }
+}
+
+impl From<url::ParseError> for Error {
+    /// Wrap nostr key error
+    fn from(r: url::ParseError) -> Self {
+        Error::URLParseError(r)
+    }
+}
+
+impl From<http::Error> for Error {
+    /// Wrap nostr key error
+    fn from(r: http::Error) -> Self {
+        Error::HTTPError(r)
+    }
+}
--- a/src/event.rs
+++ b/src/event.rs
@@ -1,7 +1,12 @@
 //! Event parsing and validation
 use crate::delegation::validate_delegation;
-use crate::error::Error::{CommandUnknownError, EventCouldNotCanonicalize, EventInvalidId, EventInvalidSignature, EventMalformedPubkey};
+use crate::error::Error::{
+    CommandUnknownError, EventCouldNotCanonicalize, EventInvalidId, EventInvalidSignature,
+    EventMalformedPubkey,
+};
 use crate::error::Result;
+use crate::event::EventWrapper::WrappedAuth;
+use crate::event::EventWrapper::WrappedEvent;
 use crate::nip05;
 use crate::utils::unix_time;
 use bitcoin_hashes::{sha256, Hash};
@@ -14,8 +19,6 @@ use std::collections::HashMap;
 use std::collections::HashSet;
 use std::str::FromStr;
 use tracing::{debug, info};
-use crate::event::EventWrapper::WrappedEvent;
-use crate::event::EventWrapper::WrappedAuth;

 lazy_static! {
    /// Secp256k1 verification instance.
@@ -30,7 +33,8 @@ pub struct EventCmd {
 }

 impl EventCmd {
-    #[must_use] pub fn event_id(&self) -> &str {
+    #[must_use]
+    pub fn event_id(&self) -> &str {
        &self.event.id
    }
 }
@@ -67,7 +71,8 @@ where
 }

 /// Attempt to form a single-char tag name.
-#[must_use] pub fn single_char_tagname(tagname: &str) -> Option<char> {
+#[must_use]
+pub fn single_char_tagname(tagname: &str) -> Option<char> {
    // We return the tag character if and only if the tagname consists
    // of a single char.
    let mut tagnamechars = tagname.chars();
@@ -85,10 +90,9 @@ where
    }
 }

-
 pub enum EventWrapper {
    WrappedEvent(Event),
-    WrappedAuth(Event)
+    WrappedAuth(Event),
 }

 /// Convert network event to parsed/validated event.
@@ -114,7 +118,8 @@ impl From<EventCmd> for Result<EventWrapper> {

 impl Event {
    #[cfg(test)]
-    #[must_use] pub fn simple_event() -> Event {
+    #[must_use]
+    pub fn simple_event() -> Event {
        Event {
            id: "0".to_owned(),
            pubkey: "0".to_owned(),
@@ -128,12 +133,14 @@ impl Event {
        }
    }

-    #[must_use] pub fn is_kind_metadata(&self) -> bool {
+    #[must_use]
+    pub fn is_kind_metadata(&self) -> bool {
        self.kind == 0
    }

    /// Should this event be persisted?
-    #[must_use] pub fn is_ephemeral(&self) -> bool {
+    #[must_use]
+    pub fn is_ephemeral(&self) -> bool {
        self.kind >= 20000 && self.kind < 30000
    }

@@ -149,40 +156,50 @@ impl Event {
    /// Determine the time at which this event should expire
    pub fn expiration(&self) -> Option<u64> {
        let default = "".to_string();
-        let dvals:Vec<&String> = self.tags
+        let dvals: Vec<&String> = self
+            .tags
            .iter()
            .filter(|x| !x.is_empty())
            .filter(|x| x.get(0).unwrap() == "expiration")
-            .map(|x| x.get(1).unwrap_or(&default)).take(1)
+            .map(|x| x.get(1).unwrap_or(&default))
+            .take(1)
            .collect();
        let val_first = dvals.get(0);
        val_first.and_then(|t| t.parse::<u64>().ok())
    }

    /// Should this event be replaced with newer timestamps from same author?
-    #[must_use] pub fn is_replaceable(&self) -> bool {
-        self.kind == 0 || self.kind == 3 || self.kind == 41 || (self.kind >= 10000 && self.kind < 20000)
+    #[must_use]
+    pub fn is_replaceable(&self) -> bool {
+        self.kind == 0
+            || self.kind == 3
+            || self.kind == 41
+            || (self.kind >= 10000 && self.kind < 20000)
    }

    /// Should this event be replaced with newer timestamps from same author, for distinct `d` tag values?
-    #[must_use] pub fn is_param_replaceable(&self) -> bool {
+    #[must_use]
+    pub fn is_param_replaceable(&self) -> bool {
        self.kind >= 30000 && self.kind < 40000
    }

    /// Should this event be replaced with newer timestamps from same author, for distinct `d` tag values?
-    #[must_use] pub fn distinct_param(&self) -> Option<String> {
+    #[must_use]
+    pub fn distinct_param(&self) -> Option<String> {
        if self.is_param_replaceable() {
            let default = "".to_string();
-            let dvals:Vec<&String> = self.tags
+            let dvals: Vec<&String> = self
+                .tags
                .iter()
                .filter(|x| !x.is_empty())
                .filter(|x| x.get(0).unwrap() == "d")
-                .map(|x| x.get(1).unwrap_or(&default)).take(1)
+                .map(|x| x.get(1).unwrap_or(&default))
+                .take(1)
                .collect();
            let dval_first = dvals.get(0);
            match dval_first {
-                Some(_) => {dval_first.map(|x| x.to_string())},
-                None => Some(default)
+                Some(_) => dval_first.map(|x| x.to_string()),
+                None => Some(default),
            }
        } else {
            None
@@ -190,7 +207,8 @@ impl Event {
    }

    /// Pull a NIP-05 Name out of the event, if one exists
-    #[must_use] pub fn get_nip05_addr(&self) -> Option<nip05::Nip05Name> {
+    #[must_use]
+    pub fn get_nip05_addr(&self) -> Option<nip05::Nip05Name> {
        if self.is_kind_metadata() {
            // very quick check if we should attempt to parse this json
            if self.content.contains("\"nip05\"") {
@@ -207,7 +225,8 @@ impl Event {
    // is this event delegated (properly)?
    // does the signature match, and are conditions valid?
    // if so, return an alternate author for the event
-    #[must_use] pub fn delegated_author(&self) -> Option<String> {
+    #[must_use]
+    pub fn delegated_author(&self) -> Option<String> {
        // is there a delegation tag?
        let delegation_tag: Vec<String> = self
            .tags
@@ -215,7 +234,8 @@ impl Event {
            .filter(|x| x.len() == 4)
            .filter(|x| x.get(0).unwrap() == "delegation")
            .take(1)
-            .next()?.clone(); // get first tag
+            .next()?
+            .clone(); // get first tag

        //let delegation_tag = self.tag_values_by_name("delegation");
        // delegation tags should have exactly 3 elements after the name (pubkey, condition, sig)
@@ -275,15 +295,18 @@ impl Event {
    }

    /// Create a short event identifier, suitable for logging.
-    #[must_use] pub fn get_event_id_prefix(&self) -> String {
+    #[must_use]
+    pub fn get_event_id_prefix(&self) -> String {
        self.id.chars().take(8).collect()
    }
-    #[must_use] pub fn get_author_prefix(&self) -> String {
+    #[must_use]
+    pub fn get_author_prefix(&self) -> String {
        self.pubkey.chars().take(8).collect()
    }

    /// Retrieve tag initial values across all tags matching the name
-    #[must_use] pub fn tag_values_by_name(&self, tag_name: &str) -> Vec<String> {
+    #[must_use]
+    pub fn tag_values_by_name(&self, tag_name: &str) -> Vec<String> {
        self.tags
            .iter()
            .filter(|x| x.len() > 1)
@@ -292,7 +315,8 @@ impl Event {
            .collect()
    }

-    #[must_use] pub fn is_valid_timestamp(&self, reject_future_seconds: Option<usize>) -> bool {
+    #[must_use]
+    pub fn is_valid_timestamp(&self, reject_future_seconds: Option<usize>) -> bool {
        if let Some(allowable_future) = reject_future_seconds {
            let curr_time = unix_time();
            // calculate difference, plus how far future we allow
@@ -384,7 +408,8 @@ impl Event {
    }

    /// Determine if the given tag and value set intersect with tags in this event.
-    #[must_use] pub fn generic_tag_val_intersect(&self, tagname: char, check: &HashSet<String>) -> bool {
+    #[must_use]
+    pub fn generic_tag_val_intersect(&self, tagname: char, check: &HashSet<String>) -> bool {
        match &self.tagidx {
            // check if this is indexable tagname
            Some(idx) => match idx.get(&tagname) {
@@ -399,6 +424,22 @@ impl Event {
    }
 }

+impl From<nostr::Event> for Event {
+    fn from(nostr_event: nostr::Event) -> Self {
+        Event {
+            id: nostr_event.id.to_hex(),
+            pubkey: nostr_event.pubkey.to_string(),
+            created_at: nostr_event.created_at.as_u64(),
+            kind: nostr_event.kind.as_u64(),
+            tags: nostr_event.tags.iter().map(|x| x.as_vec()).collect(),
+            content: nostr_event.content,
+            sig: nostr_event.sig.to_string(),
+            delegated_by: None,
+            tagidx: None,
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
    use super::*;
@@ -423,7 +464,7 @@ mod tests {
    fn empty_event_tag_match() {
        let event = Event::simple_event();
        assert!(!event
-                .generic_tag_val_intersect('e', &HashSet::from(["foo".to_owned(), "bar".to_owned()])));
+            .generic_tag_val_intersect('e', &HashSet::from(["foo".to_owned(), "bar".to_owned()])));
    }

    #[test]
@@ -571,28 +612,28 @@ mod tests {
    #[test]
    fn ephemeral_event() {
        let mut event = Event::simple_event();
-        event.kind=20000;
+        event.kind = 20000;
        assert!(event.is_ephemeral());
-        event.kind=29999;
+        event.kind = 29999;
        assert!(event.is_ephemeral());
-        event.kind=30000;
+        event.kind = 30000;
        assert!(!event.is_ephemeral());
-        event.kind=19999;
+        event.kind = 19999;
        assert!(!event.is_ephemeral());
    }

    #[test]
    fn replaceable_event() {
        let mut event = Event::simple_event();
-        event.kind=0;
+        event.kind = 0;
        assert!(event.is_replaceable());
-        event.kind=3;
+        event.kind = 3;
        assert!(event.is_replaceable());
-        event.kind=10000;
+        event.kind = 10000;
        assert!(event.is_replaceable());
-        event.kind=19999;
+        event.kind = 19999;
        assert!(event.is_replaceable());
-        event.kind=20000;
+        event.kind = 20000;
        assert!(!event.is_replaceable());
    }

@@ -614,8 +655,7 @@ mod tests {
        // NIP case #1: "tags":[["d",""]]
        let mut event = Event::simple_event();
        event.kind = 30000;
-        event.tags = vec![
-            vec!["d".to_owned(), "".to_owned()]];
+        event.tags = vec![vec!["d".to_owned(), "".to_owned()]];
        assert_eq!(event.distinct_param(), Some("".to_string()));
    }

@@ -632,8 +672,7 @@ mod tests {
        // NIP case #3: "tags":[["d"]]: implicit empty value ""
        let mut event = Event::simple_event();
        event.kind = 30000;
-        event.tags = vec![
-            vec!["d".to_owned()]];
+        event.tags = vec![vec!["d".to_owned()]];
        assert_eq!(event.distinct_param(), Some("".to_string()));
    }

@@ -644,7 +683,7 @@ mod tests {
        event.kind = 30000;
        event.tags = vec![
            vec!["d".to_owned(), "".to_string()],
-            vec!["d".to_owned(), "not empty".to_string()]
+            vec!["d".to_owned(), "not empty".to_string()],
        ];
        assert_eq!(event.distinct_param(), Some("".to_string()));
    }
@@ -657,7 +696,7 @@ mod tests {
        event.kind = 30000;
        event.tags = vec![
            vec!["d".to_owned(), "not empty".to_string()],
-            vec!["d".to_owned(), "".to_string()]
+            vec!["d".to_owned(), "".to_string()],
        ];
        assert_eq!(event.distinct_param(), Some("not empty".to_string()));
    }
@@ -670,7 +709,7 @@ mod tests {
        event.tags = vec![
            vec!["d".to_owned()],
            vec!["d".to_owned(), "second value".to_string()],
-            vec!["d".to_owned(), "third value".to_string()]
+            vec!["d".to_owned(), "third value".to_string()],
        ];
        assert_eq!(event.distinct_param(), Some("".to_string()));
    }
@@ -680,9 +719,7 @@ mod tests {
        // NIP case #6: "tags":[["e"]]: same as no tags
        let mut event = Event::simple_event();
        event.kind = 30000;
-        event.tags = vec![
-            vec!["e".to_owned()],
-        ];
+        event.tags = vec![vec!["e".to_owned()]];
        assert_eq!(event.distinct_param(), Some("".to_string()));
    }

@@ -691,9 +728,7 @@ mod tests {
        // regular events do not expire
        let mut event = Event::simple_event();
        event.kind = 7;
-        event.tags = vec![
-            vec!["test".to_string(), "foo".to_string()],
-        ];
+        event.tags = vec![vec!["test".to_string(), "foo".to_string()]];
        assert_eq!(event.expiration(), None);
    }

@@ -702,57 +737,47 @@ mod tests {
        // regular events do not expire
        let mut event = Event::simple_event();
        event.kind = 7;
-        event.tags = vec![
-            vec!["expiration".to_string()],
-        ];
+        event.tags = vec![vec!["expiration".to_string()]];
        assert_eq!(event.expiration(), None);
    }

    #[test]
    fn expiring_event_future() {
        // a normal expiring event
-        let exp:u64 = 1676264138;
+        let exp: u64 = 1676264138;
        let mut event = Event::simple_event();
        event.kind = 1;
-        event.tags = vec![
-            vec!["expiration".to_string(), exp.to_string()],
-        ];
+        event.tags = vec![vec!["expiration".to_string(), exp.to_string()]];
        assert_eq!(event.expiration(), Some(exp));
    }

    #[test]
    fn expiring_event_negative() {
        // expiration set to a negative value (invalid)
-        let exp:i64 = -90;
+        let exp: i64 = -90;
        let mut event = Event::simple_event();
        event.kind = 1;
-        event.tags = vec![
-            vec!["expiration".to_string(), exp.to_string()],
-        ];
+        event.tags = vec![vec!["expiration".to_string(), exp.to_string()]];
        assert_eq!(event.expiration(), None);
    }

    #[test]
    fn expiring_event_zero() {
        // a normal expiring event set to zero
-        let exp:i64 = 0;
+        let exp: i64 = 0;
        let mut event = Event::simple_event();
        event.kind = 1;
-        event.tags = vec![
-            vec!["expiration".to_string(), exp.to_string()],
-        ];
+        event.tags = vec![vec!["expiration".to_string(), exp.to_string()]];
        assert_eq!(event.expiration(), Some(0));
    }

    #[test]
    fn expiring_event_fraction() {
        // expiration is fractional (invalid)
-        let exp:f64 = 23.334;
+        let exp: f64 = 23.334;
        let mut event = Event::simple_event();
        event.kind = 1;
-        event.tags = vec![
-            vec!["expiration".to_string(), exp.to_string()],
-        ];
+        event.tags = vec![vec!["expiration".to_string(), exp.to_string()]];
        assert_eq!(event.expiration(), None);
    }

--- a/src/hexrange.rs
+++ b/src/hexrange.rs
@@ -1,5 +1,5 @@
 //! Utilities for searching hexadecimal
-use crate::utils::{is_hex};
+use crate::utils::is_hex;
 use hex;

 /// Types of hexadecimal queries.
@@ -19,7 +19,8 @@ fn is_all_fs(s: &str) -> bool {
 }

 /// Find the next hex sequence greater than the argument.
-#[must_use] pub fn hex_range(s: &str) -> Option<HexSearch> {
+#[must_use]
+pub fn hex_range(s: &str) -> Option<HexSearch> {
    let mut hash_base = s.to_owned();
    if !is_hex(&hash_base) || hash_base.len() > 64 {
        return None;
@@ -56,9 +57,9 @@ fn is_all_fs(s: &str) -> bool {
        } else if odd {
            // check if first char in this byte is NOT 'f'
            if b < 240 {
-		// bump up the first character in this byte
+                // bump up the first character in this byte
                upper[byte_len] = b + 16;
-		// increment done, stop iterating through the vec
+                // increment done, stop iterating through the vec
                break;
            }
            // if it is 'f', reset the byte to 0 and do a carry
--- a/src/info.rs
+++ b/src/info.rs
@@ -4,6 +4,32 @@ use crate::config::Settings;
 use serde::{Deserialize, Serialize};

 pub const CARGO_PKG_VERSION: Option<&'static str> = option_env!("CARGO_PKG_VERSION");
+pub const UNIT: &str = "sats";
+
+/// Limitations of the relay as specified in NIP-111
+/// (This nip isn't finalized so may change)
+#[derive(Debug, Serialize, Deserialize)]
+#[allow(unused)]
+pub struct Limitation {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    payment_required: Option<bool>,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+#[allow(unused)]
+pub struct Fees {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    admission: Option<Vec<Fee>>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    publication: Option<Vec<Fee>>,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+#[allow(unused)]
+pub struct Fee {
+    amount: u64,
+    unit: String,
+}

 #[derive(Debug, Serialize, Deserialize)]
 #[allow(unused)]
@@ -24,6 +50,12 @@ pub struct RelayInfo {
    pub software: Option<String>,
    #[serde(skip_serializing_if = "Option::is_none")]
    pub version: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub limitation: Option<Limitation>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub payment_url: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub fees: Option<Fees>,
 }

 /// Convert an Info configuration into public Relay Info
@@ -37,6 +69,48 @@ impl From<Settings> for RelayInfo {
        }

        let i = c.info;
+        let p = c.pay_to_relay;
+
+        let limitations = Limitation {
+            payment_required: Some(p.enabled),
+        };
+
+        let (payment_url, fees) = if p.enabled {
+            let admission_fee = if p.admission_cost > 0 {
+                Some(vec![Fee {
+                    amount: p.admission_cost,
+                    unit: UNIT.to_string(),
+                }])
+            } else {
+                None
+            };
+
+            let post_fee = if p.cost_per_event > 0 {
+                Some(vec![Fee {
+                    amount: p.cost_per_event,
+                    unit: UNIT.to_string(),
+                }])
+            } else {
+                None
+            };
+
+            let fees = Fees {
+                admission: admission_fee,
+                publication: post_fee,
+            };
+
+            let payment_url = if p.enabled && i.relay_url.is_some() {
+                Some(format!(
+                    "{}join",
+                    i.relay_url.clone().unwrap().replace("ws", "http")
+                ))
+            } else {
+                None
+            };
+            (payment_url, Some(fees))
+        } else {
+            (None, None)
+        };

        RelayInfo {
            id: i.relay_url,
@@ -47,6 +121,9 @@ impl From<Settings> for RelayInfo {
            supported_nips: Some(supported_nips),
            software: Some("https://git.sr.ht/~gheartsfield/nostr-rs-relay".to_owned()),
            version: CARGO_PKG_VERSION.map(std::borrow::ToOwned::to_owned),
+            limitation: Some(limitations),
+            payment_url,
+            fees,
        }
    }
 }
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -8,11 +8,12 @@ pub mod error;
 pub mod event;
 pub mod hexrange;
 pub mod info;
-pub mod nip05;
 pub mod nauthz;
+pub mod nip05;
 pub mod notice;
 pub mod repo;
 pub mod subscription;
 pub mod utils;
 // Public API for creating relays programatically
+pub mod payment;
 pub mod server;
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,5 +1,6 @@
 //! Server process
 use clap::Parser;
+use console_subscriber::ConsoleLayer;
 use nostr_rs_relay::cli::CLIArgs;
 use nostr_rs_relay::config;
 use nostr_rs_relay::server::start_server;
@@ -7,7 +8,13 @@ use std::sync::mpsc as syncmpsc;
 use std::sync::mpsc::{Receiver as MpscReceiver, Sender as MpscSender};
 use std::thread;
 use tracing::info;
-use console_subscriber::ConsoleLayer;
+
+#[cfg(not(target_env = "msvc"))]
+use tikv_jemallocator::Jemalloc;
+
+#[cfg(not(target_env = "msvc"))]
+#[global_allocator]
+static GLOBAL: Jemalloc = Jemalloc;

 /// Start running a Nostr relay server.
 fn main() {
--- a/src/nauthz.rs
+++ b/src/nauthz.rs
@@ -76,7 +76,7 @@ impl EventAuthzService {
        origin: Option<String>,
        user_agent: Option<String>,
        nip05: Option<Nip05Name>,
-        auth_pubkey: Option<Vec<u8>>
+        auth_pubkey: Option<Vec<u8>>,
    ) -> Result<Box<dyn AuthzDecision>> {
        self.ready_connection().await;
        let id_blob = hex::decode(&event.id)?;
--- a/src/nip05.rs
+++ b/src/nip05.rs
@@ -8,11 +8,11 @@ use crate::config::VerifiedUsers;
 use crate::error::{Error, Result};
 use crate::event::Event;
 use crate::repo::NostrRepo;
-use std::sync::Arc;
 use hyper::body::HttpBody;
 use hyper::client::connect::HttpConnector;
 use hyper::Client;
 use hyper_tls::HttpsConnector;
+use std::sync::Arc;
 use std::time::Duration;
 use std::time::Instant;
 use std::time::SystemTime;
@@ -48,7 +48,8 @@ pub struct Nip05Name {

 impl Nip05Name {
    /// Does this name represent the entire domain?
-    #[must_use] pub fn is_domain_only(&self) -> bool {
+    #[must_use]
+    pub fn is_domain_only(&self) -> bool {
        self.local == "_"
    }

@@ -58,8 +59,8 @@ impl Nip05Name {
            "https://{}/.well-known/nostr.json?name={}",
            self.domain, self.local
        )
-            .parse::<http::Uri>()
-            .ok()
+        .parse::<http::Uri>()
+        .ok()
    }
 }

@@ -73,7 +74,10 @@ impl std::convert::TryFrom<&str> for Nip05Name {
            // check if local name is valid
            let local = components[0];
            let domain = components[1];
-            if local.chars().all(|x| x.is_alphanumeric() || x == '_' || x == '-' || x == '.') {
+            if local
+                .chars()
+                .all(|x| x.is_alphanumeric() || x == '_' || x == '-' || x == '.')
+            {
                if domain
                    .chars()
                    .all(|x| x.is_alphanumeric() || x == '-' || x == '.')
@@ -261,10 +265,10 @@ impl Verifier {
                Err(Error::ChannelClosed) => {
                    // channel was closed, we are shutting down
                    return;
-                },
+                }
                Err(e) => {
-                info!("error in verifier: {:?}", e);
-                },
+                    info!("error in verifier: {:?}", e);
+                }
                _ => {}
            }
        }
@@ -349,42 +353,41 @@ impl Verifier {
                    UserWebVerificationStatus::Verified => {
                        // freshly verified account, update the
                        // timestamp.
-                        self.repo.update_verification_timestamp(v.rowid)
-                            .await?;
+                        self.repo.update_verification_timestamp(v.rowid).await?;
                        info!("verification updated for {}", v.to_string());
-
                    }
                    UserWebVerificationStatus::DomainNotAllowed
-			| UserWebVerificationStatus::Unknown => {
-                            // server may be offline, or temporarily
-                            // blocked by the config file.  Note the
-                            // failure so we can process something
-                            // else.
+                    | UserWebVerificationStatus::Unknown => {
+                        // server may be offline, or temporarily
+                        // blocked by the config file.  Note the
+                        // failure so we can process something
+                        // else.

-                            // have we had enough failures to give up?
-                            if v.failure_count >= max_failures as u64 {
-				info!(
-                                    "giving up on verifying {:?} after {} failures",
-                                    v.name, v.failure_count
-				);
-				self.repo.delete_verification(v.rowid)
-                                    .await?;
-                            } else {
-				// record normal failure, incrementing failure count
-				info!("verification failed for {}", v.to_string());
-				self.repo.fail_verification(v.rowid).await?;
-                            }
-			}
+                        // have we had enough failures to give up?
+                        if v.failure_count >= max_failures as u64 {
+                            info!(
+                                "giving up on verifying {:?} after {} failures",
+                                v.name, v.failure_count
+                            );
+                            self.repo.delete_verification(v.rowid).await?;
+                        } else {
+                            // record normal failure, incrementing failure count
+                            info!("verification failed for {}", v.to_string());
+                            self.repo.fail_verification(v.rowid).await?;
+                        }
+                    }
                    UserWebVerificationStatus::Unverified => {
                        // domain has removed the verification, drop
                        // the record on our side.
                        info!("verification rescinded for {}", v.to_string());
-                        self.repo.delete_verification(v.rowid)
-                            .await?;
+                        self.repo.delete_verification(v.rowid).await?;
                    }
                }
            }
-            Err(Error::SqlError(rusqlite::Error::QueryReturnedNoRows)) => {
+            Err(
+                Error::SqlError(rusqlite::Error::QueryReturnedNoRows)
+                | Error::SqlxError(sqlx::Error::RowNotFound),
+            ) => {
                // No users need verification.  Reset the interval to
                // the next verification attempt.
                let start = tokio::time::Instant::now() + self.wait_after_finish;
@@ -433,7 +436,9 @@ impl Verifier {
            }
        }
        // write the verification record
-        self.repo.create_verification_record(&event.id, name).await?;
+        self.repo
+            .create_verification_record(&event.id, name)
+            .await?;
        Ok(())
    }
 }
@@ -463,7 +468,8 @@ pub struct VerificationRecord {

 /// Check with settings to determine if a given domain is allowed to
 /// publish.
-#[must_use] pub fn is_domain_allowed(
+#[must_use]
+pub fn is_domain_allowed(
    domain: &str,
    whitelist: &Option<Vec<String>>,
    blacklist: &Option<Vec<String>>,
@@ -483,7 +489,8 @@ pub struct VerificationRecord {
 impl VerificationRecord {
    /// Check if the record is recent enough to be considered valid,
    /// and the domain is allowed.
-    #[must_use] pub fn is_valid(&self, verified_users_settings: &VerifiedUsers) -> bool {
+    #[must_use]
+    pub fn is_valid(&self, verified_users_settings: &VerifiedUsers) -> bool {
        //let settings = SETTINGS.read().unwrap();
        // how long a verification record is good for
        let nip05_expiration = &verified_users_settings.verify_expiration_duration;
--- a/src/notice.rs
+++ b/src/notice.rs
@@ -16,18 +16,20 @@ pub struct EventResult {
 pub enum Notice {
    Message(String),
    EventResult(EventResult),
-    AuthChallenge(String)
+    AuthChallenge(String),
 }

 impl EventResultStatus {
-    #[must_use] pub fn to_bool(&self) -> bool {
+    #[must_use]
+    pub fn to_bool(&self) -> bool {
        match self {
            Self::Duplicate | Self::Saved => true,
-            Self::Invalid |Self::Blocked | Self::RateLimited | Self::Error => false,
+            Self::Invalid | Self::Blocked | Self::RateLimited | Self::Error => false,
        }
    }

-    #[must_use] pub fn prefix(&self) -> &'static str {
+    #[must_use]
+    pub fn prefix(&self) -> &'static str {
        match self {
            Self::Saved => "saved",
            Self::Duplicate => "duplicate",
@@ -44,7 +46,8 @@ impl Notice {
    //    Notice::err_msg(format!("{}", err), id)
    //}

-    #[must_use] pub fn message(msg: String) -> Notice {
+    #[must_use]
+    pub fn message(msg: String) -> Notice {
        Notice::Message(msg)
    }

@@ -53,27 +56,33 @@ impl Notice {
        Notice::EventResult(EventResult { id, msg, status })
    }

-    #[must_use] pub fn invalid(id: String, msg: &str) -> Notice {
+    #[must_use]
+    pub fn invalid(id: String, msg: &str) -> Notice {
        Notice::prefixed(id, msg, EventResultStatus::Invalid)
    }

-    #[must_use] pub fn blocked(id: String, msg: &str) -> Notice {
+    #[must_use]
+    pub fn blocked(id: String, msg: &str) -> Notice {
        Notice::prefixed(id, msg, EventResultStatus::Blocked)
    }

-    #[must_use] pub fn rate_limited(id: String, msg: &str) -> Notice {
+    #[must_use]
+    pub fn rate_limited(id: String, msg: &str) -> Notice {
        Notice::prefixed(id, msg, EventResultStatus::RateLimited)
    }

-    #[must_use] pub fn duplicate(id: String) -> Notice {
+    #[must_use]
+    pub fn duplicate(id: String) -> Notice {
        Notice::prefixed(id, "", EventResultStatus::Duplicate)
    }

-    #[must_use] pub fn error(id: String, msg: &str) -> Notice {
+    #[must_use]
+    pub fn error(id: String, msg: &str) -> Notice {
        Notice::prefixed(id, msg, EventResultStatus::Error)
    }

-    #[must_use] pub fn saved(id: String) -> Notice {
+    #[must_use]
+    pub fn saved(id: String) -> Notice {
        Notice::EventResult(EventResult {
            id,
            msg: "".into(),
--- a/src/payment/lnbits.rs
+++ b/src/payment/lnbits.rs
@@ -0,0 +1,173 @@
+//! LNBits payment processor
+use http::Uri;
+use hyper::client::connect::HttpConnector;
+use hyper::Client;
+use hyper_tls::HttpsConnector;
+use nostr::Keys;
+use serde::{Deserialize, Serialize};
+
+use async_trait::async_trait;
+use rand::Rng;
+use tracing::debug;
+
+use std::str::FromStr;
+use url::Url;
+
+use crate::{config::Settings, error::Error};
+
+use super::{InvoiceInfo, InvoiceStatus, PaymentProcessor};
+
+const APIPATH: &str = "/api/v1/payments/";
+
+/// Info LNBits expects in create invoice request
+#[derive(Serialize, Deserialize, Debug)]
+pub struct LNBitsCreateInvoice {
+    out: bool,
+    amount: u64,
+    memo: String,
+    webhook: String,
+    unit: String,
+    internal: bool,
+    expiry: u64,
+}
+
+/// Invoice response for LN bits
+#[derive(Debug, Serialize, Deserialize)]
+pub struct LNBitsCreateInvoiceResponse {
+    payment_hash: String,
+    payment_request: String,
+}
+
+/// LNBits call back response
+/// Used when an invoice is paid
+/// lnbits to post the status change to relay
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct LNBitsCallback {
+    pub checking_id: String,
+    pub pending: bool,
+    pub amount: u64,
+    pub memo: String,
+    pub time: u64,
+    pub bolt11: String,
+    pub preimage: String,
+    pub payment_hash: String,
+    pub wallet_id: String,
+    pub webhook: String,
+    pub webhook_status: Option<String>,
+}
+
+/// LN Bits repose for check invoice endpoint
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct LNBitsCheckInvoiceResponse {
+    paid: bool,
+}
+
+#[derive(Clone)]
+pub struct LNBitsPaymentProcessor {
+    /// HTTP client
+    client: hyper::Client<HttpsConnector<HttpConnector>, hyper::Body>,
+    settings: Settings,
+}
+
+impl LNBitsPaymentProcessor {
+    pub fn new(settings: &Settings) -> Self {
+        // setup hyper client
+        let https = HttpsConnector::new();
+        let client = Client::builder().build::<_, hyper::Body>(https);
+
+        Self {
+            client,
+            settings: settings.clone(),
+        }
+    }
+}
+
+#[async_trait]
+impl PaymentProcessor for LNBitsPaymentProcessor {
+    /// Calls LNBits api to ger new invoice
+    async fn get_invoice(&self, key: &Keys, amount: u64) -> Result<InvoiceInfo, Error> {
+        let random_number: u16 = rand::thread_rng().gen();
+        let memo = format!("{}: {}", random_number, key.public_key());
+
+        let callback_url = Url::parse(
+            &self
+                .settings
+                .info
+                .relay_url
+                .clone()
+                .unwrap()
+                .replace("ws", "http"),
+        )?
+        .join("lnbits")?;
+
+        let body = LNBitsCreateInvoice {
+            out: false,
+            amount,
+            memo: memo.clone(),
+            webhook: callback_url.to_string(),
+            unit: "sat".to_string(),
+            internal: false,
+            expiry: 3600,
+        };
+        let url = Url::parse(&self.settings.pay_to_relay.node_url)?.join(APIPATH)?;
+        let uri = Uri::from_str(url.as_str().strip_suffix("/").unwrap_or(url.as_str())).unwrap();
+        debug!("{uri}");
+
+        let req = hyper::Request::builder()
+            .method(hyper::Method::POST)
+            .uri(uri)
+            .header("X-Api-Key", &self.settings.pay_to_relay.api_secret)
+            .body(hyper::Body::from(serde_json::to_string(&body)?))
+            .expect("request builder");
+
+        let res = self.client.request(req).await?;
+
+        debug!("{res:?}");
+
+        // Json to Struct of LNbits callback
+        let body = hyper::body::to_bytes(res.into_body()).await?;
+        let invoice_response: LNBitsCreateInvoiceResponse = serde_json::from_slice(&body)?;
+
+        debug!("{:?}", invoice_response);
+
+        Ok(InvoiceInfo {
+            pubkey: key.public_key().to_string(),
+            payment_hash: invoice_response.payment_hash,
+            bolt11: invoice_response.payment_request,
+            amount,
+            memo,
+            status: InvoiceStatus::Unpaid,
+            confirmed_at: None,
+        })
+    }
+
+    /// Calls LNBits Api to check the payment status of invoice
+    async fn check_invoice(&self, payment_hash: &str) -> Result<InvoiceStatus, Error> {
+        let url = Url::parse(&self.settings.pay_to_relay.node_url)?
+            .join(APIPATH)?
+            .join(payment_hash)?;
+        let uri = Uri::from_str(url.as_str()).unwrap();
+        debug!("{uri}");
+
+        let req = hyper::Request::builder()
+            .method(hyper::Method::GET)
+            .uri(uri)
+            .header("X-Api-Key", &self.settings.pay_to_relay.api_secret)
+            .body(hyper::Body::empty())
+            .expect("request builder");
+
+        let res = self.client.request(req).await?;
+        // Json to Struct of LNbits callback
+        let body = hyper::body::to_bytes(res.into_body()).await?;
+        debug!("check invoice: {body:?}");
+        let invoice_response: LNBitsCheckInvoiceResponse = serde_json::from_slice(&body)?;
+
+        let status = if invoice_response.paid {
+            InvoiceStatus::Paid
+        } else {
+            InvoiceStatus::Unpaid
+        };
+
+        Ok(status)
+    }
+}
--- a/src/payment/mod.rs
+++ b/src/payment/mod.rs
@@ -0,0 +1,261 @@
+use crate::error::{Error, Result};
+use crate::event::Event;
+use crate::payment::lnbits::LNBitsPaymentProcessor;
+use crate::repo::NostrRepo;
+use serde::{Deserialize, Serialize};
+use std::sync::Arc;
+use tracing::{info, warn};
+
+use async_trait::async_trait;
+use nostr::key::{FromPkStr, FromSkStr};
+use nostr::{key::Keys, Event as NostrEvent, EventBuilder};
+
+pub mod lnbits;
+
+/// Payment handler
+pub struct Payment {
+    /// Repository for saving/retrieving events and events
+    repo: Arc<dyn NostrRepo>,
+    /// Newly validated events get written and then broadcast on this channel to subscribers
+    event_tx: tokio::sync::broadcast::Sender<Event>,
+    /// Payment message sender
+    payment_tx: tokio::sync::broadcast::Sender<PaymentMessage>,
+    /// Payment message receiver
+    payment_rx: tokio::sync::broadcast::Receiver<PaymentMessage>,
+    /// Settings
+    settings: crate::config::Settings,
+    // Nostr Keys
+    nostr_keys: Keys,
+    /// Payment Processor
+    processor: Arc<dyn PaymentProcessor>,
+}
+
+#[async_trait]
+pub trait PaymentProcessor: Send + Sync {
+    /// Get invoice from processor
+    async fn get_invoice(&self, keys: &Keys, amount: u64) -> Result<InvoiceInfo, Error>;
+    /// Check payment status of an invoice
+    async fn check_invoice(&self, payment_hash: &str) -> Result<InvoiceStatus, Error>;
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
+pub enum Processor {
+    LNBits,
+}
+
+/// Possible states of an invoice
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, sqlx::Type)]
+#[sqlx(type_name = "status")]
+pub enum InvoiceStatus {
+    Unpaid,
+    Paid,
+    Expired,
+}
+
+impl ToString for InvoiceStatus {
+    fn to_string(&self) -> String {
+        match self {
+            InvoiceStatus::Paid => "Paid".to_string(),
+            InvoiceStatus::Unpaid => "Unpaid".to_string(),
+            InvoiceStatus::Expired => "Expired".to_string(),
+        }
+    }
+}
+
+/// Invoice information
+#[derive(Debug, Clone)]
+pub struct InvoiceInfo {
+    pub pubkey: String,
+    pub payment_hash: String,
+    pub bolt11: String,
+    pub amount: u64,
+    pub status: InvoiceStatus,
+    pub memo: String,
+    pub confirmed_at: Option<u64>,
+}
+
+/// Message variants for the payment channel
+#[derive(Debug, Clone)]
+pub enum PaymentMessage {
+    /// New account
+    NewAccount(String),
+    /// Check account,
+    CheckAccount(String),
+    /// Account Admitted
+    AccountAdmitted(String),
+    /// Invoice generated
+    Invoice(String, InvoiceInfo),
+    /// Invoice call back
+    /// Payment hash is passed
+    // This may have to be changed to better support other processors
+    InvoicePaid(String),
+}
+
+impl Payment {
+    pub fn new(
+        repo: Arc<dyn NostrRepo>,
+        payment_tx: tokio::sync::broadcast::Sender<PaymentMessage>,
+        payment_rx: tokio::sync::broadcast::Receiver<PaymentMessage>,
+        event_tx: tokio::sync::broadcast::Sender<Event>,
+        settings: crate::config::Settings,
+    ) -> Result<Self> {
+        info!("Create payment handler");
+
+        // Create nostr key from sk string
+        let nostr_keys = Keys::from_sk_str(&settings.pay_to_relay.secret_key)?;
+
+        // Create processor kind defined in settings
+        let processor = match &settings.pay_to_relay.processor {
+            Processor::LNBits => Arc::new(LNBitsPaymentProcessor::new(&settings)),
+        };
+
+        Ok(Payment {
+            repo,
+            payment_tx,
+            payment_rx,
+            event_tx,
+            settings,
+            nostr_keys,
+            processor,
+        })
+    }
+
+    /// Perform Payment tasks
+    pub async fn run(&mut self) {
+        loop {
+            let res = self.run_internal().await;
+            if let Err(e) = res {
+                info!("error in payment: {:?}", e);
+            }
+        }
+    }
+
+    /// Internal select loop for preforming payment operatons
+    async fn run_internal(&mut self) -> Result<()> {
+        tokio::select! {
+            m = self.payment_rx.recv() => {
+                match m {
+                    Ok(PaymentMessage::NewAccount(pubkey)) => {
+                        info!("payment event for {:?}", pubkey);
+                        // REVIEW: This will need to change for cost per event
+                        let amount = self.settings.pay_to_relay.admission_cost;
+                        let invoice_info = self.get_invoice_info(&pubkey, amount).await?;
+                        // TODO: should handle this error
+                        self.payment_tx.send(PaymentMessage::Invoice(pubkey, invoice_info)).ok();
+                    },
+                    // Gets the most recent unpaid invoice from database
+                    // Checks LNbits to verify if paid/unpaid
+                    Ok(PaymentMessage::CheckAccount(pubkey)) => {
+                        let keys = Keys::from_pk_str(&pubkey)?;
+
+                        if let Some(invoice_info) = self.repo.get_unpaid_invoice(&keys).await? {
+                            match self.check_invoice_status(&invoice_info.payment_hash).await? {
+                                InvoiceStatus::Paid => {
+                                    self.repo.admit_account(&keys, self.settings.pay_to_relay.admission_cost).await?;
+                                    self.payment_tx.send(PaymentMessage::AccountAdmitted(pubkey)).ok();
+                                }
+                                _ => {
+                                    self.payment_tx.send(PaymentMessage::Invoice(pubkey, invoice_info)).ok();
+                                }
+                            }
+                        }
+                    }
+                    Ok(PaymentMessage::InvoicePaid(payment_hash)) => {
+                        if self.check_invoice_status(&payment_hash).await?.eq(&InvoiceStatus::Paid) {
+                            let pubkey = self.repo
+                                .update_invoice(&payment_hash, InvoiceStatus::Paid)
+                                .await?;
+
+                            let key = Keys::from_pk_str(&pubkey)?;
+                            self.repo.admit_account(&key, self.settings.pay_to_relay.admission_cost).await?;
+                        }
+                    }
+                    Ok(_) => {
+                        // For this variant nothing need to be done here
+                        // it is used by `server`
+                    }
+                    Err(err) => warn!("Payment RX: {err}")
+                }
+            }
+        }
+
+        Ok(())
+    }
+
+    /// Sends Nostr DM to pubkey that requested invoice
+    /// Two events the terms followed by the bolt11 invoice
+    pub async fn send_admission_message(
+        &self,
+        pubkey: &str,
+        invoice_info: &InvoiceInfo,
+    ) -> Result<()> {
+        // Create Nostr key from pk
+        let key = Keys::from_pk_str(pubkey)?;
+
+        let pubkey = key.public_key();
+
+        // Event DM with terms of service
+        let message_event: NostrEvent = EventBuilder::new_encrypted_direct_msg(
+            &self.nostr_keys,
+            pubkey,
+            &self.settings.pay_to_relay.terms_message,
+        )?
+        .to_event(&self.nostr_keys)?;
+
+        // Event DM with invoice
+        let invoice_event: NostrEvent =
+            EventBuilder::new_encrypted_direct_msg(&self.nostr_keys, pubkey, &invoice_info.bolt11)?
+                .to_event(&self.nostr_keys)?;
+
+        // Persist DM events to DB
+        self.repo.write_event(&message_event.clone().into()).await?;
+        self.repo.write_event(&invoice_event.clone().into()).await?;
+
+        // Broadcast DM events
+        self.event_tx.send(message_event.clone().into()).ok();
+        self.event_tx.send(invoice_event.clone().into()).ok();
+
+        Ok(())
+    }
+
+    /// Get Invoice Info
+    /// If the has an active invoice that will be return
+    /// Otherwise a new invoice will be generated by the payment processor
+    pub async fn get_invoice_info(&self, pubkey: &str, amount: u64) -> Result<InvoiceInfo> {
+        // If user is already in DB this will be false
+        // This avoids recreating admission invoices
+        // I think it will continue to send DMs with the invoice
+        // If client continues to try and write to the relay (will be same invoice)
+        let key = Keys::from_pk_str(pubkey)?;
+        if !self.repo.create_account(&key).await? {
+            if let Ok(Some(invoice_info)) = self.repo.get_unpaid_invoice(&key).await {
+                return Ok(invoice_info);
+            }
+        }
+
+        let key = Keys::from_pk_str(pubkey)?;
+
+        let invoice_info = self.processor.get_invoice(&key, amount).await?;
+
+        // Persist invoice to DB
+        self.repo
+            .create_invoice_record(&key, invoice_info.clone())
+            .await?;
+
+        // Admission event invoice and terms to pubkey that is joining
+        self.send_admission_message(pubkey, &invoice_info).await?;
+
+        Ok(invoice_info)
+    }
+
+    /// Check paid status of invoice with LNbits
+    pub async fn check_invoice_status(&self, payment_hash: &str) -> Result<InvoiceStatus, Error> {
+        // Check base if passed expiry time
+        let status = self.processor.check_invoice(payment_hash).await?;
+        self.repo
+            .update_invoice(payment_hash, status.clone())
+            .await?;
+
+        Ok(status)
+    }
+}
--- a/src/repo/mod.rs
+++ b/src/repo/mod.rs
@@ -2,15 +2,17 @@ use crate::db::QueryResult;
 use crate::error::Result;
 use crate::event::Event;
 use crate::nip05::VerificationRecord;
+use crate::payment::{InvoiceInfo, InvoiceStatus};
 use crate::subscription::Subscription;
 use crate::utils::unix_time;
 use async_trait::async_trait;
+use nostr::Keys;
 use rand::Rng;

-pub mod sqlite;
-pub mod sqlite_migration;
 pub mod postgres;
 pub mod postgres_migration;
+pub mod sqlite;
+pub mod sqlite_migration;

 #[async_trait]
 pub trait NostrRepo: Send + Sync {
@@ -57,6 +59,33 @@ pub trait NostrRepo: Send + Sync {

    /// Get oldest verification before timestamp
    async fn get_oldest_user_verification(&self, before: u64) -> Result<VerificationRecord>;
+
+    /// Create a new account
+    async fn create_account(&self, pubkey: &Keys) -> Result<bool>;
+
+    /// Admit an account
+    async fn admit_account(&self, pubkey: &Keys, admission_cost: u64) -> Result<()>;
+
+    /// Gets user balance if they are an admitted pubkey
+    async fn get_account_balance(&self, pubkey: &Keys) -> Result<(bool, u64)>;
+
+    /// Update account balance
+    async fn update_account_balance(
+        &self,
+        pub_key: &Keys,
+        positive: bool,
+        new_balance: u64,
+    ) -> Result<()>;
+
+    /// Create invoice record
+    async fn create_invoice_record(&self, pubkey: &Keys, invoice_info: InvoiceInfo) -> Result<()>;
+
+    /// Update Invoice for given payment hash
+    async fn update_invoice(&self, payment_hash: &str, status: InvoiceStatus) -> Result<String>;
+
+    /// Get the most recent invoice for a given pubkey
+    /// invoice must be unpaid and not expired
+    async fn get_unpaid_invoice(&self, pubkey: &Keys) -> Result<Option<InvoiceInfo>>;
 }

 // Current time, with a slight forward jitter in seconds
--- a/src/repo/postgres.rs
+++ b/src/repo/postgres.rs
@@ -2,25 +2,27 @@ use crate::db::QueryResult;
 use crate::error::Result;
 use crate::event::{single_char_tagname, Event};
 use crate::nip05::{Nip05Name, VerificationRecord};
+use crate::payment::{InvoiceInfo, InvoiceStatus};
 use crate::repo::{now_jitter, NostrRepo};
 use crate::subscription::{ReqFilter, Subscription};
 use async_std::stream::StreamExt;
 use async_trait::async_trait;
 use chrono::{DateTime, TimeZone, Utc};
 use sqlx::postgres::PgRow;
+use sqlx::Error::RowNotFound;
 use sqlx::{Error, Execute, FromRow, Postgres, QueryBuilder, Row};
 use std::time::{Duration, Instant};
-use sqlx::Error::RowNotFound;

+use crate::error;
 use crate::hexrange::{hex_range, HexSearch};
 use crate::repo::postgres_migration::run_migrations;
 use crate::server::NostrMetrics;
-use crate::utils::{is_hex, is_lower_hex, self};
+use crate::utils::{self, is_hex, is_lower_hex};
+use nostr::key::Keys;
 use tokio::sync::mpsc::Sender;
 use tokio::sync::oneshot::Receiver;
 use tracing::log::trace;
-use tracing::{debug, error, warn, info};
-use crate::error;
+use tracing::{debug, error, info, warn};

 pub type PostgresPool = sqlx::pool::Pool<Postgres>;

@@ -36,10 +38,8 @@ impl PostgresRepo {
            metrics: m,
        }
    }
-
 }

-
 /// Cleanup expired events on a regular basis
 async fn cleanup_expired(conn: PostgresPool, frequency: Duration) -> Result<()> {
    tokio::task::spawn(async move {
@@ -66,23 +66,23 @@ async fn cleanup_expired(conn: PostgresPool, frequency: Duration) -> Result<()>
 }

 /// One-time deletion of all expired events
-async fn delete_expired(conn:PostgresPool) -> Result<u64> {
+async fn delete_expired(conn: PostgresPool) -> Result<u64> {
    let mut tx = conn.begin().await?;
    let update_count = sqlx::query("DELETE FROM \"event\" WHERE expires_at <= $1;")
        .bind(Utc.timestamp_opt(utils::unix_time() as i64, 0).unwrap())
        .execute(&mut tx)
-        .await?.rows_affected();
+        .await?
+        .rows_affected();
    tx.commit().await?;
    Ok(update_count)
 }

 #[async_trait]
 impl NostrRepo for PostgresRepo {
-
    async fn start(&self) -> Result<()> {
        // begin a cleanup task for expired events.
        cleanup_expired(self.conn.clone(), Duration::from_secs(600)).await?;
-	Ok(())
+        Ok(())
    }

    async fn migrate_up(&self) -> Result<usize> {
@@ -116,7 +116,7 @@ impl NostrRepo for PostgresRepo {
            }
        }
        if let Some(d_tag) = e.distinct_param() {
-            let repl_count:i64 = if is_lower_hex(&d_tag) && (d_tag.len() % 2 == 0) {
+            let repl_count: i64 = if is_lower_hex(&d_tag) && (d_tag.len() % 2 == 0) {
                sqlx::query_scalar(
                    "SELECT count(*) AS count FROM event e LEFT JOIN tag t ON e.id=t.event_id WHERE e.pub_key=$1 AND e.kind=$2 AND t.name='d' AND t.value_hex=$3 AND e.created_at >= $4 LIMIT 1;")
                    .bind(hex::decode(&e.pubkey).ok())
@@ -139,7 +139,7 @@ impl NostrRepo for PostgresRepo {
            // the same author/kind/tag value exist, and we can ignore
            // this event.
            if repl_count > 0 {
-                return Ok(0)
+                return Ok(0);
            }
        }
        // ignore if the event hash is a duplicate.
@@ -149,16 +149,19 @@ impl NostrRepo for PostgresRepo {
 VALUES($1, $2, $3, $4, $5, $6, $7)
 ON CONFLICT (id) DO NOTHING"#,
        )
-            .bind(&id_blob)
-            .bind(&pubkey_blob)
-            .bind(Utc.timestamp_opt(e.created_at as i64, 0).unwrap())
-            .bind(e.expiration().and_then(|x| Utc.timestamp_opt(x as i64, 0).latest()))
-            .bind(e.kind as i64)
-            .bind(event_str.into_bytes())
-            .bind(delegator_blob)
-            .execute(&mut tx)
-            .await?
-            .rows_affected();
+        .bind(&id_blob)
+        .bind(&pubkey_blob)
+        .bind(Utc.timestamp_opt(e.created_at as i64, 0).unwrap())
+        .bind(
+            e.expiration()
+                .and_then(|x| Utc.timestamp_opt(x as i64, 0).latest()),
+        )
+        .bind(e.kind as i64)
+        .bind(event_str.into_bytes())
+        .bind(delegator_blob)
+        .execute(&mut tx)
+        .await?
+        .rows_affected();

        if ins_count == 0 {
            // if the event was a duplicate, no need to insert event or
@@ -184,7 +187,8 @@ ON CONFLICT (id) DO NOTHING"#,
                                .bind(tag_name)
                                .bind(hex::decode(tag_val).ok())
                                .execute(&mut tx)
-                                .await?;
+                                .await
+                                .unwrap();
                        } else {
                            sqlx::query("INSERT INTO tag (event_id, \"name\", value, value_hex) VALUES($1, $2, $3, NULL) \
                    ON CONFLICT (event_id, \"name\", value, value_hex) DO NOTHING")
@@ -192,7 +196,8 @@ ON CONFLICT (id) DO NOTHING"#,
                                .bind(tag_name)
                                .bind(tag_val.as_bytes())
                                .execute(&mut tx)
-                                .await?;
+                                .await
+                                .unwrap();
                        }
                    }
                    None => {}
@@ -276,10 +281,10 @@ ON CONFLICT (id) DO NOTHING"#,
            LEFT JOIN tag t ON e.id = t.event_id \
            WHERE e.pub_key = $1 AND t.\"name\" = 'e' AND e.kind = 5 AND t.value = $2 LIMIT 1",
            )
-                .bind(&pubkey_blob)
-                .bind(&id_blob)
-                .fetch_optional(&mut tx)
-                .await?;
+            .bind(&pubkey_blob)
+            .bind(&id_blob)
+            .fetch_optional(&mut tx)
+            .await?;

            // check if a the query returned a result, meaning we should
            // hid the current event
@@ -380,7 +385,10 @@ ON CONFLICT (id) DO NOTHING"#,

                // check if this is still active; every 100 rows
                if row_count % 100 == 0 && abandon_query_rx.try_recv().is_ok() {
-                    debug!("query cancelled by client (cid: {}, sub: {:?})", client_id, sub.id);
+                    debug!(
+                        "query cancelled by client (cid: {}, sub: {:?})",
+                        client_id, sub.id
+                    );
                    return Ok(());
                }

@@ -396,7 +404,10 @@ ON CONFLICT (id) DO NOTHING"#,
                        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");
-                            metrics.query_aborts.with_label_values(&["slowclient"]).inc();
+                            metrics
+                                .query_aborts
+                                .with_label_values(&["slowclient"])
+                                .inc();
                            return Ok(());
                        }
                        // give the queue a chance to clear before trying again
@@ -467,9 +478,7 @@ ON CONFLICT (id) DO NOTHING"#,
        let verify_time = now_jitter(600);

        // update verification time and reset any failure count
-        sqlx::query(
-            "UPDATE user_verification SET verified_at = $1, fail_count = 0 WHERE id = $2",
-        )
+        sqlx::query("UPDATE user_verification SET verified_at = $1, fail_count = 0 WHERE id = $2")
            .bind(Utc.timestamp_opt(verify_time as i64, 0).unwrap())
            .bind(id as i64)
            .execute(&self.conn)
@@ -539,6 +548,172 @@ ON CONFLICT (id) DO NOTHING"#,
            .await?
            .ok_or(error::Error::SqlxError(RowNotFound))
    }
+
+    async fn create_account(&self, pub_key: &Keys) -> Result<bool> {
+        let pub_key = pub_key.public_key().to_string();
+        let mut tx = self.conn.begin().await?;
+
+        let result = sqlx::query("INSERT INTO account (pubkey, balance) VALUES ($1, 0);")
+            .bind(pub_key)
+            .execute(&mut tx)
+            .await;
+
+        let success = match result {
+            Ok(res) => {
+                tx.commit().await?;
+                res.rows_affected() == 1
+            }
+            Err(_err) => false,
+        };
+
+        Ok(success)
+    }
+
+    /// Admit account
+    async fn admit_account(&self, pub_key: &Keys, admission_cost: u64) -> Result<()> {
+        let pub_key = pub_key.public_key().to_string();
+        sqlx::query(
+            "UPDATE account SET is_admitted = TRUE, balance = balance - $1 WHERE pubkey = $2",
+        )
+        .bind(admission_cost as i64)
+        .bind(pub_key)
+        .execute(&self.conn)
+        .await?;
+        Ok(())
+    }
+
+    /// Gets if the account is admitted and balance
+    async fn get_account_balance(&self, pub_key: &Keys) -> Result<(bool, u64)> {
+        let pub_key = pub_key.public_key().to_string();
+        let query = r#"SELECT
+            is_admitted,
+            balance
+            FROM account
+            WHERE pubkey = $1
+            LIMIT 1"#;
+
+        let result = sqlx::query_as::<_, (bool, i64)>(query)
+            .bind(pub_key)
+            .fetch_optional(&self.conn)
+            .await?
+            .ok_or(error::Error::SqlxError(RowNotFound))?;
+
+        Ok((result.0, result.1 as u64))
+    }
+
+    /// Update account balance
+    async fn update_account_balance(
+        &self,
+        pub_key: &Keys,
+        positive: bool,
+        new_balance: u64,
+    ) -> Result<()> {
+        let pub_key = pub_key.public_key().to_string();
+        match positive {
+            true => {
+                sqlx::query("UPDATE account SET balance = balance + $1 WHERE pubkey = $2")
+                    .bind(new_balance as i64)
+                    .bind(pub_key)
+                    .execute(&self.conn)
+                    .await?
+            }
+            false => {
+                sqlx::query("UPDATE account SET balance = balance - $1 WHERE pubkey = $2")
+                    .bind(new_balance as i64)
+                    .bind(pub_key)
+                    .execute(&self.conn)
+                    .await?
+            }
+        };
+        Ok(())
+    }
+
+    /// Create invoice record
+    async fn create_invoice_record(&self, pub_key: &Keys, invoice_info: InvoiceInfo) -> Result<()> {
+        let pub_key = pub_key.public_key().to_string();
+        let mut tx = self.conn.begin().await?;
+
+        sqlx::query(
+            "INSERT INTO invoice (pubkey, payment_hash, amount, status, description, created_at, invoice) VALUES ($1, $2, $3, $4, $5, now(), $6)",
+        )
+        .bind(pub_key)
+        .bind(invoice_info.payment_hash)
+        .bind(invoice_info.amount as i64)
+        .bind(invoice_info.status)
+        .bind(invoice_info.memo)
+        .bind(invoice_info.bolt11)
+        .execute(&mut tx)
+        .await.unwrap();
+
+        debug!("Invoice added");
+
+        tx.commit().await?;
+        Ok(())
+    }
+
+    /// Update invoice record
+    async fn update_invoice(&self, payment_hash: &str, status: InvoiceStatus) -> Result<String> {
+        debug!("Payment Hash: {}", payment_hash);
+        let query = "SELECT pubkey, status, amount FROM invoice WHERE payment_hash=$1;";
+        let (pubkey, prev_invoice_status, amount) =
+            sqlx::query_as::<_, (String, InvoiceStatus, i64)>(query)
+                .bind(payment_hash)
+                .fetch_optional(&self.conn)
+                .await?
+                .ok_or(error::Error::SqlxError(RowNotFound))?;
+
+        // If the invoice is paid update the confirmed at timestamp
+        let query = if status.eq(&InvoiceStatus::Paid) {
+            "UPDATE invoice SET status=$1, confirmed_at = now() WHERE payment_hash=$2;"
+        } else {
+            "UPDATE invoice SET status=$1 WHERE payment_hash=$2;"
+        };
+
+        sqlx::query(query)
+            .bind(&status)
+            .bind(payment_hash)
+            .execute(&self.conn)
+            .await?;
+
+        if prev_invoice_status.eq(&InvoiceStatus::Unpaid) && status.eq(&InvoiceStatus::Paid) {
+            sqlx::query("UPDATE account SET balance = balance + $1 WHERE pubkey = $2")
+                .bind(amount)
+                .bind(&pubkey)
+                .execute(&self.conn)
+                .await?;
+        }
+
+        Ok(pubkey)
+    }
+
+    /// Get the most recent invoice for a given pubkey
+    /// invoice must be unpaid and not expired
+    async fn get_unpaid_invoice(&self, pubkey: &Keys) -> Result<Option<InvoiceInfo>> {
+        let query = r#"
+SELECT amount, payment_hash, description, invoice
+FROM invoice
+WHERE pubkey = $1
+ORDER BY created_at DESC
+LIMIT 1;
+        "#;
+        match sqlx::query_as::<_, (i64, String, String, String)>(query)
+            .bind(pubkey.public_key().to_string())
+            .fetch_optional(&self.conn)
+            .await
+            .unwrap()
+        {
+            Some((amount, payment_hash, description, invoice)) => Ok(Some(InvoiceInfo {
+                pubkey: pubkey.public_key().to_string(),
+                payment_hash,
+                bolt11: invoice,
+                amount: amount as u64,
+                status: InvoiceStatus::Unpaid,
+                memo: description,
+                confirmed_at: None,
+            })),
+            None => Ok(None),
+        }
+    }
 }

 /// Create a dynamic SQL query and params from a subscription filter.
@@ -751,7 +926,8 @@ fn query_from_filter(f: &ReqFilter) -> Option<QueryBuilder<Postgres>> {
    // never display expired events
    query
        .push(" AND (e.expires_at IS NULL OR e.expires_at > ")
-        .push_bind(Utc.timestamp_opt(utils::unix_time() as i64, 0).unwrap()).push(")");
+        .push_bind(Utc.timestamp_opt(utils::unix_time() as i64, 0).unwrap())
+        .push(")");

    // Apply per-filter limit to this query.
    // The use of a LIMIT implies a DESC order, to capture only the most recent events.
@@ -767,15 +943,17 @@ fn query_from_filter(f: &ReqFilter) -> Option<QueryBuilder<Postgres>> {

 impl FromRow<'_, PgRow> for VerificationRecord {
    fn from_row(row: &'_ PgRow) -> std::result::Result<Self, Error> {
-        let name =
-            Nip05Name::try_from(row.get::<'_, &str, &str>("name")).or(Err(RowNotFound))?;
+        let name = Nip05Name::try_from(row.get::<'_, &str, &str>("name")).or(Err(RowNotFound))?;
        Ok(VerificationRecord {
            rowid: row.get::<'_, i64, &str>("id") as u64,
            name,
            address: hex::encode(row.get::<'_, Vec<u8>, &str>("pub_key")),
            event: hex::encode(row.get::<'_, Vec<u8>, &str>("event_id")),
            event_created: row.get::<'_, DateTime<Utc>, &str>("created_at").timestamp() as u64,
-            last_success: None,
+            last_success: match row.try_get::<'_, DateTime<Utc>, &str>("verified_at") {
+                Ok(x) => Some(x.timestamp() as u64),
+                _ => None,
+            },
            last_failure: match row.try_get::<'_, DateTime<Utc>, &str>("failed_at") {
                Ok(x) => Some(x.timestamp() as u64),
                _ => None,
--- a/src/repo/postgres_migration.rs
+++ b/src/repo/postgres_migration.rs
@@ -36,6 +36,7 @@ pub async fn run_migrations(db: &PostgresPool) -> crate::error::Result<usize> {
    }
    run_migration(m003::migration(), db).await;
    run_migration(m004::migration(), db).await;
+    run_migration(m005::migration(), db).await;
    Ok(current_version(db).await as usize)
 }

@@ -277,3 +278,43 @@ CREATE INDEX event_expires_at_idx ON "event" (expires_at);
        }
    }
 }
+
+mod m005 {
+    use crate::repo::postgres_migration::{Migration, SimpleSqlMigration};
+
+    pub const VERSION: i64 = 5;
+
+    pub fn migration() -> impl Migration {
+        SimpleSqlMigration {
+            serial_number: VERSION,
+            sql: vec![
+                r#"
+-- Create account table
+CREATE TABLE "account" (
+    pubkey varchar NOT NULL,
+    is_admitted BOOLEAN NOT NULL DEFAULT FALSE,
+    balance BIGINT NOT NULL DEFAULT 0,
+    tos_accepted_at TIMESTAMP,
+    CONSTRAINT account_pkey PRIMARY KEY (pubkey)
+);
+
+CREATE TYPE status AS ENUM ('Paid', 'Unpaid', 'Expired');
+
+
+CREATE TABLE "invoice" (
+    payment_hash varchar NOT NULL,
+    pubkey varchar NOT NULL,
+    invoice varchar NOT NULL,
+    amount BIGINT NOT NULL,
+    status status NOT NULL DEFAULT 'Unpaid',
+    description varchar,
+    created_at timestamp,
+    confirmed_at timestamp,
+    CONSTRAINT invoice_payment_hash PRIMARY KEY (payment_hash),
+    CONSTRAINT invoice_pubkey_fkey FOREIGN KEY (pubkey) REFERENCES account (pubkey) ON DELETE CASCADE
+);
+        "#,
+            ],
+        }
+    }
+}
--- a/src/repo/sqlite.rs
+++ b/src/repo/sqlite.rs
@@ -1,34 +1,36 @@
 //! Event persistence and querying
 //use crate::config::SETTINGS;
 use crate::config::Settings;
-use crate::error::{Result,Error::SqlError};
+use crate::db::QueryResult;
+use crate::error::{Error::SqlError, Result};
 use crate::event::{single_char_tagname, Event};
 use crate::hexrange::hex_range;
 use crate::hexrange::HexSearch;
-use crate::repo::sqlite_migration::{STARTUP_SQL,upgrade_db};
-use crate::utils::{is_hex,unix_time};
 use crate::nip05::{Nip05Name, VerificationRecord};
-use crate::subscription::{ReqFilter, Subscription};
+use crate::payment::{InvoiceInfo, InvoiceStatus};
+use crate::repo::sqlite_migration::{upgrade_db, STARTUP_SQL};
 use crate::server::NostrMetrics;
+use crate::subscription::{ReqFilter, Subscription};
+use crate::utils::{is_hex, unix_time};
+use async_trait::async_trait;
 use hex;
 use r2d2;
 use r2d2_sqlite::SqliteConnectionManager;
 use rusqlite::params;
 use rusqlite::types::ToSql;
 use rusqlite::OpenFlags;
-use tokio::sync::{Mutex, MutexGuard, Semaphore};
 use std::fmt::Write as _;
 use std::path::Path;
 use std::sync::Arc;
 use std::thread;
 use std::time::Duration;
 use std::time::Instant;
+use tokio::sync::{Mutex, MutexGuard, Semaphore};
 use tokio::task;
 use tracing::{debug, info, trace, warn};
-use async_trait::async_trait;
-use crate::db::QueryResult;

 use crate::repo::{now_jitter, NostrRepo};
+use nostr::key::Keys;

 pub type SqlitePool = r2d2::Pool<r2d2_sqlite::SqliteConnectionManager>;
 pub type PooledConnection = r2d2::PooledConnection<r2d2_sqlite::SqliteConnectionManager>;
@@ -54,7 +56,8 @@ pub struct SqliteRepo {

 impl SqliteRepo {
    // build all the pools needed
-    #[must_use] pub fn new(settings: &Settings, metrics: NostrMetrics) -> SqliteRepo {
+    #[must_use]
+    pub fn new(settings: &Settings, metrics: NostrMetrics) -> SqliteRepo {
        let write_pool = build_pool(
            "writer",
            settings,
@@ -110,7 +113,8 @@ impl SqliteRepo {
        // get relevant fields from event and convert to blobs.
        let id_blob = hex::decode(&e.id).ok();
        let pubkey_blob: Option<Vec<u8>> = hex::decode(&e.pubkey).ok();
-        let delegator_blob: Option<Vec<u8>> = e.delegated_by.as_ref().and_then(|d| hex::decode(d).ok());
+        let delegator_blob: Option<Vec<u8>> =
+            e.delegated_by.as_ref().and_then(|d| hex::decode(d).ok());
        let event_str = serde_json::to_string(&e).ok();
        // check for replaceable events that would hide this one; we won't even attempt to insert these.
        if e.is_replaceable() {
@@ -130,7 +134,7 @@ impl SqliteRepo {
            // the same author/kind/tag value exist, and we can ignore
            // this event.
            if repl_count.ok().is_some() {
-                return Ok(0)
+                return Ok(0);
            }
        }
        // ignore if the event hash is a duplicate.
@@ -249,18 +253,26 @@ impl SqliteRepo {

 #[async_trait]
 impl NostrRepo for SqliteRepo {
-
    async fn start(&self) -> Result<()> {
-        db_checkpoint_task(self.maint_pool.clone(), Duration::from_secs(60), self.checkpoint_in_progress.clone()).await?;
-        cleanup_expired(self.maint_pool.clone(), Duration::from_secs(600), self.write_in_progress.clone()).await
+        db_checkpoint_task(
+            self.maint_pool.clone(),
+            Duration::from_secs(60),
+            self.write_in_progress.clone(),
+            self.checkpoint_in_progress.clone(),
+        )
+        .await?;
+        cleanup_expired(
+            self.maint_pool.clone(),
+            Duration::from_secs(600),
+            self.write_in_progress.clone(),
+        )
+        .await
    }

    async fn migrate_up(&self) -> Result<usize> {
        let _write_guard = self.write_in_progress.lock().await;
        let mut conn = self.write_pool.get()?;
-        task::spawn_blocking(move || {
-            upgrade_db(&mut conn)
-        }).await?
+        task::spawn_blocking(move || upgrade_db(&mut conn)).await?
    }
    /// Persist event to database
    async fn write_event(&self, e: &Event) -> Result<u64> {
@@ -277,24 +289,29 @@ impl NostrRepo for SqliteRepo {
            // this could fail because the database was busy; try
            // multiple times before giving up.
            loop {
-                attempts+=1;
+                attempts += 1;
                let wr = SqliteRepo::persist_event(&mut conn, &e);
                match wr {
-                    Err(SqlError(rusqlite::Error::SqliteFailure(e,_))) => {
+                    Err(SqlError(rusqlite::Error::SqliteFailure(e, _))) => {
                        // this basically means that NIP-05 or another
                        // writer was using the database between us
                        // reading and promoting the connection to a
                        // write lock.
-                        info!("event write failed, DB locked (attempt: {}); sqlite err: {}",
-                        attempts, e.extended_code);
-                    },
-                    _ => {return wr;},
+                        info!(
+                            "event write failed, DB locked (attempt: {}); sqlite err: {}",
+                            attempts, e.extended_code
+                        );
+                    }
+                    _ => {
+                        return wr;
+                    }
                }
                if attempts >= max_write_attempts {
                    return wr;
                }
            }
-        }).await?;
+        })
+        .await?;
        self.metrics
            .write_events
            .observe(start.elapsed().as_secs_f64());
@@ -319,9 +336,14 @@ impl NostrRepo for SqliteRepo {
        // thread pool waiting for queries to finish under high load.
        // Instead, don't bother spawning threads when they will just
        // block on a database connection.
-        let sem = self.reader_threads_ready.clone().acquire_owned().await.unwrap();
-        let self=self.clone();
-        let metrics=self.metrics.clone();
+        let sem = self
+            .reader_threads_ready
+            .clone()
+            .acquire_owned()
+            .await
+            .unwrap();
+        let self = self.clone();
+        let metrics = self.metrics.clone();
        task::spawn_blocking(move || {
            {
                // if we are waiting on a checkpoint, stop until it is complete
@@ -346,7 +368,10 @@ impl NostrRepo for SqliteRepo {
            }
            // check before getting a DB connection if the client still wants the results
            if abandon_query_rx.try_recv().is_ok() {
-                debug!("query cancelled by client (before execution) (cid: {}, sub: {:?})", client_id, sub.id);
+                debug!(
+                    "query cancelled by client (before execution) (cid: {}, sub: {:?})",
+                    client_id, sub.id
+                );
                return Ok(());
            }

@@ -359,7 +384,9 @@ impl NostrRepo for SqliteRepo {
            if let Ok(mut conn) = self.read_pool.get() {
                {
                    let pool_state = self.read_pool.state();
-                    metrics.db_connections.set((pool_state.connections - pool_state.idle_connections).into());
+                    metrics
+                        .db_connections
+                        .set((pool_state.connections - pool_state.idle_connections).into());
                }
                for filter in sub.filters.iter() {
                    let filter_start = Instant::now();
@@ -376,7 +403,7 @@ impl NostrRepo for SqliteRepo {
                    let mut last_successful_send = Instant::now();
                    // execute the query.
                    // make the actual SQL query (with parameters inserted) available
-                    conn.trace(Some(|x| {trace!("SQL trace: {:?}", x)}));
+                    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))?;

@@ -394,7 +421,10 @@ impl NostrRepo for SqliteRepo {
                            if slow_first_event && client_id.starts_with('0') {
                                debug!(
                                    "filter first result in {:?} (slow): {} (cid: {}, sub: {:?})",
-                                    first_event_elapsed, serde_json::to_string(&filter)?, client_id, sub.id
+                                    first_event_elapsed,
+                                    serde_json::to_string(&filter)?,
+                                    client_id,
+                                    sub.id
                                );
                            }
                            first_result = false;
@@ -404,8 +434,14 @@ impl NostrRepo for SqliteRepo {
                            {
                                if self.checkpoint_in_progress.try_lock().is_err() {
                                    // lock was held, abort this query
-                                    debug!("query aborted due to checkpoint (cid: {}, sub: {:?})", client_id, sub.id);
-                                    metrics.query_aborts.with_label_values(&["checkpoint"]).inc();
+                                    debug!(
+                                        "query aborted due to checkpoint (cid: {}, sub: {:?})",
+                                        client_id, sub.id
+                                    );
+                                    metrics
+                                        .query_aborts
+                                        .with_label_values(&["checkpoint"])
+                                        .inc();
                                    return Ok(());
                                }
                            }
@@ -413,7 +449,10 @@ impl NostrRepo for SqliteRepo {

                        // check if this is still active; every 100 rows
                        if row_count % 100 == 0 && abandon_query_rx.try_recv().is_ok() {
-                            debug!("query cancelled by client (cid: {}, sub: {:?})", client_id, sub.id);
+                            debug!(
+                                "query cancelled by client (cid: {}, sub: {:?})",
+                                client_id, sub.id
+                            );
                            return Ok(());
                        }
                        row_count += 1;
@@ -429,19 +468,31 @@ impl NostrRepo for SqliteRepo {
                                // the queue has been full for too long, abort
                                info!("aborting database query due to slow client (cid: {}, sub: {:?})",
                                      client_id, sub.id);
-                                metrics.query_aborts.with_label_values(&["slowclient"]).inc();
+                                metrics
+                                    .query_aborts
+                                    .with_label_values(&["slowclient"])
+                                    .inc();
                                let ok: Result<()> = Ok(());
                                return ok;
                            }
                            // check if a checkpoint is trying to run, and abort
                            if self.checkpoint_in_progress.try_lock().is_err() {
                                // lock was held, abort this query
-                                debug!("query aborted due to checkpoint (cid: {}, sub: {:?})", client_id, sub.id);
-                                metrics.query_aborts.with_label_values(&["checkpoint"]).inc();
+                                debug!(
+                                    "query aborted due to checkpoint (cid: {}, sub: {:?})",
+                                    client_id, sub.id
+                                );
+                                metrics
+                                    .query_aborts
+                                    .with_label_values(&["checkpoint"])
+                                    .inc();
                                return Ok(());
                            }
                            // give the queue a chance to clear before trying again
-                            debug!("query thread sleeping due to full query_tx (cid: {}, sub: {:?})", client_id, sub.id);
+                            debug!(
+                                "query thread sleeping due to full query_tx (cid: {}, sub: {:?})",
+                                client_id, sub.id
+                            );
                            thread::sleep(Duration::from_millis(500));
                        }
                        // TODO: we could use try_send, but we'd have to juggle
@@ -462,10 +513,12 @@ impl NostrRepo for SqliteRepo {
                    if filter_start.elapsed() > slow_cutoff && client_id.starts_with('0') {
                        debug!(
                            "query filter req (slow): {} (cid: {}, sub: {:?}, filter: {})",
-                            serde_json::to_string(&filter)?, client_id, sub.id, filter_count
+                            serde_json::to_string(&filter)?,
+                            client_id,
+                            sub.id,
+                            filter_count
                        );
                    }
-
                }
            } else {
                warn!("Could not get a database connection for querying");
@@ -501,7 +554,8 @@ impl NostrRepo for SqliteRepo {
            let start = Instant::now();
            conn.execute_batch("PRAGMA optimize;").ok();
            info!("optimize ran in {:?}", start.elapsed());
-        }).await?;
+        })
+        .await?;
        Ok(())
    }

@@ -510,6 +564,7 @@ impl NostrRepo for SqliteRepo {
        let e = hex::decode(event_id).ok();
        let n = name.to_owned();
        let mut conn = self.write_pool.get()?;
+        let _write_guard = self.write_in_progress.lock().await;
        tokio::task::spawn_blocking(move || {
            let tx = conn.transaction()?;
            {
@@ -537,6 +592,7 @@ impl NostrRepo for SqliteRepo {
    /// Update verification timestamp
    async fn update_verification_timestamp(&self, id: u64) -> Result<()> {
        let mut conn = self.write_pool.get()?;
+        let _write_guard = self.write_in_progress.lock().await;
        tokio::task::spawn_blocking(move || {
            // add some jitter to the verification to prevent everything from stacking up together.
            let verif_time = now_jitter(600);
@@ -552,13 +608,13 @@ impl NostrRepo for SqliteRepo {
            let ok: Result<()> = Ok(());
            ok
        })
-            .await?
-
+        .await?
    }

    /// Update verification record as failed
    async fn fail_verification(&self, id: u64) -> Result<()> {
        let mut conn = self.write_pool.get()?;
+        let _write_guard = self.write_in_progress.lock().await;
        tokio::task::spawn_blocking(move || {
            // add some jitter to the verification to prevent everything from stacking up together.
            let fail_time = now_jitter(600);
@@ -578,6 +634,7 @@ impl NostrRepo for SqliteRepo {
    /// Delete verification record
    async fn delete_verification(&self, id: u64) -> Result<()> {
        let mut conn = self.write_pool.get()?;
+        let _write_guard = self.write_in_progress.lock().await;
        tokio::task::spawn_blocking(move || {
            let tx = conn.transaction()?;
            {
@@ -589,7 +646,7 @@ impl NostrRepo for SqliteRepo {
            let ok: Result<()> = Ok(());
            ok
        })
-            .await?
+        .await?
    }

    /// Get the latest verification record for a given pubkey.
@@ -667,6 +724,209 @@ impl NostrRepo for SqliteRepo {
            Ok(vr)
        }).await?
    }
+
+    /// Create account
+    async fn create_account(&self, pub_key: &Keys) -> Result<bool> {
+        let pub_key = pub_key.public_key().to_string();
+
+        let mut conn = self.write_pool.get()?;
+        let ins_count =  tokio::task::spawn_blocking(move || {
+            let tx = conn.transaction()?;
+            let ins_count: u64;
+            {
+                // Ignore if user is already in db
+                let query = "INSERT OR IGNORE INTO account (pubkey, is_admitted, balance) VALUES (?1, ?2, ?3);";
+                let mut stmt = tx.prepare(query)?;
+                ins_count = stmt.execute(params![&pub_key, false, 0])? as u64;
+            }
+            tx.commit()?;
+            let ok: Result<u64> = Ok(ins_count);
+            ok
+        }).await??;
+
+        if ins_count != 1 {
+            return Ok(false);
+        }
+
+        Ok(true)
+    }
+
+    /// Admit account
+    async fn admit_account(&self, pub_key: &Keys, admission_cost: u64) -> Result<()> {
+        let pub_key = pub_key.public_key().to_string();
+        let mut conn = self.write_pool.get()?;
+        let pub_key = pub_key.to_owned();
+        tokio::task::spawn_blocking(move || {
+            let tx = conn.transaction()?;
+            {
+                let query = "UPDATE account SET is_admitted = TRUE, tos_accepted_at =  strftime('%s','now'), balance = balance - ?1 WHERE pubkey=?2;";
+                let mut stmt = tx.prepare(query)?;
+                stmt.execute(params![admission_cost, pub_key])?;
+            }
+            tx.commit()?;
+            let ok: Result<()> = Ok(());
+            ok
+        })
+            .await?
+    }
+
+    /// Gets if the account is admitted and balance
+    async fn get_account_balance(&self, pub_key: &Keys) -> Result<(bool, u64)> {
+        let pub_key = pub_key.public_key().to_string();
+        let mut conn = self.write_pool.get()?;
+        let pub_key = pub_key.to_owned();
+        tokio::task::spawn_blocking(move || {
+            let tx = conn.transaction()?;
+            let query = "SELECT is_admitted, balance FROM account WHERE pubkey = ?1;";
+            let mut stmt = tx.prepare_cached(query)?;
+            let fields = stmt.query_row(params![pub_key], |r| {
+                let is_admitted: bool = r.get(0)?;
+                let balance: u64 = r.get(1)?;
+                // create a tuple since we can't throw non-rusqlite errors in this closure
+                Ok((is_admitted, balance))
+            })?;
+            Ok(fields)
+        })
+        .await?
+    }
+
+    /// Update account balance
+    async fn update_account_balance(
+        &self,
+        pub_key: &Keys,
+        positive: bool,
+        new_balance: u64,
+    ) -> Result<()> {
+        let pub_key = pub_key.public_key().to_string();
+
+        let mut conn = self.write_pool.get()?;
+        tokio::task::spawn_blocking(move || {
+            let tx = conn.transaction()?;
+            {
+                let query = if positive {
+                    "UPDATE account SET balance=balance + ?1 WHERE pubkey=?2"
+                } else {
+                    "UPDATE account SET balance=balance - ?1 WHERE pubkey=?2"
+                };
+                let mut stmt = tx.prepare(query)?;
+                stmt.execute(params![new_balance, pub_key])?;
+            }
+            tx.commit()?;
+            let ok: Result<()> = Ok(());
+            ok
+        })
+        .await?
+    }
+
+    /// Create invoice record
+    async fn create_invoice_record(&self, pub_key: &Keys, invoice_info: InvoiceInfo) -> Result<()> {
+        let pub_key = pub_key.public_key().to_string();
+        let pub_key = pub_key.to_owned();
+        let mut conn = self.write_pool.get()?;
+        tokio::task::spawn_blocking(move || {
+            let tx = conn.transaction()?;
+            {
+                let query = "INSERT INTO invoice (pubkey, payment_hash, amount, status, description, created_at, invoice) VALUES (?1, ?2, ?3, ?4, ?5, strftime('%s','now'), ?6);";
+                let mut stmt = tx.prepare(query)?;
+                stmt.execute(params![&pub_key, invoice_info.payment_hash, invoice_info.amount, invoice_info.status.to_string(), invoice_info.memo, invoice_info.bolt11])?;
+            }
+            tx.commit()?;
+            let ok: Result<()> = Ok(());
+            ok
+        }).await??;
+
+        Ok(())
+    }
+
+    /// Update invoice record
+    async fn update_invoice(&self, payment_hash: &str, status: InvoiceStatus) -> Result<String> {
+        let mut conn = self.write_pool.get()?;
+        let payment_hash = payment_hash.to_owned();
+        let pub_key = tokio::task::spawn_blocking(move || {
+            let tx = conn.transaction()?;
+            let pubkey: String;
+            {
+
+                // Get required invoice info for given payment hash
+                let query = "SELECT pubkey, status, amount FROM invoice WHERE payment_hash=?1;";
+                let mut stmt = tx.prepare(query)?;
+                let (pub_key, prev_status, amount) = stmt.query_row(params![payment_hash], |r| {
+                    let pub_key: String = r.get(0)?;
+                    let status: String = r.get(1)?;
+                    let amount: u64 = r.get(2)?;
+
+
+                    Ok((pub_key, status, amount))
+
+                })?;
+
+                // If the invoice is paid update the confirmed_at timestamp
+                let query =  if status.eq(&InvoiceStatus::Paid) {
+                    "UPDATE invoice SET status=?1, confirmed_at = strftime('%s', 'now') WHERE payment_hash=?2;"
+                } else {
+                    "UPDATE invoice SET status=?1 WHERE payment_hash=?2;"
+                };
+                let mut stmt = tx.prepare(query)?;
+                stmt.execute(params![status.to_string(), payment_hash])?;
+
+                // Increase account balance by given invoice amount
+                if prev_status == "Unpaid" && status.eq(&InvoiceStatus::Paid) {
+                    let query =
+                            "UPDATE account SET balance = balance + ?1 WHERE pubkey = ?2;";
+                    let mut stmt = tx.prepare(query)?;
+                    stmt.execute(params![amount, pub_key])?;
+                }
+
+                pubkey = pub_key;
+            }
+
+            tx.commit()?;
+            let ok: Result<String> = Ok(pubkey);
+            ok
+        })
+        .await?;
+        pub_key
+    }
+
+    /// Get the most recent invoice for a given pubkey
+    /// invoice must be unpaid and not expired
+    async fn get_unpaid_invoice(&self, pubkey: &Keys) -> Result<Option<InvoiceInfo>> {
+        let mut conn = self.write_pool.get()?;
+
+        let pubkey = pubkey.to_owned();
+        let pubkey_str = pubkey.clone().public_key().to_string();
+        let (payment_hash, invoice, amount, description) = tokio::task::spawn_blocking(move || {
+            let tx = conn.transaction()?;
+
+            let query = r#"
+SELECT amount, payment_hash, description, invoice
+FROM invoice
+WHERE pubkey = ?1 AND status = 'Unpaid'
+ORDER BY created_at DESC
+LIMIT 1;
+        "#;
+            let mut stmt = tx.prepare(query).unwrap();
+            stmt.query_row(params![&pubkey_str], |r| {
+                let amount: u64 = r.get(0)?;
+                let payment_hash: String = r.get(1)?;
+                let description: String = r.get(2)?;
+                let invoice: String = r.get(3)?;
+
+                Ok((payment_hash, invoice, amount, description))
+            })
+        })
+        .await??;
+
+        Ok(Some(InvoiceInfo {
+            pubkey: pubkey.public_key().to_string(),
+            payment_hash,
+            bolt11: invoice,
+            amount,
+            status: InvoiceStatus::Unpaid,
+            memo: description,
+            confirmed_at: None,
+        }))
+    }
 }

 /// Decide if there is an index that should be used explicitly
@@ -677,14 +937,15 @@ fn override_index(f: &ReqFilter) -> Option<String> {
    // queries for multiple kinds default to kind_index, which is
    // significantly slower than kind_created_at_index.
    if let Some(ks) = &f.kinds {
-        if f.ids.is_none() &&
-            ks.len() > 1 &&
-            f.since.is_none() &&
-            f.until.is_none() &&
-            f.tags.is_none() &&
-            f.authors.is_none() {
-                return Some("kind_created_at_index".into());
-            }
+        if f.ids.is_none()
+            && ks.len() > 1
+            && f.since.is_none()
+            && f.until.is_none()
+            && f.tags.is_none()
+            && f.authors.is_none()
+        {
+            return Some("kind_created_at_index".into());
+        }
    }
    // if there is an author, it is much better to force the authors index.
    if f.authors.is_some() {
@@ -719,7 +980,9 @@ fn query_from_filter(f: &ReqFilter) -> (String, Vec<Box<dyn ToSql>>, Option<Stri

    // check if the index needs to be overriden
    let idx_name = override_index(f);
-    let idx_stmt = idx_name.as_ref().map_or_else(|| "".to_owned(), |i| format!("INDEXED BY {i}"));
+    let idx_stmt = idx_name
+        .as_ref()
+        .map_or_else(|| "".to_owned(), |i| format!("INDEXED BY {i}"));
    let mut query = format!("SELECT e.content FROM event e {idx_stmt}");
    // query parameters for SQLite
    let mut params: Vec<Box<dyn ToSql>> = vec![];
@@ -737,9 +1000,7 @@ fn query_from_filter(f: &ReqFilter) -> (String, Vec<Box<dyn ToSql>>, Option<Stri
                    params.push(Box::new(ex));
                }
                Some(HexSearch::Range(lower, upper)) => {
-                    auth_searches.push(
-                        "(author>? AND author<?)".to_owned(),
-                    );
+                    auth_searches.push("(author>? AND author<?)".to_owned());
                    params.push(Box::new(lower));
                    params.push(Box::new(upper));
                }
@@ -815,7 +1076,8 @@ fn query_from_filter(f: &ReqFilter) -> (String, Vec<Box<dyn ToSql>>, Option<Stri
            let until_clause;
            if let Some(ks) = &f.kinds {
                // kind is number, no escaping needed
-                let str_kinds: Vec<String> = ks.iter().map(std::string::ToString::to_string).collect();
+                let str_kinds: Vec<String> =
+                    ks.iter().map(std::string::ToString::to_string).collect();
                kind_clause = format!("AND kind IN ({})", str_kinds.join(", "));
            } else {
                kind_clause = format!("");
@@ -896,7 +1158,7 @@ fn _query_from_sub(sub: &Subscription) -> (String, Vec<Box<dyn ToSql>>, Vec<Stri
        .map(|s| format!("SELECT distinct content, created_at FROM ({s})"))
        .collect();
    let query: String = subqueries_selects.join(" UNION ");
-    (query, params,indexes)
+    (query, params, indexes)
 }

 /// Build a database connection pool.
@@ -925,7 +1187,7 @@ pub fn build_pool(
        }
    }
    let manager = if settings.database.in_memory {
-        SqliteConnectionManager::memory()
+        SqliteConnectionManager::file("file::memory:?cache=shared")
            .with_flags(flags)
            .with_init(|c| c.execute_batch(STARTUP_SQL))
    } else {
@@ -948,7 +1210,11 @@ pub fn build_pool(
 }

 /// Cleanup expired events on a regular basis
-async fn cleanup_expired(pool: SqlitePool, frequency: Duration, write_in_progress: Arc<Mutex<u64>>) -> Result<()> {
+async fn cleanup_expired(
+    pool: SqlitePool,
+    frequency: Duration,
+    write_in_progress: Arc<Mutex<u64>>,
+) -> Result<()> {
    tokio::task::spawn(async move {
        loop {
            tokio::select! {
@@ -996,13 +1262,18 @@ pub fn delete_expired(conn: &mut PooledConnection) -> Result<usize> {
 }

 /// Perform database WAL checkpoint on a regular basis
-pub async fn db_checkpoint_task(pool: SqlitePool, frequency: Duration, checkpoint_in_progress: Arc<Mutex<u64>>) -> Result<()> {
+pub async fn db_checkpoint_task(
+    pool: SqlitePool,
+    frequency: Duration,
+    write_in_progress: Arc<Mutex<u64>>,
+    checkpoint_in_progress: Arc<Mutex<u64>>,
+) -> Result<()> {
    // TODO; use acquire_many on the reader semaphore to stop them from interrupting this.
    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;
+        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
@@ -1011,6 +1282,8 @@ pub async fn db_checkpoint_task(pool: SqlitePool, frequency: Duration, checkpoin
            tokio::select! {
                _ = tokio::time::sleep(frequency) => {
                    if let Ok(mut conn) = pool.get() {
+                        // block all other writers
+                        let _write_guard = write_in_progress.lock().await;
                        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
@@ -1070,7 +1343,6 @@ pub fn checkpoint_db(conn: &mut PooledConnection) -> Result<usize> {
    Ok(wal_size as usize)
 }

-
 /// Produce a arbitrary list of '?' parameters.
 fn repeat_vars(count: usize) -> String {
    if count == 0 {
@@ -1104,7 +1376,6 @@ fn log_pool_stats(name: &str, pool: &SqlitePool) {
    );
 }

-
 /// Check if the pool is fully utilized
 fn _pool_at_capacity(pool: &SqlitePool) -> bool {
    let state: r2d2::State = pool.state();
--- a/src/repo/sqlite_migration.rs
+++ b/src/repo/sqlite_migration.rs
@@ -4,13 +4,13 @@ use crate::error::Result;
 use crate::event::{single_char_tagname, Event};
 use crate::utils::is_lower_hex;
 use const_format::formatcp;
+use indicatif::{ProgressBar, ProgressStyle};
 use rusqlite::limits::Limit;
 use rusqlite::params;
 use rusqlite::Connection;
 use std::cmp::Ordering;
 use std::time::Instant;
 use tracing::{debug, error, info};
-use indicatif::{ProgressBar, ProgressStyle};

 /// Startup DB Pragmas
 pub const STARTUP_SQL: &str = r##"
@@ -23,7 +23,7 @@ pragma mmap_size = 17179869184; -- cap mmap at 16GB
 "##;

 /// Latest database version
-pub const DB_VERSION: usize = 17;
+pub const DB_VERSION: usize = 18;

 /// Schema definition
 const INIT_SQL: &str = formatcp!(
@@ -96,6 +96,35 @@ FOREIGN KEY(metadata_event) REFERENCES event(id) ON UPDATE CASCADE ON DELETE CAS
 );
 CREATE INDEX IF NOT EXISTS user_verification_name_index ON user_verification(name);
 CREATE INDEX IF NOT EXISTS user_verification_event_index ON user_verification(metadata_event);
+
+-- Create account table
+CREATE TABLE IF NOT EXISTS account (
+pubkey TEXT PRIMARY KEY,
+is_admitted INTEGER NOT NULL DEFAULT 0,
+balance INTEGER NOT NULL DEFAULT 0,
+tos_accepted_at INTEGER
+);
+
+-- Create account index
+CREATE INDEX IF NOT EXISTS user_pubkey_index ON account(pubkey);
+
+-- Invoice table
+CREATE TABLE IF NOT EXISTS invoice (
+payment_hash TEXT PRIMARY KEY,
+pubkey TEXT NOT NULL,
+invoice TEXT NOT NULL,
+amount INTEGER NOT NULL,
+status TEXT CHECK ( status IN ('Paid', 'Unpaid', 'Expired' ) ) NOT NUll DEFAULT 'Unpaid',
+description TEXT,
+created_at INTEGER NOT NULL,
+confirmed_at INTEGER,
+CONSTRAINT invoice_pubkey_fkey FOREIGN KEY (pubkey) REFERENCES account (pubkey) ON DELETE CASCADE
+);
+
+-- Create invoice index
+CREATE INDEX IF NOT EXISTS invoice_pubkey_index ON invoice(pubkey);
+
+
 "##,
    DB_VERSION
 );
@@ -213,6 +242,9 @@ pub fn upgrade_db(conn: &mut PooledConnection) -> Result<usize> {
            if curr_version == 16 {
                curr_version = mig_16_to_17(conn)?;
            }
+            if curr_version == 17 {
+                curr_version = mig_17_to_18(conn)?;
+            }

            if curr_version == DB_VERSION {
                info!(
@@ -253,8 +285,8 @@ pub fn rebuild_tags(conn: &mut PooledConnection) -> Result<()> {
        let mut stmt = tx.prepare("select id, content from event order by id;")?;
        let mut tag_rows = stmt.query([])?;
        while let Some(row) = tag_rows.next()? {
-            if (events_processed as f32)/(count as f32) > percent_done {
-                info!("Tag update {}% complete...", (100.0*percent_done).round());
+            if (events_processed as f32) / (count as f32) > percent_done {
+                info!("Tag update {}% complete...", (100.0 * percent_done).round());
                percent_done += update_each_percent;
            }
            // we want to capture the event_id that had the tag, the tag name, and the tag hex value.
@@ -293,8 +325,6 @@ pub fn rebuild_tags(conn: &mut PooledConnection) -> Result<()> {
    Ok(())
 }

-
-
 //// Migration Scripts

 fn mig_1_to_2(conn: &mut PooledConnection) -> Result<usize> {
@@ -586,11 +616,17 @@ fn mig_11_to_12(conn: &mut PooledConnection) -> Result<usize> {
        tx.execute("PRAGMA user_version = 12;", [])?;
    }
    tx.commit()?;
-    info!("database schema upgraded v11 -> v12 in {:?}", start.elapsed());
+    info!(
+        "database schema upgraded v11 -> v12 in {:?}",
+        start.elapsed()
+    );
    // vacuum after large table modification
    let start = Instant::now();
    conn.execute("VACUUM;", [])?;
-    info!("vacuumed DB after hidden event cleanup in {:?}", start.elapsed());
+    info!(
+        "vacuumed DB after hidden event cleanup in {:?}",
+        start.elapsed()
+    );
    Ok(12)
 }

@@ -656,7 +692,7 @@ PRAGMA user_version = 15;
    match conn.execute_batch(clear_hidden_sql) {
        Ok(()) => {
            info!("all hidden events removed");
-        },
+        }
        Err(err) => {
            error!("delete failed: {}", err);
            panic!("could not remove hidden events");
@@ -688,22 +724,22 @@ CREATE INDEX IF NOT EXISTS tag_covering_index ON tag(name,kind,value,created_at,
    let start = Instant::now();
    let tx = conn.transaction()?;

-    let bar = ProgressBar::new(count.try_into().unwrap())
-        .with_message("rebuilding tags table");
+    let bar = ProgressBar::new(count.try_into().unwrap()).with_message("rebuilding tags table");
    bar.set_style(
        ProgressStyle::with_template(
            "[{elapsed_precise}] {bar:40.white/blue} {pos:>7}/{len:7} [{percent}%] {msg}",
        )
-            .unwrap(),
+        .unwrap(),
    );
    {
        tx.execute_batch(upgrade_sql)?;
-        let mut stmt = tx.prepare("select id, kind, created_at, content from event order by id;")?;
+        let mut stmt =
+            tx.prepare("select id, kind, created_at, content from event order by id;")?;
        let mut tag_rows = stmt.query([])?;
        let mut count = 0;
        while let Some(row) = tag_rows.next()? {
            count += 1;
-            if count%10==0 {
+            if count % 10 == 0 {
                bar.inc(10);
            }
            let event_id: u64 = row.get(0)?;
@@ -731,7 +767,10 @@ CREATE INDEX IF NOT EXISTS tag_covering_index ON tag(name,kind,value,created_at,
    }
    bar.finish();
    tx.commit()?;
-    info!("database schema upgraded v15 -> v16 in {:?}", start.elapsed());
+    info!(
+        "database schema upgraded v15 -> v16 in {:?}",
+        start.elapsed()
+    );
    Ok(16)
 }

@@ -753,3 +792,50 @@ PRAGMA user_version = 17;
    }
    Ok(17)
 }
+
+fn mig_17_to_18(conn: &mut PooledConnection) -> Result<usize> {
+    info!("database schema needs update from 17->18");
+    let upgrade_sql = r##"
+-- Create invoices table
+CREATE TABLE IF NOT EXISTS invoice (
+payment_hash TEXT PRIMARY KEY,
+pubkey TEXT NOT NULL,
+invoice TEXT NOT NULL,
+amount INTEGER NOT NULL,
+status TEXT CHECK ( status IN ('Paid', 'Unpaid', 'Expired' ) ) NOT NUll DEFAULT 'Unpaid',
+description TEXT,
+created_at INTEGER NOT NULL,
+confirmed_at INTEGER,
+CONSTRAINT invoice_pubkey_fkey FOREIGN KEY (pubkey) REFERENCES account (pubkey) ON DELETE CASCADE
+);
+
+-- Create invoice index
+CREATE INDEX IF NOT EXISTS invoice_pubkey_index ON invoice(pubkey);
+
+-- Create account table
+
+CREATE TABLE IF NOT EXISTS account (
+pubkey TEXT PRIMARY KEY,
+is_admitted INTEGER NOT NULL DEFAULT 0,
+balance INTEGER NOT NULL DEFAULT 0,
+tos_accepted_at INTEGER
+);
+
+-- Create account index
+CREATE INDEX IF NOT EXISTS account_pubkey_index ON account(pubkey);
+
+
+pragma optimize;
+PRAGMA user_version = 18;
+"##;
+    match conn.execute_batch(upgrade_sql) {
+        Ok(()) => {
+            info!("database schema upgraded v17 -> v18");
+        }
+        Err(err) => {
+            error!("update failed: {}", err);
+            panic!("database could not be upgraded");
+        }
+    }
+    Ok(18)
+}
--- a/src/server.rs
+++ b/src/server.rs
@@ -3,31 +3,38 @@ use crate::close::Close;
 use crate::close::CloseCmd;
 use crate::config::{Settings, VerifiedUsersMode};
 use crate::conn;
-use crate::repo::NostrRepo;
 use crate::db;
 use crate::db::SubmittedEvent;
 use crate::error::{Error, Result};
-use crate::event::EventWrapper;
-use crate::server::EventWrapper::{WrappedAuth, WrappedEvent};
 use crate::event::Event;
 use crate::event::EventCmd;
+use crate::event::EventWrapper;
 use crate::info::RelayInfo;
 use crate::nip05;
 use crate::notice::Notice;
+use crate::payment;
+use crate::payment::InvoiceInfo;
+use crate::payment::PaymentMessage;
+use crate::repo::NostrRepo;
+use crate::server::Error::CommandUnknownError;
+use crate::server::EventWrapper::{WrappedAuth, WrappedEvent};
 use crate::subscription::Subscription;
-use prometheus::IntCounterVec;
-use prometheus::IntGauge;
-use prometheus::{Encoder, Histogram, IntCounter, HistogramOpts, Opts, Registry, TextEncoder};
 use futures::SinkExt;
 use futures::StreamExt;
 use governor::{Jitter, Quota, RateLimiter};
 use http::header::HeaderMap;
+use hyper::body::to_bytes;
 use hyper::header::ACCEPT;
 use hyper::service::{make_service_fn, service_fn};
 use hyper::upgrade::Upgraded;
 use hyper::{
    header, server::conn::AddrStream, upgrade, Body, Request, Response, Server, StatusCode,
 };
+use prometheus::IntCounterVec;
+use prometheus::IntGauge;
+use prometheus::{Encoder, Histogram, HistogramOpts, IntCounter, Opts, Registry, TextEncoder};
+use qrcode::render::svg;
+use qrcode::QrCode;
 use serde::{Deserialize, Serialize};
 use serde_json::json;
 use std::collections::HashMap;
@@ -37,9 +44,9 @@ use std::io::BufReader;
 use std::io::Read;
 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::sync::Arc;
 use std::time::Duration;
 use std::time::Instant;
 use tokio::runtime::Builder;
@@ -53,7 +60,8 @@ use tungstenite::error::Error as WsError;
 use tungstenite::handshake;
 use tungstenite::protocol::Message;
 use tungstenite::protocol::WebSocketConfig;
-use crate::server::Error::CommandUnknownError;
+use nostr::key::FromPkStr;
+use nostr::key::Keys;

 /// Handle arbitrary HTTP requests, including for `WebSocket` upgrades.
 #[allow(clippy::too_many_arguments)]
@@ -64,6 +72,7 @@ async fn handle_web_request(
    remote_addr: SocketAddr,
    broadcast: Sender<Event>,
    event_tx: tokio::sync::mpsc::Sender<SubmittedEvent>,
+    payment_tx: tokio::sync::broadcast::Sender<PaymentMessage>,
    shutdown: Receiver<()>,
    favicon: Option<Vec<u8>>,
    registry: Registry,
@@ -103,7 +112,7 @@ async fn handle_web_request(
                                    tokio_tungstenite::tungstenite::protocol::Role::Server,
                                    Some(config),
                                )
-                                    .await;
+                                .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
@@ -167,19 +176,29 @@ async fn handle_web_request(
                        let rinfo = RelayInfo::from(settings);
                        let b = Body::from(serde_json::to_string_pretty(&rinfo).unwrap());
                        return Ok(Response::builder()
-                                  .status(200)
-                                  .header("Content-Type", "application/nostr+json")
-                                  .header("Access-Control-Allow-Origin", "*")
-                                  .body(b)
-                                  .unwrap());
+                            .status(200)
+                            .header("Content-Type", "application/nostr+json")
+                            .header("Access-Control-Allow-Origin", "*")
+                            .body(b)
+                            .unwrap());
                    }
                }
            }
+
+            // Redirect users to join page when pay to relay enabled
+            if settings.pay_to_relay.enabled {
+                return Ok(Response::builder()
+                    .status(StatusCode::TEMPORARY_REDIRECT)
+                    .header("location", "/join")
+                    .body(Body::empty())
+                    .unwrap());
+            }
+
            Ok(Response::builder()
-               .status(200)
-               .header("Content-Type", "text/plain")
-               .body(Body::from("Please use a Nostr client to connect."))
-               .unwrap())
+                .status(200)
+                .header("Content-Type", "text/plain")
+                .body(Body::from("Please use a Nostr client to connect."))
+                .unwrap())
        }
        ("/metrics", false) => {
            let mut buffer = vec![];
@@ -188,38 +207,442 @@ async fn handle_web_request(
            encoder.encode(&metric_families, &mut buffer).unwrap();

            Ok(Response::builder()
-               .status(StatusCode::OK)
-               .header("Content-Type", "text/plain")
-               .body(Body::from(buffer))
-               .unwrap())
+                .status(StatusCode::OK)
+                .header("Content-Type", "text/plain")
+                .body(Body::from(buffer))
+                .unwrap())
        }
        ("/favicon.ico", false) => {
            if let Some(favicon_bytes) = favicon {
                info!("returning favicon");
                Ok(Response::builder()
-                   .status(StatusCode::OK)
-                   .header("Content-Type", "image/x-icon")
-                   // 1 month cache
-                   .header("Cache-Control", "public, max-age=2419200")
-                   .body(Body::from(favicon_bytes))
-                   .unwrap())
+                    .status(StatusCode::OK)
+                    .header("Content-Type", "image/x-icon")
+                    // 1 month cache
+                    .header("Cache-Control", "public, max-age=2419200")
+                    .body(Body::from(favicon_bytes))
+                    .unwrap())
            } else {
                Ok(Response::builder()
-                   .status(StatusCode::NOT_FOUND)
-                   .body(Body::from(""))
-                   .unwrap())
+                    .status(StatusCode::NOT_FOUND)
+                    .body(Body::from(""))
+                    .unwrap())
            }
        }
-        (_, _) => {
-            //handle any other url
+        // LN bits callback endpoint for paid invoices
+        ("/lnbits", false) => {
+            let callback: payment::lnbits::LNBitsCallback =
+                serde_json::from_slice(&to_bytes(request.into_body()).await.unwrap()).unwrap();
+            debug!("LNBits callback: {callback:?}");
+
+            if let Err(e) = payment_tx.send(PaymentMessage::InvoicePaid(callback.payment_hash)) {
+                warn!("Could not send invoice update: {}", e);
+                return Ok(Response::builder()
+                    .status(StatusCode::INTERNAL_SERVER_ERROR)
+                    .body(Body::from("Error processing callback"))
+                    .unwrap());
+            }
+
            Ok(Response::builder()
-               .status(StatusCode::NOT_FOUND)
-               .body(Body::from("Nothing here."))
-               .unwrap())
+                .status(StatusCode::OK)
+                .body(Body::from("ok"))
+                .unwrap())
+        }
+        // Endpoint for relays terms
+        ("/terms", false) => Ok(Response::builder()
+            .status(200)
+            .header("Content-Type", "text/plain")
+            .body(Body::from(settings.pay_to_relay.terms_message))
+            .unwrap()),
+        // Endpoint to allow users to sign up
+        ("/join", false) => {
+            // Stops sign ups if disabled
+            if !settings.pay_to_relay.sign_ups {
+                return Ok(Response::builder()
+                    .status(401)
+                    .header("Content-Type", "text/plain")
+                    .body(Body::from("Sorry, joining is not allowed at the moment"))
+                    .unwrap());
+            }
+
+            let html = r#"
+<!doctype HTML>
+<head>
+  <meta charset="UTF-8">
+  <style>
+    body {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      text-align: center;
+      font-family: Arial, sans-serif;
+      background-color: #6320a7;
+      color: white;
+    }
+
+    .container {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      height: 400px;
+    }
+
+    a {
+      color: pink;
+    }
+
+    input[type="text"] {
+        width: 100%;
+        max-width: 500px;
+        box-sizing: border-box;
+        overflow-x: auto;
+        white-space: nowrap;
+    }
+  </style>
+</head>
+<body>
+  <div style="width:75%;">
+    <h1>Enter your pubkey</h1>
+    <form action="/invoice" onsubmit="return checkForm(this);">
+      <input type="text" name="pubkey" id="pubkey-input"><br><br>
+      <input type="checkbox" id="terms" required>
+      <label for="terms">I agree to the <a href="/terms">terms and conditions</a></label><br><br>
+      <button type="submit">Submit</button>
+    </form>
+    <button id="get-public-key-btn">Get Public Key</button>
+  </div>
+  <script>
+    function checkForm(form) {
+      if (!form.terms.checked) {
+        alert("Please agree to the terms and conditions");
+        return false;
+      }
+      return true;
+    }
+
+    const pubkeyInput = document.getElementById('pubkey-input');
+      const getPublicKeyBtn = document.getElementById('get-public-key-btn');
+      getPublicKeyBtn.addEventListener('click', async function() {
+        try {
+          const publicKey = await window.nostr.getPublicKey();
+          pubkeyInput.value = publicKey;
+        } catch (error) {
+          console.error(error);
+        }
+      });
+  </script>
+</body>
+</html>
+            "#;
+            Ok(Response::builder()
+                .status(StatusCode::OK)
+                .body(Body::from(html))
+                .unwrap())
+        }
+        // Endpoint to display invoice
+        ("/invoice", false) => {
+            // Stops sign ups if disabled
+            if !settings.pay_to_relay.sign_ups {
+                return Ok(Response::builder()
+                    .status(401)
+                    .header("Content-Type", "text/plain")
+                    .body(Body::from("Sorry, joining is not allowed at the moment"))
+                    .unwrap());
+            }
+
+            // Get query pubkey from query string
+            let pubkey = get_pubkey(request);
+
+            // Redirect back to join page if no pub key is found in query string
+            if pubkey.is_none() {
+                return Ok(Response::builder()
+                    .status(404)
+                    .header("location", "/join")
+                    .body(Body::empty())
+                    .unwrap());
+            }
+
+            // Checks key is valid
+            let pubkey = pubkey.unwrap();
+            let key = Keys::from_pk_str(&pubkey);
+            if key.is_err() {
+                return Ok(Response::builder()
+                    .status(401)
+                    .header("Content-Type", "text/plain")
+                    .body(Body::from("Looks like your key is invalid"))
+                    .unwrap());
+            }
+
+            // Checks if user is already admitted
+            let payment_message;
+            if let Ok((admission_status, _)) = repo.get_account_balance(&key.unwrap()).await {
+                if admission_status {
+                    return Ok(Response::builder()
+                        .status(StatusCode::OK)
+                        .body(Body::from("Already admitted"))
+                        .unwrap());
+                } else {
+                    payment_message = PaymentMessage::CheckAccount(pubkey.clone());
+                }
+            } else {
+                payment_message = PaymentMessage::NewAccount(pubkey.clone());
+            }
+
+            // Send message on payment channel requesting invoice
+            if payment_tx.send(payment_message).is_err() {
+                warn!("Could not send payment tx");
+                return Ok(Response::builder()
+                    .status(501)
+                    .header("Content-Type", "text/plain")
+                    .body(Body::from("Sorry, something went wrong"))
+                    .unwrap());
+            }
+
+            // wait for message with invoice back that matched the pub key
+            let mut invoice_info: Option<InvoiceInfo> = None;
+            while let Ok(msg) = payment_tx.subscribe().recv().await {
+                match msg {
+                    PaymentMessage::Invoice(m_pubkey, m_invoice_info) => {
+                        if m_pubkey == pubkey.clone() {
+                            invoice_info = Some(m_invoice_info);
+                            break;
+                        }
+                    }
+                    PaymentMessage::AccountAdmitted(m_pubkey) => {
+                        if m_pubkey == pubkey.clone() {
+                            return Ok(Response::builder()
+                                .status(StatusCode::OK)
+                                .body(Body::from("Already admitted"))
+                                .unwrap());
+                        }
+                    }
+                    _ => (),
+                }
+            }
+
+            // Return early if cant get invoice
+            if invoice_info.is_none() {
+                return Ok(Response::builder()
+                    .status(StatusCode::INTERNAL_SERVER_ERROR)
+                    .body(Body::from("Sorry, could not get invoice"))
+                    .unwrap());
+            }
+
+            // Since invoice is checked to be not none, unwrap
+            let invoice_info = invoice_info.unwrap();
+
+            let qr_code: String;
+            if let Ok(code) = QrCode::new(invoice_info.bolt11.as_bytes()) {
+                qr_code = code
+                    .render()
+                    .min_dimensions(200, 200)
+                    .dark_color(svg::Color("#800000"))
+                    .light_color(svg::Color("#ffff80"))
+                    .build();
+            } else {
+                qr_code = "Could not render image".to_string();
+            }
+
+            let html_result = format!(
+                r#"
+<!DOCTYPE html>
+<html>
+  <head>
+  <meta charset="UTF-8">
+    <style>
+      body {{
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+        font-family: Arial, sans-serif;
+        background-color:  #6320a7 ;
+        color: white;
+      }}
+      #copy-button {{
+        background-color: #bb5f0d ;
+        color: white;
+        padding: 10px 20px;
+        border-radius: 5px;
+        border: none;
+        cursor: pointer;
+      }}
+      #copy-button:hover {{
+        background-color: #8f29f4;
+      }}
+    .container {{
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        height: 400px;
+    }}
+    a {{
+        color: pink;
+    }}
+    </style>
+  </head>
+  <body>
+    <div style="width:75%;">
+      <h3>
+        To use this relay, an admission fee of {} sats is required. By paying the fee, you agree to the <a href='terms'>terms</a>.
+      </h3>
+    </div>
+    <div>
+        <div style="max-height: 300px;">
+            {}
+        </div>
+    </div>
+    <div>
+    <div style="width: 75%;">
+        <p style="overflow-wrap: break-word; width: 500px;">{}</p>
+        <button id="copy-button">Copy</button>
+    </div>
+    <div>
+        <p> This page will not refresh </p>
+        <p> Verify admission <a href=/account?pubkey={}>here</a> once you have paid</p>
+    </div>
+    </div>
+  </body>
+</html>
+
+
+<script>
+  const copyButton = document.getElementById("copy-button");
+  if (navigator.clipboard) {{
+    copyButton.addEventListener("click", function() {{
+      const textToCopy = "{}";
+      navigator.clipboard.writeText(textToCopy).then(function() {{
+        console.log("Text copied to clipboard");
+      }}, function(err) {{
+        console.error("Could not copy text: ", err);
+      }});
+    }});
+  }} else {{
+    copyButton.style.display = "none";
+    console.warn("Clipboard API is not supported in this browser");
+  }}
+</script>
+"#,
+                settings.pay_to_relay.admission_cost,
+                qr_code,
+                invoice_info.bolt11,
+                pubkey,
+                invoice_info.bolt11
+            );
+
+            Ok(Response::builder()
+                .status(StatusCode::OK)
+                .body(Body::from(html_result))
+                .unwrap())
+        }
+        ("/account", false) => {
+            // Stops sign ups if disabled
+            if !settings.pay_to_relay.enabled {
+                return Ok(Response::builder()
+                    .status(401)
+                    .header("Content-Type", "text/plain")
+                    .body(Body::from("This relay is not paid"))
+                    .unwrap());
+            }
+
+            // Gets the pubkey from query string
+            let pubkey = get_pubkey(request);
+
+            // Redirect back to join page if no pub key is found in query string
+            if pubkey.is_none() {
+                return Ok(Response::builder()
+                    .status(404)
+                    .header("location", "/join")
+                    .body(Body::empty())
+                    .unwrap());
+            }
+
+            // Checks key is valid
+            let pubkey = pubkey.unwrap();
+            let key = Keys::from_pk_str(&pubkey);
+            if key.is_err() {
+                return Ok(Response::builder()
+                    .status(401)
+                    .header("Content-Type", "text/plain")
+                    .body(Body::from("Looks like your key is invalid"))
+                    .unwrap());
+            }
+
+            // Checks if user is already admitted
+            let text =
+                if let Ok((admission_status, _)) = repo.get_account_balance(&key.unwrap()).await {
+                    if admission_status {
+                        r#"<span style="color: green;">is</span>"#
+                    } else {
+                        r#"<span style="color: red;">is not</span>"#
+                    }
+                } else {
+                    "Could not get admission status"
+                };
+
+            let html_result = format!(
+                r#"
+            <!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8">
+    <style>
+      body {{
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+        font-family: Arial, sans-serif;
+        background-color: #6320a7;
+        color: white;
+        height: 100vh;
+      }}
+    </style>
+  </head>
+  <body>
+    <div>
+      <h5>{} {} admitted</h5>
+    </div>
+  </body>
+</html>
+
+
+            "#,
+                pubkey, text
+            );
+
+            Ok(Response::builder()
+                .status(StatusCode::OK)
+                .body(Body::from(html_result))
+                .unwrap())
+        }
+        // later balance
+        (_, _) => {
+            // handle any other url
+            Ok(Response::builder()
+                .status(StatusCode::NOT_FOUND)
+                .body(Body::from("Nothing here."))
+                .unwrap())
        }
    }
 }

+// Get pubkey from request query string
+fn get_pubkey(request: Request<Body>) -> Option<String> {
+    let query = request.uri().query().unwrap_or("").to_string();
+
+    // Gets the pubkey value from query string
+    query.split('&').fold(None, |acc, pair| {
+        let mut parts = pair.splitn(2, '=');
+        let key = parts.next();
+        let value = parts.next();
+        if key == Some("pubkey") {
+            return value.map(|s| s.to_owned());
+        }
+        acc
+    })
+}
+
 fn get_header_string(header: &str, headers: &HeaderMap) -> Option<String> {
    headers
        .get(header)
@@ -256,50 +679,47 @@ fn create_metrics() -> (Registry, NostrMetrics) {
    let query_sub = Histogram::with_opts(HistogramOpts::new(
        "nostr_query_seconds",
        "Subscription response times",
-    )).unwrap();
+    ))
+    .unwrap();
    let query_db = Histogram::with_opts(HistogramOpts::new(
        "nostr_filter_seconds",
        "Filter SQL query times",
-    )).unwrap();
+    ))
+    .unwrap();
    let write_events = Histogram::with_opts(HistogramOpts::new(
        "nostr_events_write_seconds",
        "Event writing response times",
-    )).unwrap();
+    ))
+    .unwrap();
    let sent_events = IntCounterVec::new(
-	Opts::new("nostr_events_sent_total", "Events sent to clients"),
-	vec!["source"].as_slice(),
-    ).unwrap();
-    let connections = IntCounter::with_opts(Opts::new(
-        "nostr_connections_total",
-        "New connections",
-    )).unwrap();
+        Opts::new("nostr_events_sent_total", "Events sent to clients"),
+        vec!["source"].as_slice(),
+    )
+    .unwrap();
+    let connections =
+        IntCounter::with_opts(Opts::new("nostr_connections_total", "New connections")).unwrap();
    let db_connections = IntGauge::with_opts(Opts::new(
-        "nostr_db_connections", "Active database connections"
-    )).unwrap();
+        "nostr_db_connections",
+        "Active database connections",
+    ))
+    .unwrap();
    let query_aborts = IntCounterVec::new(
        Opts::new("nostr_query_abort_total", "Aborted queries"),
        vec!["reason"].as_slice(),
-    ).unwrap();
-    let cmd_req = IntCounter::with_opts(Opts::new(
-        "nostr_cmd_req_total",
-        "REQ commands",
-    )).unwrap();
-    let cmd_event = IntCounter::with_opts(Opts::new(
-        "nostr_cmd_event_total",
-        "EVENT commands",
-    )).unwrap();
-    let cmd_close = IntCounter::with_opts(Opts::new(
-        "nostr_cmd_close_total",
-        "CLOSE commands",
-    )).unwrap();
-    let cmd_auth = IntCounter::with_opts(Opts::new(
-        "nostr_cmd_auth_total",
-        "AUTH commands",
-    )).unwrap();
+    )
+    .unwrap();
+    let cmd_req = IntCounter::with_opts(Opts::new("nostr_cmd_req_total", "REQ commands")).unwrap();
+    let cmd_event =
+        IntCounter::with_opts(Opts::new("nostr_cmd_event_total", "EVENT commands")).unwrap();
+    let cmd_close =
+        IntCounter::with_opts(Opts::new("nostr_cmd_close_total", "CLOSE commands")).unwrap();
+    let cmd_auth =
+        IntCounter::with_opts(Opts::new("nostr_cmd_auth_total", "AUTH commands")).unwrap();
    let disconnects = IntCounterVec::new(
        Opts::new("nostr_disconnects_total", "Client disconnects"),
        vec!["reason"].as_slice(),
-        ).unwrap();
+    )
+    .unwrap();
    registry.register(Box::new(query_sub.clone())).unwrap();
    registry.register(Box::new(query_db.clone())).unwrap();
    registry.register(Box::new(write_events.clone())).unwrap();
@@ -319,14 +739,14 @@ fn create_metrics() -> (Registry, NostrMetrics) {
        sent_events,
        connections,
        db_connections,
-	disconnects,
+        disconnects,
        query_aborts,
-	cmd_req,
-	cmd_event,
-	cmd_close,
+        cmd_req,
+        cmd_event,
+        cmd_close,
        cmd_auth,
    };
-    (registry,metrics)
+    (registry, metrics)
 }

 fn file_bytes(path: &str) -> Result<Vec<u8>> {
@@ -383,11 +803,12 @@ pub fn start_server(settings: &Settings, shutdown_rx: MpscReceiver<()>) -> Resul
        .enable_all()
        .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);
+            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
+        // limit concurrent SQLite blocking threads
        .max_blocking_threads(settings.limits.max_blocking_threads)
        .on_thread_start(|| {
            trace!("started new thread: {:?}", std::thread::current().name());
@@ -425,27 +846,34 @@ pub fn start_server(settings: &Settings, shutdown_rx: MpscReceiver<()>) -> Resul
        // metadata events.
        let (metadata_tx, metadata_rx) = broadcast::channel::<Event>(4096);

-	let (registry, metrics) = create_metrics();
+        let (payment_tx, payment_rx) = broadcast::channel::<PaymentMessage>(4096);
+
+        let (registry, metrics) = create_metrics();
+
        // build a repository for events
        let repo = db::build_repo(&settings, metrics.clone()).await;
        // start the database writer task.  Give it a channel for
        // writing events, and for publishing events that have been
        // written (to all connected clients).
-        tokio::task::spawn(
-            db::db_writer(
-                repo.clone(),
-                settings.clone(),
-                event_rx,
-                bcast_tx.clone(),
-                metadata_tx.clone(),
-                shutdown_listen,
-            ));
+        tokio::task::spawn(db::db_writer(
+            repo.clone(),
+            settings.clone(),
+            event_rx,
+            bcast_tx.clone(),
+            metadata_tx.clone(),
+            payment_tx.clone(),
+            shutdown_listen,
+        ));
        info!("db writer created");

        // create a nip-05 verifier thread; if enabled.
        if settings.verified_users.mode != VerifiedUsersMode::Disabled {
-            let verifier_opt =
-                nip05::Verifier::new(repo.clone(), metadata_rx, bcast_tx.clone(), settings.clone());
+            let verifier_opt = nip05::Verifier::new(
+                repo.clone(),
+                metadata_rx,
+                bcast_tx.clone(),
+                settings.clone(),
+            );
            if let Ok(mut v) = verifier_opt {
                if verified_users_active {
                    tokio::task::spawn(async move {
@@ -456,6 +884,23 @@ pub fn start_server(settings: &Settings, shutdown_rx: MpscReceiver<()>) -> Resul
            }
        }

+        // Create payments thread if pay to relay enabled
+        if settings.pay_to_relay.enabled {
+            let payment_opt = payment::Payment::new(
+                repo.clone(),
+                payment_tx.clone(),
+                payment_rx,
+                bcast_tx.clone(),
+                settings.clone(),
+            );
+            if let Ok(mut p) = payment_opt {
+                tokio::task::spawn(async move {
+                    info!("starting payment process ...");
+                    p.run().await;
+                });
+            }
+        }
+
        // listen for (external to tokio) shutdown request
        let controlled_shutdown = invoke_shutdown.clone();
        tokio::spawn(async move {
@@ -464,7 +909,7 @@ pub fn start_server(settings: &Settings, shutdown_rx: MpscReceiver<()>) -> Resul
                Ok(()) => {
                    info!("control message requesting shutdown");
                    controlled_shutdown.send(()).ok();
-                },
+                }
                Err(std::sync::mpsc::RecvError) => {
                    trace!("shutdown requestor is disconnected (this is normal)");
                }
@@ -497,6 +942,7 @@ pub fn start_server(settings: &Settings, shutdown_rx: MpscReceiver<()>) -> Resul
            let remote_addr = conn.remote_addr();
            let bcast = bcast_tx.clone();
            let event = event_tx.clone();
+            let payment_tx = payment_tx.clone();
            let stop = invoke_shutdown.clone();
            let settings = settings.clone();
            let favicon = favicon.clone();
@@ -512,6 +958,7 @@ pub fn start_server(settings: &Settings, shutdown_rx: MpscReceiver<()>) -> Resul
                        remote_addr,
                        bcast.clone(),
                        event.clone(),
+                        payment_tx.clone(),
                        stop.subscribe(),
                        favicon.clone(),
                        registry.clone(),
@@ -545,12 +992,13 @@ pub enum NostrMessage {

 /// Convert Message to `NostrMessage`
 fn convert_to_msg(msg: &str, max_bytes: Option<usize>) -> Result<NostrMessage> {
-    let parsed_res: Result<NostrMessage> = serde_json::from_str(msg).map_err(std::convert::Into::into);
+    let parsed_res: Result<NostrMessage> =
+        serde_json::from_str(msg).map_err(std::convert::Into::into);
    match parsed_res {
        Ok(m) => {
            if let NostrMessage::SubMsg(_) = m {
                // note; this only prints the first 16k of a REQ and then truncates.
-                trace!("REQ: {:?}",msg);
+                trace!("REQ: {:?}", msg);
            };
            if let NostrMessage::EventMsg(_) = m {
                if let Some(max_size) = max_bytes {
@@ -581,6 +1029,31 @@ fn make_notice_message(notice: &Notice) -> Message {
    Message::text(json.to_string())
 }

+fn allowed_to_send(event_str: &String, conn: &conn::ClientConn, settings: &Settings) -> bool {
+    // TODO: pass in kind so that we can avoid deserialization for most events
+    if settings.authorization.nip42_dms {
+        match serde_json::from_str::<Event>(event_str) {
+            Ok(event) => {
+                if event.kind == 4 {
+                    match (conn.auth_pubkey(), event.tag_values_by_name("p").first()) {
+                        (Some(auth_pubkey), Some(recipient_pubkey)) => {
+                            recipient_pubkey == auth_pubkey || &event.pubkey == auth_pubkey
+                        },
+                        (_, _) => {
+                            false
+                        },
+                    }
+                } else {
+                    true
+                }
+            },
+            Err(_) => false
+        }
+    } else {
+        true
+    }
+}
+
 struct ClientInfo {
    remote_ip: String,
    user_agent: Option<String>,
@@ -653,9 +1126,7 @@ async fn nostr_server(
    let unspec = "<unspecified>".to_string();
    info!("new client connection (cid: {}, ip: {:?})", cid, conn.ip());
    let origin = client_info.origin.as_ref().unwrap_or_else(|| &unspec);
-    let user_agent = client_info
-        .user_agent.as_ref()
-        .unwrap_or_else(|| &unspec);
+    let user_agent = client_info.user_agent.as_ref().unwrap_or_else(|| &unspec);
    info!(
        "cid: {}, origin: {:?}, user-agent: {:?}",
        cid, origin, user_agent
@@ -667,15 +1138,19 @@ async fn nostr_server(
    if settings.authorization.nip42_auth {
        conn.generate_auth_challenge();
        if let Some(challenge) = conn.auth_challenge() {
-            ws_stream.send(
-                make_notice_message(&Notice::AuthChallenge(challenge.to_string()))).await.ok();
+            ws_stream
+                .send(make_notice_message(&Notice::AuthChallenge(
+                    challenge.to_string(),
+                )))
+                .await
+                .ok();
        }
    }

    loop {
        tokio::select! {
            _ = shutdown.recv() => {
-		metrics.disconnects.with_label_values(&["shutdown"]).inc();
+        metrics.disconnects.with_label_values(&["shutdown"]).inc();
                info!("Close connection down due to shutdown, client: {}, ip: {:?}, connected: {:?}", cid, conn.ip(), orig_start.elapsed());
                // server shutting down, exit loop
                break;
@@ -685,7 +1160,7 @@ async fn nostr_server(
                // if it has been too long, disconnect
                if last_message_time.elapsed() > max_quiet_time {
                    debug!("ending connection due to lack of client ping response");
-		    metrics.disconnects.with_label_values(&["timeout"]).inc();
+            metrics.disconnects.with_label_values(&["timeout"]).inc();
                    break;
                }
                // Send a ping
@@ -701,11 +1176,13 @@ async fn nostr_server(
                    let send_str = format!("[\"EOSE\",\"{subesc}\"]");
                    ws_stream.send(Message::Text(send_str)).await.ok();
                } else {
-                    client_received_event_count += 1;
-		    metrics.sent_events.with_label_values(&["db"]).inc();
-                    // send a result
-                    let send_str = format!("[\"EVENT\",\"{}\",{}]", subesc, &query_result.event);
-                    ws_stream.send(Message::Text(send_str)).await.ok();
+                    if allowed_to_send(&query_result.event, &conn, &settings) {
+                        metrics.sent_events.with_label_values(&["db"]).inc();
+                        client_received_event_count += 1;
+                        // send a result
+                        let send_str = format!("[\"EVENT\",\"{}\",{}]", subesc, &query_result.event);
+                        ws_stream.send(Message::Text(send_str)).await.ok();
+                    }
                }
            },
            // TODO: consider logging the LaggedRecv error
@@ -719,13 +1196,15 @@ async fn nostr_server(
                    // TODO: serialize at broadcast time, instead of
                    // once for each consumer.
                    if let Ok(event_str) = serde_json::to_string(&global_event) {
-                        trace!("sub match for client: {}, sub: {:?}, event: {:?}",
+                        if allowed_to_send(&event_str, &conn, &settings) {
+                            // create an event response and send it
+                            trace!("sub match for client: {}, sub: {:?}, event: {:?}",
                               cid, s,
                               global_event.get_event_id_prefix());
-                        // create an event response and send it
-                        let subesc = s.replace('"', "");
-			metrics.sent_events.with_label_values(&["realtime"]).inc();
-                        ws_stream.send(Message::Text(format!("[\"EVENT\",\"{subesc}\",{event_str}]"))).await.ok();
+                            let subesc = s.replace('"', "");
+                            metrics.sent_events.with_label_values(&["realtime"]).inc();
+                            ws_stream.send(Message::Text(format!("[\"EVENT\",\"{subesc}\",{event_str}]"))).await.ok();
+                        }
                    } else {
                        warn!("could not serialize event: {:?}", global_event.get_event_id_prefix());
                    }
@@ -760,20 +1239,20 @@ async fn nostr_server(
                             WsError::Protocol(tungstenite::error::ProtocolError::ResetWithoutClosingHandshake)))
                        => {
                            debug!("websocket close from client (cid: {}, ip: {:?})",cid, conn.ip());
-			    metrics.disconnects.with_label_values(&["normal"]).inc();
+                metrics.disconnects.with_label_values(&["normal"]).inc();
                            break;
                        },
                    Some(Err(WsError::Io(e))) => {
                        // IO errors are considered fatal
                        warn!("IO error (cid: {}, ip: {:?}): {:?}", cid, conn.ip(), e);
-			metrics.disconnects.with_label_values(&["error"]).inc();
+            metrics.disconnects.with_label_values(&["error"]).inc();

                        break;
                    }
                    x => {
                        // default condition on error is to close the client connection
                        info!("unknown error (cid: {}, ip: {:?}): {:?} (closing conn)", cid, conn.ip(), x);
-			metrics.disconnects.with_label_values(&["error"]).inc();
+            metrics.disconnects.with_label_values(&["error"]).inc();

                        break;
                    }
@@ -786,6 +1265,7 @@ async fn nostr_server(
                        // handle each type of message
                        let evid = ec.event_id().to_owned();
                        let parsed : Result<EventWrapper> = Result::<EventWrapper>::from(ec);
+                        metrics.cmd_event.inc();
                        match parsed {
                            Ok(WrappedEvent(e)) => {
                                metrics.cmd_event.inc();
@@ -866,7 +1346,7 @@ async fn nostr_server(
                        if conn.has_subscription(&s) {
                            info!("client sent duplicate subscription, ignoring (cid: {}, sub: {:?})", cid, s.id);
                        } else {
-			    metrics.cmd_req.inc();
+                metrics.cmd_req.inc();
                            if let Some(ref lim) = sub_lim_opt {
                                lim.until_ready_with_jitter(jitter).await;
                            }
@@ -893,7 +1373,7 @@ async fn nostr_server(
                        // closing a request simply removes the subscription.
                        let parsed : Result<Close> = Result::<Close>::from(cc);
                        if let Ok(c) = parsed {
-			    metrics.cmd_close.inc();
+                metrics.cmd_close.inc();
                            // check if a query is currently
                            // running, and remove it if so.
                            let stop_tx = running_queries.remove(&c.id);
@@ -943,17 +1423,16 @@ async fn nostr_server(

 #[derive(Clone)]
 pub struct NostrMetrics {
-    pub query_sub: Histogram, // response time of successful subscriptions
-    pub query_db: Histogram, // individual database query execution time
-    pub db_connections: IntGauge, // database connections in use
-    pub write_events: Histogram, // response time of event writes
-    pub sent_events: IntCounterVec, // count of events sent to clients
-    pub connections: IntCounter, // count of websocket connections
-    pub disconnects: IntCounterVec, // client disconnects
+    pub query_sub: Histogram,        // response time of successful subscriptions
+    pub query_db: Histogram,         // individual database query execution time
+    pub db_connections: IntGauge,    // database connections in use
+    pub write_events: Histogram,     // response time of event writes
+    pub sent_events: IntCounterVec,  // count of events sent to clients
+    pub connections: IntCounter,     // count of websocket connections
+    pub disconnects: IntCounterVec,  // client disconnects
    pub query_aborts: IntCounterVec, // count of queries aborted by server
-    pub cmd_req: IntCounter, // count of REQ commands received
-    pub cmd_event: IntCounter, // count of EVENT commands received
-    pub cmd_close: IntCounter, // count of CLOSE commands received
-    pub cmd_auth: IntCounter, // count of AUTH commands received
-
+    pub cmd_req: IntCounter,         // count of REQ commands received
+    pub cmd_event: IntCounter,       // count of EVENT commands received
+    pub cmd_close: IntCounter,       // count of CLOSE commands received
+    pub cmd_auth: IntCounter,        // count of AUTH commands received
 }
--- a/src/subscription.rs
+++ b/src/subscription.rs
@@ -45,7 +45,8 @@ pub struct ReqFilter {

 impl Serialize for ReqFilter {
    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where S:Serializer,
+    where
+        S: Serializer,
    {
        let mut map = serializer.serialize_map(None)?;
        if let Some(ids) = &self.ids {
@@ -68,8 +69,8 @@ impl Serialize for ReqFilter {
        }
        // serialize tags
        if let Some(tags) = &self.tags {
-            for (k,v) in tags {
-                let vals:Vec<&String> = v.iter().collect();
+            for (k, v) in tags {
+                let vals: Vec<&String> = v.iter().collect();
                map.serialize_entry(&format!("#{k}"), &vals)?;
            }
        }
@@ -105,15 +106,16 @@ impl<'de> Deserialize<'de> for ReqFilter {
        for (key, val) in filter {
            // ids
            if key == "ids" {
-                let raw_ids: Option<Vec<String>>= 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"));
+                            &"a json object",
+                        ));
                    }
                }
-                rf.ids =raw_ids;
+                rf.ids = raw_ids;
            } else if key == "kinds" {
                rf.kinds = Deserialize::deserialize(val).ok();
            } else if key == "since" {
@@ -123,12 +125,13 @@ impl<'de> Deserialize<'de> for ReqFilter {
            } else if key == "limit" {
                rf.limit = Deserialize::deserialize(val).ok();
            } else if key == "authors" {
-                let raw_authors: Option<Vec<String>>= 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"));
+                            &"a json object",
+                        ));
                    }
                }
                rf.authors = raw_authors;
@@ -232,19 +235,22 @@ impl<'de> Deserialize<'de> for Subscription {

 impl Subscription {
    /// Get a copy of the subscription identifier.
-    #[must_use] pub fn get_id(&self) -> String {
+    #[must_use]
+    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.
-    #[must_use] pub fn needs_historical_events(&self) -> bool {
-        self.filters.iter().any(|f| f.limit!=Some(0))
+    #[must_use]
+    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.
-    #[must_use] pub fn interested_in_event(&self, event: &Event) -> bool {
+    #[must_use]
+    pub fn interested_in_event(&self, event: &Event) -> bool {
        for f in &self.filters {
            if f.interested_in_event(event) {
                return true;
@@ -305,13 +311,12 @@ impl ReqFilter {

    /// Check if this filter either matches, or does not care about the kind.
    fn kind_match(&self, kind: u64) -> bool {
-        self.kinds
-            .as_ref()
-            .map_or(true, |ks| ks.contains(&kind))
+        self.kinds.as_ref().map_or(true, |ks| ks.contains(&kind))
    }

    /// Determine if all populated fields in this filter match the provided event.
-    #[must_use] pub fn interested_in_event(&self, event: &Event) -> bool {
+    #[must_use]
+    pub fn interested_in_event(&self, event: &Event) -> bool {
        //        self.id.as_ref().map(|v| v == &event.id).unwrap_or(true)
        self.ids_match(event)
            && self.since.map_or(true, |t| event.created_at > t)
@@ -625,7 +630,9 @@ mod tests {

    #[test]
    fn serialize_filter() -> Result<()> {
-        let s: Subscription = serde_json::from_str(r##"["REQ","xyz",{"authors":["abc", "bcd"], "since": 10, "until": 20, "limit":100, "#e": ["foo", "bar"], "#d": ["test"]}]"##)?;
+        let s: Subscription = serde_json::from_str(
+            r##"["REQ","xyz",{"authors":["abc", "bcd"], "since": 10, "until": 20, "limit":100, "#e": ["foo", "bar"], "#d": ["test"]}]"##,
+        )?;
        let f = s.filters.get(0);
        let serialized = serde_json::to_string(&f)?;
        let serialized_wrapped = format!(r##"["REQ", "xyz",{}]"##, serialized);
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -4,7 +4,8 @@ use std::time::SystemTime;
 use url::Url;

 /// Seconds since 1970.
-#[must_use] pub fn unix_time() -> u64 {
+#[must_use]
+pub fn unix_time() -> u64 {
    SystemTime::now()
        .duration_since(SystemTime::UNIX_EPOCH)
        .map(|x| x.as_secs())
@@ -12,7 +13,8 @@ use url::Url;
 }

 /// Check if a string contains only hex characters.
-#[must_use] pub fn is_hex(s: &str) -> bool {
+#[must_use]
+pub fn is_hex(s: &str) -> bool {
    s.chars().all(|x| char::is_ascii_hexdigit(&x))
 }

@@ -28,14 +30,17 @@ pub fn nip19_to_hex(s: &str) -> Result<String, bech32::Error> {
 }

 /// Check if a string contains only lower-case hex chars.
-#[must_use] pub fn is_lower_hex(s: &str) -> bool {
+#[must_use]
+pub fn is_lower_hex(s: &str) -> bool {
    s.chars().all(|x| {
        (char::is_ascii_lowercase(&x) || char::is_ascii_digit(&x)) && char::is_ascii_hexdigit(&x)
    })
 }

 pub fn host_str(url: &String) -> Option<String> {
-    Url::parse(url).ok().and_then(|u| u.host_str().map(|s| s.to_string()))
+    Url::parse(url)
+        .ok()
+        .and_then(|u| u.host_str().map(|s| s.to_string()))
 }

 #[cfg(test)]
--- a/tests/cli.rs
+++ b/tests/cli.rs
@@ -7,4 +7,4 @@ mod tests {
        use clap::CommandFactory;
        CLIArgs::command().debug_assert();
    }
-}
+}
Author	SHA1	Message	Date
Greg Heartsfield	ba0b50bc9c	build: bump version to 0.8.9	2023-04-22 13:47:08 -05:00
0xtr	c65c64275e	docs: add systemd service file and guide	2023-04-19 18:37:16 -05:00
Greg Heartsfield	80c459c36c	improvement: switch to jemalloc allocator	2023-04-06 18:33:30 -05:00
rorp	8e4e2d824b	feat(NIP-42): limit access to kind 4 DMs	2023-03-03 09:04:35 -06:00
thesimplekid	c13961a5c4	fix: nip05 for postgres	2023-03-03 08:57:23 -06:00
thesimplekid	05b08c7916	feat: join via nip-07	2023-03-01 18:04:06 -06:00
Greg Heartsfield	9a141dc950	improvement: disable HTTP request logging	2023-02-25 15:57:01 -06:00
Greg Heartsfield	8c9170d4e3	fix: persist database version for v18 migration	2023-02-25 15:55:00 -06:00
Greg Heartsfield	5508020777	improvement: configure pay-to-relay defaults and comment block	2023-02-25 15:53:32 -06:00
Greg Heartsfield	43021910ea	improvement: disable pay-to-relay by default	2023-02-25 15:41:30 -06:00
thesimplekid	c0158af18b	feat(NIP-111): pay to relay (experimental)	2023-02-25 15:38:26 -06:00
Rene Honig	164603dedd	docs: add Traefik to reverse proxy doc	2023-02-25 14:50:58 -06:00
Greg Heartsfield	c1c25a22f5	refactor: format	2023-02-25 14:49:35 -06:00
thesimplekid	6df92f9580	refactor: format cargo fmt	2023-02-25 14:46:49 -06:00
Greg Heartsfield	440217e1ee	docs: add documented support for NIP-40	2023-02-25 14:29:52 -06:00
Greg Heartsfield	96359aafab	docs: better example of kinds for allowlist	2023-02-25 14:05:11 -06:00
Mike White	5414629298	feat: add event kind allowlist	2023-02-25 14:00:01 -06:00
Greg Heartsfield	2be75e18fb	build: bump version to 0.8.8	2023-02-21 08:16:40 -06:00
Greg Heartsfield	5f6ff4c2b7	fix: in-memory SQLite DB correctly shares memory between connections fixes: https://todo.sr.ht/~gheartsfield/nostr-rs-relay/73#event-227131	2023-02-21 08:14:19 -06:00
Greg Heartsfield	df411c24fb	fix: block other writers during checkpoint to eliminate DB lock errors	2023-02-20 16:50:44 -06:00