Merge pull request #2889 from DFXswiss/develop

Release: develop -> master

Author: davidleomay

migration/1767952500437-MaerkiRemoved.js

@@ -0,0 +1,28 @@
+/**
+ * @typedef {import('typeorm').MigrationInterface} MigrationInterface
+ * @typedef {import('typeorm').QueryRunner} QueryRunner
+ */
+
+/**
+ * @class
+ * @implements {MigrationInterface}
+ */
+module.exports = class MaerkiRemoved1767952500437 {
+    name = 'MaerkiRemoved1767952500437'
+
+    /**
+     * @param {QueryRunner} queryRunner
+     */
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "country" DROP CONSTRAINT "DF_687dc858f7aff3f03ffbb214f2c"`);
+        await queryRunner.query(`ALTER TABLE "country" DROP COLUMN "maerkiBaumannEnable"`);
+    }
+
+    /**
+     * @param {QueryRunner} queryRunner
+     */
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "country" ADD "maerkiBaumannEnable" bit NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "country" ADD CONSTRAINT "DF_687dc858f7aff3f03ffbb214f2c" DEFAULT 0 FOR "maerkiBaumannEnable"`);
+    }
+}

src/config/config.ts

@@ -56,6 +56,10 @@ export class Configuration {
   priceSourceManual = 'DFX'; // source name for priceStep if price is set manually in buy-crypto
   priceSourcePayment = 'Payment'; // source name for priceStep if price is defined by payment quote
 
+  isDomesticIban(iban: string): boolean {
+    return ['CH', 'LI'].includes(iban?.substring(0, 2));
+  }
+
   defaults = {
     currency: 'EUR',
     language: 'EN',

src/integration/exchange/services/binance.service.ts

@@ -13,7 +13,7 @@ export class BinanceService extends ExchangeService {
     Arbitrum: 'ARBITRUM',
     BinanceSmartChain: 'BSC',
     Bitcoin: 'BTC',
-    Lightning: undefined,
+    Lightning: 'LIGHTNING',
     Spark: undefined,
     Monero: 'XMR',
     Zano: undefined,

src/integration/lightning/dto/lnbits.dto.ts

@@ -15,8 +15,8 @@ export interface LnBitsWalletPaymentParamsDto {
   amount: number;
   memo: string;
   expirySec: number;
-  webhook: string;
-  extra: {
+  webhook?: string;
+  extra?: {
     link: string;
     signature: string;
   };

src/integration/lightning/dto/lnd.dto.ts

@@ -27,6 +27,24 @@ export enum LndPaymentStatus {
   FAILED = 'FAILED',
 }
 
+export enum LndInvoiceState {
+  OPEN = 'OPEN',
+  SETTLED = 'SETTLED',
+  CANCELED = 'CANCELED',
+  ACCEPTED = 'ACCEPTED',
+}
+
+export interface LndInvoiceDto {
+  memo: string;
+  r_hash: string;
+  payment_request: string;
+  value_sat: string;
+  state: LndInvoiceState;
+  settled: boolean;
+  settle_date: string;
+  amt_paid_sat: string;
+}
+
 export interface LndPaymentDto {
   payment_hash: string;
   value_sat: number;

src/integration/lightning/lightning-client.ts

@@ -8,6 +8,7 @@ import {
   LndChannelBalanceDto,
   LndChannelDto,
   LndInfoDto,
+  LndInvoiceDto,
   LndPaymentDto,
   LndRouteDto,
   LndSendPaymentResponseDto,
@@ -115,6 +116,13 @@ export class LightningClient {
       .then((p) => p.payments);
   }
 
+  async lookupInvoice(paymentHashHex: string): Promise<LndInvoiceDto> {
+    return this.http.get<LndInvoiceDto>(
+      `${Config.blockchain.lightning.lnd.apiUrl}/invoice/${paymentHashHex}`,
+      this.httpLndConfig(),
+    );
+  }
+
   async sendPaymentByInvoice(invoice: string): Promise<LndSendPaymentResponseDto> {
     return this.http.post<LndSendPaymentResponseDto>(
       `${Config.blockchain.lightning.lnd.apiUrl}/channels/transactions`,

src/shared/models/country/__mocks__/country.entity.mock.ts

@@ -7,7 +7,6 @@ const defaultCountry: Partial<Country> = {
   dfxEnable: true,
   lockEnable: true,
   ipEnable: true,
-  maerkiBaumannEnable: true,
   yapealEnable: true,
   updated: undefined,
   created: undefined,

src/shared/models/country/country.entity.ts

@@ -30,9 +30,6 @@ export class Country extends IEntity {
   @Column({ default: true })
   ipEnable: boolean;
 
-  @Column({ default: false })
-  maerkiBaumannEnable: boolean;
-
   @Column({ default: false })
   yapealEnable: boolean;
 

src/shared/services/payment-info.service.ts

@@ -90,7 +90,7 @@ export class PaymentInfoService {
     if (!dto.currency) throw new NotFoundException('Currency not found');
     if (!dto.currency.buyable) throw new BadRequestException('Currency not buyable');
 
-    if ('iban' in dto && dto.currency?.name === 'CHF' && !dto.iban.startsWith('CH') && !dto.iban.startsWith('LI'))
+    if ('iban' in dto && dto.currency?.name === 'CHF' && !Config.isDomesticIban(dto.iban))
       throw new BadRequestException(
         'CHF transactions are only permitted to Liechtenstein or Switzerland. Use EUR for other countries.',
       );

src/shared/utils/test.util.ts

@@ -4,7 +4,7 @@ import { DeepPartial } from 'typeorm';
 
 export class TestUtil {
   static provideConfig(config: DeepPartial<Configuration> = {}): Provider {
-    const conf = { ...new Configuration(), ...config } as Configuration;
+    const conf = Object.assign(new Configuration(), config);
     return { provide: ConfigService, useValue: new ConfigService(conf) };
   }
 }