aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2026-01-31 11:54:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace entity upsert in PlannedTransaction by plain SQL (#6416)

Browse Source 
* Replace entity upsert in PlannedTransaction by plain SQL

* Fix flaky test from #6411
This commit is contained in:
Nicolas Dorier
2024-11-21 15:47:03 +09:00
committed by GitHub
parent 7db510b5ca
commit 843c813f86
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BTCPayServer.Tests/PayJoinTests.cs
View File

@@ -404,10 +404,10 @@ namespace BTCPayServer.Tests
Assert.False(paymentValueRowColumn.Text.Contains("payjoin",
StringComparison.InvariantCultureIgnoreCase));
s.GoToWallet(receiverWalletId, WalletsNavPages.Transactions);
s.Driver.WaitForElement(By.CssSelector("#WalletTransactionsList tr"));
TestUtils.Eventually(() =>
{
s.GoToWallet(receiverWalletId, WalletsNavPages.Transactions);
s.Driver.WaitForElement(By.CssSelector("#WalletTransactionsList tr"));
Assert.Contains("payjoin", s.Driver.PageSource);
// Either the invoice id or the payjoin-exposed label, depending on the input having been used
Assert.Matches(new Regex($"({invoiceId}|payjoin-exposed)"), s.Driver.PageSource);

26
BTCPayServer/Services/DelayedTransactionBroadcaster.cs
View File

@@ -5,6 +5,7 @@ using System.Threading;
using System.Threading.Tasks;
using BTCPayServer.Data;
using BTCPayServer.Logging;
using Dapper;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using NBitcoin;
@@ -45,19 +46,18 @@ namespace BTCPayServer.Services
ArgumentNullException.ThrowIfNull(transaction);
ArgumentNullException.ThrowIfNull(network);
using var db = _dbContextFactory.CreateContext();
db.PlannedTransactions.Add(new PlannedTransaction()
{
Id = $"{network.CryptoCode}-{transaction.GetHash()}",
BroadcastAt = broadcastTime,
Blob = transaction.ToBytes()
});
try
{
await db.SaveChangesAsync();
}
catch (DbUpdateException)
{
}
var conn = db.Database.GetDbConnection();
await conn.ExecuteAsync(
"""
INSERT INTO "PlannedTransactions"("Id", "BroadcastAt", "Blob") VALUES(@Id, @BroadcastAt, @Blob)
ON CONFLICT DO NOTHING
""",
new
{
Id = $"{network.CryptoCode}-{transaction.GetHash()}",
BroadcastAt = broadcastTime,
Blob = transaction.ToBytes()
});
}
public async Task<int> ProcessAll(CancellationToken cancellationToken = default)