diff --git a/datasource.js b/datasource.js
index dfae53bf..4badca25 100644
--- a/datasource.js
+++ b/datasource.js
@@ -1,3 +1,14 @@
+/**
+ * TypeORM DataSource used only by the TypeORM CLI (e.g. migration:generate).
+ *
+ * Migrations at runtime are run from src/services/storage/migrations/runner.ts (allMigrations),
+ * not from this file. The app never uses this DataSource to run migrations.
+ *
+ * Workflow: update the migrations array in this file *before* running
+ * migration:generate, so TypeORM knows the current schema (entities + existing migrations).
+ * We do not update this file immediately after adding a new migration; update it when you
+ * are about to generate the next migration.
+ */
 import { DataSource } from "typeorm"
 import { User } from "./build/src/services/storage/entity/User.js"
 import { UserReceivingInvoice } from "./build/src/services/storage/entity/UserReceivingInvoice.js"
@@ -22,11 +33,13 @@ import { AppUserDevice } from "./build/src/services/storage/entity/AppUserDevice
 import { UserAccess } from "./build/src/services/storage/entity/UserAccess.js"
 import { AdminSettings } from "./build/src/services/storage/entity/AdminSettings.js"
 import { TransactionSwap } from "./build/src/services/storage/entity/TransactionSwap.js"
+import { InvoiceSwap } from "./build/src/services/storage/entity/InvoiceSwap.js"
 
 import { Initial1703170309875 } from './build/src/services/storage/migrations/1703170309875-initial.js'
 import { LspOrder1718387847693 } from './build/src/services/storage/migrations/1718387847693-lsp_order.js'
-import { LndNodeInfo1720187506189 } from './build/src/services/storage/migrations/1720187506189-lnd_node_info.js'
 import { LiquidityProvider1719335699480 } from './build/src/services/storage/migrations/1719335699480-liquidity_provider.js'
+import { LndNodeInfo1720187506189 } from './build/src/services/storage/migrations/1720187506189-lnd_node_info.js'
+import { TrackedProvider1720814323679 } from './build/src/services/storage/migrations/1720814323679-tracked_provider.js'
 import { CreateInviteTokenTable1721751414878 } from './build/src/services/storage/migrations/1721751414878-create_invite_token_table.js'
 import { PaymentIndex1721760297610 } from './build/src/services/storage/migrations/1721760297610-payment_index.js'
 import { DebitAccess1726496225078 } from './build/src/services/storage/migrations/1726496225078-debit_access.js'
@@ -35,6 +48,7 @@ import { DebitToPub1727105758354 } from './build/src/services/storage/migrations
 import { UserCbUrl1727112281043 } from './build/src/services/storage/migrations/1727112281043-user_cb_url.js'
 import { UserOffer1733502626042 } from './build/src/services/storage/migrations/1733502626042-user_offer.js'
 import { ManagementGrant1751307732346 } from './build/src/services/storage/migrations/1751307732346-management_grant.js'
+import { ManagementGrantBanned1751989251513 } from './build/src/services/storage/migrations/1751989251513-management_grant_banned.js'
 import { InvoiceCallbackUrls1752425992291 } from './build/src/services/storage/migrations/1752425992291-invoice_callback_urls.js'
 import { OldSomethingLeftover1753106599604 } from './build/src/services/storage/migrations/1753106599604-old_something_leftover.js'
 import { UserReceivingInvoiceIdx1753109184611 } from './build/src/services/storage/migrations/1753109184611-user_receiving_invoice_idx.js'
@@ -47,20 +61,32 @@ import { TxSwap1762890527098 } from './build/src/services/storage/migrations/176
 import { TxSwapAddress1764779178945 } from './build/src/services/storage/migrations/1764779178945-tx_swap_address.js'
 import { ClinkRequester1765497600000 } from './build/src/services/storage/migrations/1765497600000-clink_requester.js'
 import { TrackedProviderHeight1766504040000 } from './build/src/services/storage/migrations/1766504040000-tracked_provider_height.js'
+import { SwapsServiceUrl1768413055036 } from './build/src/services/storage/migrations/1768413055036-swaps_service_url.js'
+import { InvoiceSwaps1769529793283 } from './build/src/services/storage/migrations/1769529793283-invoice_swaps.js'
+import { InvoiceSwapsFixes1769805357459 } from './build/src/services/storage/migrations/1769805357459-invoice_swaps_fixes.js'
+import { ApplicationUserTopicId1770038768784 } from './build/src/services/storage/migrations/1770038768784-application_user_topic_id.js'
+import { SwapTimestamps1771347307798 } from './build/src/services/storage/migrations/1771347307798-swap_timestamps.js'
+
+
+
 
 export default new DataSource({
     type: "better-sqlite3",
     database: "db.sqlite",
     // logging: true,
-    migrations: [Initial1703170309875, LspOrder1718387847693, LiquidityProvider1719335699480, LndNodeInfo1720187506189, CreateInviteTokenTable1721751414878,
-        PaymentIndex1721760297610, DebitAccess1726496225078, DebitAccessFixes1726685229264, DebitToPub1727105758354, UserCbUrl1727112281043,
-        UserOffer1733502626042, ManagementGrant1751307732346, InvoiceCallbackUrls1752425992291, OldSomethingLeftover1753106599604, UserReceivingInvoiceIdx1753109184611,
-        AppUserDevice1753285173175, UserAccess1759426050669, AddBlindToUserOffer1760000000000, ApplicationAvatarUrl1761000001000, AdminSettings1761683639419, TxSwap1762890527098,
-        TxSwapAddress1764779178945, ClinkRequester1765497600000, TrackedProviderHeight1766504040000],
+    migrations: [Initial1703170309875, LspOrder1718387847693, LiquidityProvider1719335699480, LndNodeInfo1720187506189,
+        TrackedProvider1720814323679, CreateInviteTokenTable1721751414878, PaymentIndex1721760297610, DebitAccess1726496225078, DebitAccessFixes1726685229264,
+        DebitToPub1727105758354, UserCbUrl1727112281043, UserOffer1733502626042, ManagementGrant1751307732346, ManagementGrantBanned1751989251513,
+        InvoiceCallbackUrls1752425992291, OldSomethingLeftover1753106599604, UserReceivingInvoiceIdx1753109184611, AppUserDevice1753285173175,
+        UserAccess1759426050669, AddBlindToUserOffer1760000000000, ApplicationAvatarUrl1761000001000, AdminSettings1761683639419, TxSwap1762890527098,
+        TxSwapAddress1764779178945, ClinkRequester1765497600000, TrackedProviderHeight1766504040000, SwapsServiceUrl1768413055036,
+        InvoiceSwaps1769529793283, InvoiceSwapsFixes1769805357459, ApplicationUserTopicId1770038768784, SwapTimestamps1771347307798
+    ],
+
 
     entities: [User, UserReceivingInvoice, UserReceivingAddress, AddressReceivingTransaction, UserInvoicePayment, UserTransactionPayment,
         UserBasicAuth, UserEphemeralKey, Product, UserToUserPayment, Application, ApplicationUser, UserToUserPayment, LspOrder, LndNodeInfo,
-        TrackedProvider, InviteToken, DebitAccess, UserOffer, ManagementGrant, AppUserDevice, UserAccess, AdminSettings, TransactionSwap],
+        TrackedProvider, InviteToken, DebitAccess, UserOffer, ManagementGrant, AppUserDevice, UserAccess, AdminSettings, TransactionSwap, InvoiceSwap],
     // synchronize: true,
 })
-//npx typeorm migration:generate ./src/services/storage/migrations/swaps_service_url -d ./datasource.js
\ No newline at end of file
+//npx typeorm migration:generate ./src/services/storage/migrations/tx_swap_timestamps -d ./datasource.js
\ No newline at end of file
diff --git a/metricsDatasource.js b/metricsDatasource.js
index 226b9dac..aaf5ddbc 100644
--- a/metricsDatasource.js
+++ b/metricsDatasource.js
@@ -1,3 +1,14 @@
+/**
+ * TypeORM DataSource used only by the TypeORM CLI (e.g. migration:generate).
+ *
+ * Migrations at runtime are run from src/services/storage/migrations/runner.ts (allMigrations),
+ * not from this file. The app never uses this DataSource to run migrations.
+ *
+ * Workflow: update the migrations array in this file *before* running
+ * migration:generate, so TypeORM knows the current schema (entities + existing migrations).
+ * We do not update this file immediately after adding a new migration; update it when you
+ * are about to generate the next migration.
+ */
 import { DataSource } from "typeorm"
 import { BalanceEvent } from "./build/src/services/storage/entity/BalanceEvent.js"
 import { ChannelBalanceEvent } from "./build/src/services/storage/entity/ChannelsBalanceEvent.js"
@@ -8,12 +19,16 @@ import { LndMetrics1703170330183 } from './build/src/services/storage/migrations
 import { ChannelRouting1709316653538 } from './build/src/services/storage/migrations/1709316653538-channel_routing.js'
 import { HtlcCount1724266887195 } from './build/src/services/storage/migrations/1724266887195-htlc_count.js'
 import { BalanceEvents1724860966825 } from './build/src/services/storage/migrations/1724860966825-balance_events.js'
-
+import { RootOps1732566440447 } from './build/src/services/storage/migrations/1732566440447-root_ops.js'
+import { RootOpsTime1745428134124 } from './build/src/services/storage/migrations/1745428134124-root_ops_time.js'
+import { ChannelEvents1750777346411 } from './build/src/services/storage/migrations/1750777346411-channel_events.js'
+import { RootOpPending1771524665409 } from './build/src/services/storage/migrations/1771524665409-root_op_pending.js'
 export default new DataSource({
     type: "better-sqlite3",
     database: "metrics.sqlite",
     entities: [BalanceEvent, ChannelBalanceEvent, ChannelRouting, RootOperation, ChannelEvent],
-    migrations: [LndMetrics1703170330183, ChannelRouting1709316653538, HtlcCount1724266887195, BalanceEvents1724860966825]
+    migrations: [LndMetrics1703170330183, ChannelRouting1709316653538, HtlcCount1724266887195, BalanceEvents1724860966825,
+        RootOps1732566440447, RootOpsTime1745428134124, ChannelEvents1750777346411, RootOpPending1771524665409]
 });
 
-//npx typeorm migration:generate ./src/services/storage/migrations/channel_events -d ./metricsDatasource.js
\ No newline at end of file
+//npx typeorm migration:generate ./src/services/storage/migrations/root_op_pending -d ./metricsDatasource.js
\ No newline at end of file
diff --git a/proto/autogenerated/client.md b/proto/autogenerated/client.md
index 99023c69..d42fc9ac 100644
--- a/proto/autogenerated/client.md
+++ b/proto/autogenerated/client.md
@@ -58,6 +58,11 @@ The nostr server will send back a message response, and inside the body there wi
   - This methods has an __empty__ __request__ body
   - This methods has an __empty__ __response__ body
 
+- BumpTx
+  - auth type: __Admin__
+  - input: [BumpTx](#BumpTx)
+  - This methods has an __empty__ __response__ body
+
 - CloseChannel
   - auth type: __Admin__
   - input: [CloseChannelRequest](#CloseChannelRequest)
@@ -93,6 +98,11 @@ The nostr server will send back a message response, and inside the body there wi
   - input: [MessagingToken](#MessagingToken)
   - This methods has an __empty__ __response__ body
 
+- GetAdminInvoiceSwapQuotes
+  - auth type: __Admin__
+  - input: [InvoiceSwapRequest](#InvoiceSwapRequest)
+  - output: [InvoiceSwapQuoteList](#InvoiceSwapQuoteList)
+
 - GetAdminTransactionSwapQuotes
   - auth type: __Admin__
   - input: [TransactionSwapRequest](#TransactionSwapRequest)
@@ -103,6 +113,11 @@ The nostr server will send back a message response, and inside the body there wi
   - input: [AppsMetricsRequest](#AppsMetricsRequest)
   - output: [AppsMetrics](#AppsMetrics)
 
+- GetAssetsAndLiabilities
+  - auth type: __Admin__
+  - input: [AssetsAndLiabilitiesReq](#AssetsAndLiabilitiesReq)
+  - output: [AssetsAndLiabilities](#AssetsAndLiabilities)
+
 - GetBundleMetrics
   - auth type: __Metrics__
   - input: [LatestBundleMetricReq](#LatestBundleMetricReq)
@@ -243,20 +258,25 @@ The nostr server will send back a message response, and inside the body there wi
   - input: [LinkNPubThroughTokenRequest](#LinkNPubThroughTokenRequest)
   - This methods has an __empty__ __response__ body
 
-- ListAdminSwaps
+- ListAdminInvoiceSwaps
   - auth type: __Admin__
   - This methods has an __empty__ __request__ body
-  - output: [SwapsList](#SwapsList)
+  - output: [InvoiceSwapsList](#InvoiceSwapsList)
+
+- ListAdminTxSwaps
+  - auth type: __Admin__
+  - This methods has an __empty__ __request__ body
+  - output: [TxSwapsList](#TxSwapsList)
 
 - ListChannels
   - auth type: __Admin__
   - This methods has an __empty__ __request__ body
   - output: [LndChannels](#LndChannels)
 
-- ListSwaps
+- ListTxSwaps
   - auth type: __User__
   - This methods has an __empty__ __request__ body
-  - output: [SwapsList](#SwapsList)
+  - output: [TxSwapsList](#TxSwapsList)
 
 - LndGetInfo
   - auth type: __Admin__
@@ -290,10 +310,15 @@ The nostr server will send back a message response, and inside the body there wi
   - input: [PayAddressRequest](#PayAddressRequest)
   - output: [PayAddressResponse](#PayAddressResponse)
 
+- PayAdminInvoiceSwap
+  - auth type: __Admin__
+  - input: [PayAdminInvoiceSwapRequest](#PayAdminInvoiceSwapRequest)
+  - output: [AdminInvoiceSwapResponse](#AdminInvoiceSwapResponse)
+
 - PayAdminTransactionSwap
   - auth type: __Admin__
   - input: [PayAdminTransactionSwapRequest](#PayAdminTransactionSwapRequest)
-  - output: [AdminSwapResponse](#AdminSwapResponse)
+  - output: [AdminTxSwapResponse](#AdminTxSwapResponse)
 
 - PayInvoice
   - auth type: __User__
@@ -305,6 +330,11 @@ The nostr server will send back a message response, and inside the body there wi
   - This methods has an __empty__ __request__ body
   - This methods has an __empty__ __response__ body
 
+- RefundAdminInvoiceSwap
+  - auth type: __Admin__
+  - input: [RefundAdminInvoiceSwapRequest](#RefundAdminInvoiceSwapRequest)
+  - output: [AdminInvoiceSwapResponse](#AdminInvoiceSwapResponse)
+
 - ResetDebit
   - auth type: __User__
   - input: [DebitOperation](#DebitOperation)
@@ -484,6 +514,13 @@ The nostr server will send back a message response, and inside the body there wi
   - This methods has an __empty__ __request__ body
   - This methods has an __empty__ __response__ body
 
+- BumpTx
+  - auth type: __Admin__
+  - http method: __post__
+  - http route: __/api/admin/tx/bump__
+  - input: [BumpTx](#BumpTx)
+  - This methods has an __empty__ __response__ body
+
 - CloseChannel
   - auth type: __Admin__
   - http method: __post__
@@ -540,6 +577,13 @@ The nostr server will send back a message response, and inside the body there wi
   - input: [MessagingToken](#MessagingToken)
   - This methods has an __empty__ __response__ body
 
+- GetAdminInvoiceSwapQuotes
+  - auth type: __Admin__
+  - http method: __post__
+  - http route: __/api/admin/swap/invoice/quote__
+  - input: [InvoiceSwapRequest](#InvoiceSwapRequest)
+  - output: [InvoiceSwapQuoteList](#InvoiceSwapQuoteList)
+
 - GetAdminTransactionSwapQuotes
   - auth type: __Admin__
   - http method: __post__
@@ -575,6 +619,13 @@ The nostr server will send back a message response, and inside the body there wi
   - input: [AppsMetricsRequest](#AppsMetricsRequest)
   - output: [AppsMetrics](#AppsMetrics)
 
+- GetAssetsAndLiabilities
+  - auth type: __Admin__
+  - http method: __post__
+  - http route: __/api/admin/assets/liabilities__
+  - input: [AssetsAndLiabilitiesReq](#AssetsAndLiabilitiesReq)
+  - output: [AssetsAndLiabilities](#AssetsAndLiabilities)
+
 - GetBundleMetrics
   - auth type: __Metrics__
   - http method: __post__
@@ -743,7 +794,7 @@ The nostr server will send back a message response, and inside the body there wi
 - GetTransactionSwapQuotes
   - auth type: __User__
   - http method: __post__
-  - http route: __/api/user/swap/quote__
+  - http route: __/api/user/swap/transaction/quote__
   - input: [TransactionSwapRequest](#TransactionSwapRequest)
   - output: [TransactionSwapQuoteList](#TransactionSwapQuoteList)
 
@@ -834,12 +885,19 @@ The nostr server will send back a message response, and inside the body there wi
   - input: [LinkNPubThroughTokenRequest](#LinkNPubThroughTokenRequest)
   - This methods has an __empty__ __response__ body
 
-- ListAdminSwaps
+- ListAdminInvoiceSwaps
   - auth type: __Admin__
   - http method: __post__
-  - http route: __/api/admin/swap/list__
+  - http route: __/api/admin/swap/invoice/list__
   - This methods has an __empty__ __request__ body
-  - output: [SwapsList](#SwapsList)
+  - output: [InvoiceSwapsList](#InvoiceSwapsList)
+
+- ListAdminTxSwaps
+  - auth type: __Admin__
+  - http method: __post__
+  - http route: __/api/admin/swap/transaction/list__
+  - This methods has an __empty__ __request__ body
+  - output: [TxSwapsList](#TxSwapsList)
 
 - ListChannels
   - auth type: __Admin__
@@ -848,12 +906,12 @@ The nostr server will send back a message response, and inside the body there wi
   - This methods has an __empty__ __request__ body
   - output: [LndChannels](#LndChannels)
 
-- ListSwaps
+- ListTxSwaps
   - auth type: __User__
   - http method: __post__
-  - http route: __/api/user/swap/list__
+  - http route: __/api/user/swap/transaction/list__
   - This methods has an __empty__ __request__ body
-  - output: [SwapsList](#SwapsList)
+  - output: [TxSwapsList](#TxSwapsList)
 
 - LndGetInfo
   - auth type: __Admin__
@@ -899,12 +957,19 @@ The nostr server will send back a message response, and inside the body there wi
   - input: [PayAddressRequest](#PayAddressRequest)
   - output: [PayAddressResponse](#PayAddressResponse)
 
+- PayAdminInvoiceSwap
+  - auth type: __Admin__
+  - http method: __post__
+  - http route: __/api/admin/swap/invoice/pay__
+  - input: [PayAdminInvoiceSwapRequest](#PayAdminInvoiceSwapRequest)
+  - output: [AdminInvoiceSwapResponse](#AdminInvoiceSwapResponse)
+
 - PayAdminTransactionSwap
   - auth type: __Admin__
   - http method: __post__
   - http route: __/api/admin/swap/transaction/pay__
   - input: [PayAdminTransactionSwapRequest](#PayAdminTransactionSwapRequest)
-  - output: [AdminSwapResponse](#AdminSwapResponse)
+  - output: [AdminTxSwapResponse](#AdminTxSwapResponse)
 
 - PayAppUserInvoice
   - auth type: __App__
@@ -927,6 +992,13 @@ The nostr server will send back a message response, and inside the body there wi
   - This methods has an __empty__ __request__ body
   - This methods has an __empty__ __response__ body
 
+- RefundAdminInvoiceSwap
+  - auth type: __Admin__
+  - http method: __post__
+  - http route: __/api/admin/swap/invoice/refund__
+  - input: [RefundAdminInvoiceSwapRequest](#RefundAdminInvoiceSwapRequest)
+  - output: [AdminInvoiceSwapResponse](#AdminInvoiceSwapResponse)
+
 - RequestNPubLinkingToken
   - auth type: __App__
   - http method: __post__
@@ -1098,7 +1170,10 @@ The nostr server will send back a message response, and inside the body there wi
   - __name__: _string_
   - __price_sats__: _number_
 
-### AdminSwapResponse
+### AdminInvoiceSwapResponse
+  - __tx_id__: _string_
+
+### AdminTxSwapResponse
   - __network_fee__: _number_
   - __tx_id__: _string_
 
@@ -1135,6 +1210,21 @@ The nostr server will send back a message response, and inside the body there wi
   - __include_operations__: _boolean_ *this field is optional
   - __to_unix__: _number_ *this field is optional
 
+### AssetOperation
+  - __amount__: _number_
+  - __tracked__: _[TrackedOperation](#TrackedOperation)_ *this field is optional
+  - __ts__: _number_
+
+### AssetsAndLiabilities
+  - __liquidity_providers__: ARRAY of: _[LiquidityAssetProvider](#LiquidityAssetProvider)_
+  - __lnds__: ARRAY of: _[LndAssetProvider](#LndAssetProvider)_
+  - __users_balance__: _number_
+
+### AssetsAndLiabilitiesReq
+  - __limit_invoices__: _number_ *this field is optional
+  - __limit_payments__: _number_ *this field is optional
+  - __limit_providers__: _number_ *this field is optional
+
 ### AuthApp
   - __app__: _[Application](#Application)_
   - __auth_token__: _string_
@@ -1163,6 +1253,11 @@ The nostr server will send back a message response, and inside the body there wi
   - __nextRelay__: _string_ *this field is optional
   - __type__: _string_
 
+### BumpTx
+  - __output_index__: _number_
+  - __sat_per_vbyte__: _number_
+  - __txid__: _string_
+
 ### BundleData
   - __available_chunks__: ARRAY of: _number_
   - __base_64_data__: ARRAY of: _string_
@@ -1331,6 +1426,36 @@ The nostr server will send back a message response, and inside the body there wi
   - __token__: _string_
   - __url__: _string_
 
+### InvoiceSwapOperation
+  - __completed_at_unix__: _number_ *this field is optional
+  - __failure_reason__: _string_ *this field is optional
+  - __operation_payment__: _[UserOperation](#UserOperation)_ *this field is optional
+  - __quote__: _[InvoiceSwapQuote](#InvoiceSwapQuote)_
+
+### InvoiceSwapQuote
+  - __address__: _string_
+  - __chain_fee_sats__: _number_
+  - __expires_at_block_height__: _number_
+  - __invoice__: _string_
+  - __invoice_amount_sats__: _number_
+  - __paid_at_unix__: _number_
+  - __service_fee_sats__: _number_
+  - __service_url__: _string_
+  - __swap_fee_sats__: _number_
+  - __swap_operation_id__: _string_
+  - __transaction_amount_sats__: _number_
+  - __tx_id__: _string_
+
+### InvoiceSwapQuoteList
+  - __quotes__: ARRAY of: _[InvoiceSwapQuote](#InvoiceSwapQuote)_
+
+### InvoiceSwapRequest
+  - __amount_sats__: _number_
+
+### InvoiceSwapsList
+  - __current_block_height__: _number_
+  - __swaps__: ARRAY of: _[InvoiceSwapOperation](#InvoiceSwapOperation)_
+
 ### LatestBundleMetricReq
   - __limit__: _number_ *this field is optional
 
@@ -1340,6 +1465,10 @@ The nostr server will send back a message response, and inside the body there wi
 ### LinkNPubThroughTokenRequest
   - __token__: _string_
 
+### LiquidityAssetProvider
+  - __pubkey__: _string_
+  - __tracked__: _[TrackedLiquidityProvider](#TrackedLiquidityProvider)_ *this field is optional
+
 ### LiveDebitRequest
   - __debit__: _[LiveDebitRequest_debit](#LiveDebitRequest_debit)_
   - __npub__: _string_
@@ -1353,6 +1482,10 @@ The nostr server will send back a message response, and inside the body there wi
   - __latest_balance__: _number_
   - __operation__: _[UserOperation](#UserOperation)_
 
+### LndAssetProvider
+  - __pubkey__: _string_
+  - __tracked__: _[TrackedLndProvider](#TrackedLndProvider)_ *this field is optional
+
 ### LndChannels
   - __open_channels__: ARRAY of: _[OpenChannel](#OpenChannel)_
 
@@ -1534,6 +1667,11 @@ The nostr server will send back a message response, and inside the body there wi
   - __service_fee__: _number_
   - __txId__: _string_
 
+### PayAdminInvoiceSwapRequest
+  - __no_claim__: _boolean_ *this field is optional
+  - __sat_per_v_byte__: _number_
+  - __swap_operation_id__: _string_
+
 ### PayAdminTransactionSwapRequest
   - __address__: _string_
   - __swap_operation_id__: _string_
@@ -1584,6 +1722,18 @@ The nostr server will send back a message response, and inside the body there wi
 ### ProvidersDisruption
   - __disruptions__: ARRAY of: _[ProviderDisruption](#ProviderDisruption)_
 
+### PushNotificationEnvelope
+  - __app_npub_hex__: _string_
+  - __encrypted_payload__: _string_
+  - __topic_id__: _string_
+
+### PushNotificationPayload
+  - __data__: _[PushNotificationPayload_data](#PushNotificationPayload_data)_
+
+### RefundAdminInvoiceSwapRequest
+  - __sat_per_v_byte__: _number_
+  - __swap_operation_id__: _string_
+
 ### RelaysMigration
   - __relays__: ARRAY of: _string_
 
@@ -1640,19 +1790,31 @@ The nostr server will send back a message response, and inside the body there wi
   - __page__: _number_
   - __request_id__: _number_ *this field is optional
 
-### SwapOperation
-  - __address_paid__: _string_
-  - __failure_reason__: _string_ *this field is optional
-  - __operation_payment__: _[UserOperation](#UserOperation)_ *this field is optional
-  - __swap_operation_id__: _string_
+### TrackedLiquidityProvider
+  - __balance__: _number_
+  - __invoices__: ARRAY of: _[AssetOperation](#AssetOperation)_
+  - __payments__: ARRAY of: _[AssetOperation](#AssetOperation)_
 
-### SwapsList
-  - __quotes__: ARRAY of: _[TransactionSwapQuote](#TransactionSwapQuote)_
-  - __swaps__: ARRAY of: _[SwapOperation](#SwapOperation)_
+### TrackedLndProvider
+  - __channels_balance__: _number_
+  - __confirmed_balance__: _number_
+  - __incoming_tx__: ARRAY of: _[AssetOperation](#AssetOperation)_
+  - __invoices__: ARRAY of: _[AssetOperation](#AssetOperation)_
+  - __outgoing_tx__: ARRAY of: _[AssetOperation](#AssetOperation)_
+  - __payments__: ARRAY of: _[AssetOperation](#AssetOperation)_
+  - __unconfirmed_balance__: _number_
+
+### TrackedOperation
+  - __amount__: _number_
+  - __ts__: _number_
+  - __type__: _[TrackedOperationType](#TrackedOperationType)_
 
 ### TransactionSwapQuote
   - __chain_fee_sats__: _number_
+  - __completed_at_unix__: _number_
+  - __expires_at_block_height__: _number_
   - __invoice_amount_sats__: _number_
+  - __paid_at_unix__: _number_
   - __service_fee_sats__: _number_
   - __service_url__: _string_
   - __swap_fee_sats__: _number_
@@ -1665,6 +1827,16 @@ The nostr server will send back a message response, and inside the body there wi
 ### TransactionSwapRequest
   - __transaction_amount_sats__: _number_
 
+### TxSwapOperation
+  - __address_paid__: _string_ *this field is optional
+  - __failure_reason__: _string_ *this field is optional
+  - __operation_payment__: _[UserOperation](#UserOperation)_ *this field is optional
+  - __quote__: _[TransactionSwapQuote](#TransactionSwapQuote)_
+  - __tx_id__: _string_ *this field is optional
+
+### TxSwapsList
+  - __swaps__: ARRAY of: _[TxSwapOperation](#TxSwapOperation)_
+
 ### UpdateChannelPolicyRequest
   - __policy__: _[ChannelPolicy](#ChannelPolicy)_
   - __update__: _[UpdateChannelPolicyRequest_update](#UpdateChannelPolicyRequest_update)_
@@ -1707,6 +1879,7 @@ The nostr server will send back a message response, and inside the body there wi
   - __nmanage__: _string_
   - __noffer__: _string_
   - __service_fee_bps__: _number_
+  - __topic_id__: _string_
   - __userId__: _string_
   - __user_identifier__: _string_
 
@@ -1771,6 +1944,10 @@ The nostr server will send back a message response, and inside the body there wi
   - __BUNDLE_METRIC__
   - __USAGE_METRIC__
 
+### TrackedOperationType
+  - __ROOT__
+  - __USER__
+
 ### UserOperationType
   - __INCOMING_INVOICE__
   - __INCOMING_TX__
diff --git a/proto/autogenerated/go/http_client.go b/proto/autogenerated/go/http_client.go
index a2b0ecb0..43d60ce2 100644
--- a/proto/autogenerated/go/http_client.go
+++ b/proto/autogenerated/go/http_client.go
@@ -66,6 +66,7 @@ type Client struct {
 	BanDebit          func(req DebitOperation) error
 	BanUser           func(req BanUserRequest) (*BanUserResponse, error)
 	// batching method: BatchUser not implemented
+	BumpTx                        func(req BumpTx) error
 	CloseChannel                  func(req CloseChannelRequest) (*CloseChannelResponse, error)
 	CreateOneTimeInviteLink       func(req CreateOneTimeInviteLinkRequest) (*CreateOneTimeInviteLinkResponse, error)
 	DecodeInvoice                 func(req DecodeInvoiceRequest) (*DecodeInvoiceResponse, error)
@@ -74,11 +75,13 @@ type Client struct {
 	EncryptionExchange            func(req EncryptionExchangeRequest) error
 	EnrollAdminToken              func(req EnrollAdminTokenRequest) error
 	EnrollMessagingToken          func(req MessagingToken) error
+	GetAdminInvoiceSwapQuotes     func(req InvoiceSwapRequest) (*InvoiceSwapQuoteList, error)
 	GetAdminTransactionSwapQuotes func(req TransactionSwapRequest) (*TransactionSwapQuoteList, error)
 	GetApp                        func() (*Application, error)
 	GetAppUser                    func(req GetAppUserRequest) (*AppUser, error)
 	GetAppUserLNURLInfo           func(req GetAppUserLNURLInfoRequest) (*LnurlPayInfoResponse, error)
 	GetAppsMetrics                func(req AppsMetricsRequest) (*AppsMetrics, error)
+	GetAssetsAndLiabilities       func(req AssetsAndLiabilitiesReq) (*AssetsAndLiabilities, error)
 	GetBundleMetrics              func(req LatestBundleMetricReq) (*BundleMetrics, error)
 	GetDebitAuthorizations        func() (*DebitAuthorizations, error)
 	GetErrorStats                 func() (*ErrorStats, error)
@@ -114,19 +117,22 @@ type Client struct {
 	HandleLnurlWithdraw           func(query HandleLnurlWithdraw_Query) error
 	Health                        func() error
 	LinkNPubThroughToken          func(req LinkNPubThroughTokenRequest) error
-	ListAdminSwaps                func() (*SwapsList, error)
+	ListAdminInvoiceSwaps         func() (*InvoiceSwapsList, error)
+	ListAdminTxSwaps              func() (*TxSwapsList, error)
 	ListChannels                  func() (*LndChannels, error)
-	ListSwaps                     func() (*SwapsList, error)
+	ListTxSwaps                   func() (*TxSwapsList, error)
 	LndGetInfo                    func(req LndGetInfoRequest) (*LndGetInfoResponse, error)
 	NewAddress                    func(req NewAddressRequest) (*NewAddressResponse, error)
 	NewInvoice                    func(req NewInvoiceRequest) (*NewInvoiceResponse, error)
 	NewProductInvoice             func(query NewProductInvoice_Query) (*NewInvoiceResponse, error)
 	OpenChannel                   func(req OpenChannelRequest) (*OpenChannelResponse, error)
 	PayAddress                    func(req PayAddressRequest) (*PayAddressResponse, error)
-	PayAdminTransactionSwap       func(req PayAdminTransactionSwapRequest) (*AdminSwapResponse, error)
+	PayAdminInvoiceSwap           func(req PayAdminInvoiceSwapRequest) (*AdminInvoiceSwapResponse, error)
+	PayAdminTransactionSwap       func(req PayAdminTransactionSwapRequest) (*AdminTxSwapResponse, error)
 	PayAppUserInvoice             func(req PayAppUserInvoiceRequest) (*PayInvoiceResponse, error)
 	PayInvoice                    func(req PayInvoiceRequest) (*PayInvoiceResponse, error)
 	PingSubProcesses              func() error
+	RefundAdminInvoiceSwap        func(req RefundAdminInvoiceSwapRequest) (*AdminInvoiceSwapResponse, error)
 	RequestNPubLinkingToken       func(req RequestNPubLinkingTokenRequest) (*RequestNPubLinkingTokenResponse, error)
 	ResetDebit                    func(req DebitOperation) error
 	ResetManage                   func(req ManageOperation) error
@@ -460,6 +466,30 @@ func NewClient(params ClientParams) *Client {
 			return &res, nil
 		},
 		// batching method: BatchUser not implemented
+		BumpTx: func(req BumpTx) error {
+			auth, err := params.RetrieveAdminAuth()
+			if err != nil {
+				return err
+			}
+			finalRoute := "/api/admin/tx/bump"
+			body, err := json.Marshal(req)
+			if err != nil {
+				return err
+			}
+			resBody, err := doPostRequest(params.BaseURL+finalRoute, body, auth)
+			if err != nil {
+				return err
+			}
+			result := ResultError{}
+			err = json.Unmarshal(resBody, &result)
+			if err != nil {
+				return err
+			}
+			if result.Status == "ERROR" {
+				return fmt.Errorf(result.Reason)
+			}
+			return nil
+		},
 		CloseChannel: func(req CloseChannelRequest) (*CloseChannelResponse, error) {
 			auth, err := params.RetrieveAdminAuth()
 			if err != nil {
@@ -667,6 +697,35 @@ func NewClient(params ClientParams) *Client {
 			}
 			return nil
 		},
+		GetAdminInvoiceSwapQuotes: func(req InvoiceSwapRequest) (*InvoiceSwapQuoteList, error) {
+			auth, err := params.RetrieveAdminAuth()
+			if err != nil {
+				return nil, err
+			}
+			finalRoute := "/api/admin/swap/invoice/quote"
+			body, err := json.Marshal(req)
+			if err != nil {
+				return nil, err
+			}
+			resBody, err := doPostRequest(params.BaseURL+finalRoute, body, auth)
+			if err != nil {
+				return nil, err
+			}
+			result := ResultError{}
+			err = json.Unmarshal(resBody, &result)
+			if err != nil {
+				return nil, err
+			}
+			if result.Status == "ERROR" {
+				return nil, fmt.Errorf(result.Reason)
+			}
+			res := InvoiceSwapQuoteList{}
+			err = json.Unmarshal(resBody, &res)
+			if err != nil {
+				return nil, err
+			}
+			return &res, nil
+		},
 		GetAdminTransactionSwapQuotes: func(req TransactionSwapRequest) (*TransactionSwapQuoteList, error) {
 			auth, err := params.RetrieveAdminAuth()
 			if err != nil {
@@ -809,6 +868,35 @@ func NewClient(params ClientParams) *Client {
 			}
 			return &res, nil
 		},
+		GetAssetsAndLiabilities: func(req AssetsAndLiabilitiesReq) (*AssetsAndLiabilities, error) {
+			auth, err := params.RetrieveAdminAuth()
+			if err != nil {
+				return nil, err
+			}
+			finalRoute := "/api/admin/assets/liabilities"
+			body, err := json.Marshal(req)
+			if err != nil {
+				return nil, err
+			}
+			resBody, err := doPostRequest(params.BaseURL+finalRoute, body, auth)
+			if err != nil {
+				return nil, err
+			}
+			result := ResultError{}
+			err = json.Unmarshal(resBody, &result)
+			if err != nil {
+				return nil, err
+			}
+			if result.Status == "ERROR" {
+				return nil, fmt.Errorf(result.Reason)
+			}
+			res := AssetsAndLiabilities{}
+			err = json.Unmarshal(resBody, &res)
+			if err != nil {
+				return nil, err
+			}
+			return &res, nil
+		},
 		GetBundleMetrics: func(req LatestBundleMetricReq) (*BundleMetrics, error) {
 			auth, err := params.RetrieveMetricsAuth()
 			if err != nil {
@@ -1324,7 +1412,7 @@ func NewClient(params ClientParams) *Client {
 			if err != nil {
 				return nil, err
 			}
-			finalRoute := "/api/user/swap/quote"
+			finalRoute := "/api/user/swap/transaction/quote"
 			body, err := json.Marshal(req)
 			if err != nil {
 				return nil, err
@@ -1643,12 +1731,12 @@ func NewClient(params ClientParams) *Client {
 			}
 			return nil
 		},
-		ListAdminSwaps: func() (*SwapsList, error) {
+		ListAdminInvoiceSwaps: func() (*InvoiceSwapsList, error) {
 			auth, err := params.RetrieveAdminAuth()
 			if err != nil {
 				return nil, err
 			}
-			finalRoute := "/api/admin/swap/list"
+			finalRoute := "/api/admin/swap/invoice/list"
 			body := []byte{}
 			resBody, err := doPostRequest(params.BaseURL+finalRoute, body, auth)
 			if err != nil {
@@ -1662,7 +1750,33 @@ func NewClient(params ClientParams) *Client {
 			if result.Status == "ERROR" {
 				return nil, fmt.Errorf(result.Reason)
 			}
-			res := SwapsList{}
+			res := InvoiceSwapsList{}
+			err = json.Unmarshal(resBody, &res)
+			if err != nil {
+				return nil, err
+			}
+			return &res, nil
+		},
+		ListAdminTxSwaps: func() (*TxSwapsList, error) {
+			auth, err := params.RetrieveAdminAuth()
+			if err != nil {
+				return nil, err
+			}
+			finalRoute := "/api/admin/swap/transaction/list"
+			body := []byte{}
+			resBody, err := doPostRequest(params.BaseURL+finalRoute, body, auth)
+			if err != nil {
+				return nil, err
+			}
+			result := ResultError{}
+			err = json.Unmarshal(resBody, &result)
+			if err != nil {
+				return nil, err
+			}
+			if result.Status == "ERROR" {
+				return nil, fmt.Errorf(result.Reason)
+			}
+			res := TxSwapsList{}
 			err = json.Unmarshal(resBody, &res)
 			if err != nil {
 				return nil, err
@@ -1691,12 +1805,12 @@ func NewClient(params ClientParams) *Client {
 			}
 			return &res, nil
 		},
-		ListSwaps: func() (*SwapsList, error) {
+		ListTxSwaps: func() (*TxSwapsList, error) {
 			auth, err := params.RetrieveUserAuth()
 			if err != nil {
 				return nil, err
 			}
-			finalRoute := "/api/user/swap/list"
+			finalRoute := "/api/user/swap/transaction/list"
 			body := []byte{}
 			resBody, err := doPostRequest(params.BaseURL+finalRoute, body, auth)
 			if err != nil {
@@ -1710,7 +1824,7 @@ func NewClient(params ClientParams) *Client {
 			if result.Status == "ERROR" {
 				return nil, fmt.Errorf(result.Reason)
 			}
-			res := SwapsList{}
+			res := TxSwapsList{}
 			err = json.Unmarshal(resBody, &res)
 			if err != nil {
 				return nil, err
@@ -1892,7 +2006,36 @@ func NewClient(params ClientParams) *Client {
 			}
 			return &res, nil
 		},
-		PayAdminTransactionSwap: func(req PayAdminTransactionSwapRequest) (*AdminSwapResponse, error) {
+		PayAdminInvoiceSwap: func(req PayAdminInvoiceSwapRequest) (*AdminInvoiceSwapResponse, error) {
+			auth, err := params.RetrieveAdminAuth()
+			if err != nil {
+				return nil, err
+			}
+			finalRoute := "/api/admin/swap/invoice/pay"
+			body, err := json.Marshal(req)
+			if err != nil {
+				return nil, err
+			}
+			resBody, err := doPostRequest(params.BaseURL+finalRoute, body, auth)
+			if err != nil {
+				return nil, err
+			}
+			result := ResultError{}
+			err = json.Unmarshal(resBody, &result)
+			if err != nil {
+				return nil, err
+			}
+			if result.Status == "ERROR" {
+				return nil, fmt.Errorf(result.Reason)
+			}
+			res := AdminInvoiceSwapResponse{}
+			err = json.Unmarshal(resBody, &res)
+			if err != nil {
+				return nil, err
+			}
+			return &res, nil
+		},
+		PayAdminTransactionSwap: func(req PayAdminTransactionSwapRequest) (*AdminTxSwapResponse, error) {
 			auth, err := params.RetrieveAdminAuth()
 			if err != nil {
 				return nil, err
@@ -1914,7 +2057,7 @@ func NewClient(params ClientParams) *Client {
 			if result.Status == "ERROR" {
 				return nil, fmt.Errorf(result.Reason)
 			}
-			res := AdminSwapResponse{}
+			res := AdminTxSwapResponse{}
 			err = json.Unmarshal(resBody, &res)
 			if err != nil {
 				return nil, err
@@ -2000,6 +2143,35 @@ func NewClient(params ClientParams) *Client {
 			}
 			return nil
 		},
+		RefundAdminInvoiceSwap: func(req RefundAdminInvoiceSwapRequest) (*AdminInvoiceSwapResponse, error) {
+			auth, err := params.RetrieveAdminAuth()
+			if err != nil {
+				return nil, err
+			}
+			finalRoute := "/api/admin/swap/invoice/refund"
+			body, err := json.Marshal(req)
+			if err != nil {
+				return nil, err
+			}
+			resBody, err := doPostRequest(params.BaseURL+finalRoute, body, auth)
+			if err != nil {
+				return nil, err
+			}
+			result := ResultError{}
+			err = json.Unmarshal(resBody, &result)
+			if err != nil {
+				return nil, err
+			}
+			if result.Status == "ERROR" {
+				return nil, fmt.Errorf(result.Reason)
+			}
+			res := AdminInvoiceSwapResponse{}
+			err = json.Unmarshal(resBody, &res)
+			if err != nil {
+				return nil, err
+			}
+			return &res, nil
+		},
 		RequestNPubLinkingToken: func(req RequestNPubLinkingTokenRequest) (*RequestNPubLinkingTokenResponse, error) {
 			auth, err := params.RetrieveAppAuth()
 			if err != nil {
diff --git a/proto/autogenerated/go/types.go b/proto/autogenerated/go/types.go
index 841ced1d..cff46783 100644
--- a/proto/autogenerated/go/types.go
+++ b/proto/autogenerated/go/types.go
@@ -79,6 +79,13 @@ const (
 	USAGE_METRIC  SingleMetricType = "USAGE_METRIC"
 )
 
+type TrackedOperationType string
+
+const (
+	ROOT TrackedOperationType = "ROOT"
+	USER TrackedOperationType = "USER"
+)
+
 type UserOperationType string
 
 const (
@@ -123,7 +130,10 @@ type AddProductRequest struct {
 	Name       string `json:"name"`
 	Price_sats int64  `json:"price_sats"`
 }
-type AdminSwapResponse struct {
+type AdminInvoiceSwapResponse struct {
+	Tx_id string `json:"tx_id"`
+}
+type AdminTxSwapResponse struct {
 	Network_fee int64  `json:"network_fee"`
 	Tx_id       string `json:"tx_id"`
 }
@@ -160,6 +170,21 @@ type AppsMetricsRequest struct {
 	Include_operations bool  `json:"include_operations"`
 	To_unix            int64 `json:"to_unix"`
 }
+type AssetOperation struct {
+	Amount  int64             `json:"amount"`
+	Tracked *TrackedOperation `json:"tracked"`
+	Ts      int64             `json:"ts"`
+}
+type AssetsAndLiabilities struct {
+	Liquidity_providers []LiquidityAssetProvider `json:"liquidity_providers"`
+	Lnds                []LndAssetProvider       `json:"lnds"`
+	Users_balance       int64                    `json:"users_balance"`
+}
+type AssetsAndLiabilitiesReq struct {
+	Limit_invoices  int64 `json:"limit_invoices"`
+	Limit_payments  int64 `json:"limit_payments"`
+	Limit_providers int64 `json:"limit_providers"`
+}
 type AuthApp struct {
 	App        *Application `json:"app"`
 	Auth_token string       `json:"auth_token"`
@@ -188,6 +213,11 @@ type BeaconData struct {
 	Nextrelay string          `json:"nextRelay"`
 	Type      string          `json:"type"`
 }
+type BumpTx struct {
+	Output_index  int64  `json:"output_index"`
+	Sat_per_vbyte int64  `json:"sat_per_vbyte"`
+	Txid          string `json:"txid"`
+}
 type BundleData struct {
 	Available_chunks []int64  `json:"available_chunks"`
 	Base_64_data     []string `json:"base_64_data"`
@@ -356,6 +386,36 @@ type HttpCreds struct {
 	Token string `json:"token"`
 	Url   string `json:"url"`
 }
+type InvoiceSwapOperation struct {
+	Completed_at_unix int64             `json:"completed_at_unix"`
+	Failure_reason    string            `json:"failure_reason"`
+	Operation_payment *UserOperation    `json:"operation_payment"`
+	Quote             *InvoiceSwapQuote `json:"quote"`
+}
+type InvoiceSwapQuote struct {
+	Address                 string `json:"address"`
+	Chain_fee_sats          int64  `json:"chain_fee_sats"`
+	Expires_at_block_height int64  `json:"expires_at_block_height"`
+	Invoice                 string `json:"invoice"`
+	Invoice_amount_sats     int64  `json:"invoice_amount_sats"`
+	Paid_at_unix            int64  `json:"paid_at_unix"`
+	Service_fee_sats        int64  `json:"service_fee_sats"`
+	Service_url             string `json:"service_url"`
+	Swap_fee_sats           int64  `json:"swap_fee_sats"`
+	Swap_operation_id       string `json:"swap_operation_id"`
+	Transaction_amount_sats int64  `json:"transaction_amount_sats"`
+	Tx_id                   string `json:"tx_id"`
+}
+type InvoiceSwapQuoteList struct {
+	Quotes []InvoiceSwapQuote `json:"quotes"`
+}
+type InvoiceSwapRequest struct {
+	Amount_sats int64 `json:"amount_sats"`
+}
+type InvoiceSwapsList struct {
+	Current_block_height int64                  `json:"current_block_height"`
+	Swaps                []InvoiceSwapOperation `json:"swaps"`
+}
 type LatestBundleMetricReq struct {
 	Limit int64 `json:"limit"`
 }
@@ -365,6 +425,10 @@ type LatestUsageMetricReq struct {
 type LinkNPubThroughTokenRequest struct {
 	Token string `json:"token"`
 }
+type LiquidityAssetProvider struct {
+	Pubkey  string                    `json:"pubkey"`
+	Tracked *TrackedLiquidityProvider `json:"tracked"`
+}
 type LiveDebitRequest struct {
 	Debit      *LiveDebitRequest_debit `json:"debit"`
 	Npub       string                  `json:"npub"`
@@ -378,6 +442,10 @@ type LiveUserOperation struct {
 	Latest_balance int64          `json:"latest_balance"`
 	Operation      *UserOperation `json:"operation"`
 }
+type LndAssetProvider struct {
+	Pubkey  string              `json:"pubkey"`
+	Tracked *TrackedLndProvider `json:"tracked"`
+}
 type LndChannels struct {
 	Open_channels []OpenChannel `json:"open_channels"`
 }
@@ -559,6 +627,11 @@ type PayAddressResponse struct {
 	Service_fee  int64  `json:"service_fee"`
 	Txid         string `json:"txId"`
 }
+type PayAdminInvoiceSwapRequest struct {
+	No_claim          bool   `json:"no_claim"`
+	Sat_per_v_byte    int64  `json:"sat_per_v_byte"`
+	Swap_operation_id string `json:"swap_operation_id"`
+}
 type PayAdminTransactionSwapRequest struct {
 	Address           string `json:"address"`
 	Swap_operation_id string `json:"swap_operation_id"`
@@ -609,6 +682,18 @@ type ProviderDisruption struct {
 type ProvidersDisruption struct {
 	Disruptions []ProviderDisruption `json:"disruptions"`
 }
+type PushNotificationEnvelope struct {
+	App_npub_hex      string `json:"app_npub_hex"`
+	Encrypted_payload string `json:"encrypted_payload"`
+	Topic_id          string `json:"topic_id"`
+}
+type PushNotificationPayload struct {
+	Data *PushNotificationPayload_data `json:"data"`
+}
+type RefundAdminInvoiceSwapRequest struct {
+	Sat_per_v_byte    int64  `json:"sat_per_v_byte"`
+	Swap_operation_id string `json:"swap_operation_id"`
+}
 type RelaysMigration struct {
 	Relays []string `json:"relays"`
 }
@@ -665,19 +750,31 @@ type SingleMetricReq struct {
 	Page         int64            `json:"page"`
 	Request_id   int64            `json:"request_id"`
 }
-type SwapOperation struct {
-	Address_paid      string         `json:"address_paid"`
-	Failure_reason    string         `json:"failure_reason"`
-	Operation_payment *UserOperation `json:"operation_payment"`
-	Swap_operation_id string         `json:"swap_operation_id"`
+type TrackedLiquidityProvider struct {
+	Balance  int64            `json:"balance"`
+	Invoices []AssetOperation `json:"invoices"`
+	Payments []AssetOperation `json:"payments"`
 }
-type SwapsList struct {
-	Quotes []TransactionSwapQuote `json:"quotes"`
-	Swaps  []SwapOperation        `json:"swaps"`
+type TrackedLndProvider struct {
+	Channels_balance    int64            `json:"channels_balance"`
+	Confirmed_balance   int64            `json:"confirmed_balance"`
+	Incoming_tx         []AssetOperation `json:"incoming_tx"`
+	Invoices            []AssetOperation `json:"invoices"`
+	Outgoing_tx         []AssetOperation `json:"outgoing_tx"`
+	Payments            []AssetOperation `json:"payments"`
+	Unconfirmed_balance int64            `json:"unconfirmed_balance"`
+}
+type TrackedOperation struct {
+	Amount int64                `json:"amount"`
+	Ts     int64                `json:"ts"`
+	Type   TrackedOperationType `json:"type"`
 }
 type TransactionSwapQuote struct {
 	Chain_fee_sats          int64  `json:"chain_fee_sats"`
+	Completed_at_unix       int64  `json:"completed_at_unix"`
+	Expires_at_block_height int64  `json:"expires_at_block_height"`
 	Invoice_amount_sats     int64  `json:"invoice_amount_sats"`
+	Paid_at_unix            int64  `json:"paid_at_unix"`
 	Service_fee_sats        int64  `json:"service_fee_sats"`
 	Service_url             string `json:"service_url"`
 	Swap_fee_sats           int64  `json:"swap_fee_sats"`
@@ -690,6 +787,16 @@ type TransactionSwapQuoteList struct {
 type TransactionSwapRequest struct {
 	Transaction_amount_sats int64 `json:"transaction_amount_sats"`
 }
+type TxSwapOperation struct {
+	Address_paid      string                `json:"address_paid"`
+	Failure_reason    string                `json:"failure_reason"`
+	Operation_payment *UserOperation        `json:"operation_payment"`
+	Quote             *TransactionSwapQuote `json:"quote"`
+	Tx_id             string                `json:"tx_id"`
+}
+type TxSwapsList struct {
+	Swaps []TxSwapOperation `json:"swaps"`
+}
 type UpdateChannelPolicyRequest struct {
 	Policy *ChannelPolicy                     `json:"policy"`
 	Update *UpdateChannelPolicyRequest_update `json:"update"`
@@ -732,6 +839,7 @@ type UserInfo struct {
 	Nmanage               string `json:"nmanage"`
 	Noffer                string `json:"noffer"`
 	Service_fee_bps       int64  `json:"service_fee_bps"`
+	Topic_id              string `json:"topic_id"`
 	Userid                string `json:"userId"`
 	User_identifier       string `json:"user_identifier"`
 }
@@ -830,6 +938,18 @@ type NPubLinking_state struct {
 	Linking_token *string                `json:"linking_token"`
 	Unlinked      *Empty                 `json:"unlinked"`
 }
+type PushNotificationPayload_data_type string
+
+const (
+	RECEIVED_OPERATION PushNotificationPayload_data_type = "received_operation"
+	SENT_OPERATION     PushNotificationPayload_data_type = "sent_operation"
+)
+
+type PushNotificationPayload_data struct {
+	Type               PushNotificationPayload_data_type `json:"type"`
+	Received_operation *UserOperation                    `json:"received_operation"`
+	Sent_operation     *UserOperation                    `json:"sent_operation"`
+}
 type UpdateChannelPolicyRequest_update_type string
 
 const (
diff --git a/proto/autogenerated/ts/express_server.ts b/proto/autogenerated/ts/express_server.ts
index c1740acd..aa809166 100644
--- a/proto/autogenerated/ts/express_server.ts
+++ b/proto/autogenerated/ts/express_server.ts
@@ -545,12 +545,12 @@ export default (methods: Types.ServerMethods, opts: ServerOptions) => {
                                 callsMetrics.push({ ...opInfo, ...opStats, ...ctx })
                             }
                             break
-                        case 'ListSwaps':
-                            if (!methods.ListSwaps) {
-                                throw new Error('method ListSwaps not found' )
+                        case 'ListTxSwaps':
+                            if (!methods.ListTxSwaps) {
+                                throw new Error('method ListTxSwaps not found' )
                             } else {
                                 opStats.validate = opStats.guard
-                                const res = await methods.ListSwaps({...operation, ctx}); responses.push({ status: 'OK', ...res  })
+                                const res = await methods.ListTxSwaps({...operation, ctx}); responses.push({ status: 'OK', ...res  })
                                 opStats.handle = process.hrtime.bigint()
                                 callsMetrics.push({ ...opInfo, ...opStats, ...ctx })
                             }
@@ -693,6 +693,28 @@ export default (methods: Types.ServerMethods, opts: ServerOptions) => {
             opts.metricsCallback([{ ...info, ...stats, ...ctx }, ...callsMetrics])
         } catch (ex) { const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
     })
+    if (!opts.allowNotImplementedMethods && !methods.BumpTx) throw new Error('method: BumpTx is not implemented')
+    app.post('/api/admin/tx/bump', async (req, res) => {
+        const info: Types.RequestInfo = { rpcName: 'BumpTx', batch: false, nostr: false, batchSize: 0}
+        const stats: Types.RequestStats = { startMs:req.startTimeMs || 0, start:req.startTime || 0n, parse: process.hrtime.bigint(), guard: 0n, validate: 0n, handle: 0n }
+        let authCtx: Types.AuthContext = {}
+        try {
+            if (!methods.BumpTx) throw new Error('method: BumpTx is not implemented')
+            const authContext = await opts.AdminAuthGuard(req.headers['authorization'])
+            authCtx = authContext
+            stats.guard = process.hrtime.bigint()
+            const request = req.body
+            const error = Types.BumpTxValidate(request)
+            stats.validate = process.hrtime.bigint()
+            if (error !== null) return logErrorAndReturnResponse(error, 'invalid request body', res, logger, { ...info, ...stats, ...authContext }, opts.metricsCallback)
+            const query = req.query
+            const params = req.params
+             await methods.BumpTx({rpcName:'BumpTx', ctx:authContext , req: request})
+            stats.handle = process.hrtime.bigint()
+            res.json({status: 'OK'})
+            opts.metricsCallback([{ ...info, ...stats, ...authContext }])
+        } catch (ex) { const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
+    })
     if (!opts.allowNotImplementedMethods && !methods.CloseChannel) throw new Error('method: CloseChannel is not implemented')
     app.post('/api/admin/channel/close', async (req, res) => {
         const info: Types.RequestInfo = { rpcName: 'CloseChannel', batch: false, nostr: false, batchSize: 0}
@@ -869,6 +891,28 @@ export default (methods: Types.ServerMethods, opts: ServerOptions) => {
             opts.metricsCallback([{ ...info, ...stats, ...authContext }])
         } catch (ex) { const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
     })
+    if (!opts.allowNotImplementedMethods && !methods.GetAdminInvoiceSwapQuotes) throw new Error('method: GetAdminInvoiceSwapQuotes is not implemented')
+    app.post('/api/admin/swap/invoice/quote', async (req, res) => {
+        const info: Types.RequestInfo = { rpcName: 'GetAdminInvoiceSwapQuotes', batch: false, nostr: false, batchSize: 0}
+        const stats: Types.RequestStats = { startMs:req.startTimeMs || 0, start:req.startTime || 0n, parse: process.hrtime.bigint(), guard: 0n, validate: 0n, handle: 0n }
+        let authCtx: Types.AuthContext = {}
+        try {
+            if (!methods.GetAdminInvoiceSwapQuotes) throw new Error('method: GetAdminInvoiceSwapQuotes is not implemented')
+            const authContext = await opts.AdminAuthGuard(req.headers['authorization'])
+            authCtx = authContext
+            stats.guard = process.hrtime.bigint()
+            const request = req.body
+            const error = Types.InvoiceSwapRequestValidate(request)
+            stats.validate = process.hrtime.bigint()
+            if (error !== null) return logErrorAndReturnResponse(error, 'invalid request body', res, logger, { ...info, ...stats, ...authContext }, opts.metricsCallback)
+            const query = req.query
+            const params = req.params
+            const response =  await methods.GetAdminInvoiceSwapQuotes({rpcName:'GetAdminInvoiceSwapQuotes', ctx:authContext , req: request})
+            stats.handle = process.hrtime.bigint()
+            res.json({status: 'OK', ...response})
+            opts.metricsCallback([{ ...info, ...stats, ...authContext }])
+        } catch (ex) { const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
+    })
     if (!opts.allowNotImplementedMethods && !methods.GetAdminTransactionSwapQuotes) throw new Error('method: GetAdminTransactionSwapQuotes is not implemented')
     app.post('/api/admin/swap/transaction/quote', async (req, res) => {
         const info: Types.RequestInfo = { rpcName: 'GetAdminTransactionSwapQuotes', batch: false, nostr: false, batchSize: 0}
@@ -976,6 +1020,28 @@ export default (methods: Types.ServerMethods, opts: ServerOptions) => {
             opts.metricsCallback([{ ...info, ...stats, ...authContext }])
         } catch (ex) { const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
     })
+    if (!opts.allowNotImplementedMethods && !methods.GetAssetsAndLiabilities) throw new Error('method: GetAssetsAndLiabilities is not implemented')
+    app.post('/api/admin/assets/liabilities', async (req, res) => {
+        const info: Types.RequestInfo = { rpcName: 'GetAssetsAndLiabilities', batch: false, nostr: false, batchSize: 0}
+        const stats: Types.RequestStats = { startMs:req.startTimeMs || 0, start:req.startTime || 0n, parse: process.hrtime.bigint(), guard: 0n, validate: 0n, handle: 0n }
+        let authCtx: Types.AuthContext = {}
+        try {
+            if (!methods.GetAssetsAndLiabilities) throw new Error('method: GetAssetsAndLiabilities is not implemented')
+            const authContext = await opts.AdminAuthGuard(req.headers['authorization'])
+            authCtx = authContext
+            stats.guard = process.hrtime.bigint()
+            const request = req.body
+            const error = Types.AssetsAndLiabilitiesReqValidate(request)
+            stats.validate = process.hrtime.bigint()
+            if (error !== null) return logErrorAndReturnResponse(error, 'invalid request body', res, logger, { ...info, ...stats, ...authContext }, opts.metricsCallback)
+            const query = req.query
+            const params = req.params
+            const response =  await methods.GetAssetsAndLiabilities({rpcName:'GetAssetsAndLiabilities', ctx:authContext , req: request})
+            stats.handle = process.hrtime.bigint()
+            res.json({status: 'OK', ...response})
+            opts.metricsCallback([{ ...info, ...stats, ...authContext }])
+        } catch (ex) { const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
+    })
     if (!opts.allowNotImplementedMethods && !methods.GetBundleMetrics) throw new Error('method: GetBundleMetrics is not implemented')
     app.post('/api/reports/bundle', async (req, res) => {
         const info: Types.RequestInfo = { rpcName: 'GetBundleMetrics', batch: false, nostr: false, batchSize: 0}
@@ -1362,7 +1428,7 @@ export default (methods: Types.ServerMethods, opts: ServerOptions) => {
         } catch (ex) { const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
     })
     if (!opts.allowNotImplementedMethods && !methods.GetTransactionSwapQuotes) throw new Error('method: GetTransactionSwapQuotes is not implemented')
-    app.post('/api/user/swap/quote', async (req, res) => {
+    app.post('/api/user/swap/transaction/quote', async (req, res) => {
         const info: Types.RequestInfo = { rpcName: 'GetTransactionSwapQuotes', batch: false, nostr: false, batchSize: 0}
         const stats: Types.RequestStats = { startMs:req.startTimeMs || 0, start:req.startTime || 0n, parse: process.hrtime.bigint(), guard: 0n, validate: 0n, handle: 0n }
         let authCtx: Types.AuthContext = {}
@@ -1607,20 +1673,39 @@ export default (methods: Types.ServerMethods, opts: ServerOptions) => {
             opts.metricsCallback([{ ...info, ...stats, ...authContext }])
         } catch (ex) { const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
     })
-    if (!opts.allowNotImplementedMethods && !methods.ListAdminSwaps) throw new Error('method: ListAdminSwaps is not implemented')
-    app.post('/api/admin/swap/list', async (req, res) => {
-        const info: Types.RequestInfo = { rpcName: 'ListAdminSwaps', batch: false, nostr: false, batchSize: 0}
+    if (!opts.allowNotImplementedMethods && !methods.ListAdminInvoiceSwaps) throw new Error('method: ListAdminInvoiceSwaps is not implemented')
+    app.post('/api/admin/swap/invoice/list', async (req, res) => {
+        const info: Types.RequestInfo = { rpcName: 'ListAdminInvoiceSwaps', batch: false, nostr: false, batchSize: 0}
         const stats: Types.RequestStats = { startMs:req.startTimeMs || 0, start:req.startTime || 0n, parse: process.hrtime.bigint(), guard: 0n, validate: 0n, handle: 0n }
         let authCtx: Types.AuthContext = {}
         try {
-            if (!methods.ListAdminSwaps) throw new Error('method: ListAdminSwaps is not implemented')
+            if (!methods.ListAdminInvoiceSwaps) throw new Error('method: ListAdminInvoiceSwaps is not implemented')
             const authContext = await opts.AdminAuthGuard(req.headers['authorization'])
             authCtx = authContext
             stats.guard = process.hrtime.bigint()
             stats.validate = stats.guard
             const query = req.query
             const params = req.params
-            const response =  await methods.ListAdminSwaps({rpcName:'ListAdminSwaps', ctx:authContext })
+            const response =  await methods.ListAdminInvoiceSwaps({rpcName:'ListAdminInvoiceSwaps', ctx:authContext })
+            stats.handle = process.hrtime.bigint()
+            res.json({status: 'OK', ...response})
+            opts.metricsCallback([{ ...info, ...stats, ...authContext }])
+        } catch (ex) { const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
+    })
+    if (!opts.allowNotImplementedMethods && !methods.ListAdminTxSwaps) throw new Error('method: ListAdminTxSwaps is not implemented')
+    app.post('/api/admin/swap/transaction/list', async (req, res) => {
+        const info: Types.RequestInfo = { rpcName: 'ListAdminTxSwaps', batch: false, nostr: false, batchSize: 0}
+        const stats: Types.RequestStats = { startMs:req.startTimeMs || 0, start:req.startTime || 0n, parse: process.hrtime.bigint(), guard: 0n, validate: 0n, handle: 0n }
+        let authCtx: Types.AuthContext = {}
+        try {
+            if (!methods.ListAdminTxSwaps) throw new Error('method: ListAdminTxSwaps is not implemented')
+            const authContext = await opts.AdminAuthGuard(req.headers['authorization'])
+            authCtx = authContext
+            stats.guard = process.hrtime.bigint()
+            stats.validate = stats.guard
+            const query = req.query
+            const params = req.params
+            const response =  await methods.ListAdminTxSwaps({rpcName:'ListAdminTxSwaps', ctx:authContext })
             stats.handle = process.hrtime.bigint()
             res.json({status: 'OK', ...response})
             opts.metricsCallback([{ ...info, ...stats, ...authContext }])
@@ -1645,20 +1730,20 @@ export default (methods: Types.ServerMethods, opts: ServerOptions) => {
             opts.metricsCallback([{ ...info, ...stats, ...authContext }])
         } catch (ex) { const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
     })
-    if (!opts.allowNotImplementedMethods && !methods.ListSwaps) throw new Error('method: ListSwaps is not implemented')
-    app.post('/api/user/swap/list', async (req, res) => {
-        const info: Types.RequestInfo = { rpcName: 'ListSwaps', batch: false, nostr: false, batchSize: 0}
+    if (!opts.allowNotImplementedMethods && !methods.ListTxSwaps) throw new Error('method: ListTxSwaps is not implemented')
+    app.post('/api/user/swap/transaction/list', async (req, res) => {
+        const info: Types.RequestInfo = { rpcName: 'ListTxSwaps', batch: false, nostr: false, batchSize: 0}
         const stats: Types.RequestStats = { startMs:req.startTimeMs || 0, start:req.startTime || 0n, parse: process.hrtime.bigint(), guard: 0n, validate: 0n, handle: 0n }
         let authCtx: Types.AuthContext = {}
         try {
-            if (!methods.ListSwaps) throw new Error('method: ListSwaps is not implemented')
+            if (!methods.ListTxSwaps) throw new Error('method: ListTxSwaps is not implemented')
             const authContext = await opts.UserAuthGuard(req.headers['authorization'])
             authCtx = authContext
             stats.guard = process.hrtime.bigint()
             stats.validate = stats.guard
             const query = req.query
             const params = req.params
-            const response =  await methods.ListSwaps({rpcName:'ListSwaps', ctx:authContext })
+            const response =  await methods.ListTxSwaps({rpcName:'ListTxSwaps', ctx:authContext })
             stats.handle = process.hrtime.bigint()
             res.json({status: 'OK', ...response})
             opts.metricsCallback([{ ...info, ...stats, ...authContext }])
@@ -1793,6 +1878,28 @@ export default (methods: Types.ServerMethods, opts: ServerOptions) => {
             opts.metricsCallback([{ ...info, ...stats, ...authContext }])
         } catch (ex) { const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
     })
+    if (!opts.allowNotImplementedMethods && !methods.PayAdminInvoiceSwap) throw new Error('method: PayAdminInvoiceSwap is not implemented')
+    app.post('/api/admin/swap/invoice/pay', async (req, res) => {
+        const info: Types.RequestInfo = { rpcName: 'PayAdminInvoiceSwap', batch: false, nostr: false, batchSize: 0}
+        const stats: Types.RequestStats = { startMs:req.startTimeMs || 0, start:req.startTime || 0n, parse: process.hrtime.bigint(), guard: 0n, validate: 0n, handle: 0n }
+        let authCtx: Types.AuthContext = {}
+        try {
+            if (!methods.PayAdminInvoiceSwap) throw new Error('method: PayAdminInvoiceSwap is not implemented')
+            const authContext = await opts.AdminAuthGuard(req.headers['authorization'])
+            authCtx = authContext
+            stats.guard = process.hrtime.bigint()
+            const request = req.body
+            const error = Types.PayAdminInvoiceSwapRequestValidate(request)
+            stats.validate = process.hrtime.bigint()
+            if (error !== null) return logErrorAndReturnResponse(error, 'invalid request body', res, logger, { ...info, ...stats, ...authContext }, opts.metricsCallback)
+            const query = req.query
+            const params = req.params
+            const response =  await methods.PayAdminInvoiceSwap({rpcName:'PayAdminInvoiceSwap', ctx:authContext , req: request})
+            stats.handle = process.hrtime.bigint()
+            res.json({status: 'OK', ...response})
+            opts.metricsCallback([{ ...info, ...stats, ...authContext }])
+        } catch (ex) { const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
+    })
     if (!opts.allowNotImplementedMethods && !methods.PayAdminTransactionSwap) throw new Error('method: PayAdminTransactionSwap is not implemented')
     app.post('/api/admin/swap/transaction/pay', async (req, res) => {
         const info: Types.RequestInfo = { rpcName: 'PayAdminTransactionSwap', batch: false, nostr: false, batchSize: 0}
@@ -1878,6 +1985,28 @@ export default (methods: Types.ServerMethods, opts: ServerOptions) => {
             opts.metricsCallback([{ ...info, ...stats, ...authContext }])
         } catch (ex) { const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
     })
+    if (!opts.allowNotImplementedMethods && !methods.RefundAdminInvoiceSwap) throw new Error('method: RefundAdminInvoiceSwap is not implemented')
+    app.post('/api/admin/swap/invoice/refund', async (req, res) => {
+        const info: Types.RequestInfo = { rpcName: 'RefundAdminInvoiceSwap', batch: false, nostr: false, batchSize: 0}
+        const stats: Types.RequestStats = { startMs:req.startTimeMs || 0, start:req.startTime || 0n, parse: process.hrtime.bigint(), guard: 0n, validate: 0n, handle: 0n }
+        let authCtx: Types.AuthContext = {}
+        try {
+            if (!methods.RefundAdminInvoiceSwap) throw new Error('method: RefundAdminInvoiceSwap is not implemented')
+            const authContext = await opts.AdminAuthGuard(req.headers['authorization'])
+            authCtx = authContext
+            stats.guard = process.hrtime.bigint()
+            const request = req.body
+            const error = Types.RefundAdminInvoiceSwapRequestValidate(request)
+            stats.validate = process.hrtime.bigint()
+            if (error !== null) return logErrorAndReturnResponse(error, 'invalid request body', res, logger, { ...info, ...stats, ...authContext }, opts.metricsCallback)
+            const query = req.query
+            const params = req.params
+            const response =  await methods.RefundAdminInvoiceSwap({rpcName:'RefundAdminInvoiceSwap', ctx:authContext , req: request})
+            stats.handle = process.hrtime.bigint()
+            res.json({status: 'OK', ...response})
+            opts.metricsCallback([{ ...info, ...stats, ...authContext }])
+        } catch (ex) { const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
+    })
     if (!opts.allowNotImplementedMethods && !methods.RequestNPubLinkingToken) throw new Error('method: RequestNPubLinkingToken is not implemented')
     app.post('/api/app/user/npub/token', async (req, res) => {
         const info: Types.RequestInfo = { rpcName: 'RequestNPubLinkingToken', batch: false, nostr: false, batchSize: 0}
diff --git a/proto/autogenerated/ts/http_client.ts b/proto/autogenerated/ts/http_client.ts
index a24ff3e6..21597e2c 100644
--- a/proto/autogenerated/ts/http_client.ts
+++ b/proto/autogenerated/ts/http_client.ts
@@ -176,6 +176,17 @@ export default (params: ClientParams) => ({
         } 
         return { status: 'ERROR', reason: 'invalid response' }
     },
+    BumpTx: async (request: Types.BumpTx): Promise<ResultError | ({ status: 'OK' })> => {
+        const auth = await params.retrieveAdminAuth()
+        if (auth === null) throw new Error('retrieveAdminAuth() returned null')
+        let finalRoute = '/api/admin/tx/bump'
+        const { data } = await axios.post(params.baseUrl + finalRoute, request, { headers: { 'authorization': auth } })
+        if (data.status === 'ERROR' && typeof data.reason === 'string') return data
+        if (data.status === 'OK') { 
+            return data
+        }
+        return { status: 'ERROR', reason: 'invalid response' }
+    },
     CloseChannel: async (request: Types.CloseChannelRequest): Promise<ResultError | ({ status: 'OK' }& Types.CloseChannelResponse)> => {
         const auth = await params.retrieveAdminAuth()
         if (auth === null) throw new Error('retrieveAdminAuth() returned null')
@@ -273,6 +284,20 @@ export default (params: ClientParams) => ({
         }
         return { status: 'ERROR', reason: 'invalid response' }
     },
+    GetAdminInvoiceSwapQuotes: async (request: Types.InvoiceSwapRequest): Promise<ResultError | ({ status: 'OK' }& Types.InvoiceSwapQuoteList)> => {
+        const auth = await params.retrieveAdminAuth()
+        if (auth === null) throw new Error('retrieveAdminAuth() returned null')
+        let finalRoute = '/api/admin/swap/invoice/quote'
+        const { data } = await axios.post(params.baseUrl + finalRoute, request, { headers: { 'authorization': auth } })
+        if (data.status === 'ERROR' && typeof data.reason === 'string') return data
+        if (data.status === 'OK') { 
+            const result = data
+            if(!params.checkResult) return { status: 'OK', ...result }
+            const error = Types.InvoiceSwapQuoteListValidate(result)
+            if (error === null) { return { status: 'OK', ...result } } else return { status: 'ERROR', reason: error.message }
+        }
+        return { status: 'ERROR', reason: 'invalid response' }
+    },
     GetAdminTransactionSwapQuotes: async (request: Types.TransactionSwapRequest): Promise<ResultError | ({ status: 'OK' }& Types.TransactionSwapQuoteList)> => {
         const auth = await params.retrieveAdminAuth()
         if (auth === null) throw new Error('retrieveAdminAuth() returned null')
@@ -343,6 +368,20 @@ export default (params: ClientParams) => ({
         }
         return { status: 'ERROR', reason: 'invalid response' }
     },
+    GetAssetsAndLiabilities: async (request: Types.AssetsAndLiabilitiesReq): Promise<ResultError | ({ status: 'OK' }& Types.AssetsAndLiabilities)> => {
+        const auth = await params.retrieveAdminAuth()
+        if (auth === null) throw new Error('retrieveAdminAuth() returned null')
+        let finalRoute = '/api/admin/assets/liabilities'
+        const { data } = await axios.post(params.baseUrl + finalRoute, request, { headers: { 'authorization': auth } })
+        if (data.status === 'ERROR' && typeof data.reason === 'string') return data
+        if (data.status === 'OK') { 
+            const result = data
+            if(!params.checkResult) return { status: 'OK', ...result }
+            const error = Types.AssetsAndLiabilitiesValidate(result)
+            if (error === null) { return { status: 'OK', ...result } } else return { status: 'ERROR', reason: error.message }
+        }
+        return { status: 'ERROR', reason: 'invalid response' }
+    },
     GetBundleMetrics: async (request: Types.LatestBundleMetricReq): Promise<ResultError | ({ status: 'OK' }& Types.BundleMetrics)> => {
         const auth = await params.retrieveMetricsAuth()
         if (auth === null) throw new Error('retrieveMetricsAuth() returned null')
@@ -620,7 +659,7 @@ export default (params: ClientParams) => ({
     GetTransactionSwapQuotes: async (request: Types.TransactionSwapRequest): Promise<ResultError | ({ status: 'OK' }& Types.TransactionSwapQuoteList)> => {
         const auth = await params.retrieveUserAuth()
         if (auth === null) throw new Error('retrieveUserAuth() returned null')
-        let finalRoute = '/api/user/swap/quote'
+        let finalRoute = '/api/user/swap/transaction/quote'
         const { data } = await axios.post(params.baseUrl + finalRoute, request, { headers: { 'authorization': auth } })
         if (data.status === 'ERROR' && typeof data.reason === 'string') return data
         if (data.status === 'OK') { 
@@ -781,16 +820,30 @@ export default (params: ClientParams) => ({
         }
         return { status: 'ERROR', reason: 'invalid response' }
     },
-    ListAdminSwaps: async (): Promise<ResultError | ({ status: 'OK' }& Types.SwapsList)> => {
+    ListAdminInvoiceSwaps: async (): Promise<ResultError | ({ status: 'OK' }& Types.InvoiceSwapsList)> => {
         const auth = await params.retrieveAdminAuth()
         if (auth === null) throw new Error('retrieveAdminAuth() returned null')
-        let finalRoute = '/api/admin/swap/list'
+        let finalRoute = '/api/admin/swap/invoice/list'
         const { data } = await axios.post(params.baseUrl + finalRoute, {}, { headers: { 'authorization': auth } })
         if (data.status === 'ERROR' && typeof data.reason === 'string') return data
         if (data.status === 'OK') { 
             const result = data
             if(!params.checkResult) return { status: 'OK', ...result }
-            const error = Types.SwapsListValidate(result)
+            const error = Types.InvoiceSwapsListValidate(result)
+            if (error === null) { return { status: 'OK', ...result } } else return { status: 'ERROR', reason: error.message }
+        }
+        return { status: 'ERROR', reason: 'invalid response' }
+    },
+    ListAdminTxSwaps: async (): Promise<ResultError | ({ status: 'OK' }& Types.TxSwapsList)> => {
+        const auth = await params.retrieveAdminAuth()
+        if (auth === null) throw new Error('retrieveAdminAuth() returned null')
+        let finalRoute = '/api/admin/swap/transaction/list'
+        const { data } = await axios.post(params.baseUrl + finalRoute, {}, { headers: { 'authorization': auth } })
+        if (data.status === 'ERROR' && typeof data.reason === 'string') return data
+        if (data.status === 'OK') { 
+            const result = data
+            if(!params.checkResult) return { status: 'OK', ...result }
+            const error = Types.TxSwapsListValidate(result)
             if (error === null) { return { status: 'OK', ...result } } else return { status: 'ERROR', reason: error.message }
         }
         return { status: 'ERROR', reason: 'invalid response' }
@@ -809,16 +862,16 @@ export default (params: ClientParams) => ({
         }
         return { status: 'ERROR', reason: 'invalid response' }
     },
-    ListSwaps: async (): Promise<ResultError | ({ status: 'OK' }& Types.SwapsList)> => {
+    ListTxSwaps: async (): Promise<ResultError | ({ status: 'OK' }& Types.TxSwapsList)> => {
         const auth = await params.retrieveUserAuth()
         if (auth === null) throw new Error('retrieveUserAuth() returned null')
-        let finalRoute = '/api/user/swap/list'
+        let finalRoute = '/api/user/swap/transaction/list'
         const { data } = await axios.post(params.baseUrl + finalRoute, {}, { headers: { 'authorization': auth } })
         if (data.status === 'ERROR' && typeof data.reason === 'string') return data
         if (data.status === 'OK') { 
             const result = data
             if(!params.checkResult) return { status: 'OK', ...result }
-            const error = Types.SwapsListValidate(result)
+            const error = Types.TxSwapsListValidate(result)
             if (error === null) { return { status: 'OK', ...result } } else return { status: 'ERROR', reason: error.message }
         }
         return { status: 'ERROR', reason: 'invalid response' }
@@ -909,7 +962,21 @@ export default (params: ClientParams) => ({
         }
         return { status: 'ERROR', reason: 'invalid response' }
     },
-    PayAdminTransactionSwap: async (request: Types.PayAdminTransactionSwapRequest): Promise<ResultError | ({ status: 'OK' }& Types.AdminSwapResponse)> => {
+    PayAdminInvoiceSwap: async (request: Types.PayAdminInvoiceSwapRequest): Promise<ResultError | ({ status: 'OK' }& Types.AdminInvoiceSwapResponse)> => {
+        const auth = await params.retrieveAdminAuth()
+        if (auth === null) throw new Error('retrieveAdminAuth() returned null')
+        let finalRoute = '/api/admin/swap/invoice/pay'
+        const { data } = await axios.post(params.baseUrl + finalRoute, request, { headers: { 'authorization': auth } })
+        if (data.status === 'ERROR' && typeof data.reason === 'string') return data
+        if (data.status === 'OK') { 
+            const result = data
+            if(!params.checkResult) return { status: 'OK', ...result }
+            const error = Types.AdminInvoiceSwapResponseValidate(result)
+            if (error === null) { return { status: 'OK', ...result } } else return { status: 'ERROR', reason: error.message }
+        }
+        return { status: 'ERROR', reason: 'invalid response' }
+    },
+    PayAdminTransactionSwap: async (request: Types.PayAdminTransactionSwapRequest): Promise<ResultError | ({ status: 'OK' }& Types.AdminTxSwapResponse)> => {
         const auth = await params.retrieveAdminAuth()
         if (auth === null) throw new Error('retrieveAdminAuth() returned null')
         let finalRoute = '/api/admin/swap/transaction/pay'
@@ -918,7 +985,7 @@ export default (params: ClientParams) => ({
         if (data.status === 'OK') { 
             const result = data
             if(!params.checkResult) return { status: 'OK', ...result }
-            const error = Types.AdminSwapResponseValidate(result)
+            const error = Types.AdminTxSwapResponseValidate(result)
             if (error === null) { return { status: 'OK', ...result } } else return { status: 'ERROR', reason: error.message }
         }
         return { status: 'ERROR', reason: 'invalid response' }
@@ -962,6 +1029,20 @@ export default (params: ClientParams) => ({
         }
         return { status: 'ERROR', reason: 'invalid response' }
     },
+    RefundAdminInvoiceSwap: async (request: Types.RefundAdminInvoiceSwapRequest): Promise<ResultError | ({ status: 'OK' }& Types.AdminInvoiceSwapResponse)> => {
+        const auth = await params.retrieveAdminAuth()
+        if (auth === null) throw new Error('retrieveAdminAuth() returned null')
+        let finalRoute = '/api/admin/swap/invoice/refund'
+        const { data } = await axios.post(params.baseUrl + finalRoute, request, { headers: { 'authorization': auth } })
+        if (data.status === 'ERROR' && typeof data.reason === 'string') return data
+        if (data.status === 'OK') { 
+            const result = data
+            if(!params.checkResult) return { status: 'OK', ...result }
+            const error = Types.AdminInvoiceSwapResponseValidate(result)
+            if (error === null) { return { status: 'OK', ...result } } else return { status: 'ERROR', reason: error.message }
+        }
+        return { status: 'ERROR', reason: 'invalid response' }
+    },
     RequestNPubLinkingToken: async (request: Types.RequestNPubLinkingTokenRequest): Promise<ResultError | ({ status: 'OK' }& Types.RequestNPubLinkingTokenResponse)> => {
         const auth = await params.retrieveAppAuth()
         if (auth === null) throw new Error('retrieveAppAuth() returned null')
diff --git a/proto/autogenerated/ts/nostr_client.ts b/proto/autogenerated/ts/nostr_client.ts
index df969c7b..64e517e6 100644
--- a/proto/autogenerated/ts/nostr_client.ts
+++ b/proto/autogenerated/ts/nostr_client.ts
@@ -137,6 +137,18 @@ export default (params: NostrClientParams,  send: (to:string, message: NostrRequ
         } 
         return { status: 'ERROR', reason: 'invalid response' }
     },
+    BumpTx: async (request: Types.BumpTx): Promise<ResultError | ({ status: 'OK' })> => {
+        const auth = await params.retrieveNostrAdminAuth()
+        if (auth === null) throw new Error('retrieveNostrAdminAuth() returned null')
+        const nostrRequest: NostrRequest = {}
+        nostrRequest.body = request
+        const data = await send(params.pubDestination, {rpcName:'BumpTx',authIdentifier:auth, ...nostrRequest }) 
+        if (data.status === 'ERROR' && typeof data.reason === 'string') return data
+        if (data.status === 'OK') { 
+            return data
+        }
+        return { status: 'ERROR', reason: 'invalid response' }
+    },
     CloseChannel: async (request: Types.CloseChannelRequest): Promise<ResultError | ({ status: 'OK' }& Types.CloseChannelResponse)> => {
         const auth = await params.retrieveNostrAdminAuth()
         if (auth === null) throw new Error('retrieveNostrAdminAuth() returned null')
@@ -230,6 +242,21 @@ export default (params: NostrClientParams,  send: (to:string, message: NostrRequ
         }
         return { status: 'ERROR', reason: 'invalid response' }
     },
+    GetAdminInvoiceSwapQuotes: async (request: Types.InvoiceSwapRequest): Promise<ResultError | ({ status: 'OK' }& Types.InvoiceSwapQuoteList)> => {
+        const auth = await params.retrieveNostrAdminAuth()
+        if (auth === null) throw new Error('retrieveNostrAdminAuth() returned null')
+        const nostrRequest: NostrRequest = {}
+        nostrRequest.body = request
+        const data = await send(params.pubDestination, {rpcName:'GetAdminInvoiceSwapQuotes',authIdentifier:auth, ...nostrRequest }) 
+        if (data.status === 'ERROR' && typeof data.reason === 'string') return data
+        if (data.status === 'OK') { 
+            const result = data
+            if(!params.checkResult) return { status: 'OK', ...result }
+            const error = Types.InvoiceSwapQuoteListValidate(result)
+            if (error === null) { return { status: 'OK', ...result } } else return { status: 'ERROR', reason: error.message }
+        }
+        return { status: 'ERROR', reason: 'invalid response' }
+    },
     GetAdminTransactionSwapQuotes: async (request: Types.TransactionSwapRequest): Promise<ResultError | ({ status: 'OK' }& Types.TransactionSwapQuoteList)> => {
         const auth = await params.retrieveNostrAdminAuth()
         if (auth === null) throw new Error('retrieveNostrAdminAuth() returned null')
@@ -260,6 +287,21 @@ export default (params: NostrClientParams,  send: (to:string, message: NostrRequ
         }
         return { status: 'ERROR', reason: 'invalid response' }
     },
+    GetAssetsAndLiabilities: async (request: Types.AssetsAndLiabilitiesReq): Promise<ResultError | ({ status: 'OK' }& Types.AssetsAndLiabilities)> => {
+        const auth = await params.retrieveNostrAdminAuth()
+        if (auth === null) throw new Error('retrieveNostrAdminAuth() returned null')
+        const nostrRequest: NostrRequest = {}
+        nostrRequest.body = request
+        const data = await send(params.pubDestination, {rpcName:'GetAssetsAndLiabilities',authIdentifier:auth, ...nostrRequest }) 
+        if (data.status === 'ERROR' && typeof data.reason === 'string') return data
+        if (data.status === 'OK') { 
+            const result = data
+            if(!params.checkResult) return { status: 'OK', ...result }
+            const error = Types.AssetsAndLiabilitiesValidate(result)
+            if (error === null) { return { status: 'OK', ...result } } else return { status: 'ERROR', reason: error.message }
+        }
+        return { status: 'ERROR', reason: 'invalid response' }
+    },
     GetBundleMetrics: async (request: Types.LatestBundleMetricReq): Promise<ResultError | ({ status: 'OK' }& Types.BundleMetrics)> => {
         const auth = await params.retrieveNostrMetricsAuth()
         if (auth === null) throw new Error('retrieveNostrMetricsAuth() returned null')
@@ -666,16 +708,30 @@ export default (params: NostrClientParams,  send: (to:string, message: NostrRequ
         }
         return { status: 'ERROR', reason: 'invalid response' }
     },
-    ListAdminSwaps: async (): Promise<ResultError | ({ status: 'OK' }& Types.SwapsList)> => {
+    ListAdminInvoiceSwaps: async (): Promise<ResultError | ({ status: 'OK' }& Types.InvoiceSwapsList)> => {
         const auth = await params.retrieveNostrAdminAuth()
         if (auth === null) throw new Error('retrieveNostrAdminAuth() returned null')
         const nostrRequest: NostrRequest = {}
-        const data = await send(params.pubDestination, {rpcName:'ListAdminSwaps',authIdentifier:auth, ...nostrRequest }) 
+        const data = await send(params.pubDestination, {rpcName:'ListAdminInvoiceSwaps',authIdentifier:auth, ...nostrRequest }) 
         if (data.status === 'ERROR' && typeof data.reason === 'string') return data
         if (data.status === 'OK') { 
             const result = data
             if(!params.checkResult) return { status: 'OK', ...result }
-            const error = Types.SwapsListValidate(result)
+            const error = Types.InvoiceSwapsListValidate(result)
+            if (error === null) { return { status: 'OK', ...result } } else return { status: 'ERROR', reason: error.message }
+        }
+        return { status: 'ERROR', reason: 'invalid response' }
+    },
+    ListAdminTxSwaps: async (): Promise<ResultError | ({ status: 'OK' }& Types.TxSwapsList)> => {
+        const auth = await params.retrieveNostrAdminAuth()
+        if (auth === null) throw new Error('retrieveNostrAdminAuth() returned null')
+        const nostrRequest: NostrRequest = {}
+        const data = await send(params.pubDestination, {rpcName:'ListAdminTxSwaps',authIdentifier:auth, ...nostrRequest }) 
+        if (data.status === 'ERROR' && typeof data.reason === 'string') return data
+        if (data.status === 'OK') { 
+            const result = data
+            if(!params.checkResult) return { status: 'OK', ...result }
+            const error = Types.TxSwapsListValidate(result)
             if (error === null) { return { status: 'OK', ...result } } else return { status: 'ERROR', reason: error.message }
         }
         return { status: 'ERROR', reason: 'invalid response' }
@@ -694,16 +750,16 @@ export default (params: NostrClientParams,  send: (to:string, message: NostrRequ
         }
         return { status: 'ERROR', reason: 'invalid response' }
     },
-    ListSwaps: async (): Promise<ResultError | ({ status: 'OK' }& Types.SwapsList)> => {
+    ListTxSwaps: async (): Promise<ResultError | ({ status: 'OK' }& Types.TxSwapsList)> => {
         const auth = await params.retrieveNostrUserAuth()
         if (auth === null) throw new Error('retrieveNostrUserAuth() returned null')
         const nostrRequest: NostrRequest = {}
-        const data = await send(params.pubDestination, {rpcName:'ListSwaps',authIdentifier:auth, ...nostrRequest }) 
+        const data = await send(params.pubDestination, {rpcName:'ListTxSwaps',authIdentifier:auth, ...nostrRequest }) 
         if (data.status === 'ERROR' && typeof data.reason === 'string') return data
         if (data.status === 'OK') { 
             const result = data
             if(!params.checkResult) return { status: 'OK', ...result }
-            const error = Types.SwapsListValidate(result)
+            const error = Types.TxSwapsListValidate(result)
             if (error === null) { return { status: 'OK', ...result } } else return { status: 'ERROR', reason: error.message }
         }
         return { status: 'ERROR', reason: 'invalid response' }
@@ -798,7 +854,22 @@ export default (params: NostrClientParams,  send: (to:string, message: NostrRequ
         }
         return { status: 'ERROR', reason: 'invalid response' }
     },
-    PayAdminTransactionSwap: async (request: Types.PayAdminTransactionSwapRequest): Promise<ResultError | ({ status: 'OK' }& Types.AdminSwapResponse)> => {
+    PayAdminInvoiceSwap: async (request: Types.PayAdminInvoiceSwapRequest): Promise<ResultError | ({ status: 'OK' }& Types.AdminInvoiceSwapResponse)> => {
+        const auth = await params.retrieveNostrAdminAuth()
+        if (auth === null) throw new Error('retrieveNostrAdminAuth() returned null')
+        const nostrRequest: NostrRequest = {}
+        nostrRequest.body = request
+        const data = await send(params.pubDestination, {rpcName:'PayAdminInvoiceSwap',authIdentifier:auth, ...nostrRequest }) 
+        if (data.status === 'ERROR' && typeof data.reason === 'string') return data
+        if (data.status === 'OK') { 
+            const result = data
+            if(!params.checkResult) return { status: 'OK', ...result }
+            const error = Types.AdminInvoiceSwapResponseValidate(result)
+            if (error === null) { return { status: 'OK', ...result } } else return { status: 'ERROR', reason: error.message }
+        }
+        return { status: 'ERROR', reason: 'invalid response' }
+    },
+    PayAdminTransactionSwap: async (request: Types.PayAdminTransactionSwapRequest): Promise<ResultError | ({ status: 'OK' }& Types.AdminTxSwapResponse)> => {
         const auth = await params.retrieveNostrAdminAuth()
         if (auth === null) throw new Error('retrieveNostrAdminAuth() returned null')
         const nostrRequest: NostrRequest = {}
@@ -808,7 +879,7 @@ export default (params: NostrClientParams,  send: (to:string, message: NostrRequ
         if (data.status === 'OK') { 
             const result = data
             if(!params.checkResult) return { status: 'OK', ...result }
-            const error = Types.AdminSwapResponseValidate(result)
+            const error = Types.AdminTxSwapResponseValidate(result)
             if (error === null) { return { status: 'OK', ...result } } else return { status: 'ERROR', reason: error.message }
         }
         return { status: 'ERROR', reason: 'invalid response' }
@@ -839,6 +910,21 @@ export default (params: NostrClientParams,  send: (to:string, message: NostrRequ
         }
         return { status: 'ERROR', reason: 'invalid response' }
     },
+    RefundAdminInvoiceSwap: async (request: Types.RefundAdminInvoiceSwapRequest): Promise<ResultError | ({ status: 'OK' }& Types.AdminInvoiceSwapResponse)> => {
+        const auth = await params.retrieveNostrAdminAuth()
+        if (auth === null) throw new Error('retrieveNostrAdminAuth() returned null')
+        const nostrRequest: NostrRequest = {}
+        nostrRequest.body = request
+        const data = await send(params.pubDestination, {rpcName:'RefundAdminInvoiceSwap',authIdentifier:auth, ...nostrRequest }) 
+        if (data.status === 'ERROR' && typeof data.reason === 'string') return data
+        if (data.status === 'OK') { 
+            const result = data
+            if(!params.checkResult) return { status: 'OK', ...result }
+            const error = Types.AdminInvoiceSwapResponseValidate(result)
+            if (error === null) { return { status: 'OK', ...result } } else return { status: 'ERROR', reason: error.message }
+        }
+        return { status: 'ERROR', reason: 'invalid response' }
+    },
     ResetDebit: async (request: Types.DebitOperation): Promise<ResultError | ({ status: 'OK' })> => {
         const auth = await params.retrieveNostrUserAuth()
         if (auth === null) throw new Error('retrieveNostrUserAuth() returned null')
diff --git a/proto/autogenerated/ts/nostr_transport.ts b/proto/autogenerated/ts/nostr_transport.ts
index 24a96cd6..80284e10 100644
--- a/proto/autogenerated/ts/nostr_transport.ts
+++ b/proto/autogenerated/ts/nostr_transport.ts
@@ -427,12 +427,12 @@ export default (methods: Types.ServerMethods, opts: NostrOptions) => {
                                         callsMetrics.push({ ...opInfo, ...opStats, ...ctx })
                                     }
                                     break
-                                case 'ListSwaps':
-                                    if (!methods.ListSwaps) {
-                                        throw new Error('method not defined: ListSwaps')
+                                case 'ListTxSwaps':
+                                    if (!methods.ListTxSwaps) {
+                                        throw new Error('method not defined: ListTxSwaps')
                                     } else {
                                         opStats.validate = opStats.guard
-                                        const res = await methods.ListSwaps({...operation, ctx}); responses.push({ status: 'OK', ...res  })
+                                        const res = await methods.ListTxSwaps({...operation, ctx}); responses.push({ status: 'OK', ...res  })
                                         opStats.handle = process.hrtime.bigint()
                                         callsMetrics.push({ ...opInfo, ...opStats, ...ctx })
                                     }
@@ -575,6 +575,22 @@ export default (methods: Types.ServerMethods, opts: NostrOptions) => {
                     opts.metricsCallback([{ ...info, ...stats, ...ctx }, ...callsMetrics])
                 }catch(ex){ const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
                 break
+            case 'BumpTx':
+                try {
+                    if (!methods.BumpTx) throw new Error('method: BumpTx is not implemented')
+                    const authContext = await opts.NostrAdminAuthGuard(req.appId, req.authIdentifier)
+                    stats.guard = process.hrtime.bigint()
+                    authCtx = authContext
+                    const request = req.body
+                    const error = Types.BumpTxValidate(request)
+                    stats.validate = process.hrtime.bigint()
+                    if (error !== null) return logErrorAndReturnResponse(error, 'invalid request body', res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback)
+                    await methods.BumpTx({rpcName:'BumpTx', ctx:authContext , req: request})
+                    stats.handle = process.hrtime.bigint()
+                    res({status: 'OK'})
+                    opts.metricsCallback([{ ...info, ...stats, ...authContext }])
+                }catch(ex){ const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
+                break
             case 'CloseChannel':
                 try {
                     if (!methods.CloseChannel) throw new Error('method: CloseChannel is not implemented')
@@ -687,6 +703,22 @@ export default (methods: Types.ServerMethods, opts: NostrOptions) => {
                     opts.metricsCallback([{ ...info, ...stats, ...authContext }])
                 }catch(ex){ const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
                 break
+            case 'GetAdminInvoiceSwapQuotes':
+                try {
+                    if (!methods.GetAdminInvoiceSwapQuotes) throw new Error('method: GetAdminInvoiceSwapQuotes is not implemented')
+                    const authContext = await opts.NostrAdminAuthGuard(req.appId, req.authIdentifier)
+                    stats.guard = process.hrtime.bigint()
+                    authCtx = authContext
+                    const request = req.body
+                    const error = Types.InvoiceSwapRequestValidate(request)
+                    stats.validate = process.hrtime.bigint()
+                    if (error !== null) return logErrorAndReturnResponse(error, 'invalid request body', res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback)
+                    const response = await methods.GetAdminInvoiceSwapQuotes({rpcName:'GetAdminInvoiceSwapQuotes', ctx:authContext , req: request})
+                    stats.handle = process.hrtime.bigint()
+                    res({status: 'OK', ...response})
+                    opts.metricsCallback([{ ...info, ...stats, ...authContext }])
+                }catch(ex){ const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
+                break
             case 'GetAdminTransactionSwapQuotes':
                 try {
                     if (!methods.GetAdminTransactionSwapQuotes) throw new Error('method: GetAdminTransactionSwapQuotes is not implemented')
@@ -719,6 +751,22 @@ export default (methods: Types.ServerMethods, opts: NostrOptions) => {
                     opts.metricsCallback([{ ...info, ...stats, ...authContext }])
                 }catch(ex){ const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
                 break
+            case 'GetAssetsAndLiabilities':
+                try {
+                    if (!methods.GetAssetsAndLiabilities) throw new Error('method: GetAssetsAndLiabilities is not implemented')
+                    const authContext = await opts.NostrAdminAuthGuard(req.appId, req.authIdentifier)
+                    stats.guard = process.hrtime.bigint()
+                    authCtx = authContext
+                    const request = req.body
+                    const error = Types.AssetsAndLiabilitiesReqValidate(request)
+                    stats.validate = process.hrtime.bigint()
+                    if (error !== null) return logErrorAndReturnResponse(error, 'invalid request body', res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback)
+                    const response = await methods.GetAssetsAndLiabilities({rpcName:'GetAssetsAndLiabilities', ctx:authContext , req: request})
+                    stats.handle = process.hrtime.bigint()
+                    res({status: 'OK', ...response})
+                    opts.metricsCallback([{ ...info, ...stats, ...authContext }])
+                }catch(ex){ const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
+                break
             case 'GetBundleMetrics':
                 try {
                     if (!methods.GetBundleMetrics) throw new Error('method: GetBundleMetrics is not implemented')
@@ -1122,14 +1170,27 @@ export default (methods: Types.ServerMethods, opts: NostrOptions) => {
                     opts.metricsCallback([{ ...info, ...stats, ...authContext }])
                 }catch(ex){ const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
                 break
-            case 'ListAdminSwaps':
+            case 'ListAdminInvoiceSwaps':
                 try {
-                    if (!methods.ListAdminSwaps) throw new Error('method: ListAdminSwaps is not implemented')
+                    if (!methods.ListAdminInvoiceSwaps) throw new Error('method: ListAdminInvoiceSwaps is not implemented')
                     const authContext = await opts.NostrAdminAuthGuard(req.appId, req.authIdentifier)
                     stats.guard = process.hrtime.bigint()
                     authCtx = authContext
                     stats.validate = stats.guard
-                    const response = await methods.ListAdminSwaps({rpcName:'ListAdminSwaps', ctx:authContext })
+                    const response = await methods.ListAdminInvoiceSwaps({rpcName:'ListAdminInvoiceSwaps', ctx:authContext })
+                    stats.handle = process.hrtime.bigint()
+                    res({status: 'OK', ...response})
+                    opts.metricsCallback([{ ...info, ...stats, ...authContext }])
+                }catch(ex){ const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
+                break
+            case 'ListAdminTxSwaps':
+                try {
+                    if (!methods.ListAdminTxSwaps) throw new Error('method: ListAdminTxSwaps is not implemented')
+                    const authContext = await opts.NostrAdminAuthGuard(req.appId, req.authIdentifier)
+                    stats.guard = process.hrtime.bigint()
+                    authCtx = authContext
+                    stats.validate = stats.guard
+                    const response = await methods.ListAdminTxSwaps({rpcName:'ListAdminTxSwaps', ctx:authContext })
                     stats.handle = process.hrtime.bigint()
                     res({status: 'OK', ...response})
                     opts.metricsCallback([{ ...info, ...stats, ...authContext }])
@@ -1148,14 +1209,14 @@ export default (methods: Types.ServerMethods, opts: NostrOptions) => {
                     opts.metricsCallback([{ ...info, ...stats, ...authContext }])
                 }catch(ex){ const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
                 break
-            case 'ListSwaps':
+            case 'ListTxSwaps':
                 try {
-                    if (!methods.ListSwaps) throw new Error('method: ListSwaps is not implemented')
+                    if (!methods.ListTxSwaps) throw new Error('method: ListTxSwaps is not implemented')
                     const authContext = await opts.NostrUserAuthGuard(req.appId, req.authIdentifier)
                     stats.guard = process.hrtime.bigint()
                     authCtx = authContext
                     stats.validate = stats.guard
-                    const response = await methods.ListSwaps({rpcName:'ListSwaps', ctx:authContext })
+                    const response = await methods.ListTxSwaps({rpcName:'ListTxSwaps', ctx:authContext })
                     stats.handle = process.hrtime.bigint()
                     res({status: 'OK', ...response})
                     opts.metricsCallback([{ ...info, ...stats, ...authContext }])
@@ -1254,6 +1315,22 @@ export default (methods: Types.ServerMethods, opts: NostrOptions) => {
                     opts.metricsCallback([{ ...info, ...stats, ...authContext }])
                 }catch(ex){ const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
                 break
+            case 'PayAdminInvoiceSwap':
+                try {
+                    if (!methods.PayAdminInvoiceSwap) throw new Error('method: PayAdminInvoiceSwap is not implemented')
+                    const authContext = await opts.NostrAdminAuthGuard(req.appId, req.authIdentifier)
+                    stats.guard = process.hrtime.bigint()
+                    authCtx = authContext
+                    const request = req.body
+                    const error = Types.PayAdminInvoiceSwapRequestValidate(request)
+                    stats.validate = process.hrtime.bigint()
+                    if (error !== null) return logErrorAndReturnResponse(error, 'invalid request body', res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback)
+                    const response = await methods.PayAdminInvoiceSwap({rpcName:'PayAdminInvoiceSwap', ctx:authContext , req: request})
+                    stats.handle = process.hrtime.bigint()
+                    res({status: 'OK', ...response})
+                    opts.metricsCallback([{ ...info, ...stats, ...authContext }])
+                }catch(ex){ const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
+                break
             case 'PayAdminTransactionSwap':
                 try {
                     if (!methods.PayAdminTransactionSwap) throw new Error('method: PayAdminTransactionSwap is not implemented')
@@ -1299,6 +1376,22 @@ export default (methods: Types.ServerMethods, opts: NostrOptions) => {
                     opts.metricsCallback([{ ...info, ...stats, ...authContext }])
                 }catch(ex){ const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
                 break
+            case 'RefundAdminInvoiceSwap':
+                try {
+                    if (!methods.RefundAdminInvoiceSwap) throw new Error('method: RefundAdminInvoiceSwap is not implemented')
+                    const authContext = await opts.NostrAdminAuthGuard(req.appId, req.authIdentifier)
+                    stats.guard = process.hrtime.bigint()
+                    authCtx = authContext
+                    const request = req.body
+                    const error = Types.RefundAdminInvoiceSwapRequestValidate(request)
+                    stats.validate = process.hrtime.bigint()
+                    if (error !== null) return logErrorAndReturnResponse(error, 'invalid request body', res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback)
+                    const response = await methods.RefundAdminInvoiceSwap({rpcName:'RefundAdminInvoiceSwap', ctx:authContext , req: request})
+                    stats.handle = process.hrtime.bigint()
+                    res({status: 'OK', ...response})
+                    opts.metricsCallback([{ ...info, ...stats, ...authContext }])
+                }catch(ex){ const e = ex as any; logErrorAndReturnResponse(e, e.message || e, res, logger, { ...info, ...stats, ...authCtx }, opts.metricsCallback); if (opts.throwErrors) throw e }
+                break
             case 'ResetDebit':
                 try {
                     if (!methods.ResetDebit) throw new Error('method: ResetDebit is not implemented')
diff --git a/proto/autogenerated/ts/types.ts b/proto/autogenerated/ts/types.ts
index e397cd94..90cd1724 100644
--- a/proto/autogenerated/ts/types.ts
+++ b/proto/autogenerated/ts/types.ts
@@ -7,8 +7,8 @@ export type RequestMetric = AuthContext & RequestInfo & RequestStats & { error?:
 export type AdminContext = {
     admin_id: string
 }
-export type AdminMethodInputs = AddApp_Input | AddPeer_Input | AuthApp_Input | BanUser_Input | CloseChannel_Input | CreateOneTimeInviteLink_Input | GetAdminTransactionSwapQuotes_Input | GetInviteLinkState_Input | GetSeed_Input | ListAdminSwaps_Input | ListChannels_Input | LndGetInfo_Input | OpenChannel_Input | PayAdminTransactionSwap_Input | UpdateChannelPolicy_Input
-export type AdminMethodOutputs = AddApp_Output | AddPeer_Output | AuthApp_Output | BanUser_Output | CloseChannel_Output | CreateOneTimeInviteLink_Output | GetAdminTransactionSwapQuotes_Output | GetInviteLinkState_Output | GetSeed_Output | ListAdminSwaps_Output | ListChannels_Output | LndGetInfo_Output | OpenChannel_Output | PayAdminTransactionSwap_Output | UpdateChannelPolicy_Output
+export type AdminMethodInputs = AddApp_Input | AddPeer_Input | AuthApp_Input | BanUser_Input | BumpTx_Input | CloseChannel_Input | CreateOneTimeInviteLink_Input | GetAdminInvoiceSwapQuotes_Input | GetAdminTransactionSwapQuotes_Input | GetAssetsAndLiabilities_Input | GetInviteLinkState_Input | GetSeed_Input | ListAdminInvoiceSwaps_Input | ListAdminTxSwaps_Input | ListChannels_Input | LndGetInfo_Input | OpenChannel_Input | PayAdminInvoiceSwap_Input | PayAdminTransactionSwap_Input | RefundAdminInvoiceSwap_Input | UpdateChannelPolicy_Input
+export type AdminMethodOutputs = AddApp_Output | AddPeer_Output | AuthApp_Output | BanUser_Output | BumpTx_Output | CloseChannel_Output | CreateOneTimeInviteLink_Output | GetAdminInvoiceSwapQuotes_Output | GetAdminTransactionSwapQuotes_Output | GetAssetsAndLiabilities_Output | GetInviteLinkState_Output | GetSeed_Output | ListAdminInvoiceSwaps_Output | ListAdminTxSwaps_Output | ListChannels_Output | LndGetInfo_Output | OpenChannel_Output | PayAdminInvoiceSwap_Output | PayAdminTransactionSwap_Output | RefundAdminInvoiceSwap_Output | UpdateChannelPolicy_Output
 export type AppContext = {
     app_id: string
 }
@@ -35,8 +35,8 @@ export type UserContext = {
     app_user_id: string
     user_id: string
 }
-export type UserMethodInputs = AddProduct_Input | AddUserOffer_Input | AuthorizeManage_Input | BanDebit_Input | DecodeInvoice_Input | DeleteUserOffer_Input | EditDebit_Input | EnrollAdminToken_Input | EnrollMessagingToken_Input | GetDebitAuthorizations_Input | GetHttpCreds_Input | GetLNURLChannelLink_Input | GetLnurlPayLink_Input | GetLnurlWithdrawLink_Input | GetManageAuthorizations_Input | GetPaymentState_Input | GetTransactionSwapQuotes_Input | GetUserInfo_Input | GetUserOffer_Input | GetUserOfferInvoices_Input | GetUserOffers_Input | GetUserOperations_Input | ListSwaps_Input | NewAddress_Input | NewInvoice_Input | NewProductInvoice_Input | PayAddress_Input | PayInvoice_Input | ResetDebit_Input | ResetManage_Input | RespondToDebit_Input | UpdateCallbackUrl_Input | UpdateUserOffer_Input | UserHealth_Input
-export type UserMethodOutputs = AddProduct_Output | AddUserOffer_Output | AuthorizeManage_Output | BanDebit_Output | DecodeInvoice_Output | DeleteUserOffer_Output | EditDebit_Output | EnrollAdminToken_Output | EnrollMessagingToken_Output | GetDebitAuthorizations_Output | GetHttpCreds_Output | GetLNURLChannelLink_Output | GetLnurlPayLink_Output | GetLnurlWithdrawLink_Output | GetManageAuthorizations_Output | GetPaymentState_Output | GetTransactionSwapQuotes_Output | GetUserInfo_Output | GetUserOffer_Output | GetUserOfferInvoices_Output | GetUserOffers_Output | GetUserOperations_Output | ListSwaps_Output | NewAddress_Output | NewInvoice_Output | NewProductInvoice_Output | PayAddress_Output | PayInvoice_Output | ResetDebit_Output | ResetManage_Output | RespondToDebit_Output | UpdateCallbackUrl_Output | UpdateUserOffer_Output | UserHealth_Output
+export type UserMethodInputs = AddProduct_Input | AddUserOffer_Input | AuthorizeManage_Input | BanDebit_Input | DecodeInvoice_Input | DeleteUserOffer_Input | EditDebit_Input | EnrollAdminToken_Input | EnrollMessagingToken_Input | GetDebitAuthorizations_Input | GetHttpCreds_Input | GetLNURLChannelLink_Input | GetLnurlPayLink_Input | GetLnurlWithdrawLink_Input | GetManageAuthorizations_Input | GetPaymentState_Input | GetTransactionSwapQuotes_Input | GetUserInfo_Input | GetUserOffer_Input | GetUserOfferInvoices_Input | GetUserOffers_Input | GetUserOperations_Input | ListTxSwaps_Input | NewAddress_Input | NewInvoice_Input | NewProductInvoice_Input | PayAddress_Input | PayInvoice_Input | ResetDebit_Input | ResetManage_Input | RespondToDebit_Input | UpdateCallbackUrl_Input | UpdateUserOffer_Input | UserHealth_Input
+export type UserMethodOutputs = AddProduct_Output | AddUserOffer_Output | AuthorizeManage_Output | BanDebit_Output | DecodeInvoice_Output | DeleteUserOffer_Output | EditDebit_Output | EnrollAdminToken_Output | EnrollMessagingToken_Output | GetDebitAuthorizations_Output | GetHttpCreds_Output | GetLNURLChannelLink_Output | GetLnurlPayLink_Output | GetLnurlWithdrawLink_Output | GetManageAuthorizations_Output | GetPaymentState_Output | GetTransactionSwapQuotes_Output | GetUserInfo_Output | GetUserOffer_Output | GetUserOfferInvoices_Output | GetUserOffers_Output | GetUserOperations_Output | ListTxSwaps_Output | NewAddress_Output | NewInvoice_Output | NewProductInvoice_Output | PayAddress_Output | PayInvoice_Output | ResetDebit_Output | ResetManage_Output | RespondToDebit_Output | UpdateCallbackUrl_Output | UpdateUserOffer_Output | UserHealth_Output
 export type AuthContext = AdminContext | AppContext | GuestContext | GuestWithPubContext | MetricsContext | UserContext
 
 export type AddApp_Input = {rpcName:'AddApp', req: AddAppRequest}
@@ -75,6 +75,9 @@ export type BanUser_Output = ResultError | ({ status: 'OK' } & BanUserResponse)
 export type BatchUser_Input = UserMethodInputs
 export type BatchUser_Output = UserMethodOutputs
 
+export type BumpTx_Input = {rpcName:'BumpTx', req: BumpTx}
+export type BumpTx_Output = ResultError | { status: 'OK' }
+
 export type CloseChannel_Input = {rpcName:'CloseChannel', req: CloseChannelRequest}
 export type CloseChannel_Output = ResultError | ({ status: 'OK' } & CloseChannelResponse)
 
@@ -99,6 +102,9 @@ export type EnrollAdminToken_Output = ResultError | { status: 'OK' }
 export type EnrollMessagingToken_Input = {rpcName:'EnrollMessagingToken', req: MessagingToken}
 export type EnrollMessagingToken_Output = ResultError | { status: 'OK' }
 
+export type GetAdminInvoiceSwapQuotes_Input = {rpcName:'GetAdminInvoiceSwapQuotes', req: InvoiceSwapRequest}
+export type GetAdminInvoiceSwapQuotes_Output = ResultError | ({ status: 'OK' } & InvoiceSwapQuoteList)
+
 export type GetAdminTransactionSwapQuotes_Input = {rpcName:'GetAdminTransactionSwapQuotes', req: TransactionSwapRequest}
 export type GetAdminTransactionSwapQuotes_Output = ResultError | ({ status: 'OK' } & TransactionSwapQuoteList)
 
@@ -114,6 +120,9 @@ export type GetAppUserLNURLInfo_Output = ResultError | ({ status: 'OK' } & Lnurl
 export type GetAppsMetrics_Input = {rpcName:'GetAppsMetrics', req: AppsMetricsRequest}
 export type GetAppsMetrics_Output = ResultError | ({ status: 'OK' } & AppsMetrics)
 
+export type GetAssetsAndLiabilities_Input = {rpcName:'GetAssetsAndLiabilities', req: AssetsAndLiabilitiesReq}
+export type GetAssetsAndLiabilities_Output = ResultError | ({ status: 'OK' } & AssetsAndLiabilities)
+
 export type GetBundleMetrics_Input = {rpcName:'GetBundleMetrics', req: LatestBundleMetricReq}
 export type GetBundleMetrics_Output = ResultError | ({ status: 'OK' } & BundleMetrics)
 
@@ -238,14 +247,17 @@ export type Health_Output = ResultError | { status: 'OK' }
 export type LinkNPubThroughToken_Input = {rpcName:'LinkNPubThroughToken', req: LinkNPubThroughTokenRequest}
 export type LinkNPubThroughToken_Output = ResultError | { status: 'OK' }
 
-export type ListAdminSwaps_Input = {rpcName:'ListAdminSwaps'}
-export type ListAdminSwaps_Output = ResultError | ({ status: 'OK' } & SwapsList)
+export type ListAdminInvoiceSwaps_Input = {rpcName:'ListAdminInvoiceSwaps'}
+export type ListAdminInvoiceSwaps_Output = ResultError | ({ status: 'OK' } & InvoiceSwapsList)
+
+export type ListAdminTxSwaps_Input = {rpcName:'ListAdminTxSwaps'}
+export type ListAdminTxSwaps_Output = ResultError | ({ status: 'OK' } & TxSwapsList)
 
 export type ListChannels_Input = {rpcName:'ListChannels'}
 export type ListChannels_Output = ResultError | ({ status: 'OK' } & LndChannels)
 
-export type ListSwaps_Input = {rpcName:'ListSwaps'}
-export type ListSwaps_Output = ResultError | ({ status: 'OK' } & SwapsList)
+export type ListTxSwaps_Input = {rpcName:'ListTxSwaps'}
+export type ListTxSwaps_Output = ResultError | ({ status: 'OK' } & TxSwapsList)
 
 export type LndGetInfo_Input = {rpcName:'LndGetInfo', req: LndGetInfoRequest}
 export type LndGetInfo_Output = ResultError | ({ status: 'OK' } & LndGetInfoResponse)
@@ -268,8 +280,11 @@ export type OpenChannel_Output = ResultError | ({ status: 'OK' } & OpenChannelRe
 export type PayAddress_Input = {rpcName:'PayAddress', req: PayAddressRequest}
 export type PayAddress_Output = ResultError | ({ status: 'OK' } & PayAddressResponse)
 
+export type PayAdminInvoiceSwap_Input = {rpcName:'PayAdminInvoiceSwap', req: PayAdminInvoiceSwapRequest}
+export type PayAdminInvoiceSwap_Output = ResultError | ({ status: 'OK' } & AdminInvoiceSwapResponse)
+
 export type PayAdminTransactionSwap_Input = {rpcName:'PayAdminTransactionSwap', req: PayAdminTransactionSwapRequest}
-export type PayAdminTransactionSwap_Output = ResultError | ({ status: 'OK' } & AdminSwapResponse)
+export type PayAdminTransactionSwap_Output = ResultError | ({ status: 'OK' } & AdminTxSwapResponse)
 
 export type PayAppUserInvoice_Input = {rpcName:'PayAppUserInvoice', req: PayAppUserInvoiceRequest}
 export type PayAppUserInvoice_Output = ResultError | ({ status: 'OK' } & PayInvoiceResponse)
@@ -280,6 +295,9 @@ export type PayInvoice_Output = ResultError | ({ status: 'OK' } & PayInvoiceResp
 export type PingSubProcesses_Input = {rpcName:'PingSubProcesses'}
 export type PingSubProcesses_Output = ResultError | { status: 'OK' }
 
+export type RefundAdminInvoiceSwap_Input = {rpcName:'RefundAdminInvoiceSwap', req: RefundAdminInvoiceSwapRequest}
+export type RefundAdminInvoiceSwap_Output = ResultError | ({ status: 'OK' } & AdminInvoiceSwapResponse)
+
 export type RequestNPubLinkingToken_Input = {rpcName:'RequestNPubLinkingToken', req: RequestNPubLinkingTokenRequest}
 export type RequestNPubLinkingToken_Output = ResultError | ({ status: 'OK' } & RequestNPubLinkingTokenResponse)
 
@@ -349,6 +367,7 @@ export type ServerMethods = {
     AuthorizeManage?: (req: AuthorizeManage_Input & {ctx: UserContext }) => Promise<ManageAuthorization>
     BanDebit?: (req: BanDebit_Input & {ctx: UserContext }) => Promise<void>
     BanUser?: (req: BanUser_Input & {ctx: AdminContext }) => Promise<BanUserResponse>
+    BumpTx?: (req: BumpTx_Input & {ctx: AdminContext }) => Promise<void>
     CloseChannel?: (req: CloseChannel_Input & {ctx: AdminContext }) => Promise<CloseChannelResponse>
     CreateOneTimeInviteLink?: (req: CreateOneTimeInviteLink_Input & {ctx: AdminContext }) => Promise<CreateOneTimeInviteLinkResponse>
     DecodeInvoice?: (req: DecodeInvoice_Input & {ctx: UserContext }) => Promise<DecodeInvoiceResponse>
@@ -357,11 +376,13 @@ export type ServerMethods = {
     EncryptionExchange?: (req: EncryptionExchange_Input & {ctx: GuestContext }) => Promise<void>
     EnrollAdminToken?: (req: EnrollAdminToken_Input & {ctx: UserContext }) => Promise<void>
     EnrollMessagingToken?: (req: EnrollMessagingToken_Input & {ctx: UserContext }) => Promise<void>
+    GetAdminInvoiceSwapQuotes?: (req: GetAdminInvoiceSwapQuotes_Input & {ctx: AdminContext }) => Promise<InvoiceSwapQuoteList>
     GetAdminTransactionSwapQuotes?: (req: GetAdminTransactionSwapQuotes_Input & {ctx: AdminContext }) => Promise<TransactionSwapQuoteList>
     GetApp?: (req: GetApp_Input & {ctx: AppContext }) => Promise<Application>
     GetAppUser?: (req: GetAppUser_Input & {ctx: AppContext }) => Promise<AppUser>
     GetAppUserLNURLInfo?: (req: GetAppUserLNURLInfo_Input & {ctx: AppContext }) => Promise<LnurlPayInfoResponse>
     GetAppsMetrics?: (req: GetAppsMetrics_Input & {ctx: MetricsContext }) => Promise<AppsMetrics>
+    GetAssetsAndLiabilities?: (req: GetAssetsAndLiabilities_Input & {ctx: AdminContext }) => Promise<AssetsAndLiabilities>
     GetBundleMetrics?: (req: GetBundleMetrics_Input & {ctx: MetricsContext }) => Promise<BundleMetrics>
     GetDebitAuthorizations?: (req: GetDebitAuthorizations_Input & {ctx: UserContext }) => Promise<DebitAuthorizations>
     GetErrorStats?: (req: GetErrorStats_Input & {ctx: MetricsContext }) => Promise<ErrorStats>
@@ -397,19 +418,22 @@ export type ServerMethods = {
     HandleLnurlWithdraw?: (req: HandleLnurlWithdraw_Input & {ctx: GuestContext }) => Promise<void>
     Health?: (req: Health_Input & {ctx: GuestContext }) => Promise<void>
     LinkNPubThroughToken?: (req: LinkNPubThroughToken_Input & {ctx: GuestWithPubContext }) => Promise<void>
-    ListAdminSwaps?: (req: ListAdminSwaps_Input & {ctx: AdminContext }) => Promise<SwapsList>
+    ListAdminInvoiceSwaps?: (req: ListAdminInvoiceSwaps_Input & {ctx: AdminContext }) => Promise<InvoiceSwapsList>
+    ListAdminTxSwaps?: (req: ListAdminTxSwaps_Input & {ctx: AdminContext }) => Promise<TxSwapsList>
     ListChannels?: (req: ListChannels_Input & {ctx: AdminContext }) => Promise<LndChannels>
-    ListSwaps?: (req: ListSwaps_Input & {ctx: UserContext }) => Promise<SwapsList>
+    ListTxSwaps?: (req: ListTxSwaps_Input & {ctx: UserContext }) => Promise<TxSwapsList>
     LndGetInfo?: (req: LndGetInfo_Input & {ctx: AdminContext }) => Promise<LndGetInfoResponse>
     NewAddress?: (req: NewAddress_Input & {ctx: UserContext }) => Promise<NewAddressResponse>
     NewInvoice?: (req: NewInvoice_Input & {ctx: UserContext }) => Promise<NewInvoiceResponse>
     NewProductInvoice?: (req: NewProductInvoice_Input & {ctx: UserContext }) => Promise<NewInvoiceResponse>
     OpenChannel?: (req: OpenChannel_Input & {ctx: AdminContext }) => Promise<OpenChannelResponse>
     PayAddress?: (req: PayAddress_Input & {ctx: UserContext }) => Promise<PayAddressResponse>
-    PayAdminTransactionSwap?: (req: PayAdminTransactionSwap_Input & {ctx: AdminContext }) => Promise<AdminSwapResponse>
+    PayAdminInvoiceSwap?: (req: PayAdminInvoiceSwap_Input & {ctx: AdminContext }) => Promise<AdminInvoiceSwapResponse>
+    PayAdminTransactionSwap?: (req: PayAdminTransactionSwap_Input & {ctx: AdminContext }) => Promise<AdminTxSwapResponse>
     PayAppUserInvoice?: (req: PayAppUserInvoice_Input & {ctx: AppContext }) => Promise<PayInvoiceResponse>
     PayInvoice?: (req: PayInvoice_Input & {ctx: UserContext }) => Promise<PayInvoiceResponse>
     PingSubProcesses?: (req: PingSubProcesses_Input & {ctx: MetricsContext }) => Promise<void>
+    RefundAdminInvoiceSwap?: (req: RefundAdminInvoiceSwap_Input & {ctx: AdminContext }) => Promise<AdminInvoiceSwapResponse>
     RequestNPubLinkingToken?: (req: RequestNPubLinkingToken_Input & {ctx: AppContext }) => Promise<RequestNPubLinkingTokenResponse>
     ResetDebit?: (req: ResetDebit_Input & {ctx: UserContext }) => Promise<void>
     ResetManage?: (req: ResetManage_Input & {ctx: UserContext }) => Promise<void>
@@ -465,6 +489,14 @@ export const enumCheckSingleMetricType = (e?: SingleMetricType): boolean => {
     for (const v in SingleMetricType) if (e === v) return true
     return false
 }
+export enum TrackedOperationType {
+    ROOT = 'ROOT',
+    USER = 'USER',
+}
+export const enumCheckTrackedOperationType = (e?: TrackedOperationType): boolean => {
+    for (const v in TrackedOperationType) if (e === v) return true
+    return false
+}
 export enum UserOperationType {
     INCOMING_INVOICE = 'INCOMING_INVOICE',
     INCOMING_TX = 'INCOMING_TX',
@@ -671,17 +703,35 @@ export const AddProductRequestValidate = (o?: AddProductRequest, opts: AddProduc
     return null
 }
 
-export type AdminSwapResponse = {
+export type AdminInvoiceSwapResponse = {
+    tx_id: string
+}
+export const AdminInvoiceSwapResponseOptionalFields: [] = []
+export type AdminInvoiceSwapResponseOptions = OptionsBaseMessage & {
+    checkOptionalsAreSet?: []
+    tx_id_CustomCheck?: (v: string) => boolean
+}
+export const AdminInvoiceSwapResponseValidate = (o?: AdminInvoiceSwapResponse, opts: AdminInvoiceSwapResponseOptions = {}, path: string = 'AdminInvoiceSwapResponse::root.'): Error | null => {
+    if (opts.checkOptionalsAreSet && opts.allOptionalsAreSet) return new Error(path + ': only one of checkOptionalsAreSet or allOptionalNonDefault can be set for each message')
+    if (typeof o !== 'object' || o === null) return new Error(path + ': object is not an instance of an object or is null')
+
+    if (typeof o.tx_id !== 'string') return new Error(`${path}.tx_id: is not a string`)
+    if (opts.tx_id_CustomCheck && !opts.tx_id_CustomCheck(o.tx_id)) return new Error(`${path}.tx_id: custom check failed`)
+
+    return null
+}
+
+export type AdminTxSwapResponse = {
     network_fee: number
     tx_id: string
 }
-export const AdminSwapResponseOptionalFields: [] = []
-export type AdminSwapResponseOptions = OptionsBaseMessage & {
+export const AdminTxSwapResponseOptionalFields: [] = []
+export type AdminTxSwapResponseOptions = OptionsBaseMessage & {
     checkOptionalsAreSet?: []
     network_fee_CustomCheck?: (v: number) => boolean
     tx_id_CustomCheck?: (v: string) => boolean
 }
-export const AdminSwapResponseValidate = (o?: AdminSwapResponse, opts: AdminSwapResponseOptions = {}, path: string = 'AdminSwapResponse::root.'): Error | null => {
+export const AdminTxSwapResponseValidate = (o?: AdminTxSwapResponse, opts: AdminTxSwapResponseOptions = {}, path: string = 'AdminTxSwapResponse::root.'): Error | null => {
     if (opts.checkOptionalsAreSet && opts.allOptionalsAreSet) return new Error(path + ': only one of checkOptionalsAreSet or allOptionalNonDefault can be set for each message')
     if (typeof o !== 'object' || o === null) return new Error(path + ': object is not an instance of an object or is null')
 
@@ -895,6 +945,105 @@ export const AppsMetricsRequestValidate = (o?: AppsMetricsRequest, opts: AppsMet
     return null
 }
 
+export type AssetOperation = {
+    amount: number
+    tracked?: TrackedOperation
+    ts: number
+}
+export type AssetOperationOptionalField = 'tracked'
+export const AssetOperationOptionalFields: AssetOperationOptionalField[] = ['tracked']
+export type AssetOperationOptions = OptionsBaseMessage & {
+    checkOptionalsAreSet?: AssetOperationOptionalField[]
+    amount_CustomCheck?: (v: number) => boolean
+    tracked_Options?: TrackedOperationOptions
+    ts_CustomCheck?: (v: number) => boolean
+}
+export const AssetOperationValidate = (o?: AssetOperation, opts: AssetOperationOptions = {}, path: string = 'AssetOperation::root.'): Error | null => {
+    if (opts.checkOptionalsAreSet && opts.allOptionalsAreSet) return new Error(path + ': only one of checkOptionalsAreSet or allOptionalNonDefault can be set for each message')
+    if (typeof o !== 'object' || o === null) return new Error(path + ': object is not an instance of an object or is null')
+
+    if (typeof o.amount !== 'number') return new Error(`${path}.amount: is not a number`)
+    if (opts.amount_CustomCheck && !opts.amount_CustomCheck(o.amount)) return new Error(`${path}.amount: custom check failed`)
+
+    if (typeof o.tracked === 'object' || opts.allOptionalsAreSet || opts.checkOptionalsAreSet?.includes('tracked')) {
+        const trackedErr = TrackedOperationValidate(o.tracked, opts.tracked_Options, `${path}.tracked`)
+        if (trackedErr !== null) return trackedErr
+    }
+    
+
+    if (typeof o.ts !== 'number') return new Error(`${path}.ts: is not a number`)
+    if (opts.ts_CustomCheck && !opts.ts_CustomCheck(o.ts)) return new Error(`${path}.ts: custom check failed`)
+
+    return null
+}
+
+export type AssetsAndLiabilities = {
+    liquidity_providers: LiquidityAssetProvider[]
+    lnds: LndAssetProvider[]
+    users_balance: number
+}
+export const AssetsAndLiabilitiesOptionalFields: [] = []
+export type AssetsAndLiabilitiesOptions = OptionsBaseMessage & {
+    checkOptionalsAreSet?: []
+    liquidity_providers_ItemOptions?: LiquidityAssetProviderOptions
+    liquidity_providers_CustomCheck?: (v: LiquidityAssetProvider[]) => boolean
+    lnds_ItemOptions?: LndAssetProviderOptions
+    lnds_CustomCheck?: (v: LndAssetProvider[]) => boolean
+    users_balance_CustomCheck?: (v: number) => boolean
+}
+export const AssetsAndLiabilitiesValidate = (o?: AssetsAndLiabilities, opts: AssetsAndLiabilitiesOptions = {}, path: string = 'AssetsAndLiabilities::root.'): Error | null => {
+    if (opts.checkOptionalsAreSet && opts.allOptionalsAreSet) return new Error(path + ': only one of checkOptionalsAreSet or allOptionalNonDefault can be set for each message')
+    if (typeof o !== 'object' || o === null) return new Error(path + ': object is not an instance of an object or is null')
+
+    if (!Array.isArray(o.liquidity_providers)) return new Error(`${path}.liquidity_providers: is not an array`)
+    for (let index = 0; index < o.liquidity_providers.length; index++) {
+        const liquidity_providersErr = LiquidityAssetProviderValidate(o.liquidity_providers[index], opts.liquidity_providers_ItemOptions, `${path}.liquidity_providers[${index}]`)
+        if (liquidity_providersErr !== null) return liquidity_providersErr
+    }
+    if (opts.liquidity_providers_CustomCheck && !opts.liquidity_providers_CustomCheck(o.liquidity_providers)) return new Error(`${path}.liquidity_providers: custom check failed`)
+
+    if (!Array.isArray(o.lnds)) return new Error(`${path}.lnds: is not an array`)
+    for (let index = 0; index < o.lnds.length; index++) {
+        const lndsErr = LndAssetProviderValidate(o.lnds[index], opts.lnds_ItemOptions, `${path}.lnds[${index}]`)
+        if (lndsErr !== null) return lndsErr
+    }
+    if (opts.lnds_CustomCheck && !opts.lnds_CustomCheck(o.lnds)) return new Error(`${path}.lnds: custom check failed`)
+
+    if (typeof o.users_balance !== 'number') return new Error(`${path}.users_balance: is not a number`)
+    if (opts.users_balance_CustomCheck && !opts.users_balance_CustomCheck(o.users_balance)) return new Error(`${path}.users_balance: custom check failed`)
+
+    return null
+}
+
+export type AssetsAndLiabilitiesReq = {
+    limit_invoices?: number
+    limit_payments?: number
+    limit_providers?: number
+}
+export type AssetsAndLiabilitiesReqOptionalField = 'limit_invoices' | 'limit_payments' | 'limit_providers'
+export const AssetsAndLiabilitiesReqOptionalFields: AssetsAndLiabilitiesReqOptionalField[] = ['limit_invoices', 'limit_payments', 'limit_providers']
+export type AssetsAndLiabilitiesReqOptions = OptionsBaseMessage & {
+    checkOptionalsAreSet?: AssetsAndLiabilitiesReqOptionalField[]
+    limit_invoices_CustomCheck?: (v?: number) => boolean
+    limit_payments_CustomCheck?: (v?: number) => boolean
+    limit_providers_CustomCheck?: (v?: number) => boolean
+}
+export const AssetsAndLiabilitiesReqValidate = (o?: AssetsAndLiabilitiesReq, opts: AssetsAndLiabilitiesReqOptions = {}, path: string = 'AssetsAndLiabilitiesReq::root.'): Error | null => {
+    if (opts.checkOptionalsAreSet && opts.allOptionalsAreSet) return new Error(path + ': only one of checkOptionalsAreSet or allOptionalNonDefault can be set for each message')
+    if (typeof o !== 'object' || o === null) return new Error(path + ': object is not an instance of an object or is null')
+
+    if ((o.limit_invoices || opts.allOptionalsAreSet || opts.checkOptionalsAreSet?.includes('limit_invoices')) && typeof o.limit_invoices !== 'number') return new Error(`${path}.limit_invoices: is not a number`)
+    if (opts.limit_invoices_CustomCheck && !opts.limit_invoices_CustomCheck(o.limit_invoices)) return new Error(`${path}.limit_invoices: custom check failed`)
+
+    if ((o.limit_payments || opts.allOptionalsAreSet || opts.checkOptionalsAreSet?.includes('limit_payments')) && typeof o.limit_payments !== 'number') return new Error(`${path}.limit_payments: is not a number`)
+    if (opts.limit_payments_CustomCheck && !opts.limit_payments_CustomCheck(o.limit_payments)) return new Error(`${path}.limit_payments: custom check failed`)
+
+    if ((o.limit_providers || opts.allOptionalsAreSet || opts.checkOptionalsAreSet?.includes('limit_providers')) && typeof o.limit_providers !== 'number') return new Error(`${path}.limit_providers: is not a number`)
+    if (opts.limit_providers_CustomCheck && !opts.limit_providers_CustomCheck(o.limit_providers)) return new Error(`${path}.limit_providers: custom check failed`)
+
+    return null
+}
+
 export type AuthApp = {
     app: Application
     auth_token: string
@@ -1064,6 +1213,34 @@ export const BeaconDataValidate = (o?: BeaconData, opts: BeaconDataOptions = {},
     return null
 }
 
+export type BumpTx = {
+    output_index: number
+    sat_per_vbyte: number
+    txid: string
+}
+export const BumpTxOptionalFields: [] = []
+export type BumpTxOptions = OptionsBaseMessage & {
+    checkOptionalsAreSet?: []
+    output_index_CustomCheck?: (v: number) => boolean
+    sat_per_vbyte_CustomCheck?: (v: number) => boolean
+    txid_CustomCheck?: (v: string) => boolean
+}
+export const BumpTxValidate = (o?: BumpTx, opts: BumpTxOptions = {}, path: string = 'BumpTx::root.'): Error | null => {
+    if (opts.checkOptionalsAreSet && opts.allOptionalsAreSet) return new Error(path + ': only one of checkOptionalsAreSet or allOptionalNonDefault can be set for each message')
+    if (typeof o !== 'object' || o === null) return new Error(path + ': object is not an instance of an object or is null')
+
+    if (typeof o.output_index !== 'number') return new Error(`${path}.output_index: is not a number`)
+    if (opts.output_index_CustomCheck && !opts.output_index_CustomCheck(o.output_index)) return new Error(`${path}.output_index: custom check failed`)
+
+    if (typeof o.sat_per_vbyte !== 'number') return new Error(`${path}.sat_per_vbyte: is not a number`)
+    if (opts.sat_per_vbyte_CustomCheck && !opts.sat_per_vbyte_CustomCheck(o.sat_per_vbyte)) return new Error(`${path}.sat_per_vbyte: custom check failed`)
+
+    if (typeof o.txid !== 'string') return new Error(`${path}.txid: is not a string`)
+    if (opts.txid_CustomCheck && !opts.txid_CustomCheck(o.txid)) return new Error(`${path}.txid: custom check failed`)
+
+    return null
+}
+
 export type BundleData = {
     available_chunks: number[]
     base_64_data: string[]
@@ -2088,6 +2265,186 @@ export const HttpCredsValidate = (o?: HttpCreds, opts: HttpCredsOptions = {}, pa
     return null
 }
 
+export type InvoiceSwapOperation = {
+    completed_at_unix?: number
+    failure_reason?: string
+    operation_payment?: UserOperation
+    quote: InvoiceSwapQuote
+}
+export type InvoiceSwapOperationOptionalField = 'completed_at_unix' | 'failure_reason' | 'operation_payment'
+export const InvoiceSwapOperationOptionalFields: InvoiceSwapOperationOptionalField[] = ['completed_at_unix', 'failure_reason', 'operation_payment']
+export type InvoiceSwapOperationOptions = OptionsBaseMessage & {
+    checkOptionalsAreSet?: InvoiceSwapOperationOptionalField[]
+    completed_at_unix_CustomCheck?: (v?: number) => boolean
+    failure_reason_CustomCheck?: (v?: string) => boolean
+    operation_payment_Options?: UserOperationOptions
+    quote_Options?: InvoiceSwapQuoteOptions
+}
+export const InvoiceSwapOperationValidate = (o?: InvoiceSwapOperation, opts: InvoiceSwapOperationOptions = {}, path: string = 'InvoiceSwapOperation::root.'): Error | null => {
+    if (opts.checkOptionalsAreSet && opts.allOptionalsAreSet) return new Error(path + ': only one of checkOptionalsAreSet or allOptionalNonDefault can be set for each message')
+    if (typeof o !== 'object' || o === null) return new Error(path + ': object is not an instance of an object or is null')
+
+    if ((o.completed_at_unix || opts.allOptionalsAreSet || opts.checkOptionalsAreSet?.includes('completed_at_unix')) && typeof o.completed_at_unix !== 'number') return new Error(`${path}.completed_at_unix: is not a number`)
+    if (opts.completed_at_unix_CustomCheck && !opts.completed_at_unix_CustomCheck(o.completed_at_unix)) return new Error(`${path}.completed_at_unix: custom check failed`)
+
+    if ((o.failure_reason || opts.allOptionalsAreSet || opts.checkOptionalsAreSet?.includes('failure_reason')) && typeof o.failure_reason !== 'string') return new Error(`${path}.failure_reason: is not a string`)
+    if (opts.failure_reason_CustomCheck && !opts.failure_reason_CustomCheck(o.failure_reason)) return new Error(`${path}.failure_reason: custom check failed`)
+
+    if (typeof o.operation_payment === 'object' || opts.allOptionalsAreSet || opts.checkOptionalsAreSet?.includes('operation_payment')) {
+        const operation_paymentErr = UserOperationValidate(o.operation_payment, opts.operation_payment_Options, `${path}.operation_payment`)
+        if (operation_paymentErr !== null) return operation_paymentErr
+    }
+    
+
+    const quoteErr = InvoiceSwapQuoteValidate(o.quote, opts.quote_Options, `${path}.quote`)
+    if (quoteErr !== null) return quoteErr
+    
+
+    return null
+}
+
+export type InvoiceSwapQuote = {
+    address: string
+    chain_fee_sats: number
+    expires_at_block_height: number
+    invoice: string
+    invoice_amount_sats: number
+    paid_at_unix: number
+    service_fee_sats: number
+    service_url: string
+    swap_fee_sats: number
+    swap_operation_id: string
+    transaction_amount_sats: number
+    tx_id: string
+}
+export const InvoiceSwapQuoteOptionalFields: [] = []
+export type InvoiceSwapQuoteOptions = OptionsBaseMessage & {
+    checkOptionalsAreSet?: []
+    address_CustomCheck?: (v: string) => boolean
+    chain_fee_sats_CustomCheck?: (v: number) => boolean
+    expires_at_block_height_CustomCheck?: (v: number) => boolean
+    invoice_CustomCheck?: (v: string) => boolean
+    invoice_amount_sats_CustomCheck?: (v: number) => boolean
+    paid_at_unix_CustomCheck?: (v: number) => boolean
+    service_fee_sats_CustomCheck?: (v: number) => boolean
+    service_url_CustomCheck?: (v: string) => boolean
+    swap_fee_sats_CustomCheck?: (v: number) => boolean
+    swap_operation_id_CustomCheck?: (v: string) => boolean
+    transaction_amount_sats_CustomCheck?: (v: number) => boolean
+    tx_id_CustomCheck?: (v: string) => boolean
+}
+export const InvoiceSwapQuoteValidate = (o?: InvoiceSwapQuote, opts: InvoiceSwapQuoteOptions = {}, path: string = 'InvoiceSwapQuote::root.'): Error | null => {
+    if (opts.checkOptionalsAreSet && opts.allOptionalsAreSet) return new Error(path + ': only one of checkOptionalsAreSet or allOptionalNonDefault can be set for each message')
+    if (typeof o !== 'object' || o === null) return new Error(path + ': object is not an instance of an object or is null')
+
+    if (typeof o.address !== 'string') return new Error(`${path}.address: is not a string`)
+    if (opts.address_CustomCheck && !opts.address_CustomCheck(o.address)) return new Error(`${path}.address: custom check failed`)
+
+    if (typeof o.chain_fee_sats !== 'number') return new Error(`${path}.chain_fee_sats: is not a number`)
+    if (opts.chain_fee_sats_CustomCheck && !opts.chain_fee_sats_CustomCheck(o.chain_fee_sats)) return new Error(`${path}.chain_fee_sats: custom check failed`)
+
+    if (typeof o.expires_at_block_height !== 'number') return new Error(`${path}.expires_at_block_height: is not a number`)
+    if (opts.expires_at_block_height_CustomCheck && !opts.expires_at_block_height_CustomCheck(o.expires_at_block_height)) return new Error(`${path}.expires_at_block_height: custom check failed`)
+
+    if (typeof o.invoice !== 'string') return new Error(`${path}.invoice: is not a string`)
+    if (opts.invoice_CustomCheck && !opts.invoice_CustomCheck(o.invoice)) return new Error(`${path}.invoice: custom check failed`)
+
+    if (typeof o.invoice_amount_sats !== 'number') return new Error(`${path}.invoice_amount_sats: is not a number`)
+    if (opts.invoice_amount_sats_CustomCheck && !opts.invoice_amount_sats_CustomCheck(o.invoice_amount_sats)) return new Error(`${path}.invoice_amount_sats: custom check failed`)
+
+    if (typeof o.paid_at_unix !== 'number') return new Error(`${path}.paid_at_unix: is not a number`)
+    if (opts.paid_at_unix_CustomCheck && !opts.paid_at_unix_CustomCheck(o.paid_at_unix)) return new Error(`${path}.paid_at_unix: custom check failed`)
+
+    if (typeof o.service_fee_sats !== 'number') return new Error(`${path}.service_fee_sats: is not a number`)
+    if (opts.service_fee_sats_CustomCheck && !opts.service_fee_sats_CustomCheck(o.service_fee_sats)) return new Error(`${path}.service_fee_sats: custom check failed`)
+
+    if (typeof o.service_url !== 'string') return new Error(`${path}.service_url: is not a string`)
+    if (opts.service_url_CustomCheck && !opts.service_url_CustomCheck(o.service_url)) return new Error(`${path}.service_url: custom check failed`)
+
+    if (typeof o.swap_fee_sats !== 'number') return new Error(`${path}.swap_fee_sats: is not a number`)
+    if (opts.swap_fee_sats_CustomCheck && !opts.swap_fee_sats_CustomCheck(o.swap_fee_sats)) return new Error(`${path}.swap_fee_sats: custom check failed`)
+
+    if (typeof o.swap_operation_id !== 'string') return new Error(`${path}.swap_operation_id: is not a string`)
+    if (opts.swap_operation_id_CustomCheck && !opts.swap_operation_id_CustomCheck(o.swap_operation_id)) return new Error(`${path}.swap_operation_id: custom check failed`)
+
+    if (typeof o.transaction_amount_sats !== 'number') return new Error(`${path}.transaction_amount_sats: is not a number`)
+    if (opts.transaction_amount_sats_CustomCheck && !opts.transaction_amount_sats_CustomCheck(o.transaction_amount_sats)) return new Error(`${path}.transaction_amount_sats: custom check failed`)
+
+    if (typeof o.tx_id !== 'string') return new Error(`${path}.tx_id: is not a string`)
+    if (opts.tx_id_CustomCheck && !opts.tx_id_CustomCheck(o.tx_id)) return new Error(`${path}.tx_id: custom check failed`)
+
+    return null
+}
+
+export type InvoiceSwapQuoteList = {
+    quotes: InvoiceSwapQuote[]
+}
+export const InvoiceSwapQuoteListOptionalFields: [] = []
+export type InvoiceSwapQuoteListOptions = OptionsBaseMessage & {
+    checkOptionalsAreSet?: []
+    quotes_ItemOptions?: InvoiceSwapQuoteOptions
+    quotes_CustomCheck?: (v: InvoiceSwapQuote[]) => boolean
+}
+export const InvoiceSwapQuoteListValidate = (o?: InvoiceSwapQuoteList, opts: InvoiceSwapQuoteListOptions = {}, path: string = 'InvoiceSwapQuoteList::root.'): Error | null => {
+    if (opts.checkOptionalsAreSet && opts.allOptionalsAreSet) return new Error(path + ': only one of checkOptionalsAreSet or allOptionalNonDefault can be set for each message')
+    if (typeof o !== 'object' || o === null) return new Error(path + ': object is not an instance of an object or is null')
+
+    if (!Array.isArray(o.quotes)) return new Error(`${path}.quotes: is not an array`)
+    for (let index = 0; index < o.quotes.length; index++) {
+        const quotesErr = InvoiceSwapQuoteValidate(o.quotes[index], opts.quotes_ItemOptions, `${path}.quotes[${index}]`)
+        if (quotesErr !== null) return quotesErr
+    }
+    if (opts.quotes_CustomCheck && !opts.quotes_CustomCheck(o.quotes)) return new Error(`${path}.quotes: custom check failed`)
+
+    return null
+}
+
+export type InvoiceSwapRequest = {
+    amount_sats: number
+}
+export const InvoiceSwapRequestOptionalFields: [] = []
+export type InvoiceSwapRequestOptions = OptionsBaseMessage & {
+    checkOptionalsAreSet?: []
+    amount_sats_CustomCheck?: (v: number) => boolean
+}
+export const InvoiceSwapRequestValidate = (o?: InvoiceSwapRequest, opts: InvoiceSwapRequestOptions = {}, path: string = 'InvoiceSwapRequest::root.'): Error | null => {
+    if (opts.checkOptionalsAreSet && opts.allOptionalsAreSet) return new Error(path + ': only one of checkOptionalsAreSet or allOptionalNonDefault can be set for each message')
+    if (typeof o !== 'object' || o === null) return new Error(path + ': object is not an instance of an object or is null')
+
+    if (typeof o.amount_sats !== 'number') return new Error(`${path}.amount_sats: is not a number`)
+    if (opts.amount_sats_CustomCheck && !opts.amount_sats_CustomCheck(o.amount_sats)) return new Error(`${path}.amount_sats: custom check failed`)
+
+    return null
+}
+
+export type InvoiceSwapsList = {
+    current_block_height: number
+    swaps: InvoiceSwapOperation[]
+}
+export const InvoiceSwapsListOptionalFields: [] = []
+export type InvoiceSwapsListOptions = OptionsBaseMessage & {
+    checkOptionalsAreSet?: []
+    current_block_height_CustomCheck?: (v: number) => boolean
+    swaps_ItemOptions?: InvoiceSwapOperationOptions
+    swaps_CustomCheck?: (v: InvoiceSwapOperation[]) => boolean
+}
+export const InvoiceSwapsListValidate = (o?: InvoiceSwapsList, opts: InvoiceSwapsListOptions = {}, path: string = 'InvoiceSwapsList::root.'): Error | null => {
+    if (opts.checkOptionalsAreSet && opts.allOptionalsAreSet) return new Error(path + ': only one of checkOptionalsAreSet or allOptionalNonDefault can be set for each message')
+    if (typeof o !== 'object' || o === null) return new Error(path + ': object is not an instance of an object or is null')
+
+    if (typeof o.current_block_height !== 'number') return new Error(`${path}.current_block_height: is not a number`)
+    if (opts.current_block_height_CustomCheck && !opts.current_block_height_CustomCheck(o.current_block_height)) return new Error(`${path}.current_block_height: custom check failed`)
+
+    if (!Array.isArray(o.swaps)) return new Error(`${path}.swaps: is not an array`)
+    for (let index = 0; index < o.swaps.length; index++) {
+        const swapsErr = InvoiceSwapOperationValidate(o.swaps[index], opts.swaps_ItemOptions, `${path}.swaps[${index}]`)
+        if (swapsErr !== null) return swapsErr
+    }
+    if (opts.swaps_CustomCheck && !opts.swaps_CustomCheck(o.swaps)) return new Error(`${path}.swaps: custom check failed`)
+
+    return null
+}
+
 export type LatestBundleMetricReq = {
     limit?: number
 }
@@ -2144,6 +2501,33 @@ export const LinkNPubThroughTokenRequestValidate = (o?: LinkNPubThroughTokenRequ
     return null
 }
 
+export type LiquidityAssetProvider = {
+    pubkey: string
+    tracked?: TrackedLiquidityProvider
+}
+export type LiquidityAssetProviderOptionalField = 'tracked'
+export const LiquidityAssetProviderOptionalFields: LiquidityAssetProviderOptionalField[] = ['tracked']
+export type LiquidityAssetProviderOptions = OptionsBaseMessage & {
+    checkOptionalsAreSet?: LiquidityAssetProviderOptionalField[]
+    pubkey_CustomCheck?: (v: string) => boolean
+    tracked_Options?: TrackedLiquidityProviderOptions
+}
+export const LiquidityAssetProviderValidate = (o?: LiquidityAssetProvider, opts: LiquidityAssetProviderOptions = {}, path: string = 'LiquidityAssetProvider::root.'): Error | null => {
+    if (opts.checkOptionalsAreSet && opts.allOptionalsAreSet) return new Error(path + ': only one of checkOptionalsAreSet or allOptionalNonDefault can be set for each message')
+    if (typeof o !== 'object' || o === null) return new Error(path + ': object is not an instance of an object or is null')
+
+    if (typeof o.pubkey !== 'string') return new Error(`${path}.pubkey: is not a string`)
+    if (opts.pubkey_CustomCheck && !opts.pubkey_CustomCheck(o.pubkey)) return new Error(`${path}.pubkey: custom check failed`)
+
+    if (typeof o.tracked === 'object' || opts.allOptionalsAreSet || opts.checkOptionalsAreSet?.includes('tracked')) {
+        const trackedErr = TrackedLiquidityProviderValidate(o.tracked, opts.tracked_Options, `${path}.tracked`)
+        if (trackedErr !== null) return trackedErr
+    }
+    
+
+    return null
+}
+
 export type LiveDebitRequest = {
     debit: LiveDebitRequest_debit
     npub: string
@@ -2220,6 +2604,33 @@ export const LiveUserOperationValidate = (o?: LiveUserOperation, opts: LiveUserO
     return null
 }
 
+export type LndAssetProvider = {
+    pubkey: string
+    tracked?: TrackedLndProvider
+}
+export type LndAssetProviderOptionalField = 'tracked'
+export const LndAssetProviderOptionalFields: LndAssetProviderOptionalField[] = ['tracked']
+export type LndAssetProviderOptions = OptionsBaseMessage & {
+    checkOptionalsAreSet?: LndAssetProviderOptionalField[]
+    pubkey_CustomCheck?: (v: string) => boolean
+    tracked_Options?: TrackedLndProviderOptions
+}
+export const LndAssetProviderValidate = (o?: LndAssetProvider, opts: LndAssetProviderOptions = {}, path: string = 'LndAssetProvider::root.'): Error | null => {
+    if (opts.checkOptionalsAreSet && opts.allOptionalsAreSet) return new Error(path + ': only one of checkOptionalsAreSet or allOptionalNonDefault can be set for each message')
+    if (typeof o !== 'object' || o === null) return new Error(path + ': object is not an instance of an object or is null')
+
+    if (typeof o.pubkey !== 'string') return new Error(`${path}.pubkey: is not a string`)
+    if (opts.pubkey_CustomCheck && !opts.pubkey_CustomCheck(o.pubkey)) return new Error(`${path}.pubkey: custom check failed`)
+
+    if (typeof o.tracked === 'object' || opts.allOptionalsAreSet || opts.checkOptionalsAreSet?.includes('tracked')) {
+        const trackedErr = TrackedLndProviderValidate(o.tracked, opts.tracked_Options, `${path}.tracked`)
+        if (trackedErr !== null) return trackedErr
+    }
+    
+
+    return null
+}
+
 export type LndChannels = {
     open_channels: OpenChannel[]
 }
@@ -3308,6 +3719,35 @@ export const PayAddressResponseValidate = (o?: PayAddressResponse, opts: PayAddr
     return null
 }
 
+export type PayAdminInvoiceSwapRequest = {
+    no_claim?: boolean
+    sat_per_v_byte: number
+    swap_operation_id: string
+}
+export type PayAdminInvoiceSwapRequestOptionalField = 'no_claim'
+export const PayAdminInvoiceSwapRequestOptionalFields: PayAdminInvoiceSwapRequestOptionalField[] = ['no_claim']
+export type PayAdminInvoiceSwapRequestOptions = OptionsBaseMessage & {
+    checkOptionalsAreSet?: PayAdminInvoiceSwapRequestOptionalField[]
+    no_claim_CustomCheck?: (v?: boolean) => boolean
+    sat_per_v_byte_CustomCheck?: (v: number) => boolean
+    swap_operation_id_CustomCheck?: (v: string) => boolean
+}
+export const PayAdminInvoiceSwapRequestValidate = (o?: PayAdminInvoiceSwapRequest, opts: PayAdminInvoiceSwapRequestOptions = {}, path: string = 'PayAdminInvoiceSwapRequest::root.'): Error | null => {
+    if (opts.checkOptionalsAreSet && opts.allOptionalsAreSet) return new Error(path + ': only one of checkOptionalsAreSet or allOptionalNonDefault can be set for each message')
+    if (typeof o !== 'object' || o === null) return new Error(path + ': object is not an instance of an object or is null')
+
+    if ((o.no_claim || opts.allOptionalsAreSet || opts.checkOptionalsAreSet?.includes('no_claim')) && typeof o.no_claim !== 'boolean') return new Error(`${path}.no_claim: is not a boolean`)
+    if (opts.no_claim_CustomCheck && !opts.no_claim_CustomCheck(o.no_claim)) return new Error(`${path}.no_claim: custom check failed`)
+
+    if (typeof o.sat_per_v_byte !== 'number') return new Error(`${path}.sat_per_v_byte: is not a number`)
+    if (opts.sat_per_v_byte_CustomCheck && !opts.sat_per_v_byte_CustomCheck(o.sat_per_v_byte)) return new Error(`${path}.sat_per_v_byte: custom check failed`)
+
+    if (typeof o.swap_operation_id !== 'string') return new Error(`${path}.swap_operation_id: is not a string`)
+    if (opts.swap_operation_id_CustomCheck && !opts.swap_operation_id_CustomCheck(o.swap_operation_id)) return new Error(`${path}.swap_operation_id: custom check failed`)
+
+    return null
+}
+
 export type PayAdminTransactionSwapRequest = {
     address: string
     swap_operation_id: string
@@ -3600,6 +4040,76 @@ export const ProvidersDisruptionValidate = (o?: ProvidersDisruption, opts: Provi
     return null
 }
 
+export type PushNotificationEnvelope = {
+    app_npub_hex: string
+    encrypted_payload: string
+    topic_id: string
+}
+export const PushNotificationEnvelopeOptionalFields: [] = []
+export type PushNotificationEnvelopeOptions = OptionsBaseMessage & {
+    checkOptionalsAreSet?: []
+    app_npub_hex_CustomCheck?: (v: string) => boolean
+    encrypted_payload_CustomCheck?: (v: string) => boolean
+    topic_id_CustomCheck?: (v: string) => boolean
+}
+export const PushNotificationEnvelopeValidate = (o?: PushNotificationEnvelope, opts: PushNotificationEnvelopeOptions = {}, path: string = 'PushNotificationEnvelope::root.'): Error | null => {
+    if (opts.checkOptionalsAreSet && opts.allOptionalsAreSet) return new Error(path + ': only one of checkOptionalsAreSet or allOptionalNonDefault can be set for each message')
+    if (typeof o !== 'object' || o === null) return new Error(path + ': object is not an instance of an object or is null')
+
+    if (typeof o.app_npub_hex !== 'string') return new Error(`${path}.app_npub_hex: is not a string`)
+    if (opts.app_npub_hex_CustomCheck && !opts.app_npub_hex_CustomCheck(o.app_npub_hex)) return new Error(`${path}.app_npub_hex: custom check failed`)
+
+    if (typeof o.encrypted_payload !== 'string') return new Error(`${path}.encrypted_payload: is not a string`)
+    if (opts.encrypted_payload_CustomCheck && !opts.encrypted_payload_CustomCheck(o.encrypted_payload)) return new Error(`${path}.encrypted_payload: custom check failed`)
+
+    if (typeof o.topic_id !== 'string') return new Error(`${path}.topic_id: is not a string`)
+    if (opts.topic_id_CustomCheck && !opts.topic_id_CustomCheck(o.topic_id)) return new Error(`${path}.topic_id: custom check failed`)
+
+    return null
+}
+
+export type PushNotificationPayload = {
+    data: PushNotificationPayload_data
+}
+export const PushNotificationPayloadOptionalFields: [] = []
+export type PushNotificationPayloadOptions = OptionsBaseMessage & {
+    checkOptionalsAreSet?: []
+    data_Options?: PushNotificationPayload_dataOptions
+}
+export const PushNotificationPayloadValidate = (o?: PushNotificationPayload, opts: PushNotificationPayloadOptions = {}, path: string = 'PushNotificationPayload::root.'): Error | null => {
+    if (opts.checkOptionalsAreSet && opts.allOptionalsAreSet) return new Error(path + ': only one of checkOptionalsAreSet or allOptionalNonDefault can be set for each message')
+    if (typeof o !== 'object' || o === null) return new Error(path + ': object is not an instance of an object or is null')
+
+    const dataErr = PushNotificationPayload_dataValidate(o.data, opts.data_Options, `${path}.data`)
+    if (dataErr !== null) return dataErr
+    
+
+    return null
+}
+
+export type RefundAdminInvoiceSwapRequest = {
+    sat_per_v_byte: number
+    swap_operation_id: string
+}
+export const RefundAdminInvoiceSwapRequestOptionalFields: [] = []
+export type RefundAdminInvoiceSwapRequestOptions = OptionsBaseMessage & {
+    checkOptionalsAreSet?: []
+    sat_per_v_byte_CustomCheck?: (v: number) => boolean
+    swap_operation_id_CustomCheck?: (v: string) => boolean
+}
+export const RefundAdminInvoiceSwapRequestValidate = (o?: RefundAdminInvoiceSwapRequest, opts: RefundAdminInvoiceSwapRequestOptions = {}, path: string = 'RefundAdminInvoiceSwapRequest::root.'): Error | null => {
+    if (opts.checkOptionalsAreSet && opts.allOptionalsAreSet) return new Error(path + ': only one of checkOptionalsAreSet or allOptionalNonDefault can be set for each message')
+    if (typeof o !== 'object' || o === null) return new Error(path + ': object is not an instance of an object or is null')
+
+    if (typeof o.sat_per_v_byte !== 'number') return new Error(`${path}.sat_per_v_byte: is not a number`)
+    if (opts.sat_per_v_byte_CustomCheck && !opts.sat_per_v_byte_CustomCheck(o.sat_per_v_byte)) return new Error(`${path}.sat_per_v_byte: custom check failed`)
+
+    if (typeof o.swap_operation_id !== 'string') return new Error(`${path}.swap_operation_id: is not a string`)
+    if (opts.swap_operation_id_CustomCheck && !opts.swap_operation_id_CustomCheck(o.swap_operation_id)) return new Error(`${path}.swap_operation_id: custom check failed`)
+
+    return null
+}
+
 export type RelaysMigration = {
     relays: string[]
 }
@@ -3917,79 +4427,146 @@ export const SingleMetricReqValidate = (o?: SingleMetricReq, opts: SingleMetricR
     return null
 }
 
-export type SwapOperation = {
-    address_paid: string
-    failure_reason?: string
-    operation_payment?: UserOperation
-    swap_operation_id: string
+export type TrackedLiquidityProvider = {
+    balance: number
+    invoices: AssetOperation[]
+    payments: AssetOperation[]
 }
-export type SwapOperationOptionalField = 'failure_reason' | 'operation_payment'
-export const SwapOperationOptionalFields: SwapOperationOptionalField[] = ['failure_reason', 'operation_payment']
-export type SwapOperationOptions = OptionsBaseMessage & {
-    checkOptionalsAreSet?: SwapOperationOptionalField[]
-    address_paid_CustomCheck?: (v: string) => boolean
-    failure_reason_CustomCheck?: (v?: string) => boolean
-    operation_payment_Options?: UserOperationOptions
-    swap_operation_id_CustomCheck?: (v: string) => boolean
+export const TrackedLiquidityProviderOptionalFields: [] = []
+export type TrackedLiquidityProviderOptions = OptionsBaseMessage & {
+    checkOptionalsAreSet?: []
+    balance_CustomCheck?: (v: number) => boolean
+    invoices_ItemOptions?: AssetOperationOptions
+    invoices_CustomCheck?: (v: AssetOperation[]) => boolean
+    payments_ItemOptions?: AssetOperationOptions
+    payments_CustomCheck?: (v: AssetOperation[]) => boolean
 }
-export const SwapOperationValidate = (o?: SwapOperation, opts: SwapOperationOptions = {}, path: string = 'SwapOperation::root.'): Error | null => {
+export const TrackedLiquidityProviderValidate = (o?: TrackedLiquidityProvider, opts: TrackedLiquidityProviderOptions = {}, path: string = 'TrackedLiquidityProvider::root.'): Error | null => {
     if (opts.checkOptionalsAreSet && opts.allOptionalsAreSet) return new Error(path + ': only one of checkOptionalsAreSet or allOptionalNonDefault can be set for each message')
     if (typeof o !== 'object' || o === null) return new Error(path + ': object is not an instance of an object or is null')
 
-    if (typeof o.address_paid !== 'string') return new Error(`${path}.address_paid: is not a string`)
-    if (opts.address_paid_CustomCheck && !opts.address_paid_CustomCheck(o.address_paid)) return new Error(`${path}.address_paid: custom check failed`)
+    if (typeof o.balance !== 'number') return new Error(`${path}.balance: is not a number`)
+    if (opts.balance_CustomCheck && !opts.balance_CustomCheck(o.balance)) return new Error(`${path}.balance: custom check failed`)
 
-    if ((o.failure_reason || opts.allOptionalsAreSet || opts.checkOptionalsAreSet?.includes('failure_reason')) && typeof o.failure_reason !== 'string') return new Error(`${path}.failure_reason: is not a string`)
-    if (opts.failure_reason_CustomCheck && !opts.failure_reason_CustomCheck(o.failure_reason)) return new Error(`${path}.failure_reason: custom check failed`)
-
-    if (typeof o.operation_payment === 'object' || opts.allOptionalsAreSet || opts.checkOptionalsAreSet?.includes('operation_payment')) {
-        const operation_paymentErr = UserOperationValidate(o.operation_payment, opts.operation_payment_Options, `${path}.operation_payment`)
-        if (operation_paymentErr !== null) return operation_paymentErr
+    if (!Array.isArray(o.invoices)) return new Error(`${path}.invoices: is not an array`)
+    for (let index = 0; index < o.invoices.length; index++) {
+        const invoicesErr = AssetOperationValidate(o.invoices[index], opts.invoices_ItemOptions, `${path}.invoices[${index}]`)
+        if (invoicesErr !== null) return invoicesErr
     }
-    
+    if (opts.invoices_CustomCheck && !opts.invoices_CustomCheck(o.invoices)) return new Error(`${path}.invoices: custom check failed`)
 
-    if (typeof o.swap_operation_id !== 'string') return new Error(`${path}.swap_operation_id: is not a string`)
-    if (opts.swap_operation_id_CustomCheck && !opts.swap_operation_id_CustomCheck(o.swap_operation_id)) return new Error(`${path}.swap_operation_id: custom check failed`)
+    if (!Array.isArray(o.payments)) return new Error(`${path}.payments: is not an array`)
+    for (let index = 0; index < o.payments.length; index++) {
+        const paymentsErr = AssetOperationValidate(o.payments[index], opts.payments_ItemOptions, `${path}.payments[${index}]`)
+        if (paymentsErr !== null) return paymentsErr
+    }
+    if (opts.payments_CustomCheck && !opts.payments_CustomCheck(o.payments)) return new Error(`${path}.payments: custom check failed`)
 
     return null
 }
 
-export type SwapsList = {
-    quotes: TransactionSwapQuote[]
-    swaps: SwapOperation[]
+export type TrackedLndProvider = {
+    channels_balance: number
+    confirmed_balance: number
+    incoming_tx: AssetOperation[]
+    invoices: AssetOperation[]
+    outgoing_tx: AssetOperation[]
+    payments: AssetOperation[]
+    unconfirmed_balance: number
 }
-export const SwapsListOptionalFields: [] = []
-export type SwapsListOptions = OptionsBaseMessage & {
+export const TrackedLndProviderOptionalFields: [] = []
+export type TrackedLndProviderOptions = OptionsBaseMessage & {
     checkOptionalsAreSet?: []
-    quotes_ItemOptions?: TransactionSwapQuoteOptions
-    quotes_CustomCheck?: (v: TransactionSwapQuote[]) => boolean
-    swaps_ItemOptions?: SwapOperationOptions
-    swaps_CustomCheck?: (v: SwapOperation[]) => boolean
+    channels_balance_CustomCheck?: (v: number) => boolean
+    confirmed_balance_CustomCheck?: (v: number) => boolean
+    incoming_tx_ItemOptions?: AssetOperationOptions
+    incoming_tx_CustomCheck?: (v: AssetOperation[]) => boolean
+    invoices_ItemOptions?: AssetOperationOptions
+    invoices_CustomCheck?: (v: AssetOperation[]) => boolean
+    outgoing_tx_ItemOptions?: AssetOperationOptions
+    outgoing_tx_CustomCheck?: (v: AssetOperation[]) => boolean
+    payments_ItemOptions?: AssetOperationOptions
+    payments_CustomCheck?: (v: AssetOperation[]) => boolean
+    unconfirmed_balance_CustomCheck?: (v: number) => boolean
 }
-export const SwapsListValidate = (o?: SwapsList, opts: SwapsListOptions = {}, path: string = 'SwapsList::root.'): Error | null => {
+export const TrackedLndProviderValidate = (o?: TrackedLndProvider, opts: TrackedLndProviderOptions = {}, path: string = 'TrackedLndProvider::root.'): Error | null => {
     if (opts.checkOptionalsAreSet && opts.allOptionalsAreSet) return new Error(path + ': only one of checkOptionalsAreSet or allOptionalNonDefault can be set for each message')
     if (typeof o !== 'object' || o === null) return new Error(path + ': object is not an instance of an object or is null')
 
-    if (!Array.isArray(o.quotes)) return new Error(`${path}.quotes: is not an array`)
-    for (let index = 0; index < o.quotes.length; index++) {
-        const quotesErr = TransactionSwapQuoteValidate(o.quotes[index], opts.quotes_ItemOptions, `${path}.quotes[${index}]`)
-        if (quotesErr !== null) return quotesErr
-    }
-    if (opts.quotes_CustomCheck && !opts.quotes_CustomCheck(o.quotes)) return new Error(`${path}.quotes: custom check failed`)
+    if (typeof o.channels_balance !== 'number') return new Error(`${path}.channels_balance: is not a number`)
+    if (opts.channels_balance_CustomCheck && !opts.channels_balance_CustomCheck(o.channels_balance)) return new Error(`${path}.channels_balance: custom check failed`)
 
-    if (!Array.isArray(o.swaps)) return new Error(`${path}.swaps: is not an array`)
-    for (let index = 0; index < o.swaps.length; index++) {
-        const swapsErr = SwapOperationValidate(o.swaps[index], opts.swaps_ItemOptions, `${path}.swaps[${index}]`)
-        if (swapsErr !== null) return swapsErr
+    if (typeof o.confirmed_balance !== 'number') return new Error(`${path}.confirmed_balance: is not a number`)
+    if (opts.confirmed_balance_CustomCheck && !opts.confirmed_balance_CustomCheck(o.confirmed_balance)) return new Error(`${path}.confirmed_balance: custom check failed`)
+
+    if (!Array.isArray(o.incoming_tx)) return new Error(`${path}.incoming_tx: is not an array`)
+    for (let index = 0; index < o.incoming_tx.length; index++) {
+        const incoming_txErr = AssetOperationValidate(o.incoming_tx[index], opts.incoming_tx_ItemOptions, `${path}.incoming_tx[${index}]`)
+        if (incoming_txErr !== null) return incoming_txErr
     }
-    if (opts.swaps_CustomCheck && !opts.swaps_CustomCheck(o.swaps)) return new Error(`${path}.swaps: custom check failed`)
+    if (opts.incoming_tx_CustomCheck && !opts.incoming_tx_CustomCheck(o.incoming_tx)) return new Error(`${path}.incoming_tx: custom check failed`)
+
+    if (!Array.isArray(o.invoices)) return new Error(`${path}.invoices: is not an array`)
+    for (let index = 0; index < o.invoices.length; index++) {
+        const invoicesErr = AssetOperationValidate(o.invoices[index], opts.invoices_ItemOptions, `${path}.invoices[${index}]`)
+        if (invoicesErr !== null) return invoicesErr
+    }
+    if (opts.invoices_CustomCheck && !opts.invoices_CustomCheck(o.invoices)) return new Error(`${path}.invoices: custom check failed`)
+
+    if (!Array.isArray(o.outgoing_tx)) return new Error(`${path}.outgoing_tx: is not an array`)
+    for (let index = 0; index < o.outgoing_tx.length; index++) {
+        const outgoing_txErr = AssetOperationValidate(o.outgoing_tx[index], opts.outgoing_tx_ItemOptions, `${path}.outgoing_tx[${index}]`)
+        if (outgoing_txErr !== null) return outgoing_txErr
+    }
+    if (opts.outgoing_tx_CustomCheck && !opts.outgoing_tx_CustomCheck(o.outgoing_tx)) return new Error(`${path}.outgoing_tx: custom check failed`)
+
+    if (!Array.isArray(o.payments)) return new Error(`${path}.payments: is not an array`)
+    for (let index = 0; index < o.payments.length; index++) {
+        const paymentsErr = AssetOperationValidate(o.payments[index], opts.payments_ItemOptions, `${path}.payments[${index}]`)
+        if (paymentsErr !== null) return paymentsErr
+    }
+    if (opts.payments_CustomCheck && !opts.payments_CustomCheck(o.payments)) return new Error(`${path}.payments: custom check failed`)
+
+    if (typeof o.unconfirmed_balance !== 'number') return new Error(`${path}.unconfirmed_balance: is not a number`)
+    if (opts.unconfirmed_balance_CustomCheck && !opts.unconfirmed_balance_CustomCheck(o.unconfirmed_balance)) return new Error(`${path}.unconfirmed_balance: custom check failed`)
+
+    return null
+}
+
+export type TrackedOperation = {
+    amount: number
+    ts: number
+    type: TrackedOperationType
+}
+export const TrackedOperationOptionalFields: [] = []
+export type TrackedOperationOptions = OptionsBaseMessage & {
+    checkOptionalsAreSet?: []
+    amount_CustomCheck?: (v: number) => boolean
+    ts_CustomCheck?: (v: number) => boolean
+    type_CustomCheck?: (v: TrackedOperationType) => boolean
+}
+export const TrackedOperationValidate = (o?: TrackedOperation, opts: TrackedOperationOptions = {}, path: string = 'TrackedOperation::root.'): Error | null => {
+    if (opts.checkOptionalsAreSet && opts.allOptionalsAreSet) return new Error(path + ': only one of checkOptionalsAreSet or allOptionalNonDefault can be set for each message')
+    if (typeof o !== 'object' || o === null) return new Error(path + ': object is not an instance of an object or is null')
+
+    if (typeof o.amount !== 'number') return new Error(`${path}.amount: is not a number`)
+    if (opts.amount_CustomCheck && !opts.amount_CustomCheck(o.amount)) return new Error(`${path}.amount: custom check failed`)
+
+    if (typeof o.ts !== 'number') return new Error(`${path}.ts: is not a number`)
+    if (opts.ts_CustomCheck && !opts.ts_CustomCheck(o.ts)) return new Error(`${path}.ts: custom check failed`)
+
+    if (!enumCheckTrackedOperationType(o.type)) return new Error(`${path}.type: is not a valid TrackedOperationType`)
+    if (opts.type_CustomCheck && !opts.type_CustomCheck(o.type)) return new Error(`${path}.type: custom check failed`)
 
     return null
 }
 
 export type TransactionSwapQuote = {
     chain_fee_sats: number
+    completed_at_unix: number
+    expires_at_block_height: number
     invoice_amount_sats: number
+    paid_at_unix: number
     service_fee_sats: number
     service_url: string
     swap_fee_sats: number
@@ -4000,7 +4577,10 @@ export const TransactionSwapQuoteOptionalFields: [] = []
 export type TransactionSwapQuoteOptions = OptionsBaseMessage & {
     checkOptionalsAreSet?: []
     chain_fee_sats_CustomCheck?: (v: number) => boolean
+    completed_at_unix_CustomCheck?: (v: number) => boolean
+    expires_at_block_height_CustomCheck?: (v: number) => boolean
     invoice_amount_sats_CustomCheck?: (v: number) => boolean
+    paid_at_unix_CustomCheck?: (v: number) => boolean
     service_fee_sats_CustomCheck?: (v: number) => boolean
     service_url_CustomCheck?: (v: string) => boolean
     swap_fee_sats_CustomCheck?: (v: number) => boolean
@@ -4014,9 +4594,18 @@ export const TransactionSwapQuoteValidate = (o?: TransactionSwapQuote, opts: Tra
     if (typeof o.chain_fee_sats !== 'number') return new Error(`${path}.chain_fee_sats: is not a number`)
     if (opts.chain_fee_sats_CustomCheck && !opts.chain_fee_sats_CustomCheck(o.chain_fee_sats)) return new Error(`${path}.chain_fee_sats: custom check failed`)
 
+    if (typeof o.completed_at_unix !== 'number') return new Error(`${path}.completed_at_unix: is not a number`)
+    if (opts.completed_at_unix_CustomCheck && !opts.completed_at_unix_CustomCheck(o.completed_at_unix)) return new Error(`${path}.completed_at_unix: custom check failed`)
+
+    if (typeof o.expires_at_block_height !== 'number') return new Error(`${path}.expires_at_block_height: is not a number`)
+    if (opts.expires_at_block_height_CustomCheck && !opts.expires_at_block_height_CustomCheck(o.expires_at_block_height)) return new Error(`${path}.expires_at_block_height: custom check failed`)
+
     if (typeof o.invoice_amount_sats !== 'number') return new Error(`${path}.invoice_amount_sats: is not a number`)
     if (opts.invoice_amount_sats_CustomCheck && !opts.invoice_amount_sats_CustomCheck(o.invoice_amount_sats)) return new Error(`${path}.invoice_amount_sats: custom check failed`)
 
+    if (typeof o.paid_at_unix !== 'number') return new Error(`${path}.paid_at_unix: is not a number`)
+    if (opts.paid_at_unix_CustomCheck && !opts.paid_at_unix_CustomCheck(o.paid_at_unix)) return new Error(`${path}.paid_at_unix: custom check failed`)
+
     if (typeof o.service_fee_sats !== 'number') return new Error(`${path}.service_fee_sats: is not a number`)
     if (opts.service_fee_sats_CustomCheck && !opts.service_fee_sats_CustomCheck(o.service_fee_sats)) return new Error(`${path}.service_fee_sats: custom check failed`)
 
@@ -4076,6 +4665,72 @@ export const TransactionSwapRequestValidate = (o?: TransactionSwapRequest, opts:
     return null
 }
 
+export type TxSwapOperation = {
+    address_paid?: string
+    failure_reason?: string
+    operation_payment?: UserOperation
+    quote: TransactionSwapQuote
+    tx_id?: string
+}
+export type TxSwapOperationOptionalField = 'address_paid' | 'failure_reason' | 'operation_payment' | 'tx_id'
+export const TxSwapOperationOptionalFields: TxSwapOperationOptionalField[] = ['address_paid', 'failure_reason', 'operation_payment', 'tx_id']
+export type TxSwapOperationOptions = OptionsBaseMessage & {
+    checkOptionalsAreSet?: TxSwapOperationOptionalField[]
+    address_paid_CustomCheck?: (v?: string) => boolean
+    failure_reason_CustomCheck?: (v?: string) => boolean
+    operation_payment_Options?: UserOperationOptions
+    quote_Options?: TransactionSwapQuoteOptions
+    tx_id_CustomCheck?: (v?: string) => boolean
+}
+export const TxSwapOperationValidate = (o?: TxSwapOperation, opts: TxSwapOperationOptions = {}, path: string = 'TxSwapOperation::root.'): Error | null => {
+    if (opts.checkOptionalsAreSet && opts.allOptionalsAreSet) return new Error(path + ': only one of checkOptionalsAreSet or allOptionalNonDefault can be set for each message')
+    if (typeof o !== 'object' || o === null) return new Error(path + ': object is not an instance of an object or is null')
+
+    if ((o.address_paid || opts.allOptionalsAreSet || opts.checkOptionalsAreSet?.includes('address_paid')) && typeof o.address_paid !== 'string') return new Error(`${path}.address_paid: is not a string`)
+    if (opts.address_paid_CustomCheck && !opts.address_paid_CustomCheck(o.address_paid)) return new Error(`${path}.address_paid: custom check failed`)
+
+    if ((o.failure_reason || opts.allOptionalsAreSet || opts.checkOptionalsAreSet?.includes('failure_reason')) && typeof o.failure_reason !== 'string') return new Error(`${path}.failure_reason: is not a string`)
+    if (opts.failure_reason_CustomCheck && !opts.failure_reason_CustomCheck(o.failure_reason)) return new Error(`${path}.failure_reason: custom check failed`)
+
+    if (typeof o.operation_payment === 'object' || opts.allOptionalsAreSet || opts.checkOptionalsAreSet?.includes('operation_payment')) {
+        const operation_paymentErr = UserOperationValidate(o.operation_payment, opts.operation_payment_Options, `${path}.operation_payment`)
+        if (operation_paymentErr !== null) return operation_paymentErr
+    }
+    
+
+    const quoteErr = TransactionSwapQuoteValidate(o.quote, opts.quote_Options, `${path}.quote`)
+    if (quoteErr !== null) return quoteErr
+    
+
+    if ((o.tx_id || opts.allOptionalsAreSet || opts.checkOptionalsAreSet?.includes('tx_id')) && typeof o.tx_id !== 'string') return new Error(`${path}.tx_id: is not a string`)
+    if (opts.tx_id_CustomCheck && !opts.tx_id_CustomCheck(o.tx_id)) return new Error(`${path}.tx_id: custom check failed`)
+
+    return null
+}
+
+export type TxSwapsList = {
+    swaps: TxSwapOperation[]
+}
+export const TxSwapsListOptionalFields: [] = []
+export type TxSwapsListOptions = OptionsBaseMessage & {
+    checkOptionalsAreSet?: []
+    swaps_ItemOptions?: TxSwapOperationOptions
+    swaps_CustomCheck?: (v: TxSwapOperation[]) => boolean
+}
+export const TxSwapsListValidate = (o?: TxSwapsList, opts: TxSwapsListOptions = {}, path: string = 'TxSwapsList::root.'): Error | null => {
+    if (opts.checkOptionalsAreSet && opts.allOptionalsAreSet) return new Error(path + ': only one of checkOptionalsAreSet or allOptionalNonDefault can be set for each message')
+    if (typeof o !== 'object' || o === null) return new Error(path + ': object is not an instance of an object or is null')
+
+    if (!Array.isArray(o.swaps)) return new Error(`${path}.swaps: is not an array`)
+    for (let index = 0; index < o.swaps.length; index++) {
+        const swapsErr = TxSwapOperationValidate(o.swaps[index], opts.swaps_ItemOptions, `${path}.swaps[${index}]`)
+        if (swapsErr !== null) return swapsErr
+    }
+    if (opts.swaps_CustomCheck && !opts.swaps_CustomCheck(o.swaps)) return new Error(`${path}.swaps: custom check failed`)
+
+    return null
+}
+
 export type UpdateChannelPolicyRequest = {
     policy: ChannelPolicy
     update: UpdateChannelPolicyRequest_update
@@ -4273,6 +4928,7 @@ export type UserInfo = {
     nmanage: string
     noffer: string
     service_fee_bps: number
+    topic_id: string
     userId: string
     user_identifier: string
 }
@@ -4289,6 +4945,7 @@ export type UserInfoOptions = OptionsBaseMessage & {
     nmanage_CustomCheck?: (v: string) => boolean
     noffer_CustomCheck?: (v: string) => boolean
     service_fee_bps_CustomCheck?: (v: number) => boolean
+    topic_id_CustomCheck?: (v: string) => boolean
     userId_CustomCheck?: (v: string) => boolean
     user_identifier_CustomCheck?: (v: string) => boolean
 }
@@ -4326,6 +4983,9 @@ export const UserInfoValidate = (o?: UserInfo, opts: UserInfoOptions = {}, path:
     if (typeof o.service_fee_bps !== 'number') return new Error(`${path}.service_fee_bps: is not a number`)
     if (opts.service_fee_bps_CustomCheck && !opts.service_fee_bps_CustomCheck(o.service_fee_bps)) return new Error(`${path}.service_fee_bps: custom check failed`)
 
+    if (typeof o.topic_id !== 'string') return new Error(`${path}.topic_id: is not a string`)
+    if (opts.topic_id_CustomCheck && !opts.topic_id_CustomCheck(o.topic_id)) return new Error(`${path}.topic_id: custom check failed`)
+
     if (typeof o.userId !== 'string') return new Error(`${path}.userId: is not a string`)
     if (opts.userId_CustomCheck && !opts.userId_CustomCheck(o.userId)) return new Error(`${path}.userId: custom check failed`)
 
@@ -4743,6 +5403,43 @@ export const NPubLinking_stateValidate = (o?: NPubLinking_state, opts:NPubLinkin
         if (unlinkedErr !== null) return unlinkedErr
         
 
+        break
+        default:
+            return new Error(path + ': unknown type '+ stringType)
+    }
+    return null
+}
+export enum PushNotificationPayload_data_type {
+    RECEIVED_OPERATION = 'received_operation',
+    SENT_OPERATION = 'sent_operation',
+}
+export const enumCheckPushNotificationPayload_data_type = (e?: PushNotificationPayload_data_type): boolean => {
+    for (const v in PushNotificationPayload_data_type) if (e === v) return true
+    return false
+}
+export type PushNotificationPayload_data = 
+    {type:PushNotificationPayload_data_type.RECEIVED_OPERATION, received_operation:UserOperation}|
+    {type:PushNotificationPayload_data_type.SENT_OPERATION, sent_operation:UserOperation}
+
+export type PushNotificationPayload_dataOptions = {
+    received_operation_Options?: UserOperationOptions
+    sent_operation_Options?: UserOperationOptions
+}
+export const PushNotificationPayload_dataValidate = (o?: PushNotificationPayload_data, opts:PushNotificationPayload_dataOptions = {}, path: string = 'PushNotificationPayload_data::root.'): Error | null => {
+    if (typeof o !== 'object' || o === null) return new Error(path + ': object is not an instance of an object or is null')
+    const stringType: string = o.type
+    switch (o.type) {
+        case PushNotificationPayload_data_type.RECEIVED_OPERATION:
+        const received_operationErr = UserOperationValidate(o.received_operation, opts.received_operation_Options, `${path}.received_operation`)
+        if (received_operationErr !== null) return received_operationErr
+        
+
+        break
+        case PushNotificationPayload_data_type.SENT_OPERATION:
+        const sent_operationErr = UserOperationValidate(o.sent_operation, opts.sent_operation_Options, `${path}.sent_operation`)
+        if (sent_operationErr !== null) return sent_operationErr
+        
+
         break
         default:
             return new Error(path + ': unknown type '+ stringType)
diff --git a/proto/service/methods.proto b/proto/service/methods.proto
index feaf3e97..2a54767b 100644
--- a/proto/service/methods.proto
+++ b/proto/service/methods.proto
@@ -112,6 +112,20 @@ service LightningPub {
         option (nostr) = true;
     };
 
+    rpc GetAssetsAndLiabilities(structs.AssetsAndLiabilitiesReq) returns (structs.AssetsAndLiabilities) {
+        option (auth_type)  = "Admin";
+        option (http_method) = "post";
+        option (http_route) = "/api/admin/assets/liabilities";
+        option (nostr) = true;
+    };
+
+    rpc BumpTx(structs.BumpTx) returns (structs.Empty) {
+        option (auth_type)  = "Admin";
+        option (http_method) = "post";
+        option (http_route) = "/api/admin/tx/bump";
+        option (nostr) = true;
+    };
+
     rpc AddApp(structs.AddAppRequest) returns (structs.AuthApp) {
         option (auth_type)  = "Admin";
         option (http_method) = "post";
@@ -175,6 +189,34 @@ service LightningPub {
         option (nostr) = true;
     }
 
+    rpc GetAdminInvoiceSwapQuotes(structs.InvoiceSwapRequest) returns (structs.InvoiceSwapQuoteList) {
+        option (auth_type)  = "Admin";
+        option (http_method) = "post";
+        option (http_route) = "/api/admin/swap/invoice/quote";
+        option (nostr) = true;
+    }
+
+    rpc ListAdminInvoiceSwaps(structs.Empty) returns (structs.InvoiceSwapsList) {
+        option (auth_type)  = "Admin";
+        option (http_method) = "post";
+        option (http_route) = "/api/admin/swap/invoice/list";
+        option (nostr) = true;
+    }
+
+    rpc PayAdminInvoiceSwap(structs.PayAdminInvoiceSwapRequest) returns (structs.AdminInvoiceSwapResponse) {
+        option (auth_type)  = "Admin";
+        option (http_method) = "post";
+        option (http_route) = "/api/admin/swap/invoice/pay";
+        option (nostr) = true;
+    }
+
+    rpc RefundAdminInvoiceSwap(structs.RefundAdminInvoiceSwapRequest) returns (structs.AdminInvoiceSwapResponse) {
+        option (auth_type)  = "Admin";
+        option (http_method) = "post";
+        option (http_route) = "/api/admin/swap/invoice/refund";
+        option (nostr) = true;
+    }
+
     rpc GetAdminTransactionSwapQuotes(structs.TransactionSwapRequest) returns (structs.TransactionSwapQuoteList) {
         option (auth_type)  = "Admin";
         option (http_method) = "post";
@@ -182,17 +224,17 @@ service LightningPub {
         option (nostr) = true;
     }
 
-    rpc PayAdminTransactionSwap(structs.PayAdminTransactionSwapRequest) returns (structs.AdminSwapResponse) {
+    rpc PayAdminTransactionSwap(structs.PayAdminTransactionSwapRequest) returns (structs.AdminTxSwapResponse) {
         option (auth_type)  = "Admin";
         option (http_method) = "post";
         option (http_route) = "/api/admin/swap/transaction/pay";
         option (nostr) = true;
     }
 
-    rpc ListAdminSwaps(structs.Empty) returns (structs.SwapsList) {
+    rpc ListAdminTxSwaps(structs.Empty) returns (structs.TxSwapsList) {
         option (auth_type)  = "Admin";
         option (http_method) = "post";
-        option (http_route) = "/api/admin/swap/list";
+        option (http_route) = "/api/admin/swap/transaction/list";
         option (nostr) = true;
     }
 
@@ -520,14 +562,14 @@ service LightningPub {
     rpc GetTransactionSwapQuotes(structs.TransactionSwapRequest) returns (structs.TransactionSwapQuoteList){
         option (auth_type)  = "User";
         option (http_method) = "post";
-        option (http_route) = "/api/user/swap/quote";
+        option (http_route) = "/api/user/swap/transaction/quote";
         option (nostr) = true;
     }
 
-    rpc ListSwaps(structs.Empty) returns (structs.SwapsList){
+    rpc ListTxSwaps(structs.Empty) returns (structs.TxSwapsList){
         option (auth_type)  = "User";
         option (http_method) = "post";
-        option (http_route) = "/api/user/swap/list";
+        option (http_route) = "/api/user/swap/transaction/list";
         option (nostr) = true;
     }
 
diff --git a/proto/service/structs.proto b/proto/service/structs.proto
index 00552fdd..3d64ef67 100644
--- a/proto/service/structs.proto
+++ b/proto/service/structs.proto
@@ -19,6 +19,68 @@ message EncryptionExchangeRequest {
     string deviceId = 2;
 }
 
+message AssetsAndLiabilitiesReq {
+    optional int64 limit_invoices = 1;
+    optional int64 limit_payments = 2;
+    optional int64 limit_providers = 4;
+}
+
+message BumpTx {
+    string txid = 1;
+    int64 output_index = 2;
+    int64 sat_per_vbyte = 3;
+}
+
+
+enum TrackedOperationType {
+    USER = 0;
+    ROOT = 1;
+}
+
+message TrackedOperation {
+    int64 ts = 1;
+    int64 amount = 2;
+    TrackedOperationType type = 3;
+}
+
+message AssetOperation {
+    int64 ts = 1;
+    int64 amount = 2;
+    optional TrackedOperation tracked = 3;
+}
+
+message TrackedLndProvider {
+    int64 confirmed_balance = 1;
+    int64 unconfirmed_balance =  2;
+    int64 channels_balance = 3;
+    repeated AssetOperation payments = 4;
+    repeated AssetOperation invoices = 5;
+    repeated AssetOperation incoming_tx = 6;
+    repeated AssetOperation outgoing_tx = 7;
+}
+
+message TrackedLiquidityProvider {
+    int64 balance = 1;
+    repeated AssetOperation payments = 2;
+    repeated AssetOperation invoices = 3;
+}
+
+message LndAssetProvider {
+    string pubkey = 1;
+    optional TrackedLndProvider tracked = 2;
+}
+
+message LiquidityAssetProvider {
+    string pubkey = 1;
+    optional TrackedLiquidityProvider tracked = 2;
+}
+
+message AssetsAndLiabilities {
+    int64 users_balance = 1;
+    repeated LndAssetProvider lnds = 2;
+    repeated LiquidityAssetProvider liquidity_providers = 3;
+}
+
 message UserHealthState {
     string downtime_reason = 1;
 }
@@ -37,6 +99,8 @@ message ErrorStats {
     ErrorStat past1m = 5;
 }
 
+
+
 message MetricsFile {
     
 }
@@ -541,6 +605,7 @@ message UserInfo{
     string callback_url = 10;
     string bridge_url = 11;
     string nmanage = 12;
+    string topic_id = 13;
 }
 
 
@@ -833,6 +898,56 @@ message MessagingToken {
     string firebase_messaging_token = 2;
 }
 
+message InvoiceSwapRequest {
+    int64 amount_sats = 1;
+}
+
+message InvoiceSwapQuote {
+    string swap_operation_id = 1;
+    string invoice = 2;
+    int64 invoice_amount_sats = 3;
+    string address = 4;
+    int64 transaction_amount_sats = 5;
+    int64 chain_fee_sats = 6;
+    int64 service_fee_sats = 7;
+    string service_url = 8;
+    int64 swap_fee_sats = 9;
+    string tx_id = 10;
+    int64 paid_at_unix = 11;
+    int64 expires_at_block_height = 12;
+}
+
+message InvoiceSwapQuoteList {
+    repeated InvoiceSwapQuote quotes = 1;
+}
+
+message InvoiceSwapOperation {
+    InvoiceSwapQuote quote = 1;
+    optional UserOperation operation_payment = 2;
+    optional string failure_reason = 3;
+    optional int64 completed_at_unix = 6;
+}
+
+message InvoiceSwapsList {
+    repeated InvoiceSwapOperation swaps = 1;
+    int64 current_block_height = 3;
+}
+
+message RefundAdminInvoiceSwapRequest {
+    string swap_operation_id = 1;
+    int64 sat_per_v_byte = 2;
+}
+
+message PayAdminInvoiceSwapRequest {
+    string swap_operation_id = 1;
+    int64 sat_per_v_byte = 2;
+    optional bool no_claim = 3;
+}
+
+message AdminInvoiceSwapResponse {
+    string tx_id = 1; 
+}
+
 message TransactionSwapRequest {
     int64 transaction_amount_sats = 2;
 }
@@ -851,27 +966,31 @@ message TransactionSwapQuote {
     int64 chain_fee_sats = 5;
     int64 service_fee_sats = 7;
     string service_url = 8;
+
+    int64 expires_at_block_height = 9;
+    int64 paid_at_unix = 10;
+    int64 completed_at_unix = 11;
 }
 
 message TransactionSwapQuoteList {
     repeated TransactionSwapQuote quotes = 1;
 }
 
-message AdminSwapResponse {
+message AdminTxSwapResponse {
     string tx_id = 1;
     int64 network_fee = 2;
 }
 
-message SwapOperation {
-    string swap_operation_id = 1;
+message TxSwapOperation {
+    TransactionSwapQuote quote = 1;
     optional UserOperation operation_payment = 2;
     optional string failure_reason = 3;
-    string address_paid = 4;
+    optional string address_paid = 4;
+    optional string tx_id = 5;
 }
 
-message SwapsList {
-    repeated SwapOperation swaps = 1;
-    repeated TransactionSwapQuote quotes = 2;
+message TxSwapsList {
+    repeated TxSwapOperation swaps = 1;
 }
 
 message CumulativeFees {
@@ -885,4 +1004,19 @@ message BeaconData {
     optional string avatarUrl = 3;
     optional string nextRelay = 4;
     optional CumulativeFees fees = 5;
+}
+
+
+message PushNotificationEnvelope {
+  string topic_id = 1;
+  string app_npub_hex = 2;
+  string encrypted_payload = 3; // encrypted PushNotificationPayload
+}
+
+
+message PushNotificationPayload {
+  oneof data {
+    UserOperation received_operation = 1;
+    UserOperation sent_operation = 2;
+  }
 }
\ No newline at end of file
diff --git a/src/extensions/README.md b/src/extensions/README.md
new file mode 100644
index 00000000..2f4e0b15
--- /dev/null
+++ b/src/extensions/README.md
@@ -0,0 +1,731 @@
+# Lightning.Pub Extension System
+
+A modular extension system that allows third-party functionality to be added to Lightning.Pub without modifying core code.
+
+## Table of Contents
+
+- [Overview](#overview)
+- [Architecture](#architecture)
+- [Creating an Extension](#creating-an-extension)
+- [Extension Lifecycle](#extension-lifecycle)
+- [ExtensionContext API](#extensioncontext-api)
+- [Database Isolation](#database-isolation)
+- [RPC Methods](#rpc-methods)
+- [HTTP Routes](#http-routes)
+- [Event Handling](#event-handling)
+- [Configuration](#configuration)
+- [Examples](#examples)
+
+---
+
+## Overview
+
+The extension system provides:
+
+- **Modularity**: Extensions are self-contained modules with their own code and data
+- **Isolation**: Each extension gets its own SQLite database
+- **Integration**: Extensions can register RPC methods, handle events, and interact with Lightning.Pub's payment and Nostr systems
+- **Lifecycle Management**: Automatic discovery, loading, and graceful shutdown
+
+### Built-in Extensions
+
+| Extension | Description |
+|-----------|-------------|
+| `marketplace` | NIP-15 Nostr marketplace for selling products via Lightning |
+| `withdraw` | LNURL-withdraw (LUD-03) for vouchers, faucets, and gifts |
+
+---
+
+## Architecture
+
+```
+┌─────────────────────────────────────────────────────────────────┐
+│                        Lightning.Pub                             │
+├─────────────────────────────────────────────────────────────────┤
+│                      Extension Loader                            │
+│  ┌─────────────┐  ┌─────────────┐  ┌─────────────┐              │
+│  │ Extension A │  │ Extension B │  │ Extension C │   ...        │
+│  │  ┌───────┐  │  │  ┌───────┐  │  │  ┌───────┐  │              │
+│  │  │Context│  │  │  │Context│  │  │  │Context│  │              │
+│  │  └───────┘  │  │  └───────┘  │  │  └───────┘  │              │
+│  │  ┌───────┐  │  │  ┌───────┐  │  │  ┌───────┐  │              │
+│  │  │  DB   │  │  │  │  DB   │  │  │  │  DB   │  │              │
+│  │  └───────┘  │  │  └───────┘  │  │  └───────┘  │              │
+│  └─────────────┘  └─────────────┘  └─────────────┘              │
+├─────────────────────────────────────────────────────────────────┤
+│  Payment Manager  │  Nostr Transport  │  Application Manager    │
+└─────────────────────────────────────────────────────────────────┘
+```
+
+### Key Components
+
+| Component | File | Description |
+|-----------|------|-------------|
+| `ExtensionLoader` | `loader.ts` | Discovers, loads, and manages extensions |
+| `ExtensionContext` | `context.ts` | Bridge between extensions and Lightning.Pub |
+| `ExtensionDatabase` | `database.ts` | Isolated SQLite database per extension |
+
+---
+
+## Creating an Extension
+
+### Directory Structure
+
+```
+src/extensions/
+└── my-extension/
+    ├── index.ts           # Main entry point (required)
+    ├── types.ts           # TypeScript interfaces
+    ├── migrations.ts      # Database migrations
+    └── managers/          # Business logic
+        └── myManager.ts
+```
+
+### Minimal Extension
+
+```typescript
+// src/extensions/my-extension/index.ts
+
+import { Extension, ExtensionInfo, ExtensionContext, ExtensionDatabase } from '../types.js'
+
+export default class MyExtension implements Extension {
+  readonly info: ExtensionInfo = {
+    id: 'my-extension',        // Must match directory name
+    name: 'My Extension',
+    version: '1.0.0',
+    description: 'Does something useful',
+    author: 'Your Name',
+    minPubVersion: '1.0.0'     // Minimum Lightning.Pub version
+  }
+
+  async initialize(ctx: ExtensionContext, db: ExtensionDatabase): Promise<void> {
+    // Run migrations
+    await db.execute(`
+      CREATE TABLE IF NOT EXISTS my_table (
+        id TEXT PRIMARY KEY,
+        data TEXT
+      )
+    `)
+
+    // Register RPC methods
+    ctx.registerMethod('my-extension.doSomething', async (req, appId) => {
+      return { result: 'done' }
+    })
+
+    ctx.log('info', 'Extension initialized')
+  }
+
+  async shutdown(): Promise<void> {
+    // Cleanup resources
+  }
+}
+```
+
+### Extension Interface
+
+```typescript
+interface Extension {
+  // Required: Extension metadata
+  readonly info: ExtensionInfo
+
+  // Required: Called once when extension is loaded
+  initialize(ctx: ExtensionContext, db: ExtensionDatabase): Promise<void>
+
+  // Optional: Called when Lightning.Pub shuts down
+  shutdown?(): Promise<void>
+
+  // Optional: Health check for monitoring
+  healthCheck?(): Promise<boolean>
+}
+
+interface ExtensionInfo {
+  id: string              // Unique identifier (lowercase, no spaces)
+  name: string            // Display name
+  version: string         // Semver version
+  description: string     // Short description
+  author: string          // Author name
+  minPubVersion?: string  // Minimum Lightning.Pub version
+  dependencies?: string[] // Other extension IDs required
+}
+```
+
+---
+
+## Extension Lifecycle
+
+```
+┌──────────────┐
+│   Discover   │  Scan extensions directory for index.ts files
+└──────┬───────┘
+       │
+       ▼
+┌──────────────┐
+│    Load      │  Import module, instantiate class
+└──────┬───────┘
+       │
+       ▼
+┌──────────────┐
+│  Initialize  │  Create database, call initialize()
+└──────┬───────┘
+       │
+       ▼
+┌──────────────┐
+│    Ready     │  Extension is active, handling requests
+└──────┬───────┘
+       │
+       ▼ (on shutdown)
+┌──────────────┐
+│   Shutdown   │  Call shutdown(), close database
+└──────────────┘
+```
+
+### States
+
+| State | Description |
+|-------|-------------|
+| `loading` | Extension is being loaded |
+| `ready` | Extension is active and healthy |
+| `error` | Initialization failed |
+| `stopped` | Extension has been shut down |
+
+---
+
+## ExtensionContext API
+
+The `ExtensionContext` is passed to your extension during initialization. It provides access to Lightning.Pub functionality.
+
+### Application Management
+
+```typescript
+// Get information about an application
+const app = await ctx.getApplication(applicationId)
+// Returns: { id, name, nostr_public, balance_sats } | null
+```
+
+### Payment Operations
+
+```typescript
+// Create a Lightning invoice
+const invoice = await ctx.createInvoice(amountSats, {
+  memo: 'Payment for service',
+  expiry: 3600,  // seconds
+  metadata: { order_id: '123' }  // Returned in payment callback
+})
+// Returns: { id, paymentRequest, paymentHash, expiry }
+
+// Pay a Lightning invoice
+const result = await ctx.payInvoice(applicationId, bolt11Invoice, maxFeeSats)
+// Returns: { paymentHash, feeSats }
+```
+
+### Nostr Operations
+
+```typescript
+// Send encrypted DM (NIP-44)
+const eventId = await ctx.sendEncryptedDM(applicationId, recipientPubkey, content)
+
+// Publish a Nostr event (signed by application's key)
+const eventId = await ctx.publishNostrEvent({
+  kind: 30017,
+  pubkey: appPubkey,
+  created_at: Math.floor(Date.now() / 1000),
+  tags: [['d', 'identifier']],
+  content: JSON.stringify(data)
+})
+```
+
+### RPC Method Registration
+
+```typescript
+// Register a method that can be called via RPC
+ctx.registerMethod('my-extension.methodName', async (request, applicationId, userPubkey?) => {
+  // request: The RPC request payload
+  // applicationId: The calling application's ID
+  // userPubkey: The user's Nostr pubkey (if authenticated)
+
+  return { result: 'success' }
+})
+```
+
+### Event Subscriptions
+
+```typescript
+// Subscribe to payment received events
+ctx.onPaymentReceived(async (payment) => {
+  // payment: { invoiceId, paymentHash, amountSats, metadata }
+
+  if (payment.metadata?.extension === 'my-extension') {
+    // Handle payment for this extension
+  }
+})
+
+// Subscribe to incoming Nostr events
+ctx.onNostrEvent(async (event, applicationId) => {
+  // event: { id, pubkey, kind, tags, content, created_at }
+  // applicationId: The application this event is for
+
+  if (event.kind === 4) {  // DM
+    // Handle incoming message
+  }
+})
+```
+
+### Logging
+
+```typescript
+ctx.log('debug', 'Detailed debugging info')
+ctx.log('info', 'Normal operation info')
+ctx.log('warn', 'Warning message')
+ctx.log('error', 'Error occurred', errorObject)
+```
+
+---
+
+## Database Isolation
+
+Each extension gets its own SQLite database file at:
+```
+{databaseDir}/{extension-id}.db
+```
+
+### Database Interface
+
+```typescript
+interface ExtensionDatabase {
+  // Execute write queries (INSERT, UPDATE, DELETE, CREATE)
+  execute(sql: string, params?: any[]): Promise<{ changes?: number; lastId?: number }>
+
+  // Execute read queries (SELECT)
+  query<T>(sql: string, params?: any[]): Promise<T[]>
+
+  // Run multiple statements in a transaction
+  transaction<T>(fn: () => Promise<T>): Promise<T>
+}
+```
+
+### Migration Pattern
+
+```typescript
+// migrations.ts
+
+export interface Migration {
+  version: number
+  name: string
+  up: (db: ExtensionDatabase) => Promise<void>
+}
+
+export const migrations: Migration[] = [
+  {
+    version: 1,
+    name: 'create_initial_tables',
+    up: async (db) => {
+      await db.execute(`
+        CREATE TABLE items (
+          id TEXT PRIMARY KEY,
+          name TEXT NOT NULL,
+          created_at INTEGER NOT NULL
+        )
+      `)
+    }
+  },
+  {
+    version: 2,
+    name: 'add_status_column',
+    up: async (db) => {
+      await db.execute(`ALTER TABLE items ADD COLUMN status TEXT DEFAULT 'active'`)
+    }
+  }
+]
+
+// Run migrations in initialize()
+export async function runMigrations(db: ExtensionDatabase): Promise<void> {
+  const result = await db.query<{ value: string }>(
+    `SELECT value FROM _extension_meta WHERE key = 'migration_version'`
+  ).catch(() => [])
+
+  const currentVersion = result.length > 0 ? parseInt(result[0].value, 10) : 0
+
+  for (const migration of migrations) {
+    if (migration.version > currentVersion) {
+      console.log(`Running migration ${migration.version}: ${migration.name}`)
+      await migration.up(db)
+      await db.execute(
+        `INSERT INTO _extension_meta (key, value) VALUES ('migration_version', ?)
+         ON CONFLICT(key) DO UPDATE SET value = excluded.value`,
+        [String(migration.version)]
+      )
+    }
+  }
+}
+```
+
+---
+
+## RPC Methods
+
+Extensions register RPC methods that can be called by clients.
+
+### Naming Convention
+
+Methods should be namespaced with the extension ID:
+```
+{extension-id}.{methodName}
+```
+
+Examples:
+- `marketplace.createStall`
+- `withdraw.createLink`
+
+### Method Handler Signature
+
+```typescript
+type RpcMethodHandler = (
+  request: any,           // The request payload
+  applicationId: string,  // The calling application
+  userPubkey?: string     // The authenticated user (if any)
+) => Promise<any>
+```
+
+### Example
+
+```typescript
+ctx.registerMethod('my-extension.createItem', async (req, appId, userPubkey) => {
+  // Validate request
+  if (!req.name) {
+    throw new Error('Name is required')
+  }
+
+  // Create item
+  const item = await this.manager.create(appId, req)
+
+  // Return response
+  return { item }
+})
+```
+
+---
+
+## HTTP Routes
+
+Some extensions need HTTP endpoints (e.g., LNURL protocol). Extensions can define routes that the main application mounts.
+
+### Defining Routes
+
+```typescript
+interface HttpRoute {
+  method: 'GET' | 'POST'
+  path: string
+  handler: (req: HttpRequest) => Promise<HttpResponse>
+}
+
+interface HttpRequest {
+  params: Record<string, string>   // URL path params
+  query: Record<string, string>    // Query string params
+  body?: any                       // POST body
+  headers: Record<string, string>
+}
+
+interface HttpResponse {
+  status: number
+  body: any
+  headers?: Record<string, string>
+}
+```
+
+### Example
+
+```typescript
+class MyExtension implements Extension {
+  getHttpRoutes(): HttpRoute[] {
+    return [
+      {
+        method: 'GET',
+        path: '/api/v1/my-extension/:id',
+        handler: async (req) => {
+          const item = await this.getItem(req.params.id)
+          return {
+            status: 200,
+            body: item,
+            headers: { 'Content-Type': 'application/json' }
+          }
+        }
+      }
+    ]
+  }
+}
+```
+
+---
+
+## Event Handling
+
+### Payment Callbacks
+
+When you create an invoice with metadata, you'll receive that metadata back in the payment callback:
+
+```typescript
+// Creating invoice with metadata
+const invoice = await ctx.createInvoice(1000, {
+  metadata: {
+    extension: 'my-extension',
+    order_id: 'order-123'
+  }
+})
+
+// Handling payment
+ctx.onPaymentReceived(async (payment) => {
+  if (payment.metadata?.extension === 'my-extension') {
+    const orderId = payment.metadata.order_id
+    await this.handlePayment(orderId, payment)
+  }
+})
+```
+
+### Nostr Events
+
+Subscribe to Nostr events for your application:
+
+```typescript
+ctx.onNostrEvent(async (event, applicationId) => {
+  // Filter by event kind
+  if (event.kind === 4) {  // Encrypted DM
+    await this.handleDirectMessage(event, applicationId)
+  }
+})
+```
+
+---
+
+## Configuration
+
+### Loader Configuration
+
+```typescript
+interface ExtensionLoaderConfig {
+  extensionsDir: string         // Directory containing extensions
+  databaseDir: string           // Directory for extension databases
+  enabledExtensions?: string[]  // Whitelist (if set, only these load)
+  disabledExtensions?: string[] // Blacklist
+}
+```
+
+### Usage
+
+```typescript
+import { createExtensionLoader } from './extensions'
+
+const loader = createExtensionLoader({
+  extensionsDir: './src/extensions',
+  databaseDir: './data/extensions',
+  disabledExtensions: ['experimental-ext']
+}, mainHandler)
+
+await loader.loadAll()
+
+// Call extension methods
+const result = await loader.callMethod(
+  'marketplace.createStall',
+  { name: 'My Shop', currency: 'sat', shipping_zones: [] },
+  applicationId,
+  userPubkey
+)
+
+// Dispatch events
+loader.dispatchPaymentReceived(paymentData)
+loader.dispatchNostrEvent(event, applicationId)
+
+// Shutdown
+await loader.shutdown()
+```
+
+---
+
+## Examples
+
+### Example: Simple Counter Extension
+
+```typescript
+// src/extensions/counter/index.ts
+
+import { Extension, ExtensionInfo, ExtensionContext, ExtensionDatabase } from '../types.js'
+
+export default class CounterExtension implements Extension {
+  readonly info: ExtensionInfo = {
+    id: 'counter',
+    name: 'Simple Counter',
+    version: '1.0.0',
+    description: 'A simple counter for each application',
+    author: 'Example'
+  }
+
+  private db!: ExtensionDatabase
+
+  async initialize(ctx: ExtensionContext, db: ExtensionDatabase): Promise<void> {
+    this.db = db
+
+    await db.execute(`
+      CREATE TABLE IF NOT EXISTS counters (
+        application_id TEXT PRIMARY KEY,
+        count INTEGER NOT NULL DEFAULT 0
+      )
+    `)
+
+    ctx.registerMethod('counter.increment', async (req, appId) => {
+      await db.execute(
+        `INSERT INTO counters (application_id, count) VALUES (?, 1)
+         ON CONFLICT(application_id) DO UPDATE SET count = count + 1`,
+        [appId]
+      )
+      const result = await db.query<{ count: number }>(
+        'SELECT count FROM counters WHERE application_id = ?',
+        [appId]
+      )
+      return { count: result[0]?.count || 0 }
+    })
+
+    ctx.registerMethod('counter.get', async (req, appId) => {
+      const result = await db.query<{ count: number }>(
+        'SELECT count FROM counters WHERE application_id = ?',
+        [appId]
+      )
+      return { count: result[0]?.count || 0 }
+    })
+
+    ctx.registerMethod('counter.reset', async (req, appId) => {
+      await db.execute(
+        'UPDATE counters SET count = 0 WHERE application_id = ?',
+        [appId]
+      )
+      return { count: 0 }
+    })
+  }
+}
+```
+
+### Example: Payment-Triggered Extension
+
+```typescript
+// src/extensions/donations/index.ts
+
+import { Extension, ExtensionContext, ExtensionDatabase } from '../types.js'
+
+export default class DonationsExtension implements Extension {
+  readonly info = {
+    id: 'donations',
+    name: 'Donations',
+    version: '1.0.0',
+    description: 'Accept donations with thank-you messages',
+    author: 'Example'
+  }
+
+  private db!: ExtensionDatabase
+  private ctx!: ExtensionContext
+
+  async initialize(ctx: ExtensionContext, db: ExtensionDatabase): Promise<void> {
+    this.db = db
+    this.ctx = ctx
+
+    await db.execute(`
+      CREATE TABLE IF NOT EXISTS donations (
+        id TEXT PRIMARY KEY,
+        application_id TEXT NOT NULL,
+        amount_sats INTEGER NOT NULL,
+        donor_pubkey TEXT,
+        message TEXT,
+        created_at INTEGER NOT NULL
+      )
+    `)
+
+    // Create donation invoice
+    ctx.registerMethod('donations.createInvoice', async (req, appId) => {
+      const invoice = await ctx.createInvoice(req.amount_sats, {
+        memo: req.message || 'Donation',
+        metadata: {
+          extension: 'donations',
+          donor_pubkey: req.donor_pubkey,
+          message: req.message
+        }
+      })
+      return { invoice: invoice.paymentRequest }
+    })
+
+    // Handle successful payments
+    ctx.onPaymentReceived(async (payment) => {
+      if (payment.metadata?.extension !== 'donations') return
+
+      // Record donation
+      await db.execute(
+        `INSERT INTO donations (id, application_id, amount_sats, donor_pubkey, message, created_at)
+         VALUES (?, ?, ?, ?, ?, ?)`,
+        [
+          payment.paymentHash,
+          payment.metadata.application_id,
+          payment.amountSats,
+          payment.metadata.donor_pubkey,
+          payment.metadata.message,
+          Math.floor(Date.now() / 1000)
+        ]
+      )
+
+      // Send thank-you DM if donor has pubkey
+      if (payment.metadata.donor_pubkey) {
+        await ctx.sendEncryptedDM(
+          payment.metadata.application_id,
+          payment.metadata.donor_pubkey,
+          `Thank you for your donation of ${payment.amountSats} sats!`
+        )
+      }
+    })
+
+    // List donations
+    ctx.registerMethod('donations.list', async (req, appId) => {
+      const donations = await db.query(
+        `SELECT * FROM donations WHERE application_id = ? ORDER BY created_at DESC LIMIT ?`,
+        [appId, req.limit || 50]
+      )
+      return { donations }
+    })
+  }
+}
+```
+
+---
+
+## Best Practices
+
+1. **Namespace your methods**: Always prefix RPC methods with your extension ID
+2. **Use migrations**: Never modify existing migration files; create new ones
+3. **Handle errors gracefully**: Throw descriptive errors, don't return error objects
+4. **Clean up in shutdown**: Close connections, cancel timers, etc.
+5. **Log appropriately**: Use debug for verbose info, error for failures
+6. **Validate inputs**: Check request parameters before processing
+7. **Use transactions**: For multi-step database operations
+8. **Document your API**: Include types and descriptions for RPC methods
+
+---
+
+## Troubleshooting
+
+### Extension not loading
+
+1. Check that directory name matches `info.id`
+2. Verify `index.ts` has a default export
+3. Check for TypeScript/import errors in logs
+
+### Database errors
+
+1. Check migration syntax
+2. Verify column types match queries
+3. Look for migration version conflicts
+
+### RPC method not found
+
+1. Verify method is registered in `initialize()`
+2. Check method name includes extension prefix
+3. Ensure extension status is `ready`
+
+### Payment callbacks not firing
+
+1. Verify `metadata.extension` matches your extension ID
+2. Check that `onPaymentReceived` is registered in `initialize()`
+3. Confirm invoice was created through the extension
diff --git a/src/extensions/context.ts b/src/extensions/context.ts
new file mode 100644
index 00000000..b1c6e8d6
--- /dev/null
+++ b/src/extensions/context.ts
@@ -0,0 +1,309 @@
+import {
+  ExtensionContext,
+  ExtensionDatabase,
+  ExtensionInfo,
+  ApplicationInfo,
+  CreateInvoiceOptions,
+  CreatedInvoice,
+  PaymentReceivedData,
+  NostrEvent,
+  UnsignedNostrEvent,
+  RpcMethodHandler,
+  LnurlPayInfo
+} from './types.js'
+
+/**
+ * Main Handler interface (from Lightning.Pub)
+ * This is a minimal interface - the actual MainHandler has more methods
+ */
+export interface MainHandlerInterface {
+  // Application management
+  applicationManager: {
+    getById(id: string): Promise<any>
+  }
+
+  // Payment operations
+  paymentManager: {
+    createInvoice(params: {
+      applicationId: string
+      amountSats: number
+      memo?: string
+      expiry?: number
+      metadata?: Record<string, any>
+    }): Promise<{
+      id: string
+      paymentRequest: string
+      paymentHash: string
+      expiry: number
+    }>
+
+    payInvoice(params: {
+      applicationId: string
+      paymentRequest: string
+      maxFeeSats?: number
+    }): Promise<{
+      paymentHash: string
+      feeSats: number
+    }>
+
+    /**
+     * Get LNURL-pay info for a user by their Nostr pubkey
+     * This enables Lightning Address (LUD-16) and zap (NIP-57) support
+     */
+    getLnurlPayInfoByPubkey(pubkeyHex: string, options?: {
+      metadata?: string
+      description?: string
+    }): Promise<LnurlPayInfo>
+  }
+
+  // Nostr operations
+  sendNostrEvent(event: any): Promise<string | null>
+  sendEncryptedDM(applicationId: string, recipientPubkey: string, content: string): Promise<string>
+}
+
+/**
+ * Callback registries for extension events
+ */
+interface CallbackRegistries {
+  paymentReceived: Array<(payment: PaymentReceivedData) => Promise<void>>
+  nostrEvent: Array<(event: NostrEvent, applicationId: string) => Promise<void>>
+}
+
+/**
+ * Registered RPC method
+ */
+interface RegisteredMethod {
+  extensionId: string
+  handler: RpcMethodHandler
+}
+
+/**
+ * Extension Context Implementation
+ *
+ * Provides the interface for extensions to interact with Lightning.Pub.
+ * Each extension gets its own context instance.
+ */
+export class ExtensionContextImpl implements ExtensionContext {
+  private callbacks: CallbackRegistries = {
+    paymentReceived: [],
+    nostrEvent: []
+  }
+
+  constructor(
+    private extensionInfo: ExtensionInfo,
+    private database: ExtensionDatabase,
+    private mainHandler: MainHandlerInterface,
+    private methodRegistry: Map<string, RegisteredMethod>
+  ) {}
+
+  /**
+   * Get information about an application
+   */
+  async getApplication(applicationId: string): Promise<ApplicationInfo | null> {
+    try {
+      const app = await this.mainHandler.applicationManager.getById(applicationId)
+      if (!app) return null
+
+      return {
+        id: app.id,
+        name: app.name,
+        nostr_public: app.nostr_public,
+        balance_sats: app.balance || 0
+      }
+    } catch (e) {
+      this.log('error', `Failed to get application ${applicationId}:`, e)
+      return null
+    }
+  }
+
+  /**
+   * Create a Lightning invoice
+   */
+  async createInvoice(amountSats: number, options: CreateInvoiceOptions = {}): Promise<CreatedInvoice> {
+    // Note: In practice, this needs an applicationId. Extensions typically
+    // get this from the RPC request context. For now, we'll need to handle
+    // this in the actual implementation.
+    throw new Error('createInvoice requires applicationId from request context')
+  }
+
+  /**
+   * Create invoice with explicit application ID
+   * This is the internal method used by extensions
+   */
+  async createInvoiceForApp(
+    applicationId: string,
+    amountSats: number,
+    options: CreateInvoiceOptions = {}
+  ): Promise<CreatedInvoice> {
+    const result = await this.mainHandler.paymentManager.createInvoice({
+      applicationId,
+      amountSats,
+      memo: options.memo,
+      expiry: options.expiry,
+      metadata: {
+        ...options.metadata,
+        extension: this.extensionInfo.id
+      }
+    })
+
+    return {
+      id: result.id,
+      paymentRequest: result.paymentRequest,
+      paymentHash: result.paymentHash,
+      expiry: result.expiry
+    }
+  }
+
+  /**
+   * Pay a Lightning invoice
+   */
+  async payInvoice(
+    applicationId: string,
+    paymentRequest: string,
+    maxFeeSats?: number
+  ): Promise<{ paymentHash: string; feeSats: number }> {
+    return this.mainHandler.paymentManager.payInvoice({
+      applicationId,
+      paymentRequest,
+      maxFeeSats
+    })
+  }
+
+  /**
+   * Send an encrypted DM via Nostr
+   */
+  async sendEncryptedDM(
+    applicationId: string,
+    recipientPubkey: string,
+    content: string
+  ): Promise<string> {
+    return this.mainHandler.sendEncryptedDM(applicationId, recipientPubkey, content)
+  }
+
+  /**
+   * Publish a Nostr event
+   */
+  async publishNostrEvent(event: UnsignedNostrEvent): Promise<string | null> {
+    return this.mainHandler.sendNostrEvent(event)
+  }
+
+  /**
+   * Get LNURL-pay info for a user by pubkey
+   * Enables Lightning Address and zap support
+   */
+  async getLnurlPayInfo(pubkeyHex: string, options?: {
+    metadata?: string
+    description?: string
+  }): Promise<LnurlPayInfo> {
+    return this.mainHandler.paymentManager.getLnurlPayInfoByPubkey(pubkeyHex, options)
+  }
+
+  /**
+   * Subscribe to payment received callbacks
+   */
+  onPaymentReceived(callback: (payment: PaymentReceivedData) => Promise<void>): void {
+    this.callbacks.paymentReceived.push(callback)
+  }
+
+  /**
+   * Subscribe to incoming Nostr events
+   */
+  onNostrEvent(callback: (event: NostrEvent, applicationId: string) => Promise<void>): void {
+    this.callbacks.nostrEvent.push(callback)
+  }
+
+  /**
+   * Register an RPC method
+   */
+  registerMethod(name: string, handler: RpcMethodHandler): void {
+    const fullName = name.startsWith(`${this.extensionInfo.id}.`)
+      ? name
+      : `${this.extensionInfo.id}.${name}`
+
+    if (this.methodRegistry.has(fullName)) {
+      throw new Error(`RPC method ${fullName} already registered`)
+    }
+
+    this.methodRegistry.set(fullName, {
+      extensionId: this.extensionInfo.id,
+      handler
+    })
+
+    this.log('debug', `Registered RPC method: ${fullName}`)
+  }
+
+  /**
+   * Get the extension's database
+   */
+  getDatabase(): ExtensionDatabase {
+    return this.database
+  }
+
+  /**
+   * Log a message
+   */
+  log(level: 'debug' | 'info' | 'warn' | 'error', message: string, ...args: any[]): void {
+    const prefix = `[Extension:${this.extensionInfo.id}]`
+    switch (level) {
+      case 'debug':
+        console.debug(prefix, message, ...args)
+        break
+      case 'info':
+        console.info(prefix, message, ...args)
+        break
+      case 'warn':
+        console.warn(prefix, message, ...args)
+        break
+      case 'error':
+        console.error(prefix, message, ...args)
+        break
+    }
+  }
+
+  // ===== Internal Methods (called by ExtensionLoader) =====
+
+  /**
+   * Dispatch payment received event to extension callbacks
+   */
+  async dispatchPaymentReceived(payment: PaymentReceivedData): Promise<void> {
+    for (const callback of this.callbacks.paymentReceived) {
+      try {
+        await callback(payment)
+      } catch (e) {
+        this.log('error', 'Error in payment callback:', e)
+      }
+    }
+  }
+
+  /**
+   * Dispatch Nostr event to extension callbacks
+   */
+  async dispatchNostrEvent(event: NostrEvent, applicationId: string): Promise<void> {
+    for (const callback of this.callbacks.nostrEvent) {
+      try {
+        await callback(event, applicationId)
+      } catch (e) {
+        this.log('error', 'Error in Nostr event callback:', e)
+      }
+    }
+  }
+
+  /**
+   * Get registered callbacks for external access
+   */
+  getCallbacks(): CallbackRegistries {
+    return this.callbacks
+  }
+}
+
+/**
+ * Create an extension context
+ */
+export function createExtensionContext(
+  extensionInfo: ExtensionInfo,
+  database: ExtensionDatabase,
+  mainHandler: MainHandlerInterface,
+  methodRegistry: Map<string, RegisteredMethod>
+): ExtensionContextImpl {
+  return new ExtensionContextImpl(extensionInfo, database, mainHandler, methodRegistry)
+}
diff --git a/src/extensions/database.ts b/src/extensions/database.ts
new file mode 100644
index 00000000..6f300c36
--- /dev/null
+++ b/src/extensions/database.ts
@@ -0,0 +1,148 @@
+import Database from 'better-sqlite3'
+import path from 'path'
+import fs from 'fs'
+import { ExtensionDatabase } from './types.js'
+
+/**
+ * Extension Database Implementation
+ *
+ * Provides isolated SQLite database access for each extension.
+ * Uses better-sqlite3 for synchronous, high-performance access.
+ */
+export class ExtensionDatabaseImpl implements ExtensionDatabase {
+  private db: Database.Database
+  private extensionId: string
+
+  constructor(extensionId: string, databaseDir: string) {
+    this.extensionId = extensionId
+
+    // Ensure database directory exists
+    if (!fs.existsSync(databaseDir)) {
+      fs.mkdirSync(databaseDir, { recursive: true })
+    }
+
+    // Create database file for this extension
+    const dbPath = path.join(databaseDir, `${extensionId}.db`)
+    this.db = new Database(dbPath)
+
+    // Enable WAL mode for better concurrency
+    this.db.pragma('journal_mode = WAL')
+
+    // Enable foreign keys
+    this.db.pragma('foreign_keys = ON')
+
+    // Create metadata table for tracking migrations
+    this.db.exec(`
+      CREATE TABLE IF NOT EXISTS _extension_meta (
+        key TEXT PRIMARY KEY,
+        value TEXT NOT NULL
+      )
+    `)
+  }
+
+  /**
+   * Execute a write query (INSERT, UPDATE, DELETE, CREATE, etc.)
+   */
+  async execute(sql: string, params: any[] = []): Promise<{ changes?: number; lastId?: number }> {
+    try {
+      const stmt = this.db.prepare(sql)
+      const result = stmt.run(...params)
+
+      return {
+        changes: result.changes,
+        lastId: result.lastInsertRowid as number
+      }
+    } catch (e) {
+      console.error(`[Extension:${this.extensionId}] Database execute error:`, e)
+      throw e
+    }
+  }
+
+  /**
+   * Execute a read query (SELECT)
+   */
+  async query<T = any>(sql: string, params: any[] = []): Promise<T[]> {
+    try {
+      const stmt = this.db.prepare(sql)
+      return stmt.all(...params) as T[]
+    } catch (e) {
+      console.error(`[Extension:${this.extensionId}] Database query error:`, e)
+      throw e
+    }
+  }
+
+  /**
+   * Execute multiple statements in a transaction
+   */
+  async transaction<T>(fn: () => Promise<T>): Promise<T> {
+    const runTransaction = this.db.transaction(() => {
+      // Note: better-sqlite3 transactions are synchronous
+      // We wrap the async function but it executes synchronously
+      return fn()
+    })
+
+    return runTransaction() as T
+  }
+
+  /**
+   * Get a metadata value
+   */
+  async getMeta(key: string): Promise<string | null> {
+    const rows = await this.query<{ value: string }>(
+      'SELECT value FROM _extension_meta WHERE key = ?',
+      [key]
+    )
+    return rows.length > 0 ? rows[0].value : null
+  }
+
+  /**
+   * Set a metadata value
+   */
+  async setMeta(key: string, value: string): Promise<void> {
+    await this.execute(
+      `INSERT INTO _extension_meta (key, value) VALUES (?, ?)
+       ON CONFLICT(key) DO UPDATE SET value = excluded.value`,
+      [key, value]
+    )
+  }
+
+  /**
+   * Get current migration version
+   */
+  async getMigrationVersion(): Promise<number> {
+    const version = await this.getMeta('migration_version')
+    return version ? parseInt(version, 10) : 0
+  }
+
+  /**
+   * Set migration version
+   */
+  async setMigrationVersion(version: number): Promise<void> {
+    await this.setMeta('migration_version', String(version))
+  }
+
+  /**
+   * Close the database connection
+   */
+  close(): void {
+    this.db.close()
+  }
+
+  /**
+   * Get the underlying database for advanced operations
+   * (Use with caution - bypasses isolation)
+   */
+  getUnderlyingDb(): Database.Database {
+    return this.db
+  }
+}
+
+/**
+ * Create an extension database instance
+ */
+export function createExtensionDatabase(
+  extensionId: string,
+  databaseDir: string
+): ExtensionDatabaseImpl {
+  return new ExtensionDatabaseImpl(extensionId, databaseDir)
+}
diff --git a/src/extensions/index.ts b/src/extensions/index.ts
new file mode 100644
index 00000000..208b7c86
--- /dev/null
+++ b/src/extensions/index.ts
@@ -0,0 +1,56 @@
+/**
+ * Lightning.Pub Extension System
+ *
+ * This module provides the extension infrastructure for Lightning.Pub.
+ * Extensions can add functionality like marketplaces, subscriptions,
+ * tipping, and more.
+ *
+ * Usage:
+ *
+ * ```typescript
+ * import { createExtensionLoader, ExtensionLoaderConfig } from './extensions'
+ *
+ * const config: ExtensionLoaderConfig = {
+ *   extensionsDir: './extensions',
+ *   databaseDir: './data/extensions'
+ * }
+ *
+ * const loader = createExtensionLoader(config, mainHandler)
+ * await loader.loadAll()
+ *
+ * // Call extension methods
+ * const result = await loader.callMethod(
+ *   'marketplace.createStall',
+ *   { name: 'My Shop', currency: 'sat', shipping_zones: [...] },
+ *   applicationId
+ * )
+ * ```
+ */
+
+// Export types
+export {
+  Extension,
+  ExtensionInfo,
+  ExtensionContext,
+  ExtensionDatabase,
+  ExtensionModule,
+  ExtensionConstructor,
+  LoadedExtension,
+  ExtensionLoaderConfig,
+  ApplicationInfo,
+  CreateInvoiceOptions,
+  CreatedInvoice,
+  PaymentReceivedData,
+  NostrEvent,
+  UnsignedNostrEvent,
+  RpcMethodHandler
+} from './types.js'
+
+// Export loader
+export { ExtensionLoader, createExtensionLoader } from './loader.js'
+
+// Export database utilities
+export { ExtensionDatabaseImpl, createExtensionDatabase } from './database.js'
+
+// Export context utilities
+export { ExtensionContextImpl, createExtensionContext, MainHandlerInterface } from './context.js'
diff --git a/src/extensions/loader.ts b/src/extensions/loader.ts
new file mode 100644
index 00000000..9fc453c0
--- /dev/null
+++ b/src/extensions/loader.ts
@@ -0,0 +1,406 @@
+import path from 'path'
+import fs from 'fs'
+import {
+  Extension,
+  ExtensionInfo,
+  ExtensionModule,
+  LoadedExtension,
+  ExtensionLoaderConfig,
+  RpcMethodHandler,
+  PaymentReceivedData,
+  NostrEvent
+} from './types.js'
+import { ExtensionDatabaseImpl, createExtensionDatabase } from './database.js'
+import { ExtensionContextImpl, createExtensionContext, MainHandlerInterface } from './context.js'
+
+/**
+ * Registered RPC method entry
+ */
+interface RegisteredMethod {
+  extensionId: string
+  handler: RpcMethodHandler
+}
+
+/**
+ * Extension Loader
+ *
+ * Discovers, loads, and manages Lightning.Pub extensions.
+ * Provides lifecycle management and event dispatching.
+ */
+export class ExtensionLoader {
+  private config: ExtensionLoaderConfig
+  private mainHandler: MainHandlerInterface
+  private extensions: Map<string, LoadedExtension> = new Map()
+  private contexts: Map<string, ExtensionContextImpl> = new Map()
+  private methodRegistry: Map<string, RegisteredMethod> = new Map()
+  private initialized = false
+
+  constructor(config: ExtensionLoaderConfig, mainHandler: MainHandlerInterface) {
+    this.config = config
+    this.mainHandler = mainHandler
+  }
+
+  /**
+   * Discover and load all extensions
+   */
+  async loadAll(): Promise<void> {
+    if (this.initialized) {
+      throw new Error('Extension loader already initialized')
+    }
+
+    console.log('[Extensions] Loading extensions from:', this.config.extensionsDir)
+
+    // Ensure directories exist
+    if (!fs.existsSync(this.config.extensionsDir)) {
+      console.log('[Extensions] Extensions directory does not exist, creating...')
+      fs.mkdirSync(this.config.extensionsDir, { recursive: true })
+      this.initialized = true
+      return
+    }
+
+    if (!fs.existsSync(this.config.databaseDir)) {
+      fs.mkdirSync(this.config.databaseDir, { recursive: true })
+    }
+
+    // Discover extensions
+    const extensionDirs = await this.discoverExtensions()
+    console.log(`[Extensions] Found ${extensionDirs.length} extension(s)`)
+
+    // Load extensions in dependency order
+    const loadOrder = await this.resolveDependencies(extensionDirs)
+
+    for (const extDir of loadOrder) {
+      try {
+        await this.loadExtension(extDir)
+      } catch (e) {
+        console.error(`[Extensions] Failed to load extension from ${extDir}:`, e)
+      }
+    }
+
+    this.initialized = true
+    console.log(`[Extensions] Loaded ${this.extensions.size} extension(s)`)
+  }
+
+  /**
+   * Discover extension directories
+   */
+  private async discoverExtensions(): Promise<string[]> {
+    const entries = fs.readdirSync(this.config.extensionsDir, { withFileTypes: true })
+    const extensionDirs: string[] = []
+
+    for (const entry of entries) {
+      if (!entry.isDirectory()) continue
+
+      const extDir = path.join(this.config.extensionsDir, entry.name)
+      const indexPath = path.join(extDir, 'index.ts')
+      const indexJsPath = path.join(extDir, 'index.js')
+
+      // Check for index file
+      if (fs.existsSync(indexPath) || fs.existsSync(indexJsPath)) {
+        // Check enabled/disabled lists
+        if (this.config.disabledExtensions?.includes(entry.name)) {
+          console.log(`[Extensions] Skipping disabled extension: ${entry.name}`)
+          continue
+        }
+
+        if (this.config.enabledExtensions &&
+            !this.config.enabledExtensions.includes(entry.name)) {
+          console.log(`[Extensions] Skipping non-enabled extension: ${entry.name}`)
+          continue
+        }
+
+        extensionDirs.push(extDir)
+      }
+    }
+
+    return extensionDirs
+  }
+
+  /**
+   * Resolve extension dependencies and return load order
+   */
+  private async resolveDependencies(extensionDirs: string[]): Promise<string[]> {
+    // For now, simple alphabetical order
+    // TODO: Implement proper dependency resolution with topological sort
+    return extensionDirs.sort()
+  }
+
+  /**
+   * Load a single extension
+   */
+  private async loadExtension(extensionDir: string): Promise<void> {
+    const dirName = path.basename(extensionDir)
+    console.log(`[Extensions] Loading extension: ${dirName}`)
+
+    // Determine index file path
+    let indexPath = path.join(extensionDir, 'index.js')
+    if (!fs.existsSync(indexPath)) {
+      indexPath = path.join(extensionDir, 'index.ts')
+    }
+
+    // Dynamic import
+    const moduleUrl = `file://${indexPath}`
+    const module = await import(moduleUrl) as ExtensionModule
+
+    if (!module.default) {
+      throw new Error(`Extension ${dirName} has no default export`)
+    }
+
+    // Instantiate extension
+    const ExtensionClass = module.default
+    const instance = new ExtensionClass() as Extension
+
+    if (!instance.info) {
+      throw new Error(`Extension ${dirName} has no info property`)
+    }
+
+    const info = instance.info
+
+    // Validate extension ID matches directory name
+    if (info.id !== dirName) {
+      console.warn(
+        `[Extensions] Extension ID '${info.id}' doesn't match directory '${dirName}'`
+      )
+    }
+
+    // Check for duplicate
+    if (this.extensions.has(info.id)) {
+      throw new Error(`Extension ${info.id} already loaded`)
+    }
+
+    // Create isolated database
+    const database = createExtensionDatabase(info.id, this.config.databaseDir)
+
+    // Create context
+    const context = createExtensionContext(
+      info,
+      database,
+      this.mainHandler,
+      this.methodRegistry
+    )
+
+    // Track as loading
+    const loaded: LoadedExtension = {
+      info,
+      instance,
+      database,
+      status: 'loading',
+      loadedAt: Date.now()
+    }
+    this.extensions.set(info.id, loaded)
+    this.contexts.set(info.id, context)
+
+    try {
+      // Initialize extension
+      await instance.initialize(context, database)
+
+      loaded.status = 'ready'
+      console.log(`[Extensions] Extension ${info.id} v${info.version} loaded successfully`)
+    } catch (e) {
+      loaded.status = 'error'
+      loaded.error = e as Error
+      console.error(`[Extensions] Extension ${info.id} initialization failed:`, e)
+      throw e
+    }
+  }
+
+  /**
+   * Unload a specific extension
+   */
+  async unloadExtension(extensionId: string): Promise<void> {
+    const loaded = this.extensions.get(extensionId)
+    if (!loaded) {
+      throw new Error(`Extension ${extensionId} not found`)
+    }
+
+    console.log(`[Extensions] Unloading extension: ${extensionId}`)
+
+    try {
+      // Call shutdown if available
+      if (loaded.instance.shutdown) {
+        await loaded.instance.shutdown()
+      }
+
+      loaded.status = 'stopped'
+    } catch (e) {
+      console.error(`[Extensions] Error during ${extensionId} shutdown:`, e)
+    }
+
+    // Close database
+    if (loaded.database instanceof ExtensionDatabaseImpl) {
+      loaded.database.close()
+    }
+
+    // Remove registered methods
+    for (const [name, method] of this.methodRegistry.entries()) {
+      if (method.extensionId === extensionId) {
+        this.methodRegistry.delete(name)
+      }
+    }
+
+    // Remove from maps
+    this.extensions.delete(extensionId)
+    this.contexts.delete(extensionId)
+  }
+
+  /**
+   * Shutdown all extensions
+   */
+  async shutdown(): Promise<void> {
+    console.log('[Extensions] Shutting down all extensions...')
+
+    for (const extensionId of this.extensions.keys()) {
+      try {
+        await this.unloadExtension(extensionId)
+      } catch (e) {
+        console.error(`[Extensions] Error unloading ${extensionId}:`, e)
+      }
+    }
+
+    console.log('[Extensions] All extensions shut down')
+  }
+
+  /**
+   * Get a loaded extension
+   */
+  getExtension(extensionId: string): LoadedExtension | undefined {
+    return this.extensions.get(extensionId)
+  }
+
+  /**
+   * Get all loaded extensions
+   */
+  getAllExtensions(): LoadedExtension[] {
+    return Array.from(this.extensions.values())
+  }
+
+  /**
+   * Check if an extension is loaded and ready
+   */
+  isReady(extensionId: string): boolean {
+    const ext = this.extensions.get(extensionId)
+    return ext?.status === 'ready'
+  }
+
+  /**
+   * Get all registered RPC methods
+   */
+  getRegisteredMethods(): Map<string, RegisteredMethod> {
+    return this.methodRegistry
+  }
+
+  /**
+   * Call an extension RPC method
+   */
+  async callMethod(
+    methodName: string,
+    request: any,
+    applicationId: string,
+    userPubkey?: string
+  ): Promise<any> {
+    const method = this.methodRegistry.get(methodName)
+    if (!method) {
+      throw new Error(`Unknown method: ${methodName}`)
+    }
+
+    const ext = this.extensions.get(method.extensionId)
+    if (!ext || ext.status !== 'ready') {
+      throw new Error(`Extension ${method.extensionId} not ready`)
+    }
+
+    return method.handler(request, applicationId, userPubkey)
+  }
+
+  /**
+   * Check if a method exists
+   */
+  hasMethod(methodName: string): boolean {
+    return this.methodRegistry.has(methodName)
+  }
+
+  /**
+   * Dispatch payment received event to all extensions
+   */
+  async dispatchPaymentReceived(payment: PaymentReceivedData): Promise<void> {
+    for (const context of this.contexts.values()) {
+      try {
+        await context.dispatchPaymentReceived(payment)
+      } catch (e) {
+        console.error('[Extensions] Error dispatching payment:', e)
+      }
+    }
+  }
+
+  /**
+   * Dispatch Nostr event to all extensions
+   */
+  async dispatchNostrEvent(event: NostrEvent, applicationId: string): Promise<void> {
+    for (const context of this.contexts.values()) {
+      try {
+        await context.dispatchNostrEvent(event, applicationId)
+      } catch (e) {
+        console.error('[Extensions] Error dispatching Nostr event:', e)
+      }
+    }
+  }
+
+  /**
+   * Run health checks on all extensions
+   */
+  async healthCheck(): Promise<Map<string, boolean>> {
+    const results = new Map<string, boolean>()
+
+    for (const [id, ext] of this.extensions.entries()) {
+      if (ext.status !== 'ready') {
+        results.set(id, false)
+        continue
+      }
+
+      try {
+        if (ext.instance.healthCheck) {
+          results.set(id, await ext.instance.healthCheck())
+        } else {
+          results.set(id, true)
+        }
+      } catch (e) {
+        results.set(id, false)
+      }
+    }
+
+    return results
+  }
+
+  /**
+   * Get extension status summary
+   */
+  getStatus(): {
+    total: number
+    ready: number
+    error: number
+    extensions: Array<{ id: string; name: string; version: string; status: string }>
+  } {
+    const extensions = this.getAllExtensions().map(ext => ({
+      id: ext.info.id,
+      name: ext.info.name,
+      version: ext.info.version,
+      status: ext.status
+    }))
+
+    return {
+      total: extensions.length,
+      ready: extensions.filter(e => e.status === 'ready').length,
+      error: extensions.filter(e => e.status === 'error').length,
+      extensions
+    }
+  }
+}
+
+/**
+ * Create an extension loader instance
+ */
+export function createExtensionLoader(
+  config: ExtensionLoaderConfig,
+  mainHandler: MainHandlerInterface
+): ExtensionLoader {
+  return new ExtensionLoader(config, mainHandler)
+}
diff --git a/src/extensions/marketplace/index.ts b/src/extensions/marketplace/index.ts
new file mode 100644
index 00000000..0bd470e3
--- /dev/null
+++ b/src/extensions/marketplace/index.ts
@@ -0,0 +1,390 @@
+import {
+  Extension, ExtensionContext, ExtensionDatabase, ExtensionInfo,
+  CreateStallRequest, UpdateStallRequest,
+  CreateProductRequest, UpdateProductRequest,
+  CreateOrderRequest
+} from './types.js'
+import { migrations } from './migrations.js'
+import { StallManager } from './managers/stallManager.js'
+import { ProductManager } from './managers/productManager.js'
+import { OrderManager } from './managers/orderManager.js'
+import { MessageManager } from './managers/messageManager.js'
+import { parseOrderRequest, parseMessageType, NostrEvent } from './nostr/parser.js'
+import { EVENT_KINDS } from './nostr/kinds.js'
+import { validatePubkey } from './utils/validation.js'
+
+/**
+ * Marketplace Extension for Lightning.Pub
+ *
+ * Implements NIP-15 compatible marketplace functionality:
+ * - Stall management (kind 30017 events)
+ * - Product listings (kind 30018 events)
+ * - Order processing via encrypted DMs
+ * - Customer relationship management
+ */
+export default class MarketplaceExtension implements Extension {
+  readonly info: ExtensionInfo = {
+    id: 'marketplace',
+    name: 'Nostr Marketplace',
+    version: '1.0.0',
+    description: 'NIP-15 compatible marketplace for selling products via Lightning',
+    author: 'Lightning.Pub',
+    minPubVersion: '1.0.0'
+  }
+
+  private stallManager!: StallManager
+  private productManager!: ProductManager
+  private orderManager!: OrderManager
+  private messageManager!: MessageManager
+
+  /**
+   * Initialize the extension
+   */
+  async initialize(ctx: ExtensionContext, db: ExtensionDatabase): Promise<void> {
+    // Run migrations
+    for (const migration of migrations) {
+      await migration.up(db)
+    }
+
+    // Initialize managers
+    this.stallManager = new StallManager(db, ctx)
+    this.productManager = new ProductManager(db, ctx)
+    this.orderManager = new OrderManager(db, ctx)
+    this.messageManager = new MessageManager(db, ctx)
+
+    // Register RPC methods
+    this.registerRpcMethods(ctx)
+
+    // Subscribe to payment callbacks
+    ctx.onPaymentReceived(async (payment) => {
+      if (payment.metadata?.extension === 'marketplace' && payment.metadata?.order_id) {
+        await this.orderManager.handlePayment(payment.invoiceId)
+      }
+    })
+
+    // Subscribe to incoming Nostr events
+    ctx.onNostrEvent(async (event, applicationId) => {
+      await this.handleNostrEvent(event, applicationId)
+    })
+
+    console.log(`[Marketplace] Extension initialized`)
+  }
+
+  /**
+   * Cleanup on shutdown
+   */
+  async shutdown(): Promise<void> {
+    console.log(`[Marketplace] Extension shutting down`)
+  }
+
+  /**
+   * Register all RPC methods with the extension context
+   */
+  private registerRpcMethods(ctx: ExtensionContext): void {
+    // ===== Stall Methods =====
+
+    ctx.registerMethod('marketplace.createStall', async (req, appId) => {
+      const stall = await this.stallManager.create(appId, req as CreateStallRequest)
+      return { stall }
+    })
+
+    ctx.registerMethod('marketplace.getStall', async (req, appId) => {
+      const stall = await this.stallManager.get(req.id, appId)
+      if (!stall) throw new Error('Stall not found')
+      return { stall }
+    })
+
+    ctx.registerMethod('marketplace.listStalls', async (_req, appId) => {
+      const stalls = await this.stallManager.list(appId)
+      return { stalls }
+    })
+
+    ctx.registerMethod('marketplace.updateStall', async (req, appId) => {
+      const stall = await this.stallManager.update(req.id, appId, req as UpdateStallRequest)
+      if (!stall) throw new Error('Stall not found')
+      return { stall }
+    })
+
+    ctx.registerMethod('marketplace.deleteStall', async (req, appId) => {
+      const success = await this.stallManager.delete(req.id, appId)
+      if (!success) throw new Error('Stall not found')
+      return { success }
+    })
+
+    ctx.registerMethod('marketplace.publishStall', async (req, appId) => {
+      const stall = await this.stallManager.get(req.id, appId)
+      if (!stall) throw new Error('Stall not found')
+      const eventId = await this.stallManager.publishToNostr(stall)
+      return { event_id: eventId }
+    })
+
+    // ===== Product Methods =====
+
+    ctx.registerMethod('marketplace.createProduct', async (req, appId) => {
+      const product = await this.productManager.create(
+        appId,
+        req.stall_id,
+        req as CreateProductRequest
+      )
+      return { product }
+    })
+
+    ctx.registerMethod('marketplace.getProduct', async (req, appId) => {
+      const product = await this.productManager.get(req.id, appId)
+      if (!product) throw new Error('Product not found')
+      return { product }
+    })
+
+    ctx.registerMethod('marketplace.listProducts', async (req, appId) => {
+      const products = await this.productManager.list(appId, {
+        stall_id: req.stall_id,
+        category: req.category,
+        active_only: req.active_only,
+        limit: req.limit,
+        offset: req.offset
+      })
+      return { products }
+    })
+
+    ctx.registerMethod('marketplace.updateProduct', async (req, appId) => {
+      const product = await this.productManager.update(req.id, appId, req as UpdateProductRequest)
+      if (!product) throw new Error('Product not found')
+      return { product }
+    })
+
+    ctx.registerMethod('marketplace.deleteProduct', async (req, appId) => {
+      const success = await this.productManager.delete(req.id, appId)
+      if (!success) throw new Error('Product not found')
+      return { success }
+    })
+
+    ctx.registerMethod('marketplace.updateInventory', async (req, appId) => {
+      const newQuantity = await this.productManager.updateQuantity(req.id, appId, req.delta)
+      return { quantity: newQuantity }
+    })
+
+    ctx.registerMethod('marketplace.checkStock', async (req, appId) => {
+      const result = await this.productManager.checkStock(req.items, appId)
+      return result
+    })
+
+    // ===== Order Methods =====
+
+    ctx.registerMethod('marketplace.createOrder', async (req, appId, userPubkey) => {
+      if (!userPubkey) throw new Error('User pubkey required')
+      const order = await this.orderManager.createFromRpc(
+        appId,
+        userPubkey,
+        req as CreateOrderRequest,
+        req.app_user_id
+      )
+      return { order }
+    })
+
+    ctx.registerMethod('marketplace.getOrder', async (req, appId) => {
+      const order = await this.orderManager.get(req.id, appId)
+      if (!order) throw new Error('Order not found')
+      return { order }
+    })
+
+    ctx.registerMethod('marketplace.listOrders', async (req, appId) => {
+      const orders = await this.orderManager.list(appId, {
+        stall_id: req.stall_id,
+        customer_pubkey: req.customer_pubkey,
+        status: req.status,
+        limit: req.limit,
+        offset: req.offset
+      })
+      return { orders }
+    })
+
+    ctx.registerMethod('marketplace.createInvoice', async (req, appId) => {
+      const order = await this.orderManager.createInvoice(req.order_id, appId)
+      return { order }
+    })
+
+    ctx.registerMethod('marketplace.updateOrderStatus', async (req, appId) => {
+      const order = await this.orderManager.updateStatus(
+        req.id,
+        appId,
+        req.status,
+        req.message
+      )
+      if (!order) throw new Error('Order not found')
+      return { order }
+    })
+
+    ctx.registerMethod('marketplace.sendPaymentRequest', async (req, appId) => {
+      const order = await this.orderManager.get(req.order_id, appId)
+      if (!order) throw new Error('Order not found')
+
+      // Create invoice if not exists
+      if (!order.invoice) {
+        await this.orderManager.createInvoice(req.order_id, appId)
+      }
+
+      const updatedOrder = await this.orderManager.get(req.order_id, appId)
+      if (!updatedOrder?.invoice) throw new Error('Failed to create invoice')
+
+      await this.orderManager.sendPaymentRequestDM(updatedOrder)
+      return { order: updatedOrder }
+    })
+
+    // ===== Message/Customer Methods =====
+
+    ctx.registerMethod('marketplace.listMessages', async (req, appId) => {
+      const messages = await this.messageManager.listMessages(appId, {
+        customer_pubkey: req.customer_pubkey,
+        order_id: req.order_id,
+        incoming_only: req.incoming_only,
+        unread_only: req.unread_only,
+        limit: req.limit,
+        offset: req.offset
+      })
+      return { messages }
+    })
+
+    ctx.registerMethod('marketplace.getConversation', async (req, appId) => {
+      if (!validatePubkey(req.customer_pubkey)) {
+        throw new Error('Invalid customer pubkey')
+      }
+      const messages = await this.messageManager.getConversation(
+        appId,
+        req.customer_pubkey,
+        req.limit
+      )
+      return { messages }
+    })
+
+    ctx.registerMethod('marketplace.sendMessage', async (req, appId) => {
+      if (!validatePubkey(req.customer_pubkey)) {
+        throw new Error('Invalid customer pubkey')
+      }
+      const message = await this.messageManager.sendMessage(
+        appId,
+        req.customer_pubkey,
+        req.message,
+        req.order_id
+      )
+      return { message }
+    })
+
+    ctx.registerMethod('marketplace.markMessagesRead', async (req, appId) => {
+      if (!validatePubkey(req.customer_pubkey)) {
+        throw new Error('Invalid customer pubkey')
+      }
+      const count = await this.messageManager.markAsRead(appId, req.customer_pubkey)
+      return { marked_read: count }
+    })
+
+    ctx.registerMethod('marketplace.getUnreadCount', async (_req, appId) => {
+      const count = await this.messageManager.getUnreadCount(appId)
+      return { unread_count: count }
+    })
+
+    ctx.registerMethod('marketplace.listCustomers', async (req, appId) => {
+      const customers = await this.messageManager.listCustomers(appId, {
+        has_orders: req.has_orders,
+        has_unread: req.has_unread,
+        limit: req.limit,
+        offset: req.offset
+      })
+      return { customers }
+    })
+
+    ctx.registerMethod('marketplace.getCustomer', async (req, appId) => {
+      if (!validatePubkey(req.pubkey)) {
+        throw new Error('Invalid customer pubkey')
+      }
+      const customer = await this.messageManager.getCustomer(req.pubkey, appId)
+      if (!customer) throw new Error('Customer not found')
+      return { customer }
+    })
+
+    ctx.registerMethod('marketplace.getCustomerStats', async (_req, appId) => {
+      const stats = await this.messageManager.getCustomerStats(appId)
+      return stats
+    })
+
+    // ===== Bulk Operations =====
+
+    ctx.registerMethod('marketplace.republishAll', async (req, appId) => {
+      let stallCount = 0
+      let productCount = 0
+
+      if (req.stall_id) {
+        // Republish specific stall and its products
+        const stall = await this.stallManager.get(req.stall_id, appId)
+        if (stall) {
+          await this.stallManager.publishToNostr(stall)
+          stallCount = 1
+          productCount = await this.productManager.republishAllForStall(req.stall_id, appId)
+        }
+      } else {
+        // Republish all
+        stallCount = await this.stallManager.republishAll(appId)
+        const stalls = await this.stallManager.list(appId)
+        for (const stall of stalls) {
+          productCount += await this.productManager.republishAllForStall(stall.id, appId)
+        }
+      }
+
+      return {
+        stalls_published: stallCount,
+        products_published: productCount
+      }
+    })
+  }
+
+  /**
+   * Handle incoming Nostr events (DMs for orders)
+   */
+  private async handleNostrEvent(event: NostrEvent, applicationId: string): Promise<void> {
+    // Only handle DMs for now
+    if (event.kind !== EVENT_KINDS.DIRECT_MESSAGE) {
+      return
+    }
+
+    try {
+      // Decrypt the message content (context handles this)
+      const decrypted = event.content  // Assume pre-decrypted by context
+
+      // Store the message
+      await this.messageManager.storeIncoming(
+        applicationId,
+        event.pubkey,
+        decrypted,
+        event.id,
+        event.created_at
+      )
+
+      // Parse message type
+      const { type, parsed } = parseMessageType(decrypted)
+
+      // Handle order requests
+      if (type === 'order_request') {
+        const orderReq = parseOrderRequest(decrypted)
+        if (orderReq) {
+          const order = await this.orderManager.createFromNostr(
+            applicationId,
+            event.pubkey,
+            orderReq,
+            event.id
+          )
+
+          // Create invoice and send payment request
+          const withInvoice = await this.orderManager.createInvoice(order.id, applicationId)
+          await this.orderManager.sendPaymentRequestDM(withInvoice)
+
+          console.log(`[Marketplace] Created order ${order.id} from Nostr DM`)
+        }
+      }
+    } catch (e) {
+      console.error('[Marketplace] Error handling Nostr event:', e)
+    }
+  }
+}
+
+// Export types for external use
+export * from './types.js'
+export { EVENT_KINDS, MESSAGE_TYPES } from './nostr/kinds.js'
diff --git a/src/extensions/marketplace/managers/messageManager.ts b/src/extensions/marketplace/managers/messageManager.ts
new file mode 100644
index 00000000..a70d0700
--- /dev/null
+++ b/src/extensions/marketplace/managers/messageManager.ts
@@ -0,0 +1,497 @@
+import {
+  ExtensionContext, ExtensionDatabase,
+  DirectMessage, Customer, MessageType
+} from '../types.js'
+import { generateId } from '../utils/validation.js'
+import { parseMessageType } from '../nostr/parser.js'
+
+/**
+ * Database row for direct message
+ */
+interface MessageRow {
+  id: string
+  application_id: string
+  order_id: string | null
+  customer_pubkey: string
+  message_type: string
+  content: string
+  incoming: number
+  nostr_event_id: string
+  nostr_event_created_at: number
+  created_at: number
+  read: number
+}
+
+/**
+ * Database row for customer
+ */
+interface CustomerRow {
+  pubkey: string
+  application_id: string
+  name: string | null
+  about: string | null
+  picture: string | null
+  total_orders: number
+  total_spent_sats: number
+  unread_messages: number
+  first_seen_at: number
+  last_seen_at: number
+}
+
+/**
+ * Convert database row to DirectMessage object
+ */
+function rowToMessage(row: MessageRow): DirectMessage {
+  return {
+    id: row.id,
+    application_id: row.application_id,
+    order_id: row.order_id || undefined,
+    customer_pubkey: row.customer_pubkey,
+    message_type: row.message_type as MessageType,
+    content: row.content,
+    incoming: row.incoming === 1,
+    nostr_event_id: row.nostr_event_id,
+    nostr_event_created_at: row.nostr_event_created_at,
+    created_at: row.created_at,
+    read: row.read === 1
+  }
+}
+
+/**
+ * Convert database row to Customer object
+ */
+function rowToCustomer(row: CustomerRow): Customer {
+  return {
+    pubkey: row.pubkey,
+    application_id: row.application_id,
+    name: row.name || undefined,
+    about: row.about || undefined,
+    picture: row.picture || undefined,
+    total_orders: row.total_orders,
+    total_spent_sats: row.total_spent_sats,
+    unread_messages: row.unread_messages,
+    first_seen_at: row.first_seen_at,
+    last_seen_at: row.last_seen_at
+  }
+}
+
+/**
+ * Query options for listing messages
+ */
+interface ListMessagesOptions {
+  customer_pubkey?: string
+  order_id?: string
+  incoming_only?: boolean
+  unread_only?: boolean
+  limit?: number
+  offset?: number
+}
+
+/**
+ * Query options for listing customers
+ */
+interface ListCustomersOptions {
+  has_orders?: boolean
+  has_unread?: boolean
+  limit?: number
+  offset?: number
+}
+
+/**
+ * MessageManager - Handles customer DMs and customer management
+ */
+export class MessageManager {
+  constructor(
+    private db: ExtensionDatabase,
+    private ctx: ExtensionContext
+  ) {}
+
+  // ===== Message Methods =====
+
+  /**
+   * Store incoming message from Nostr
+   */
+  async storeIncoming(
+    applicationId: string,
+    customerPubkey: string,
+    decryptedContent: string,
+    nostrEventId: string,
+    nostrEventCreatedAt: number,
+    orderId?: string
+  ): Promise<DirectMessage> {
+    // Parse message type
+    const { type } = parseMessageType(decryptedContent)
+
+    const now = Math.floor(Date.now() / 1000)
+    const id = generateId()
+
+    const message: DirectMessage = {
+      id,
+      application_id: applicationId,
+      order_id: orderId,
+      customer_pubkey: customerPubkey,
+      message_type: type,
+      content: decryptedContent,
+      incoming: true,
+      nostr_event_id: nostrEventId,
+      nostr_event_created_at: nostrEventCreatedAt,
+      created_at: now,
+      read: false
+    }
+
+    // Check for duplicate event
+    const existing = await this.db.query(
+      'SELECT id FROM direct_messages WHERE nostr_event_id = ?',
+      [nostrEventId]
+    )
+    if (existing.length > 0) {
+      return message  // Already stored, return without error
+    }
+
+    // Insert message
+    await this.db.execute(
+      `INSERT INTO direct_messages (
+        id, application_id, order_id, customer_pubkey, message_type,
+        content, incoming, nostr_event_id, nostr_event_created_at,
+        created_at, read
+      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+      [
+        message.id,
+        message.application_id,
+        message.order_id || null,
+        message.customer_pubkey,
+        message.message_type,
+        message.content,
+        1,  // incoming = true
+        message.nostr_event_id,
+        message.nostr_event_created_at,
+        message.created_at,
+        0   // read = false
+      ]
+    )
+
+    // Update customer unread count
+    await this.incrementUnread(applicationId, customerPubkey)
+
+    // Ensure customer exists
+    await this.ensureCustomer(applicationId, customerPubkey)
+
+    return message
+  }
+
+  /**
+   * Store outgoing message (sent by merchant)
+   */
+  async storeOutgoing(
+    applicationId: string,
+    customerPubkey: string,
+    content: string,
+    nostrEventId: string,
+    orderId?: string
+  ): Promise<DirectMessage> {
+    const { type } = parseMessageType(content)
+    const now = Math.floor(Date.now() / 1000)
+    const id = generateId()
+
+    const message: DirectMessage = {
+      id,
+      application_id: applicationId,
+      order_id: orderId,
+      customer_pubkey: customerPubkey,
+      message_type: type,
+      content,
+      incoming: false,
+      nostr_event_id: nostrEventId,
+      nostr_event_created_at: now,
+      created_at: now,
+      read: true  // Outgoing messages are always "read"
+    }
+
+    await this.db.execute(
+      `INSERT INTO direct_messages (
+        id, application_id, order_id, customer_pubkey, message_type,
+        content, incoming, nostr_event_id, nostr_event_created_at,
+        created_at, read
+      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+      [
+        message.id,
+        message.application_id,
+        message.order_id || null,
+        message.customer_pubkey,
+        message.message_type,
+        message.content,
+        0,  // incoming = false
+        message.nostr_event_id,
+        message.nostr_event_created_at,
+        message.created_at,
+        1   // read = true
+      ]
+    )
+
+    return message
+  }
+
+  /**
+   * Get message by ID
+   */
+  async getMessage(id: string, applicationId: string): Promise<DirectMessage | null> {
+    const rows = await this.db.query<MessageRow>(
+      'SELECT * FROM direct_messages WHERE id = ? AND application_id = ?',
+      [id, applicationId]
+    )
+
+    if (rows.length === 0) return null
+    return rowToMessage(rows[0])
+  }
+
+  /**
+   * List messages with filters
+   */
+  async listMessages(
+    applicationId: string,
+    options: ListMessagesOptions = {}
+  ): Promise<DirectMessage[]> {
+    let sql = 'SELECT * FROM direct_messages WHERE application_id = ?'
+    const params: any[] = [applicationId]
+
+    if (options.customer_pubkey) {
+      sql += ' AND customer_pubkey = ?'
+      params.push(options.customer_pubkey)
+    }
+
+    if (options.order_id) {
+      sql += ' AND order_id = ?'
+      params.push(options.order_id)
+    }
+
+    if (options.incoming_only) {
+      sql += ' AND incoming = 1'
+    }
+
+    if (options.unread_only) {
+      sql += ' AND read = 0'
+    }
+
+    sql += ' ORDER BY nostr_event_created_at DESC'
+
+    if (options.limit) {
+      sql += ' LIMIT ?'
+      params.push(options.limit)
+      if (options.offset) {
+        sql += ' OFFSET ?'
+        params.push(options.offset)
+      }
+    }
+
+    const rows = await this.db.query<MessageRow>(sql, params)
+    return rows.map(rowToMessage)
+  }
+
+  /**
+   * Get conversation thread with a customer
+   */
+  async getConversation(
+    applicationId: string,
+    customerPubkey: string,
+    limit: number = 50
+  ): Promise<DirectMessage[]> {
+    const rows = await this.db.query<MessageRow>(
+      `SELECT * FROM direct_messages
+       WHERE application_id = ? AND customer_pubkey = ?
+       ORDER BY nostr_event_created_at DESC
+       LIMIT ?`,
+      [applicationId, customerPubkey, limit]
+    )
+
+    // Return in chronological order
+    return rows.map(rowToMessage).reverse()
+  }
+
+  /**
+   * Mark messages as read
+   */
+  async markAsRead(applicationId: string, customerPubkey: string): Promise<number> {
+    const result = await this.db.execute(
+      `UPDATE direct_messages SET read = 1
+       WHERE application_id = ? AND customer_pubkey = ? AND read = 0`,
+      [applicationId, customerPubkey]
+    )
+
+    // Reset customer unread count
+    await this.db.execute(
+      `UPDATE customers SET unread_messages = 0
+       WHERE application_id = ? AND pubkey = ?`,
+      [applicationId, customerPubkey]
+    )
+
+    return result.changes || 0
+  }
+
+  /**
+   * Get unread message count
+   */
+  async getUnreadCount(applicationId: string): Promise<number> {
+    const result = await this.db.query<{ count: number }>(
+      `SELECT COUNT(*) as count FROM direct_messages
+       WHERE application_id = ? AND incoming = 1 AND read = 0`,
+      [applicationId]
+    )
+    return result[0]?.count || 0
+  }
+
+  /**
+   * Send a plain text message to customer
+   */
+  async sendMessage(
+    applicationId: string,
+    customerPubkey: string,
+    message: string,
+    orderId?: string
+  ): Promise<DirectMessage> {
+    // Send via Nostr
+    const eventId = await this.ctx.sendEncryptedDM(
+      applicationId,
+      customerPubkey,
+      message
+    )
+
+    // Store outgoing message
+    return this.storeOutgoing(
+      applicationId,
+      customerPubkey,
+      message,
+      eventId,
+      orderId
+    )
+  }
+
+  // ===== Customer Methods =====
+
+  /**
+   * Get customer by pubkey
+   */
+  async getCustomer(pubkey: string, applicationId: string): Promise<Customer | null> {
+    const rows = await this.db.query<CustomerRow>(
+      'SELECT * FROM customers WHERE pubkey = ? AND application_id = ?',
+      [pubkey, applicationId]
+    )
+
+    if (rows.length === 0) return null
+    return rowToCustomer(rows[0])
+  }
+
+  /**
+   * List customers with filters
+   */
+  async listCustomers(
+    applicationId: string,
+    options: ListCustomersOptions = {}
+  ): Promise<Customer[]> {
+    let sql = 'SELECT * FROM customers WHERE application_id = ?'
+    const params: any[] = [applicationId]
+
+    if (options.has_orders) {
+      sql += ' AND total_orders > 0'
+    }
+
+    if (options.has_unread) {
+      sql += ' AND unread_messages > 0'
+    }
+
+    sql += ' ORDER BY last_seen_at DESC'
+
+    if (options.limit) {
+      sql += ' LIMIT ?'
+      params.push(options.limit)
+      if (options.offset) {
+        sql += ' OFFSET ?'
+        params.push(options.offset)
+      }
+    }
+
+    const rows = await this.db.query<CustomerRow>(sql, params)
+    return rows.map(rowToCustomer)
+  }
+
+  /**
+   * Update customer profile from Nostr metadata
+   */
+  async updateCustomerProfile(
+    pubkey: string,
+    applicationId: string,
+    profile: { name?: string; about?: string; picture?: string }
+  ): Promise<Customer | null> {
+    await this.ensureCustomer(applicationId, pubkey)
+
+    await this.db.execute(
+      `UPDATE customers SET
+        name = COALESCE(?, name),
+        about = COALESCE(?, about),
+        picture = COALESCE(?, picture),
+        last_seen_at = ?
+      WHERE pubkey = ? AND application_id = ?`,
+      [
+        profile.name || null,
+        profile.about || null,
+        profile.picture || null,
+        Math.floor(Date.now() / 1000),
+        pubkey,
+        applicationId
+      ]
+    )
+
+    return this.getCustomer(pubkey, applicationId)
+  }
+
+  /**
+   * Get customer statistics summary
+   */
+  async getCustomerStats(applicationId: string): Promise<{
+    total_customers: number
+    customers_with_orders: number
+    total_unread: number
+  }> {
+    const total = await this.db.query<{ count: number }>(
+      'SELECT COUNT(*) as count FROM customers WHERE application_id = ?',
+      [applicationId]
+    )
+
+    const withOrders = await this.db.query<{ count: number }>(
+      'SELECT COUNT(*) as count FROM customers WHERE application_id = ? AND total_orders > 0',
+      [applicationId]
+    )
+
+    const unread = await this.db.query<{ sum: number }>(
+      'SELECT SUM(unread_messages) as sum FROM customers WHERE application_id = ?',
+      [applicationId]
+    )
+
+    return {
+      total_customers: total[0]?.count || 0,
+      customers_with_orders: withOrders[0]?.count || 0,
+      total_unread: unread[0]?.sum || 0
+    }
+  }
+
+  // ===== Private Helpers =====
+
+  private async ensureCustomer(applicationId: string, pubkey: string): Promise<void> {
+    const now = Math.floor(Date.now() / 1000)
+
+    await this.db.execute(
+      `INSERT INTO customers (pubkey, application_id, first_seen_at, last_seen_at)
+       VALUES (?, ?, ?, ?)
+       ON CONFLICT(pubkey, application_id) DO UPDATE SET
+         last_seen_at = ?`,
+      [pubkey, applicationId, now, now, now]
+    )
+  }
+
+  private async incrementUnread(applicationId: string, pubkey: string): Promise<void> {
+    await this.db.execute(
+      `UPDATE customers SET unread_messages = unread_messages + 1
+       WHERE pubkey = ? AND application_id = ?`,
+      [pubkey, applicationId]
+    )
+  }
+}
diff --git a/src/extensions/marketplace/managers/orderManager.ts b/src/extensions/marketplace/managers/orderManager.ts
new file mode 100644
index 00000000..30d8c8d9
--- /dev/null
+++ b/src/extensions/marketplace/managers/orderManager.ts
@@ -0,0 +1,607 @@
+import {
+  ExtensionContext, ExtensionDatabase,
+  Order, Stall, Product, NIP15OrderRequest,
+  CreateOrderRequest, OrderItem, OrderStatus
+} from '../types.js'
+import { generateId, validateOrderItems } from '../utils/validation.js'
+import { convertToSats, SupportedCurrency } from '../utils/currency.js'
+import { buildPaymentRequestContent, buildOrderStatusContent } from '../nostr/events.js'
+
+/**
+ * Database row for order
+ */
+interface OrderRow {
+  id: string
+  application_id: string
+  stall_id: string
+  customer_pubkey: string
+  customer_app_user_id: string | null
+  items: string  // JSON
+  shipping_zone_id: string
+  shipping_address: string
+  contact: string  // JSON
+  subtotal_sats: number
+  shipping_sats: number
+  total_sats: number
+  original_currency: string
+  exchange_rate: number | null
+  invoice: string | null
+  invoice_id: string | null
+  status: string
+  nostr_event_id: string | null
+  created_at: number
+  paid_at: number | null
+  shipped_at: number | null
+  completed_at: number | null
+}
+
+/**
+ * Convert database row to Order object
+ */
+function rowToOrder(row: OrderRow): Order {
+  return {
+    id: row.id,
+    application_id: row.application_id,
+    stall_id: row.stall_id,
+    customer_pubkey: row.customer_pubkey,
+    customer_app_user_id: row.customer_app_user_id || undefined,
+    items: JSON.parse(row.items),
+    shipping_zone_id: row.shipping_zone_id,
+    shipping_address: row.shipping_address,
+    contact: JSON.parse(row.contact),
+    subtotal_sats: row.subtotal_sats,
+    shipping_sats: row.shipping_sats,
+    total_sats: row.total_sats,
+    original_currency: row.original_currency as SupportedCurrency,
+    exchange_rate: row.exchange_rate || undefined,
+    invoice: row.invoice || undefined,
+    invoice_id: row.invoice_id || undefined,
+    status: row.status as OrderStatus,
+    nostr_event_id: row.nostr_event_id || undefined,
+    created_at: row.created_at,
+    paid_at: row.paid_at || undefined,
+    shipped_at: row.shipped_at || undefined,
+    completed_at: row.completed_at || undefined
+  }
+}
+
+/**
+ * Query options for listing orders
+ */
+interface ListOrdersOptions {
+  stall_id?: string
+  customer_pubkey?: string
+  status?: OrderStatus
+  limit?: number
+  offset?: number
+}
+
+/**
+ * OrderManager - Handles order lifecycle and payment integration
+ */
+export class OrderManager {
+  constructor(
+    private db: ExtensionDatabase,
+    private ctx: ExtensionContext
+  ) {}
+
+  /**
+   * Create order from NIP-15 order request (via Nostr DM)
+   */
+  async createFromNostr(
+    applicationId: string,
+    customerPubkey: string,
+    orderReq: NIP15OrderRequest,
+    nostrEventId?: string
+  ): Promise<Order> {
+    // Validate items
+    validateOrderItems(orderReq.items)
+
+    // Find stall from first product
+    const firstProduct = await this.getProduct(orderReq.items[0].product_id, applicationId)
+    if (!firstProduct) {
+      throw new Error('Product not found')
+    }
+
+    const stall = await this.getStall(firstProduct.stall_id, applicationId)
+    if (!stall) {
+      throw new Error('Stall not found')
+    }
+
+    // Calculate totals
+    const itemsWithDetails = await this.enrichOrderItems(orderReq.items, applicationId)
+    const { subtotal, shippingCost, total, exchangeRate } = await this.calculateTotals(
+      itemsWithDetails,
+      stall,
+      orderReq.shipping_id
+    )
+
+    const now = Math.floor(Date.now() / 1000)
+    const id = orderReq.id || generateId()
+
+    const order: Order = {
+      id,
+      application_id: applicationId,
+      stall_id: stall.id,
+      customer_pubkey: customerPubkey,
+      items: itemsWithDetails,
+      shipping_zone_id: orderReq.shipping_id,
+      shipping_address: orderReq.address || '',
+      contact: orderReq.contact || {},
+      subtotal_sats: subtotal,
+      shipping_sats: shippingCost,
+      total_sats: total,
+      original_currency: stall.currency,
+      exchange_rate: exchangeRate,
+      status: 'pending',
+      nostr_event_id: nostrEventId,
+      created_at: now
+    }
+
+    // Insert into database
+    await this.insertOrder(order)
+
+    // Reserve inventory
+    await this.reserveInventory(order)
+
+    // Update customer stats
+    await this.updateCustomerStats(applicationId, customerPubkey)
+
+    return order
+  }
+
+  /**
+   * Create order from RPC request (native client)
+   */
+  async createFromRpc(
+    applicationId: string,
+    customerPubkey: string,
+    req: CreateOrderRequest,
+    appUserId?: string
+  ): Promise<Order> {
+    // Validate items
+    validateOrderItems(req.items)
+
+    // Find stall
+    const stall = await this.getStall(req.stall_id, applicationId)
+    if (!stall) {
+      throw new Error('Stall not found')
+    }
+
+    // Calculate totals
+    const itemsWithDetails = await this.enrichOrderItems(req.items, applicationId)
+    const { subtotal, shippingCost, total, exchangeRate } = await this.calculateTotals(
+      itemsWithDetails,
+      stall,
+      req.shipping_zone_id
+    )
+
+    const now = Math.floor(Date.now() / 1000)
+    const id = generateId()
+
+    const order: Order = {
+      id,
+      application_id: applicationId,
+      stall_id: stall.id,
+      customer_pubkey: customerPubkey,
+      customer_app_user_id: appUserId,
+      items: itemsWithDetails,
+      shipping_zone_id: req.shipping_zone_id,
+      shipping_address: req.shipping_address || '',
+      contact: req.contact || {},
+      subtotal_sats: subtotal,
+      shipping_sats: shippingCost,
+      total_sats: total,
+      original_currency: stall.currency,
+      exchange_rate: exchangeRate,
+      status: 'pending',
+      created_at: now
+    }
+
+    // Insert into database
+    await this.insertOrder(order)
+
+    // Reserve inventory
+    await this.reserveInventory(order)
+
+    // Update customer stats
+    await this.updateCustomerStats(applicationId, customerPubkey)
+
+    return order
+  }
+
+  /**
+   * Get order by ID
+   */
+  async get(id: string, applicationId: string): Promise<Order | null> {
+    const rows = await this.db.query<OrderRow>(
+      'SELECT * FROM orders WHERE id = ? AND application_id = ?',
+      [id, applicationId]
+    )
+
+    if (rows.length === 0) return null
+    return rowToOrder(rows[0])
+  }
+
+  /**
+   * List orders with filters
+   */
+  async list(applicationId: string, options: ListOrdersOptions = {}): Promise<Order[]> {
+    let sql = 'SELECT * FROM orders WHERE application_id = ?'
+    const params: any[] = [applicationId]
+
+    if (options.stall_id) {
+      sql += ' AND stall_id = ?'
+      params.push(options.stall_id)
+    }
+
+    if (options.customer_pubkey) {
+      sql += ' AND customer_pubkey = ?'
+      params.push(options.customer_pubkey)
+    }
+
+    if (options.status) {
+      sql += ' AND status = ?'
+      params.push(options.status)
+    }
+
+    sql += ' ORDER BY created_at DESC'
+
+    if (options.limit) {
+      sql += ' LIMIT ?'
+      params.push(options.limit)
+      if (options.offset) {
+        sql += ' OFFSET ?'
+        params.push(options.offset)
+      }
+    }
+
+    const rows = await this.db.query<OrderRow>(sql, params)
+    return rows.map(rowToOrder)
+  }
+
+  /**
+   * Create invoice for an order
+   */
+  async createInvoice(id: string, applicationId: string): Promise<Order> {
+    const order = await this.get(id, applicationId)
+    if (!order) {
+      throw new Error('Order not found')
+    }
+
+    if (order.status !== 'pending') {
+      throw new Error(`Order already ${order.status}`)
+    }
+
+    // Create invoice via Lightning.Pub
+    const invoice = await this.ctx.createInvoice(order.total_sats, {
+      memo: `Order ${order.id}`,
+      expiry: 3600,  // 1 hour
+      metadata: {
+        extension: 'marketplace',
+        order_id: order.id
+      }
+    })
+
+    // Update order with invoice
+    await this.db.execute(
+      `UPDATE orders SET invoice = ?, invoice_id = ? WHERE id = ?`,
+      [invoice.paymentRequest, invoice.id, order.id]
+    )
+
+    order.invoice = invoice.paymentRequest
+    order.invoice_id = invoice.id
+
+    return order
+  }
+
+  /**
+   * Handle invoice payment callback
+   */
+  async handlePayment(invoiceId: string): Promise<Order | null> {
+    // Find order by invoice ID
+    const rows = await this.db.query<OrderRow>(
+      'SELECT * FROM orders WHERE invoice_id = ? AND status = ?',
+      [invoiceId, 'pending']
+    )
+
+    if (rows.length === 0) return null
+
+    const order = rowToOrder(rows[0])
+    const now = Math.floor(Date.now() / 1000)
+
+    // Update order status
+    await this.db.execute(
+      `UPDATE orders SET status = ?, paid_at = ? WHERE id = ?`,
+      ['paid', now, order.id]
+    )
+
+    order.status = 'paid'
+    order.paid_at = now
+
+    // Update customer stats
+    await this.updateCustomerSpent(order.application_id, order.customer_pubkey, order.total_sats)
+
+    // Send payment confirmation DM
+    await this.sendOrderStatusDM(order, 'Payment received! Your order is being processed.')
+
+    return order
+  }
+
+  /**
+   * Update order status
+   */
+  async updateStatus(
+    id: string,
+    applicationId: string,
+    status: OrderStatus,
+    message?: string
+  ): Promise<Order | null> {
+    const order = await this.get(id, applicationId)
+    if (!order) return null
+
+    const now = Math.floor(Date.now() / 1000)
+    const updates: string[] = ['status = ?']
+    const params: any[] = [status]
+
+    // Set timestamp based on status
+    if (status === 'paid' && !order.paid_at) {
+      updates.push('paid_at = ?')
+      params.push(now)
+    } else if (status === 'shipped' && !order.shipped_at) {
+      updates.push('shipped_at = ?')
+      params.push(now)
+    } else if (status === 'completed' && !order.completed_at) {
+      updates.push('completed_at = ?')
+      params.push(now)
+    }
+
+    params.push(id, applicationId)
+
+    await this.db.execute(
+      `UPDATE orders SET ${updates.join(', ')} WHERE id = ? AND application_id = ?`,
+      params
+    )
+
+    const updated = await this.get(id, applicationId)
+
+    // Send status update DM
+    if (updated && message) {
+      await this.sendOrderStatusDM(updated, message)
+    }
+
+    // Handle cancellation - restore inventory
+    if (status === 'cancelled' && order.status === 'pending') {
+      await this.restoreInventory(order)
+    }
+
+    return updated
+  }
+
+  /**
+   * Send payment request DM to customer
+   */
+  async sendPaymentRequestDM(order: Order): Promise<void> {
+    if (!order.invoice) {
+      throw new Error('Order has no invoice')
+    }
+
+    const content = buildPaymentRequestContent(order, order.invoice)
+
+    await this.ctx.sendEncryptedDM(
+      order.application_id,
+      order.customer_pubkey,
+      JSON.stringify(content)
+    )
+  }
+
+  /**
+   * Send order status update DM to customer
+   */
+  async sendOrderStatusDM(order: Order, message: string): Promise<void> {
+    const content = buildOrderStatusContent(order, message)
+
+    await this.ctx.sendEncryptedDM(
+      order.application_id,
+      order.customer_pubkey,
+      JSON.stringify(content)
+    )
+  }
+
+  // ===== Private Helpers =====
+
+  private async insertOrder(order: Order): Promise<void> {
+    await this.db.execute(
+      `INSERT INTO orders (
+        id, application_id, stall_id, customer_pubkey, customer_app_user_id,
+        items, shipping_zone_id, shipping_address, contact,
+        subtotal_sats, shipping_sats, total_sats, original_currency, exchange_rate,
+        invoice, invoice_id, status, nostr_event_id, created_at
+      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+      [
+        order.id,
+        order.application_id,
+        order.stall_id,
+        order.customer_pubkey,
+        order.customer_app_user_id || null,
+        JSON.stringify(order.items),
+        order.shipping_zone_id,
+        order.shipping_address,
+        JSON.stringify(order.contact),
+        order.subtotal_sats,
+        order.shipping_sats,
+        order.total_sats,
+        order.original_currency,
+        order.exchange_rate || null,
+        order.invoice || null,
+        order.invoice_id || null,
+        order.status,
+        order.nostr_event_id || null,
+        order.created_at
+      ]
+    )
+  }
+
+  private async getStall(id: string, applicationId: string): Promise<Stall | null> {
+    const rows = await this.db.query(
+      'SELECT * FROM stalls WHERE id = ? AND application_id = ?',
+      [id, applicationId]
+    )
+    if (rows.length === 0) return null
+
+    const row = rows[0] as any
+    return {
+      ...row,
+      shipping_zones: JSON.parse(row.shipping_zones)
+    }
+  }
+
+  private async getProduct(id: string, applicationId: string): Promise<Product | null> {
+    const rows = await this.db.query(
+      'SELECT * FROM products WHERE id = ? AND application_id = ?',
+      [id, applicationId]
+    )
+    if (rows.length === 0) return null
+
+    const row = rows[0] as any
+    return {
+      ...row,
+      images: JSON.parse(row.images),
+      categories: JSON.parse(row.categories),
+      specs: row.specs ? JSON.parse(row.specs) : undefined,
+      active: row.active === 1
+    }
+  }
+
+  private async enrichOrderItems(
+    items: Array<{ product_id: string; quantity: number }>,
+    applicationId: string
+  ): Promise<OrderItem[]> {
+    const enriched: OrderItem[] = []
+
+    for (const item of items) {
+      const product = await this.getProduct(item.product_id, applicationId)
+      if (!product) {
+        throw new Error(`Product ${item.product_id} not found`)
+      }
+
+      if (!product.active) {
+        throw new Error(`Product ${product.name} is not available`)
+      }
+
+      // Check stock
+      if (product.quantity !== -1 && product.quantity < item.quantity) {
+        throw new Error(`Insufficient stock for ${product.name}`)
+      }
+
+      enriched.push({
+        product_id: product.id,
+        product_name: product.name,
+        quantity: item.quantity,
+        unit_price: product.price
+      })
+    }
+
+    return enriched
+  }
+
+  private async calculateTotals(
+    items: OrderItem[],
+    stall: Stall,
+    shippingZoneId: string
+  ): Promise<{
+    subtotal: number
+    shippingCost: number
+    total: number
+    exchangeRate?: number
+  }> {
+    // Calculate subtotal in original currency
+    const subtotalOriginal = items.reduce(
+      (sum, item) => sum + item.unit_price * item.quantity,
+      0
+    )
+
+    // Find shipping zone
+    const shippingZone = stall.shipping_zones.find(z => z.id === shippingZoneId)
+    if (!shippingZone) {
+      throw new Error('Invalid shipping zone')
+    }
+
+    const shippingOriginal = shippingZone.cost
+
+    // Convert to sats if needed
+    let subtotal: number
+    let shippingCost: number
+    let exchangeRate: number | undefined
+
+    if (stall.currency === 'sat') {
+      subtotal = subtotalOriginal
+      shippingCost = shippingOriginal
+    } else {
+      subtotal = await convertToSats(this.db, subtotalOriginal, stall.currency)
+      shippingCost = await convertToSats(this.db, shippingOriginal, stall.currency)
+      exchangeRate = subtotal / subtotalOriginal
+    }
+
+    return {
+      subtotal,
+      shippingCost,
+      total: subtotal + shippingCost,
+      exchangeRate
+    }
+  }
+
+  private async reserveInventory(order: Order): Promise<void> {
+    for (const item of order.items) {
+      await this.db.execute(
+        `UPDATE products SET
+          quantity = CASE
+            WHEN quantity = -1 THEN -1
+            ELSE quantity - ?
+          END
+        WHERE id = ? AND quantity != -1`,
+        [item.quantity, item.product_id]
+      )
+    }
+  }
+
+  private async restoreInventory(order: Order): Promise<void> {
+    for (const item of order.items) {
+      await this.db.execute(
+        `UPDATE products SET
+          quantity = CASE
+            WHEN quantity = -1 THEN -1
+            ELSE quantity + ?
+          END
+        WHERE id = ? AND quantity != -1`,
+        [item.quantity, item.product_id]
+      )
+    }
+  }
+
+  private async updateCustomerStats(applicationId: string, pubkey: string): Promise<void> {
+    const now = Math.floor(Date.now() / 1000)
+
+    await this.db.execute(
+      `INSERT INTO customers (pubkey, application_id, total_orders, first_seen_at, last_seen_at)
+       VALUES (?, ?, 1, ?, ?)
+       ON CONFLICT(pubkey, application_id) DO UPDATE SET
+         total_orders = total_orders + 1,
+         last_seen_at = ?`,
+      [pubkey, applicationId, now, now, now]
+    )
+  }
+
+  private async updateCustomerSpent(
+    applicationId: string,
+    pubkey: string,
+    amount: number
+  ): Promise<void> {
+    await this.db.execute(
+      `UPDATE customers SET
+        total_spent_sats = total_spent_sats + ?
+      WHERE pubkey = ? AND application_id = ?`,
+      [amount, pubkey, applicationId]
+    )
+  }
+}
diff --git a/src/extensions/marketplace/managers/productManager.ts b/src/extensions/marketplace/managers/productManager.ts
new file mode 100644
index 00000000..f5321bb4
--- /dev/null
+++ b/src/extensions/marketplace/managers/productManager.ts
@@ -0,0 +1,466 @@
+import {
+  ExtensionContext, ExtensionDatabase,
+  Product, Stall, CreateProductRequest, UpdateProductRequest
+} from '../types.js'
+import { generateId, validateProduct } from '../utils/validation.js'
+import { buildProductEvent, buildDeleteEvent } from '../nostr/events.js'
+
+/**
+ * Database row for product
+ */
+interface ProductRow {
+  id: string
+  stall_id: string
+  application_id: string
+  name: string
+  description: string
+  images: string  // JSON array
+  price: number
+  quantity: number
+  categories: string  // JSON array
+  shipping_cost: number | null
+  specs: string | null  // JSON array
+  active: number
+  nostr_event_id: string | null
+  nostr_event_created_at: number | null
+  created_at: number
+  updated_at: number
+}
+
+/**
+ * Convert database row to Product object
+ */
+function rowToProduct(row: ProductRow): Product {
+  return {
+    id: row.id,
+    stall_id: row.stall_id,
+    application_id: row.application_id,
+    name: row.name,
+    description: row.description,
+    images: JSON.parse(row.images),
+    price: row.price,
+    quantity: row.quantity,
+    categories: JSON.parse(row.categories),
+    shipping_cost: row.shipping_cost ?? undefined,
+    specs: row.specs ? JSON.parse(row.specs) : undefined,
+    active: row.active === 1,
+    nostr_event_id: row.nostr_event_id || undefined,
+    nostr_event_created_at: row.nostr_event_created_at || undefined,
+    created_at: row.created_at,
+    updated_at: row.updated_at
+  }
+}
+
+/**
+ * Query options for listing products
+ */
+interface ListProductsOptions {
+  stall_id?: string
+  category?: string
+  active_only?: boolean
+  limit?: number
+  offset?: number
+}
+
+/**
+ * ProductManager - Handles product CRUD, inventory, and Nostr publishing
+ */
+export class ProductManager {
+  constructor(
+    private db: ExtensionDatabase,
+    private ctx: ExtensionContext
+  ) {}
+
+  /**
+   * Create a new product
+   */
+  async create(
+    applicationId: string,
+    stallId: string,
+    req: CreateProductRequest
+  ): Promise<Product> {
+    // Validate request
+    validateProduct(req)
+
+    // Verify stall exists and belongs to application
+    const stallRows = await this.db.query(
+      'SELECT * FROM stalls WHERE id = ? AND application_id = ?',
+      [stallId, applicationId]
+    )
+    if (stallRows.length === 0) {
+      throw new Error('Stall not found')
+    }
+
+    const now = Math.floor(Date.now() / 1000)
+    const id = generateId()
+
+    const product: Product = {
+      id,
+      stall_id: stallId,
+      application_id: applicationId,
+      name: req.name.trim(),
+      description: req.description?.trim() || '',
+      images: req.images || [],
+      price: req.price,
+      quantity: req.quantity ?? -1,  // -1 = unlimited
+      categories: req.categories || [],
+      shipping_cost: req.shipping_cost,
+      specs: req.specs,
+      active: true,
+      created_at: now,
+      updated_at: now
+    }
+
+    // Insert into database
+    await this.db.execute(
+      `INSERT INTO products (
+        id, stall_id, application_id, name, description, images,
+        price, quantity, categories, shipping_cost, specs, active,
+        created_at, updated_at
+      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+      [
+        product.id,
+        product.stall_id,
+        product.application_id,
+        product.name,
+        product.description,
+        JSON.stringify(product.images),
+        product.price,
+        product.quantity,
+        JSON.stringify(product.categories),
+        product.shipping_cost ?? null,
+        product.specs ? JSON.stringify(product.specs) : null,
+        product.active ? 1 : 0,
+        product.created_at,
+        product.updated_at
+      ]
+    )
+
+    // Publish to Nostr if auto-publish enabled
+    if (req.publish_to_nostr !== false) {
+      await this.publishToNostr(product)
+    }
+
+    return product
+  }
+
+  /**
+   * Get product by ID
+   */
+  async get(id: string, applicationId: string): Promise<Product | null> {
+    const rows = await this.db.query<ProductRow>(
+      'SELECT * FROM products WHERE id = ? AND application_id = ?',
+      [id, applicationId]
+    )
+
+    if (rows.length === 0) return null
+    return rowToProduct(rows[0])
+  }
+
+  /**
+   * List products with optional filters
+   */
+  async list(applicationId: string, options: ListProductsOptions = {}): Promise<Product[]> {
+    let sql = 'SELECT * FROM products WHERE application_id = ?'
+    const params: any[] = [applicationId]
+
+    if (options.stall_id) {
+      sql += ' AND stall_id = ?'
+      params.push(options.stall_id)
+    }
+
+    if (options.active_only !== false) {
+      sql += ' AND active = 1'
+    }
+
+    if (options.category) {
+      // Search in JSON array
+      sql += ' AND categories LIKE ?'
+      params.push(`%"${options.category}"%`)
+    }
+
+    sql += ' ORDER BY created_at DESC'
+
+    if (options.limit) {
+      sql += ' LIMIT ?'
+      params.push(options.limit)
+      if (options.offset) {
+        sql += ' OFFSET ?'
+        params.push(options.offset)
+      }
+    }
+
+    const rows = await this.db.query<ProductRow>(sql, params)
+    return rows.map(rowToProduct)
+  }
+
+  /**
+   * Update a product
+   */
+  async update(
+    id: string,
+    applicationId: string,
+    req: UpdateProductRequest
+  ): Promise<Product | null> {
+    const existing = await this.get(id, applicationId)
+    if (!existing) return null
+
+    // Build updated product
+    const updated: Product = {
+      ...existing,
+      name: req.name?.trim() ?? existing.name,
+      description: req.description?.trim() ?? existing.description,
+      images: req.images ?? existing.images,
+      price: req.price ?? existing.price,
+      quantity: req.quantity ?? existing.quantity,
+      categories: req.categories ?? existing.categories,
+      shipping_cost: req.shipping_cost ?? existing.shipping_cost,
+      specs: req.specs ?? existing.specs,
+      active: req.active ?? existing.active,
+      updated_at: Math.floor(Date.now() / 1000)
+    }
+
+    // Validate merged product
+    validateProduct({
+      name: updated.name,
+      price: updated.price,
+      quantity: updated.quantity,
+      images: updated.images,
+      categories: updated.categories
+    })
+
+    // Update database
+    await this.db.execute(
+      `UPDATE products SET
+        name = ?, description = ?, images = ?, price = ?,
+        quantity = ?, categories = ?, shipping_cost = ?,
+        specs = ?, active = ?, updated_at = ?
+      WHERE id = ? AND application_id = ?`,
+      [
+        updated.name,
+        updated.description,
+        JSON.stringify(updated.images),
+        updated.price,
+        updated.quantity,
+        JSON.stringify(updated.categories),
+        updated.shipping_cost ?? null,
+        updated.specs ? JSON.stringify(updated.specs) : null,
+        updated.active ? 1 : 0,
+        updated.updated_at,
+        id,
+        applicationId
+      ]
+    )
+
+    // Republish to Nostr
+    if (req.publish_to_nostr !== false && updated.active) {
+      await this.publishToNostr(updated)
+    } else if (!updated.active && existing.nostr_event_id) {
+      // Unpublish if deactivated
+      await this.unpublishFromNostr(updated)
+    }
+
+    return updated
+  }
+
+  /**
+   * Delete a product
+   */
+  async delete(id: string, applicationId: string): Promise<boolean> {
+    const product = await this.get(id, applicationId)
+    if (!product) return false
+
+    // Check for pending orders
+    const orders = await this.db.query(
+      `SELECT COUNT(*) as count FROM orders
+       WHERE items LIKE ? AND status IN ('pending', 'paid')`,
+      [`%"${id}"%`]
+    )
+    if ((orders[0] as any).count > 0) {
+      throw new Error('Cannot delete product with pending orders')
+    }
+
+    // Unpublish from Nostr
+    if (product.nostr_event_id) {
+      await this.unpublishFromNostr(product)
+    }
+
+    // Delete from database
+    await this.db.execute(
+      'DELETE FROM products WHERE id = ? AND application_id = ?',
+      [id, applicationId]
+    )
+
+    return true
+  }
+
+  /**
+   * Update product quantity (for inventory management)
+   */
+  async updateQuantity(
+    id: string,
+    applicationId: string,
+    delta: number
+  ): Promise<number> {
+    const product = await this.get(id, applicationId)
+    if (!product) {
+      throw new Error('Product not found')
+    }
+
+    // -1 means unlimited
+    if (product.quantity === -1) {
+      return -1
+    }
+
+    const newQuantity = Math.max(0, product.quantity + delta)
+
+    await this.db.execute(
+      'UPDATE products SET quantity = ?, updated_at = ? WHERE id = ?',
+      [newQuantity, Math.floor(Date.now() / 1000), id]
+    )
+
+    // Republish if quantity changed and product is published
+    if (product.nostr_event_id) {
+      const updated = await this.get(id, applicationId)
+      if (updated) await this.publishToNostr(updated)
+    }
+
+    return newQuantity
+  }
+
+  /**
+   * Check if products are in stock
+   */
+  async checkStock(
+    items: Array<{ product_id: string; quantity: number }>,
+    applicationId: string
+  ): Promise<{ available: boolean; unavailable: string[] }> {
+    const unavailable: string[] = []
+
+    for (const item of items) {
+      const product = await this.get(item.product_id, applicationId)
+
+      if (!product) {
+        unavailable.push(item.product_id)
+        continue
+      }
+
+      if (!product.active) {
+        unavailable.push(item.product_id)
+        continue
+      }
+
+      // -1 means unlimited
+      if (product.quantity !== -1 && product.quantity < item.quantity) {
+        unavailable.push(item.product_id)
+      }
+    }
+
+    return {
+      available: unavailable.length === 0,
+      unavailable
+    }
+  }
+
+  /**
+   * Publish product to Nostr (kind 30018)
+   */
+  async publishToNostr(product: Product): Promise<string | null> {
+    try {
+      // Get stall for currency info
+      const stallRows = await this.db.query(
+        'SELECT * FROM stalls WHERE id = ?',
+        [product.stall_id]
+      )
+      if (stallRows.length === 0) return null
+
+      const stall = stallRows[0] as any
+      const stallObj: Stall = {
+        ...stall,
+        shipping_zones: JSON.parse(stall.shipping_zones)
+      }
+
+      // Get application's Nostr pubkey
+      const app = await this.ctx.getApplication(product.application_id)
+      if (!app || !app.nostr_public) {
+        console.warn(`No Nostr pubkey for application ${product.application_id}`)
+        return null
+      }
+
+      // Build the event
+      const event = buildProductEvent(product, stallObj, app.nostr_public)
+
+      // Sign and publish
+      const eventId = await this.ctx.publishNostrEvent(event)
+
+      // Update database with event info
+      if (eventId) {
+        await this.db.execute(
+          `UPDATE products SET
+            nostr_event_id = ?,
+            nostr_event_created_at = ?
+          WHERE id = ?`,
+          [eventId, event.created_at, product.id]
+        )
+      }
+
+      return eventId
+    } catch (e) {
+      console.error('Failed to publish product to Nostr:', e)
+      return null
+    }
+  }
+
+  /**
+   * Unpublish product from Nostr (kind 5 deletion)
+   */
+  async unpublishFromNostr(product: Product): Promise<boolean> {
+    if (!product.nostr_event_id) return false
+
+    try {
+      const app = await this.ctx.getApplication(product.application_id)
+      if (!app || !app.nostr_public) return false
+
+      const deleteEvent = buildDeleteEvent(
+        product.nostr_event_id,
+        30018,  // PRODUCT kind
+        app.nostr_public,
+        `Product ${product.name} removed`
+      )
+
+      await this.ctx.publishNostrEvent(deleteEvent)
+
+      // Clear event info
+      await this.db.execute(
+        `UPDATE products SET
+          nostr_event_id = NULL,
+          nostr_event_created_at = NULL
+        WHERE id = ?`,
+        [product.id]
+      )
+
+      return true
+    } catch (e) {
+      console.error('Failed to unpublish product from Nostr:', e)
+      return false
+    }
+  }
+
+  /**
+   * Republish all products for a stall
+   */
+  async republishAllForStall(stallId: string, applicationId: string): Promise<number> {
+    const products = await this.list(applicationId, {
+      stall_id: stallId,
+      active_only: true
+    })
+
+    let count = 0
+    for (const product of products) {
+      const eventId = await this.publishToNostr(product)
+      if (eventId) count++
+    }
+
+    return count
+  }
+}
diff --git a/src/extensions/marketplace/managers/stallManager.ts b/src/extensions/marketplace/managers/stallManager.ts
new file mode 100644
index 00000000..a77809c3
--- /dev/null
+++ b/src/extensions/marketplace/managers/stallManager.ts
@@ -0,0 +1,305 @@
+import {
+  ExtensionContext, ExtensionDatabase,
+  Stall, CreateStallRequest, UpdateStallRequest
+} from '../types.js'
+import { generateId, validateStall } from '../utils/validation.js'
+import { buildStallEvent, buildDeleteEvent } from '../nostr/events.js'
+
+/**
+ * Database row for stall
+ */
+interface StallRow {
+  id: string
+  application_id: string
+  name: string
+  description: string
+  currency: string
+  shipping_zones: string  // JSON
+  image_url: string | null
+  nostr_event_id: string | null
+  nostr_event_created_at: number | null
+  created_at: number
+  updated_at: number
+}
+
+/**
+ * Convert database row to Stall object
+ */
+function rowToStall(row: StallRow): Stall {
+  return {
+    id: row.id,
+    application_id: row.application_id,
+    name: row.name,
+    description: row.description,
+    currency: row.currency as Stall['currency'],
+    shipping_zones: JSON.parse(row.shipping_zones),
+    image_url: row.image_url || undefined,
+    nostr_event_id: row.nostr_event_id || undefined,
+    nostr_event_created_at: row.nostr_event_created_at || undefined,
+    created_at: row.created_at,
+    updated_at: row.updated_at
+  }
+}
+
+/**
+ * StallManager - Handles stall CRUD and Nostr publishing
+ */
+export class StallManager {
+  constructor(
+    private db: ExtensionDatabase,
+    private ctx: ExtensionContext
+  ) {}
+
+  /**
+   * Create a new stall
+   */
+  async create(applicationId: string, req: CreateStallRequest): Promise<Stall> {
+    // Validate request
+    validateStall(req)
+
+    const now = Math.floor(Date.now() / 1000)
+    const id = generateId()
+
+    // Assign IDs to shipping zones if not provided
+    const shippingZones = req.shipping_zones.map(zone => ({
+      id: zone.id || generateId(),
+      name: zone.name,
+      cost: zone.cost,
+      regions: zone.regions
+    }))
+
+    const stall: Stall = {
+      id,
+      application_id: applicationId,
+      name: req.name.trim(),
+      description: req.description?.trim() || '',
+      currency: req.currency,
+      shipping_zones: shippingZones,
+      image_url: req.image_url,
+      created_at: now,
+      updated_at: now
+    }
+
+    // Insert into database
+    await this.db.execute(
+      `INSERT INTO stalls (
+        id, application_id, name, description, currency,
+        shipping_zones, image_url, created_at, updated_at
+      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+      [
+        stall.id,
+        stall.application_id,
+        stall.name,
+        stall.description,
+        stall.currency,
+        JSON.stringify(stall.shipping_zones),
+        stall.image_url || null,
+        stall.created_at,
+        stall.updated_at
+      ]
+    )
+
+    // Publish to Nostr if auto-publish enabled
+    if (req.publish_to_nostr !== false) {
+      await this.publishToNostr(stall)
+    }
+
+    return stall
+  }
+
+  /**
+   * Get stall by ID
+   */
+  async get(id: string, applicationId: string): Promise<Stall | null> {
+    const rows = await this.db.query<StallRow>(
+      'SELECT * FROM stalls WHERE id = ? AND application_id = ?',
+      [id, applicationId]
+    )
+
+    if (rows.length === 0) return null
+    return rowToStall(rows[0])
+  }
+
+  /**
+   * List all stalls for an application
+   */
+  async list(applicationId: string): Promise<Stall[]> {
+    const rows = await this.db.query<StallRow>(
+      'SELECT * FROM stalls WHERE application_id = ? ORDER BY created_at DESC',
+      [applicationId]
+    )
+
+    return rows.map(rowToStall)
+  }
+
+  /**
+   * Update a stall
+   */
+  async update(
+    id: string,
+    applicationId: string,
+    req: UpdateStallRequest
+  ): Promise<Stall | null> {
+    const existing = await this.get(id, applicationId)
+    if (!existing) return null
+
+    // Build updated stall
+    const updated: Stall = {
+      ...existing,
+      name: req.name?.trim() ?? existing.name,
+      description: req.description?.trim() ?? existing.description,
+      currency: req.currency ?? existing.currency,
+      shipping_zones: req.shipping_zones ?? existing.shipping_zones,
+      image_url: req.image_url ?? existing.image_url,
+      updated_at: Math.floor(Date.now() / 1000)
+    }
+
+    // Validate merged stall
+    validateStall({
+      name: updated.name,
+      currency: updated.currency,
+      shipping_zones: updated.shipping_zones
+    })
+
+    // Update database
+    await this.db.execute(
+      `UPDATE stalls SET
+        name = ?, description = ?, currency = ?,
+        shipping_zones = ?, image_url = ?, updated_at = ?
+      WHERE id = ? AND application_id = ?`,
+      [
+        updated.name,
+        updated.description,
+        updated.currency,
+        JSON.stringify(updated.shipping_zones),
+        updated.image_url || null,
+        updated.updated_at,
+        id,
+        applicationId
+      ]
+    )
+
+    // Republish to Nostr (updates parameterized replaceable event)
+    if (req.publish_to_nostr !== false) {
+      await this.publishToNostr(updated)
+    }
+
+    return updated
+  }
+
+  /**
+   * Delete a stall
+   */
+  async delete(id: string, applicationId: string): Promise<boolean> {
+    const stall = await this.get(id, applicationId)
+    if (!stall) return false
+
+    // Check for products
+    const products = await this.db.query(
+      'SELECT COUNT(*) as count FROM products WHERE stall_id = ?',
+      [id]
+    )
+    if ((products[0] as any).count > 0) {
+      throw new Error('Cannot delete stall with existing products')
+    }
+
+    // Publish deletion event to Nostr if it was published
+    if (stall.nostr_event_id) {
+      await this.unpublishFromNostr(stall)
+    }
+
+    // Delete from database
+    await this.db.execute(
+      'DELETE FROM stalls WHERE id = ? AND application_id = ?',
+      [id, applicationId]
+    )
+
+    return true
+  }
+
+  /**
+   * Publish stall to Nostr (kind 30017)
+   */
+  async publishToNostr(stall: Stall): Promise<string | null> {
+    try {
+      // Get application's Nostr pubkey
+      const app = await this.ctx.getApplication(stall.application_id)
+      if (!app || !app.nostr_public) {
+        console.warn(`No Nostr pubkey for application ${stall.application_id}`)
+        return null
+      }
+
+      // Build the event
+      const event = buildStallEvent(stall, app.nostr_public)
+
+      // Sign and publish via context
+      const eventId = await this.ctx.publishNostrEvent(event)
+
+      // Update database with event info
+      if (eventId) {
+        await this.db.execute(
+          `UPDATE stalls SET
+            nostr_event_id = ?,
+            nostr_event_created_at = ?
+          WHERE id = ?`,
+          [eventId, event.created_at, stall.id]
+        )
+      }
+
+      return eventId
+    } catch (e) {
+      console.error('Failed to publish stall to Nostr:', e)
+      return null
+    }
+  }
+
+  /**
+   * Unpublish stall from Nostr (kind 5 deletion)
+   */
+  async unpublishFromNostr(stall: Stall): Promise<boolean> {
+    if (!stall.nostr_event_id) return false
+
+    try {
+      const app = await this.ctx.getApplication(stall.application_id)
+      if (!app || !app.nostr_public) return false
+
+      const deleteEvent = buildDeleteEvent(
+        stall.nostr_event_id,
+        30017,  // STALL kind
+        app.nostr_public,
+        `Stall ${stall.name} removed`
+      )
+
+      await this.ctx.publishNostrEvent(deleteEvent)
+
+      // Clear event info from database
+      await this.db.execute(
+        `UPDATE stalls SET
+          nostr_event_id = NULL,
+          nostr_event_created_at = NULL
+        WHERE id = ?`,
+        [stall.id]
+      )
+
+      return true
+    } catch (e) {
+      console.error('Failed to unpublish stall from Nostr:', e)
+      return false
+    }
+  }
+
+  /**
+   * Republish all stalls for an application
+   */
+  async republishAll(applicationId: string): Promise<number> {
+    const stalls = await this.list(applicationId)
+    let count = 0
+
+    for (const stall of stalls) {
+      const eventId = await this.publishToNostr(stall)
+      if (eventId) count++
+    }
+
+    return count
+  }
+}
diff --git a/src/extensions/marketplace/migrations.ts b/src/extensions/marketplace/migrations.ts
new file mode 100644
index 00000000..5c1ff1c7
--- /dev/null
+++ b/src/extensions/marketplace/migrations.ts
@@ -0,0 +1,194 @@
+import { ExtensionDatabase } from './types.js'
+
+export interface ExtensionMigration {
+  version: number
+  description: string
+  up(db: ExtensionDatabase): Promise<void>
+  down?(db: ExtensionDatabase): Promise<void>
+}
+
+export const migrations: ExtensionMigration[] = [
+  {
+    version: 1,
+    description: 'Create core marketplace tables',
+    up: async (db: ExtensionDatabase) => {
+      // Stalls table
+      await db.execute(`
+        CREATE TABLE IF NOT EXISTS stalls (
+          id TEXT PRIMARY KEY,
+          application_id TEXT NOT NULL,
+          name TEXT NOT NULL,
+          description TEXT DEFAULT '',
+          currency TEXT NOT NULL DEFAULT 'sat',
+          shipping_zones TEXT NOT NULL DEFAULT '[]',
+          image_url TEXT,
+          nostr_event_id TEXT,
+          nostr_event_created_at INTEGER,
+          created_at INTEGER NOT NULL,
+          updated_at INTEGER NOT NULL
+        )
+      `)
+
+      await db.execute(`
+        CREATE INDEX IF NOT EXISTS idx_stalls_app
+        ON stalls(application_id)
+      `)
+
+      // Products table
+      await db.execute(`
+        CREATE TABLE IF NOT EXISTS products (
+          id TEXT PRIMARY KEY,
+          stall_id TEXT NOT NULL,
+          application_id TEXT NOT NULL,
+          name TEXT NOT NULL,
+          description TEXT DEFAULT '',
+          images TEXT NOT NULL DEFAULT '[]',
+          price INTEGER NOT NULL,
+          quantity INTEGER NOT NULL DEFAULT -1,
+          categories TEXT NOT NULL DEFAULT '[]',
+          shipping_cost INTEGER,
+          specs TEXT DEFAULT '[]',
+          active INTEGER NOT NULL DEFAULT 1,
+          nostr_event_id TEXT,
+          nostr_event_created_at INTEGER,
+          created_at INTEGER NOT NULL,
+          updated_at INTEGER NOT NULL,
+          FOREIGN KEY (stall_id) REFERENCES stalls(id)
+        )
+      `)
+
+      await db.execute(`
+        CREATE INDEX IF NOT EXISTS idx_products_stall
+        ON products(stall_id)
+      `)
+
+      await db.execute(`
+        CREATE INDEX IF NOT EXISTS idx_products_app
+        ON products(application_id)
+      `)
+
+      await db.execute(`
+        CREATE INDEX IF NOT EXISTS idx_products_active
+        ON products(active, application_id)
+      `)
+
+      // Orders table
+      await db.execute(`
+        CREATE TABLE IF NOT EXISTS orders (
+          id TEXT PRIMARY KEY,
+          application_id TEXT NOT NULL,
+          stall_id TEXT NOT NULL,
+          customer_pubkey TEXT NOT NULL,
+          customer_app_user_id TEXT,
+          items TEXT NOT NULL,
+          shipping_zone_id TEXT NOT NULL,
+          shipping_address TEXT NOT NULL,
+          contact TEXT NOT NULL,
+          subtotal_sats INTEGER NOT NULL,
+          shipping_sats INTEGER NOT NULL,
+          total_sats INTEGER NOT NULL,
+          original_currency TEXT NOT NULL,
+          exchange_rate REAL,
+          invoice TEXT,
+          invoice_id TEXT,
+          status TEXT NOT NULL DEFAULT 'pending',
+          nostr_event_id TEXT,
+          created_at INTEGER NOT NULL,
+          paid_at INTEGER,
+          shipped_at INTEGER,
+          completed_at INTEGER
+        )
+      `)
+
+      await db.execute(`
+        CREATE INDEX IF NOT EXISTS idx_orders_app
+        ON orders(application_id)
+      `)
+
+      await db.execute(`
+        CREATE INDEX IF NOT EXISTS idx_orders_customer
+        ON orders(customer_pubkey, application_id)
+      `)
+
+      await db.execute(`
+        CREATE INDEX IF NOT EXISTS idx_orders_status
+        ON orders(status, application_id)
+      `)
+
+      // Direct messages table
+      await db.execute(`
+        CREATE TABLE IF NOT EXISTS direct_messages (
+          id TEXT PRIMARY KEY,
+          application_id TEXT NOT NULL,
+          order_id TEXT,
+          customer_pubkey TEXT NOT NULL,
+          message_type TEXT NOT NULL,
+          content TEXT NOT NULL,
+          incoming INTEGER NOT NULL,
+          nostr_event_id TEXT NOT NULL UNIQUE,
+          nostr_event_created_at INTEGER NOT NULL,
+          created_at INTEGER NOT NULL,
+          read INTEGER NOT NULL DEFAULT 0
+        )
+      `)
+
+      await db.execute(`
+        CREATE INDEX IF NOT EXISTS idx_dm_customer
+        ON direct_messages(customer_pubkey, application_id)
+      `)
+
+      await db.execute(`
+        CREATE INDEX IF NOT EXISTS idx_dm_order
+        ON direct_messages(order_id)
+      `)
+
+      await db.execute(`
+        CREATE INDEX IF NOT EXISTS idx_dm_unread
+        ON direct_messages(read, application_id)
+      `)
+
+      // Customers table
+      await db.execute(`
+        CREATE TABLE IF NOT EXISTS customers (
+          pubkey TEXT NOT NULL,
+          application_id TEXT NOT NULL,
+          name TEXT,
+          about TEXT,
+          picture TEXT,
+          total_orders INTEGER NOT NULL DEFAULT 0,
+          total_spent_sats INTEGER NOT NULL DEFAULT 0,
+          unread_messages INTEGER NOT NULL DEFAULT 0,
+          first_seen_at INTEGER NOT NULL,
+          last_seen_at INTEGER NOT NULL,
+          PRIMARY KEY (pubkey, application_id)
+        )
+      `)
+    },
+
+    down: async (db: ExtensionDatabase) => {
+      await db.execute('DROP TABLE IF EXISTS customers')
+      await db.execute('DROP TABLE IF EXISTS direct_messages')
+      await db.execute('DROP TABLE IF EXISTS orders')
+      await db.execute('DROP TABLE IF EXISTS products')
+      await db.execute('DROP TABLE IF EXISTS stalls')
+    }
+  },
+
+  {
+    version: 2,
+    description: 'Add exchange rates cache table',
+    up: async (db: ExtensionDatabase) => {
+      await db.execute(`
+        CREATE TABLE IF NOT EXISTS exchange_rates (
+          currency TEXT PRIMARY KEY,
+          rate_sats INTEGER NOT NULL,
+          updated_at INTEGER NOT NULL
+        )
+      `)
+    },
+
+    down: async (db: ExtensionDatabase) => {
+      await db.execute('DROP TABLE IF EXISTS exchange_rates')
+    }
+  }
+]
diff --git a/src/extensions/marketplace/nostr/events.ts b/src/extensions/marketplace/nostr/events.ts
new file mode 100644
index 00000000..b4c476b4
--- /dev/null
+++ b/src/extensions/marketplace/nostr/events.ts
@@ -0,0 +1,164 @@
+import { EVENT_KINDS } from './kinds.js'
+import {
+  Stall, Product, Order,
+  NIP15Stall, NIP15Product, NIP15PaymentRequest, NIP15OrderStatusUpdate
+} from '../types.js'
+
+/**
+ * Unsigned Nostr event structure
+ */
+export interface UnsignedEvent {
+  kind: number
+  pubkey: string
+  created_at: number
+  tags: string[][]
+  content: string
+  id?: string
+}
+
+/**
+ * Build NIP-15 stall event (kind 30017)
+ */
+export function buildStallEvent(stall: Stall, pubkey: string): UnsignedEvent {
+  const nip15Stall: NIP15Stall = {
+    id: stall.id,
+    name: stall.name,
+    description: stall.description,
+    currency: stall.currency,
+    shipping: stall.shipping_zones.map(zone => ({
+      id: zone.id,
+      name: zone.name,
+      cost: zone.cost,
+      regions: zone.regions
+    }))
+  }
+
+  return {
+    kind: EVENT_KINDS.STALL,
+    pubkey,
+    created_at: Math.floor(Date.now() / 1000),
+    tags: [
+      ['d', stall.id],  // Unique identifier for parameterized replaceable
+    ],
+    content: JSON.stringify(nip15Stall)
+  }
+}
+
+/**
+ * Build NIP-15 product event (kind 30018)
+ */
+export function buildProductEvent(product: Product, stall: Stall, pubkey: string): UnsignedEvent {
+  const nip15Product: NIP15Product = {
+    id: product.id,
+    stall_id: product.stall_id,
+    name: product.name,
+    description: product.description,
+    images: product.images,
+    currency: stall.currency,
+    price: product.price,
+    quantity: product.quantity,
+    specs: product.specs?.map(s => [s.key, s.value] as [string, string])
+  }
+
+  // Add shipping costs if different from stall defaults
+  if (product.shipping_cost !== undefined) {
+    nip15Product.shipping = stall.shipping_zones.map(zone => ({
+      id: zone.id,
+      cost: product.shipping_cost!
+    }))
+  }
+
+  const tags: string[][] = [
+    ['d', product.id],  // Unique identifier
+  ]
+
+  // Add category tags
+  for (const category of product.categories) {
+    tags.push(['t', category])
+  }
+
+  return {
+    kind: EVENT_KINDS.PRODUCT,
+    pubkey,
+    created_at: Math.floor(Date.now() / 1000),
+    tags,
+    content: JSON.stringify(nip15Product)
+  }
+}
+
+/**
+ * Build deletion event (kind 5)
+ */
+export function buildDeleteEvent(
+  eventId: string,
+  kind: number,
+  pubkey: string,
+  reason?: string
+): UnsignedEvent {
+  const tags: string[][] = [
+    ['e', eventId],
+    ['k', String(kind)]
+  ]
+
+  return {
+    kind: EVENT_KINDS.DELETE,
+    pubkey,
+    created_at: Math.floor(Date.now() / 1000),
+    tags,
+    content: reason || ''
+  }
+}
+
+/**
+ * Build payment request DM content
+ */
+export function buildPaymentRequestContent(
+  order: Order,
+  invoice: string,
+  message?: string
+): NIP15PaymentRequest {
+  return {
+    id: order.id,
+    type: 1,
+    message: message || `Payment request for order ${order.id}. Total: ${order.total_sats} sats`,
+    payment_options: [
+      { type: 'ln', link: invoice }
+    ]
+  }
+}
+
+/**
+ * Build order status update DM content
+ */
+export function buildOrderStatusContent(
+  order: Order,
+  message: string
+): NIP15OrderStatusUpdate {
+  return {
+    id: order.id,
+    type: 2,
+    message,
+    paid: order.status !== 'pending',
+    shipped: order.status === 'shipped' || order.status === 'completed'
+  }
+}
+
+/**
+ * Build encrypted DM event (kind 4)
+ * Note: Actual encryption happens in the manager using NIP-44
+ */
+export function buildDirectMessageEvent(
+  content: string,  // Already encrypted
+  fromPubkey: string,
+  toPubkey: string
+): UnsignedEvent {
+  return {
+    kind: EVENT_KINDS.DIRECT_MESSAGE,
+    pubkey: fromPubkey,
+    created_at: Math.floor(Date.now() / 1000),
+    tags: [
+      ['p', toPubkey]
+    ],
+    content
+  }
+}
diff --git a/src/extensions/marketplace/nostr/kinds.ts b/src/extensions/marketplace/nostr/kinds.ts
new file mode 100644
index 00000000..20d26914
--- /dev/null
+++ b/src/extensions/marketplace/nostr/kinds.ts
@@ -0,0 +1,31 @@
+/**
+ * NIP-15 Event Kinds
+ * https://github.com/nostr-protocol/nips/blob/master/15.md
+ */
+
+export const EVENT_KINDS = {
+  // Standard kinds
+  METADATA: 0,              // User profile
+  TEXT_NOTE: 1,             // Short text
+  DIRECT_MESSAGE: 4,        // Encrypted DM (NIP-04)
+  DELETE: 5,                // Event deletion
+
+  // NIP-15 Marketplace kinds
+  STALL: 30017,             // Parameterized replaceable: merchant stall
+  PRODUCT: 30018,           // Parameterized replaceable: product listing
+
+  // Lightning.Pub RPC kinds (for native clients)
+  RPC_REQUEST: 21001,       // Encrypted RPC request
+  RPC_RESPONSE: 21002,      // Encrypted RPC response
+} as const
+
+export type EventKind = typeof EVENT_KINDS[keyof typeof EVENT_KINDS]
+
+// Marketplace message types (in DM content)
+export const MESSAGE_TYPES = {
+  ORDER_REQUEST: 0,
+  PAYMENT_REQUEST: 1,
+  ORDER_STATUS: 2,
+} as const
+
+export type MessageTypeNum = typeof MESSAGE_TYPES[keyof typeof MESSAGE_TYPES]
diff --git a/src/extensions/marketplace/nostr/parser.ts b/src/extensions/marketplace/nostr/parser.ts
new file mode 100644
index 00000000..f90a1aa3
--- /dev/null
+++ b/src/extensions/marketplace/nostr/parser.ts
@@ -0,0 +1,162 @@
+import { EVENT_KINDS, MESSAGE_TYPES } from './kinds.js'
+import {
+  NIP15Stall, NIP15Product, NIP15OrderRequest,
+  Stall, Product, MessageType
+} from '../types.js'
+import { generateId } from '../utils/validation.js'
+
+/**
+ * Nostr event structure
+ */
+export interface NostrEvent {
+  id: string
+  pubkey: string
+  created_at: number
+  kind: number
+  tags: string[][]
+  content: string
+  sig?: string
+}
+
+/**
+ * Parse NIP-15 stall event
+ */
+export function parseStallEvent(event: NostrEvent): Partial<Stall> | null {
+  if (event.kind !== EVENT_KINDS.STALL) return null
+
+  try {
+    const content = JSON.parse(event.content) as NIP15Stall
+    const dTag = event.tags.find(t => t[0] === 'd')
+
+    return {
+      id: content.id || dTag?.[1] || generateId(),
+      name: content.name,
+      description: content.description || '',
+      currency: content.currency as any || 'sat',
+      shipping_zones: (content.shipping || []).map(zone => ({
+        id: zone.id || generateId(),
+        name: zone.name || zone.id,
+        cost: zone.cost,
+        regions: zone.regions || []
+      })),
+      nostr_event_id: event.id,
+      nostr_event_created_at: event.created_at
+    }
+  } catch (e) {
+    return null
+  }
+}
+
+/**
+ * Parse NIP-15 product event
+ */
+export function parseProductEvent(event: NostrEvent): Partial<Product> | null {
+  if (event.kind !== EVENT_KINDS.PRODUCT) return null
+
+  try {
+    const content = JSON.parse(event.content) as NIP15Product
+    const dTag = event.tags.find(t => t[0] === 'd')
+    const categoryTags = event.tags.filter(t => t[0] === 't').map(t => t[1])
+
+    return {
+      id: content.id || dTag?.[1] || generateId(),
+      stall_id: content.stall_id,
+      name: content.name,
+      description: content.description || '',
+      images: content.images || [],
+      price: content.price,
+      quantity: content.quantity ?? -1,
+      categories: categoryTags.length > 0 ? categoryTags : [],
+      specs: content.specs?.map(([key, value]) => ({ key, value })),
+      nostr_event_id: event.id,
+      nostr_event_created_at: event.created_at
+    }
+  } catch (e) {
+    return null
+  }
+}
+
+/**
+ * Parse NIP-15 order request from DM
+ */
+export function parseOrderRequest(content: string): NIP15OrderRequest | null {
+  try {
+    const parsed = JSON.parse(content)
+    if (parsed.type !== MESSAGE_TYPES.ORDER_REQUEST) return null
+
+    return {
+      id: parsed.id || generateId(),
+      type: 0,
+      name: parsed.name,
+      address: parsed.address,
+      message: parsed.message,
+      contact: parsed.contact || {},
+      items: parsed.items || [],
+      shipping_id: parsed.shipping_id
+    }
+  } catch (e) {
+    return null
+  }
+}
+
+/**
+ * Determine message type from decrypted content
+ */
+export function parseMessageType(content: string): { type: MessageType; parsed: any } {
+  try {
+    const parsed = JSON.parse(content)
+
+    if (typeof parsed.type === 'number') {
+      switch (parsed.type) {
+        case MESSAGE_TYPES.ORDER_REQUEST:
+          return { type: 'order_request', parsed }
+        case MESSAGE_TYPES.PAYMENT_REQUEST:
+          return { type: 'payment_request', parsed }
+        case MESSAGE_TYPES.ORDER_STATUS:
+          return { type: 'order_status', parsed }
+      }
+    }
+
+    // If it has items and shipping_id, treat as order request
+    if (parsed.items && parsed.shipping_id) {
+      return { type: 'order_request', parsed: { ...parsed, type: 0 } }
+    }
+
+    return { type: 'plain', parsed: content }
+  } catch {
+    return { type: 'plain', parsed: content }
+  }
+}
+
+/**
+ * Extract pubkey from p tag
+ */
+export function extractRecipientPubkey(event: NostrEvent): string | null {
+  const pTag = event.tags.find(t => t[0] === 'p')
+  return pTag?.[1] || null
+}
+
+/**
+ * Check if event is a deletion event for a specific kind
+ */
+export function isDeletionEvent(event: NostrEvent, targetKind?: number): boolean {
+  if (event.kind !== EVENT_KINDS.DELETE) return false
+
+  if (targetKind !== undefined) {
+    const kTag = event.tags.find(t => t[0] === 'k')
+    return kTag?.[1] === String(targetKind)
+  }
+
+  return true
+}
+
+/**
+ * Get deleted event IDs from a deletion event
+ */
+export function getDeletedEventIds(event: NostrEvent): string[] {
+  if (event.kind !== EVENT_KINDS.DELETE) return []
+
+  return event.tags
+    .filter(t => t[0] === 'e')
+    .map(t => t[1])
+}
diff --git a/src/extensions/marketplace/types.ts b/src/extensions/marketplace/types.ts
new file mode 100644
index 00000000..7559d947
--- /dev/null
+++ b/src/extensions/marketplace/types.ts
@@ -0,0 +1,418 @@
+/**
+ * Marketplace Extension Types
+ * NIP-15 compliant marketplace for Lightning.Pub
+ */
+
+// Re-export base extension types
+export {
+  Extension,
+  ExtensionInfo,
+  ExtensionContext,
+  ExtensionDatabase,
+  ApplicationInfo,
+  NostrEvent,
+  UnsignedNostrEvent,
+  PaymentReceivedData,
+  RpcMethodHandler
+} from '../types.js'
+
+// ============================================================================
+// Core Data Types
+// ============================================================================
+
+export interface ShippingZone {
+  id: string
+  name: string
+  cost: number          // In stall's currency
+  regions: string[]     // ISO country codes or region names
+}
+
+export interface Stall {
+  id: string
+  application_id: string
+  name: string
+  description: string
+  currency: Currency
+  shipping_zones: ShippingZone[]
+  image_url?: string
+
+  // Nostr sync
+  nostr_event_id?: string
+  nostr_event_created_at?: number
+
+  // Metadata
+  created_at: number
+  updated_at: number
+}
+
+export interface Product {
+  id: string
+  stall_id: string
+  application_id: string
+
+  name: string
+  description: string
+  images: string[]
+  price: number                 // In stall's currency
+  quantity: number              // Available stock (-1 = unlimited)
+  categories: string[]
+
+  // Shipping override (optional, otherwise use stall zones)
+  shipping_cost?: number
+
+  // Product options/variants (future)
+  specs?: ProductSpec[]
+
+  // Behavior
+  active: boolean
+
+  // Nostr sync
+  nostr_event_id?: string
+  nostr_event_created_at?: number
+
+  // Metadata
+  created_at: number
+  updated_at: number
+}
+
+export interface ProductSpec {
+  key: string
+  value: string
+}
+
+export interface OrderItem {
+  product_id: string
+  product_name: string        // Snapshot at order time
+  quantity: number
+  unit_price: number          // In stall currency, at order time
+}
+
+export interface ContactInfo {
+  nostr?: string              // Nostr pubkey
+  email?: string
+  phone?: string
+}
+
+export type OrderStatus =
+  | 'pending'                 // Awaiting payment
+  | 'paid'                    // Payment received
+  | 'processing'              // Merchant preparing
+  | 'shipped'                 // In transit
+  | 'completed'               // Delivered
+  | 'cancelled'               // Cancelled by merchant or customer
+
+export interface Order {
+  id: string
+  application_id: string
+  stall_id: string
+
+  // Customer
+  customer_pubkey: string     // Nostr pubkey
+  customer_app_user_id?: string  // If registered user
+
+  // Order details
+  items: OrderItem[]
+  shipping_zone_id: string
+  shipping_address: string
+  contact: ContactInfo
+
+  // Pricing (all in sats)
+  subtotal_sats: number
+  shipping_sats: number
+  total_sats: number
+
+  // Original currency info (for display)
+  original_currency: Currency
+  exchange_rate?: number      // Rate at order time
+
+  // Payment
+  invoice?: string            // BOLT11 invoice
+  invoice_id?: string         // Internal invoice reference
+
+  // Status
+  status: OrderStatus
+
+  // Nostr
+  nostr_event_id?: string     // Order request event
+
+  // Timestamps
+  created_at: number
+  paid_at?: number
+  shipped_at?: number
+  completed_at?: number
+}
+
+export interface DirectMessage {
+  id: string
+  application_id: string
+  order_id?: string           // Optional link to order
+
+  customer_pubkey: string
+
+  // Message content
+  message_type: MessageType
+  content: string             // Decrypted content
+
+  // Direction
+  incoming: boolean           // true = from customer, false = to customer
+
+  // Nostr
+  nostr_event_id: string
+  nostr_event_created_at: number
+
+  // Metadata
+  created_at: number
+  read: boolean
+}
+
+export type MessageType =
+  | 'plain'                   // Regular text message
+  | 'order_request'           // Customer order (type 0)
+  | 'payment_request'         // Merchant payment request (type 1)
+  | 'order_status'            // Order update (type 2)
+
+export interface Customer {
+  pubkey: string
+  application_id: string
+
+  // Profile (from kind 0)
+  name?: string
+  about?: string
+  picture?: string
+
+  // Stats
+  total_orders: number
+  total_spent_sats: number
+  unread_messages: number
+
+  // Metadata
+  first_seen_at: number
+  last_seen_at: number
+}
+
+// ============================================================================
+// Currency Types
+// ============================================================================
+
+export type Currency = 'sat' | 'btc' | 'usd' | 'eur' | 'gbp' | 'cad' | 'aud' | 'jpy'
+
+export interface ExchangeRate {
+  currency: Currency
+  rate_sats: number           // How many sats per 1 unit of currency
+  timestamp: number
+}
+
+// ============================================================================
+// NIP-15 Event Types
+// ============================================================================
+
+export interface NIP15Stall {
+  id: string
+  name: string
+  description?: string
+  currency: string
+  shipping: NIP15ShippingZone[]
+}
+
+export interface NIP15ShippingZone {
+  id: string
+  name?: string
+  cost: number
+  regions: string[]
+}
+
+export interface NIP15Product {
+  id: string
+  stall_id: string
+  name: string
+  description?: string
+  images?: string[]
+  currency: string
+  price: number
+  quantity: number
+  specs?: Array<[string, string]>
+  shipping?: NIP15ProductShipping[]
+}
+
+export interface NIP15ProductShipping {
+  id: string                  // Zone ID
+  cost: number
+}
+
+export interface NIP15OrderRequest {
+  id: string
+  type: 0
+  name?: string
+  address?: string
+  message?: string
+  contact: {
+    nostr?: string
+    phone?: string
+    email?: string
+  }
+  items: Array<{
+    product_id: string
+    quantity: number
+  }>
+  shipping_id: string
+}
+
+export interface NIP15PaymentRequest {
+  id: string
+  type: 1
+  message?: string
+  payment_options: Array<{
+    type: 'ln' | 'url' | 'btc'
+    link: string
+  }>
+}
+
+export interface NIP15OrderStatusUpdate {
+  id: string
+  type: 2
+  message: string
+  paid?: boolean
+  shipped?: boolean
+}
+
+// ============================================================================
+// RPC Request/Response Types
+// ============================================================================
+
+// Stall operations
+export interface CreateStallRequest {
+  name: string
+  description?: string
+  currency: Currency
+  shipping_zones: Array<Omit<ShippingZone, 'id'> & { id?: string }>
+  image_url?: string
+  publish_to_nostr?: boolean  // Default: true
+}
+
+export interface UpdateStallRequest {
+  stall_id: string
+  name?: string
+  description?: string
+  currency?: Currency
+  shipping_zones?: ShippingZone[]
+  image_url?: string
+  publish_to_nostr?: boolean  // Default: true
+}
+
+export interface GetStallRequest {
+  stall_id: string
+}
+
+export interface ListStallsRequest {
+  limit?: number
+  offset?: number
+}
+
+// Product operations
+export interface CreateProductRequest {
+  stall_id: string
+  name: string
+  description?: string
+  images?: string[]
+  price: number
+  quantity?: number            // Default: -1 (unlimited)
+  categories?: string[]
+  shipping_cost?: number
+  specs?: ProductSpec[]
+  active?: boolean
+  publish_to_nostr?: boolean   // Default: true
+}
+
+export interface UpdateProductRequest {
+  product_id: string
+  name?: string
+  description?: string
+  images?: string[]
+  price?: number
+  quantity?: number
+  categories?: string[]
+  shipping_cost?: number
+  specs?: ProductSpec[]
+  active?: boolean
+  publish_to_nostr?: boolean   // Default: true
+}
+
+export interface GetProductRequest {
+  product_id: string
+}
+
+export interface ListProductsRequest {
+  stall_id?: string
+  category?: string
+  active_only?: boolean
+  limit?: number
+  offset?: number
+}
+
+// Order operations
+export interface CreateOrderRequest {
+  stall_id: string
+  items: Array<{ product_id: string; quantity: number }>
+  shipping_zone_id: string
+  shipping_address: string
+  contact: ContactInfo
+}
+
+export interface GetOrderRequest {
+  order_id: string
+}
+
+export interface ListOrdersRequest {
+  stall_id?: string
+  status?: OrderStatus
+  customer_pubkey?: string
+  limit?: number
+  offset?: number
+}
+
+export interface UpdateOrderStatusRequest {
+  order_id: string
+  status: OrderStatus
+  message?: string
+}
+
+// Message operations
+export interface SendMessageRequest {
+  customer_pubkey: string
+  message: string
+  order_id?: string
+}
+
+export interface ListMessagesRequest {
+  customer_pubkey?: string
+  order_id?: string
+  unread_only?: boolean
+  limit?: number
+  offset?: number
+}
+
+export interface MarkMessagesReadRequest {
+  customer_pubkey?: string
+  message_ids?: string[]
+}
+
+// Customer operations
+export interface ListCustomersRequest {
+  limit?: number
+  offset?: number
+}
+
+export interface GetCustomerRequest {
+  pubkey: string
+}
+
+// ============================================================================
+// Extension Context Types
+// ============================================================================
+
+export interface MarketplaceContext {
+  application_id: string
+  application_pubkey: string
+  user_id: string
+  is_owner: boolean
+}
diff --git a/src/extensions/marketplace/utils/currency.ts b/src/extensions/marketplace/utils/currency.ts
new file mode 100644
index 00000000..7bb2dd14
--- /dev/null
+++ b/src/extensions/marketplace/utils/currency.ts
@@ -0,0 +1,205 @@
+import { ExtensionDatabase } from '../types.js'
+
+/**
+ * Exchange rate data
+ */
+interface ExchangeRateData {
+  currency: string
+  rate_sats: number  // How many sats per 1 unit of currency
+  updated_at: number
+}
+
+// Cache duration: 10 minutes
+const CACHE_DURATION_MS = 10 * 60 * 1000
+
+// In-memory cache for rates
+const rateCache = new Map<string, { rate: number; timestamp: number }>()
+
+/**
+ * Supported fiat currencies
+ */
+export const SUPPORTED_CURRENCIES = ['sat', 'btc', 'usd', 'eur', 'gbp', 'cad', 'aud', 'jpy'] as const
+export type SupportedCurrency = typeof SUPPORTED_CURRENCIES[number]
+
+/**
+ * Get exchange rate from cache or database
+ */
+async function getCachedRate(
+  db: ExtensionDatabase,
+  currency: string
+): Promise<number | null> {
+  // Check memory cache first
+  const cached = rateCache.get(currency)
+  if (cached && Date.now() - cached.timestamp < CACHE_DURATION_MS) {
+    return cached.rate
+  }
+
+  // Check database cache
+  const result = await db.query<ExchangeRateData>(
+    'SELECT * FROM exchange_rates WHERE currency = ?',
+    [currency]
+  )
+
+  if (result.length > 0) {
+    const row = result[0]
+    if (Date.now() - row.updated_at * 1000 < CACHE_DURATION_MS) {
+      rateCache.set(currency, { rate: row.rate_sats, timestamp: row.updated_at * 1000 })
+      return row.rate_sats
+    }
+  }
+
+  return null
+}
+
+/**
+ * Save exchange rate to cache and database
+ */
+async function saveRate(
+  db: ExtensionDatabase,
+  currency: string,
+  rateSats: number
+): Promise<void> {
+  const now = Math.floor(Date.now() / 1000)
+
+  // Save to memory cache
+  rateCache.set(currency, { rate: rateSats, timestamp: now * 1000 })
+
+  // Save to database (upsert)
+  await db.execute(
+    `INSERT INTO exchange_rates (currency, rate_sats, updated_at)
+     VALUES (?, ?, ?)
+     ON CONFLICT(currency) DO UPDATE SET
+       rate_sats = excluded.rate_sats,
+       updated_at = excluded.updated_at`,
+    [currency, rateSats, now]
+  )
+}
+
+/**
+ * Fetch current BTC price from public API
+ * Returns price in USD per BTC
+ */
+async function fetchBtcPrice(): Promise<number> {
+  // Try CoinGecko first (free, no API key)
+  try {
+    const response = await fetch(
+      'https://api.coingecko.com/api/v3/simple/price?ids=bitcoin&vs_currencies=usd,eur,gbp,cad,aud,jpy'
+    )
+    if (response.ok) {
+      const data = await response.json()
+      return data.bitcoin.usd
+    }
+  } catch (e) {
+    // Fall through to backup
+  }
+
+  // Backup: use a hardcoded fallback (should be updated periodically)
+  // This is a safety net - in production you'd want multiple API sources
+  console.warn('Failed to fetch exchange rate, using fallback')
+  return 100000  // Fallback BTC price in USD
+}
+
+/**
+ * Get exchange rate: sats per 1 unit of currency
+ */
+export async function getExchangeRate(
+  db: ExtensionDatabase,
+  currency: SupportedCurrency
+): Promise<number> {
+  // Bitcoin denominations are fixed
+  if (currency === 'sat') return 1
+  if (currency === 'btc') return 100_000_000
+
+  // Check cache
+  const cached = await getCachedRate(db, currency)
+  if (cached !== null) return cached
+
+  // Fetch fresh rate
+  const btcPriceUsd = await fetchBtcPrice()
+  const satsPerBtc = 100_000_000
+
+  // Calculate rates for all fiat currencies
+  // Using approximate cross-rates (in production, fetch all from API)
+  const usdRates: Record<string, number> = {
+    usd: 1,
+    eur: 0.92,
+    gbp: 0.79,
+    cad: 1.36,
+    aud: 1.53,
+    jpy: 149.5
+  }
+
+  // Calculate sats per 1 unit of each currency
+  for (const [curr, usdRate] of Object.entries(usdRates)) {
+    const priceInCurrency = btcPriceUsd * usdRate
+    const satsPerUnit = Math.round(satsPerBtc / priceInCurrency)
+    await saveRate(db, curr, satsPerUnit)
+  }
+
+  // Return requested currency rate
+  const rate = await getCachedRate(db, currency)
+  return rate || 1  // Fallback to 1:1 if something went wrong
+}
+
+/**
+ * Convert amount from a currency to sats
+ */
+export async function convertToSats(
+  db: ExtensionDatabase,
+  amount: number,
+  currency: SupportedCurrency
+): Promise<number> {
+  if (currency === 'sat') return Math.round(amount)
+
+  const rate = await getExchangeRate(db, currency)
+  return Math.round(amount * rate)
+}
+
+/**
+ * Convert amount from sats to a currency
+ */
+export async function convertFromSats(
+  db: ExtensionDatabase,
+  sats: number,
+  currency: SupportedCurrency
+): Promise<number> {
+  if (currency === 'sat') return sats
+
+  const rate = await getExchangeRate(db, currency)
+  return sats / rate
+}
+
+/**
+ * Format amount with currency symbol
+ */
+export function formatCurrency(amount: number, currency: SupportedCurrency): string {
+  const symbols: Record<SupportedCurrency, string> = {
+    sat: ' sats',
+    btc: ' BTC',
+    usd: '$',
+    eur: '€',
+    gbp: '£',
+    cad: 'CA$',
+    aud: 'AU$',
+    jpy: '¥'
+  }
+
+  const symbol = symbols[currency]
+  const isPrefix = ['usd', 'gbp', 'cad', 'aud', 'jpy'].includes(currency)
+
+  if (currency === 'btc') {
+    return `${amount.toFixed(8)}${symbol}`
+  }
+
+  if (currency === 'sat') {
+    return `${amount.toLocaleString()}${symbol}`
+  }
+
+  // Fiat currencies
+  const formatted = amount.toLocaleString(undefined, {
+    minimumFractionDigits: 2,
+    maximumFractionDigits: 2
+  })
+
+  return isPrefix ? `${symbol}${formatted}` : `${formatted}${symbol}`
+}
diff --git a/src/extensions/marketplace/utils/validation.ts b/src/extensions/marketplace/utils/validation.ts
new file mode 100644
index 00000000..549b59d4
--- /dev/null
+++ b/src/extensions/marketplace/utils/validation.ts
@@ -0,0 +1,109 @@
+import crypto from 'crypto'
+import { CreateStallRequest, CreateProductRequest } from '../types.js'
+
+/**
+ * Generate a random ID
+ */
+export function generateId(): string {
+  return crypto.randomBytes(16).toString('hex')
+}
+
+/**
+ * Validate stall creation request
+ */
+export function validateStall(req: CreateStallRequest): void {
+  if (!req.name || req.name.trim().length === 0) {
+    throw new Error('Stall name is required')
+  }
+
+  if (req.name.length > 100) {
+    throw new Error('Stall name must be 100 characters or less')
+  }
+
+  const validCurrencies = ['sat', 'btc', 'usd', 'eur', 'gbp', 'cad', 'aud', 'jpy']
+  if (!validCurrencies.includes(req.currency)) {
+    throw new Error(`Invalid currency. Must be one of: ${validCurrencies.join(', ')}`)
+  }
+
+  if (!req.shipping_zones || req.shipping_zones.length === 0) {
+    throw new Error('At least one shipping zone is required')
+  }
+
+  for (const zone of req.shipping_zones) {
+    if (!zone.name || zone.name.trim().length === 0) {
+      throw new Error('Shipping zone name is required')
+    }
+    if (zone.cost < 0) {
+      throw new Error('Shipping cost cannot be negative')
+    }
+    if (!zone.regions || zone.regions.length === 0) {
+      throw new Error('Shipping zone must have at least one region')
+    }
+  }
+}
+
+/**
+ * Validate product creation request
+ */
+export function validateProduct(req: CreateProductRequest): void {
+  if (!req.name || req.name.trim().length === 0) {
+    throw new Error('Product name is required')
+  }
+
+  if (req.name.length > 200) {
+    throw new Error('Product name must be 200 characters or less')
+  }
+
+  if (req.price < 0) {
+    throw new Error('Price cannot be negative')
+  }
+
+  if (req.quantity < -1) {
+    throw new Error('Quantity must be -1 (unlimited) or >= 0')
+  }
+
+  if (req.images && req.images.length > 10) {
+    throw new Error('Maximum 10 images allowed')
+  }
+
+  if (req.categories && req.categories.length > 10) {
+    throw new Error('Maximum 10 categories allowed')
+  }
+}
+
+/**
+ * Validate Nostr pubkey format (64 char hex)
+ */
+export function validatePubkey(pubkey: string): boolean {
+  return /^[0-9a-f]{64}$/i.test(pubkey)
+}
+
+/**
+ * Sanitize string input
+ */
+export function sanitizeString(input: string, maxLength: number = 1000): string {
+  if (!input) return ''
+  return input.trim().slice(0, maxLength)
+}
+
+/**
+ * Validate order items
+ */
+export function validateOrderItems(items: Array<{ product_id: string; quantity: number }>): void {
+  if (!items || items.length === 0) {
+    throw new Error('Order must have at least one item')
+  }
+
+  if (items.length > 100) {
+    throw new Error('Maximum 100 items per order')
+  }
+
+  for (const item of items) {
+    if (!item.product_id) {
+      throw new Error('Product ID is required for each item')
+    }
+    if (!Number.isInteger(item.quantity) || item.quantity < 1) {
+      throw new Error('Quantity must be a positive integer')
+    }
+  }
+}
diff --git a/src/extensions/types.ts b/src/extensions/types.ts
new file mode 100644
index 00000000..62abf5df
--- /dev/null
+++ b/src/extensions/types.ts
@@ -0,0 +1,254 @@
+/**
+ * Extension System Core Types
+ *
+ * These types define the contract between Lightning.Pub and extensions.
+ */
+
+/**
+ * Extension metadata
+ */
+export interface ExtensionInfo {
+  id: string                    // Unique identifier (lowercase, no spaces)
+  name: string                  // Display name
+  version: string               // Semver version
+  description: string           // Short description
+  author: string                // Author name or organization
+  minPubVersion?: string        // Minimum Lightning.Pub version required
+  dependencies?: string[]       // Other extension IDs this depends on
+}
+
+/**
+ * Extension database interface
+ * Provides isolated database access for each extension
+ */
+export interface ExtensionDatabase {
+  /**
+   * Execute a write query (INSERT, UPDATE, DELETE, CREATE, etc.)
+   */
+  execute(sql: string, params?: any[]): Promise<{ changes?: number; lastId?: number }>
+
+  /**
+   * Execute a read query (SELECT)
+   */
+  query<T = any>(sql: string, params?: any[]): Promise<T[]>
+
+  /**
+   * Execute multiple statements in a transaction
+   */
+  transaction<T>(fn: () => Promise<T>): Promise<T>
+}
+
+/**
+ * Application info provided to extensions
+ */
+export interface ApplicationInfo {
+  id: string
+  name: string
+  nostr_public: string          // Application's Nostr pubkey (hex)
+  balance_sats: number
+}
+
+/**
+ * Invoice creation options
+ */
+export interface CreateInvoiceOptions {
+  memo?: string
+  expiry?: number               // Seconds until expiry
+  metadata?: Record<string, any>  // Custom metadata for callbacks
+}
+
+/**
+ * Created invoice result
+ */
+export interface CreatedInvoice {
+  id: string                    // Internal invoice ID
+  paymentRequest: string        // BOLT11 invoice string
+  paymentHash: string           // Payment hash (hex)
+  expiry: number                // Expiry timestamp
+}
+
+/**
+ * Payment received callback data
+ */
+export interface PaymentReceivedData {
+  invoiceId: string
+  paymentHash: string
+  amountSats: number
+  metadata?: Record<string, any>
+}
+
+/**
+ * LNURL-pay info response (LUD-06/LUD-16)
+ * Used for Lightning Address and zap support
+ */
+export interface LnurlPayInfo {
+  tag: 'payRequest'
+  callback: string                // URL to call with amount
+  minSendable: number             // Minimum msats
+  maxSendable: number             // Maximum msats
+  metadata: string                // JSON-encoded metadata array
+  allowsNostr?: boolean           // Whether zaps are supported
+  nostrPubkey?: string            // Pubkey for zap receipts (hex)
+}
+
+/**
+ * Nostr event structure (minimal)
+ */
+export interface NostrEvent {
+  id: string
+  pubkey: string
+  created_at: number
+  kind: number
+  tags: string[][]
+  content: string
+  sig?: string
+}
+
+/**
+ * Unsigned Nostr event for publishing
+ */
+export interface UnsignedNostrEvent {
+  kind: number
+  pubkey: string
+  created_at: number
+  tags: string[][]
+  content: string
+}
+
+/**
+ * RPC method handler function
+ */
+export type RpcMethodHandler = (
+  request: any,
+  applicationId: string,
+  userPubkey?: string
+) => Promise<any>
+
+/**
+ * Extension context - interface provided to extensions for interacting with Lightning.Pub
+ */
+export interface ExtensionContext {
+  /**
+   * Get information about an application
+   */
+  getApplication(applicationId: string): Promise<ApplicationInfo | null>
+
+  /**
+   * Create a Lightning invoice
+   */
+  createInvoice(amountSats: number, options?: CreateInvoiceOptions): Promise<CreatedInvoice>
+
+  /**
+   * Pay a Lightning invoice (requires sufficient balance)
+   */
+  payInvoice(applicationId: string, paymentRequest: string, maxFeeSats?: number): Promise<{
+    paymentHash: string
+    feeSats: number
+  }>
+
+  /**
+   * Send an encrypted DM via Nostr (NIP-44)
+   */
+  sendEncryptedDM(applicationId: string, recipientPubkey: string, content: string): Promise<string>
+
+  /**
+   * Publish a Nostr event (signed by application's key)
+   */
+  publishNostrEvent(event: UnsignedNostrEvent): Promise<string | null>
+
+  /**
+   * Get LNURL-pay info for a user (by pubkey)
+   * Used to enable Lightning Address support (LUD-16) and zaps (NIP-57)
+   */
+  getLnurlPayInfo(pubkeyHex: string, options?: {
+    metadata?: string              // Custom metadata JSON
+    description?: string           // Human-readable description
+  }): Promise<LnurlPayInfo>
+
+  /**
+   * Subscribe to payment received callbacks
+   */
+  onPaymentReceived(callback: (payment: PaymentReceivedData) => Promise<void>): void
+
+  /**
+   * Subscribe to incoming Nostr events for the application
+   */
+  onNostrEvent(callback: (event: NostrEvent, applicationId: string) => Promise<void>): void
+
+  /**
+   * Register an RPC method
+   */
+  registerMethod(name: string, handler: RpcMethodHandler): void
+
+  /**
+   * Get the extension's isolated database
+   */
+  getDatabase(): ExtensionDatabase
+
+  /**
+   * Log a message (prefixed with extension ID)
+   */
+  log(level: 'debug' | 'info' | 'warn' | 'error', message: string, ...args: any[]): void
+}
+
+/**
+ * Extension interface - what extensions must implement
+ */
+export interface Extension {
+  /**
+   * Extension metadata
+   */
+  readonly info: ExtensionInfo
+
+  /**
+   * Initialize the extension
+   * Called once when the extension is loaded
+   */
+  initialize(ctx: ExtensionContext, db: ExtensionDatabase): Promise<void>
+
+  /**
+   * Shutdown the extension
+   * Called when Lightning.Pub is shutting down
+   */
+  shutdown?(): Promise<void>
+
+  /**
+   * Health check
+   * Return true if extension is healthy
+   */
+  healthCheck?(): Promise<boolean>
+}
+
+/**
+ * Extension constructor type
+ */
+export type ExtensionConstructor = new () => Extension
+
+/**
+ * Extension module default export
+ */
+export interface ExtensionModule {
+  default: ExtensionConstructor
+}
+
+/**
+ * Loaded extension state
+ */
+export interface LoadedExtension {
+  info: ExtensionInfo
+  instance: Extension
+  database: ExtensionDatabase
+  status: 'loading' | 'ready' | 'error' | 'stopped'
+  error?: Error
+  loadedAt: number
+}
+
+/**
+ * Extension loader configuration
+ */
+export interface ExtensionLoaderConfig {
+  extensionsDir: string         // Directory containing extensions
+  databaseDir: string           // Directory for extension databases
+  enabledExtensions?: string[]  // If set, only load these extensions
+  disabledExtensions?: string[] // Extensions to skip
+}
diff --git a/src/nostrMiddleware.ts b/src/nostrMiddleware.ts
index 034dbce8..4dd3b281 100644
--- a/src/nostrMiddleware.ts
+++ b/src/nostrMiddleware.ts
@@ -105,7 +105,7 @@ export default (serverMethods: Types.ServerMethods, mainHandler: Main, nostrSett
 
     return {
         Stop: () => { mainHandler.adminManager.setNostrConnected(false); return nostr.Stop },
-        Send: (...args) => nostr.Send(...args),
+        Send: async (...args) => nostr.Send(...args),
         Ping: () => nostr.Ping(),
         Reset: (settings: NostrSettings) => nostr.Reset(settings)
     }
diff --git a/src/services/helpers/logger.ts b/src/services/helpers/logger.ts
index 4d6601c9..62a87eac 100644
--- a/src/services/helpers/logger.ts
+++ b/src/services/helpers/logger.ts
@@ -1,17 +1,17 @@
 import fs from 'fs'
 export const DEBUG = Symbol("DEBUG")
 export const ERROR = Symbol("ERROR")
-export const WARN = Symbol("WARN")
+export const INFO = Symbol("INFO")
 type LoggerParams = { appName?: string, userId?: string, component?: string }
 export type PubLogger = (...message: (string | number | object | symbol)[]) => void
 type Writer = (message: string) => void
 const logsDir = process.env.LOGS_DIR || "logs"
-const logLevel = process.env.LOG_LEVEL || "DEBUG"
+const logLevel = process.env.LOG_LEVEL || "INFO"
 try {
     fs.mkdirSync(logsDir)
 } catch { }
-if (logLevel !== "DEBUG" && logLevel !== "WARN" && logLevel !== "ERROR") {
-    throw new Error("Invalid log level " + logLevel + " must be one of (DEBUG, WARN, ERROR)")
+if (logLevel !== "DEBUG" && logLevel !== "INFO" && logLevel !== "ERROR") {
+    throw new Error("Invalid log level " + logLevel + " must be one of (DEBUG, INFO, ERROR)")
 }
 const z = (n: number) => n < 10 ? `0${n}` : `${n}`
 // Sanitize filename to remove invalid characters for filesystem
@@ -67,19 +67,17 @@ export const getLogger = (params: LoggerParams): PubLogger => {
                 }
                 message[0] = "DEBUG"
                 break;
-            case WARN:
+            case INFO:
                 if (logLevel === "ERROR") {
                     return
                 }
-                message[0] = "WARN"
+                message[0] = "INFO"
                 break;
             case ERROR:
                 message[0] = "ERROR"
                 break;
             default:
-                if (logLevel !== "DEBUG") {
-                    return
-                }
+            // treats logs without a level as ERROR level, without prefix so it can be found and fixed if needed
         }
         const now = new Date()
         const timestamp = `${now.getFullYear()}-${z(now.getMonth() + 1)}-${z(now.getDate())} ${z(now.getHours())}:${z(now.getMinutes())}:${z(now.getSeconds())}`
diff --git a/src/services/lnd/lnd.ts b/src/services/lnd/lnd.ts
index daf7b411..eba48f6d 100644
--- a/src/services/lnd/lnd.ts
+++ b/src/services/lnd/lnd.ts
@@ -15,7 +15,7 @@ import { AddInvoiceReq } from './addInvoiceReq.js';
 import { PayInvoiceReq } from './payInvoiceReq.js';
 import { SendCoinsReq } from './sendCoinsReq.js';
 import { AddressPaidCb, InvoicePaidCb, NodeInfo, Invoice, DecodedInvoice, PaidInvoice, NewBlockCb, HtlcCb, BalanceInfo, ChannelEventCb } from './settings.js';
-import { ERROR, getLogger } from '../helpers/logger.js';
+import { ERROR, getLogger, DEBUG, INFO } from '../helpers/logger.js';
 import { HtlcEvent_EventType } from '../../../proto/lnd/router.js';
 import { LiquidityProvider } from '../main/liquidityProvider.js';
 import { Utils } from '../helpers/utilsWrapper.js';
@@ -23,7 +23,7 @@ import { TxPointSettings } from '../storage/tlv/stateBundler.js';
 import { WalletKitClient } from '../../../proto/lnd/walletkit.client.js';
 import SettingsManager from '../main/settingsManager.js';
 import { LndNodeSettings, LndSettings } from '../main/settings.js';
-import { ListAddressesResponse } from '../../../proto/lnd/walletkit.js';
+import { ListAddressesResponse, PublishResponse } from '../../../proto/lnd/walletkit.js';
 
 const DeadLineMetadata = (deadline = 10 * 1000) => ({ deadline: Date.now() + deadline })
 const deadLndRetrySeconds = 20
@@ -69,7 +69,7 @@ export default class {
 
         // Skip LND client initialization if using only liquidity provider
         if (liquidProvider.getSettings().useOnlyLiquidityProvider) {
-            this.log("USE_ONLY_LIQUIDITY_PROVIDER enabled, skipping LND client initialization")
+            this.log(INFO, "USE_ONLY_LIQUIDITY_PROVIDER enabled, skipping LND client initialization")
             // Create minimal dummy clients - they won't be used but prevent null reference errors
             // Use insecure credentials directly (can't combine them)
             const { lndAddr } = this.getSettings().lndNodeSettings
@@ -126,13 +126,13 @@ export default class {
     }
 
     async Warmup() {
+        this.log(INFO, "Warming up LND")
         // Skip LND warmup if using only liquidity provider
         if (this.liquidProvider.getSettings().useOnlyLiquidityProvider) {
-            this.log("USE_ONLY_LIQUIDITY_PROVIDER enabled, skipping LND warmup")
+            this.log(INFO, "USE_ONLY_LIQUIDITY_PROVIDER enabled, skipping LND warmup")
             this.ready = true
             return
         }
-        // console.log("Warming up LND")
         this.SubscribeAddressPaid()
         this.SubscribeInvoicePaid()
         await this.SubscribeNewBlock()
@@ -147,7 +147,7 @@ export default class {
                     this.ready = true
                     res()
                 } catch (err) {
-                    this.log("LND is not ready yet, will try again in 1 second")
+                    this.log(INFO, "LND is not ready yet, will try again in 1 second")
                     if (Date.now() - now > 1000 * 60) {
                         rej(new Error("LND not ready after 1 minute"))
                     }
@@ -156,6 +156,13 @@ export default class {
         })
     }
 
+    async PublishTransaction(txHex: string): Promise<PublishResponse> {
+        const res = await this.walletKit.publishTransaction({
+            txHex: Buffer.from(txHex, 'hex'), label: ""
+        }, DeadLineMetadata())
+        return res.response
+    }
+
     async GetInfo(): Promise<NodeInfo> {
         if (this.liquidProvider.getSettings().useOnlyLiquidityProvider) {
             // Return dummy info when bypass is enabled
@@ -169,27 +176,26 @@ export default class {
                 uris: []
             }
         }
-        // console.log("Getting info")
         const res = await this.lightning.getInfo({}, DeadLineMetadata())
         return res.response
     }
     async ListPendingChannels(): Promise<PendingChannelsResponse> {
+        this.log(DEBUG, "Listing pending channels")
         if (this.liquidProvider.getSettings().useOnlyLiquidityProvider) {
             return { pendingOpenChannels: [], pendingClosingChannels: [], pendingForceClosingChannels: [], waitingCloseChannels: [], totalLimboBalance: 0n }
         }
-        // console.log("Listing pending channels")
         const res = await this.lightning.pendingChannels({ includeRawTx: false }, DeadLineMetadata())
         return res.response
     }
     async ListChannels(peerLookup = false): Promise<ListChannelsResponse> {
-        // console.log("Listing channels")
+        this.log(DEBUG, "Listing channels")
         const res = await this.lightning.listChannels({
             activeOnly: false, inactiveOnly: false, privateOnly: false, publicOnly: false, peer: Buffer.alloc(0), peerAliasLookup: peerLookup
         }, DeadLineMetadata())
         return res.response
     }
     async ListClosedChannels(): Promise<ClosedChannelsResponse> {
-        // console.log("Listing closed channels")
+        this.log(DEBUG, "Listing closed channels")
         const res = await this.lightning.closedChannels({
             abandoned: true,
             breach: true,
@@ -206,7 +212,6 @@ export default class {
         if (this.liquidProvider.getSettings().useOnlyLiquidityProvider) {
             return
         }
-        // console.log("Checking health")
         if (!this.ready) {
             throw new Error("not ready")
         }
@@ -217,69 +222,69 @@ export default class {
     }
 
     RestartStreams() {
-        // console.log("Restarting streams")
+        this.log(INFO, "Restarting streams")
         if (!this.ready || this.abortController.signal.aborted) {
             return
         }
-        this.log("LND is dead, will try to reconnect in", deadLndRetrySeconds, "seconds")
+        this.log(INFO, "LND is dead, will try to reconnect in", deadLndRetrySeconds, "seconds")
         const interval = setInterval(async () => {
             try {
                 await this.unlockLnd()
-                this.log("LND is back online")
+                this.log(INFO, "LND is back online")
                 clearInterval(interval)
                 await this.Warmup()
             } catch (err) {
-                this.log("LND still dead, will try again in", deadLndRetrySeconds, "seconds")
+                this.log(INFO, "LND still dead, will try again in", deadLndRetrySeconds, "seconds")
             }
         }, deadLndRetrySeconds * 1000)
     }
 
     async SubscribeChannelEvents() {
-        // console.log("Subscribing to channel events")
+        this.log(DEBUG, "Subscribing to channel events")
         const stream = this.lightning.subscribeChannelEvents({}, { abort: this.abortController.signal })
         stream.responses.onMessage(async channel => {
             const channels = await this.ListChannels()
             this.channelEventCb(channel, channels.channels)
         })
         stream.responses.onError(error => {
-            this.log("Error with subscribeChannelEvents stream")
+            this.log(ERROR, "Error with subscribeChannelEvents stream")
         })
         stream.responses.onComplete(() => {
-            this.log("subscribeChannelEvents stream closed")
+            this.log(INFO, "subscribeChannelEvents stream closed")
         })
     }
 
     async SubscribeHtlcEvents() {
-        // console.log("Subscribing to htlc events")
+        this.log(DEBUG, "Subscribing to htlc events")
         const stream = this.router.subscribeHtlcEvents({}, { abort: this.abortController.signal })
         stream.responses.onMessage(htlc => {
             this.htlcCb(htlc)
         })
         stream.responses.onError(error => {
-            this.log("Error with subscribeHtlcEvents stream")
+            this.log(ERROR, "Error with subscribeHtlcEvents stream")
         })
         stream.responses.onComplete(() => {
-            this.log("subscribeHtlcEvents stream closed")
+            this.log(INFO, "subscribeHtlcEvents stream closed")
         })
     }
 
     async SubscribeNewBlock() {
-        // console.log("Subscribing to new block")
+        this.log(DEBUG, "Subscribing to new block")
         const { blockHeight } = await this.GetInfo()
         const stream = this.chainNotifier.registerBlockEpochNtfn({ height: blockHeight, hash: Buffer.alloc(0) }, { abort: this.abortController.signal })
         stream.responses.onMessage(block => {
             this.newBlockCb(block.height)
         })
         stream.responses.onError(error => {
-            this.log("Error with new block stream")
+            this.log(ERROR, "Error with new block stream")
         })
         stream.responses.onComplete(() => {
-            this.log("new block stream closed")
+            this.log(INFO, "new block stream closed")
         })
     }
 
     SubscribeAddressPaid(): void {
-        // console.log("Subscribing to address paid")
+        this.log(DEBUG, "Subscribing to address paid")
         const stream = this.lightning.subscribeTransactions({
             account: "",
             endHeight: 0,
@@ -298,15 +303,15 @@ export default class {
             }
         })
         stream.responses.onError(error => {
-            this.log("Error with onchain tx stream")
+            this.log(ERROR, "Error with onchain tx stream")
         })
         stream.responses.onComplete(() => {
-            this.log("onchain tx stream closed")
+            this.log(INFO, "onchain tx stream closed")
         })
     }
 
     SubscribeInvoicePaid(): void {
-        // console.log("Subscribing to invoice paid")
+        this.log(DEBUG, "Subscribing to invoice paid")
         const stream = this.lightning.subscribeInvoices({
             settleIndex: BigInt(this.latestKnownSettleIndex),
             addIndex: 0n,
@@ -319,14 +324,14 @@ export default class {
         })
         let restarted = false
         stream.responses.onError(error => {
-            this.log("Error with invoice stream")
+            this.log(ERROR, "Error with invoice stream")
             if (!restarted) {
                 restarted = true
                 this.RestartStreams()
             }
         })
         stream.responses.onComplete(() => {
-            this.log("invoice stream closed")
+            this.log(INFO, "invoice stream closed")
             if (!restarted) {
                 restarted = true
                 this.RestartStreams()
@@ -348,6 +353,7 @@ export default class {
     }
 
     async ListAddresses(): Promise<LndAddress[]> {
+        this.log(DEBUG, "Listing addresses")
         const res = await this.walletKit.listAddresses({ accountName: "", showCustomAccounts: false }, DeadLineMetadata())
         const addresses = res.response.accountWithAddresses.map(a => a.addresses.map(a => ({ address: a.address, change: a.isInternal }))).flat()
         addresses.forEach(a => this.addressesCache[a.address] = { isChange: a.change })
@@ -355,11 +361,11 @@ export default class {
     }
 
     async NewAddress(addressType: Types.AddressType, { useProvider, from }: TxActionOptions): Promise<NewAddressResponse> {
+        this.log(DEBUG, "Creating new address")
         // Force use of provider when bypass is enabled (addresses not supported by provider, but we should fail gracefully)
         if (this.liquidProvider.getSettings().useOnlyLiquidityProvider) {
             throw new Error("Address generation not supported when USE_ONLY_LIQUIDITY_PROVIDER is enabled")
         }
-        //  console.log("Creating new address")
         let lndAddressType: AddressType
         switch (addressType) {
             case Types.AddressType.NESTED_PUBKEY_HASH:
@@ -389,11 +395,11 @@ export default class {
     }
 
     async NewInvoice(value: number, memo: string, expiry: number, { useProvider, from }: TxActionOptions, blind = false): Promise<Invoice> {
-        // console.log("Creating new invoice")
+        this.log(DEBUG, "Creating new invoice")
         // Force use of provider when bypass is enabled
         const mustUseProvider = this.liquidProvider.getSettings().useOnlyLiquidityProvider || useProvider
         if (mustUseProvider) {
-            console.log("using provider")
+            this.log(INFO, "using provider")
             const invoice = await this.liquidProvider.AddInvoice(value, memo, from, expiry)
             const providerPubkey = this.liquidProvider.GetProviderPubkey()
             return { payRequest: invoice, providerPubkey }
@@ -409,6 +415,7 @@ export default class {
     }
 
     async DecodeInvoice(paymentRequest: string): Promise<DecodedInvoice> {
+        this.log(DEBUG, "Decoding invoice")
         if (this.liquidProvider.getSettings().useOnlyLiquidityProvider) {
             // Use light-bolt11-decoder when LND is bypassed
             try {
@@ -434,24 +441,23 @@ export default class {
                 throw new Error(`Failed to decode invoice: ${err.message}`)
             }
         }
-        // console.log("Decoding invoice")
         const res = await this.lightning.decodePayReq({ payReq: paymentRequest }, DeadLineMetadata())
         return { numSatoshis: Number(res.response.numSatoshis), paymentHash: res.response.paymentHash }
     }
 
     async ChannelBalance(): Promise<{ local: number, remote: number }> {
+        this.log(DEBUG, "Getting channel balance")
         if (this.liquidProvider.getSettings().useOnlyLiquidityProvider) {
             return { local: 0, remote: 0 }
         }
-        // console.log("Getting channel balance")
         const res = await this.lightning.channelBalance({})
         const r = res.response
         return { local: r.localBalance ? Number(r.localBalance.sat) : 0, remote: r.remoteBalance ? Number(r.remoteBalance.sat) : 0 }
     }
     async PayInvoice(invoice: string, amount: number, { routingFeeLimit, serviceFee }: { routingFeeLimit: number, serviceFee: number }, decodedAmount: number, { useProvider, from }: TxActionOptions, paymentIndexCb?: (index: number) => void): Promise<PaidInvoice> {
-        // console.log("Paying invoice")
+        this.log(DEBUG, "Paying invoice")
         if (this.outgoingOpsLocked) {
-            this.log("outgoing ops locked, rejecting payment request")
+            this.log(ERROR, "outgoing ops locked, rejecting payment request")
             throw new Error("lnd node is currently out of sync")
         }
         // Force use of provider when bypass is enabled
@@ -468,7 +474,7 @@ export default class {
             const stream = this.router.sendPaymentV2(req, { abort: abortController.signal })
             return new Promise((res, rej) => {
                 stream.responses.onError(error => {
-                    this.log("invoice payment failed", error)
+                    this.log(ERROR, "invoice payment failed", error)
                     rej(error)
                 })
                 let indexSent = false
@@ -480,7 +486,7 @@ export default class {
                     }
                     switch (payment.status) {
                         case Payment_PaymentStatus.FAILED:
-                            this.log("invoice payment failed", payment.failureReason)
+                            this.log(ERROR, "invoice payment failed", payment.failureReason)
                             rej(PaymentFailureReason[payment.failureReason])
                             return
                         case Payment_PaymentStatus.SUCCEEDED:
@@ -498,7 +504,7 @@ export default class {
     }
 
     async EstimateChainFees(address: string, amount: number, targetConf: number): Promise<EstimateFeeResponse> {
-        // console.log("Estimating chain fees")
+        this.log(DEBUG, "Estimating chain fees")
         await this.Health()
         const res = await this.lightning.estimateFee({
             addrToAmount: { [address]: BigInt(amount) },
@@ -511,13 +517,13 @@ export default class {
     }
 
     async PayAddress(address: string, amount: number, satPerVByte: number, label = "", { useProvider, from }: TxActionOptions): Promise<SendCoinsResponse> {
+        this.log(DEBUG, "Paying address")
         // Address payments not supported when bypass is enabled
         if (this.liquidProvider.getSettings().useOnlyLiquidityProvider) {
             throw new Error("Address payments not supported when USE_ONLY_LIQUIDITY_PROVIDER is enabled")
         }
-        // console.log("Paying address")
         if (this.outgoingOpsLocked) {
-            this.log("outgoing ops locked, rejecting payment request")
+            this.log(ERROR, "outgoing ops locked, rejecting payment request")
             throw new Error("lnd node is currently out of sync")
         }
         if (useProvider) {
@@ -535,19 +541,19 @@ export default class {
     }
 
     async GetTransactions(startHeight: number): Promise<TransactionDetails> {
-        // console.log("Getting transactions")
-        const res = await this.lightning.getTransactions({ startHeight, endHeight: 0, account: "" }, DeadLineMetadata())
+        this.log(DEBUG, "Getting transactions")
+        const res = await this.lightning.getTransactions({ startHeight, endHeight: 0, account: "", }, DeadLineMetadata())
         return res.response
     }
 
     async GetChannelInfo(chanId: string) {
-        // console.log("Getting channel info")
+        this.log(DEBUG, "Getting channel info")
         const res = await this.lightning.getChanInfo({ chanId, chanPoint: "" }, DeadLineMetadata())
         return res.response
     }
 
     async UpdateChannelPolicy(chanPoint: string, policy: Types.ChannelPolicy) {
-        // console.log("Updating channel policy")
+        this.log(DEBUG, "Updating channel policy")
         const split = chanPoint.split(':')
 
         const res = await this.lightning.updateChannelPolicy({
@@ -565,19 +571,19 @@ export default class {
     }
 
     async GetChannelBalance() {
-        // console.log("Getting channel balance")
+        this.log(DEBUG, "Getting channel balance")
         const res = await this.lightning.channelBalance({}, DeadLineMetadata())
         return res.response
     }
 
     async GetWalletBalance() {
-        // console.log("Getting wallet balance")
+        this.log(DEBUG, "Getting wallet balance")
         const res = await this.lightning.walletBalance({ account: "", minConfs: 1 }, DeadLineMetadata())
         return res.response
     }
 
     async GetTotalBalace() {
-        // console.log("Getting total balance")
+        this.log(DEBUG, "Getting total balance")
         const walletBalance = await this.GetWalletBalance()
         const confirmedWalletBalance = Number(walletBalance.confirmedBalance)
         this.utils.stateBundler.AddBalancePoint('walletBalance', confirmedWalletBalance)
@@ -592,10 +598,10 @@ export default class {
     }
 
     async GetBalance(): Promise<BalanceInfo> { // TODO: remove this
+        this.log(DEBUG, "Getting balance")
         if (this.liquidProvider.getSettings().useOnlyLiquidityProvider) {
             return { confirmedBalance: 0, unconfirmedBalance: 0, totalBalance: 0, channelsBalance: [] }
         }
-        //      console.log("Getting balance")
         const wRes = await this.lightning.walletBalance({ account: "", minConfs: 1 }, DeadLineMetadata())
         const { confirmedBalance, unconfirmedBalance, totalBalance } = wRes.response
         const { response } = await this.lightning.listChannels({
@@ -611,33 +617,47 @@ export default class {
     }
 
     async GetForwardingHistory(indexOffset: number, startTime = 0, endTime = 0): Promise<ForwardingHistoryResponse> {
+        this.log(DEBUG, "Getting forwarding history")
         if (this.liquidProvider.getSettings().useOnlyLiquidityProvider) {
             return { forwardingEvents: [], lastOffsetIndex: indexOffset }
         }
-        // console.log("Getting forwarding history")
         const { response } = await this.lightning.forwardingHistory({ indexOffset, numMaxEvents: 0, startTime: BigInt(startTime), endTime: BigInt(endTime), peerAliasLookup: false }, DeadLineMetadata())
         return response
     }
 
-    async GetAllPaidInvoices(max: number) {
+    async GetAllInvoices(max: number) {
+        this.log(DEBUG, "Getting all paid invoices")
         if (this.liquidProvider.getSettings().useOnlyLiquidityProvider) {
             return { invoices: [] }
         }
-        // console.log("Getting all paid invoices")
         const res = await this.lightning.listInvoices({ indexOffset: 0n, numMaxInvoices: BigInt(max), pendingOnly: false, reversed: true, creationDateEnd: 0n, creationDateStart: 0n }, DeadLineMetadata())
         return res.response
     }
     async GetAllPayments(max: number) {
+        this.log(DEBUG, "Getting all payments")
         if (this.liquidProvider.getSettings().useOnlyLiquidityProvider) {
             return { payments: [] }
         }
-        // console.log("Getting all payments")
         const res = await this.lightning.listPayments({ countTotalPayments: false, includeIncomplete: false, indexOffset: 0n, maxPayments: BigInt(max), reversed: true, creationDateEnd: 0n, creationDateStart: 0n })
         return res.response
     }
 
+    async BumpFee(txId: string, outputIndex: number, satPerVbyte: number) {
+        this.log(DEBUG, "Bumping fee")
+        const res = await this.walletKit.bumpFee({
+            budget: 0n, immediate: false, targetConf: 0, satPerVbyte: BigInt(satPerVbyte), outpoint: {
+                txidStr: txId,
+                outputIndex: outputIndex,
+                txidBytes: Buffer.alloc(0)
+            },
+            force: false,
+            satPerByte: 0
+        }, DeadLineMetadata())
+        return res.response
+    }
+
     async GetPayment(paymentIndex: number) {
-        // console.log("Getting payment")
+        this.log(DEBUG, "Getting payment")
         if (paymentIndex === 0) {
             throw new Error("payment index starts from 1")
         }
@@ -649,10 +669,10 @@ export default class {
     }
 
     async GetLatestPaymentIndex(from = 0) {
+        this.log(DEBUG, "Getting latest payment index")
         if (this.liquidProvider.getSettings().useOnlyLiquidityProvider) {
             return from
         }
-        // console.log("Getting latest payment index")
         let indexOffset = BigInt(from)
         while (true) {
             const res = await this.lightning.listPayments({ countTotalPayments: false, includeIncomplete: false, indexOffset, maxPayments: 0n, reversed: false, creationDateEnd: 0n, creationDateStart: 0n }, DeadLineMetadata())
@@ -664,7 +684,7 @@ export default class {
     }
 
     async ConnectPeer(addr: { pubkey: string, host: string }) {
-        // console.log("Connecting to peer")
+        this.log(DEBUG, "Connecting to peer")
         const res = await this.lightning.connectPeer({
             addr,
             perm: true,
@@ -674,7 +694,7 @@ export default class {
     }
 
     async GetPaymentFromHash(paymentHash: string): Promise<Payment | null> {
-        // console.log("Getting payment from hash")
+        this.log(DEBUG, "Getting payment from hash")
         const abortController = new AbortController()
         const stream = this.router.trackPaymentV2({
             paymentHash: Buffer.from(paymentHash, 'hex'),
@@ -696,13 +716,12 @@ export default class {
     }
 
     async GetTx(txid: string) {
-        // console.log("Getting transaction")
         const res = await this.walletKit.getTransaction({ txid }, DeadLineMetadata())
         return res.response
     }
 
     async AddPeer(pub: string, host: string, port: number) {
-        // console.log("Adding peer")
+        this.log(DEBUG, "Adding peer")
         const res = await this.lightning.connectPeer({
             addr: {
                 pubkey: pub,
@@ -715,19 +734,19 @@ export default class {
     }
 
     async ListPeers() {
-        // console.log("Listing peers")
+        this.log(DEBUG, "Listing peers")
         const res = await this.lightning.listPeers({ latestError: true }, DeadLineMetadata())
         return res.response
     }
 
     async OpenChannel(destination: string, closeAddress: string, fundingAmount: number, pushSats: number, satsPerVByte: number): Promise<OpenStatusUpdate> {
-        // console.log("Opening channel")
+        this.log(DEBUG, "Opening channel")
         const abortController = new AbortController()
         const req = OpenChannelReq(destination, closeAddress, fundingAmount, pushSats, satsPerVByte)
         const stream = this.lightning.openChannel(req, { abort: abortController.signal })
         return new Promise((res, rej) => {
             stream.responses.onMessage(message => {
-                console.log("message", message)
+                this.log(DEBUG, "open channel message", message)
                 switch (message.update.oneofKind) {
                     case 'chanPending':
                         res(message)
@@ -735,14 +754,14 @@ export default class {
                 }
             })
             stream.responses.onError(error => {
-                console.log("error", error)
+                this.log(ERROR, "open channel error", error)
                 rej(error)
             })
         })
     }
 
     async CloseChannel(fundingTx: string, outputIndex: number, force: boolean, satPerVByte: number): Promise<PendingUpdate> {
-        // console.log("Closing channel")
+        this.log(DEBUG, "Closing channel")
         const stream = this.lightning.closeChannel({
             deliveryAddress: "",
             force: force,
@@ -761,7 +780,7 @@ export default class {
         }, DeadLineMetadata())
         return new Promise((res, rej) => {
             stream.responses.onMessage(message => {
-                console.log("message", message)
+                this.log(DEBUG, "close channel message", message)
                 switch (message.update.oneofKind) {
                     case 'closePending':
                         res(message.update.closePending)
@@ -769,7 +788,7 @@ export default class {
                 }
             })
             stream.responses.onError(error => {
-                console.log("error", error)
+                this.log(ERROR, "close channel error", error)
                 rej(error)
             })
         })
diff --git a/src/services/lnd/swaps.ts b/src/services/lnd/swaps.ts
deleted file mode 100644
index 727f0e88..00000000
--- a/src/services/lnd/swaps.ts
+++ /dev/null
@@ -1,657 +0,0 @@
-import zkpInit from '@vulpemventures/secp256k1-zkp';
-import axios from 'axios';
-import { crypto, initEccLib, Transaction, address, Network } from 'bitcoinjs-lib';
-// import bolt11 from 'bolt11';
-import {
-    Musig, SwapTreeSerializer, TaprootUtils, detectSwap,
-    constructClaimTransaction, targetFee, OutputType,
-    Networks,
-} from 'boltz-core';
-import { randomBytes, createHash } from 'crypto';
-import { ECPairFactory, ECPairInterface } from 'ecpair';
-import * as ecc from 'tiny-secp256k1';
-import ws from 'ws';
-import { getLogger, PubLogger, ERROR } from '../helpers/logger.js';
-import SettingsManager from '../main/settingsManager.js';
-import * as Types from '../../../proto/autogenerated/ts/types.js';
-import { BTCNetwork } from '../main/settings.js';
-import Storage from '../storage/index.js';
-import LND from './lnd.js';
-import { UserInvoicePayment } from '../storage/entity/UserInvoicePayment.js';
-type InvoiceSwapResponse = { id: string, claimPublicKey: string, swapTree: string }
-type InvoiceSwapInfo = { paymentHash: string, keys: ECPairInterface }
-type InvoiceSwapData = { createdResponse: InvoiceSwapResponse, info: InvoiceSwapInfo }
-
-type TransactionSwapFees = {
-    percentage: number,
-    minerFees: {
-        claim: number,
-        lockup: number,
-    }
-}
-
-type TransactionSwapFeesRes = {
-    BTC?: {
-        BTC?: {
-            fees: TransactionSwapFees
-        }
-    }
-}
-
-
-type TransactionSwapResponse = {
-    id: string, refundPublicKey: string, swapTree: string,
-    timeoutBlockHeight: number, lockupAddress: string, invoice: string,
-    onchainAmount?: number
-}
-type TransactionSwapInfo = { destinationAddress: string, preimage: Buffer, keys: ECPairInterface, chainFee: number }
-export type TransactionSwapData = { createdResponse: TransactionSwapResponse, info: TransactionSwapInfo }
-export class Swaps {
-    settings: SettingsManager
-    revSwappers: Record<string, ReverseSwaps>
-    // submarineSwaps: SubmarineSwaps
-    storage: Storage
-    lnd: LND
-    log = getLogger({ component: 'swaps' })
-    constructor(settings: SettingsManager, storage: Storage) {
-        this.settings = settings
-        this.revSwappers = {}
-        const network = settings.getSettings().lndSettings.network
-        const { boltzHttpUrl, boltzWebSocketUrl, boltsHttpUrlAlt, boltsWebSocketUrlAlt } = settings.getSettings().swapsSettings
-        if (boltzHttpUrl && boltzWebSocketUrl) {
-            this.revSwappers[boltzHttpUrl] = new ReverseSwaps({ httpUrl: boltzHttpUrl, wsUrl: boltzWebSocketUrl, network })
-        }
-        if (boltsHttpUrlAlt && boltsWebSocketUrlAlt) {
-            this.revSwappers[boltsHttpUrlAlt] = new ReverseSwaps({ httpUrl: boltsHttpUrlAlt, wsUrl: boltsWebSocketUrlAlt, network })
-        }
-        this.storage = storage
-    }
-
-    SetLnd = (lnd: LND) => {
-        this.lnd = lnd
-    }
-
-    Stop = () => { }
-
-    GetKeys = (privateKey: string) => {
-        const keys = ECPairFactory(ecc).fromPrivateKey(Buffer.from(privateKey, 'hex'))
-        return keys
-    }
-
-    ListSwaps = async (appUserId: string, payments: UserInvoicePayment[], newOp: (p: UserInvoicePayment) => Types.UserOperation | undefined, getServiceFee: (amt: number) => number): Promise<Types.SwapsList> => {
-        const completedSwaps = await this.storage.paymentStorage.ListCompletedSwaps(appUserId, payments)
-        const pendingSwaps = await this.storage.paymentStorage.ListPendingTransactionSwaps(appUserId)
-        return {
-            swaps: completedSwaps.map(s => {
-                const p = s.payment
-                const op = p ? newOp(p) : undefined
-                return {
-                    operation_payment: op,
-                    swap_operation_id: s.swap.swap_operation_id,
-                    address_paid: s.swap.address_paid,
-                    failure_reason: s.swap.failure_reason,
-                }
-            }),
-            quotes: pendingSwaps.map(s => {
-                const serviceFee = getServiceFee(s.invoice_amount)
-                return {
-                    swap_operation_id: s.swap_operation_id,
-                    invoice_amount_sats: s.invoice_amount,
-                    transaction_amount_sats: s.transaction_amount,
-                    chain_fee_sats: s.chain_fee_sats,
-                    service_fee_sats: serviceFee,
-                    swap_fee_sats: s.swap_fee_sats,
-                    service_url: s.service_url,
-                }
-            })
-        }
-    }
-    GetTxSwapQuotes = async (appUserId: string, amt: number, getServiceFee: (decodedAmt: number) => number): Promise<Types.TransactionSwapQuote[]> => {
-        if (!this.settings.getSettings().swapsSettings.enableSwaps) {
-            throw new Error("Swaps are not enabled")
-        }
-        const swappers = Object.values(this.revSwappers)
-        if (swappers.length === 0) {
-            throw new Error("No swap services available")
-        }
-        const res = await Promise.allSettled(swappers.map(sw => this.getTxSwapQuote(sw, appUserId, amt, getServiceFee)))
-        const failures: string[] = []
-        const success: Types.TransactionSwapQuote[] = []
-        for (const r of res) {
-            if (r.status === 'fulfilled') {
-                success.push(r.value)
-            } else {
-                failures.push(r.reason.message ? r.reason.message : r.reason.toString())
-            }
-        }
-        if (success.length === 0) {
-            throw new Error(failures.join("\n"))
-        }
-        return success
-    }
-
-    private async getTxSwapQuote(swapper: ReverseSwaps, appUserId: string, amt: number, getServiceFee: (decodedAmt: number) => number): Promise<Types.TransactionSwapQuote> {
-        this.log("getting transaction swap quote")
-        const feesRes = await swapper.GetFees()
-        if (!feesRes.ok) {
-            throw new Error(feesRes.error)
-        }
-        const { claim, lockup } = feesRes.fees.minerFees
-        const minerFee = claim + lockup
-        const chainTotal = amt + minerFee
-        const res = await swapper.SwapTransaction(chainTotal)
-        if (!res.ok) {
-            throw new Error(res.error)
-        }
-        const decoded = await this.lnd.DecodeInvoice(res.createdResponse.invoice)
-        const swapFee = decoded.numSatoshis - chainTotal
-        const serviceFee = getServiceFee(decoded.numSatoshis)
-        const newSwap = await this.storage.paymentStorage.AddTransactionSwap({
-            app_user_id: appUserId,
-            swap_quote_id: res.createdResponse.id,
-            swap_tree: JSON.stringify(res.createdResponse.swapTree),
-            lockup_address: res.createdResponse.lockupAddress,
-            refund_public_key: res.createdResponse.refundPublicKey,
-            timeout_block_height: res.createdResponse.timeoutBlockHeight,
-            invoice: res.createdResponse.invoice,
-            invoice_amount: decoded.numSatoshis,
-            transaction_amount: chainTotal,
-            swap_fee_sats: swapFee,
-            chain_fee_sats: minerFee,
-            preimage: res.preimage,
-            ephemeral_private_key: res.privKey,
-            ephemeral_public_key: res.pubkey,
-            service_url: swapper.getHttpUrl(),
-        })
-        return {
-            swap_operation_id: newSwap.swap_operation_id,
-            swap_fee_sats: swapFee,
-            invoice_amount_sats: decoded.numSatoshis,
-            transaction_amount_sats: amt,
-            chain_fee_sats: minerFee,
-            service_fee_sats: serviceFee,
-            service_url: swapper.getHttpUrl(),
-        }
-    }
-
-    async PayAddrWithSwap(appUserId: string, swapOpId: string, address: string, payInvoice: (invoice: string, amt: number) => Promise<void>) {
-        if (!this.settings.getSettings().swapsSettings.enableSwaps) {
-            throw new Error("Swaps are not enabled")
-        }
-        this.log("paying address with swap", { appUserId, swapOpId, address })
-        if (!swapOpId) {
-            throw new Error("request a swap quote before paying an external address")
-        }
-        const txSwap = await this.storage.paymentStorage.GetTransactionSwap(swapOpId, appUserId)
-        if (!txSwap) {
-            throw new Error("swap quote not found")
-        }
-        const info = await this.lnd.GetInfo()
-        if (info.blockHeight >= txSwap.timeout_block_height) {
-            throw new Error("swap timeout")
-        }
-        const swapper = this.revSwappers[txSwap.service_url]
-        if (!swapper) {
-            throw new Error("swapper service not found")
-        }
-        const keys = this.GetKeys(txSwap.ephemeral_private_key)
-        const data: TransactionSwapData = {
-            createdResponse: {
-                id: txSwap.swap_quote_id,
-                invoice: txSwap.invoice,
-                lockupAddress: txSwap.lockup_address,
-                refundPublicKey: txSwap.refund_public_key,
-                swapTree: txSwap.swap_tree,
-                timeoutBlockHeight: txSwap.timeout_block_height,
-                onchainAmount: txSwap.transaction_amount,
-            },
-            info: {
-                destinationAddress: address,
-                keys,
-                chainFee: txSwap.chain_fee_sats,
-                preimage: Buffer.from(txSwap.preimage, 'hex'),
-            }
-        }
-        // the swap and the invoice payment are linked, swap will not start until the invoice payment is started, and will not complete once the invoice payment is completed
-        let swapResult = { ok: false, error: "swap never completed" } as { ok: true, txId: string } | { ok: false, error: string }
-        swapper.SubscribeToTransactionSwap(data, result => {
-            swapResult = result
-        })
-        try {
-            await payInvoice(txSwap.invoice, txSwap.invoice_amount)
-            if (!swapResult.ok) {
-                this.log("invoice payment successful, but swap failed")
-                await this.storage.paymentStorage.FailTransactionSwap(swapOpId, address, swapResult.error)
-                throw new Error(swapResult.error)
-            }
-            this.log("swap completed successfully")
-            await this.storage.paymentStorage.FinalizeTransactionSwap(swapOpId, address, swapResult.txId)
-        } catch (err: any) {
-            if (swapResult.ok) {
-                this.log("failed to pay swap invoice, but swap completed successfully", swapResult.txId)
-                await this.storage.paymentStorage.FailTransactionSwap(swapOpId, address, err.message)
-            } else {
-                this.log("failed to pay swap invoice and swap failed", swapResult.error)
-                await this.storage.paymentStorage.FailTransactionSwap(swapOpId, address, swapResult.error)
-            }
-            throw err
-        }
-        const networkFeesTotal = txSwap.chain_fee_sats + txSwap.swap_fee_sats
-        return {
-            txId: swapResult.txId,
-            network_fee: networkFeesTotal
-        }
-    }
-}
-
-
-
-export class ReverseSwaps {
-    // settings: SettingsManager
-    private httpUrl: string
-    private wsUrl: string
-    log: PubLogger
-    private network: BTCNetwork
-    constructor({ httpUrl, wsUrl, network }: { httpUrl: string, wsUrl: string, network: BTCNetwork }) {
-        this.httpUrl = httpUrl
-        this.wsUrl = wsUrl
-        this.network = network
-        this.log = getLogger({ component: 'ReverseSwaps' })
-        initEccLib(ecc)
-    }
-
-    getHttpUrl = () => {
-        return this.httpUrl
-    }
-    getWsUrl = () => {
-        return this.wsUrl
-    }
-
-    calculateFees = (fees: TransactionSwapFees, receiveAmount: number) => {
-        const pct = fees.percentage / 100
-        const minerFee = fees.minerFees.claim + fees.minerFees.lockup
-
-        const preFee = receiveAmount + minerFee
-        const fee = Math.ceil(preFee * pct)
-        const total = preFee + fee
-        return { total, fee, minerFee }
-    }
-
-    GetFees = async (): Promise<{ ok: true, fees: TransactionSwapFees, } | { ok: false, error: string }> => {
-        const url = `${this.httpUrl}/v2/swap/reverse`
-        const feesRes = await loggedGet<TransactionSwapFeesRes>(this.log, url)
-        if (!feesRes.ok) {
-            return { ok: false, error: feesRes.error }
-        }
-        if (!feesRes.data.BTC?.BTC?.fees) {
-            return { ok: false, error: 'No fees found for BTC to BTC swap' }
-        }
-
-        return { ok: true, fees: feesRes.data.BTC.BTC.fees }
-    }
-
-    SwapTransaction = async (txAmount: number): Promise<{ ok: true, createdResponse: TransactionSwapResponse, preimage: string, pubkey: string, privKey: string } | { ok: false, error: string }> => {
-        const preimage = randomBytes(32);
-        const keys = ECPairFactory(ecc).makeRandom()
-        if (!keys.privateKey) {
-            return { ok: false, error: 'Failed to generate keys' }
-        }
-        const url = `${this.httpUrl}/v2/swap/reverse`
-        const req: any = {
-            onchainAmount: txAmount,
-            to: 'BTC',
-            from: 'BTC',
-            claimPublicKey: Buffer.from(keys.publicKey).toString('hex'),
-            preimageHash: createHash('sha256').update(preimage).digest('hex'),
-        }
-        const createdResponseRes = await loggedPost<TransactionSwapResponse>(this.log, url, req)
-        if (!createdResponseRes.ok) {
-            return createdResponseRes
-        }
-        const createdResponse = createdResponseRes.data
-        this.log('Created transaction swap');
-        this.log(createdResponse);
-        return {
-            ok: true, createdResponse,
-            preimage: Buffer.from(preimage).toString('hex'),
-            pubkey: Buffer.from(keys.publicKey).toString('hex'),
-            privKey: Buffer.from(keys.privateKey).toString('hex')
-        }
-    }
-
-    SubscribeToTransactionSwap = async (data: TransactionSwapData, swapDone: (result: { ok: true, txId: string } | { ok: false, error: string }) => void) => {
-        const webSocket = new ws(`${this.wsUrl}/v2/ws`)
-        const subReq = { op: 'subscribe', channel: 'swap.update', args: [data.createdResponse.id] }
-        webSocket.on('open', () => {
-            webSocket.send(JSON.stringify(subReq))
-        })
-        let txId = "", isDone = false
-        const done = () => {
-            isDone = true
-            webSocket.close()
-            swapDone({ ok: true, txId })
-        }
-        webSocket.on('error', (err) => {
-            this.log(ERROR, 'Error in WebSocket', err.message)
-        })
-        webSocket.on('close', () => {
-            if (!isDone) {
-                this.log(ERROR, 'WebSocket closed before swap was done');
-                swapDone({ ok: false, error: 'WebSocket closed before swap was done' })
-            }
-        })
-        webSocket.on('message', async (rawMsg) => {
-            try {
-                const result = await this.handleSwapTransactionMessage(rawMsg, data, done)
-                if (result) {
-                    txId = result
-                }
-            } catch (err: any) {
-                this.log(ERROR, 'Error handling transaction WebSocket message', err.message)
-                isDone = true
-                webSocket.close()
-                swapDone({ ok: false, error: err.message })
-                return
-            }
-        })
-    }
-
-    handleSwapTransactionMessage = async (rawMsg: ws.RawData, data: TransactionSwapData, done: () => void) => {
-        const msg = JSON.parse(rawMsg.toString('utf-8'));
-        if (msg.event !== 'update') {
-            return;
-        }
-
-        this.log('Got WebSocket update');
-        this.log(msg);
-        switch (msg.args[0].status) {
-            // "swap.created" means Boltz is waiting for the invoice to be paid
-            case 'swap.created':
-                this.log('Waiting invoice to be paid');
-                return;
-
-            // "transaction.mempool" means that Boltz sent an onchain transaction
-            case 'transaction.mempool':
-                const txIdRes = await this.handleTransactionMempool(data, msg.args[0].transaction.hex)
-                if (!txIdRes.ok) {
-                    throw new Error(txIdRes.error)
-                }
-                return txIdRes.txId
-            case 'invoice.settled':
-                this.log('Transaction swap successful');
-                done()
-                return;
-        }
-    }
-
-    handleTransactionMempool = async (data: TransactionSwapData, txHex: string): Promise<{ ok: true, txId: string } | { ok: false, error: string }> => {
-        this.log('Creating claim transaction');
-        const { createdResponse, info } = data
-        const { destinationAddress, keys, preimage, chainFee } = info
-        const boltzPublicKey = Buffer.from(
-            createdResponse.refundPublicKey,
-            'hex',
-        );
-
-        // Create a musig signing session and tweak it with the Taptree of the swap scripts
-        const musig = new Musig(await zkpInit(), keys, randomBytes(32), [
-            boltzPublicKey,
-            Buffer.from(keys.publicKey),
-        ]);
-        const tweakedKey = TaprootUtils.tweakMusig(
-            musig,
-            // swap tree can either be a string or an object
-            SwapTreeSerializer.deserializeSwapTree(createdResponse.swapTree).tree,
-        );
-
-        // Parse the lockup transaction and find the output relevant for the swap
-        const lockupTx = Transaction.fromHex(txHex);
-        const swapOutput = detectSwap(tweakedKey, lockupTx);
-        if (swapOutput === undefined) {
-            this.log(ERROR, 'No swap output found in lockup transaction');
-            return { ok: false, error: 'No swap output found in lockup transaction' }
-        }
-        const network = getNetwork(this.network)
-        // Create a claim transaction to be signed cooperatively via a key path spend
-        const claimTx = constructClaimTransaction(
-            [
-                {
-                    ...swapOutput,
-                    keys,
-                    preimage,
-                    cooperative: true,
-                    type: OutputType.Taproot,
-                    txHash: lockupTx.getHash(),
-                },
-            ],
-            address.toOutputScript(destinationAddress, network),
-            chainFee,
-        )
-        // Get the partial signature from Boltz
-        const claimUrl = `${this.httpUrl}/v2/swap/reverse/${createdResponse.id}/claim`
-        const claimReq = {
-            index: 0,
-            transaction: claimTx.toHex(),
-            preimage: preimage.toString('hex'),
-            pubNonce: Buffer.from(musig.getPublicNonce()).toString('hex'),
-        }
-        const boltzSigRes = await loggedPost<{ pubNonce: string, partialSignature: string }>(this.log, claimUrl, claimReq)
-        if (!boltzSigRes.ok) {
-            return boltzSigRes
-        }
-        const boltzSig = boltzSigRes.data
-
-        // Aggregate the nonces
-        musig.aggregateNonces([
-            [boltzPublicKey, Buffer.from(boltzSig.pubNonce, 'hex')],
-        ]);
-
-        // Initialize the session to sign the claim transaction
-        musig.initializeSession(
-            claimTx.hashForWitnessV1(
-                0,
-                [swapOutput.script],
-                [swapOutput.value],
-                Transaction.SIGHASH_DEFAULT,
-            ),
-        );
-
-        // Add the partial signature from Boltz
-        musig.addPartial(
-            boltzPublicKey,
-            Buffer.from(boltzSig.partialSignature, 'hex'),
-        );
-
-        // Create our partial signature
-        musig.signPartial();
-
-        // Witness of the input to the aggregated signature
-        claimTx.ins[0].witness = [musig.aggregatePartials()];
-
-        // Broadcast the finalized transaction
-        const broadcastUrl = `${this.httpUrl}/v2/chain/BTC/transaction`
-        const broadcastReq = {
-            hex: claimTx.toHex(),
-        }
-
-        const broadcastResponse = await loggedPost<any>(this.log, broadcastUrl, broadcastReq)
-        if (!broadcastResponse.ok) {
-            return broadcastResponse
-        }
-        this.log('Transaction broadcasted', broadcastResponse.data)
-        const txId = claimTx.getId()
-        return { ok: true, txId }
-    }
-}
-
-const loggedPost = async <T>(log: PubLogger, url: string, req: any): Promise<{ ok: true, data: T } | { ok: false, error: string }> => {
-    try {
-        const { data } = await axios.post(url, req)
-        return { ok: true, data: data as T }
-    } catch (err: any) {
-        if (err.response?.data) {
-            log(ERROR, 'Error sending request', err.response.data)
-            return { ok: false, error: JSON.stringify(err.response.data) }
-        }
-        log(ERROR, 'Error sending request', err.message)
-        return { ok: false, error: err.message }
-    }
-}
-
-const loggedGet = async <T>(log: PubLogger, url: string): Promise<{ ok: true, data: T } | { ok: false, error: string }> => {
-    try {
-        const { data } = await axios.get(url)
-        return { ok: true, data: data as T }
-    } catch (err: any) {
-        if (err.response?.data) {
-            log(ERROR, 'Error getting request', err.response.data)
-            return { ok: false, error: err.response.data }
-        }
-        log(ERROR, 'Error getting request', err.message)
-        return { ok: false, error: err.message }
-    }
-}
-
-const getNetwork = (network: BTCNetwork): Network => {
-    switch (network) {
-        case 'mainnet':
-            return Networks.bitcoinMainnet
-        case 'testnet':
-            return Networks.bitcoinTestnet
-        case 'regtest':
-            return Networks.bitcoinRegtest
-        default:
-            throw new Error(`Invalid network: ${network}`)
-    }
-}
-
-// Submarine swaps currently not supported, keeping the code for future reference
-/*
-export class SubmarineSwaps {
-    settings: SettingsManager
-    log: PubLogger
-    constructor(settings: SettingsManager) {
-        this.settings = settings
-        this.log = getLogger({ component: 'SubmarineSwaps' })
-    }
-
-    SwapInvoice = async (invoice: string, paymentHash: string) => {
-        if (!this.settings.getSettings().swapsSettings.enableSwaps) {
-            this.log(ERROR, 'Swaps are not enabled');
-            return;
-        }
-        const keys = ECPairFactory(ecc).makeRandom()
-        const refundPublicKey = Buffer.from(keys.publicKey).toString('hex')
-        const req = { invoice, to: 'BTC', from: 'BTC', refundPublicKey }
-        const url = `${this.settings.getSettings().swapsSettings.boltzHttpUrl}/v2/swap/submarine`
-        this.log('Sending invoice swap request to', url);
-        const createdResponseRes = await loggedPost<InvoiceSwapResponse>(this.log, url, req)
-        if (!createdResponseRes.ok) {
-            return createdResponseRes
-        }
-        const createdResponse = createdResponseRes.data
-        this.log('Created invoice swap');
-        this.log(createdResponse);
-
-        const webSocket = new ws(`${this.settings.getSettings().swapsSettings.boltzWebSocketUrl}/v2/ws`)
-        const subReq = { op: 'subscribe', channel: 'swap.update', args: [createdResponse.id] }
-        webSocket.on('open', () => {
-            webSocket.send(JSON.stringify(subReq))
-        })
-
-        webSocket.on('message', async (rawMsg) => {
-            try {
-                await this.handleSwapInvoiceMessage(rawMsg, { createdResponse, info: { paymentHash, keys } }, () => webSocket.close())
-            } catch (err: any) {
-                this.log(ERROR, 'Error handling invoice WebSocket message', err.message)
-                webSocket.close()
-                return
-            }
-        });
-    }
-
-    handleSwapInvoiceMessage = async (rawMsg: ws.RawData, data: InvoiceSwapData, closeWebSocket: () => void) => {
-        const msg = JSON.parse(rawMsg.toString('utf-8'));
-        if (msg.event !== 'update') {
-            return;
-        }
-
-        this.log('Got invoice WebSocket update');
-        this.log(msg);
-        switch (msg.args[0].status) {
-            // "invoice.set" means Boltz is waiting for an onchain transaction to be sent
-            case 'invoice.set':
-                this.log('Waiting for onchain transaction');
-                return;
-            // Create a partial signature to allow Boltz to do a key path spend to claim the mainchain coins
-            case 'transaction.claim.pending':
-                await this.handleInvoiceClaimPending(data)
-                return;
-
-            case 'transaction.claimed':
-                this.log('Invoice swap successful');
-                closeWebSocket()
-                return;
-        }
-
-    }
-
-    handleInvoiceClaimPending = async (data: InvoiceSwapData) => {
-        this.log('Creating cooperative claim transaction');
-        const { createdResponse, info } = data
-        const { paymentHash, keys } = info
-        const { boltzHttpUrl } = this.settings.getSettings().swapsSettings
-        // Get the information request to create a partial signature
-        const url = `${boltzHttpUrl}/v2/swap/submarine/${createdResponse.id}/claim`
-        const claimTxDetailsRes = await loggedGet<{ preimage: string, transactionHash: string, pubNonce: string }>(this.log, url)
-        if (!claimTxDetailsRes.ok) {
-            return claimTxDetailsRes
-        }
-        const claimTxDetails = claimTxDetailsRes.data
-        // Verify that Boltz actually paid the invoice by comparing the preimage hash
-        // of the invoice to the SHA256 hash of the preimage from the response
-        const claimTxPreimageHash = createHash('sha256').update(Buffer.from(claimTxDetails.preimage, 'hex')).digest()
-        const invoicePreimageHash = Buffer.from(paymentHash, 'hex')
-
-        if (!claimTxPreimageHash.equals(invoicePreimageHash)) {
-            this.log(ERROR, 'Boltz provided invalid preimage');
-            return;
-        }
-
-        const boltzPublicKey = Buffer.from(createdResponse.claimPublicKey, 'hex')
-
-        // Create a musig signing instance
-        const musig = new Musig(await zkpInit(), keys, randomBytes(32), [
-            boltzPublicKey,
-            Buffer.from(keys.publicKey),
-        ]);
-        // Tweak that musig with the Taptree of the swap scripts
-        TaprootUtils.tweakMusig(
-            musig,
-            SwapTreeSerializer.deserializeSwapTree(createdResponse.swapTree).tree,
-        );
-
-        // Aggregate the nonces
-        musig.aggregateNonces([
-            [boltzPublicKey, Buffer.from(claimTxDetails.pubNonce, 'hex')],
-        ]);
-        // Initialize the session to sign the transaction hash from the response
-        musig.initializeSession(
-            Buffer.from(claimTxDetails.transactionHash, 'hex'),
-        );
-
-        // Give our public nonce and the partial signature to Boltz
-        const claimUrl = `${boltzHttpUrl}/v2/swap/submarine/${createdResponse.id}/claim`
-        const claimReq = {
-            pubNonce: Buffer.from(musig.getPublicNonce()).toString('hex'),
-            partialSignature: Buffer.from(musig.signPartial()).toString('hex'),
-        }
-        const claimResponseRes = await loggedPost<{ pubNonce: string, partialSignature: string }>(this.log, claimUrl, claimReq)
-        if (!claimResponseRes.ok) {
-            return claimResponseRes
-        }
-        const claimResponse = claimResponseRes.data
-        this.log('Claim response', claimResponse)
-    }
-}
-*/
\ No newline at end of file
diff --git a/src/services/lnd/swaps/reverseSwaps.ts b/src/services/lnd/swaps/reverseSwaps.ts
new file mode 100644
index 00000000..83dddc37
--- /dev/null
+++ b/src/services/lnd/swaps/reverseSwaps.ts
@@ -0,0 +1,299 @@
+import secp256k1ZkpModule from '@vulpemventures/secp256k1-zkp';
+const zkpInit = (secp256k1ZkpModule as any).default || secp256k1ZkpModule;
+import { initEccLib, Transaction, address } from 'bitcoinjs-lib';
+// import bolt11 from 'bolt11';
+import {
+    Musig, SwapTreeSerializer, TaprootUtils, detectSwap,
+    constructClaimTransaction, OutputType, constructRefundTransaction
+} from 'boltz-core';
+import { randomBytes, createHash } from 'crypto';
+import { ECPairFactory, ECPairInterface } from 'ecpair';
+import * as ecc from 'tiny-secp256k1';
+import ws from 'ws';
+import { getLogger, PubLogger, ERROR } from '../../helpers/logger.js';
+import { BTCNetwork } from '../../main/settings.js';
+import { loggedGet, loggedPost, getNetwork } from './swapHelpers.js';
+
+
+type TransactionSwapFees = {
+    percentage: number,
+    minerFees: {
+        claim: number,
+        lockup: number,
+    }
+}
+
+type TransactionSwapFeesRes = {
+    BTC?: {
+        BTC?: {
+            fees: TransactionSwapFees
+        }
+    }
+}
+
+
+type TransactionSwapResponse = {
+    id: string, refundPublicKey: string, swapTree: string,
+    timeoutBlockHeight: number, lockupAddress: string, invoice: string,
+    onchainAmount?: number
+}
+type TransactionSwapInfo = { destinationAddress: string, preimage: Buffer, keys: ECPairInterface, chainFee: number }
+export type TransactionSwapData = { createdResponse: TransactionSwapResponse, info: TransactionSwapInfo }
+
+
+
+export class ReverseSwaps {
+    // settings: SettingsManager
+    private httpUrl: string
+    private wsUrl: string
+    log: PubLogger
+    private network: BTCNetwork
+    constructor({ httpUrl, wsUrl, network }: { httpUrl: string, wsUrl: string, network: BTCNetwork }) {
+        this.httpUrl = httpUrl
+        this.wsUrl = wsUrl
+        this.network = network
+        this.log = getLogger({ component: 'ReverseSwaps' })
+        initEccLib(ecc)
+    }
+
+    getHttpUrl = () => {
+        return this.httpUrl
+    }
+    getWsUrl = () => {
+        return this.wsUrl
+    }
+
+    calculateFees = (fees: TransactionSwapFees, receiveAmount: number) => {
+        const pct = fees.percentage / 100
+        const minerFee = fees.minerFees.claim + fees.minerFees.lockup
+
+        const preFee = receiveAmount + minerFee
+        const fee = Math.ceil(preFee * pct)
+        const total = preFee + fee
+        return { total, fee, minerFee }
+    }
+
+    GetFees = async (): Promise<{ ok: true, fees: TransactionSwapFees, } | { ok: false, error: string }> => {
+        const url = `${this.httpUrl}/v2/swap/reverse`
+        const feesRes = await loggedGet<TransactionSwapFeesRes>(this.log, url)
+        if (!feesRes.ok) {
+            return { ok: false, error: feesRes.error }
+        }
+        if (!feesRes.data.BTC?.BTC?.fees) {
+            return { ok: false, error: 'No fees found for BTC to BTC swap' }
+        }
+
+        return { ok: true, fees: feesRes.data.BTC.BTC.fees }
+    }
+
+    SwapTransaction = async (txAmount: number): Promise<{ ok: true, createdResponse: TransactionSwapResponse, preimage: string, pubkey: string, privKey: string } | { ok: false, error: string }> => {
+        const preimage = randomBytes(32);
+        const keys = ECPairFactory(ecc).makeRandom()
+        if (!keys.privateKey) {
+            return { ok: false, error: 'Failed to generate keys' }
+        }
+        const url = `${this.httpUrl}/v2/swap/reverse`
+        const req: any = {
+            onchainAmount: txAmount,
+            to: 'BTC',
+            from: 'BTC',
+            claimPublicKey: Buffer.from(keys.publicKey).toString('hex'),
+            preimageHash: createHash('sha256').update(preimage).digest('hex'),
+        }
+        const createdResponseRes = await loggedPost<TransactionSwapResponse>(this.log, url, req)
+        if (!createdResponseRes.ok) {
+            return createdResponseRes
+        }
+        const createdResponse = createdResponseRes.data
+        this.log('Created transaction swap');
+        this.log(createdResponse);
+        return {
+            ok: true, createdResponse,
+            preimage: Buffer.from(preimage).toString('hex'),
+            pubkey: Buffer.from(keys.publicKey).toString('hex'),
+            privKey: Buffer.from(keys.privateKey).toString('hex')
+        }
+    }
+
+    SubscribeToTransactionSwap = async (data: TransactionSwapData, swapDone: (result: { ok: true, txId: string } | { ok: false, error: string }) => void) => {
+        const webSocket = new ws(`${this.wsUrl}/v2/ws`)
+        const subReq = { op: 'subscribe', channel: 'swap.update', args: [data.createdResponse.id] }
+        webSocket.on('open', () => {
+            webSocket.send(JSON.stringify(subReq))
+        })
+        const interval = setInterval(() => {
+            webSocket.ping()
+        }, 30 * 1000)
+        let txId = "", isDone = false
+        const done = (failureReason?: string) => {
+            isDone = true
+            clearInterval(interval)
+            webSocket.close()
+            if (failureReason) {
+                swapDone({ ok: false, error: failureReason })
+            } else {
+                swapDone({ ok: true, txId })
+            }
+        }
+        webSocket.on('pong', () => {
+            this.log('WebSocket transaction swap pong received')
+        })
+        webSocket.on('error', (err) => {
+            this.log(ERROR, 'Error in WebSocket', err.message)
+        })
+        webSocket.on('close', () => {
+            if (!isDone) {
+                this.log(ERROR, 'WebSocket closed before swap was done');
+                done('WebSocket closed before swap was done')
+            }
+        })
+        webSocket.on('message', async (rawMsg) => {
+            try {
+                const result = await this.handleSwapTransactionMessage(rawMsg, data, done)
+                if (result) {
+                    txId = result
+                }
+            } catch (err: any) {
+                this.log(ERROR, 'Error handling transaction WebSocket message', err.message)
+                done(err.message)
+                return
+            }
+        })
+    }
+
+    handleSwapTransactionMessage = async (rawMsg: ws.RawData, data: TransactionSwapData, done: (failureReason?: string) => void) => {
+        const msg = JSON.parse(rawMsg.toString('utf-8'));
+        if (msg.event !== 'update') {
+            return;
+        }
+
+        this.log('Got WebSocket update');
+        this.log(msg);
+        switch (msg.args[0].status) {
+            // "swap.created" means Boltz is waiting for the invoice to be paid
+            case 'swap.created':
+                this.log('Waiting invoice to be paid');
+                return;
+
+            // "transaction.mempool" means that Boltz sent an onchain transaction
+            case 'transaction.mempool':
+                const txIdRes = await this.handleTransactionMempool(data, msg.args[0].transaction.hex)
+                if (!txIdRes.ok) {
+                    throw new Error(txIdRes.error)
+                }
+                return txIdRes.txId
+            case 'invoice.settled':
+                this.log('Transaction swap successful');
+                done()
+                return;
+            case 'invoice.expired':
+            case 'swap.expired':
+            case 'transaction.failed':
+                done(`swap ${data.createdResponse.id} failed with status ${msg.args[0].status}`)
+                return;
+            default:
+                this.log('Unknown swap transaction WebSocket message', msg)
+                return;
+
+        }
+    }
+
+    handleTransactionMempool = async (data: TransactionSwapData, txHex: string): Promise<{ ok: true, txId: string } | { ok: false, error: string }> => {
+        this.log('Creating claim transaction');
+        const { createdResponse, info } = data
+        const { destinationAddress, keys, preimage, chainFee } = info
+        const boltzPublicKey = Buffer.from(
+            createdResponse.refundPublicKey,
+            'hex',
+        );
+
+        // Create a musig signing session and tweak it with the Taptree of the swap scripts
+        const musig = new Musig(await zkpInit(), keys, randomBytes(32), [
+            boltzPublicKey,
+            Buffer.from(keys.publicKey),
+        ]);
+        const tweakedKey = TaprootUtils.tweakMusig(
+            musig,
+            // swap tree can either be a string or an object
+            SwapTreeSerializer.deserializeSwapTree(createdResponse.swapTree).tree,
+        );
+
+        // Parse the lockup transaction and find the output relevant for the swap
+        const lockupTx = Transaction.fromHex(txHex);
+        const swapOutput = detectSwap(tweakedKey, lockupTx);
+        if (swapOutput === undefined) {
+            this.log(ERROR, 'No swap output found in lockup transaction');
+            return { ok: false, error: 'No swap output found in lockup transaction' }
+        }
+        const network = getNetwork(this.network)
+        // Create a claim transaction to be signed cooperatively via a key path spend
+        const claimTx = constructClaimTransaction(
+            [
+                {
+                    ...swapOutput,
+                    keys,
+                    preimage,
+                    cooperative: true,
+                    type: OutputType.Taproot,
+                    txHash: lockupTx.getHash(),
+                },
+            ],
+            address.toOutputScript(destinationAddress, network),
+            chainFee,
+        )
+        // Get the partial signature from Boltz
+        const claimUrl = `${this.httpUrl}/v2/swap/reverse/${createdResponse.id}/claim`
+        const claimReq = {
+            index: 0,
+            transaction: claimTx.toHex(),
+            preimage: preimage.toString('hex'),
+            pubNonce: Buffer.from(musig.getPublicNonce()).toString('hex'),
+        }
+        const boltzSigRes = await loggedPost<{ pubNonce: string, partialSignature: string }>(this.log, claimUrl, claimReq)
+        if (!boltzSigRes.ok) {
+            return boltzSigRes
+        }
+        const boltzSig = boltzSigRes.data
+
+        // Aggregate the nonces
+        musig.aggregateNonces([
+            [boltzPublicKey, Buffer.from(boltzSig.pubNonce, 'hex')],
+        ]);
+
+        // Initialize the session to sign the claim transaction
+        musig.initializeSession(
+            claimTx.hashForWitnessV1(
+                0,
+                [swapOutput.script],
+                [swapOutput.value],
+                Transaction.SIGHASH_DEFAULT,
+            ),
+        );
+
+        // Add the partial signature from Boltz
+        musig.addPartial(
+            boltzPublicKey,
+            Buffer.from(boltzSig.partialSignature, 'hex'),
+        );
+
+        // Create our partial signature
+        musig.signPartial();
+
+        // Witness of the input to the aggregated signature
+        claimTx.ins[0].witness = [musig.aggregatePartials()];
+
+        // Broadcast the finalized transaction
+        const broadcastUrl = `${this.httpUrl}/v2/chain/BTC/transaction`
+        const broadcastReq = {
+            hex: claimTx.toHex(),
+        }
+
+        const broadcastResponse = await loggedPost<any>(this.log, broadcastUrl, broadcastReq)
+        if (!broadcastResponse.ok) {
+            return broadcastResponse
+        }
+        this.log('Transaction broadcasted', broadcastResponse.data)
+        const txId = claimTx.getId()
+        return { ok: true, txId }
+    }
+}
\ No newline at end of file
diff --git a/src/services/lnd/swaps/submarineSwaps.ts b/src/services/lnd/swaps/submarineSwaps.ts
new file mode 100644
index 00000000..6e4beba8
--- /dev/null
+++ b/src/services/lnd/swaps/submarineSwaps.ts
@@ -0,0 +1,539 @@
+import secp256k1ZkpModule from '@vulpemventures/secp256k1-zkp';
+const zkpInit = (secp256k1ZkpModule as any).default || secp256k1ZkpModule;
+// import bolt11 from 'bolt11';
+import {
+    Musig, SwapTreeSerializer, TaprootUtils, constructRefundTransaction,
+    detectSwap, OutputType, targetFee
+} from 'boltz-core';
+import { randomBytes, createHash } from 'crypto';
+import { ECPairFactory, ECPairInterface } from 'ecpair';
+import * as ecc from 'tiny-secp256k1';
+import { Transaction, address } from 'bitcoinjs-lib';
+import ws from 'ws';
+import { getLogger, PubLogger, ERROR } from '../../helpers/logger.js';
+import { loggedGet, loggedPost, getNetwork } from './swapHelpers.js';
+import { BTCNetwork } from '../../main/settings.js';
+
+/* type InvoiceSwapFees = {
+    hash: string,
+    rate: number,
+    limits: {
+        maximal: number,
+        minimal: number,
+        maximalZeroConf: number
+    },
+    fees: {
+        percentage: number,
+        minerFees: number,
+    }
+} */
+
+type InvoiceSwapFees = {
+    percentage: number,
+    minerFees: number,
+}
+
+type InvoiceSwapFeesRes = {
+    BTC?: {
+        BTC?: {
+            fees: InvoiceSwapFees
+        }
+    }
+}
+type InvoiceSwapResponse = {
+    id: string, claimPublicKey: string, swapTree: string, timeoutBlockHeight: number,
+    expectedAmount: number, address: string
+}
+type InvoiceSwapInfo = { paymentHash: string, keys: ECPairInterface }
+export type InvoiceSwapData = { createdResponse: InvoiceSwapResponse, info: InvoiceSwapInfo }
+
+export class SubmarineSwaps {
+    private httpUrl: string
+    private wsUrl: string
+    private network: BTCNetwork
+    log: PubLogger
+    constructor({ httpUrl, wsUrl, network }: { httpUrl: string, wsUrl: string, network: BTCNetwork }) {
+        this.httpUrl = httpUrl
+        this.wsUrl = wsUrl
+        this.network = network
+        this.log = getLogger({ component: 'SubmarineSwaps' })
+    }
+
+    getHttpUrl = () => {
+        return this.httpUrl
+    }
+    getWsUrl = () => {
+        return this.wsUrl
+    }
+
+    GetFees = async (): Promise<{ ok: true, fees: InvoiceSwapFees, } | { ok: false, error: string }> => {
+        const url = `${this.httpUrl}/v2/swap/submarine`
+        const feesRes = await loggedGet<InvoiceSwapFeesRes>(this.log, url)
+        if (!feesRes.ok) {
+            return { ok: false, error: feesRes.error }
+        }
+        if (!feesRes.data.BTC?.BTC?.fees) {
+            return { ok: false, error: 'No fees found for BTC to BTC swap' }
+        }
+        return { ok: true, fees: feesRes.data.BTC.BTC.fees }
+    }
+
+    SwapInvoice = async (invoice: string): Promise<{ ok: true, createdResponse: InvoiceSwapResponse, pubkey: string, privKey: string } | { ok: false, error: string }> => {
+        const keys = ECPairFactory(ecc).makeRandom()
+        if (!keys.privateKey) {
+            return { ok: false, error: 'Failed to generate keys' }
+        }
+        const refundPublicKey = Buffer.from(keys.publicKey).toString('hex')
+        const req = { invoice, to: 'BTC', from: 'BTC', refundPublicKey }
+        const url = `${this.httpUrl}/v2/swap/submarine`
+        this.log('Sending invoice swap request to', url);
+        const createdResponseRes = await loggedPost<InvoiceSwapResponse>(this.log, url, req)
+        if (!createdResponseRes.ok) {
+            return createdResponseRes
+        }
+        const createdResponse = createdResponseRes.data
+        this.log('Created invoice swap');
+        this.log(createdResponse);
+        return {
+            ok: true, createdResponse,
+            pubkey: refundPublicKey,
+            privKey: Buffer.from(keys.privateKey).toString('hex')
+        }
+
+    }
+
+    /**
+     * Get the lockup transaction for a swap from Boltz
+     */
+    private getLockupTransaction = async (swapId: string): Promise<{ ok: true, data: { hex: string } } | { ok: false, error: string }> => {
+        const url = `${this.httpUrl}/v2/swap/submarine/${swapId}/transaction`
+        return await loggedGet<{ hex: string }>(this.log, url)
+    }
+
+    /**
+     * Get partial refund signature from Boltz for cooperative refund
+     */
+    private getPartialRefundSignature = async (
+        swapId: string,
+        pubNonce: Buffer,
+        transaction: Transaction,
+        index: number
+    ): Promise<{ ok: true, data: { pubNonce: string, partialSignature: string } } | { ok: false, error: string }> => {
+        const url = `${this.httpUrl}/v2/swap/submarine/${swapId}/refund`
+        const req = {
+            index,
+            pubNonce: pubNonce.toString('hex'),
+            transaction: transaction.toHex()
+        }
+        return await loggedPost<{ pubNonce: string, partialSignature: string }>(this.log, url, req)
+    }
+
+    /**
+     * Constructs a Taproot refund transaction (cooperative or uncooperative)
+     */
+    private constructTaprootRefund = async (
+        swapId: string,
+        claimPublicKey: string,
+        swapTree: string,
+        timeoutBlockHeight: number,
+        lockupTx: Transaction,
+        privateKey: ECPairInterface,
+        refundAddress: string,
+        feePerVbyte: number,
+        cooperative: boolean = true,
+        allowUncooperativeFallback: boolean = true,
+        cooperativeErrorMessage?: string
+    ): Promise<{
+        ok: true,
+        transaction: Transaction,
+        cooperativeError?: string
+    } | {
+        ok: false,
+        error: string
+    }> => {
+        this.log(`Constructing ${cooperative ? 'cooperative' : 'uncooperative'} Taproot refund for swap ${swapId}`)
+
+        const boltzPublicKey = Buffer.from(claimPublicKey, 'hex')
+        const swapTreeDeserialized = SwapTreeSerializer.deserializeSwapTree(swapTree)
+
+        // Create musig and tweak it
+        let musig = new Musig(await zkpInit(), privateKey, randomBytes(32), [
+            boltzPublicKey,
+            Buffer.from(privateKey.publicKey),
+        ])
+        const tweakedKey = TaprootUtils.tweakMusig(musig, swapTreeDeserialized.tree)
+
+        // Detect the swap output in the lockup transaction
+        const swapOutput = detectSwap(tweakedKey, lockupTx)
+        if (!swapOutput) {
+            return { ok: false, error: 'Could not detect swap output in lockup transaction' }
+        }
+
+        const network = getNetwork(this.network)
+        // const decodedAddress = address.fromBech32(refundAddress)
+
+        const details = [
+            {
+                ...swapOutput,
+                keys: privateKey,
+                cooperative,
+                type: OutputType.Taproot,
+                txHash: lockupTx.getHash(),
+                swapTree: swapTreeDeserialized,
+                internalKey: musig.getAggregatedPublicKey(),
+            }
+        ]
+        const outputScript = address.toOutputScript(refundAddress, network)
+        // Construct the refund transaction: targetFee converts sat/vbyte rate to flat fee
+        const refundTx = targetFee(
+            feePerVbyte,
+            (fee) => constructRefundTransaction(
+                details,
+                outputScript,
+                cooperative ? 0 : timeoutBlockHeight,
+                fee,
+                true
+            )
+        )
+
+        if (!cooperative) {
+            return {
+                ok: true,
+                transaction: refundTx,
+                cooperativeError: cooperativeErrorMessage,
+            }
+        }
+
+        // For cooperative refund, get Boltz's partial signature
+        try {
+            musig = new Musig(await zkpInit(), privateKey, randomBytes(32), [
+                boltzPublicKey,
+                Buffer.from(privateKey.publicKey),
+            ])
+            // Get the partial signature from Boltz
+            const boltzSigRes = await this.getPartialRefundSignature(
+                swapId,
+                Buffer.from(musig.getPublicNonce()),
+                refundTx,
+                0
+            )
+
+            if (!boltzSigRes.ok) {
+                this.log(ERROR, 'Failed to get Boltz partial signature')
+                if (!allowUncooperativeFallback) {
+                    return { ok: false, error: `Failed to get Boltz partial signature: ${boltzSigRes.error}` }
+                }
+                this.log(ERROR, 'Falling back to uncooperative refund')
+                // Fallback to uncooperative refund
+                return await this.constructTaprootRefund(
+                    swapId,
+                    claimPublicKey,
+                    swapTree,
+                    timeoutBlockHeight,
+                    lockupTx,
+                    privateKey,
+                    refundAddress,
+                    feePerVbyte,
+                    false,
+                    allowUncooperativeFallback,
+                    boltzSigRes.error
+                )
+            }
+
+            const boltzSig = boltzSigRes.data
+
+            // Aggregate nonces
+            musig.aggregateNonces([
+                [boltzPublicKey, Musig.parsePubNonce(boltzSig.pubNonce)],
+            ])
+
+            // Tweak musig again after aggregating nonces
+            TaprootUtils.tweakMusig(musig, swapTreeDeserialized.tree)
+
+            // Initialize session and sign
+            musig.initializeSession(
+                TaprootUtils.hashForWitnessV1(
+                    details,
+                    refundTx,
+                    0
+                )
+            )
+
+            musig.signPartial()
+            musig.addPartial(boltzPublicKey, Buffer.from(boltzSig.partialSignature, 'hex'))
+
+            // Set the witness to the aggregated signature
+            refundTx.ins[0].witness = [musig.aggregatePartials()]
+
+            return { ok: true, transaction: refundTx }
+        } catch (error: any) {
+            this.log(ERROR, 'Cooperative refund failed:', error.message)
+            if (!allowUncooperativeFallback) {
+                return { ok: false, error: `Cooperative refund failed: ${error.message}` }
+            }
+            // Fallback to uncooperative refund
+            return await this.constructTaprootRefund(
+                swapId,
+                claimPublicKey,
+                swapTree,
+                timeoutBlockHeight,
+                lockupTx,
+                privateKey,
+                refundAddress,
+                feePerVbyte,
+                false,
+                allowUncooperativeFallback,
+                error.message
+            )
+        }
+    }
+
+    /**
+     * Broadcasts a refund transaction
+     */
+    private broadcastRefundTransaction = async (transaction: Transaction): Promise<{ ok: true, txId: string } | { ok: false, error: string }> => {
+        const url = `${this.httpUrl}/v2/chain/BTC/transaction`
+        const req = { hex: transaction.toHex() }
+
+        const result = await loggedPost<{ id: string }>(this.log, url, req)
+        if (!result.ok) {
+            return result
+        }
+
+        return { ok: true, txId: result.data.id }
+    }
+
+    /**
+     * Refund a submarine swap
+     * @param swapId - The swap ID
+     * @param claimPublicKey - Boltz's claim public key
+     * @param swapTree - The swap tree
+     * @param timeoutBlockHeight - The timeout block height
+     * @param privateKey - The refund private key (hex string)
+     * @param refundAddress - The address to refund to
+     * @param currentHeight - The current block height
+     * @param lockupTxHex - The lockup transaction hex (optional, will fetch from Boltz if not provided)
+     * @param feePerVbyte - Fee rate in sat/vbyte (optional, will use default if not provided)
+     */
+    RefundSwap = async (params: {
+        swapId: string,
+        claimPublicKey: string,
+        swapTree: string,
+        timeoutBlockHeight: number,
+        privateKeyHex: string,
+        refundAddress: string,
+        currentHeight: number,
+        lockupTxHex?: string,
+        feePerVbyte?: number,
+        allowEarlyRefund?: boolean
+    }): Promise<{ ok: true, publish: { done: false, txHex: string, txId: string } | { done: true, txId: string } } | { ok: false, error: string }> => {
+        const { swapId, claimPublicKey, swapTree, timeoutBlockHeight, privateKeyHex, refundAddress, currentHeight, lockupTxHex, feePerVbyte = 2, allowEarlyRefund = false } = params
+
+        this.log('Starting refund process for swap:', swapId)
+
+        // Get the lockup transaction (from parameter or fetch from Boltz)
+        let lockupTx: Transaction
+        if (lockupTxHex) {
+            this.log('Using provided lockup transaction hex')
+            lockupTx = Transaction.fromHex(lockupTxHex)
+        } else {
+            this.log('Fetching lockup transaction from Boltz')
+            const lockupTxRes = await this.getLockupTransaction(swapId)
+            if (!lockupTxRes.ok) {
+                return { ok: false, error: `Failed to get lockup transaction: ${lockupTxRes.error}` }
+            }
+            lockupTx = Transaction.fromHex(lockupTxRes.data.hex)
+        }
+        this.log('Lockup transaction retrieved:', lockupTx.getId())
+
+        const hasTimedOut = currentHeight >= timeoutBlockHeight
+
+        // For stuck swaps, only allow refund after timeout. For completed (failed) swaps,
+        // we may attempt a cooperative refund before timeout.
+        if (!hasTimedOut && !allowEarlyRefund) {
+            return {
+                ok: false,
+                error: `Swap has not timed out yet. Current height: ${currentHeight}, timeout: ${timeoutBlockHeight}`
+            }
+        }
+        if (hasTimedOut) {
+            this.log(`Swap has timed out. Current height: ${currentHeight}, timeout: ${timeoutBlockHeight}`)
+        } else {
+            this.log(`Swap has not timed out yet, attempting cooperative refund`)
+        }
+
+        // Parse the private key
+        const privateKey = ECPairFactory(ecc).fromPrivateKey(Buffer.from(privateKeyHex, 'hex'))
+
+        // Construct the refund transaction (tries cooperative first, then falls back to uncooperative)
+        const refundTxRes = await this.constructTaprootRefund(
+            swapId,
+            claimPublicKey,
+            swapTree,
+            timeoutBlockHeight,
+            lockupTx,
+            privateKey,
+            refundAddress,
+            feePerVbyte,
+            true, // Try cooperative first
+            hasTimedOut // only allow uncooperative fallback once timeout has passed
+        )
+
+        if (!refundTxRes.ok) {
+            return { ok: false, error: refundTxRes.error }
+        }
+
+        const cooperative = !refundTxRes.cooperativeError
+        this.log(`Refund transaction constructed (${cooperative ? 'cooperative' : 'uncooperative'}):`, refundTxRes.transaction.getId())
+        if (!cooperative) {
+            return { ok: true, publish: { done: false, txHex: refundTxRes.transaction.toHex(), txId: refundTxRes.transaction.getId() } }
+        }
+        // Broadcast the refund transaction
+        const broadcastRes = await this.broadcastRefundTransaction(refundTxRes.transaction)
+        if (!broadcastRes.ok) {
+            return { ok: false, error: `Failed to broadcast refund transaction: ${broadcastRes.error}` }
+        }
+
+        this.log('Refund transaction broadcasted successfully:', broadcastRes.txId)
+        return { ok: true, publish: { done: true, txId: broadcastRes.txId } }
+    }
+
+    SubscribeToInvoiceSwap = (data: InvoiceSwapData, swapDone: (result: { ok: true } | { ok: false, error: string }) => void, waitingTx: () => void) => {
+        this.log("subscribing to invoice swap", { id: data.createdResponse.id })
+        const webSocket = new ws(`${this.wsUrl}/v2/ws`)
+        const subReq = { op: 'subscribe', channel: 'swap.update', args: [data.createdResponse.id] }
+        webSocket.on('open', () => {
+            webSocket.send(JSON.stringify(subReq))
+        })
+        const interval = setInterval(() => {
+            webSocket.ping()
+        }, 30 * 1000)
+        let isDone = false
+        const done = (failureReason?: string) => {
+            isDone = true
+            clearInterval(interval)
+            webSocket.close()
+            if (failureReason) {
+                swapDone({ ok: false, error: failureReason })
+            } else {
+                swapDone({ ok: true })
+            }
+        }
+        webSocket.on('pong', () => {
+            this.log('WebSocket invoice swap pong received')
+        })
+        webSocket.on('error', (err) => {
+            this.log(ERROR, 'Error in WebSocket', err.message)
+        })
+        webSocket.on('close', () => {
+            if (!isDone) {
+                this.log(ERROR, 'WebSocket closed before swap was done');
+                done('WebSocket closed before swap was done')
+            }
+        })
+        webSocket.on('message', async (rawMsg) => {
+            try {
+                await this.handleSwapInvoiceMessage(rawMsg, data, done, waitingTx)
+            } catch (err: any) {
+                this.log(ERROR, 'Error handling invoice WebSocket message', err.message)
+                done(err.message)
+                return
+            }
+        });
+        return () => {
+            webSocket.close()
+        }
+    }
+
+    handleSwapInvoiceMessage = async (rawMsg: ws.RawData, data: InvoiceSwapData, closeWebSocket: (failureReason?: string) => void, waitingTx: () => void) => {
+        const msg = JSON.parse(rawMsg.toString('utf-8'));
+        if (msg.event !== 'update') {
+            return;
+        }
+
+        this.log('Got invoice WebSocket update');
+        this.log(msg);
+        switch (msg.args[0].status) {
+            // "invoice.set" means Boltz is waiting for an onchain transaction to be sent
+            case 'invoice.set':
+                this.log('Waiting for onchain transaction');
+                waitingTx()
+                return;
+            // Create a partial signature to allow Boltz to do a key path spend to claim the mainchain coins
+            case 'transaction.claim.pending':
+                await this.handleInvoiceClaimPending(data)
+                return;
+
+            case 'transaction.claimed':
+                this.log('Invoice swap successful');
+                closeWebSocket()
+                return;
+            case 'swap.expired':
+            case 'transaction.lockupFailed':
+            case 'invoice.failedToPay':
+                closeWebSocket(`swap ${data.createdResponse.id} failed with status ${msg.args[0].status}`)
+                return;
+            default:
+                this.log('Unknown swap invoice WebSocket message', msg)
+                return;
+        }
+
+    }
+
+    handleInvoiceClaimPending = async (data: InvoiceSwapData) => {
+        this.log('Creating cooperative claim transaction');
+        const { createdResponse, info } = data
+        const { paymentHash, keys } = info
+        // Get the information request to create a partial signature
+        const url = `${this.httpUrl}/v2/swap/submarine/${createdResponse.id}/claim`
+        const claimTxDetailsRes = await loggedGet<{ preimage: string, transactionHash: string, pubNonce: string }>(this.log, url)
+        if (!claimTxDetailsRes.ok) {
+            return claimTxDetailsRes
+        }
+        const claimTxDetails = claimTxDetailsRes.data
+        // Verify that Boltz actually paid the invoice by comparing the preimage hash
+        // of the invoice to the SHA256 hash of the preimage from the response
+        const claimTxPreimageHash = createHash('sha256').update(Buffer.from(claimTxDetails.preimage, 'hex')).digest()
+        const invoicePreimageHash = Buffer.from(paymentHash, 'hex')
+
+        if (!claimTxPreimageHash.equals(invoicePreimageHash)) {
+            this.log(ERROR, 'Boltz provided invalid preimage');
+            return;
+        }
+
+        const boltzPublicKey = Buffer.from(createdResponse.claimPublicKey, 'hex')
+
+        // Create a musig signing instance
+        const musig = new Musig(await zkpInit(), keys, randomBytes(32), [
+            boltzPublicKey,
+            Buffer.from(keys.publicKey),
+        ]);
+        // Tweak that musig with the Taptree of the swap scripts
+        TaprootUtils.tweakMusig(
+            musig,
+            SwapTreeSerializer.deserializeSwapTree(createdResponse.swapTree).tree,
+        );
+
+        // Aggregate the nonces
+        musig.aggregateNonces([
+            [boltzPublicKey, Buffer.from(claimTxDetails.pubNonce, 'hex')],
+        ]);
+        // Initialize the session to sign the transaction hash from the response
+        musig.initializeSession(
+            Buffer.from(claimTxDetails.transactionHash, 'hex'),
+        );
+
+        // Give our public nonce and the partial signature to Boltz
+        const claimUrl = `${this.httpUrl}/v2/swap/submarine/${createdResponse.id}/claim`
+        const claimReq = {
+            pubNonce: Buffer.from(musig.getPublicNonce()).toString('hex'),
+            partialSignature: Buffer.from(musig.signPartial()).toString('hex'),
+        }
+        const claimResponseRes = await loggedPost<{ pubNonce: string, partialSignature: string }>(this.log, claimUrl, claimReq)
+        if (!claimResponseRes.ok) {
+            return claimResponseRes
+        }
+        const claimResponse = claimResponseRes.data
+        this.log('Claim response', claimResponse)
+    }
+}
diff --git a/src/services/lnd/swaps/swapHelpers.ts b/src/services/lnd/swaps/swapHelpers.ts
new file mode 100644
index 00000000..8c34f4fd
--- /dev/null
+++ b/src/services/lnd/swaps/swapHelpers.ts
@@ -0,0 +1,50 @@
+import axios from 'axios';
+import { Network } from 'bitcoinjs-lib';
+// import bolt11 from 'bolt11';
+import {
+    Networks,
+} from 'boltz-core';
+import { PubLogger, ERROR } from '../../helpers/logger.js';
+import { BTCNetwork } from '../../main/settings.js';
+
+
+export const loggedPost = async <T>(log: PubLogger, url: string, req: any): Promise<{ ok: true, data: T } | { ok: false, error: string }> => {
+    try {
+        const { data } = await axios.post(url, req)
+        return { ok: true, data: data as T }
+    } catch (err: any) {
+        if (err.response?.data) {
+            log(ERROR, 'Error sending request', err.response.data)
+            return { ok: false, error: JSON.stringify(err.response.data) }
+        }
+        log(ERROR, 'Error sending request', err.message)
+        return { ok: false, error: err.message }
+    }
+}
+
+export const loggedGet = async <T>(log: PubLogger, url: string): Promise<{ ok: true, data: T } | { ok: false, error: string }> => {
+    try {
+        const { data } = await axios.get(url)
+        return { ok: true, data: data as T }
+    } catch (err: any) {
+        if (err.response?.data) {
+            log(ERROR, 'Error getting request', err.response.data)
+            return { ok: false, error: err.response.data }
+        }
+        log(ERROR, 'Error getting request', err.message)
+        return { ok: false, error: err.message }
+    }
+}
+
+export const getNetwork = (network: BTCNetwork): Network => {
+    switch (network) {
+        case 'mainnet':
+            return Networks.bitcoinMainnet
+        case 'testnet':
+            return Networks.bitcoinTestnet
+        case 'regtest':
+            return Networks.bitcoinRegtest
+        default:
+            throw new Error(`Invalid network: ${network}`)
+    }
+}
\ No newline at end of file
diff --git a/src/services/lnd/swaps/swaps.ts b/src/services/lnd/swaps/swaps.ts
new file mode 100644
index 00000000..0aaf9e32
--- /dev/null
+++ b/src/services/lnd/swaps/swaps.ts
@@ -0,0 +1,448 @@
+import { ECPairFactory } from 'ecpair';
+import * as ecc from 'tiny-secp256k1';
+import { getLogger } from '../../helpers/logger.js';
+import SettingsManager from '../../main/settingsManager.js';
+import * as Types from '../../../../proto/autogenerated/ts/types.js';
+import Storage from '../../storage/index.js';
+import LND from '../lnd.js';
+import { UserInvoicePayment } from '../../storage/entity/UserInvoicePayment.js';
+import { ReverseSwaps, TransactionSwapData } from './reverseSwaps.js';
+import { SubmarineSwaps, InvoiceSwapData } from './submarineSwaps.js';
+import { InvoiceSwap } from '../../storage/entity/InvoiceSwap.js';
+import { TransactionSwap } from '../../storage/entity/TransactionSwap.js';
+
+
+export class Swaps {
+    settings: SettingsManager
+    revSwappers: Record<string, ReverseSwaps>
+    subSwappers: Record<string, SubmarineSwaps>
+    storage: Storage
+    lnd: LND
+    waitingSwaps: Record<string, boolean> = {}
+    log = getLogger({ component: 'swaps' })
+    constructor(settings: SettingsManager, storage: Storage) {
+        this.settings = settings
+        this.revSwappers = {}
+        this.subSwappers = {}
+        const network = settings.getSettings().lndSettings.network
+        const { boltzHttpUrl, boltzWebSocketUrl, boltsHttpUrlAlt, boltsWebSocketUrlAlt } = settings.getSettings().swapsSettings
+        if (boltzHttpUrl && boltzWebSocketUrl) {
+            this.revSwappers[boltzHttpUrl] = new ReverseSwaps({ httpUrl: boltzHttpUrl, wsUrl: boltzWebSocketUrl, network })
+            this.subSwappers[boltzHttpUrl] = new SubmarineSwaps({ httpUrl: boltzHttpUrl, wsUrl: boltzWebSocketUrl, network })
+        }
+        if (boltsHttpUrlAlt && boltsWebSocketUrlAlt) {
+            this.revSwappers[boltsHttpUrlAlt] = new ReverseSwaps({ httpUrl: boltsHttpUrlAlt, wsUrl: boltsWebSocketUrlAlt, network })
+            this.subSwappers[boltsHttpUrlAlt] = new SubmarineSwaps({ httpUrl: boltsHttpUrlAlt, wsUrl: boltsWebSocketUrlAlt, network })
+        }
+        this.storage = storage
+    }
+
+    SetLnd = (lnd: LND) => {
+        this.lnd = lnd
+    }
+
+    Stop = () => { }
+
+    GetKeys = (privateKey: string) => {
+        const keys = ECPairFactory(ecc).fromPrivateKey(Buffer.from(privateKey, 'hex'))
+        return keys
+    }
+
+    GetInvoiceSwapQuotes = async (appUserId: string, invoice: string): Promise<Types.InvoiceSwapQuote[]> => {
+        if (!this.settings.getSettings().swapsSettings.enableSwaps) {
+            throw new Error("Swaps are not enabled")
+        }
+        const swappers = Object.values(this.subSwappers)
+        if (swappers.length === 0) {
+            throw new Error("No swap services available")
+        }
+        const res = await Promise.allSettled(swappers.map(sw => this.getInvoiceSwapQuote(sw, appUserId, invoice)))
+        const failures: string[] = []
+        const success: Types.InvoiceSwapQuote[] = []
+        for (const r of res) {
+            if (r.status === 'fulfilled') {
+                success.push(r.value)
+            } else {
+                failures.push(r.reason.message ? r.reason.message : r.reason.toString())
+            }
+        }
+        if (success.length === 0) {
+            throw new Error(failures.join("\n"))
+        }
+        return success
+    }
+
+    private mapInvoiceSwapQuote = (s: InvoiceSwap): Types.InvoiceSwapQuote => {
+        return {
+            swap_operation_id: s.swap_operation_id,
+            invoice: s.invoice,
+            invoice_amount_sats: s.invoice_amount,
+            address: s.address,
+            transaction_amount_sats: s.transaction_amount,
+            chain_fee_sats: s.chain_fee_sats,
+            service_fee_sats: 0,
+            service_url: s.service_url,
+            swap_fee_sats: s.swap_fee_sats,
+            tx_id: s.tx_id,
+            paid_at_unix: s.paid_at_unix || (s.tx_id ? 1 : 0),
+            expires_at_block_height: s.timeout_block_height,
+        }
+    }
+
+    ListInvoiceSwaps = async (appUserId: string): Promise<Types.InvoiceSwapsList> => {
+        const info = await this.lnd.GetInfo()
+        const currentBlockHeight = info.blockHeight
+        const completedSwaps = await this.storage.paymentStorage.ListCompletedInvoiceSwaps(appUserId)
+        const pendingSwaps = await this.storage.paymentStorage.ListPendingInvoiceSwaps(appUserId)
+        const quotes: Types.InvoiceSwapOperation[] = pendingSwaps.map(s => ({ quote: this.mapInvoiceSwapQuote(s) }))
+        const operations: Types.InvoiceSwapOperation[] = completedSwaps.map(s => ({
+            quote: this.mapInvoiceSwapQuote(s),
+            failure_reason: s.failure_reason,
+            completed_at_unix: s.completed_at_unix || 1,
+        }))
+        return {
+            current_block_height: currentBlockHeight,
+            swaps: operations.concat(quotes),
+        }
+    }
+
+    RefundInvoiceSwap = async (swapOperationId: string, satPerVByte: number, refundAddress: string, currentHeight: number): Promise<{ published: false, txHex: string, txId: string } | { published: true, txId: string }> => {
+        this.log("refunding invoice swap", { swapOperationId, satPerVByte, refundAddress, currentHeight })
+        const swap = await this.storage.paymentStorage.GetRefundableInvoiceSwap(swapOperationId)
+        if (!swap) {
+            throw new Error("Swap not found or already used")
+        }
+        const allowEarlyRefund = !!swap.failure_reason
+        const swapper = this.subSwappers[swap.service_url]
+        if (!swapper) {
+            throw new Error("swapper service not found")
+        }
+        const result = await swapper.RefundSwap({
+            swapId: swap.swap_quote_id,
+            claimPublicKey: swap.claim_public_key,
+            currentHeight,
+            privateKeyHex: swap.ephemeral_private_key,
+            refundAddress,
+            swapTree: swap.swap_tree,
+            timeoutBlockHeight: swap.timeout_block_height,
+            allowEarlyRefund,
+            feePerVbyte: satPerVByte,
+            lockupTxHex: swap.lockup_tx_hex,
+        })
+        if (!result.ok) {
+            throw new Error(result.error)
+        }
+        if (result.publish.done) {
+            return { published: true, txId: result.publish.txId }
+        }
+        return { published: false, txHex: result.publish.txHex, txId: result.publish.txId }
+
+    }
+
+    PayInvoiceSwap = async (appUserId: string, swapOpId: string, satPerVByte: number, payAddress: (address: string, amt: number) => Promise<{ txId: string }>): Promise<void> => {
+        this.log("paying invoice swap", { appUserId, swapOpId, satPerVByte })
+        if (!this.settings.getSettings().swapsSettings.enableSwaps) {
+            throw new Error("Swaps are not enabled")
+        }
+        if (!swapOpId) {
+            throw new Error("swap operation id is required")
+        }
+        if (!satPerVByte) {
+            throw new Error("sat per v byte is required")
+        }
+        const swap = await this.storage.paymentStorage.GetInvoiceSwap(swapOpId, appUserId)
+        if (!swap) {
+            throw new Error("swap not found")
+        }
+        const swapper = this.subSwappers[swap.service_url]
+        if (!swapper) {
+            throw new Error("swapper service not found")
+        }
+        if (this.waitingSwaps[swapOpId]) {
+            throw new Error("swap already in progress")
+        }
+        this.waitingSwaps[swapOpId] = true
+        const data = this.getInvoiceSwapData(swap)
+        let txId = ""
+        const close = swapper.SubscribeToInvoiceSwap(data, async (result) => {
+            if (result.ok) {
+                await this.storage.paymentStorage.FinalizeInvoiceSwap(swapOpId)
+                this.log("invoice swap completed", { swapOpId, txId })
+            } else {
+                await this.storage.paymentStorage.FailInvoiceSwap(swapOpId, result.error, txId)
+                this.log("invoice swap failed", { swapOpId, error: result.error })
+            }
+        }, () => payAddress(swap.address, swap.transaction_amount)
+            .then(res => { txId = res.txId })
+            .catch(err => { close(); this.log("error paying address", err.message || err) }))
+    }
+
+    ResumeInvoiceSwaps = async () => {
+        this.log("resuming invoice swaps")
+        const swaps = await this.storage.paymentStorage.ListUnfinishedInvoiceSwaps()
+        this.log("resuming", swaps.length, "invoice swaps")
+        for (const swap of swaps) {
+            try {
+                this.resumeInvoiceSwap(swap)
+            } catch (err: any) {
+                this.log("error resuming invoice swap", err.message || err)
+            }
+        }
+    }
+
+
+    private resumeInvoiceSwap = (swap: InvoiceSwap) => {
+        // const swap = await this.storage.paymentStorage.GetInvoiceSwap(swapOpId, appUserId)
+        if (!swap || !swap.tx_id || swap.used) {
+            throw new Error("swap to resume not found, or does not have a tx id")
+        }
+        const swapper = this.subSwappers[swap.service_url]
+        if (!swapper) {
+            throw new Error("swapper service not found")
+        }
+        const data = this.getInvoiceSwapData(swap)
+        swapper.SubscribeToInvoiceSwap(data, async (result) => {
+            if (result.ok) {
+                await this.storage.paymentStorage.FinalizeInvoiceSwap(swap.swap_operation_id)
+                this.log("invoice swap completed", { swapOpId: swap.swap_operation_id, txId: swap.tx_id })
+            } else {
+                await this.storage.paymentStorage.FailInvoiceSwap(swap.swap_operation_id, result.error)
+                this.log("invoice swap failed", { swapOpId: swap.swap_operation_id, error: result.error })
+            }
+        }, () => { throw new Error("swap tx already paid") })
+    }
+
+    private getInvoiceSwapData = (swap: InvoiceSwap) => {
+        return {
+            createdResponse: {
+                address: swap.address,
+                claimPublicKey: swap.claim_public_key,
+                id: swap.swap_quote_id,
+                swapTree: swap.swap_tree,
+                timeoutBlockHeight: swap.timeout_block_height,
+                expectedAmount: swap.transaction_amount,
+            },
+            info: {
+                keys: this.GetKeys(swap.ephemeral_private_key),
+                paymentHash: swap.payment_hash,
+            }
+        }
+    }
+
+    private async getInvoiceSwapQuote(swapper: SubmarineSwaps, appUserId: string, invoice: string): Promise<Types.InvoiceSwapQuote> {
+        const feesRes = await swapper.GetFees()
+        if (!feesRes.ok) {
+            throw new Error(feesRes.error)
+        }
+        const decoded = await this.lnd.DecodeInvoice(invoice)
+        const amt = decoded.numSatoshis
+        const fee = Math.ceil((feesRes.fees.percentage / 100) * amt) + feesRes.fees.minerFees
+        const res = await swapper.SwapInvoice(invoice)
+        if (!res.ok) {
+            throw new Error(res.error)
+        }
+        const newSwap = await this.storage.paymentStorage.AddInvoiceSwap({
+            app_user_id: appUserId,
+            swap_quote_id: res.createdResponse.id,
+            swap_tree: JSON.stringify(res.createdResponse.swapTree),
+            timeout_block_height: res.createdResponse.timeoutBlockHeight,
+            ephemeral_public_key: res.pubkey,
+            ephemeral_private_key: res.privKey,
+            invoice: invoice,
+            invoice_amount: amt,
+            transaction_amount: res.createdResponse.expectedAmount,
+            swap_fee_sats: fee,
+            chain_fee_sats: 0,
+            service_url: swapper.getHttpUrl(),
+            address: res.createdResponse.address,
+            claim_public_key: res.createdResponse.claimPublicKey,
+            payment_hash: decoded.paymentHash,
+        })
+        return {
+            swap_operation_id: newSwap.swap_operation_id,
+            invoice: invoice,
+            invoice_amount_sats: amt,
+            address: res.createdResponse.address,
+            transaction_amount_sats: res.createdResponse.expectedAmount,
+            chain_fee_sats: 0,
+            service_fee_sats: 0,
+            service_url: swapper.getHttpUrl(),
+            swap_fee_sats: fee,
+            tx_id: newSwap.tx_id,
+            paid_at_unix: newSwap.paid_at_unix,
+            expires_at_block_height: newSwap.timeout_block_height,
+        }
+    }
+
+    private mapTransactionSwapQuote = (s: TransactionSwap, getServiceFee: (amt: number) => number): Types.TransactionSwapQuote => {
+        const serviceFee = getServiceFee(s.invoice_amount)
+        return {
+            swap_operation_id: s.swap_operation_id,
+            transaction_amount_sats: s.transaction_amount,
+            invoice_amount_sats: s.invoice_amount,
+            chain_fee_sats: s.chain_fee_sats,
+            service_fee_sats: serviceFee,
+            swap_fee_sats: s.swap_fee_sats,
+            expires_at_block_height: s.timeout_block_height,
+            service_url: s.service_url,
+            paid_at_unix: s.paid_at_unix,
+            completed_at_unix: s.completed_at_unix,
+        }
+    }
+
+    ListTxSwaps = async (appUserId: string, payments: UserInvoicePayment[], newOp: (p: UserInvoicePayment) => Types.UserOperation | undefined, getServiceFee: (amt: number) => number): Promise<Types.TxSwapsList> => {
+        const completedSwaps = await this.storage.paymentStorage.ListCompletedTxSwaps(appUserId, payments)
+        const pendingSwaps = await this.storage.paymentStorage.ListPendingTransactionSwaps(appUserId)
+        const quotes: Types.TxSwapOperation[] = pendingSwaps.map(s => ({ quote: this.mapTransactionSwapQuote(s, getServiceFee) }))
+        const swaps: Types.TxSwapOperation[] = completedSwaps.map(s => ({
+            quote: this.mapTransactionSwapQuote(s.swap, getServiceFee),
+            operation_payment: s.payment ? newOp(s.payment) : undefined,
+            address_paid: s.swap.address_paid,
+            tx_id: s.swap.tx_id,
+            failure_reason: s.swap.failure_reason,
+        }))
+        return {
+            swaps: swaps.concat(quotes),
+        }
+    }
+    GetTxSwapQuotes = async (appUserId: string, amt: number, getServiceFee: (decodedAmt: number) => number): Promise<Types.TransactionSwapQuote[]> => {
+        if (!this.settings.getSettings().swapsSettings.enableSwaps) {
+            throw new Error("Swaps are not enabled")
+        }
+        const swappers = Object.values(this.revSwappers)
+        if (swappers.length === 0) {
+            throw new Error("No swap services available")
+        }
+        const res = await Promise.allSettled(swappers.map(sw => this.getTxSwapQuote(sw, appUserId, amt, getServiceFee)))
+        const failures: string[] = []
+        const success: Types.TransactionSwapQuote[] = []
+        for (const r of res) {
+            if (r.status === 'fulfilled') {
+                success.push(r.value)
+            } else {
+                failures.push(r.reason.message ? r.reason.message : r.reason.toString())
+            }
+        }
+        if (success.length === 0) {
+            throw new Error(failures.join("\n"))
+        }
+        return success
+    }
+
+    private async getTxSwapQuote(swapper: ReverseSwaps, appUserId: string, amt: number, getServiceFee: (decodedAmt: number) => number): Promise<Types.TransactionSwapQuote> {
+        this.log("getting transaction swap quote")
+        const feesRes = await swapper.GetFees()
+        if (!feesRes.ok) {
+            throw new Error(feesRes.error)
+        }
+        const { claim, lockup } = feesRes.fees.minerFees
+        const minerFee = claim + lockup
+        const chainTotal = amt + minerFee
+        const res = await swapper.SwapTransaction(chainTotal)
+        if (!res.ok) {
+            throw new Error(res.error)
+        }
+        const decoded = await this.lnd.DecodeInvoice(res.createdResponse.invoice)
+        const swapFee = decoded.numSatoshis - chainTotal
+        const serviceFee = getServiceFee(decoded.numSatoshis)
+        const newSwap = await this.storage.paymentStorage.AddTransactionSwap({
+            app_user_id: appUserId,
+            swap_quote_id: res.createdResponse.id,
+            swap_tree: JSON.stringify(res.createdResponse.swapTree),
+            lockup_address: res.createdResponse.lockupAddress,
+            refund_public_key: res.createdResponse.refundPublicKey,
+            timeout_block_height: res.createdResponse.timeoutBlockHeight,
+            invoice: res.createdResponse.invoice,
+            invoice_amount: decoded.numSatoshis,
+            transaction_amount: chainTotal,
+            swap_fee_sats: swapFee,
+            chain_fee_sats: minerFee,
+            preimage: res.preimage,
+            ephemeral_private_key: res.privKey,
+            ephemeral_public_key: res.pubkey,
+            service_url: swapper.getHttpUrl(),
+        })
+        return {
+            swap_operation_id: newSwap.swap_operation_id,
+            swap_fee_sats: swapFee,
+            invoice_amount_sats: decoded.numSatoshis,
+            transaction_amount_sats: amt,
+            chain_fee_sats: minerFee,
+            service_fee_sats: serviceFee,
+            service_url: swapper.getHttpUrl(),
+            expires_at_block_height: res.createdResponse.timeoutBlockHeight,
+            paid_at_unix: newSwap.paid_at_unix,
+            completed_at_unix: newSwap.completed_at_unix,
+        }
+    }
+
+    async PayAddrWithSwap(appUserId: string, swapOpId: string, address: string, payInvoice: (invoice: string, amt: number) => Promise<void>) {
+        if (!this.settings.getSettings().swapsSettings.enableSwaps) {
+            throw new Error("Swaps are not enabled")
+        }
+        this.log("paying address with swap", { appUserId, swapOpId, address })
+        if (!swapOpId) {
+            throw new Error("request a swap quote before paying an external address")
+        }
+        const txSwap = await this.storage.paymentStorage.GetTransactionSwap(swapOpId, appUserId)
+        if (!txSwap) {
+            throw new Error("swap quote not found")
+        }
+        const info = await this.lnd.GetInfo()
+        if (info.blockHeight >= txSwap.timeout_block_height) {
+            throw new Error("swap timeout")
+        }
+        const swapper = this.revSwappers[txSwap.service_url]
+        if (!swapper) {
+            throw new Error("swapper service not found")
+        }
+        const keys = this.GetKeys(txSwap.ephemeral_private_key)
+        const data: TransactionSwapData = {
+            createdResponse: {
+                id: txSwap.swap_quote_id,
+                invoice: txSwap.invoice,
+                lockupAddress: txSwap.lockup_address,
+                refundPublicKey: txSwap.refund_public_key,
+                swapTree: txSwap.swap_tree,
+                timeoutBlockHeight: txSwap.timeout_block_height,
+                onchainAmount: txSwap.transaction_amount,
+            },
+            info: {
+                destinationAddress: address,
+                keys,
+                chainFee: txSwap.chain_fee_sats,
+                preimage: Buffer.from(txSwap.preimage, 'hex'),
+            }
+        }
+        // the swap and the invoice payment are linked, swap will not start until the invoice payment is started, and will not complete once the invoice payment is completed
+        let swapResult = { ok: false, error: "swap never completed" } as { ok: true, txId: string } | { ok: false, error: string }
+        swapper.SubscribeToTransactionSwap(data, result => {
+            swapResult = result
+        })
+        try {
+            await this.storage.paymentStorage.SetTransactionSwapPaid(swapOpId)
+            await payInvoice(txSwap.invoice, txSwap.invoice_amount)
+            if (!swapResult.ok) {
+                this.log("invoice payment successful, but swap failed")
+                await this.storage.paymentStorage.FailTransactionSwap(swapOpId, address, swapResult.error)
+                throw new Error(swapResult.error)
+            }
+            this.log("swap completed successfully")
+            await this.storage.paymentStorage.FinalizeTransactionSwap(swapOpId, address, swapResult.txId)
+        } catch (err: any) {
+            if (swapResult.ok) {
+                this.log("failed to pay swap invoice, but swap completed successfully", swapResult.txId)
+                await this.storage.paymentStorage.FailTransactionSwap(swapOpId, address, err.message)
+            } else {
+                this.log("failed to pay swap invoice and swap failed", swapResult.error)
+                await this.storage.paymentStorage.FailTransactionSwap(swapOpId, address, swapResult.error)
+            }
+            throw err
+        }
+        const networkFeesTotal = txSwap.chain_fee_sats + txSwap.swap_fee_sats
+        return {
+            txId: swapResult.txId,
+            network_fee: networkFeesTotal
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/services/main/adminManager.ts b/src/services/main/adminManager.ts
index 294635ed..dbde290d 100644
--- a/src/services/main/adminManager.ts
+++ b/src/services/main/adminManager.ts
@@ -5,9 +5,50 @@ import Storage from "../storage/index.js";
 import * as Types from '../../../proto/autogenerated/ts/types.js'
 import LND from "../lnd/lnd.js";
 import SettingsManager from "./settingsManager.js";
-import { Swaps } from "../lnd/swaps.js";
+import { Swaps } from "../lnd/swaps/swaps.js";
+import { defaultInvoiceExpiry } from "../storage/paymentStorage.js";
+import { TrackedProvider } from "../storage/entity/TrackedProvider.js";
+import { NodeInfo } from "../lnd/settings.js";
+import { Invoice, Payment, OutputDetail, Transaction, Payment_PaymentStatus, Invoice_InvoiceState } from "../../../proto/lnd/lightning.js";
+import { LiquidityProvider } from "./liquidityProvider.js";
+/* type TrackedOperation = {
+    ts: number
+    amount: number
+    type: 'user' | 'root'
+}
+
+type AssetOperation = {
+    ts: number
+    amount: number
+    tracked?: TrackedOperation
+}
+type TrackedLndProvider = {
+    confirmedBalance: number
+    unconfirmedBalance: number
+    channelsBalace: number
+    payments: AssetOperation[]
+    invoices: AssetOperation[]
+    incomingTx: AssetOperation[]
+    outgoingTx: AssetOperation[]
+}
+type LndAssetProvider = {
+    pubkey: string
+    tracked?: TrackedLndProvider
+}
+type TrackedLiquidityProvider = {
+    balance: number
+    payments: AssetOperation[]
+    invoices: AssetOperation[]
+}
+type ProviderAssetProvider = {
+    pubkey: string
+    tracked?: TrackedLiquidityProvider
+} */
+const ROOT_OP = Types.TrackedOperationType.ROOT
+const USER_OP = Types.TrackedOperationType.USER
 export class AdminManager {
     settings: SettingsManager
+    liquidityProvider: LiquidityProvider | null = null
     storage: Storage
     log = getLogger({ component: "adminManager" })
     adminNpub = ""
@@ -40,6 +81,10 @@ export class AdminManager {
         this.start()
     }
 
+    attachLiquidityProvider(liquidityProvider: LiquidityProvider) {
+        this.liquidityProvider = liquidityProvider
+    }
+
     attachNostrReset(f: () => Promise<void>) {
         this.nostrReset = f
     }
@@ -260,15 +305,64 @@ export class AdminManager {
         }
     }
 
-    async ListAdminSwaps(): Promise<Types.SwapsList> {
-        return this.swaps.ListSwaps("admin", [], p => undefined, amt => 0)
+    async ListAdminInvoiceSwaps(): Promise<Types.InvoiceSwapsList> {
+        return this.swaps.ListInvoiceSwaps("admin")
+    }
+
+    async GetAdminInvoiceSwapQuotes(req: Types.InvoiceSwapRequest): Promise<Types.InvoiceSwapQuoteList> {
+        const invoice = await this.lnd.NewInvoice(req.amount_sats, "Admin Swap", defaultInvoiceExpiry, { useProvider: false, from: 'system' })
+        const quotes = await this.swaps.GetInvoiceSwapQuotes("admin", invoice.payRequest)
+        return { quotes }
+    }
+
+    async PayAdminInvoiceSwap(req: Types.PayAdminInvoiceSwapRequest): Promise<Types.AdminInvoiceSwapResponse> {
+        const resolvedTxId = await new Promise<string>(res => {
+            this.swaps.PayInvoiceSwap("admin", req.swap_operation_id, req.sat_per_v_byte, async (addr, amt) => {
+                const tx = await this.lnd.PayAddress(addr, amt, req.sat_per_v_byte, "", { useProvider: false, from: 'system' })
+                this.log("paid admin invoice swap", { swapOpId: req.swap_operation_id, txId: tx.txid })
+                await this.storage.metricsStorage.AddRootOperation("chain_payment", tx.txid, amt, true)
+
+                // Fetch the full transaction hex for potential refunds
+                let lockupTxHex: string | undefined
+                let chainFeeSats = 0
+                try {
+                    const txDetails = await this.lnd.GetTx(tx.txid)
+                    chainFeeSats = Number(txDetails.totalFees)
+                    lockupTxHex = txDetails.rawTxHex
+                } catch (err: any) {
+                    this.log("Warning: Could not fetch transaction hex for refund purposes:", err.message)
+                }
+
+                await this.storage.paymentStorage.SetInvoiceSwapTxId(req.swap_operation_id, tx.txid, chainFeeSats, lockupTxHex)
+                this.log("saved admin swap txid", { swapOpId: req.swap_operation_id, txId: tx.txid })
+                res(tx.txid)
+                return { txId: tx.txid }
+            })
+        })
+        return { tx_id: resolvedTxId }
+    }
+
+    async RefundAdminInvoiceSwap(req: Types.RefundAdminInvoiceSwapRequest): Promise<Types.AdminInvoiceSwapResponse> {
+        const info = await this.lnd.GetInfo()
+        const currentHeight = info.blockHeight
+        const address = await this.lnd.NewAddress(Types.AddressType.WITNESS_PUBKEY_HASH, { useProvider: false, from: 'system' })
+        const result = await this.swaps.RefundInvoiceSwap(req.swap_operation_id, req.sat_per_v_byte, address.address, currentHeight)
+        if (result.published) {
+            return { tx_id: result.txId }
+        }
+        await this.lnd.PublishTransaction(result.txHex)
+        return { tx_id: result.txId }
+    }
+
+    async ListAdminTxSwaps(): Promise<Types.TxSwapsList> {
+        return this.swaps.ListTxSwaps("admin", [], p => undefined, amt => 0)
     }
 
     async GetAdminTransactionSwapQuotes(req: Types.TransactionSwapRequest): Promise<Types.TransactionSwapQuoteList> {
         const quotes = await this.swaps.GetTxSwapQuotes("admin", req.transaction_amount_sats, () => 0)
         return { quotes }
     }
-    async PayAdminTransactionSwap(req: Types.PayAdminTransactionSwapRequest): Promise<Types.AdminSwapResponse> {
+    async PayAdminTransactionSwap(req: Types.PayAdminTransactionSwapRequest): Promise<Types.AdminTxSwapResponse> {
         const routingFloor = this.settings.getSettings().lndSettings.routingFeeFloor
         const routingLimit = this.settings.getSettings().lndSettings.routingFeeLimitBps / 10000
 
@@ -282,6 +376,222 @@ export class AdminManager {
             network_fee: swap.network_fee,
         }
     }
+
+    async GetAssetsAndLiabilities(req: Types.AssetsAndLiabilitiesReq): Promise<Types.AssetsAndLiabilities> {
+        const providers = await this.storage.liquidityStorage.GetTrackedProviders()
+
+        const lnds: Types.LndAssetProvider[] = []
+        const liquidityProviders: Types.LiquidityAssetProvider[] = []
+        for (const provider of providers) {
+            if (provider.provider_type === 'lnd') {
+                const lndEntry = await this.GetLndAssetsAndLiabilities(req, provider)
+                lnds.push(lndEntry)
+            } else if (provider.provider_type === 'lnPub') {
+                const liquidityEntry = await this.GetProviderAssetsAndLiabilities(req, provider)
+                liquidityProviders.push(liquidityEntry)
+            }
+        }
+        const usersBalance = await this.storage.paymentStorage.GetTotalUsersBalance(true)
+        return {
+            users_balance: usersBalance,
+            lnds,
+            liquidity_providers: liquidityProviders,
+        }
+    }
+
+    async GetProviderAssetsAndLiabilities(req: Types.AssetsAndLiabilitiesReq, provider: TrackedProvider): Promise<Types.LiquidityAssetProvider> {
+        if (!this.liquidityProvider) {
+            throw new Error("liquidity provider not attached")
+        }
+        if (this.liquidityProvider.GetProviderPubkey() !== provider.provider_pubkey) {
+            return { pubkey: provider.provider_pubkey, tracked: undefined }
+        }
+        const providerOps = await this.liquidityProvider.GetOperations(req.limit_providers || 100)
+        // we only care about invoices cuz they are the only ops we can generate with a provider
+        const invoices: Types.AssetOperation[] = []
+        const payments: Types.AssetOperation[] = []
+        for (const op of providerOps.latestIncomingInvoiceOperations.operations) {
+            const assetOp = await this.GetProviderInvoiceAssetOperation(op)
+            invoices.push(assetOp)
+        }
+        for (const op of providerOps.latestOutgoingInvoiceOperations.operations) {
+            const assetOp = await this.GetProviderPaymentAssetOperation(op)
+            payments.push(assetOp)
+        }
+        const balance = await this.liquidityProvider.GetUserState()
+        return {
+            pubkey: provider.provider_pubkey,
+            tracked: {
+                balance: balance.status === 'OK' ? balance.balance : 0,
+                payments,
+                invoices,
+            }
+        }
+    }
+
+    async GetProviderInvoiceAssetOperation(op: Types.UserOperation): Promise<Types.AssetOperation> {
+        const ts = Number(op.paidAtUnix)
+        const amount = Number(op.amount)
+        const invoice = op.identifier
+        const userInvoice = await this.storage.paymentStorage.GetInvoiceOwner(invoice)
+        if (userInvoice) {
+            const tracked: Types.TrackedOperation = { ts: userInvoice.paid_at_unix, amount: userInvoice.paid_amount, type: USER_OP }
+            return { ts, amount, tracked }
+        }
+        const rootOp = await this.storage.metricsStorage.GetRootOperation("invoice", invoice)
+        if (rootOp) {
+            const tracked: Types.TrackedOperation = { ts: rootOp.at_unix, amount: rootOp.operation_amount, type: ROOT_OP }
+            return { ts, amount, tracked }
+        }
+        return { ts, amount, tracked: undefined }
+    }
+
+    async GetProviderPaymentAssetOperation(op: Types.UserOperation): Promise<Types.AssetOperation> {
+        const ts = Number(op.paidAtUnix)
+        const amount = Number(op.amount)
+        const invoice = op.identifier
+        const userInvoice = await this.storage.paymentStorage.GetPaymentOwner(invoice)
+        if (userInvoice) {
+            const tracked: Types.TrackedOperation = { ts: userInvoice.paid_at_unix, amount: userInvoice.paid_amount, type: USER_OP }
+            return { ts, amount, tracked }
+        }
+        const rootOp = await this.storage.metricsStorage.GetRootOperation("invoice_payment", invoice)
+        if (rootOp) {
+            const tracked: Types.TrackedOperation = { ts: rootOp.at_unix, amount: rootOp.operation_amount, type: ROOT_OP }
+            return { ts, amount, tracked }
+        }
+        return { ts, amount, tracked: undefined }
+    }
+
+    async GetLndAssetsAndLiabilities(req: Types.AssetsAndLiabilitiesReq, provider: TrackedProvider): Promise<Types.LndAssetProvider> {
+        const info = await this.lnd.GetInfo()
+        if (provider.provider_pubkey !== info.identityPubkey) {
+            return { pubkey: provider.provider_pubkey, tracked: undefined }
+        }
+
+        const latestLndPayments = await this.lnd.GetAllPayments(req.limit_payments || 50)
+        const payments: Types.AssetOperation[] = []
+        for (const payment of latestLndPayments.payments) {
+            if (payment.status !== Payment_PaymentStatus.SUCCEEDED) {
+                continue
+            }
+            const assetOp = await this.GetPaymentAssetOperation(payment)
+            payments.push(assetOp)
+        }
+        const invoices: Types.AssetOperation[] = []
+        const paidInvoices = await this.lnd.GetAllInvoices(req.limit_invoices || 100)
+        for (const invoiceEntry of paidInvoices.invoices) {
+            if (invoiceEntry.state !== Invoice_InvoiceState.SETTLED) {
+                continue
+            }
+            const assetOp = await this.GetInvoiceAssetOperation(invoiceEntry)
+            invoices.push(assetOp)
+        }
+        const latestLndTransactions = await this.lnd.GetTransactions(info.blockHeight)
+        const txOuts: Types.AssetOperation[] = []
+        const txIns: Types.AssetOperation[] = []
+        for (const transaction of latestLndTransactions.transactions) {
+            for (const output of transaction.outputDetails) {
+                if (output.isOurAddress) {
+                    const assetOp = await this.GetTxOutAssetOperation(transaction, output)
+                    txOuts.push(assetOp)
+                }
+            }
+            // we only produce TXs with a single output
+            const input = transaction.previousOutpoints.find(p => p.isOurOutput)
+            if (input) {
+                const assetOp = await this.GetTxInAssetOperation(transaction)
+                txIns.push(assetOp)
+            }
+        }
+        const balance = await this.lnd.GetBalance()
+        const channelsBalance = balance.channelsBalance.reduce((acc, c) => acc + Number(c.localBalanceSats), 0)
+        return {
+            pubkey: provider.provider_pubkey,
+            tracked: {
+                confirmed_balance: Number(balance.confirmedBalance),
+                unconfirmed_balance: Number(balance.unconfirmedBalance),
+                channels_balance: channelsBalance,
+                payments,
+                invoices,
+                incoming_tx: txOuts, // tx outputs, are incoming sats
+                outgoing_tx: txIns, // tx inputs, are outgoing sats
+            }
+        }
+    }
+
+    async GetPaymentAssetOperation(payment: Payment): Promise<Types.AssetOperation> {
+        const invoice = payment.paymentRequest
+        const userInvoice = await this.storage.paymentStorage.GetPaymentOwner(invoice)
+        const ts = Number(payment.creationTimeNs / (BigInt(1000_000_000)))
+        const amount = Number(payment.valueSat)
+        if (userInvoice) {
+            const tracked: Types.TrackedOperation = { ts: userInvoice.paid_at_unix, amount: userInvoice.paid_amount, type: USER_OP }
+            return { ts, amount, tracked }
+        }
+        const rootOp = await this.storage.metricsStorage.GetRootOperation("invoice_payment", invoice)
+        if (rootOp) {
+            const tracked: Types.TrackedOperation = { ts: rootOp.at_unix, amount: rootOp.operation_amount, type: ROOT_OP }
+            return { ts, amount, tracked }
+        }
+        return { ts, amount, tracked: undefined }
+    }
+
+    async GetInvoiceAssetOperation(invoiceEntry: Invoice): Promise<Types.AssetOperation> {
+        const invoice = invoiceEntry.paymentRequest
+        const ts = Number(invoiceEntry.settleDate)
+        const amount = Number(invoiceEntry.amtPaidSat)
+        const userInvoice = await this.storage.paymentStorage.GetInvoiceOwner(invoice)
+        if (userInvoice) {
+            const tracked: Types.TrackedOperation = { ts: userInvoice.paid_at_unix, amount: userInvoice.paid_amount, type: USER_OP }
+            return { ts, amount, tracked }
+        }
+        const rootOp = await this.storage.metricsStorage.GetRootOperation("invoice", invoice)
+        if (rootOp) {
+            const tracked: Types.TrackedOperation = { ts: rootOp.at_unix, amount: rootOp.operation_amount, type: ROOT_OP }
+            return { ts, amount, tracked }
+        }
+        return { ts, amount, tracked: undefined }
+    }
+
+    async GetTxInAssetOperation(tx: Transaction): Promise<Types.AssetOperation> {
+        const ts = Number(tx.timeStamp)
+        const amount = Number(tx.amount)
+        const userOp = await this.storage.paymentStorage.GetTxHashPaymentOwner(tx.txHash)
+        if (userOp) {
+            // user transaction payments are actually deprecated from lnd, but we keep this for consstency
+            const tracked: Types.TrackedOperation = { ts: userOp.paid_at_unix, amount: userOp.paid_amount, type: USER_OP }
+            return { ts, amount, tracked }
+        }
+        const rootOp = await this.storage.metricsStorage.GetRootOperation("chain_payment", tx.txHash)
+        if (rootOp) {
+            const tracked: Types.TrackedOperation = { ts: rootOp.at_unix, amount: rootOp.operation_amount, type: ROOT_OP }
+            return { ts, amount, tracked }
+        }
+        return { ts, amount, tracked: undefined }
+    }
+
+    async GetTxOutAssetOperation(tx: Transaction, output: OutputDetail): Promise<Types.AssetOperation> {
+        const ts = Number(tx.timeStamp)
+        const amount = Number(output.amount)
+        const outputIndex = Number(output.outputIndex)
+        const userOp = await this.storage.paymentStorage.GetAddressReceivingTransactionOwner(output.address, tx.txHash)
+        if (userOp) {
+            const tracked: Types.TrackedOperation = { ts: userOp.paid_at_unix, amount: userOp.paid_amount, type: USER_OP }
+            return { ts, amount, tracked }
+        }
+        const rootOp = await this.storage.metricsStorage.GetRootAddressTransaction(output.address, tx.txHash, outputIndex)
+        if (rootOp) {
+            const tracked: Types.TrackedOperation = { ts: rootOp.at_unix, amount: rootOp.operation_amount, type: ROOT_OP }
+            return { ts, amount, tracked }
+        }
+        return { ts, amount, tracked: undefined }
+    }
+
+    async BumpTx(req: Types.BumpTx): Promise<void> {
+        await this.lnd.BumpFee(req.txid, req.output_index, req.sat_per_vbyte)
+    }
+
 }
 
 const getDataPath = (dataDir: string, dataPath: string) => {
diff --git a/src/services/main/appUserManager.ts b/src/services/main/appUserManager.ts
index 9db8b5e6..b9bf8742 100644
--- a/src/services/main/appUserManager.ts
+++ b/src/services/main/appUserManager.ts
@@ -66,7 +66,7 @@ export default class {
         const appUser = await this.storage.applicationStorage.GetAppUserFromUser(app, user.user_id)
 
         if (!appUser) {
-            throw new Error(`app user ${ctx.user_id} not found`) // TODO: fix logs doxing
+            throw new Error("app user not found")
         }
         const nostrSettings = this.settings.getSettings().nostrRelaySettings
         const { max, serviceFeeFloor, serviceFeeBps } = this.applicationManager.paymentManager.GetMaxPayableInvoice(user.balance_sats)
@@ -82,7 +82,8 @@ export default class {
             ndebit: ndebitEncode({ pubkey: app.nostr_public_key!, pointer: appUser.identifier, relay: nostrSettings.relays[0] }),
             nmanage: nmanageEncode({ pubkey: app.nostr_public_key!, pointer: appUser.identifier, relay: nostrSettings.relays[0] }),
             callback_url: appUser.callback_url,
-            bridge_url: this.settings.getSettings().serviceSettings.bridgeUrl
+            bridge_url: this.settings.getSettings().serviceSettings.bridgeUrl,
+            topic_id: appUser.topic_id
         }
     }
 
@@ -131,12 +132,12 @@ export default class {
         }
 
         this.log("Found", toDelete.length, "inactive users to delete")
-        // await this.RemoveUsers(toDelete)
+        await this.LockUsers(toDelete.map(u => u.userId))
     }
 
     async CleanupNeverActiveUsers() {
         this.log("Cleaning up never active users")
-        const inactiveUsers = await this.storage.userStorage.GetInactiveUsers(30)
+        const inactiveUsers = await this.storage.userStorage.GetInactiveUsers(90)
         const toDelete: { userId: string, appUserIds: string[] }[] = []
         for (const u of inactiveUsers) {
             const user = await this.storage.userStorage.GetUser(u.user_id)
@@ -160,13 +161,26 @@ export default class {
         }
 
         this.log("Found", toDelete.length, "never active users to delete")
-        // await this.RemoveUsers(toDelete) TODO: activate deletion
+        await this.RemoveUsers(toDelete)
+    }
+
+    async LockUsers(toLock: string[]) {
+        this.log("Locking", toLock.length, "users")
+        for (const userId of toLock) {
+            await this.storage.userStorage.BanUser(userId)
+        }
+        this.log("Locked users")
     }
 
     async RemoveUsers(toDelete: { userId: string, appUserIds: string[] }[]) {
         this.log("Deleting", toDelete.length, "inactive users")
         for (let i = 0; i < toDelete.length; i++) {
             const { userId, appUserIds } = toDelete[i]
+            const user = await this.storage.userStorage.FindUser(userId)
+            if (!user || user.balance_sats > 0) {
+                if (user) this.log("Skipping user", userId, "has balance", user.balance_sats)
+                continue
+            }
             this.log("Deleting user", userId, "progress", i + 1, "/", toDelete.length)
             await this.storage.StartTransaction(async tx => {
                 for (const appUserId of appUserIds) {
@@ -174,13 +188,18 @@ export default class {
                     await this.storage.offerStorage.DeleteUserOffers(appUserId, tx)
                     await this.storage.debitStorage.RemoveUserDebitAccess(appUserId, tx)
                     await this.storage.applicationStorage.RemoveAppUserDevices(appUserId, tx)
-
                 }
                 await this.storage.paymentStorage.RemoveUserInvoices(userId, tx)
                 await this.storage.productStorage.RemoveUserProducts(userId, tx)
                 await this.storage.paymentStorage.RemoveUserEphemeralKeys(userId, tx)
+                await this.storage.paymentStorage.RemoveUserInvoicePayments(userId, tx)
+                await this.storage.paymentStorage.RemoveUserTransactionPayments(userId, tx)
+                await this.storage.paymentStorage.RemoveUserToUserPayments(userId, tx)
+                await this.storage.paymentStorage.RemoveUserReceivingAddresses(userId, tx)
+                await this.storage.userStorage.DeleteUserAccess(userId, tx)
+                await this.storage.applicationStorage.RemoveAppUsersAndBaseUsers(appUserIds, userId, tx)
             })
         }
         this.log("Cleaned up inactive users")
     }
-}
\ No newline at end of file
+}
diff --git a/src/services/main/applicationManager.ts b/src/services/main/applicationManager.ts
index aaafd8a7..ecfc7b85 100644
--- a/src/services/main/applicationManager.ts
+++ b/src/services/main/applicationManager.ts
@@ -169,7 +169,8 @@ export default class {
                 ndebit: ndebitEncode({ pubkey: app.nostr_public_key!, pointer: u.identifier, relay: nostrSettings.relays[0] }),
                 nmanage: nmanageEncode({ pubkey: app.nostr_public_key!, pointer: u.identifier, relay: nostrSettings.relays[0] }),
                 callback_url: u.callback_url,
-                bridge_url: this.settings.getSettings().serviceSettings.bridgeUrl
+                bridge_url: this.settings.getSettings().serviceSettings.bridgeUrl,
+                topic_id: u.topic_id
 
             },
             max_withdrawable: max
@@ -227,7 +228,8 @@ export default class {
                 ndebit: ndebitEncode({ pubkey: app.nostr_public_key!, pointer: user.identifier, relay: nostrSettings.relays[0] }),
                 nmanage: nmanageEncode({ pubkey: app.nostr_public_key!, pointer: user.identifier, relay: nostrSettings.relays[0] }),
                 callback_url: user.callback_url,
-                bridge_url: this.settings.getSettings().serviceSettings.bridgeUrl
+                bridge_url: this.settings.getSettings().serviceSettings.bridgeUrl,
+                topic_id: user.topic_id
             },
         }
     }
diff --git a/src/services/main/debitManager.ts b/src/services/main/debitManager.ts
index 28579d31..53375217 100644
--- a/src/services/main/debitManager.ts
+++ b/src/services/main/debitManager.ts
@@ -153,13 +153,14 @@ export class DebitManager {
     }
 
     notifyPaymentSuccess = (debitRes: NdebitSuccess, event: { pub: string, id: string, appId: string }) => {
+        this.logger("✅ [DEBIT REQUEST] Payment successful, sending OK response to", event.pub.slice(0, 16) + "...", "for event", event.id.slice(0, 16) + "...")
         this.sendDebitResponse(debitRes, event)
     }
 
     sendDebitResponse = (debitRes: NdebitFailure | NdebitSuccess, event: { pub: string, id: string, appId: string }) => {
+        this.logger("📤 [DEBIT RESPONSE] Sending Kind 21002 response:", JSON.stringify(debitRes), "to", event.pub.slice(0, 16) + "...")
         const e = newNdebitResponse(JSON.stringify(debitRes), event)
         this.storage.NostrSender().Send({ type: 'app', appId: event.appId }, { type: 'event', event: e, encrypt: { toPub: event.pub } })
-
     }
 
     payNdebitInvoice = async (event: NostrEvent, pointerdata: NdebitData): Promise<HandleNdebitRes> => {
diff --git a/src/services/main/index.ts b/src/services/main/index.ts
index 3d885681..81de5ada 100644
--- a/src/services/main/index.ts
+++ b/src/services/main/index.ts
@@ -72,6 +72,7 @@ export default class {
         this.unlocker = unlocker
         const updateProviderBalance = (b: number) => this.storage.liquidityStorage.IncrementTrackedProviderBalance('lnPub', settings.getSettings().liquiditySettings.liquidityProviderPub, b)
         this.liquidityProvider = new LiquidityProvider(() => this.settings.getSettings().liquiditySettings, this.utils, this.invoicePaidCb, updateProviderBalance)
+        adminManager.attachLiquidityProvider(this.liquidityProvider)
         this.rugPullTracker = new RugPullTracker(this.storage, this.liquidityProvider)
         const lndGetSettings = () => ({
             lndSettings: settings.getSettings().lndSettings,
@@ -161,19 +162,23 @@ export default class {
     NewBlockHandler = async (height: number, skipMetrics?: boolean) => {
         let confirmed: (PendingTx & { confs: number; })[]
         let log = getLogger({})
+        log("NewBlockHandler called", JSON.stringify({ height, skipMetrics }))
         this.storage.paymentStorage.DeleteExpiredTransactionSwaps(height)
             .catch(err => log(ERROR, "failed to delete expired transaction swaps", err.message || err))
+        this.storage.paymentStorage.DeleteExpiredInvoiceSwaps(height)
+            .catch(err => log(ERROR, "failed to delete expired invoice swaps", err.message || err))
         try {
             const balanceEvents = await this.paymentManager.GetLndBalance()
             if (!skipMetrics) {
                 await this.metricsManager.NewBlockCb(height, balanceEvents)
             }
-            confirmed = await this.paymentManager.CheckNewlyConfirmedTxs(height)
+            confirmed = await this.paymentManager.CheckNewlyConfirmedTxs()
             await this.liquidityManager.onNewBlock()
         } catch (err: any) {
             log(ERROR, "failed to check transactions after new block", err.message || err)
             return
         }
+        log("NewBlockHandler new confirmed transactions", confirmed.length)
         await Promise.all(confirmed.map(async c => {
             if (c.type === 'outgoing') {
                 await this.storage.paymentStorage.UpdateUserTransactionPayment(c.tx.serial_id, { confs: c.confs })
@@ -208,6 +213,7 @@ export default class {
 
     addressPaidCb: AddressPaidCb = (txOutput, address, amount, used, broadcastHeight) => {
         return this.storage.StartTransaction(async tx => {
+            getLogger({})("addressPaidCb called", JSON.stringify({ txOutput, address, amount, used, broadcastHeight }))
             // On-chain payments not supported when bypass is enabled
             if (this.liquidityProvider.getSettings().useOnlyLiquidityProvider) {
                 getLogger({})("addressPaidCb called but USE_ONLY_LIQUIDITY_PROVIDER is enabled, ignoring")
@@ -419,13 +425,36 @@ export default class {
         if (devices.length === 0 || !app.nostr_public_key || !app.nostr_private_key || !appUser.nostr_public_key) {
             return
         }
+
         const tokens = devices.map(d => d.firebase_messaging_token)
         const ck = nip44.getConversationKey(Buffer.from(app.nostr_private_key, 'hex'), appUser.nostr_public_key)
-        const j = JSON.stringify(op)
+
+        let payloadToEncrypt: Types.PushNotificationPayload;
+        if (op.inbound) {
+            payloadToEncrypt = {
+                data: {
+                    type: Types.PushNotificationPayload_data_type.RECEIVED_OPERATION,
+                    received_operation: op
+                }
+            }
+        } else {
+            payloadToEncrypt = {
+                data: {
+                    type: Types.PushNotificationPayload_data_type.SENT_OPERATION,
+                    sent_operation: op
+                }
+            }
+        }
+        const j = JSON.stringify(payloadToEncrypt)
         const encrypted = nip44.encrypt(j, ck)
-        const encryptedData: { encrypted: string, app_npub_hex: string } = { encrypted, app_npub_hex: app.nostr_public_key }
+
+        const envelope: Types.PushNotificationEnvelope = {
+            topic_id: appUser.topic_id,
+            app_npub_hex: app.nostr_public_key,
+            encrypted_payload: encrypted
+        }
         const notification: ShockPushNotification = {
-            message: JSON.stringify(encryptedData),
+            message: JSON.stringify(envelope),
             body,
             title
         }
diff --git a/src/services/main/init.ts b/src/services/main/init.ts
index 3cbba602..946061fb 100644
--- a/src/services/main/init.ts
+++ b/src/services/main/init.ts
@@ -11,7 +11,7 @@ import { AdminManager } from "./adminManager.js"
 import SettingsManager from "./settingsManager.js"
 import { LoadStorageSettingsFromEnv } from "../storage/index.js"
 import { NostrSender } from "../nostr/sender.js"
-import { Swaps } from "../lnd/swaps.js"
+import { Swaps } from "../lnd/swaps/swaps.js"
 export type AppData = {
     privateKey: string;
     publicKey: string;
@@ -79,6 +79,7 @@ export const initMainHandler = async (log: PubLogger, settingsManager: SettingsM
     await mainHandler.paymentManager.CleanupOldUnpaidInvoices()
     await mainHandler.appUserManager.CleanupInactiveUsers()
     await mainHandler.appUserManager.CleanupNeverActiveUsers()
+    await swaps.ResumeInvoiceSwaps()
     await mainHandler.paymentManager.watchDog.Start()
     return { mainHandler, apps, localProviderClient, wizard, adminManager }
 }
diff --git a/src/services/main/liquidityProvider.ts b/src/services/main/liquidityProvider.ts
index 1f8fe2dd..a39f86a6 100644
--- a/src/services/main/liquidityProvider.ts
+++ b/src/services/main/liquidityProvider.ts
@@ -277,14 +277,14 @@ export class LiquidityProvider {
         return res
     }
 
-    GetOperations = async () => {
+    GetOperations = async (max = 200) => {
         if (!this.IsReady()) {
             throw new Error("liquidity provider is not ready yet, disabled or unreachable")
         }
         const res = await this.client.GetUserOperations({
             latestIncomingInvoice: { ts: 0, id: 0 }, latestOutgoingInvoice: { ts: 0, id: 0 },
             latestIncomingTx: { ts: 0, id: 0 }, latestOutgoingTx: { ts: 0, id: 0 }, latestIncomingUserToUserPayment: { ts: 0, id: 0 },
-            latestOutgoingUserToUserPayment: { ts: 0, id: 0 }, max_size: 200
+            latestOutgoingUserToUserPayment: { ts: 0, id: 0 }, max_size: max
         })
         if (res.status === 'ERROR') {
             this.log("error getting operations", res.reason)
diff --git a/src/services/main/paymentManager.ts b/src/services/main/paymentManager.ts
index c68020dc..7d96898d 100644
--- a/src/services/main/paymentManager.ts
+++ b/src/services/main/paymentManager.ts
@@ -18,7 +18,7 @@ import { LiquidityManager } from './liquidityManager.js'
 import { Utils } from '../helpers/utilsWrapper.js'
 import { UserInvoicePayment } from '../storage/entity/UserInvoicePayment.js'
 import SettingsManager from './settingsManager.js'
-import { Swaps, TransactionSwapData } from '../lnd/swaps.js'
+import { Swaps } from '../lnd/swaps/swaps.js'
 import { Transaction, OutputDetail } from '../../../proto/lnd/lightning.js'
 import { LndAddress } from '../lnd/lnd.js'
 import Metrics from '../metrics/index.js'
@@ -201,24 +201,11 @@ export default class {
             } else {
                 log("no missed chain transactions found")
             }
-            await this.reprocessStuckPendingTx(log, currentHeight)
         } catch (err: any) {
             log(ERROR, "failed to check for missed chain transactions:", err.message || err)
         }
     }
 
-    reprocessStuckPendingTx = async (log: PubLogger, currentHeight: number) => {
-        const { incoming } = await this.storage.paymentStorage.GetPendingTransactions()
-        const found = incoming.find(t => t.broadcast_height < currentHeight - 100)
-        if (found) {
-            log("found a possibly stuck pending transaction, reprocessing with full transaction history")
-            // There is a pending transaction more than 100 blocks old, this is likely a transaction
-            // that has a broadcast height higher than it actually is, so its not getting picked up when being processed
-            // by calling new block cb with height of 1, we make sure that even if the transaction has a newer height, it will still be processed
-            await this.newBlockCb(1, true)
-        }
-    }
-
     private async getLatestTransactions(log: PubLogger): Promise<{ txs: Transaction[], currentHeight: number, lndPubkey: string, startHeight: number }> {
         const lndInfo = await this.lnd.GetInfo()
         const lndPubkey = lndInfo.identityPubkey
@@ -273,14 +260,14 @@ export default class {
     private async processRootAddressOutput(output: OutputDetail, tx: Transaction, addresses: LndAddress[], log: PubLogger): Promise<boolean> {
         const addr = addresses.find(a => a.address === output.address)
         if (!addr) {
-            throw new Error(`address ${output.address} not found in list of addresses`)
+            throw new Error(`root address ${output.address} not found in list of addresses`)
         }
         if (addr.change) {
             log(`ignoring change address ${output.address}`)
             return false
         }
         const outputIndex = Number(output.outputIndex)
-        const existingRootOp = await this.metrics.GetRootAddressTransaction(output.address, tx.txHash, outputIndex)
+        const existingRootOp = await this.storage.metricsStorage.GetRootAddressTransaction(output.address, tx.txHash, outputIndex)
         if (existingRootOp) {
             return false
         }
@@ -302,8 +289,11 @@ export default class {
         const amount = Number(output.amount)
         const outputIndex = Number(output.outputIndex)
         log(`processing missed chain tx: address=${output.address}, txHash=${tx.txHash}, amount=${amount}, outputIndex=${outputIndex}`)
-        this.addressPaidCb({ hash: tx.txHash, index: outputIndex }, output.address, amount, 'lnd', startHeight)
-            .catch(err => log(ERROR, "failed to process user address output:", err.message || err))
+        try {
+            await this.addressPaidCb({ hash: tx.txHash, index: outputIndex }, output.address, amount, 'lnd', startHeight)
+        } catch (err: any) {
+            log(ERROR, "failed to process user address output:", err.message || err)
+        }
         return true
     }
 
@@ -605,9 +595,15 @@ export default class {
 
     async PayInternalAddress(ctx: Types.UserContext, req: Types.PayAddressRequest): Promise<Types.PayAddressResponse> {
         this.log("paying internal address")
+        let amount = req.amountSats
         if (req.swap_operation_id) {
+            const swap = await this.storage.paymentStorage.GetTransactionSwap(req.swap_operation_id, ctx.app_user_id)
+            amount = amount > 0 ? amount : swap?.invoice_amount || 0
             await this.storage.paymentStorage.DeleteTransactionSwap(req.swap_operation_id)
         }
+        if (amount <= 0) {
+            throw new Error("invalid tx amount")
+        }
         const { blockHeight } = await this.lnd.GetInfo()
         const app = await this.storage.applicationStorage.GetApplication(ctx.app_id)
         const isManagedUser = ctx.user_id !== app.owner.user_id
@@ -634,11 +630,13 @@ export default class {
         }
     }
 
-    async ListSwaps(ctx: Types.UserContext): Promise<Types.SwapsList> {
-        const payments = await this.storage.paymentStorage.ListSwapPayments(ctx.app_user_id)
+    async ListTxSwaps(ctx: Types.UserContext): Promise<Types.TxSwapsList> {
+        console.log("listing tx swaps", { appUserId: ctx.app_user_id })
+        const payments = await this.storage.paymentStorage.ListTxSwapPayments(ctx.app_user_id)
+        console.log("payments", payments.length)
         const app = await this.storage.applicationStorage.GetApplication(ctx.app_id)
         const isManagedUser = ctx.user_id !== app.owner.user_id
-        return this.swaps.ListSwaps(ctx.app_user_id, payments, p => {
+        return this.swaps.ListTxSwaps(ctx.app_user_id, payments, p => {
             const opId = `${Types.UserOperationType.OUTGOING_TX}-${p.serial_id}`
             return this.newInvoicePaymentOperation({ amount: p.paid_amount, confirmed: p.paid_at_unix !== 0, invoice: p.invoice, opId, networkFee: p.routing_fees, serviceFee: p.service_fees, paidAtUnix: p.paid_at_unix })
         }, amt => this.getSendServiceFee(Types.UserOperationType.OUTGOING_INVOICE, amt, isManagedUser))
@@ -973,29 +971,38 @@ export default class {
         return { amount: payment.paid_amount, fees: payment.service_fees }
     }
 
-    async CheckNewlyConfirmedTxs(height: number) {
-        const pending = await this.storage.paymentStorage.GetPendingTransactions()
-        let lowestHeight = height
-        const map: Record<string, PendingTx> = {}
-
-        const checkTx = (t: PendingTx) => {
-            if (t.tx.broadcast_height < lowestHeight) { lowestHeight = t.tx.broadcast_height }
-            map[t.tx.tx_hash] = t
-        }
-        pending.incoming.forEach(t => checkTx({ type: "incoming", tx: t }))
-        pending.outgoing.forEach(t => checkTx({ type: "outgoing", tx: t }))
-        const { transactions } = await this.lnd.GetTransactions(lowestHeight)
-        const newlyConfirmedTxs = transactions.map(tx => {
-            const { txHash, numConfirmations: confs, amount: amt } = tx
-            const t = map[txHash]
-            if (!t || confs === 0) {
-                return
-            }
+    private async getTxConfs(txHash: string): Promise<number> {
+        try {
+            const info = await this.lnd.GetTx(txHash)
+            const { numConfirmations: confs, amount: amt } = info
             if (confs > 2 || (amt <= confInTwo && confs > 1) || (amt <= confInOne && confs > 0)) {
-                return { ...t, confs }
+                return confs
             }
-        })
-        return newlyConfirmedTxs.filter(t => t !== undefined) as (PendingTx & { confs: number })[]
+        } catch (err: any) {
+            getLogger({})("failed to get tx info", err.message || err)
+        }
+        return 0
+    }
+
+    async CheckNewlyConfirmedTxs() {
+        const pending = await this.storage.paymentStorage.GetPendingTransactions()
+        let log = getLogger({})
+        log("CheckNewlyConfirmedTxs ", pending.incoming.length, "incoming", pending.outgoing.length, "outgoing")
+        const confirmedIncoming: (PendingTx & { confs: number })[] = []
+        const confirmedOutgoing: (PendingTx & { confs: number })[] = []
+        for (const tx of pending.incoming) {
+            const confs = await this.getTxConfs(tx.tx_hash)
+            if (confs > 0) {
+                confirmedIncoming.push({ type: "incoming", tx: tx, confs })
+            }
+        }
+        for (const tx of pending.outgoing) {
+            const confs = await this.getTxConfs(tx.tx_hash)
+            if (confs > 0) {
+                confirmedOutgoing.push({ type: "outgoing", tx: tx, confs })
+            }
+        }
+        return confirmedIncoming.concat(confirmedOutgoing)
     }
 
     async CleanupOldUnpaidInvoices() {
diff --git a/src/services/main/sanityChecker.ts b/src/services/main/sanityChecker.ts
index 6ef7419a..cb0ecb75 100644
--- a/src/services/main/sanityChecker.ts
+++ b/src/services/main/sanityChecker.ts
@@ -226,7 +226,7 @@ export default class SanityChecker {
 
     async VerifyEventsLog() {
         this.events = await this.storage.eventsLog.GetAllLogs()
-        this.invoices = (await this.lnd.GetAllPaidInvoices(1000)).invoices
+        this.invoices = (await this.lnd.GetAllInvoices(1000)).invoices
         this.payments = (await this.lnd.GetAllPayments(1000)).payments
 
         this.incrementSources = {}
diff --git a/src/services/main/watchdog.ts b/src/services/main/watchdog.ts
index 778e09ce..d9d585ba 100644
--- a/src/services/main/watchdog.ts
+++ b/src/services/main/watchdog.ts
@@ -29,6 +29,7 @@ export class Watchdog {
     ready = false
     interval: NodeJS.Timer;
     lndPubKey: string;
+    lastHandlerRootOpsAtUnix = 0
     constructor(settings: SettingsManager, liquidityManager: LiquidityManager, lnd: LND, storage: Storage, utils: Utils, rugPullTracker: RugPullTracker) {
         this.lnd = lnd;
         this.settings = settings;
@@ -67,7 +68,7 @@ export class Watchdog {
         await this.getTracker()
         const totalUsersBalance = await this.storage.paymentStorage.GetTotalUsersBalance()
         this.utils.stateBundler.AddBalancePoint('usersBalance', totalUsersBalance)
-        const { totalExternal, otherExternal } = await this.getAggregatedExternalBalance()
+        const { totalExternal } = await this.getAggregatedExternalBalance()
         this.initialLndBalance = totalExternal
         this.initialUsersBalance = totalUsersBalance
         const fwEvents = await this.lnd.GetForwardingHistory(0, this.startedAtUnix)
@@ -76,8 +77,6 @@ export class Watchdog {
         const paymentFound = await this.storage.paymentStorage.GetMaxPaymentIndex()
         const knownMaxIndex = paymentFound.length > 0 ? Math.max(paymentFound[0].paymentIndex, 0) : 0
         this.latestPaymentIndexOffset = await this.lnd.GetLatestPaymentIndex(knownMaxIndex)
-        const other = { ilnd: this.initialLndBalance, hf: this.accumulatedHtlcFees, iu: this.initialUsersBalance, tu: totalUsersBalance, oext: otherExternal }
-        //getLogger({ component: 'watchdog_debug2' })(JSON.stringify({ deltaLnd: 0, deltaUsers: 0, totalExternal, latestIndex: this.latestPaymentIndexOffset, other }))
         this.interval = setInterval(() => {
             if (this.latestCheckStart + (1000 * 58) < Date.now()) {
                 this.PaymentRequested()
@@ -93,7 +92,49 @@ export class Watchdog {
         fwEvents.forwardingEvents.forEach((event) => {
             this.accumulatedHtlcFees += Number(event.fee)
         })
+    }
 
+    handleRootOperations = async () => {
+        let pendingChange = 0
+        const pendingChainPayments = await this.storage.metricsStorage.GetPendingChainPayments()
+        for (const payment of pendingChainPayments) {
+            try {
+                const tx = await this.lnd.GetTx(payment.operation_identifier)
+                if (tx.numConfirmations > 0) {
+                    await this.storage.metricsStorage.SetRootOpConfirmed(payment.serial_id)
+                    continue
+                }
+                tx.outputDetails.forEach(o => pendingChange += o.isOurAddress ? Number(o.amount) : 0)
+            } catch (err: any) {
+                this.log("Error getting tx for root operation", err.message || err)
+            }
+
+        }
+        let newReceived = 0
+        let newSpent = 0
+        if (this.lastHandlerRootOpsAtUnix === 0) {
+            this.lastHandlerRootOpsAtUnix = Math.floor(Date.now() / 1000)
+            return { newReceived, newSpent, pendingChange }
+        }
+
+        const newOps = await this.storage.metricsStorage.GetRootOperations({ from: this.lastHandlerRootOpsAtUnix })
+        newOps.forEach(o => {
+            switch (o.operation_type) {
+                case 'chain_payment':
+                    newSpent += Number(o.operation_amount)
+                    break
+                case 'invoice_payment':
+                    newSpent += Number(o.operation_amount)
+                    break
+                case 'chain':
+                    newReceived += Number(o.operation_amount)
+                    break
+                case 'invoice':
+                    newReceived += Number(o.operation_amount)
+                    break
+            }
+        })
+        return { newReceived, newSpent, pendingChange }
     }
 
     getAggregatedExternalBalance = async () => {
@@ -101,8 +142,9 @@ export class Watchdog {
         const feesPaidForLiquidity = this.liquidityManager.GetPaidFees()
         const pb = await this.rugPullTracker.CheckProviderBalance()
         const providerBalance = pb.prevBalance || pb.balance
-        const otherExternal = { pb: providerBalance, f: feesPaidForLiquidity, lnd: totalLndBalance, olnd: othersFromLnd }
-        return { totalExternal: totalLndBalance + providerBalance + feesPaidForLiquidity, otherExternal }
+        const { newReceived, newSpent, pendingChange } = await this.handleRootOperations()
+        const opsTotal = newReceived + pendingChange - newSpent
+        return { totalExternal: totalLndBalance + providerBalance + feesPaidForLiquidity + opsTotal }
     }
 
     checkBalanceUpdate = async (deltaLnd: number, deltaUsers: number) => {
@@ -187,7 +229,7 @@ export class Watchdog {
         }
         const totalUsersBalance = await this.storage.paymentStorage.GetTotalUsersBalance()
         this.utils.stateBundler.AddBalancePoint('usersBalance', totalUsersBalance)
-        const { totalExternal, otherExternal } = await this.getAggregatedExternalBalance()
+        const { totalExternal } = await this.getAggregatedExternalBalance()
         this.utils.stateBundler.AddBalancePoint('accumulatedHtlcFees', this.accumulatedHtlcFees)
         const deltaLnd = totalExternal - (this.initialLndBalance + this.accumulatedHtlcFees)
         const deltaUsers = totalUsersBalance - this.initialUsersBalance
@@ -196,8 +238,6 @@ export class Watchdog {
         const knownMaxIndex = Math.max(maxFromDb, this.latestPaymentIndexOffset)
         const newLatest = await this.lnd.GetLatestPaymentIndex(knownMaxIndex)
         const historyMismatch = newLatest > knownMaxIndex
-        const other = { ilnd: this.initialLndBalance, hf: this.accumulatedHtlcFees, iu: this.initialUsersBalance, tu: totalUsersBalance, km: knownMaxIndex, nl: newLatest, oext: otherExternal }
-        //getLogger({ component: 'watchdog_debug2' })(JSON.stringify({ deltaLnd, deltaUsers, totalExternal, other }))
         const deny = await this.checkBalanceUpdate(deltaLnd, deltaUsers)
         if (historyMismatch) {
             getLogger({ component: 'bark' })("History mismatch detected in absolute update, locking outgoing operations")
diff --git a/src/services/metrics/index.ts b/src/services/metrics/index.ts
index 3dbafedb..9e23b665 100644
--- a/src/services/metrics/index.ts
+++ b/src/services/metrics/index.ts
@@ -414,9 +414,7 @@ export default class Handler {
         await this.storage.metricsStorage.AddRootOperation("chain", `${address}:${txOutput.hash}:${txOutput.index}`, amount)
     }
 
-    async GetRootAddressTransaction(address: string, txHash: string, index: number) {
-        return this.storage.metricsStorage.GetRootOperation("chain", `${address}:${txHash}:${index}`)
-    }
+
 
     async AddRootInvoicePaid(paymentRequest: string, amount: number) {
         await this.storage.metricsStorage.AddRootOperation("invoice", paymentRequest, amount)
@@ -425,8 +423,13 @@ export default class Handler {
 
 const mapRootOpType = (opType: string): Types.OperationType => {
     switch (opType) {
-        case "chain": return Types.OperationType.CHAIN_OP
-        case "invoice": return Types.OperationType.INVOICE_OP
+        case "chain_payment":
+        case "chain":
+            return Types.OperationType.CHAIN_OP
+        case "invoice_payment":
+        case "invoice":
+            return Types.OperationType.INVOICE_OP
+
         default: throw new Error("Unknown operation type")
     }
 }
\ No newline at end of file
diff --git a/src/services/nostr/handler.ts b/src/services/nostr/handler.ts
index d1fa46ec..b9ecfe70 100644
--- a/src/services/nostr/handler.ts
+++ b/src/services/nostr/handler.ts
@@ -132,12 +132,12 @@ const handleNostrSettings = (settings: NostrSettings) => {
         send(event)
     })
 } */
-const sendToNostr: NostrSend = (initiator, data, relays) => {
+const sendToNostr: NostrSend = async (initiator, data, relays) => {
     if (!subProcessHandler) {
         getLogger({ component: "nostrMiddleware" })(ERROR, "nostr was not initialized")
         return
     }
-    subProcessHandler.Send(initiator, data, relays)
+    await subProcessHandler.Send(initiator, data, relays)
 }
 
 send({ type: 'ready' })
diff --git a/src/services/nostr/index.ts b/src/services/nostr/index.ts
index 3dce7b41..ffa636b6 100644
--- a/src/services/nostr/index.ts
+++ b/src/services/nostr/index.ts
@@ -11,28 +11,69 @@ export default class NostrSubprocess {
     utils: Utils
     awaitingPongs: (() => void)[] = []
     log = getLogger({})
+    latestRestart = 0
+    private settings: NostrSettings
+    private eventCallback: EventCallback
+    private beaconCallback: BeaconCallback
+    private isShuttingDown = false
+
     constructor(settings: NostrSettings, utils: Utils, eventCallback: EventCallback, beaconCallback: BeaconCallback) {
         this.utils = utils
+        this.settings = settings
+        this.eventCallback = eventCallback
+        this.beaconCallback = beaconCallback
+        this.startSubProcess()
+    }
+
+    private cleanupProcess() {
+        if (this.childProcess) {
+            this.childProcess.removeAllListeners()
+            if (!this.childProcess.killed) {
+                this.childProcess.kill('SIGTERM')
+            }
+        }
+    }
+
+    private startSubProcess() {
+        this.cleanupProcess()
+
         this.childProcess = fork("./build/src/services/nostr/handler")
+
         this.childProcess.on("error", (error) => {
             this.log(ERROR, "nostr subprocess error", error)
         })
 
-        this.childProcess.on("exit", (code) => {
-            this.log(ERROR, `nostr subprocess exited with code ${code}`)
-            if (!code) {
+        this.childProcess.on("exit", (code, signal) => {
+            if (this.isShuttingDown) {
+                this.log("nostr subprocess stopped")
                 return
             }
-            throw new Error(`nostr subprocess exited with code ${code}`)
+
+            if (code === 0) {
+                this.log("nostr subprocess exited cleanly")
+                return
+            }
+
+            this.log(ERROR, `nostr subprocess exited with code ${code} and signal ${signal}`)
+
+            const now = Date.now()
+            if (now - this.latestRestart < 5000) {
+                this.log(ERROR, "nostr subprocess exited too quickly, not restarting")
+                throw new Error("nostr subprocess crashed repeatedly")
+            }
+
+            this.log("restarting nostr subprocess...")
+            this.latestRestart = now
+            setTimeout(() => this.startSubProcess(), 100)
         })
 
         this.childProcess.on("message", (message: ChildProcessResponse) => {
             switch (message.type) {
                 case 'ready':
-                    this.sendToChildProcess({ type: 'settings', settings: settings })
+                    this.sendToChildProcess({ type: 'settings', settings: this.settings })
                     break;
                 case 'event':
-                    eventCallback(message.event)
+                    this.eventCallback(message.event)
                     break
                 case 'processMetrics':
                     this.utils.tlvStorageFactory.ProcessMetrics(message.metrics, 'nostr')
@@ -42,7 +83,7 @@ export default class NostrSubprocess {
                     this.awaitingPongs = []
                     break
                 case 'beacon':
-                    beaconCallback({ content: message.content, pub: message.pub })
+                    this.beaconCallback({ content: message.content, pub: message.pub })
                     break
                 default:
                     console.error("unknown nostr event response", message)
@@ -50,11 +91,15 @@ export default class NostrSubprocess {
             }
         })
     }
+
     sendToChildProcess(message: ChildProcessRequest) {
-        this.childProcess.send(message)
+        if (this.childProcess && !this.childProcess.killed) {
+            this.childProcess.send(message)
+        }
     }
 
     Reset(settings: NostrSettings) {
+        this.settings = settings
         this.sendToChildProcess({ type: 'settings', settings })
     }
 
@@ -68,7 +113,9 @@ export default class NostrSubprocess {
     Send(initiator: SendInitiator, data: SendData, relays?: string[]) {
         this.sendToChildProcess({ type: 'send', data, initiator, relays })
     }
+
     Stop() {
-        this.childProcess.kill()
+        this.isShuttingDown = true
+        this.cleanupProcess()
     }
 }
diff --git a/src/services/nostr/nostrPool.ts b/src/services/nostr/nostrPool.ts
index d41da382..d5e47d7f 100644
--- a/src/services/nostr/nostrPool.ts
+++ b/src/services/nostr/nostrPool.ts
@@ -16,7 +16,7 @@ export type SendDataContent = { type: "content", content: string, pub: string }
 export type SendDataEvent = { type: "event", event: UnsignedEvent, encrypt?: { toPub: string } }
 export type SendData = SendDataContent | SendDataEvent
 export type SendInitiator = { type: 'app', appId: string } | { type: 'client', clientId: string }
-export type NostrSend = (initiator: SendInitiator, data: SendData, relays?: string[] | undefined) => void
+export type NostrSend = (initiator: SendInitiator, data: SendData, relays?: string[] | undefined) => Promise<void>
 
 export type LinkedProviderInfo = { pubkey: string, clientId: string, relayUrl: string }
 export type AppInfo = { appId: string, publicKey: string, privateKey: string, name: string, provider?: LinkedProviderInfo }
@@ -203,21 +203,22 @@ export class NostrPool {
         const signed = finalizeEvent(event, Buffer.from(keys.privateKey, 'hex'))
         let sent = false
         const log = getLogger({ appName: keys.name })
-        // const r = relays ? relays : this.getServiceRelays()
+        this.log(`📤 Publishing Kind ${event.kind} event to ${relays.length} relay(s): ${relays.join(', ')}`)
         const pool = new SimplePool()
         await Promise.all(pool.publish(relays, signed).map(async p => {
             try {
                 await p
                 sent = true
             } catch (e: any) {
-                console.log(e)
+                this.log(ERROR, `Failed to publish Kind ${event.kind} event:`, e.message || e)
                 log(e)
             }
         }))
         if (!sent) {
+            this.log(ERROR, `Failed to send Kind ${event.kind} event to any relay`)
             log("failed to send event")
         } else {
-            //log("sent event")
+            this.log(`✅ Kind ${event.kind} event published successfully (id: ${signed.id.slice(0, 16)}...)`)
         }
     }
 
diff --git a/src/services/nostr/sender.ts b/src/services/nostr/sender.ts
index 1fd336a5..8437b9af 100644
--- a/src/services/nostr/sender.ts
+++ b/src/services/nostr/sender.ts
@@ -1,7 +1,7 @@
 import { NostrSend, SendData, SendInitiator } from "./nostrPool.js"
-import { getLogger } from "../helpers/logger.js"
+import { ERROR, getLogger } from "../helpers/logger.js"
 export class NostrSender {
-    private _nostrSend: NostrSend = () => { throw new Error('nostr send not initialized yet') }
+    private _nostrSend: NostrSend = async () => { throw new Error('nostr send not initialized yet') }
     private isReady: boolean = false
     private onReadyCallbacks: (() => void)[] = []
     private pendingSends: { initiator: SendInitiator, data: SendData, relays?: string[] | undefined }[] = []
@@ -12,7 +12,12 @@ export class NostrSender {
         this.isReady = true
         this.onReadyCallbacks.forEach(cb => cb())
         this.onReadyCallbacks = []
-        this.pendingSends.forEach(send => this._nostrSend(send.initiator, send.data, send.relays))
+        // Process pending sends with proper error handling
+        this.pendingSends.forEach(send => {
+            this._nostrSend(send.initiator, send.data, send.relays).catch(e => {
+                this.log(ERROR, "failed to send pending event", e.message || e)
+            })
+        })
         this.pendingSends = []
     }
     OnReady(callback: () => void) {
@@ -22,13 +27,16 @@ export class NostrSender {
             this.onReadyCallbacks.push(callback)
         }
     }
-    Send(initiator: SendInitiator, data: SendData, relays?: string[] | undefined) {
+    Send(initiator: SendInitiator, data: SendData, relays?: string[] | undefined): void {
         if (!this.isReady) {
             this.log("tried to send before nostr was ready, caching request")
             this.pendingSends.push({ initiator, data, relays })
             return
         }
-        this._nostrSend(initiator, data, relays)
+        // Fire and forget but log errors
+        this._nostrSend(initiator, data, relays).catch(e => {
+            this.log(ERROR, "failed to send event", e.message || e)
+        })
     }
     IsReady() {
         return this.isReady
diff --git a/src/services/serverMethods/index.ts b/src/services/serverMethods/index.ts
index 8b9b80a3..d74e67fd 100644
--- a/src/services/serverMethods/index.ts
+++ b/src/services/serverMethods/index.ts
@@ -91,6 +91,14 @@ export default (mainHandler: Main): Types.ServerMethods => {
             if (err != null) throw new Error(err.message)
             return mainHandler.adminManager.CloseChannel(req)
         },
+        BumpTx: async ({ ctx, req }) => {
+            const err = Types.BumpTxValidate(req, {
+                txid_CustomCheck: txid => txid !== '',
+                sat_per_vbyte_CustomCheck: spv => spv > 0
+            })
+            if (err != null) throw new Error(err.message)
+            return mainHandler.adminManager.BumpTx(req)
+        },
         GetAdminTransactionSwapQuotes: async ({ ctx, req }) => {
             const err = Types.TransactionSwapRequestValidate(req, {
                 transaction_amount_sats_CustomCheck: amt => amt > 0
@@ -106,6 +114,36 @@ export default (mainHandler: Main): Types.ServerMethods => {
             if (err != null) throw new Error(err.message)
             return mainHandler.adminManager.PayAdminTransactionSwap(req)
         },
+        ListAdminTxSwaps: async ({ ctx }) => {
+            return mainHandler.adminManager.ListAdminTxSwaps()
+        },
+        GetAdminInvoiceSwapQuotes: async ({ ctx, req }) => {
+            const err = Types.InvoiceSwapRequestValidate(req, {
+                amount_sats_CustomCheck: amt => amt > 0
+            })
+            if (err != null) throw new Error(err.message)
+            return mainHandler.adminManager.GetAdminInvoiceSwapQuotes(req)
+        },
+        RefundAdminInvoiceSwap: async ({ ctx, req }) => {
+            const err = Types.RefundAdminInvoiceSwapRequestValidate(req, {
+                swap_operation_id_CustomCheck: id => id !== '',
+            })
+            if (err != null) throw new Error(err.message)
+            return mainHandler.adminManager.RefundAdminInvoiceSwap(req)
+        },
+        ListAdminInvoiceSwaps: async ({ ctx }) => {
+            return mainHandler.adminManager.ListAdminInvoiceSwaps()
+        },
+        PayAdminInvoiceSwap: async ({ ctx, req }) => {
+            const err = Types.PayAdminInvoiceSwapRequestValidate(req, {
+                swap_operation_id_CustomCheck: id => id !== '',
+            })
+            if (err != null) throw new Error(err.message)
+            return mainHandler.adminManager.PayAdminInvoiceSwap(req)
+        },
+        GetAssetsAndLiabilities: async ({ ctx, req }) => {
+            return mainHandler.adminManager.GetAssetsAndLiabilities(req)
+        },
         GetProvidersDisruption: async () => {
             return mainHandler.metricsManager.GetProvidersDisruption()
         },
@@ -145,9 +183,7 @@ export default (mainHandler: Main): Types.ServerMethods => {
         GetUserOperations: async ({ ctx, req }) => {
             return mainHandler.paymentManager.GetUserOperations(ctx.user_id, req)
         },
-        ListAdminSwaps: async ({ ctx }) => {
-            return mainHandler.adminManager.ListAdminSwaps()
-        },
+
         GetPaymentState: async ({ ctx, req }) => {
             const err = Types.GetPaymentStateRequestValidate(req, {
                 invoice_CustomCheck: invoice => invoice !== ""
@@ -159,14 +195,14 @@ export default (mainHandler: Main): Types.ServerMethods => {
         PayAddress: async ({ ctx, req }) => {
             const err = Types.PayAddressRequestValidate(req, {
                 address_CustomCheck: addr => addr !== '',
-                amountSats_CustomCheck: amt => amt > 0,
+                // amountSats_CustomCheck: amt => amt > 0,
                 // satsPerVByte_CustomCheck: spb => spb > 0
             })
             if (err != null) throw new Error(err.message)
             return mainHandler.paymentManager.PayAddress(ctx, req)
         },
-        ListSwaps: async ({ ctx }) => {
-            return mainHandler.paymentManager.ListSwaps(ctx)
+        ListTxSwaps: async ({ ctx }) => {
+            return mainHandler.paymentManager.ListTxSwaps(ctx)
         },
         GetTransactionSwapQuotes: async ({ ctx, req }) => {
             return mainHandler.paymentManager.GetTransactionSwapQuotes(ctx, req)
diff --git a/src/services/storage/applicationStorage.ts b/src/services/storage/applicationStorage.ts
index 21f6f9c9..402e7773 100644
--- a/src/services/storage/applicationStorage.ts
+++ b/src/services/storage/applicationStorage.ts
@@ -1,5 +1,5 @@
 import crypto from 'crypto';
-import { Between, FindOperator, IsNull, LessThanOrEqual, MoreThanOrEqual, In } from "typeorm"
+import { Between, FindOperator, IsNull, LessThanOrEqual, MoreThanOrEqual } from "typeorm"
 import { generateSecretKey, getPublicKey } from 'nostr-tools';
 import { Application } from "./entity/Application.js"
 import UserStorage from './userStorage.js';
@@ -72,7 +72,8 @@ export default class {
                 user: user,
                 application,
                 identifier: userIdentifier,
-                nostr_public_key: nostrPub
+                nostr_public_key: nostrPub,
+                topic_id: crypto.randomBytes(32).toString('hex')
             }, txId)
         })
     }
@@ -160,10 +161,16 @@ export default class {
         this.dbs.Remove<User>('User', baseUser, txId)
     }
 
-    async RemoveAppUsersAndBaseUsers(appUserIds: string[],baseUser:string, txId?: string) {
-        await this.dbs.Delete<ApplicationUser>('ApplicationUser', { identifier: In(appUserIds) }, txId)
-        await this.dbs.Delete<User>('User', { user_id: baseUser }, txId)
-
+    async RemoveAppUsersAndBaseUsers(appUserIds: string[], baseUser: string, txId?: string) {
+        for (const appUserId of appUserIds) {
+            const appUser = await this.dbs.FindOne<ApplicationUser>('ApplicationUser', { where: { identifier: appUserId } }, txId)
+            if (appUser) {
+                await this.dbs.Delete<ApplicationUser>('ApplicationUser', appUser.serial_id, txId)
+            }
+        }
+        const user = await this.userStorage.FindUser(baseUser, txId)
+        if (!user) return
+        await this.dbs.Delete<User>('User', user.serial_id, txId)
     }
 
 
diff --git a/src/services/storage/db/db.ts b/src/services/storage/db/db.ts
index 335f6848..63397c58 100644
--- a/src/services/storage/db/db.ts
+++ b/src/services/storage/db/db.ts
@@ -30,6 +30,7 @@ import * as fs from 'fs'
 import { UserAccess } from "../entity/UserAccess.js"
 import { AdminSettings } from "../entity/AdminSettings.js"
 import { TransactionSwap } from "../entity/TransactionSwap.js"
+import { InvoiceSwap } from "../entity/InvoiceSwap.js"
 
 
 export type DbSettings = {
@@ -76,7 +77,8 @@ export const MainDbEntities = {
     'AppUserDevice': AppUserDevice,
     'UserAccess': UserAccess,
     'AdminSettings': AdminSettings,
-    'TransactionSwap': TransactionSwap
+    'TransactionSwap': TransactionSwap,
+    'InvoiceSwap': InvoiceSwap
 }
 export type MainDbNames = keyof typeof MainDbEntities
 export const MainDbEntitiesNames = Object.keys(MainDbEntities)
diff --git a/src/services/storage/db/serializationHelpers.ts b/src/services/storage/db/serializationHelpers.ts
index eb27f678..ee19201f 100644
--- a/src/services/storage/db/serializationHelpers.ts
+++ b/src/services/storage/db/serializationHelpers.ts
@@ -8,10 +8,19 @@ type SerializedFindOperator = {
 }
 
 export function serializeFindOperator(operator: FindOperator<any>): SerializedFindOperator {
+    let value: any;
+    if (Array.isArray(operator['value']) && operator['type'] !== 'between') {
+        value = operator['value'].map(serializeFindOperator);
+    } else if ((operator as any).child !== undefined) {
+        // Not(IsNull()) etc.: TypeORM's .value getter unwraps nested FindOperators, so we'd lose the inner operator. Use .child to serialize the nested operator.
+        value = serializeFindOperator((operator as any).child);
+    } else {
+        value = operator['value'];
+    }
     return {
         _type: 'FindOperator',
         type: operator['type'],
-        value: (Array.isArray(operator['value']) && operator['type'] !== 'between') ? operator["value"].map(serializeFindOperator) : operator["value"],
+        value,
     };
 }
 
@@ -51,7 +60,8 @@ export function deserializeFindOperator(serialized: SerializedFindOperator): Fin
     }
 }
 
-export function serializeRequest<T>(r: object): T {
+export function serializeRequest<T>(r: object, debug = false): T {
+    if (debug) console.log("serializeRequest", r)
     if (!r || typeof r !== 'object') {
         return r;
     }
@@ -61,23 +71,24 @@ export function serializeRequest<T>(r: object): T {
     }
 
     if (Array.isArray(r)) {
-        return r.map(item => serializeRequest(item)) as any;
+        return r.map(item => serializeRequest(item, debug)) as any;
     }
 
     const result: any = {};
     for (const [key, value] of Object.entries(r)) {
-        result[key] = serializeRequest(value);
+        result[key] = serializeRequest(value, debug);
     }
     return result;
 }
 
-export function deserializeRequest<T>(r: object): T {
+export function deserializeRequest<T>(r: object, debug = false): T {
+    if (debug) console.log("deserializeRequest", r)
     if (!r || typeof r !== 'object') {
         return r;
     }
 
     if (Array.isArray(r)) {
-        return r.map(item => deserializeRequest(item)) as any;
+        return r.map(item => deserializeRequest(item, debug)) as any;
     }
 
     if (r && typeof r === 'object' && (r as any)._type === 'FindOperator') {
@@ -86,7 +97,7 @@ export function deserializeRequest<T>(r: object): T {
 
     const result: any = {};
     for (const [key, value] of Object.entries(r)) {
-        result[key] = deserializeRequest(value);
+        result[key] = deserializeRequest(value, debug);
     }
     return result;
 }
diff --git a/src/services/storage/db/storageInterface.ts b/src/services/storage/db/storageInterface.ts
index 941d9533..976ec20d 100644
--- a/src/services/storage/db/storageInterface.ts
+++ b/src/services/storage/db/storageInterface.ts
@@ -29,7 +29,7 @@ export class StorageInterface extends EventEmitter {
     private debug: boolean = false;
     private utils: Utils
     private dbType: 'main' | 'metrics'
-    private log = getLogger({component: 'StorageInterface'})
+    private log = getLogger({ component: 'StorageInterface' })
     constructor(utils: Utils) {
         super();
         this.initializeSubprocess();
@@ -61,13 +61,13 @@ export class StorageInterface extends EventEmitter {
             this.isConnected = false;
         });
 
-        this.process.on('exit', (code: number) => {
-            this.log(ERROR, `Storage processor exited with code ${code}`);
+        this.process.on('exit', (code: number, signal: string) => {
+            this.log(ERROR, `Storage processor exited with code ${code} and signal ${signal}`);
             this.isConnected = false;
-            if (!code) {
+            if (code === 0) {
                 return
             }
-            throw new Error(`Storage processor exited with code ${code}`)
+            throw new Error(`Storage processor exited with code ${code} and signal ${signal}`)
         });
 
         this.isConnected = true;
@@ -104,9 +104,10 @@ export class StorageInterface extends EventEmitter {
         return this.handleOp<T | null>(findOp)
     }
 
-    Find<T>(entity: DBNames, q: QueryOptions<T>, txId?: string): Promise<T[]> {
+    Find<T>(entity: DBNames, q: QueryOptions<T>, txId?: string, debug = false): Promise<T[]> {
+        if (debug) console.log("Find", { entity })
         const opId = Math.random().toString()
-        const findOp: FindOperation<T> = { type: 'find', entity, opId, q, txId }
+        const findOp: FindOperation<T> = { type: 'find', entity, opId, q, txId, debug }
         return this.handleOp<T[]>(findOp)
     }
 
@@ -166,32 +167,33 @@ export class StorageInterface extends EventEmitter {
     }
 
     private handleOp<T>(op: IStorageOperation): Promise<T> {
-        if (this.debug) console.log('handleOp', op)
+        if (this.debug || op.debug) console.log('handleOp', op)
         this.checkConnected()
         return new Promise<T>((resolve, reject) => {
             const responseHandler = (response: OperationResponse<T>) => {
-                if (this.debug) console.log('responseHandler', response)
+                if (this.debug || op.debug) console.log('responseHandler', response)
                 if (!response.success) {
                     reject(new Error(response.error));
                     return
                 }
+                if (this.debug || op.debug) console.log("response", response, op)
                 if (response.type !== op.type) {
                     reject(new Error('Invalid storage response type'));
                     return
                 }
-               resolve(deserializeResponseData(response.data));
+                resolve(deserializeResponseData(response.data));
             }
             this.once(op.opId, responseHandler)
             this.process.send(this.serializeOperation(op))
         })
     }
 
-    private serializeOperation(operation: IStorageOperation): IStorageOperation {
+    private serializeOperation(operation: IStorageOperation, debug = false): IStorageOperation {
         const serialized = { ...operation };
         if ('q' in serialized) {
-            (serialized as any).q = serializeRequest((serialized as any).q);
+            (serialized as any).q = serializeRequest((serialized as any).q, debug);
         }
-        if (this.debug) {
+        if (this.debug || debug) {
             serialized.debug = true
         }
         return serialized;
@@ -205,7 +207,7 @@ export class StorageInterface extends EventEmitter {
 
     public disconnect() {
         if (this.process) {
-            this.process.kill();
+            this.process.kill(0);
             this.isConnected = false;
             this.debug = false;
         }
diff --git a/src/services/storage/entity/ApplicationUser.ts b/src/services/storage/entity/ApplicationUser.ts
index 2284b9bd..c4717721 100644
--- a/src/services/storage/entity/ApplicationUser.ts
+++ b/src/services/storage/entity/ApplicationUser.ts
@@ -26,6 +26,9 @@ export class ApplicationUser {
     @Column({ default: "" })
     callback_url: string
 
+    @Column({ unique: true })
+    topic_id: string;
+
     @CreateDateColumn()
     created_at: Date
 
diff --git a/src/services/storage/entity/InvoiceSwap.ts b/src/services/storage/entity/InvoiceSwap.ts
new file mode 100644
index 00000000..746756b8
--- /dev/null
+++ b/src/services/storage/entity/InvoiceSwap.ts
@@ -0,0 +1,94 @@
+import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, ManyToOne, JoinColumn, UpdateDateColumn } from "typeorm";
+import { User } from "./User";
+
+@Entity()
+export class InvoiceSwap {
+    @PrimaryGeneratedColumn('uuid')
+    swap_operation_id: string
+
+    @Column()
+    app_user_id: string
+
+    @Column()
+    swap_quote_id: string
+
+    @Column()
+    swap_tree: string
+
+    @Column()
+    claim_public_key: string
+
+    @Column()
+    payment_hash: string
+
+    /*     @Column()
+        lockup_address: string */
+
+    /*     @Column()
+        refund_public_key: string */
+
+    @Column()
+    timeout_block_height: number
+
+    @Column()
+    invoice: string
+
+    @Column()
+    invoice_amount: number
+
+    @Column()
+    transaction_amount: number
+
+    @Column()
+    swap_fee_sats: number
+
+    @Column()
+    chain_fee_sats: number
+
+
+
+    @Column()
+    ephemeral_public_key: string
+
+    @Column()
+    address: string
+
+    // the private key is used on to perform a swap, it does not hold any funds once the swap is completed
+    // the swap should only last a few seconds, so it is not a security risk to store the private key in the database
+    // the key is stored here mostly for recovery purposes, in case something goes wrong with the swap
+    @Column()
+    ephemeral_private_key: string
+
+    @Column({ default: false })
+    used: boolean
+
+    @Column({ default: 0 })
+    completed_at_unix: number
+
+    @Column({ default: 0 })
+    paid_at_unix: number
+
+    @Column({ default: "" })
+    preimage: string
+
+    @Column({ default: "" })
+    failure_reason: string
+
+    @Column({ default: "" })
+    tx_id: string
+
+    @Column({ default: "", type: "text" })
+    lockup_tx_hex: string
+
+    /*     @Column({ default: "" })
+        address_paid: string */
+
+    @Column({ default: "" })
+    service_url: string
+
+    @CreateDateColumn()
+    created_at: Date
+
+    @UpdateDateColumn()
+    updated_at: Date
+}
\ No newline at end of file
diff --git a/src/services/storage/entity/RootOperation.ts b/src/services/storage/entity/RootOperation.ts
index 3a2bd1f9..ec4914bc 100644
--- a/src/services/storage/entity/RootOperation.ts
+++ b/src/services/storage/entity/RootOperation.ts
@@ -17,6 +17,9 @@ export class RootOperation {
     @Column({ default: 0 })
     at_unix: number
 
+    @Column({ default: false })
+    pending: boolean
+
     @CreateDateColumn()
     created_at: Date
 
diff --git a/src/services/storage/entity/TransactionSwap.ts b/src/services/storage/entity/TransactionSwap.ts
index 7403e2a1..d2a99f52 100644
--- a/src/services/storage/entity/TransactionSwap.ts
+++ b/src/services/storage/entity/TransactionSwap.ts
@@ -60,6 +60,12 @@ export class TransactionSwap {
     @Column({ default: "" })
     tx_id: string
 
+    @Column({ default: 0 })
+    completed_at_unix: number
+
+    @Column({ default: 0 })
+    paid_at_unix: number
+
     @Column({ default: "" })
     address_paid: string
 
diff --git a/src/services/storage/metricsStorage.ts b/src/services/storage/metricsStorage.ts
index 44da304c..d80d11c9 100644
--- a/src/services/storage/metricsStorage.ts
+++ b/src/services/storage/metricsStorage.ts
@@ -10,6 +10,7 @@ import { StorageInterface } from "./db/storageInterface.js";
 import { Utils } from "../helpers/utilsWrapper.js";
 import { Channel, ChannelEventUpdate } from "../../../proto/lnd/lightning.js";
 import { ChannelEvent } from "./entity/ChannelEvent.js";
+export type RootOperationType = 'chain' | 'invoice' | 'chain_payment' | 'invoice_payment'
 export default class {
     //DB: DataSource | EntityManager
     settings: StorageSettings
@@ -145,13 +146,27 @@ export default class {
         }
     }
 
-    async AddRootOperation(opType: string, id: string, amount: number, txId?: string) {
-        return this.dbs.CreateAndSave<RootOperation>('RootOperation', { operation_type: opType, operation_amount: amount, operation_identifier: id, at_unix: Math.floor(Date.now() / 1000) }, txId)
+    async AddRootOperation(opType: RootOperationType, id: string, amount: number, pending = false, dbTxId?: string) {
+        return this.dbs.CreateAndSave<RootOperation>('RootOperation', {
+            operation_type: opType, operation_amount: amount,
+            operation_identifier: id, at_unix: Math.floor(Date.now() / 1000), pending
+        }, dbTxId)
     }
 
-    async GetRootOperation(opType: string, id: string, txId?: string) {
+    async GetRootOperation(opType: RootOperationType, id: string, txId?: string) {
         return this.dbs.FindOne<RootOperation>('RootOperation', { where: { operation_type: opType, operation_identifier: id } }, txId)
     }
+    async GetRootAddressTransaction(address: string, txHash: string, index: number) {
+        return this.GetRootOperation("chain", `${address}:${txHash}:${index}`)
+    }
+
+    async GetPendingChainPayments() {
+        return this.dbs.Find<RootOperation>('RootOperation', { where: { operation_type: 'chain_payment', pending: true } })
+    }
+
+    async SetRootOpConfirmed(serialId: number) {
+        return this.dbs.Update<RootOperation>('RootOperation', serialId, { pending: false })
+    }
 
     async GetRootOperations({ from, to }: { from?: number, to?: number }, txId?: string) {
         const q = getTimeQuery({ from, to })
diff --git a/src/services/storage/migrations/1769529793283-invoice_swaps.ts b/src/services/storage/migrations/1769529793283-invoice_swaps.ts
new file mode 100644
index 00000000..f7b93755
--- /dev/null
+++ b/src/services/storage/migrations/1769529793283-invoice_swaps.ts
@@ -0,0 +1,14 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class InvoiceSwaps1769529793283 implements MigrationInterface {
+    name = 'InvoiceSwaps1769529793283'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`CREATE TABLE "invoice_swap" ("swap_operation_id" varchar PRIMARY KEY NOT NULL, "app_user_id" varchar NOT NULL, "swap_quote_id" varchar NOT NULL, "swap_tree" varchar NOT NULL, "claim_public_key" varchar NOT NULL, "payment_hash" varchar NOT NULL, "timeout_block_height" integer NOT NULL, "invoice" varchar NOT NULL, "invoice_amount" integer NOT NULL, "transaction_amount" integer NOT NULL, "swap_fee_sats" integer NOT NULL, "chain_fee_sats" integer NOT NULL, "ephemeral_public_key" varchar NOT NULL, "address" varchar NOT NULL, "ephemeral_private_key" varchar NOT NULL, "used" boolean NOT NULL DEFAULT (0), "preimage" varchar NOT NULL DEFAULT (''), "failure_reason" varchar NOT NULL DEFAULT (''), "tx_id" varchar NOT NULL DEFAULT (''), "service_url" varchar NOT NULL DEFAULT (''), "created_at" datetime NOT NULL DEFAULT (datetime('now')), "updated_at" datetime NOT NULL DEFAULT (datetime('now')))`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`DROP TABLE "invoice_swap"`);
+    }
+
+}
diff --git a/src/services/storage/migrations/1769805357459-invoice_swaps_fixes.ts b/src/services/storage/migrations/1769805357459-invoice_swaps_fixes.ts
new file mode 100644
index 00000000..3ba13031
--- /dev/null
+++ b/src/services/storage/migrations/1769805357459-invoice_swaps_fixes.ts
@@ -0,0 +1,21 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class InvoiceSwapsFixes1769805357459 implements MigrationInterface {
+    name = 'InvoiceSwapsFixes1769805357459'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`CREATE TABLE "temporary_invoice_swap" ("swap_operation_id" varchar PRIMARY KEY NOT NULL, "app_user_id" varchar NOT NULL, "swap_quote_id" varchar NOT NULL, "swap_tree" varchar NOT NULL, "claim_public_key" varchar NOT NULL, "payment_hash" varchar NOT NULL, "timeout_block_height" integer NOT NULL, "invoice" varchar NOT NULL, "invoice_amount" integer NOT NULL, "transaction_amount" integer NOT NULL, "swap_fee_sats" integer NOT NULL, "chain_fee_sats" integer NOT NULL, "ephemeral_public_key" varchar NOT NULL, "address" varchar NOT NULL, "ephemeral_private_key" varchar NOT NULL, "used" boolean NOT NULL DEFAULT (0), "preimage" varchar NOT NULL DEFAULT (''), "failure_reason" varchar NOT NULL DEFAULT (''), "tx_id" varchar NOT NULL DEFAULT (''), "service_url" varchar NOT NULL DEFAULT (''), "created_at" datetime NOT NULL DEFAULT (datetime('now')), "updated_at" datetime NOT NULL DEFAULT (datetime('now')), "lockup_tx_hex" text NOT NULL DEFAULT (''))`);
+        await queryRunner.query(`INSERT INTO "temporary_invoice_swap"("swap_operation_id", "app_user_id", "swap_quote_id", "swap_tree", "claim_public_key", "payment_hash", "timeout_block_height", "invoice", "invoice_amount", "transaction_amount", "swap_fee_sats", "chain_fee_sats", "ephemeral_public_key", "address", "ephemeral_private_key", "used", "preimage", "failure_reason", "tx_id", "service_url", "created_at", "updated_at") SELECT "swap_operation_id", "app_user_id", "swap_quote_id", "swap_tree", "claim_public_key", "payment_hash", "timeout_block_height", "invoice", "invoice_amount", "transaction_amount", "swap_fee_sats", "chain_fee_sats", "ephemeral_public_key", "address", "ephemeral_private_key", "used", "preimage", "failure_reason", "tx_id", "service_url", "created_at", "updated_at" FROM "invoice_swap"`);
+        await queryRunner.query(`DROP TABLE "invoice_swap"`);
+        await queryRunner.query(`ALTER TABLE "temporary_invoice_swap" RENAME TO "invoice_swap"`);
+
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "invoice_swap" RENAME TO "temporary_invoice_swap"`);
+        await queryRunner.query(`CREATE TABLE "invoice_swap" ("swap_operation_id" varchar PRIMARY KEY NOT NULL, "app_user_id" varchar NOT NULL, "swap_quote_id" varchar NOT NULL, "swap_tree" varchar NOT NULL, "claim_public_key" varchar NOT NULL, "payment_hash" varchar NOT NULL, "timeout_block_height" integer NOT NULL, "invoice" varchar NOT NULL, "invoice_amount" integer NOT NULL, "transaction_amount" integer NOT NULL, "swap_fee_sats" integer NOT NULL, "chain_fee_sats" integer NOT NULL, "ephemeral_public_key" varchar NOT NULL, "address" varchar NOT NULL, "ephemeral_private_key" varchar NOT NULL, "used" boolean NOT NULL DEFAULT (0), "preimage" varchar NOT NULL DEFAULT (''), "failure_reason" varchar NOT NULL DEFAULT (''), "tx_id" varchar NOT NULL DEFAULT (''), "service_url" varchar NOT NULL DEFAULT (''), "created_at" datetime NOT NULL DEFAULT (datetime('now')), "updated_at" datetime NOT NULL DEFAULT (datetime('now')))`);
+        await queryRunner.query(`INSERT INTO "invoice_swap"("swap_operation_id", "app_user_id", "swap_quote_id", "swap_tree", "claim_public_key", "payment_hash", "timeout_block_height", "invoice", "invoice_amount", "transaction_amount", "swap_fee_sats", "chain_fee_sats", "ephemeral_public_key", "address", "ephemeral_private_key", "used", "preimage", "failure_reason", "tx_id", "service_url", "created_at", "updated_at") SELECT "swap_operation_id", "app_user_id", "swap_quote_id", "swap_tree", "claim_public_key", "payment_hash", "timeout_block_height", "invoice", "invoice_amount", "transaction_amount", "swap_fee_sats", "chain_fee_sats", "ephemeral_public_key", "address", "ephemeral_private_key", "used", "preimage", "failure_reason", "tx_id", "service_url", "created_at", "updated_at" FROM "temporary_invoice_swap"`);
+        await queryRunner.query(`DROP TABLE "temporary_invoice_swap"`);
+    }
+
+}
diff --git a/src/services/storage/migrations/1770038768784-application_user_topic_id.ts b/src/services/storage/migrations/1770038768784-application_user_topic_id.ts
new file mode 100644
index 00000000..b520cbe9
--- /dev/null
+++ b/src/services/storage/migrations/1770038768784-application_user_topic_id.ts
@@ -0,0 +1,24 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class ApplicationUserTopicId1770038768784 implements MigrationInterface {
+    name = 'ApplicationUserTopicId1770038768784'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`DROP INDEX "IDX_0a0dbb25a73306b037dec82251"`);
+        await queryRunner.query(`CREATE TABLE "temporary_application_user" ("serial_id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "identifier" varchar NOT NULL, "nostr_public_key" varchar, "created_at" datetime NOT NULL DEFAULT (datetime('now')), "updated_at" datetime NOT NULL DEFAULT (datetime('now')), "userSerialId" integer, "applicationSerialId" integer, "callback_url" varchar NOT NULL DEFAULT (''), "topic_id" varchar NOT NULL, CONSTRAINT "UQ_3175dc397c8285d1e532554dea5" UNIQUE ("nostr_public_key"), CONSTRAINT "REL_0796a381bcc624f52e9a155712" UNIQUE ("userSerialId"), CONSTRAINT "UQ_bd1a42f39fd7b4218bed5cc63d9" UNIQUE ("topic_id"), CONSTRAINT "FK_0796a381bcc624f52e9a155712b" FOREIGN KEY ("userSerialId") REFERENCES "user" ("serial_id") ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT "FK_1b3bdb6f660cd99533a1e673ef1" FOREIGN KEY ("applicationSerialId") REFERENCES "application" ("serial_id") ON DELETE NO ACTION ON UPDATE NO ACTION)`);
+        await queryRunner.query(`INSERT INTO "temporary_application_user"("serial_id", "identifier", "nostr_public_key", "created_at", "updated_at", "userSerialId", "applicationSerialId", "callback_url", "topic_id") SELECT "serial_id", "identifier", "nostr_public_key", "created_at", "updated_at", "userSerialId", "applicationSerialId", "callback_url", lower(hex(randomblob(32))) FROM "application_user"`);
+        await queryRunner.query(`DROP TABLE "application_user"`);
+        await queryRunner.query(`ALTER TABLE "temporary_application_user" RENAME TO "application_user"`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_0a0dbb25a73306b037dec82251" ON "application_user" ("identifier") `);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`DROP INDEX "IDX_0a0dbb25a73306b037dec82251"`);
+        await queryRunner.query(`ALTER TABLE "application_user" RENAME TO "temporary_application_user"`);
+        await queryRunner.query(`CREATE TABLE "application_user" ("serial_id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "identifier" varchar NOT NULL, "nostr_public_key" varchar, "created_at" datetime NOT NULL DEFAULT (datetime('now')), "updated_at" datetime NOT NULL DEFAULT (datetime('now')), "userSerialId" integer, "applicationSerialId" integer, "callback_url" varchar NOT NULL DEFAULT (''), CONSTRAINT "UQ_3175dc397c8285d1e532554dea5" UNIQUE ("nostr_public_key"), CONSTRAINT "REL_0796a381bcc624f52e9a155712" UNIQUE ("userSerialId"), CONSTRAINT "FK_0796a381bcc624f52e9a155712b" FOREIGN KEY ("userSerialId") REFERENCES "user" ("serial_id") ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT "FK_1b3bdb6f660cd99533a1e673ef1" FOREIGN KEY ("applicationSerialId") REFERENCES "application" ("serial_id") ON DELETE NO ACTION ON UPDATE NO ACTION)`);
+        await queryRunner.query(`INSERT INTO "application_user"("serial_id", "identifier", "nostr_public_key", "created_at", "updated_at", "userSerialId", "applicationSerialId", "callback_url") SELECT "serial_id", "identifier", "nostr_public_key", "created_at", "updated_at", "userSerialId", "applicationSerialId", "callback_url" FROM "temporary_application_user"`);
+        await queryRunner.query(`DROP TABLE "temporary_application_user"`);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_0a0dbb25a73306b037dec82251" ON "application_user" ("identifier") `);
+    }
+
+}
diff --git a/src/services/storage/migrations/1771347307798-swap_timestamps.ts b/src/services/storage/migrations/1771347307798-swap_timestamps.ts
new file mode 100644
index 00000000..ce5c0b39
--- /dev/null
+++ b/src/services/storage/migrations/1771347307798-swap_timestamps.ts
@@ -0,0 +1,20 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class SwapTimestamps1771347307798 implements MigrationInterface {
+    name = 'SwapTimestamps1771347307798'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`CREATE TABLE "temporary_invoice_swap" ("swap_operation_id" varchar PRIMARY KEY NOT NULL, "app_user_id" varchar NOT NULL, "swap_quote_id" varchar NOT NULL, "swap_tree" varchar NOT NULL, "claim_public_key" varchar NOT NULL, "payment_hash" varchar NOT NULL, "timeout_block_height" integer NOT NULL, "invoice" varchar NOT NULL, "invoice_amount" integer NOT NULL, "transaction_amount" integer NOT NULL, "swap_fee_sats" integer NOT NULL, "chain_fee_sats" integer NOT NULL, "ephemeral_public_key" varchar NOT NULL, "address" varchar NOT NULL, "ephemeral_private_key" varchar NOT NULL, "used" boolean NOT NULL DEFAULT (0), "preimage" varchar NOT NULL DEFAULT (''), "failure_reason" varchar NOT NULL DEFAULT (''), "tx_id" varchar NOT NULL DEFAULT (''), "service_url" varchar NOT NULL DEFAULT (''), "created_at" datetime NOT NULL DEFAULT (datetime('now')), "updated_at" datetime NOT NULL DEFAULT (datetime('now')), "lockup_tx_hex" text NOT NULL DEFAULT (''), "completed_at_unix" integer NOT NULL DEFAULT (0), "paid_at_unix" integer NOT NULL DEFAULT (0))`);
+        await queryRunner.query(`INSERT INTO "temporary_invoice_swap"("swap_operation_id", "app_user_id", "swap_quote_id", "swap_tree", "claim_public_key", "payment_hash", "timeout_block_height", "invoice", "invoice_amount", "transaction_amount", "swap_fee_sats", "chain_fee_sats", "ephemeral_public_key", "address", "ephemeral_private_key", "used", "preimage", "failure_reason", "tx_id", "service_url", "created_at", "updated_at", "lockup_tx_hex") SELECT "swap_operation_id", "app_user_id", "swap_quote_id", "swap_tree", "claim_public_key", "payment_hash", "timeout_block_height", "invoice", "invoice_amount", "transaction_amount", "swap_fee_sats", "chain_fee_sats", "ephemeral_public_key", "address", "ephemeral_private_key", "used", "preimage", "failure_reason", "tx_id", "service_url", "created_at", "updated_at", "lockup_tx_hex" FROM "invoice_swap"`);
+        await queryRunner.query(`DROP TABLE "invoice_swap"`);
+        await queryRunner.query(`ALTER TABLE "temporary_invoice_swap" RENAME TO "invoice_swap"`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "invoice_swap" RENAME TO "temporary_invoice_swap"`);
+        await queryRunner.query(`CREATE TABLE "invoice_swap" ("swap_operation_id" varchar PRIMARY KEY NOT NULL, "app_user_id" varchar NOT NULL, "swap_quote_id" varchar NOT NULL, "swap_tree" varchar NOT NULL, "claim_public_key" varchar NOT NULL, "payment_hash" varchar NOT NULL, "timeout_block_height" integer NOT NULL, "invoice" varchar NOT NULL, "invoice_amount" integer NOT NULL, "transaction_amount" integer NOT NULL, "swap_fee_sats" integer NOT NULL, "chain_fee_sats" integer NOT NULL, "ephemeral_public_key" varchar NOT NULL, "address" varchar NOT NULL, "ephemeral_private_key" varchar NOT NULL, "used" boolean NOT NULL DEFAULT (0), "preimage" varchar NOT NULL DEFAULT (''), "failure_reason" varchar NOT NULL DEFAULT (''), "tx_id" varchar NOT NULL DEFAULT (''), "service_url" varchar NOT NULL DEFAULT (''), "created_at" datetime NOT NULL DEFAULT (datetime('now')), "updated_at" datetime NOT NULL DEFAULT (datetime('now')), "lockup_tx_hex" text NOT NULL DEFAULT (''))`);
+        await queryRunner.query(`INSERT INTO "invoice_swap"("swap_operation_id", "app_user_id", "swap_quote_id", "swap_tree", "claim_public_key", "payment_hash", "timeout_block_height", "invoice", "invoice_amount", "transaction_amount", "swap_fee_sats", "chain_fee_sats", "ephemeral_public_key", "address", "ephemeral_private_key", "used", "preimage", "failure_reason", "tx_id", "service_url", "created_at", "updated_at", "lockup_tx_hex") SELECT "swap_operation_id", "app_user_id", "swap_quote_id", "swap_tree", "claim_public_key", "payment_hash", "timeout_block_height", "invoice", "invoice_amount", "transaction_amount", "swap_fee_sats", "chain_fee_sats", "ephemeral_public_key", "address", "ephemeral_private_key", "used", "preimage", "failure_reason", "tx_id", "service_url", "created_at", "updated_at", "lockup_tx_hex" FROM "temporary_invoice_swap"`);
+        await queryRunner.query(`DROP TABLE "temporary_invoice_swap"`);
+    }
+
+}
diff --git a/src/services/storage/migrations/1771524665409-root_op_pending.ts b/src/services/storage/migrations/1771524665409-root_op_pending.ts
new file mode 100644
index 00000000..e65461f3
--- /dev/null
+++ b/src/services/storage/migrations/1771524665409-root_op_pending.ts
@@ -0,0 +1,20 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class RootOpPending1771524665409 implements MigrationInterface {
+    name = 'RootOpPending1771524665409'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`CREATE TABLE "temporary_root_operation" ("serial_id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "operation_type" varchar NOT NULL, "operation_amount" integer NOT NULL, "operation_identifier" varchar NOT NULL, "created_at" datetime NOT NULL DEFAULT (datetime('now')), "updated_at" datetime NOT NULL DEFAULT (datetime('now')), "at_unix" integer NOT NULL DEFAULT (0), "pending" boolean NOT NULL DEFAULT (0))`);
+        await queryRunner.query(`INSERT INTO "temporary_root_operation"("serial_id", "operation_type", "operation_amount", "operation_identifier", "created_at", "updated_at", "at_unix") SELECT "serial_id", "operation_type", "operation_amount", "operation_identifier", "created_at", "updated_at", "at_unix" FROM "root_operation"`);
+        await queryRunner.query(`DROP TABLE "root_operation"`);
+        await queryRunner.query(`ALTER TABLE "temporary_root_operation" RENAME TO "root_operation"`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "root_operation" RENAME TO "temporary_root_operation"`);
+        await queryRunner.query(`CREATE TABLE "root_operation" ("serial_id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "operation_type" varchar NOT NULL, "operation_amount" integer NOT NULL, "operation_identifier" varchar NOT NULL, "created_at" datetime NOT NULL DEFAULT (datetime('now')), "updated_at" datetime NOT NULL DEFAULT (datetime('now')), "at_unix" integer NOT NULL DEFAULT (0))`);
+        await queryRunner.query(`INSERT INTO "root_operation"("serial_id", "operation_type", "operation_amount", "operation_identifier", "created_at", "updated_at", "at_unix") SELECT "serial_id", "operation_type", "operation_amount", "operation_identifier", "created_at", "updated_at", "at_unix" FROM "temporary_root_operation"`);
+        await queryRunner.query(`DROP TABLE "temporary_root_operation"`);
+    }
+
+}
diff --git a/src/services/storage/migrations/1771878683383-tx_swap_timestamps.ts b/src/services/storage/migrations/1771878683383-tx_swap_timestamps.ts
new file mode 100644
index 00000000..be9ccade
--- /dev/null
+++ b/src/services/storage/migrations/1771878683383-tx_swap_timestamps.ts
@@ -0,0 +1,20 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class TxSwapTimestamps1771878683383 implements MigrationInterface {
+    name = 'TxSwapTimestamps1771878683383'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`CREATE TABLE "temporary_transaction_swap" ("swap_operation_id" varchar PRIMARY KEY NOT NULL, "app_user_id" varchar NOT NULL, "swap_quote_id" varchar NOT NULL, "swap_tree" varchar NOT NULL, "lockup_address" varchar NOT NULL, "refund_public_key" varchar NOT NULL, "timeout_block_height" integer NOT NULL, "invoice" varchar NOT NULL, "invoice_amount" integer NOT NULL, "transaction_amount" integer NOT NULL, "swap_fee_sats" integer NOT NULL, "chain_fee_sats" integer NOT NULL, "preimage" varchar NOT NULL, "ephemeral_public_key" varchar NOT NULL, "ephemeral_private_key" varchar NOT NULL, "used" boolean NOT NULL DEFAULT (0), "failure_reason" varchar NOT NULL DEFAULT (''), "tx_id" varchar NOT NULL DEFAULT (''), "created_at" datetime NOT NULL DEFAULT (datetime('now')), "updated_at" datetime NOT NULL DEFAULT (datetime('now')), "address_paid" varchar NOT NULL DEFAULT (''), "service_url" varchar NOT NULL DEFAULT (''), "completed_at_unix" integer NOT NULL DEFAULT (0), "paid_at_unix" integer NOT NULL DEFAULT (0))`);
+        await queryRunner.query(`INSERT INTO "temporary_transaction_swap"("swap_operation_id", "app_user_id", "swap_quote_id", "swap_tree", "lockup_address", "refund_public_key", "timeout_block_height", "invoice", "invoice_amount", "transaction_amount", "swap_fee_sats", "chain_fee_sats", "preimage", "ephemeral_public_key", "ephemeral_private_key", "used", "failure_reason", "tx_id", "created_at", "updated_at", "address_paid", "service_url") SELECT "swap_operation_id", "app_user_id", "swap_quote_id", "swap_tree", "lockup_address", "refund_public_key", "timeout_block_height", "invoice", "invoice_amount", "transaction_amount", "swap_fee_sats", "chain_fee_sats", "preimage", "ephemeral_public_key", "ephemeral_private_key", "used", "failure_reason", "tx_id", "created_at", "updated_at", "address_paid", "service_url" FROM "transaction_swap"`);
+        await queryRunner.query(`DROP TABLE "transaction_swap"`);
+        await queryRunner.query(`ALTER TABLE "temporary_transaction_swap" RENAME TO "transaction_swap"`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "transaction_swap" RENAME TO "temporary_transaction_swap"`);
+        await queryRunner.query(`CREATE TABLE "transaction_swap" ("swap_operation_id" varchar PRIMARY KEY NOT NULL, "app_user_id" varchar NOT NULL, "swap_quote_id" varchar NOT NULL, "swap_tree" varchar NOT NULL, "lockup_address" varchar NOT NULL, "refund_public_key" varchar NOT NULL, "timeout_block_height" integer NOT NULL, "invoice" varchar NOT NULL, "invoice_amount" integer NOT NULL, "transaction_amount" integer NOT NULL, "swap_fee_sats" integer NOT NULL, "chain_fee_sats" integer NOT NULL, "preimage" varchar NOT NULL, "ephemeral_public_key" varchar NOT NULL, "ephemeral_private_key" varchar NOT NULL, "used" boolean NOT NULL DEFAULT (0), "failure_reason" varchar NOT NULL DEFAULT (''), "tx_id" varchar NOT NULL DEFAULT (''), "created_at" datetime NOT NULL DEFAULT (datetime('now')), "updated_at" datetime NOT NULL DEFAULT (datetime('now')), "address_paid" varchar NOT NULL DEFAULT (''), "service_url" varchar NOT NULL DEFAULT (''))`);
+        await queryRunner.query(`INSERT INTO "transaction_swap"("swap_operation_id", "app_user_id", "swap_quote_id", "swap_tree", "lockup_address", "refund_public_key", "timeout_block_height", "invoice", "invoice_amount", "transaction_amount", "swap_fee_sats", "chain_fee_sats", "preimage", "ephemeral_public_key", "ephemeral_private_key", "used", "failure_reason", "tx_id", "created_at", "updated_at", "address_paid", "service_url") SELECT "swap_operation_id", "app_user_id", "swap_quote_id", "swap_tree", "lockup_address", "refund_public_key", "timeout_block_height", "invoice", "invoice_amount", "transaction_amount", "swap_fee_sats", "chain_fee_sats", "preimage", "ephemeral_public_key", "ephemeral_private_key", "used", "failure_reason", "tx_id", "created_at", "updated_at", "address_paid", "service_url" FROM "temporary_transaction_swap"`);
+        await queryRunner.query(`DROP TABLE "temporary_transaction_swap"`);
+    }
+
+}
diff --git a/src/services/storage/migrations/runner.ts b/src/services/storage/migrations/runner.ts
index d14b8381..c78af2eb 100644
--- a/src/services/storage/migrations/runner.ts
+++ b/src/services/storage/migrations/runner.ts
@@ -1,28 +1,21 @@
 import { Initial1703170309875 } from './1703170309875-initial.js'
-import { LndMetrics1703170330183 } from './1703170330183-lnd_metrics.js'
-import { ChannelRouting1709316653538 } from './1709316653538-channel_routing.js'
 import { LspOrder1718387847693 } from './1718387847693-lsp_order.js'
 import { LiquidityProvider1719335699480 } from './1719335699480-liquidity_provider.js'
 import { LndNodeInfo1720187506189 } from './1720187506189-lnd_node_info.js'
 import { TrackedProvider1720814323679 } from './1720814323679-tracked_provider.js'
 import { CreateInviteTokenTable1721751414878 } from "./1721751414878-create_invite_token_table.js"
 import { PaymentIndex1721760297610 } from './1721760297610-payment_index.js'
-import { HtlcCount1724266887195 } from './1724266887195-htlc_count.js'
-import { BalanceEvents1724860966825 } from './1724860966825-balance_events.js'
 import { DebitAccess1726496225078 } from './1726496225078-debit_access.js'
 import { DebitAccessFixes1726685229264 } from './1726685229264-debit_access_fixes.js'
 import { DebitToPub1727105758354 } from './1727105758354-debit_to_pub.js'
 import { UserCbUrl1727112281043 } from './1727112281043-user_cb_url.js'
-import { RootOps1732566440447 } from './1732566440447-root_ops.js'
 import { UserOffer1733502626042 } from './1733502626042-user_offer.js'
-import { RootOpsTime1745428134124 } from './1745428134124-root_ops_time.js'
-import { ChannelEvents1750777346411 } from './1750777346411-channel_events.js'
 import { ManagementGrant1751307732346 } from './1751307732346-management_grant.js'
 import { ManagementGrantBanned1751989251513 } from './1751989251513-management_grant_banned.js'
 import { InvoiceCallbackUrls1752425992291 } from './1752425992291-invoice_callback_urls.js'
-import { AppUserDevice1753285173175 } from './1753285173175-app_user_device.js'
 import { OldSomethingLeftover1753106599604 } from './1753106599604-old_something_leftover.js'
 import { UserReceivingInvoiceIdx1753109184611 } from './1753109184611-user_receiving_invoice_idx.js'
+import { AppUserDevice1753285173175 } from './1753285173175-app_user_device.js'
 import { UserAccess1759426050669 } from './1759426050669-user_access.js'
 import { AddBlindToUserOffer1760000000000 } from './1760000000000-add_blind_to_user_offer.js'
 import { ApplicationAvatarUrl1761000001000 } from './1761000001000-application_avatar_url.js'
@@ -32,6 +25,23 @@ import { TxSwapAddress1764779178945 } from './1764779178945-tx_swap_address.js'
 import { ClinkRequester1765497600000 } from './1765497600000-clink_requester.js'
 import { TrackedProviderHeight1766504040000 } from './1766504040000-tracked_provider_height.js'
 import { SwapsServiceUrl1768413055036 } from './1768413055036-swaps_service_url.js'
+import { InvoiceSwaps1769529793283 } from './1769529793283-invoice_swaps.js'
+import { InvoiceSwapsFixes1769805357459 } from './1769805357459-invoice_swaps_fixes.js'
+import { ApplicationUserTopicId1770038768784 } from './1770038768784-application_user_topic_id.js'
+import { SwapTimestamps1771347307798 } from './1771347307798-swap_timestamps.js'
+import { TxSwapTimestamps1771878683383 } from './1771878683383-tx_swap_timestamps.js'
+
+import { LndMetrics1703170330183 } from './1703170330183-lnd_metrics.js'
+import { ChannelRouting1709316653538 } from './1709316653538-channel_routing.js'
+import { HtlcCount1724266887195 } from './1724266887195-htlc_count.js'
+import { BalanceEvents1724860966825 } from './1724860966825-balance_events.js'
+import { RootOps1732566440447 } from './1732566440447-root_ops.js'
+import { RootOpsTime1745428134124 } from './1745428134124-root_ops_time.js'
+import { ChannelEvents1750777346411 } from './1750777346411-channel_events.js'
+
+import { RootOpPending1771524665409 } from './1771524665409-root_op_pending.js'
+
+
 
 
 export const allMigrations = [Initial1703170309875, LspOrder1718387847693, LiquidityProvider1719335699480, LndNodeInfo1720187506189,
@@ -39,9 +49,13 @@ export const allMigrations = [Initial1703170309875, LspOrder1718387847693, Liqui
     DebitToPub1727105758354, UserCbUrl1727112281043, UserOffer1733502626042, ManagementGrant1751307732346, ManagementGrantBanned1751989251513,
     InvoiceCallbackUrls1752425992291, OldSomethingLeftover1753106599604, UserReceivingInvoiceIdx1753109184611, AppUserDevice1753285173175,
     UserAccess1759426050669, AddBlindToUserOffer1760000000000, ApplicationAvatarUrl1761000001000, AdminSettings1761683639419, TxSwap1762890527098,
-    TxSwapAddress1764779178945, ClinkRequester1765497600000, TrackedProviderHeight1766504040000, SwapsServiceUrl1768413055036]
+    TxSwapAddress1764779178945, ClinkRequester1765497600000, TrackedProviderHeight1766504040000, SwapsServiceUrl1768413055036,
+    InvoiceSwaps1769529793283, InvoiceSwapsFixes1769805357459, ApplicationUserTopicId1770038768784, SwapTimestamps1771347307798,
+    TxSwapTimestamps1771878683383]
 
-export const allMetricsMigrations = [LndMetrics1703170330183, ChannelRouting1709316653538, HtlcCount1724266887195, BalanceEvents1724860966825, RootOps1732566440447, RootOpsTime1745428134124, ChannelEvents1750777346411]
+
+export const allMetricsMigrations = [LndMetrics1703170330183, ChannelRouting1709316653538, HtlcCount1724266887195, BalanceEvents1724860966825,
+    RootOps1732566440447, RootOpsTime1745428134124, ChannelEvents1750777346411, RootOpPending1771524665409]
 /* export const TypeOrmMigrationRunner = async (log: PubLogger, storageManager: Storage, settings: DbSettings, arg: string | undefined): Promise<boolean> => {
     await connectAndMigrate(log, storageManager, allMigrations, allMetricsMigrations)
     return false
diff --git a/src/services/storage/paymentStorage.ts b/src/services/storage/paymentStorage.ts
index ed3f84dd..af96b6c5 100644
--- a/src/services/storage/paymentStorage.ts
+++ b/src/services/storage/paymentStorage.ts
@@ -15,6 +15,7 @@ import TransactionsQueue from "./db/transactionsQueue.js";
 import { LoggedEvent } from './eventsLog.js';
 import { StorageInterface } from './db/storageInterface.js';
 import { TransactionSwap } from './entity/TransactionSwap.js';
+import { InvoiceSwap } from './entity/InvoiceSwap.js';
 export type InboundOptionals = { product?: Product, callbackUrl?: string, expiry: number, expectedPayer?: User, linkedApplication?: Application, zapInfo?: ZapInfo, offerId?: string, payerData?: Record<string, string>, rejectUnauthorized?: boolean, token?: string, blind?: boolean, clinkRequesterPub?: string, clinkRequesterEventId?: string }
 export const defaultInvoiceExpiry = 60 * 60
 export default class {
@@ -137,7 +138,15 @@ export default class {
     }
 
     async RemoveUserInvoices(userId: string, txId?: string) {
-        return this.dbs.Delete<UserReceivingInvoice>('UserReceivingInvoice', { user: { user_id: userId } }, txId)
+        const invoices = await this.dbs.Find<UserReceivingInvoice>('UserReceivingInvoice', { where: { user: { user_id: userId } } }, txId)
+        if (invoices.length === 0) {
+            return 0
+        }
+        let deleted = 0
+        for (const invoice of invoices) {
+            deleted += await this.dbs.Delete<UserReceivingInvoice>('UserReceivingInvoice', invoice.serial_id, txId)
+        }
+        return deleted
     }
 
     async GetAddressOwner(address: string, txId?: string): Promise<UserReceivingAddress | null> {
@@ -151,6 +160,10 @@ export default class {
         return this.dbs.FindOne<UserTransactionPayment>('UserTransactionPayment', { where: { address, tx_hash: txHash } }, txId)
     }
 
+    async GetTxHashPaymentOwner(txHash: string, txId?: string): Promise<UserTransactionPayment | null> {
+        return this.dbs.FindOne<UserTransactionPayment>('UserTransactionPayment', { where: { tx_hash: txHash } }, txId)
+    }
+
     async GetInvoiceOwner(paymentRequest: string, txId?: string): Promise<UserReceivingInvoice | null> {
         return this.dbs.FindOne<UserReceivingInvoice>('UserReceivingInvoice', { where: { invoice: paymentRequest } }, txId)
     }
@@ -317,7 +330,51 @@ export default class {
     }
 
     async RemoveUserEphemeralKeys(userId: string, txId?: string) {
-        return this.dbs.Delete<UserEphemeralKey>('UserEphemeralKey', { user: { user_id: userId } }, txId)
+        const keys = await this.dbs.Find<UserEphemeralKey>('UserEphemeralKey', { where: { user: { user_id: userId } } }, txId)
+        if (keys.length === 0) {
+            return 0
+        }
+        let deleted = 0
+        for (const key of keys) {
+            deleted += await this.dbs.Delete<UserEphemeralKey>('UserEphemeralKey', key.serial_id, txId)
+        }
+        return deleted
+    }
+
+    async RemoveUserReceivingAddresses(userId: string, txId?: string) {
+        const addresses = await this.dbs.Find<UserReceivingAddress>('UserReceivingAddress', { where: { user: { user_id: userId } } }, txId)
+        for (const addr of addresses) {
+            const txs = await this.dbs.Find<AddressReceivingTransaction>('AddressReceivingTransaction', { where: { user_address: { serial_id: addr.serial_id } } }, txId)
+            for (const tx of txs) {
+                await this.dbs.Delete<AddressReceivingTransaction>('AddressReceivingTransaction', tx.serial_id, txId)
+            }
+            await this.dbs.Delete<UserReceivingAddress>('UserReceivingAddress', addr.serial_id, txId)
+        }
+    }
+
+    async RemoveUserInvoicePayments(userId: string, txId?: string) {
+        const payments = await this.dbs.Find<UserInvoicePayment>('UserInvoicePayment', { where: { user: { user_id: userId } } }, txId)
+        for (const p of payments) {
+            await this.dbs.Delete<UserInvoicePayment>('UserInvoicePayment', p.serial_id, txId)
+        }
+    }
+
+    async RemoveUserTransactionPayments(userId: string, txId?: string) {
+        const payments = await this.dbs.Find<UserTransactionPayment>('UserTransactionPayment', { where: { user: { user_id: userId } } }, txId)
+        for (const p of payments) {
+            await this.dbs.Delete<UserTransactionPayment>('UserTransactionPayment', p.serial_id, txId)
+        }
+    }
+
+    async RemoveUserToUserPayments(userId: string, txId?: string) {
+        const asSender = await this.dbs.Find<UserToUserPayment>('UserToUserPayment', { where: { from_user: { user_id: userId } } }, txId)
+        const asReceiver = await this.dbs.Find<UserToUserPayment>('UserToUserPayment', { where: { to_user: { user_id: userId } } }, txId)
+        const seen = new Set<number>()
+        for (const p of [...asSender, ...asReceiver]) {
+            if (seen.has(p.serial_id)) continue
+            seen.add(p.serial_id)
+            await this.dbs.Delete<UserToUserPayment>('UserToUserPayment', p.serial_id, txId)
+        }
     }
 
     async AddPendingUserToUserPayment(fromUserId: string, toUserId: string, amount: number, fee: number, linkedApplication: Application, txId: string) {
@@ -447,8 +504,12 @@ export default class {
         }
     }
 
-    async GetTotalUsersBalance(txId?: string) {
-        const total = await this.dbs.Sum<User>('User', "balance_sats", {})
+    async GetTotalUsersBalance(excludeLocked?: boolean, txId?: string) {
+        const where: { locked?: boolean } = {}
+        if (excludeLocked) {
+            where.locked = false
+        }
+        const total = await this.dbs.Sum<User>('User', "balance_sats", where, txId)
         return total || 0
     }
 
@@ -472,20 +533,31 @@ export default class {
         return this.dbs.FindOne<TransactionSwap>('TransactionSwap', { where: { swap_operation_id: swapOperationId, used: false, app_user_id: appUserId } }, txId)
     }
 
-    async FinalizeTransactionSwap(swapOperationId: string, address: string, txId: string) {
+    async SetTransactionSwapPaid(swapOperationId: string, txId?: string) {
+        const now = Math.floor(Date.now() / 1000)
         return this.dbs.Update<TransactionSwap>('TransactionSwap', { swap_operation_id: swapOperationId }, {
-            used: true,
-            tx_id: txId,
-            address_paid: address,
-        })
+            paid_at_unix: now,
+        }, txId)
     }
 
-    async FailTransactionSwap(swapOperationId: string, address: string, failureReason: string) {
+    async FinalizeTransactionSwap(swapOperationId: string, address: string, chainTxId: string, txId?: string) {
+        const now = Math.floor(Date.now() / 1000)
+        return this.dbs.Update<TransactionSwap>('TransactionSwap', { swap_operation_id: swapOperationId }, {
+            used: true,
+            tx_id: chainTxId,
+            address_paid: address,
+            completed_at_unix: now,
+        }, txId)
+    }
+
+    async FailTransactionSwap(swapOperationId: string, address: string, failureReason: string, txId?: string) {
+        const now = Math.floor(Date.now() / 1000)
         return this.dbs.Update<TransactionSwap>('TransactionSwap', { swap_operation_id: swapOperationId }, {
             used: true,
             failure_reason: failureReason,
             address_paid: address,
-        })
+            completed_at_unix: now,
+        }, txId)
     }
 
     async DeleteTransactionSwap(swapOperationId: string, txId?: string) {
@@ -493,18 +565,18 @@ export default class {
     }
 
     async DeleteExpiredTransactionSwaps(currentHeight: number, txId?: string) {
-        return this.dbs.Delete<TransactionSwap>('TransactionSwap', { timeout_block_height: LessThan(currentHeight) }, txId)
+        return this.dbs.Delete<TransactionSwap>('TransactionSwap', { timeout_block_height: LessThan(currentHeight), used: false }, txId)
     }
 
     async ListPendingTransactionSwaps(appUserId: string, txId?: string) {
         return this.dbs.Find<TransactionSwap>('TransactionSwap', { where: { used: false, app_user_id: appUserId } }, txId)
     }
 
-    async ListSwapPayments(userId: string, txId?: string) {
+    async ListTxSwapPayments(userId: string, txId?: string) {
         return this.dbs.Find<UserInvoicePayment>('UserInvoicePayment', { where: { swap_operation_id: Not(IsNull()), user: { user_id: userId } } }, txId)
     }
 
-    async ListCompletedSwaps(appUserId: string, payments: UserInvoicePayment[], txId?: string) {
+    async ListCompletedTxSwaps(appUserId: string, payments: UserInvoicePayment[], txId?: string) {
         const completed = await this.dbs.Find<TransactionSwap>('TransactionSwap', { where: { used: true, app_user_id: appUserId } }, txId)
         // const payments = await this.dbs.Find<UserInvoicePayment>('UserInvoicePayment', { where: { swap_operation_id: Not(IsNull()), } }, txId)
         const paymentsMap = new Map<string, UserInvoicePayment>()
@@ -515,6 +587,85 @@ export default class {
             swap: c, payment: paymentsMap.get(c.swap_operation_id)
         }))
     }
+
+    async AddInvoiceSwap(swap: Partial<InvoiceSwap>) {
+        return this.dbs.CreateAndSave<InvoiceSwap>('InvoiceSwap', swap)
+    }
+
+    async GetInvoiceSwap(swapOperationId: string, appUserId: string, txId?: string) {
+        const swap = await this.dbs.FindOne<InvoiceSwap>('InvoiceSwap', { where: { swap_operation_id: swapOperationId, used: false, app_user_id: appUserId } }, txId)
+        if (!swap || swap.tx_id) {
+            return null
+        }
+        return swap
+    }
+
+    async FinalizeInvoiceSwap(swapOperationId: string, txId?: string) {
+        const now = Math.floor(Date.now() / 1000)
+        return this.dbs.Update<InvoiceSwap>('InvoiceSwap', { swap_operation_id: swapOperationId }, {
+            used: true,
+            completed_at_unix: now,
+        }, txId)
+    }
+
+    async UpdateInvoiceSwap(swapOperationId: string, update: Partial<InvoiceSwap>, txId?: string) {
+        return this.dbs.Update<InvoiceSwap>('InvoiceSwap', { swap_operation_id: swapOperationId }, update, txId)
+    }
+
+    async SetInvoiceSwapTxId(swapOperationId: string, chainTxId: string, chainFeeSats: number, lockupTxHex?: string, txId?: string) {
+        const now = Math.floor(Date.now() / 1000)
+        const update: Partial<InvoiceSwap> = {
+            tx_id: chainTxId,
+            paid_at_unix: now,
+            chain_fee_sats: chainFeeSats,
+        }
+        if (lockupTxHex) {
+            update.lockup_tx_hex = lockupTxHex
+        }
+        return this.dbs.Update<InvoiceSwap>('InvoiceSwap', { swap_operation_id: swapOperationId }, update, txId)
+    }
+
+    async FailInvoiceSwap(swapOperationId: string, failureReason: string, txId?: string) {
+        const now = Math.floor(Date.now() / 1000)
+        return this.dbs.Update<InvoiceSwap>('InvoiceSwap', { swap_operation_id: swapOperationId }, {
+            used: true,
+            failure_reason: failureReason,
+            completed_at_unix: now,
+        }, txId)
+    }
+
+    async DeleteInvoiceSwap(swapOperationId: string, txId?: string) {
+        return this.dbs.Delete<InvoiceSwap>('InvoiceSwap', { swap_operation_id: swapOperationId }, txId)
+    }
+
+    async DeleteExpiredInvoiceSwaps(currentHeight: number, txId?: string) {
+        return this.dbs.Delete<InvoiceSwap>('InvoiceSwap', { timeout_block_height: LessThan(currentHeight), used: false, tx_id: "" }, txId)
+    }
+
+    async ListCompletedInvoiceSwaps(appUserId: string, txId?: string) {
+        return this.dbs.Find<InvoiceSwap>('InvoiceSwap', { where: { used: true, app_user_id: appUserId } }, txId)
+    }
+
+    async ListPendingInvoiceSwaps(appUserId: string, txId?: string) {
+        return this.dbs.Find<InvoiceSwap>('InvoiceSwap', { where: { used: false, app_user_id: appUserId } }, txId)
+    }
+
+    async ListUnfinishedInvoiceSwaps(txId?: string) {
+        const swaps = await this.dbs.Find<InvoiceSwap>('InvoiceSwap', { where: { used: false } }, txId)
+        return swaps.filter(s => !!s.tx_id)
+    }
+
+    async GetRefundableInvoiceSwap(swapOperationId: string, txId?: string) {
+        const swap = await this.dbs.FindOne<InvoiceSwap>('InvoiceSwap', { where: { swap_operation_id: swapOperationId } }, txId)
+        if (!swap || !swap.tx_id) {
+            return null
+        }
+        if (swap.used && !swap.failure_reason) {
+            return null
+        }
+        return swap
+    }
+
 }
 
 const orFail = async <T>(resultPromise: Promise<T | null>) => {
diff --git a/src/services/storage/productStorage.ts b/src/services/storage/productStorage.ts
index e6f2f662..75f3da0d 100644
--- a/src/services/storage/productStorage.ts
+++ b/src/services/storage/productStorage.ts
@@ -21,6 +21,14 @@ export default class {
     }
 
     async RemoveUserProducts(userId: string, txId?: string) {
-        return this.dbs.Delete<Product>('Product', { owner: { user_id: userId } }, txId)
+        const products = await this.dbs.Find<Product>('Product', { where: { owner: { user_id: userId } } }, txId)
+        if (products.length === 0) {
+            return 0
+        }
+        let deleted = 0
+        for (const product of products) {
+            deleted += await this.dbs.Delete<Product>('Product', { product_id: product.product_id }, txId)
+        }
+        return deleted
     }
 }
\ No newline at end of file
diff --git a/src/services/storage/tlv/tlvFilesStorageFactory.ts b/src/services/storage/tlv/tlvFilesStorageFactory.ts
index 0e396703..3eb2d117 100644
--- a/src/services/storage/tlv/tlvFilesStorageFactory.ts
+++ b/src/services/storage/tlv/tlvFilesStorageFactory.ts
@@ -53,13 +53,13 @@ export class TlvStorageFactory extends EventEmitter {
             this.isConnected = false;
         });
 
-        this.process.on('exit', (code: number) => {
-            this.log(ERROR, `Tlv Storage processor exited with code ${code}`);
+        this.process.on('exit', (code: number, signal: string) => {
+            this.log(ERROR, `Tlv Storage processor exited with code ${code} and signal ${signal}`);
             this.isConnected = false;
-            if (!code) {
+            if (code === 0) {
                 return
             }
-            throw new Error(`Tlv Storage processor exited with code ${code}`)
+            throw new Error(`Tlv Storage processor exited with code ${code} and signal ${signal}`)
         });
 
         this.isConnected = true;
@@ -173,7 +173,7 @@ export class TlvStorageFactory extends EventEmitter {
 
     public disconnect() {
         if (this.process) {
-            this.process.kill();
+            this.process.kill(0);
             this.isConnected = false;
             this.debug = false;
         }
diff --git a/src/services/storage/tlv/tlvFilesStorageProcessor.ts b/src/services/storage/tlv/tlvFilesStorageProcessor.ts
index 2b4189e4..caccb949 100644
--- a/src/services/storage/tlv/tlvFilesStorageProcessor.ts
+++ b/src/services/storage/tlv/tlvFilesStorageProcessor.ts
@@ -126,7 +126,7 @@ class TlvFilesStorageProcessor {
                     throw new Error('Unknown metric type: ' + t)
             }
         })
-        this.wrtc.attachNostrSend((initiator: SendInitiator, data: SendData, relays?: string[] | undefined) => {
+        this.wrtc.attachNostrSend(async (initiator: SendInitiator, data: SendData, relays?: string[] | undefined) => {
             this.sendResponse({
                 success: true,
                 type: 'nostrSend',
diff --git a/src/services/storage/userStorage.ts b/src/services/storage/userStorage.ts
index 58dd6cf5..a1541bac 100644
--- a/src/services/storage/userStorage.ts
+++ b/src/services/storage/userStorage.ts
@@ -42,7 +42,7 @@ export default class {
     async GetUser(userId: string, txId?: string): Promise<User> {
         const user = await this.FindUser(userId, txId)
         if (!user) {
-            throw new Error(`user ${userId} not found`) // TODO: fix logs doxing
+            throw new Error(`user not found`)
         }
         return user
     }
@@ -50,7 +50,7 @@ export default class {
     async UnbanUser(userId: string, txId?: string) {
         const affected = await this.dbs.Update<User>('User', { user_id: userId }, { locked: false }, txId)
         if (!affected) {
-            throw new Error("unaffected user unlock for " + userId) // TODO: fix logs doxing
+            throw new Error("unaffected user unlock")
         }
     }
 
@@ -58,7 +58,7 @@ export default class {
         const user = await this.GetUser(userId, txId)
         const affected = await this.dbs.Update<User>('User', { user_id: userId }, { balance_sats: 0, locked: true }, txId)
         if (!affected) {
-            throw new Error("unaffected ban user for " + userId) // TODO: fix logs doxing
+            throw new Error("unaffected ban user")
         }
         if (user.balance_sats > 0) {
             this.eventsLog.LogEvent({ type: 'balance_decrement', userId, appId: "", appUserId: "", balance: user.balance_sats, data: 'ban', amount: user.balance_sats })
@@ -80,7 +80,7 @@ export default class {
         const affected = await this.dbs.Increment<User>('User', { user_id: userId }, "balance_sats", increment, txId)
         if (!affected) {
             getLogger({ userId: userId, component: "balanceUpdates" })("user unaffected by increment")
-            throw new Error("unaffected balance increment for " + userId) // TODO: fix logs doxing
+            throw new Error("unaffected balance increment")
         }
         getLogger({ userId: userId, component: "balanceUpdates" })("incremented balance from", user.balance_sats, "sats, by", increment, "sats")
         this.eventsLog.LogEvent({ type: 'balance_increment', userId, appId: "", appUserId: "", balance: user.balance_sats, data: reason, amount: increment })
@@ -105,7 +105,7 @@ export default class {
         const affected = await this.dbs.Decrement<User>('User', { user_id: userId }, "balance_sats", decrement, txId)
         if (!affected) {
             getLogger({ userId: userId, component: "balanceUpdates" })("user unaffected by decrement")
-            throw new Error("unaffected balance decrement for " + userId) // TODO: fix logs doxing
+            throw new Error("unaffected balance decrement")
         }
         getLogger({ userId: userId, component: "balanceUpdates" })("decremented balance from", user.balance_sats, "sats, by", decrement, "sats")
         this.eventsLog.LogEvent({ type: 'balance_decrement', userId, appId: "", appUserId: "", balance: user.balance_sats, data: reason, amount: decrement })
@@ -126,4 +126,8 @@ export default class {
         const lastSeenAtUnix = now - seconds
         return this.dbs.Find<UserAccess>('UserAccess', { where: { last_seen_at_unix: LessThan(lastSeenAtUnix) } })
     }
-}
\ No newline at end of file
+
+    async DeleteUserAccess(userId: string, txId?: string) {
+        return this.dbs.Delete<UserAccess>('UserAccess', { user_id: userId }, txId)
+    }
+}
diff --git a/src/services/webRTC/index.ts b/src/services/webRTC/index.ts
index 8ee8d884..a2cc90af 100644
--- a/src/services/webRTC/index.ts
+++ b/src/services/webRTC/index.ts
@@ -27,11 +27,11 @@ export default class webRTC {
     attachNostrSend(f: NostrSend) {
         this._nostrSend = f
     }
-    private nostrSend: NostrSend = (initiator: SendInitiator, data: SendData, relays?: string[] | undefined) => {
+    private nostrSend: NostrSend = async (initiator: SendInitiator, data: SendData, relays?: string[] | undefined) => {
         if (!this._nostrSend) {
             throw new Error("No nostrSend attached")
         }
-        this._nostrSend(initiator, data, relays)
+        await this._nostrSend(initiator, data, relays)
     }
 
     private sendCandidate = (u: WebRtcUserInfo, candidate: string) => {