Skip to content

Commit

Permalink
Add the batch of release v3.3.1 commits
Browse files Browse the repository at this point in the history
  • Loading branch information
@developer-at-bcn
developer-at-bcn committed Oct 4, 2018
1 parent 083dcc0 commit 32344c1
Show file tree
Hide file tree
Showing 45 changed files with 759 additions and 10,950 deletions.
83 changes: 0 additions & 83 deletions .clang-format
View file

This file was deleted.

11 changes: 10 additions & 1 deletion ReleaseNotes.md
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
## Release Notes

### v3.3.1

- The `create_transaction` method can now create transactions with fee < 0.01 BCN iff both `fee_per_byte` and transaction size are small enough.
- In the `create_transaction` method, if `any_spend_address` is set to true, leaving `change_address` empty now sets it to first wallet address.
- Added amounts to the message of the `TRANSACTION_TOO_BIG` error so that you see how much you can actually send (with desired or zero anonymity).
- Added a new new flag `subtract_fee_from_amount` to the `create_transaction` method to indicate subtracting fee from receivers.
- Tweaked the distribution of mix-in outputs returned by the `get_random_outputs` method to make it .
- Fixed error in the `getblocktemplate` and `get_block_template` methods which returned wrong reserved_offset.

### v3.3.0

*Consensus update (hard fork)*

- Voting starts immediately, once 90% of mined blocks contain votes for update, the update height will be automatically selected so that consensus update will happen approximately 2 weeks after that.
- Market fees - any transaction fee including 0 is now legal for all transactions. Miners will increase block size only if it is profitable for them in a short run.
- Market fees - any transaction fee including `0` is now legal for all transactions. Miners will increase block size only if it is profitable for them in a short run.

*General improvements*

