feat: address filter

lib/Boltz.ts

@@ -23,6 +23,7 @@ import LndClient from './lightning/LndClient';
 import ClnClient from './lightning/cln/ClnClient';
 import MpayClient from './lightning/cln/MpayClient';
 import NotificationProvider from './notifications/NotificationProvider';
+import Blocks from './service/Blocks';
 import CountryCodes from './service/CountryCodes';
 import Service from './service/Service';
 import NodeSwitch from './swap/NodeSwitch';
@@ -44,6 +45,7 @@ class Boltz {
   private readonly notifications!: NotificationProvider;
 
   private readonly api!: Api;
+  private readonly blocks: Blocks;
   private readonly countryCodes: CountryCodes;
   private readonly grpcServer!: GrpcServer;
   private readonly prometheus: Prometheus;
@@ -115,13 +117,16 @@ class Boltz {
       this.ethereumManagers,
     );
 
+    this.blocks = new Blocks(this.logger, this.config.blocks);
+
     try {
       this.service = new Service(
         this.logger,
         this.config,
         this.walletManager,
         new NodeSwitch(this.logger, this.config.nodeSwitch),
         this.currencies,
+        this.blocks,
       );
 
       this.backup = new BackupScheduler(
@@ -214,7 +219,10 @@ class Boltz {
 
       await this.grpcServer.listen();
 
-      await this.countryCodes.downloadRanges();
+      await Promise.all([
+        this.countryCodes.downloadRanges(),
+        this.blocks.updateBlocks(),
+      ]);
       await this.api.init();
 
       // Rescan chains after everything else was initialized to avoid race conditions

lib/Config.ts

@@ -10,7 +10,8 @@ import { Network } from './consts/Enums';
 import Errors from './consts/Errors';
 import { PairConfig } from './consts/Types';
 import { LndConfig } from './lightning/LndClient';
-import { ClnConfig } from './lightning/cln/ClnClient';
+import { ClnConfig } from './lightning/cln/Types';
+import { BlocksConfig } from './service/Blocks';
 import { MarkingsConfig } from './service/CountryCodes';
 import { NodeSwitchConfig } from './swap/NodeSwitch';
 
@@ -164,6 +165,7 @@ type ConfigType = {
   swapwitnessaddress: boolean;
 
   marking: MarkingsConfig;
+  blocks: BlocksConfig;
 
   api: ApiConfig;
   grpc: GrpcConfig;
@@ -228,6 +230,8 @@ class Config {
           'https://cdn.jsdelivr.net/npm/@ip-location-db/asn-country/asn-country-ipv6-num.csv',
       },
 
+      blocks: {},
+
       api: {
         host: '127.0.0.1',
         port: 9001,

lib/cli/Command.ts

@@ -8,6 +8,7 @@ import {
   detectSwap,
 } from 'boltz-core';
 import { Networks as LiquidNetworks } from 'boltz-core/dist/lib/liquid';
+import * as console from 'console';
 import { randomBytes } from 'crypto';
 import { ECPairInterface } from 'ecpair';
 import { Transaction as LiquidTransaction } from 'liquidjs-lib';
@@ -87,7 +88,9 @@ export const prepareTx = async (
 
   // If the redeem script can be parsed as JSON, it is a swap tree
   try {
-    const tree = SwapTreeSerializer.deserializeSwapTree(argv.redeemScript);
+    const tree = SwapTreeSerializer.deserializeSwapTree(
+      argv.redeemScript.replaceAll('\\"', '"'),
+    );
 
     const { musig, swapOutput } = musigFromExtractedKey(
       type,

lib/service/Blocks.ts

@@ -0,0 +1,40 @@
+import axios from 'axios';
+import Logger from '../Logger';
+
+type BlocksConfig = {
+  urls?: string[];
+};
+
+class Blocks {
+  private blocked = new Set<string>();
+
+  constructor(
+    private readonly logger: Logger,
+    private readonly config: BlocksConfig,
+  ) {}
+
+  public updateBlocks = async () => {
+    if (this.config.urls === undefined || this.config.urls.length === 0) {
+      return;
+    }
+
+    const addresses = await Promise.all(
+      this.config.urls.map(async (url) => {
+        const response = await axios.get<string[]>(url);
+        this.logger.verbose(
+          `Fetched ${response.data.length} blocked addresses from: ${url}`,
+        );
+        return response.data;
+      }),
+    );
+
+    for (const addr of addresses.flat()) {
+      this.blocked.add(addr);
+    }
+  };
+
+  public isBlocked = (addr: string) => this.blocked.has(addr);
+}
+
+export default Blocks;
+export { BlocksConfig };

lib/service/Service.ts

@@ -64,6 +64,7 @@ import SwapManager, { ChannelCreationInfo } from '../swap/SwapManager';
 import SwapOutputType from '../swap/SwapOutputType';
 import WalletManager, { Currency } from '../wallet/WalletManager';
 import EthereumManager from '../wallet/ethereum/EthereumManager';
+import Blocks from './Blocks';
 import ElementsService from './ElementsService';
 import Errors from './Errors';
 import EventHandler from './EventHandler';
@@ -119,6 +120,7 @@ class Service {
     private walletManager: WalletManager,
     private nodeSwitch: NodeSwitch,
     public currencies: Map<string, Currency>,
+    blocks: Blocks,
   ) {
     this.prepayMinerFee = config.prepayminerfee;
     this.logger.debug(
@@ -163,6 +165,7 @@ class Service {
           : OutputType.Compatibility,
       ),
       config.retryInterval,
+      blocks,
     );
 
     this.eventHandler = new EventHandler(

lib/swap/Errors.ts

@@ -98,4 +98,8 @@ export default {
     message: 'invalid address',
     code: concatErrorCode(ErrorCodePrefix.Swap, 19),
   }),
+  BLOCKED_ADDRESS: (): Error => ({
+    message: 'blocked address',
+    code: concatErrorCode(ErrorCodePrefix.Swap, 20),
+  }),
 };

lib/swap/EthereumNursery.ts

@@ -1,4 +1,4 @@
-import { TransactionResponse } from 'ethers';
+import { Transaction, TransactionResponse } from 'ethers';
 import { EventEmitter } from 'events';
 import { Op } from 'sequelize';
 import Logger from '../Logger';
@@ -15,6 +15,7 @@ import ReverseSwap from '../db/models/ReverseSwap';
 import Swap from '../db/models/Swap';
 import ReverseSwapRepository from '../db/repositories/ReverseSwapRepository';
 import SwapRepository from '../db/repositories/SwapRepository';
+import Blocks from '../service/Blocks';
 import Wallet from '../wallet/Wallet';
 import WalletManager from '../wallet/WalletManager';
 import EthereumManager from '../wallet/ethereum/EthereumManager';
@@ -109,6 +110,7 @@ class EthereumNursery extends EventEmitter implements IEthereumNursery {
     private readonly logger: Logger,
     private readonly walletManager: WalletManager,
     public readonly ethereumManager: EthereumManager,
+    private readonly blocks: Blocks,
   ) {
     super();
 
@@ -184,7 +186,7 @@ class EthereumNursery extends EventEmitter implements IEthereumNursery {
   private listenEtherSwap = () => {
     this.ethereumManager.contractEventHandler.on(
       'eth.lockup',
-      async (transactionHash, etherSwapValues) => {
+      async (transaction: Transaction, etherSwapValues) => {
         let swap = await SwapRepository.getSwap({
           preimageHash: getHexString(etherSwapValues.preimageHash),
           status: {
@@ -209,12 +211,12 @@ class EthereumNursery extends EventEmitter implements IEthereumNursery {
         }
 
         this.logger.debug(
-          `Found lockup in ${this.ethereumManager.networkDetails.name} EtherSwap contract for Swap ${swap.id}: ${transactionHash}`,
+          `Found lockup in ${this.ethereumManager.networkDetails.name} EtherSwap contract for Swap ${swap.id}: ${transaction.hash}`,
         );
 
         swap = await SwapRepository.setLockupTransaction(
           swap,
-          transactionHash,
+          transaction.hash!,
           Number(etherSwapValues.amount / etherDecimals),
           true,
         );
@@ -261,7 +263,12 @@ class EthereumNursery extends EventEmitter implements IEthereumNursery {
           }
         }
 
-        this.emit('eth.lockup', swap, transactionHash, etherSwapValues);
+        if (this.blocks.isBlocked(transaction.from!)) {
+          this.emit('lockup.failed', swap, Errors.BLOCKED_ADDRESS().message);
+          return;
+        }
+
+        this.emit('eth.lockup', swap, transaction.hash, etherSwapValues);
       },
     );
 
@@ -291,7 +298,7 @@ class EthereumNursery extends EventEmitter implements IEthereumNursery {
   private listenERC20Swap = () => {
     this.ethereumManager.contractEventHandler.on(
       'erc20.lockup',
-      async (transactionHash, erc20SwapValues) => {
+      async (transaction: Transaction, erc20SwapValues) => {
         let swap = await SwapRepository.getSwap({
           preimageHash: getHexString(erc20SwapValues.preimageHash),
           status: {
@@ -320,12 +327,12 @@ class EthereumNursery extends EventEmitter implements IEthereumNursery {
         const erc20Wallet = wallet.walletProvider as ERC20WalletProvider;
 
         this.logger.debug(
-          `Found lockup in ${this.ethereumManager.networkDetails.name} ERC20Swap contract for Swap ${swap.id}: ${transactionHash}`,
+          `Found lockup in ${this.ethereumManager.networkDetails.name} ERC20Swap contract for Swap ${swap.id}: ${transaction.hash}`,
         );
 
         swap = await SwapRepository.setLockupTransaction(
           swap,
-          transactionHash,
+          transaction.hash!,
           erc20Wallet.normalizeTokenAmount(erc20SwapValues.amount),
           true,
         );
@@ -383,7 +390,12 @@ class EthereumNursery extends EventEmitter implements IEthereumNursery {
           }
         }
 
-        this.emit('erc20.lockup', swap, transactionHash, erc20SwapValues);
+        if (this.blocks.isBlocked(transaction.from!)) {
+          this.emit('lockup.failed', swap, Errors.BLOCKED_ADDRESS().message);
+          return;
+        }
+
+        this.emit('erc20.lockup', swap, transaction.hash, erc20SwapValues);
       },
     );
 

lib/swap/SwapManager.ts

@@ -45,6 +45,7 @@ import ChannelCreationRepository from '../db/repositories/ChannelCreationReposit
 import ReverseSwapRepository from '../db/repositories/ReverseSwapRepository';
 import SwapRepository from '../db/repositories/SwapRepository';
 import RateProvider from '../rates/RateProvider';
+import Blocks from '../service/Blocks';
 import InvoiceExpiryHelper from '../service/InvoiceExpiryHelper';
 import PaymentRequestUtils from '../service/PaymentRequestUtils';
 import TimeoutDeltaProvider from '../service/TimeoutDeltaProvider';
@@ -133,6 +134,7 @@ class SwapManager {
     private readonly paymentRequestUtils: PaymentRequestUtils,
     private readonly swapOutputType: SwapOutputType,
     retryInterval: number,
+    private readonly blocks: Blocks,
   ) {
     this.nursery = new SwapNursery(
       this.logger,
@@ -142,6 +144,7 @@ class SwapManager {
       this.walletManager,
       this.swapOutputType,
       retryInterval,
+      this.blocks,
     );
   }
 
@@ -593,6 +596,14 @@ class SwapManager {
       );
     }
 
+    const isBitcoinLike =
+      sendingCurrency.type === CurrencyType.BitcoinLike ||
+      sendingCurrency.type === CurrencyType.Liquid;
+
+    if (!isBitcoinLike && this.blocks.isBlocked(args.claimAddress!)) {
+      throw Errors.BLOCKED_ADDRESS();
+    }
+
     const pair = getPairId({
       base: args.baseCurrency,
       quote: args.quoteCurrency,
@@ -672,10 +683,7 @@ class SwapManager {
       invoice: paymentRequest,
     };
 
-    if (
-      sendingCurrency.type === CurrencyType.BitcoinLike ||
-      sendingCurrency.type === CurrencyType.Liquid
-    ) {
+    if (isBitcoinLike) {
       const { keys, index } = sendingCurrency.wallet.getNewKeys();
       const { blocks } = await sendingCurrency.chainClient!.getBlockchainInfo();
       result.timeoutBlockHeight = blocks + args.onchainTimeoutBlockDelta;

lib/swap/SwapNursery.ts

@@ -45,6 +45,7 @@ import {
 } from '../lightning/LightningClient';
 import FeeProvider from '../rates/FeeProvider';
 import RateProvider from '../rates/RateProvider';
+import Blocks from '../service/Blocks';
 import TimeoutDeltaProvider from '../service/TimeoutDeltaProvider';
 import Wallet from '../wallet/Wallet';
 import WalletManager, { Currency } from '../wallet/WalletManager';
@@ -198,12 +199,13 @@ class SwapNursery extends EventEmitter implements ISwapNursery {
     private walletManager: WalletManager,
     private swapOutputType: SwapOutputType,
     private retryInterval: number,
+    blocks: Blocks,
   ) {
     super();
 
     this.logger.info(`Setting Swap retry interval to ${retryInterval} seconds`);
 
-    this.utxoNursery = new UtxoNursery(this.logger, this.walletManager);
+    this.utxoNursery = new UtxoNursery(this.logger, this.walletManager, blocks);
     this.lightningNursery = new LightningNursery(this.logger);
     this.invoiceNursery = new InvoiceNursery(this.logger);
     this.channelNursery = new ChannelNursery(
@@ -213,7 +215,7 @@ class SwapNursery extends EventEmitter implements ISwapNursery {
 
     this.ethereumNurseries = this.walletManager.ethereumManagers.map(
       (manager) =>
-        new EthereumNursery(this.logger, this.walletManager, manager),
+        new EthereumNursery(this.logger, this.walletManager, manager, blocks),
     );
 
     this.paymentHandler = new PaymentHandler(