keep old usage of per_kb_fee functional

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

View File

@@ -537,15 +537,15 @@ namespace lws
if (!resp)
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};
const std::uint64_t per_byte_fee =
resp->estimated_base_fee / resp->size_scale;
const std::uint64_t per_byte_fee_masked =
((per_byte_fee + (resp->fee_mask - 1)) / resp->fee_mask) * resp->fee_mask;
const bool use_per_byte_fee = resp->size_scale == 1;
const std::uint64_t base_fee = resp->estimated_base_fee;
const std::uint64_t base_fee_masked =
((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};
}
};