mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2025-02-22 14:22:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix pagination of wallet's transactions (#4150)

Browse source
This commit is contained in:
Nicolas Dorier 2022-09-22 10:39:48 +09:00 • committed by GitHub
parent 0e4544b2da
commit 5387a6287e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
BTCPayServer/Controllers/UIWalletsController.cs
View file

@ -317,9 +317,13 @@ namespace BTCPayServer.Controllers
} }
model.Total = preFiltering ? null : model.Transactions.Count; model.Total = preFiltering ? null : model.Transactions.Count;
// if we couldn't filter at the db level, we need to apply skip and count
if (!preFiltering)
{
model.Transactions = model.Transactions.Skip(skip).Take(count) model.Transactions = model.Transactions.Skip(skip).Take(count)
.ToList(); .ToList();
} }
}
model.CryptoCode = walletId.CryptoCode; model.CryptoCode = walletId.CryptoCode;

19
BTCPayServer/Services/Wallets/BTCPayWallet.cs
View file

@ -201,7 +201,7 @@ namespace BTCPayServer.Services.Wallets
} }
return await completionSource.Task; return await completionSource.Task;
} }
bool? get_wallets_recentBugFixed = null;
List<TransactionInformation> dummy = new List<TransactionInformation>(); List<TransactionInformation> dummy = new List<TransactionInformation>();
public async Task<IList<TransactionHistoryLine>> FetchTransactionHistory(DerivationStrategyBase derivationStrategyBase, int? skip = null, int? count = null, TimeSpan? interval = null) public async Task<IList<TransactionHistoryLine>> FetchTransactionHistory(DerivationStrategyBase derivationStrategyBase, int? skip = null, int? count = null, TimeSpan? interval = null)
{ {
@ -231,6 +231,10 @@ namespace BTCPayServer.Services.Wallets
else else
{ {
await using var ctx = await NbxplorerConnectionFactory.OpenConnection(); await using var ctx = await NbxplorerConnectionFactory.OpenConnection();
if (get_wallets_recentBugFixed is null)
{
get_wallets_recentBugFixed = await ctx.QuerySingleAsync<bool>("SELECT COUNT(*) = 1 FROM nbxv1_migrations WHERE script_name='011.FixGetWalletsRecent';");
}
var rows = await ctx.QueryAsync<(string tx_id, DateTimeOffset seen_at, string blk_id, long? blk_height, long balance_change, string asset_id, long confs)>( var rows = await ctx.QueryAsync<(string tx_id, DateTimeOffset seen_at, string blk_id, long? blk_height, long balance_change, string asset_id, long confs)>(
"SELECT r.tx_id, r.seen_at, t.blk_id, t.blk_height, r.balance_change, r.asset_id, COALESCE((SELECT height FROM get_tip('BTC')) - t.blk_height + 1, 0) AS confs " + "SELECT r.tx_id, r.seen_at, t.blk_id, t.blk_height, r.balance_change, r.asset_id, COALESCE((SELECT height FROM get_tip('BTC')) - t.blk_height + 1, 0) AS confs " +
"FROM get_wallets_recent(@wallet_id, @code, @interval, @count, @skip) r " + "FROM get_wallets_recent(@wallet_id, @code, @interval, @count, @skip) r " +
@ -239,14 +243,23 @@ namespace BTCPayServer.Services.Wallets
{ {
wallet_id = NBXplorer.Client.DBUtils.nbxv1_get_wallet_id(Network.CryptoCode, derivationStrategyBase.ToString()), wallet_id = NBXplorer.Client.DBUtils.nbxv1_get_wallet_id(Network.CryptoCode, derivationStrategyBase.ToString()),
code = Network.CryptoCode, code = Network.CryptoCode,
count, count = get_wallets_recentBugFixed is true ? count : skip + count,
skip, skip = get_wallets_recentBugFixed is true ? skip : 0,
interval = interval is TimeSpan t ? t : TimeSpan.FromDays(365 * 1000) interval = interval is TimeSpan t ? t : TimeSpan.FromDays(365 * 1000)
}); });
rows.TryGetNonEnumeratedCount(out int c); rows.TryGetNonEnumeratedCount(out int c);
var lines = new List<TransactionHistoryLine>(c); var lines = new List<TransactionHistoryLine>(c);
foreach (var row in rows) foreach (var row in rows)
{ {
if (get_wallets_recentBugFixed is false)
{
if (skip > 0)
{
// We skip row manually so version of nbx before 2.3.34, return the expected... Remove in a year.
skip--;
continue;
}
}
lines.Add(new TransactionHistoryLine() lines.Add(new TransactionHistoryLine()
{ {
BalanceChange = string.IsNullOrEmpty(row.asset_id) ? Money.Satoshis(row.balance_change) : new AssetMoney(uint256.Parse(row.asset_id), row.balance_change), BalanceChange = string.IsNullOrEmpty(row.asset_id) ? Money.Satoshis(row.balance_change) : new AssetMoney(uint256.Parse(row.asset_id), row.balance_change),