fix: utxo instead of fmutxos

docker/docker-compose.yml

@@ -13,7 +13,7 @@ services:
     volumes:
       - nodeguard_postgres_data:/var/lib/postgresql/data
     ports:
-      - 25432:5432
+      - 5432:5432
 
   nbxplorer:
     restart: unless-stopped

src/Automapper/MapperProfile.cs

@@ -62,7 +62,7 @@ public MapperProfile()
                 .ForMember(x => x.UserRequestor, opt => opt.Ignore())
                 .ForMember(x => x.UTXOs, opt => opt.Ignore());
 
-            CreateMap<UTXO, FMUTXO>()
+            CreateMap<UTXO, Data.Models.UTXO>()
                 .ForMember(x => x.TxId, opt => opt.MapFrom(x => x.Outpoint.Hash.ToString()))
                 .ForMember(x => x.OutputIndex, opt => opt.MapFrom(x => x.Outpoint.N))
                 .ForMember(x => x.SatsAmount, opt => opt.MapFrom(x => ((Money)x.Value).Satoshi));

src/Data/ApplicationDbContext.cs

@@ -106,7 +106,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
         public DbSet<InternalWallet> InternalWallets { get; set; }
 
-        public DbSet<FMUTXO> FMUTXOs { get; set; }
+        public DbSet<UTXO> UTXOs { get; set; }
 
         public DbSet<LiquidityRule> LiquidityRules { get; set; }
 

src/Data/Models/ChannelOperationRequest.cs

@@ -137,7 +137,7 @@ public decimal Amount
 
         public bool IsChannelPrivate { get; set; }
 
-        public List<FMUTXO> Utxos { get; set; }
+        public List<UTXO> Utxos { get; set; }
 
         #endregion Relationships
 

src/Data/Models/FMUTXO.cs → src/Data/Models/UTXO.cs

@@ -22,7 +22,7 @@ namespace NodeGuard.Data.Models
     /// <summary>
     /// UTXO entity in the NodeGuard
     /// </summary>
-    public class FMUTXO : Entity, IEquatable<FMUTXO>
+    public class UTXO : Entity, IEquatable<UTXO>
     {
         public string TxId { get; set; }
 
@@ -48,7 +48,7 @@ public override bool Equals(object? obj)
             return base.Equals(obj);
         }
 
-        public bool Equals(FMUTXO? other)
+        public bool Equals(UTXO? other)
         {
             if (ReferenceEquals(null, other)) return false;
             if (ReferenceEquals(this, other)) return true;
@@ -60,12 +60,12 @@ public override int GetHashCode()
             return HashCode.Combine(TxId, OutputIndex, SatsAmount);
         }
 
-        public static bool operator ==(FMUTXO? left, FMUTXO? right)
+        public static bool operator ==(UTXO? left, UTXO? right)
         {
             return Equals(left, right);
         }
 
-        public static bool operator !=(FMUTXO? left, FMUTXO? right)
+        public static bool operator !=(UTXO? left, UTXO? right)
         {
             return !Equals(left, right);
         }

src/Data/Models/WalletWithdrawalRequest.cs

@@ -195,11 +195,11 @@
         public ApplicationUser UserRequestor { get; set; }
         public int WalletId { get; set; }
 
         public Wallet Wallet { get; set; }
 
         public List<WalletWithdrawalRequestPSBT> WalletWithdrawalRequestPSBTs { get; set; }
 
-        public List<FMUTXO> UTXOs { get; set; }
+        public List<UTXO> UTXOs { get; set; }
 
         #endregion Relationships
 

src/Data/Repositories/ChannelOperationRequestRepository.cs

@@ -158,7 +158,7 @@ public async Task<(bool, string?)> AddRangeAsync(List<ChannelOperationRequest> t
             return _repository.Update(strippedType, applicationDbContext);
         }
 
