Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

blockchain_import: Get hard fork version from HardFork 

Replace temporary assignment that used hardcoded values.
This commit is contained in:
warptangent 2016-02-08 08:12:11 -08:00
parent e02577f594
commit b368e29f67
No known key found for this signature in database
GPG Key ID: 0E490BEBFBE4E92D
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/blockchain_utilities/blockchain_import.cpp
View File

@ -400,11 +400,8 @@ int import_from_file(FakeCore& simple_core, const std::string& import_file_path,
// size_t blob_size = 0; // size_t blob_size = 0;
// get_transaction_hash(tx, hsh, blob_size); // get_transaction_hash(tx, hsh, blob_size);
// we'd need to get the starting heights from the daemon
// to be correct once voting kicks in
uint64_t v2height = opt_testnet ? 624634 : 1009827;
uint8_t version = h < v2height ? 1 : 2; uint8_t version = simple_core.m_storage.get_current_hard_fork_version();
tx_verification_context tvc = AUTO_VAL_INIT(tvc); tx_verification_context tvc = AUTO_VAL_INIT(tvc);
bool r = true; bool r = true;
r = simple_core.m_pool.add_tx(tx, tvc, true, true, version); r = simple_core.m_pool.add_tx(tx, tvc, true, true, version);