Merge branch 'master' into prevent-duplicate-lightning

backend/.env.template

@@ -28,6 +28,5 @@ LIVEKIT_API_SECRET=
 
 # Billing
 NWC_URL=                      # Nostr Wallet Connect URL for generating Lightning invoices
-ENCRYPTION_SECRET=            # Nostr secret key (hex or nsec) used for NIP-44 encryption of tenant nwc_url at rest
 STRIPE_SECRET_KEY=            # Required Stripe API secret key (sk_...)
 STRIPE_WEBHOOK_SECRET=whsec_test_00000000000000000000000000  # Webhook signing secret (use real value in production)

backend/README.md

@@ -30,30 +30,29 @@ backend/
 
 Environment variables:
 
-| Variable                 | Description                                                                             | Default                                  |
+| Variable                 | Description                                                             | Default                              |
-| ------------------------ | --------------------------------------------------------------------------------------- | ---------------------------------------- |
+| ------------------------ | ----------------------------------------------------------------------- | ------------------------------------ |
-| `DATABASE_URL`           | SQLite URL. Relative paths are resolved under `backend/`.                               | `sqlite://<backend>/data/caravel.db`     |
+| `DATABASE_URL`           | SQLite URL. Relative paths are resolved under `backend/`.               | `sqlite://<backend>/data/caravel.db` |
-| `HOST`                   | API bind host (also used for NIP-98 `u` host check)                                     | `127.0.0.1`                              |
+| `HOST`                   | API bind host (also used for NIP-98 `u` host check)                     | `127.0.0.1`                          |
-| `PORT`                   | API bind port                                                                           | `2892`                                   |
+| `PORT`                   | API bind port                                                           | `2892`                               |
-| `ADMINS`                 | Comma-separated admin pubkeys (hex)                                                     | _optional_                               |
+| `ADMINS`                 | Comma-separated admin pubkeys (hex)                                     | _optional_                           |
-| `ALLOW_ORIGINS`          | Comma-separated CORS origins. If empty, CORS is permissive.                             | _optional_                               |
+| `ALLOW_ORIGINS`          | Comma-separated CORS origins. If empty, CORS is permissive.             | _optional_                           |
-| `ZOOID_API_URL`          | Zooid API base URL used by infra worker                                                 | _required for infra sync_                |
+| `ZOOID_API_URL`          | Zooid API base URL used by infra worker                                 | _required for infra sync_            |
-| `ZOOID_API_SECRET`       | Nostr secret key used for authentication of requests to the zooid API                   | _required_                               |
+| `ZOOID_API_SECRET`       | Nostr secret key used for authentication of requests to the zooid API   | _required_                           |
-| `RELAY_DOMAIN`           | Base domain appended to relay subdomains                                                | empty                                    |
+| `RELAY_DOMAIN`           | Base domain appended to relay subdomains                                | empty                                |
-| `LIVEKIT_URL`            | LiveKit URL sent to zooid when relay livekit is enabled                                 | _optional_                               |
+| `LIVEKIT_URL`            | LiveKit URL sent to zooid when relay livekit is enabled                 | _optional_                           |
-| `LIVEKIT_API_KEY`        | LiveKit API key sent to zooid                                                           | _optional_                               |
+| `LIVEKIT_API_KEY`        | LiveKit API key sent to zooid                                           | _optional_                           |
-| `LIVEKIT_API_SECRET`     | LiveKit API secret sent to zooid                                                        | _optional_                               |
+| `LIVEKIT_API_SECRET`     | LiveKit API secret sent to zooid                                        | _optional_                           |
-| `NWC_URL`                | Platform NWC URL used to generate BOLT11 invoices                                       | _required for invoice generation_        |
+| `NWC_URL`                | Platform NWC URL used to generate BOLT11 invoices                       | _required for invoice generation_    |
-| `ENCRYPTION_SECRET`      | Nostr secret key (hex or `nsec`) used for NIP-44 encryption of tenant `nwc_url` at rest | _required when tenant `nwc_url` is used_ |
+| `STRIPE_SECRET_KEY`      | Stripe API secret key used for billing API operations                   | _required_                           |
-| `STRIPE_SECRET_KEY`      | Stripe API secret key used for billing API operations                                   | _required_                               |
+| `STRIPE_WEBHOOK_SECRET`  | Stripe webhook signing secret used to verify `Stripe-Signature` headers | _required_                           |
-| `STRIPE_WEBHOOK_SECRET`  | Stripe webhook signing secret used to verify `Stripe-Signature` headers                 | _required_                               |
+| `ROBOT_SECRET`           | Robot Nostr secret key                                                  | _required_                           |
-| `ROBOT_SECRET`           | Robot Nostr secret key                                                                  | _required_                               |
+| `ROBOT_NAME`             | Robot display name (kind `0`)                                           | _optional_                           |
-| `ROBOT_NAME`             | Robot display name (kind `0`)                                                           | _optional_                               |
+| `ROBOT_DESCRIPTION`      | Robot description (kind `0`)                                            | _optional_                           |
-| `ROBOT_DESCRIPTION`      | Robot description (kind `0`)                                                            | _optional_                               |
+| `ROBOT_PICTURE`          | Robot picture URL (kind `0`)                                            | _optional_                           |
-| `ROBOT_PICTURE`          | Robot picture URL (kind `0`)                                                            | _optional_                               |
+| `ROBOT_OUTBOX_RELAYS`    | Comma-separated relays published as kind `10002`                        | _required_                           |
-| `ROBOT_OUTBOX_RELAYS`    | Comma-separated relays published as kind `10002`                                        | _required_                               |
+| `ROBOT_INDEXER_RELAYS`   | Comma-separated relays used for recipient relay discovery               | _required_                           |
-| `ROBOT_INDEXER_RELAYS`   | Comma-separated relays used for recipient relay discovery                               | _required_                               |
+| `ROBOT_MESSAGING_RELAYS` | Comma-separated relays published as kind `10050`                        | _required_                           |
-| `ROBOT_MESSAGING_RELAYS` | Comma-separated relays published as kind `10050`                                        | _required_                               |
 
 Relay list env vars are comma-separated and trimmed. If a relay has no `ws://` or `wss://` scheme, `wss://` is prepended.
 

