tiamak/salvium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wallet: only return tx keys via RPC if requested

Browse Source 
To get the tx keys returned via RPC, set the "get_tx_key" or
"get_tx_keys" request field to true (defaults to false).
This commit is contained in:
moneromooo-monero
2015-08-19 20:59:44 +01:00
parent 32077d3810
commit d91eb8c7b4
6 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/wallet/wallet2.h
View File

@@ -80,9 +80,9 @@ namespace tools
class wallet2
{
wallet2(const wallet2&) : m_run(true), m_callback(0), m_testnet(false), m_always_confirm_transfers (false) {};
wallet2(const wallet2&) : m_run(true), m_callback(0), m_testnet(false), m_always_confirm_transfers (false), m_store_tx_keys(false) {};
public:
wallet2(bool testnet = false, bool restricted = false) : m_run(true), m_callback(0), m_testnet(testnet), m_restricted(restricted), is_old_file_format(false) {};
wallet2(bool testnet = false, bool restricted = false) : m_run(true), m_callback(0), m_testnet(testnet), m_restricted(restricted), is_old_file_format(false), m_store_tx_keys(false) {};
struct transfer_details
{
uint64_t m_block_height;
@@ -292,6 +292,8 @@ namespace tools
bool always_confirm_transfers() const { return m_always_confirm_transfers; }
void always_confirm_transfers(bool always) { m_always_confirm_transfers = always; }
bool store_tx_keys() const { return m_store_tx_keys; }
void store_tx_keys(bool store) { m_store_tx_keys = store; }
bool get_tx_key(const crypto::hash &txid, crypto::secret_key &tx_key) const;
@@ -351,6 +353,7 @@ namespace tools
bool is_old_file_format; /*!< Whether the wallet file is of an old file format */
bool m_watch_only; /*!< no spend key */
bool m_always_confirm_transfers;
bool m_store_tx_keys; /*!< request txkey to be returned in RPC, and store in the wallet cache file */
};
}
BOOST_CLASS_VERSION(tools::wallet2, 8)
@@ -585,7 +588,7 @@ namespace tools
}
crypto::secret_key tx_key;
bool r = cryptonote::construct_tx(m_account.get_keys(), sources, splitted_dsts, extra, tx, unlock_time, tx_key);
bool r = cryptonote::construct_tx_and_get_tx_key(m_account.get_keys(), sources, splitted_dsts, extra, tx, unlock_time, tx_key);
THROW_WALLET_EXCEPTION_IF(!r, error::tx_not_constructed, sources, splitted_dsts, unlock_time, m_testnet);
THROW_WALLET_EXCEPTION_IF(m_upper_transaction_size_limit <= get_object_blobsize(tx), error::tx_too_big, tx, m_upper_transaction_size_limit);