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

Make tx label endpoint not error

Browse Source
This commit is contained in:
Kukks
2022-07-28 15:33:28 +02:00
parent 5ef31a96ea
commit 4be5eb39ff
4 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
BTCPayServer.Client/BTCPayServerClient.OnChainWallet.cs
View File

@@ -85,11 +85,14 @@ namespace BTCPayServer.Client
public virtual async Task<OnChainWalletTransactionData> PatchOnChainWalletTransaction( public virtual async Task<OnChainWalletTransactionData> PatchOnChainWalletTransaction(
string storeId, string cryptoCode, string transactionId, string storeId, string cryptoCode, string transactionId,
PatchOnChainTransactionRequest request, PatchOnChainTransactionRequest request,
CancellationToken token = default) bool force = false, CancellationToken token = default)
{ {
var response = var response =
await _httpClient.SendAsync( await _httpClient.SendAsync(
CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/transactions/{transactionId}", queryPayload: null, bodyPayload: request, HttpMethod.Patch), token); CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/transactions/{transactionId}", queryPayload: new Dictionary<string, object>()
{
{"force", force}
}, bodyPayload: request, HttpMethod.Patch), token);
return await HandleResponse<OnChainWalletTransactionData>(response); return await HandleResponse<OnChainWalletTransactionData>(response);
} }

5
BTCPayServer/Controllers/GreenField/GreenfieldStoreOnChainWalletsController.cs
View File

@@ -254,7 +254,8 @@ namespace BTCPayServer.Controllers.Greenfield
string storeId, string storeId,
string cryptoCode, string cryptoCode,
string transactionId, string transactionId,
[FromBody] PatchOnChainTransactionRequest request [FromBody] PatchOnChainTransactionRequest request,
bool force = false
) )
{ {
if (IsInvalidWalletRequest(cryptoCode, out var network, if (IsInvalidWalletRequest(cryptoCode, out var network,
@@ -263,7 +264,7 @@ namespace BTCPayServer.Controllers.Greenfield
var wallet = _btcPayWalletProvider.GetWallet(network); var wallet = _btcPayWalletProvider.GetWallet(network);
var tx = await wallet.FetchTransaction(derivationScheme.AccountDerivation, uint256.Parse(transactionId)); var tx = await wallet.FetchTransaction(derivationScheme.AccountDerivation, uint256.Parse(transactionId));
if (tx is null) if (!force && tx is null)
{ {
return this.CreateAPIError(404, "transaction-not-found", "The transaction was not found."); return this.CreateAPIError(404, "transaction-not-found", "The transaction was not found.");
} }

4
BTCPayServer/Controllers/GreenField/LocalBTCPayServerClient.cs
View File

@@ -990,11 +990,11 @@ namespace BTCPayServer.Controllers.Greenfield
public override async Task<OnChainWalletTransactionData> PatchOnChainWalletTransaction(string storeId, public override async Task<OnChainWalletTransactionData> PatchOnChainWalletTransaction(string storeId,
string cryptoCode, string transactionId, string cryptoCode, string transactionId,
PatchOnChainTransactionRequest request, CancellationToken token = default) PatchOnChainTransactionRequest request, bool force = false,CancellationToken token = default)
{ {
return GetFromActionResult<OnChainWalletTransactionData>( return GetFromActionResult<OnChainWalletTransactionData>(
await GetController<GreenfieldStoreOnChainWalletsController>().PatchOnChainWalletTransaction(storeId, cryptoCode, transactionId, await GetController<GreenfieldStoreOnChainWalletsController>().PatchOnChainWalletTransaction(storeId, cryptoCode, transactionId,
request)); request, force));
} }
public override async Task<LightningPaymentData> GetLightningPayment(string cryptoCode, string paymentHash, public override async Task<LightningPaymentData> GetLightningPayment(string cryptoCode, string paymentHash,

9
BTCPayServer/wwwroot/swagger/v1/swagger.template.stores-wallet.on-chain.json
View File

@@ -513,6 +513,15 @@
"schema": { "schema": {
"type": "string" "type": "string"
} }
},
{
"name": "force",
"in": "query",
"required": false,
"description": "Whether to update the label/comments even if the transaction does not yet exist",
"schema": {
"type": "string"
}
} }
], ],
"requestBody": { "requestBody": {