From c71e671311b2cacaf1c99f177dbfc84d02e41e34 Mon Sep 17 00:00:00 2001 From: Wouter Samaey Date: Thu, 4 Aug 2022 04:38:49 +0200 Subject: [PATCH] Added custodian account trade support (#3978) * Added custodian account trade support * UI updates * Improved UI spacing and field sizes + Fixed input validation * Reset error message when opening trade modal * Better error handing + test + surface error in trade modal in UI * Add delete confirmation modal * Fixed duplicate ID in site nav * Replace jQuery.ajax with fetch for onTradeSubmit * Added support for minimumTradeQty to trading pairs * Fixed LocalBTCPayServerClient after previous refactoring * Handling dust amounts + minor API change * Replaced jQuery with Fetch API + UX improvements + more TODOs * Moved namespace because Rider was unhappy * Major UI improvements when swapping or changing assets, fixed bugs in min trade qty, fixed initial qty after an asset change etc * Commented out code for easier debugging * Fixed missing default values Co-authored-by: Dennis Reimann --- .../Custodians/Client/AssetQuoteResult.cs | 21 +- .../Custodians/Client/MarketTradeResult.cs | 2 +- .../Custodians/Client/WithdrawResult.cs | 2 +- .../Custodians/ICanTrade.cs | 1 + .../Custodians/ICanWithdraw.cs | 1 + .../BTCPayServerClient.CustodianAccounts.cs | 10 +- BTCPayServer.Client/Models/AssetPairData.cs | 15 +- BTCPayServer.Client/Models/CustodianData.cs | 4 +- BTCPayServer.Tests/GreenfieldAPITests.cs | 22 +- .../MockCustodian/MockCustodian.cs | 3 +- .../Components/MainNav/Default.cshtml | 2 +- .../GreenfieldCustodianAccountController.cs | 38 +- .../GreenfieldCustodianController.cs | 8 +- .../GreenField/LocalBTCPayServerClient.cs | 25 +- .../UICustodianAccountsController.cs | 191 +++++++- .../AssetBalanceInfo.cs | 6 +- .../TradePrepareViewModel.cs | 9 + .../ViewCustodianAccountBalancesViewModel.cs | 15 + .../ViewCustodianAccountViewModel.cs | 6 +- BTCPayServer/Views/Shared/_Form.cshtml | 4 +- .../CreateCustodianAccount.cshtml | 6 +- .../EditCustodianAccount.cshtml | 14 +- .../ViewCustodianAccount.cshtml | 456 ++++++++++++------ BTCPayServer/wwwroot/js/custodian-account.js | 372 ++++++++++++++ BTCPayServer/wwwroot/main/site.css | 20 + .../v1/swagger.template.custodians.json | 56 ++- 26 files changed, 1058 insertions(+), 251 deletions(-) create mode 100644 BTCPayServer/Models/CustodianAccountViewModels/TradePrepareViewModel.cs create mode 100644 BTCPayServer/Models/CustodianAccountViewModels/ViewCustodianAccountBalancesViewModel.cs create mode 100644 BTCPayServer/wwwroot/js/custodian-account.js diff --git a/BTCPayServer.Abstractions/Custodians/Client/AssetQuoteResult.cs b/BTCPayServer.Abstractions/Custodians/Client/AssetQuoteResult.cs index 28a7caec8..26964598e 100644 --- a/BTCPayServer.Abstractions/Custodians/Client/AssetQuoteResult.cs +++ b/BTCPayServer.Abstractions/Custodians/Client/AssetQuoteResult.cs @@ -1,18 +1,19 @@ -namespace BTCPayServer.Abstractions.Custodians; +namespace BTCPayServer.Abstractions.Custodians.Client; public class AssetQuoteResult { - public string FromAsset { get; } - - public string ToAsset { get; } - public decimal Bid { get; } - public decimal Ask { get; } + public string FromAsset { get; set; } + public string ToAsset { get; set; } + public decimal Bid { get; set; } + public decimal Ask { get; set; } + + public AssetQuoteResult() { } public AssetQuoteResult(string fromAsset, string toAsset,decimal bid, decimal ask) { - this.FromAsset = fromAsset; - this.ToAsset = toAsset; - this.Bid = bid; - this.Ask = ask; + FromAsset = fromAsset; + ToAsset = toAsset; + Bid = bid; + Ask = ask; } } diff --git a/BTCPayServer.Abstractions/Custodians/Client/MarketTradeResult.cs b/BTCPayServer.Abstractions/Custodians/Client/MarketTradeResult.cs index b84821ed6..d393e1c08 100644 --- a/BTCPayServer.Abstractions/Custodians/Client/MarketTradeResult.cs +++ b/BTCPayServer.Abstractions/Custodians/Client/MarketTradeResult.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using BTCPayServer.Client.Models; -namespace BTCPayServer.Abstractions.Custodians; +namespace BTCPayServer.Abstractions.Custodians.Client; /** * The result of a market trade. Used as a return type for custodians implementing ICanTrade diff --git a/BTCPayServer.Abstractions/Custodians/Client/WithdrawResult.cs b/BTCPayServer.Abstractions/Custodians/Client/WithdrawResult.cs index 9e9eebe51..0cfb255c4 100644 --- a/BTCPayServer.Abstractions/Custodians/Client/WithdrawResult.cs +++ b/BTCPayServer.Abstractions/Custodians/Client/WithdrawResult.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using BTCPayServer.Client.Models; -namespace BTCPayServer.Abstractions.Custodians; +namespace BTCPayServer.Abstractions.Custodians.Client; public class WithdrawResult { diff --git a/BTCPayServer.Abstractions/Custodians/ICanTrade.cs b/BTCPayServer.Abstractions/Custodians/ICanTrade.cs index df5624516..24c426ac3 100644 --- a/BTCPayServer.Abstractions/Custodians/ICanTrade.cs +++ b/BTCPayServer.Abstractions/Custodians/ICanTrade.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; +using BTCPayServer.Abstractions.Custodians.Client; using BTCPayServer.Client.Models; using Newtonsoft.Json.Linq; diff --git a/BTCPayServer.Abstractions/Custodians/ICanWithdraw.cs b/BTCPayServer.Abstractions/Custodians/ICanWithdraw.cs index 74677911e..883120bd5 100644 --- a/BTCPayServer.Abstractions/Custodians/ICanWithdraw.cs +++ b/BTCPayServer.Abstractions/Custodians/ICanWithdraw.cs @@ -1,5 +1,6 @@ using System.Threading; using System.Threading.Tasks; +using BTCPayServer.Abstractions.Custodians.Client; using Newtonsoft.Json.Linq; namespace BTCPayServer.Abstractions.Custodians; diff --git a/BTCPayServer.Client/BTCPayServerClient.CustodianAccounts.cs b/BTCPayServer.Client/BTCPayServerClient.CustodianAccounts.cs index 012150eeb..91a7b46a0 100644 --- a/BTCPayServer.Client/BTCPayServerClient.CustodianAccounts.cs +++ b/BTCPayServer.Client/BTCPayServerClient.CustodianAccounts.cs @@ -56,9 +56,14 @@ namespace BTCPayServer.Client return await HandleResponse(response); } - public virtual async Task TradeMarket(string storeId, string accountId, TradeRequestData request, CancellationToken token = default) + public virtual async Task MarketTradeCustodianAccountAsset(string storeId, string accountId, TradeRequestData request, CancellationToken token = default) { - var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/custodian-accounts/{accountId}/trades/market", bodyPayload: request, method: HttpMethod.Post), token); + + //var response = await _httpClient.SendAsync(CreateHttpRequest("api/v1/users", null, request, HttpMethod.Post), token); + //return await HandleResponse(response); + var internalRequest = CreateHttpRequest($"api/v1/stores/{storeId}/custodian-accounts/{accountId}/trades/market", null, + request, HttpMethod.Post); + var response = await _httpClient.SendAsync(internalRequest, token); return await HandleResponse(response); } @@ -73,7 +78,6 @@ namespace BTCPayServer.Client var queryPayload = new Dictionary(); queryPayload.Add("fromAsset", fromAsset); queryPayload.Add("toAsset", toAsset); - var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/custodian-accounts/{accountId}/trades/quote", queryPayload), token); return await HandleResponse(response); } diff --git a/BTCPayServer.Client/Models/AssetPairData.cs b/BTCPayServer.Client/Models/AssetPairData.cs index 1503695bf..a3075ef2a 100644 --- a/BTCPayServer.Client/Models/AssetPairData.cs +++ b/BTCPayServer.Client/Models/AssetPairData.cs @@ -1,20 +1,31 @@ +using Newtonsoft.Json; + namespace BTCPayServer.Client.Models; +[JsonObject(MemberSerialization.OptIn)] public class AssetPairData { public AssetPairData() { } - public AssetPairData(string assetBought, string assetSold) + public AssetPairData(string assetBought, string assetSold, decimal minimumTradeQty) { AssetBought = assetBought; AssetSold = assetSold; + MinimumTradeQty = minimumTradeQty; } - + + [JsonProperty] public string AssetBought { set; get; } + + [JsonProperty] public string AssetSold { set; get; } + [JsonProperty] + public decimal MinimumTradeQty { set; get; } + + public override string ToString() { return AssetBought + "/" + AssetSold; diff --git a/BTCPayServer.Client/Models/CustodianData.cs b/BTCPayServer.Client/Models/CustodianData.cs index c9311c59d..67631274d 100644 --- a/BTCPayServer.Client/Models/CustodianData.cs +++ b/BTCPayServer.Client/Models/CustodianData.cs @@ -1,10 +1,12 @@ +using System.Collections.Generic; + namespace BTCPayServer.Client.Models; public class CustodianData { public string Code { get; set; } public string Name { get; set; } - public string[] TradableAssetPairs { get; set; } + public Dictionary TradableAssetPairs { get; set; } public string[] WithdrawablePaymentMethods { get; set; } public string[] DepositablePaymentMethods { get; set; } diff --git a/BTCPayServer.Tests/GreenfieldAPITests.cs b/BTCPayServer.Tests/GreenfieldAPITests.cs index e7fe044d1..652189aa1 100644 --- a/BTCPayServer.Tests/GreenfieldAPITests.cs +++ b/BTCPayServer.Tests/GreenfieldAPITests.cs @@ -2859,13 +2859,13 @@ namespace BTCPayServer.Tests // Test: Trade, unauth var tradeRequest = new TradeRequestData {FromAsset = MockCustodian.TradeFromAsset, ToAsset = MockCustodian.TradeToAsset, Qty = MockCustodian.TradeQtyBought.ToString(CultureInfo.InvariantCulture)}; - await AssertHttpError(401, async () => await unauthClient.TradeMarket(storeId, accountId, tradeRequest)); + await AssertHttpError(401, async () => await unauthClient.MarketTradeCustodianAccountAsset(storeId, accountId, tradeRequest)); // Test: Trade, auth, but wrong permission - await AssertHttpError(403, async () => await managerClient.TradeMarket(storeId, accountId, tradeRequest)); + await AssertHttpError(403, async () => await managerClient.MarketTradeCustodianAccountAsset(storeId, accountId, tradeRequest)); // Test: Trade, correct permission, correct assets, correct amount - var newTradeResult = await tradeClient.TradeMarket(storeId, accountId, tradeRequest); + var newTradeResult = await tradeClient.MarketTradeCustodianAccountAsset(storeId, accountId, tradeRequest); Assert.NotNull(newTradeResult); Assert.Equal(accountId, newTradeResult.AccountId); Assert.Equal(mockCustodian.Code, newTradeResult.CustodianCode); @@ -2886,23 +2886,27 @@ namespace BTCPayServer.Tests // Test: GetTradeQuote, SATS var satsTradeRequest = new TradeRequestData {FromAsset = MockCustodian.TradeFromAsset, ToAsset = "SATS", Qty = MockCustodian.TradeQtyBought.ToString(CultureInfo.InvariantCulture)}; - await AssertApiError(400, "use-asset-synonym", async () => await tradeClient.TradeMarket(storeId, accountId, satsTradeRequest)); + await AssertApiError(400, "use-asset-synonym", async () => await tradeClient.MarketTradeCustodianAccountAsset(storeId, accountId, satsTradeRequest)); // TODO Test: Trade with percentage qty + // Test: Trade with wrong decimal format (example: JavaScript scientific format) + var wrongQtyTradeRequest = new TradeRequestData {FromAsset = MockCustodian.TradeFromAsset, ToAsset = MockCustodian.TradeToAsset, Qty = "6.1e-7"}; + await AssertApiError(400,"bad-qty-format", async () => await tradeClient.MarketTradeCustodianAccountAsset(storeId, accountId, wrongQtyTradeRequest)); + // Test: Trade, wrong assets method var wrongAssetsTradeRequest = new TradeRequestData {FromAsset = "WRONG", ToAsset = MockCustodian.TradeToAsset, Qty = MockCustodian.TradeQtyBought.ToString(CultureInfo.InvariantCulture)}; - await AssertHttpError(WrongTradingPairException.HttpCode, async () => await tradeClient.TradeMarket(storeId, accountId, wrongAssetsTradeRequest)); + await AssertHttpError(WrongTradingPairException.HttpCode, async () => await tradeClient.MarketTradeCustodianAccountAsset(storeId, accountId, wrongAssetsTradeRequest)); // Test: wrong account ID - await AssertHttpError(404, async () => await tradeClient.TradeMarket(storeId, "WRONG-ACCOUNT-ID", tradeRequest)); + await AssertHttpError(404, async () => await tradeClient.MarketTradeCustodianAccountAsset(storeId, "WRONG-ACCOUNT-ID", tradeRequest)); // Test: wrong store ID - await AssertHttpError(403, async () => await tradeClient.TradeMarket("WRONG-STORE-ID", accountId, tradeRequest)); + await AssertHttpError(403, async () => await tradeClient.MarketTradeCustodianAccountAsset("WRONG-STORE-ID", accountId, tradeRequest)); // Test: Trade, correct assets, wrong amount - var wrongQtyTradeRequest = new TradeRequestData {FromAsset = MockCustodian.TradeFromAsset, ToAsset = MockCustodian.TradeToAsset, Qty = "0.01"}; - await AssertApiError(400, "insufficient-funds", async () => await tradeClient.TradeMarket(storeId, accountId, wrongQtyTradeRequest)); + var insufficientFundsTradeRequest = new TradeRequestData {FromAsset = MockCustodian.TradeFromAsset, ToAsset = MockCustodian.TradeToAsset, Qty = "0.01"}; + await AssertApiError(400, "insufficient-funds", async () => await tradeClient.MarketTradeCustodianAccountAsset(storeId, accountId, insufficientFundsTradeRequest)); // Test: GetTradeQuote, unauth diff --git a/BTCPayServer.Tests/MockCustodian/MockCustodian.cs b/BTCPayServer.Tests/MockCustodian/MockCustodian.cs index 22b359bcc..d27df7529 100644 --- a/BTCPayServer.Tests/MockCustodian/MockCustodian.cs +++ b/BTCPayServer.Tests/MockCustodian/MockCustodian.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; using BTCPayServer.Abstractions.Custodians; +using BTCPayServer.Abstractions.Custodians.Client; using BTCPayServer.Abstractions.Form; using BTCPayServer.Client.Models; using Newtonsoft.Json.Linq; @@ -76,7 +77,7 @@ public class MockCustodian : ICustodian, ICanDeposit, ICanTrade, ICanWithdraw public List GetTradableAssetPairs() { var r = new List(); - r.Add(new AssetPairData("BTC", "EUR")); + r.Add(new AssetPairData("BTC", "EUR", (decimal) 0.0001)); return r; } diff --git a/BTCPayServer/Components/MainNav/Default.cshtml b/BTCPayServer/Components/MainNav/Default.cshtml index bd5695548..5ada7ec9d 100644 --- a/BTCPayServer/Components/MainNav/Default.cshtml +++ b/BTCPayServer/Components/MainNav/Default.cshtml @@ -109,7 +109,7 @@ }
  • - + Add Custodian Experimental diff --git a/BTCPayServer/Controllers/GreenField/GreenfieldCustodianAccountController.cs b/BTCPayServer/Controllers/GreenField/GreenfieldCustodianAccountController.cs index f28ff51ca..5423e644b 100644 --- a/BTCPayServer/Controllers/GreenField/GreenfieldCustodianAccountController.cs +++ b/BTCPayServer/Controllers/GreenField/GreenfieldCustodianAccountController.cs @@ -6,6 +6,7 @@ using System.Threading; using System.Threading.Tasks; using BTCPayServer.Abstractions.Constants; using BTCPayServer.Abstractions.Custodians; +using BTCPayServer.Abstractions.Custodians.Client; using BTCPayServer.Abstractions.Extensions; using BTCPayServer.Abstractions.Form; using BTCPayServer.Client; @@ -231,7 +232,7 @@ namespace BTCPayServer.Controllers.Greenfield [HttpPost("~/api/v1/stores/{storeId}/custodian-accounts/{accountId}/trades/market")] [Authorize(Policy = Policies.CanTradeCustodianAccount, AuthenticationSchemes = AuthenticationSchemes.Greenfield)] - public async Task TradeMarket(string storeId, string accountId, + public async Task MarketTradeCustodianAccountAsset(string storeId, string accountId, TradeRequestData request, CancellationToken cancellationToken = default) { // TODO add SATS check everywhere. We cannot change to 'BTC' ourselves because the qty / price would be different too. @@ -246,29 +247,38 @@ namespace BTCPayServer.Controllers.Greenfield if (custodian is ICanTrade tradableCustodian) { - decimal Qty; - if (request.Qty.EndsWith("%", StringComparison.InvariantCultureIgnoreCase)) + bool isPercentage = request.Qty.EndsWith("%", StringComparison.InvariantCultureIgnoreCase); + string qtyString = isPercentage ? request.Qty.Substring(0, request.Qty.Length - 1) : request.Qty; + bool canParseQty = Decimal.TryParse(qtyString, out decimal qty); + if (!canParseQty) { - // Qty is a percentage of current holdings - var percentage = Decimal.Parse( request.Qty.Substring(0, request.Qty.Length - 1), CultureInfo.InvariantCulture); + return this.CreateAPIError(400, "bad-qty-format", + $"Quantity should be a number or a number ending with '%' for percentages."); + } + + if (isPercentage) + { + // Percentage of current holdings => calculate the amount var config = custodianAccount.GetBlob(); var balances = custodian.GetAssetBalancesAsync(config, cancellationToken).Result; var fromAssetBalance = balances[request.FromAsset]; var priceQuote = await tradableCustodian.GetQuoteForAssetAsync(request.FromAsset, request.ToAsset, config, cancellationToken); - Qty = fromAssetBalance / priceQuote.Ask * percentage / 100; - } - else - { - // Qty is an exact amount - Qty = Decimal.Parse(request.Qty, CultureInfo.InvariantCulture); - + qty = fromAssetBalance / priceQuote.Ask * qty / 100; } - var result = await tradableCustodian.TradeMarketAsync(request.FromAsset, request.ToAsset, Qty, + try + { + var result = await tradableCustodian.TradeMarketAsync(request.FromAsset, request.ToAsset, qty, custodianAccount.GetBlob(), cancellationToken); - return Ok(ToModel(result, accountId, custodianAccount.CustodianCode)); + return Ok(ToModel(result, accountId, custodianAccount.CustodianCode)); + } + catch (CustodianApiException e) + { + return this.CreateAPIError(e.HttpStatus, e.Code, + e.Message); + } } return this.CreateAPIError(400, "market-trade-not-supported", diff --git a/BTCPayServer/Controllers/GreenField/GreenfieldCustodianController.cs b/BTCPayServer/Controllers/GreenField/GreenfieldCustodianController.cs index d8ff195c6..05422305c 100644 --- a/BTCPayServer/Controllers/GreenField/GreenfieldCustodianController.cs +++ b/BTCPayServer/Controllers/GreenField/GreenfieldCustodianController.cs @@ -40,12 +40,12 @@ namespace BTCPayServer.Controllers.Greenfield if (custodian is ICanTrade tradableCustodian) { var tradableAssetPairs = tradableCustodian.GetTradableAssetPairs(); - var tradableAssetPairStrings = new string[tradableAssetPairs.Count]; - for (int i = 0; i < tradableAssetPairs.Count; i++) + var tradableAssetPairsDict = new Dictionary(tradableAssetPairs.Count); + foreach (var tradableAssetPair in tradableAssetPairs) { - tradableAssetPairStrings[i] = tradableAssetPairs[i].ToString(); + tradableAssetPairsDict.Add(tradableAssetPair.ToString(), tradableAssetPair); } - result.TradableAssetPairs = tradableAssetPairStrings; + result.TradableAssetPairs = tradableAssetPairsDict; } if (custodian is ICanDeposit depositableCustodian) diff --git a/BTCPayServer/Controllers/GreenField/LocalBTCPayServerClient.cs b/BTCPayServer/Controllers/GreenField/LocalBTCPayServerClient.cs index 54dc74a19..fb4e0f77f 100644 --- a/BTCPayServer/Controllers/GreenField/LocalBTCPayServerClient.cs +++ b/BTCPayServer/Controllers/GreenField/LocalBTCPayServerClient.cs @@ -90,7 +90,8 @@ namespace BTCPayServer.Controllers.Greenfield else { context.User = - new ClaimsPrincipal(new ClaimsIdentity(new List() + new ClaimsPrincipal(new ClaimsIdentity( + new List() { new(_identityOptions.CurrentValue.ClaimsIdentity.RoleClaimType, Roles.ServerAdmin) }, @@ -204,7 +205,7 @@ namespace BTCPayServer.Controllers.Greenfield public Task AuthorizeAsync(ClaimsPrincipal user, object resource, string policyName) { return AuthorizeAsync(user, resource, - new List(new[] {new PolicyRequirement(policyName)})); + new List(new[] { new PolicyRequirement(policyName) })); } } @@ -214,6 +215,14 @@ namespace BTCPayServer.Controllers.Greenfield throw new NotSupportedException("This method is not supported by the LocalBTCPayServerClient."); } + + public override async Task MarketTradeCustodianAccountAsset(string storeId, string accountId, + TradeRequestData request, CancellationToken cancellationToken = default) + { + return GetFromActionResult( + await GetController().MarketTradeCustodianAccountAsset(storeId, accountId, request, cancellationToken)); + } + public override async Task CreateWebhook(string storeId, CreateStoreWebhookRequest create, CancellationToken token = default) { @@ -460,8 +469,8 @@ namespace BTCPayServer.Controllers.Greenfield return result switch { JsonResult jsonResult => (T)jsonResult.Value, - OkObjectResult {Value: T res} => res, - OkObjectResult {Value: JValue res} => res.Value(), + OkObjectResult { Value: T res } => res, + OkObjectResult { Value: JValue res } => res.Value(), _ => default }; } @@ -470,9 +479,11 @@ namespace BTCPayServer.Controllers.Greenfield { switch (result) { - case UnprocessableEntityObjectResult {Value: List validationErrors}: + case UnprocessableEntityObjectResult { Value: List validationErrors }: throw new GreenfieldValidationException(validationErrors.ToArray()); - case BadRequestObjectResult {Value: GreenfieldAPIError error}: + case BadRequestObjectResult { Value: GreenfieldAPIError error }: + throw new GreenfieldAPIException(400, error); + case ObjectResult { Value: GreenfieldAPIError error }: throw new GreenfieldAPIException(400, error); case NotFoundResult _: throw new GreenfieldAPIException(404, new GreenfieldAPIError("not-found", "")); @@ -1085,7 +1096,7 @@ namespace BTCPayServer.Controllers.Greenfield } public override async Task CreatePointOfSaleApp( - string storeId, + string storeId, CreatePointOfSaleAppRequest request, CancellationToken token = default) { return GetFromActionResult( diff --git a/BTCPayServer/Controllers/UICustodianAccountsController.cs b/BTCPayServer/Controllers/UICustodianAccountsController.cs index 94478d0dc..c3996ca9b 100644 --- a/BTCPayServer/Controllers/UICustodianAccountsController.cs +++ b/BTCPayServer/Controllers/UICustodianAccountsController.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Globalization; using System.Linq; using System.Threading.Tasks; using BTCPayServer.Abstractions.Constants; @@ -7,6 +8,8 @@ using BTCPayServer.Abstractions.Custodians; using BTCPayServer.Abstractions.Extensions; using BTCPayServer.Abstractions.Form; using BTCPayServer.Client; +using BTCPayServer.Client.Models; +using BTCPayServer.Controllers.Greenfield; using BTCPayServer.Data; using BTCPayServer.Filters; using BTCPayServer.Models.CustodianAccountViewModels; @@ -26,30 +29,32 @@ namespace BTCPayServer.Controllers [ExperimentalRouteAttribute] public class UICustodianAccountsController : Controller { + private readonly IEnumerable _custodianRegistry; + private readonly UserManager _userManager; + private readonly CustodianAccountRepository _custodianAccountRepository; + private readonly CurrencyNameTable _currencyNameTable; + private readonly BTCPayServerClient _btcPayServerClient; + public UICustodianAccountsController( CurrencyNameTable currencyNameTable, UserManager userManager, CustodianAccountRepository custodianAccountRepository, - IEnumerable custodianRegistry + IEnumerable custodianRegistry, + BTCPayServerClient btcPayServerClient ) { _currencyNameTable = currencyNameTable ?? throw new ArgumentNullException(nameof(currencyNameTable)); _userManager = userManager; _custodianAccountRepository = custodianAccountRepository; _custodianRegistry = custodianRegistry; + _btcPayServerClient = btcPayServerClient; } - private readonly IEnumerable _custodianRegistry; - private readonly UserManager _userManager; - private readonly CustodianAccountRepository _custodianAccountRepository; - private readonly CurrencyNameTable _currencyNameTable; - public string CreatedCustodianAccountId { get; set; } [HttpGet("/stores/{storeId}/custodian-accounts/{accountId}")] public async Task ViewCustodianAccount(string storeId, string accountId) { - var vm = new ViewCustodianAccountViewModel(); var custodianAccount = await _custodianAccountRepository.FindById(storeId, accountId); if (custodianAccount == null) @@ -62,14 +67,34 @@ namespace BTCPayServer.Controllers return NotFound(); } + var vm = new ViewCustodianAccountViewModel(); vm.Custodian = custodian; vm.CustodianAccount = custodianAccount; + + return View(vm); + } + + [HttpGet("/stores/{storeId}/custodian-accounts/{accountId}.json")] + public async Task ViewCustodianAccountAjax(string storeId, string accountId) + { + var vm = new ViewCustodianAccountBalancesViewModel(); + var custodianAccount = await _custodianAccountRepository.FindById(storeId, accountId); + + if (custodianAccount == null) + return NotFound(); + + var custodian = _custodianRegistry.GetCustodianByCode(custodianAccount.CustodianCode); + if (custodian == null) + { + // TODO The custodian account is broken. The custodian is no longer available. Maybe delete the custodian account? + return NotFound(); + } + var store = GetCurrentStore(); - var storeBlob = BTCPayServer.Data.StoreDataExtensions.GetStoreBlob(store); + var storeBlob = StoreDataExtensions.GetStoreBlob(store); var defaultCurrency = storeBlob.DefaultCurrency; - vm.DefaultCurrency = defaultCurrency; - - + vm.DustThresholdInFiat = 1; + vm.StoreDefaultFiat = defaultCurrency; try { var assetBalances = new Dictionary(); @@ -81,11 +106,15 @@ namespace BTCPayServer.Controllers var asset = pair.Key; assetBalances.Add(asset, - new AssetBalanceInfo { Asset = asset, Qty = pair.Value } + new AssetBalanceInfo + { + Asset = asset, + Qty = pair.Value, + FormattedQty = pair.Value.ToString(CultureInfo.InvariantCulture) + } ); } - if (custodian is ICanTrade tradingCustodian) { var config = custodianAccount.GetBlob(); @@ -95,10 +124,20 @@ namespace BTCPayServer.Controllers { var asset = pair.Key; var assetBalance = assetBalances[asset]; + var tradableAssetPairsList = + tradableAssetPairs.Where(o => o.AssetBought == asset || o.AssetSold == asset).ToList(); + var tradableAssetPairsDict = new Dictionary(tradableAssetPairsList.Count); + foreach (var assetPair in tradableAssetPairsList) + { + tradableAssetPairsDict.Add(assetPair.ToString(), assetPair); + } + assetBalance.TradableAssetPairs = tradableAssetPairsDict; if (asset.Equals(defaultCurrency)) { - assetBalance.FormattedFiatValue = _currencyNameTable.DisplayFormatCurrency(pair.Value.Qty, defaultCurrency); + assetBalance.FormattedFiatValue = + _currencyNameTable.DisplayFormatCurrency(pair.Value.Qty, defaultCurrency); + assetBalance.FiatValue = pair.Value.Qty; } else { @@ -108,11 +147,14 @@ namespace BTCPayServer.Controllers config, default); assetBalance.Bid = quote.Bid; assetBalance.Ask = quote.Ask; - assetBalance.FiatAsset = defaultCurrency; - assetBalance.FormattedBid = _currencyNameTable.DisplayFormatCurrency(quote.Bid, quote.FromAsset); - assetBalance.FormattedAsk = _currencyNameTable.DisplayFormatCurrency(quote.Ask, quote.FromAsset); - assetBalance.FormattedFiatValue = _currencyNameTable.DisplayFormatCurrency(pair.Value.Qty * quote.Bid, pair.Value.FiatAsset); - assetBalance.TradableAssetPairs = tradableAssetPairs.Where(o => o.AssetBought == asset || o.AssetSold == asset); + assetBalance.FormattedBid = + _currencyNameTable.DisplayFormatCurrency(quote.Bid, quote.FromAsset); + assetBalance.FormattedAsk = + _currencyNameTable.DisplayFormatCurrency(quote.Ask, quote.FromAsset); + assetBalance.FormattedFiatValue = + _currencyNameTable.DisplayFormatCurrency(pair.Value.Qty * quote.Bid, + defaultCurrency); + assetBalance.FiatValue = pair.Value.Qty * quote.Bid; } catch (WrongTradingPairException) { @@ -136,8 +178,10 @@ namespace BTCPayServer.Controllers } } + vm.CanDeposit = false; if (custodian is ICanDeposit depositableCustodian) { + vm.CanDeposit = true; var depositablePaymentMethods = depositableCustodian.GetDepositablePaymentMethods(); foreach (var depositablePaymentMethod in depositablePaymentMethods) { @@ -154,10 +198,10 @@ namespace BTCPayServer.Controllers } catch (Exception e) { - vm.GetAssetBalanceException = e; + vm.AssetBalanceExceptionMessage = e.Message; } - return View(vm); + return Ok(vm); } [HttpGet("/stores/{storeId}/custodian-accounts/{accountId}/edit")] @@ -173,6 +217,7 @@ namespace BTCPayServer.Controllers // TODO The custodian account is broken. The custodian is no longer available. Maybe delete the custodian account? return NotFound(); } + var configForm = await custodian.GetConfigForm(custodianAccount.GetBlob(), "en-US"); var vm = new EditCustodianAccountViewModel(); @@ -198,6 +243,7 @@ namespace BTCPayServer.Controllers // TODO The custodian account is broken. The custodian is no longer available. Maybe delete the custodian account? return NotFound(); } + var configForm = await custodian.GetConfigForm(custodianAccount.GetBlob(), locale); var newData = new JObject(); @@ -255,12 +301,16 @@ namespace BTCPayServer.Controllers ModelState.AddModelError(nameof(vm.SelectedCustodian), "Invalid Custodian"); return View(vm); } + if (string.IsNullOrEmpty(vm.Name)) { vm.Name = custodian.Name; } - var custodianAccountData = new CustodianAccountData { CustodianCode = vm.SelectedCustodian, StoreId = vm.StoreId, Name = custodian.Name }; + var custodianAccountData = new CustodianAccountData + { + CustodianCode = vm.SelectedCustodian, StoreId = vm.StoreId, Name = custodian.Name + }; var configData = new JObject(); @@ -287,8 +337,7 @@ namespace BTCPayServer.Controllers return View(vm); } - - [HttpGet("/stores/{storeId}/custodian-accounts/{accountId}/delete")] + [HttpPost("/stores/{storeId}/custodian-accounts/{accountId}/delete")] public async Task DeleteCustodianAccount(string storeId, string accountId) { var custodianAccount = await _custodianAccountRepository.FindById(storeId, accountId); @@ -301,7 +350,7 @@ namespace BTCPayServer.Controllers if (isDeleted) { TempData[WellKnownTempData.SuccessMessage] = "Custodian account deleted"; - return RedirectToAction("Dashboard", "UIStores", new { storeId }); + return RedirectToAction(nameof(UIStoresController.Dashboard), "UIStores", new { storeId }); } TempData[WellKnownTempData.ErrorMessage] = "Could not delete custodian account"; @@ -335,6 +384,98 @@ namespace BTCPayServer.Controllers return filteredData; } + [HttpGet("/stores/{storeId}/custodian-accounts/{accountId}/trade/prepare")] + public async Task GetTradePrepareAjax(string storeId, string accountId, + [FromQuery] string assetToTrade, [FromQuery] string assetToTradeInto) + { + if (string.IsNullOrEmpty(assetToTrade) || string.IsNullOrEmpty(assetToTradeInto)) + { + return BadRequest(); + } + + TradePrepareViewModel vm = new(); + var custodianAccount = await _custodianAccountRepository.FindById(storeId, accountId); + + if (custodianAccount == null) + return NotFound(); + + var custodian = _custodianRegistry.GetCustodianByCode(custodianAccount.CustodianCode); + if (custodian == null) + { + // TODO The custodian account is broken. The custodian is no longer available. Maybe delete the custodian account? + return NotFound(); + } + + var store = GetCurrentStore(); + var storeBlob = BTCPayServer.Data.StoreDataExtensions.GetStoreBlob(store); + var defaultCurrency = storeBlob.DefaultCurrency; + + try + { + var assetBalancesData = + await custodian.GetAssetBalancesAsync(custodianAccount.GetBlob(), cancellationToken: default); + + if (custodian is ICanTrade tradingCustodian) + { + var config = custodianAccount.GetBlob(); + + foreach (var pair in assetBalancesData) + { + var oneAsset = pair.Key; + if (assetToTrade.Equals(oneAsset)) + { + vm.MaxQtyToTrade = pair.Value; + //vm.FormattedMaxQtyToTrade = pair.Value; + + if (assetToTrade.Equals(assetToTradeInto)) + { + // We cannot trade the asset for itself + return BadRequest(); + } + + try + { + var quote = await tradingCustodian.GetQuoteForAssetAsync(assetToTrade, assetToTradeInto, + config, default); + + // TODO Ask is normally a higher number than Bid!! Let's check this!! Maybe a Unit Test? + vm.Ask = quote.Ask; + vm.Bid = quote.Bid; + vm.FromAsset = quote.FromAsset; + vm.ToAsset = quote.ToAsset; + } + catch (WrongTradingPairException) + { + // Cannot trade this asset, just ignore + } + } + } + } + } + catch (Exception e) + { + return BadRequest(); + } + + return Ok(vm); + } + + [HttpPost("/stores/{storeId}/custodian-accounts/{accountId}/trade")] + public async Task Trade(string storeId, string accountId, + [FromBody] TradeRequestData request) + { + try + { + var result = await _btcPayServerClient.MarketTradeCustodianAccountAsset(storeId, accountId, request); + return Ok(result); + } + catch (GreenfieldAPIException e) + { + var result = new ObjectResult(e.APIError) { StatusCode = e.HttpCode }; + return result; + } + } + private StoreData GetCurrentStore() => HttpContext.GetStoreData(); } } diff --git a/BTCPayServer/Models/CustodianAccountViewModels/AssetBalanceInfo.cs b/BTCPayServer/Models/CustodianAccountViewModels/AssetBalanceInfo.cs index 361782a3b..2c7bbb028 100644 --- a/BTCPayServer/Models/CustodianAccountViewModels/AssetBalanceInfo.cs +++ b/BTCPayServer/Models/CustodianAccountViewModels/AssetBalanceInfo.cs @@ -1,4 +1,3 @@ -using System; using System.Collections.Generic; using BTCPayServer.Client.Models; @@ -11,9 +10,10 @@ public class AssetBalanceInfo public decimal? Bid { get; set; } public decimal? Ask { get; set; } public decimal Qty { get; set; } - public string FiatAsset { get; set; } + public string FormattedQty { get; set; } public string FormattedFiatValue { get; set; } - public IEnumerable TradableAssetPairs { get; set; } + public decimal FiatValue { get; set; } + public Dictionary TradableAssetPairs { get; set; } public bool CanWithdraw { get; set; } public bool CanDeposit { get; set; } public string FormattedBid { get; set; } diff --git a/BTCPayServer/Models/CustodianAccountViewModels/TradePrepareViewModel.cs b/BTCPayServer/Models/CustodianAccountViewModels/TradePrepareViewModel.cs new file mode 100644 index 000000000..ac0c3d481 --- /dev/null +++ b/BTCPayServer/Models/CustodianAccountViewModels/TradePrepareViewModel.cs @@ -0,0 +1,9 @@ +using BTCPayServer.Abstractions.Custodians.Client; + +namespace BTCPayServer.Models.CustodianAccountViewModels; + +public class TradePrepareViewModel : AssetQuoteResult +{ + public decimal MaxQtyToTrade { get; set; } + +} diff --git a/BTCPayServer/Models/CustodianAccountViewModels/ViewCustodianAccountBalancesViewModel.cs b/BTCPayServer/Models/CustodianAccountViewModels/ViewCustodianAccountBalancesViewModel.cs new file mode 100644 index 000000000..79b515f48 --- /dev/null +++ b/BTCPayServer/Models/CustodianAccountViewModels/ViewCustodianAccountBalancesViewModel.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; + +namespace BTCPayServer.Models.CustodianAccountViewModels +{ + public class ViewCustodianAccountBalancesViewModel + { + public Dictionary AssetBalances { get; set; } + public string AssetBalanceExceptionMessage { get; set; } + + public string StoreDefaultFiat { get; set; } + public decimal DustThresholdInFiat { get; set; } + public bool CanDeposit { get; set; } + } +} diff --git a/BTCPayServer/Models/CustodianAccountViewModels/ViewCustodianAccountViewModel.cs b/BTCPayServer/Models/CustodianAccountViewModels/ViewCustodianAccountViewModel.cs index cb7250e65..bf7c58c65 100644 --- a/BTCPayServer/Models/CustodianAccountViewModels/ViewCustodianAccountViewModel.cs +++ b/BTCPayServer/Models/CustodianAccountViewModels/ViewCustodianAccountViewModel.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using BTCPayServer.Abstractions.Custodians; using BTCPayServer.Data; @@ -9,8 +7,6 @@ namespace BTCPayServer.Models.CustodianAccountViewModels { public ICustodian Custodian { get; set; } public CustodianAccountData CustodianAccount { get; set; } - public Dictionary AssetBalances { get; set; } - public Exception GetAssetBalanceException { get; set; } - public string DefaultCurrency { get; set; } + } } diff --git a/BTCPayServer/Views/Shared/_Form.cshtml b/BTCPayServer/Views/Shared/_Form.cshtml index 8af3607bf..402b3cae2 100644 --- a/BTCPayServer/Views/Shared/_Form.cshtml +++ b/BTCPayServer/Views/Shared/_Form.cshtml @@ -3,7 +3,7 @@ @foreach (var fieldset in Model.Fieldsets) {
    - @fieldset.Label + @fieldset.Label @foreach (var field in fieldset.Fields) { @if ("text".Equals(field.Type)) @@ -22,7 +22,7 @@ } - + @field.HelpText diff --git a/BTCPayServer/Views/UICustodianAccounts/CreateCustodianAccount.cshtml b/BTCPayServer/Views/UICustodianAccounts/CreateCustodianAccount.cshtml index b77b03ad7..410d6ce77 100644 --- a/BTCPayServer/Views/UICustodianAccounts/CreateCustodianAccount.cshtml +++ b/BTCPayServer/Views/UICustodianAccounts/CreateCustodianAccount.cshtml @@ -16,8 +16,10 @@
    -
    - + @if (!ViewContext.ModelState.IsValid) + { +
    + } @if (!string.IsNullOrEmpty(Model.SelectedCustodian)) { diff --git a/BTCPayServer/Views/UICustodianAccounts/EditCustodianAccount.cshtml b/BTCPayServer/Views/UICustodianAccounts/EditCustodianAccount.cshtml index f2c0f0649..b3f2b950a 100644 --- a/BTCPayServer/Views/UICustodianAccounts/EditCustodianAccount.cshtml +++ b/BTCPayServer/Views/UICustodianAccounts/EditCustodianAccount.cshtml @@ -1,5 +1,6 @@ @using BTCPayServer.Views.Apps @using BTCPayServer.Abstractions.Extensions +@using BTCPayServer.Abstractions.Models @model BTCPayServer.Models.CustodianAccountViewModels.EditCustodianAccountViewModel @{ ViewData.SetActivePage(AppsNavPages.Update, "Edit custodian account"); @@ -15,9 +16,11 @@
    - -
    - + + @if (!ViewContext.ModelState.IsValid) + { +
    + }
    @@ -32,5 +35,10 @@
    +     + Delete this custodian account +
    + + diff --git a/BTCPayServer/Views/UICustodianAccounts/ViewCustodianAccount.cshtml b/BTCPayServer/Views/UICustodianAccounts/ViewCustodianAccount.cshtml index 6351a7183..696172419 100644 --- a/BTCPayServer/Views/UICustodianAccounts/ViewCustodianAccount.cshtml +++ b/BTCPayServer/Views/UICustodianAccounts/ViewCustodianAccount.cshtml @@ -10,180 +10,338 @@ } + - - -
    -
    -

    - @ViewData["Title"] -

    -
    - - Configure - - - Delete - - +
    +
    +
    +

    + @ViewData["Title"] +

    +
    + + Deposit + + + Configure + + +
    -
    + -
    -
    +
    +
    +
    + +
    - @if (@Model.GetAssetBalanceException != null) - { -

    - @Model.GetAssetBalanceException.Message -

    - } +
    +

    + {{ account.assetBalanceExceptionMessage }} +

    -

    Balances

    -
    - - - - - - - - - - - - - @if (Model.AssetBalances != null && Model.AssetBalances.Count > 0) - { - @foreach (var pair in Model.AssetBalances.OrderBy(key => key.Key)) - { +

    Balances

    + +
    + + +
    + + +
    +
    AssetBalanceUnit Price (Bid)Unit Price (Ask)Fiat ValueActions
    + - + + + + + + + + + + + - + + + + + + + + +
    @pair.KeyAssetBalanceUnit Price (Bid)Unit Price (Ask)Fiat ValueActions
    {{ row.asset }} @pair.Value.Qty{{ row.formattedQty }} - @pair.Value.FormattedBid + {{ row.formattedBid }} - @pair.Value.FormattedAsk + {{ row.formattedAsk }} - @(pair.Value.FormattedFiatValue) + {{ row.formattedFiatValue }} - @if (pair.Value.TradableAssetPairs != null) - { - Trade - } - @if (pair.Value.CanDeposit) - { - Deposit - } - @if (pair.Value.CanWithdraw) - { - Withdraw - } + Trade + Deposit + Withdraw
    No assets are stored with this custodian (yet).
    An error occured while loading assets and balances.
    +
    + + +

    Features

    +

    The @Model?.Custodian.Name custodian supports:

    +
      +
    • Viewing asset account
      • + @if (Model?.Custodian is ICanTrade) + { +
    • Trading
      • } - } - else if (Model.GetAssetBalanceException == null) - { - - No assets are stored with this custodian (yet). - - } - else - { - - An error occured while loading assets and balances. - - } - - + @if (Model?.Custodian is ICanDeposit) + { +
    • Depositing (Greenfield API only, for now)
      • + } + @if (Model?.Custodian is ICanWithdraw) + { +
    • Withdrawing (Greenfield API only, for now)
      • + } +
    +
    - - -

    Features

    -

    The @Model.Custodian.Name custodian supports:

    -
      -
    • Viewing asset balances
      • - @if (Model.Custodian is ICanTrade) - { -
    • Trading (Greenfield API only, for now)
      • - } - @if (Model.Custodian is ICanDeposit) - { -
    • Depositing (Greenfield API only, for now)
      • - } - @if (Model.Custodian is ICanWithdraw) - { -
    • Withdrawing (Greenfield API only, for now)
      • - } -
    - -
    -
    -