admin swaps

2026-01-27 16:08:52 +00:00 · 2026-01-27 16:08:52 +00:00 · d120ad7f99
commit d120ad7f99
parent a596e186fe
22 changed files with 1258 additions and 226 deletions
--- a/proto/autogenerated/client.md
+++ b/proto/autogenerated/client.md
@ -93,6 +93,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)
@ -243,20 +248,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 +300,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__
@ -540,6 +555,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__
@ -743,7 +765,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 +856,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 +877,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 +928,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__
@ -1098,7 +1134,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_

@ -1331,6 +1370,35 @@ The nostr server will send back a message response, and inside the body there wi
  - __token__: _string_
  - __url__: _string_

+### InvoiceSwapOperation
+  - __failure_reason__: _string_ *this field is optional
+  - __invoice_paid__: _string_
+  - __operation_payment__: _[UserOperation](#UserOperation)_ *this field is optional
+  - __swap_operation_id__: _string_
+  - __tx_id__: _string_
+
+### InvoiceSwapQuote
+  - __address__: _string_
+  - __chain_fee_sats__: _number_
+  - __invoice__: _string_
+  - __invoice_amount_sats__: _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
+  - __invoice__: _string_
+
+### InvoiceSwapsList
+  - __quotes__: ARRAY of: _[InvoiceSwapQuote](#InvoiceSwapQuote)_
+  - __swaps__: ARRAY of: _[InvoiceSwapOperation](#InvoiceSwapOperation)_
+
 ### LatestBundleMetricReq
  - __limit__: _number_ *this field is optional

@ -1534,6 +1602,10 @@ The nostr server will send back a message response, and inside the body there wi
  - __service_fee__: _number_
  - __txId__: _string_

+### PayAdminInvoiceSwapRequest
+  - __sat_per_v_byte__: _number_
+  - __swap_operation_id__: _string_
+
 ### PayAdminTransactionSwapRequest
  - __address__: _string_
  - __swap_operation_id__: _string_
@ -1640,16 +1712,6 @@ 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_
-
-### SwapsList
-  - __quotes__: ARRAY of: _[TransactionSwapQuote](#TransactionSwapQuote)_
-  - __swaps__: ARRAY of: _[SwapOperation](#SwapOperation)_
-
 ### TransactionSwapQuote
  - __chain_fee_sats__: _number_
  - __invoice_amount_sats__: _number_
@ -1665,6 +1727,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_
+  - __failure_reason__: _string_ *this field is optional
+  - __operation_payment__: _[UserOperation](#UserOperation)_ *this field is optional
+  - __swap_operation_id__: _string_
+
+### TxSwapsList
+  - __quotes__: ARRAY of: _[TransactionSwapQuote](#TransactionSwapQuote)_
+  - __swaps__: ARRAY of: _[TxSwapOperation](#TxSwapOperation)_
+
 ### UpdateChannelPolicyRequest
  - __policy__: _[ChannelPolicy](#ChannelPolicy)_
  - __update__: _[UpdateChannelPolicyRequest_update](#UpdateChannelPolicyRequest_update)_
--- a/proto/autogenerated/go/http_client.go
+++ b/proto/autogenerated/go/http_client.go
@ -74,6 +74,7 @@ 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)
@ -114,16 +115,18 @@ 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
@ -667,6 +670,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 {
@ -1324,7 +1356,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 +1675,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 +1694,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 +1749,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 +1768,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 +1950,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 +2001,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
--- a/proto/autogenerated/go/types.go
+++ b/proto/autogenerated/go/types.go
@ -123,7 +123,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"`
 }
@ -356,6 +359,35 @@ type HttpCreds struct {
 	Token string `json:"token"`
 	Url   string `json:"url"`
 }
+type InvoiceSwapOperation struct {
+	Failure_reason    string         `json:"failure_reason"`
+	Invoice_paid      string         `json:"invoice_paid"`
+	Operation_payment *UserOperation `json:"operation_payment"`
+	Swap_operation_id string         `json:"swap_operation_id"`
+	Tx_id             string         `json:"tx_id"`
+}
+type InvoiceSwapQuote struct {
+	Address                 string `json:"address"`
+	Chain_fee_sats          int64  `json:"chain_fee_sats"`
+	Invoice                 string `json:"invoice"`
+	Invoice_amount_sats     int64  `json:"invoice_amount_sats"`
+	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 {
+	Invoice string `json:"invoice"`
+}
+type InvoiceSwapsList struct {
+	Quotes []InvoiceSwapQuote     `json:"quotes"`
+	Swaps  []InvoiceSwapOperation `json:"swaps"`
+}
 type LatestBundleMetricReq struct {
 	Limit int64 `json:"limit"`
 }
@ -559,6 +591,10 @@ type PayAddressResponse struct {
 	Service_fee  int64  `json:"service_fee"`
 	Txid         string `json:"txId"`
 }
+type PayAdminInvoiceSwapRequest struct {
+	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"`
@ -665,16 +701,6 @@ 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 SwapsList struct {
-	Quotes []TransactionSwapQuote `json:"quotes"`
-	Swaps  []SwapOperation        `json:"swaps"`
-}
 type TransactionSwapQuote struct {
 	Chain_fee_sats          int64  `json:"chain_fee_sats"`
 	Invoice_amount_sats     int64  `json:"invoice_amount_sats"`
@ -690,6 +716,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"`
+	Swap_operation_id string         `json:"swap_operation_id"`
+}
+type TxSwapsList struct {
+	Quotes []TransactionSwapQuote `json:"quotes"`
+	Swaps  []TxSwapOperation      `json:"swaps"`
+}
 type UpdateChannelPolicyRequest struct {
 	Policy *ChannelPolicy                     `json:"policy"`
 	Update *UpdateChannelPolicyRequest_update `json:"update"`
--- 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 })
                            }
@ -869,6 +869,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}
@ -1362,7 +1384,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 +1629,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 +1686,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 +1834,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}
--- a/proto/autogenerated/ts/http_client.ts
+++ b/proto/autogenerated/ts/http_client.ts
@ -273,6 +273,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')
@ -620,7 +634,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 +795,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 +837,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 +937,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 +960,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' }
--- a/proto/autogenerated/ts/nostr_client.ts
+++ b/proto/autogenerated/ts/nostr_client.ts
@ -230,6 +230,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')
@ -666,16 +681,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 +723,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 +827,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 +852,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' }
--- 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 })
                                    }
@ -687,6 +687,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')
@ -1122,14 +1138,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 +1177,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 +1283,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')
--- 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 | CloseChannel_Input | CreateOneTimeInviteLink_Input | GetAdminInvoiceSwapQuotes_Input | GetAdminTransactionSwapQuotes_Input | GetInviteLinkState_Input | GetSeed_Input | ListAdminInvoiceSwaps_Input | ListAdminTxSwaps_Input | ListChannels_Input | LndGetInfo_Input | OpenChannel_Input | PayAdminInvoiceSwap_Input | PayAdminTransactionSwap_Input | UpdateChannelPolicy_Input
+export type AdminMethodOutputs = AddApp_Output | AddPeer_Output | AuthApp_Output | BanUser_Output | CloseChannel_Output | CreateOneTimeInviteLink_Output | GetAdminInvoiceSwapQuotes_Output | GetAdminTransactionSwapQuotes_Output | GetInviteLinkState_Output | GetSeed_Output | ListAdminInvoiceSwaps_Output | ListAdminTxSwaps_Output | ListChannels_Output | LndGetInfo_Output | OpenChannel_Output | PayAdminInvoiceSwap_Output | PayAdminTransactionSwap_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}
@ -99,6 +99,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)

@ -238,14 +241,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 +274,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)
@ -357,6 +366,7 @@ 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>
@ -397,16 +407,18 @@ 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>
@ -671,17 +683,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')

@ -2088,6 +2118,185 @@ export const HttpCredsValidate = (o?: HttpCreds, opts: HttpCredsOptions = {}, pa
    return null
 }

+export type InvoiceSwapOperation = {
+    failure_reason?: string
+    invoice_paid: string
+    operation_payment?: UserOperation
+    swap_operation_id: string
+    tx_id: string
+}
+export type InvoiceSwapOperationOptionalField = 'failure_reason' | 'operation_payment'
+export const InvoiceSwapOperationOptionalFields: InvoiceSwapOperationOptionalField[] = ['failure_reason', 'operation_payment']
+export type InvoiceSwapOperationOptions = OptionsBaseMessage & {
+    checkOptionalsAreSet?: InvoiceSwapOperationOptionalField[]
+    failure_reason_CustomCheck?: (v?: string) => boolean
+    invoice_paid_CustomCheck?: (v: string) => boolean
+    operation_payment_Options?: UserOperationOptions
+    swap_operation_id_CustomCheck?: (v: string) => boolean
+    tx_id_CustomCheck?: (v: string) => boolean
+}
+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.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.invoice_paid !== 'string') return new Error(`${path}.invoice_paid: is not a string`)
+    if (opts.invoice_paid_CustomCheck && !opts.invoice_paid_CustomCheck(o.invoice_paid)) return new Error(`${path}.invoice_paid: 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 (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.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 InvoiceSwapQuote = {
+    address: string
+    chain_fee_sats: number
+    invoice: string
+    invoice_amount_sats: 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
+    invoice_CustomCheck?: (v: string) => boolean
+    invoice_amount_sats_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.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.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 = {
+    invoice: string
+}
+export const InvoiceSwapRequestOptionalFields: [] = []
+export type InvoiceSwapRequestOptions = OptionsBaseMessage & {
+    checkOptionalsAreSet?: []
+    invoice_CustomCheck?: (v: string) => 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.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`)
+
+    return null
+}
+
+export type InvoiceSwapsList = {
+    quotes: InvoiceSwapQuote[]
+    swaps: InvoiceSwapOperation[]
+}
+export const InvoiceSwapsListOptionalFields: [] = []
+export type InvoiceSwapsListOptions = OptionsBaseMessage & {
+    checkOptionalsAreSet?: []
+    quotes_ItemOptions?: InvoiceSwapQuoteOptions
+    quotes_CustomCheck?: (v: InvoiceSwapQuote[]) => 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 (!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`)
+
+    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
 }
@ -3308,6 +3517,29 @@ export const PayAddressResponseValidate = (o?: PayAddressResponse, opts: PayAddr
    return null
 }

+export type PayAdminInvoiceSwapRequest = {
+    sat_per_v_byte: number
+    swap_operation_id: string
+}
+export const PayAdminInvoiceSwapRequestOptionalFields: [] = []
+export type PayAdminInvoiceSwapRequestOptions = OptionsBaseMessage & {
+    checkOptionalsAreSet?: []
+    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 (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
@ -3917,76 +4149,6 @@ 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 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 SwapOperationValidate = (o?: SwapOperation, opts: SwapOperationOptions = {}, path: string = 'SwapOperation::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 ((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 (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 SwapsList = {
-    quotes: TransactionSwapQuote[]
-    swaps: SwapOperation[]
-}
-export const SwapsListOptionalFields: [] = []
-export type SwapsListOptions = OptionsBaseMessage & {
-    checkOptionalsAreSet?: []
-    quotes_ItemOptions?: TransactionSwapQuoteOptions
-    quotes_CustomCheck?: (v: TransactionSwapQuote[]) => boolean
-    swaps_ItemOptions?: SwapOperationOptions
-    swaps_CustomCheck?: (v: SwapOperation[]) => boolean
-}
-export const SwapsListValidate = (o?: SwapsList, opts: SwapsListOptions = {}, path: string = 'SwapsList::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 (!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 (opts.swaps_CustomCheck && !opts.swaps_CustomCheck(o.swaps)) return new Error(`${path}.swaps: custom check failed`)
-
-    return null
-}
-
 export type TransactionSwapQuote = {
    chain_fee_sats: number
    invoice_amount_sats: number
@ -4076,6 +4238,76 @@ export const TransactionSwapRequestValidate = (o?: TransactionSwapRequest, opts:
    return null
 }

+export type TxSwapOperation = {
+    address_paid: string
+    failure_reason?: string
+    operation_payment?: UserOperation
+    swap_operation_id: string
+}
+export type TxSwapOperationOptionalField = 'failure_reason' | 'operation_payment'
+export const TxSwapOperationOptionalFields: TxSwapOperationOptionalField[] = ['failure_reason', 'operation_payment']
+export type TxSwapOperationOptions = OptionsBaseMessage & {
+    checkOptionalsAreSet?: TxSwapOperationOptionalField[]
+    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 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 (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
+    }
+    
+
+    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 TxSwapsList = {
+    quotes: TransactionSwapQuote[]
+    swaps: TxSwapOperation[]
+}
+export const TxSwapsListOptionalFields: [] = []
+export type TxSwapsListOptions = OptionsBaseMessage & {
+    checkOptionalsAreSet?: []
+    quotes_ItemOptions?: TransactionSwapQuoteOptions
+    quotes_CustomCheck?: (v: TransactionSwapQuote[]) => boolean
+    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.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 (!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