getuserinfo returns bridgeUrl from env

This commit is contained in:
Mothana 2024-09-17 19:39:55 +04:00
parent 127d3a07fd
commit 4560d5c68b
6 changed files with 16 additions and 3 deletions

View file

@ -25,6 +25,9 @@
#PORT=1776 #PORT=1776
#JWT_SECRET= #JWT_SECRET=
#Lightning Address Bridge
#BRIDGE_URL=https://shockwallet.app
#LIGHTNING #LIGHTNING
# Maximum amount in network fees passed to LND when it pays an external invoice # Maximum amount in network fees passed to LND when it pays an external invoice
# BPS are basis points, 100 BPS = 1% # BPS are basis points, 100 BPS = 1%

View file

@ -962,6 +962,7 @@ The nostr server will send back a message response, and inside the body there wi
### UserInfo ### UserInfo
- __balance__: _number_ - __balance__: _number_
- __bridge_url__: _string_
- __max_withdrawable__: _number_ - __max_withdrawable__: _number_
- __network_max_fee_bps__: _number_ - __network_max_fee_bps__: _number_
- __network_max_fee_fixed__: _number_ - __network_max_fee_fixed__: _number_

View file

@ -2353,6 +2353,7 @@ export const UseInviteLinkRequestValidate = (o?: UseInviteLinkRequest, opts: Use
export type UserInfo = { export type UserInfo = {
balance: number balance: number
bridge_url: string
max_withdrawable: number max_withdrawable: number
network_max_fee_bps: number network_max_fee_bps: number
network_max_fee_fixed: number network_max_fee_fixed: number
@ -2365,6 +2366,7 @@ export const UserInfoOptionalFields: [] = []
export type UserInfoOptions = OptionsBaseMessage & { export type UserInfoOptions = OptionsBaseMessage & {
checkOptionalsAreSet?: [] checkOptionalsAreSet?: []
balance_CustomCheck?: (v: number) => boolean balance_CustomCheck?: (v: number) => boolean
bridge_url_CustomCheck?: (v: string) => boolean
max_withdrawable_CustomCheck?: (v: number) => boolean max_withdrawable_CustomCheck?: (v: number) => boolean
network_max_fee_bps_CustomCheck?: (v: number) => boolean network_max_fee_bps_CustomCheck?: (v: number) => boolean
network_max_fee_fixed_CustomCheck?: (v: number) => boolean network_max_fee_fixed_CustomCheck?: (v: number) => boolean
@ -2380,6 +2382,9 @@ export const UserInfoValidate = (o?: UserInfo, opts: UserInfoOptions = {}, path:
if (typeof o.balance !== 'number') return new Error(`${path}.balance: is not a number`) if (typeof o.balance !== 'number') return new Error(`${path}.balance: is not a number`)
if (opts.balance_CustomCheck && !opts.balance_CustomCheck(o.balance)) return new Error(`${path}.balance: custom check failed`) if (opts.balance_CustomCheck && !opts.balance_CustomCheck(o.balance)) return new Error(`${path}.balance: custom check failed`)
if (typeof o.bridge_url !== 'string') return new Error(`${path}.bridge_url: is not a string`)
if (opts.bridge_url_CustomCheck && !opts.bridge_url_CustomCheck(o.bridge_url)) return new Error(`${path}.bridge_url: custom check failed`)
if (typeof o.max_withdrawable !== 'number') return new Error(`${path}.max_withdrawable: is not a number`) if (typeof o.max_withdrawable !== 'number') return new Error(`${path}.max_withdrawable: is not a number`)
if (opts.max_withdrawable_CustomCheck && !opts.max_withdrawable_CustomCheck(o.max_withdrawable)) return new Error(`${path}.max_withdrawable: custom check failed`) if (opts.max_withdrawable_CustomCheck && !opts.max_withdrawable_CustomCheck(o.max_withdrawable)) return new Error(`${path}.max_withdrawable: custom check failed`)

View file

@ -354,6 +354,7 @@ message UserInfo{
int64 network_max_fee_bps = 6; int64 network_max_fee_bps = 6;
int64 network_max_fee_fixed = 7; int64 network_max_fee_fixed = 7;
string noffer = 8; string noffer = 8;
string bridge_url = 9;
} }
message GetUserOperationsRequest{ message GetUserOperationsRequest{

View file

@ -61,7 +61,8 @@ export default class {
network_max_fee_bps: this.settings.lndSettings.feeRateBps, network_max_fee_bps: this.settings.lndSettings.feeRateBps,
network_max_fee_fixed: this.settings.lndSettings.feeFixedLimit, network_max_fee_fixed: this.settings.lndSettings.feeFixedLimit,
service_fee_bps: this.settings.outgoingAppUserInvoiceFeeBps, service_fee_bps: this.settings.outgoingAppUserInvoiceFeeBps,
noffer: encodeNoffer({ pubkey: app.nostr_public_key!, offer: appUser.identifier, priceType: PriceType.spontaneous, relay: "" }) noffer: encodeNoffer({ pubkey: app.nostr_public_key!, offer: appUser.identifier, priceType: PriceType.spontaneous, relay: "" }),
bridge_url: this.settings.bridgeUrl
} }
} }

View file

@ -33,7 +33,8 @@ export type MainSettings = {
wizard: boolean wizard: boolean
defaultAppName: string defaultAppName: string
pushBackupsToNostr: boolean pushBackupsToNostr: boolean
lnurlMetaText: string lnurlMetaText: string,
bridgeUrl: string
} }
export type BitcoinCoreSettings = { export type BitcoinCoreSettings = {
@ -72,7 +73,8 @@ export const LoadMainSettingsFromEnv = (): MainSettings => {
wizard: process.env.WIZARD === 'true' || false, wizard: process.env.WIZARD === 'true' || false,
defaultAppName: process.env.DEFAULT_APP_NAME || "wallet", defaultAppName: process.env.DEFAULT_APP_NAME || "wallet",
pushBackupsToNostr: process.env.PUSH_BACKUPS_TO_NOSTR === 'true' || false, pushBackupsToNostr: process.env.PUSH_BACKUPS_TO_NOSTR === 'true' || false,
lnurlMetaText: process.env.LNURL_META_TEXT || "LNURL via Lightning.pub" lnurlMetaText: process.env.LNURL_META_TEXT || "LNURL via Lightning.pub",
bridgeUrl: process.env.BRIDGE_URL || "https://shockwallet.app"
} }
} }