[GEN-1658] RBF for withdrawals in NG

.vscode/launch.json

@@ -21,7 +21,7 @@
             },
             "env": {
                 "ASPNETCORE_ENVIRONMENT": "Development",
-                "POSTGRES_CONNECTIONSTRING": "Host=127.0.0.1;Port=5432;Database=nodeguard;Username=rw_dev;Password=rw_dev",
+                "POSTGRES_CONNECTIONSTRING": "Host=127.0.0.1;Port=25432;Database=nodeguard;Username=rw_dev;Password=rw_dev",
                 "BITCOIN_NETWORK": "REGTEST",
                 "MAXIMUM_WITHDRAWAL_BTC_AMOUNT": "21000000",
                 "NBXPLORER_ENABLE_CUSTOM_BACKEND": "true",

docker/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3.4'
+version: "3.4"
 
 name: nodeguard
 services:
@@ -22,7 +22,9 @@ services:
     platform: linux/amd64
     hostname: nbxplorer
     ports:
-    - "32838:32838"
+      - "32838:32838"
+    depends_on:
+      - nbxplorer_postgres
     environment:
       NBXPLORER_NETWORK: regtest
       NBXPLORER_BIND: 0.0.0.0:32838
@@ -36,7 +38,7 @@ services:
       NBXPLORER_BTCNODEENDPOINT: host.docker.internal:19444
     command: ["--noauth"]
     volumes:
-    - "bitcoin_datadir:/root/.bitcoin"
+      - "bitcoin_datadir:/root/.bitcoin"
 
   nbxplorer_postgres:
     container_name: nbxplorer_postgres
@@ -51,12 +53,99 @@ services:
       - nbxplorer_postgres_data:/var/lib/postgresql/data
     ports:
       - 35432:5432
+    healthcheck:
+      test: ["CMD", "pg_isready", "-U", "rw_dev"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
 
+  mempool-frontend-btc:
+    profiles: ["mempool"]
+    environment:
+      FRONTEND_HTTP_PORT: "8080"
+      BACKEND_MAINNET_HTTP_HOST: "mempool-backend-btc"
+      LIQUID_ENABLED: false
+      LIQUID_TESTNET_ENABLED: false
+    image: mempool/frontend:latest
+    container_name: 40swap_mempool_frontend_btc
+    user: "1000:1000"
+    restart: always
+    command: "./wait-for mempool-db-btc:3306 --timeout=720 -- nginx -g 'daemon off;'"
+    ports:
+      - 7084:8080
+
+  mempool-backend-btc:
+    profiles: ["mempool"]
+    environment:
+      MEMPOOL_BACKEND: "electrum"
+      CORE_RPC_HOST: "host.docker.internal"
+      CORE_RPC_PORT: "18443"
+      CORE_RPC_USERNAME: "polaruser"
+      CORE_RPC_PASSWORD: "polarpass"
+      DATABASE_ENABLED: "true"
+      DATABASE_HOST: "mempool-db-btc"
+      DATABASE_DATABASE: "mempool_btc"
+      DATABASE_USERNAME: "mempool"
+      DATABASE_PASSWORD: "mempool"
+      STATISTICS_ENABLED: "true"
+      ELECTRUM_HOST: "electrumx"
+      ELECTRUM_PORT: "50001"
+      ELECTRUM_TLS_ENABLED: "false"
+    image: mempool/backend:latest
+    container_name: 40swap_mempool_backend_btc
+    user: "1000:1000"
+    restart: always
+    command: "./wait-for-it.sh mempool-db-btc:3306 --timeout=720 --strict -- ./start.sh"
+    depends_on:
+      - mempool-db-btc
+    volumes:
+      - mempool-backend-btc-data:/backend/cache
 
+  mempool-db-btc:
+    profiles: ["mempool"]
+    environment:
+      MYSQL_DATABASE: "mempool_btc"
+      MYSQL_USER: "mempool"
+      MYSQL_PASSWORD: "mempool"
+      MYSQL_ROOT_PASSWORD: "admin"
+    image: mariadb:10.5.8
+    container_name: 40swap_mempool_db_btc
+    restart: always
+    volumes:
+      - mempool-db-btc-data:/var/lib/mysql
+
+  electrumx:
+    profiles: ["mempool"]
+    image: andgohq/electrumx:1.8.7
+    container_name: 40swap_electrumx
+    command: ["wait-for-it.sh", "host.docker.internal:18443", "--", "init"]
+    ports:
+      - "51002:50002"
+      - "51001:50001"
+    expose:
+      - "50001"
+      - "50002"
+    volumes:
+      - electrumx-data:/data
+    environment:
+      # bitcoind is valid
+      - DAEMON_URL=http://polaruser:polarpass@host.docker.internal:18443
+      - COIN=BitcoinSegwit
+      - NET=regtest
+      # 127.0.0.1 or electrumx is valid for RPC_HOST
+      - RPC_HOST=electrumx
+      - RPC_PORT=18443
+      - HOST=electrumx
+      - TCP_PORT=50001
+      - SSL_PORT=50002
+    restart: always
 
 volumes:
-    nodeguard_postgres_data:
-    bitcoin_datadir:
-    nbxplorer_datadir:
-    nbxplorer_postgres_data:
-    nodeguard_data_keys_dir:
+  nodeguard_postgres_data:
+  bitcoin_datadir:
+  nbxplorer_datadir:
+  nbxplorer_postgres_data:
+  nodeguard_data_keys_dir:
+  mempool-backend-btc-data:
+  mempool-db-btc-data:
+  electrumx-data:

src/Data/Models/WalletWithdrawalRequest.cs

@@ -63,7 +63,12 @@
         /// <summary>
         /// The PSBT is being signed by NodeGuard after all human required signatures have been collected
         /// </summary>
-        FinalizingPSBT = 7
+        FinalizingPSBT = 7,
+
+        /// <summary>
+        /// The tx was bumped by Replace by Fee (RBF) method
+        /// </summary>
+        Bumped = 8
     }
 
     /// <summary>
@@ -187,8 +192,12 @@
         public ApplicationUser UserRequestor { get; set; }
         public int WalletId { get; set; }
 
         public Wallet Wallet { get; set; }
 
+        public int? BumpingWalletWithdrawalRequestId { get; set; }
+
+        public WalletWithdrawalRequest? BumpingWalletWithdrawalRequest { get; set; }
+
         public List<WalletWithdrawalRequestPSBT> WalletWithdrawalRequestPSBTs { get; set; }
 
         public List<FMUTXO> UTXOs { get; set; }

src/Data/Repositories/FUTXORepository.cs

@@ -91,6 +91,21 @@ public async Task<List<FMUTXO>> GetAll()
             return _repository.Update(type, applicationDbContext);
         }
 
