add time info to swaps
This commit is contained in:
parent
f4b302ed43
commit
edbbbd4aec
12 changed files with 124 additions and 75 deletions
|
|
@ -1383,17 +1383,18 @@ The nostr server will send back a message response, and inside the body there wi
|
|||
- __url__: _string_
|
||||
|
||||
### InvoiceSwapOperation
|
||||
- __completed_at_unix__: _number_ *this field is optional
|
||||
- __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_
|
||||
- __quote__: _[InvoiceSwapQuote](#InvoiceSwapQuote)_
|
||||
|
||||
### InvoiceSwapQuote
|
||||
- __address__: _string_
|
||||
- __chain_fee_sats__: _number_
|
||||
- __expires_at_block_height__: _number_
|
||||
- __invoice__: _string_
|
||||
- __invoice_amount_sats__: _number_
|
||||
- __paid_at_unix__: _number_
|
||||
- __service_fee_sats__: _number_
|
||||
- __service_url__: _string_
|
||||
- __swap_fee_sats__: _number_
|
||||
|
|
@ -1408,7 +1409,7 @@ The nostr server will send back a message response, and inside the body there wi
|
|||
- __amount_sats__: _number_
|
||||
|
||||
### InvoiceSwapsList
|
||||
- __quotes__: ARRAY of: _[InvoiceSwapQuote](#InvoiceSwapQuote)_
|
||||
- __current_block_height__: _number_
|
||||
- __swaps__: ARRAY of: _[InvoiceSwapOperation](#InvoiceSwapOperation)_
|
||||
|
||||
### LatestBundleMetricReq
|
||||
|
|
|
|||
|
|
@ -360,17 +360,18 @@ type HttpCreds struct {
|
|||
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"`
|
||||
Completed_at_unix int64 `json:"completed_at_unix"`
|
||||
Failure_reason string `json:"failure_reason"`
|
||||
Operation_payment *UserOperation `json:"operation_payment"`
|
||||
Quote *InvoiceSwapQuote `json:"quote"`
|
||||
}
|
||||
type InvoiceSwapQuote struct {
|
||||
Address string `json:"address"`
|
||||
Chain_fee_sats int64 `json:"chain_fee_sats"`
|
||||
Expires_at_block_height int64 `json:"expires_at_block_height"`
|
||||
Invoice string `json:"invoice"`
|
||||
Invoice_amount_sats int64 `json:"invoice_amount_sats"`
|
||||
Paid_at_unix int64 `json:"paid_at_unix"`
|
||||
Service_fee_sats int64 `json:"service_fee_sats"`
|
||||
Service_url string `json:"service_url"`
|
||||
Swap_fee_sats int64 `json:"swap_fee_sats"`
|
||||
|
|
@ -385,8 +386,8 @@ type InvoiceSwapRequest struct {
|
|||
Amount_sats int64 `json:"amount_sats"`
|
||||
}
|
||||
type InvoiceSwapsList struct {
|
||||
Quotes []InvoiceSwapQuote `json:"quotes"`
|
||||
Swaps []InvoiceSwapOperation `json:"swaps"`
|
||||
Current_block_height int64 `json:"current_block_height"`
|
||||
Swaps []InvoiceSwapOperation `json:"swaps"`
|
||||
}
|
||||
type LatestBundleMetricReq struct {
|
||||
Limit int64 `json:"limit"`
|
||||
|
|
|
|||
|
|
@ -2123,43 +2123,39 @@ export const HttpCredsValidate = (o?: HttpCreds, opts: HttpCredsOptions = {}, pa
|
|||
}
|
||||
|
||||
export type InvoiceSwapOperation = {
|
||||
completed_at_unix?: number
|
||||
failure_reason?: string
|
||||
invoice_paid: string
|
||||
operation_payment?: UserOperation
|
||||
swap_operation_id: string
|
||||
tx_id: string
|
||||
quote: InvoiceSwapQuote
|
||||
}
|
||||
export type InvoiceSwapOperationOptionalField = 'failure_reason' | 'operation_payment'
|
||||
export const InvoiceSwapOperationOptionalFields: InvoiceSwapOperationOptionalField[] = ['failure_reason', 'operation_payment']
|
||||
export type InvoiceSwapOperationOptionalField = 'completed_at_unix' | 'failure_reason' | 'operation_payment'
|
||||
export const InvoiceSwapOperationOptionalFields: InvoiceSwapOperationOptionalField[] = ['completed_at_unix', 'failure_reason', 'operation_payment']
|
||||
export type InvoiceSwapOperationOptions = OptionsBaseMessage & {
|
||||
checkOptionalsAreSet?: InvoiceSwapOperationOptionalField[]
|
||||
completed_at_unix_CustomCheck?: (v?: number) => boolean
|
||||
failure_reason_CustomCheck?: (v?: string) => boolean
|
||||
invoice_paid_CustomCheck?: (v: string) => boolean
|
||||
operation_payment_Options?: UserOperationOptions
|
||||
swap_operation_id_CustomCheck?: (v: string) => boolean
|
||||
tx_id_CustomCheck?: (v: string) => boolean
|
||||
quote_Options?: InvoiceSwapQuoteOptions
|
||||
}
|
||||
export const InvoiceSwapOperationValidate = (o?: InvoiceSwapOperation, opts: InvoiceSwapOperationOptions = {}, path: string = 'InvoiceSwapOperation::root.'): Error | null => {
|
||||
if (opts.checkOptionalsAreSet && opts.allOptionalsAreSet) return new Error(path + ': only one of checkOptionalsAreSet or allOptionalNonDefault can be set for each message')
|
||||
if (typeof o !== 'object' || o === null) return new Error(path + ': object is not an instance of an object or is null')
|
||||
|
||||
if ((o.completed_at_unix || opts.allOptionalsAreSet || opts.checkOptionalsAreSet?.includes('completed_at_unix')) && typeof o.completed_at_unix !== 'number') return new Error(`${path}.completed_at_unix: is not a number`)
|
||||
if (opts.completed_at_unix_CustomCheck && !opts.completed_at_unix_CustomCheck(o.completed_at_unix)) return new Error(`${path}.completed_at_unix: custom check failed`)
|
||||
|
||||
if ((o.failure_reason || opts.allOptionalsAreSet || opts.checkOptionalsAreSet?.includes('failure_reason')) && typeof o.failure_reason !== 'string') return new Error(`${path}.failure_reason: is not a string`)
|
||||
if (opts.failure_reason_CustomCheck && !opts.failure_reason_CustomCheck(o.failure_reason)) return new Error(`${path}.failure_reason: custom check failed`)
|
||||
|
||||
if (typeof o.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`)
|
||||
const quoteErr = InvoiceSwapQuoteValidate(o.quote, opts.quote_Options, `${path}.quote`)
|
||||
if (quoteErr !== null) return quoteErr
|
||||
|
||||
|
||||
return null
|
||||
}
|
||||
|
|
@ -2167,8 +2163,10 @@ export const InvoiceSwapOperationValidate = (o?: InvoiceSwapOperation, opts: Inv
|
|||
export type InvoiceSwapQuote = {
|
||||
address: string
|
||||
chain_fee_sats: number
|
||||
expires_at_block_height: number
|
||||
invoice: string
|
||||
invoice_amount_sats: number
|
||||
paid_at_unix: number
|
||||
service_fee_sats: number
|
||||
service_url: string
|
||||
swap_fee_sats: number
|
||||
|
|
@ -2181,8 +2179,10 @@ export type InvoiceSwapQuoteOptions = OptionsBaseMessage & {
|
|||
checkOptionalsAreSet?: []
|
||||
address_CustomCheck?: (v: string) => boolean
|
||||
chain_fee_sats_CustomCheck?: (v: number) => boolean
|
||||
expires_at_block_height_CustomCheck?: (v: number) => boolean
|
||||
invoice_CustomCheck?: (v: string) => boolean
|
||||
invoice_amount_sats_CustomCheck?: (v: number) => boolean
|
||||
paid_at_unix_CustomCheck?: (v: number) => boolean
|
||||
service_fee_sats_CustomCheck?: (v: number) => boolean
|
||||
service_url_CustomCheck?: (v: string) => boolean
|
||||
swap_fee_sats_CustomCheck?: (v: number) => boolean
|
||||
|
|
@ -2200,12 +2200,18 @@ export const InvoiceSwapQuoteValidate = (o?: InvoiceSwapQuote, opts: InvoiceSwap
|
|||
if (typeof o.chain_fee_sats !== 'number') return new Error(`${path}.chain_fee_sats: is not a number`)
|
||||
if (opts.chain_fee_sats_CustomCheck && !opts.chain_fee_sats_CustomCheck(o.chain_fee_sats)) return new Error(`${path}.chain_fee_sats: custom check failed`)
|
||||
|
||||
if (typeof o.expires_at_block_height !== 'number') return new Error(`${path}.expires_at_block_height: is not a number`)
|
||||
if (opts.expires_at_block_height_CustomCheck && !opts.expires_at_block_height_CustomCheck(o.expires_at_block_height)) return new Error(`${path}.expires_at_block_height: custom check failed`)
|
||||
|
||||
if (typeof o.invoice !== 'string') return new Error(`${path}.invoice: is not a string`)
|
||||
if (opts.invoice_CustomCheck && !opts.invoice_CustomCheck(o.invoice)) return new Error(`${path}.invoice: custom check failed`)
|
||||
|
||||
if (typeof o.invoice_amount_sats !== 'number') return new Error(`${path}.invoice_amount_sats: is not a number`)
|
||||
if (opts.invoice_amount_sats_CustomCheck && !opts.invoice_amount_sats_CustomCheck(o.invoice_amount_sats)) return new Error(`${path}.invoice_amount_sats: custom check failed`)
|
||||
|
||||
if (typeof o.paid_at_unix !== 'number') return new Error(`${path}.paid_at_unix: is not a number`)
|
||||
if (opts.paid_at_unix_CustomCheck && !opts.paid_at_unix_CustomCheck(o.paid_at_unix)) return new Error(`${path}.paid_at_unix: custom check failed`)
|
||||
|
||||
if (typeof o.service_fee_sats !== 'number') return new Error(`${path}.service_fee_sats: is not a number`)
|
||||
if (opts.service_fee_sats_CustomCheck && !opts.service_fee_sats_CustomCheck(o.service_fee_sats)) return new Error(`${path}.service_fee_sats: custom check failed`)
|
||||
|
||||
|
|
@ -2269,14 +2275,13 @@ export const InvoiceSwapRequestValidate = (o?: InvoiceSwapRequest, opts: Invoice
|
|||
}
|
||||
|
||||
export type InvoiceSwapsList = {
|
||||
quotes: InvoiceSwapQuote[]
|
||||
current_block_height: number
|
||||
swaps: InvoiceSwapOperation[]
|
||||
}
|
||||
export const InvoiceSwapsListOptionalFields: [] = []
|
||||
export type InvoiceSwapsListOptions = OptionsBaseMessage & {
|
||||
checkOptionalsAreSet?: []
|
||||
quotes_ItemOptions?: InvoiceSwapQuoteOptions
|
||||
quotes_CustomCheck?: (v: InvoiceSwapQuote[]) => boolean
|
||||
current_block_height_CustomCheck?: (v: number) => boolean
|
||||
swaps_ItemOptions?: InvoiceSwapOperationOptions
|
||||
swaps_CustomCheck?: (v: InvoiceSwapOperation[]) => boolean
|
||||
}
|
||||
|
|
@ -2284,12 +2289,8 @@ export const InvoiceSwapsListValidate = (o?: InvoiceSwapsList, opts: InvoiceSwap
|
|||
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 (typeof o.current_block_height !== 'number') return new Error(`${path}.current_block_height: is not a number`)
|
||||
if (opts.current_block_height_CustomCheck && !opts.current_block_height_CustomCheck(o.current_block_height)) return new Error(`${path}.current_block_height: custom check failed`)
|
||||
|
||||
if (!Array.isArray(o.swaps)) return new Error(`${path}.swaps: is not an array`)
|
||||
for (let index = 0; index < o.swaps.length; index++) {
|
||||
|
|
|
|||
|
|
@ -848,6 +848,8 @@ message InvoiceSwapQuote {
|
|||
string service_url = 8;
|
||||
int64 swap_fee_sats = 9;
|
||||
string tx_id = 10;
|
||||
int64 paid_at_unix = 11;
|
||||
int64 expires_at_block_height = 12;
|
||||
}
|
||||
|
||||
message InvoiceSwapQuoteList {
|
||||
|
|
@ -855,16 +857,15 @@ message InvoiceSwapQuoteList {
|
|||
}
|
||||
|
||||
message InvoiceSwapOperation {
|
||||
string swap_operation_id = 1;
|
||||
InvoiceSwapQuote quote = 1;
|
||||
optional UserOperation operation_payment = 2;
|
||||
optional string failure_reason = 3;
|
||||
string invoice_paid = 4;
|
||||
string tx_id = 5;
|
||||
optional int64 completed_at_unix = 6;
|
||||
}
|
||||
|
||||
message InvoiceSwapsList {
|
||||
repeated InvoiceSwapOperation swaps = 1;
|
||||
repeated InvoiceSwapQuote quotes = 2;
|
||||
int64 current_block_height = 3;
|
||||
}
|
||||
|
||||
message RefundAdminInvoiceSwapRequest {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue