Add the batch of release v3.4.5 commits

Author: developer-at-bcn

CMakeLists.txt

@@ -142,7 +142,7 @@ else()
     set_property(SOURCE ${SRC_SERIA} PROPERTY COMPILE_FLAGS -O3)
 endif()
 include_directories(src)
-include_directories(${CMAKE_BINARY_DIR})
+#include_directories(${CMAKE_BINARY_DIR})
 set(SOURCE_FILES
     ${SRC_DB}
     ${SRC_NO_WARNINGS}

README.md

@@ -1,6 +1,6 @@
 # Bytecoin
 
-[![Build Status](https://dev.azure.com/bcndev/bytecoin/_apis/build/status/bytecoin-daemons?branchName=releases/3.4.4)](https://dev.azure.com/bcndev/bytecoin/_build/latest?definitionId=1&branchName=releases/3.4.4)
+[![Build Status](https://dev.azure.com/bcndev/bytecoin/_apis/build/status/bytecoin-daemons?branchName=releases/3.4.5)](https://dev.azure.com/bcndev/bytecoin/_build/latest?definitionId=1&branchName=releases/3.4.5)
 
 ## About
 

ReleaseNotes.md

@@ -1,5 +1,19 @@
 ## Release Notes
 
+### v3.4.5 (Amethyst)
+
+- Tiny fixes in mining-related code. All miners are advised to update.
+
+*API tweaks*
+- In `get_transfers` response, when filtering by address, filtering does not remove transfers from transactions, only returns less transactions
+- In `check_sendproof` error response, hash of referenced transaction is returned if proof is successfully parsed
+- In `check_sendproof` errors `ADDRESS_NOT_IN_TRANSACTION (-204)` and `ADDRESS_FAILED_TO_PARSE (-4)` removed, `PROOF_WRONG_SIGNATURE (-203)` will be reported instead.
+- `walletd` methods which do request to `bytecoind` - `create_transaction`, `send_transaction`, `create_sendproof` will now return special error `BYTECOIND_REQUEST_ERROR (-1003)` instead of `INTERNAL_ERROR (-32603)` when json RPC call to `bytecoind` fails.
+
+*API deprecations (will be removed in future)*
+- In `get_transfers` response, `unlocked_transfers` for range of blocks deprecated, unlocked transfers are returned in corresponding blocks.
+- In `create_sendproof` request/response, `addresses/sendproofs` fields are deprecated, use `address/sendproof` instead. If using `address` field and proof canno be created, json RPC error `ADDRESS_NOT_IN_TRANSACTION (-204)` will be returned, instead of empty proof, as it was before.
+
 ### v3.4.4 (Amethyst)
 
 - `walletd` can now sync most of the blockchain from static files (tremendously increasing efficiency for public nodes), reverting to RPC only for the (small) part of blockchain after last hard checkpoint.

azure-pipelines.yml

@@ -54,8 +54,7 @@ jobs:
     displayName: Clone daemons code
 
   - script: |
-      wget -c 'https://sourceforge.net/projects/boost/files/boost/1.69.0/boost_1_69_0.tar.gz'
-      # wget -c 'https://dl.bintray.com/boostorg/release/1.69.0/source/boost_1_69_0.tar.gz'
+      wget -c 'https://dl.bintray.com/boostorg/release/1.69.0/source/boost_1_69_0.tar.gz'
       mkdir boost && tar -xzf ./boost_1_69_0.tar.gz --directory boost --strip-components=1
     displayName: Fetch boost
 
@@ -201,8 +200,7 @@ jobs:
     displayName: Clone daemons code
 
   - bash: |
-      curl -L -O https://sourceforge.net/projects/boost/files/boost/1.69.0/boost_1_69_0.zip
-      # curl -L -O https://dl.bintray.com/boostorg/release/1.69.0/source/boost_1_69_0.zip
+      curl -L -O https://dl.bintray.com/boostorg/release/1.69.0/source/boost_1_69_0.zip
       7z x boost_1_69_0.zip
       mv boost_1_69_0 boost
     displayName: Fetch boost

src/Core/BlockChain.cpp

@@ -991,6 +991,11 @@ void BlockChain::test_undo_everything(Height new_tip_height) {
 		undo_block(get_tip_bid(), raw_block, block, m_tip_height);
 		if (get_tip_bid() == m_genesis_bid)
 			break;
+		if (m_tip_height <= new_tip_height) {
+			std::cout << "Partial undo finished" << std::endl;
+			db_commit();
+			return;
+		}
 		pop_chain(block.header.previous_block_hash);
 		tip_changed();
 		while (test_prune_oldest()) {  // prunning main branch

src/Core/BlockChainState.cpp

@@ -126,18 +126,19 @@ void BlockChainState::DeltaState::clear(Height new_block_height) {
 }
 
 // returns reward for coinbase transaction or fee for non-coinbase one
-static Amount validate_semantic(const Currency &currency, uint8_t block_major_version, bool generating,
+static Amount validate_semantic(const Currency &currency, uint8_t block_major_version, bool coinbase,
     const Transaction &tx, bool check_keys, bool key_image_subgroup_check) {
-	if (tx.inputs.empty())
-		throw ConsensusError("Empty inputs");
 	//	TODO - uncomment during next hard fork, finally prohibiting old signatures, outputs without secrets
 	//	We cannot do it at once, because mem pool will have v1 transactions during switch
-
 	// for compatibility, we create v1 coinbase transaction if mining on legacy address
-	const bool is_tx_amethyst = tx.version >= currency.amethyst_transaction_version;
-	if (block_major_version < currency.amethyst_block_version && is_tx_amethyst)
+	const bool is_tx_amethyst = tx.version == currency.amethyst_transaction_version;
+
+	if ((block_major_version < currency.amethyst_block_version && is_tx_amethyst) ||
+	    (tx.version != 1 && !is_tx_amethyst))
 		throw ConsensusError(common::to_string(
 		    "Wrong transaction version", int(tx.version), "in block version", int(block_major_version)));
+	if (block_major_version >= currency.amethyst_block_version && !extra::is_valid(tx.extra))
+		throw ConsensusError("Extra has wrong format");
 	// Subgroup check policy is as following:
 	// 1. output keys and encrypted output secrets are checked here
 	// 2. keyimage is checked here (this is changed in amethyst)
@@ -168,13 +169,15 @@ static Amount validate_semantic(const Currency &currency, uint8_t block_major_ve
 	}
 	Amount summary_input_amount = 0;
 	std::unordered_set<KeyImage> ki;
+	if (tx.inputs.empty())
+		throw ConsensusError("Empty inputs");
 	for (const auto &input : tx.inputs) {
 		Amount amount = 0;
 		if (input.type() == typeid(InputCoinbase)) {
-			if (!generating)
+			if (!coinbase)
 				throw ConsensusError("Coinbase input in non-coinbase transaction");
 		} else if (input.type() == typeid(InputKey)) {
-			if (generating)
+			if (coinbase)
 				throw ConsensusError("Key input in coinbase transaction");
 			const InputKey &in = boost::get<InputKey>(input);
 			amount             = in.amount;
@@ -190,10 +193,10 @@ static Amount validate_semantic(const Currency &currency, uint8_t block_major_ve
 		if (!add_amount(summary_input_amount, amount))
 			throw ConsensusError("Outputs amounts overflow");
 	}
-	if (summary_output_amount > summary_input_amount && !generating)
+	if (summary_output_amount > summary_input_amount && !coinbase)
 		throw ConsensusError("Sum of outputs > sum of inputs in non-coinbase transaction");
 	//	Types/count of signatures is derived from tx body during transaction serialization
-	if (generating)
+	if (coinbase)
 		return summary_output_amount;
 	return summary_input_amount - summary_output_amount;
 }
@@ -938,7 +941,7 @@ std::vector<PublicKey> BlockChainState::get_mixed_public_keys(const InputKey &in
 	return output_keys;
 }
 
-void BlockChainState::redo_transaction(uint8_t major_block_version, bool generating, const Transaction &transaction,
+void BlockChainState::redo_transaction(uint8_t major_block_version, bool coinbase, const Transaction &transaction,
     DeltaState *delta_state, BlockGlobalIndices *global_indices, Hash *newest_referenced_bid, bool check_sigs) const {
 	const bool check_outputs  = check_sigs;
 	const bool is_tx_amethyst = transaction.version >= m_currency.amethyst_transaction_version;

src/Core/BlockChainState.hpp

@@ -133,7 +133,7 @@ class BlockChainState : public BlockChain, private IBlockChainState {
 	bool read_hidden_amount_output(size_t hidden_index, OutputIndexData *) const;
 	void spend_output(OutputIndexData &&, size_t hidden_index, size_t trigger_input_index, size_t level, bool spent);
 
-	void redo_transaction(uint8_t major_block_version, bool generating, const Transaction &, DeltaState *,
+	void redo_transaction(uint8_t major_block_version, bool coinbase, const Transaction &, DeltaState *,
 	    BlockGlobalIndices *, Hash *newest_referenced_bid,
 	    bool check_sigs) const;  // throws ConsensusError
 	void redo_block(

src/Core/CryptoNoteTools.cpp

@@ -12,15 +12,15 @@ using namespace cn;
 
 Hash cn::get_root_block_base_transaction_hash(const RootBaseTransaction &tx) {
 	if (tx.version < 2)
-		return get_object_hash(tx);
+		return get_object_hash(tx, nullptr);
 	// XMR(XMO) as popular MM root, see details in monero/src/cryptonote_basic/cryptonote_format_utils.cpp
 	// bc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a = hash(1 zero byte (RCTTypeNull))
 	crypto::KeccakStream hasher;
 	static const unsigned char append_data[64] = {0xbc, 0x36, 0x78, 0x9e, 0x7a, 0x1e, 0x28, 0x14, 0x36, 0x46, 0x42,
 	    0x29, 0x82, 0x8f, 0x81, 0x7d, 0x66, 0x12, 0xf7, 0xb4, 0x77, 0xd6, 0x65, 0x91, 0xff, 0x96, 0xa9, 0xe0, 0x64,
 	    0xbc, 0xc9, 0x8a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-	const Hash ha                              = get_object_hash(static_cast<const TransactionPrefix &>(tx));
+	const Hash ha = get_object_hash(static_cast<const TransactionPrefix &>(tx), nullptr, true);
 	hasher.append(ha);
 	hasher.append(append_data, sizeof(append_data));
 	return hasher.cn_fast_hash();

src/Core/CryptoNoteTools.hpp

@@ -10,9 +10,9 @@
 
 namespace cn {
 
-template<class T>
-Hash get_object_hash(const T &object, size_t *size = nullptr) {
-	BinaryArray ba = seria::to_binary(object);
+template<class T, typename... Context>
+Hash get_object_hash(const T &object, size_t *size, Context... context) {
+	BinaryArray ba = seria::to_binary(object, context...);
 	if (size)
 		*size = ba.size();
 	return crypto::cn_fast_hash(ba.data(), ba.size());

src/Core/Currency.cpp

@@ -11,6 +11,7 @@
 #include "Difficulty.hpp"
 #include "TransactionBuilder.hpp"
 #include "TransactionExtra.hpp"
+#include "Wallet.hpp"
 #include "common/Base58.hpp"
 #include "common/StringTools.hpp"
 #include "common/Varint.hpp"
@@ -57,7 +58,6 @@ Currency::Currency(const std::string &net)
     , mined_money_unlock_window(MINED_MONEY_UNLOCK_WINDOW)
     , block_future_time_limit(BLOCK_FUTURE_TIME_LIMIT)
     , money_supply(MONEY_SUPPLY)
-    , emission_speed_factor(EMISSION_SPEED_FACTOR)
     , median_block_size_window(MEIDAN_BLOCK_SIZE_WINDOW)
     , block_capacity_vote_window(BLOCK_CAPACITY_VOTE_WINDOW)
     , max_header_size(MAX_HEADER_SIZE)
@@ -73,8 +73,8 @@ Currency::Currency(const std::string &net)
     , key_image_subgroup_checking_height(KEY_IMAGE_SUBGROUP_CHECKING_HEIGHT)
     , amethyst_block_version(BLOCK_VERSION_AMETHYST)
     , amethyst_transaction_version(TRANSACTION_VERSION_AMETHYST)
-    , upgrade_vote_minor(7)
-    , upgrade_indicator_minor(7)  // We may now not need separate upgrade_indicator_minor
+    , upgrade_vote_minor(8)
+    , upgrade_indicator_minor(8)  // We may now not need separate upgrade_indicator_minor
     , upgrade_desired_major(4)
     , upgrade_voting_window(UPGRADE_VOTING_WINDOW)
     , upgrade_window(UPGRADE_WINDOW)
@@ -103,7 +103,7 @@ Currency::Currency(const std::string &net)
 		//		coinbase_transaction.version                   = 1;
 		//		coinbase_transaction.unlock_block_or_timestamp = mined_money_unlock_window;
 		//		coinbase_transaction.inputs.push_back(CoinbaseInput{0});
-		//		coinbase_transaction.outputs.push_back(TransactionOutput{money_supply >> emission_speed_factor,
+		//		coinbase_transaction.outputs.push_back(TransactionOutput{money_supply >> EMISSION_SPEED_FACTOR,
 		// KeyOutput{genesis_output_key}});
 		//		extra_add_transaction_public_key(coinbase_transaction.extra, genesis_tx_public_key);
 		//		invariant(miner_tx_blob == seria::to_binary(coinbase_transaction), "Demystified transaction does not
@@ -256,9 +256,8 @@ size_t Currency::minimum_anonymity(uint8_t block_major_version) const {
 Amount Currency::get_base_block_reward(
     uint8_t block_major_version, Height height, Amount already_generated_coins) const {
 	invariant(already_generated_coins <= money_supply, "");
-	invariant(emission_speed_factor > 0 && emission_speed_factor <= 8 * sizeof(Amount), "");
 
-	return (money_supply - already_generated_coins) >> emission_speed_factor;
+	return (money_supply - already_generated_coins) >> EMISSION_SPEED_FACTOR;
 }
 
 Amount Currency::get_block_reward(uint8_t block_major_version, Height height, size_t effective_median_size,
@@ -292,9 +291,8 @@ Transaction Currency::construct_miner_tx(const Hash &miner_secret, uint8_t block
 	tx.inputs.push_back(InputCoinbase{height});
 
 	Hash tx_inputs_hash = get_transaction_inputs_hash(tx);
-	KeyPair txkey       = miner_secret == Hash{}
-	                    ? crypto::random_keypair()
-	                    : TransactionBuilder::transaction_keys_from_seed(tx_inputs_hash, miner_secret);
+	KeyPair txkey       = miner_secret == Hash{} ? crypto::random_keypair()
+	                                       : Wallet::transaction_keys_from_seed(tx_inputs_hash, miner_secret);
 
 	if (!is_tx_amethyst)
 		extra::add_transaction_public_key(tx.extra, txkey.public_key);
@@ -309,9 +307,9 @@ Transaction Currency::construct_miner_tx(const Hash &miner_secret, uint8_t block
 
 	Amount summary_amounts = 0;
 	for (size_t out_index = 0; out_index < out_amounts.size(); out_index++) {
-		const Hash output_seed =
-		    miner_secret == Hash{} ? crypto::rand<Hash>()
-		                           : TransactionBuilder::generate_output_seed(tx_inputs_hash, miner_secret, out_index);
+		const Hash output_seed = miner_secret == Hash{}
+		                             ? crypto::rand<Hash>()
+		                             : Wallet::generate_output_seed(tx_inputs_hash, miner_secret, out_index);
 		PublicKey output_shared_secret;
 		OutputKey tk = TransactionBuilder::create_output(is_tx_amethyst, miner_address, txkey.secret_key,
 		    tx_inputs_hash, out_index, output_seed, &output_shared_secret);

src/Core/Currency.hpp

@@ -31,7 +31,6 @@ class Currency {  // Consensus calculations depend on those parameters
 	Timestamp block_future_time_limit;
 
 	Amount money_supply;
-	unsigned int emission_speed_factor;
 
 	Height median_block_size_window;
 	Height block_capacity_vote_window;