very, VERY primitive blockchain converter
hard-coded config folder, hard-coded BlockchainDB subclass. Needs finessing, but should be testable this way. update for rebase (warptangent 2015-01-04) fix conflicts with upstream CMakeLists.txt files src/CMakeLists.txt (edit original commit) src/blockchain_converter/CMakeLists.txt (add)
This commit is contained in:
Thomas Winget
warptangent
parent
26a7db38eb
commit
4af0918501
5 changed files with 171 additions and 14 deletions
|
|
@ -97,3 +97,5 @@ add_subdirectory(connectivity_tool)
|
|||
add_subdirectory(miner)
|
||||
add_subdirectory(simplewallet)
|
||||
add_subdirectory(daemon)
|
||||
|
||||
add_subdirectory(blockchain_converter)
|
||||
|
|
|
|||
51
src/blockchain_converter/CMakeLists.txt
Normal file
51
src/blockchain_converter/CMakeLists.txt
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
# Copyright (c) 2014-2015, 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(blockchain_converter_sources
|
||||
blockchain_converter.cpp
|
||||
)
|
||||
|
||||
set(blockchain_converter_private_headers)
|
||||
|
||||
bitmonero_private_headers(blockchain_converter
|
||||
${blockchain_converter_private_headers})
|
||||
|
||||
bitmonero_add_executable(blockchain_converter
|
||||
${blockchain_converter_sources}
|
||||
${blockchain_converter_private_headers})
|
||||
|
||||
target_link_libraries(blockchain_converter
|
||||
LINK_PRIVATE
|
||||
cryptonote_core
|
||||
${CMAKE_THREAD_LIBS_INIT})
|
||||
|
||||
add_dependencies(blockchain_converter
|
||||
version)
|
||||
set_property(TARGET blockchain_converter
|
||||
PROPERTY
|
||||
OUTPUT_NAME "blockchain_converter")
|
||||
99
src/blockchain_converter/blockchain_converter.cpp
Normal file
99
src/blockchain_converter/blockchain_converter.cpp
Normal file
|
|
@ -0,0 +1,99 @@
|
|||
// Copyright (c) 2014, 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.
|
||||
|
||||
#include "include_base_utils.h"
|
||||
#include "common/util.h"
|
||||
#include "warnings.h"
|
||||
#include "crypto/crypto.h"
|
||||
#include "cryptonote_config.h"
|
||||
#include "cryptonote_core/cryptonote_format_utils.h"
|
||||
#include "misc_language.h"
|
||||
#include "cryptonote_core/blockchain_storage.h"
|
||||
#include "cryptonote_core/blockchain_db.h"
|
||||
#include "cryptonote_core/blockchain.h"
|
||||
#include "cryptonote_core/BlockchainDB_impl/db_lmdb.h"
|
||||
#include "cryptonote_core/tx_pool.h"
|
||||
|
||||
using namespace cryptonote;
|
||||
|
||||
struct fake_core
|
||||
{
|
||||
tx_memory_pool m_pool;
|
||||
Blockchain dummy;
|
||||
|
||||
blockchain_storage m_storage;
|
||||
|
||||
|
||||
fake_core() : m_pool(dummy), dummy(m_pool), m_storage(&m_pool)
|
||||
{
|
||||
m_pool.init("~/.bitmonero");
|
||||
m_storage.init("~/.bitmonero", false);
|
||||
}
|
||||
};
|
||||
|
||||
int main(int argc, char* argv[])
|
||||
{
|
||||
fake_core c;
|
||||
|
||||
BlockchainDB *blockchain;
|
||||
|
||||
blockchain = new BlockchainLMDB();
|
||||
|
||||
blockchain->open("~/.bitmonero");
|
||||
|
||||
for (uint64_t i = 0; i < c.m_storage.get_current_blockchain_height(); ++i)
|
||||
{
|
||||
block b = c.m_storage.get_block(i);
|
||||
size_t bsize = c.m_storage.get_block_size(i);
|
||||
difficulty_type bdiff = c.m_storage.get_block_cumulative_difficulty(i);
|
||||
uint64_t bcoins = c.m_storage.get_block_coins_generated(i);
|
||||
std::vector<transaction> txs;
|
||||
std::vector<crypto::hash> missed;
|
||||
|
||||
c.m_storage.get_transactions(b.tx_hashes, txs, missed);
|
||||
if (missed.size())
|
||||
{
|
||||
std::cerr << "Missed transaction(s) for block at height " << i << ", exiting" << std::endl;
|
||||
delete blockchain;
|
||||
return 1;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
blockchain->add_block(b, bsize, bdiff, bcoins, txs);
|
||||
}
|
||||
catch (const std::exception& e)
|
||||
{
|
||||
std::cerr << "Error adding block to new blockchain: " << e.what() << std::endl;
|
||||
delete blockchain;
|
||||
return 2;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -231,7 +231,7 @@ bool blockchain_storage::pop_block_from_blockchain()
|
|||
m_blocks_index.erase(bl_ind);
|
||||
//pop block from core
|
||||
m_blocks.pop_back();
|
||||
m_tx_pool.on_blockchain_dec(m_blocks.size()-1, get_tail_id());
|
||||
m_tx_pool->on_blockchain_dec(m_blocks.size()-1, get_tail_id());
|
||||
return true;
|
||||
}
|
||||
//------------------------------------------------------------------
|
||||
|
|
@ -307,7 +307,7 @@ bool blockchain_storage::purge_transaction_from_blockchain(const crypto::hash& t
|
|||
if(!is_coinbase(tx))
|
||||
{
|
||||
cryptonote::tx_verification_context tvc = AUTO_VAL_INIT(tvc);
|
||||
bool r = m_tx_pool.add_tx(tx, tvc, true);
|
||||
bool r = m_tx_pool->add_tx(tx, tvc, true);
|
||||
CHECK_AND_ASSERT_MES(r, false, "purge_block_data_from_blockchain: failed to add transaction to transaction pool");
|
||||
}
|
||||
|
||||
|
|
@ -676,16 +676,16 @@ bool blockchain_storage::create_block_template(block& b, const account_public_ad
|
|||
|
||||
size_t txs_size;
|
||||
uint64_t fee;
|
||||
if (!m_tx_pool.fill_block_template(b, median_size, already_generated_coins, txs_size, fee)) {
|
||||
if (!m_tx_pool->fill_block_template(b, median_size, already_generated_coins, txs_size, fee)) {
|
||||
return false;
|
||||
}
|
||||
#if defined(DEBUG_CREATE_BLOCK_TEMPLATE)
|
||||
size_t real_txs_size = 0;
|
||||
uint64_t real_fee = 0;
|
||||
CRITICAL_REGION_BEGIN(m_tx_pool.m_transactions_lock);
|
||||
CRITICAL_REGION_BEGIN(m_tx_pool->m_transactions_lock);
|
||||
BOOST_FOREACH(crypto::hash &cur_hash, b.tx_hashes) {
|
||||
auto cur_res = m_tx_pool.m_transactions.find(cur_hash);
|
||||
if (cur_res == m_tx_pool.m_transactions.end()) {
|
||||
auto cur_res = m_tx_pool->m_transactions.find(cur_hash);
|
||||
if (cur_res == m_tx_pool->m_transactions.end()) {
|
||||
LOG_ERROR("Creating block template: error: transaction not found");
|
||||
continue;
|
||||
}
|
||||
|
|
@ -1658,7 +1658,7 @@ bool blockchain_storage::handle_block_to_main_chain(const block& bl, const crypt
|
|||
transaction tx;
|
||||
size_t blob_size = 0;
|
||||
uint64_t fee = 0;
|
||||
if(!m_tx_pool.take_tx(tx_id, tx, blob_size, fee))
|
||||
if(!m_tx_pool->take_tx(tx_id, tx, blob_size, fee))
|
||||
{
|
||||
LOG_PRINT_L1("Block with id: " << id << "has at least one unknown transaction with id: " << tx_id);
|
||||
purge_block_data_from_blockchain(bl, tx_processed_count);
|
||||
|
|
@ -1670,7 +1670,7 @@ bool blockchain_storage::handle_block_to_main_chain(const block& bl, const crypt
|
|||
{
|
||||
LOG_PRINT_L1("Block with id: " << id << "has at least one transaction (id: " << tx_id << ") with wrong inputs.");
|
||||
cryptonote::tx_verification_context tvc = AUTO_VAL_INIT(tvc);
|
||||
bool add_res = m_tx_pool.add_tx(tx, tvc, true);
|
||||
bool add_res = m_tx_pool->add_tx(tx, tvc, true);
|
||||
CHECK_AND_ASSERT_MES2(add_res, "handle_block_to_main_chain: failed to add transaction back to transaction pool");
|
||||
purge_block_data_from_blockchain(bl, tx_processed_count);
|
||||
add_block_as_invalid(bl, id);
|
||||
|
|
@ -1683,7 +1683,7 @@ bool blockchain_storage::handle_block_to_main_chain(const block& bl, const crypt
|
|||
{
|
||||
LOG_PRINT_L1("Block with id: " << id << " failed to add transaction to blockchain storage");
|
||||
cryptonote::tx_verification_context tvc = AUTO_VAL_INIT(tvc);
|
||||
bool add_res = m_tx_pool.add_tx(tx, tvc, true);
|
||||
bool add_res = m_tx_pool->add_tx(tx, tvc, true);
|
||||
CHECK_AND_ASSERT_MES2(add_res, "handle_block_to_main_chain: failed to add transaction back to transaction pool");
|
||||
purge_block_data_from_blockchain(bl, tx_processed_count);
|
||||
bvc.m_verifivation_failed = true;
|
||||
|
|
@ -1738,7 +1738,7 @@ bool blockchain_storage::handle_block_to_main_chain(const block& bl, const crypt
|
|||
/*if(!m_orphanes_reorganize_in_work)
|
||||
review_orphaned_blocks_with_new_block_id(id, true);*/
|
||||
|
||||
m_tx_pool.on_blockchain_inc(bei.height, id);
|
||||
m_tx_pool->on_blockchain_inc(bei.height, id);
|
||||
//LOG_PRINT_L0("BLOCK: " << ENDL << "" << dump_obj_as_json(bei.bl));
|
||||
return true;
|
||||
}
|
||||
|
|
@ -1761,7 +1761,7 @@ bool blockchain_storage::add_new_block(const block& bl_, block_verification_cont
|
|||
//copy block here to let modify block.target
|
||||
block bl = bl_;
|
||||
crypto::hash id = get_block_hash(bl);
|
||||
CRITICAL_REGION_LOCAL(m_tx_pool);//to avoid deadlock lets lock tx_pool for whole add/reorganize process
|
||||
CRITICAL_REGION_LOCAL(*m_tx_pool);//to avoid deadlock lets lock tx_pool for whole add/reorganize process
|
||||
CRITICAL_REGION_LOCAL1(m_blockchain_lock);
|
||||
if(have_block(id))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ namespace cryptonote
|
|||
uint64_t already_generated_coins;
|
||||
};
|
||||
|
||||
blockchain_storage(tx_memory_pool& tx_pool):m_tx_pool(tx_pool), m_current_block_cumul_sz_limit(0), m_is_in_checkpoint_zone(false), m_is_blockchain_storing(false), m_enforce_dns_checkpoints(false)
|
||||
blockchain_storage(tx_memory_pool* tx_pool):m_tx_pool(tx_pool), m_current_block_cumul_sz_limit(0), m_is_in_checkpoint_zone(false), m_is_blockchain_storing(false), m_enforce_dns_checkpoints(false)
|
||||
{};
|
||||
|
||||
bool init() { return init(tools::get_default_data_dir(), true); }
|
||||
|
|
@ -166,7 +166,7 @@ namespace cryptonote
|
|||
if(it == m_transactions.end())
|
||||
{
|
||||
transaction tx;
|
||||
if(!m_tx_pool.get_transaction(tx_id, tx))
|
||||
if(!m_tx_pool->get_transaction(tx_id, tx))
|
||||
missed_txs.push_back(tx_id);
|
||||
else
|
||||
txs.push_back(tx);
|
||||
|
|
@ -184,6 +184,11 @@ namespace cryptonote
|
|||
bool update_checkpoints(const std::string& file_path, bool check_dns);
|
||||
void set_enforce_dns_checkpoints(bool enforce_checkpoints);
|
||||
|
||||
block get_block(uint64_t height) { return m_blocks[height].bl; }
|
||||
size_t get_block_size(uint64_t height) { return m_blocks[height].block_cumulative_size; }
|
||||
difficulty_type get_block_cumulative_difficulty(uint64_t height) { return m_blocks[height].cumulative_difficulty; }
|
||||
uint64_t get_block_coins_generated(uint64_t height) { return m_blocks[height].already_generated_coins; }
|
||||
|
||||
private:
|
||||
typedef std::unordered_map<crypto::hash, size_t> blocks_by_id_index;
|
||||
typedef std::unordered_map<crypto::hash, transaction_chain_entry> transactions_container;
|
||||
|
|
@ -193,7 +198,7 @@ namespace cryptonote
|
|||
typedef std::unordered_map<crypto::hash, block> blocks_by_hash;
|
||||
typedef std::map<uint64_t, std::vector<std::pair<crypto::hash, size_t>>> outputs_container; //crypto::hash - tx hash, size_t - index of out in transaction
|
||||
|
||||
tx_memory_pool& m_tx_pool;
|
||||
tx_memory_pool* m_tx_pool;
|
||||
epee::critical_section m_blockchain_lock; // TODO: add here reader/writer lock
|
||||
|
||||
// main chain
|
||||
|
|
|
|||
Loading…
Reference in a new issue