diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-11-01 15:06:51 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-11-01 15:06:51 +0200 |
| commit | 95e0010fbb4afb582e8504c36102fec8c6967090 (patch) | |
| tree | 43b41ece9510623fb91a18c60d51f5ef0d2af27e /src/simplewallet/simplewallet.h | |
| parent | Merge pull request #1275 (diff) | |
| parent | wallet: set incoming outputs' key image to 0 on view wallets (diff) | |
| download | monero-95e0010fbb4afb582e8504c36102fec8c6967090.tar.xz | |
Merge pull request #1277
7e6d3cf wallet: set incoming outputs' key image to 0 on view wallets (moneromooo-monero)
1f9e6a4 wallet: print tx overview on submit_transfer too (moneromooo-monero)
Diffstat (limited to 'src/simplewallet/simplewallet.h')
| -rw-r--r-- | src/simplewallet/simplewallet.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/simplewallet/simplewallet.h b/src/simplewallet/simplewallet.h index 375716604..674c375be 100644 --- a/src/simplewallet/simplewallet.h +++ b/src/simplewallet/simplewallet.h @@ -156,7 +156,9 @@ namespace cryptonote uint64_t get_daemon_blockchain_height(std::string& err); bool try_connect_to_daemon(bool silent = false); bool ask_wallet_create_if_needed(); + bool accept_loaded_tx(const std::function<size_t()> get_num_txes, const std::function<const tools::wallet2::tx_construction_data&(size_t)> &get_tx); bool accept_loaded_tx(const tools::wallet2::unsigned_tx_set &txs); + bool accept_loaded_tx(const tools::wallet2::signed_tx_set &txs); bool get_address_from_str(const std::string &str, cryptonote::account_public_address &address, bool &has_payment_id, crypto::hash8 &payment_id); /*! |