From 2c3ee4c347838ecadb17a011932dffc077e46630 Mon Sep 17 00:00:00 2001 From: Andrew Chow Date: Fri, 12 Nov 2021 16:09:54 -0500 Subject: gui: Load Base64 PSBT string from file Some .psbt files may have the PSBT as a base64 string instead of in binary. We should be able to load those files. --- src/qt/walletframe.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/qt/walletframe.cpp b/src/qt/walletframe.cpp index dc4e25a02b..abeb6a827b 100644 --- a/src/qt/walletframe.cpp +++ b/src/qt/walletframe.cpp @@ -215,6 +215,14 @@ void WalletFrame::gotoLoadPSBT(bool from_clipboard) } std::ifstream in{filename.toLocal8Bit().data(), std::ios::binary}; data.assign(std::istream_iterator{in}, {}); + + // Some psbt files may be base64 strings in the file rather than binary data + std::string b64_str{data.begin(), data.end()}; + b64_str.erase(b64_str.find_last_not_of(" \t\n\r\f\v") + 1); // Trim trailing whitespace + auto b64_dec = DecodeBase64(b64_str); + if (b64_dec.has_value()) { + data = b64_dec.value(); + } } std::string error; -- cgit v1.2.3