mirror of
https://github.com/monero-project/monero.git
synced 2024-12-23 12:09:54 +00:00
ebc60a098d
This curbs runaway growth while still allowing substantial spikes in block weight Original specification from ArticMine: here is the scaling proposal Define: LongTermBlockWeight Before fork: LongTermBlockWeight = BlockWeight At or after fork: LongTermBlockWeight = min(BlockWeight, 1.4*LongTermEffectiveMedianBlockWeight) Note: To avoid possible consensus issues over rounding the LongTermBlockWeight for a given block should be calculated to the nearest byte, and stored as a integer in the block itself. The stored LongTermBlockWeight is then used for future calculations of the LongTermEffectiveMedianBlockWeight and not recalculated each time. Define: LongTermEffectiveMedianBlockWeight LongTermEffectiveMedianBlockWeight = max(300000, MedianOverPrevious100000Blocks(LongTermBlockWeight)) Change Definition of EffectiveMedianBlockWeight From (current definition) EffectiveMedianBlockWeight = max(300000, MedianOverPrevious100Blocks(BlockWeight)) To (proposed definition) EffectiveMedianBlockWeight = min(max(300000, MedianOverPrevious100Blocks(BlockWeight)), 50*LongTermEffectiveMedianBlockWeight) Notes: 1) There are no other changes to the existing penalty formula, median calculation, fees etc. 2) There is the requirement to store the LongTermBlockWeight of a block unencrypted in the block itself. This is to avoid possible consensus issues over rounding and also to prevent the calculations from becoming unwieldy as we move away from the fork. 3) When the EffectiveMedianBlockWeight cap is reached it is still possible to mine blocks up to 2x the EffectiveMedianBlockWeight by paying the corresponding penalty.
126 lines
3.4 KiB
CMake
126 lines
3.4 KiB
CMake
# Copyright (c) 2014-2018, The Monero Project
|
|
#
|
|
# All rights reserved.
|
|
#
|
|
# Redistribution and use in source and binary forms, with or without modification, are
|
|
# permitted provided that the following conditions are met:
|
|
#
|
|
# 1. Redistributions of source code must retain the above copyright notice, this list of
|
|
# conditions and the following disclaimer.
|
|
#
|
|
# 2. Redistributions in binary form must reproduce the above copyright notice, this list
|
|
# of conditions and the following disclaimer in the documentation and/or other
|
|
# materials provided with the distribution.
|
|
#
|
|
# 3. Neither the name of the copyright holder nor the names of its contributors may be
|
|
# used to endorse or promote products derived from this software without specific
|
|
# prior written permission.
|
|
#
|
|
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
|
|
# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
|
|
# THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
|
# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
|
|
# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
set(unit_tests_sources
|
|
account.cpp
|
|
apply_permutation.cpp
|
|
address_from_url.cpp
|
|
ban.cpp
|
|
base58.cpp
|
|
blockchain_db.cpp
|
|
block_queue.cpp
|
|
block_reward.cpp
|
|
bulletproofs.cpp
|
|
canonical_amounts.cpp
|
|
chacha.cpp
|
|
checkpoints.cpp
|
|
command_line.cpp
|
|
crypto.cpp
|
|
decompose_amount_into_digits.cpp
|
|
device.cpp
|
|
dns_resolver.cpp
|
|
epee_boosted_tcp_server.cpp
|
|
epee_levin_protocol_handler_async.cpp
|
|
epee_utils.cpp
|
|
expect.cpp
|
|
fee.cpp
|
|
json_serialization.cpp
|
|
get_xtype_from_string.cpp
|
|
hashchain.cpp
|
|
http.cpp
|
|
keccak.cpp
|
|
long_term_block_weight.cpp
|
|
main.cpp
|
|
memwipe.cpp
|
|
mlocker.cpp
|
|
mnemonics.cpp
|
|
mul_div.cpp
|
|
multiexp.cpp
|
|
multisig.cpp
|
|
parse_amount.cpp
|
|
random.cpp
|
|
serialization.cpp
|
|
sha256.cpp
|
|
slow_memmem.cpp
|
|
subaddress.cpp
|
|
test_tx_utils.cpp
|
|
test_peerlist.cpp
|
|
test_protocol_pack.cpp
|
|
threadpool.cpp
|
|
hardfork.cpp
|
|
unbound.cpp
|
|
uri.cpp
|
|
varint.cpp
|
|
ringct.cpp
|
|
output_selection.cpp
|
|
vercmp.cpp
|
|
ringdb.cpp
|
|
wipeable_string.cpp
|
|
is_hdd.cpp
|
|
aligned.cpp)
|
|
|
|
set(unit_tests_headers
|
|
unit_tests_utils.h)
|
|
|
|
add_executable(unit_tests
|
|
${unit_tests_sources}
|
|
${unit_tests_headers})
|
|
target_link_libraries(unit_tests
|
|
PRIVATE
|
|
ringct
|
|
cryptonote_protocol
|
|
cryptonote_core
|
|
blockchain_db
|
|
rpc
|
|
serialization
|
|
wallet
|
|
p2p
|
|
version
|
|
${Boost_CHRONO_LIBRARY}
|
|
${Boost_THREAD_LIBRARY}
|
|
${GTEST_LIBRARIES}
|
|
${CMAKE_THREAD_LIBS_INIT}
|
|
${EXTRA_LIBRARIES})
|
|
set_property(TARGET unit_tests
|
|
PROPERTY
|
|
FOLDER "tests")
|
|
|
|
if (NOT MSVC)
|
|
set_property(TARGET unit_tests
|
|
APPEND_STRING
|
|
PROPERTY
|
|
COMPILE_FLAGS " -Wno-undef -Wno-sign-compare")
|
|
endif ()
|
|
|
|
SET_PROPERTY(SOURCE main.cpp PROPERTY COMPILE_FLAGS -DDEFAULT_DATA_DIR="\\"${CMAKE_SOURCE_DIR}/tests/data\\"")
|
|
|
|
SET_PROPERTY(SOURCE memwipe.cpp PROPERTY COMPILE_FLAGS -Ofast)
|
|
|
|
add_test(
|
|
NAME unit_tests
|
|
COMMAND unit_tests --data-dir "${TEST_DATA_DIR}")
|