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

Remove warnings

Browse Source
This commit is contained in:
nicolas.dorier
2020-02-24 22:12:50 +09:00
parent 2a7f6e4aa3
commit a3e7729c52
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BTCPayServer/Controllers/WalletsController.PSBT.cs
View File

@@ -117,7 +117,7 @@ namespace BTCPayServer.Controllers
.GetMetadataAsync<string>(derivationScheme.AccountDerivation, .GetMetadataAsync<string>(derivationScheme.AccountDerivation,
WellknownMetadataKeys.MasterHDKey); WellknownMetadataKeys.MasterHDKey);
return await SignWithSeed(walletId, return SignWithSeed(walletId,
new SignWithSeedViewModel() {SeedOrKey = extKey, PSBT = psbt.ToBase64()}); new SignWithSeedViewModel() {SeedOrKey = extKey, PSBT = psbt.ToBase64()});
} }

9
BTCPayServer/Controllers/WalletsController.cs
View File

@@ -573,7 +573,7 @@ namespace BTCPayServer.Controllers
var extKey = await ExplorerClientProvider.GetExplorerClient(network) var extKey = await ExplorerClientProvider.GetExplorerClient(network)
.GetMetadataAsync<string>(derivationScheme.AccountDerivation, WellknownMetadataKeys.MasterHDKey, cancellation); .GetMetadataAsync<string>(derivationScheme.AccountDerivation, WellknownMetadataKeys.MasterHDKey, cancellation);
return await SignWithSeed(walletId, new SignWithSeedViewModel() return SignWithSeed(walletId, new SignWithSeedViewModel()
{ {
SeedOrKey = extKey, SeedOrKey = extKey,
PSBT = psbt.PSBT.ToBase64() PSBT = psbt.PSBT.ToBase64()
@@ -645,10 +645,9 @@ namespace BTCPayServer.Controllers
[HttpPost] [HttpPost]
[Route("{walletId}/vault")] [Route("{walletId}/vault")]
public async Task<IActionResult> SubmitVault([ModelBinder(typeof(WalletIdModelBinder))] public IActionResult SubmitVault([ModelBinder(typeof(WalletIdModelBinder))]
WalletId walletId, WalletSendVaultModel model) WalletId walletId, WalletSendVaultModel model)
{ {
return RedirectToWalletPSBTReady(model.PSBT); return RedirectToWalletPSBTReady(model.PSBT);
} }
private IActionResult RedirectToWalletPSBTReady(string psbt, string signingKey= null, string signingKeyPath = null) private IActionResult RedirectToWalletPSBTReady(string psbt, string signingKey= null, string signingKeyPath = null)
@@ -718,7 +717,7 @@ namespace BTCPayServer.Controllers
[HttpPost] [HttpPost]
[Route("{walletId}/ledger")] [Route("{walletId}/ledger")]
public async Task<IActionResult> SubmitLedger([ModelBinder(typeof(WalletIdModelBinder))] public IActionResult SubmitLedger([ModelBinder(typeof(WalletIdModelBinder))]
WalletId walletId, WalletSendLedgerModel model) WalletId walletId, WalletSendLedgerModel model)
{ {
return RedirectToWalletPSBTReady(model.PSBT); return RedirectToWalletPSBTReady(model.PSBT);
@@ -735,7 +734,7 @@ namespace BTCPayServer.Controllers
} }
[HttpPost("{walletId}/psbt/seed")] [HttpPost("{walletId}/psbt/seed")]
public async Task<IActionResult> SignWithSeed([ModelBinder(typeof(WalletIdModelBinder))] public IActionResult SignWithSeed([ModelBinder(typeof(WalletIdModelBinder))]
WalletId walletId, SignWithSeedViewModel viewModel) WalletId walletId, SignWithSeedViewModel viewModel)
{ {
if (!ModelState.IsValid) if (!ModelState.IsValid)