aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-17 05:54:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve Labeling further (#4849)

Browse Source 
* If loading addresses into the send wallet page using bip21 or address,  (or clicking on "Send selected payouts"  from the payotus page), existing labels will be pre-populated.
*  Add the payout label to the address when the payoutis created instead of to the transaction when it is paid.
*  Add the label attachments when adding labels from an address to the transaction.
This commit is contained in:
Andrew Camilleri
2023-04-07 08:58:41 +02:00
committed by GitHub
parent 91faf5756d
commit 892b3e273f
10 changed files with 87 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
BTCPayServer/Controllers/UIWalletsController.cs
View File

@@ -453,7 +453,7 @@ namespace BTCPayServer.Controllers
{
if (!string.IsNullOrEmpty(link))
{
LoadFromBIP21(model, link, network);
await LoadFromBIP21(walletId, model, link, network);
}
}
}
@@ -568,7 +568,7 @@ namespace BTCPayServer.Controllers
if (!string.IsNullOrEmpty(bip21))
{
vm.Outputs?.Clear();
LoadFromBIP21(vm, bip21, network);
await LoadFromBIP21(walletId, vm, bip21, network);
}
decimal transactionAmountSum = 0;
@@ -586,7 +586,7 @@ namespace BTCPayServer.Controllers
.GetUnspentCoins(schemeSettings.AccountDerivation, false, cancellation);
var walletTransactionsInfoAsync = await this.WalletRepository.GetWalletTransactionsInfo(walletId,
utxos.SelectMany(u => GetWalletObjectsQuery.Get(u)).Distinct().ToArray());
utxos.SelectMany(GetWalletObjectsQuery.Get).Distinct().ToArray());
vm.InputsAvailable = utxos.Select(coin =>
{
walletTransactionsInfoAsync.TryGetValue(coin.OutPoint.Hash.ToString(), out var info1);
@@ -863,8 +863,10 @@ namespace BTCPayServer.Controllers
}
private void LoadFromBIP21(WalletSendModel vm, string bip21, BTCPayNetwork network)
private async Task LoadFromBIP21(WalletId walletId, WalletSendModel vm, string bip21,
BTCPayNetwork network)
{
BitcoinAddress? address = null;
vm.Outputs ??= new();
try
{
@@ -879,6 +881,7 @@ namespace BTCPayServer.Controllers
? uriBuilder.UnknownParameters["payout"]
: null
});
address = uriBuilder.Address;
if (!string.IsNullOrEmpty(uriBuilder.Label) || !string.IsNullOrEmpty(uriBuilder.Message))
{
TempData.SetStatusMessageModel(new StatusMessageModel()
@@ -896,9 +899,10 @@ namespace BTCPayServer.Controllers
{
try
{
address = BitcoinAddress.Create(bip21, network.NBitcoinNetwork);
vm.Outputs.Add(new WalletSendModel.TransactionOutput()
{
DestinationAddress = BitcoinAddress.Create(bip21, network.NBitcoinNetwork).ToString()
DestinationAddress = address.ToString()
}
);
}
@@ -913,6 +917,11 @@ namespace BTCPayServer.Controllers
}
ModelState.Clear();
if (address is not null)
{
var addressLabels = await WalletRepository.GetWalletLabels(new WalletObjectId(walletId, WalletObjectData.Types.Address, address.ToString()));
vm.Outputs.Last().Labels = addressLabels.Select(tuple => tuple.Label).ToArray();
}
}
private IActionResult ViewVault(WalletId walletId, WalletPSBTViewModel vm)