-        public async Task<(bool, string?)> AddUTXOs(IBitcoinRequest type, List<FMUTXO> utxos)
+        public async Task<(bool, string?)> AddUTXOs(IBitcoinRequest type, List<UTXO> utxos)
         {
             if (type == null) throw new ArgumentNullException(nameof(type));
             if (utxos.Count == 0) throw new ArgumentException("Value cannot be an empty collection.", nameof(utxos));
@@ -197,11 +197,11 @@ public async Task<(bool, string?)> AddUTXOs(IBitcoinRequest type, List<FMUTXO> u
             return result;
         }
 
-        public async Task<(bool, List<FMUTXO>?)> GetUTXOs(IBitcoinRequest request)
+        public async Task<(bool, List<UTXO>?)> GetUTXOs(IBitcoinRequest request)
         {
             await using var applicationDbContext = await _dbContextFactory.CreateDbContextAsync();
 
-            (bool, List<FMUTXO>?) result = (true, null);
+            (bool, List<UTXO>?) result = (true, null);
             try
             {
                 var channelOperationRequest = await applicationDbContext.ChannelOperationRequests

src/Data/Repositories/FUTXORepository.cs

@@ -23,13 +23,13 @@
 
 namespace NodeGuard.Data.Repositories
 {
-    public class FUTXORepository : IFMUTXORepository
+    public class FUTXORepository : IUTXORepository
     {
-        private readonly IRepository<FMUTXO> _repository;
+        private readonly IRepository<UTXO> _repository;
         private readonly ILogger<FUTXORepository> _logger;
         private readonly IDbContextFactory<ApplicationDbContext> _dbContextFactory;
 
-        public FUTXORepository(IRepository<FMUTXO> repository,
+        public FUTXORepository(IRepository<UTXO> repository,
             ILogger<FUTXORepository> logger,
             IDbContextFactory<ApplicationDbContext> dbContextFactory)
         {
@@ -38,19 +38,19 @@ public class FUTXORepository : IFMUTXORepository
             _dbContextFactory = dbContextFactory;
         }
 
-        public async Task<FMUTXO?> GetById(int id)
+        public async Task<UTXO?> GetById(int id)
         {
             await using var applicationDbContext = await _dbContextFactory.CreateDbContextAsync();
 
-            return await applicationDbContext.FMUTXOs.FirstOrDefaultAsync(x => x.Id == id);
+            return await applicationDbContext.UTXOs.FirstOrDefaultAsync(x => x.Id == id);
         }
 
-        public async Task<List<FMUTXO>> GetAll()
+        public async Task<List<UTXO>> GetAll()
         {
             throw new NotImplementedException();
         }
 
-        public async Task<(bool, string?)> AddAsync(FMUTXO type)
+        public async Task<(bool, string?)> AddAsync(UTXO type)
         {
             await using var applicationDbContext = await _dbContextFactory.CreateDbContextAsync();
 
@@ -59,28 +59,28 @@ public async Task<(bool, string?)> AddAsync(FMUTXO type)
             return await _repository.AddAsync(type, applicationDbContext);
         }
 
-        public async Task<(bool, string?)> AddRangeAsync(List<FMUTXO> type)
+        public async Task<(bool, string?)> AddRangeAsync(List<UTXO> type)
         {
             await using var applicationDbContext = await _dbContextFactory.CreateDbContextAsync();
 
             return await _repository.AddRangeAsync(type, applicationDbContext);
         }
 
-        public (bool, string?) Remove(FMUTXO type)
+        public (bool, string?) Remove(UTXO type)
         {
             using var applicationDbContext = _dbContextFactory.CreateDbContext();
 
             return _repository.Remove(type, applicationDbContext);
         }
 
-        public (bool, string?) RemoveRange(List<FMUTXO> types)
+        public (bool, string?) RemoveRange(List<UTXO> types)
         {
             using var applicationDbContext = _dbContextFactory.CreateDbContext();
 
             return _repository.RemoveRange(types, applicationDbContext);
         }
 
-        public (bool, string?) Update(FMUTXO type)
+        public (bool, string?) Update(UTXO type)
         {
             using var applicationDbContext = _dbContextFactory.CreateDbContext();
 
@@ -89,11 +89,11 @@ public async Task<(bool, string?)> AddRangeAsync(List<FMUTXO> type)
             return _repository.Update(type, applicationDbContext);
         }
 
-        public async Task<List<FMUTXO>> GetLockedUTXOs(int? ignoredWalletWithdrawalRequestId = null, int? ignoredChannelOperationRequestId = null)
+        public async Task<List<UTXO>> GetLockedUTXOs(int? ignoredWalletWithdrawalRequestId = null, int? ignoredChannelOperationRequestId = null)
         {
             await using var applicationDbContext = await _dbContextFactory.CreateDbContextAsync();
 
-            var walletWithdrawalRequestsLockedUTXOs = new List<FMUTXO>();
+            var walletWithdrawalRequestsLockedUTXOs = new List<UTXO>();
             if (ignoredWalletWithdrawalRequestId == null)
             {
                 walletWithdrawalRequestsLockedUTXOs = await applicationDbContext.WalletWithdrawalRequests
@@ -116,7 +116,7 @@ public async Task<List<FMUTXO>> GetLockedUTXOs(int? ignoredWalletWithdrawalReque
                     .SelectMany(x => x.UTXOs).ToListAsync();
             }
 
-            var channelOperationRequestsLockedUTXOs = new List<FMUTXO>();
+            var channelOperationRequestsLockedUTXOs = new List<UTXO>();
 
             if (ignoredChannelOperationRequestId == null)
             {

src/Data/Repositories/Interfaces/IBitcoinRequestRepository.cs

@@ -29,7 +29,7 @@ public interface IBitcoinRequestRepository
     /// <param name="type"></param>
     /// <param name="utxos"></param>
     /// <returns></returns>
-    Task<(bool, string?)> AddUTXOs(IBitcoinRequest type, List<FMUTXO> utxos);
+    Task<(bool, string?)> AddUTXOs(IBitcoinRequest type, List<UTXO> utxos);
 
-    public Task<(bool, List<FMUTXO>?)> GetUTXOs(IBitcoinRequest type);
+    public Task<(bool, List<UTXO>?)> GetUTXOs(IBitcoinRequest type);
 }

src/Data/Repositories/Interfaces/IFMUTXORepository.cs → src/Data/Repositories/Interfaces/IUTXORepository.cs

@@ -21,25 +21,25 @@
 
 namespace NodeGuard.Data.Repositories.Interfaces;
 
-public interface IFMUTXORepository
+public interface IUTXORepository
 {
-    Task<FMUTXO?> GetById(int id);
+    Task<UTXO?> GetById(int id);
 
-    Task<List<FMUTXO>> GetAll();
+    Task<List<UTXO>> GetAll();
 
-    Task<(bool, string?)> AddAsync(FMUTXO type);
+    Task<(bool, string?)> AddAsync(UTXO type);
 
-    Task<(bool, string?)> AddRangeAsync(List<FMUTXO> type);
+    Task<(bool, string?)> AddRangeAsync(List<UTXO> type);
 
-    (bool, string?) Remove(FMUTXO type);
+    (bool, string?) Remove(UTXO type);
 
-    (bool, string?) RemoveRange(List<FMUTXO> types);
+    (bool, string?) RemoveRange(List<UTXO> types);
 
-    (bool, string?) Update(FMUTXO type);
+    (bool, string?) Update(UTXO type);
 
     /// <summary>
     /// Gets the current list of UTXOs locked on requests ChannelOperationRequest / WalletWithdrawalRequest by passing its id if wants to remove it from the resulting set
     /// </summary>
     /// <returns></returns>
-    Task<List<FMUTXO>> GetLockedUTXOs(int? ignoredWalletWithdrawalRequestId = null, int? ignoredChannelOperationRequestId = null);
+    Task<List<UTXO>> GetLockedUTXOs(int? ignoredWalletWithdrawalRequestId = null, int? ignoredChannelOperationRequestId = null);
 }

src/Data/Repositories/WalletWithdrawalRequestRepository.cs

@@ -194,7 +194,7 @@ public async Task<(bool, string?)> AddRangeAsync(List<WalletWithdrawalRequest> t
             return _repository.Update(strippedType, applicationDbContext);
         }
 
-        public async Task<(bool, string?)> AddUTXOs(IBitcoinRequest type, List<FMUTXO> utxos)
+        public async Task<(bool, string?)> AddUTXOs(IBitcoinRequest type, List<UTXO> utxos)
         {
             if (type == null) throw new ArgumentNullException(nameof(type));
             if (utxos.Count == 0) throw new ArgumentException("Value cannot be an empty collection.", nameof(utxos));
@@ -233,11 +233,11 @@ public async Task<(bool, string?)> AddUTXOs(IBitcoinRequest type, List<FMUTXO> u
             return result;
         }
 
-        public async Task<(bool, List<FMUTXO>?)> GetUTXOs(IBitcoinRequest request)
+        public async Task<(bool, List<UTXO>?)> GetUTXOs(IBitcoinRequest request)
         {
             await using var applicationDbContext = await _dbContextFactory.CreateDbContextAsync();
 
-            (bool, List<FMUTXO>?) result = (true, null);
+            (bool, List<UTXO>?) result = (true, null);
             try
             {
                 var walletWithdrawalRequest = await applicationDbContext.WalletWithdrawalRequests

src/Helpers/LightningHelper.cs

@@ -23,6 +23,7 @@
 using NBitcoin;
 using NBXplorer;
 using NBXplorer.Models;
+using UTXO = NBXplorer.Models.UTXO;
 
 namespace NodeGuard.Helpers
 {