Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-08 16:22:20 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6144

Browse source 
0e0351c4 wallet_rpc_server: add count parameter to create_address (Matt Smith)
This commit is contained in:
Alexander Blair 2020-01-16 17:51:24 -08:00
commit beb815a81d
No known key found for this signature in database
GPG key ID: C64552D877C32479
3 changed files with 37 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/wallet/wallet_rpc_server_commands_defs.h
View file

@ -47,7 +47,7 @@
// advance which version they will stop working with
// Don't go over 32767 for any of these
#define WALLET_RPC_VERSION_MAJOR 1
#define WALLET_RPC_VERSION_MINOR 16
#define WALLET_RPC_VERSION_MINOR 17
#define MAKE_WALLET_RPC_VERSION(major,minor) (((major)<<16)|(minor))
#define WALLET_RPC_VERSION MAKE_WALLET_RPC_VERSION(WALLET_RPC_VERSION_MAJOR, WALLET_RPC_VERSION_MINOR)
namespace tools
@ -182,11 +182,13 @@ namespace wallet_rpc
{
struct request_t
{
uint32_t account_index;
uint32_t account_index;
uint32_t count;
std::string label;
BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE(account_index)
KV_SERIALIZE_OPT(count, 1U)
KV_SERIALIZE(label)
END_KV_SERIALIZE_MAP()
};
@ -194,12 +196,16 @@ namespace wallet_rpc
struct response_t
{
std::string address;
uint32_t address_index;
std::string address;
uint32_t address_index;
std::vector<std::string> addresses;
std::vector<uint32_t> address_indices;
BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE(address)
KV_SERIALIZE(address_index)
KV_SERIALIZE(addresses)
KV_SERIALIZE(address_indices)
END_KV_SERIALIZE_MAP()
};
typedef epee::misc_utils::struct_init<response_t> response;