GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 23c926d859 into merged_master (Bitcoin PR #18699)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-26 01:08:37 +00:00
commit d4711bdf91
26 changed files with 278 additions and 239 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/interfaces/wallet.cpp
View file

@ -232,7 +232,7 @@ public:
int& change_pos,
CAmount& fee,
std::vector<CAmount>& out_amounts,
std::string& fail_reason) override
bilingual_str& fail_reason) override
{
LOCK(m_wallet->cs_wallet);
CTransactionRef tx;
@ -263,7 +263,7 @@ public:
}
bool createBumpTransaction(const uint256& txid,
const CCoinControl& coin_control,
std::vector<std::string>& errors,
std::vector<bilingual_str>& errors,
CAmount& old_fee,
CAmount& new_fee,
CMutableTransaction& mtx) override
@ -273,7 +273,7 @@ public:
bool signBumpTransaction(CMutableTransaction& mtx) override { return feebumper::SignTransaction(*m_wallet.get(), mtx); }
bool commitBumpTransaction(const uint256& txid,
CMutableTransaction&& mtx,
std::vector<std::string>& errors,
std::vector<bilingual_str>& errors,
uint256& bumped_txid) override
{
return feebumper::CommitTransaction(*m_wallet.get(), txid, std::move(mtx), errors, bumped_txid) ==