backend/migrations/0004_invoice_manual_lightning_payment.sql

@@ -1,11 +0,0 @@
-CREATE TABLE IF NOT EXISTS invoice_manual_lightning_payment (
-  invoice_id TEXT PRIMARY KEY,
-  tenant_pubkey TEXT NOT NULL,
-  bolt11 TEXT NOT NULL,
-  created_at INTEGER NOT NULL,
-  updated_at INTEGER NOT NULL,
-  FOREIGN KEY (tenant_pubkey) REFERENCES tenant(pubkey)
-);
-
-CREATE INDEX IF NOT EXISTS idx_invoice_manual_lightning_payment_tenant_pubkey
-ON invoice_manual_lightning_payment (tenant_pubkey);

backend/src/api.rs

@@ -445,17 +445,6 @@ struct IdentityResponse {
     is_admin: bool,
 }
 
-#[derive(Serialize)]
-struct TenantResponse {
-    pubkey: String,
-    nwc_configured: bool,
-    nwc_error: Option<String>,
-    created_at: i64,
-    stripe_customer_id: String,
-    stripe_subscription_id: Option<String>,
-    past_due_at: Option<i64>,
-}
-
 #[derive(Deserialize)]
 struct CreateRelayRequest {
     tenant: String,
@@ -497,7 +486,7 @@ async fn list_tenants(
     state.api.require_admin(&pubkey)?;
 
     match state.api.query.list_tenants().await {
-        Ok(tenants) => Ok(ok(StatusCode::OK, scrub_tenants_for_response(tenants))),
+        Ok(tenants) => Ok(ok(StatusCode::OK, tenants)),
         Err(e) => Ok(err(
             StatusCode::INTERNAL_SERVER_ERROR,
             "internal",
@@ -526,7 +515,7 @@ async fn create_tenant(
     let pubkey = state.api.extract_auth_pubkey(&headers)?;
 
     match state.api.query.get_tenant(&pubkey).await {
-        Ok(Some(t)) => Ok(ok(StatusCode::OK, scrub_tenant_for_response(t))),
+        Ok(Some(t)) => Ok(ok(StatusCode::OK, t)),
         Ok(None) => {
             let stripe_customer_id = match state.api.billing.stripe_create_customer(&pubkey).await {
                 Ok(id) => id,
@@ -550,10 +539,10 @@ async fn create_tenant(
             };
 
             match state.api.command.create_tenant(&tenant).await {
-                Ok(()) => Ok(ok(StatusCode::OK, scrub_tenant_for_response(tenant))),
+                Ok(()) => Ok(ok(StatusCode::OK, tenant)),
                 Err(e) if matches!(map_unique_error(&e), Some("pubkey-exists")) => {
                     match state.api.query.get_tenant(&pubkey).await {
-                        Ok(Some(t)) => Ok(ok(StatusCode::OK, scrub_tenant_for_response(t))),
+                        Ok(Some(t)) => Ok(ok(StatusCode::OK, t)),
                         Ok(None) => Ok(err(
                             StatusCode::INTERNAL_SERVER_ERROR,
                             "internal",
@@ -596,7 +585,7 @@ async fn get_tenant(
     let auth = state.api.extract_auth_pubkey(&headers)?;
     state.api.require_admin_or_tenant(&auth, &pubkey)?;
     let tenant = state.api.get_tenant_or_404(&pubkey).await?;
-    Ok(ok(StatusCode::OK, scrub_tenant_for_response(tenant)))
+    Ok(ok(StatusCode::OK, tenant))
 }
 
 async fn list_relays(
@@ -1020,13 +1009,6 @@ async fn get_invoice(
         .map_err(map_invoice_lookup_error)?;
     state.api.require_admin_or_tenant(&auth, &tenant.pubkey)?;
 
-    let invoice = state
-        .api
-        .billing
-        .reconcile_manual_lightning_invoice(&id, &invoice)
-        .await
-        .map_err(map_invoice_lookup_error)?;
-
     Ok(ok(StatusCode::OK, invoice))
 }
 
@@ -1044,13 +1026,6 @@ async fn get_invoice_bolt11(
         .map_err(map_invoice_lookup_error)?;
     state.api.require_admin_or_tenant(&auth, &tenant.pubkey)?;
 
-    let invoice = state
-        .api
-        .billing
-        .reconcile_manual_lightning_invoice(&id, &invoice)
-        .await
-        .map_err(map_invoice_lookup_error)?;
-
     let status = invoice["status"].as_str().unwrap_or_default();
     if status != "open" {
         return Ok(err(
@@ -1063,12 +1038,7 @@ async fn get_invoice_bolt11(
     let amount_due = invoice["amount_due"].as_i64().unwrap_or(0);
     let currency = invoice["currency"].as_str().unwrap_or("usd");
 
-    match state
+    match state.api.billing.create_bolt11(amount_due, currency).await {
-        .api
-        .billing
-        .get_or_create_manual_lightning_bolt11(&id, &tenant.pubkey, amount_due, currency)
-        .await
-    {
         Ok(bolt11) => Ok(ok(StatusCode::OK, serde_json::json!({ "bolt11": bolt11 }))),
         Err(e) => Ok(err(
             StatusCode::INTERNAL_SERVER_ERROR,
@@ -1133,7 +1103,7 @@ async fn update_tenant(
                     }
                 });
             }
-            Ok(ok(StatusCode::OK, scrub_tenant_for_response(tenant)))
+            Ok(ok(StatusCode::OK, tenant))
         }
         Err(e) => Ok(err(
             StatusCode::INTERNAL_SERVER_ERROR,
@@ -1142,19 +1112,3 @@ async fn update_tenant(
         )),
     }
 }
-
-fn scrub_tenant_for_response(tenant: Tenant) -> TenantResponse {
-    TenantResponse {
-        pubkey: tenant.pubkey,
-        nwc_configured: !tenant.nwc_url.is_empty(),
-        nwc_error: tenant.nwc_error,
-        created_at: tenant.created_at,
-        stripe_customer_id: tenant.stripe_customer_id,
-        stripe_subscription_id: tenant.stripe_subscription_id,
-        past_due_at: tenant.past_due_at,
-    }
-}
-
-fn scrub_tenants_for_response(tenants: Vec<Tenant>) -> Vec<TenantResponse> {
-    tenants.into_iter().map(scrub_tenant_for_response).collect()
-}

backend/src/billing.rs

@@ -1,8 +1,7 @@
 use anyhow::{Result, anyhow};
 use hmac::{Hmac, Mac};
 use nwc::prelude::{
-    LookupInvoiceRequest, LookupInvoiceResponse, MakeInvoiceRequest, NWC, NostrWalletConnectURI,
+    MakeInvoiceRequest, NWC, NostrWalletConnectURI, PayInvoiceRequest as NwcPayInvoiceRequest,
-    PayInvoiceRequest as NwcPayInvoiceRequest, TransactionState,
 };
 use sha2::Sha256;
 
@@ -121,10 +120,6 @@ impl Billing {
     pub async fn start(self) {
         let mut rx = self.command.notify.subscribe();
 
-        if let Err(error) = self.reconcile_relay_subscriptions("startup").await {
-            tracing::error!(error = %error, "failed to reconcile relay billing state on startup");
-        }
-
         loop {
             match rx.recv().await {
                 Ok(activity) => {
@@ -134,43 +129,12 @@ impl Billing {
                 }
                 Err(tokio::sync::broadcast::error::RecvError::Lagged(n)) => {
                     tracing::warn!(missed = n, "billing lagged");
-
-                    if let Err(error) = self.reconcile_relay_subscriptions("lagged").await {
-                        tracing::error!(error = %error, "failed to reconcile relay billing state after lag");
-                    }
                 }
                 Err(tokio::sync::broadcast::error::RecvError::Closed) => break,
             }
         }
     }
 
-    async fn reconcile_relay_subscriptions(&self, source: &str) -> Result<()> {
-        let relays = self.query.list_relays().await?;
-
-        if relays.is_empty() {
-            return Ok(());
-        }
-
-        tracing::info!(
-            source,
-            relay_count = relays.len(),
-            "reconciling relay billing state"
-        );
-
-        for relay in relays {
-            if let Err(error) = self.sync_relay_subscription_for_relay(&relay).await {
-                tracing::error!(
-                    source,
-                    relay = %relay.id,
-                    error = %error,
-                    "failed to reconcile relay billing state"
-                );
-            }
-        }
-
-        Ok(())
-    }
-
     async fn handle_activity(&self, activity: &Activity) -> Result<()> {
         let needs_billing_sync = matches!(
             activity.activity_type.as_str(),
@@ -194,10 +158,6 @@ impl Billing {
             return Ok(());
         };
 
-        self.sync_relay_subscription_for_relay(&relay).await
-    }
-
-    async fn sync_relay_subscription_for_relay(&self, relay: &Relay) -> Result<()> {
         let Some(tenant) = self.query.get_tenant(&relay.tenant).await? else {
             return Ok(());
         };
@@ -723,50 +683,6 @@ impl Billing {
         Ok((invoice, tenant))
     }
 
-    pub async fn reconcile_manual_lightning_invoice(
-        &self,
-        invoice_id: &str,
-        invoice: &serde_json::Value,
-    ) -> std::result::Result<serde_json::Value, InvoiceLookupError> {
-        self.reconcile_manual_lightning_invoice_if_settled(invoice_id, invoice)
-            .await
-    }
-
-    pub async fn get_or_create_manual_lightning_bolt11(
-        &self,
-        invoice_id: &str,
-        tenant_pubkey: &str,
-        amount_due_minor: i64,
-        currency: &str,
-    ) -> Result<String> {
-        if let Some(existing_bolt11) = self
-            .query
-            .get_invoice_manual_lightning_bolt11(invoice_id)
-            .await?
-        {
-            return Ok(existing_bolt11);
-        }
-
-        let bolt11 = self.create_bolt11(amount_due_minor, currency).await?;
-
-        if self
-            .command
-            .insert_manual_lightning_invoice_payment(invoice_id, tenant_pubkey, &bolt11)
-            .await?
-        {
-            return Ok(bolt11);
-        }
-
-        self.query
-            .get_invoice_manual_lightning_bolt11(invoice_id)
-            .await?
-            .ok_or_else(|| {
-                anyhow!(
-                    "manual lightning payment row missing after insert race for invoice {invoice_id}"
-                )
-            })
-    }
-
     pub async fn stripe_create_customer(&self, tenant_pubkey: &str) -> Result<String> {
         let short_pubkey: String = tenant_pubkey.chars().take(12).collect();
         let display_name = format!("Caravel tenant {short_pubkey}");
@@ -999,7 +915,8 @@ impl Billing {
         customer_id: &str,
         price_id: &str,
     ) -> Result<(String, String)> {
-        let idempotency_key = self.idempotency_key(&["create_subscription", customer_id, price_id]);
+        let idempotency_key =
+            self.idempotency_key(&["create_subscription", customer_id, price_id]);
         let resp = self
             .http
             .post(format!("{STRIPE_API}/subscriptions"))
@@ -1186,72 +1103,6 @@ impl Billing {
         Ok(())
     }
 
-    async fn reconcile_manual_lightning_invoice_if_settled(
-        &self,
-        invoice_id: &str,
-        invoice: &serde_json::Value,
-    ) -> std::result::Result<serde_json::Value, InvoiceLookupError> {
-        if invoice["status"].as_str().unwrap_or_default() != "open" {
-            return Ok(invoice.clone());
-        }
-
-        let Some(bolt11) = self
-            .query
-            .get_invoice_manual_lightning_bolt11(invoice_id)
-            .await?
-        else {
-            return Ok(invoice.clone());
-        };
-
-        let settled = match self.is_manual_lightning_invoice_settled(&bolt11).await {
-            Ok(settled) => settled,
-            Err(error) => {
-                tracing::warn!(
-                    error = %error,
-                    invoice_id,
-                    "failed to lookup manual lightning invoice settlement"
-                );
-                return Ok(invoice.clone());
-            }
-        };
-
-        if !settled {
-            return Ok(invoice.clone());
-        }
-
-        if let Err(error) = self.stripe_pay_invoice_out_of_band(invoice_id).await {
-            tracing::warn!(
-                error = %error,
-                invoice_id,
-                "failed to mark settled manual lightning invoice as paid_out_of_band"
-            );
-        }
-
-        self.stripe_get_invoice(invoice_id).await
-    }
-
-    async fn is_manual_lightning_invoice_settled(&self, bolt11: &str) -> Result<bool> {
-        let system_uri = Self::parse_nwc_uri(&self.nwc_url, "system")?;
-        let system_nwc = NWC::new(system_uri);
-
-        let lookup_req = LookupInvoiceRequest {
-            payment_hash: None,
-            invoice: Some(bolt11.to_string()),
-        };
-
-        let lookup_result = system_nwc.lookup_invoice(lookup_req).await;
-        system_nwc.shutdown().await;
-
-        let lookup_response =
-            lookup_result.map_err(|error| anyhow!("failed to lookup invoice: {error}"))?;
-
-        Ok(Self::lookup_invoice_response_is_settled(&lookup_response))
-    }
-
-    fn lookup_invoice_response_is_settled(response: &LookupInvoiceResponse) -> bool {
-        response.state == Some(TransactionState::Settled) || response.settled_at.is_some()
-    }
-
     fn parse_nwc_uri(nwc_url: &str, role: &str) -> Result<NostrWalletConnectURI> {
         nwc_url
             .parse::<NostrWalletConnectURI>()
@@ -1726,5 +1577,5 @@ mod tests {
         assert_eq!(billing.stripe_secret_key, "sk_test_dummy");
         assert_eq!(billing.stripe_webhook_secret, "whsec_test_dummy");
     }
-}
 
+}

backend/src/command.rs

@@ -2,7 +2,6 @@ use anyhow::Result;
 use sqlx::{Sqlite, SqlitePool, Transaction};
 use tokio::sync::broadcast;
 
-use crate::crypto;
 use crate::models::{
     Activity, RELAY_STATUS_ACTIVE, RELAY_STATUS_DELINQUENT, RELAY_STATUS_INACTIVE, Relay, Tenant,
 };
@@ -71,7 +70,6 @@ impl Command {
             anyhow::bail!("stripe_customer_id is required");
         }
 
-        let encrypted_nwc_url = crypto::encrypt(&tenant.nwc_url)?;
         let mut tx = self.pool.begin().await?;
 
         sqlx::query(
@@ -79,7 +77,7 @@ impl Command {
              VALUES (?, ?, ?, ?)",
         )
         .bind(&tenant.pubkey)
-        .bind(&encrypted_nwc_url)
+        .bind(&tenant.nwc_url)
         .bind(tenant.created_at)
         .bind(&tenant.stripe_customer_id)
         .execute(&mut *tx)
@@ -94,11 +92,10 @@ impl Command {
     }
 
     pub async fn update_tenant(&self, tenant: &Tenant) -> Result<()> {
-        let encrypted_nwc_url = crypto::encrypt(&tenant.nwc_url)?;
         let mut tx = self.pool.begin().await?;
 
         sqlx::query("UPDATE tenant SET nwc_url = ? WHERE pubkey = ?")
-            .bind(&encrypted_nwc_url)
+            .bind(&tenant.nwc_url)
             .bind(&tenant.pubkey)
             .execute(&mut *tx)
             .await?;
@@ -116,12 +113,12 @@ impl Command {
 
         sqlx::query(
             "INSERT INTO relay (
-                id, tenant, schema, subdomain, plan, status, synced, sync_error,
+                id, tenant, schema, subdomain, plan, status, sync_error,
                 info_name, info_icon, info_description,
                 policy_public_join, policy_strip_signatures,
                 groups_enabled, management_enabled, blossom_enabled,
                 livekit_enabled, push_enabled
-            ) VALUES (?, ?, ?, ?, ?, 'active', 0, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+            ) VALUES (?, ?, ?, ?, ?, 'active', ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
         )
         .bind(&relay.id)
         .bind(&relay.tenant)
@@ -154,7 +151,7 @@ impl Command {
 
         sqlx::query(
             "UPDATE relay
-             SET tenant = ?, schema = ?, subdomain = ?, plan = ?, status = ?, sync_error = ?, synced = 0,
+             SET tenant = ?, schema = ?, subdomain = ?, plan = ?, status = ?, sync_error = ?,
                  info_name = ?, info_icon = ?, info_description = ?,
                  policy_public_join = ?, policy_strip_signatures = ?,
                  groups_enabled = ?, management_enabled = ?, blossom_enabled = ?,
@@ -206,7 +203,7 @@ impl Command {
     ) -> Result<()> {
         let mut tx = self.pool.begin().await?;
 
-        sqlx::query("UPDATE relay SET status = ?, synced = 0 WHERE id = ?")
+        sqlx::query("UPDATE relay SET status = ? WHERE id = ?")
             .bind(status)
             .bind(relay_id)
             .execute(&mut *tx)
@@ -227,7 +224,7 @@ impl Command {
     pub async fn fail_relay_sync(&self, relay: &Relay, sync_error: String) -> Result<()> {
         let mut tx = self.pool.begin().await?;
 
-        sqlx::query("UPDATE relay SET synced = 0, sync_error = ? WHERE id = ?")
+        sqlx::query("UPDATE relay SET sync_error = ? WHERE id = ?")
             .bind(&sync_error)
             .bind(&relay.id)
             .execute(&mut *tx)
@@ -356,30 +353,6 @@ impl Command {
         Ok(())
     }
 
-    pub async fn insert_manual_lightning_invoice_payment(
-        &self,
-        invoice_id: &str,
-        tenant_pubkey: &str,
-        bolt11: &str,
-    ) -> Result<bool> {
-        let now = chrono::Utc::now().timestamp();
-        let result = sqlx::query(
-            "INSERT INTO invoice_manual_lightning_payment
-             (invoice_id, tenant_pubkey, bolt11, created_at, updated_at)
-             VALUES (?, ?, ?, ?, ?)
-             ON CONFLICT(invoice_id) DO NOTHING",
-        )
-        .bind(invoice_id)
-        .bind(tenant_pubkey)
-        .bind(bolt11)
-        .bind(now)
-        .bind(now)
-        .execute(&self.pool)
-        .await?;
-
-        Ok(result.rows_affected() > 0)
-    }
-
     pub async fn set_tenant_past_due(&self, pubkey: &str) -> Result<()> {
         let now = chrono::Utc::now().timestamp();
         sqlx::query("UPDATE tenant SET past_due_at = ? WHERE pubkey = ?")

backend/src/crypto.rs

@@ -1,49 +0,0 @@
-use anyhow::{Result, anyhow};
-use nostr_sdk::prelude::{Keys, nip44};
-
-const ENVELOPE_PREFIX: &str = "enc:nip44:v2:";
-
-pub fn encrypt(value: &str) -> Result<String> {
-    if value.is_empty() {
-        return Ok(String::new());
-    }
-
-    let keys = parse_encryption_keys()?;
-    let payload = nip44::encrypt(
-        keys.secret_key(),
-        &keys.public_key(),
-        value,
-        nip44::Version::V2,
-    )
-    .map_err(|e| anyhow!("encrypt failed: {e}"))?;
-
-    Ok(format!("{ENVELOPE_PREFIX}{payload}"))
-}
-
-pub fn decrypt(value: &str) -> Result<String> {
-    if value.is_empty() {
-        return Ok(String::new());
-    }
-
-    let Some(payload) = value.strip_prefix(ENVELOPE_PREFIX) else {
-        return Ok(value.to_string());
-    };
-
-    let keys = parse_encryption_keys()?;
-    nip44::decrypt(keys.secret_key(), &keys.public_key(), payload)
-        .map_err(|e| anyhow!("decrypt failed: {e}"))
-}
-
-fn parse_encryption_keys() -> Result<Keys> {
-    let raw = std::env::var("ENCRYPTION_SECRET")
-        .map_err(|_| anyhow!("missing ENCRYPTION_SECRET environment variable"))?;
-    let trimmed = raw.trim();
-
-    if trimmed.is_empty() {
-        return Err(anyhow!("missing ENCRYPTION_SECRET environment variable"));
-    }
-
-    Keys::parse(trimmed).map_err(|e| {
-        anyhow!("ENCRYPTION_SECRET must be a valid nostr secret key (hex or nsec): {e}")
-    })
-}

backend/src/infra.rs

@@ -53,8 +53,8 @@ impl Infra {
     pub async fn start(self) {
         let mut rx = self.command.notify.subscribe();
 
-        if let Err(error) = self.reconcile_relay_state("startup").await {
+        if let Err(e) = self.schedule_startup_retries().await {
-            tracing::error!(error = %error, "failed to reconcile relay state on startup");
+            tracing::error!(error = %e, "failed to schedule relay sync retries on startup");
         }
 
         loop {
@@ -66,10 +66,6 @@ impl Infra {
                 }
                 Err(tokio::sync::broadcast::error::RecvError::Lagged(n)) => {
                     tracing::warn!(missed = n, "infra lagged");
-
-                    if let Err(error) = self.reconcile_relay_state("lagged").await {
-                        tracing::error!(error = %error, "failed to reconcile relay state after lag");
-                    }
                 }
                 Err(tokio::sync::broadcast::error::RecvError::Closed) => break,
             }
@@ -93,32 +89,17 @@ impl Infra {
             return Ok(());
         };
 
-        let is_new = self.relay_sync_is_new(&relay).await?;
+        let is_new = relay.synced == 0;
         self.sync_and_report(&relay, is_new).await;
 
         Ok(())
     }
 
-    async fn reconcile_relay_state(&self, source: &str) -> Result<()> {
+    async fn schedule_startup_retries(&self) -> Result<()> {
-        let relays = self.query.list_relays_pending_sync().await?;
+        let relays = self.query.list_relays_with_sync_error().await?;
-
-        if relays.is_empty() {
-            return Ok(());
-        }
-
-        tracing::info!(
-            source,
-            relay_count = relays.len(),
-            "reconciling pending relay state"
-        );
 
         for relay in relays {
-            if relay.sync_error.trim().is_empty() {
+            self.schedule_relay_sync_retry(&relay.id, "startup").await?;
-                let is_new = self.relay_sync_is_new(&relay).await?;
-                self.sync_and_report(&relay, is_new).await;
-            } else {
-                self.schedule_relay_sync_retry(&relay.id, source).await?;
-            }
         }
 
         Ok(())
@@ -170,20 +151,11 @@ impl Infra {
             return Ok(());
         }
 
-        let is_new = self.relay_sync_is_new(&relay).await?;
+        let is_new = relay.synced == 0;
         self.sync_and_report(&relay, is_new).await;
         Ok(())
     }
 
-    async fn relay_sync_is_new(&self, relay: &Relay) -> Result<bool> {
-        if relay.synced == 1 {
-            return Ok(false);
-        }
-
-        let has_completed_sync = self.query.relay_has_completed_sync(&relay.id).await?;
-        Ok(!has_completed_sync)
-    }
-
     async fn sync_and_report(&self, relay: &Relay, is_new: bool) {
         match self.sync_relay(relay, is_new).await {
             Ok(()) => {

backend/src/lib.rs

@@ -1,7 +1,6 @@
 pub mod api;
 pub mod billing;
 pub mod command;
-pub mod crypto;
 pub mod infra;
 pub mod models;
 pub mod pool;

backend/src/main.rs

@@ -1,7 +1,6 @@
 mod api;
 mod billing;
 mod command;
-mod crypto;
 mod infra;
 mod models;
 mod pool;

backend/src/query.rs

@@ -1,7 +1,6 @@
 use anyhow::Result;
 use sqlx::SqlitePool;
 
-use crate::crypto;
 use crate::models::{Activity, Plan, Relay, Tenant};
 
 #[derive(Clone)]
@@ -22,7 +21,7 @@ impl Query {
         )
         .fetch_all(&self.pool)
         .await?;
-        rows.into_iter().map(decrypt_tenant_nwc_url).collect()
+        Ok(rows)
     }
 
     pub async fn get_tenant(&self, pubkey: &str) -> Result<Option<Tenant>> {
@@ -34,7 +33,7 @@ impl Query {
         .bind(pubkey)
         .fetch_optional(&self.pool)
         .await?;
-        row.map(decrypt_tenant_nwc_url).transpose()
+        Ok(row)
     }
 
     pub fn list_plans() -> Vec<Plan> {
@@ -95,7 +94,7 @@ impl Query {
         Ok(rows)
     }
 
-    pub async fn list_relays_pending_sync(&self) -> Result<Vec<Relay>> {
+    pub async fn list_relays_with_sync_error(&self) -> Result<Vec<Relay>> {
         let rows = sqlx::query_as::<_, Relay>(
             "SELECT id, tenant, schema, subdomain, plan, stripe_subscription_item_id,
                      status, sync_error,
@@ -104,7 +103,7 @@ impl Query {
                      groups_enabled, management_enabled, blossom_enabled,
                      livekit_enabled, push_enabled, synced
               FROM relay
-              WHERE synced = 0 OR TRIM(sync_error) != ''
+              WHERE TRIM(sync_error) != ''
               ORDER BY id",
         )
         .fetch_all(&self.pool)
@@ -159,7 +158,7 @@ impl Query {
         .bind(stripe_customer_id)
         .fetch_optional(&self.pool)
         .await?;
-        row.map(decrypt_tenant_nwc_url).transpose()
+        Ok(row)
     }
 
     pub async fn get_invoice_nwc_payment_state(&self, invoice_id: &str) -> Result<Option<String>> {
@@ -172,19 +171,6 @@ impl Query {
         Ok(state)
     }
 
-    pub async fn get_invoice_manual_lightning_bolt11(
-        &self,
-        invoice_id: &str,
-    ) -> Result<Option<String>> {
-        let bolt11 = sqlx::query_scalar::<_, String>(
-            "SELECT bolt11 FROM invoice_manual_lightning_payment WHERE invoice_id = ?",
-        )
-        .bind(invoice_id)
-        .fetch_optional(&self.pool)
-        .await?;
-        Ok(bolt11)
-    }
-
     pub async fn has_active_paid_relays(&self, tenant_id: &str) -> Result<bool> {
         let plans = sqlx::query_scalar::<_, String>(
             "SELECT plan FROM relay WHERE tenant = ? AND status = 'active'",
@@ -208,25 +194,4 @@ impl Query {
         .await?;
         Ok(rows)
     }
-
-    pub async fn relay_has_completed_sync(&self, relay_id: &str) -> Result<bool> {
-        let found = sqlx::query_scalar::<_, i64>(
-            "SELECT 1
-             FROM activity
-             WHERE resource_type = 'relay'
-               AND resource_id = ?
-               AND activity_type = 'complete_relay_sync'
-             LIMIT 1",
-        )
-        .bind(relay_id)
-        .fetch_optional(&self.pool)
-        .await?;
-
-        Ok(found.is_some())
-    }
-}
-
-fn decrypt_tenant_nwc_url(mut tenant: Tenant) -> Result<Tenant> {
-    tenant.nwc_url = crypto::decrypt(&tenant.nwc_url)?;
-    Ok(tenant)
 }

frontend/src/lib/api.ts

@@ -99,7 +99,6 @@ export type UpdateRelayInput = {
 export type Tenant = {
   pubkey: string
   nwc_url: string
-  nwc_configured: boolean
   created_at: number
   stripe_customer_id: string
   stripe_subscription_id: string | null

frontend/src/lib/hooks.ts

@@ -135,7 +135,7 @@ export const reactivateRelayById = (id: string) => reactivateRelay(id)
 
 export async function tenantNeedsPaymentSetup(): Promise<boolean> {
   const tenant = await getTenant(account()!.pubkey)
-  return !tenant.nwc_configured && !tenant.stripe_subscription_id
+  return !tenant.nwc_url && !tenant.stripe_subscription_id
 }
 
 export async function getLatestOpenInvoice(): Promise<Invoice | null> {

frontend/src/pages/Account.tsx

@@ -18,9 +18,9 @@ export default function Account() {
   const invoicesLoading = useMinLoading(() => invoices.loading)
 
   const hasBillingChanges = createMemo(() => {
+    const current = tenant()?.nwc_url?.trim() ?? ""
     const next = nwcUrl().trim()
-    if (next) return true
+    return current !== next
-    return tenant()?.nwc_configured ?? false
   })
 
   createEffect(() => {
@@ -169,7 +169,7 @@ export default function Account() {
                               <p class="text-xs text-gray-500 mt-0.5">{periodLabel()}</p>
                             </Show>
                           </div>
-                          <div class="flex items-center gap-2 shrink-0">
+                          <div class="flex items-center gap-2 flex-shrink-0">
                             <Show when={isOpen()}>
                               <span class="text-xs text-blue-600 font-medium">Pay now</span>
                             </Show>

frontend/src/pages/relays/RelayDetail.tsx

@@ -52,7 +52,7 @@ export default function RelayDetail() {
     if (!isPaidRelay()) return false
     const t = tenant()
     if (!t) return false
-    return !t.nwc_configured
+    return !t.nwc_url
   })
 
   return (