+        public async Task<List<FMUTXO>> GetLockedUTXOsByWithdrawalId(int walletWithdrawalRequestId)
+        {
+            await using var applicationDbContext = await _dbContextFactory.CreateDbContextAsync();
+
+            var result = new List<FMUTXO>();
+            result = await applicationDbContext.WalletWithdrawalRequests
+                .Include(x => x.UTXOs)
+                .Where(x => x.Id == walletWithdrawalRequestId)
+                .SelectMany(x => x.UTXOs)
+                .Include(x => x.WalletWithdrawalRequests)
+                .ToListAsync();
+
+            return result;
+        }
+
         public async Task<List<FMUTXO>> GetLockedUTXOs(int? ignoredWalletWithdrawalRequestId = null, int? ignoredChannelOperationRequestId = null)
         {
             await using var applicationDbContext = await _dbContextFactory.CreateDbContextAsync();

src/Data/Repositories/Interfaces/IFMUTXORepository.cs

@@ -43,4 +43,9 @@ public interface IFMUTXORepository
     /// <returns></returns>
     Task<List<FMUTXO>> GetLockedUTXOs(int? ignoredWalletWithdrawalRequestId = null, int? ignoredChannelOperationRequestId = null);
     Task<List<FMUTXO>> GetLockedUTXOsByWalletId(int walletId);
+    /// <summary>
+    /// Gets the current list of UTXOs locked on WalletWithdrawalRequest by passing its id 
+    /// </summary>
+    /// <returns></returns>
+    Task<List<FMUTXO>> GetLockedUTXOsByWithdrawalId(int walletWithdrawalRequestId);
 }

