aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2026-01-30 03:14:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Monero payments in mempool not detected if accountIndex != 0 (Fix #6430) (#6544)

Browse Source
This commit is contained in:
Nicolas Dorier
2025-01-10 20:21:33 +09:00
committed by GitHub
parent d2c52c10bd
commit e0a51537a1
2 changed files with 45 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BTCPayServer/Plugins/Altcoins/Monero/RPC/Models/GetTransferByTransactionIdRequest.cs
View File

@@ -6,6 +6,6 @@ namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
{
[JsonProperty("txid")] public string TransactionId { get; set; }
[JsonProperty("account_index")] public long AccountIndex { get; set; }
[JsonProperty("account_index", DefaultValueHandling = DefaultValueHandling.Ignore)] public long? AccountIndex { get; set; }
}
}

48
BTCPayServer/Services/Altcoins/Monero/Services/MoneroListener.cs
View File

@@ -234,10 +234,7 @@ namespace BTCPayServer.Services.Altcoins.Monero.Services
private async Task OnTransactionUpdated(string cryptoCode, string transactionHash)
{
var paymentMethodId = PaymentTypes.CHAIN.GetPaymentMethodId(cryptoCode);
var transfer = await _moneroRpcProvider.WalletRpcClients[cryptoCode]
.SendCommandAsync<GetTransferByTransactionIdRequest, GetTransferByTransactionIdResponse>(
"get_transfer_by_txid",
new GetTransferByTransactionIdRequest() { TransactionId = transactionHash });
var transfer = await GetTransferByTxId(cryptoCode, transactionHash, this.CancellationToken);
var paymentsToUpdate = new List<(PaymentEntity Payment, InvoiceEntity invoice)>();
@@ -275,6 +272,49 @@ namespace BTCPayServer.Services.Altcoins.Monero.Services
}
}
private async Task<GetTransferByTransactionIdResponse> GetTransferByTxId(string cryptoCode,
string transactionHash, CancellationToken cancellationToken)
{
var accounts = await _moneroRpcProvider.WalletRpcClients[cryptoCode].SendCommandAsync<GetAccountsRequest, GetAccountsResponse>("get_accounts", new GetAccountsRequest(), cancellationToken);
var accountIndexes = accounts
.SubaddressAccounts
.Select(a => new long?(a.AccountIndex))
.ToList();
if (accountIndexes.Count is 0)
accountIndexes.Add(null);
var req = accountIndexes
.Select(i => GetTransferByTxId(cryptoCode, transactionHash, i))
.ToArray();
foreach (var task in req)
{
var result = await task;
if (result != null)
return result;
}
return null;
}
private async Task<GetTransferByTransactionIdResponse> GetTransferByTxId(string cryptoCode, string transactionHash, long? accountIndex)
{
try
{
var result = await _moneroRpcProvider.WalletRpcClients[cryptoCode]
.SendCommandAsync<GetTransferByTransactionIdRequest, GetTransferByTransactionIdResponse>(
"get_transfer_by_txid",
new GetTransferByTransactionIdRequest()
{
TransactionId = transactionHash,
AccountIndex = accountIndex
});
return result;
}
catch (JsonRpcClient.JsonRpcApiException e)
{
return null;
}
}
private async Task HandlePaymentData(string cryptoCode, string address, long totalAmount, long subaccountIndex,
long subaddressIndex,
string txId, long confirmations, long blockHeight, long locktime, InvoiceEntity invoice,