aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/wallet2.h
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2018-05-31 14:34:34 -0500
committerluigi1111 <luigi1111w@gmail.com>2018-05-31 14:34:34 -0500
commit3a373c3d3ae9837b4002247f25efcb6325950dd4 (patch)
tree317e0fc4961f2c7e1790ca1ef12751d3d964f4fb /src/wallet/wallet2.h
parentMerge pull request #3499 (diff)
parentWalletApi: getMultisigInfo entry for gui wallets (diff)
downloadmonero-3a373c3d3ae9837b4002247f25efcb6325950dd4.tar.xz
Merge pull request #3489
47fdb74 WalletApi: getMultisigInfo entry for gui wallets... (naughtyfox) 47fdb74 Refactored: work with wallet api statuses to make setting and getting operations atomic along with error strings (naughtyfox)
Diffstat (limited to 'src/wallet/wallet2.h')
-rw-r--r--src/wallet/wallet2.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h
index 61e6927bc..5e0dd076b 100644
--- a/src/wallet/wallet2.h
+++ b/src/wallet/wallet2.h
@@ -688,6 +688,7 @@ namespace tools
bool save_multisig_tx(const multisig_tx_set &txs, const std::string &filename);
std::string save_multisig_tx(const std::vector<pending_tx>& ptx_vector);
bool save_multisig_tx(const std::vector<pending_tx>& ptx_vector, const std::string &filename);
+ multisig_tx_set make_multisig_tx_set(const std::vector<pending_tx>& ptx_vector) const;
// load unsigned tx from file and sign it. Takes confirmation callback as argument. Used by the cli wallet
bool sign_tx(const std::string &unsigned_filename, const std::string &signed_filename, std::vector<wallet2::pending_tx> &ptx, std::function<bool(const unsigned_tx_set&)> accept_func = NULL, bool export_raw = false);
// sign unsigned tx. Takes unsigned_tx_set as argument. Used by GUI