|
|
|
@ -530,39 +530,7 @@ namespace wallet_rpc
|
|
|
|
|
END_KV_SERIALIZE_MAP()
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct COMMAND_RPC_TRANSFER
|
|
|
|
|
{
|
|
|
|
|
struct request_t
|
|
|
|
|
{
|
|
|
|
|
std::list<transfer_destination> destinations;
|
|
|
|
|
uint32_t account_index;
|
|
|
|
|
std::set<uint32_t> subaddr_indices;
|
|
|
|
|
uint32_t priority;
|
|
|
|
|
uint64_t ring_size;
|
|
|
|
|
uint64_t unlock_time;
|
|
|
|
|
std::string payment_id;
|
|
|
|
|
bool get_tx_key;
|
|
|
|
|
bool do_not_relay;
|
|
|
|
|
bool get_tx_hex;
|
|
|
|
|
bool get_tx_metadata;
|
|
|
|
|
|
|
|
|
|
BEGIN_KV_SERIALIZE_MAP()
|
|
|
|
|
KV_SERIALIZE(destinations)
|
|
|
|
|
KV_SERIALIZE(account_index)
|
|
|
|
|
KV_SERIALIZE(subaddr_indices)
|
|
|
|
|
KV_SERIALIZE(priority)
|
|
|
|
|
KV_SERIALIZE_OPT(ring_size, (uint64_t)0)
|
|
|
|
|
KV_SERIALIZE(unlock_time)
|
|
|
|
|
KV_SERIALIZE(payment_id)
|
|
|
|
|
KV_SERIALIZE(get_tx_key)
|
|
|
|
|
KV_SERIALIZE_OPT(do_not_relay, false)
|
|
|
|
|
KV_SERIALIZE_OPT(get_tx_hex, false)
|
|
|
|
|
KV_SERIALIZE_OPT(get_tx_metadata, false)
|
|
|
|
|
END_KV_SERIALIZE_MAP()
|
|
|
|
|
};
|
|
|
|
|
typedef epee::misc_utils::struct_init<request_t> request;
|
|
|
|
|
|
|
|
|
|
struct response_t
|
|
|
|
|
struct single_transfer_response
|
|
|
|
|
{
|
|
|
|
|
std::string tx_hash;
|
|
|
|
|
std::string tx_key;
|
|
|
|
@ -588,10 +556,8 @@ namespace wallet_rpc
|
|
|
|
|
KV_SERIALIZE(spent_key_images)
|
|
|
|
|
END_KV_SERIALIZE_MAP()
|
|
|
|
|
};
|
|
|
|
|
typedef epee::misc_utils::struct_init<response_t> response;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct COMMAND_RPC_TRANSFER_SPLIT
|
|
|
|
|
struct COMMAND_RPC_TRANSFER
|
|
|
|
|
{
|
|
|
|
|
struct request_t
|
|
|
|
|
{
|
|
|
|
@ -602,7 +568,7 @@ namespace wallet_rpc
|
|
|
|
|
uint64_t ring_size;
|
|
|
|
|
uint64_t unlock_time;
|
|
|
|
|
std::string payment_id;
|
|
|
|
|
bool get_tx_keys;
|
|
|
|
|
bool get_tx_key;
|
|
|
|
|
bool do_not_relay;
|
|
|
|
|
bool get_tx_hex;
|
|
|
|
|
bool get_tx_metadata;
|
|
|
|
@ -615,7 +581,7 @@ namespace wallet_rpc
|
|
|
|
|
KV_SERIALIZE_OPT(ring_size, (uint64_t)0)
|
|
|
|
|
KV_SERIALIZE(unlock_time)
|
|
|
|
|
KV_SERIALIZE(payment_id)
|
|
|
|
|
KV_SERIALIZE(get_tx_keys)
|
|
|
|
|
KV_SERIALIZE(get_tx_key)
|
|
|
|
|
KV_SERIALIZE_OPT(do_not_relay, false)
|
|
|
|
|
KV_SERIALIZE_OPT(get_tx_hex, false)
|
|
|
|
|
KV_SERIALIZE_OPT(get_tx_metadata, false)
|
|
|
|
@ -623,16 +589,11 @@ namespace wallet_rpc
|
|
|
|
|
};
|
|
|
|
|
typedef epee::misc_utils::struct_init<request_t> request;
|
|
|
|
|
|
|
|
|
|
struct key_list
|
|
|
|
|
{
|
|
|
|
|
std::list<std::string> keys;
|
|
|
|
|
|
|
|
|
|
BEGIN_KV_SERIALIZE_MAP()
|
|
|
|
|
KV_SERIALIZE(keys)
|
|
|
|
|
END_KV_SERIALIZE_MAP()
|
|
|
|
|
typedef single_transfer_response response_t;
|
|
|
|
|
typedef epee::misc_utils::struct_init<response_t> response;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct response_t
|
|
|
|
|
struct split_transfer_response
|
|
|
|
|
{
|
|
|
|
|
std::list<std::string> tx_hash_list;
|
|
|
|
|
std::list<std::string> tx_key_list;
|
|
|
|
@ -658,6 +619,40 @@ namespace wallet_rpc
|
|
|
|
|
KV_SERIALIZE(spent_key_images_list)
|
|
|
|
|
END_KV_SERIALIZE_MAP()
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct COMMAND_RPC_TRANSFER_SPLIT
|
|
|
|
|
{
|
|
|
|
|
struct request_t
|
|
|
|
|
{
|
|
|
|
|
std::list<transfer_destination> destinations;
|
|
|
|
|
uint32_t account_index;
|
|
|
|
|
std::set<uint32_t> subaddr_indices;
|
|
|
|
|
uint32_t priority;
|
|
|
|
|
uint64_t ring_size;
|
|
|
|
|
uint64_t unlock_time;
|
|
|
|
|
std::string payment_id;
|
|
|
|
|
bool get_tx_keys;
|
|
|
|
|
bool do_not_relay;
|
|
|
|
|
bool get_tx_hex;
|
|
|
|
|
bool get_tx_metadata;
|
|
|
|
|
|
|
|
|
|
BEGIN_KV_SERIALIZE_MAP()
|
|
|
|
|
KV_SERIALIZE(destinations)
|
|
|
|
|
KV_SERIALIZE(account_index)
|
|
|
|
|
KV_SERIALIZE(subaddr_indices)
|
|
|
|
|
KV_SERIALIZE(priority)
|
|
|
|
|
KV_SERIALIZE_OPT(ring_size, (uint64_t)0)
|
|
|
|
|
KV_SERIALIZE(unlock_time)
|
|
|
|
|
KV_SERIALIZE(payment_id)
|
|
|
|
|
KV_SERIALIZE(get_tx_keys)
|
|
|
|
|
KV_SERIALIZE_OPT(do_not_relay, false)
|
|
|
|
|
KV_SERIALIZE_OPT(get_tx_hex, false)
|
|
|
|
|
KV_SERIALIZE_OPT(get_tx_metadata, false)
|
|
|
|
|
END_KV_SERIALIZE_MAP()
|
|
|
|
|
};
|
|
|
|
|
typedef epee::misc_utils::struct_init<request_t> request;
|
|
|
|
|
|
|
|
|
|
typedef split_transfer_response response_t;
|
|
|
|
|
typedef epee::misc_utils::struct_init<response_t> response;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
@ -821,41 +816,7 @@ namespace wallet_rpc
|
|
|
|
|
};
|
|
|
|
|
typedef epee::misc_utils::struct_init<request_t> request;
|
|
|
|
|
|
|
|
|
|
struct key_list
|
|
|
|
|
{
|
|
|
|
|
std::list<std::string> keys;
|
|
|
|
|
|
|
|
|
|
BEGIN_KV_SERIALIZE_MAP()
|
|
|
|
|
KV_SERIALIZE(keys)
|
|
|
|
|
END_KV_SERIALIZE_MAP()
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct response_t
|
|
|
|
|
{
|
|
|
|
|
std::list<std::string> tx_hash_list;
|
|
|
|
|
std::list<std::string> tx_key_list;
|
|
|
|
|
std::list<uint64_t> amount_list;
|
|
|
|
|
std::list<uint64_t> fee_list;
|
|
|
|
|
std::list<uint64_t> weight_list;
|
|
|
|
|
std::list<std::string> tx_blob_list;
|
|
|
|
|
std::list<std::string> tx_metadata_list;
|
|
|
|
|
std::string multisig_txset;
|
|
|
|
|
std::string unsigned_txset;
|
|
|
|
|
std::list<key_image_list> spent_key_images_list;
|
|
|
|
|
|
|
|
|
|
BEGIN_KV_SERIALIZE_MAP()
|
|
|
|
|
KV_SERIALIZE(tx_hash_list)
|
|
|
|
|
KV_SERIALIZE(tx_key_list)
|
|
|
|
|
KV_SERIALIZE(amount_list)
|
|
|
|
|
KV_SERIALIZE(fee_list)
|
|
|
|
|
KV_SERIALIZE(weight_list)
|
|
|
|
|
KV_SERIALIZE(tx_blob_list)
|
|
|
|
|
KV_SERIALIZE(tx_metadata_list)
|
|
|
|
|
KV_SERIALIZE(multisig_txset)
|
|
|
|
|
KV_SERIALIZE(unsigned_txset)
|
|
|
|
|
KV_SERIALIZE(spent_key_images_list)
|
|
|
|
|
END_KV_SERIALIZE_MAP()
|
|
|
|
|
};
|
|
|
|
|
typedef split_transfer_response response_t;
|
|
|
|
|
typedef epee::misc_utils::struct_init<response_t> response;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
@ -897,41 +858,7 @@ namespace wallet_rpc
|
|
|
|
|
};
|
|
|
|
|
typedef epee::misc_utils::struct_init<request_t> request;
|
|
|
|
|
|
|
|
|
|
struct key_list
|
|
|
|
|
{
|
|
|
|
|
std::list<std::string> keys;
|
|
|
|
|
|
|
|
|
|
BEGIN_KV_SERIALIZE_MAP()
|
|
|
|
|
KV_SERIALIZE(keys)
|
|
|
|
|
END_KV_SERIALIZE_MAP()
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct response_t
|
|
|
|
|
{
|
|
|
|
|
std::list<std::string> tx_hash_list;
|
|
|
|
|
std::list<std::string> tx_key_list;
|
|
|
|
|
std::list<uint64_t> amount_list;
|
|
|
|
|
std::list<uint64_t> fee_list;
|
|
|
|
|
std::list<uint64_t> weight_list;
|
|
|
|
|
std::list<std::string> tx_blob_list;
|
|
|
|
|
std::list<std::string> tx_metadata_list;
|
|
|
|
|
std::string multisig_txset;
|
|
|
|
|
std::string unsigned_txset;
|
|
|
|
|
std::list<key_image_list> spent_key_images_list;
|
|
|
|
|
|
|
|
|
|
BEGIN_KV_SERIALIZE_MAP()
|
|
|
|
|
KV_SERIALIZE(tx_hash_list)
|
|
|
|
|
KV_SERIALIZE(tx_key_list)
|
|
|
|
|
KV_SERIALIZE(amount_list)
|
|
|
|
|
KV_SERIALIZE(fee_list)
|
|
|
|
|
KV_SERIALIZE(weight_list)
|
|
|
|
|
KV_SERIALIZE(tx_blob_list)
|
|
|
|
|
KV_SERIALIZE(tx_metadata_list)
|
|
|
|
|
KV_SERIALIZE(multisig_txset)
|
|
|
|
|
KV_SERIALIZE(unsigned_txset)
|
|
|
|
|
KV_SERIALIZE(spent_key_images_list)
|
|
|
|
|
END_KV_SERIALIZE_MAP()
|
|
|
|
|
};
|
|
|
|
|
typedef split_transfer_response response_t;
|
|
|
|
|
typedef epee::misc_utils::struct_init<response_t> response;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
@ -967,32 +894,7 @@ namespace wallet_rpc
|
|
|
|
|
};
|
|
|
|
|
typedef epee::misc_utils::struct_init<request_t> request;
|
|
|
|
|
|
|
|
|
|
struct response_t
|
|
|
|
|
{
|
|
|
|
|
std::string tx_hash;
|
|
|
|
|
std::string tx_key;
|
|
|
|
|
uint64_t amount;
|
|
|
|
|
uint64_t fee;
|
|
|
|
|
uint64_t weight;
|
|
|
|
|
std::string tx_blob;
|
|
|
|
|
std::string tx_metadata;
|
|
|
|
|
std::string multisig_txset;
|
|
|
|
|
std::string unsigned_txset;
|
|
|
|
|
key_image_list spent_key_images;
|
|
|
|
|
|
|
|
|
|
BEGIN_KV_SERIALIZE_MAP()
|
|
|
|
|
KV_SERIALIZE(tx_hash)
|
|
|
|
|
KV_SERIALIZE(tx_key)
|
|
|
|
|
KV_SERIALIZE(amount)
|
|
|
|
|
KV_SERIALIZE(fee)
|
|
|
|
|
KV_SERIALIZE(weight)
|
|
|
|
|
KV_SERIALIZE(tx_blob)
|
|
|
|
|
KV_SERIALIZE(tx_metadata)
|
|
|
|
|
KV_SERIALIZE(multisig_txset)
|
|
|
|
|
KV_SERIALIZE(unsigned_txset)
|
|
|
|
|
KV_SERIALIZE(spent_key_images)
|
|
|
|
|
END_KV_SERIALIZE_MAP()
|
|
|
|
|
};
|
|
|
|
|
typedef single_transfer_response response_t;
|
|
|
|
|
typedef epee::misc_utils::struct_init<response_t> response;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|