mirror of
https://codeberg.org/anoncontributorxmr/monero.git
synced 2024-11-27 05:13:25 +01:00
Merge pull request #4552
67e76aa0
wallet_rpc_server: optionally return tx keys in sign_transfer (moneromooo-monero)
This commit is contained in:
commit
169e6e9074
@ -5612,6 +5612,10 @@ bool wallet2::sign_tx(unsigned_tx_set &exported_txs, std::vector<wallet2::pendin
|
|||||||
ptx.construction_data = sd;
|
ptx.construction_data = sd;
|
||||||
|
|
||||||
txs.push_back(ptx);
|
txs.push_back(ptx);
|
||||||
|
|
||||||
|
// add tx keys only to ptx
|
||||||
|
txs.back().tx_key = tx_key;
|
||||||
|
txs.back().additional_tx_keys = additional_tx_keys;
|
||||||
}
|
}
|
||||||
|
|
||||||
// add key images
|
// add key images
|
||||||
|
@ -981,6 +981,8 @@ namespace tools
|
|||||||
for (auto &ptx: ptxs)
|
for (auto &ptx: ptxs)
|
||||||
{
|
{
|
||||||
res.tx_hash_list.push_back(epee::string_tools::pod_to_hex(cryptonote::get_transaction_hash(ptx.tx)));
|
res.tx_hash_list.push_back(epee::string_tools::pod_to_hex(cryptonote::get_transaction_hash(ptx.tx)));
|
||||||
|
if (req.get_tx_keys)
|
||||||
|
res.tx_key_list.push_back(epee::string_tools::pod_to_hex(ptx.tx_key));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (req.export_raw)
|
if (req.export_raw)
|
||||||
|
@ -598,10 +598,12 @@ namespace wallet_rpc
|
|||||||
{
|
{
|
||||||
std::string unsigned_txset;
|
std::string unsigned_txset;
|
||||||
bool export_raw;
|
bool export_raw;
|
||||||
|
bool get_tx_keys;
|
||||||
|
|
||||||
BEGIN_KV_SERIALIZE_MAP()
|
BEGIN_KV_SERIALIZE_MAP()
|
||||||
KV_SERIALIZE(unsigned_txset)
|
KV_SERIALIZE(unsigned_txset)
|
||||||
KV_SERIALIZE_OPT(export_raw, false)
|
KV_SERIALIZE_OPT(export_raw, false)
|
||||||
|
KV_SERIALIZE_OPT(get_tx_keys, false)
|
||||||
END_KV_SERIALIZE_MAP()
|
END_KV_SERIALIZE_MAP()
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -610,11 +612,13 @@ namespace wallet_rpc
|
|||||||
std::string signed_txset;
|
std::string signed_txset;
|
||||||
std::list<std::string> tx_hash_list;
|
std::list<std::string> tx_hash_list;
|
||||||
std::list<std::string> tx_raw_list;
|
std::list<std::string> tx_raw_list;
|
||||||
|
std::list<std::string> tx_key_list;
|
||||||
|
|
||||||
BEGIN_KV_SERIALIZE_MAP()
|
BEGIN_KV_SERIALIZE_MAP()
|
||||||
KV_SERIALIZE(signed_txset)
|
KV_SERIALIZE(signed_txset)
|
||||||
KV_SERIALIZE(tx_hash_list)
|
KV_SERIALIZE(tx_hash_list)
|
||||||
KV_SERIALIZE(tx_raw_list)
|
KV_SERIALIZE(tx_raw_list)
|
||||||
|
KV_SERIALIZE(tx_key_list)
|
||||||
END_KV_SERIALIZE_MAP()
|
END_KV_SERIALIZE_MAP()
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user