mirrors/thunderhub
1
0
Fork 0
mirror of https://github.com/apotdevin/thunderhub.git synced 2025-02-20 13:34:30 +01:00
Code Issues Projects Releases Wiki Activity

chore: cleanup

Browse source
This commit is contained in:
Anthony Potdevin 2023-12-14 13:42:38 +01:00
parent 5e9b3f681f
commit e0498a6c91
No known key found for this signature in database
GPG key ID: 4403F1DFBE779457
5 changed files with 38 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.env
View file

@ -32,6 +32,7 @@
# DISABLE_INVOICE_SUB=true
# DISABLE_PAYMENT_SUB=true
# DISABLE_FORWARD_SUB=true
# DISABLE_FORWARD_REQUESTS_SUB=true
# DISABLE_CHANNEL_SUB=true
# DISABLE_BACKUP_SUB=true

1
src/server/config/configuration.ts
View file

@ -129,6 +129,7 @@ export default (): ConfigType => {
disableForwards: process.env.DISABLE_FORWARD_SUB === 'true',
disableChannels: process.env.DISABLE_CHANNEL_SUB === 'true',
disableBackups: process.env.DISABLE_BACKUP_SUB === 'true',
disableForwardRequests: process.env.DISABLE_FORWARD_REQUESTS_SUB === 'true',
};
const amboss = {

6
src/server/modules/api/amboss/amboss.gql.ts
View file

@ -130,9 +130,9 @@ export const getEdgeInfoBatchQuery = gql`
}
`;
export const getPhantomPayment = gql`
query GetPhantomPayment($input: PhantomPaymentInput!) {
getPhantomPayment(input: $input) {
export const getGhostPayment = gql`
query GetGhostPayment($input: GhostPaymentInput!) {
getGhostPayment(input: $input) {
preimage
payment_amount
}

12
src/server/modules/api/amboss/amboss.service.ts
View file

@ -10,7 +10,7 @@ import { FetchService } from '../../fetch/fetch.service';
import {
getEdgeInfoBatchQuery,
getNodeAliasBatchQuery,
getPhantomPayment,
getGhostPayment,
pingHealthCheckMutation,
pushNodeBalancesMutation,
saveBackupMutation,
@ -79,19 +79,19 @@ export class AmbossService {
return data.getNodeAliasBatch;
}
async getPhantomPayment(paymentHash: string, signature: string) {
async getGhostPayment(paymentHash: string, signature: string) {
const { data, error } = await this.fetchService.graphqlFetchWithProxy(
this.configService.get('urls.amboss'),
getPhantomPayment,
getGhostPayment,
{ input: { payment_hash: paymentHash, signature } }
);
if (!data?.getPhantomPayment || error) {
this.logger.error('Error getting phantom payment info', { data, error });
if (!data?.getGhostPayment || error) {
this.logger.error('Error getting ghost payment info', { data, error });
return null;
}
return data.getPhantomPayment;
return data.getGhostPayment;
}
async getNodeAliasBatch(pubkeys: string[]): Promise<(NodeAlias | null)[]> {

35
src/server/modules/sub/sub.service.ts
View file

@ -285,6 +285,17 @@ export class SubService implements OnApplicationBootstrap {
forwardRequests: [
'checkAvailable',
async ({ checkAvailable }, callback) => {
const disabled = this.configService.get(
'subscriptions.disableForwardRequests'
);
if (disabled) {
this.logger.info(
'Forward requests subscriptions are disabled'
);
return;
}
const names = checkAvailable.map(a => a.name);
this.logger.info('Forward request subscription', {
@ -303,24 +314,30 @@ export class SubService implements OnApplicationBootstrap {
async (
data: SubscribeToForwardRequestsForwardRequestEvent
) => {
this.logger.silly('New forward request event', {
this.logger.silly('Full new forward request event', {
node: node.name,
data,
});
this.logger.debug('New forward request event', {
node: node.name,
amount_msats: data.mtokens,
fee_msats: data.fee_mtokens,
in_channel: data.in_channel,
out_channel: data.out_channel,
payment_hash: data.hash,
});
if (data.out_channel !== SHORT_CHANNEL_ID) {
this.logger.debug(
'Accepting non phantom forward request'
'Accepting non ghost forward request'
);
data.accept();
return;
}
this.logger.info('Accepting phantom payment');
this.logger.info('Accepting ghost payment');
const { signature } =
await this.nodeService.signMessage(
@ -328,13 +345,15 @@ export class SubService implements OnApplicationBootstrap {
data.hash
);
const info = await this.ambossService.getPhantomPayment(
const info = await this.ambossService.getGhostPayment(
data.hash,
signature
);
if (!info) {
this.logger.error('Unable to accept phantom payment');
this.logger.error('Unable to accept ghost payment', {
payment_hash: data.hash,
});
data.reject();
return;
@ -342,7 +361,7 @@ export class SubService implements OnApplicationBootstrap {
if (data.mtokens < info.payment_amount) {
this.logger.error(
'Unable to accept phantom payment because size is below expected',
'Unable to accept ghost payment because size is below expected',
{
expected: info.payment_amount,
received: data.mtokens,
@ -356,7 +375,7 @@ export class SubService implements OnApplicationBootstrap {
if (!!info.preimage) {
data.settle({ secret: info.preimage });
this.logger.info('Accepted phantom payment request', {
this.logger.info('Accepted ghost payment request', {
info,
});
@ -364,7 +383,7 @@ export class SubService implements OnApplicationBootstrap {
}
this.logger.error(
'Error accepting phantom payment request',
'Error accepting ghost payment request',
{ info }
);
data.reject();