kumi/danicoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1837

Browse source 
31533493 core: quantize per kB fee to 8 decimals (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-03-04 21:15:04 +02:00
commit 4728ab977a
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/cryptonote_config.h
View file

@ -128,6 +128,7 @@
#define THREAD_STACK_SIZE 5 * 1024 * 1024 #define THREAD_STACK_SIZE 5 * 1024 * 1024
#define HF_VERSION_DYNAMIC_FEE 4 #define HF_VERSION_DYNAMIC_FEE 4
#define PER_KB_FEE_QUANTIZATION_DECIMALS 8
// New constants are intended to go here // New constants are intended to go here
namespace config namespace config

20
src/cryptonote_core/blockchain.cpp
View file

@ -2795,6 +2795,19 @@ void Blockchain::check_ring_signature(const crypto::hash &tx_prefix_hash, const
result = crypto::check_ring_signature(tx_prefix_hash, key_image, p_output_keys, sig.data()) ? 1 : 0; result = crypto::check_ring_signature(tx_prefix_hash, key_image, p_output_keys, sig.data()) ? 1 : 0;
} }
//------------------------------------------------------------------
static uint64_t get_fee_quantization_mask()
{
static uint64_t mask = 0;
if (mask == 0)
{
mask = 1;
for (size_t n = PER_KB_FEE_QUANTIZATION_DECIMALS; n < CRYPTONOTE_DISPLAY_DECIMAL_POINT; ++n)
mask *= 10;
}
return mask;
}
//------------------------------------------------------------------ //------------------------------------------------------------------
uint64_t Blockchain::get_dynamic_per_kb_fee(uint64_t block_reward, size_t median_block_size) uint64_t Blockchain::get_dynamic_per_kb_fee(uint64_t block_reward, size_t median_block_size)
{ {
@ -2810,7 +2823,12 @@ uint64_t Blockchain::get_dynamic_per_kb_fee(uint64_t block_reward, size_t median
div128_32(hi, lo, 1000000, &hi, &lo); div128_32(hi, lo, 1000000, &hi, &lo);
assert(hi == 0); assert(hi == 0);
return lo; // quantize fee up to 8 decimals
uint64_t mask = get_fee_quantization_mask();
uint64_t qlo = (lo + mask - 1) / mask * mask;
MDEBUG("lo " << print_money(lo) << ", qlo " << print_money(qlo) << ", mask " << mask);
return qlo;
} }
//------------------------------------------------------------------ //------------------------------------------------------------------