src/Data/Repositories/WalletWithdrawalRequestRepository.cs

@@ -65,6 +65,7 @@ INBXplorerService nBXplorerService
                 .Include(x => x.UserRequestor)
                 .Include(x => x.WalletWithdrawalRequestPSBTs)
                 .Include(x => x.WalletWithdrawalRequestDestinations)
+                .Include(x => x.UTXOs)
                 .SingleOrDefaultAsync(x => x.Id == id);
 
             return request;
@@ -94,6 +95,7 @@ public async Task<List<WalletWithdrawalRequest>> GetAll()
                 .Include(x => x.UserRequestor)
                 .Include(x => x.WalletWithdrawalRequestPSBTs)
                 .Include(x => x.WalletWithdrawalRequestDestinations)
+                .Include(x => x.UTXOs)
                 .AsSplitQuery()
                 .ToListAsync();
         }

src/Helpers/Constants.cs

@@ -18,6 +18,7 @@
  */
 using System.Globalization;
 using System.Reflection;
+using NBitcoin;
 using NodeGuard.Helpers;
 
 public class Constants
@@ -75,6 +76,7 @@ public class Constants
     public static readonly long MINIMUM_SWEEP_TRANSACTION_AMOUNT_SATS = 25_000_000; //25M sats
     public static readonly string DEFAULT_DERIVATION_PATH = "48'/1'";
     public static readonly int SESSION_TIMEOUT_MILLISECONDS = 3_600_000;
+    public static readonly Money BITCOIN_DUST = new Money(0.00000546m, MoneyUnit.BTC); // 546 satoshi in BTC
 
     //Sat/vb ratio
     public static decimal MIN_SAT_PER_VB_RATIO = 0.9m;
@@ -100,7 +102,7 @@ public class Constants
     public static readonly string ALICE_PUBKEY = "02dc2ae598a02fc1e9709a23b68cd51d7fa14b1132295a4d75aa4f5acd23ee9527";
     public static readonly string ALICE_HOST = "host.docker.internal:10001";
     public static readonly string ALICE_MACAROON = "0201036c6e6402f801030a108cdfeb2614b8335c11aebb358f888d6d1201301a160a0761646472657373120472656164120577726974651a130a04696e666f120472656164120577726974651a170a08696e766f69636573120472656164120577726974651a210a086d616361726f6f6e120867656e6572617465120472656164120577726974651a160a076d657373616765120472656164120577726974651a170a086f6666636861696e120472656164120577726974651a160a076f6e636861696e120472656164120577726974651a140a057065657273120472656164120577726974651a180a067369676e6572120867656e657261746512047265616400000620c999e1a30842cbae3f79bd633b19d5ec0d2b6ebdc4880f6f5d5c230ce38f26ab";
