diff options
author | AwfulCrawler <AwfulCrawler@users.noreply.github.com> | 2016-04-18 13:58:22 +1200 |
---|---|---|
committer | AwfulCrawler <AwfulCrawler@users.noreply.github.com> | 2016-04-18 13:58:22 +1200 |
commit | 2d9dfd082096429b4b1876aff8cb8c76f93b7b10 (patch) | |
tree | 3665fcb864eabc32a754c7bfddc90a3c672dd598 /src/wallet/wallet_rpc_server_commands_defs.h | |
parent | Merge pull request #799 (diff) | |
parent | Merge pull request #803 (diff) | |
download | monero-2d9dfd082096429b4b1876aff8cb8c76f93b7b10.tar.xz |
Merge pull request #1 from monero-project/master
Catch up with Monero master
Diffstat (limited to 'src/wallet/wallet_rpc_server_commands_defs.h')
-rw-r--r-- | src/wallet/wallet_rpc_server_commands_defs.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/wallet/wallet_rpc_server_commands_defs.h b/src/wallet/wallet_rpc_server_commands_defs.h index 2c4e26406..2d90bf623 100644 --- a/src/wallet/wallet_rpc_server_commands_defs.h +++ b/src/wallet/wallet_rpc_server_commands_defs.h @@ -115,6 +115,7 @@ namespace wallet_rpc uint64_t unlock_time; std::string payment_id; bool get_tx_key; + bool trusted_daemon; BEGIN_KV_SERIALIZE_MAP() KV_SERIALIZE(destinations) @@ -123,6 +124,7 @@ namespace wallet_rpc KV_SERIALIZE(unlock_time) KV_SERIALIZE(payment_id) KV_SERIALIZE(get_tx_key) + KV_SERIALIZE(trusted_daemon) END_KV_SERIALIZE_MAP() }; @@ -149,6 +151,7 @@ namespace wallet_rpc std::string payment_id; bool new_algorithm; bool get_tx_keys; + bool trusted_daemon; BEGIN_KV_SERIALIZE_MAP() KV_SERIALIZE(destinations) @@ -158,6 +161,7 @@ namespace wallet_rpc KV_SERIALIZE(payment_id) KV_SERIALIZE(new_algorithm) KV_SERIALIZE(get_tx_keys) + KV_SERIALIZE(trusted_daemon) END_KV_SERIALIZE_MAP() }; |