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

Providing TrimmedId property for shorter txn id

Browse Source
This commit is contained in:
rockstardev
2025-03-23 19:32:53 -05:00
parent dd17cd25cb
commit 2427740e79
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
BTCPayServer/HostedServices/Webhooks/PendingTransactionDeliveryRequest.cs
View File

@@ -36,7 +36,11 @@ public class PendingTransactionDeliveryRequest(
private string Interpolate(string str, PendingTransactionBlob blob)
{
var res = str.Replace("{PendingTransaction.Id}", evt.Data.TransactionId)
var id = evt.Data.TransactionId;
string trimmedId = $"{id.Substring(0, 7)}...{id.Substring(id.Length - 7)}";
var res = str.Replace("{PendingTransaction.Id}", id)
.Replace("{PendingTransaction.TrimmedId}", trimmedId)
.Replace("{PendingTransaction.StoreId}", evt.Data.StoreId)
.Replace("{PendingTransaction.SignaturesCollected}", blob.SignaturesCollected?.ToString())
.Replace("{PendingTransaction.SignaturesNeeded}", blob.SignaturesNeeded?.ToString())

11
BTCPayServer/Views/UIStores/StoreEmailRulesManage.cshtml
View File

@@ -112,6 +112,7 @@
<th text-translate="true">Pending Transaction</th>
<td>
<code>{PendingTransaction.Id}</code>,
<code>{PendingTransaction.TrimmedId}</code>,
<code>{PendingTransaction.StoreId}</code>,
<code>{PendingTransaction.SignaturesCollected}</code>,
<code>{PendingTransaction.SignaturesNeeded}</code>,
@@ -160,21 +161,21 @@
body: 'Invoice {Invoice.Id} (Order Id: {Invoice.OrderId}) payment settled.'
},
@PendingTransactionWebhookProvider.PendingTransactionCreated : {
subject: 'Pending Transaction {PendingTransaction.Id} Created',
body: 'Review the transaction and sign it on: @hostRoot/wallets/S-{PendingTransaction.StoreId}-BTC/transactions'
subject: 'Pending Transaction {PendingTransaction.TrimmedId} Created',
body: 'Review the transaction {PendingTransaction.Id} and sign it on: @hostRoot/wallets/S-{PendingTransaction.StoreId}-BTC/transactions'
},
@PendingTransactionWebhookProvider.PendingTransactionSignatureCollected : {
subject: 'Signature Collected for Pending Transaction {PendingTransaction.Id}',
subject: 'Signature Collected for Pending Transaction {PendingTransaction.TrimmedId}',
body: 'So far {PendingTransaction.SignaturesCollected} signatures collected out of {PendingTransaction.SignaturesNeeded} signatures needed. ' +
'Review the transaction and sign it on: @hostRoot/wallets/S-{PendingTransaction.StoreId}-BTC/transactions'
},
@PendingTransactionWebhookProvider.PendingTransactionBroadcast : {
subject: 'Transaction {PendingTransaction.Id} has been Broadcast',
subject: 'Transaction {PendingTransaction.TrimmedId} has been Broadcast',
body: 'Transaction is visible in mempool on: https://mempool.space/tx/{PendingTransaction.Id}. ' +
'Review the transaction: @hostRoot/wallets/S-{PendingTransaction.StoreId}-BTC/transactions'
},
@PendingTransactionWebhookProvider.PendingTransactionCancelled : {
subject: 'Pending Transaction {PendingTransaction.Id} Cancelled',
subject: 'Pending Transaction {PendingTransaction.TrimmedId} Cancelled',
body: 'Transaction {PendingTransaction.Id} is cancelled and signatures are no longer being collected. ' +
'Review the wallet: @hostRoot/wallets/S-{PendingTransaction.StoreId}-BTC/transactions'
},