-    public static readonly string BOB_PUBKEY =  "038644c6b13cdfc59bc97c2cc2b1418ced78f6d01da94f3bfd5fdf8b197335ea84";
+    public static readonly string BOB_PUBKEY = "038644c6b13cdfc59bc97c2cc2b1418ced78f6d01da94f3bfd5fdf8b197335ea84";
     public static readonly string BOB_HOST = "host.docker.internal:10002";
     public static readonly string BOB_MACAROON = "0201036c6e6402f801030a10e0e89a68f9e2398228a995890637d2531201301a160a0761646472657373120472656164120577726974651a130a04696e666f120472656164120577726974651a170a08696e766f69636573120472656164120577726974651a210a086d616361726f6f6e120867656e6572617465120472656164120577726974651a160a076d657373616765120472656164120577726974651a170a086f6666636861696e120472656164120577726974651a160a076f6e636861696e120472656164120577726974651a140a057065657273120472656164120577726974651a180a067369676e6572120867656e657261746512047265616400000620b85ae6b693338987cd65eda60a24573e962301b2a91d8f7c5625650d6368751f";
     public static readonly string CAROL_PUBKEY = "03650f49929d84d9a6d9b5a66235c603a1a0597dd609f7cd3b15052382cf9bb1b4";

src/Jobs/PerformWithdrawalJob.cs

@@ -58,6 +58,29 @@ public async Task Execute(IJobExecutionContext context)
         catch (Exception e)
         {
             var request = await _walletWithdrawalRequestRepository.GetById(withdrawalRequestId);
+
+            // If an error occurs and the wd was bumping another one, we need to update the status of the withdrawal request to previous status
+            if (request != null && request!.BumpingWalletWithdrawalRequestId.HasValue)
+            {
+                var bumped = await _walletWithdrawalRequestRepository.GetById(request.BumpingWalletWithdrawalRequestId.Value);
+                if (bumped == null)
+                {
+                    _logger.LogError("Failed to find withdrawal request with ID {WithdrawalRequestId}", withdrawalRequestId);
+                    return;
+                }
+
+                bumped.Status = WalletWithdrawalRequestStatus.OnChainConfirmationPending;
+                var (ok, _) = _walletWithdrawalRequestRepository.Update(bumped);
+                if (!ok)
+                {
+                    _logger.LogError("Failed to update withdrawal request status to OnChainConfirmationPending for ID {WithdrawalRequestId}", withdrawalRequestId);
+                }
+                else
+                {
+                    _logger.LogInformation("Updated withdrawal request status to OnChainConfirmationPending for ID {WithdrawalRequestId}", withdrawalRequestId);
+                }
+            }
+
             request!.Status = WalletWithdrawalRequestStatus.Failed;
             var (updated, _) = _walletWithdrawalRequestRepository.Update(request);
             if (!updated)

src/Migrations/20230309121807_UpdateSourceDestChannelNodeIdFromRequests.cs

@@ -36,7 +36,6 @@ protected override void Down(MigrationBuilder migrationBuilder)
     UPDATE public.""Channels"" SET ""SourceNodeId"" = 1, ""DestinationNodeId"" = 1;
 COMMIT;";
             migrationBuilder.Sql(query);
-
         }
     }
 }

src/Migrations/20250611142943_MigrateLegacyWithdrawalData.cs

@@ -10,10 +10,8 @@ public partial class MigrateLegacyWithdrawalData : Migration
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
         {
-            // Execute data migration in an explicit transaction
+            // Execute data migration
             migrationBuilder.Sql(@"
-                BEGIN;
-
                 -- Step 1: Migrate existing data from Amount and DestinationAddress to WalletWithdrawalRequestDestinations
                 INSERT INTO ""WalletWithdrawalRequestDestinations"" (""Amount"", ""Address"", ""WalletWithdrawalRequestId"", ""CreationDatetime"", ""UpdateDatetime"")
                 SELECT 
@@ -24,7 +22,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                     ""UpdateDatetime""
                 FROM ""WalletWithdrawalRequests""
                 WHERE ""Amount"" > 0 AND ""DestinationAddress"" IS NOT NULL AND ""DestinationAddress"" != '';
-                
+
                 -- Step 2: Verify migration was successful - if any records failed to migrate, rollback
                 DO $$
                 DECLARE
@@ -50,8 +48,6 @@ SELECT COUNT(*) INTO migrated_count
                     -- Log success
                     RAISE NOTICE 'Successfully migrated % legacy withdrawal records to destinations table', original_count;
                 END $$;
-
-                COMMIT;
             ");
         }