github-wownero/wownero
1
0
Fork 0
mirror of https://github.com/wownero/wownero.git synced 2026-10-17 07:31:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

wallet_rpc_server: add weight to describe_transfer

Browse Source 
(cherry picked from commit 017f3cf6b5e548859914a13a0a9ec184597d278d)
This commit is contained in:
Samy
2026-10-04 18:50:22 -04:00
committed by such-gitea
parent cafc099d04
commit aee1ca831e
4 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wallet/wallet_rpc_server.cpp
+6 -1
View File
@@ -1459,6 +1459,7 @@ namespace tools
}
std::vector <wallet2::tx_construction_data> tx_constructions;
std::vector<uint64_t> tx_weights;
if (!req.unsigned_txset.empty()) {
try {
tools::wallet2::unsigned_tx_set exported_txs;
@@ -1474,6 +1475,8 @@ namespace tools
return false;
}
tx_constructions = exported_txs.txes;
// An unsigned txset does not contain a transaction with an exact weight yet.
tx_weights.resize(tx_constructions.size());
}
catch (const std::exception &e) {
er.code = WALLET_RPC_ERROR_CODE_BAD_UNSIGNED_TX_DATA;
@@ -1497,6 +1500,7 @@ namespace tools
for (size_t n = 0; n < exported_txs.m_ptx.size(); ++n) {
tx_constructions.push_back(exported_txs.m_ptx[n].construction_data);
tx_weights.push_back(cryptonote::get_transaction_weight(exported_txs.m_ptx[n].tx));
}
}
catch (const std::exception &e) {
@@ -1519,8 +1523,9 @@ namespace tools
for (size_t n = 0; n < tx_constructions.size(); ++n)
{
const tools::wallet2::tx_construction_data &cd = tx_constructions[n];
res.desc.push_back({0, 0, std::numeric_limits<uint32_t>::max(), 0, {}, {}, "", 0, "", 0, 0, ""});
res.desc.push_back({0, 0, std::numeric_limits<uint32_t>::max(), 0, {}, {}, "", 0, "", 0, 0, 0, ""});
wallet_rpc::COMMAND_RPC_DESCRIBE_TRANSFER::transfer_description &desc = res.desc.back();
desc.weight = tx_weights[n];
// Clear the recipients collection ready for this loop iteration
tx_dests.clear();
src/wallet/wallet_rpc_server_commands_defs.h
+3 -1
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 31
#define WALLET_RPC_VERSION_MINOR 32
#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
@@ -736,6 +736,7 @@ namespace wallet_rpc
uint64_t change_amount;
std::string change_address;
uint64_t fee;
uint64_t weight;
uint32_t dummy_outputs;
std::string extra;
@@ -750,6 +751,7 @@ namespace wallet_rpc
KV_SERIALIZE(change_amount)
KV_SERIALIZE(change_address)
KV_SERIALIZE(fee)
KV_SERIALIZE_OPT(weight, (uint64_t)0)
KV_SERIALIZE(dummy_outputs)
KV_SERIALIZE(extra)
END_KV_SERIALIZE_MAP()