such-gitea/wownero-lws
1
0
Fork 1
mirror of https://codeberg.org/wownero/wownero-lws synced 2026-01-10 15:45:15 -08:00
Code Issues Packages Projects Releases Wiki Activity

keep old usage of per_kb_fee functional

Browse Source
This commit is contained in:
j-berman
2022-02-21 20:12:25 -05:00
committed by Lee *!* Clagett
parent f027c15479
commit 04c6d553c6
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/rest_server.cpp
View File

@@ -537,15 +537,15 @@ namespace lws
if (!resp) if (!resp)
return resp.error(); return resp.error();
if (resp->size_scale == 0 || 1024 < resp->size_scale || resp->fee_mask == 0) if ((resp->size_scale != 1 && resp->size_scale != 1024) || resp->fee_mask == 0)
return {lws::error::bad_daemon_response}; return {lws::error::bad_daemon_response};
const std::uint64_t per_byte_fee = const bool use_per_byte_fee = resp->size_scale == 1;
resp->estimated_base_fee / resp->size_scale; const std::uint64_t base_fee = resp->estimated_base_fee;
const std::uint64_t per_byte_fee_masked = const std::uint64_t base_fee_masked =
((per_byte_fee + (resp->fee_mask - 1)) / resp->fee_mask) * resp->fee_mask; ((base_fee + (resp->fee_mask - 1)) / resp->fee_mask) * resp->fee_mask;
return response{per_byte_fee_masked, resp->fee_mask, rpc::safe_uint64(received), std::move(unspent), std::move(req.creds.key)}; return response{base_fee_masked, resp->fee_mask, rpc::safe_uint64(received), std::move(unspent), std::move(req.creds.key), use_per_byte_fee};
} }
}; };

2
src/rpc/light_wallet.cpp
View File

@@ -294,7 +294,7 @@ namespace lws
return expand_outputs{src, self.user_key}; return expand_outputs{src, self.user_key};
}; };
wire::object(dest, wire::object(dest,
WIRE_FIELD_COPY(per_byte_fee), wire::field(self.use_per_byte_fee ? "per_byte_fee" : "per_kb_fee", self.base_fee),
WIRE_FIELD_COPY(fee_mask), WIRE_FIELD_COPY(fee_mask),
WIRE_FIELD_COPY(amount), WIRE_FIELD_COPY(amount),
wire::field("outputs", wire::as_array(std::cref(self.outputs), expand)) wire::field("outputs", wire::as_array(std::cref(self.outputs), expand))

3
src/rpc/light_wallet.h
View File

@@ -155,11 +155,12 @@ namespace rpc
struct get_unspent_outs_response struct get_unspent_outs_response
{ {
get_unspent_outs_response() = delete; get_unspent_outs_response() = delete;
std::uint64_t per_byte_fee; std::uint64_t base_fee; // either per_byte_fee or per_kb_fee
std::uint64_t fee_mask; std::uint64_t fee_mask;
safe_uint64 amount; safe_uint64 amount;
std::vector<std::pair<db::output, std::vector<crypto::key_image>>> outputs; std::vector<std::pair<db::output, std::vector<crypto::key_image>>> outputs;
crypto::secret_key user_key; crypto::secret_key user_key;
bool use_per_byte_fee;
}; };
void write_bytes(wire::json_writer&, const get_unspent_outs_response&); void write_bytes(wire::json_writer&, const get_unspent_outs_response&);