diff --git a/src/Makefile.am b/src/Makefile.am index 3cd3c8bbaa..b7e18bd6ce 100755 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -292,6 +292,7 @@ BITCOIN_CORE_H = \ util/overloaded.h \ util/rbf.h \ util/readwritefile.h \ + util/result.h \ util/serfloat.h \ util/settings.h \ util/sock.h \ diff --git a/src/bench/wallet_loading.cpp b/src/bench/wallet_loading.cpp old mode 100644 new mode 100755 index 211d5a758c..f44229e0b6 --- a/src/bench/wallet_loading.cpp +++ b/src/bench/wallet_loading.cpp @@ -47,12 +47,11 @@ static void BenchUnloadWallet(std::shared_ptr&& wallet) static void AddTx(CWallet& wallet) { - bilingual_str error; - CTxDestination dest; - wallet.GetNewDestination(OutputType::BECH32, "", dest, error); + const auto& dest = wallet.GetNewDestination(OutputType::BECH32, ""); + assert(dest.HasRes()); CMutableTransaction mtx; - mtx.vout.push_back({::policyAsset, COIN, GetScriptForDestination(dest)}); + mtx.vout.push_back({::policyAsset, COIN, GetScriptForDestination(dest.GetObj())}); mtx.vin.push_back(CTxIn()); wallet.AddToWallet(MakeTransactionRef(mtx), TxStateInactive{}); diff --git a/src/interfaces/wallet.h b/src/interfaces/wallet.h old mode 100644 new mode 100755 index 0e35c2ad49..2b8205f35f --- a/src/interfaces/wallet.h +++ b/src/interfaces/wallet.h @@ -13,6 +13,7 @@ #include