Expand Down
56 changes: 30 additions & 26 deletions src/Core/BlockChain.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ PreparedBlock::PreparedBlock(BinaryArray &&ba, const Currency &currency, crypto:
}
auto body_proxy = get_body_proxy_from_template(block.header);
bid = bytecoin::get_block_hash(block.header, body_proxy);
if (block.header.major_version >= 2)
if (block.header.is_merge_mined())
parent_block_size = seria::binary_size(block.header.parent_block);
coinbase_tx_size = seria::binary_size(block.header.base_transaction);
base_transaction_hash = get_transaction_hash(block.header.base_transaction);
Expand All @@ -109,7 +109,7 @@ PreparedBlock::PreparedBlock(RawBlock &&rba, const Currency &currency, crypto::C
}
auto body_proxy = get_body_proxy_from_template(block.header);
bid = bytecoin::get_block_hash(block.header, body_proxy);
if (block.header.major_version >= 2)
if (block.header.is_merge_mined())
parent_block_size = seria::binary_size(block.header.parent_block);
coinbase_tx_size = seria::binary_size(block.header.base_transaction);
base_transaction_hash = get_transaction_hash(block.header.base_transaction);
Expand Down Expand Up @@ -1083,7 +1083,7 @@ void BlockChain::test_undo_everything(Height new_tip_height) {
continue;
if (cur.get_suffix().find(HEADER_PREFIX) == 0)
continue;
if (cur.get_suffix().find("f") == 0)
if (cur.get_suffix().find("f") == 0) // TODO - we have no index starting with "f"
continue;
std::cout << DB::clean_key(cur.get_suffix()) << std::endl;
if (counter++ > 1000)
Expand Down Expand Up @@ -1182,24 +1182,25 @@ bool BlockChain::add_blod_impl(const api::BlockHeader &header) {
bit = blods.find(header.previous_block_hash);
if (bit == blods.end())
return false;
Blod &blod = blods[header.hash];
blod.height = header.height;
blod.hash = header.hash;
blod.parent = &bit->second;
Blod &blod = blods[header.hash];
blod.height = header.height;
blod.hash = header.hash;
blod.parent = &bit->second;
bit->second.children.push_back(&blod);
blod.checkpoint_difficulty = blod.parent->checkpoint_difficulty;

if (m_currency.upgrade_from_major_version) {
blod.vote_for_upgrade = (header.major_version == m_currency.upgrade_from_major_version && header.minor_version == m_currency.upgrade_indicator_minor_version);
blod.vote_for_upgrade = uint8_t(header.major_version == m_currency.upgrade_from_major_version &&
header.minor_version == m_currency.upgrade_indicator_minor_version);
blod.upgrade_decided_height = blod.parent->upgrade_decided_height;
if (!blod.upgrade_decided_height) {
blod.votes_for_upgrade_in_voting_window = blod.parent->votes_for_upgrade_in_voting_window;
blod.votes_for_upgrade_in_voting_window.push_back(blod.vote_for_upgrade);
if (blod.votes_for_upgrade_in_voting_window.size() > m_currency.upgrade_voting_window)
blod.votes_for_upgrade_in_voting_window.pop_front();
invariant(blod.votes_for_upgrade_in_voting_window.size() <= m_currency.upgrade_voting_window, "");
size_t count = std::count(blod.votes_for_upgrade_in_voting_window.begin(),
blod.votes_for_upgrade_in_voting_window.end(), 1);
auto count = std::count(blod.votes_for_upgrade_in_voting_window.begin(),
blod.votes_for_upgrade_in_voting_window.end(), uint8_t(1));
// if(count != 0)
// std::cout << "Votes for version=" << int(m_currency.upgrade_desired_major_version) << "
// height="
Expand Down Expand Up @@ -1283,48 +1284,51 @@ void BlockChain::build_blods() {
for (auto &&ha : good_headers) { // They are conveniently sorted parent to child and can be applied sequentially
if (!add_blod_impl(ha)) {
invariant(ha.hash == m_currency.last_sw_checkpoint().hash, "");
Blod &blod = blods[ha.hash];
blod.height = ha.height;
blod.hash = ha.hash;
Blod &blod = blods[ha.hash];
blod.height = ha.height;
blod.hash = ha.hash;
if (m_currency.upgrade_from_major_version) {
blod.vote_for_upgrade = (ha.major_version == m_currency.upgrade_from_major_version && ha.minor_version == m_currency.upgrade_indicator_minor_version);
blod.vote_for_upgrade = uint8_t(ha.major_version == m_currency.upgrade_from_major_version &&
ha.minor_version == m_currency.upgrade_indicator_minor_version);
Height first_height =
m_currency.last_sw_checkpoint().height < m_currency.upgrade_voting_window - 1
? 0
: m_currency.last_sw_checkpoint().height - (m_currency.upgrade_voting_window - 1);
for (Height h = first_height; h != m_currency.last_sw_checkpoint().height; ++h) {
auto header = read_header(read_chain(h), h);
uint8_t vote = (header.major_version == m_currency.upgrade_from_major_version && header.minor_version == m_currency.upgrade_indicator_minor_version);
auto vote = uint8_t(header.major_version == m_currency.upgrade_from_major_version &&
header.minor_version == m_currency.upgrade_indicator_minor_version);
blod.votes_for_upgrade_in_voting_window.push_back(vote);
}
blod.votes_for_upgrade_in_voting_window.push_back(blod.vote_for_upgrade);
size_t count = std::count(blod.votes_for_upgrade_in_voting_window.begin(),
blod.votes_for_upgrade_in_voting_window.end(), 1);
invariant(count < m_currency.upgrade_votes_required, "Upgrade happened before or on last SW checkpoint");
auto count = std::count(blod.votes_for_upgrade_in_voting_window.begin(),
blod.votes_for_upgrade_in_voting_window.end(), uint8_t(1));
invariant(
count < m_currency.upgrade_votes_required, "Upgrade happened before or on last SW checkpoint");
}
}
}
update_key_count_max_heights();
}

void BlockChain::fill_statistics(api::bytecoind::GetStatistics::Response &res) const {
res.checkpoints = get_latest_checkpoints();
res.checkpoints = get_latest_checkpoints();

if (!m_currency.upgrade_from_major_version)
return;
auto bit = blods.find(get_tip_bid());
if (bit == blods.end())
return;
res.upgrade_decided_height = bit->second.upgrade_decided_height;
size_t count = std::count(bit->second.votes_for_upgrade_in_voting_window.begin(),
bit->second.votes_for_upgrade_in_voting_window.end(), 1);
auto count = std::count(bit->second.votes_for_upgrade_in_voting_window.begin(),
bit->second.votes_for_upgrade_in_voting_window.end(), uint8_t(1));
res.upgrade_votes_in_top_block = static_cast<Height>(count);
}

bool BlockChain::fill_next_block_versions(
const api::BlockHeader &prev_info, bool cooperative, uint8_t *major, uint8_t *minor) const {
*major = m_currency.get_block_major_version_for_height(prev_info.height + 1);
if( *major == m_currency.upgrade_from_major_version)
if (*major == m_currency.upgrade_from_major_version)
*minor = m_currency.upgrade_indicator_minor_version;
else
*minor = 0;
Expand All @@ -1350,13 +1354,13 @@ void BlockChain::update_key_count_max_heights() {
bit.second.checkpoint_difficulty = CheckpointDifficulty{};
}
auto checkpoints = get_stable_checkpoints();
for (auto cit = checkpoints.begin(); cit != checkpoints.end(); ++cit)
if (cit->is_enabled()) {
auto bit = blods.find(cit->hash);
for (const auto &cit : checkpoints)
if (cit.is_enabled()) {
auto bit = blods.find(cit.hash);
if (bit == blods.end())
continue;
for (Blod *b = &bit->second; b; b = b->parent)
b->checkpoint_key_ids.set(cit->key_id);
b->checkpoint_key_ids.set(cit.key_id);
}
std::vector<Blod *> to_visit;
auto bit = blods.find(m_currency.last_sw_checkpoint().hash);
Expand Down
Loading

0 comments on commit 32344c1

Please sign in to comment.