From 04392d35989d2bccf721370e8ac9eec6945293a0 Mon Sep 17 00:00:00 2001 From: Vikram Rajkumar Date: Tue, 14 Jul 2015 15:21:04 -0400 Subject: [PATCH 001/353] Fix witness production with 1 second block intervals --- libraries/plugins/witness/witness.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/libraries/plugins/witness/witness.cpp b/libraries/plugins/witness/witness.cpp index c48184da..624ad59d 100644 --- a/libraries/plugins/witness/witness.cpp +++ b/libraries/plugins/witness/witness.cpp @@ -174,10 +174,10 @@ void witness_plugin::block_production_loop() _production_enabled = true; // is anyone scheduled to produce now or one second in the future? - uint32_t slot = db.get_slot_at_time( graphene::time::now() + fc::seconds(1) ); + const fc::time_point_sec now = graphene::time::now(); + uint32_t slot = db.get_slot_at_time( now ); graphene::chain::witness_id_type scheduled_witness = db.get_scheduled_witness( slot ).first; fc::time_point_sec scheduled_time = db.get_slot_time( slot ); - fc::time_point_sec now = graphene::time::now(); graphene::chain::public_key_type scheduled_key = scheduled_witness( db ).signing_key; auto is_scheduled = [&]() @@ -194,7 +194,7 @@ void witness_plugin::block_production_loop() uint32_t prate = db.witness_participation_rate(); if( prate < _required_witness_participation ) { - elog("Not producing block because node appers to be on a minority fork with only ${x}% witness participation", + elog("Not producing block because node appears to be on a minority fork with only ${x}% witness participation", ("x",uint32_t(100*uint64_t(prate) / GRAPHENE_1_PERCENT) ) ); return false; } @@ -212,21 +212,19 @@ void witness_plugin::block_production_loop() return false; } - // the local clock must be at least 1 second ahead of - // head_block_time. - if( (now - db.head_block_time()).to_seconds() <= 1 ) { + // the local clock must be at least 1 second ahead of head_block_time. + if( (now - db.head_block_time()).to_seconds() < GRAPHENE_MIN_BLOCK_INTERVAL ) { elog("Not producing block because head block is less than a second old."); return false; } // the local clock must be within 500 milliseconds of // the scheduled production time. - if( llabs((scheduled_time - now).count()) > fc::milliseconds(250).count() ) { + if( llabs((scheduled_time - now).count()) > fc::milliseconds( 500 ).count() ) { elog("Not producing block because network time is not within 250ms of scheduled block time."); return false; } - // we must know the private key corresponding to the witness's // published block production key. if( _private_keys.find( scheduled_key ) == _private_keys.end() ) { From 419ab4f9326d653df7a4d234ffb0b3c68a26ad34 Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Tue, 14 Jul 2015 15:33:52 -0400 Subject: [PATCH 002/353] [GUI] UX tweaks --- programs/light_client/qml/FormBox.qml | 45 +++++++++++++++++---------- programs/light_client/qml/main.qml | 2 -- 2 files changed, 28 insertions(+), 19 deletions(-) diff --git a/programs/light_client/qml/FormBox.qml b/programs/light_client/qml/FormBox.qml index 799069cf..69539789 100644 --- a/programs/light_client/qml/FormBox.qml +++ b/programs/light_client/qml/FormBox.qml @@ -35,25 +35,36 @@ Rectangle { state = "SHOWN" } - MouseArea { - id: mouseTrap + FocusScope { + id: scope anchors.fill: parent - onClicked: { - mouse.accepted = true - greySheet.state = "HIDDEN" + + // Do not let focus leave this scope while form is open + onFocusChanged: if (enabled && !focus) forceActiveFocus() + + Keys.onEscapePressed: greySheet.state = "HIDDEN" + + MouseArea { + id: mouseTrap + anchors.fill: parent + onClicked: { + mouse.accepted = true + greySheet.state = "HIDDEN" + } + acceptedButtons: Qt.AllButtons + } + MouseArea { + // This mouse area blocks clicks inside the form from reaching the mouseTrap + anchors.fill: formContainer + acceptedButtons: Qt.AllButtons + onClicked: mouse.accepted = true + } + Item { + id: formContainer + anchors.centerIn: parent + width: parent.width / 2 + height: parent.height / 2 } - acceptedButtons: Qt.AllButtons - } - MouseArea { - anchors.fill: formContainer - acceptedButtons: Qt.AllButtons - onClicked: mouse.accepted = true - } - Item { - id: formContainer - anchors.centerIn: parent - width: parent.width / 2 - height: parent.height / 2 } states: [ diff --git a/programs/light_client/qml/main.qml b/programs/light_client/qml/main.qml index 9e6e1f96..196db8cb 100644 --- a/programs/light_client/qml/main.qml +++ b/programs/light_client/qml/main.qml @@ -113,8 +113,6 @@ ApplicationWindow { } } } - - } FormBox { From 1813e9f5f6b71cf6a9b5d2b348f688df247e25d0 Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Tue, 14 Jul 2015 16:08:54 -0400 Subject: [PATCH 003/353] [GUI] Fix crash from user-after-free The QML engine was taking ownership of Account objects, and garbage collecting them when it was done with them, thus causing a crash when the C++ accessed them. Fix by explicitly marking Account objects as being owned by the C++ so QML doesn't garbage collect them. --- programs/light_client/ClientDataModel.cpp | 2 ++ programs/light_client/qml/AccountPicker.qml | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/programs/light_client/ClientDataModel.cpp b/programs/light_client/ClientDataModel.cpp index 3c48fee4..f76267d2 100644 --- a/programs/light_client/ClientDataModel.cpp +++ b/programs/light_client/ClientDataModel.cpp @@ -17,6 +17,7 @@ Account* ChainDataModel::getAccount(ObjectId id) if( itr == by_id_idx.end() ) { auto tmp = new Account; + QQmlEngine::setObjectOwnership(tmp, QQmlEngine::CppOwnership); tmp->id = id; --m_account_query_num; tmp->name = QString::number( --m_account_query_num); auto result = m_accounts.insert( tmp ); @@ -67,6 +68,7 @@ Account* ChainDataModel::getAccount(QString name) if( itr == by_name_idx.end() ) { auto tmp = new Account; + QQmlEngine::setObjectOwnership(tmp, QQmlEngine::CppOwnership); tmp->id = --m_account_query_num; tmp->name = name; auto result = m_accounts.insert( tmp ); diff --git a/programs/light_client/qml/AccountPicker.qml b/programs/light_client/qml/AccountPicker.qml index b148f64f..d94549ad 100644 --- a/programs/light_client/qml/AccountPicker.qml +++ b/programs/light_client/qml/AccountPicker.qml @@ -49,6 +49,24 @@ RowLayout { : account.id) }) } + + Behavior on text { + SequentialAnimation { + PropertyAnimation { + target: accountDetails + property: "opacity" + from: 1; to: 0 + duration: 100 + } + PropertyAction { target: accountDetails; property: "text" } + PropertyAnimation { + target: accountDetails + property: "opacity" + from: 0; to: 1 + duration: 100 + } + } + } } } } From d176429dade07ab0db6d199a278625015e2ff4b2 Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Tue, 14 Jul 2015 16:49:17 -0400 Subject: [PATCH 004/353] [GUI] Add connection loss detection and reestablishment --- programs/light_client/ClientDataModel.cpp | 1 + programs/light_client/ClientDataModel.hpp | 2 ++ programs/light_client/qml/main.qml | 19 +++++++++++++++---- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/programs/light_client/ClientDataModel.cpp b/programs/light_client/ClientDataModel.cpp index f76267d2..4764a2c7 100644 --- a/programs/light_client/ClientDataModel.cpp +++ b/programs/light_client/ClientDataModel.cpp @@ -156,6 +156,7 @@ void GrapheneApplication::start( QString apiurl, QString user, QString pass ) m_client = std::make_shared(); ilog( "connecting...${s}", ("s",apiurl.toStdString()) ); auto con = m_client->connect( apiurl.toStdString() ); + m_connectionClosed = con->closed.connect([this]{queueExecute([this]{setIsConnected(false);});}); auto apic = std::make_shared(*con); auto remote_api = apic->get_remote_api< login_api >(1); auto db_api = apic->get_remote_api< database_api >(0); diff --git a/programs/light_client/ClientDataModel.hpp b/programs/light_client/ClientDataModel.hpp index d7533ba4..32344ba7 100644 --- a/programs/light_client/ClientDataModel.hpp +++ b/programs/light_client/ClientDataModel.hpp @@ -129,6 +129,8 @@ class GrapheneApplication : public QObject { ChainDataModel* m_model = nullptr; bool m_isConnected = false; + boost::signals2::scoped_connection m_connectionClosed; + std::shared_ptr m_client; fc::future m_done; diff --git a/programs/light_client/qml/main.qml b/programs/light_client/qml/main.qml index 196db8cb..e9c0a57f 100644 --- a/programs/light_client/qml/main.qml +++ b/programs/light_client/qml/main.qml @@ -14,10 +14,6 @@ ApplicationWindow { height: 480 title: qsTr("Hello World") - Component.onCompleted: { - app.start("ws://localhost:8090", "user", "pass") - } - menuBar: MenuBar { Menu { title: qsTr("File") @@ -32,9 +28,22 @@ ApplicationWindow { } } } + statusBar: StatusBar { + Label { + anchors.right: parent.right + text: app.isConnected? qsTr("Connected") : qsTr("Disconnected") + } + } GrapheneApplication { id: app + } + Timer { + running: !app.isConnected + interval: 5000 + repeat: true + onTriggered: app.start("ws://localhost:8090", "user", "pass") + triggeredOnStart: true } Settings { id: appSettings @@ -47,6 +56,8 @@ ApplicationWindow { Column { anchors.centerIn: parent + enabled: app.isConnected + Button { text: "Transfer" onClicked: formBox.showForm(Qt.createComponent("TransferForm.qml"), {}, From d1c3c7a698e2595ee3d058f133e3eb5cc3b9f94e Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Tue, 14 Jul 2015 17:28:26 -0400 Subject: [PATCH 005/353] Issue #157 - TAPOS Refinements 1. Implement a TaPoS assert operation predicate that offers full block ID validation for transactions that want the added security. This is only required for transactions that are of high value and transfer control of funds to a newly created identifier and where the witnesses cannot be trusted. 2. Remove the full block ID from the transaction digest generation. --- libraries/chain/assert_evaluator.cpp | 5 ++++ libraries/chain/db_block.cpp | 10 ++----- .../graphene/chain/block_summary_object.hpp | 2 +- .../graphene/chain/protocol/assert.hpp | 18 ++++++++++++- .../graphene/chain/protocol/transaction.hpp | 19 ++++++------- libraries/chain/protocol/transaction.cpp | 27 ++----------------- 6 files changed, 37 insertions(+), 44 deletions(-) diff --git a/libraries/chain/assert_evaluator.cpp b/libraries/chain/assert_evaluator.cpp index f7fe1a14..c805280b 100644 --- a/libraries/chain/assert_evaluator.cpp +++ b/libraries/chain/assert_evaluator.cpp @@ -17,6 +17,7 @@ */ #include +#include #include #include @@ -38,6 +39,10 @@ struct predicate_evaluator { FC_ASSERT( p.asset_id(db).symbol == p.symbol ); } + void operator()( const block_id_predicate& p )const + { + FC_ASSERT( block_summary_id_type( block_header::num_from_id( p.id ) )(db).block_id == p.id ); + } }; void_result assert_evaluator::do_evaluate( const assert_operation& o ) diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index 9cccc9ff..5adba8a5 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -547,11 +547,7 @@ processed_transaction database::_apply_transaction(const signed_transaction& trx ref_block_height = uint32_t( x0 ); } - const block_summary_object& tapos_block_summary = - static_cast( - get_index() - .get(block_summary_id_type(ref_block_height)) - ); + const auto& tapos_block_summary = block_summary_id_type( ref_block_height )(*this); //This is the signature check for transactions with relative expiration. if( !(skip & skip_transaction_signatures) ) @@ -561,9 +557,7 @@ processed_transaction database::_apply_transaction(const signed_transaction& trx for( const auto& sig : trx.signatures ) { FC_ASSERT(eval_state._sigs.insert(std::make_pair( - public_key_type( - fc::ecc::public_key(sig, - trx.digest(tapos_block_summary.block_id))), + public_key_type( fc::ecc::public_key(sig, trx.digest())), false)).second, "Multiple signatures by same key detected"); } diff --git a/libraries/chain/include/graphene/chain/block_summary_object.hpp b/libraries/chain/include/graphene/chain/block_summary_object.hpp index ec8dcd0d..ddf44d6f 100644 --- a/libraries/chain/include/graphene/chain/block_summary_object.hpp +++ b/libraries/chain/include/graphene/chain/block_summary_object.hpp @@ -36,7 +36,7 @@ namespace graphene { namespace chain { static const uint8_t space_id = implementation_ids; static const uint8_t type_id = impl_block_summary_object_type; - block_id_type block_id; + block_id_type block_id; fc::time_point_sec timestamp; }; diff --git a/libraries/chain/include/graphene/chain/protocol/assert.hpp b/libraries/chain/include/graphene/chain/protocol/assert.hpp index 2177df87..48a9db77 100644 --- a/libraries/chain/include/graphene/chain/protocol/assert.hpp +++ b/libraries/chain/include/graphene/chain/protocol/assert.hpp @@ -34,13 +34,27 @@ namespace graphene { namespace chain { }; + /** + * Used to verify that a specific block is part of the + * blockchain history. This helps protect some high-value + * transactions to newly created IDs + * + * The block ID must be within the last 2^16 blocks. + */ + struct block_id_predicate + { + block_id_type id; + bool validate()const{ return true; } + }; + /** * When defining predicates do not make the protocol dependent upon * implementation details. */ typedef static_variant< account_name_eq_lit_predicate, - asset_symbol_eq_lit_predicate + asset_symbol_eq_lit_predicate, + block_id_predicate > predicate; @@ -71,5 +85,7 @@ namespace graphene { namespace chain { FC_REFLECT( graphene::chain::assert_operation::fee_parameters_type, (fee) ) FC_REFLECT( graphene::chain::account_name_eq_lit_predicate, (account_id)(name) ) FC_REFLECT( graphene::chain::asset_symbol_eq_lit_predicate, (asset_id)(symbol) ) +FC_REFLECT( graphene::chain::block_id_predicate, (id) ) FC_REFLECT_TYPENAME( graphene::chain::predicate ) FC_REFLECT( graphene::chain::assert_operation, (fee)(fee_paying_account)(predicates)(required_auths)(extensions) ) + diff --git a/libraries/chain/include/graphene/chain/protocol/transaction.hpp b/libraries/chain/include/graphene/chain/protocol/transaction.hpp index 4575742e..776bf162 100644 --- a/libraries/chain/include/graphene/chain/protocol/transaction.hpp +++ b/libraries/chain/include/graphene/chain/protocol/transaction.hpp @@ -89,13 +89,10 @@ namespace graphene { namespace chain { vector operations; extensions_type extensions; - /// Calculate the digest for a transaction with a reference block - /// @param ref_block_id Full block ID of the reference block - digest_type digest(const block_id_type& ref_block_id)const; /// Calculate the digest for a transaction with an absolute expiration time - digest_type digest()const; + digest_type digest()const; transaction_id_type id()const; - void validate() const; + void validate() const; void set_expiration( fc::time_point_sec expiration_time ); void set_expiration( const block_id_type& reference_block, unsigned_int lifetime_intervals = 3 ); @@ -115,10 +112,6 @@ namespace graphene { namespace chain { } void get_required_authorities( flat_set& active, flat_set& owner, vector& other )const; - - protected: - // Intentionally unreflected: does not go on wire - optional block_id_cache; }; /** @@ -135,6 +128,14 @@ namespace graphene { namespace chain { /** returns signature but does not append */ signature_type sign( const private_key_type& key )const; + /** + * The purpose of this method is to identify the minimal subset of @ref available_keys that are + * required to sign + */ + set get_required_signatures( const set& available_keys, + const map& active_authorities, + const map& owner_authorities )const; + /** * Given a set of private keys sign this transaction with a minimial subset of required keys. * diff --git a/libraries/chain/protocol/transaction.cpp b/libraries/chain/protocol/transaction.cpp index 5dc32798..9a02a98a 100644 --- a/libraries/chain/protocol/transaction.cpp +++ b/libraries/chain/protocol/transaction.cpp @@ -23,13 +23,6 @@ namespace graphene { namespace chain { -digest_type transaction::digest(const block_id_type& ref_block_id) const -{ - digest_type::encoder enc; - fc::raw::pack( enc, ref_block_id ); - fc::raw::pack( enc, *this ); - return enc.result(); -} digest_type processed_transaction::merkle_digest()const { @@ -38,8 +31,6 @@ digest_type processed_transaction::merkle_digest()const digest_type transaction::digest()const { - //Only use this digest() for transactions with absolute expiration times. - assert(relative_expiration == 0); digest_type::encoder enc; fc::raw::pack( enc, *this ); return enc.result(); @@ -65,24 +56,11 @@ graphene::chain::transaction_id_type graphene::chain::transaction::id() const const signature_type& graphene::chain::signed_transaction::sign(const private_key_type& key) { - if( relative_expiration != 0 ) - { - // Relative expiration is set, meaning we must include the block ID in the signature - FC_ASSERT(block_id_cache.valid()); - signatures.push_back(key.sign_compact(digest(*block_id_cache))); - } else { - signatures.push_back(key.sign_compact(digest())); - } + signatures.push_back(key.sign_compact(digest())); return signatures.back(); } signature_type graphene::chain::signed_transaction::sign(const private_key_type& key)const { - if( relative_expiration != 0 ) - { - // Relative expiration is set, meaning we must include the block ID in the signature - FC_ASSERT(block_id_cache.valid()); - return key.sign_compact(digest(*block_id_cache)); - } return key.sign_compact(digest()); } @@ -91,7 +69,6 @@ void transaction::set_expiration( fc::time_point_sec expiration_time ) ref_block_num = 0; relative_expiration = 0; ref_block_prefix = expiration_time.sec_since_epoch(); - block_id_cache.reset(); } void transaction::set_expiration( const block_id_type& reference_block, unsigned_int lifetime_intervals ) @@ -99,8 +76,8 @@ void transaction::set_expiration( const block_id_type& reference_block, unsigned ref_block_num = fc::endian_reverse_u32(reference_block._hash[0]); ref_block_prefix = reference_block._hash[1]; relative_expiration = lifetime_intervals; - block_id_cache = reference_block; } + void transaction::get_required_authorities( flat_set& active, flat_set& owner, vector& other )const { for( const auto& op : operations ) From 80319893c23aa8486757cf6a32b617e314043639 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Tue, 14 Jul 2015 17:30:15 -0400 Subject: [PATCH 006/353] updating UI for asset supprot --- programs/cli_wallet/main.cpp | 2 + programs/light_client/ClientDataModel.cpp | 134 +++++++++++++++++++++- programs/light_client/ClientDataModel.hpp | 73 +++++++----- programs/light_client/qml/main.qml | 46 ++++++-- 4 files changed, 213 insertions(+), 42 deletions(-) diff --git a/programs/cli_wallet/main.cpp b/programs/cli_wallet/main.cpp index c98e51bc..f0cf6da2 100644 --- a/programs/cli_wallet/main.cpp +++ b/programs/cli_wallet/main.cpp @@ -134,10 +134,12 @@ int main( int argc, char** argv ) wdata.ws_password = options.at("server-rpc-password").as(); fc::http::websocket_client client; + idump((wdata.ws_server)); auto con = client.connect( wdata.ws_server ); auto apic = std::make_shared(*con); auto remote_api = apic->get_remote_api< login_api >(1); + edump((wdata.ws_user)(wdata.ws_password) ); FC_ASSERT( remote_api->login( wdata.ws_user, wdata.ws_password ) ); auto wapiptr = std::make_shared(remote_api); diff --git a/programs/light_client/ClientDataModel.cpp b/programs/light_client/ClientDataModel.cpp index 6b45b9e4..260161ab 100644 --- a/programs/light_client/ClientDataModel.cpp +++ b/programs/light_client/ClientDataModel.cpp @@ -10,6 +10,130 @@ using namespace graphene::app; ChainDataModel::ChainDataModel( fc::thread& t, QObject* parent ) :QObject(parent),m_thread(&t){} + +Asset* ChainDataModel::getAsset(qint64 id) +{ + auto& by_id_idx = m_assets.get<::by_id>(); + auto itr = by_id_idx.find(id); + if( itr == by_id_idx.end() ) + { + auto tmp = new Asset; + tmp->id = id; --m_account_query_num; + tmp->symbol = QString::number( --m_account_query_num); + auto result = m_assets.insert( tmp ); + assert( result.second ); + + /** execute in app thread */ + m_thread->async( [this,id](){ + try { + ilog( "look up symbol.." ); + auto result = m_db_api->get_assets( {asset_id_type(id)} ); + wdump((result)); + + /** execute in main */ + Q_EMIT queueExecute( [this,result,id](){ + wlog( "process result" ); + auto& by_id_idx = this->m_assets.get<::by_id>(); + auto itr = by_id_idx.find(id); + assert( itr != by_id_idx.end() ); + + if( result.size() == 0 || !result.front() ) + { + elog( "delete later" ); + (*itr)->deleteLater(); + by_id_idx.erase( itr ); + } + else + { + by_id_idx.modify( itr, + [=]( Asset* a ){ + a->setProperty("symbol", QString::fromStdString(result.front()->symbol) ); + a->setProperty("precision", result.front()->precision ); + } + ); + } + }); + } + catch ( const fc::exception& e ) + { + Q_EMIT exceptionThrown( QString::fromStdString(e.to_string()) ); + } + }); + return *result.first; + } + return *itr; +} + +Asset* ChainDataModel::getAsset(QString symbol) +{ + auto& by_symbol_idx = m_assets.get(); + auto itr = by_symbol_idx.find(symbol); + if( itr == by_symbol_idx.end() ) + { + auto tmp = new Asset; + tmp->id = --m_account_query_num; + tmp->symbol = symbol; + auto result = m_assets.insert( tmp ); + assert( result.second ); + + /** execute in app thread */ + m_thread->async( [this,symbol](){ + try { + ilog( "look up symbol.." ); + auto result = m_db_api->lookup_asset_symbols( {symbol.toStdString()} ); + /** execute in main */ + Q_EMIT queueExecute( [this,result,symbol](){ + wlog( "process result" ); + auto& by_symbol_idx = this->m_assets.get(); + auto itr = by_symbol_idx.find(symbol); + assert( itr != by_symbol_idx.end() ); + + if( result.size() == 0 || !result.front() ) + { + elog( "delete later" ); + (*itr)->deleteLater(); + by_symbol_idx.erase( itr ); + } + else + { + by_symbol_idx.modify( itr, + [=]( Asset* a ){ + a->setProperty("id", result.front()->id.instance() ); + a->setProperty("precision", result.front()->precision ); + } + ); + } + }); + } + catch ( const fc::exception& e ) + { + Q_EMIT exceptionThrown( QString::fromStdString(e.to_string()) ); + } + }); + return *result.first; + } + return *itr; +} + + + + + + + + + + + + + + + + + + + + Account* ChainDataModel::getAccount(qint64 id) { auto& by_id_idx = m_accounts.get<::by_id>(); @@ -80,19 +204,19 @@ Account* ChainDataModel::getAccount(QString name) /** execute in main */ Q_EMIT queueExecute( [this,result,name](){ wlog( "process result" ); - auto& by_name_idx = this->m_accounts.get(); - auto itr = by_name_idx.find(name); - assert( itr != by_name_idx.end() ); + auto& by_symbol_idx = this->m_accounts.get(); + auto itr = by_symbol_idx.find(name); + assert( itr != by_symbol_idx.end() ); if( result.size() == 0 || !result.front() ) { elog( "delete later" ); (*itr)->deleteLater(); - by_name_idx.erase( itr ); + by_symbol_idx.erase( itr ); } else { - by_name_idx.modify( itr, + by_symbol_idx.modify( itr, [=]( Account* a ){ a->setProperty("id", result.front()->id.instance() ); } diff --git a/programs/light_client/ClientDataModel.hpp b/programs/light_client/ClientDataModel.hpp index dd258e4c..dd588a0d 100644 --- a/programs/light_client/ClientDataModel.hpp +++ b/programs/light_client/ClientDataModel.hpp @@ -19,67 +19,79 @@ using namespace boost::multi_index; Q_DECLARE_METATYPE(std::function) +class GrapheneObject : public QObject +{ + Q_OBJECT + Q_PROPERTY(qint64 id MEMBER id NOTIFY idChanged) -class Asset : public QObject { + public: + qint64 id; + + Q_SIGNALS: + void idChanged(); +}; + + +class Asset : public GrapheneObject { Q_OBJECT Q_PROPERTY(QString symbol MEMBER symbol) - Q_PROPERTY(qint64 id MEMBER id) - Q_PROPERTY(quint8 precision MEMBER precision) + Q_PROPERTY(quint32 precision MEMBER precision) - QString symbol; - qint64 id; - quint8 precision; + public: + QString symbol; + quint32 precision; + + + Q_SIGNALS: + void symbolChanged(); }; -class Balance : public QObject { +struct by_id; +struct by_symbol_name; +typedef multi_index_container< + Asset*, + indexed_by< + hashed_unique< tag, member >, + ordered_unique< tag, member > + > +> asset_multi_index_type; + +class Balance : public GrapheneObject { Q_OBJECT Q_PROPERTY(Asset* type MEMBER type) Q_PROPERTY(qint64 amount MEMBER amount) - Q_PROPERTY(qint64 id MEMBER id) Asset* type; qint64 amount; - qint64 id; }; -class Account : public QObject { +class Account : public GrapheneObject { Q_OBJECT Q_PROPERTY(QString name MEMBER name NOTIFY nameChanged) - Q_PROPERTY(qint64 id MEMBER id NOTIFY idChanged) Q_PROPERTY(QQmlListProperty balances READ balances) QList m_balances; -public: - // Account(QObject* parent = nullptr) - // : QObject(parent){} + public: + const QString& getName()const { return name; } - const QString& getName()const { return name; } - qint64 getId()const { return id; } + QQmlListProperty balances(); - QQmlListProperty balances(); + QString name; - QString name; - qint64 id; - -signals: - void nameChanged(); - void idChanged(); + Q_SIGNALS: + void nameChanged(); }; -struct by_id; struct by_account_name; -/** - * @ingroup object_index - */ typedef multi_index_container< Account*, indexed_by< - hashed_unique< tag, const_mem_fun >, - ordered_unique< tag, const_mem_fun > + hashed_unique< tag, member >, + ordered_unique< tag, member > > > account_multi_index_type; @@ -92,6 +104,8 @@ class ChainDataModel : public QObject { public: Q_INVOKABLE Account* getAccount(qint64 id); Q_INVOKABLE Account* getAccount(QString name); + Q_INVOKABLE Asset* getAsset(qint64 id); + Q_INVOKABLE Asset* getAsset(QString symbol); ChainDataModel(){} ChainDataModel( fc::thread& t, QObject* parent = nullptr ); @@ -109,6 +123,7 @@ private: qint64 m_account_query_num = -1; account_multi_index_type m_accounts; + asset_multi_index_type m_assets; }; diff --git a/programs/light_client/qml/main.qml b/programs/light_client/qml/main.qml index ef5f0c84..127bb1d1 100644 --- a/programs/light_client/qml/main.qml +++ b/programs/light_client/qml/main.qml @@ -75,24 +75,24 @@ ApplicationWindow { else { console.log("Waiting for result...") - acct.idChanged.connect(function(loadedAcct) { + acct.idChanged.connect(function() { console.log( "ID CHANGED" ); - console.log(JSON.stringify(loadedAcct)) + console.log(JSON.stringify(acct)) }) } } } TextField { - id: idField - onAccepted: lookupIdButton.clicked() + id: accountIdField + onAccepted: lookupAccountIdButton.clicked() focus: true } Button { - id: lookupIdButton - text: "Lookup ID" + id: lookupAccountIdButton + text: "Lookup Account ID" onClicked: { - var acct = app.model.getAccount(parseInt(idField.text)) + var acct = app.model.getAccount(parseInt(accountIdField.text)) console.log(JSON.stringify(acct)) // @disable-check M126 if (acct == null) @@ -105,7 +105,37 @@ ApplicationWindow { else { console.log("Waiting for result...") - acct.nameChanged.connect(function(loadedAcct) { + acct.nameChanged.connect(function() { + console.log( "NAME CHANGED" ); + console.log(JSON.stringify(acct)) + }) + } + } + } + + TextField { + id: assetIdField + onAccepted: lookupassetIdButton.clicked() + focus: true + } + Button { + id: lookupassetIdButton + text: "Lookup Asset ID" + onClicked: { + var acct = app.model.getAsset(parseInt(assetIdField.text)) + console.log(JSON.stringify(acct)) + // @disable-check M126 + if (acct == null) + console.log("Got back null asset") + else if ( !(parseInt(acct.name) <= 0) ) + { + console.log("NAME ALREADY SET" ); + console.log(JSON.stringify(acct)) + } + else + { + console.log("Waiting for result...") + acct.nameChanged.connect(function() { console.log( "NAME CHANGED" ); console.log(JSON.stringify(acct)) }) From da254cdbff8b63da305a446b01005707698ed343 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Tue, 14 Jul 2015 17:56:42 -0400 Subject: [PATCH 007/353] Fix #158 - block summary database now only has 2^16 entries --- libraries/chain/assert_evaluator.cpp | 2 +- libraries/chain/db_block.cpp | 8 +++++--- libraries/chain/db_init.cpp | 3 +++ libraries/db/include/graphene/db/flat_index.hpp | 6 ++++++ 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/libraries/chain/assert_evaluator.cpp b/libraries/chain/assert_evaluator.cpp index c805280b..e8cf935e 100644 --- a/libraries/chain/assert_evaluator.cpp +++ b/libraries/chain/assert_evaluator.cpp @@ -41,7 +41,7 @@ struct predicate_evaluator } void operator()( const block_id_predicate& p )const { - FC_ASSERT( block_summary_id_type( block_header::num_from_id( p.id ) )(db).block_id == p.id ); + FC_ASSERT( block_summary_id_type( block_header::num_from_id( p.id ) & 0xffff )(db).block_id == p.id ); } }; diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index 5adba8a5..afa98823 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -524,6 +524,7 @@ processed_transaction database::_apply_transaction(const signed_transaction& trx // integer that satisfies (a) and (b); for x1, the next // largest integer that satisfies (a), does not satisfy (b). // + /** int64_t N = head_block_num(); int64_t a = N & 0xFFFF; int64_t r = trx.ref_block_num; @@ -546,8 +547,9 @@ processed_transaction database::_apply_transaction(const signed_transaction& trx { ref_block_height = uint32_t( x0 ); } + */ - const auto& tapos_block_summary = block_summary_id_type( ref_block_height )(*this); + const auto& tapos_block_summary = block_summary_id_type( trx.ref_block_num )(*this); //This is the signature check for transactions with relative expiration. if( !(skip & skip_transaction_signatures) ) @@ -652,11 +654,11 @@ const witness_object& database::validate_block_header( uint32_t skip, const sign void database::create_block_summary(const signed_block& next_block) { - const auto& sum = create( [&](block_summary_object& p) { + block_summary_id_type sid(next_block.block_num() & 0xffff ); + modify( sid(*this), [&](block_summary_object& p) { p.block_id = next_block.id(); p.timestamp = next_block.timestamp; }); - FC_ASSERT( sum.id.instance() == next_block.block_num(), "", ("summary.id",sum.id)("next.block_num",next_block.block_num()) ); } void database::add_checkpoints( const flat_map& checkpts ) diff --git a/libraries/chain/db_init.cpp b/libraries/chain/db_init.cpp index ffd928a3..287a810e 100644 --- a/libraries/chain/db_init.cpp +++ b/libraries/chain/db_init.cpp @@ -214,6 +214,9 @@ void database::init_genesis(const genesis_state_type& genesis_state) transaction_evaluation_state genesis_eval_state(this); + flat_index& bsi = get_mutable_index_type< flat_index >(); + bsi.resize(0xffff+1); + // Create blockchain accounts fc::ecc::private_key null_private_key = fc::ecc::private_key::regenerate(fc::sha256::hash(string("null_key"))); create([](account_balance_object& b) { diff --git a/libraries/db/include/graphene/db/flat_index.hpp b/libraries/db/include/graphene/db/flat_index.hpp index 2df5a23c..06eb3826 100644 --- a/libraries/db/include/graphene/db/flat_index.hpp +++ b/libraries/db/include/graphene/db/flat_index.hpp @@ -105,6 +105,12 @@ namespace graphene { namespace db { size_t size()const{ return _objects.size(); } + void resize( uint32_t s ) { + _objects.resize(s); + for( uint32_t i = 0; i < s; ++i ) + _objects[i].id = object_id_type(object_type::space_id,object_type::type_id,i); + } + private: vector< T > _objects; }; From cfd9dd0f75270f01c4d28b717e9117b732b63801 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Tue, 14 Jul 2015 17:43:29 -0400 Subject: [PATCH 008/353] app_test: Rewrite broken two_node_network test --- tests/app/main.cpp | 87 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 66 insertions(+), 21 deletions(-) diff --git a/tests/app/main.cpp b/tests/app/main.cpp index ffade287..bad909fc 100644 --- a/tests/app/main.cpp +++ b/tests/app/main.cpp @@ -18,6 +18,8 @@ #include #include +#include + #include #include @@ -38,12 +40,13 @@ BOOST_AUTO_TEST_CASE( two_node_network ) using namespace graphene::chain; using namespace graphene::app; try { + BOOST_TEST_MESSAGE( "Creating temporary files" ); + fc::temp_directory app_dir( graphene::utilities::temp_directory_path() ); fc::temp_directory app2_dir( graphene::utilities::temp_directory_path() ); fc::temp_file genesis_json; - // TODO: Time should be read from the blockchain - fc::time_point_sec now( 1431700000 ); + BOOST_TEST_MESSAGE( "Creating and initializing app1" ); graphene::app::application app1; app1.register_plugin(); @@ -51,6 +54,8 @@ BOOST_AUTO_TEST_CASE( two_node_network ) cfg.emplace("p2p-endpoint", boost::program_options::variable_value(string("127.0.0.1:3939"), false)); app1.initialize(app_dir.path(), cfg); + BOOST_TEST_MESSAGE( "Creating and initializing app2" ); + graphene::app::application app2; app2.register_plugin(); auto cfg2 = cfg; @@ -59,42 +64,82 @@ BOOST_AUTO_TEST_CASE( two_node_network ) cfg2.emplace("seed-node", boost::program_options::variable_value(vector{"127.0.0.1:3939"}, false)); app2.initialize(app2_dir.path(), cfg2); - app1.startup(); + BOOST_TEST_MESSAGE( "Starting app1 and waiting 500 ms" ); + app1.startup(); + fc::usleep(fc::milliseconds(500)); + BOOST_TEST_MESSAGE( "Starting app2 and waiting 500 ms" ); app2.startup(); fc::usleep(fc::milliseconds(500)); BOOST_REQUIRE_EQUAL(app1.p2p_node()->get_connection_count(), 1); BOOST_CHECK_EQUAL(std::string(app1.p2p_node()->get_connected_peers().front().host.get_address()), "127.0.0.1"); - ilog("Connected!"); + BOOST_TEST_MESSAGE( "app1 and app2 successfully connected" ); - fc::ecc::private_key nathan_key = fc::ecc::private_key::generate(); - fc::ecc::private_key committee_key = fc::ecc::private_key::regenerate(fc::sha256::hash(string("nathan"))); - graphene::chain::signed_transaction trx; - trx.set_expiration(now + fc::seconds(30)); + std::shared_ptr db1 = app1.chain_database(); std::shared_ptr db2 = app2.chain_database(); - assert_operation op; - op.fee_paying_account = GRAPHENE_TEMP_ACCOUNT; - op.predicates.push_back( graphene::chain::asset_symbol_eq_lit_predicate{ asset_id_type(), "CORE" } ); + BOOST_CHECK_EQUAL( db1->get_balance( GRAPHENE_NULL_ACCOUNT, asset_id_type() ).amount.value, 0 ); + BOOST_CHECK_EQUAL( db2->get_balance( GRAPHENE_NULL_ACCOUNT, asset_id_type() ).amount.value, 0 ); - trx.operations.push_back( std::move( op ) ); + BOOST_TEST_MESSAGE( "Creating transfer tx" ); + graphene::chain::signed_transaction trx; + { + account_id_type nathan_id = db2->get_index_type().indices().get().find( "nathan" )->id; + fc::ecc::private_key nathan_key = fc::ecc::private_key::regenerate(fc::sha256::hash(string("nathan"))); - trx.validate(); - processed_transaction ptrx = app1.chain_database()->push_transaction(trx); + balance_claim_operation claim_op; + balance_id_type bid = balance_id_type(); + claim_op.deposit_to_account = nathan_id; + claim_op.balance_to_claim = bid; + claim_op.balance_owner_key = nathan_key.get_public_key(); + claim_op.total_claimed = bid(*db1).balance; + trx.operations.push_back( claim_op ); + db1->current_fee_schedule().set_fee( trx.operations.back() ); + + transfer_operation xfer_op; + xfer_op.from = nathan_id; + xfer_op.to = GRAPHENE_NULL_ACCOUNT; + xfer_op.amount = asset( 1000000 ); + trx.operations.push_back( xfer_op ); + db1->current_fee_schedule().set_fee( trx.operations.back() ); + + trx.set_expiration( db1->get_slot_time( 10 ) ); + trx.sign( nathan_key ); + trx.validate(); + } + + BOOST_TEST_MESSAGE( "Pushing tx locally on db1" ); + processed_transaction ptrx = db1->push_transaction(trx); + + BOOST_CHECK_EQUAL( db1->get_balance( GRAPHENE_NULL_ACCOUNT, asset_id_type() ).amount.value, 1000000 ); + BOOST_CHECK_EQUAL( db2->get_balance( GRAPHENE_NULL_ACCOUNT, asset_id_type() ).amount.value, 0 ); + + BOOST_TEST_MESSAGE( "Broadcasting tx" ); app1.p2p_node()->broadcast(graphene::net::trx_message(trx)); - fc::usleep(fc::milliseconds(250)); - ilog("Pushed transaction"); + fc::usleep(fc::milliseconds(500)); - now += GRAPHENE_DEFAULT_BLOCK_INTERVAL; - app2.p2p_node()->broadcast(graphene::net::block_message(db2->generate_block(now, - db2->get_scheduled_witness(1).first, - committee_key, - database::skip_nothing))); + BOOST_CHECK_EQUAL( db1->get_balance( GRAPHENE_NULL_ACCOUNT, asset_id_type() ).amount.value, 1000000 ); + BOOST_CHECK_EQUAL( db2->get_balance( GRAPHENE_NULL_ACCOUNT, asset_id_type() ).amount.value, 1000000 ); + + BOOST_TEST_MESSAGE( "Generating block on db2" ); + fc::ecc::private_key committee_key = fc::ecc::private_key::regenerate(fc::sha256::hash(string("nathan"))); + + auto block_1 = db2->generate_block( + db2->get_slot_time(1), + db2->get_scheduled_witness(1).first, + committee_key, + database::skip_nothing); + + BOOST_TEST_MESSAGE( "Broadcasting block" ); + app2.p2p_node()->broadcast(graphene::net::block_message( block_1 )); fc::usleep(fc::milliseconds(500)); + BOOST_TEST_MESSAGE( "Verifying nodes are still connected" ); BOOST_CHECK_EQUAL(app1.p2p_node()->get_connection_count(), 1); BOOST_CHECK_EQUAL(app1.chain_database()->head_block_num(), 1); + + BOOST_TEST_MESSAGE( "Checking GRAPHENE_NULL_ACCOUNT has balance" ); } catch( fc::exception& e ) { edump((e.to_detail_string())); throw; From cfa95a3f57d30cbe4397e6320d575eb102c3203a Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Tue, 14 Jul 2015 18:46:58 -0400 Subject: [PATCH 009/353] Issue #157 - make trx expiration absolute This is done to comply with the policy that transactions should be self describing and not depend upon implied state. This makes things easier for everyone to understand exactly when a transaction will be invalid without having to refer to chain state. --- libraries/chain/db_block.cpp | 95 ++----------------- libraries/chain/db_update.cpp | 2 +- .../graphene/chain/protocol/transaction.hpp | 30 ++---- .../graphene/chain/transaction_object.hpp | 7 +- libraries/chain/proposal_evaluator.cpp | 1 + libraries/chain/protocol/transaction.cpp | 11 +-- libraries/wallet/wallet.cpp | 12 ++- tests/intense/block_tests.cpp | 7 +- tests/tests/authority_tests.cpp | 6 +- tests/tests/block_tests.cpp | 7 +- tests/tests/operation_tests.cpp | 3 +- tests/tests/operation_tests2.cpp | 28 +++--- 12 files changed, 65 insertions(+), 144 deletions(-) diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index afa98823..6b671e47 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -471,8 +471,7 @@ processed_transaction database::_apply_transaction(const signed_transaction& trx const chain_parameters& chain_parameters = get_global_properties().parameters; eval_state._trx = &trx; - //This check is used only if this transaction has an absolute expiration time. - if( !(skip & skip_transaction_signatures) && trx.relative_expiration == 0 ) + if( !(skip & skip_transaction_signatures) ) { eval_state._sigs.reserve(trx.signatures.size()); @@ -484,105 +483,27 @@ processed_transaction database::_apply_transaction(const signed_transaction& trx } } - //If we're skipping tapos check, but not dupe check, assume all transactions have maximum expiration time. - fc::time_point_sec trx_expiration = _pending_block.timestamp + chain_parameters.maximum_time_until_expiration; - //Skip all manner of expiration and TaPoS checking if we're on block 1; It's impossible that the transaction is //expired, and TaPoS makes no sense as no blocks exist. if( BOOST_LIKELY(head_block_num() > 0) ) { - if( !(skip & skip_tapos_check) && trx.relative_expiration != 0 ) + if( !(skip & skip_tapos_check) ) { - //Check the TaPoS reference and expiration time - //Remember that the TaPoS block number is abbreviated; it contains only the lower 16 bits. - //Lookup TaPoS block summary by block number (remember block summary instances are the block numbers) - - // Let N = head_block_num(), a = N & 0xFFFF, and r = trx.ref_block_num - // - // We want to solve for the largest block height x such that - // these two conditions hold: - // - // (a) 0x10000 divides x-r - // (b) x <= N - // - // Let us define: - // - // x1 = N-a+r - // x0 = x1-2^16 - // x2 = x1+2^16 - // - // It is clear that x0, x1, x2 are consecutive solutions to (a). - // - // Since r < 2^16 and a < 2^16, it follows that - // -2^16 < r-a < 2^16. From this we know that x0 < N and x2 > N. - // - // Case (1): x1 <= N. In this case, x1 must be the greatest - // integer that satisfies (a) and (b); for x2, the next - // largest integer that satisfies (a), does not satisfy (b). - // - // Case (2): x1 > N. In this case, x0 must be the greatest - // integer that satisfies (a) and (b); for x1, the next - // largest integer that satisfies (a), does not satisfy (b). - // - /** - int64_t N = head_block_num(); - int64_t a = N & 0xFFFF; - int64_t r = trx.ref_block_num; - - int64_t x1 = N-a+r; - int64_t x0 = x1 - 0x10000; - int64_t x2 = x1 + 0x10000; - - assert( x0 < N ); - assert( x1 >= 0 ); - assert( x2 > N ); - - uint32_t ref_block_height; - if( x1 <= N ) - { - FC_ASSERT( x1 > 0 ); - ref_block_height = uint32_t( x1 ); - } - else - { - ref_block_height = uint32_t( x0 ); - } - */ - const auto& tapos_block_summary = block_summary_id_type( trx.ref_block_num )(*this); - //This is the signature check for transactions with relative expiration. - if( !(skip & skip_transaction_signatures) ) - { - eval_state._sigs.reserve(trx.signatures.size()); - - for( const auto& sig : trx.signatures ) - { - FC_ASSERT(eval_state._sigs.insert(std::make_pair( - public_key_type( fc::ecc::public_key(sig, trx.digest())), - false)).second, - "Multiple signatures by same key detected"); - } - } - //Verify TaPoS block summary has correct ID prefix, and that this block's time is not past the expiration FC_ASSERT( trx.ref_block_prefix == tapos_block_summary.block_id._hash[1] ); - trx_expiration = tapos_block_summary.timestamp + chain_parameters.block_interval*trx.relative_expiration; - } else if( trx.relative_expiration == 0 ) { - trx_expiration = fc::time_point_sec() + fc::seconds(trx.ref_block_prefix); - FC_ASSERT( trx_expiration <= _pending_block.timestamp + chain_parameters.maximum_time_until_expiration, "", - ("trx_expiration",trx_expiration)("_pending_block.timestamp",_pending_block.timestamp)("max_til_exp",chain_parameters.maximum_time_until_expiration)); - } - FC_ASSERT( _pending_block.timestamp <= trx_expiration, "", ("pending.timestamp",_pending_block.timestamp)("trx_exp",trx_expiration) ); - } else if( !(skip & skip_transaction_signatures) ) { - FC_ASSERT(trx.relative_expiration == 0, "May not use transactions with a reference block in block 1!"); - } + } + + FC_ASSERT( trx.expiration <= _pending_block.timestamp + chain_parameters.maximum_time_until_expiration, "", + ("trx.expiration",trx.expiration)("_pending_block.timestamp",_pending_block.timestamp)("max_til_exp",chain_parameters.maximum_time_until_expiration)); + FC_ASSERT( _pending_block.timestamp <= trx.expiration, "", ("pending.timestamp",_pending_block.timestamp)("trx.exp",trx.expiration) ); + } //Insert transaction into unique transactions database. if( !(skip & skip_transaction_dupe_check) ) { create([&](transaction_object& transaction) { - transaction.expiration = trx_expiration; transaction.trx_id = trx_id; transaction.trx = trx; }); diff --git a/libraries/chain/db_update.cpp b/libraries/chain/db_update.cpp index 78ca531b..d76db321 100644 --- a/libraries/chain/db_update.cpp +++ b/libraries/chain/db_update.cpp @@ -90,7 +90,7 @@ void database::clear_expired_transactions() const auto& global_parameters = get_global_properties().parameters; auto forking_window_time = global_parameters.maximum_undo_history * global_parameters.block_interval; while( !dedupe_index.empty() - && head_block_time() - dedupe_index.rbegin()->expiration >= fc::seconds(forking_window_time) ) + && head_block_time() - dedupe_index.rbegin()->trx.expiration >= fc::seconds(forking_window_time) ) transaction_idx.remove(*dedupe_index.rbegin()); } diff --git a/libraries/chain/include/graphene/chain/protocol/transaction.hpp b/libraries/chain/include/graphene/chain/protocol/transaction.hpp index 776bf162..4ee3ca88 100644 --- a/libraries/chain/include/graphene/chain/protocol/transaction.hpp +++ b/libraries/chain/include/graphene/chain/protocol/transaction.hpp @@ -34,20 +34,8 @@ namespace graphene { namespace chain { * hours with a 1 second interval. * * All transactions must expire so that the network does not have to maintain a permanent record of all transactions - * ever published. There are two accepted ways to specify the transaction's expiration time. The first is to choose - * a reference block, which is generally the most recent block the wallet is aware of when it signs the transaction, - * and specify a number of block intervals after the reference block until the transaction expires. The second - * expiration mechanism is to explicitly specify a timestamp of expiration. - * - * Note: The number of block intervals is different than the number of blocks. In effect the maximum period that a - * transaction is theoretically valid is 18 hours (1 sec interval) to 3.5 days (5 sec interval) if the reference - * block was the most recent block. - * - * If a transaction is to expire after a number of block intervals from a reference block, the reference block - * should be identified in the transaction header using the @ref ref_block_num, @ref ref_block_prefix, and @ref - * relative_expiration fields. If the transaction is instead to expire at an absolute timestamp, @ref - * ref_block_prefix should be treated as a 32-bit timestamp of the expiration time, and @ref ref_block_num and @ref - * relative_expiration must both be set to zero. + * ever published. A transaction may not have an expiration date too far in the future because this would require + * keeping too much transaction history in memory. * * The block prefix is the first 4 bytes of the block hash of the reference block number, which is the second 4 * bytes of the @ref block_id_type (the first 4 bytes of the block ID are the block number) @@ -58,7 +46,7 @@ namespace graphene { namespace chain { * probably have a longer re-org window to ensure their transaction can still go through in the event of a momentary * disruption in service. * - * @note It is not recommended to set the @ref ref_block_num, @ref ref_block_prefix, and @ref relative_expiration + * @note It is not recommended to set the @ref ref_block_num, @ref ref_block_prefix, and @ref expiration * fields manually. Call the appropriate overload of @ref set_expiration instead. * * @{ @@ -80,12 +68,12 @@ namespace graphene { namespace chain { * @ref block_id_type */ uint32_t ref_block_prefix = 0; + /** - * This field specifies the number of block intervals after the reference block until this transaction becomes - * invalid. If this field is set to zero, the @ref ref_block_prefix is interpreted as an absolute timestamp of - * the time the transaction becomes invalid. + * This field specifies the absolute expiration for this transaction. */ - uint16_t relative_expiration = 1; + fc::time_point_sec expiration; + vector operations; extensions_type extensions; @@ -95,7 +83,7 @@ namespace graphene { namespace chain { void validate() const; void set_expiration( fc::time_point_sec expiration_time ); - void set_expiration( const block_id_type& reference_block, unsigned_int lifetime_intervals = 3 ); + void set_reference_block( const block_id_type& reference_block ); /// visit all operations template @@ -182,6 +170,6 @@ namespace graphene { namespace chain { } } -FC_REFLECT( graphene::chain::transaction, (ref_block_num)(ref_block_prefix)(relative_expiration)(operations)(extensions) ) +FC_REFLECT( graphene::chain::transaction, (ref_block_num)(ref_block_prefix)(expiration)(operations)(extensions) ) FC_REFLECT_DERIVED( graphene::chain::signed_transaction, (graphene::chain::transaction), (signatures) ) FC_REFLECT_DERIVED( graphene::chain::processed_transaction, (graphene::chain::signed_transaction), (operation_results) ) diff --git a/libraries/chain/include/graphene/chain/transaction_object.hpp b/libraries/chain/include/graphene/chain/transaction_object.hpp index e8f630e7..80be41bf 100644 --- a/libraries/chain/include/graphene/chain/transaction_object.hpp +++ b/libraries/chain/include/graphene/chain/transaction_object.hpp @@ -45,8 +45,9 @@ namespace graphene { namespace chain { static const uint8_t type_id = impl_transaction_object_type; signed_transaction trx; - time_point_sec expiration; transaction_id_type trx_id; + + time_point_sec get_expiration()const { return trx.expiration; } }; struct by_expiration; @@ -57,11 +58,11 @@ namespace graphene { namespace chain { indexed_by< hashed_unique< tag, member< object, object_id_type, &object::id > >, hashed_unique< tag, BOOST_MULTI_INDEX_MEMBER(transaction_object, transaction_id_type, trx_id), std::hash >, - ordered_non_unique< tag, BOOST_MULTI_INDEX_MEMBER(transaction_object, time_point_sec, expiration)> + ordered_non_unique< tag, const_mem_fun > > > transaction_multi_index_type; typedef generic_index transaction_index; } } -FC_REFLECT_DERIVED( graphene::chain::transaction_object, (graphene::db::object), (trx)(expiration) ) +FC_REFLECT_DERIVED( graphene::chain::transaction_object, (graphene::db::object), (trx)(trx_id) ) diff --git a/libraries/chain/proposal_evaluator.cpp b/libraries/chain/proposal_evaluator.cpp index 86e6ee04..9f175c2a 100644 --- a/libraries/chain/proposal_evaluator.cpp +++ b/libraries/chain/proposal_evaluator.cpp @@ -75,6 +75,7 @@ object_id_type proposal_create_evaluator::do_apply(const proposal_create_operati database& d = db(); const proposal_object& proposal = d.create([&](proposal_object& proposal) { + _proposed_trx.expiration = o.expiration_time; proposal.proposed_transaction = _proposed_trx; proposal.expiration_time = o.expiration_time; if( o.review_period_seconds ) diff --git a/libraries/chain/protocol/transaction.cpp b/libraries/chain/protocol/transaction.cpp index 9a02a98a..e7ff5ec1 100644 --- a/libraries/chain/protocol/transaction.cpp +++ b/libraries/chain/protocol/transaction.cpp @@ -37,9 +37,6 @@ digest_type transaction::digest()const } void transaction::validate() const { - if( relative_expiration == 0 ) - FC_ASSERT( ref_block_num == 0 && ref_block_prefix > 0 ); - for( const auto& op : operations ) operation_validate(op); } @@ -66,16 +63,14 @@ signature_type graphene::chain::signed_transaction::sign(const private_key_type& void transaction::set_expiration( fc::time_point_sec expiration_time ) { - ref_block_num = 0; - relative_expiration = 0; - ref_block_prefix = expiration_time.sec_since_epoch(); + expiration = expiration_time; } -void transaction::set_expiration( const block_id_type& reference_block, unsigned_int lifetime_intervals ) +void transaction::set_reference_block( const block_id_type& reference_block ) { ref_block_num = fc::endian_reverse_u32(reference_block._hash[0]); + if( ref_block_num == 0 ) ref_block_prefix = 0; ref_block_prefix = reference_block._hash[1]; - relative_expiration = lifetime_intervals; } void transaction::get_required_authorities( flat_set& active, flat_set& owner, vector& other )const diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp index 13ac46c3..6986bcca 100644 --- a/libraries/wallet/wallet.cpp +++ b/libraries/wallet/wallet.cpp @@ -727,7 +727,9 @@ public: vector paying_keys = registrar_account_object.active.get_keys(); - tx.set_expiration(get_dynamic_global_properties().head_block_id); + auto dyn_props = get_dynamic_global_properties(); + tx.set_reference_block( dyn_props.head_block_id ); + tx.set_expiration( dyn_props.time + fc::seconds(30) ); tx.validate(); for( public_key_type& key : paying_keys ) @@ -851,7 +853,9 @@ public: vector paying_keys = registrar_account_object.active.get_keys(); - tx.set_expiration(get_dynamic_global_properties().head_block_id); + auto dyn_props = get_dynamic_global_properties(); + tx.set_reference_block( dyn_props.head_block_id ); + tx.set_expiration( dyn_props.time + fc::seconds(30) ); tx.validate(); for( public_key_type& key : paying_keys ) @@ -1434,7 +1438,9 @@ public: approving_key_set.insert( k.first ); } - tx.set_expiration(get_dynamic_global_properties().head_block_id); + auto dyn_props = get_dynamic_global_properties(); + tx.set_reference_block( dyn_props.head_block_id ); + tx.set_expiration( dyn_props.time + fc::seconds(30) ); for( public_key_type& key : approving_key_set ) { diff --git a/tests/intense/block_tests.cpp b/tests/intense/block_tests.cpp index e28774fa..7f3e6386 100644 --- a/tests/intense/block_tests.cpp +++ b/tests/intense/block_tests.cpp @@ -424,13 +424,16 @@ BOOST_FIXTURE_TEST_CASE( tapos_rollover, database_fixture ) xfer_op.amount = asset(1000); xfer_tx.operations.push_back( xfer_op ); - xfer_tx.set_expiration( db.head_block_id(), 0x1000 ); + xfer_tx.set_expiration( db.head_block_time() + fc::seconds( 0x1000 * db.get_global_properties().parameters.block_interval ) ); + xfer_tx.set_reference_block( db.head_block_id() ); + sign( xfer_tx, alice_private_key ); PUSH_TX( db, xfer_tx, 0 ); generate_block(); BOOST_TEST_MESSAGE( "Sign new tx's" ); - xfer_tx.set_expiration( db.head_block_id(), 0x1000 ); + xfer_tx.set_expiration( db.head_block_time() + fc::seconds( 0x1000 * db.get_global_properties().parameters.block_interval ) ); + xfer_tx.set_reference_block( db.head_block_id() ); xfer_tx.signatures.clear(); sign( xfer_tx, alice_private_key ); diff --git a/tests/tests/authority_tests.cpp b/tests/tests/authority_tests.cpp index b178bf12..f40c3eb3 100644 --- a/tests/tests/authority_tests.cpp +++ b/tests/tests/authority_tests.cpp @@ -337,7 +337,8 @@ BOOST_AUTO_TEST_CASE( proposed_single_account ) } trx.operations.push_back(op); - trx.set_expiration(db.head_block_id()); + trx.set_expiration( db.head_block_time() + fc::seconds( 3 * db.get_global_properties().parameters.block_interval )); + trx.set_reference_block( db.head_block_id() ); //idump((moneyman)); trx.sign( init_account_priv_key ); @@ -849,7 +850,8 @@ BOOST_FIXTURE_TEST_CASE( proposal_owner_authority_complete, database_fixture ) std::swap(uop.key_approvals_to_add, uop.key_approvals_to_remove); // Survive trx dupe check - trx.set_expiration(db.head_block_id(), 5); + trx.set_expiration( db.head_block_time() + fc::seconds( 5 * db.get_global_properties().parameters.block_interval )); + trx.set_reference_block( db.head_block_id() ); trx.operations.push_back(uop); trx.sign(nathan_key); trx.sign(dan_key); diff --git a/tests/tests/block_tests.cpp b/tests/tests/block_tests.cpp index 0dca6448..2b096e1e 100644 --- a/tests/tests/block_tests.cpp +++ b/tests/tests/block_tests.cpp @@ -288,6 +288,7 @@ BOOST_AUTO_TEST_CASE( undo_pending ) { signed_transaction trx; trx.set_expiration(db.head_block_time() + fc::minutes(1)); + trx.operations.push_back(t); PUSH_TX( db, trx, ~0 ); @@ -465,7 +466,8 @@ BOOST_AUTO_TEST_CASE( tapos ) signed_transaction trx; //This transaction must be in the next block after its reference, or it is invalid. - trx.set_expiration(db1.head_block_id(), 1); + trx.set_expiration( db1.head_block_time() + fc::seconds( 1 * db1.get_global_properties().parameters.block_interval )); + trx.set_reference_block( db1.head_block_id() ); account_id_type nathan_id = account_idx.get_next_id(); account_create_operation cop; @@ -486,7 +488,8 @@ BOOST_AUTO_TEST_CASE( tapos ) trx.sign(init_account_priv_key); //relative_expiration is 1, but ref block is 2 blocks old, so this should fail. GRAPHENE_REQUIRE_THROW(PUSH_TX( db1, trx, database::skip_transaction_signatures | database::skip_authority_check ), fc::exception); - trx.set_expiration(db1.head_block_id(), 2); + trx.set_expiration( db1.head_block_time() + fc::seconds( 2 * db1.get_global_properties().parameters.block_interval )); + trx.set_reference_block( db1.head_block_id() ); trx.signatures.clear(); trx.sign(init_account_priv_key); db1.push_transaction(trx, database::skip_transaction_signatures | database::skip_authority_check); diff --git a/tests/tests/operation_tests.cpp b/tests/tests/operation_tests.cpp index acf2ff26..7c28ba4d 100644 --- a/tests/tests/operation_tests.cpp +++ b/tests/tests/operation_tests.cpp @@ -1143,7 +1143,8 @@ BOOST_AUTO_TEST_CASE( witness_withdraw_pay_test ) account_upgrade_operation uop; uop.account_to_upgrade = nathan->get_id(); uop.upgrade_to_lifetime_member = true; - trx.set_expiration(db.head_block_id()); + trx.set_expiration( db.head_block_time() + fc::seconds( 3 * db.get_global_properties().parameters.block_interval )); + trx.set_reference_block( db.head_block_id() ); trx.operations.push_back(uop); for( auto& op : trx.operations ) db.current_fee_schedule().set_fee(op); trx.validate(); diff --git a/tests/tests/operation_tests2.cpp b/tests/tests/operation_tests2.cpp index be752ec2..99163b3b 100644 --- a/tests/tests/operation_tests2.cpp +++ b/tests/tests/operation_tests2.cpp @@ -133,7 +133,7 @@ BOOST_AUTO_TEST_CASE( withdraw_permission_test ) // withdraw 1 trx.operations = {op}; // make it different from previous trx so it's non-duplicate - trx.ref_block_prefix++; + trx.expiration += fc::seconds(1); trx.sign(dan_private_key); PUSH_TX( db, trx ); trx.clear(); @@ -226,9 +226,9 @@ BOOST_AUTO_TEST_CASE( withdraw_permission_nominal_case ) op.withdraw_to_account = dan_id; op.amount_to_withdraw = asset(5); trx.operations.push_back(op); - // ref_block_prefix is timestamp, so treat it as a rollable nonce + // expiration is timestamp, so treat it as a rollable nonce // so tx's have different txid's - trx.ref_block_prefix++; + trx.expiration += fc::seconds(1); trx.sign(dan_private_key); PUSH_TX( db, trx ); // tx's involving withdraw_permissions can't delete it even @@ -297,7 +297,7 @@ BOOST_AUTO_TEST_CASE( withdraw_permission_delete ) withdraw_permission_delete_operation op; op.authorized_account = get_account("dan").id; op.withdraw_from_account = get_account("nathan").id; - trx.set_expiration(db.head_block_id()); + trx.set_reference_block(db.head_block_id()); trx.set_expiration( db.head_block_time() + fc::seconds( 3 * db.get_global_properties().parameters.block_interval ) ); trx.operations.push_back(op); trx.sign(generate_private_key("nathan")); PUSH_TX( db, trx ); @@ -415,7 +415,7 @@ BOOST_AUTO_TEST_CASE( witness_create ) // Give nathan some voting stake transfer(committee_account, nathan_id, asset(10000000)); generate_block(); - trx.set_expiration(db.head_block_id()); + trx.set_reference_block(db.head_block_id()); trx.set_expiration( db.head_block_time() + fc::seconds( 3 * db.get_global_properties().parameters.block_interval ) ); { account_update_operation op; @@ -627,7 +627,7 @@ BOOST_AUTO_TEST_CASE( worker_pay_test ) op.vesting_balance = worker_id_type()(db).worker.get().balance; op.amount = asset(500); op.owner = nathan_id; - trx.set_expiration(db.head_block_id()); + trx.set_reference_block(db.head_block_id()); trx.set_expiration( db.head_block_time() + fc::seconds( 3 * db.get_global_properties().parameters.block_interval ) ); trx.operations.push_back(op); trx.sign( nathan_private_key); PUSH_TX( db, trx ); @@ -657,11 +657,11 @@ BOOST_AUTO_TEST_CASE( worker_pay_test ) op.vesting_balance = worker_id_type()(db).worker.get().balance; op.amount = asset(500); op.owner = nathan_id; - trx.set_expiration(db.head_block_id()); + trx.set_reference_block(db.head_block_id()); trx.set_expiration( db.head_block_time() + fc::seconds( 3 * db.get_global_properties().parameters.block_interval ) ); trx.operations.push_back(op); REQUIRE_THROW_WITH_VALUE(op, amount, asset(500)); generate_blocks(db.head_block_time() + fc::hours(12)); - trx.set_expiration(db.head_block_id()); + trx.set_reference_block(db.head_block_id()); trx.set_expiration( db.head_block_time() + fc::seconds( 3 * db.get_global_properties().parameters.block_interval ) ); REQUIRE_THROW_WITH_VALUE(op, amount, asset(501)); trx.operations.back() = op; trx.sign( nathan_private_key); @@ -680,7 +680,7 @@ BOOST_AUTO_TEST_CASE( refund_worker_test ) upgrade_to_lifetime_member(nathan_id); generate_block(); generate_blocks(db.get_dynamic_global_properties().next_maintenance_time); - trx.set_expiration(db.head_block_id()); + trx.set_reference_block(db.head_block_id()); trx.set_expiration( db.head_block_time() + fc::seconds( 3 * db.get_global_properties().parameters.block_interval ) ); { worker_create_operation op; @@ -753,7 +753,7 @@ BOOST_AUTO_TEST_CASE( burn_worker_test ) upgrade_to_lifetime_member(nathan_id); generate_block(); generate_blocks(db.get_dynamic_global_properties().next_maintenance_time); - trx.set_expiration(db.head_block_id()); + trx.set_reference_block(db.head_block_id()); trx.set_expiration( db.head_block_time() + fc::seconds( 3 * db.get_global_properties().parameters.block_interval ) ); { worker_create_operation op; @@ -933,7 +933,7 @@ BOOST_AUTO_TEST_CASE( unimp_force_settlement_unavailable ) op.new_options = bit_usd(db).options; op.new_options.flags |= disable_force_settle; trx.operations.push_back(op); - trx.set_expiration(db.head_block_id()); + trx.set_reference_block(db.head_block_id()); trx.set_expiration( db.head_block_time() + fc::seconds( 3 * db.get_global_properties().parameters.block_interval ) ); trx.sign(key_id_type(), private_key); PUSH_TX( db, trx ); //Check that force settlements were all canceled @@ -1027,7 +1027,7 @@ BOOST_AUTO_TEST_CASE( balance_object_test ) auto slot = db.get_slot_at_time(starting_time); db.generate_block(starting_time, db.get_scheduled_witness(slot).first, init_account_priv_key, database::skip_nothing); - trx.set_expiration(db.head_block_id()); + trx.set_reference_block(db.head_block_id()); trx.set_expiration( db.head_block_time() + fc::seconds( 3 * db.get_global_properties().parameters.block_interval ) ); const balance_object& vesting_balance_1 = balance_id_type(2)(db); const balance_object& vesting_balance_2 = balance_id_type(3)(db); @@ -1080,7 +1080,7 @@ BOOST_AUTO_TEST_CASE( balance_object_test ) db.generate_block(db.get_slot_time(1), db.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); slot = db.get_slot_at_time(vesting_balance_1.vesting_policy->begin_timestamp + 60); db.generate_block(db.get_slot_time(slot), db.get_scheduled_witness(slot).first, init_account_priv_key, database::skip_nothing); - trx.set_expiration(db.head_block_id()); + trx.set_reference_block(db.head_block_id()); trx.set_expiration( db.head_block_time() + fc::seconds( 3 * db.get_global_properties().parameters.block_interval ) ); op.balance_to_claim = vesting_balance_1.id; op.total_claimed.amount = 500; @@ -1106,7 +1106,7 @@ BOOST_AUTO_TEST_CASE( balance_object_test ) db.generate_block(db.get_slot_time(1), db.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); slot = db.get_slot_at_time(db.head_block_time() + fc::days(1)); db.generate_block(db.get_slot_time(slot), db.get_scheduled_witness(slot).first, init_account_priv_key, database::skip_nothing); - trx.set_expiration(db.head_block_id()); + trx.set_reference_block(db.head_block_id()); trx.set_expiration( db.head_block_time() + fc::seconds( 3 * db.get_global_properties().parameters.block_interval ) ); op.total_claimed = vesting_balance_2.balance; trx.operations = {op}; From e5f8d0f5485b10a2ebe363804c536469b85780e9 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Tue, 14 Jul 2015 18:50:03 -0400 Subject: [PATCH 010/353] removing unecessary field --- libraries/chain/db_block.cpp | 1 - libraries/chain/include/graphene/chain/block_summary_object.hpp | 1 - 2 files changed, 2 deletions(-) diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index 6b671e47..8fa9eaba 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -578,7 +578,6 @@ void database::create_block_summary(const signed_block& next_block) block_summary_id_type sid(next_block.block_num() & 0xffff ); modify( sid(*this), [&](block_summary_object& p) { p.block_id = next_block.id(); - p.timestamp = next_block.timestamp; }); } diff --git a/libraries/chain/include/graphene/chain/block_summary_object.hpp b/libraries/chain/include/graphene/chain/block_summary_object.hpp index ddf44d6f..9c17db15 100644 --- a/libraries/chain/include/graphene/chain/block_summary_object.hpp +++ b/libraries/chain/include/graphene/chain/block_summary_object.hpp @@ -37,7 +37,6 @@ namespace graphene { namespace chain { static const uint8_t type_id = impl_block_summary_object_type; block_id_type block_id; - fc::time_point_sec timestamp; }; } } From 59f65d1411adc49d9b428e0fcae9b8edf3243911 Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Wed, 15 Jul 2015 00:25:46 -0400 Subject: [PATCH 011/353] [GUI] Fix ownership of asset objects --- programs/light_client/ClientDataModel.cpp | 35 ++++++----------------- 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/programs/light_client/ClientDataModel.cpp b/programs/light_client/ClientDataModel.cpp index 70dba2ce..e408f222 100644 --- a/programs/light_client/ClientDataModel.cpp +++ b/programs/light_client/ClientDataModel.cpp @@ -18,6 +18,7 @@ Asset* ChainDataModel::getAsset(qint64 id) if( itr == by_id_idx.end() ) { auto tmp = new Asset; + QQmlEngine::setObjectOwnership(tmp, QQmlEngine::CppOwnership); tmp->id = id; --m_account_query_num; tmp->symbol = QString::number( --m_account_query_num); auto result = m_assets.insert( tmp ); @@ -53,7 +54,7 @@ Asset* ChainDataModel::getAsset(qint64 id) ); } }); - } + } catch ( const fc::exception& e ) { Q_EMIT exceptionThrown( QString::fromStdString(e.to_string()) ); @@ -71,6 +72,7 @@ Asset* ChainDataModel::getAsset(QString symbol) if( itr == by_symbol_idx.end() ) { auto tmp = new Asset; + QQmlEngine::setObjectOwnership(tmp, QQmlEngine::CppOwnership); tmp->id = --m_account_query_num; tmp->symbol = symbol; auto result = m_assets.insert( tmp ); @@ -104,7 +106,7 @@ Asset* ChainDataModel::getAsset(QString symbol) ); } }); - } + } catch ( const fc::exception& e ) { Q_EMIT exceptionThrown( QString::fromStdString(e.to_string()) ); @@ -115,25 +117,6 @@ Asset* ChainDataModel::getAsset(QString symbol) return *itr; } - - - - - - - - - - - - - - - - - - - Account* ChainDataModel::getAccount(ObjectId id) { auto& by_id_idx = m_accounts.get<::by_id>(); @@ -206,19 +189,19 @@ Account* ChainDataModel::getAccount(QString name) /** execute in main */ Q_EMIT queueExecute( [this,result,name](){ wlog( "process result" ); - auto& by_symbol_idx = this->m_accounts.get(); - auto itr = by_symbol_idx.find(name); - assert( itr != by_symbol_idx.end() ); + auto& by_name_idx = this->m_accounts.get(); + auto itr = by_name_idx.find(name); + assert( itr != by_name_idx.end() ); if( result.size() == 0 || !result.front() ) { elog( "delete later" ); (*itr)->deleteLater(); - by_symbol_idx.erase( itr ); + by_name_idx.erase( itr ); } else { - by_symbol_idx.modify( itr, + by_name_idx.modify( itr, [=]( Account* a ){ a->setProperty("id", ObjectId(result.front()->id.instance())); } From b24006cca37f8d6c26f0118ab878397863f2da39 Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Wed, 15 Jul 2015 00:33:33 -0400 Subject: [PATCH 012/353] [GUI] Fix build --- programs/light_client/ClientDataModel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/light_client/ClientDataModel.cpp b/programs/light_client/ClientDataModel.cpp index e408f222..7db26780 100644 --- a/programs/light_client/ClientDataModel.cpp +++ b/programs/light_client/ClientDataModel.cpp @@ -100,7 +100,7 @@ Asset* ChainDataModel::getAsset(QString symbol) { by_symbol_idx.modify( itr, [=]( Asset* a ){ - a->setProperty("id", result.front()->id.instance() ); + a->setProperty("id", ObjectId(result.front()->id.instance())); a->setProperty("precision", result.front()->precision ); } ); From a751d90e000903821ad8a096079d0bdb19f4f948 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 15 Jul 2015 12:03:10 -0400 Subject: [PATCH 013/353] Move witness pay to VBO, update test #142 --- libraries/chain/db_balance.cpp | 112 ++++++++++++------ libraries/chain/db_debug.cpp | 5 - libraries/chain/db_init.cpp | 1 - libraries/chain/db_update.cpp | 3 +- .../chain/include/graphene/chain/config.hpp | 1 + .../chain/include/graphene/chain/database.hpp | 22 ++++ .../include/graphene/chain/exceptions.hpp | 1 - .../chain/protocol/chain_parameters.hpp | 1 + .../graphene/chain/protocol/operations.hpp | 1 - .../graphene/chain/protocol/witness.hpp | 25 ---- .../graphene/chain/witness_evaluator.hpp | 11 -- .../include/graphene/chain/witness_object.hpp | 4 +- libraries/chain/protocol/witness.cpp | 7 -- libraries/chain/witness_evaluator.cpp | 26 ---- libraries/wallet/wallet.cpp | 2 - tests/common/database_fixture.cpp | 4 - tests/tests/operation_tests.cpp | 57 +++------ 17 files changed, 126 insertions(+), 157 deletions(-) diff --git a/libraries/chain/db_balance.cpp b/libraries/chain/db_balance.cpp index 0434239e..52cf97df 100644 --- a/libraries/chain/db_balance.cpp +++ b/libraries/chain/db_balance.cpp @@ -21,6 +21,7 @@ #include #include #include +#include namespace graphene { namespace chain { @@ -86,6 +87,54 @@ void database::adjust_core_in_orders( const account_object& acnt, asset delta ) } } +optional< vesting_balance_id_type > database::deposit_lazy_vesting( + const optional< vesting_balance_id_type >& ovbid, + share_type amount, uint32_t req_vesting_seconds, + account_id_type req_owner, + bool require_vesting ) +{ + if( amount == 0 ) + return optional< vesting_balance_id_type >(); + + fc::time_point_sec now = head_block_time(); + + while( true ) + { + if( !ovbid.valid() ) + break; + const vesting_balance_object& vbo = (*ovbid)(*this); + if( vbo.owner != req_owner ) + break; + if( vbo.policy.which() != vesting_policy::tag< cdd_vesting_policy >::value ) + break; + if( vbo.policy.get< cdd_vesting_policy >().vesting_seconds != req_vesting_seconds ) + break; + modify( vbo, [&]( vesting_balance_object& _vbo ) + { + if( require_vesting ) + _vbo.deposit(now, amount); + else + _vbo.deposit_vested(now, amount); + } ); + return optional< vesting_balance_id_type >(); + } + + const vesting_balance_object& vbo = create< vesting_balance_object >( [&]( vesting_balance_object& _vbo ) + { + _vbo.owner = req_owner; + _vbo.balance = amount; + + cdd_vesting_policy policy; + policy.vesting_seconds = req_vesting_seconds; + policy.coin_seconds_earned = require_vesting ? 0 : amount.value * policy.vesting_seconds; + policy.coin_seconds_earned_last_update = now; + + _vbo.policy = policy; + } ); + + return vbo.id; +} + void database::deposit_cashback(const account_object& acct, share_type amount, bool require_vesting) { // If we don't have a VBO, or if it has the wrong maturity @@ -105,46 +154,43 @@ void database::deposit_cashback(const account_object& acct, share_type amount, b return; } - uint32_t global_vesting_seconds = get_global_properties().parameters.cashback_vesting_period_seconds; - fc::time_point_sec now = head_block_time(); + optional< vesting_balance_id_type > new_vbid = deposit_lazy_vesting( + acct.cashback_vb, + amount, + get_global_properties().parameters.cashback_vesting_period_seconds, + acct.id, + require_vesting ); - while( true ) + if( new_vbid.valid() ) { - if( !acct.cashback_vb.valid() ) - break; - const vesting_balance_object& cashback_vb = (*acct.cashback_vb)(*this); - if( cashback_vb.policy.which() != vesting_policy::tag< cdd_vesting_policy >::value ) - break; - if( cashback_vb.policy.get< cdd_vesting_policy >().vesting_seconds != global_vesting_seconds ) - break; - - modify( cashback_vb, [&]( vesting_balance_object& obj ) + modify( acct, [&]( account_object& _acct ) { - if( require_vesting ) - obj.deposit(now, amount); - else - obj.deposit_vested(now, amount); + _acct.cashback_vb = *new_vbid; } ); - return; } - const vesting_balance_object& cashback_vb = create< vesting_balance_object >( [&]( vesting_balance_object& obj ) + return; +} + +void database::deposit_witness_pay(const witness_object& wit, share_type amount) +{ + if( amount == 0 ) + return; + + optional< vesting_balance_id_type > new_vbid = deposit_lazy_vesting( + wit.pay_vb, + amount, + get_global_properties().parameters.witness_pay_vesting_seconds, + wit.witness_account, + true ); + + if( new_vbid.valid() ) { - obj.owner = acct.id; - obj.balance = amount; - - cdd_vesting_policy policy; - policy.vesting_seconds = global_vesting_seconds; - policy.coin_seconds_earned = require_vesting? 0 : amount.value * policy.vesting_seconds; - policy.coin_seconds_earned_last_update = now; - - obj.policy = policy; - } ); - - modify( acct, [&]( account_object& _acct ) - { - _acct.cashback_vb = cashback_vb.id; - } ); + modify( wit, [&]( witness_object& _wit ) + { + _wit.pay_vb = *new_vbid; + } ); + } return; } diff --git a/libraries/chain/db_debug.cpp b/libraries/chain/db_debug.cpp index bfba2a0d..a792b741 100644 --- a/libraries/chain/db_debug.cpp +++ b/libraries/chain/db_debug.cpp @@ -72,11 +72,6 @@ void database::debug_dump() total_balances[asset_obj.id] += asset_obj.dynamic_asset_data_id(db).accumulated_fees; total_balances[asset_id_type()] += asset_obj.dynamic_asset_data_id(db).fee_pool; } - for( const witness_object& witness_obj : db.get_index_type().indices() ) - { - //idump((witness_obj)); - total_balances[asset_id_type()] += witness_obj.accumulated_income; - } if( total_balances[asset_id_type()].value != core_asset_data.current_supply.value ) { edump( (total_balances[asset_id_type()].value)(core_asset_data.current_supply.value )); diff --git a/libraries/chain/db_init.cpp b/libraries/chain/db_init.cpp index 287a810e..d4f9a9cb 100644 --- a/libraries/chain/db_init.cpp +++ b/libraries/chain/db_init.cpp @@ -142,7 +142,6 @@ void database::initialize_evaluators() register_evaluator(); register_evaluator(); register_evaluator(); - register_evaluator(); register_evaluator(); register_evaluator(); register_evaluator(); diff --git a/libraries/chain/db_update.cpp b/libraries/chain/db_update.cpp index d76db321..80ec6c7e 100644 --- a/libraries/chain/db_update.cpp +++ b/libraries/chain/db_update.cpp @@ -63,11 +63,12 @@ void database::update_signing_witness(const witness_object& signing_witness, con _dpo.witness_budget -= witness_pay; } ); + deposit_witness_pay( signing_witness, witness_pay ); + modify( signing_witness, [&]( witness_object& _wit ) { _wit.previous_secret = new_block.previous_secret; _wit.next_secret_hash = new_block.next_secret_hash; - _wit.accumulated_income += witness_pay; } ); } diff --git a/libraries/chain/include/graphene/chain/config.hpp b/libraries/chain/include/graphene/chain/config.hpp index 61add015..7221c420 100644 --- a/libraries/chain/include/graphene/chain/config.hpp +++ b/libraries/chain/include/graphene/chain/config.hpp @@ -133,6 +133,7 @@ #define GRAPHENE_CORE_ASSET_CYCLE_RATE_BITS 32 #define GRAPHENE_DEFAULT_WITNESS_PAY_PER_BLOCK (GRAPHENE_BLOCKCHAIN_PRECISION * int64_t( 10) ) +#define GRAPHENE_DEFAULT_WITNESS_PAY_VESTING_SECONDS (60*60*24) #define GRAPHENE_DEFAULT_WORKER_BUDGET_PER_DAY (GRAPHENE_BLOCKCHAIN_PRECISION * int64_t(500) * 1000 ) #define GRAPHENE_MAX_INTEREST_APR uint16_t( 10000 ) diff --git a/libraries/chain/include/graphene/chain/database.hpp b/libraries/chain/include/graphene/chain/database.hpp index 0500f834..238bb5d3 100644 --- a/libraries/chain/include/graphene/chain/database.hpp +++ b/libraries/chain/include/graphene/chain/database.hpp @@ -326,8 +326,30 @@ namespace graphene { namespace chain { */ void adjust_core_in_orders( const account_object& acnt, asset delta ); + /** + * @brief Helper to make lazy deposit to CDD VBO. + * + * If the given optional VBID is not valid(), + * or it does not have a CDD vesting policy, + * or the owner / vesting_seconds of the policy + * does not match the parameter, then credit amount + * to newly created VBID and return it. + * + * Otherwise, credit amount to ovbid. + * + * @return ID of newly created VBO, but only if VBO was created. + */ + optional< vesting_balance_id_type > deposit_lazy_vesting( + const optional< vesting_balance_id_type >& ovbid, + share_type amount, + uint32_t req_vesting_seconds, + account_id_type req_owner, + bool require_vesting ); + // helper to handle cashback rewards void deposit_cashback(const account_object& acct, share_type amount, bool require_vesting = true); + // helper to handle witness pay + void deposit_witness_pay(const witness_object& wit, share_type amount); //////////////////// db_debug.cpp //////////////////// diff --git a/libraries/chain/include/graphene/chain/exceptions.hpp b/libraries/chain/include/graphene/chain/exceptions.hpp index b18859a2..45c236e8 100644 --- a/libraries/chain/include/graphene/chain/exceptions.hpp +++ b/libraries/chain/include/graphene/chain/exceptions.hpp @@ -102,7 +102,6 @@ namespace graphene { namespace chain { //GRAPHENE_DECLARE_OP_BASE_EXCEPTIONS( asset_publish_feed ); //GRAPHENE_DECLARE_OP_BASE_EXCEPTIONS( committee_member_create ); //GRAPHENE_DECLARE_OP_BASE_EXCEPTIONS( witness_create ); - //GRAPHENE_DECLARE_OP_BASE_EXCEPTIONS( witness_withdraw_pay ); GRAPHENE_DECLARE_OP_BASE_EXCEPTIONS( proposal_create ); diff --git a/libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp b/libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp index 55a068c0..f05e68ba 100644 --- a/libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp +++ b/libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp @@ -58,6 +58,7 @@ namespace graphene { namespace chain { bool count_non_member_votes = true; ///< set to false to restrict voting privlegages to member accounts bool allow_non_member_whitelists = false; ///< true if non-member accounts may set whitelists and blacklists; false otherwise share_type witness_pay_per_block = GRAPHENE_DEFAULT_WITNESS_PAY_PER_BLOCK; ///< CORE to be allocated to witnesses (per block) + uint32_t witness_pay_vesting_seconds = GRAPHENE_DEFAULT_WITNESS_PAY_VESTING_SECONDS; ///< vesting_seconds parameter for witness VBO's share_type worker_budget_per_day = GRAPHENE_DEFAULT_WORKER_BUDGET_PER_DAY; ///< CORE to be allocated to workers (per day) uint16_t max_predicate_opcode = GRAPHENE_DEFAULT_MAX_ASSERT_OPCODE; ///< predicate_opcode must be less than this number share_type fee_liquidation_threshold = GRAPHENE_DEFAULT_FEE_LIQUIDATION_THRESHOLD; ///< value in CORE at which accumulated fees in blockchain-issued market assets should be liquidated diff --git a/libraries/chain/include/graphene/chain/protocol/operations.hpp b/libraries/chain/include/graphene/chain/protocol/operations.hpp index 8a63d0b9..853e9c5c 100644 --- a/libraries/chain/include/graphene/chain/protocol/operations.hpp +++ b/libraries/chain/include/graphene/chain/protocol/operations.hpp @@ -44,7 +44,6 @@ namespace graphene { namespace chain { asset_global_settle_operation, asset_publish_feed_operation, witness_create_operation, - witness_withdraw_pay_operation, proposal_create_operation, proposal_update_operation, proposal_delete_operation, diff --git a/libraries/chain/include/graphene/chain/protocol/witness.hpp b/libraries/chain/include/graphene/chain/protocol/witness.hpp index f375b1fa..57d5a1ee 100644 --- a/libraries/chain/include/graphene/chain/protocol/witness.hpp +++ b/libraries/chain/include/graphene/chain/protocol/witness.hpp @@ -25,35 +25,10 @@ namespace graphene { namespace chain { void validate()const; }; - - /** - * @ingroup operations - * Used to move witness pay from accumulated_income to their account balance. - * - * TODO: remove this operation, send witness pay into a vesting balance object and - * have the witness claim the funds from there. - */ - struct witness_withdraw_pay_operation : public base_operation - { - struct fee_parameters_type { uint64_t fee = 20 * GRAPHENE_BLOCKCHAIN_PRECISION; }; - - asset fee; - /// The account to pay. Must match from_witness->witness_account. This account pays the fee for this operation. - account_id_type to_account; - witness_id_type from_witness; - share_type amount; - - account_id_type fee_payer()const { return to_account; } - void validate()const; - }; - - /// TODO: witness_resign_operation : public base_operation } } // graphene::chain FC_REFLECT( graphene::chain::witness_create_operation::fee_parameters_type, (fee) ) -FC_REFLECT( graphene::chain::witness_withdraw_pay_operation::fee_parameters_type, (fee) ) FC_REFLECT( graphene::chain::witness_create_operation, (fee)(witness_account)(url)(block_signing_key)(initial_secret) ) -FC_REFLECT( graphene::chain::witness_withdraw_pay_operation, (fee)(from_witness)(to_account)(amount) ) diff --git a/libraries/chain/include/graphene/chain/witness_evaluator.hpp b/libraries/chain/include/graphene/chain/witness_evaluator.hpp index 2fabdfb7..4e98cd56 100644 --- a/libraries/chain/include/graphene/chain/witness_evaluator.hpp +++ b/libraries/chain/include/graphene/chain/witness_evaluator.hpp @@ -30,15 +30,4 @@ namespace graphene { namespace chain { object_id_type do_apply( const witness_create_operation& o ); }; - class witness_withdraw_pay_evaluator : public evaluator - { - public: - typedef witness_withdraw_pay_operation operation_type; - - void_result do_evaluate( const operation_type& o ); - void_result do_apply( const operation_type& o ); - - const witness_object* witness; - const account_object* to_account; - }; } } // graphene::chain diff --git a/libraries/chain/include/graphene/chain/witness_object.hpp b/libraries/chain/include/graphene/chain/witness_object.hpp index 875db07e..4c83ba55 100644 --- a/libraries/chain/include/graphene/chain/witness_object.hpp +++ b/libraries/chain/include/graphene/chain/witness_object.hpp @@ -35,7 +35,7 @@ namespace graphene { namespace chain { public_key_type signing_key; secret_hash_type next_secret_hash; secret_hash_type previous_secret; - share_type accumulated_income; + optional< vesting_balance_id_type > pay_vb; vote_id_type vote_id; string url; @@ -62,6 +62,6 @@ FC_REFLECT_DERIVED( graphene::chain::witness_object, (graphene::db::object), (signing_key) (next_secret_hash) (previous_secret) - (accumulated_income) + (pay_vb) (vote_id) (url) ) diff --git a/libraries/chain/protocol/witness.cpp b/libraries/chain/protocol/witness.cpp index 079a54c2..12d7ecb0 100644 --- a/libraries/chain/protocol/witness.cpp +++ b/libraries/chain/protocol/witness.cpp @@ -3,17 +3,10 @@ namespace graphene { namespace chain { - void witness_create_operation::validate() const { FC_ASSERT(fee.amount >= 0); FC_ASSERT(url.size() < GRAPHENE_MAX_URL_LENGTH ); } -void witness_withdraw_pay_operation::validate() const -{ - FC_ASSERT( fee.amount >= 0 ); - FC_ASSERT( amount >= 0 ); -} - } } // graphene::chain diff --git a/libraries/chain/witness_evaluator.cpp b/libraries/chain/witness_evaluator.cpp index 65a2387a..792c1251 100644 --- a/libraries/chain/witness_evaluator.cpp +++ b/libraries/chain/witness_evaluator.cpp @@ -46,30 +46,4 @@ object_id_type witness_create_evaluator::do_apply( const witness_create_operatio return new_witness_object.id; } FC_CAPTURE_AND_RETHROW( (op) ) } -void_result witness_withdraw_pay_evaluator::do_evaluate(const witness_withdraw_pay_evaluator::operation_type& o) -{ try { - database& d = db(); - - witness = &d.get(o.from_witness); - FC_ASSERT( o.to_account == witness->witness_account ); - FC_ASSERT( o.amount <= witness->accumulated_income, "Attempting to withdraw ${w}, but witness has only earned ${e}.", - ("w", o.amount)("e", witness->accumulated_income) ); - to_account = &d.get(o.to_account); - - return void_result(); -} FC_CAPTURE_AND_RETHROW( (o) ) } - -void_result witness_withdraw_pay_evaluator::do_apply(const witness_withdraw_pay_evaluator::operation_type& o) -{ try { - database& d = db(); - - d.adjust_balance(o.to_account, asset(o.amount)); - - d.modify(*witness, [&o](witness_object& w) { - w.accumulated_income -= o.amount; - }); - - return void_result(); -} FC_CAPTURE_AND_RETHROW( (o) ) } - } } // graphene::chain diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp index 6986bcca..82182a59 100644 --- a/libraries/wallet/wallet.cpp +++ b/libraries/wallet/wallet.cpp @@ -2196,8 +2196,6 @@ operation wallet_api::get_prototype_operation(string operation_name) return graphene::chain::committee_member_create_operation(); if (operation_name == "witness_create_operation") return graphene::chain::witness_create_operation(); - if (operation_name == "witness_withdraw_pay_operation") - return graphene::chain::witness_withdraw_pay_operation(); if (operation_name == "committee_member_update_global_parameters_operation") return graphene::chain::committee_member_update_global_parameters_operation(); if (operation_name == "transfer_operation") diff --git a/tests/common/database_fixture.cpp b/tests/common/database_fixture.cpp index 69d557d8..3022fbe6 100644 --- a/tests/common/database_fixture.cpp +++ b/tests/common/database_fixture.cpp @@ -181,10 +181,6 @@ void database_fixture::verify_asset_supplies( const database& db ) total_balances[bad.options.short_backing_asset] += bad.settlement_fund; } } - for( const witness_object& witness_obj : db.get_index_type().indices() ) - { - total_balances[asset_id_type()] += witness_obj.accumulated_income; - } for( const vesting_balance_object& vbo : db.get_index_type< simple_index >() ) total_balances[ vbo.balance.asset_id ] += vbo.balance.amount; diff --git a/tests/tests/operation_tests.cpp b/tests/tests/operation_tests.cpp index 7c28ba4d..11620145 100644 --- a/tests/tests/operation_tests.cpp +++ b/tests/tests/operation_tests.cpp @@ -1100,7 +1100,7 @@ BOOST_AUTO_TEST_CASE( fill_order ) //o.calculate_fee(db.current_fee_schedule()); } FC_LOG_AND_RETHROW() } -BOOST_AUTO_TEST_CASE( witness_withdraw_pay_test ) +BOOST_AUTO_TEST_CASE( witness_pay_test ) { try { // there is an immediate maintenance interval in the first block // which will initialize last_budget_time @@ -1112,9 +1112,17 @@ BOOST_AUTO_TEST_CASE( witness_withdraw_pay_test ) transfer(account_id_type()(db), get_account("init3"), asset(20*CORE)); generate_block(); + auto last_witness_vbo_balance = [&]() -> share_type + { + const witness_object& wit = db.fetch_block_by_number(db.head_block_num())->witness(db); + if( !wit.pay_vb.valid() ) + return 0; + return (*wit.pay_vb)(db).balance.amount; + }; + const asset_object* core = &asset_id_type()(db); const account_object* nathan = &get_account("nathan"); - enable_fees();//105000000); + enable_fees(); BOOST_CHECK_GT(db.current_fee_schedule().get().membership_lifetime_fee, 0); // Based on the size of the reserve fund later in the test, the witness budget will be set to this value const uint64_t ref_budget = @@ -1156,9 +1164,7 @@ BOOST_AUTO_TEST_CASE( witness_withdraw_pay_test ) generate_block(); nathan = &get_account("nathan"); core = &asset_id_type()(db); - const witness_object* witness = &db.fetch_block_by_number(db.head_block_num())->witness(db); - - BOOST_CHECK_EQUAL(witness->accumulated_income.value, 0); + BOOST_CHECK_EQUAL( last_witness_vbo_balance().value, 0 ); auto schedule_maint = [&]() { @@ -1174,8 +1180,7 @@ BOOST_AUTO_TEST_CASE( witness_withdraw_pay_test ) while( db.head_block_num() < 30 ) { generate_block(); - witness = &db.fetch_block_by_number(db.head_block_num())->witness(db); - BOOST_CHECK_EQUAL( witness->accumulated_income.value, 0 ); + BOOST_CHECK_EQUAL( last_witness_vbo_balance().value, 0 ); } BOOST_CHECK_EQUAL( db.head_block_num(), 30 ); // maintenance will be in block 31. time of block 31 - time of block 1 = 30 * 5 seconds. @@ -1186,51 +1191,27 @@ BOOST_AUTO_TEST_CASE( witness_withdraw_pay_test ) generate_block(); BOOST_CHECK_EQUAL( core->reserved(db).value, 999999406 ); BOOST_CHECK_EQUAL( db.get_dynamic_global_properties().witness_budget.value, ref_budget ); - witness = &db.fetch_block_by_number(db.head_block_num())->witness(db); // first witness paid from old budget (so no pay) - BOOST_CHECK_EQUAL( witness->accumulated_income.value, 0 ); + BOOST_CHECK_EQUAL( last_witness_vbo_balance().value, 0 ); // second witness finally gets paid! generate_block(); - witness = &db.fetch_block_by_number(db.head_block_num())->witness(db); - const witness_object* paid_witness = witness; - BOOST_CHECK_EQUAL( witness->accumulated_income.value, witness_ppb ); + BOOST_CHECK_EQUAL( last_witness_vbo_balance().value, witness_ppb ); BOOST_CHECK_EQUAL( db.get_dynamic_global_properties().witness_budget.value, ref_budget - witness_ppb ); generate_block(); - witness = &db.fetch_block_by_number(db.head_block_num())->witness(db); - BOOST_CHECK_EQUAL( witness->accumulated_income.value, witness_ppb ); + BOOST_CHECK_EQUAL( last_witness_vbo_balance().value, witness_ppb ); BOOST_CHECK_EQUAL( db.get_dynamic_global_properties().witness_budget.value, ref_budget - 2 * witness_ppb ); generate_block(); - witness = &db.fetch_block_by_number(db.head_block_num())->witness(db); - BOOST_CHECK_LT( witness->accumulated_income.value, witness_ppb ); - BOOST_CHECK_EQUAL( witness->accumulated_income.value, ref_budget - 2 * witness_ppb ); + BOOST_CHECK_LT( last_witness_vbo_balance().value, witness_ppb ); + BOOST_CHECK_EQUAL( last_witness_vbo_balance().value, ref_budget - 2 * witness_ppb ); BOOST_CHECK_EQUAL( db.get_dynamic_global_properties().witness_budget.value, 0 ); generate_block(); - witness = &db.fetch_block_by_number(db.head_block_num())->witness(db); - BOOST_CHECK_EQUAL( witness->accumulated_income.value, 0 ); + BOOST_CHECK_EQUAL( last_witness_vbo_balance().value, 0 ); BOOST_CHECK_EQUAL( db.get_dynamic_global_properties().witness_budget.value, 0 ); - - trx.set_expiration(db.head_block_time() + GRAPHENE_DEFAULT_MAX_TIME_UNTIL_EXPIRATION); - // Withdraw the witness's pay - enable_fees();//1); - witness = paid_witness; - witness_withdraw_pay_operation wop; - wop.from_witness = witness->id; - wop.to_account = witness->witness_account; - wop.amount = witness->accumulated_income; - trx.operations.push_back(wop); - REQUIRE_THROW_WITH_VALUE(wop, amount, witness->accumulated_income.value * 2); - trx.operations.back() = wop; - for( auto& op : trx.operations ) db.current_fee_schedule().set_fee(op); - trx.validate(); - db.push_transaction(trx, database::skip_authority_check); - trx.clear(); - - BOOST_CHECK_EQUAL(get_balance(witness->witness_account(db), *core), witness_ppb ); BOOST_CHECK_EQUAL(core->reserved(db).value, 999999406 ); - BOOST_CHECK_EQUAL(witness->accumulated_income.value, 0); + } FC_LOG_AND_RETHROW() } /** From 15724170b825dd05c3a7b18debdcdb7a15c10bf7 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 15 Jul 2015 13:45:56 -0400 Subject: [PATCH 014/353] Fix test failures due to now-required expiration --- tests/tests/authority_tests.cpp | 2 ++ tests/tests/operation_tests.cpp | 1 + 2 files changed, 3 insertions(+) diff --git a/tests/tests/authority_tests.cpp b/tests/tests/authority_tests.cpp index f40c3eb3..8b0c6cbf 100644 --- a/tests/tests/authority_tests.cpp +++ b/tests/tests/authority_tests.cpp @@ -909,6 +909,7 @@ BOOST_FIXTURE_TEST_CASE( max_authority_membership, database_fixture ) private_key_type privkey = generate_private_key( seed ); private_keys.push_back( privkey ); } + tx.set_expiration( db.head_block_time() + fc::minutes(5) ); ptx = PUSH_TX( db, tx, ~0 ); vector key_ids; @@ -946,6 +947,7 @@ BOOST_FIXTURE_TEST_CASE( max_authority_membership, database_fixture ) anon_create_op.name = generate_anon_acct_name(); tx.operations.push_back( anon_create_op ); + tx.set_expiration( db.head_block_time() + fc::minutes(5) ); if( num_keys > max_authority_membership ) { diff --git a/tests/tests/operation_tests.cpp b/tests/tests/operation_tests.cpp index 11620145..cfcacd29 100644 --- a/tests/tests/operation_tests.cpp +++ b/tests/tests/operation_tests.cpp @@ -1391,6 +1391,7 @@ BOOST_AUTO_TEST_CASE( vesting_balance_withdraw_test ) create_op.amount = amount; create_op.policy = cdd_vesting_policy_initializer(vesting_seconds); tx.operations.push_back( create_op ); + tx.set_expiration( db.head_block_time() + fc::minutes(5) ); processed_transaction ptx = PUSH_TX( db, tx, ~0 ); const vesting_balance_object& vbo = vesting_balance_id_type( From 7f54d3d07758d6750a3c7b472160c23cf82e6929 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Wed, 15 Jul 2015 14:13:24 -0400 Subject: [PATCH 015/353] Issue #160 - Dynamic Undo History / Minority Fork The blockchain now has a minimal participation requirement that can only be overridden with checkpoints. Any time participation falls below a minimal level no new blocks may be added. Currently it requires 66% participation and tolerates short periods of time below 66% participation with a maximum of 500 consecutive blocks missed. For every two blocks produced 1 can be missed with a slack of 999 bias. --- libraries/chain/db_block.cpp | 13 ++++++++++- libraries/chain/db_init.cpp | 1 + libraries/chain/db_update.cpp | 23 +++++++++++++++++-- .../chain/include/graphene/chain/config.hpp | 5 +++- .../chain/include/graphene/chain/database.hpp | 3 ++- .../include/graphene/chain/exceptions.hpp | 1 + .../graphene/chain/global_property_object.hpp | 11 ++++++++- .../chain/protocol/chain_parameters.hpp | 4 ++-- libraries/db/undo_database.cpp | 2 +- tests/common/database_fixture.cpp | 1 + 10 files changed, 55 insertions(+), 9 deletions(-) diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index 8fa9eaba..dccabbb0 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -25,6 +25,7 @@ #include #include #include +#include namespace graphene { namespace chain { @@ -305,7 +306,9 @@ signed_block database::_generate_block( _pending_block.transactions.clear(); bool failed = false; - try { push_block( tmp, skip ); } catch ( const fc::exception& e ) { failed = true; } + try { push_block( tmp, skip ); } + catch ( const undo_database_exception& e ) { throw; } + catch ( const fc::exception& e ) { failed = true; } if( failed ) { for( const auto& trx : tmp.transactions ) @@ -378,6 +381,14 @@ void database::apply_block( const signed_block& next_block, uint32_t skip ) { // WE CAN SKIP ALMOST EVERYTHING skip = ~0; + + /** clear the recently missed count because the checkpoint indicates that + * we will never have to go back further than this. + */ + const auto& _dgp = dynamic_global_property_id_type(0)(*this); + modify( _dgp, [&]( dynamic_global_property_object& dgp ){ + dgp.recently_missed_count = 0; + }); } } diff --git a/libraries/chain/db_init.cpp b/libraries/chain/db_init.cpp index 287a810e..ccbd7945 100644 --- a/libraries/chain/db_init.cpp +++ b/libraries/chain/db_init.cpp @@ -156,6 +156,7 @@ void database::initialize_evaluators() void database::initialize_indexes() { reset_indexes(); + _undo_db.set_max_size( GRAPHENE_MIN_UNDO_HISTORY ); //Protocol object indexes add_index< primary_index >(); diff --git a/libraries/chain/db_update.cpp b/libraries/chain/db_update.cpp index d76db321..84456326 100644 --- a/libraries/chain/db_update.cpp +++ b/libraries/chain/db_update.cpp @@ -36,6 +36,10 @@ void database::update_global_dynamic_data( const signed_block& b ) const dynamic_global_property_object& _dgp = dynamic_global_property_id_type(0)(*this); + const auto& global_props = get_global_properties(); + auto delta_time = b.timestamp - _dgp.time; + auto missed_blocks = (delta_time.to_seconds() / global_props.parameters.block_interval) - 1; + // // dynamic global properties updating // @@ -44,11 +48,27 @@ void database::update_global_dynamic_data( const signed_block& b ) fc::raw::pack( enc, dgp.random ); fc::raw::pack( enc, b.previous_secret ); dgp.random = enc.result(); + + if( missed_blocks ) + dgp.recently_missed_count += 2*missed_blocks; + else if( dgp.recently_missed_count > 0 ) + dgp.recently_missed_count--; + dgp.head_block_number = b.block_num(); dgp.head_block_id = b.id(); dgp.time = b.timestamp; dgp.current_witness = b.witness; }); + + if( !(get_node_properties().skip_flags & skip_undo_history_check) ) + { + GRAPHENE_ASSERT( _dgp.recently_missed_count < GRAPHENE_MAX_UNDO_HISTORY, undo_database_exception, + "The database does not have enough undo history to support a blockchain with so many missed blocks. " + "Please add a checkpoint if you would like to continue applying blocks beyond this point.", + ("recently_missed",_dgp.recently_missed_count)("max_undo",GRAPHENE_MAX_UNDO_HISTORY) ); + } + + _undo_db.set_max_size( _dgp.recently_missed_count + GRAPHENE_MIN_UNDO_HISTORY ); } void database::update_signing_witness(const witness_object& signing_witness, const signed_block& new_block) @@ -88,9 +108,8 @@ void database::clear_expired_transactions() auto& transaction_idx = static_cast(get_mutable_index(implementation_ids, impl_transaction_object_type)); const auto& dedupe_index = transaction_idx.indices().get(); const auto& global_parameters = get_global_properties().parameters; - auto forking_window_time = global_parameters.maximum_undo_history * global_parameters.block_interval; while( !dedupe_index.empty() - && head_block_time() - dedupe_index.rbegin()->trx.expiration >= fc::seconds(forking_window_time) ) + && head_block_time() - dedupe_index.rbegin()->trx.expiration >= fc::seconds(global_parameters.maximum_expiration) ) transaction_idx.remove(*dedupe_index.rbegin()); } diff --git a/libraries/chain/include/graphene/chain/config.hpp b/libraries/chain/include/graphene/chain/config.hpp index 61add015..5fa13169 100644 --- a/libraries/chain/include/graphene/chain/config.hpp +++ b/libraries/chain/include/graphene/chain/config.hpp @@ -46,7 +46,10 @@ #define GRAPHENE_DEFAULT_MAX_BLOCK_SIZE (GRAPHENE_DEFAULT_MAX_TRANSACTION_SIZE*GRAPHENE_DEFAULT_BLOCK_INTERVAL*200000) #define GRAPHENE_DEFAULT_MAX_TIME_UNTIL_EXPIRATION (60*60*24) // seconds, aka: 1 day #define GRAPHENE_DEFAULT_MAINTENANCE_INTERVAL (60*60*24) // seconds, aka: 1 day -#define GRAPHENE_DEFAULT_MAX_UNDO_HISTORY 1024 +#define GRAPHENE_DEFAULT_MAX_EXPIRATION_SEC (60*60) // 1 hour + +#define GRAPHENE_MIN_UNDO_HISTORY 10 +#define GRAPHENE_MAX_UNDO_HISTORY 1000 #define GRAPHENE_MIN_BLOCK_SIZE_LIMIT (GRAPHENE_MIN_TRANSACTION_SIZE_LIMIT*5) // 5 transactions per block #define GRAPHENE_MIN_TRANSACTION_EXPIRATION_LIMIT (GRAPHENE_MAX_BLOCK_INTERVAL * 5) // 5 transactions per block diff --git a/libraries/chain/include/graphene/chain/database.hpp b/libraries/chain/include/graphene/chain/database.hpp index 0500f834..13d4a8ff 100644 --- a/libraries/chain/include/graphene/chain/database.hpp +++ b/libraries/chain/include/graphene/chain/database.hpp @@ -90,7 +90,8 @@ namespace graphene { namespace chain { skip_tapos_check = 1 << 7, ///< used while reindexing -- note this skips expiration check as well skip_authority_check = 1 << 8, ///< used while reindexing -- disables any checking of authority on transactions skip_merkle_check = 1 << 9, ///< used while reindexing - skip_assert_evaluation = 1 << 10 ///< used while reindexing + skip_assert_evaluation = 1 << 10, ///< used while reindexing + skip_undo_history_check = 1 << 11 ///< used while reindexing }; /** diff --git a/libraries/chain/include/graphene/chain/exceptions.hpp b/libraries/chain/include/graphene/chain/exceptions.hpp index b18859a2..76648bef 100644 --- a/libraries/chain/include/graphene/chain/exceptions.hpp +++ b/libraries/chain/include/graphene/chain/exceptions.hpp @@ -68,6 +68,7 @@ namespace graphene { namespace chain { FC_DECLARE_DERIVED_EXCEPTION( operation_validate_exception, graphene::chain::chain_exception, 3040000, "operation validation exception" ) FC_DECLARE_DERIVED_EXCEPTION( operation_evaluate_exception, graphene::chain::chain_exception, 3050000, "operation evaluation exception" ) FC_DECLARE_DERIVED_EXCEPTION( utility_exception, graphene::chain::chain_exception, 3060000, "utility method exception" ) + FC_DECLARE_DERIVED_EXCEPTION( undo_database_exception, graphene::chain::chain_exception, 3070000, "undo database exception" ) FC_DECLARE_DERIVED_EXCEPTION( tx_missing_active_auth, graphene::chain::transaction_exception, 3030001, "missing required active authority" ) FC_DECLARE_DERIVED_EXCEPTION( tx_missing_owner_auth, graphene::chain::transaction_exception, 3030002, "missing required owner authority" ) diff --git a/libraries/chain/include/graphene/chain/global_property_object.hpp b/libraries/chain/include/graphene/chain/global_property_object.hpp index 4b83b993..1ba5dc07 100644 --- a/libraries/chain/include/graphene/chain/global_property_object.hpp +++ b/libraries/chain/include/graphene/chain/global_property_object.hpp @@ -77,7 +77,15 @@ namespace graphene { namespace chain { time_point_sec next_maintenance_time; time_point_sec last_budget_time; share_type witness_budget; - uint32_t accounts_registered_this_interval; + uint32_t accounts_registered_this_interval = 0; + /** + * Every time a block is missed this increases by 2, every time a block is found it decreases by 1 it is + * never less than 0 + * + * If the recently_missed_count hits 2*UNDO_HISTORY then no ew blocks may be pushed. + */ + uint32_t recently_missed_count = 0; + /** if the interval changes then how we calculate witness participation will * also change. Normally witness participation is defined as % of blocks * produced in the last round which is calculated by dividing the delta @@ -97,6 +105,7 @@ FC_REFLECT_DERIVED( graphene::chain::dynamic_global_property_object, (graphene:: (next_maintenance_time) (witness_budget) (accounts_registered_this_interval) + (recently_missed_count) (first_maintenance_block_with_current_interval) ) diff --git a/libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp b/libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp index 55a068c0..3baca598 100644 --- a/libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp +++ b/libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp @@ -39,7 +39,7 @@ namespace graphene { namespace chain { uint32_t committee_proposal_review_period = GRAPHENE_DEFAULT_COMMITTEE_PROPOSAL_REVIEW_PERIOD_SEC; ///< minimum time in seconds that a proposed transaction requiring committee authority may not be signed, prior to expiration uint32_t maximum_transaction_size = GRAPHENE_DEFAULT_MAX_TRANSACTION_SIZE; ///< maximum allowable size in bytes for a transaction uint32_t maximum_block_size = GRAPHENE_DEFAULT_MAX_BLOCK_SIZE; ///< maximum allowable size in bytes for a block - uint32_t maximum_undo_history = GRAPHENE_DEFAULT_MAX_UNDO_HISTORY; ///< maximum number of undo states to keep in RAM + uint32_t maximum_expiration = GRAPHENE_DEFAULT_MAX_EXPIRATION_SEC; ///< maximum number of seconds in the future a transaction may expire uint32_t maximum_time_until_expiration = GRAPHENE_DEFAULT_MAX_TIME_UNTIL_EXPIRATION; ///< maximum lifetime in seconds for transactions to be valid, before expiring uint32_t maximum_proposal_lifetime = GRAPHENE_DEFAULT_MAX_PROPOSAL_LIFETIME_SEC; ///< maximum lifetime in seconds for proposed transactions to be kept, before expiring uint8_t maximum_asset_whitelist_authorities = GRAPHENE_DEFAULT_MAX_ASSET_WHITELIST_AUTHORITIES; ///< maximum number of accounts which an asset may list as authorities for its whitelist OR blacklist @@ -102,7 +102,7 @@ FC_REFLECT( graphene::chain::chain_parameters, (committee_proposal_review_period) (maximum_transaction_size) (maximum_block_size) - (maximum_undo_history) + (maximum_expiration) (maximum_time_until_expiration) (maximum_proposal_lifetime) (maximum_asset_whitelist_authorities) diff --git a/libraries/db/undo_database.cpp b/libraries/db/undo_database.cpp index 87be9846..9534f683 100644 --- a/libraries/db/undo_database.cpp +++ b/libraries/db/undo_database.cpp @@ -28,7 +28,7 @@ undo_database::session undo_database::start_undo_session() { if( _disabled ) return session(*this); - if( size() == max_size() ) + while( size() > max_size() ) _stack.pop_front(); _stack.emplace_back(); diff --git a/tests/common/database_fixture.cpp b/tests/common/database_fixture.cpp index 69d557d8..6bccc542 100644 --- a/tests/common/database_fixture.cpp +++ b/tests/common/database_fixture.cpp @@ -296,6 +296,7 @@ signed_block database_fixture::generate_block(uint32_t skip, const fc::ecc::priv { open_database(); + skip |= database::skip_undo_history_check; // skip == ~0 will skip checks specified in database::validation_steps return db.generate_block(db.get_slot_time(miss_blocks + 1), db.get_scheduled_witness(miss_blocks + 1).first, From aa794e7836244e0287f3fa3d94e8081b513af08f Mon Sep 17 00:00:00 2001 From: Eric Frias Date: Wed, 15 Jul 2015 14:37:03 -0400 Subject: [PATCH 016/353] By default, log p2p messages to logs/p2p/p2p.log, default to stderr, progress on #149 --- programs/witness_node/main.cpp | 142 +++++++++++++++++++++++++++++++-- 1 file changed, 137 insertions(+), 5 deletions(-) diff --git a/programs/witness_node/main.cpp b/programs/witness_node/main.cpp index 99387f31..cbf53f7d 100644 --- a/programs/witness_node/main.cpp +++ b/programs/witness_node/main.cpp @@ -23,9 +23,19 @@ #include #include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include + #include #include @@ -35,6 +45,9 @@ using namespace graphene; namespace bpo = boost::program_options; + +void write_default_logging_config_to_stream(std::ostream& out); +fc::optional load_logging_config_from_ini_file(const fc::path& config_ini_filename); int main(int argc, char** argv) { try { @@ -80,14 +93,24 @@ int main(int argc, char** argv) { data_dir = fc::current_path() / data_dir; } - if( fc::exists(data_dir / "config.ini") ) - bpo::store(bpo::parse_config_file((data_dir / "config.ini").preferred_string().c_str(), cfg_options), options); - else { - ilog("Writing new config file at ${path}", ("path", data_dir/"config.ini")); + fc::path config_ini_path = data_dir / "config.ini"; + if( fc::exists(config_ini_path) ) + { + // get the basic options + bpo::store(bpo::parse_config_file(config_ini_path.preferred_string().c_str(), cfg_options, true), options); + + // try to get logging options from the config file. + fc::optional logging_config = load_logging_config_from_ini_file(config_ini_path); + if (logging_config) + fc::configure_logging(*logging_config); + } + else + { + ilog("Writing new config file at ${path}", ("path", config_ini_path)); if( !fc::exists(data_dir) ) fc::create_directories(data_dir); - std::ofstream out_cfg((data_dir / "config.ini").preferred_string()); + std::ofstream out_cfg(config_ini_path.preferred_string()); for( const boost::shared_ptr od : cfg_options.options() ) { if( !od->description().empty() ) @@ -109,6 +132,12 @@ int main(int argc, char** argv) { } out_cfg << "\n"; } + write_default_logging_config_to_stream(out_cfg); + out_cfg.close(); + // read the default logging config we just wrote out to the file and start using it + fc::optional logging_config = load_logging_config_from_ini_file(config_ini_path); + if (logging_config) + fc::configure_logging(*logging_config); } bpo::notify(options); @@ -136,3 +165,106 @@ int main(int argc, char** argv) { return 1; } } + +// logging config is too complicated to be parsed by boost::program_options, +// so we do it by hand +// +// Currently, you can only specify the filenames and logging levels, which +// are all most users would want to change. At a later time, options can +// be added to control rotation intervals, compression, and other seldom- +// used features +void write_default_logging_config_to_stream(std::ostream& out) +{ + out << "# declare an appender named \"stderr\" that writes messages to the console\n" + "[log.console_appender.stderr]\n" + "stream=std_error\n\n" + "# declare an appender named \"p2p\" that writes messages to p2p.log\n" + "[log.file_appender.p2p]\n" + "filename=logs/p2p/p2p.log\n" + "# filename can be absolute or relative to this config file\n\n" + "# route any messages logged to the default logger to the \"stderr\" logger we\n" + "# declared above, if they are info level are higher\n" + "[logger.default]\n" + "level=info\n" + "appenders=stderr\n\n" + "# route messages sent to the \"p2p\" logger to the p2p appender declared above\n" + "[logger.p2p]\n" + "level=debug\n" + "appenders=p2p\n\n"; +} + +fc::optional load_logging_config_from_ini_file(const fc::path& config_ini_filename) +{ + fc::logging_config logging_config; + bool found_logging_config = false; + + boost::property_tree::ptree config_ini_tree; + boost::property_tree::ini_parser::read_ini(config_ini_filename.preferred_string().c_str(), config_ini_tree); + for (const auto& section : config_ini_tree) + { + const std::string& section_name = section.first; + const boost::property_tree::ptree& section_tree = section.second; + + const std::string console_appender_section_prefix = "log.console_appender."; + const std::string file_appender_section_prefix = "log.file_appender."; + const std::string logger_section_prefix = "logger."; + + if (boost::starts_with(section_name, console_appender_section_prefix)) + { + std::string console_appender_name = section_name.substr(console_appender_section_prefix.length()); + std::string stream_name = section_tree.get("stream"); + + // construct a default console appender config here + // stdout/stderr will be taken from ini file, everything else hard-coded here + fc::console_appender::config console_appender_config; + console_appender_config.level_colors.emplace_back( + fc::console_appender::level_color(fc::log_level::debug, + fc::console_appender::color::green)); + console_appender_config.level_colors.emplace_back( + fc::console_appender::level_color(fc::log_level::warn, + fc::console_appender::color::brown)); + console_appender_config.level_colors.emplace_back( + fc::console_appender::level_color(fc::log_level::error, + fc::console_appender::color::cyan)); + console_appender_config.stream = fc::variant(stream_name).as(); + logging_config.appenders.push_back(fc::appender_config(console_appender_name, "console", fc::variant(console_appender_config))); + found_logging_config = true; + } + else if (boost::starts_with(section_name, file_appender_section_prefix)) + { + std::string file_appender_name = section_name.substr(file_appender_section_prefix.length()); + fc::path file_name = section_tree.get("filename"); + if (file_name.is_relative()) + file_name = fc::absolute(config_ini_filename).parent_path() / file_name; + + + // construct a default file appender config here + // filename will be taken from ini file, everything else hard-coded here + fc::file_appender::config file_appender_config; + file_appender_config.filename = file_name; + file_appender_config.flush = true; + file_appender_config.rotate = true; + file_appender_config.rotation_interval = fc::hours(1); + file_appender_config.rotation_limit = fc::days(1); + logging_config.appenders.push_back(fc::appender_config(file_appender_name, "file", fc::variant(file_appender_config))); + found_logging_config = true; + } + else if (boost::starts_with(section_name, logger_section_prefix)) + { + std::string logger_name = section_name.substr(logger_section_prefix.length()); + std::string level_string = section_tree.get("level"); + std::string appenders_string = section_tree.get("appenders"); + fc::logger_config logger_config(logger_name); + logger_config.level = fc::variant(level_string).as(); + boost::split(logger_config.appenders, appenders_string, + boost::is_any_of(" ,"), + boost::token_compress_on); + logging_config.loggers.push_back(logger_config); + found_logging_config = true; + } + } + if (found_logging_config) + return logging_config; + else + return fc::optional(); +} From 8944facd4129e60155debdf1064b0a96bd43965a Mon Sep 17 00:00:00 2001 From: Eric Frias Date: Wed, 15 Jul 2015 14:42:35 -0400 Subject: [PATCH 017/353] Fix signed/unsigned mismatch warning --- libraries/chain/protocol/fee_schedule.cpp | 12 +++++++++++- programs/js_operation_serializer/main.cpp | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/libraries/chain/protocol/fee_schedule.cpp b/libraries/chain/protocol/fee_schedule.cpp index 8636691f..a87fec45 100644 --- a/libraries/chain/protocol/fee_schedule.cpp +++ b/libraries/chain/protocol/fee_schedule.cpp @@ -1,6 +1,16 @@ #include #include +namespace fc +{ + // explicitly instantiate the smart_ref, gcc fails to instantiate it in some release builds + //template graphene::chain::fee_schedule& smart_ref::operator=(smart_ref&&); + //template graphene::chain::fee_schedule& smart_ref::operator=(U&&); + //template graphene::chain::fee_schedule& smart_ref::operator=(const smart_ref&); + //template smart_ref::smart_ref(); + //template const graphene::chain::fee_schedule& smart_ref::operator*() const; +} + namespace graphene { namespace chain { typedef fc::smart_ref smart_fee_schedule; @@ -12,7 +22,7 @@ namespace graphene { namespace chain { fee_schedule fee_schedule::get_default() { fee_schedule result; - for( uint32_t i = 0; i < fee_parameters().count(); ++i ) + for( int i = 0; i < fee_parameters().count(); ++i ) { fee_parameters x; x.set_which(i); result.parameters.insert(x); diff --git a/programs/js_operation_serializer/main.cpp b/programs/js_operation_serializer/main.cpp index 8d81db24..6022b9fe 100644 --- a/programs/js_operation_serializer/main.cpp +++ b/programs/js_operation_serializer/main.cpp @@ -365,7 +365,7 @@ int main( int argc, char** argv ) operation op; std::cout << "ChainTypes.operations=\n"; - for( uint32_t i = 0; i < op.count(); ++i ) + for( int i = 0; i < op.count(); ++i ) { op.set_which(i); op.visit( detail_ns::serialize_type_visitor(i) ); From b6a5119226d66690cea842d3d128e1aac857efc7 Mon Sep 17 00:00:00 2001 From: Eric Frias Date: Wed, 15 Jul 2015 15:48:01 -0400 Subject: [PATCH 018/353] Allow using hostnames for seed nodes --- libraries/app/application.cpp | 45 +++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 7 deletions(-) diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp index 9eb15af7..305b689a 100644 --- a/libraries/app/application.cpp +++ b/libraries/app/application.cpp @@ -30,6 +30,7 @@ #include #include +#include #include #include @@ -101,12 +102,15 @@ namespace detail { if( _options->count("seed-node") ) { auto seeds = _options->at("seed-node").as>(); - for( const string& ep : seeds ) + for( const string& endpoint_string : seeds ) { - fc::ip::endpoint node = fc::ip::endpoint::from_string(ep); - ilog("Adding seed node ${ip}", ("ip", node)); - _p2p_network->add_node(node); - _p2p_network->connect_to_endpoint(node); + std::vector endpoints = resolve_string_to_ip_endpoints(endpoint_string); + for (const fc::ip::endpoint& endpoint : endpoints) + { + ilog("Adding seed node ${endpoint}", ("endpoint", endpoint)); + _p2p_network->add_node(endpoint); + _p2p_network->connect_to_endpoint(endpoint); + } } } @@ -123,6 +127,33 @@ namespace detail { std::vector()); } FC_CAPTURE_AND_RETHROW() } + std::vector resolve_string_to_ip_endpoints(const std::string& endpoint_string) + { + try + { + string::size_type colon_pos = endpoint_string.find(':'); + if (colon_pos == std::string::npos) + FC_THROW("Missing required port number in endpoint string \"${endpoint_string}\"", + ("endpoint_string", endpoint_string)); + std::string port_string = endpoint_string.substr(colon_pos + 1); + try + { + uint16_t port = boost::lexical_cast(port_string); + + std::string hostname = endpoint_string.substr(0, colon_pos); + std::vector endpoints = fc::resolve(hostname, port); + if (endpoints.empty()) + FC_THROW_EXCEPTION(fc::unknown_host_exception, "The host name can not be resolved: ${hostname}", ("hostname", hostname)); + return endpoints; + } + catch (const boost::bad_lexical_cast&) + { + FC_THROW("Bad port: ${port}", ("port", port_string)); + } + } + FC_CAPTURE_AND_RETHROW((endpoint_string)) + } + void reset_websocket_server() { try { if( !_options->count("rpc-endpoint") ) @@ -395,9 +426,9 @@ namespace detail { { try { std::vector result; result.reserve(30); - auto head_block_num = _chain_db->head_block_num(); + uint32_t head_block_num = _chain_db->head_block_num(); result.push_back(_chain_db->head_block_id()); - auto current = 1; + uint32_t current = 1; while( current < head_block_num ) { result.push_back(_chain_db->get_block_id_for_num(head_block_num - current)); From 8c91d17301a942a72260b19b421bab799701d753 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 15 Jul 2015 15:52:21 -0400 Subject: [PATCH 019/353] fee_tests.cpp: Rewrite cashback_test to compute ref amounts instead of using hardcoded numbers --- tests/tests/fee_tests.cpp | 332 +++++++++++++++++++++++++++++++++----- 1 file changed, 291 insertions(+), 41 deletions(-) diff --git a/tests/tests/fee_tests.cpp b/tests/tests/fee_tests.cpp index f3ebf58c..ed9b6eb4 100644 --- a/tests/tests/fee_tests.cpp +++ b/tests/tests/fee_tests.cpp @@ -16,6 +16,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include #include @@ -26,47 +27,123 @@ using namespace graphene::chain; BOOST_FIXTURE_TEST_SUITE( fee_tests, database_fixture ) +#define CHECK_BALANCE( actor_name, amount ) \ + BOOST_CHECK_EQUAL( get_balance( actor_name ## _id, asset_id_type() ), amount ) + +#define CHECK_VESTED_CASHBACK( actor_name, amount ) \ + BOOST_CHECK_EQUAL( actor_name ## _id(db).statistics(db).pending_vested_fees.value, amount ) + +#define CHECK_UNVESTED_CASHBACK( actor_name, amount ) \ + BOOST_CHECK_EQUAL( actor_name ## _id(db).statistics(db).pending_fees.value, amount ) + +#define GET_CASHBACK_BALANCE( account ) \ + ( (account.cashback_vb.valid()) \ + ? account.cashback_balance(db).balance.amount.value \ + : 0 ) + +#define CHECK_CASHBACK_VBO( actor_name, _amount ) \ + BOOST_CHECK_EQUAL( GET_CASHBACK_BALANCE( actor_name ## _id(db) ), _amount ) + +#define P100 GRAPHENE_100_PERCENT +#define P1 GRAPHENE_1_PERCENT + +uint64_t pct( uint64_t percentage, uint64_t val ) +{ + fc::uint128_t x = percentage; + x *= val; + x /= GRAPHENE_100_PERCENT; + return x.to_uint64(); +} + +uint64_t pct( uint64_t percentage0, uint64_t percentage1, uint64_t val ) +{ + return pct( percentage1, pct( percentage0, val ) ); +} + +uint64_t pct( uint64_t percentage0, uint64_t percentage1, uint64_t percentage2, uint64_t val ) +{ + return pct( percentage2, pct( percentage1, pct( percentage0, val ) ) ); +} + +struct actor_audit +{ + int64_t b0 = 0; // starting balance parameter + int64_t bal = 0; // balance should be this + int64_t ubal = 0; // unvested balance (in VBO) should be this + int64_t ucb = 0; // unvested cashback in account_statistics should be this + int64_t vcb = 0; // vested cashback in account_statistics should be this + int64_t ref_pct = 0; // referrer percentage should be this +}; BOOST_AUTO_TEST_CASE( cashback_test ) { try { - wlog(""); /* Account Structure used in this test * * * * /-----------------\ /-------------------\ * - * | life (Lifetime) | | reggie (Lifetime) | * + * | life (Lifetime) | | rog (Lifetime) | * * \-----------------/ \-------------------/ * - * | Refers & | Refers | Registers | Registers * - * v Registers v v | * + * | Ref&Reg | Refers | Registers | Registers * + * | | 75 | 25 | * + * v v v | * * /----------------\ /----------------\ | * * | ann (Annual) | | dumy (basic) | | * * \----------------/ \----------------/ |-------------. * - * | Refers L--------------------------------. | | * - * v Refers v v | * + * 80 | Refers L--------------------------------. | | * + * v Refers 80 v v 20 | * * /----------------\ /----------------\ | * * | scud (basic) |<------------------------| stud (basic) | | * - * \----------------/ Registers | (Upgrades to | | * + * \----------------/ 20 Registers | (Upgrades to | | 5 * * | Lifetime) | v * * \----------------/ /--------------\ * * L------->| pleb (Basic) | * - * Refers \--------------/ * + * 95 Refers \--------------/ * * * + * Fee distribution chains (80-20 referral/net split, 50-30 referrer/LTM split) * + * life : 80% -> life, 20% -> net * + * rog: 80% -> rog, 20% -> net * + * ann (before upg): 80% -> life, 20% -> net * + * ann (after upg): 80% * 5/8 -> ann, 80% * 3/8 -> life, 20% -> net * + * stud (before upg): 80% * 5/8 -> ann, 80% * 3/8 -> life, 20% * 80% -> rog, * + * 20% -> net * + * stud (after upg): 80% -> stud, 20% -> net * + * dumy : 75% * 80% -> life, 25% * 80% -> rog, 20% -> net * + * scud : 80% * 5/8 -> ann, 80% * 3/8 -> life, 20% * 80% -> stud, 20% -> net * + * pleb : 95% * 80% -> stud, 5% * 80% -> rog, 20% -> net * */ + + BOOST_TEST_MESSAGE("Creating actors"); + ACTOR(life); - ACTOR(reggie); + ACTOR(rog); PREP_ACTOR(ann); PREP_ACTOR(scud); PREP_ACTOR(dumy); PREP_ACTOR(stud); PREP_ACTOR(pleb); - transfer(account_id_type(), life_id, asset(500000*CORE)); - transfer(account_id_type(), reggie_id, asset(500000*CORE)); + + account_id_type ann_id, scud_id, dumy_id, stud_id, pleb_id; + actor_audit alife, arog, aann, ascud, adumy, astud, apleb; + + alife.b0 = 100000000; + arog.b0 = 100000000; + aann.b0 = 1000000; + astud.b0 = 1000000; + astud.ref_pct = 80 * GRAPHENE_1_PERCENT; + ascud.ref_pct = 80 * GRAPHENE_1_PERCENT; + adumy.ref_pct = 75 * GRAPHENE_1_PERCENT; + apleb.ref_pct = 95 * GRAPHENE_1_PERCENT; + + transfer(account_id_type(), life_id, asset(alife.b0)); + alife.bal += alife.b0; + transfer(account_id_type(), rog_id, asset(arog.b0)); + arog.bal += arog.b0; upgrade_to_lifetime_member(life_id); - upgrade_to_lifetime_member(reggie_id); - enable_fees(); + upgrade_to_lifetime_member(rog_id); + + BOOST_TEST_MESSAGE("Enable fees"); const auto& fees = db.get_global_properties().parameters.current_fees; #define CustomRegisterActor(actor_name, registrar_name, referrer_name, referrer_rate) \ - account_id_type actor_name ## _id; \ { \ account_create_operation op; \ op.registrar = registrar_name ## _id; \ @@ -76,61 +153,234 @@ BOOST_AUTO_TEST_CASE( cashback_test ) op.options.memo_key = actor_name ## _private_key.get_public_key(); \ op.active = authority(1, public_key_type(actor_name ## _private_key.get_public_key()), 1); \ op.owner = op.active; \ - op.fee = fees->calculate_fee(op); \ - idump((op.fee)); \ + op.fee = fees->calculate_fee(op); \ trx.operations = {op}; \ trx.sign( registrar_name ## _private_key); \ actor_name ## _id = PUSH_TX( db, trx ).operation_results.front().get(); \ trx.clear(); \ } +#define CustomAuditActor(actor_name) \ + if( actor_name ## _id != account_id_type() ) \ + { \ + CHECK_BALANCE( actor_name, a ## actor_name.bal ); \ + CHECK_VESTED_CASHBACK( actor_name, a ## actor_name.vcb ); \ + CHECK_UNVESTED_CASHBACK( actor_name, a ## actor_name.ucb ); \ + CHECK_CASHBACK_VBO( actor_name, a ## actor_name.ubal ); \ + } - CustomRegisterActor(ann, life, life, 75); +#define CustomAudit() \ + { \ + CustomAuditActor( life ); \ + CustomAuditActor( rog ); \ + CustomAuditActor( ann ); \ + CustomAuditActor( stud ); \ + CustomAuditActor( dumy ); \ + CustomAuditActor( scud ); \ + CustomAuditActor( pleb ); \ + } - transfer(life_id, ann_id, asset(3000*CORE)); - upgrade_to_annual_member(ann_id); + int64_t reg_fee = fees->get< account_create_operation >().premium_fee; + int64_t xfer_fee = fees->get< transfer_operation >().fee; + int64_t upg_an_fee = fees->get< account_upgrade_operation >().membership_annual_fee; + int64_t upg_lt_fee = fees->get< account_upgrade_operation >().membership_lifetime_fee; + // all percentages here are cut from whole pie! + uint64_t network_pct = 20 * P1; + uint64_t lt_pct = 375 * P100 / 1000; - CustomRegisterActor(dumy, reggie, life, 75); - CustomRegisterActor(stud, reggie, ann, 80); + BOOST_TEST_MESSAGE("Register and upgrade Ann"); + { + CustomRegisterActor(ann, life, life, 75); + alife.vcb += reg_fee; alife.bal += -reg_fee; + CustomAudit(); + + transfer(life_id, ann_id, asset(aann.b0)); + alife.vcb += xfer_fee; alife.bal += -xfer_fee -aann.b0; aann.bal += aann.b0; + CustomAudit(); + + upgrade_to_annual_member(ann_id); + aann.ucb += upg_an_fee; aann.bal += -upg_an_fee; + + // audit distribution of fees from Ann + alife.ubal += pct( P100-network_pct, aann.ucb ); + alife.bal += pct( P100-network_pct, aann.vcb ); + aann.ucb = 0; aann.vcb = 0; + CustomAudit(); + } + + BOOST_TEST_MESSAGE("Register dumy and stud"); + CustomRegisterActor(dumy, rog, life, 75); + arog.vcb += reg_fee; arog.bal += -reg_fee; + CustomAudit(); + + CustomRegisterActor(stud, rog, ann, 80); + arog.vcb += reg_fee; arog.bal += -reg_fee; + CustomAudit(); + + BOOST_TEST_MESSAGE("Upgrade stud to lifetime member"); + + transfer(life_id, stud_id, asset(astud.b0)); + alife.vcb += xfer_fee; alife.bal += -astud.b0 -xfer_fee; astud.bal += astud.b0; + CustomAudit(); - transfer(life_id, stud_id, asset(20000*CORE)); upgrade_to_lifetime_member(stud_id); + astud.ucb += upg_lt_fee; astud.bal -= upg_lt_fee; + +/* +network_cut: 20000 +referrer_cut: 40000 -> ann +registrar_cut: 10000 -> rog +lifetime_cut: 30000 -> life + +NET : net +LTM : net' ltm +REF : net' ltm' ref +REG : net' ltm' ref' +*/ + + // audit distribution of fees from stud + alife.ubal += pct( P100-network_pct, lt_pct, astud.ucb ); + aann.ubal += pct( P100-network_pct, P100-lt_pct, astud.ref_pct, astud.ucb ); + arog.ubal += pct( P100-network_pct, P100-lt_pct, P100-astud.ref_pct, astud.ucb ); + astud.ucb = 0; + CustomAudit(); + + BOOST_TEST_MESSAGE("Register pleb and scud"); + + CustomRegisterActor(pleb, rog, stud, 95); + arog.vcb += reg_fee; arog.bal += -reg_fee; + CustomAudit(); - CustomRegisterActor(pleb, reggie, stud, 95); CustomRegisterActor(scud, stud, ann, 80); + astud.vcb += reg_fee; astud.bal += -reg_fee; + CustomAudit(); + + generate_block(); + + BOOST_TEST_MESSAGE("Wait for maintenance interval"); generate_blocks(db.get_dynamic_global_properties().next_maintenance_time); - enable_fees(); + // audit distribution of fees from life + alife.ubal += pct( P100-network_pct, alife.ucb +alife.vcb ); + alife.ucb = 0; alife.vcb = 0; - BOOST_CHECK_EQUAL(life_id(db).cashback_balance(db).balance.amount.value, 78000); - BOOST_CHECK_EQUAL(reggie_id(db).cashback_balance(db).balance.amount.value, 34000); - BOOST_CHECK_EQUAL(ann_id(db).cashback_balance(db).balance.amount.value, 40000); - BOOST_CHECK_EQUAL(stud_id(db).cashback_balance(db).balance.amount.value, 8000); + // audit distribution of fees from rog + arog.ubal += pct( P100-network_pct, arog.ucb + arog.vcb ); + arog.ucb = 0; arog.vcb = 0; - transfer(stud_id, scud_id, asset(5*CORE)); - transfer(scud_id, pleb_id, asset(4*CORE)); - transfer(pleb_id, dumy_id, asset(3*CORE)); - transfer(dumy_id, reggie_id, asset(2*CORE)); + // audit distribution of fees from ann + alife.ubal += pct( P100-network_pct, lt_pct, aann.ucb+aann.vcb ); + aann.ubal += pct( P100-network_pct, P100-lt_pct, aann.ref_pct, aann.ucb+aann.vcb ); + alife.ubal += pct( P100-network_pct, P100-lt_pct, P100-aann.ref_pct, aann.ucb+aann.vcb ); + aann.ucb = 0; aann.vcb = 0; + + // audit distribution of fees from stud + astud.ubal += pct( P100-network_pct, astud.ucb+astud.vcb ); + astud.ucb = 0; astud.vcb = 0; + + // audit distribution of fees from dumy + alife.ubal += pct( P100-network_pct, lt_pct, adumy.ucb+adumy.vcb ); + alife.ubal += pct( P100-network_pct, P100-lt_pct, adumy.ref_pct, adumy.ucb+adumy.vcb ); + arog.ubal += pct( P100-network_pct, P100-lt_pct, P100-adumy.ref_pct, adumy.ucb+adumy.vcb ); + adumy.ucb = 0; adumy.vcb = 0; + + // audit distribution of fees from scud + alife.ubal += pct( P100-network_pct, lt_pct, ascud.ucb+ascud.vcb ); + aann.ubal += pct( P100-network_pct, P100-lt_pct, ascud.ref_pct, ascud.ucb+ascud.vcb ); + astud.ubal += pct( P100-network_pct, P100-lt_pct, P100-ascud.ref_pct, ascud.ucb+ascud.vcb ); + ascud.ucb = 0; ascud.vcb = 0; + + // audit distribution of fees from pleb + astud.ubal += pct( P100-network_pct, lt_pct, apleb.ucb+apleb.vcb ); + astud.ubal += pct( P100-network_pct, P100-lt_pct, apleb.ref_pct, apleb.ucb+apleb.vcb ); + arog.ubal += pct( P100-network_pct, P100-lt_pct, P100-apleb.ref_pct, apleb.ucb+apleb.vcb ); + apleb.ucb = 0; apleb.vcb = 0; + + CustomAudit(); + + BOOST_TEST_MESSAGE("Doing some transfers"); + + transfer(stud_id, scud_id, asset(500000)); + astud.bal += -500000-xfer_fee; astud.vcb += xfer_fee; ascud.bal += 500000; + CustomAudit(); + + transfer(scud_id, pleb_id, asset(400000)); + ascud.bal += -400000-xfer_fee; ascud.vcb += xfer_fee; apleb.bal += 400000; + CustomAudit(); + + transfer(pleb_id, dumy_id, asset(300000)); + apleb.bal += -300000-xfer_fee; apleb.vcb += xfer_fee; adumy.bal += 300000; + CustomAudit(); + + transfer(dumy_id, rog_id, asset(200000)); + adumy.bal += -200000-xfer_fee; adumy.vcb += xfer_fee; arog.bal += 200000; + CustomAudit(); + + BOOST_TEST_MESSAGE("Waiting for maintenance time"); generate_blocks(db.get_dynamic_global_properties().next_maintenance_time); - BOOST_CHECK_EQUAL(life_id(db).cashback_balance(db).balance.amount.value, 87750); - BOOST_CHECK_EQUAL(reggie_id(db).cashback_balance(db).balance.amount.value, 35500); - BOOST_CHECK_EQUAL(ann_id(db).cashback_balance(db).balance.amount.value, 44000); - BOOST_CHECK_EQUAL(stud_id(db).cashback_balance(db).balance.amount.value, 24750); + // audit distribution of fees from life + alife.ubal += pct( P100-network_pct, alife.ucb +alife.vcb ); + alife.ucb = 0; alife.vcb = 0; + + // audit distribution of fees from rog + arog.ubal += pct( P100-network_pct, arog.ucb + arog.vcb ); + arog.ucb = 0; arog.vcb = 0; + + // audit distribution of fees from ann + alife.ubal += pct( P100-network_pct, lt_pct, aann.ucb+aann.vcb ); + aann.ubal += pct( P100-network_pct, P100-lt_pct, aann.ref_pct, aann.ucb+aann.vcb ); + alife.ubal += pct( P100-network_pct, P100-lt_pct, P100-aann.ref_pct, aann.ucb+aann.vcb ); + aann.ucb = 0; aann.vcb = 0; + + // audit distribution of fees from stud + astud.ubal += pct( P100-network_pct, astud.ucb+astud.vcb ); + astud.ucb = 0; astud.vcb = 0; + + // audit distribution of fees from dumy + alife.ubal += pct( P100-network_pct, lt_pct, adumy.ucb+adumy.vcb ); + alife.ubal += pct( P100-network_pct, P100-lt_pct, adumy.ref_pct, adumy.ucb+adumy.vcb ); + arog.ubal += pct( P100-network_pct, P100-lt_pct, P100-adumy.ref_pct, adumy.ucb+adumy.vcb ); + adumy.ucb = 0; adumy.vcb = 0; + + // audit distribution of fees from scud + alife.ubal += pct( P100-network_pct, lt_pct, ascud.ucb+ascud.vcb ); + aann.ubal += pct( P100-network_pct, P100-lt_pct, ascud.ref_pct, ascud.ucb+ascud.vcb ); + astud.ubal += pct( P100-network_pct, P100-lt_pct, P100-ascud.ref_pct, ascud.ucb+ascud.vcb ); + ascud.ucb = 0; ascud.vcb = 0; + + // audit distribution of fees from pleb + astud.ubal += pct( P100-network_pct, lt_pct, apleb.ucb+apleb.vcb ); + astud.ubal += pct( P100-network_pct, P100-lt_pct, apleb.ref_pct, apleb.ucb+apleb.vcb ); + arog.ubal += pct( P100-network_pct, P100-lt_pct, P100-apleb.ref_pct, apleb.ucb+apleb.vcb ); + apleb.ucb = 0; apleb.vcb = 0; + + CustomAudit(); + + BOOST_TEST_MESSAGE("Waiting for annual membership to expire"); generate_blocks(ann_id(db).membership_expiration_date); generate_block(); - enable_fees(); + + BOOST_TEST_MESSAGE("Transferring from scud to pleb"); //ann's membership has expired, so scud's fee should go up to life instead. transfer(scud_id, pleb_id, asset(10)); + ascud.bal += -10-xfer_fee; ascud.vcb += xfer_fee; apleb.bal += 10; + CustomAudit(); + + BOOST_TEST_MESSAGE("Waiting for maint interval"); generate_blocks(db.get_dynamic_global_properties().next_maintenance_time); - BOOST_CHECK_EQUAL(life_id(db).cashback_balance(db).balance.amount.value, 94750); - BOOST_CHECK_EQUAL(reggie_id(db).cashback_balance(db).balance.amount.value, 35500); - BOOST_CHECK_EQUAL(ann_id(db).cashback_balance(db).balance.amount.value, 44000); - BOOST_CHECK_EQUAL(stud_id(db).cashback_balance(db).balance.amount.value, 25750); + // audit distribution of fees from scud + alife.ubal += pct( P100-network_pct, lt_pct, ascud.ucb+ascud.vcb ); + alife.ubal += pct( P100-network_pct, P100-lt_pct, ascud.ref_pct, ascud.ucb+ascud.vcb ); + astud.ubal += pct( P100-network_pct, P100-lt_pct, P100-ascud.ref_pct, ascud.ucb+ascud.vcb ); + ascud.ucb = 0; ascud.vcb = 0; + + CustomAudit(); + } FC_LOG_AND_RETHROW() } BOOST_AUTO_TEST_SUITE_END() From 8cc683374a857a8016c4142420e6c5b14c645bb4 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 15 Jul 2015 16:43:39 -0400 Subject: [PATCH 020/353] operation_tests.cpp: set_expiration_time in transfer_core_asset test --- tests/tests/operation_tests.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/tests/operation_tests.cpp b/tests/tests/operation_tests.cpp index cfcacd29..75d5fe1c 100644 --- a/tests/tests/operation_tests.cpp +++ b/tests/tests/operation_tests.cpp @@ -439,6 +439,7 @@ BOOST_AUTO_TEST_CASE( transfer_core_asset ) for( auto& op : trx.operations ) db.current_fee_schedule().set_fee(op); fee = trx.operations.front().get().fee; + trx.set_expiration( db.head_block_time() + fc::minutes(5) ); trx.validate(); PUSH_TX( db, trx, ~0 ); From 6f4eb557567659b2a815d558c35efa9de155c9de Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 15 Jul 2015 16:48:45 -0400 Subject: [PATCH 021/353] operation_tests2.cpp: Set skip_flags to deal with gaps in balance_object_test --- tests/tests/operation_tests2.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/tests/operation_tests2.cpp b/tests/tests/operation_tests2.cpp index 99163b3b..b6edcbc0 100644 --- a/tests/tests/operation_tests2.cpp +++ b/tests/tests/operation_tests2.cpp @@ -973,6 +973,7 @@ BOOST_AUTO_TEST_CASE( balance_object_test ) { try { // Intentionally overriding the fixture's db; I need to control genesis on this one. database db; + const uint32_t skip_flags = database::skip_undo_history_check; fc::temp_directory td( graphene::utilities::temp_directory_path() ); genesis_state.initial_balances.push_back({generate_private_key("n").get_public_key(), GRAPHENE_SYMBOL, 1}); genesis_state.initial_balances.push_back({generate_private_key("x").get_public_key(), GRAPHENE_SYMBOL, 1}); @@ -1026,7 +1027,7 @@ BOOST_AUTO_TEST_CASE( balance_object_test ) BOOST_CHECK(db.find_object(balance_id_type(1)) != nullptr); auto slot = db.get_slot_at_time(starting_time); - db.generate_block(starting_time, db.get_scheduled_witness(slot).first, init_account_priv_key, database::skip_nothing); + db.generate_block(starting_time, db.get_scheduled_witness(slot).first, init_account_priv_key, skip_flags); trx.set_reference_block(db.head_block_id()); trx.set_expiration( db.head_block_time() + fc::seconds( 3 * db.get_global_properties().parameters.block_interval ) ); const balance_object& vesting_balance_1 = balance_id_type(2)(db); @@ -1077,9 +1078,9 @@ BOOST_AUTO_TEST_CASE( balance_object_test ) // Attempting to claim twice within a day GRAPHENE_CHECK_THROW(db.push_transaction(trx), balance_claim_claimed_too_often); - db.generate_block(db.get_slot_time(1), db.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); + db.generate_block(db.get_slot_time(1), db.get_scheduled_witness(1).first, init_account_priv_key, skip_flags); slot = db.get_slot_at_time(vesting_balance_1.vesting_policy->begin_timestamp + 60); - db.generate_block(db.get_slot_time(slot), db.get_scheduled_witness(slot).first, init_account_priv_key, database::skip_nothing); + db.generate_block(db.get_slot_time(slot), db.get_scheduled_witness(slot).first, init_account_priv_key, skip_flags); trx.set_reference_block(db.head_block_id()); trx.set_expiration( db.head_block_time() + fc::seconds( 3 * db.get_global_properties().parameters.block_interval ) ); op.balance_to_claim = vesting_balance_1.id; @@ -1103,9 +1104,9 @@ BOOST_AUTO_TEST_CASE( balance_object_test ) // Attempting to claim twice within a day GRAPHENE_CHECK_THROW(db.push_transaction(trx), balance_claim_claimed_too_often); - db.generate_block(db.get_slot_time(1), db.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); + db.generate_block(db.get_slot_time(1), db.get_scheduled_witness(1).first, init_account_priv_key, skip_flags); slot = db.get_slot_at_time(db.head_block_time() + fc::days(1)); - db.generate_block(db.get_slot_time(slot), db.get_scheduled_witness(slot).first, init_account_priv_key, database::skip_nothing); + db.generate_block(db.get_slot_time(slot), db.get_scheduled_witness(slot).first, init_account_priv_key, skip_flags); trx.set_reference_block(db.head_block_id()); trx.set_expiration( db.head_block_time() + fc::seconds( 3 * db.get_global_properties().parameters.block_interval ) ); op.total_claimed = vesting_balance_2.balance; From 8aa048661fb4770b170f76f944e1cab27aecd611 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 15 Jul 2015 17:06:45 -0400 Subject: [PATCH 022/353] Remove unused undo_block and undo_transaction skip flags --- libraries/chain/db_management.cpp | 2 -- .../chain/include/graphene/chain/database.hpp | 18 ++++++++---------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/libraries/chain/db_management.cpp b/libraries/chain/db_management.cpp index 3dab21c3..6a9a81fa 100644 --- a/libraries/chain/db_management.cpp +++ b/libraries/chain/db_management.cpp @@ -53,8 +53,6 @@ void database::reindex(fc::path data_dir, const genesis_state_type& initial_allo { apply_block(*_block_id_to_block.fetch_by_number(i), skip_witness_signature | skip_transaction_signatures | - skip_undo_block | - skip_undo_transaction | skip_transaction_dupe_check | skip_tapos_check | skip_authority_check); diff --git a/libraries/chain/include/graphene/chain/database.hpp b/libraries/chain/include/graphene/chain/database.hpp index 034aece9..f89346a4 100644 --- a/libraries/chain/include/graphene/chain/database.hpp +++ b/libraries/chain/include/graphene/chain/database.hpp @@ -82,16 +82,14 @@ namespace graphene { namespace chain { skip_nothing = 0, skip_witness_signature = 1 << 0, ///< used while reindexing skip_transaction_signatures = 1 << 1, ///< used by non-witness nodes - skip_undo_block = 1 << 2, ///< used while reindexing - skip_undo_transaction = 1 << 3, ///< used while applying block - skip_transaction_dupe_check = 1 << 4, ///< used while reindexing - skip_fork_db = 1 << 5, ///< used while reindexing - skip_block_size_check = 1 << 6, ///< used when applying locally generated transactions - skip_tapos_check = 1 << 7, ///< used while reindexing -- note this skips expiration check as well - skip_authority_check = 1 << 8, ///< used while reindexing -- disables any checking of authority on transactions - skip_merkle_check = 1 << 9, ///< used while reindexing - skip_assert_evaluation = 1 << 10, ///< used while reindexing - skip_undo_history_check = 1 << 11 ///< used while reindexing + skip_transaction_dupe_check = 1 << 2, ///< used while reindexing + skip_fork_db = 1 << 3, ///< used while reindexing + skip_block_size_check = 1 << 4, ///< used when applying locally generated transactions + skip_tapos_check = 1 << 5, ///< used while reindexing -- note this skips expiration check as well + skip_authority_check = 1 << 6, ///< used while reindexing -- disables any checking of authority on transactions + skip_merkle_check = 1 << 7, ///< used while reindexing + skip_assert_evaluation = 1 << 8, ///< used while reindexing + skip_undo_history_check = 1 << 9 ///< used while reindexing }; /** From a4496eccb8890c9d0440c738c264f1f3b3f83300 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 15 Jul 2015 17:19:28 -0400 Subject: [PATCH 023/353] Fix #162 by adding an active authority to tests that use account_create_op directly --- libraries/chain/protocol/account.cpp | 3 +-- tests/tests/block_tests.cpp | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libraries/chain/protocol/account.cpp b/libraries/chain/protocol/account.cpp index d8d9100f..d9572707 100644 --- a/libraries/chain/protocol/account.cpp +++ b/libraries/chain/protocol/account.cpp @@ -139,8 +139,7 @@ void account_create_operation::validate()const FC_ASSERT( referrer_percent <= GRAPHENE_100_PERCENT ); FC_ASSERT( owner.num_auths() != 0 ); FC_ASSERT( owner.address_auths.size() == 0 ); - // TODO: this asset causes many tests to fail, those tests should probably be updated - //FC_ASSERT( active.num_auths() != 0 ); + FC_ASSERT( active.num_auths() != 0 ); FC_ASSERT( active.address_auths.size() == 0 ); options.validate(); } diff --git a/tests/tests/block_tests.cpp b/tests/tests/block_tests.cpp index 2b096e1e..2c9bbecb 100644 --- a/tests/tests/block_tests.cpp +++ b/tests/tests/block_tests.cpp @@ -303,6 +303,7 @@ BOOST_AUTO_TEST_CASE( undo_pending ) cop.registrar = GRAPHENE_TEMP_ACCOUNT; cop.name = "nathan"; cop.owner = authority(1, init_account_pub_key, 1); + cop.active = cop.owner; trx.operations.push_back(cop); //trx.sign( init_account_priv_key ); PUSH_TX( db, trx ); @@ -357,6 +358,7 @@ BOOST_AUTO_TEST_CASE( switch_forks_undo_create ) cop.registrar = GRAPHENE_TEMP_ACCOUNT; cop.name = "nathan"; cop.owner = authority(1, init_account_pub_key, 1); + cop.active = cop.owner; trx.operations.push_back(cop); PUSH_TX( db1, trx ); @@ -415,6 +417,7 @@ BOOST_AUTO_TEST_CASE( duplicate_transactions ) account_create_operation cop; cop.name = "nathan"; cop.owner = authority(1, init_account_pub_key, 1); + cop.active = cop.owner; trx.operations.push_back(cop); trx.sign( init_account_priv_key ); PUSH_TX( db1, trx, skip_sigs ); @@ -474,6 +477,7 @@ BOOST_AUTO_TEST_CASE( tapos ) cop.registrar = init1.id; cop.name = "nathan"; cop.owner = authority(1, init_account_pub_key, 1); + cop.active = cop.owner; trx.operations.push_back(cop); trx.sign(init_account_priv_key); db1.push_transaction(trx); From 2ec17e225414dce1463259445f11ce7ba08bf930 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 15 Jul 2015 17:42:23 -0400 Subject: [PATCH 024/353] wallet.cpp: Use reflection in get_prototype_operation() --- libraries/wallet/wallet.cpp | 122 ++++++++++++++---------------------- 1 file changed, 47 insertions(+), 75 deletions(-) diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp index 82182a59..a70bebf6 100644 --- a/libraries/wallet/wallet.cpp +++ b/libraries/wallet/wallet.cpp @@ -193,6 +193,30 @@ string normalize_brain_key( string s ) } return result; } + +struct op_prototype_visitor +{ + typedef void result_type; + + int t = 0; + flat_map< std::string, operation >& name2op; + + op_prototype_visitor( + int _t, + flat_map< std::string, operation >& _prototype_ops + ):t(_t), name2op(_prototype_ops) {} + + template + result_type operator()( const Type& op )const + { + string name = fc::get_typename::name(); + size_t p = name.rfind(':'); + if( p != string::npos ) + name = name.substr( p+1 ); + name2op[ name ] = Type(); + } +}; + class wallet_api_impl { public: @@ -296,6 +320,17 @@ private: #endif } + void init_prototype_ops() + { + operation op; + for( int t=0; t _builder_transactions; public: @@ -307,6 +342,7 @@ public: _remote_net_broadcast(rapi->network_broadcast()), _remote_hist(rapi->history()) { + init_prototype_ops(); _remote_db->subscribe_to_objects( [=]( const fc::variant& obj ) { fc::async([this]{resync();}, "Resync after block"); @@ -1698,6 +1734,14 @@ public: } + operation get_prototype_operation( string operation_name ) + { + auto it = _prototype_ops.find( operation_name ); + if( it == _prototype_ops.end() ) + FC_THROW("Unsupported operation: \"${operation_name}\"", ("operation_name", operation_name)); + return it->second; + } + string _wallet_filename; wallet_data _wallet; @@ -1709,6 +1753,8 @@ public: fc::api _remote_net_broadcast; fc::api _remote_hist; + flat_map _prototype_ops; + #ifdef __unix__ mode_t _old_umask; #endif @@ -2178,81 +2224,7 @@ signed_transaction wallet_api::sign_transaction(signed_transaction tx, bool broa operation wallet_api::get_prototype_operation(string operation_name) { - if (operation_name == "assert_operation") - return graphene::chain::assert_operation(); - if (operation_name == "balance_claim_operation") - return graphene::chain::balance_claim_operation(); - if (operation_name == "account_create_operation") - return graphene::chain::account_create_operation(); - if (operation_name == "account_whitelist_operation") - return graphene::chain::account_whitelist_operation(); - if (operation_name == "account_update_operation") - return graphene::chain::account_update_operation(); - if (operation_name == "account_upgrade_operation") - return graphene::chain::account_upgrade_operation(); - if (operation_name == "account_transfer_operation") - return graphene::chain::account_transfer_operation(); - if (operation_name == "committee_member_create_operation") - return graphene::chain::committee_member_create_operation(); - if (operation_name == "witness_create_operation") - return graphene::chain::witness_create_operation(); - if (operation_name == "committee_member_update_global_parameters_operation") - return graphene::chain::committee_member_update_global_parameters_operation(); - if (operation_name == "transfer_operation") - return graphene::chain::transfer_operation(); - if (operation_name == "override_transfer_operation") - return graphene::chain::override_transfer_operation(); - if (operation_name == "asset_create_operation") - return graphene::chain::asset_create_operation(); - if (operation_name == "asset_global_settle_operation") - return graphene::chain::asset_global_settle_operation(); - if (operation_name == "asset_settle_operation") - return graphene::chain::asset_settle_operation(); - if (operation_name == "asset_fund_fee_pool_operation") - return graphene::chain::asset_fund_fee_pool_operation(); - if (operation_name == "asset_update_operation") - return graphene::chain::asset_update_operation(); - if (operation_name == "asset_update_bitasset_operation") - return graphene::chain::asset_update_bitasset_operation(); - if (operation_name == "asset_update_feed_producers_operation") - return graphene::chain::asset_update_feed_producers_operation(); - if (operation_name == "asset_publish_feed_operation") - return graphene::chain::asset_publish_feed_operation(); - if (operation_name == "asset_issue_operation") - return graphene::chain::asset_issue_operation(); - if (operation_name == "asset_reserve_operation") - return graphene::chain::asset_reserve_operation(); - if (operation_name == "limit_order_create_operation") - return graphene::chain::limit_order_create_operation(); - if (operation_name == "limit_order_cancel_operation") - return graphene::chain::limit_order_cancel_operation(); - if (operation_name == "call_order_update_operation") - return graphene::chain::call_order_update_operation(); - if (operation_name == "proposal_create_operation") - return graphene::chain::proposal_create_operation(); - if (operation_name == "proposal_update_operation") - return graphene::chain::proposal_update_operation(); - if (operation_name == "proposal_delete_operation") - return graphene::chain::proposal_delete_operation(); - if (operation_name == "fill_order_operation") - return graphene::chain::fill_order_operation(); - if (operation_name == "withdraw_permission_create_operation") - return graphene::chain::withdraw_permission_create_operation(); - if (operation_name == "withdraw_permission_update_operation") - return graphene::chain::withdraw_permission_update_operation(); - if (operation_name == "withdraw_permission_claim_operation") - return graphene::chain::withdraw_permission_claim_operation(); - if (operation_name == "withdraw_permission_delete_operation") - return graphene::chain::withdraw_permission_delete_operation(); - if (operation_name == "vesting_balance_create_operation") - return graphene::chain::vesting_balance_create_operation(); - if (operation_name == "vesting_balance_withdraw_operation") - return graphene::chain::vesting_balance_withdraw_operation(); - if (operation_name == "worker_create_operation") - return graphene::chain::worker_create_operation(); - if (operation_name == "custom_operation") - return graphene::chain::custom_operation(); - FC_THROW("Unsupported operation: \"${operation_name}\"", ("operation_name", operation_name)); + return my->get_prototype_operation( operation_name ); } void wallet_api::dbg_make_uia(string creator, string symbol) From b433f90a55d04e8416488fab28145f2089708800 Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Wed, 15 Jul 2015 17:48:44 -0400 Subject: [PATCH 025/353] [GUI] Use assets and balances in transfer form --- libraries/app/include/graphene/app/api.hpp | 10 +-- programs/light_client/CMakeLists.txt | 5 +- programs/light_client/ClientDataModel.cpp | 35 ++++---- programs/light_client/ClientDataModel.hpp | 93 ++++++++++++++------- programs/light_client/main.cpp | 1 + programs/light_client/qml/AccountPicker.qml | 25 ++++-- programs/light_client/qml/TransferForm.qml | 23 ++++- 7 files changed, 132 insertions(+), 60 deletions(-) diff --git a/libraries/app/include/graphene/app/api.hpp b/libraries/app/include/graphene/app/api.hpp index b1e96a34..109de097 100644 --- a/libraries/app/include/graphene/app/api.hpp +++ b/libraries/app/include/graphene/app/api.hpp @@ -71,7 +71,7 @@ namespace graphene { namespace app { */ optional get_block(uint32_t block_num)const; - /** + /** * @brief used to fetch an individual transaction. */ processed_transaction get_transaction( uint32_t block_num, uint32_t trx_in_block )const; @@ -120,7 +120,7 @@ namespace graphene { namespace app { /** * @brief Get an account's balances in various assets * @param id ID of the account to get balances for - * @param assets IDs of the assets to get balances of + * @param assets IDs of the assets to get balances of; if empty, get all assets account has a balance in * @return Balances of the account */ vector get_account_balances(account_id_type id, const flat_set& assets)const; @@ -194,7 +194,7 @@ namespace graphene { namespace app { * @return Map of witness names to corresponding IDs */ map lookup_witness_accounts(const string& lower_bound_name, uint32_t limit)const; - + /** * @brief Get names and IDs for registered committee_members * @param lower_bound_name Lower bound of the first name to return @@ -202,7 +202,7 @@ namespace graphene { namespace app { * @return Map of committee_member names to corresponding IDs */ map lookup_committee_member_accounts(const string& lower_bound_name, uint32_t limit)const; - + /** * @brief Get a list of witnesses by ID * @param witness_ids IDs of the witnesses to retrieve @@ -322,7 +322,7 @@ namespace graphene { namespace app { unsigned limit = 100, operation_history_id_type start = operation_history_id_type())const; - vector get_market_history( asset_id_type a, asset_id_type b, uint32_t bucket_seconds, + vector get_market_history( asset_id_type a, asset_id_type b, uint32_t bucket_seconds, fc::time_point_sec start, fc::time_point_sec end )const; flat_set get_market_history_buckets()const; private: diff --git a/programs/light_client/CMakeLists.txt b/programs/light_client/CMakeLists.txt index 54e8dfc9..5931383f 100644 --- a/programs/light_client/CMakeLists.txt +++ b/programs/light_client/CMakeLists.txt @@ -13,7 +13,10 @@ find_package(Qt5Quick) file(GLOB QML qml/*) -qt5_add_resources(QML_QRC qml/qml.qrc) +# Skip building QRC in debug mode, since we access the QML files directly on disk in debug mode +if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug") + qt5_add_resources(QML_QRC qml/qml.qrc) +endif() add_executable(light_client ClientDataModel.cpp ClientDataModel.hpp main.cpp ${QML_QRC} ${QML}) if (CMAKE_VERSION VERSION_LESS 3.0) diff --git a/programs/light_client/ClientDataModel.cpp b/programs/light_client/ClientDataModel.cpp index 7db26780..cd76b925 100644 --- a/programs/light_client/ClientDataModel.cpp +++ b/programs/light_client/ClientDataModel.cpp @@ -11,16 +11,13 @@ ChainDataModel::ChainDataModel( fc::thread& t, QObject* parent ) :QObject(parent),m_thread(&t){} -Asset* ChainDataModel::getAsset(qint64 id) +Asset* ChainDataModel::getAsset(ObjectId id) { auto& by_id_idx = m_assets.get<::by_id>(); auto itr = by_id_idx.find(id); if( itr == by_id_idx.end() ) { - auto tmp = new Asset; - QQmlEngine::setObjectOwnership(tmp, QQmlEngine::CppOwnership); - tmp->id = id; --m_account_query_num; - tmp->symbol = QString::number( --m_account_query_num); + auto tmp = new Asset(id, QString::number(--m_account_query_num), 0, this); auto result = m_assets.insert( tmp ); assert( result.second ); @@ -71,10 +68,7 @@ Asset* ChainDataModel::getAsset(QString symbol) auto itr = by_symbol_idx.find(symbol); if( itr == by_symbol_idx.end() ) { - auto tmp = new Asset; - QQmlEngine::setObjectOwnership(tmp, QQmlEngine::CppOwnership); - tmp->id = --m_account_query_num; - tmp->symbol = symbol; + auto tmp = new Asset(--m_account_query_num, symbol, 0, this); auto result = m_assets.insert( tmp ); assert( result.second ); @@ -123,10 +117,7 @@ Account* ChainDataModel::getAccount(ObjectId id) auto itr = by_id_idx.find(id); if( itr == by_id_idx.end() ) { - auto tmp = new Account; - QQmlEngine::setObjectOwnership(tmp, QQmlEngine::CppOwnership); - tmp->id = id; --m_account_query_num; - tmp->name = QString::number( --m_account_query_num); + auto tmp = new Account(id, QString::number(--m_account_query_num), this); auto result = m_accounts.insert( tmp ); assert( result.second ); @@ -174,10 +165,7 @@ Account* ChainDataModel::getAccount(QString name) auto itr = by_name_idx.find(name); if( itr == by_name_idx.end() ) { - auto tmp = new Account; - QQmlEngine::setObjectOwnership(tmp, QQmlEngine::CppOwnership); - tmp->id = --m_account_query_num; - tmp->name = name; + auto tmp = new Account(--m_account_query_num, name, this); auto result = m_accounts.insert( tmp ); assert( result.second ); @@ -221,6 +209,19 @@ Account* ChainDataModel::getAccount(QString name) QQmlListProperty Account::balances() { + // This entire block is dummy data. Throw it away when this function gets a real implementation. + if (m_balances.empty()) + { + auto asset = new Asset(0, QStringLiteral("CORE"), 5, this); + m_balances.append(new Balance); + m_balances.back()->setProperty("amount", 5000000); + m_balances.back()->setProperty("type", QVariant::fromValue(asset)); + asset = new Asset(0, QStringLiteral("USD"), 2, this); + m_balances.append(new Balance); + m_balances.back()->setProperty("amount", 3099); + m_balances.back()->setProperty("type", QVariant::fromValue(asset)); + } + return QQmlListProperty(this, m_balances); } diff --git a/programs/light_client/ClientDataModel.hpp b/programs/light_client/ClientDataModel.hpp index 9411dee7..1968a194 100644 --- a/programs/light_client/ClientDataModel.hpp +++ b/programs/light_client/ClientDataModel.hpp @@ -26,13 +26,21 @@ Q_DECLARE_METATYPE(std::function) class GrapheneObject : public QObject { Q_OBJECT - Q_PROPERTY(ObjectId id MEMBER id NOTIFY idChanged) + Q_PROPERTY(ObjectId id MEMBER m_id READ id NOTIFY idChanged) - public: - ObjectId id; + ObjectId m_id; - Q_SIGNALS: - void idChanged(); +public: + GrapheneObject(ObjectId id = -1, QObject* parent = nullptr) + : QObject(parent), m_id(id) + {} + + ObjectId id() const { + return m_id; + } + +Q_SIGNALS: + void idChanged(); }; class Crypto { Q_GADGET @@ -45,19 +53,34 @@ public: QML_DECLARE_TYPE(Crypto) -class Asset : public GrapheneObject { +class Asset : public GrapheneObject { Q_OBJECT - Q_PROPERTY(QString symbol MEMBER symbol) - Q_PROPERTY(quint32 precision MEMBER precision) + Q_PROPERTY(QString symbol MEMBER m_symbol READ symbol NOTIFY symbolChanged) + Q_PROPERTY(quint32 precision MEMBER m_precision NOTIFY precisionChanged) - public: - QString symbol; - quint32 precision; + QString m_symbol; + quint32 m_precision; +public: + Asset(ObjectId id = -1, QString symbol = QString(), quint32 precision = 0, QObject* parent = nullptr) + : GrapheneObject(id, parent), m_symbol(symbol), m_precision(precision) + {} - Q_SIGNALS: - void symbolChanged(); + QString symbol() const { + return m_symbol; + } + + quint64 precisionPower() const { + quint64 power = 1; + for (int i = 0; i < m_precision; ++i) + power *= 10; + return power; + } + +Q_SIGNALS: + void symbolChanged(); + void precisionChanged(); }; struct by_id; @@ -65,45 +88,59 @@ struct by_symbol_name; typedef multi_index_container< Asset*, indexed_by< - hashed_unique< tag, member >, - ordered_unique< tag, member > + hashed_unique< tag, const_mem_fun >, + ordered_unique< tag, const_mem_fun > > > asset_multi_index_type; class Balance : public GrapheneObject { Q_OBJECT - Q_PROPERTY(Asset* type MEMBER type) - Q_PROPERTY(qint64 amount MEMBER amount) + Q_PROPERTY(Asset* type MEMBER type NOTIFY typeChanged) + Q_PROPERTY(qint64 amount MEMBER amount NOTIFY amountChanged) Asset* type; qint64 amount; + +public: + // This ultimately needs to be replaced with a string equivalent + Q_INVOKABLE qreal amountReal() const { + return amount / qreal(type->precisionPower()); + } + +Q_SIGNALS: + void typeChanged(); + void amountChanged(); }; class Account : public GrapheneObject { Q_OBJECT - Q_PROPERTY(QString name MEMBER name NOTIFY nameChanged) - Q_PROPERTY(QQmlListProperty balances READ balances) + Q_PROPERTY(QString name MEMBER m_name READ name NOTIFY nameChanged) + Q_PROPERTY(QQmlListProperty balances READ balances NOTIFY balancesChanged) + QString m_name; QList m_balances; - public: - const QString& getName()const { return name; } - QQmlListProperty balances(); +public: + Account(ObjectId id = -1, QString name = QString(), QObject* parent = nullptr) + : GrapheneObject(id, parent), m_name(name) + {} - QString name; + QString name()const { return m_name; } + QQmlListProperty balances(); - Q_SIGNALS: - void nameChanged(); +Q_SIGNALS: + void nameChanged(); + void balancesChanged(); }; struct by_account_name; typedef multi_index_container< Account*, indexed_by< - hashed_unique< tag, member >, - ordered_unique< tag, member > + hashed_unique< tag, const_mem_fun >, + ordered_unique< tag, const_mem_fun > > > account_multi_index_type; @@ -113,7 +150,7 @@ class ChainDataModel : public QObject { public: Q_INVOKABLE Account* getAccount(ObjectId id); Q_INVOKABLE Account* getAccount(QString name); - Q_INVOKABLE Asset* getAsset(qint64 id); + Q_INVOKABLE Asset* getAsset(ObjectId id); Q_INVOKABLE Asset* getAsset(QString symbol); ChainDataModel(){} diff --git a/programs/light_client/main.cpp b/programs/light_client/main.cpp index a2c12ac4..e3aaa035 100644 --- a/programs/light_client/main.cpp +++ b/programs/light_client/main.cpp @@ -28,6 +28,7 @@ int main(int argc, char *argv[]) #ifdef NDEBUG engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); #else + QQmlDebuggingEnabler enabler; engine.load(QUrl(QStringLiteral("qml/main.qml"))); #endif diff --git a/programs/light_client/qml/AccountPicker.qml b/programs/light_client/qml/AccountPicker.qml index d94549ad..19c0e758 100644 --- a/programs/light_client/qml/AccountPicker.qml +++ b/programs/light_client/qml/AccountPicker.qml @@ -9,8 +9,11 @@ import "." RowLayout { property Account account + property var balances: account? Object.keys(account.balances).map(function(key){return account.balances[key]}) + : null property alias placeholderText: accountNameField.placeholderText + property int showBalance: -1 function setFocus() { accountNameField.forceActiveFocus() @@ -29,25 +32,37 @@ RowLayout { width: parent.width onEditingFinished: accountDetails.update(text) } - Label { + Text { id: accountDetails + width: parent.width + height: text? implicitHeight : 0 + + Behavior on height { NumberAnimation{ easing.type: Easing.InOutQuad } } + function update(name) { if (!name) { text = "" + account = null return } account = app.model.getAccount(name) - if (account == null) + if (account == null) { text = qsTr("Error fetching account.") - else + } else { text = Qt.binding(function() { if (account == null) return qsTr("Account does not exist.") - return qsTr("Account ID: %1").arg(account.id < 0? qsTr("Loading...") - : account.id) + var text = qsTr("Account ID: %1").arg(account.id < 0? qsTr("Loading...") + : account.id) + if (showBalance >= 0) { + text += "\n" + qsTr("Balance: %1 %2").arg(balances[showBalance].amountReal()) + .arg(balances[showBalance].type.symbol) + } + return text }) + } } Behavior on text { diff --git a/programs/light_client/qml/TransferForm.qml b/programs/light_client/qml/TransferForm.qml index 8ff7beac..fc678543 100644 --- a/programs/light_client/qml/TransferForm.qml +++ b/programs/light_client/qml/TransferForm.qml @@ -27,28 +27,42 @@ Rectangle { AccountPicker { id: senderPicker width: parent.width + Layout.minimumWidth: Scaling.cm(5) Component.onCompleted: setFocus() placeholderText: qsTr("Sender") + showBalance: balances? balances.reduce(function(foundIndex, balance, index) { + if (foundIndex >= 0) return foundIndex + return balance.type.symbol === assetBox.currentText? index : -1 + }, -1) : -1 } AccountPicker { id: recipientPicker width: parent.width + Layout.minimumWidth: Scaling.cm(5) placeholderText: qsTr("Recipient") layoutDirection: Qt.RightToLeft } RowLayout { width: parent.width SpinBox { + id: amountField Layout.preferredWidth: Scaling.cm(4) Layout.minimumWidth: Scaling.cm(1.5) - enabled: senderPicker.account + enabled: maxBalance minimumValue: 0 - maximumValue: Number.POSITIVE_INFINITY + maximumValue: maxBalance? maxBalance.amountReal() : 0 + decimals: maxBalance? maxBalance.type.precision : 0 + + property Balance maxBalance: senderPicker.balances && senderPicker.showBalance >= 0? + senderPicker.balances[senderPicker.showBalance] : null } ComboBox { + id: assetBox Layout.minimumWidth: Scaling.cm(3) - enabled: senderPicker.account - model: ["CORE", "USD", "GOLD"] + enabled: Boolean(senderPicker.balances) + model: enabled? senderPicker.balances.filter(function(balance) { return balance.amount > 0 }) + .map(function(balance) { return balance.type.symbol }) + : ["Asset Type"] } Item { Layout.fillWidth: true } Button { @@ -58,6 +72,7 @@ Rectangle { Button { text: qsTr("Transfer") enabled: senderPicker.account + onClicked: console.log(amountField.value) } } } From 05efa54598e40f1167f7c5f1446ee798fed8e170 Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Wed, 15 Jul 2015 17:55:12 -0400 Subject: [PATCH 026/353] [GUI] Add memo field to transfer form --- programs/light_client/qml/TransferForm.qml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/programs/light_client/qml/TransferForm.qml b/programs/light_client/qml/TransferForm.qml index fc678543..18ac15bf 100644 --- a/programs/light_client/qml/TransferForm.qml +++ b/programs/light_client/qml/TransferForm.qml @@ -22,28 +22,33 @@ Rectangle { ColumnLayout { anchors.centerIn: parent width: parent.width - Scaling.cm(2) - spacing: Scaling.cm(1) + spacing: Scaling.mm(5) AccountPicker { id: senderPicker - width: parent.width + Layout.fillWidth: true Layout.minimumWidth: Scaling.cm(5) Component.onCompleted: setFocus() placeholderText: qsTr("Sender") showBalance: balances? balances.reduce(function(foundIndex, balance, index) { if (foundIndex >= 0) return foundIndex - return balance.type.symbol === assetBox.currentText? index : -1 + return balance.type.symbol === assetField.currentText? index : -1 }, -1) : -1 } AccountPicker { id: recipientPicker - width: parent.width + Layout.fillWidth: true Layout.minimumWidth: Scaling.cm(5) placeholderText: qsTr("Recipient") layoutDirection: Qt.RightToLeft } + TextField { + id: memoField + Layout.fillWidth: true + placeholderText: qsTr("Memo") + } RowLayout { - width: parent.width + Layout.fillWidth: true SpinBox { id: amountField Layout.preferredWidth: Scaling.cm(4) @@ -57,7 +62,7 @@ Rectangle { senderPicker.balances[senderPicker.showBalance] : null } ComboBox { - id: assetBox + id: assetField Layout.minimumWidth: Scaling.cm(3) enabled: Boolean(senderPicker.balances) model: enabled? senderPicker.balances.filter(function(balance) { return balance.amount > 0 }) From b056b0f499d4321e5beeeb5b3f62126e1342f555 Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Wed, 15 Jul 2015 18:14:48 -0400 Subject: [PATCH 027/353] [GUI] Tweaks to the identicon behavior --- programs/light_client/qml/AccountPicker.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/light_client/qml/AccountPicker.qml b/programs/light_client/qml/AccountPicker.qml index 19c0e758..f789eefe 100644 --- a/programs/light_client/qml/AccountPicker.qml +++ b/programs/light_client/qml/AccountPicker.qml @@ -20,7 +20,7 @@ RowLayout { } Identicon { - name: accountNameField.text + name: account && account.name == accountNameField.text? accountNameField.text : "" width: Scaling.cm(2) height: Scaling.cm(2) } From d9855f9023b0773a8b4cb71effc2a6f25b2a1fff Mon Sep 17 00:00:00 2001 From: Vikram Rajkumar Date: Wed, 15 Jul 2015 14:04:17 -0400 Subject: [PATCH 028/353] Clean up some TODOs; #77 --- README.md | 7 ++----- libraries/chain/db_management.cpp | 2 +- .../graphene/chain/protocol/account.hpp | 2 +- .../include/graphene/chain/protocol/types.hpp | 2 +- libraries/chain/proposal_evaluator.cpp | 2 +- libraries/chain/protocol/operations.cpp | 4 ++-- libraries/net/node.cpp | 20 +++++++++---------- libraries/wallet/wallet.cpp | 2 -- 8 files changed, 17 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 53f74942..7ced79bb 100644 --- a/README.md +++ b/README.md @@ -99,20 +99,17 @@ When running `witness_node`, initially two API's are available: API 0 provides read-only access to the database, while API 1 is used to login and gain access to additional, restricted API's. -TODO: the following examples use the old authority definition and thus do not work. They need to be updated. - Here is an example using `wscat` package from `npm` for websockets: $ npm install -g wscat $ wscat -c ws://127.0.0.1:8090 > {"id":1, "method":"call", "params":[0,"get_accounts",[["1.2.0"]]]} - < {"id":1,"result":[{"id":"1.2.0","annotations":[],"registrar":"1.2.0","referrer":"1.2.0","referrer_percent":0,"name":"genesis","owner":{"weight_threshold":1,"key_auths":[["PUBLIC_KEY",1]]},"active":{"weight_threshold":1,"key_auths":[["PUBLIC_KEY",1]]},"memo_key":"PUBLIC_KEY","voting_account":"1.2.0","num_witness":0,"num_committee":0,"votes":[],"statistics":"2.7.0","whitelisting_accounts":[],"blacklisting_accounts":[]}]} - $ + < {"id":1,"result":[{"id":"1.2.0","annotations":[],"membership_expiration_date":"1969-12-31T23:59:59","registrar":"1.2.0","referrer":"1.2.0","lifetime_referrer":"1.2.0","network_fee_percentage":2000,"lifetime_referrer_fee_percentage":8000,"referrer_rewards_percentage":0,"name":"committee-account","owner":{"weight_threshold":1,"account_auths":[],"key_auths":[],"address_auths":[]},"active":{"weight_threshold":6,"account_auths":[["1.2.5",1],["1.2.6",1],["1.2.7",1],["1.2.8",1],["1.2.9",1],["1.2.10",1],["1.2.11",1],["1.2.12",1],["1.2.13",1],["1.2.14",1]],"key_auths":[],"address_auths":[]},"options":{"memo_key":"GPH1111111111111111111111111111111114T1Anm","voting_account":"1.2.0","num_witness":0,"num_committee":0,"votes":[],"extensions":[]},"statistics":"2.7.0","whitelisting_accounts":[],"blacklisting_accounts":[]}]} We can do the same thing using an HTTP client such as `curl` for API's which do not require login or other session state: $ curl --data '{"jsonrpc": "2.0", "method": "call", "params": [0, "get_accounts", [["1.2.0"]]], "id": 1}' http://127.0.0.1:8090/rpc - {"id":1,"result":[{"id":"1.2.0","annotations":[],"registrar":"1.2.0","referrer":"1.2.0","referrer_percent":0,"name":"genesis","owner":{"weight_threshold":1,"key_auths":[["PUBLIC_KEY",1]]},"active":{"weight_threshold":1,"key_auths":[["PUBLIC_KEY",1]]},"memo_key":"PUBLIC_KEY","voting_account":"1.2.0","num_witness":0,"num_committee":0,"votes":[],"statistics":"2.7.0","whitelisting_accounts":[],"blacklisting_accounts":[]}]} + {"id":1,"result":[{"id":"1.2.0","annotations":[],"membership_expiration_date":"1969-12-31T23:59:59","registrar":"1.2.0","referrer":"1.2.0","lifetime_referrer":"1.2.0","network_fee_percentage":2000,"lifetime_referrer_fee_percentage":8000,"referrer_rewards_percentage":0,"name":"committee-account","owner":{"weight_threshold":1,"account_auths":[],"key_auths":[],"address_auths":[]},"active":{"weight_threshold":6,"account_auths":[["1.2.5",1],["1.2.6",1],["1.2.7",1],["1.2.8",1],["1.2.9",1],["1.2.10",1],["1.2.11",1],["1.2.12",1],["1.2.13",1],["1.2.14",1]],"key_auths":[],"address_auths":[]},"options":{"memo_key":"GPH1111111111111111111111111111111114T1Anm","voting_account":"1.2.0","num_witness":0,"num_committee":0,"votes":[],"extensions":[]},"statistics":"2.7.0","whitelisting_accounts":[],"blacklisting_accounts":[]}]} API 0 is accessible using regular JSON-RPC: diff --git a/libraries/chain/db_management.cpp b/libraries/chain/db_management.cpp index 6a9a81fa..7b1c1337 100644 --- a/libraries/chain/db_management.cpp +++ b/libraries/chain/db_management.cpp @@ -47,7 +47,7 @@ void database::reindex(fc::path data_dir, const genesis_state_type& initial_allo const auto last_block_num = last_block->block_num(); - // TODO: disable undo tracking durring reindex, this currently causes crashes in the benchmark test + // TODO: disable undo tracking during reindex, this currently causes crashes in the benchmark test //_undo_db.disable(); for( uint32_t i = 1; i <= last_block_num; ++i ) { diff --git a/libraries/chain/include/graphene/chain/protocol/account.hpp b/libraries/chain/include/graphene/chain/protocol/account.hpp index 4c3cbd7e..13fc7b09 100644 --- a/libraries/chain/include/graphene/chain/protocol/account.hpp +++ b/libraries/chain/include/graphene/chain/protocol/account.hpp @@ -92,7 +92,7 @@ namespace graphene { namespace chain { /// New owner authority. If set, this operation requires owner authority to execute. optional owner; - /// New active authority. If set, this operation requires owner authority to execute: TODO: why? + /// New active authority. If set, this operation requires owner authority to execute. optional active; /// New account options diff --git a/libraries/chain/include/graphene/chain/protocol/types.hpp b/libraries/chain/include/graphene/chain/protocol/types.hpp index b9a1a0fb..64d49325 100644 --- a/libraries/chain/include/graphene/chain/protocol/types.hpp +++ b/libraries/chain/include/graphene/chain/protocol/types.hpp @@ -81,7 +81,7 @@ namespace graphene { namespace chain { { charge_market_fee = 0x01, /**< an issuer-specified percentage of all market trades in this asset is paid to the issuer */ white_list = 0x02, /**< accounts must be whitelisted in order to hold this asset */ - override_authority = 0x04, /**< @todo issuer may transfer asset back to himself */ + override_authority = 0x04, /**< issuer may transfer asset back to himself */ transfer_restricted = 0x08, /**< require the issuer to be one party to every transfer */ disable_force_settle = 0x10, /**< disable force settling */ global_settle = 0x20 /**< allow the bitasset issuer to force a global settling -- this may be set in permissions, but not flags */ diff --git a/libraries/chain/proposal_evaluator.cpp b/libraries/chain/proposal_evaluator.cpp index 9f175c2a..613b7f59 100644 --- a/libraries/chain/proposal_evaluator.cpp +++ b/libraries/chain/proposal_evaluator.cpp @@ -120,7 +120,7 @@ void_result proposal_update_evaluator::do_evaluate(const proposal_update_operati "", ("id", id)("available", _proposal->available_owner_approvals) ); } - /* All authority checks happen outside of evaluators, TODO: verify this is checked elsewhere + /* All authority checks happen outside of evaluators */ if( (d.get_node_properties().skip_flags & database::skip_authority_check) == 0 ) { diff --git a/libraries/chain/protocol/operations.cpp b/libraries/chain/protocol/operations.cpp index 7dba1c8d..7dadf232 100644 --- a/libraries/chain/protocol/operations.cpp +++ b/libraries/chain/protocol/operations.cpp @@ -71,7 +71,7 @@ struct required_active_visitor void operator()(const account_update_operation& o)const { /// if owner authority is required, no active authority is required - if( !(o.owner || o.active) ) /// TODO: document why active cannot be updated by active? + if( !(o.owner || o.active) ) result.insert( o.fee_payer() ); } void operator()( const proposal_delete_operation& o )const @@ -113,7 +113,7 @@ struct required_owner_visitor void operator()(const account_update_operation& o)const { - if( o.owner || o.active ) /// TODO: document why active cannot be updated by active? + if( o.owner || o.active ) result.insert( o.account ); } diff --git a/libraries/net/node.cpp b/libraries/net/node.cpp index 5f216cdd..9e84907b 100644 --- a/libraries/net/node.cpp +++ b/libraries/net/node.cpp @@ -2576,7 +2576,6 @@ namespace graphene { namespace net { namespace detail { wlog("Peer doesn't have the requested item."); trigger_fetch_items_loop(); return; - // TODO: reschedule fetching this item from a different peer } auto sync_item_iter = originating_peer->sync_items_requested_from_peer.find(requested_item); @@ -3261,7 +3260,6 @@ namespace graphene { namespace net { namespace detail { (current_time_reply_message_received.reply_transmitted_time - reply_received_time)).count() / 2); originating_peer->round_trip_delay = (reply_received_time - current_time_reply_message_received.request_sent_time) - (current_time_reply_message_received.reply_transmitted_time - current_time_reply_message_received.request_received_time); - // TODO } void node_impl::forward_firewall_check_to_next_available_peer(firewall_check_state_data* firewall_check_state) @@ -4397,7 +4395,7 @@ namespace graphene { namespace net { namespace detail { } ilog( "--------- MEMORY USAGE ------------" ); - ilog( "node._active_sync_requests size: ${size}", ("size", _active_sync_requests.size() ) ); // TODO: un-break this + ilog( "node._active_sync_requests size: ${size}", ("size", _active_sync_requests.size() ) ); ilog( "node._received_sync_items size: ${size}", ("size", _received_sync_items.size() ) ); ilog( "node._new_received_sync_items size: ${size}", ("size", _new_received_sync_items.size() ) ); ilog( "node._items_to_fetch size: ${size}", ("size", _items_to_fetch.size() ) ); @@ -4506,28 +4504,28 @@ namespace graphene { namespace net { namespace detail { ASSERT_TASK_NOT_PREEMPTED(); // don't yield while iterating over _active_connections peer_status this_peer_status; - this_peer_status.version = 0; // TODO + this_peer_status.version = 0; fc::optional endpoint = peer->get_remote_endpoint(); if (endpoint) this_peer_status.host = *endpoint; fc::mutable_variant_object peer_details; peer_details["addr"] = endpoint ? (std::string)*endpoint : std::string(); peer_details["addrlocal"] = (std::string)peer->get_local_endpoint(); - peer_details["services"] = "00000001"; // TODO: assign meaning, right now this just prints what bitcoin prints + peer_details["services"] = "00000001"; peer_details["lastsend"] = peer->get_last_message_sent_time().sec_since_epoch(); peer_details["lastrecv"] = peer->get_last_message_received_time().sec_since_epoch(); peer_details["bytessent"] = peer->get_total_bytes_sent(); peer_details["bytesrecv"] = peer->get_total_bytes_received(); peer_details["conntime"] = peer->get_connection_time(); - peer_details["pingtime"] = ""; // TODO: fill me for bitcoin compatibility - peer_details["pingwait"] = ""; // TODO: fill me for bitcoin compatibility - peer_details["version"] = ""; // TODO: fill me for bitcoin compatibility + peer_details["pingtime"] = ""; + peer_details["pingwait"] = ""; + peer_details["version"] = ""; peer_details["subver"] = peer->user_agent; peer_details["inbound"] = peer->direction == peer_connection_direction::inbound; peer_details["firewall_status"] = peer->is_firewalled; - peer_details["startingheight"] = ""; // TODO: fill me for bitcoin compatibility - peer_details["banscore"] = ""; // TODO: fill me for bitcoin compatibility - peer_details["syncnode"] = ""; // TODO: fill me for bitcoin compatibility + peer_details["startingheight"] = ""; + peer_details["banscore"] = ""; + peer_details["syncnode"] = ""; if (peer->fc_git_revision_sha) { diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp index a70bebf6..c3e5b43c 100644 --- a/libraries/wallet/wallet.cpp +++ b/libraries/wallet/wallet.cpp @@ -587,10 +587,8 @@ public: bool load_wallet_file(string wallet_filename = "") { - // // TODO: Merge imported wallet with existing wallet, // instead of replacing it - // if( wallet_filename == "" ) wallet_filename = _wallet_filename; From 46f35d0f8901a9ea4a67ca56c985157b397eb11d Mon Sep 17 00:00:00 2001 From: Vikram Rajkumar Date: Thu, 16 Jul 2015 13:46:17 -0400 Subject: [PATCH 029/353] Fix witness block production failure on block 1; resolve #163 --- libraries/chain/db_update.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/chain/db_update.cpp b/libraries/chain/db_update.cpp index 1ddd35a5..da5f4d7f 100644 --- a/libraries/chain/db_update.cpp +++ b/libraries/chain/db_update.cpp @@ -39,10 +39,10 @@ void database::update_global_dynamic_data( const signed_block& b ) const auto& global_props = get_global_properties(); auto delta_time = b.timestamp - _dgp.time; auto missed_blocks = (delta_time.to_seconds() / global_props.parameters.block_interval) - 1; + if( _dgp.head_block_number == 0 ) + missed_blocks = 0; - // // dynamic global properties updating - // modify( _dgp, [&]( dynamic_global_property_object& dgp ){ secret_hash_type::encoder enc; fc::raw::pack( enc, dgp.random ); @@ -62,7 +62,7 @@ void database::update_global_dynamic_data( const signed_block& b ) if( !(get_node_properties().skip_flags & skip_undo_history_check) ) { - GRAPHENE_ASSERT( _dgp.recently_missed_count < GRAPHENE_MAX_UNDO_HISTORY, undo_database_exception, + GRAPHENE_ASSERT( _dgp.recently_missed_count < GRAPHENE_MAX_UNDO_HISTORY, undo_database_exception, "The database does not have enough undo history to support a blockchain with so many missed blocks. " "Please add a checkpoint if you would like to continue applying blocks beyond this point.", ("recently_missed",_dgp.recently_missed_count)("max_undo",GRAPHENE_MAX_UNDO_HISTORY) ); From 9c8eb7d63bd6db3446ff4643b8592b26dc4b8303 Mon Sep 17 00:00:00 2001 From: Eric Frias Date: Thu, 16 Jul 2015 14:13:42 -0400 Subject: [PATCH 030/353] Avoid crashing on error parsing invalid ini file format requried by boost::program_options, temporary workaround for #167 --- programs/witness_node/main.cpp | 148 ++++++++++++++++++--------------- 1 file changed, 80 insertions(+), 68 deletions(-) diff --git a/programs/witness_node/main.cpp b/programs/witness_node/main.cpp index cbf53f7d..65bba032 100644 --- a/programs/witness_node/main.cpp +++ b/programs/witness_node/main.cpp @@ -21,6 +21,7 @@ #include #include +#include #include #include #include @@ -100,9 +101,16 @@ int main(int argc, char** argv) { bpo::store(bpo::parse_config_file(config_ini_path.preferred_string().c_str(), cfg_options, true), options); // try to get logging options from the config file. - fc::optional logging_config = load_logging_config_from_ini_file(config_ini_path); - if (logging_config) - fc::configure_logging(*logging_config); + try + { + fc::optional logging_config = load_logging_config_from_ini_file(config_ini_path); + if (logging_config) + fc::configure_logging(*logging_config); + } + catch (const fc::exception&) + { + wlog("Error parsing logging config from config file ${config}, using default config", ("config", config_ini_path.preferred_string())); + } } else { @@ -195,76 +203,80 @@ void write_default_logging_config_to_stream(std::ostream& out) fc::optional load_logging_config_from_ini_file(const fc::path& config_ini_filename) { - fc::logging_config logging_config; - bool found_logging_config = false; - - boost::property_tree::ptree config_ini_tree; - boost::property_tree::ini_parser::read_ini(config_ini_filename.preferred_string().c_str(), config_ini_tree); - for (const auto& section : config_ini_tree) + try { - const std::string& section_name = section.first; - const boost::property_tree::ptree& section_tree = section.second; + fc::logging_config logging_config; + bool found_logging_config = false; - const std::string console_appender_section_prefix = "log.console_appender."; - const std::string file_appender_section_prefix = "log.file_appender."; - const std::string logger_section_prefix = "logger."; - - if (boost::starts_with(section_name, console_appender_section_prefix)) + boost::property_tree::ptree config_ini_tree; + boost::property_tree::ini_parser::read_ini(config_ini_filename.preferred_string().c_str(), config_ini_tree); + for (const auto& section : config_ini_tree) { - std::string console_appender_name = section_name.substr(console_appender_section_prefix.length()); - std::string stream_name = section_tree.get("stream"); + const std::string& section_name = section.first; + const boost::property_tree::ptree& section_tree = section.second; - // construct a default console appender config here - // stdout/stderr will be taken from ini file, everything else hard-coded here - fc::console_appender::config console_appender_config; - console_appender_config.level_colors.emplace_back( - fc::console_appender::level_color(fc::log_level::debug, - fc::console_appender::color::green)); - console_appender_config.level_colors.emplace_back( - fc::console_appender::level_color(fc::log_level::warn, - fc::console_appender::color::brown)); - console_appender_config.level_colors.emplace_back( - fc::console_appender::level_color(fc::log_level::error, - fc::console_appender::color::cyan)); - console_appender_config.stream = fc::variant(stream_name).as(); - logging_config.appenders.push_back(fc::appender_config(console_appender_name, "console", fc::variant(console_appender_config))); - found_logging_config = true; - } - else if (boost::starts_with(section_name, file_appender_section_prefix)) - { - std::string file_appender_name = section_name.substr(file_appender_section_prefix.length()); - fc::path file_name = section_tree.get("filename"); - if (file_name.is_relative()) - file_name = fc::absolute(config_ini_filename).parent_path() / file_name; - + const std::string console_appender_section_prefix = "log.console_appender."; + const std::string file_appender_section_prefix = "log.file_appender."; + const std::string logger_section_prefix = "logger."; - // construct a default file appender config here - // filename will be taken from ini file, everything else hard-coded here - fc::file_appender::config file_appender_config; - file_appender_config.filename = file_name; - file_appender_config.flush = true; - file_appender_config.rotate = true; - file_appender_config.rotation_interval = fc::hours(1); - file_appender_config.rotation_limit = fc::days(1); - logging_config.appenders.push_back(fc::appender_config(file_appender_name, "file", fc::variant(file_appender_config))); - found_logging_config = true; - } - else if (boost::starts_with(section_name, logger_section_prefix)) - { - std::string logger_name = section_name.substr(logger_section_prefix.length()); - std::string level_string = section_tree.get("level"); - std::string appenders_string = section_tree.get("appenders"); - fc::logger_config logger_config(logger_name); - logger_config.level = fc::variant(level_string).as(); - boost::split(logger_config.appenders, appenders_string, - boost::is_any_of(" ,"), - boost::token_compress_on); - logging_config.loggers.push_back(logger_config); - found_logging_config = true; + if (boost::starts_with(section_name, console_appender_section_prefix)) + { + std::string console_appender_name = section_name.substr(console_appender_section_prefix.length()); + std::string stream_name = section_tree.get("stream"); + + // construct a default console appender config here + // stdout/stderr will be taken from ini file, everything else hard-coded here + fc::console_appender::config console_appender_config; + console_appender_config.level_colors.emplace_back( + fc::console_appender::level_color(fc::log_level::debug, + fc::console_appender::color::green)); + console_appender_config.level_colors.emplace_back( + fc::console_appender::level_color(fc::log_level::warn, + fc::console_appender::color::brown)); + console_appender_config.level_colors.emplace_back( + fc::console_appender::level_color(fc::log_level::error, + fc::console_appender::color::cyan)); + console_appender_config.stream = fc::variant(stream_name).as(); + logging_config.appenders.push_back(fc::appender_config(console_appender_name, "console", fc::variant(console_appender_config))); + found_logging_config = true; + } + else if (boost::starts_with(section_name, file_appender_section_prefix)) + { + std::string file_appender_name = section_name.substr(file_appender_section_prefix.length()); + fc::path file_name = section_tree.get("filename"); + if (file_name.is_relative()) + file_name = fc::absolute(config_ini_filename).parent_path() / file_name; + + + // construct a default file appender config here + // filename will be taken from ini file, everything else hard-coded here + fc::file_appender::config file_appender_config; + file_appender_config.filename = file_name; + file_appender_config.flush = true; + file_appender_config.rotate = true; + file_appender_config.rotation_interval = fc::hours(1); + file_appender_config.rotation_limit = fc::days(1); + logging_config.appenders.push_back(fc::appender_config(file_appender_name, "file", fc::variant(file_appender_config))); + found_logging_config = true; + } + else if (boost::starts_with(section_name, logger_section_prefix)) + { + std::string logger_name = section_name.substr(logger_section_prefix.length()); + std::string level_string = section_tree.get("level"); + std::string appenders_string = section_tree.get("appenders"); + fc::logger_config logger_config(logger_name); + logger_config.level = fc::variant(level_string).as(); + boost::split(logger_config.appenders, appenders_string, + boost::is_any_of(" ,"), + boost::token_compress_on); + logging_config.loggers.push_back(logger_config); + found_logging_config = true; + } } + if (found_logging_config) + return logging_config; + else + return fc::optional(); } - if (found_logging_config) - return logging_config; - else - return fc::optional(); + FC_RETHROW_EXCEPTIONS(warn, "") } From 8ff2c94c52436d677a2be30d31b07fef31f9cb7f Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Thu, 16 Jul 2015 14:28:23 -0400 Subject: [PATCH 031/353] Update API to address #164 --- libraries/app/api.cpp | 27 ++++++++++++++-------- libraries/app/include/graphene/app/api.hpp | 2 +- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/libraries/app/api.cpp b/libraries/app/api.cpp index f192c765..864539c0 100644 --- a/libraries/app/api.cpp +++ b/libraries/app/api.cpp @@ -650,20 +650,27 @@ namespace graphene { namespace app { /** * @return all accounts that referr to the key or account id in their owner or active authorities. */ - vector database_api::get_key_references( public_key_type key )const + vector> database_api::get_key_references( vector keys )const { - const auto& idx = _db.get_index_type(); - const auto& aidx = dynamic_cast&>(idx); - const auto& refs = aidx.get_secondary_index(); - auto itr = refs.account_to_key_memberships.find(key); - vector result; + vector< vector > final_result; + final_result.reserve(keys.size()); - if( itr != refs.account_to_key_memberships.end() ) + for( auto& key : keys ) { - result.reserve( itr->second.size() ); - for( auto item : itr->second ) result.push_back(item); + const auto& idx = _db.get_index_type(); + const auto& aidx = dynamic_cast&>(idx); + const auto& refs = aidx.get_secondary_index(); + auto itr = refs.account_to_key_memberships.find(key); + vector result; + + if( itr != refs.account_to_key_memberships.end() ) + { + result.reserve( itr->second.size() ); + for( auto item : itr->second ) result.push_back(item); + } + final_result.emplace_back( std::move(result) ); } - return result; + return final_result; } /** TODO: add secondary index that will accelerate this process */ diff --git a/libraries/app/include/graphene/app/api.hpp b/libraries/app/include/graphene/app/api.hpp index 109de097..f820044b 100644 --- a/libraries/app/include/graphene/app/api.hpp +++ b/libraries/app/include/graphene/app/api.hpp @@ -276,7 +276,7 @@ namespace graphene { namespace app { * @return all accounts that referr to the key or account id in their owner or active authorities. */ vector get_account_references( account_id_type account_id )const; - vector get_key_references( public_key_type account_id )const; + vector> get_key_references( vector key )const; /** * @return all open margin positions for a given account id. From 11a5d2b620f05c7134dc4d3423b47ba19be9c2af Mon Sep 17 00:00:00 2001 From: Eric Frias Date: Thu, 16 Jul 2015 15:30:05 -0400 Subject: [PATCH 032/353] When the p2p code processes a block that contains transactions we haven't seen, avoid fetching those transactions separately --- libraries/app/application.cpp | 35 +++++++-- libraries/chain/db_block.cpp | 4 +- libraries/net/include/graphene/net/node.hpp | 36 +++++----- libraries/net/node.cpp | 80 +++++++++++++++------ libraries/wallet/wallet.cpp | 5 +- 5 files changed, 111 insertions(+), 49 deletions(-) diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp index 305b689a..227a83db 100644 --- a/libraries/app/application.cpp +++ b/libraries/app/application.cpp @@ -312,11 +312,29 @@ namespace detail { * * @throws exception if error validating the item, otherwise the item is safe to broadcast on. */ - virtual bool handle_block(const graphene::net::block_message& blk_msg, bool sync_mode) override + virtual bool handle_block(const graphene::net::block_message& blk_msg, bool sync_mode, + std::vector& contained_transaction_message_ids) override { try { ilog("Got block #${n} from network", ("n", blk_msg.block.block_num())); try { - return _chain_db->push_block(blk_msg.block, _is_block_producer? database::skip_nothing : database::skip_transaction_signatures); + bool result = _chain_db->push_block(blk_msg.block, _is_block_producer ? database::skip_nothing : database::skip_transaction_signatures); + + // the block was accepted, so we now know all of the transactions contained in the block + if (!sync_mode) + { + // if we're not in sync mode, there's a chance we will be seeing some transactions + // included in blocks before we see the free-floating transaction itself. If that + // happens, there's no reason to fetch the transactions, so construct a list of the + // transaction message ids we no longer need. + // during sync, it is unlikely that we'll see any old + for (const processed_transaction& transaction : blk_msg.block.transactions) + { + graphene::net::trx_message transaction_message(transaction); + contained_transaction_message_ids.push_back(graphene::net::message(transaction_message).id()); + } + } + + return result; } catch( const fc::exception& e ) { elog("Error when pushing block:\n${e}", ("e", e.to_detail_string())); throw; @@ -329,12 +347,17 @@ namespace detail { } } FC_CAPTURE_AND_RETHROW( (blk_msg)(sync_mode) ) } - virtual bool handle_transaction(const graphene::net::trx_message& trx_msg, bool sync_mode) override + virtual void handle_transaction(const graphene::net::trx_message& transaction_message) override { try { ilog("Got transaction from network"); - _chain_db->push_transaction( trx_msg.trx ); - return false; - } FC_CAPTURE_AND_RETHROW( (trx_msg)(sync_mode) ) } + _chain_db->push_transaction( transaction_message.trx ); + } FC_CAPTURE_AND_RETHROW( (transaction_message) ) } + + virtual void handle_message(const message& message_to_process) override + { + // not a transaction, not a block + FC_THROW( "Invalid Message Type" ); + } /** * Assuming all data elements are ordered in some way, this method should diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index dccabbb0..b08b0959 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -97,7 +97,7 @@ bool database::_push_block(const signed_block& new_block) uint32_t skip = get_node_properties().skip_flags; if( !(skip&skip_fork_db) ) { - auto new_head = _fork_db.push_block(new_block); + shared_ptr new_head = _fork_db.push_block(new_block); //If the head block from the longest chain does not build off of the current head, we need to switch forks. if( new_head->data.previous != head_block_id() ) { @@ -116,7 +116,7 @@ bool database::_push_block(const signed_block& new_block) { optional except; try { - auto session = _undo_db.start_undo_session(); + undo_database::session session = _undo_db.start_undo_session(); apply_block( (*ritr)->data, skip ); _block_id_to_block.store( (*ritr)->id, (*ritr)->data ); session.commit(); diff --git a/libraries/net/include/graphene/net/node.hpp b/libraries/net/include/graphene/net/node.hpp index b5bfdeb7..22ef496e 100644 --- a/libraries/net/include/graphene/net/node.hpp +++ b/libraries/net/include/graphene/net/node.hpp @@ -62,8 +62,7 @@ namespace graphene { namespace net { virtual bool has_item( const net::item_id& id ) = 0; /** - * @brief allows the application to validate an item prior to - * broadcasting to peers. + * @brief Called when a new block comes in from the network * * @param sync_mode true if the message was fetched through the sync process, false during normal operation * @returns true if this message caused the blockchain to switch forks, false if it did not @@ -71,21 +70,26 @@ namespace graphene { namespace net { * @throws exception if error validating the item, otherwise the item is * safe to broadcast on. */ - virtual bool handle_block( const graphene::net::block_message& blk_msg, bool syncmode ) = 0; - virtual bool handle_transaction( const graphene::net::trx_message& trx_msg, bool syncmode ) = 0; + virtual bool handle_block( const graphene::net::block_message& blk_msg, bool sync_mode, + std::vector& contained_transaction_message_ids ) = 0; + + /** + * @brief Called when a new transaction comes in from the network + * + * @throws exception if error validating the item, otherwise the item is + * safe to broadcast on. + */ + virtual void handle_transaction( const graphene::net::trx_message& trx_msg ) = 0; - virtual bool handle_message( const message& message_to_process, bool sync_mode ) - { - switch( message_to_process.msg_type ) - { - case block_message_type: - return handle_block(message_to_process.as(), sync_mode); - case trx_message_type: - return handle_transaction(message_to_process.as(), sync_mode); - default: - FC_THROW( "Invalid Message Type" ); - }; - } + /** + * @brief Called when a new message comes in from the network other than a + * block or a transaction. Currently there are no other possible + * messages, so this should never be called. + * + * @throws exception if error validating the item, otherwise the item is + * safe to broadcast on. + */ + virtual void handle_message( const message& message_to_process ) = 0; /** * Assuming all data elements are ordered in some way, this method should diff --git a/libraries/net/node.cpp b/libraries/net/node.cpp index 9e84907b..4c568d76 100644 --- a/libraries/net/node.cpp +++ b/libraries/net/node.cpp @@ -276,6 +276,8 @@ namespace graphene { namespace net { namespace detail { boost::accumulators::tag::count> > call_stats_accumulator; #define NODE_DELEGATE_METHOD_NAMES (has_item) \ (handle_message) \ + (handle_block) \ + (handle_transaction) \ (get_item_ids) \ (get_item) \ (get_chain_id) \ @@ -367,9 +369,9 @@ namespace graphene { namespace net { namespace detail { fc::variant_object get_call_statistics(); bool has_item( const net::item_id& id ) override; - bool handle_message( const message&, bool sync_mode ) override; - bool handle_block( const graphene::net::block_message& blk_msg, bool syncmode ) override; - bool handle_transaction( const graphene::net::trx_message& trx_msg, bool syncmode ) override; + void handle_message( const message& ) override; + bool handle_block( const graphene::net::block_message& block_message, bool sync_mode, std::vector& contained_transaction_message_ids ) override; + void handle_transaction( const graphene::net::trx_message& transaction_message ) override; std::vector get_item_ids(uint32_t item_type, const std::vector& blockchain_synopsis, uint32_t& remaining_item_count, @@ -448,9 +450,11 @@ namespace graphene { namespace net { namespace detail { bool _items_to_fetch_updated; fc::future _fetch_item_loop_done; + struct item_id_index{}; typedef boost::multi_index_container >, - boost::multi_index::hashed_unique, + boost::multi_index::hashed_unique, + boost::multi_index::member, std::hash > > > items_to_fetch_set_type; unsigned _items_to_fetch_sequence_counter; @@ -2777,7 +2781,8 @@ namespace graphene { namespace net { namespace detail { try { - _delegate->handle_block(block_message_to_send, true); + std::vector contained_transaction_message_ids; + _delegate->handle_block(block_message_to_send, true, contained_transaction_message_ids); ilog("Successfully pushed sync block ${num} (id:${id})", ("num", block_message_to_send.block.block_num()) ("id", block_message_to_send.block_id)); @@ -3095,12 +3100,31 @@ namespace graphene { namespace net { namespace detail { if (std::find(_most_recent_blocks_accepted.begin(), _most_recent_blocks_accepted.end(), block_message_to_process.block_id) == _most_recent_blocks_accepted.end()) { - _delegate->handle_block(block_message_to_process, false); + std::vector contained_transaction_message_ids; + _delegate->handle_block(block_message_to_process, false, contained_transaction_message_ids); message_validated_time = fc::time_point::now(); ilog("Successfully pushed block ${num} (id:${id})", ("num", block_message_to_process.block.block_num()) ("id", block_message_to_process.block_id)); _most_recent_blocks_accepted.push_back(block_message_to_process.block_id); + + bool new_transaction_discovered = false; + for (const item_hash_t& transaction_message_hash : contained_transaction_message_ids) + { + size_t items_erased = _items_to_fetch.get().erase(item_id(trx_message_type, transaction_message_hash)); + // there are two ways we could behave here: we could either act as if we received + // the transaction outside the block and offer it to our peers, or we could just + // forget about it (we would still advertise this block to our peers so they should + // get the transaction through that mechanism). + // We take the second approach, bring in the next if block to try the first approach + //if (items_erased) + //{ + // new_transaction_discovered = true; + // _new_inventory.insert(item_id(trx_message_type, transaction_message_hash)); + //} + } + if (new_transaction_discovered) + trigger_advertise_inventory_loop(); } else dlog( "Already received and accepted this block (presumably through sync mechanism), treating it as accepted" ); @@ -3532,7 +3556,10 @@ namespace graphene { namespace net { namespace detail { fc::time_point message_validated_time; try { - _delegate->handle_message( message_to_process, false ); + if (message_to_process.msg_type == trx_message_type) + _delegate->handle_transaction( message_to_process.as() ); + else + _delegate->handle_message( message_to_process ); message_validated_time = fc::time_point::now(); } catch ( const insufficient_relay_fee& ) @@ -4914,8 +4941,8 @@ namespace graphene { namespace net { namespace detail { INVOKE_IN_IMPL(clear_peer_database); } - void node::set_total_bandwidth_limit( uint32_t upload_bytes_per_second, - uint32_t download_bytes_per_second ) + void node::set_total_bandwidth_limit(uint32_t upload_bytes_per_second, + uint32_t download_bytes_per_second) { INVOKE_IN_IMPL(set_total_bandwidth_limit, upload_bytes_per_second, download_bytes_per_second); } @@ -4968,7 +4995,16 @@ namespace graphene { namespace net { namespace detail { { try { - destination_node->delegate->handle_message(destination_node->messages_to_deliver.front(), false); + const message& message_to_deliver = destination_node->messages_to_deliver.front(); + if (message_to_deliver.msg_type == trx_message_type) + destination_node->delegate->handle_transaction(message_to_deliver.as()); + else if (message_to_deliver.msg_type == block_message_type) + { + std::vector contained_transaction_message_ids; + destination_node->delegate->handle_block(message_to_deliver.as(), false, contained_transaction_message_ids); + } + else + destination_node->delegate->handle_message(message_to_deliver); } catch ( const fc::exception& e ) { @@ -5098,27 +5134,25 @@ namespace graphene { namespace net { namespace detail { INVOKE_AND_COLLECT_STATISTICS(has_item, id); } - bool statistics_gathering_node_delegate_wrapper::handle_message( const message& message_to_handle, bool sync_mode ) + void statistics_gathering_node_delegate_wrapper::handle_message( const message& message_to_handle ) { - INVOKE_AND_COLLECT_STATISTICS(handle_message, message_to_handle, sync_mode); + INVOKE_AND_COLLECT_STATISTICS(handle_message, message_to_handle); } - bool statistics_gathering_node_delegate_wrapper::handle_block( const graphene::net::block_message& blk_msg, bool syncmode ) + bool statistics_gathering_node_delegate_wrapper::handle_block( const graphene::net::block_message& block_message, bool sync_mode, std::vector& contained_transaction_message_ids) { - if (_thread->is_current()) { return _node_delegate->handle_block(blk_msg,syncmode); } - else return _thread->async([&](){ return _node_delegate->handle_block(blk_msg,syncmode); }, "invoke handle_block").wait(); + INVOKE_AND_COLLECT_STATISTICS(handle_block, block_message, sync_mode, contained_transaction_message_ids); } - bool statistics_gathering_node_delegate_wrapper::handle_transaction( const graphene::net::trx_message& trx_msg, bool syncmode ) + void statistics_gathering_node_delegate_wrapper::handle_transaction( const graphene::net::trx_message& transaction_message ) { - if (_thread->is_current()) { return _node_delegate->handle_transaction(trx_msg,syncmode); } - else return _thread->async([&](){ return _node_delegate->handle_transaction(trx_msg,syncmode); }, "invoke handle_transaction").wait(); + INVOKE_AND_COLLECT_STATISTICS(handle_transaction, transaction_message); } std::vector statistics_gathering_node_delegate_wrapper::get_item_ids(uint32_t item_type, - const std::vector& blockchain_synopsis, - uint32_t& remaining_item_count, - uint32_t limit /* = 2000 */) + const std::vector& blockchain_synopsis, + uint32_t& remaining_item_count, + uint32_t limit /* = 2000 */) { INVOKE_AND_COLLECT_STATISTICS(get_item_ids, item_type, blockchain_synopsis, remaining_item_count, limit); } @@ -5134,8 +5168,8 @@ namespace graphene { namespace net { namespace detail { } std::vector statistics_gathering_node_delegate_wrapper::get_blockchain_synopsis(uint32_t item_type, - const graphene::net::item_hash_t& reference_point /* = graphene::net::item_hash_t() */, - uint32_t number_of_blocks_after_reference_point /* = 0 */) + const graphene::net::item_hash_t& reference_point /* = graphene::net::item_hash_t() */, + uint32_t number_of_blocks_after_reference_point /* = 0 */) { INVOKE_AND_COLLECT_STATISTICS(get_blockchain_synopsis, item_type, reference_point, number_of_blocks_after_reference_point); } diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp index c3e5b43c..03968f22 100644 --- a/libraries/wallet/wallet.cpp +++ b/libraries/wallet/wallet.cpp @@ -1707,8 +1707,9 @@ public: dbg_make_uia(master.name, "SHILL"); } catch(...) {/* Ignore; the asset probably already exists.*/} - fc::time_point start = fc::time_point::now(); for( int i = 0; i < number_of_accounts; ++i ) - create_account_with_private_key(key, prefix + fc::to_string(i), master.name, master.name, true, false); + fc::time_point start = fc::time_point::now(); + for( int i = 0; i < number_of_accounts; ++i ) + create_account_with_private_key(key, prefix + fc::to_string(i), master.name, master.name, /* broadcast = */ true, /* save wallet = */ false); fc::time_point end = fc::time_point::now(); ilog("Created ${n} accounts in ${time} milliseconds", ("n", number_of_accounts)("time", (end - start).count() / 1000)); From bc9a3173ec49091f0f375358f2790e54e282deed Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Thu, 16 Jul 2015 15:05:50 -0400 Subject: [PATCH 033/353] database_fixture: Make borrow() return object --- tests/common/database_fixture.cpp | 10 +++++++++- tests/common/database_fixture.hpp | 6 +++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/tests/common/database_fixture.cpp b/tests/common/database_fixture.cpp index 8aeeda06..efdf75f3 100644 --- a/tests/common/database_fixture.cpp +++ b/tests/common/database_fixture.cpp @@ -755,7 +755,7 @@ void database_fixture::force_settle( const account_object& who, asset what ) verify_asset_supplies(db); } FC_CAPTURE_AND_RETHROW( (who)(what) ) } -void database_fixture::borrow(const account_object& who, asset what, asset collateral) +const call_order_object* database_fixture::borrow(const account_object& who, asset what, asset collateral) { try { trx.set_expiration(db.head_block_time() + fc::minutes(1)); trx.operations.clear(); @@ -769,6 +769,14 @@ void database_fixture::borrow(const account_object& who, asset what, asset coll db.push_transaction(trx, ~0); trx.operations.clear(); verify_asset_supplies(db); + + auto& call_idx = db.get_index_type().indices().get(); + auto itr = call_idx.find( boost::make_tuple(who.id, what.asset_id) ); + const call_order_object* call_obj = nullptr; + + if( itr != call_idx.end() ) + call_obj = &*itr; + return call_obj; } FC_CAPTURE_AND_RETHROW( (who.name)(what)(collateral) ) } void database_fixture::cover(const account_object& who, asset what, asset collateral) diff --git a/tests/common/database_fixture.hpp b/tests/common/database_fixture.hpp index 328a3be6..e0a643f9 100644 --- a/tests/common/database_fixture.hpp +++ b/tests/common/database_fixture.hpp @@ -198,9 +198,9 @@ struct database_fixture { void publish_feed(asset_id_type mia, account_id_type by, const price_feed& f) { publish_feed(mia(db), by(db), f); } void publish_feed(const asset_object& mia, const account_object& by, const price_feed& f); - void borrow(account_id_type who, asset what, asset collateral) - { borrow(who(db), what, collateral); } - void borrow(const account_object& who, asset what, asset collateral); + const call_order_object* borrow(account_id_type who, asset what, asset collateral) + { return borrow(who(db), what, collateral); } + const call_order_object* borrow(const account_object& who, asset what, asset collateral); void cover(account_id_type who, asset what, asset collateral_freed) { cover(who(db), what, collateral_freed); } void cover(const account_object& who, asset what, asset collateral_freed); From 3cdcf5139faf64b41517250a7bb713642df71dea Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Thu, 16 Jul 2015 15:24:00 -0400 Subject: [PATCH 034/353] market_evaluator.cpp: Fix call_order_update_evaluator exception logic --- .../include/graphene/chain/exceptions.hpp | 4 ++- libraries/chain/market_evaluator.cpp | 25 ++++++++++++++----- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/libraries/chain/include/graphene/chain/exceptions.hpp b/libraries/chain/include/graphene/chain/exceptions.hpp index cd2f0261..a75e3bba 100644 --- a/libraries/chain/include/graphene/chain/exceptions.hpp +++ b/libraries/chain/include/graphene/chain/exceptions.hpp @@ -85,7 +85,9 @@ namespace graphene { namespace chain { //GRAPHENE_DECLARE_OP_BASE_EXCEPTIONS( limit_order_create ); //GRAPHENE_DECLARE_OP_BASE_EXCEPTIONS( limit_order_cancel ); - //GRAPHENE_DECLARE_OP_BASE_EXCEPTIONS( call_order_update ); + GRAPHENE_DECLARE_OP_BASE_EXCEPTIONS( call_order_update ); + + GRAPHENE_DECLARE_OP_EVALUATE_EXCEPTION( unfilled_margin_call, call_order_update, 1, "Updating call order would trigger a margin call that cannot be fully filled" ) //GRAPHENE_DECLARE_OP_BASE_EXCEPTIONS( account_create ); //GRAPHENE_DECLARE_OP_BASE_EXCEPTIONS( account_update ); //GRAPHENE_DECLARE_OP_BASE_EXCEPTIONS( account_whitelist ); diff --git a/libraries/chain/market_evaluator.cpp b/libraries/chain/market_evaluator.cpp index 2867e866..786a56ad 100644 --- a/libraries/chain/market_evaluator.cpp +++ b/libraries/chain/market_evaluator.cpp @@ -213,18 +213,31 @@ void_result call_order_update_evaluator::do_apply(const call_order_update_operat // then we must check for margin calls and other issues if( !_bitasset_data->is_prediction_market ) { - // Check that the order's debt per collateral is less than the system's minimum debt per collateral. - FC_ASSERT( ~call_obj->call_price <= _bitasset_data->current_feed.settlement_price, - "Insufficient collateral for debt.", - ("a", ~call_obj->call_price)("b", _bitasset_data->current_feed.settlement_price)); - auto call_order_id = call_obj->id; // check to see if the order needs to be margin called now, but don't allow black swans and require there to be // limit orders available that could be used to fill the order. if( d.check_call_orders( *_debt_asset, false ) ) { - FC_ASSERT( !d.find_object( call_order_id ), "If updating the call order triggers a margin call, then it must completely cover the order" ); + // if we filled at least one call order, we are OK if we totally filled. + GRAPHENE_ASSERT( + !d.find_object( call_order_id ), + call_order_update_unfilled_margin_call, + "Updating call order would trigger a margin call that cannot be fully filled", + ("a", ~call_obj->call_price)("b", _bitasset_data->current_feed.settlement_price) + ); + } + else + { + // We didn't fill any call orders. This may be because we + // aren't in margin call territory, or it may be because there + // were no matching orders. In the latter case, we throw. + GRAPHENE_ASSERT( + ~call_obj->call_price < _bitasset_data->current_feed.settlement_price, + call_order_update_unfilled_margin_call, + "Updating call order would trigger a margin call that cannot be fully filled", + ("a", ~call_obj->call_price)("b", _bitasset_data->current_feed.settlement_price) + ); } } From c527b2d41e215ff45f8f2184ec27af4d5c0104c8 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Thu, 16 Jul 2015 13:49:24 -0400 Subject: [PATCH 035/353] operation_tests.cpp: Implement cover_with_collateral_test --- tests/tests/operation_tests.cpp | 86 ++++++++++++++++++++++++++++++--- 1 file changed, 80 insertions(+), 6 deletions(-) diff --git a/tests/tests/operation_tests.cpp b/tests/tests/operation_tests.cpp index 75d5fe1c..8173f88a 100644 --- a/tests/tests/operation_tests.cpp +++ b/tests/tests/operation_tests.cpp @@ -18,9 +18,11 @@ #include +#include +#include + #include #include -#include #include #include #include @@ -1227,13 +1229,85 @@ BOOST_AUTO_TEST_CASE( unimp_burn_asset_test ) /** * This test demonstrates how using the call_order_update_operation to - * increase the maintenance collateral ratio above the current market - * price, perhaps setting it to infinity. + * trigger a margin call is legal if there is a matching order. */ -BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES( unimp_cover_with_collateral_test, 1 ) -BOOST_AUTO_TEST_CASE( unimp_cover_with_collateral_test ) +BOOST_AUTO_TEST_CASE( cover_with_collateral_test ) { - BOOST_FAIL( "not implemented" ); + try + { + ACTORS((alice)(bob)(sam)); + const auto& bitusd = create_bitasset("BITUSD"); + const auto& core = asset_id_type()(db); + + BOOST_TEST_MESSAGE( "Setting price feed to $0.02 / 100" ); + transfer(committee_account, alice_id, asset(10000000)); + update_feed_producers( bitusd, {sam.id} ); + + price_feed current_feed; + current_feed.settlement_price = bitusd.amount( 2 ) / core.amount(100); + publish_feed( bitusd, sam, current_feed ); + + BOOST_REQUIRE( bitusd.bitasset_data(db).current_feed.settlement_price == current_feed.settlement_price ); + + BOOST_TEST_MESSAGE( "Alice borrows some BitUSD at 2x collateral and gives it to Bob" ); + const call_order_object* call_order = borrow( alice, bitusd.amount(100), asset(10000) ); + BOOST_REQUIRE( call_order != nullptr ); + + // wdump( (*call_order) ); + + transfer( alice_id, bob_id, bitusd.amount(100) ); + + auto update_call_order = [&]( account_id_type acct, asset delta_collateral, asset delta_debt ) + { + call_order_update_operation op; + op.funding_account = acct; + op.delta_collateral = delta_collateral; + op.delta_debt = delta_debt; + transaction tx; + tx.operations.push_back( op ); + tx.set_expiration( db.head_block_time() + fc::minutes(5) ); + db.push_transaction( tx, database::skip_authority_check | database::skip_tapos_check | database::skip_transaction_signatures ); + } ; + + // margin call requirement: 1.75x + BOOST_TEST_MESSAGE( "Alice decreases her collateral to maint level plus one satoshi" ); + asset delta_collateral = asset(int64_t( current_feed.maintenance_collateral_ratio ) * 5000 / GRAPHENE_COLLATERAL_RATIO_DENOM - 10000 + 1 ); + update_call_order( alice_id, delta_collateral, bitusd.amount(0) ); + // wdump( (*call_order) ); + + BOOST_TEST_MESSAGE( "Alice cannot decrease her collateral by one satoshi, there is no buyer" ); + GRAPHENE_REQUIRE_THROW( update_call_order( alice_id, asset(-1), bitusd.amount(0) ), call_order_update_unfilled_margin_call ); + // wdump( (*call_order) ); + + BOOST_TEST_MESSAGE( "Bob offers to sell most of the BitUSD at the feed" ); + const limit_order_object* order = create_sell_order( bob_id, bitusd.amount(99), asset(4950) ); + BOOST_REQUIRE( order != nullptr ); + limit_order_id_type order1_id = order->id; + BOOST_CHECK_EQUAL( order->for_sale.value, 99 ); + // wdump( (*call_order) ); + + BOOST_TEST_MESSAGE( "Alice still cannot decrease her collateral to maint level" ); + GRAPHENE_REQUIRE_THROW( update_call_order( alice_id, asset(-1), bitusd.amount(0) ), call_order_update_unfilled_margin_call ); + // wdump( (*call_order) ); + + BOOST_TEST_MESSAGE( "Bob offers to sell the last of his BitUSD in another order" ); + order = create_sell_order( bob_id, bitusd.amount(1), asset(50) ); + BOOST_REQUIRE( order != nullptr ); + limit_order_id_type order2_id = order->id; + BOOST_CHECK_EQUAL( order->for_sale.value, 1 ); + // wdump( (*call_order) ); + + BOOST_TEST_MESSAGE( "Alice decreases her collateral to maint level and Bob's orders fill" ); + update_call_order( alice_id, asset(-1), bitusd.amount(0) ); + + BOOST_CHECK( db.find( order1_id ) == nullptr ); + BOOST_CHECK( db.find( order2_id ) == nullptr ); + } + catch (fc::exception& e) + { + edump((e.to_detail_string())); + throw; + } } BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES( unimp_bulk_discount_test, 1 ) From dc8849f23b97a05c7226b924d727505feab3aae0 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Thu, 16 Jul 2015 16:09:32 -0400 Subject: [PATCH 036/353] Active key is not required when owner key present - when updating account there is no need to sign with the active key if the owner has signed. - when updating an account the active key is enough to update the active key. --- .../chain/include/graphene/chain/protocol/account.hpp | 5 ++++- tests/tests/operation_tests.cpp | 9 --------- tests/tests/uia_tests.cpp | 8 -------- 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/libraries/chain/include/graphene/chain/protocol/account.hpp b/libraries/chain/include/graphene/chain/protocol/account.hpp index 13fc7b09..01a64f8c 100644 --- a/libraries/chain/include/graphene/chain/protocol/account.hpp +++ b/libraries/chain/include/graphene/chain/protocol/account.hpp @@ -104,7 +104,10 @@ namespace graphene { namespace chain { share_type calculate_fee( const fee_parameters_type& k )const; void get_required_owner_authorities( flat_set& a )const - { if( owner || active ) a.insert( account ); } + { if( owner ) a.insert( account ); } + + void get_required_active_authorities( flat_set& a )const + { if( !owner ) a.insert( account ); } void get_impacted_accounts( flat_set& i )const { diff --git a/tests/tests/operation_tests.cpp b/tests/tests/operation_tests.cpp index 8173f88a..dad31ead 100644 --- a/tests/tests/operation_tests.cpp +++ b/tests/tests/operation_tests.cpp @@ -1217,15 +1217,6 @@ BOOST_AUTO_TEST_CASE( witness_pay_test ) } FC_LOG_AND_RETHROW() } -/** - * Asset Burn Test should make sure that all assets except bitassets - * can be burned and all supplies add up. - */ -BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES( unimp_burn_asset_test, 1 ) -BOOST_AUTO_TEST_CASE( unimp_burn_asset_test ) -{ - BOOST_FAIL( "not implemented" ); -} /** * This test demonstrates how using the call_order_update_operation to diff --git a/tests/tests/uia_tests.cpp b/tests/tests/uia_tests.cpp index 35bf3d98..14ae637a 100644 --- a/tests/tests/uia_tests.cpp +++ b/tests/tests/uia_tests.cpp @@ -296,13 +296,5 @@ BOOST_AUTO_TEST_CASE( unimp_halt_transfers_flag_test ) BOOST_FAIL( "not implemented" ); } -/** - * verify that issuers can retract funds - */ -BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES( unimp_fund_retraction_test, 1 ) -BOOST_AUTO_TEST_CASE( unimp_fund_retraction_test ) -{ - BOOST_FAIL( "not implemented" ); -} BOOST_AUTO_TEST_SUITE_END() From 723b11533bb352940f5784164ed1bfb7a46b915c Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Thu, 16 Jul 2015 17:02:08 -0400 Subject: [PATCH 037/353] Progress #166: Initial implementation of get_full_accounts API call --- libraries/app/api.cpp | 95 +++++++++++++++++-- libraries/app/include/graphene/app/api.hpp | 34 +++++-- libraries/chain/db_init.cpp | 5 +- .../graphene/chain/market_evaluator.hpp | 6 +- .../graphene/chain/vesting_balance_object.hpp | 6 +- 5 files changed, 124 insertions(+), 22 deletions(-) diff --git a/libraries/app/api.cpp b/libraries/app/api.cpp index 864539c0..815710d0 100644 --- a/libraries/app/api.cpp +++ b/libraries/app/api.cpp @@ -149,6 +149,87 @@ namespace graphene { namespace app { return result; } + std::map database_api::get_full_accounts(std::function callback, + const vector& names_or_ids) + { + std::map results; + std::set ids_to_subscribe; + + for (const std::string& account_name_or_id : names_or_ids) + { + const account_object* account = nullptr; + if (std::isdigit(account_name_or_id[0])) + account = _db.find(fc::variant(account_name_or_id).as()); + else + { + const auto& idx = _db.get_index_type().indices().get(); + auto itr = idx.find(account_name_or_id); + if (itr != idx.end()) + account = &*itr; + } + if (account == nullptr) + continue; + + ids_to_subscribe.insert({account->id, account->statistics}); + + fc::mutable_variant_object full_account; + + // Add the account itself, its statistics object, cashback balance, and referral account names + full_account("account", *account)("statistics", account->statistics(_db)) + ("registrar_name", account->registrar(_db).name)("referrer_name", account->referrer(_db).name) + ("lifetime_referrer_name", account->lifetime_referrer(_db).name); + if (account->cashback_vb) + { + ids_to_subscribe.insert(*account->cashback_vb); + full_account("cashback_balance", account->cashback_balance(_db)); + } + + // Add the account's balances + auto balance_range = _db.get_index_type().indices().get().equal_range(account->id); + vector balances; + std::for_each(balance_range.first, balance_range.second, + [&balances, &ids_to_subscribe](const account_balance_object& balance) { + balances.emplace_back(balance); + ids_to_subscribe.insert(balance.id); + }); + idump((balances)); + full_account("balances", balances); + + // Add the account's vesting balances + auto vesting_range = _db.get_index_type().indices().get().equal_range(account->id); + vector vesting_balances; + std::for_each(vesting_range.first, vesting_range.second, + [&vesting_balances, &ids_to_subscribe](const vesting_balance_object& balance) { + vesting_balances.emplace_back(balance); + ids_to_subscribe.insert(balance.id); + }); + full_account("vesting_balances", vesting_balances); + + // Add the account's orders + auto order_range = _db.get_index_type().indices().get().equal_range(account->id); + vector orders; + std::for_each(order_range.first, order_range.second, + [&orders, &ids_to_subscribe] (const limit_order_object& order) { + orders.emplace_back(order); + ids_to_subscribe.insert(order.id); + }); + auto call_range = _db.get_index_type().indices().get().equal_range(account->id); + vector calls; + std::for_each(call_range.first, call_range.second, + [&calls, &ids_to_subscribe] (const call_order_object& call) { + calls.emplace_back(call); + ids_to_subscribe.insert(call.id); + }); + full_account("limit_orders", orders)("call_orders", calls); + + results[account_name_or_id] = full_account; + } + + wdump((results)); + subscribe_to_objects(callback, vector(ids_to_subscribe.begin(), ids_to_subscribe.end())); + return results; + } + vector database_api::get_account_balances(account_id_type acnt, const flat_set& assets)const { vector result; @@ -278,12 +359,12 @@ namespace graphene { namespace app { // we want to order witnesses by account name, but that name is in the account object // so the witness_index doesn't have a quick way to access it. // get all the names and look them all up, sort them, then figure out what - // records to return. This could be optimized, but we expect the + // records to return. This could be optimized, but we expect the // number of witnesses to be few and the frequency of calls to be rare std::map witnesses_by_account_name; for (const witness_object& witness : witnesses_by_id) if (auto account_iter = _db.find(witness.witness_account)) - if (account_iter->name >= lower_bound_name) // we can ignore anything below lower_bound_name + if (account_iter->name >= lower_bound_name) // we can ignore anything below lower_bound_name witnesses_by_account_name.insert(std::make_pair(account_iter->name, witness.id)); auto end_iter = witnesses_by_account_name.begin(); @@ -292,7 +373,7 @@ namespace graphene { namespace app { witnesses_by_account_name.erase(end_iter, witnesses_by_account_name.end()); return witnesses_by_account_name; } - + map database_api::lookup_committee_member_accounts(const string& lower_bound_name, uint32_t limit)const { FC_ASSERT( limit <= 1000 ); @@ -301,12 +382,12 @@ namespace graphene { namespace app { // we want to order committee_members by account name, but that name is in the account object // so the committee_member_index doesn't have a quick way to access it. // get all the names and look them all up, sort them, then figure out what - // records to return. This could be optimized, but we expect the + // records to return. This could be optimized, but we expect the // number of committee_members to be few and the frequency of calls to be rare std::map committee_members_by_account_name; for (const committee_member_object& committee_member : committee_members_by_id) if (auto account_iter = _db.find(committee_member.committee_member_account)) - if (account_iter->name >= lower_bound_name) // we can ignore anything below lower_bound_name + if (account_iter->name >= lower_bound_name) // we can ignore anything below lower_bound_name committee_members_by_account_name.insert(std::make_pair(account_iter->name, committee_member.id)); auto end_iter = committee_members_by_account_name.begin(); @@ -315,7 +396,7 @@ namespace graphene { namespace app { committee_members_by_account_name.erase(end_iter, committee_members_by_account_name.end()); return committee_members_by_account_name; } - + vector> database_api::get_witnesses(const vector& witness_ids)const { vector> result; result.reserve(witness_ids.size()); @@ -605,7 +686,7 @@ namespace graphene { namespace app { return hist->tracked_buckets(); } - vector history_api::get_market_history( asset_id_type a, asset_id_type b, + vector history_api::get_market_history( asset_id_type a, asset_id_type b, uint32_t bucket_seconds, fc::time_point_sec start, fc::time_point_sec end )const { try { FC_ASSERT(_app.chain_database()); diff --git a/libraries/app/include/graphene/app/api.hpp b/libraries/app/include/graphene/app/api.hpp index f820044b..75d3ac52 100644 --- a/libraries/app/include/graphene/app/api.hpp +++ b/libraries/app/include/graphene/app/api.hpp @@ -57,29 +57,29 @@ namespace graphene { namespace app { * * If any of the provided IDs does not map to an object, a null variant is returned in its position. */ - fc::variants get_objects(const vector& ids)const; + fc::variants get_objects(const vector& ids)const; /** * @brief Retrieve a block header * @param block_num Height of the block whose header should be returned * @return header of the referenced block, or null if no matching block was found */ - optional get_block_header(uint32_t block_num)const; + optional get_block_header(uint32_t block_num)const; /** * @brief Retrieve a full, signed block * @param block_num Height of the block to be returned * @return the referenced block, or null if no matching block was found */ - optional get_block(uint32_t block_num)const; + optional get_block(uint32_t block_num)const; /** * @brief used to fetch an individual transaction. */ - processed_transaction get_transaction( uint32_t block_num, uint32_t trx_in_block )const; + processed_transaction get_transaction( uint32_t block_num, uint32_t trx_in_block )const; /** * @brief Retrieve the current @ref global_property_object */ - global_property_object get_global_properties()const; + global_property_object get_global_properties()const; /** * @brief Retrieve the current @ref dynamic_global_property_object */ @@ -138,6 +138,21 @@ namespace graphene { namespace app { */ map lookup_accounts(const string& lower_bound_name, uint32_t limit)const; + /** + * @brief Fetch all objects relevant to the specified accounts and subscribe to updates + * @param callback Function to call with updates + * @param names_or_ids Each item must be the name or ID of an account to retrieve + * @return Map of string from @ref names_or_ids to the corresponding account + * + * This function fetches all relevant objects for the given accounts, and subscribes to updates to the given + * accounts. If any of the strings in @ref names_or_ids cannot be tied to an account, that input will be + * ignored. All other accounts will be retrieved and subscribed. + * + * TODO: Describe the return value and argument to callback in detail + */ + std::map get_full_accounts(std::function callback, + const vector& names_or_ids); + /** * @brief Get limit orders in a given market * @param a ID of asset being sold @@ -324,9 +339,9 @@ namespace graphene { namespace app { vector get_market_history( asset_id_type a, asset_id_type b, uint32_t bucket_seconds, fc::time_point_sec start, fc::time_point_sec end )const; - flat_set get_market_history_buckets()const; + flat_set get_market_history_buckets()const; private: - application& _app; + application& _app; }; /** @@ -403,7 +418,7 @@ namespace graphene { namespace app { std::vector get_connected_peers() const; private: - application& _app; + application& _app; }; /** @@ -440,7 +455,7 @@ namespace graphene { namespace app { /// @brief Called to enable an API, not reflected. void enable_api( const string& api_name ); - application& _app; + application& _app; optional< fc::api > _database_api; optional< fc::api > _network_broadcast_api; optional< fc::api > _network_node_api; @@ -464,6 +479,7 @@ FC_API(graphene::app::database_api, (lookup_account_names) (get_account_count) (lookup_accounts) + (get_full_accounts) (get_account_balances) (get_named_account_balances) (lookup_asset_symbols) diff --git a/libraries/chain/db_init.cpp b/libraries/chain/db_init.cpp index 65e91391..32a724cf 100644 --- a/libraries/chain/db_init.cpp +++ b/libraries/chain/db_init.cpp @@ -174,8 +174,7 @@ void database::initialize_indexes() prop_index->add_secondary_index(); add_index< primary_index >(); - //add_index< primary_index >(); - add_index< primary_index> >(); + add_index< primary_index >(); add_index< primary_index >(); add_index< primary_index >(); @@ -214,7 +213,7 @@ void database::init_genesis(const genesis_state_type& genesis_state) transaction_evaluation_state genesis_eval_state(this); - flat_index& bsi = get_mutable_index_type< flat_index >(); + flat_index& bsi = get_mutable_index_type< flat_index >(); bsi.resize(0xffff+1); // Create blockchain accounts diff --git a/libraries/chain/include/graphene/chain/market_evaluator.hpp b/libraries/chain/include/graphene/chain/market_evaluator.hpp index 7e5b7258..cd316491 100644 --- a/libraries/chain/include/graphene/chain/market_evaluator.hpp +++ b/libraries/chain/include/graphene/chain/market_evaluator.hpp @@ -34,6 +34,7 @@ namespace graphene { namespace chain { struct by_id; struct by_price; struct by_expiration; + struct by_account; typedef multi_index_container< limit_order_object, indexed_by< @@ -46,7 +47,8 @@ namespace graphene { namespace chain { member< object, object_id_type, &object::id> >, composite_key_compare< std::greater, std::less > - > + >, + ordered_non_unique< tag, member> > > limit_order_multi_index_type; @@ -74,7 +76,7 @@ namespace graphene { namespace chain { account_id_type borrower; share_type collateral; ///< call_price.base.asset_id, access via get_collateral share_type debt; ///< call_price.quote.asset_id, access via get_collateral - price call_price; ///< Debt / Collateral + price call_price; ///< Debt / Collateral }; /** diff --git a/libraries/chain/include/graphene/chain/vesting_balance_object.hpp b/libraries/chain/include/graphene/chain/vesting_balance_object.hpp index efac5243..3386d021 100644 --- a/libraries/chain/include/graphene/chain/vesting_balance_object.hpp +++ b/libraries/chain/include/graphene/chain/vesting_balance_object.hpp @@ -159,10 +159,14 @@ namespace graphene { namespace chain { /** * @ingroup object_index */ + struct by_account; typedef multi_index_container< vesting_balance_object, indexed_by< - hashed_unique< tag, member< object, object_id_type, &object::id > > + hashed_unique< tag, member< object, object_id_type, &object::id > >, + ordered_non_unique< tag, + member + > > > vesting_balance_multi_index_type; /** From b08b6cb55340776d922a9cdd94445acab408cb8d Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Thu, 16 Jul 2015 18:13:11 -0400 Subject: [PATCH 038/353] Partial work toward auth refactor --- libraries/chain/db_block.cpp | 14 +- libraries/chain/evaluator.cpp | 4 +- .../include/graphene/chain/evaluator.hpp | 4 +- .../graphene/chain/protocol/transaction.hpp | 30 +-- .../chain/transaction_evaluation_state.hpp | 8 +- libraries/chain/proposal_evaluator.cpp | 2 +- libraries/chain/proposal_object.cpp | 18 +- libraries/chain/protocol/transaction.cpp | 180 +++++++++++------- .../chain/transaction_evaluation_state.cpp | 2 + 9 files changed, 164 insertions(+), 98 deletions(-) diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index b08b0959..68c0fa03 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -216,6 +216,7 @@ processed_transaction database::push_proposal(const proposal_object& proposal) eval_state._is_proposed_trx = true; //Inject the approving authorities into the transaction eval state + /* std::transform(proposal.required_active_approvals.begin(), proposal.required_active_approvals.end(), std::inserter(eval_state.approved_by, eval_state.approved_by.begin()), @@ -228,6 +229,7 @@ processed_transaction database::push_proposal(const proposal_object& proposal) []( account_id_type id ) { return std::make_pair(id, authority::owner); }); + */ eval_state.operation_results.reserve(proposal.proposed_transaction.operations.size()); processed_transaction ptrx(proposal.proposed_transaction); @@ -482,8 +484,13 @@ processed_transaction database::_apply_transaction(const signed_transaction& trx const chain_parameters& chain_parameters = get_global_properties().parameters; eval_state._trx = &trx; - if( !(skip & skip_transaction_signatures) ) + if( !(skip & (skip_transaction_signatures | skip_authority_check) ) ) { + auto get_active = [&]( account_id_type id ) { return &id(*this).active; }; + auto get_owner = [&]( account_id_type id ) { return &id(*this).owner; }; + trx.verify_authority( get_active, get_owner ); + + /* eval_state._sigs.reserve(trx.signatures.size()); for( const auto& sig : trx.signatures ) @@ -492,6 +499,7 @@ processed_transaction database::_apply_transaction(const signed_transaction& trx false)).second, "Multiple signatures by same key detected" ); } + */ } //Skip all manner of expiration and TaPoS checking if we're on block 1; It's impossible that the transaction is @@ -538,6 +546,7 @@ processed_transaction database::_apply_transaction(const signed_transaction& trx std::for_each(range.first, range.second, [](const account_balance_object& b) { FC_ASSERT(b.balance == 0); }); //Make sure all signatures were needed to validate the transaction + /* if( !(skip & (skip_transaction_signatures|skip_authority_check)) ) { for( const auto& item : eval_state._sigs ) @@ -545,6 +554,7 @@ processed_transaction database::_apply_transaction(const signed_transaction& trx FC_ASSERT( item.second, "All signatures must be used", ("item",item) ); } } + */ return ptrx; } FC_CAPTURE_AND_RETHROW( (trx) ) } @@ -564,7 +574,7 @@ operation_result database::apply_operation(transaction_evaluation_state& eval_st auto result = eval->evaluate( eval_state, op, true ); set_applied_operation_result( op_id, result ); return result; -} FC_CAPTURE_AND_RETHROW( (eval_state._sigs) ) } +} FC_CAPTURE_AND_RETHROW( ) } const witness_object& database::validate_block_header( uint32_t skip, const signed_block& next_block )const { diff --git a/libraries/chain/evaluator.cpp b/libraries/chain/evaluator.cpp index 13d78646..b396611e 100644 --- a/libraries/chain/evaluator.cpp +++ b/libraries/chain/evaluator.cpp @@ -34,7 +34,7 @@ database& generic_evaluator::db()const { return trx_state->db(); } operation_result generic_evaluator::start_evaluate( transaction_evaluation_state& eval_state, const operation& op, bool apply ) { try { trx_state = &eval_state; - check_required_authorities(op); + //check_required_authorities(op); auto result = evaluate( op ); if( apply ) result = this->apply( op ); @@ -77,6 +77,7 @@ database& generic_evaluator::db()const { return trx_state->db(); } }); } FC_CAPTURE_AND_RETHROW() } + /* bool generic_evaluator::verify_authority( const account_object& a, authority::classification c ) { try { return trx_state->check_authority( a, c ); @@ -117,6 +118,7 @@ database& generic_evaluator::db()const { return trx_state->db(); } } } FC_CAPTURE_AND_RETHROW( (op) ) } + */ void generic_evaluator::verify_authority_accounts( const authority& a )const { diff --git a/libraries/chain/include/graphene/chain/evaluator.hpp b/libraries/chain/include/graphene/chain/evaluator.hpp index 74d31378..218d2224 100644 --- a/libraries/chain/include/graphene/chain/evaluator.hpp +++ b/libraries/chain/include/graphene/chain/evaluator.hpp @@ -84,7 +84,7 @@ namespace graphene { namespace chain { database& db()const; - void check_required_authorities(const operation& op); + //void check_required_authorities(const operation& op); protected: /** * @brief Fetch objects relevant to fee payer and set pointer members @@ -98,7 +98,7 @@ namespace graphene { namespace chain { /// Pays the fee and returns the number of CORE asset that were paid. void pay_fee(); - bool verify_authority(const account_object&, authority::classification); + //bool verify_authority(const account_object&, authority::classification); object_id_type get_relative_id( object_id_type rel_id )const; void verify_authority_accounts( const authority& a )const; diff --git a/libraries/chain/include/graphene/chain/protocol/transaction.hpp b/libraries/chain/include/graphene/chain/protocol/transaction.hpp index 4ee3ca88..30e373d1 100644 --- a/libraries/chain/include/graphene/chain/protocol/transaction.hpp +++ b/libraries/chain/include/graphene/chain/protocol/transaction.hpp @@ -118,23 +118,17 @@ namespace graphene { namespace chain { /** * The purpose of this method is to identify the minimal subset of @ref available_keys that are - * required to sign + * required to sign given the signatures that are already provided. */ - set get_required_signatures( const set& available_keys, - const map& active_authorities, - const map& owner_authorities )const; + set get_required_signatures( const flat_set& available_keys, + const std::function& get_active, + const std::function& get_owner + )const; - /** - * Given a set of private keys sign this transaction with a minimial subset of required keys. - * - * @pram get_auth - used to fetch the active authority required for an account referenced by another authority - */ - void sign( const vector& keys, - const std::function& get_active, - const std::function& get_owner ); - - bool verify( const std::function& get_active, - const std::function& get_owner )const; + void verify_authority( const std::function& get_active, + const std::function& get_owner )const; + + flat_set get_signature_keys()const; vector signatures; @@ -142,6 +136,12 @@ namespace graphene { namespace chain { void clear() { operations.clear(); signatures.clear(); } }; + void verify_authority( const vector& ops, const flat_set& sigs, + const std::function& get_active, + const std::function& get_owner, + const flat_set& active_aprovals = flat_set(), + const flat_set& owner_approvals = flat_set()); + /** * @brief captures the result of evaluating the operations contained in the transaction * diff --git a/libraries/chain/include/graphene/chain/transaction_evaluation_state.hpp b/libraries/chain/include/graphene/chain/transaction_evaluation_state.hpp index 6054763c..027beb9a 100644 --- a/libraries/chain/include/graphene/chain/transaction_evaluation_state.hpp +++ b/libraries/chain/include/graphene/chain/transaction_evaluation_state.hpp @@ -32,6 +32,7 @@ namespace graphene { namespace chain { transaction_evaluation_state( database* db = nullptr ) :_db(db){} + /* bool check_authority(const account_object&, authority::classification auth_class = authority::active, int depth = 0); @@ -39,14 +40,17 @@ namespace graphene { namespace chain { bool check_authority(const authority&, authority::classification auth_class = authority::active, int depth = 0); + */ - database& db()const { FC_ASSERT( _db ); return *_db; } + database& db()const { assert( _db ); return *_db; } + /* bool signed_by(const public_key_type& k); bool signed_by(const address& k); /// cached approval (accounts and keys) flat_set> approved_by; + */ /// Used to look up new objects using transaction relative IDs vector operation_results; @@ -55,7 +59,7 @@ namespace graphene { namespace chain { * When an address is referenced via check authority it is flagged as being used, all addresses must be * flagged as being used or the transaction will fail. */ - flat_map _sigs; + // flat_map _sigs; const signed_transaction* _trx = nullptr; database* _db = nullptr; bool _is_proposed_trx = false; diff --git a/libraries/chain/proposal_evaluator.cpp b/libraries/chain/proposal_evaluator.cpp index 613b7f59..4e9341f2 100644 --- a/libraries/chain/proposal_evaluator.cpp +++ b/libraries/chain/proposal_evaluator.cpp @@ -121,7 +121,6 @@ void_result proposal_update_evaluator::do_evaluate(const proposal_update_operati } /* All authority checks happen outside of evaluators - */ if( (d.get_node_properties().skip_flags & database::skip_authority_check) == 0 ) { for( const auto& id : o.key_approvals_to_add ) @@ -133,6 +132,7 @@ void_result proposal_update_evaluator::do_evaluate(const proposal_update_operati FC_ASSERT( trx_state->signed_by(id) ); } } + */ return void_result(); } FC_CAPTURE_AND_RETHROW( (o) ) } diff --git a/libraries/chain/proposal_object.cpp b/libraries/chain/proposal_object.cpp index ae7aa559..d67b4f8a 100644 --- a/libraries/chain/proposal_object.cpp +++ b/libraries/chain/proposal_object.cpp @@ -24,6 +24,22 @@ namespace graphene { namespace chain { bool proposal_object::is_authorized_to_execute(database& db) const { transaction_evaluation_state dry_run_eval(&db); + + try { + verify_authority( proposed_transaction.operations, + available_key_approvals, + [&]( account_id_type id ){ return &id(db).active; }, + [&]( account_id_type id ){ return &id(db).owner; }, + available_active_approvals, + available_owner_approvals ); + } catch ( const fc::exception& e ) + { + return false; + } + return true; + + + /* dry_run_eval._is_proposed_trx = true; std::transform(available_active_approvals.begin(), available_active_approvals.end(), std::inserter(dry_run_eval.approved_by, dry_run_eval.approved_by.end()), [](object_id_type id) { @@ -50,8 +66,8 @@ bool proposal_object::is_authorized_to_execute(database& db) const for( const auto& id : required_owner_approvals ) if( !dry_run_eval.check_authority(id(db), authority::owner) ) return false; + */ - return true; } diff --git a/libraries/chain/protocol/transaction.cpp b/libraries/chain/protocol/transaction.cpp index e7ff5ec1..253cbee6 100644 --- a/libraries/chain/protocol/transaction.cpp +++ b/libraries/chain/protocol/transaction.cpp @@ -15,7 +15,8 @@ * 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 +#include #include #include #include @@ -79,6 +80,9 @@ void transaction::get_required_authorities( flat_set& active, f operation_get_required_authorities( op, active, owner, other ); } + + + struct sign_state { /** returns true if we have a signature for this key or can @@ -86,20 +90,21 @@ struct sign_state */ bool signed_by( const public_key_type& k ) { - auto itr = signatures.find(k); - if( itr == signatures.end() ) + auto itr = provided_signatures.find(k); + if( itr == provided_signatures.end() ) { - auto pk = keys.find(k); - if( pk != keys.end() ) - { - signatures[k] = trx.sign(pk->second); - checked_sigs.insert(k); - return true; - } + auto pk = available_keys.find(k); + if( pk != available_keys.end() ) + return provided_signatures[k] = true; return false; } - checked_sigs.insert(k); - return true; + return itr->second = true; + } + + bool check_authority( account_id_type id ) + { + if( id == GRAPHENE_TEMP_ACCOUNT ) return true; + return check_authority( get_active(id) ); } /** @@ -147,89 +152,116 @@ struct sign_state bool remove_unused_signatures() { vector remove_sigs; - for( const auto& sig : signatures ) - if( checked_sigs.find(sig.first) == checked_sigs.end() ) - remove_sigs.push_back( sig.first ); + for( const auto& sig : provided_signatures ) + if( !sig.second ) remove_sigs.push_back( sig.first ); + for( auto& sig : remove_sigs ) - signatures.erase(sig); + provided_signatures.erase(sig); + return remove_sigs.size() != 0; } - sign_state( const signed_transaction& t, const std::function& a, - const vector& kys = vector() ) - :trx(t),get_active(a) + sign_state( const flat_set& sigs, + const std::function& a, + const flat_set& keys = flat_set() ) + :get_active(a),available_keys(keys) { - auto d = trx.digest(); - for( const auto& sig : trx.signatures ) - signatures[ fc::ecc::public_key( sig, d ) ] = sig; - - for( const auto& key : kys ) - keys[key.get_public_key()] = key; + for( const auto& key : sigs ) + provided_signatures[ key ] = false; + approved_by.insert( GRAPHENE_TEMP_ACCOUNT ); } - const signed_transaction& trx; const std::function& get_active; + const flat_set& available_keys; - flat_map keys; - flat_map signatures; - - set checked_sigs; - flat_set approved_by; - + flat_map provided_signatures; + flat_set approved_by; }; -/** - * Given a set of private keys sign this transaction with a minimial subset of required keys. - */ -void signed_transaction::sign( const vector& keys, - const std::function& get_active, - const std::function& get_owner ) -{ + +void verify_authority( const vector& ops, const flat_set& sigs, + const std::function& get_active, + const std::function& get_owner, + const flat_set& active_aprovals, + const flat_set& owner_approvals ) +{ try { flat_set required_active; flat_set required_owner; vector other; - get_required_authorities( required_active, required_owner, other ); - sign_state s(*this,get_active,keys); + for( const auto& op : ops ) + operation_get_required_authorities( op, required_active, required_owner, other ); + + sign_state s(sigs,get_active); + for( auto& id : active_aprovals ) + s.approved_by.insert( id ); + for( auto& id : owner_approvals ) + s.approved_by.insert( id ); for( const auto& auth : other ) - s.check_authority(&auth); - for( auto id : required_active ) - s.check_authority(get_active(id)); - for( auto id : required_owner ) - s.check_authority(get_owner(id)); - - s.remove_unused_signatures(); - - signatures.clear(); - for( const auto& sig : s.signatures ) - signatures.push_back(sig.second); -} - -bool signed_transaction::verify( const std::function& get_active, - const std::function& get_owner )const -{ - flat_set required_active; - flat_set required_owner; - vector other; - get_required_authorities( required_active, required_owner, other ); - - sign_state s(*this,get_active); - - for( const auto& auth : other ) - if( !s.check_authority(&auth) ) - return false; + GRAPHENE_ASSERT( s.check_authority(&auth), tx_missing_other_auth, "Missing Authority", ("auth",auth)("sigs",sigs) ); // fetch all of the top level authorities for( auto id : required_active ) - if( !s.check_authority(get_active(id)) ) - return false; + GRAPHENE_ASSERT( s.check_authority(id) || + s.check_authority(get_owner(id)), + tx_missing_active_auth, "Missing Active Authority ${id}", ("id",id)("auth",*get_active(id))("owner",*get_owner(id)) ); + for( auto id : required_owner ) - if( !s.check_authority(get_owner(id)) ) - return false; - if( s.remove_unused_signatures() ) - return false; - return true; + GRAPHENE_ASSERT( owner_approvals.find(id) != owner_approvals.end() || + s.check_authority(get_owner(id)), + tx_missing_other_auth, "Missing Owner Authority ${id}", ("id",id)("auth",*get_owner(id)) ); + + FC_ASSERT( !s.remove_unused_signatures(), "Unnecessary signatures detected" ); +} FC_CAPTURE_AND_RETHROW( (ops)(sigs) ) } + + +flat_set signed_transaction::get_signature_keys()const +{ try { + auto d = digest(); + flat_set result; + for( const auto& sig : signatures ) + FC_ASSERT( result.insert( fc::ecc::public_key(sig,d) ).second, "Duplicate Signature detected" ); + return result; +} FC_CAPTURE_AND_RETHROW() } + + + +set signed_transaction::get_required_signatures( const flat_set& available_keys, + const std::function& get_active, + const std::function& get_owner )const +{ + flat_set required_active; + flat_set required_owner; + vector other; + get_required_authorities( required_active, required_owner, other ); + + + sign_state s(get_signature_keys(),get_active,available_keys); + + for( const auto& auth : other ) + s.check_authority(&auth); + for( auto& owner : required_owner ) + s.check_authority( get_owner( owner ) ); + for( auto& active : required_active ) + s.check_authority( active ); + + s.remove_unused_signatures(); + + set result; + + for( auto& provided_sig : s.provided_signatures ) + if( available_keys.find( provided_sig.first ) != available_keys.end() ) + result.insert( provided_sig.first ); + + return result; } + +void signed_transaction::verify_authority( const std::function& get_active, + const std::function& get_owner )const +{ try { + graphene::chain::verify_authority( operations, get_signature_keys(), get_active, get_owner ); +} FC_CAPTURE_AND_RETHROW( (*this) ) } + } } // graphene::chain diff --git a/libraries/chain/transaction_evaluation_state.cpp b/libraries/chain/transaction_evaluation_state.cpp index 4e6dae18..f6b4fc70 100644 --- a/libraries/chain/transaction_evaluation_state.cpp +++ b/libraries/chain/transaction_evaluation_state.cpp @@ -23,6 +23,7 @@ #include namespace graphene { namespace chain { + /* bool transaction_evaluation_state::check_authority( const account_object& account, authority::classification auth_class, int depth ) { if( (!_is_proposed_trx) && (_db->get_node_properties().skip_flags & database::skip_authority_check) ) @@ -121,5 +122,6 @@ namespace graphene { namespace chain { if( itr->first == k ) return itr->second = true; return false; } + */ } } // namespace graphene::chain From 8c6e0b9e55cd59e500f58ba7289cebb0d70fc6a8 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Fri, 17 Jul 2015 00:41:43 -0400 Subject: [PATCH 039/353] Refactor Authority Checking transaction_evaluation_state no longer tracks authority validation. Authority validation is now compeltely independent of the database. --- libraries/chain/CMakeLists.txt | 1 - libraries/chain/db_block.cpp | 38 ------------------- .../include/graphene/chain/exceptions.hpp | 4 +- .../graphene/chain/protocol/transaction.hpp | 8 +++- .../chain/transaction_evaluation_state.hpp | 24 ------------ libraries/chain/proposal_object.cpp | 7 +++- libraries/chain/protocol/transaction.cpp | 21 +++++++--- tests/tests/authority_tests.cpp | 6 +-- 8 files changed, 34 insertions(+), 75 deletions(-) diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt index 698b5089..3ad4183a 100644 --- a/libraries/chain/CMakeLists.txt +++ b/libraries/chain/CMakeLists.txt @@ -43,7 +43,6 @@ add_library( graphene_chain proposal_object.cpp vesting_balance_object.cpp - transaction_evaluation_state.cpp fork_database.cpp block_database.cpp diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index 68c0fa03..489897d3 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -215,22 +215,6 @@ processed_transaction database::push_proposal(const proposal_object& proposal) transaction_evaluation_state eval_state(this); eval_state._is_proposed_trx = true; - //Inject the approving authorities into the transaction eval state - /* - std::transform(proposal.required_active_approvals.begin(), - proposal.required_active_approvals.end(), - std::inserter(eval_state.approved_by, eval_state.approved_by.begin()), - []( account_id_type id ) { - return std::make_pair(id, authority::active); - }); - std::transform(proposal.required_owner_approvals.begin(), - proposal.required_owner_approvals.end(), - std::inserter(eval_state.approved_by, eval_state.approved_by.begin()), - []( account_id_type id ) { - return std::make_pair(id, authority::owner); - }); - */ - eval_state.operation_results.reserve(proposal.proposed_transaction.operations.size()); processed_transaction ptrx(proposal.proposed_transaction); eval_state._trx = &ptrx; @@ -489,17 +473,6 @@ processed_transaction database::_apply_transaction(const signed_transaction& trx auto get_active = [&]( account_id_type id ) { return &id(*this).active; }; auto get_owner = [&]( account_id_type id ) { return &id(*this).owner; }; trx.verify_authority( get_active, get_owner ); - - /* - eval_state._sigs.reserve(trx.signatures.size()); - - for( const auto& sig : trx.signatures ) - { - FC_ASSERT( eval_state._sigs.insert(std::make_pair(public_key_type(fc::ecc::public_key(sig, trx.digest())), - false)).second, - "Multiple signatures by same key detected" ); - } - */ } //Skip all manner of expiration and TaPoS checking if we're on block 1; It's impossible that the transaction is @@ -545,17 +518,6 @@ processed_transaction database::_apply_transaction(const signed_transaction& trx auto range = index.equal_range(GRAPHENE_TEMP_ACCOUNT); std::for_each(range.first, range.second, [](const account_balance_object& b) { FC_ASSERT(b.balance == 0); }); - //Make sure all signatures were needed to validate the transaction - /* - if( !(skip & (skip_transaction_signatures|skip_authority_check)) ) - { - for( const auto& item : eval_state._sigs ) - { - FC_ASSERT( item.second, "All signatures must be used", ("item",item) ); - } - } - */ - return ptrx; } FC_CAPTURE_AND_RETHROW( (trx) ) } diff --git a/libraries/chain/include/graphene/chain/exceptions.hpp b/libraries/chain/include/graphene/chain/exceptions.hpp index a75e3bba..05bde928 100644 --- a/libraries/chain/include/graphene/chain/exceptions.hpp +++ b/libraries/chain/include/graphene/chain/exceptions.hpp @@ -73,7 +73,9 @@ namespace graphene { namespace chain { FC_DECLARE_DERIVED_EXCEPTION( tx_missing_active_auth, graphene::chain::transaction_exception, 3030001, "missing required active authority" ) FC_DECLARE_DERIVED_EXCEPTION( tx_missing_owner_auth, graphene::chain::transaction_exception, 3030002, "missing required owner authority" ) FC_DECLARE_DERIVED_EXCEPTION( tx_missing_other_auth, graphene::chain::transaction_exception, 3030003, "missing required other authority" ) - //FC_DECLARE_DERIVED_EXCEPTION( tx_irrelevant_authority, graphene::chain::transaction_exception, 3030004, "irrelevant authority" ) + FC_DECLARE_DERIVED_EXCEPTION( tx_irrelevant_authority, graphene::chain::transaction_exception, 3030004, "irrelevant authority" ) + FC_DECLARE_DERIVED_EXCEPTION( invalid_committee_approval, graphene::chain::transaction_exception, 3030005, + "committee account cannot directly approve transaction" ) FC_DECLARE_DERIVED_EXCEPTION( invalid_pts_address, graphene::chain::utility_exception, 3060001, "invalid pts address" ) FC_DECLARE_DERIVED_EXCEPTION( insufficient_feeds, graphene::chain::chain_exception, 37006, "insufficient feeds" ) diff --git a/libraries/chain/include/graphene/chain/protocol/transaction.hpp b/libraries/chain/include/graphene/chain/protocol/transaction.hpp index 30e373d1..4ada2b34 100644 --- a/libraries/chain/include/graphene/chain/protocol/transaction.hpp +++ b/libraries/chain/include/graphene/chain/protocol/transaction.hpp @@ -122,11 +122,13 @@ namespace graphene { namespace chain { */ set get_required_signatures( const flat_set& available_keys, const std::function& get_active, - const std::function& get_owner + const std::function& get_owner, + uint32_t max_recursion = GRAPHENE_MAX_SIG_CHECK_DEPTH )const; void verify_authority( const std::function& get_active, - const std::function& get_owner )const; + const std::function& get_owner, + uint32_t max_recursion = GRAPHENE_MAX_SIG_CHECK_DEPTH )const; flat_set get_signature_keys()const; @@ -139,6 +141,8 @@ namespace graphene { namespace chain { void verify_authority( const vector& ops, const flat_set& sigs, const std::function& get_active, const std::function& get_owner, + uint32_t max_recursion = GRAPHENE_MAX_SIG_CHECK_DEPTH, + bool allow_committe = false, const flat_set& active_aprovals = flat_set(), const flat_set& owner_approvals = flat_set()); diff --git a/libraries/chain/include/graphene/chain/transaction_evaluation_state.hpp b/libraries/chain/include/graphene/chain/transaction_evaluation_state.hpp index 027beb9a..49a69a98 100644 --- a/libraries/chain/include/graphene/chain/transaction_evaluation_state.hpp +++ b/libraries/chain/include/graphene/chain/transaction_evaluation_state.hpp @@ -32,34 +32,10 @@ namespace graphene { namespace chain { transaction_evaluation_state( database* db = nullptr ) :_db(db){} - /* - bool check_authority(const account_object&, - authority::classification auth_class = authority::active, - int depth = 0); - - bool check_authority(const authority&, - authority::classification auth_class = authority::active, - int depth = 0); - */ database& db()const { assert( _db ); return *_db; } - - /* - bool signed_by(const public_key_type& k); - bool signed_by(const address& k); - - /// cached approval (accounts and keys) - flat_set> approved_by; - */ - - /// Used to look up new objects using transaction relative IDs vector operation_results; - /** - * When an address is referenced via check authority it is flagged as being used, all addresses must be - * flagged as being used or the transaction will fail. - */ - // flat_map _sigs; const signed_transaction* _trx = nullptr; database* _db = nullptr; bool _is_proposed_trx = false; diff --git a/libraries/chain/proposal_object.cpp b/libraries/chain/proposal_object.cpp index d67b4f8a..f40d22e6 100644 --- a/libraries/chain/proposal_object.cpp +++ b/libraries/chain/proposal_object.cpp @@ -30,10 +30,15 @@ bool proposal_object::is_authorized_to_execute(database& db) const available_key_approvals, [&]( account_id_type id ){ return &id(db).active; }, [&]( account_id_type id ){ return &id(db).owner; }, + GRAPHENE_MAX_SIG_CHECK_DEPTH, // TODO make chain param + true, /* allow committeee */ available_active_approvals, available_owner_approvals ); - } catch ( const fc::exception& e ) + } + catch ( const fc::exception& e ) { + //idump((available_active_approvals)); + //wlog((e.to_detail_string())); return false; } return true; diff --git a/libraries/chain/protocol/transaction.cpp b/libraries/chain/protocol/transaction.cpp index 253cbee6..d3e662db 100644 --- a/libraries/chain/protocol/transaction.cpp +++ b/libraries/chain/protocol/transaction.cpp @@ -103,7 +103,7 @@ struct sign_state bool check_authority( account_id_type id ) { - if( id == GRAPHENE_TEMP_ACCOUNT ) return true; + if( approved_by.find(id) != approved_by.end() ) return true; return check_authority( get_active(id) ); } @@ -129,7 +129,7 @@ struct sign_state { if( approved_by.find(a.first) == approved_by.end() ) { - if( depth == GRAPHENE_MAX_SIG_CHECK_DEPTH ) + if( depth == max_recursion ) return false; if( check_authority( get_active( a.first ), depth+1 ) ) { @@ -176,12 +176,15 @@ struct sign_state flat_map provided_signatures; flat_set approved_by; + uint32_t max_recursion = GRAPHENE_MAX_SIG_CHECK_DEPTH; }; void verify_authority( const vector& ops, const flat_set& sigs, const std::function& get_active, const std::function& get_owner, + uint32_t max_recursion_depth, + bool allow_committe, const flat_set& active_aprovals, const flat_set& owner_approvals ) { try { @@ -192,7 +195,12 @@ void verify_authority( const vector& ops, const flat_set signed_transaction::get_signature_keys()const set signed_transaction::get_required_signatures( const flat_set& available_keys, const std::function& get_active, - const std::function& get_owner )const + const std::function& get_owner, + uint32_t max_recursion_depth )const { flat_set required_active; flat_set required_owner; @@ -238,6 +247,7 @@ set signed_transaction::get_required_signatures( const flat_set sign_state s(get_signature_keys(),get_active,available_keys); + s.max_recursion = max_recursion_depth; for( const auto& auth : other ) s.check_authority(&auth); @@ -259,9 +269,10 @@ set signed_transaction::get_required_signatures( const flat_set void signed_transaction::verify_authority( const std::function& get_active, - const std::function& get_owner )const + const std::function& get_owner, + uint32_t max_recursion )const { try { - graphene::chain::verify_authority( operations, get_signature_keys(), get_active, get_owner ); + graphene::chain::verify_authority( operations, get_signature_keys(), get_active, get_owner, max_recursion ); } FC_CAPTURE_AND_RETHROW( (*this) ) } } } // graphene::chain diff --git a/tests/tests/authority_tests.cpp b/tests/tests/authority_tests.cpp index 8b0c6cbf..dfabf40a 100644 --- a/tests/tests/authority_tests.cpp +++ b/tests/tests/authority_tests.cpp @@ -340,7 +340,6 @@ BOOST_AUTO_TEST_CASE( proposed_single_account ) trx.set_expiration( db.head_block_time() + fc::seconds( 3 * db.get_global_properties().parameters.block_interval )); trx.set_reference_block( db.head_block_id() ); - //idump((moneyman)); trx.sign( init_account_priv_key ); const proposal_object& proposal = db.get(PUSH_TX( db, trx ).operation_results.front().get()); @@ -353,6 +352,7 @@ BOOST_AUTO_TEST_CASE( proposed_single_account ) proposal_update_operation pup; pup.proposal = proposal.id; pup.fee_paying_account = nathan.id; + BOOST_TEST_MESSAGE( "Updating the proposal to have nathan's authority" ); pup.active_approvals_to_add.insert(nathan.id); trx.operations = {pup}; @@ -399,13 +399,13 @@ BOOST_AUTO_TEST_CASE( committee_authority ) p.parameters.committee_proposal_review_period = fc::days(1).to_seconds(); }); - BOOST_TEST_MESSAGE( "transfering 100000 CORE to nathan, signing with committee key" ); + BOOST_TEST_MESSAGE( "transfering 100000 CORE to nathan, signing with committee key should fail because this requires it to be part of a proposal" ); transfer_operation top; top.to = nathan.id; top.amount = asset(100000); trx.operations.push_back(top); sign(trx, committee_key); - GRAPHENE_CHECK_THROW(PUSH_TX( db, trx ), fc::exception); + GRAPHENE_CHECK_THROW(PUSH_TX( db, trx ), graphene::chain::invalid_committee_approval ); auto sign = [&] { trx.signatures.clear(); trx.sign(nathan_key); }; From d0659848543a3a7d6e3abed8f0f4bb25b85a42eb Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Fri, 17 Jul 2015 01:32:52 -0400 Subject: [PATCH 040/353] fix crash due to bad cast --- tests/common/database_fixture.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/common/database_fixture.cpp b/tests/common/database_fixture.cpp index efdf75f3..532be11e 100644 --- a/tests/common/database_fixture.cpp +++ b/tests/common/database_fixture.cpp @@ -181,7 +181,7 @@ void database_fixture::verify_asset_supplies( const database& db ) total_balances[bad.options.short_backing_asset] += bad.settlement_fund; } } - for( const vesting_balance_object& vbo : db.get_index_type< simple_index >() ) + for( const vesting_balance_object& vbo : db.get_index_type< vesting_balance_index >().indices() ) total_balances[ vbo.balance.asset_id ] += vbo.balance.amount; total_balances[asset_id_type()] += db.get_dynamic_global_properties().witness_budget; From 46fae5cbbf8f40c4010dd5c102c3a00f6c4c618c Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Fri, 17 Jul 2015 09:41:08 -0400 Subject: [PATCH 041/353] make max authority check depth configurable by delegates --- libraries/chain/db_block.cpp | 2 +- .../chain/protocol/chain_parameters.hpp | 2 ++ libraries/chain/proposal_object.cpp | 33 +------------------ 3 files changed, 4 insertions(+), 33 deletions(-) diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index 489897d3..dc27e290 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -472,7 +472,7 @@ processed_transaction database::_apply_transaction(const signed_transaction& trx { auto get_active = [&]( account_id_type id ) { return &id(*this).active; }; auto get_owner = [&]( account_id_type id ) { return &id(*this).owner; }; - trx.verify_authority( get_active, get_owner ); + trx.verify_authority( get_active, get_owner, get_global_properties().parameters.max_authority_depth ); } //Skip all manner of expiration and TaPoS checking if we're on block 1; It's impossible that the transaction is diff --git a/libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp b/libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp index 03ab94fa..fd82537f 100644 --- a/libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp +++ b/libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp @@ -64,6 +64,7 @@ namespace graphene { namespace chain { share_type fee_liquidation_threshold = GRAPHENE_DEFAULT_FEE_LIQUIDATION_THRESHOLD; ///< value in CORE at which accumulated fees in blockchain-issued market assets should be liquidated uint16_t accounts_per_fee_scale = GRAPHENE_DEFAULT_ACCOUNTS_PER_FEE_SCALE; ///< number of accounts between fee scalings uint8_t account_fee_scale_bitshifts = GRAPHENE_DEFAULT_ACCOUNT_FEE_SCALE_BITSHIFTS; ///< number of times to left bitshift account registration fee at each scaling + uint8_t max_authority_depth = GRAPHENE_MAX_SIG_CHECK_DEPTH; extensions_type extensions; void validate()const @@ -127,5 +128,6 @@ FC_REFLECT( graphene::chain::chain_parameters, (fee_liquidation_threshold) (accounts_per_fee_scale) (account_fee_scale_bitshifts) + (max_authority_depth) (extensions) ) diff --git a/libraries/chain/proposal_object.cpp b/libraries/chain/proposal_object.cpp index f40d22e6..92465c7f 100644 --- a/libraries/chain/proposal_object.cpp +++ b/libraries/chain/proposal_object.cpp @@ -30,7 +30,7 @@ bool proposal_object::is_authorized_to_execute(database& db) const available_key_approvals, [&]( account_id_type id ){ return &id(db).active; }, [&]( account_id_type id ){ return &id(db).owner; }, - GRAPHENE_MAX_SIG_CHECK_DEPTH, // TODO make chain param + db.get_global_properties().parameters.max_authority_depth, true, /* allow committeee */ available_active_approvals, available_owner_approvals ); @@ -42,37 +42,6 @@ bool proposal_object::is_authorized_to_execute(database& db) const return false; } return true; - - - /* - dry_run_eval._is_proposed_trx = true; - std::transform(available_active_approvals.begin(), available_active_approvals.end(), - std::inserter(dry_run_eval.approved_by, dry_run_eval.approved_by.end()), [](object_id_type id) { - return make_pair(id, authority::active); - }); - std::transform(available_owner_approvals.begin(), available_owner_approvals.end(), - std::inserter(dry_run_eval.approved_by, dry_run_eval.approved_by.end()), [](object_id_type id) { - return make_pair(id, authority::owner); - }); - - signed_transaction tmp; - dry_run_eval._trx = &tmp; - - for( auto key_id : available_key_approvals ) - dry_run_eval._sigs.insert( std::make_pair(key_id,true) ); - - //insert into dry_run_eval->_trx.signatures - //dry_run_eval.signed_by.insert(available_key_approvals.begin(), available_key_approvals.end()); - - // Check all required approvals. If any of them are unsatisfied, return false. - for( const auto& id : required_active_approvals ) - if( !dry_run_eval.check_authority(id(db), authority::active) ) - return false; - for( const auto& id : required_owner_approvals ) - if( !dry_run_eval.check_authority(id(db), authority::owner) ) - return false; - */ - } From d52461b77b5285ed6a4888be88397fee661982d6 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Fri, 17 Jul 2015 15:13:17 -0400 Subject: [PATCH 042/353] operation_tests.cpp: Implement reserve_asset_test --- libraries/chain/asset_evaluator.cpp | 7 +- .../include/graphene/chain/exceptions.hpp | 7 +- .../graphene/chain/protocol/asset_ops.hpp | 2 +- tests/tests/operation_tests.cpp | 85 +++++++++++++++++++ 4 files changed, 98 insertions(+), 3 deletions(-) diff --git a/libraries/chain/asset_evaluator.cpp b/libraries/chain/asset_evaluator.cpp index 2c7a17fd..e8b4b0fe 100644 --- a/libraries/chain/asset_evaluator.cpp +++ b/libraries/chain/asset_evaluator.cpp @@ -144,7 +144,12 @@ void_result asset_reserve_evaluator::do_evaluate( const asset_reserve_operation& database& d = db(); const asset_object& a = o.amount_to_reserve.asset_id(d); - FC_ASSERT( !a.is_market_issued() ); + GRAPHENE_ASSERT( + !a.is_market_issued(), + asset_reserve_invalid_on_mia, + "Cannot reserve ${sym} because it is a market-issued asset", + ("sym", a.symbol) + ); from_account = &o.payer(d); diff --git a/libraries/chain/include/graphene/chain/exceptions.hpp b/libraries/chain/include/graphene/chain/exceptions.hpp index 05bde928..dc993912 100644 --- a/libraries/chain/include/graphene/chain/exceptions.hpp +++ b/libraries/chain/include/graphene/chain/exceptions.hpp @@ -90,6 +90,7 @@ namespace graphene { namespace chain { GRAPHENE_DECLARE_OP_BASE_EXCEPTIONS( call_order_update ); GRAPHENE_DECLARE_OP_EVALUATE_EXCEPTION( unfilled_margin_call, call_order_update, 1, "Updating call order would trigger a margin call that cannot be fully filled" ) + //GRAPHENE_DECLARE_OP_BASE_EXCEPTIONS( account_create ); //GRAPHENE_DECLARE_OP_BASE_EXCEPTIONS( account_update ); //GRAPHENE_DECLARE_OP_BASE_EXCEPTIONS( account_whitelist ); @@ -100,7 +101,11 @@ namespace graphene { namespace chain { //GRAPHENE_DECLARE_OP_BASE_EXCEPTIONS( asset_update_bitasset ); //GRAPHENE_DECLARE_OP_BASE_EXCEPTIONS( asset_update_feed_producers ); //GRAPHENE_DECLARE_OP_BASE_EXCEPTIONS( asset_issue ); - //GRAPHENE_DECLARE_OP_BASE_EXCEPTIONS( asset_reserve ); + + GRAPHENE_DECLARE_OP_BASE_EXCEPTIONS( asset_reserve ); + + GRAPHENE_DECLARE_OP_EVALUATE_EXCEPTION( invalid_on_mia, asset_reserve, 1, "invalid on mia" ) + //GRAPHENE_DECLARE_OP_BASE_EXCEPTIONS( asset_fund_fee_pool ); //GRAPHENE_DECLARE_OP_BASE_EXCEPTIONS( asset_settle ); //GRAPHENE_DECLARE_OP_BASE_EXCEPTIONS( asset_global_settle ); diff --git a/libraries/chain/include/graphene/chain/protocol/asset_ops.hpp b/libraries/chain/include/graphene/chain/protocol/asset_ops.hpp index 5cdc6661..d64f4474 100644 --- a/libraries/chain/include/graphene/chain/protocol/asset_ops.hpp +++ b/libraries/chain/include/graphene/chain/protocol/asset_ops.hpp @@ -366,7 +366,7 @@ namespace graphene { namespace chain { * @brief used to take an asset out of circulation, returning to the issuer * @ingroup operations * - * @note You cannot burn market-issued assets. + * @note You cannot use this operation on market-issued assets. */ struct asset_reserve_operation : public base_operation { diff --git a/tests/tests/operation_tests.cpp b/tests/tests/operation_tests.cpp index dad31ead..08d12e1a 100644 --- a/tests/tests/operation_tests.cpp +++ b/tests/tests/operation_tests.cpp @@ -1217,6 +1217,91 @@ BOOST_AUTO_TEST_CASE( witness_pay_test ) } FC_LOG_AND_RETHROW() } +/** + * Reserve asset test should make sure that all assets except bitassets + * can be burned, and all supplies add up. + */ +BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES( reserve_asset_test, 1 ) +BOOST_AUTO_TEST_CASE( reserve_asset_test ) +{ + try + { + ACTORS((alice)(bob)(sam)(judge)); + const auto& basset = create_bitasset("BITUSD"); + const auto& uasset = create_user_issued_asset("TEST"); + const auto& passet = create_prediction_market("PMARK", judge_id); + const auto& casset = asset_id_type()(db); + + auto reserve_asset = [&]( account_id_type payer, asset amount_to_reserve ) + { + asset_reserve_operation op; + op.payer = payer; + op.amount_to_reserve = amount_to_reserve; + transaction tx; + tx.operations.push_back( op ); + tx.set_expiration( db.head_block_time() + fc::minutes(5) ); + db.push_transaction( tx, database::skip_authority_check | database::skip_tapos_check | database::skip_transaction_signatures ); + } ; + + auto _issue_uia = [&]( const account_object& recipient, asset amount ) + { + asset_issue_operation op; + op.issuer = amount.asset_id(db).issuer; + op.asset_to_issue = amount; + op.issue_to_account = recipient.id; + transaction tx; + tx.operations.push_back( op ); + tx.set_expiration( db.head_block_time() + fc::minutes(5) ); + db.push_transaction( tx, database::skip_authority_check | database::skip_tapos_check | database::skip_transaction_signatures ); + } ; + + int64_t init_balance = 10000; + int64_t reserve_amount = 3000; + share_type initial_reserve; + + BOOST_TEST_MESSAGE( "Test reserve operation on core asset" ); + transfer( committee_account, alice_id, casset.amount( init_balance ) ); + + initial_reserve = casset.reserved( db ); + reserve_asset( alice_id, casset.amount( reserve_amount ) ); + BOOST_CHECK_EQUAL( get_balance( alice, casset ), init_balance - reserve_amount ); + BOOST_CHECK_EQUAL( (casset.reserved( db ) - initial_reserve).value, reserve_amount ); + verify_asset_supplies(db); + + BOOST_TEST_MESSAGE( "Test reserve operation on market issued asset" ); + transfer( committee_account, alice_id, casset.amount( init_balance*100 ) ); + update_feed_producers( basset, {sam.id} ); + price_feed current_feed; + current_feed.settlement_price = basset.amount( 2 ) / casset.amount(100); + publish_feed( basset, sam, current_feed ); + borrow( alice_id, basset.amount( init_balance ), casset.amount( 100*init_balance ) ); + BOOST_CHECK_EQUAL( get_balance( alice, basset ), init_balance ); + + GRAPHENE_REQUIRE_THROW( reserve_asset( alice_id, basset.amount( reserve_amount ) ), asset_reserve_invalid_on_mia ); + + BOOST_TEST_MESSAGE( "Test reserve operation on prediction market asset" ); + transfer( committee_account, alice_id, casset.amount( init_balance ) ); + borrow( alice_id, passet.amount( init_balance ), casset.amount( init_balance ) ); + GRAPHENE_REQUIRE_THROW( reserve_asset( alice_id, passet.amount( reserve_amount ) ), asset_reserve_invalid_on_mia ); + + BOOST_TEST_MESSAGE( "Test reserve operation on user issued asset" ); + _issue_uia( alice, uasset.amount( init_balance ) ); + BOOST_CHECK_EQUAL( get_balance( alice, uasset ), init_balance ); + verify_asset_supplies(db); + + BOOST_TEST_MESSAGE( "Reserving asset" ); + initial_reserve = uasset.reserved( db ); + reserve_asset( alice_id, uasset.amount( reserve_amount ) ); + BOOST_CHECK_EQUAL( get_balance( alice, uasset ), init_balance - reserve_amount ); + BOOST_CHECK_EQUAL( (uasset.reserved( db ) - initial_reserve).value, reserve_amount ); + verify_asset_supplies(db); + } + catch (fc::exception& e) + { + edump((e.to_detail_string())); + throw; + } +} /** * This test demonstrates how using the call_order_update_operation to From 0fe9276c4422aa1c012006993dc829e9b6908440 Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Fri, 17 Jul 2015 15:35:24 -0400 Subject: [PATCH 043/353] [GUI] Refactor ClientDataModel, implement account balances --- libraries/app/api.cpp | 15 +- libraries/app/include/graphene/app/api.hpp | 6 +- programs/light_client/ClientDataModel.cpp | 369 ++++++++++----------- programs/light_client/ClientDataModel.hpp | 29 +- programs/light_client/qml/FormBox.qml | 1 - programs/light_client/qml/main.qml | 9 +- 6 files changed, 210 insertions(+), 219 deletions(-) diff --git a/libraries/app/api.cpp b/libraries/app/api.cpp index 815710d0..fc19f56d 100644 --- a/libraries/app/api.cpp +++ b/libraries/app/api.cpp @@ -82,14 +82,19 @@ namespace graphene { namespace app { return result; } - vector> database_api::lookup_asset_symbols(const vector& symbols)const + vector> database_api::lookup_asset_symbols(const vector& symbols_or_ids)const { const auto& assets_by_symbol = _db.get_index_type().indices().get(); vector > result; - result.reserve(symbols.size()); - std::transform(symbols.begin(), symbols.end(), std::back_inserter(result), - [&assets_by_symbol](const string& symbol) -> optional { - auto itr = assets_by_symbol.find(symbol); + result.reserve(symbols_or_ids.size()); + std::transform(symbols_or_ids.begin(), symbols_or_ids.end(), std::back_inserter(result), + [this, &assets_by_symbol](const string& symbol_or_id) -> optional { + if( !symbol_or_id.empty() && std::isdigit(symbol_or_id[0]) ) + { + auto ptr = _db.find(variant(symbol_or_id).as()); + return ptr == nullptr? optional() : *ptr; + } + auto itr = assets_by_symbol.find(symbol_or_id); return itr == assets_by_symbol.end()? optional() : *itr; }); return result; diff --git a/libraries/app/include/graphene/app/api.hpp b/libraries/app/include/graphene/app/api.hpp index 75d3ac52..d61d8d12 100644 --- a/libraries/app/include/graphene/app/api.hpp +++ b/libraries/app/include/graphene/app/api.hpp @@ -110,12 +110,12 @@ namespace graphene { namespace app { vector> lookup_account_names(const vector& account_names)const; /** * @brief Get a list of assets by symbol - * @param asset_symbols Symbols of the assets to retrieve - * @return The assets corresponding to the provided symbols + * @param asset_symbols Symbols or stringified IDs of the assets to retrieve + * @return The assets corresponding to the provided symbols or IDs * * This function has semantics identical to @ref get_objects */ - vector> lookup_asset_symbols(const vector& asset_symbols)const; + vector> lookup_asset_symbols(const vector& symbols_or_ids)const; /** * @brief Get an account's balances in various assets diff --git a/programs/light_client/ClientDataModel.cpp b/programs/light_client/ClientDataModel.cpp index cd76b925..2997016f 100644 --- a/programs/light_client/ClientDataModel.cpp +++ b/programs/light_client/ClientDataModel.cpp @@ -5,58 +5,32 @@ #include +#include + using namespace graphene::app; -ChainDataModel::ChainDataModel( fc::thread& t, QObject* parent ) -:QObject(parent),m_thread(&t){} +template +QString idToString(T id) { + return QString("%1.%2.%3").arg(T::space_id).arg(T::type_id).arg(ObjectId(id.instance)); +} +QString idToString(graphene::db::object_id_type id) { + return QString("%1.%2.%3").arg(id.space(), id.type(), ObjectId(id.instance())); +} +ChainDataModel::ChainDataModel(fc::thread& t, QObject* parent) +:QObject(parent),m_rpc_thread(&t){} Asset* ChainDataModel::getAsset(ObjectId id) { - auto& by_id_idx = m_assets.get<::by_id>(); + auto& by_id_idx = m_assets.get(); auto itr = by_id_idx.find(id); - if( itr == by_id_idx.end() ) + if (itr == by_id_idx.end()) { - auto tmp = new Asset(id, QString::number(--m_account_query_num), 0, this); - auto result = m_assets.insert( tmp ); - assert( result.second ); + auto result = m_assets.insert(new Asset(id, QString::number(--m_account_query_num), 0, this)); + assert(result.second); - /** execute in app thread */ - m_thread->async( [this,id](){ - try { - ilog( "look up symbol.." ); - auto result = m_db_api->get_assets( {asset_id_type(id)} ); - wdump((result)); - - /** execute in main */ - Q_EMIT queueExecute( [this,result,id](){ - wlog( "process result" ); - auto& by_id_idx = this->m_assets.get<::by_id>(); - auto itr = by_id_idx.find(id); - assert( itr != by_id_idx.end() ); - - if( result.size() == 0 || !result.front() ) - { - elog( "delete later" ); - (*itr)->deleteLater(); - by_id_idx.erase( itr ); - } - else - { - by_id_idx.modify( itr, - [=]( Asset* a ){ - a->setProperty("symbol", QString::fromStdString(result.front()->symbol) ); - a->setProperty("precision", result.front()->precision ); - } - ); - } - }); - } - catch ( const fc::exception& e ) - { - Q_EMIT exceptionThrown( QString::fromStdString(e.to_string()) ); - } - }); + // Run in RPC thread + m_rpc_thread->async([this,id,result]{ getAssetImpl(idToString(asset_id_type(id)), &*result.first); }); return *result.first; } return *itr; @@ -66,94 +40,138 @@ Asset* ChainDataModel::getAsset(QString symbol) { auto& by_symbol_idx = m_assets.get(); auto itr = by_symbol_idx.find(symbol); - if( itr == by_symbol_idx.end() ) + if (itr == by_symbol_idx.end()) { - auto tmp = new Asset(--m_account_query_num, symbol, 0, this); - auto result = m_assets.insert( tmp ); - assert( result.second ); + auto result = m_assets.insert(new Asset(--m_account_query_num, symbol, 0, this)); + assert(result.second); - /** execute in app thread */ - m_thread->async( [this,symbol](){ - try { - ilog( "look up symbol.." ); - auto result = m_db_api->lookup_asset_symbols( {symbol.toStdString()} ); - /** execute in main */ - Q_EMIT queueExecute( [this,result,symbol](){ - wlog( "process result" ); - auto& by_symbol_idx = this->m_assets.get(); - auto itr = by_symbol_idx.find(symbol); - assert( itr != by_symbol_idx.end() ); - - if( result.size() == 0 || !result.front() ) - { - elog( "delete later" ); - (*itr)->deleteLater(); - by_symbol_idx.erase( itr ); - } - else - { - by_symbol_idx.modify( itr, - [=]( Asset* a ){ - a->setProperty("id", ObjectId(result.front()->id.instance())); - a->setProperty("precision", result.front()->precision ); - } - ); - } - }); - } - catch ( const fc::exception& e ) - { - Q_EMIT exceptionThrown( QString::fromStdString(e.to_string()) ); - } - }); + // Run in RPC thread + m_rpc_thread->async([this,symbol,result](){ getAssetImpl(symbol, &*result.first); }); return *result.first; } return *itr; } +void ChainDataModel::getAssetImpl(QString assetIdentifier, Asset* const * assetInContainer) +{ + try { + ilog("Fetching asset ${asset}", ("asset", assetIdentifier.toStdString())); + auto result = m_db_api->lookup_asset_symbols({assetIdentifier.toStdString()}); + + // Run in main thread + Q_EMIT queueExecute([this,result,assetInContainer](){ + ilog("Processing result ${r}", ("r", result)); + auto itr = m_assets.iterator_to(*assetInContainer); + + if (result.size() == 0 || !result.front()) { + (*itr)->deleteLater(); + m_assets.erase(itr); + } else { + m_assets.modify(itr, + [=](Asset* a){ + a->setProperty("symbol", QString::fromStdString(result.front()->symbol)); + a->setProperty("id", ObjectId(result.front()->id.instance())); + a->setProperty("precision", result.front()->precision); + }); + } + }); + } + catch ( const fc::exception& e ) + { + Q_EMIT exceptionThrown(QString::fromStdString(e.to_string())); + } +} + +void ChainDataModel::getAccountImpl(QString accountIdentifier, Account* const * accountInContainer) +{ + try { + ilog("Fetching account ${acct}", ("acct", accountIdentifier.toStdString())); + auto result = m_db_api->get_full_accounts([](const fc::variant& v) { + idump((v)); + }, {accountIdentifier.toStdString()}); + fc::variant_object accountPackage; + + if (result.count(accountIdentifier.toStdString())) { + accountPackage = result.begin()->second.as(); + + // Fetch all necessary assets + auto balances = accountPackage["balances"].as>(); + QList assetsToFetch; + QList assetPlaceholders; + assetsToFetch.reserve(balances.size()); + // Get list of asset IDs the account has a balance in + std::transform(balances.begin(), balances.end(), std::back_inserter(assetsToFetch), + [](const account_balance_object& b) { return b.asset_type; }); + auto function = [this,&assetsToFetch,&assetPlaceholders] { + auto itr = assetsToFetch.begin(); + const auto& assets_by_id = m_assets.get(); + // Filter out assets I already have, create placeholders for the ones I don't. + while (itr != assetsToFetch.end()) { + if (assets_by_id.count(itr->instance)) + itr = assetsToFetch.erase(itr); + else { + assetPlaceholders.push_back(&*m_assets.insert(new Asset(itr->instance, QString(), 0, this)).first); + ++itr; + } + } + }; + QMetaObject::invokeMethod(parent(), "execute", Qt::BlockingQueuedConnection, + Q_ARG(const std::function&, function)); + assert(assetsToFetch.size() == assetPlaceholders.size()); + + // Blocking call to fetch and complete initialization for all the assets + for (int i = 0; i < assetsToFetch.size(); ++i) + getAssetImpl(idToString(assetsToFetch[i]), assetPlaceholders[i]); + } + + // Run in main thread + Q_EMIT queueExecute([this,accountPackage,accountInContainer](){ + ilog("Processing result ${r}", ("r", accountPackage)); + auto itr = m_accounts.iterator_to(*accountInContainer); + + if (!accountPackage.size()) { + (*itr)->deleteLater(); + m_accounts.erase(itr); + } else { + m_accounts.modify(itr, [=](Account* a){ + account_object account = accountPackage["account"].as(); + a->setProperty("id", ObjectId(account.id.instance())); + a->setProperty("name", QString::fromStdString(account.name)); + + // Set balances + QList balances; + auto balanceObjects = accountPackage["balances"].as>(); + std::transform(balanceObjects.begin(), balanceObjects.end(), std::back_inserter(balances), + [this](const account_balance_object& b) { + Balance* bal = new Balance; + bal->setParent(this); + bal->setProperty("amount", QVariant::fromValue(b.balance.value)); + bal->setProperty("type", QVariant::fromValue(getAsset(ObjectId(b.asset_type.instance)))); + return bal; + }); + a->setBalances(balances); + }); + } + }); + } + catch (const fc::exception& e) + { + Q_EMIT exceptionThrown(QString::fromStdString(e.to_string())); + } +} + Account* ChainDataModel::getAccount(ObjectId id) { - auto& by_id_idx = m_accounts.get<::by_id>(); + auto& by_id_idx = m_accounts.get(); auto itr = by_id_idx.find(id); if( itr == by_id_idx.end() ) { - auto tmp = new Account(id, QString::number(--m_account_query_num), this); - auto result = m_accounts.insert( tmp ); - assert( result.second ); + auto tmp = new Account(id, tr("Account #%1").arg(--m_account_query_num), this); + auto result = m_accounts.insert(tmp); + assert(result.second); - /** execute in app thread */ - m_thread->async( [this,id](){ - try { - ilog( "look up names.." ); - auto result = m_db_api->get_accounts( {account_id_type(id)} ); - /** execute in main */ - Q_EMIT queueExecute( [this,result,id](){ - wlog( "process result" ); - auto& by_id_idx = this->m_accounts.get<::by_id>(); - auto itr = by_id_idx.find(id); - assert( itr != by_id_idx.end() ); - - if( result.size() == 0 || !result.front() ) - { - elog( "delete later" ); - (*itr)->deleteLater(); - by_id_idx.erase( itr ); - } - else - { - by_id_idx.modify( itr, - [=]( Account* a ){ - a->setProperty("name", QString::fromStdString(result.front()->name) ); - } - ); - } - }); - } - catch ( const fc::exception& e ) - { - Q_EMIT exceptionThrown( QString::fromStdString(e.to_string()) ); - } - }); + // Run in RPC thread + m_rpc_thread->async([this, id, result]{getAccountImpl(idToString(account_id_type(id)), &*result.first);}); return *result.first; } return *itr; @@ -166,42 +184,11 @@ Account* ChainDataModel::getAccount(QString name) if( itr == by_name_idx.end() ) { auto tmp = new Account(--m_account_query_num, name, this); - auto result = m_accounts.insert( tmp ); - assert( result.second ); + auto result = m_accounts.insert(tmp); + assert(result.second); - /** execute in app thread */ - m_thread->async( [this,name](){ - try { - ilog( "look up names.." ); - auto result = m_db_api->lookup_account_names( {name.toStdString()} ); - /** execute in main */ - Q_EMIT queueExecute( [this,result,name](){ - wlog( "process result" ); - auto& by_name_idx = this->m_accounts.get(); - auto itr = by_name_idx.find(name); - assert( itr != by_name_idx.end() ); - - if( result.size() == 0 || !result.front() ) - { - elog( "delete later" ); - (*itr)->deleteLater(); - by_name_idx.erase( itr ); - } - else - { - by_name_idx.modify( itr, - [=]( Account* a ){ - a->setProperty("id", ObjectId(result.front()->id.instance())); - } - ); - } - }); - } - catch ( const fc::exception& e ) - { - Q_EMIT exceptionThrown( QString::fromStdString(e.to_string()) ); - } - }); + // Run in RPC thread + m_rpc_thread->async([this, name, result]{getAccountImpl(name, &*result.first);}); return *result.first; } return *itr; @@ -209,84 +196,78 @@ Account* ChainDataModel::getAccount(QString name) QQmlListProperty Account::balances() { - // This entire block is dummy data. Throw it away when this function gets a real implementation. - if (m_balances.empty()) - { - auto asset = new Asset(0, QStringLiteral("CORE"), 5, this); - m_balances.append(new Balance); - m_balances.back()->setProperty("amount", 5000000); - m_balances.back()->setProperty("type", QVariant::fromValue(asset)); - asset = new Asset(0, QStringLiteral("USD"), 2, this); - m_balances.append(new Balance); - m_balances.back()->setProperty("amount", 3099); - m_balances.back()->setProperty("type", QVariant::fromValue(asset)); - } + auto count = [](QQmlListProperty* list) { + return reinterpret_cast(list->data)->m_balances.size(); + }; + auto at = [](QQmlListProperty* list, int index) { + return reinterpret_cast(list->data)->m_balances[index]; + }; - return QQmlListProperty(this, m_balances); + return QQmlListProperty(this, this, count, at); } -GrapheneApplication::GrapheneApplication( QObject* parent ) -:QObject( parent ),m_thread("app") +GrapheneApplication::GrapheneApplication(QObject* parent) +:QObject(parent),m_thread("app") { - connect( this, &GrapheneApplication::queueExecute, - this, &GrapheneApplication::execute ); + connect(this, &GrapheneApplication::queueExecute, + this, &GrapheneApplication::execute); - m_model = new ChainDataModel( m_thread, this ); + m_model = new ChainDataModel(m_thread, this); - connect( m_model, &ChainDataModel::queueExecute, - this, &GrapheneApplication::execute ); + connect(m_model, &ChainDataModel::queueExecute, + this, &GrapheneApplication::execute); - connect( m_model, &ChainDataModel::exceptionThrown, - this, &GrapheneApplication::exceptionThrown ); + connect(m_model, &ChainDataModel::exceptionThrown, + this, &GrapheneApplication::exceptionThrown); } GrapheneApplication::~GrapheneApplication() { } -void GrapheneApplication::setIsConnected( bool v ) +void GrapheneApplication::setIsConnected(bool v) { - if( v != m_isConnected ) + if (v != m_isConnected) { m_isConnected = v; - Q_EMIT isConnectedChanged( m_isConnected ); + Q_EMIT isConnectedChanged(m_isConnected); } } -void GrapheneApplication::start( QString apiurl, QString user, QString pass ) +void GrapheneApplication::start(QString apiurl, QString user, QString pass) { - if( !m_thread.is_current() ) + if (!m_thread.is_current()) { - m_done = m_thread.async( [=](){ return start( apiurl, user, pass ); } ); + m_done = m_thread.async([=](){ return start(apiurl, user, pass); }); return; } try { m_client = std::make_shared(); - ilog( "connecting...${s}", ("s",apiurl.toStdString()) ); - auto con = m_client->connect( apiurl.toStdString() ); + ilog("connecting...${s}", ("s",apiurl.toStdString())); + auto con = m_client->connect(apiurl.toStdString()); m_connectionClosed = con->closed.connect([this]{queueExecute([this]{setIsConnected(false);});}); auto apic = std::make_shared(*con); - auto remote_api = apic->get_remote_api< login_api >(1); - auto db_api = apic->get_remote_api< database_api >(0); - if( !remote_api->login( user.toStdString(), pass.toStdString() ) ) + auto remote_api = apic->get_remote_api(1); + auto db_api = apic->get_remote_api(0); + if (!remote_api->login(user.toStdString(), pass.toStdString())) { - elog( "login failed" ); + elog("login failed"); Q_EMIT loginFailed(); return; } - ilog( "connecting..." ); - queueExecute( [=](){ - m_model->setDatabaseAPI( db_api ); + ilog("connecting..."); + queueExecute([=](){ + m_model->setDatabaseAPI(db_api); }); - queueExecute( [=](){setIsConnected( true );} ); - } catch ( const fc::exception& e ) + queueExecute([=](){ setIsConnected(true); }); + } catch (const fc::exception& e) { - Q_EMIT exceptionThrown( QString::fromStdString(e.to_string()) ); + Q_EMIT exceptionThrown(QString::fromStdString(e.to_string())); } } -Q_SLOT void GrapheneApplication::execute( const std::function& func )const +Q_SLOT void GrapheneApplication::execute(const std::function& func)const { func(); } diff --git a/programs/light_client/ClientDataModel.hpp b/programs/light_client/ClientDataModel.hpp index 1968a194..5f6c99da 100644 --- a/programs/light_client/ClientDataModel.hpp +++ b/programs/light_client/ClientDataModel.hpp @@ -18,6 +18,8 @@ using boost::multi_index_container; using namespace boost::multi_index; +using graphene::chain::by_id; + using ObjectId = qint64; Q_DECLARE_METATYPE(ObjectId) @@ -83,7 +85,6 @@ Q_SIGNALS: void precisionChanged(); }; -struct by_id; struct by_symbol_name; typedef multi_index_container< Asset*, @@ -130,6 +131,13 @@ public: QString name()const { return m_name; } QQmlListProperty balances(); + void setBalances(QList balances) { + if (balances != m_balances) { + m_balances = balances; + Q_EMIT balancesChanged(); + } + } + Q_SIGNALS: void nameChanged(); void balancesChanged(); @@ -147,6 +155,9 @@ typedef multi_index_container< class ChainDataModel : public QObject { Q_OBJECT + void getAssetImpl(QString assetIdentifier, Asset* const * assetInContainer); + void getAccountImpl(QString accountIdentifier, Account* const * accountInContainer); + public: Q_INVOKABLE Account* getAccount(ObjectId id); Q_INVOKABLE Account* getAccount(QString name); @@ -163,7 +174,7 @@ Q_SIGNALS: void exceptionThrown( QString message ); private: - fc::thread* m_thread = nullptr; + fc::thread* m_rpc_thread = nullptr; std::string m_api_url; fc::api m_db_api; @@ -186,13 +197,15 @@ class GrapheneApplication : public QObject { boost::signals2::scoped_connection m_connectionClosed; std::shared_ptr m_client; - fc::future m_done; + fc::future m_done; - void setIsConnected( bool v ); + void setIsConnected(bool v); + +protected Q_SLOTS: + void execute(const std::function&)const; - Q_SLOT void execute( const std::function& )const; public: - GrapheneApplication( QObject* parent = nullptr ); + GrapheneApplication(QObject* parent = nullptr); ~GrapheneApplication(); ChainDataModel* model() const @@ -201,8 +214,8 @@ public: } Q_INVOKABLE void start(QString apiUrl, - QString user, - QString pass ); + QString user, + QString pass); bool isConnected() const { diff --git a/programs/light_client/qml/FormBox.qml b/programs/light_client/qml/FormBox.qml index 69539789..653f40fe 100644 --- a/programs/light_client/qml/FormBox.qml +++ b/programs/light_client/qml/FormBox.qml @@ -84,7 +84,6 @@ Rectangle { StateChangeScript { name: "postHidden" script: { - console.log("Post") greySheet.closed() formContainer.data = [] if (internal.callback instanceof Function) diff --git a/programs/light_client/qml/main.qml b/programs/light_client/qml/main.qml index 03714d25..e6774b13 100644 --- a/programs/light_client/qml/main.qml +++ b/programs/light_client/qml/main.qml @@ -110,15 +110,10 @@ ApplicationWindow { if (acct == null) console.log("Got back null account") else if ( !(parseInt(acct.name) <= 0) ) - { - console.log("NAME ALREADY SET" ); console.log(JSON.stringify(acct)) - } - else - { + else { console.log("Waiting for result...") acct.nameChanged.connect(function() { - console.log( "NAME CHANGED" ); console.log(JSON.stringify(acct)) }) } @@ -141,14 +136,12 @@ ApplicationWindow { console.log("Got back null asset") else if ( !(parseInt(acct.name) <= 0) ) { - console.log("NAME ALREADY SET" ); console.log(JSON.stringify(acct)) } else { console.log("Waiting for result...") acct.nameChanged.connect(function() { - console.log( "NAME CHANGED" ); console.log(JSON.stringify(acct)) }) } From e221fabe397bb49a055087288a2ec115e9d1fecf Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Fri, 17 Jul 2015 16:06:07 -0400 Subject: [PATCH 044/353] [GUI] Fixes in transfer form --- programs/light_client/qml/AccountPicker.qml | 7 ++++--- programs/light_client/qml/TransferForm.qml | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/programs/light_client/qml/AccountPicker.qml b/programs/light_client/qml/AccountPicker.qml index f789eefe..2de1ce86 100644 --- a/programs/light_client/qml/AccountPicker.qml +++ b/programs/light_client/qml/AccountPicker.qml @@ -28,9 +28,10 @@ RowLayout { Layout.fillWidth: true TextField { id: accountNameField - width: parent.width + onEditingFinished: accountDetails.update(text) + onTextChanged: if (account && account.name !== text) accountDetails.update("") } Text { id: accountDetails @@ -57,8 +58,8 @@ RowLayout { var text = qsTr("Account ID: %1").arg(account.id < 0? qsTr("Loading...") : account.id) if (showBalance >= 0) { - text += "\n" + qsTr("Balance: %1 %2").arg(balances[showBalance].amountReal()) - .arg(balances[showBalance].type.symbol) + var bal = balances[showBalance] + text += "\n" + qsTr("Balance: %1 %2").arg(String(bal.amountReal())).arg(bal.type.symbol) } return text }) diff --git a/programs/light_client/qml/TransferForm.qml b/programs/light_client/qml/TransferForm.qml index 18ac15bf..5ea3df2f 100644 --- a/programs/light_client/qml/TransferForm.qml +++ b/programs/light_client/qml/TransferForm.qml @@ -58,13 +58,13 @@ Rectangle { maximumValue: maxBalance? maxBalance.amountReal() : 0 decimals: maxBalance? maxBalance.type.precision : 0 - property Balance maxBalance: senderPicker.balances && senderPicker.showBalance >= 0? - senderPicker.balances[senderPicker.showBalance] : null + property Balance maxBalance: assetField.enabled && senderPicker.showBalance >= 0? + senderPicker.balances[senderPicker.showBalance] : null } ComboBox { id: assetField Layout.minimumWidth: Scaling.cm(3) - enabled: Boolean(senderPicker.balances) + enabled: senderPicker.balances instanceof Array && senderPicker.balances.length > 0 model: enabled? senderPicker.balances.filter(function(balance) { return balance.amount > 0 }) .map(function(balance) { return balance.type.symbol }) : ["Asset Type"] @@ -76,7 +76,7 @@ Rectangle { } Button { text: qsTr("Transfer") - enabled: senderPicker.account + enabled: senderPicker.account && recipientPicker.account && senderPicker.account !== recipientPicker.account && amountField.value onClicked: console.log(amountField.value) } } From 34a3c17af432b8198d94e586ef75926de81ef201 Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Fri, 17 Jul 2015 16:39:01 -0400 Subject: [PATCH 045/353] [GUI] Add some docs in the QML --- programs/light_client/qml/AccountPicker.qml | 13 ++++++++++--- programs/light_client/qml/TransferForm.qml | 20 +++++++++++++++++--- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/programs/light_client/qml/AccountPicker.qml b/programs/light_client/qml/AccountPicker.qml index 2de1ce86..01ecceec 100644 --- a/programs/light_client/qml/AccountPicker.qml +++ b/programs/light_client/qml/AccountPicker.qml @@ -7,14 +7,21 @@ import Graphene.Client 0.1 import "." +/// A component for choosing an Account from the chain RowLayout { + property GrapheneApplication app + /// The text to show in the name field when it is empty + property alias placeholderText: accountNameField.placeholderText + /// Index into the balances Array of the balance to show beneath the name field + property int showBalance: -1 + + /// The Account object the user has selected property Account account + /// An Array of Balance objects held by account property var balances: account? Object.keys(account.balances).map(function(key){return account.balances[key]}) : null - property alias placeholderText: accountNameField.placeholderText - property int showBalance: -1 - + /// Set the name field to have active focus function setFocus() { accountNameField.forceActiveFocus() } diff --git a/programs/light_client/qml/TransferForm.qml b/programs/light_client/qml/TransferForm.qml index 5ea3df2f..f72ff864 100644 --- a/programs/light_client/qml/TransferForm.qml +++ b/programs/light_client/qml/TransferForm.qml @@ -7,15 +7,21 @@ import Graphene.Client 0.1 import "." +/** + * This is the form for transferring some amount of asset from one account to another. + */ Rectangle { + id: root anchors.fill: parent - property alias senderAccount: senderPicker.account - property alias receiverAccount: recipientPicker.account - property GrapheneApplication app signal finished + /// The Account object for the sender + property alias senderAccount: senderPicker.account + /// The Account object for the receiver + property alias receiverAccount: recipientPicker.account + Component.onCompleted: console.log("Made a transfer form") Component.onDestruction: console.log("Destroyed a transfer form") @@ -26,6 +32,13 @@ Rectangle { AccountPicker { id: senderPicker + // The senderPicker is really the heart of the form. Everything else in the form adjusts based on the account + // selected here. The assetField below updates to contain all assets this account has a nonzero balance in. + // The amountField updates based on the asset selected in the assetField to have the appropriate precision and + // to have a maximum value equal to the account's balance in that asset. The transfer button enables only when + // both accounts are set, and a nonzero amount is selected to be transferred. + + app: root.app Layout.fillWidth: true Layout.minimumWidth: Scaling.cm(5) Component.onCompleted: setFocus() @@ -37,6 +50,7 @@ Rectangle { } AccountPicker { id: recipientPicker + app: root.app Layout.fillWidth: true Layout.minimumWidth: Scaling.cm(5) placeholderText: qsTr("Recipient") From 7388a85cf2b615bea6e6e2cdfbabeccd9b61f30e Mon Sep 17 00:00:00 2001 From: Eric Frias Date: Fri, 17 Jul 2015 17:27:07 -0400 Subject: [PATCH 046/353] Prevent the wallet from generating duplicate transactions when you execute the same command twice in quick succession, Fix #165 --- libraries/wallet/wallet.cpp | 185 +++++++++++++++++++++++++++--------- 1 file changed, 138 insertions(+), 47 deletions(-) diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp index 03968f22..0943480a 100644 --- a/libraries/wallet/wallet.cpp +++ b/libraries/wallet/wallet.cpp @@ -29,6 +29,15 @@ #include #include +#include +#include +#include +#include +#include +#include +#include +#include + #include #include #include @@ -333,6 +342,27 @@ private: map _builder_transactions; + // if the user executes the same command twice in quick succession, + // we might generate the same transaction id, and cause the second + // transaction to be rejected. This can be avoided by altering the + // second transaction slightly (bumping up the expiration time by + // a second). Keep track of recent transaction ids we've generated + // so we can know if we need to do this + struct recently_generated_transaction_record + { + fc::time_point_sec generation_time; + graphene::chain::transaction_id_type transaction_id; + }; + struct timestamp_index{}; + typedef boost::multi_index_container, + std::hash >, + boost::multi_index::ordered_non_unique, + boost::multi_index::member > > > recently_generated_transaction_set_type; + recently_generated_transaction_set_type _recently_generated_transactions; + public: wallet_api& self; wallet_api_impl( wallet_api& s, fc::api rapi ) @@ -467,7 +497,17 @@ public: } else { // It's a name if( _wallet.my_accounts.get().count(account_name_or_id) ) + { + auto local_account = *_wallet.my_accounts.get().find(account_name_or_id); + auto blockchain_account = _remote_db->lookup_account_names({account_name_or_id}).front(); + FC_ASSERT( blockchain_account ); + if (local_account.id != blockchain_account->id) + elog("my account id ${id} different from blockchain id ${id2}", ("id", local_account.id)("id2", blockchain_account->id)); + if (local_account.name != blockchain_account->name) + elog("my account name ${id} different from blockchain name ${id2}", ("id", local_account.name)("id2", blockchain_account->name)); + return *_wallet.my_accounts.get().find(account_name_or_id); + } auto rec = _remote_db->lookup_account_names({account_name_or_id}).front(); FC_ASSERT( rec && rec->name == account_name_or_id ); return *rec; @@ -918,13 +958,14 @@ public: string account_name, string registrar_account, string referrer_account, - bool broadcast = false) + bool broadcast = false, + bool save_wallet = true) { try { FC_ASSERT( !self.is_locked() ); string normalized_brain_key = normalize_brain_key( brain_key ); // TODO: scan blockchain for accounts that exist with same brain key fc::ecc::private_key owner_privkey = derive_private_key( normalized_brain_key, 0 ); - return create_account_with_private_key(owner_privkey, account_name, registrar_account, referrer_account, broadcast); + return create_account_with_private_key(owner_privkey, account_name, registrar_account, referrer_account, broadcast, save_wallet); } FC_CAPTURE_AND_RETHROW( (account_name)(registrar_account)(referrer_account) ) } @@ -1416,7 +1457,7 @@ public: // std::merge lets us de-duplicate account_id's that occur in both // sets, and dump them into a vector (as required by remote_db api) // at the same time - vector< account_id_type > v_approving_account_ids; + vector v_approving_account_ids; std::merge(req_active_approvals.begin(), req_active_approvals.end(), req_owner_approvals.begin() , req_owner_approvals.end(), std::back_inserter(v_approving_account_ids)); @@ -1430,7 +1471,7 @@ public: FC_ASSERT( approving_account_objects.size() == v_approving_account_ids.size() ); - flat_map< account_id_type, account_object* > approving_account_lut; + flat_map approving_account_lut; size_t i = 0; for( optional& approving_acct : approving_account_objects ) { @@ -1445,7 +1486,7 @@ public: i++; } - flat_set< public_key_type > approving_key_set; + flat_set approving_key_set; for( account_id_type& acct_id : req_active_approvals ) { const auto it = approving_account_lut.find( acct_id ); @@ -1474,28 +1515,65 @@ public: auto dyn_props = get_dynamic_global_properties(); tx.set_reference_block( dyn_props.head_block_id ); - tx.set_expiration( dyn_props.time + fc::seconds(30) ); - for( public_key_type& key : approving_key_set ) + // first, some bookkeeping, expire old items from _recently_generated_transactions + // since transactions include the head block id, we just need the index for keeping transactions unique + // when there are multiple transactions in the same block. choose a time period that should be at + // least one block long, even in the worst case. 2 minutes ought to be plenty. + fc::time_point_sec oldest_transaction_ids_to_track(dyn_props.time - fc::minutes(2)); + auto oldest_transaction_record_iter = _recently_generated_transactions.get().lower_bound(oldest_transaction_ids_to_track); + auto begin_iter = _recently_generated_transactions.get().begin(); + _recently_generated_transactions.get().erase(begin_iter, oldest_transaction_record_iter); + + uint32_t expiration_time_offset = 0; + for (;;) { - auto it = _keys.find(key); - if( it != _keys.end() ) + tx.set_expiration( dyn_props.time + fc::seconds(30 + expiration_time_offset) ); + tx.signatures.clear(); + + for( public_key_type& key : approving_key_set ) { - fc::optional< fc::ecc::private_key > privkey = wif_to_key( it->second ); - if( !privkey.valid() ) + auto it = _keys.find(key); + if( it != _keys.end() ) { - FC_ASSERT( false, "Malformed private key in _keys" ); + fc::optional privkey = wif_to_key( it->second ); + FC_ASSERT( privkey.valid(), "Malformed private key in _keys" ); + tx.sign( *privkey ); } - tx.sign( *privkey ); + /// TODO: if transaction has enough signatures to be "valid" don't add any more, + /// there are cases where the wallet may have more keys than strictly necessary and + /// the transaction will be rejected if the transaction validates without requiring + /// all signatures provided } - /// TODO: if transaction has enough signatures to be "valid" don't add any more, - /// there are cases where the wallet may have more keys than strictly necessary and - /// the transaction will be rejected if the transaction validates without requiring - /// all signatures provided + + graphene::chain::transaction_id_type this_transaction_id = tx.id(); + auto iter = _recently_generated_transactions.find(this_transaction_id); + if (iter == _recently_generated_transactions.end()) + { + // we haven't generated this transaction before, the usual case + recently_generated_transaction_record this_transaction_record; + this_transaction_record.generation_time = dyn_props.time; + this_transaction_record.transaction_id = this_transaction_id; + _recently_generated_transactions.insert(this_transaction_record); + break; + } + + // else we've generated a dupe, increment expiration time and re-sign it + ++expiration_time_offset; } if( broadcast ) - _remote_net_broadcast->broadcast_transaction( tx ); + { + try + { + _remote_net_broadcast->broadcast_transaction( tx ); + } + catch (const fc::exception& e) + { + elog("Caught exception while broadcasting transaction with id ${id}", ("id", tx.id().str())); + throw; + } + } return tx; } @@ -1699,37 +1777,50 @@ public: void flood_network(string prefix, uint32_t number_of_transactions) { - const account_object& master = *_wallet.my_accounts.get().lower_bound("import"); - int number_of_accounts = number_of_transactions / 3; - number_of_transactions -= number_of_accounts; - auto key = derive_private_key("floodshill", 0); - try { - dbg_make_uia(master.name, "SHILL"); - } catch(...) {/* Ignore; the asset probably already exists.*/} - - fc::time_point start = fc::time_point::now(); - for( int i = 0; i < number_of_accounts; ++i ) - create_account_with_private_key(key, prefix + fc::to_string(i), master.name, master.name, /* broadcast = */ true, /* save wallet = */ false); - fc::time_point end = fc::time_point::now(); - ilog("Created ${n} accounts in ${time} milliseconds", - ("n", number_of_accounts)("time", (end - start).count() / 1000)); - - start = fc::time_point::now(); - for( int i = 0; i < number_of_accounts; ++i ) + try { - transfer(master.name, prefix + fc::to_string(i), "10", "CORE", "", true); - transfer(master.name, prefix + fc::to_string(i), "1", "CORE", "", true); - } - end = fc::time_point::now(); - ilog("Transferred to ${n} accounts in ${time} milliseconds", - ("n", number_of_accounts*2)("time", (end - start).count() / 1000)); + const account_object& master = *_wallet.my_accounts.get().lower_bound("import"); + int number_of_accounts = number_of_transactions / 3; + number_of_transactions -= number_of_accounts; + //auto key = derive_private_key("floodshill", 0); + try { + dbg_make_uia(master.name, "SHILL"); + } catch(...) {/* Ignore; the asset probably already exists.*/} - start = fc::time_point::now(); - for( int i = 0; i < number_of_accounts; ++i ) - issue_asset(prefix + fc::to_string(i), "1000", "SHILL", "", true); - end = fc::time_point::now(); - ilog("Issued to ${n} accounts in ${time} milliseconds", - ("n", number_of_accounts)("time", (end - start).count() / 1000)); + fc::time_point start = fc::time_point::now(); + for( int i = 0; i < number_of_accounts; ++i ) + { + std::ostringstream brain_key; + brain_key << "brain key for account " << prefix << i; + signed_transaction trx = create_account_with_brain_key(brain_key.str(), prefix + fc::to_string(i), master.name, master.name, /* broadcast = */ true, /* save wallet = */ false); + } + fc::time_point end = fc::time_point::now(); + ilog("Created ${n} accounts in ${time} milliseconds", + ("n", number_of_accounts)("time", (end - start).count() / 1000)); + + start = fc::time_point::now(); + for( int i = 0; i < number_of_accounts; ++i ) + { + signed_transaction trx = transfer(master.name, prefix + fc::to_string(i), "10", "CORE", "", true); + trx = transfer(master.name, prefix + fc::to_string(i), "1", "CORE", "", true); + } + end = fc::time_point::now(); + ilog("Transferred to ${n} accounts in ${time} milliseconds", + ("n", number_of_accounts*2)("time", (end - start).count() / 1000)); + + start = fc::time_point::now(); + for( int i = 0; i < number_of_accounts; ++i ) + { + signed_transaction trx = issue_asset(prefix + fc::to_string(i), "1000", "SHILL", "", true); + } + end = fc::time_point::now(); + ilog("Issued to ${n} accounts in ${time} milliseconds", + ("n", number_of_accounts)("time", (end - start).count() / 1000)); + } + catch (...) + { + throw; + } } From 5655d47a6f7a259003b1cdf698f1c3f234521d74 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Fri, 17 Jul 2015 19:15:08 -0400 Subject: [PATCH 047/353] operation_tests.cpp: Delete unimp_transfer_cashback_test, superseded by cashback_test --- tests/tests/operation_tests.cpp | 44 --------------------------------- 1 file changed, 44 deletions(-) diff --git a/tests/tests/operation_tests.cpp b/tests/tests/operation_tests.cpp index 08d12e1a..b38a2310 100644 --- a/tests/tests/operation_tests.cpp +++ b/tests/tests/operation_tests.cpp @@ -1221,7 +1221,6 @@ BOOST_AUTO_TEST_CASE( witness_pay_test ) * Reserve asset test should make sure that all assets except bitassets * can be burned, and all supplies add up. */ -BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES( reserve_asset_test, 1 ) BOOST_AUTO_TEST_CASE( reserve_asset_test ) { try @@ -1394,49 +1393,6 @@ BOOST_AUTO_TEST_CASE( unimp_bulk_discount_test ) //const account_object& shorter2 = create_account( "bob" ); BOOST_FAIL( "not implemented" ); } -/** - * Assume the referrer gets 99% of transaction fee - */ -BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES( unimp_transfer_cashback_test, 1 ) -BOOST_AUTO_TEST_CASE( unimp_transfer_cashback_test ) -{ - try { - BOOST_FAIL( "Rewrite this test with VBO based cashback" ); -#if 0 - generate_blocks(1); - - const account_object& sam = create_account( "sam" ); - transfer(account_id_type()(db), sam, asset(30000)); - upgrade_to_lifetime_member(sam); - - ilog( "Creating alice" ); - const account_object& alice = create_account( "alice", sam, sam, 0 ); - ilog( "Creating bob" ); - const account_object& bob = create_account( "bob", sam, sam, 0 ); - - transfer(account_id_type()(db), alice, asset(300000)); - - enable_fees(); - - transfer(alice, bob, asset(100000)); - - BOOST_REQUIRE_EQUAL( alice.statistics(db).lifetime_fees_paid.value, GRAPHENE_BLOCKCHAIN_PRECISION ); - - const asset_dynamic_data_object& core_asset_data = db.get_core_asset().dynamic_asset_data_id(db); - // 1% of fee goes to witnesses - BOOST_CHECK_EQUAL(core_asset_data.accumulated_fees.value, - GRAPHENE_BLOCKCHAIN_PRECISION/100/*witness*/ + GRAPHENE_BLOCKCHAIN_PRECISION/5 /*burn*/); - // 99% of fee goes to referrer / registrar sam - BOOST_CHECK_EQUAL( sam.statistics(db).cashback_rewards.value, - GRAPHENE_BLOCKCHAIN_PRECISION - GRAPHENE_BLOCKCHAIN_PRECISION/100/*witness*/ - GRAPHENE_BLOCKCHAIN_PRECISION/5/*burn*/); - -#endif - } catch( const fc::exception& e ) - { - edump((e.to_detail_string())); - throw; - } -} BOOST_AUTO_TEST_CASE( vesting_balance_create_test ) { try { From c67acc0cf5f1688eeee1df2041540a2821a2b6c2 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Fri, 17 Jul 2015 20:27:18 -0400 Subject: [PATCH 048/353] uia_tests.cpp: Implement transfer_restricted_test --- .../include/graphene/chain/exceptions.hpp | 1 + libraries/chain/transfer_evaluator.cpp | 9 ++- tests/tests/uia_tests.cpp | 78 ++++++++++++++++++- 3 files changed, 83 insertions(+), 5 deletions(-) diff --git a/libraries/chain/include/graphene/chain/exceptions.hpp b/libraries/chain/include/graphene/chain/exceptions.hpp index dc993912..4d8a7af4 100644 --- a/libraries/chain/include/graphene/chain/exceptions.hpp +++ b/libraries/chain/include/graphene/chain/exceptions.hpp @@ -84,6 +84,7 @@ namespace graphene { namespace chain { GRAPHENE_DECLARE_OP_EVALUATE_EXCEPTION( from_account_not_whitelisted, transfer, 1, "owner mismatch" ) GRAPHENE_DECLARE_OP_EVALUATE_EXCEPTION( to_account_not_whitelisted, transfer, 2, "owner mismatch" ) + GRAPHENE_DECLARE_OP_EVALUATE_EXCEPTION( restricted_transfer_asset, transfer, 3, "restricted transfer asset" ) //GRAPHENE_DECLARE_OP_BASE_EXCEPTIONS( limit_order_create ); //GRAPHENE_DECLARE_OP_BASE_EXCEPTIONS( limit_order_cancel ); diff --git a/libraries/chain/transfer_evaluator.cpp b/libraries/chain/transfer_evaluator.cpp index 5ec4977b..26d7efe9 100644 --- a/libraries/chain/transfer_evaluator.cpp +++ b/libraries/chain/transfer_evaluator.cpp @@ -54,7 +54,14 @@ void_result transfer_evaluator::do_evaluate( const transfer_operation& op ) FC_ASSERT( from_account.is_authorized_asset( asset_type ) ); if( asset_type.is_transfer_restricted() ) - FC_ASSERT( from_account.id == asset_type.issuer || to_account.id == asset_type.issuer ); + { + GRAPHENE_ASSERT( + from_account.id == asset_type.issuer || to_account.id == asset_type.issuer, + transfer_restricted_transfer_asset, + "Asset {asset} has transfer_restricted flag enabled", + ("asset", op.amount.asset_id) + ); + } bool insufficient_balance = d.get_balance( from_account, asset_type ).amount >= op.amount.amount; FC_ASSERT( insufficient_balance, diff --git a/tests/tests/uia_tests.cpp b/tests/tests/uia_tests.cpp index 14ae637a..04210653 100644 --- a/tests/tests/uia_tests.cpp +++ b/tests/tests/uia_tests.cpp @@ -286,14 +286,84 @@ BOOST_AUTO_TEST_CASE( transfer_whitelist_uia ) } } - /** * verify that issuers can halt transfers */ -BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES( unimp_halt_transfers_flag_test, 1 ) -BOOST_AUTO_TEST_CASE( unimp_halt_transfers_flag_test ) +BOOST_AUTO_TEST_CASE( transfer_restricted_test ) { - BOOST_FAIL( "not implemented" ); + try + { + ACTORS( (sam)(alice)(bob) ); + + BOOST_TEST_MESSAGE( "Issuing 1000 UIA to Alice" ); + + auto _issue_uia = [&]( const account_object& recipient, asset amount ) + { + asset_issue_operation op; + op.issuer = amount.asset_id(db).issuer; + op.asset_to_issue = amount; + op.issue_to_account = recipient.id; + transaction tx; + tx.operations.push_back( op ); + tx.set_expiration( db.head_block_time() + fc::minutes(5) ); + PUSH_TX( db, tx, database::skip_authority_check | database::skip_tapos_check | database::skip_transaction_signatures ); + } ; + + asset fee; + account_id_type issuer; + asset_id_type asset_to_update; + + /// If the asset is to be given a new issuer, specify his ID here. + optional new_issuer; + asset_options new_options; + extensions_type extensions; + + const asset_object& uia = create_user_issued_asset( "TXRX", sam, transfer_restricted ); + _issue_uia( alice, uia.amount( 1000 ) ); + + auto _restrict_xfer = [&]( bool xfer_flag ) + { + asset_update_operation op; + op.issuer = sam_id; + op.asset_to_update = uia.id; + op.new_options = uia.options; + if( xfer_flag ) + op.new_options.flags |= transfer_restricted; + else + op.new_options.flags &= ~transfer_restricted; + transaction tx; + tx.operations.push_back( op ); + tx.set_expiration( db.head_block_time() + fc::minutes(5) ); + PUSH_TX( db, tx, database::skip_authority_check | database::skip_tapos_check | database::skip_transaction_signatures ); + } ; + + BOOST_TEST_MESSAGE( "Enable transfer_restricted, send fails" ); + + transfer_operation xfer_op; + xfer_op.from = alice_id; + xfer_op.to = bob_id; + xfer_op.amount = uia.amount(100); + signed_transaction xfer_tx; + xfer_tx.operations.push_back( xfer_op ); + xfer_tx.set_expiration( db.head_block_time() + fc::minutes(5) ); + sign( xfer_tx, alice_private_key ); + + _restrict_xfer( true ); + GRAPHENE_REQUIRE_THROW( PUSH_TX( db, xfer_tx ), transfer_restricted_transfer_asset ); + + BOOST_TEST_MESSAGE( "Disable transfer_restricted, send succeeds" ); + + _restrict_xfer( false ); + PUSH_TX( db, xfer_tx ); + + xfer_op.amount = uia.amount(101); + + } + catch(fc::exception& e) + { + edump((e.to_detail_string())); + throw; + } } From 517ea70c95c72501d6c8505bec787dac966a88d7 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Fri, 17 Jul 2015 22:07:07 -0400 Subject: [PATCH 049/353] #169 - Removing Bulk Discounts --- libraries/chain/account_object.cpp | 30 ------------------- .../include/graphene/chain/account_object.hpp | 2 -- .../chain/protocol/chain_parameters.hpp | 9 ------ 3 files changed, 41 deletions(-) diff --git a/libraries/chain/account_object.cpp b/libraries/chain/account_object.cpp index 79c4060a..387ad917 100644 --- a/libraries/chain/account_object.cpp +++ b/libraries/chain/account_object.cpp @@ -50,25 +50,6 @@ void account_balance_object::adjust_balance(const asset& delta) balance += delta.amount; } -uint16_t account_statistics_object::calculate_bulk_discount_percent(const chain_parameters& params) const -{ - uint64_t bulk_discount_percent = 0; - if( lifetime_fees_paid >= params.bulk_discount_threshold_max ) - bulk_discount_percent = params.max_bulk_discount_percent_of_fee; - else if(params.bulk_discount_threshold_max.value != - params.bulk_discount_threshold_min.value) - { - bulk_discount_percent = - (params.max_bulk_discount_percent_of_fee * - (lifetime_fees_paid.value - - params.bulk_discount_threshold_min.value)) / - (params.bulk_discount_threshold_max.value - - params.bulk_discount_threshold_min.value); - } - assert( bulk_discount_percent <= GRAPHENE_100_PERCENT ); - - return bulk_discount_percent; -} void account_statistics_object::process_fees(const account_object& a, database& d) const { @@ -117,17 +98,6 @@ void account_statistics_object::process_fees(const account_object& a, database& share_type vested_fee_subtotal(pending_vested_fees); share_type vesting_cashback, vested_cashback; - if( lifetime_fees_paid > props.parameters.bulk_discount_threshold_min && - a.is_member(d.head_block_time()) ) - { - auto bulk_discount_rate = calculate_bulk_discount_percent(props.parameters); - vesting_cashback = cut_fee(vesting_fee_subtotal, bulk_discount_rate); - vesting_fee_subtotal -= vesting_cashback; - - vested_cashback = cut_fee(vested_fee_subtotal, bulk_discount_rate); - vested_fee_subtotal -= vested_cashback; - } - pay_out_fees(a, vesting_fee_subtotal, true); d.deposit_cashback(a, vesting_cashback, true); pay_out_fees(a, vested_fee_subtotal, false); diff --git a/libraries/chain/include/graphene/chain/account_object.hpp b/libraries/chain/include/graphene/chain/account_object.hpp index 56e3f96a..f8f1d08e 100644 --- a/libraries/chain/include/graphene/chain/account_object.hpp +++ b/libraries/chain/include/graphene/chain/account_object.hpp @@ -74,8 +74,6 @@ namespace graphene { namespace chain { */ share_type pending_vested_fees; - /// @brief Calculate the percentage discount this user receives on his fees - uint16_t calculate_bulk_discount_percent(const chain_parameters& params)const; /// @brief Split up and pay out @ref pending_fees and @ref pending_vested_fees void process_fees(const account_object& a, database& d) const; }; diff --git a/libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp b/libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp index fd82537f..1d76f52f 100644 --- a/libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp +++ b/libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp @@ -52,9 +52,6 @@ namespace graphene { namespace chain { uint16_t lifetime_referrer_percent_of_fee = GRAPHENE_DEFAULT_LIFETIME_REFERRER_PERCENT_OF_FEE; ///< percent of transaction fees paid to network uint32_t cashback_vesting_period_seconds = GRAPHENE_DEFAULT_CASHBACK_VESTING_PERIOD_SEC; ///< time after cashback rewards are accrued before they become liquid share_type cashback_vesting_threshold = GRAPHENE_DEFAULT_CASHBACK_VESTING_THRESHOLD; ///< the maximum cashback that can be received without vesting - uint16_t max_bulk_discount_percent_of_fee = GRAPHENE_DEFAULT_MAX_BULK_DISCOUNT_PERCENT; ///< the maximum percentage discount for bulk discounts - share_type bulk_discount_threshold_min = GRAPHENE_DEFAULT_BULK_DISCOUNT_THRESHOLD_MIN; ///< the minimum amount of fees paid to qualify for bulk discounts - share_type bulk_discount_threshold_max = GRAPHENE_DEFAULT_BULK_DISCOUNT_THRESHOLD_MAX; ///< the amount of fees paid to qualify for the max bulk discount percent bool count_non_member_votes = true; ///< set to false to restrict voting privlegages to member accounts bool allow_non_member_whitelists = false; ///< true if non-member accounts may set whitelists and blacklists; false otherwise share_type witness_pay_per_block = GRAPHENE_DEFAULT_WITNESS_PAY_PER_BLOCK; ///< CORE to be allocated to witnesses (per block) @@ -71,11 +68,8 @@ namespace graphene { namespace chain { { FC_ASSERT( reserve_percent_of_fee <= GRAPHENE_100_PERCENT ); FC_ASSERT( network_percent_of_fee <= GRAPHENE_100_PERCENT ); - FC_ASSERT( max_bulk_discount_percent_of_fee <= GRAPHENE_100_PERCENT ); FC_ASSERT( lifetime_referrer_percent_of_fee <= GRAPHENE_100_PERCENT ); FC_ASSERT( network_percent_of_fee + lifetime_referrer_percent_of_fee <= GRAPHENE_100_PERCENT ); - FC_ASSERT( bulk_discount_threshold_min <= bulk_discount_threshold_max ); - FC_ASSERT( bulk_discount_threshold_min > 0 ); FC_ASSERT( block_interval >= GRAPHENE_MIN_BLOCK_INTERVAL ); FC_ASSERT( block_interval <= GRAPHENE_MAX_BLOCK_INTERVAL ); @@ -115,11 +109,8 @@ FC_REFLECT( graphene::chain::chain_parameters, (reserve_percent_of_fee) (network_percent_of_fee) (lifetime_referrer_percent_of_fee) - (max_bulk_discount_percent_of_fee) (cashback_vesting_period_seconds) (cashback_vesting_threshold) - (bulk_discount_threshold_min) - (bulk_discount_threshold_max) (count_non_member_votes) (allow_non_member_whitelists) (witness_pay_per_block) From e4c29cbe787584a3e20ce628052bac0a7abedd82 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Fri, 17 Jul 2015 22:58:36 -0400 Subject: [PATCH 050/353] #166 Define type-safe API for get_full_account() --- libraries/app/api.cpp | 45 +++++++++---------- libraries/app/include/graphene/app/api.hpp | 3 +- .../app/include/graphene/app/full_account.hpp | 34 ++++++++++++++ 3 files changed, 58 insertions(+), 24 deletions(-) create mode 100644 libraries/app/include/graphene/app/full_account.hpp diff --git a/libraries/app/api.cpp b/libraries/app/api.cpp index fc19f56d..f6131a5c 100644 --- a/libraries/app/api.cpp +++ b/libraries/app/api.cpp @@ -154,10 +154,10 @@ namespace graphene { namespace app { return result; } - std::map database_api::get_full_accounts(std::function callback, + std::map database_api::get_full_accounts(std::function callback, const vector& names_or_ids) { - std::map results; + std::map results; std::set ids_to_subscribe; for (const std::string& account_name_or_id : names_or_ids) @@ -177,59 +177,58 @@ namespace graphene { namespace app { ids_to_subscribe.insert({account->id, account->statistics}); - fc::mutable_variant_object full_account; + // fc::mutable_variant_object full_account; + full_account acnt; + acnt.account = *account; + acnt.statistics = account->statistics(_db); + acnt.registrar_name = account->registrar(_db).name; + acnt.referrer_name = account->referrer(_db).name; + acnt.lifetime_referrer_name = account->lifetime_referrer(_db).name; // Add the account itself, its statistics object, cashback balance, and referral account names + /* full_account("account", *account)("statistics", account->statistics(_db)) ("registrar_name", account->registrar(_db).name)("referrer_name", account->referrer(_db).name) ("lifetime_referrer_name", account->lifetime_referrer(_db).name); + */ if (account->cashback_vb) { ids_to_subscribe.insert(*account->cashback_vb); - full_account("cashback_balance", account->cashback_balance(_db)); + acnt.cashback_balance = account->cashback_balance(_db); } // Add the account's balances auto balance_range = _db.get_index_type().indices().get().equal_range(account->id); - vector balances; + //vector balances; std::for_each(balance_range.first, balance_range.second, - [&balances, &ids_to_subscribe](const account_balance_object& balance) { - balances.emplace_back(balance); + [&acnt, &ids_to_subscribe](const account_balance_object& balance) { + acnt.balances.emplace_back(balance); ids_to_subscribe.insert(balance.id); }); - idump((balances)); - full_account("balances", balances); // Add the account's vesting balances auto vesting_range = _db.get_index_type().indices().get().equal_range(account->id); - vector vesting_balances; std::for_each(vesting_range.first, vesting_range.second, - [&vesting_balances, &ids_to_subscribe](const vesting_balance_object& balance) { - vesting_balances.emplace_back(balance); + [&acnt, &ids_to_subscribe](const vesting_balance_object& balance) { + acnt.vesting_balances.emplace_back(balance); ids_to_subscribe.insert(balance.id); }); - full_account("vesting_balances", vesting_balances); // Add the account's orders auto order_range = _db.get_index_type().indices().get().equal_range(account->id); - vector orders; std::for_each(order_range.first, order_range.second, - [&orders, &ids_to_subscribe] (const limit_order_object& order) { - orders.emplace_back(order); + [&acnt, &ids_to_subscribe] (const limit_order_object& order) { + acnt.limit_orders.emplace_back(order); ids_to_subscribe.insert(order.id); }); auto call_range = _db.get_index_type().indices().get().equal_range(account->id); - vector calls; std::for_each(call_range.first, call_range.second, - [&calls, &ids_to_subscribe] (const call_order_object& call) { - calls.emplace_back(call); + [&acnt, &ids_to_subscribe] (const call_order_object& call) { + acnt.call_orders.emplace_back(call); ids_to_subscribe.insert(call.id); }); - full_account("limit_orders", orders)("call_orders", calls); - - results[account_name_or_id] = full_account; + results[account_name_or_id] = acnt; } - wdump((results)); subscribe_to_objects(callback, vector(ids_to_subscribe.begin(), ids_to_subscribe.end())); return results; diff --git a/libraries/app/include/graphene/app/api.hpp b/libraries/app/include/graphene/app/api.hpp index d61d8d12..b0fb8b75 100644 --- a/libraries/app/include/graphene/app/api.hpp +++ b/libraries/app/include/graphene/app/api.hpp @@ -29,6 +29,7 @@ #include #include +#include #include @@ -150,7 +151,7 @@ namespace graphene { namespace app { * * TODO: Describe the return value and argument to callback in detail */ - std::map get_full_accounts(std::function callback, + std::map get_full_accounts(std::function callback, const vector& names_or_ids); /** diff --git a/libraries/app/include/graphene/app/full_account.hpp b/libraries/app/include/graphene/app/full_account.hpp new file mode 100644 index 00000000..a9e12a1a --- /dev/null +++ b/libraries/app/include/graphene/app/full_account.hpp @@ -0,0 +1,34 @@ +#pragma once + +#include + +namespace graphene { namespace app { + using namespace graphene::chain; + + struct full_account + { + account_object account; + account_statistics_object statistics; + string registrar_name; + string referrer_name; + string lifetime_referrer_name; + optional cashback_balance; + vector balances; + vector vesting_balances; + vector limit_orders; + vector call_orders; + }; + +} } + +FC_REFLECT( graphene::app::full_account, + (account) + (statistics) + (registrar_name) + (referrer_name) + (lifetime_referrer_name) + (cashback_balance) + (balances) + (vesting_balances) + (limit_orders) + (call_orders) ) From ee0901aca0a74aba8a8d94e9d2a8de4393f5795d Mon Sep 17 00:00:00 2001 From: Jaewoo Cho Date: Sun, 19 Jul 2015 18:54:30 -0700 Subject: [PATCH 051/353] Update README.md Update libraries --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 7ced79bb..5f48e2dd 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,8 @@ For Ubuntu 14.04 LTS users, see this link first: and then proceed with: + sudo apt-get update + sudo apt-get install autoconf autotools-dev build-essential cmake g++ git libboost-all-dev libboost-dev libbz2-dev libdb++-dev libdb-dev libicu-dev libreadline-dev libssl-dev libtool openssl python-dev uuid-dev git clone https://github.com/cryptonomex/graphene.git cd graphene git submodule update --init --recursive From 2530ffb06c0bf1d45aa1fc03f71c8e2c2f51461b Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Mon, 20 Jul 2015 12:21:58 -0400 Subject: [PATCH 052/353] [GUI] Fix build following e4c29cbe787584a3e20ce628052bac0a7abedd82 --- programs/light_client/ClientDataModel.cpp | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/programs/light_client/ClientDataModel.cpp b/programs/light_client/ClientDataModel.cpp index 2997016f..b89e2a98 100644 --- a/programs/light_client/ClientDataModel.cpp +++ b/programs/light_client/ClientDataModel.cpp @@ -89,18 +89,17 @@ void ChainDataModel::getAccountImpl(QString accountIdentifier, Account* const * auto result = m_db_api->get_full_accounts([](const fc::variant& v) { idump((v)); }, {accountIdentifier.toStdString()}); - fc::variant_object accountPackage; + fc::optional accountPackage; if (result.count(accountIdentifier.toStdString())) { - accountPackage = result.begin()->second.as(); + accountPackage = result.at(accountIdentifier.toStdString()); // Fetch all necessary assets - auto balances = accountPackage["balances"].as>(); QList assetsToFetch; QList assetPlaceholders; - assetsToFetch.reserve(balances.size()); + assetsToFetch.reserve(accountPackage->balances.size()); // Get list of asset IDs the account has a balance in - std::transform(balances.begin(), balances.end(), std::back_inserter(assetsToFetch), + std::transform(accountPackage->balances.begin(), accountPackage->balances.end(), std::back_inserter(assetsToFetch), [](const account_balance_object& b) { return b.asset_type; }); auto function = [this,&assetsToFetch,&assetPlaceholders] { auto itr = assetsToFetch.begin(); @@ -129,19 +128,17 @@ void ChainDataModel::getAccountImpl(QString accountIdentifier, Account* const * ilog("Processing result ${r}", ("r", accountPackage)); auto itr = m_accounts.iterator_to(*accountInContainer); - if (!accountPackage.size()) { + if (!accountPackage.valid()) { (*itr)->deleteLater(); m_accounts.erase(itr); } else { m_accounts.modify(itr, [=](Account* a){ - account_object account = accountPackage["account"].as(); - a->setProperty("id", ObjectId(account.id.instance())); - a->setProperty("name", QString::fromStdString(account.name)); + a->setProperty("id", ObjectId(accountPackage->account.id.instance())); + a->setProperty("name", QString::fromStdString(accountPackage->account.name)); // Set balances QList balances; - auto balanceObjects = accountPackage["balances"].as>(); - std::transform(balanceObjects.begin(), balanceObjects.end(), std::back_inserter(balances), + std::transform(accountPackage->balances.begin(), accountPackage->balances.end(), std::back_inserter(balances), [this](const account_balance_object& b) { Balance* bal = new Balance; bal->setParent(this); From d0b8c66aad8aca12f98f2796f42bc72c529a39e5 Mon Sep 17 00:00:00 2001 From: Vikram Rajkumar Date: Mon, 20 Jul 2015 14:57:08 -0400 Subject: [PATCH 053/353] Fix Linux Clang build with missing includes; resolve #174 --- libraries/app/api.cpp | 1 + libraries/chain/block_database.cpp | 1 + libraries/chain/committee_member_evaluator.cpp | 2 ++ libraries/chain/fork_database.cpp | 3 ++- libraries/chain/proposal_evaluator.cpp | 2 ++ libraries/chain/protocol/proposal.cpp | 1 + libraries/chain/protocol/transaction.cpp | 2 +- libraries/net/node.cpp | 1 + libraries/plugins/account_history/account_history_plugin.cpp | 1 + libraries/plugins/market_history/market_history_plugin.cpp | 1 + libraries/plugins/witness/witness.cpp | 1 + programs/cli_wallet/main.cpp | 3 +-- programs/js_operation_serializer/main.cpp | 1 + programs/size_checker/main.cpp | 1 + tests/app/main.cpp | 1 + tests/benchmarks/genesis_allocation.cpp | 1 + tests/common/database_fixture.hpp | 1 + 17 files changed, 20 insertions(+), 4 deletions(-) diff --git a/libraries/app/api.cpp b/libraries/app/api.cpp index f6131a5c..46d763e0 100644 --- a/libraries/app/api.cpp +++ b/libraries/app/api.cpp @@ -23,6 +23,7 @@ #include #include +#include namespace graphene { namespace app { diff --git a/libraries/chain/block_database.cpp b/libraries/chain/block_database.cpp index 2851ad64..95c37790 100644 --- a/libraries/chain/block_database.cpp +++ b/libraries/chain/block_database.cpp @@ -18,6 +18,7 @@ #include #include #include +#include namespace graphene { namespace chain { diff --git a/libraries/chain/committee_member_evaluator.cpp b/libraries/chain/committee_member_evaluator.cpp index 345b9b77..fec610b7 100644 --- a/libraries/chain/committee_member_evaluator.cpp +++ b/libraries/chain/committee_member_evaluator.cpp @@ -22,6 +22,8 @@ #include #include +#include + namespace graphene { namespace chain { void_result committee_member_create_evaluator::do_evaluate( const committee_member_create_operation& op ) diff --git a/libraries/chain/fork_database.cpp b/libraries/chain/fork_database.cpp index 11c91c5c..4be19289 100644 --- a/libraries/chain/fork_database.cpp +++ b/libraries/chain/fork_database.cpp @@ -16,7 +16,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include - +#include +#include namespace graphene { namespace chain { fork_database::fork_database() diff --git a/libraries/chain/proposal_evaluator.cpp b/libraries/chain/proposal_evaluator.cpp index 4e9341f2..0fe7e81b 100644 --- a/libraries/chain/proposal_evaluator.cpp +++ b/libraries/chain/proposal_evaluator.cpp @@ -21,6 +21,8 @@ #include #include +#include + namespace graphene { namespace chain { void_result proposal_create_evaluator::do_evaluate(const proposal_create_operation& o) diff --git a/libraries/chain/protocol/proposal.cpp b/libraries/chain/protocol/proposal.cpp index 118a23fc..148dfea9 100644 --- a/libraries/chain/protocol/proposal.cpp +++ b/libraries/chain/protocol/proposal.cpp @@ -1,6 +1,7 @@ /* Copyright (C) Cryptonomex, Inc - All Rights Reserved **/ #include #include +#include namespace graphene { namespace chain { diff --git a/libraries/chain/protocol/transaction.cpp b/libraries/chain/protocol/transaction.cpp index d3e662db..39d43c5e 100644 --- a/libraries/chain/protocol/transaction.cpp +++ b/libraries/chain/protocol/transaction.cpp @@ -17,9 +17,9 @@ */ #include #include -#include #include #include +#include #include namespace graphene { namespace chain { diff --git a/libraries/net/node.cpp b/libraries/net/node.cpp index 4c568d76..93bb5759 100644 --- a/libraries/net/node.cpp +++ b/libraries/net/node.cpp @@ -62,6 +62,7 @@ #include #include #include +#include #include #include diff --git a/libraries/plugins/account_history/account_history_plugin.cpp b/libraries/plugins/account_history/account_history_plugin.cpp index cf9d12f5..3e5146d6 100644 --- a/libraries/plugins/account_history/account_history_plugin.cpp +++ b/libraries/plugins/account_history/account_history_plugin.cpp @@ -26,6 +26,7 @@ #include #include +#include #include namespace graphene { namespace account_history { diff --git a/libraries/plugins/market_history/market_history_plugin.cpp b/libraries/plugins/market_history/market_history_plugin.cpp index 4a76b89b..260d4c7e 100644 --- a/libraries/plugins/market_history/market_history_plugin.cpp +++ b/libraries/plugins/market_history/market_history_plugin.cpp @@ -28,6 +28,7 @@ #include #include +#include namespace graphene { namespace market_history { diff --git a/libraries/plugins/witness/witness.cpp b/libraries/plugins/witness/witness.cpp index 624ad59d..6380fba7 100644 --- a/libraries/plugins/witness/witness.cpp +++ b/libraries/plugins/witness/witness.cpp @@ -23,6 +23,7 @@ #include +#include #include using namespace graphene::witness_plugin; diff --git a/programs/cli_wallet/main.cpp b/programs/cli_wallet/main.cpp index f0cf6da2..22685068 100644 --- a/programs/cli_wallet/main.cpp +++ b/programs/cli_wallet/main.cpp @@ -28,14 +28,13 @@ #include #include #include +#include #include #include #include #include -#include - #include #include diff --git a/programs/js_operation_serializer/main.cpp b/programs/js_operation_serializer/main.cpp index 6022b9fe..8f01f70c 100644 --- a/programs/js_operation_serializer/main.cpp +++ b/programs/js_operation_serializer/main.cpp @@ -24,6 +24,7 @@ #include #include #include +#include #include using namespace graphene::chain; diff --git a/programs/size_checker/main.cpp b/programs/size_checker/main.cpp index 47c907e3..5950f6aa 100644 --- a/programs/size_checker/main.cpp +++ b/programs/size_checker/main.cpp @@ -17,6 +17,7 @@ */ #include +#include #include #include diff --git a/tests/app/main.cpp b/tests/app/main.cpp index bad909fc..1de4dc3e 100644 --- a/tests/app/main.cpp +++ b/tests/app/main.cpp @@ -27,6 +27,7 @@ #include #include +#include #include diff --git a/tests/benchmarks/genesis_allocation.cpp b/tests/benchmarks/genesis_allocation.cpp index 033a4350..eb93700a 100644 --- a/tests/benchmarks/genesis_allocation.cpp +++ b/tests/benchmarks/genesis_allocation.cpp @@ -22,6 +22,7 @@ #include #include +#include #include diff --git a/tests/common/database_fixture.hpp b/tests/common/database_fixture.hpp index e0a643f9..14671b87 100644 --- a/tests/common/database_fixture.hpp +++ b/tests/common/database_fixture.hpp @@ -20,6 +20,7 @@ #include #include #include +#include #include From 6bdc0f69b64b1ffa017dee87c47dc906d3108a47 Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Mon, 20 Jul 2015 17:50:58 -0400 Subject: [PATCH 054/353] [GUI] Add support for balance update notifications TODO: Figure out why maximum value in transfer form doesn't update --- programs/light_client/ClientDataModel.cpp | 77 ++++++++++++++++++++++- programs/light_client/ClientDataModel.hpp | 16 ++++- 2 files changed, 88 insertions(+), 5 deletions(-) diff --git a/programs/light_client/ClientDataModel.cpp b/programs/light_client/ClientDataModel.cpp index b89e2a98..4db9a153 100644 --- a/programs/light_client/ClientDataModel.cpp +++ b/programs/light_client/ClientDataModel.cpp @@ -52,6 +52,50 @@ Asset* ChainDataModel::getAsset(QString symbol) return *itr; } +void ChainDataModel::processUpdatedObject(const fc::variant& update) +{ + if (update.is_null()) + return; + if (&fc::thread::current() == m_rpc_thread) + { + ilog("Proxying object update to app thread."); + Q_EMIT queueExecute([this,update]{processUpdatedObject(update);}); + return; + } + + idump((update)); + try { + auto id = update.as()["id"].as(); + if (id.space() == protocol_ids) { + switch (id.type()) { + default: + wlog("Update procedure for ${update} is not yet implemented.", ("update", update)); + break; + } + } else if (id.space() == implementation_ids) { + switch (id.type()) { + case impl_account_balance_object_type: { + account_balance_object balance = update.as(); + auto owner = m_accounts.find(balance.owner.instance.value); + if (owner != m_accounts.end()) + (*owner)->update(balance); + else + elog("Got unexpected balance update:\n${u}\nfor an account I don't have.", + ("u", update)); + break; + } + + default: + wlog("Update procedure for ${update} is not yet implemented.", ("update", update)); + break; + } + } else + wlog("Update procedure for ${update} is not yet implemented.", ("update", update)); + } catch (const fc::exception& e) { + elog("Caught exception while updating object: ${e}", ("e", e.to_detail_string())); + } +} + void ChainDataModel::getAssetImpl(QString assetIdentifier, Asset* const * assetInContainer) { try { @@ -86,8 +130,8 @@ void ChainDataModel::getAccountImpl(QString accountIdentifier, Account* const * { try { ilog("Fetching account ${acct}", ("acct", accountIdentifier.toStdString())); - auto result = m_db_api->get_full_accounts([](const fc::variant& v) { - idump((v)); + auto result = m_db_api->get_full_accounts([this](const fc::variant& v) { + processUpdatedObject(v); }, {accountIdentifier.toStdString()}); fc::optional accountPackage; @@ -203,6 +247,27 @@ QQmlListProperty Account::balances() return QQmlListProperty(this, this, count, at); } +void Account::update(const account_balance_object& balance) +{ + auto balanceItr = std::find_if(m_balances.begin(), m_balances.end(), + [&balance](Balance* b) { return b->type()->id() == balance.asset_type.instance.value; }); + + if (balanceItr != m_balances.end()) { + ilog("Updating ${a}'s balance: ${b}", ("a", m_name.toStdString())("b", balance)); + (*balanceItr)->update(balance); + Q_EMIT balancesChanged(); + } else { + ilog("Adding to ${a}'s new balance: ${b}", ("a", m_name.toStdString())("b", balance)); + Balance* newBalance = new Balance; + newBalance->setParent(this); + auto model = qobject_cast(parent()); + newBalance->setProperty("type", QVariant::fromValue(model->getAsset(balance.asset_type.instance.value))); + newBalance->setProperty("amount", QVariant::fromValue(balance.balance.value)); + m_balances.append(newBalance); + Q_EMIT balancesChanged(); + } +} + GrapheneApplication::GrapheneApplication(QObject* parent) :QObject(parent),m_thread("app") { @@ -268,3 +333,11 @@ Q_SLOT void GrapheneApplication::execute(const std::function& func)const { func(); } + +void Balance::update(const account_balance_object& update) +{ + if (update.balance != amount) { + amount = update.balance.value; + emit amountChanged(); + } +} diff --git a/programs/light_client/ClientDataModel.hpp b/programs/light_client/ClientDataModel.hpp index 5f6c99da..7c1db5e0 100644 --- a/programs/light_client/ClientDataModel.hpp +++ b/programs/light_client/ClientDataModel.hpp @@ -97,18 +97,24 @@ typedef multi_index_container< class Balance : public GrapheneObject { Q_OBJECT - Q_PROPERTY(Asset* type MEMBER type NOTIFY typeChanged) + Q_PROPERTY(Asset* type MEMBER m_type READ type NOTIFY typeChanged) Q_PROPERTY(qint64 amount MEMBER amount NOTIFY amountChanged) - Asset* type; + Asset* m_type; qint64 amount; public: // This ultimately needs to be replaced with a string equivalent Q_INVOKABLE qreal amountReal() const { - return amount / qreal(type->precisionPower()); + return amount / qreal(m_type->precisionPower()); } + Asset* type()const { + return m_type; + } + + void update(const graphene::app::account_balance_object& update); + Q_SIGNALS: void typeChanged(); void amountChanged(); @@ -138,6 +144,8 @@ public: } } + void update(const graphene::app::account_balance_object& balance); + Q_SIGNALS: void nameChanged(); void balancesChanged(); @@ -155,6 +163,8 @@ typedef multi_index_container< class ChainDataModel : public QObject { Q_OBJECT + void processUpdatedObject(const fc::variant& update); + void getAssetImpl(QString assetIdentifier, Asset* const * assetInContainer); void getAccountImpl(QString accountIdentifier, Account* const * accountInContainer); From c77cb49cc25dae269064272bd9e1141804f684e7 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Mon, 20 Jul 2015 18:27:09 -0400 Subject: [PATCH 055/353] adding new API calls that can be used to check required signatures on transactions --- libraries/app/api.cpp | 15 +++++++++++++++ libraries/app/include/graphene/app/api.hpp | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/libraries/app/api.cpp b/libraries/app/api.cpp index 46d763e0..fc8baa19 100644 --- a/libraries/app/api.cpp +++ b/libraries/app/api.cpp @@ -812,5 +812,20 @@ namespace graphene { namespace app { return result; } FC_CAPTURE_AND_RETHROW( (addrs) ) } + set database_api::get_required_signatures( const signed_transaction& trx, const flat_set& available_keys )const + { + return trx.get_required_signatures( available_keys, + [&]( account_id_type id ){ return &id(_db).active; }, + [&]( account_id_type id ){ return &id(_db).owner; }, + _db.get_global_properties().parameters.max_authority_depth ); + } + + bool database_api::verify_authority( const signed_transaction& trx )const + { + trx.verify_authority( [&]( account_id_type id ){ return &id(_db).active; }, + [&]( account_id_type id ){ return &id(_db).owner; }, + _db.get_global_properties().parameters.max_authority_depth ); + return true; + } } } // graphene::app diff --git a/libraries/app/include/graphene/app/api.hpp b/libraries/app/include/graphene/app/api.hpp index b0fb8b75..99d707c9 100644 --- a/libraries/app/include/graphene/app/api.hpp +++ b/libraries/app/include/graphene/app/api.hpp @@ -302,6 +302,19 @@ namespace graphene { namespace app { /** @return all unclaimed balance objects for a set of addresses */ vector get_balance_objects( const vector
& addrs )const; + + /** + * This API will take a partially signed transaction and a set of public keys that the owner has the ability to sign for + * and return the minimal subset of public keys that should add signatures to the transaction. + */ + set get_required_signatures( const signed_transaction& trx, const flat_set& available_keys )const; + + /** + * @return true of the @ref trx has all of the required signatures, otherwise throws an exception + */ + bool verify_authority( const signed_transaction& trx )const; + + private: /** called every time a block is applied to report the objects that were changed */ void on_objects_changed(const vector& ids); @@ -506,6 +519,8 @@ FC_API(graphene::app::database_api, (get_key_references) (get_margin_positions) (get_balance_objects) + (get_required_signatures) + (verify_authority) ) FC_API(graphene::app::history_api, (get_account_history) From a55b348e6c6455f9482bb5cfcd6f649d5c297d63 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Tue, 21 Jul 2015 08:34:38 -0400 Subject: [PATCH 056/353] #170 Make sure TEMP ACCOUNT cannot be updated --- libraries/chain/protocol/account.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/chain/protocol/account.cpp b/libraries/chain/protocol/account.cpp index d9572707..b1bec699 100644 --- a/libraries/chain/protocol/account.cpp +++ b/libraries/chain/protocol/account.cpp @@ -157,6 +157,7 @@ share_type account_update_operation::calculate_fee( const fee_parameters_type& k void account_update_operation::validate()const { + FC_ASSERT( account != GRAPHENE_TEMP_ACCOUNT ); FC_ASSERT( fee.amount >= 0 ); FC_ASSERT( account != account_id_type() ); FC_ASSERT( owner || active || new_options ); From b3d299d2413f628bdab4aa55d14bc76a71a837a8 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Tue, 21 Jul 2015 09:23:14 -0400 Subject: [PATCH 057/353] #170 Make sure accounts cannot be updated with impossible auhtority settings --- libraries/chain/account_evaluator.cpp | 1 + .../include/graphene/chain/protocol/authority.hpp | 10 +++++++++- libraries/chain/protocol/account.cpp | 4 ++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/libraries/chain/account_evaluator.cpp b/libraries/chain/account_evaluator.cpp index 7a6ac1fd..c7e38452 100644 --- a/libraries/chain/account_evaluator.cpp +++ b/libraries/chain/account_evaluator.cpp @@ -31,6 +31,7 @@ void_result account_create_evaluator::do_evaluate( const account_create_operatio const auto& global_props = d.get_global_properties(); const auto& chain_params = global_props.parameters; + verify_authority_accounts( op.owner ); verify_authority_accounts( op.active ); diff --git a/libraries/chain/include/graphene/chain/protocol/authority.hpp b/libraries/chain/include/graphene/chain/protocol/authority.hpp index 843a4638..f00009a6 100644 --- a/libraries/chain/include/graphene/chain/protocol/authority.hpp +++ b/libraries/chain/include/graphene/chain/protocol/authority.hpp @@ -54,6 +54,14 @@ namespace graphene { namespace chain { { account_auths[k] = w; } + bool is_impossible()const + { + uint64_t auth_weights = 0; + for( const auto& item : account_auths ) auth_weights += item.second; + for( const auto& item : key_auths ) auth_weights += item.second; + for( const auto& item : address_auths ) auth_weights += item.second; + return auth_weights < weight_threshold; + } template void add_authorities(AuthType k, weight_type w) @@ -75,7 +83,7 @@ namespace graphene { namespace chain { result.push_back(k.first); return result; } - uint32_t num_auths()const { return account_auths.size() + key_auths.size(); } + uint32_t num_auths()const { return account_auths.size() + key_auths.size() + address_auths.size(); } void clear() { account_auths.clear(); key_auths.clear(); } uint32_t weight_threshold = 0; diff --git a/libraries/chain/protocol/account.cpp b/libraries/chain/protocol/account.cpp index b1bec699..1a4726ae 100644 --- a/libraries/chain/protocol/account.cpp +++ b/libraries/chain/protocol/account.cpp @@ -141,6 +141,8 @@ void account_create_operation::validate()const FC_ASSERT( owner.address_auths.size() == 0 ); FC_ASSERT( active.num_auths() != 0 ); FC_ASSERT( active.address_auths.size() == 0 ); + FC_ASSERT( !owner.is_impossible(), "cannot create an account with an imposible owner authority threshold" ); + FC_ASSERT( !active.is_impossible(), "cannot create an account with an imposible active authority threshold" ); options.validate(); } @@ -165,11 +167,13 @@ void account_update_operation::validate()const { FC_ASSERT( owner->num_auths() != 0 ); FC_ASSERT( owner->address_auths.size() == 0 ); + FC_ASSERT( !owner->is_impossible(), "cannot update an account with an imposible owner authority threshold" ); } if( active ) { FC_ASSERT( active->num_auths() != 0 ); FC_ASSERT( active->address_auths.size() == 0 ); + FC_ASSERT( !active->is_impossible(), "cannot update an account with an imposible active authority threshold" ); } if( new_options ) From ef0c24933d2ac6754368445057c6754f1ab555a3 Mon Sep 17 00:00:00 2001 From: Vikram Rajkumar Date: Tue, 21 Jul 2015 12:13:35 -0400 Subject: [PATCH 058/353] Revert "Update README.md" --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 5f48e2dd..7ced79bb 100644 --- a/README.md +++ b/README.md @@ -11,8 +11,6 @@ For Ubuntu 14.04 LTS users, see this link first: and then proceed with: - sudo apt-get update - sudo apt-get install autoconf autotools-dev build-essential cmake g++ git libboost-all-dev libboost-dev libbz2-dev libdb++-dev libdb-dev libicu-dev libreadline-dev libssl-dev libtool openssl python-dev uuid-dev git clone https://github.com/cryptonomex/graphene.git cd graphene git submodule update --init --recursive From 2389d2f352bc2fae2b12530583c7a9d48b5d634a Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Tue, 21 Jul 2015 14:26:47 -0400 Subject: [PATCH 059/353] [GUI] Fix build --- programs/light_client/ClientDataModel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/light_client/ClientDataModel.cpp b/programs/light_client/ClientDataModel.cpp index 4db9a153..309fcade 100644 --- a/programs/light_client/ClientDataModel.cpp +++ b/programs/light_client/ClientDataModel.cpp @@ -176,7 +176,7 @@ void ChainDataModel::getAccountImpl(QString accountIdentifier, Account* const * (*itr)->deleteLater(); m_accounts.erase(itr); } else { - m_accounts.modify(itr, [=](Account* a){ + m_accounts.modify(itr, [this,&accountPackage](Account* a){ a->setProperty("id", ObjectId(accountPackage->account.id.instance())); a->setProperty("name", QString::fromStdString(accountPackage->account.name)); From dffc83cca9e710e509c307237a3767b966da2505 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Tue, 21 Jul 2015 15:19:52 -0400 Subject: [PATCH 060/353] Refactor full account subscriptions When subscribing to an account via the get_full_account API it will start streaming any object relevant to the account that is added, removed, or modified. --- libraries/app/api.cpp | 227 ++++++++++++++++-- libraries/app/include/graphene/app/api.hpp | 4 + libraries/chain/db_block.cpp | 8 + .../include/graphene/chain/account_object.hpp | 3 + .../chain/include/graphene/chain/database.hpp | 5 + .../graphene/chain/protocol/transaction.hpp | 1 + .../include/graphene/chain/protocol/types.hpp | 7 - libraries/chain/protocol/operations.cpp | 17 ++ libraries/chain/protocol/transaction.cpp | 6 + .../account_history_plugin.cpp | 6 - 10 files changed, 251 insertions(+), 33 deletions(-) diff --git a/libraries/app/api.cpp b/libraries/app/api.cpp index fc8baa19..f16c91d4 100644 --- a/libraries/app/api.cpp +++ b/libraries/app/api.cpp @@ -21,6 +21,9 @@ #include #include #include +#include +#include +#include #include #include @@ -32,6 +35,9 @@ namespace graphene { namespace app { _change_connection = _db.changed_objects.connect([this](const vector& ids) { on_objects_changed(ids); }); + _removed_connection = _db.removed_objects.connect([this](const vector& objs) { + on_objects_removed(objs); + }); _applied_block_connection = _db.applied_block.connect([this](const signed_block&){ on_applied_block(); }); } @@ -158,8 +164,8 @@ namespace graphene { namespace app { std::map database_api::get_full_accounts(std::function callback, const vector& names_or_ids) { + FC_ASSERT( _account_subscriptions.size() < 1024 ); std::map results; - std::set ids_to_subscribe; for (const std::string& account_name_or_id : names_or_ids) { @@ -176,7 +182,7 @@ namespace graphene { namespace app { if (account == nullptr) continue; - ids_to_subscribe.insert({account->id, account->statistics}); + _account_subscriptions[account->id] = callback; // fc::mutable_variant_object full_account; full_account acnt; @@ -194,7 +200,6 @@ namespace graphene { namespace app { */ if (account->cashback_vb) { - ids_to_subscribe.insert(*account->cashback_vb); acnt.cashback_balance = account->cashback_balance(_db); } @@ -202,36 +207,31 @@ namespace graphene { namespace app { auto balance_range = _db.get_index_type().indices().get().equal_range(account->id); //vector balances; std::for_each(balance_range.first, balance_range.second, - [&acnt, &ids_to_subscribe](const account_balance_object& balance) { + [&acnt](const account_balance_object& balance) { acnt.balances.emplace_back(balance); - ids_to_subscribe.insert(balance.id); }); // Add the account's vesting balances auto vesting_range = _db.get_index_type().indices().get().equal_range(account->id); std::for_each(vesting_range.first, vesting_range.second, - [&acnt, &ids_to_subscribe](const vesting_balance_object& balance) { + [&acnt](const vesting_balance_object& balance) { acnt.vesting_balances.emplace_back(balance); - ids_to_subscribe.insert(balance.id); }); // Add the account's orders auto order_range = _db.get_index_type().indices().get().equal_range(account->id); std::for_each(order_range.first, order_range.second, - [&acnt, &ids_to_subscribe] (const limit_order_object& order) { + [&acnt] (const limit_order_object& order) { acnt.limit_orders.emplace_back(order); - ids_to_subscribe.insert(order.id); }); auto call_range = _db.get_index_type().indices().get().equal_range(account->id); std::for_each(call_range.first, call_range.second, - [&acnt, &ids_to_subscribe] (const call_order_object& call) { + [&acnt] (const call_order_object& call) { acnt.call_orders.emplace_back(call); - ids_to_subscribe.insert(call.id); }); results[account_name_or_id] = acnt; } wdump((results)); - subscribe_to_objects(callback, vector(ids_to_subscribe.begin(), ids_to_subscribe.end())); return results; } @@ -554,24 +554,205 @@ namespace graphene { namespace app { return *_history_api; } + vector get_relevant_accounts( const object* obj ) + { + vector result; + if( obj->id.space() == protocol_ids ) + { + switch( (object_type)obj->id.type() ) + { + case null_object_type: + case base_object_type: + case OBJECT_TYPE_COUNT: + return result; + case account_object_type:{ + result.push_back( obj->id ); + break; + } case asset_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + result.push_back( aobj->issuer ); + break; + } case force_settlement_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + result.push_back( aobj->owner ); + break; + } case committee_member_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + result.push_back( aobj->committee_member_account ); + break; + } case witness_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + result.push_back( aobj->witness_account ); + break; + } case limit_order_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + result.push_back( aobj->seller ); + break; + } case call_order_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + result.push_back( aobj->borrower ); + break; + } case custom_object_type:{ + } case proposal_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + flat_set impacted; + aobj->proposed_transaction.get_impacted_accounts( impacted ); + result.reserve( impacted.size() ); + for( auto& item : impacted ) result.emplace_back(item); + break; + } case operation_history_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + flat_set impacted; + operation_get_impacted_accounts( aobj->op, impacted ); + result.reserve( impacted.size() ); + for( auto& item : impacted ) result.emplace_back(item); + break; + } case withdraw_permission_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + result.push_back( aobj->withdraw_from_account ); + result.push_back( aobj->authorized_account ); + break; + } case vesting_balance_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + result.push_back( aobj->owner ); + break; + } case worker_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + result.push_back( aobj->worker_account ); + break; + } case balance_object_type:{ + /** these are free from any accounts */ + } + } + } + else if( obj->id.space() == implementation_ids ) + { + switch( (impl_object_type)obj->id.type() ) + { + case impl_global_property_object_type:{ + } case impl_dynamic_global_property_object_type:{ + } case impl_index_meta_object_type:{ + } case impl_asset_dynamic_data_type:{ + } case impl_asset_bitasset_data_type:{ + break; + } case impl_account_balance_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + result.push_back( aobj->owner ); + break; + } case impl_account_statistics_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + result.push_back( aobj->owner ); + break; + } case impl_transaction_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + flat_set impacted; + aobj->trx.get_impacted_accounts( impacted ); + result.reserve( impacted.size() ); + for( auto& item : impacted ) result.emplace_back(item); + break; + } case impl_block_summary_object_type:{ + } case impl_account_transaction_history_object_type:{ + } case impl_witness_schedule_object_type: { + } + } + } + return result; + } // end get_relevant_accounts( obj ) + + + void database_api::on_objects_removed( const vector& objs ) + { + if( _account_subscriptions.size() ) + { + map > broadcast_queue; + for( const auto& obj : objs ) + { + auto relevant = get_relevant_accounts( obj ); + for( const auto& r : relevant ) + { + auto sub = _account_subscriptions.find(r); + if( sub != _account_subscriptions.end() ) + broadcast_queue[r].emplace_back(obj->to_variant()); + } + } + + _broadcast_removed_complete = fc::async([=](){ + for( const auto& item : broadcast_queue ) + { + auto sub = _account_subscriptions.find(item.first); + if( sub != _account_subscriptions.end() ) + sub->second( fc::variant(item.second ) ); + } + }); + } + } + void database_api::on_objects_changed(const vector& ids) { - vector my_objects; + vector my_objects; + map > broadcast_queue; for(auto id : ids) + { if(_subscriptions.find(id) != _subscriptions.end()) my_objects.push_back(id); + if( _account_subscriptions.size() ) + { + const object* obj = _db.find_object( id ); + if( obj ) + { + vector relevant = get_relevant_accounts( obj ); + for( const auto& r : relevant ) + { + auto sub = _account_subscriptions.find(r); + if( sub != _account_subscriptions.end() ) + broadcast_queue[r].emplace_back(obj->to_variant()); + } + } + } + } + + + /// TODO: consider making _broadcast_changes_complete a deque and + /// pushing the future back / popping the prior future if it is complete. + /// if a connection hangs then this could get backed up and result in + /// a failure to exit cleanly. _broadcast_changes_complete = fc::async([=](){ + for( const auto& item : broadcast_queue ) + { + auto sub = _account_subscriptions.find(item.first); + if( sub != _account_subscriptions.end() ) + sub->second( fc::variant(item.second ) ); + } for(auto id : my_objects) { - const object* obj = _db.find_object(id); - if(obj) + // just incase _usbscriptions changed between filter and broadcast + auto itr = _subscriptions.find( id ); + if( itr != _subscriptions.end() ) { - _subscriptions[id](obj->to_variant()); - } - else - { - _subscriptions[id](fc::variant(id)); + const object* obj = _db.find_object( id ); + if( obj != nullptr ) + { + itr->second(obj->to_variant()); + } + else + { + itr->second(fc::variant(id)); + } } } }); @@ -624,6 +805,11 @@ namespace graphene { namespace app { _broadcast_changes_complete.cancel(); _broadcast_changes_complete.wait(); } + if(_broadcast_removed_complete.valid()) + { + _broadcast_removed_complete.cancel(); + _broadcast_removed_complete.wait(); + } } catch (const fc::exception& e) { wlog("${e}", ("e",e.to_detail_string())); @@ -632,6 +818,7 @@ namespace graphene { namespace app { bool database_api::subscribe_to_objects( const std::function& callback, const vector& ids) { + FC_ASSERT( _subscriptions.size() < 1024 ); for(auto id : ids) _subscriptions[id] = callback; return true; } diff --git a/libraries/app/include/graphene/app/api.hpp b/libraries/app/include/graphene/app/api.hpp index 99d707c9..42be161c 100644 --- a/libraries/app/include/graphene/app/api.hpp +++ b/libraries/app/include/graphene/app/api.hpp @@ -318,12 +318,16 @@ namespace graphene { namespace app { private: /** called every time a block is applied to report the objects that were changed */ void on_objects_changed(const vector& ids); + void on_objects_removed(const vector& objs); void on_applied_block(); fc::future _broadcast_changes_complete; + fc::future _broadcast_removed_complete; boost::signals2::scoped_connection _change_connection; + boost::signals2::scoped_connection _removed_connection; boost::signals2::scoped_connection _applied_block_connection; map > _subscriptions; + map > _account_subscriptions; map< pair, std::function > _market_subscriptions; graphene::chain::database& _db; }; diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index dc27e290..2afb64e3 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -443,6 +443,14 @@ void database::notify_changed_objects() const auto& head_undo = _undo_db.head(); vector changed_ids; changed_ids.reserve(head_undo.old_values.size()); for( const auto& item : head_undo.old_values ) changed_ids.push_back(item.first); + for( const auto& item : head_undo.new_ids ) changed_ids.push_back(item); + vector removed; + removed.reserve( head_undo.removed.size() ); + for( const auto& item : head_undo.removed ) + { + changed_ids.push_back( item.first ); + removed.emplace_back( item.second.get() ); + } changed_objects(changed_ids); } diff --git a/libraries/chain/include/graphene/chain/account_object.hpp b/libraries/chain/include/graphene/chain/account_object.hpp index f8f1d08e..cb4f61c7 100644 --- a/libraries/chain/include/graphene/chain/account_object.hpp +++ b/libraries/chain/include/graphene/chain/account_object.hpp @@ -38,6 +38,8 @@ namespace graphene { namespace chain { static const uint8_t space_id = implementation_ids; static const uint8_t type_id = impl_account_statistics_object_type; + account_id_type owner; + /** * Keep the most recent operation as a root pointer to a linked list of the transaction history. This field is * not required by core validation and could in theory be made an annotation on the account object, but @@ -335,6 +337,7 @@ FC_REFLECT_DERIVED( graphene::chain::meta_account_object, (memo_key)(committee_member_id) ) FC_REFLECT_DERIVED( graphene::chain::account_statistics_object, (graphene::chain::object), + (owner) (most_recent_op) (total_core_in_orders) (lifetime_fees_paid) diff --git a/libraries/chain/include/graphene/chain/database.hpp b/libraries/chain/include/graphene/chain/database.hpp index f89346a4..cb68f9f0 100644 --- a/libraries/chain/include/graphene/chain/database.hpp +++ b/libraries/chain/include/graphene/chain/database.hpp @@ -198,6 +198,11 @@ namespace graphene { namespace chain { */ fc::signal&)> changed_objects; + /** this signal is emitted any time an object is removed and contains a + * pointer to the last value of every object that was removed. + */ + fc::signal&)> removed_objects; + //////////////////// db_witness_schedule.cpp //////////////////// /** diff --git a/libraries/chain/include/graphene/chain/protocol/transaction.hpp b/libraries/chain/include/graphene/chain/protocol/transaction.hpp index 4ada2b34..b3896218 100644 --- a/libraries/chain/include/graphene/chain/protocol/transaction.hpp +++ b/libraries/chain/include/graphene/chain/protocol/transaction.hpp @@ -100,6 +100,7 @@ namespace graphene { namespace chain { } void get_required_authorities( flat_set& active, flat_set& owner, vector& other )const; + void get_impacted_accounts( flat_set& )const; }; /** diff --git a/libraries/chain/include/graphene/chain/protocol/types.hpp b/libraries/chain/include/graphene/chain/protocol/types.hpp index 64d49325..f78b93cf 100644 --- a/libraries/chain/include/graphene/chain/protocol/types.hpp +++ b/libraries/chain/include/graphene/chain/protocol/types.hpp @@ -133,10 +133,8 @@ namespace graphene { namespace chain { impl_index_meta_object_type, impl_asset_dynamic_data_type, impl_asset_bitasset_data_type, - impl_committee_member_feeds_object_type, impl_account_balance_object_type, impl_account_statistics_object_type, - impl_account_debt_object_type, impl_transaction_object_type, impl_block_summary_object_type, impl_account_transaction_history_object_type, @@ -193,7 +191,6 @@ namespace graphene { namespace chain { class asset_bitasset_data_object; class account_balance_object; class account_statistics_object; - class account_debt_object; class transaction_object; class block_summary_object; class account_transaction_history_object; @@ -204,7 +201,6 @@ namespace graphene { namespace chain { typedef object_id< implementation_ids, impl_asset_bitasset_data_type, asset_bitasset_data_object> asset_bitasset_data_id_type; typedef object_id< implementation_ids, impl_account_balance_object_type, account_balance_object> account_balance_id_type; typedef object_id< implementation_ids, impl_account_statistics_object_type,account_statistics_object> account_statistics_id_type; - typedef object_id< implementation_ids, impl_account_debt_object_type, account_debt_object> account_debt_id_type; typedef object_id< implementation_ids, impl_transaction_object_type, transaction_object> transaction_obj_id_type; typedef object_id< implementation_ids, impl_block_summary_object_type, block_summary_object> block_summary_id_type; @@ -384,10 +380,8 @@ FC_REFLECT_ENUM( graphene::chain::impl_object_type, (impl_index_meta_object_type) (impl_asset_dynamic_data_type) (impl_asset_bitasset_data_type) - (impl_committee_member_feeds_object_type) (impl_account_balance_object_type) (impl_account_statistics_object_type) - (impl_account_debt_object_type) (impl_transaction_object_type) (impl_block_summary_object_type) (impl_account_transaction_history_object_type) @@ -417,7 +411,6 @@ FC_REFLECT_TYPENAME( graphene::chain::asset_dynamic_data_id_type ) FC_REFLECT_TYPENAME( graphene::chain::asset_bitasset_data_id_type ) FC_REFLECT_TYPENAME( graphene::chain::account_balance_id_type ) FC_REFLECT_TYPENAME( graphene::chain::account_statistics_id_type ) -FC_REFLECT_TYPENAME( graphene::chain::account_debt_id_type ) FC_REFLECT_TYPENAME( graphene::chain::transaction_obj_id_type ) FC_REFLECT_TYPENAME( graphene::chain::block_summary_id_type ) FC_REFLECT_TYPENAME( graphene::chain::account_transaction_history_id_type ) diff --git a/libraries/chain/protocol/operations.cpp b/libraries/chain/protocol/operations.cpp index 7dadf232..9743b686 100644 --- a/libraries/chain/protocol/operations.cpp +++ b/libraries/chain/protocol/operations.cpp @@ -133,6 +133,23 @@ struct required_owner_visitor }; +struct get_impacted_account_visitor +{ + flat_set& _impacted; + get_impacted_account_visitor( flat_set& impact ):_impacted(impact) {} + typedef void result_type; + + template + void operator()( const T& o )const + { + o.get_impacted_accounts( _impacted ); + } +}; +void operation_get_impacted_accounts( const operation& op, flat_set& result ) +{ + op.visit( get_impacted_account_visitor( result ) ); +} + void operation_get_required_authorities( const operation& op, vector& result ) { op.visit( required_auth_visitor( result ) ); diff --git a/libraries/chain/protocol/transaction.cpp b/libraries/chain/protocol/transaction.cpp index 39d43c5e..e8eb8e7f 100644 --- a/libraries/chain/protocol/transaction.cpp +++ b/libraries/chain/protocol/transaction.cpp @@ -275,4 +275,10 @@ void signed_transaction::verify_authority( const std::function& impacted ) const +{ + for( const auto& op : operations ) + operation_get_impacted_accounts( op, impacted ); +} + } } // graphene::chain diff --git a/libraries/plugins/account_history/account_history_plugin.cpp b/libraries/plugins/account_history/account_history_plugin.cpp index 3e5146d6..24d5b0f4 100644 --- a/libraries/plugins/account_history/account_history_plugin.cpp +++ b/libraries/plugins/account_history/account_history_plugin.cpp @@ -68,12 +68,6 @@ struct operation_get_impacted_accounts {} typedef void result_type; - void add_authority( const authority& a )const - { - for( auto& item : a.account_auths ) - _impacted.insert( item.first ); - } - void operator()( const account_create_operation& o )const { _impacted.insert( _op_history.result.get() ); } From 3e41f726a792805ec84edbea20ff391b911a7187 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Tue, 21 Jul 2015 15:51:22 -0400 Subject: [PATCH 061/353] Issue #45 Market Subscription Standardization When subscribing to markets the callback will now receive something that looks like this: [ "REMOVED ID1", "REMOVED ID2", ..., { "id": "UPDATED ID3", data... }, { "id": "UPDATED ID4", data... }, ... [ FILL_OPERATION_TYPE_ID, { fill order operation data } ], [ FILL_OPERATION_TYPE_ID, { fill order operation data } ], [ FILL_OPERATION_TYPE_ID, { fill order operation data } ], [ FILL_OPERATION_TYPE_ID, { fill order operation data } ] ] When ever an order is removed from the order book, its ID will be included as a string. When an order is modified the new order data is included as an object. And the operations describing how orders were matched and what fees are paid will be included as an operation, aka array. Also added means to unsubscribe from full account data (issue #166) --- libraries/app/api.cpp | 96 ++++++++++++++++--- libraries/app/include/graphene/app/api.hpp | 7 +- .../graphene/chain/market_evaluator.hpp | 7 ++ 3 files changed, 98 insertions(+), 12 deletions(-) diff --git a/libraries/app/api.cpp b/libraries/app/api.cpp index f16c91d4..d751c31a 100644 --- a/libraries/app/api.cpp +++ b/libraries/app/api.cpp @@ -160,6 +160,26 @@ namespace graphene { namespace app { return result; } + void database_api::unsubscribe_from_accounts( const vector& names_or_ids ) + { + for (const std::string& account_name_or_id : names_or_ids) + { + const account_object* account = nullptr; + if (std::isdigit(account_name_or_id[0])) + account = _db.find(fc::variant(account_name_or_id).as()); + else + { + const auto& idx = _db.get_index_type().indices().get(); + auto itr = idx.find(account_name_or_id); + if (itr != idx.end()) + account = &*itr; + } + if (account == nullptr) + continue; + + _account_subscriptions.erase(account->id); + } + } std::map database_api::get_full_accounts(std::function callback, const vector& names_or_ids) @@ -690,29 +710,59 @@ namespace graphene { namespace app { } } - _broadcast_removed_complete = fc::async([=](){ - for( const auto& item : broadcast_queue ) - { - auto sub = _account_subscriptions.find(item.first); - if( sub != _account_subscriptions.end() ) - sub->second( fc::variant(item.second ) ); - } - }); + if( broadcast_queue.size() ) + { + _broadcast_removed_complete = fc::async([=](){ + for( const auto& item : broadcast_queue ) + { + auto sub = _account_subscriptions.find(item.first); + if( sub != _account_subscriptions.end() ) + sub->second( fc::variant(item.second ) ); + } + }); + } + } + if( _market_subscriptions.size() ) + { + map< pair, vector > broadcast_queue; + for( const auto& obj : objs ) + { + const limit_order_object* order = dynamic_cast(obj); + if( order ) + { + auto sub = _market_subscriptions.find( order->get_market() ); + if( sub != _market_subscriptions.end() ) + broadcast_queue[order->get_market()].emplace_back( order->id ); + } + } + if( broadcast_queue.size() ) + { + _broadcast_removed_complete = fc::async([=](){ + for( const auto& item : broadcast_queue ) + { + auto sub = _market_subscriptions.find(item.first); + if( sub != _market_subscriptions.end() ) + sub->second( fc::variant(item.second ) ); + } + }); + } } } void database_api::on_objects_changed(const vector& ids) { - vector my_objects; - map > broadcast_queue; + vector my_objects; + map > broadcast_queue; + map< pair, vector > market_broadcast_queue; for(auto id : ids) { if(_subscriptions.find(id) != _subscriptions.end()) my_objects.push_back(id); + const object* obj = nullptr; if( _account_subscriptions.size() ) { - const object* obj = _db.find_object( id ); + obj = _db.find_object( id ); if( obj ) { vector relevant = get_relevant_accounts( obj ); @@ -724,6 +774,21 @@ namespace graphene { namespace app { } } } + + if( _market_subscriptions.size() ) + { + if( !_account_subscriptions.size() ) obj = _db.find_object( id ); + if( obj ) + { + const limit_order_object* order = dynamic_cast(obj); + if( order ) + { + auto sub = _market_subscriptions.find( order->get_market() ); + if( sub != _market_subscriptions.end() ) + market_broadcast_queue[order->get_market()].emplace_back( order->id ); + } + } + } } @@ -738,6 +803,12 @@ namespace graphene { namespace app { if( sub != _account_subscriptions.end() ) sub->second( fc::variant(item.second ) ); } + for( const auto& item : market_broadcast_queue ) + { + auto sub = _market_subscriptions.find(item.first); + if( sub != _market_subscriptions.end() ) + sub->second( fc::variant(item.second ) ); + } for(auto id : my_objects) { // just incase _usbscriptions changed between filter and broadcast @@ -766,6 +837,7 @@ namespace graphene { namespace app { if(_market_subscriptions.size() == 0) return; + const auto& ops = _db.get_applied_operations(); map< std::pair, vector> > subscribed_markets_ops; for(const auto& op : ops) @@ -773,9 +845,11 @@ namespace graphene { namespace app { std::pair market; switch(op.op.which()) { + /* This is sent via the object_changed callback case operation::tag::value: market = op.op.get().get_market(); break; + */ case operation::tag::value: market = op.op.get().get_market(); break; diff --git a/libraries/app/include/graphene/app/api.hpp b/libraries/app/include/graphene/app/api.hpp index 42be161c..be457af2 100644 --- a/libraries/app/include/graphene/app/api.hpp +++ b/libraries/app/include/graphene/app/api.hpp @@ -149,11 +149,15 @@ namespace graphene { namespace app { * accounts. If any of the strings in @ref names_or_ids cannot be tied to an account, that input will be * ignored. All other accounts will be retrieved and subscribed. * - * TODO: Describe the return value and argument to callback in detail */ std::map get_full_accounts(std::function callback, const vector& names_or_ids); + /** + * Stop receiving updates generated by get_full_accounts() + */ + void unsubscribe_from_accounts( const vector& names_or_ids ); + /** * @brief Get limit orders in a given market * @param a ID of asset being sold @@ -498,6 +502,7 @@ FC_API(graphene::app::database_api, (get_account_count) (lookup_accounts) (get_full_accounts) + (unsubscribe_from_accounts) (get_account_balances) (get_named_account_balances) (lookup_asset_symbols) diff --git a/libraries/chain/include/graphene/chain/market_evaluator.hpp b/libraries/chain/include/graphene/chain/market_evaluator.hpp index cd316491..48f4d5f6 100644 --- a/libraries/chain/include/graphene/chain/market_evaluator.hpp +++ b/libraries/chain/include/graphene/chain/market_evaluator.hpp @@ -27,6 +27,13 @@ namespace graphene { namespace chain { share_type for_sale; ///< asset id is sell_price.base.asset_id price sell_price; + pair get_market()const + { + auto tmp = std::make_pair( sell_price.base.asset_id, sell_price.quote.asset_id ); + if( tmp.first > tmp.second ) std::swap( tmp.first, tmp.second ); + return tmp; + } + asset amount_for_sale()const { return asset( for_sale, sell_price.base.asset_id ); } asset amount_to_receive()const { return amount_for_sale() * sell_price; } }; From cb2031a1e44d8dc2ecd3f5a11e81588c77801ef3 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Fri, 17 Jul 2015 20:56:24 -0400 Subject: [PATCH 062/353] uia_tests.cpp: Remove mistakenly copy-pasted notes --- tests/tests/uia_tests.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/tests/tests/uia_tests.cpp b/tests/tests/uia_tests.cpp index 04210653..1692e2f9 100644 --- a/tests/tests/uia_tests.cpp +++ b/tests/tests/uia_tests.cpp @@ -309,15 +309,6 @@ BOOST_AUTO_TEST_CASE( transfer_restricted_test ) PUSH_TX( db, tx, database::skip_authority_check | database::skip_tapos_check | database::skip_transaction_signatures ); } ; - asset fee; - account_id_type issuer; - asset_id_type asset_to_update; - - /// If the asset is to be given a new issuer, specify his ID here. - optional new_issuer; - asset_options new_options; - extensions_type extensions; - const asset_object& uia = create_user_issued_asset( "TXRX", sam, transfer_restricted ); _issue_uia( alice, uia.amount( 1000 ) ); From 5f12f3f445ad4c7ee52b2637195f05253e66a0c3 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Mon, 20 Jul 2015 12:55:58 -0400 Subject: [PATCH 063/353] operation_tests2.cpp: Implement force_settlement_test --- tests/common/database_fixture.cpp | 6 +- tests/common/database_fixture.hpp | 6 +- tests/tests/operation_tests2.cpp | 297 ++++++++++++++++++------------ 3 files changed, 187 insertions(+), 122 deletions(-) diff --git a/tests/common/database_fixture.cpp b/tests/common/database_fixture.cpp index 532be11e..b7075ab4 100644 --- a/tests/common/database_fixture.cpp +++ b/tests/common/database_fixture.cpp @@ -740,7 +740,7 @@ void database_fixture::force_global_settle( const asset_object& what, const pric verify_asset_supplies(db); } FC_CAPTURE_AND_RETHROW( (what)(p) ) } -void database_fixture::force_settle( const account_object& who, asset what ) +operation_result database_fixture::force_settle( const account_object& who, asset what ) { try { trx.set_expiration(db.head_block_time() + fc::minutes(1)); trx.operations.clear(); @@ -750,9 +750,11 @@ void database_fixture::force_settle( const account_object& who, asset what ) trx.operations.push_back(sop); for( auto& op : trx.operations ) db.current_fee_schedule().set_fee(op); trx.validate(); - db.push_transaction(trx, ~0); + processed_transaction ptx = db.push_transaction(trx, ~0); + const operation_result& op_result = ptx.operation_results.front(); trx.operations.clear(); verify_asset_supplies(db); + return op_result; } FC_CAPTURE_AND_RETHROW( (who)(what) ) } const call_order_object* database_fixture::borrow(const account_object& who, asset what, asset collateral) diff --git a/tests/common/database_fixture.hpp b/tests/common/database_fixture.hpp index 14671b87..366d95a9 100644 --- a/tests/common/database_fixture.hpp +++ b/tests/common/database_fixture.hpp @@ -190,9 +190,9 @@ struct database_fixture { ); void force_global_settle(const asset_object& what, const price& p); - void force_settle(account_id_type who, asset what) - { force_settle(who(db), what); } - void force_settle(const account_object& who, asset what); + operation_result force_settle(account_id_type who, asset what) + { return force_settle(who(db), what); } + operation_result force_settle(const account_object& who, asset what); void update_feed_producers(asset_id_type mia, flat_set producers) { update_feed_producers(mia(db), producers); } void update_feed_producers(const asset_object& mia, flat_set producers); diff --git a/tests/tests/operation_tests2.cpp b/tests/tests/operation_tests2.cpp index b6edcbc0..2c0978ad 100644 --- a/tests/tests/operation_tests2.cpp +++ b/tests/tests/operation_tests2.cpp @@ -820,128 +820,191 @@ BOOST_AUTO_TEST_CASE( burn_worker_test ) BOOST_CHECK_EQUAL( get_balance(GRAPHENE_NULL_ACCOUNT, asset_id_type()), 2000 ); }FC_LOG_AND_RETHROW()} -BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES( unimp_force_settlement_unavailable, 1 ) -BOOST_AUTO_TEST_CASE( unimp_force_settlement_unavailable ) +BOOST_AUTO_TEST_CASE( force_settle_test ) { - BOOST_FAIL( "TODO - Reimplement this" ); - /* - try { - auto private_key = init_account_priv_key; - auto private_key = generate_private_key("committee"); ->>>>>>> short_refactor - account_id_type nathan_id = create_account("nathan").get_id(); - account_id_type shorter1_id = create_account("shorter1").get_id(); - account_id_type shorter2_id = create_account("shorter2").get_id(); - account_id_type shorter3_id = create_account("shorter3").get_id(); - transfer(account_id_type()(db), nathan_id(db), asset(100000000)); - transfer(account_id_type()(db), shorter1_id(db), asset(100000000)); - transfer(account_id_type()(db), shorter2_id(db), asset(100000000)); - transfer(account_id_type()(db), shorter3_id(db), asset(100000000)); - asset_id_type bit_usd = create_bitasset("BITUSD", GRAPHENE_TEMP_ACCOUNT, 0, disable_force_settle).get_id(); - FC_ASSERT( bit_usd(db).is_market_issued() ); + try { - asset_update_bitasset_operation op; - op.asset_to_update = bit_usd; - op.issuer = bit_usd(db).issuer; - op.new_options = bit_usd(db).bitasset_data(db).options; - op.new_options.maximum_force_settlement_volume = 9000; - trx.clear(); - trx.operations.push_back(op); - PUSH_TX( db, trx, ~0 ); - trx.clear(); + ACTORS( (nathan)(shorter1)(shorter2)(shorter3)(shorter4)(shorter5) ); + + int64_t initial_balance = 100000000; + + transfer(account_id_type()(db), shorter1_id(db), asset(initial_balance)); + transfer(account_id_type()(db), shorter2_id(db), asset(initial_balance)); + transfer(account_id_type()(db), shorter3_id(db), asset(initial_balance)); + transfer(account_id_type()(db), shorter4_id(db), asset(initial_balance)); + transfer(account_id_type()(db), shorter5_id(db), asset(initial_balance)); + + asset_id_type bitusd_id = create_bitasset( + "BITUSD", + nathan_id, + 100, + disable_force_settle + ).id; + + asset_id_type core_id = asset_id_type(); + + auto update_bitasset_options = [&]( asset_id_type asset_id, + std::function< void(bitasset_options&) > update_function ) + { + const asset_object& _asset = asset_id(db); + asset_update_bitasset_operation op; + op.asset_to_update = asset_id; + op.issuer = _asset.issuer; + op.new_options = (*_asset.bitasset_data_id)(db).options; + update_function( op.new_options ); + signed_transaction tx; + tx.operations.push_back( op ); + tx.set_expiration( db.head_block_time() + fc::minutes(5) ); + PUSH_TX( db, tx, ~0 ); + } ; + + auto update_asset_options = [&]( asset_id_type asset_id, + std::function< void(asset_options&) > update_function ) + { + const asset_object& _asset = asset_id(db); + asset_update_operation op; + op.asset_to_update = asset_id; + op.issuer = _asset.issuer; + op.new_options = _asset.options; + update_function( op.new_options ); + signed_transaction tx; + tx.operations.push_back( op ); + tx.set_expiration( db.head_block_time() + fc::minutes(5) ); + PUSH_TX( db, tx, ~0 ); + } ; + + BOOST_TEST_MESSAGE( "Update maximum_force_settlement_volume = 9000" ); + + BOOST_CHECK( bitusd_id(db).is_market_issued() ); + update_bitasset_options( bitusd_id, [&]( bitasset_options& new_options ) + { new_options.maximum_force_settlement_volume = 9000; } ); + + BOOST_TEST_MESSAGE( "Publish price feed" ); + + update_feed_producers( bitusd_id, { nathan_id } ); + { + price_feed feed; + feed.settlement_price = price( asset( 1, bitusd_id ), asset( 1, core_id ) ); + publish_feed( bitusd_id, nathan_id, feed ); + } + + BOOST_TEST_MESSAGE( "First short batch" ); + + call_order_id_type call1_id = borrow( shorter1_id, asset(1000, bitusd_id), asset(2*1000, core_id) )->id; // 2.0000 + call_order_id_type call2_id = borrow( shorter2_id, asset(2000, bitusd_id), asset(2*1999, core_id) )->id; // 1.9990 + call_order_id_type call3_id = borrow( shorter3_id, asset(3000, bitusd_id), asset(2*2890, core_id) )->id; // 1.9267 + call_order_id_type call4_id = borrow( shorter4_id, asset(4000, bitusd_id), asset(2*3950, core_id) )->id; // 1.9750 + call_order_id_type call5_id = borrow( shorter5_id, asset(5000, bitusd_id), asset(2*4900, core_id) )->id; // 1.9600 + + transfer( shorter1_id, nathan_id, asset(1000, bitusd_id) ); + transfer( shorter2_id, nathan_id, asset(2000, bitusd_id) ); + transfer( shorter3_id, nathan_id, asset(3000, bitusd_id) ); + transfer( shorter4_id, nathan_id, asset(4000, bitusd_id) ); + transfer( shorter5_id, nathan_id, asset(5000, bitusd_id) ); + + BOOST_CHECK_EQUAL( get_balance(nathan_id, bitusd_id), 15000); + BOOST_CHECK_EQUAL( get_balance(nathan_id, core_id), 0); + BOOST_CHECK_EQUAL( get_balance(shorter1_id, core_id), initial_balance-2000 ); + BOOST_CHECK_EQUAL( get_balance(shorter2_id, core_id), initial_balance-3998 ); + BOOST_CHECK_EQUAL( get_balance(shorter3_id, core_id), initial_balance-5780 ); + BOOST_CHECK_EQUAL( get_balance(shorter4_id, core_id), initial_balance-7900 ); + BOOST_CHECK_EQUAL( get_balance(shorter5_id, core_id), initial_balance-9800 ); + + BOOST_TEST_MESSAGE( "Update force_settlement_delay_sec = 100, force_settlement_offset_percent = 1%" ); + + update_bitasset_options( bitusd_id, [&]( bitasset_options& new_options ) + { new_options.force_settlement_delay_sec = 100; + new_options.force_settlement_offset_percent = GRAPHENE_1_PERCENT; } ); + + // Force settlement is disabled; check that it fails + GRAPHENE_REQUIRE_THROW( force_settle( nathan_id, asset( 50, bitusd_id ) ), fc::exception ); + + update_asset_options( bitusd_id, [&]( asset_options& new_options ) + { new_options.flags &= ~disable_force_settle; } ); + + // Can't settle more BitUSD than you own + GRAPHENE_REQUIRE_THROW( force_settle( nathan_id, asset( 999999, bitusd_id ) ), fc::exception ); + + // settle3 should be least collateralized order according to index + BOOST_CHECK( db.get_index_type().indices().get().begin()->id == call3_id ); + BOOST_CHECK_EQUAL( call3_id(db).debt.value, 3000 ); + + BOOST_TEST_MESSAGE( "Verify partial settlement of call" ); + // Partially settle a call + force_settlement_id_type settle_id = force_settle( nathan_id, asset( 50, bitusd_id ) ).get< object_id_type >(); + + // Call does not take effect immediately + BOOST_CHECK_EQUAL( get_balance(nathan_id, bitusd_id), 14950); + BOOST_CHECK_EQUAL( settle_id(db).balance.amount.value, 50); + BOOST_CHECK_EQUAL( call3_id(db).debt.value, 3000 ); + BOOST_CHECK_EQUAL( call3_id(db).collateral.value, 5780 ); + BOOST_CHECK( settle_id(db).owner == nathan_id ); + + // Wait for settlement to take effect + generate_blocks(settle_id(db).settlement_date); + BOOST_CHECK(db.find(settle_id) == nullptr); + BOOST_CHECK_EQUAL( get_balance(nathan_id, bitusd_id), 14950); + BOOST_CHECK_EQUAL( get_balance(nathan_id, core_id), 49 ); // 1% force_settlement_offset_percent (rounded unfavorably) + BOOST_CHECK_EQUAL( call3_id(db).debt.value, 2950 ); + BOOST_CHECK_EQUAL( call3_id(db).collateral.value, 5731 ); // 5731 == 5780-49 + + BOOST_CHECK( db.get_index_type().indices().get().begin()->id == call3_id ); + + BOOST_TEST_MESSAGE( "Verify pending settlement is cancelled when asset's force_settle is disabled" ); + // Ensure pending settlement is cancelled when force settle is disabled + settle_id = force_settle( nathan_id, asset( 50, bitusd_id ) ).get< object_id_type >(); + + BOOST_CHECK( !db.get_index_type().indices().empty() ); + update_asset_options( bitusd_id, [&]( asset_options& new_options ) + { new_options.flags |= disable_force_settle; } ); + BOOST_CHECK( db.get_index_type().indices().empty() ); + update_asset_options( bitusd_id, [&]( asset_options& new_options ) + { new_options.flags &= ~disable_force_settle; } ); + + BOOST_TEST_MESSAGE( "Perform iterative settlement" ); + settle_id = force_settle( nathan_id, asset( 12500, bitusd_id ) ).get< object_id_type >(); + + // c3 2950 : 5731 1.9427 fully settled + // c5 5000 : 9800 1.9600 fully settled + // c4 4000 : 7900 1.9750 fully settled + // c2 2000 : 3998 1.9990 550 settled + // c1 1000 : 2000 2.0000 + + generate_blocks( settle_id(db).settlement_date ); + + int64_t call1_payout = 0; + int64_t call2_payout = 550*99/100; + int64_t call3_payout = 49 + 2950*99/100; + int64_t call4_payout = 4000*99/100; + int64_t call5_payout = 5000*99/100; + + BOOST_CHECK_EQUAL( get_balance(shorter1_id, core_id), initial_balance-2*1000 ); // full collat still tied up + BOOST_CHECK_EQUAL( get_balance(shorter2_id, core_id), initial_balance-2*1999 ); // full collat still tied up + BOOST_CHECK_EQUAL( get_balance(shorter3_id, core_id), initial_balance-call3_payout ); // initial balance minus transfer to Nathan (as BitUSD) + BOOST_CHECK_EQUAL( get_balance(shorter4_id, core_id), initial_balance-call4_payout ); // initial balance minus transfer to Nathan (as BitUSD) + BOOST_CHECK_EQUAL( get_balance(shorter5_id, core_id), initial_balance-call5_payout ); // initial balance minus transfer to Nathan (as BitUSD) + + BOOST_CHECK_EQUAL( get_balance(nathan_id, core_id), + call1_payout + call2_payout + call3_payout + call4_payout + call5_payout ); + + BOOST_CHECK( db.find(call3_id) == nullptr ); + BOOST_CHECK( db.find(call4_id) == nullptr ); + BOOST_CHECK( db.find(call5_id) == nullptr ); + + BOOST_REQUIRE( db.find(call1_id) != nullptr ); + BOOST_REQUIRE( db.find(call2_id) != nullptr ); + + BOOST_CHECK_EQUAL( call1_id(db).debt.value, 1000 ); + BOOST_CHECK_EQUAL( call1_id(db).collateral.value, 2000 ); + + BOOST_CHECK_EQUAL( call2_id(db).debt.value, 2000-550 ); + BOOST_CHECK_EQUAL( call2_id(db).collateral.value, 3998-call2_payout ); } - generate_block(); - - create_short(shorter1_id(db), asset(1000, bit_usd), asset(1000)); - create_sell_order(nathan_id(db), asset(1000), asset(1000, bit_usd)); - create_short(shorter2_id(db), asset(2000, bit_usd), asset(1999)); - create_sell_order(nathan_id(db), asset(1999), asset(2000, bit_usd)); - create_short(shorter3_id(db), asset(3000, bit_usd), asset(2990)); - create_sell_order(nathan_id(db), asset(2990), asset(3000, bit_usd)); - BOOST_CHECK_EQUAL(get_balance(nathan_id, bit_usd), 6000); - - transfer(nathan_id(db), account_id_type()(db), db.get_balance(nathan_id, asset_id_type())); - + catch(fc::exception& e) { - asset_update_bitasset_operation uop; - uop.issuer = bit_usd(db).issuer; - uop.asset_to_update = bit_usd; - uop.new_options = bit_usd(db).bitasset_data(db).options; - uop.new_options.force_settlement_delay_sec = 100; - uop.new_options.force_settlement_offset_percent = 100; - trx.operations.push_back(uop); - } { - asset_update_feed_producers_operation uop; - uop.asset_to_update = bit_usd; - uop.issuer = bit_usd(db).issuer; - uop.new_feed_producers = {nathan_id}; - trx.operations.push_back(uop); - } { - asset_publish_feed_operation pop; - pop.asset_id = bit_usd; - pop.publisher = nathan_id; - price_feed feed; - feed.settlement_price = price(asset(1),asset(1, bit_usd)); - feed.call_limit = price::min(0, bit_usd); - pop.feed = feed; - trx.operations.push_back(pop); + edump((e.to_detail_string())); + throw; } - trx.sign(key_id_type(),private_key); - PUSH_TX( db, trx ); - trx.clear(); - - asset_settle_operation sop; - sop.account = nathan_id; - sop.amount = asset(50, bit_usd); - trx.operations = {sop}; - //Force settlement is disabled; check that it fails - GRAPHENE_CHECK_THROW(PUSH_TX( db, trx, ~0 ), fc::exception); - { - //Enable force settlement - asset_update_operation op; - op.issuer = bit_usd(db).issuer; - op.asset_to_update = bit_usd; - op.new_options = bit_usd(db).options; - op.new_options.flags &= ~disable_force_settle; - trx.operations = {op}; - trx.sign(key_id_type(), private_key); - PUSH_TX( db, trx ); - trx.operations = {sop}; - } - REQUIRE_THROW_WITH_VALUE(sop, amount, asset(999999, bit_usd)); - trx.operations.back() = sop; - trx.sign(key_id_type(),private_key); - - //Partially settle a call - force_settlement_id_type settle_id = PUSH_TX( db, trx ).operation_results.front().get(); - trx.clear(); - call_order_id_type call_id = db.get_index_type().indices().get().begin()->id; - BOOST_CHECK_EQUAL(settle_id(db).balance.amount.value, 50); - BOOST_CHECK_EQUAL(call_id(db).debt.value, 3000); - BOOST_CHECK(settle_id(db).owner == nathan_id); - - generate_blocks(settle_id(db).settlement_date); - BOOST_CHECK(db.find(settle_id) == nullptr); - BOOST_CHECK_EQUAL(get_balance(nathan_id, asset_id_type()), 49); - BOOST_CHECK_EQUAL(call_id(db).debt.value, 2950); - - { - //Disable force settlement - asset_update_operation op; - op.issuer = bit_usd(db).issuer; - op.asset_to_update = bit_usd; - op.new_options = bit_usd(db).options; - op.new_options.flags |= disable_force_settle; - trx.operations.push_back(op); - trx.set_reference_block(db.head_block_id()); trx.set_expiration( db.head_block_time() + fc::seconds( 3 * db.get_global_properties().parameters.block_interval ) ); - trx.sign(key_id_type(), private_key); - PUSH_TX( db, trx ); - //Check that force settlements were all canceled - BOOST_CHECK(db.get_index_type().indices().empty()); - BOOST_CHECK_EQUAL(get_balance(nathan_id, bit_usd), bit_usd(db).dynamic_data(db).current_supply.value); - } - } FC_LOG_AND_RETHROW() - */ } BOOST_AUTO_TEST_CASE( assert_op_test ) From d343a71c569223f6f4a01aac1d490314625ea7b9 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Tue, 21 Jul 2015 15:44:08 -0400 Subject: [PATCH 064/353] asset_evaluator.cpp: Enforce issuer permissions #176 --- libraries/chain/asset_evaluator.cpp | 6 +++++- libraries/chain/protocol/asset_ops.cpp | 2 -- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libraries/chain/asset_evaluator.cpp b/libraries/chain/asset_evaluator.cpp index e8b4b0fe..5b3bde4f 100644 --- a/libraries/chain/asset_evaluator.cpp +++ b/libraries/chain/asset_evaluator.cpp @@ -223,10 +223,14 @@ void_result asset_update_evaluator::do_evaluate(const asset_update_operation& o) } } - //There must be no bits set in o.permissions which are unset in a.issuer_permissions. + // new issuer_permissions must be subset of old issuer permissions FC_ASSERT(!(o.new_options.issuer_permissions & ~a.options.issuer_permissions), "Cannot reinstate previously revoked issuer permissions on an asset."); + // changed flags must be subset of old issuer permissions + FC_ASSERT(!((o.new_options.flags ^ a.options.flags) & ~a.options.issuer_permissions), + "Flag change is forbidden by issuer permissions"); + asset_to_update = &a; FC_ASSERT( o.issuer == a.issuer, "", ("o.issuer", o.issuer)("a.issuer", a.issuer) ); diff --git a/libraries/chain/protocol/asset_ops.cpp b/libraries/chain/protocol/asset_ops.cpp index 59830be7..ccc68093 100644 --- a/libraries/chain/protocol/asset_ops.cpp +++ b/libraries/chain/protocol/asset_ops.cpp @@ -168,8 +168,6 @@ void asset_options::validate()const FC_ASSERT( max_market_fee >= 0 && max_market_fee <= GRAPHENE_MAX_SHARE_SUPPLY ); // There must be no high bits in permissions whose meaning is not known. FC_ASSERT( !(issuer_permissions & ~ASSET_ISSUER_PERMISSION_MASK) ); - // There must be no high bits in flags which are not also high in permissions. - FC_ASSERT( !(flags & ~issuer_permissions ) ); // The global_settle flag may never be set (this is a permission only) FC_ASSERT( !(flags & global_settle) ); core_exchange_rate.validate(); From 1430fab0f4414b6574565b24ee1f8da990fba6c0 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Tue, 21 Jul 2015 16:00:14 -0400 Subject: [PATCH 065/353] operation_tests.cpp: Add messages to update_uia test, fix check failing due to previous commit --- tests/tests/operation_tests.cpp | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/tests/tests/operation_tests.cpp b/tests/tests/operation_tests.cpp index b38a2310..53cf9739 100644 --- a/tests/tests/operation_tests.cpp +++ b/tests/tests/operation_tests.cpp @@ -614,11 +614,15 @@ BOOST_AUTO_TEST_CASE( update_uia ) trx.operations.push_back(op); //Cannot change issuer to same as before + BOOST_TEST_MESSAGE( "Make sure changing issuer to same as before is forbidden" ); REQUIRE_THROW_WITH_VALUE(op, new_issuer, test.issuer); + //Cannot convert to an MIA + BOOST_TEST_MESSAGE( "Make sure we can't convert UIA to MIA" ); REQUIRE_THROW_WITH_VALUE(op, new_options.issuer_permissions, ASSET_ISSUER_PERMISSION_MASK); REQUIRE_THROW_WITH_VALUE(op, new_options.core_exchange_rate, price(asset(5), asset(5))); + BOOST_TEST_MESSAGE( "Test updating core_exchange_rate" ); op.new_options.core_exchange_rate = price(asset(3), test.amount(5)); trx.operations.back() = op; PUSH_TX( db, trx, ~0 ); @@ -627,21 +631,37 @@ BOOST_AUTO_TEST_CASE( update_uia ) op.new_issuer = nathan.id; trx.operations.back() = op; PUSH_TX( db, trx, ~0 ); + + BOOST_TEST_MESSAGE( "Test setting flags" ); op.issuer = nathan.id; op.new_issuer.reset(); op.new_options.flags = transfer_restricted | white_list; trx.operations.back() = op; PUSH_TX( db, trx, ~0 ); - REQUIRE_THROW_WITH_VALUE(op, new_options.issuer_permissions, test.options.issuer_permissions & ~white_list); + + BOOST_TEST_MESSAGE( "Disable white_list permission" ); op.new_options.issuer_permissions = test.options.issuer_permissions & ~white_list; - op.new_options.flags = 0; trx.operations.back() = op; PUSH_TX( db, trx, ~0 ); + + BOOST_TEST_MESSAGE( "Can't toggle white_list" ); + REQUIRE_THROW_WITH_VALUE(op, new_options.flags, test.options.flags & ~white_list); + + BOOST_TEST_MESSAGE( "Can toggle transfer_restricted" ); + for( int i=0; i<2; i++ ) + { + op.new_options.flags = test.options.flags ^ transfer_restricted; + trx.operations.back() = op; + PUSH_TX( db, trx, ~0 ); + } + + BOOST_TEST_MESSAGE( "Make sure white_list can't be re-enabled" ); op.new_options.issuer_permissions = test.options.issuer_permissions; op.new_options.flags = test.options.flags; BOOST_CHECK(!(test.options.issuer_permissions & white_list)); REQUIRE_THROW_WITH_VALUE(op, new_options.issuer_permissions, UIA_ASSET_ISSUER_PERMISSION_MASK); - REQUIRE_THROW_WITH_VALUE(op, new_options.flags, white_list); + + BOOST_TEST_MESSAGE( "We can change issuer to account_id_type(), but can't do it again" ); op.new_issuer = account_id_type(); trx.operations.back() = op; PUSH_TX( db, trx, ~0 ); From f06a5dccdab6d55521642d6793f5306b98432f7c Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Tue, 21 Jul 2015 16:04:21 -0400 Subject: [PATCH 066/353] operation_tests.cpp: Remove unimplemented bulk_discount_test #169 --- tests/tests/operation_tests.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/tests/tests/operation_tests.cpp b/tests/tests/operation_tests.cpp index 53cf9739..b08842c4 100644 --- a/tests/tests/operation_tests.cpp +++ b/tests/tests/operation_tests.cpp @@ -1405,15 +1405,6 @@ BOOST_AUTO_TEST_CASE( cover_with_collateral_test ) } } -BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES( unimp_bulk_discount_test, 1 ) -BOOST_AUTO_TEST_CASE( unimp_bulk_discount_test ) -{ - // commented out to silence compiler warnings - //const account_object& shorter1 = create_account( "alice" ); - //const account_object& shorter2 = create_account( "bob" ); - BOOST_FAIL( "not implemented" ); -} - BOOST_AUTO_TEST_CASE( vesting_balance_create_test ) { try { INVOKE( create_uia ); From d827c5df281eafe43d6d0d00533ea0a0f2643c1c Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Tue, 21 Jul 2015 16:05:47 -0400 Subject: [PATCH 067/353] block_tests.cpp: Remove redundant, unimplemented force_settlement test --- tests/tests/block_tests.cpp | 132 ------------------------------------ 1 file changed, 132 deletions(-) diff --git a/tests/tests/block_tests.cpp b/tests/tests/block_tests.cpp index 2c9bbecb..a39caffb 100644 --- a/tests/tests/block_tests.cpp +++ b/tests/tests/block_tests.cpp @@ -710,138 +710,6 @@ BOOST_FIXTURE_TEST_CASE( change_block_interval, database_fixture ) BOOST_CHECK_EQUAL(db.head_block_time().sec_since_epoch() - past_time, 2); } FC_LOG_AND_RETHROW() } -BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES( unimp_force_settlement, 1 ) -BOOST_FIXTURE_TEST_CASE( unimp_force_settlement, database_fixture ) -{ - BOOST_FAIL( "TODO" ); - /* - try { - auto private_key = init_account_priv_key; - auto private_key = generate_private_key("committee"); ->>>>>>> short_refactor - account_id_type nathan_id = create_account("nathan").get_id(); - account_id_type shorter1_id = create_account("shorter1").get_id(); - account_id_type shorter2_id = create_account("shorter2").get_id(); - account_id_type shorter3_id = create_account("shorter3").get_id(); - transfer(account_id_type()(db), nathan_id(db), asset(100000000)); - transfer(account_id_type()(db), shorter1_id(db), asset(100000000)); - transfer(account_id_type()(db), shorter2_id(db), asset(100000000)); - transfer(account_id_type()(db), shorter3_id(db), asset(100000000)); - asset_id_type bit_usd = create_bitasset("BITUSD", GRAPHENE_TEMP_ACCOUNT, 0).get_id(); - { - asset_update_bitasset_operation op; - op.asset_to_update = bit_usd; - op.issuer = bit_usd(db).issuer; - op.new_options = bit_usd(db).bitasset_data(db).options; - op.new_options.maximum_force_settlement_volume = 9000; - trx.clear(); - trx.operations.push_back(op); - PUSH_TX( db, trx, ~0 ); - trx.clear(); - } - generate_block(); - - create_short(shorter1_id(db), asset(1000, bit_usd), asset(1000)); - create_sell_order(nathan_id(db), asset(1000), asset(1000, bit_usd)); - create_short(shorter2_id(db), asset(2000, bit_usd), asset(1999)); - create_sell_order(nathan_id(db), asset(1999), asset(2000, bit_usd)); - create_short(shorter3_id(db), asset(3000, bit_usd), asset(2990)); - create_sell_order(nathan_id(db), asset(2990), asset(3000, bit_usd)); - BOOST_CHECK_EQUAL(get_balance(nathan_id, bit_usd), 6000); - - transfer(nathan_id(db), account_id_type()(db), db.get_balance(nathan_id, asset_id_type())); - - { - asset_update_bitasset_operation uop; - uop.issuer = bit_usd(db).issuer; - uop.asset_to_update = bit_usd; - uop.new_options = bit_usd(db).bitasset_data(db).options; - uop.new_options.force_settlement_delay_sec = 100; - uop.new_options.force_settlement_offset_percent = 100; - trx.operations.push_back(uop); - } { - asset_update_feed_producers_operation uop; - uop.asset_to_update = bit_usd; - uop.issuer = bit_usd(db).issuer; - uop.new_feed_producers = {nathan_id}; - trx.operations.push_back(uop); - } { - asset_publish_feed_operation pop; - pop.asset_id = bit_usd; - pop.publisher = nathan_id; - price_feed feed; - feed.settlement_price = price(asset(1),asset(1, bit_usd)); - feed.call_limit = price::min(0, bit_usd); - feed.short_limit = price::min(bit_usd, 0); - pop.feed = feed; - trx.operations.push_back(pop); - } - trx.sign(key_id_type(),private_key); - PUSH_TX( db, trx ); - trx.clear(); - - asset_settle_operation sop; - sop.account = nathan_id; - sop.amount = asset(50, bit_usd); - trx.operations.push_back(sop); - REQUIRE_THROW_WITH_VALUE(sop, amount, asset(999999, bit_usd)); - trx.operations.back() = sop; - trx.sign(key_id_type(),private_key); - - //Partially settle a call - force_settlement_id_type settle_id = PUSH_TX( db, trx ).operation_results.front().get(); - trx.clear(); - call_order_id_type call_id = db.get_index_type().indices().get().begin()->id; - BOOST_CHECK_EQUAL(settle_id(db).balance.amount.value, 50); - BOOST_CHECK_EQUAL(call_id(db).debt.value, 3000); - BOOST_CHECK(settle_id(db).owner == nathan_id); - - generate_blocks(settle_id(db).settlement_date); - BOOST_CHECK(db.find(settle_id) == nullptr); - BOOST_CHECK_EQUAL(get_balance(nathan_id, asset_id_type()), 49); - BOOST_CHECK_EQUAL(call_id(db).debt.value, 2950); - - //Exactly settle a call - call_id = db.get_index_type().indices().get().begin()->id; - sop.amount.amount = 2000; - trx.operations.push_back(sop); - trx.sign(key_id_type(),private_key); - //Trx has expired by now. Make sure it throws. - GRAPHENE_CHECK_THROW(settle_id = PUSH_TX( db, trx ).operation_results.front().get(), fc::exception); - trx.set_expiration(db.head_block_time() + fc::minutes(1)); - trx.sign(key_id_type(),private_key); - settle_id = PUSH_TX( db, trx ).operation_results.front().get(); - trx.clear(); - - generate_blocks(settle_id(db).settlement_date); - BOOST_CHECK(db.find(settle_id) == nullptr); - BOOST_CHECK_EQUAL(get_balance(nathan_id, asset_id_type()), 2029); - BOOST_CHECK(db.find(call_id) == nullptr); - trx.set_expiration(db.head_block_time() + fc::minutes(1)); - - //Attempt to settle all existing asset - sop.amount = db.get_balance(nathan_id, bit_usd); - trx.operations.push_back(sop); - trx.sign(key_id_type(),private_key); - settle_id = PUSH_TX( db, trx ).operation_results.front().get(); - trx.clear(); - - generate_blocks(settle_id(db).settlement_date); - //We've hit the max force settlement. Can't settle more now. - BOOST_CHECK(db.find(settle_id)); - BOOST_CHECK_EQUAL(get_balance(nathan_id, asset_id_type()), 5344); - BOOST_CHECK(!db.get_index_type().indices().empty()); - - generate_blocks(db.get_dynamic_global_properties().next_maintenance_time); - //Now it's been another maintenance interval, so we should have some more settlement. - //I can't force settle all existing asset, but with a 90% limit, I get pretty close. - BOOST_CHECK(db.find(settle_id)); - BOOST_CHECK_EQUAL(get_balance(nathan_id, asset_id_type()), 5878); - BOOST_CHECK(!db.get_index_type().indices().empty()); -} FC_LOG_AND_RETHROW() -*/ -} - BOOST_FIXTURE_TEST_CASE( pop_block_twice, database_fixture ) { try From f72f07b05bcacdd5b10e4e188471f7aad4b911b7 Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Tue, 21 Jul 2015 17:09:44 -0400 Subject: [PATCH 068/353] [GUI] Early implementation of operations --- programs/light_client/CMakeLists.txt | 3 +- programs/light_client/ClientDataModel.cpp | 32 ++++++++++- programs/light_client/ClientDataModel.hpp | 39 ++++++++----- programs/light_client/Operations.cpp | 22 +++++++ programs/light_client/Operations.hpp | 64 +++++++++++++++++++++ programs/light_client/main.cpp | 4 ++ programs/light_client/qml/AccountPicker.qml | 6 +- programs/light_client/qml/TransferForm.qml | 17 +++++- 8 files changed, 170 insertions(+), 17 deletions(-) create mode 100644 programs/light_client/Operations.cpp create mode 100644 programs/light_client/Operations.hpp diff --git a/programs/light_client/CMakeLists.txt b/programs/light_client/CMakeLists.txt index 5931383f..788bb617 100644 --- a/programs/light_client/CMakeLists.txt +++ b/programs/light_client/CMakeLists.txt @@ -18,7 +18,8 @@ if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug") qt5_add_resources(QML_QRC qml/qml.qrc) endif() -add_executable(light_client ClientDataModel.cpp ClientDataModel.hpp main.cpp ${QML_QRC} ${QML}) +add_executable(light_client ClientDataModel.cpp ClientDataModel.hpp Operations.cpp main.cpp ${QML_QRC} ${QML}) + if (CMAKE_VERSION VERSION_LESS 3.0) add_dependencies(light_client gen_qrc) endif() diff --git a/programs/light_client/ClientDataModel.cpp b/programs/light_client/ClientDataModel.cpp index 309fcade..deda45c2 100644 --- a/programs/light_client/ClientDataModel.cpp +++ b/programs/light_client/ClientDataModel.cpp @@ -1,4 +1,5 @@ #include "ClientDataModel.hpp" +#include "Operations.hpp" #include #include @@ -18,7 +19,16 @@ QString idToString(graphene::db::object_id_type id) { } ChainDataModel::ChainDataModel(fc::thread& t, QObject* parent) -:QObject(parent),m_rpc_thread(&t){} + :QObject(parent),m_rpc_thread(&t){} + +void ChainDataModel::setDatabaseAPI(fc::api dbapi) { + m_db_api = dbapi; + m_rpc_thread->async([this] { + m_global_properties = m_db_api->get_global_properties(); + m_db_api->subscribe_to_objects([this](const variant& v) { m_global_properties = v.as(); }, + {m_global_properties.id}); + }); +} Asset* ChainDataModel::getAsset(ObjectId id) { @@ -275,6 +285,7 @@ GrapheneApplication::GrapheneApplication(QObject* parent) this, &GrapheneApplication::execute); m_model = new ChainDataModel(m_thread, this); + m_operationBuilder = new OperationBuilder(*m_model, this); connect(m_model, &ChainDataModel::queueExecute, this, &GrapheneApplication::execute); @@ -329,6 +340,7 @@ void GrapheneApplication::start(QString apiurl, QString user, QString pass) Q_EMIT exceptionThrown(QString::fromStdString(e.to_string())); } } + Q_SLOT void GrapheneApplication::execute(const std::function& func)const { func(); @@ -341,3 +353,21 @@ void Balance::update(const account_balance_object& update) emit amountChanged(); } } + + +void Asset::update(const asset_object& asset) +{ + if (asset.id.instance() != id()) + setProperty("id", QVariant::fromValue(asset.id.instance())); + if (asset.symbol != m_symbol.toStdString()) { + m_symbol = QString::fromStdString(asset.symbol); + Q_EMIT symbolChanged(); + } + if (asset.precision != m_precision) { + m_precision = asset.precision; + Q_EMIT precisionChanged(); + } + + if (asset.options.core_exchange_rate != coreExchangeRate) + coreExchangeRate = asset.options.core_exchange_rate; +} diff --git a/programs/light_client/ClientDataModel.hpp b/programs/light_client/ClientDataModel.hpp index 7c1db5e0..ade9fee1 100644 --- a/programs/light_client/ClientDataModel.hpp +++ b/programs/light_client/ClientDataModel.hpp @@ -64,6 +64,8 @@ class Asset : public GrapheneObject { QString m_symbol; quint32 m_precision; + graphene::chain::price coreExchangeRate; + public: Asset(ObjectId id = -1, QString symbol = QString(), quint32 precision = 0, QObject* parent = nullptr) : GrapheneObject(id, parent), m_symbol(symbol), m_precision(precision) @@ -80,6 +82,8 @@ public: return power; } + void update(const graphene::chain::asset_object& asset); + Q_SIGNALS: void symbolChanged(); void precisionChanged(); @@ -177,36 +181,43 @@ public: ChainDataModel(){} ChainDataModel( fc::thread& t, QObject* parent = nullptr ); - void setDatabaseAPI( fc::api dbapi ){ m_db_api = dbapi; } + void setDatabaseAPI(fc::api dbapi); + + const graphene::chain::global_property_object& global_properties() const { return m_global_properties; } Q_SIGNALS: void queueExecute( const std::function& ); void exceptionThrown( QString message ); private: - fc::thread* m_rpc_thread = nullptr; - std::string m_api_url; - fc::api m_db_api; + fc::thread* m_rpc_thread = nullptr; + std::string m_api_url; + fc::api m_db_api; - ObjectId m_account_query_num = -1; - account_multi_index_type m_accounts; - asset_multi_index_type m_assets; + graphene::chain::global_property_object m_global_properties; + + ObjectId m_account_query_num = -1; + account_multi_index_type m_accounts; + asset_multi_index_type m_assets; }; +class OperationBuilder; class GrapheneApplication : public QObject { Q_OBJECT Q_PROPERTY(ChainDataModel* model READ model CONSTANT) + Q_PROPERTY(OperationBuilder* operationBuilder READ operationBuilder CONSTANT) Q_PROPERTY(bool isConnected READ isConnected NOTIFY isConnectedChanged) - fc::thread m_thread; - ChainDataModel* m_model = nullptr; - bool m_isConnected = false; + fc::thread m_thread; + ChainDataModel* m_model = nullptr; + OperationBuilder* m_operationBuilder = nullptr; + bool m_isConnected = false; boost::signals2::scoped_connection m_connectionClosed; - std::shared_ptr m_client; + std::shared_ptr m_client; fc::future m_done; void setIsConnected(bool v); @@ -218,10 +229,12 @@ public: GrapheneApplication(QObject* parent = nullptr); ~GrapheneApplication(); - ChainDataModel* model() const - { + ChainDataModel* model() const { return m_model; } + OperationBuilder* operationBuilder() const { + return m_operationBuilder; + } Q_INVOKABLE void start(QString apiUrl, QString user, diff --git a/programs/light_client/Operations.cpp b/programs/light_client/Operations.cpp new file mode 100644 index 00000000..934d7cae --- /dev/null +++ b/programs/light_client/Operations.cpp @@ -0,0 +1,22 @@ +#include "Operations.hpp" + +#include + +TransferOperation OperationBuilder::transfer(ObjectId sender, ObjectId receiver, qint64 amount, + ObjectId amountType, QString memo, ObjectId feeType) +{ + static fc::ecc::private_key dummyPrivate = fc::ecc::private_key::generate(); + static fc::ecc::public_key dummyPublic = fc::ecc::private_key::generate().get_public_key(); + TransferOperation op; + op.setSender(sender); + op.setReceiver(receiver); + op.setAmount(amount); + op.setAmountType(amountType); + op.setMemo(memo); + op.setFeeType(feeType); + auto feeParameters = model.global_properties().parameters.current_fees->get(); + op.operation().memo = graphene::chain::memo_data(); + op.operation().memo->set_message(dummyPrivate, dummyPublic, memo.toStdString()); + op.setFee(op.operation().calculate_fee(feeParameters).value); + return op; +} diff --git a/programs/light_client/Operations.hpp b/programs/light_client/Operations.hpp new file mode 100644 index 00000000..1b49a3f4 --- /dev/null +++ b/programs/light_client/Operations.hpp @@ -0,0 +1,64 @@ +#pragma once + +#include "ClientDataModel.hpp" + +#include + +#include + +class TransferOperation { + Q_GADGET + Q_PROPERTY(qint64 fee READ fee) + Q_PROPERTY(ObjectId feeType READ feeType) + Q_PROPERTY(ObjectId sender READ sender WRITE setSender) + Q_PROPERTY(ObjectId receiver READ receiver WRITE setReceiver) + Q_PROPERTY(qint64 amount READ amount WRITE setAmount) + Q_PROPERTY(ObjectId amountType READ amountType WRITE setAmountType) + Q_PROPERTY(QString memo READ memo WRITE setMemo) + + graphene::chain::transfer_operation m_op; + QString m_memo; + +public: + Q_INVOKABLE qint64 fee() const { return m_op.fee.amount.value; } + Q_INVOKABLE void setFee(qint64 fee) { m_op.fee.amount = fee; } + + Q_INVOKABLE ObjectId feeType() const { return m_op.fee.asset_id.instance.value; } + Q_INVOKABLE void setFeeType(ObjectId feeType) { m_op.fee.asset_id = feeType; } + + Q_INVOKABLE ObjectId sender() const { return m_op.from.instance.value; } + Q_INVOKABLE void setSender(ObjectId sender) { m_op.from = sender; } + + Q_INVOKABLE ObjectId receiver() const { return m_op.to.instance.value; } + Q_INVOKABLE void setReceiver(ObjectId receiver) { m_op.to = receiver; } + + Q_INVOKABLE qint64 amount() const { return m_op.amount.amount.value; } + Q_INVOKABLE void setAmount(qint64 amount) { m_op.amount.amount = amount; } + + Q_INVOKABLE ObjectId amountType() const { return m_op.amount.asset_id.instance.value; } + Q_INVOKABLE void setAmountType(ObjectId assetType) { m_op.amount.asset_id = assetType; } + + /// This does not deal with encrypted memos. The memo stored here is unencrypted, and does not get stored in the + /// underlying graphene operation. The encryption and storage steps must be handled elsewhere. + Q_INVOKABLE QString memo() const { return m_memo; } + /// This does not deal with encrypted memos. The memo stored here is unencrypted, and does not get stored in the + /// underlying graphene operation. The encryption and storage steps must be handled elsewhere. + Q_INVOKABLE void setMemo(QString memo) { m_memo = memo; } + + const graphene::chain::transfer_operation& operation() const { return m_op; } + graphene::chain::transfer_operation& operation() { return m_op; } +}; +Q_DECLARE_METATYPE(TransferOperation) + +class OperationBuilder : public QObject { + Q_OBJECT + + ChainDataModel& model; + +public: + OperationBuilder(ChainDataModel& model, QObject* parent = nullptr) + : QObject(parent), model(model){} + + Q_INVOKABLE TransferOperation transfer(ObjectId sender, ObjectId receiver, + qint64 amount, ObjectId amountType, QString memo, ObjectId feeType); +}; diff --git a/programs/light_client/main.cpp b/programs/light_client/main.cpp index e3aaa035..8da5be62 100644 --- a/programs/light_client/main.cpp +++ b/programs/light_client/main.cpp @@ -3,6 +3,7 @@ #include #include "ClientDataModel.hpp" +#include "Operations.hpp" int main(int argc, char *argv[]) { @@ -14,12 +15,15 @@ int main(int argc, char *argv[]) qRegisterMetaType>(); qRegisterMetaType(); + qRegisterMetaType(); qmlRegisterType("Graphene.Client", 0, 1, "Asset"); qmlRegisterType("Graphene.Client", 0, 1, "Balance"); qmlRegisterType("Graphene.Client", 0, 1, "Account"); qmlRegisterType("Graphene.Client", 0, 1, "DataModel"); qmlRegisterType("Graphene.Client", 0, 1, "GrapheneApplication"); + qmlRegisterUncreatableType("Graphene.Client", 0, 1, "OperationBuilder", + QStringLiteral("OperationBuilder cannot be created from QML")); QQmlApplicationEngine engine; QVariant crypto; diff --git a/programs/light_client/qml/AccountPicker.qml b/programs/light_client/qml/AccountPicker.qml index 01ecceec..f3dc4287 100644 --- a/programs/light_client/qml/AccountPicker.qml +++ b/programs/light_client/qml/AccountPicker.qml @@ -26,6 +26,8 @@ RowLayout { accountNameField.forceActiveFocus() } + signal balanceClicked(var balance) + Identicon { name: account && account.name == accountNameField.text? accountNameField.text : "" width: Scaling.cm(2) @@ -44,6 +46,7 @@ RowLayout { id: accountDetails width: parent.width height: text? implicitHeight : 0 + onLinkActivated: if (link === "balance") balanceClicked(balances[showBalance].amountReal()) Behavior on height { NumberAnimation{ easing.type: Easing.InOutQuad } } @@ -66,7 +69,8 @@ RowLayout { : account.id) if (showBalance >= 0) { var bal = balances[showBalance] - text += "\n" + qsTr("Balance: %1 %2").arg(String(bal.amountReal())).arg(bal.type.symbol) + text += "
" + qsTr("Balance: %1 %2").arg(String(bal.amountReal())) + .arg(bal.type.symbol) } return text }) diff --git a/programs/light_client/qml/TransferForm.qml b/programs/light_client/qml/TransferForm.qml index f72ff864..d3f9b416 100644 --- a/programs/light_client/qml/TransferForm.qml +++ b/programs/light_client/qml/TransferForm.qml @@ -21,6 +21,8 @@ Rectangle { property alias senderAccount: senderPicker.account /// The Account object for the receiver property alias receiverAccount: recipientPicker.account + /// The operation created in this form + property var operation Component.onCompleted: console.log("Made a transfer form") Component.onDestruction: console.log("Destroyed a transfer form") @@ -47,6 +49,7 @@ Rectangle { if (foundIndex >= 0) return foundIndex return balance.type.symbol === assetField.currentText? index : -1 }, -1) : -1 + onBalanceClicked: amountField.value = balance } AccountPicker { id: recipientPicker @@ -77,12 +80,24 @@ Rectangle { } ComboBox { id: assetField - Layout.minimumWidth: Scaling.cm(3) + Layout.minimumWidth: Scaling.cm(1) enabled: senderPicker.balances instanceof Array && senderPicker.balances.length > 0 model: enabled? senderPicker.balances.filter(function(balance) { return balance.amount > 0 }) .map(function(balance) { return balance.type.symbol }) : ["Asset Type"] } + Text { + font.pixelSize: assetField.height / 2.5 + text: { + var balance = amountField.maxBalance + if (!balance || !balance.type) return "" + var precisionAdjustment = Math.pow(10, balance.type.precision) + + var op = app.operationBuilder.transfer(0, 0, amountField.value * precisionAdjustment, + balance.type.id, memoField.text, 0) + return qsTr("Fee:
") + op.fee / precisionAdjustment + " CORE" + } + } Item { Layout.fillWidth: true } Button { text: qsTr("Cancel") From ce84de41be3f8c53a64c550797e3a8564c3db102 Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Tue, 21 Jul 2015 17:56:52 -0400 Subject: [PATCH 069/353] [GUI] Fix object update notification handling --- libraries/app/include/graphene/app/api.hpp | 4 ++-- programs/light_client/ClientDataModel.cpp | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/libraries/app/include/graphene/app/api.hpp b/libraries/app/include/graphene/app/api.hpp index be457af2..6039a85e 100644 --- a/libraries/app/include/graphene/app/api.hpp +++ b/libraries/app/include/graphene/app/api.hpp @@ -151,7 +151,7 @@ namespace graphene { namespace app { * */ std::map get_full_accounts(std::function callback, - const vector& names_or_ids); + const vector& names_or_ids); /** * Stop receiving updates generated by get_full_accounts() @@ -309,7 +309,7 @@ namespace graphene { namespace app { /** * This API will take a partially signed transaction and a set of public keys that the owner has the ability to sign for - * and return the minimal subset of public keys that should add signatures to the transaction. + * and return the minimal subset of public keys that should add signatures to the transaction. */ set get_required_signatures( const signed_transaction& trx, const flat_set& available_keys )const; diff --git a/programs/light_client/ClientDataModel.cpp b/programs/light_client/ClientDataModel.cpp index deda45c2..40d5f3af 100644 --- a/programs/light_client/ClientDataModel.cpp +++ b/programs/light_client/ClientDataModel.cpp @@ -141,7 +141,13 @@ void ChainDataModel::getAccountImpl(QString accountIdentifier, Account* const * try { ilog("Fetching account ${acct}", ("acct", accountIdentifier.toStdString())); auto result = m_db_api->get_full_accounts([this](const fc::variant& v) { - processUpdatedObject(v); + vector updates = v.as>(); + for (const variant& update : updates) { + if (update.is_object()) + processUpdatedObject(update); + else + elog("Handling object deletions is not yet implemented: ${update}", ("update", update)); + } }, {accountIdentifier.toStdString()}); fc::optional accountPackage; From 9a3a6a52345b67068e6d883bef42084c72695b43 Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Wed, 22 Jul 2015 10:09:07 -0400 Subject: [PATCH 070/353] Set core asset issuer to null account No one should be able to interfere with the behavior of core asset, so codify this. --- libraries/chain/db_init.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/chain/db_init.cpp b/libraries/chain/db_init.cpp index 32a724cf..dcd014de 100644 --- a/libraries/chain/db_init.cpp +++ b/libraries/chain/db_init.cpp @@ -285,7 +285,7 @@ void database::init_genesis(const genesis_state_type& genesis_state) a.precision = GRAPHENE_BLOCKCHAIN_PRECISION_DIGITS; a.options.flags = 0; a.options.issuer_permissions = 0; - a.issuer = committee_account.id; + a.issuer = GRAPHENE_NULL_ACCOUNT; a.options.core_exchange_rate.base.amount = 1; a.options.core_exchange_rate.base.asset_id = 0; a.options.core_exchange_rate.quote.amount = 1; From 1667a72144b50d1db039856fc35485a1bbc871dd Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Wed, 22 Jul 2015 11:10:52 -0400 Subject: [PATCH 071/353] [GUI] Break up ClientDataModel.{c,h}pp into many files This has been needing to happen. Now it's done. There's no going back. --- programs/light_client/Account.cpp | 37 +++ programs/light_client/Account.hpp | 42 +++ programs/light_client/Asset.cpp | 22 ++ programs/light_client/Asset.hpp | 39 +++ programs/light_client/Balance.cpp | 16 ++ programs/light_client/Balance.hpp | 33 +++ programs/light_client/CMakeLists.txt | 2 +- ...ClientDataModel.cpp => ChainDataModel.cpp} | 130 +-------- programs/light_client/ChainDataModel.hpp | 73 +++++ programs/light_client/ClientDataModel.hpp | 253 ------------------ programs/light_client/GrapheneApplication.cpp | 80 ++++++ programs/light_client/GrapheneApplication.hpp | 65 +++++ programs/light_client/Operations.hpp | 2 +- programs/light_client/main.cpp | 16 +- 14 files changed, 426 insertions(+), 384 deletions(-) create mode 100644 programs/light_client/Account.cpp create mode 100644 programs/light_client/Account.hpp create mode 100644 programs/light_client/Asset.cpp create mode 100644 programs/light_client/Asset.hpp create mode 100644 programs/light_client/Balance.cpp create mode 100644 programs/light_client/Balance.hpp rename programs/light_client/{ClientDataModel.cpp => ChainDataModel.cpp} (69%) create mode 100644 programs/light_client/ChainDataModel.hpp delete mode 100644 programs/light_client/ClientDataModel.hpp create mode 100644 programs/light_client/GrapheneApplication.cpp create mode 100644 programs/light_client/GrapheneApplication.hpp diff --git a/programs/light_client/Account.cpp b/programs/light_client/Account.cpp new file mode 100644 index 00000000..96785e5a --- /dev/null +++ b/programs/light_client/Account.cpp @@ -0,0 +1,37 @@ +#include "Balance.hpp" +#include "ChainDataModel.hpp" + +#include + +QQmlListProperty Account::balances() +{ + auto count = [](QQmlListProperty* list) { + return reinterpret_cast(list->data)->m_balances.size(); + }; + auto at = [](QQmlListProperty* list, int index) { + return reinterpret_cast(list->data)->m_balances[index]; + }; + + return QQmlListProperty(this, this, count, at); +} + +void Account::update(const graphene::chain::account_balance_object& balance) +{ + auto balanceItr = std::find_if(m_balances.begin(), m_balances.end(), + [&balance](Balance* b) { return b->type()->id() == balance.asset_type.instance.value; }); + + if (balanceItr != m_balances.end()) { + ilog("Updating ${a}'s balance: ${b}", ("a", m_name.toStdString())("b", balance)); + (*balanceItr)->update(balance); + Q_EMIT balancesChanged(); + } else { + ilog("Adding to ${a}'s new balance: ${b}", ("a", m_name.toStdString())("b", balance)); + Balance* newBalance = new Balance; + newBalance->setParent(this); + auto model = qobject_cast(parent()); + newBalance->setProperty("type", QVariant::fromValue(model->getAsset(balance.asset_type.instance.value))); + newBalance->setProperty("amount", QVariant::fromValue(balance.balance.value)); + m_balances.append(newBalance); + Q_EMIT balancesChanged(); + } +} diff --git a/programs/light_client/Account.hpp b/programs/light_client/Account.hpp new file mode 100644 index 00000000..dbdfaa9b --- /dev/null +++ b/programs/light_client/Account.hpp @@ -0,0 +1,42 @@ +#pragma once +#pragma GCC diagnostic ignored "-Wunknown-pragmas" + +#include "GrapheneObject.hpp" + +#include + +namespace graphene { namespace chain { +class account_balance_object; +}} + +class Balance; +class Account : public GrapheneObject { + Q_OBJECT + + Q_PROPERTY(QString name MEMBER m_name READ name NOTIFY nameChanged) + Q_PROPERTY(QQmlListProperty balances READ balances NOTIFY balancesChanged) + + QString m_name; + QList m_balances; + +public: + Account(ObjectId id = -1, QString name = QString(), QObject* parent = nullptr) + : GrapheneObject(id, parent), m_name(name) + {} + + QString name()const { return m_name; } + QQmlListProperty balances(); + + void setBalances(QList balances) { + if (balances != m_balances) { + m_balances = balances; + Q_EMIT balancesChanged(); + } + } + + void update(const graphene::chain::account_balance_object& balance); + +Q_SIGNALS: + void nameChanged(); + void balancesChanged(); +}; diff --git a/programs/light_client/Asset.cpp b/programs/light_client/Asset.cpp new file mode 100644 index 00000000..545bbd3a --- /dev/null +++ b/programs/light_client/Asset.cpp @@ -0,0 +1,22 @@ +#include "Asset.hpp" + +#include + +#include + +void Asset::update(const graphene::chain::asset_object& asset) +{ + if (asset.id.instance() != id()) + setProperty("id", QVariant::fromValue(asset.id.instance())); + if (asset.symbol != m_symbol.toStdString()) { + m_symbol = QString::fromStdString(asset.symbol); + Q_EMIT symbolChanged(); + } + if (asset.precision != m_precision) { + m_precision = asset.precision; + Q_EMIT precisionChanged(); + } + + if (asset.options.core_exchange_rate != coreExchangeRate) + coreExchangeRate = asset.options.core_exchange_rate; +} diff --git a/programs/light_client/Asset.hpp b/programs/light_client/Asset.hpp new file mode 100644 index 00000000..ef34a473 --- /dev/null +++ b/programs/light_client/Asset.hpp @@ -0,0 +1,39 @@ +#pragma once + +#include "GrapheneObject.hpp" + +#include "graphene/chain/protocol/asset.hpp" + +class Asset : public GrapheneObject { + Q_OBJECT + + Q_PROPERTY(QString symbol MEMBER m_symbol READ symbol NOTIFY symbolChanged) + Q_PROPERTY(quint32 precision MEMBER m_precision NOTIFY precisionChanged) + + QString m_symbol; + quint32 m_precision; + + graphene::chain::price coreExchangeRate; + +public: + Asset(ObjectId id = -1, QString symbol = QString(), quint32 precision = 0, QObject* parent = nullptr) + : GrapheneObject(id, parent), m_symbol(symbol), m_precision(precision) + {} + + QString symbol() const { + return m_symbol; + } + + quint64 precisionPower() const { + quint64 power = 1; + for (int i = 0; i < m_precision; ++i) + power *= 10; + return power; + } + + void update(const graphene::chain::asset_object& asset); + +Q_SIGNALS: + void symbolChanged(); + void precisionChanged(); +}; diff --git a/programs/light_client/Balance.cpp b/programs/light_client/Balance.cpp new file mode 100644 index 00000000..d626b67f --- /dev/null +++ b/programs/light_client/Balance.cpp @@ -0,0 +1,16 @@ +#include "Balance.hpp" +#include "Asset.hpp" + +#include + +qreal Balance::amountReal() const { + return amount / qreal(m_type->precisionPower()); +} + +void Balance::update(const graphene::chain::account_balance_object& update) +{ + if (update.balance != amount) { + amount = update.balance.value; + emit amountChanged(); + } +} diff --git a/programs/light_client/Balance.hpp b/programs/light_client/Balance.hpp new file mode 100644 index 00000000..47e0727d --- /dev/null +++ b/programs/light_client/Balance.hpp @@ -0,0 +1,33 @@ +#pragma once +#pragma GCC diagnostic ignored "-Wunknown-pragmas" + +#include "GrapheneObject.hpp" + +namespace graphene { namespace chain { +class account_balance_object; +}} + +class Asset; +class Balance : public GrapheneObject { + Q_OBJECT + + Q_PROPERTY(Asset* type MEMBER m_type READ type NOTIFY typeChanged) + Q_PROPERTY(qint64 amount MEMBER amount NOTIFY amountChanged) + + Asset* m_type; + qint64 amount; + +public: + // This ultimately needs to be replaced with a string equivalent + Q_INVOKABLE qreal amountReal() const; + + Asset* type()const { + return m_type; + } + + void update(const graphene::chain::account_balance_object& update); + +Q_SIGNALS: + void typeChanged(); + void amountChanged(); +}; diff --git a/programs/light_client/CMakeLists.txt b/programs/light_client/CMakeLists.txt index 788bb617..6a35f279 100644 --- a/programs/light_client/CMakeLists.txt +++ b/programs/light_client/CMakeLists.txt @@ -18,7 +18,7 @@ if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug") qt5_add_resources(QML_QRC qml/qml.qrc) endif() -add_executable(light_client ClientDataModel.cpp ClientDataModel.hpp Operations.cpp main.cpp ${QML_QRC} ${QML}) +add_executable(light_client ChainDataModel.cpp Operations.cpp GrapheneApplication.cpp GrapheneObject.cpp Asset.cpp Account.cpp Balance.cpp main.cpp ${QML_QRC} ${QML}) if (CMAKE_VERSION VERSION_LESS 3.0) add_dependencies(light_client gen_qrc) diff --git a/programs/light_client/ClientDataModel.cpp b/programs/light_client/ChainDataModel.cpp similarity index 69% rename from programs/light_client/ClientDataModel.cpp rename to programs/light_client/ChainDataModel.cpp index 40d5f3af..9a877abc 100644 --- a/programs/light_client/ClientDataModel.cpp +++ b/programs/light_client/ChainDataModel.cpp @@ -1,4 +1,5 @@ -#include "ClientDataModel.hpp" +#include "ChainDataModel.hpp" +#include "Balance.hpp" #include "Operations.hpp" #include @@ -250,130 +251,3 @@ Account* ChainDataModel::getAccount(QString name) } return *itr; } - -QQmlListProperty Account::balances() -{ - auto count = [](QQmlListProperty* list) { - return reinterpret_cast(list->data)->m_balances.size(); - }; - auto at = [](QQmlListProperty* list, int index) { - return reinterpret_cast(list->data)->m_balances[index]; - }; - - return QQmlListProperty(this, this, count, at); -} - -void Account::update(const account_balance_object& balance) -{ - auto balanceItr = std::find_if(m_balances.begin(), m_balances.end(), - [&balance](Balance* b) { return b->type()->id() == balance.asset_type.instance.value; }); - - if (balanceItr != m_balances.end()) { - ilog("Updating ${a}'s balance: ${b}", ("a", m_name.toStdString())("b", balance)); - (*balanceItr)->update(balance); - Q_EMIT balancesChanged(); - } else { - ilog("Adding to ${a}'s new balance: ${b}", ("a", m_name.toStdString())("b", balance)); - Balance* newBalance = new Balance; - newBalance->setParent(this); - auto model = qobject_cast(parent()); - newBalance->setProperty("type", QVariant::fromValue(model->getAsset(balance.asset_type.instance.value))); - newBalance->setProperty("amount", QVariant::fromValue(balance.balance.value)); - m_balances.append(newBalance); - Q_EMIT balancesChanged(); - } -} - -GrapheneApplication::GrapheneApplication(QObject* parent) -:QObject(parent),m_thread("app") -{ - connect(this, &GrapheneApplication::queueExecute, - this, &GrapheneApplication::execute); - - m_model = new ChainDataModel(m_thread, this); - m_operationBuilder = new OperationBuilder(*m_model, this); - - connect(m_model, &ChainDataModel::queueExecute, - this, &GrapheneApplication::execute); - - connect(m_model, &ChainDataModel::exceptionThrown, - this, &GrapheneApplication::exceptionThrown); -} - -GrapheneApplication::~GrapheneApplication() -{ -} - -void GrapheneApplication::setIsConnected(bool v) -{ - if (v != m_isConnected) - { - m_isConnected = v; - Q_EMIT isConnectedChanged(m_isConnected); - } -} - -void GrapheneApplication::start(QString apiurl, QString user, QString pass) -{ - if (!m_thread.is_current()) - { - m_done = m_thread.async([=](){ return start(apiurl, user, pass); }); - return; - } - try { - m_client = std::make_shared(); - ilog("connecting...${s}", ("s",apiurl.toStdString())); - auto con = m_client->connect(apiurl.toStdString()); - m_connectionClosed = con->closed.connect([this]{queueExecute([this]{setIsConnected(false);});}); - auto apic = std::make_shared(*con); - auto remote_api = apic->get_remote_api(1); - auto db_api = apic->get_remote_api(0); - if (!remote_api->login(user.toStdString(), pass.toStdString())) - { - elog("login failed"); - Q_EMIT loginFailed(); - return; - } - - ilog("connecting..."); - queueExecute([=](){ - m_model->setDatabaseAPI(db_api); - }); - - queueExecute([=](){ setIsConnected(true); }); - } catch (const fc::exception& e) - { - Q_EMIT exceptionThrown(QString::fromStdString(e.to_string())); - } -} - -Q_SLOT void GrapheneApplication::execute(const std::function& func)const -{ - func(); -} - -void Balance::update(const account_balance_object& update) -{ - if (update.balance != amount) { - amount = update.balance.value; - emit amountChanged(); - } -} - - -void Asset::update(const asset_object& asset) -{ - if (asset.id.instance() != id()) - setProperty("id", QVariant::fromValue(asset.id.instance())); - if (asset.symbol != m_symbol.toStdString()) { - m_symbol = QString::fromStdString(asset.symbol); - Q_EMIT symbolChanged(); - } - if (asset.precision != m_precision) { - m_precision = asset.precision; - Q_EMIT precisionChanged(); - } - - if (asset.options.core_exchange_rate != coreExchangeRate) - coreExchangeRate = asset.options.core_exchange_rate; -} diff --git a/programs/light_client/ChainDataModel.hpp b/programs/light_client/ChainDataModel.hpp new file mode 100644 index 00000000..6e9cf434 --- /dev/null +++ b/programs/light_client/ChainDataModel.hpp @@ -0,0 +1,73 @@ +#pragma once +#pragma GCC diagnostic ignored "-Wunknown-pragmas" + +#include +#include + +#include "BoostMultiIndex.hpp" +#include "Asset.hpp" +#include "Account.hpp" + +#include + +using graphene::chain::by_id; + +namespace fc { +class thread; +} + +struct by_symbol_name; +typedef multi_index_container< + Asset*, + indexed_by< + hashed_unique< tag, const_mem_fun >, + ordered_unique< tag, const_mem_fun > + > +> asset_multi_index_type; + +struct by_account_name; +typedef multi_index_container< + Account*, + indexed_by< + hashed_unique< tag, const_mem_fun >, + ordered_unique< tag, const_mem_fun > + > +> account_multi_index_type; + +class ChainDataModel : public QObject { + Q_OBJECT + + void processUpdatedObject(const fc::variant& update); + + void getAssetImpl(QString assetIdentifier, Asset* const * assetInContainer); + void getAccountImpl(QString accountIdentifier, Account* const * accountInContainer); + +public: + Q_INVOKABLE Account* getAccount(ObjectId id); + Q_INVOKABLE Account* getAccount(QString name); + Q_INVOKABLE Asset* getAsset(ObjectId id); + Q_INVOKABLE Asset* getAsset(QString symbol); + + ChainDataModel(){} + ChainDataModel(fc::thread& t, QObject* parent = nullptr); + + void setDatabaseAPI(fc::api dbapi); + + const graphene::chain::global_property_object& global_properties() const { return m_global_properties; } + +Q_SIGNALS: + void queueExecute(const std::function&); + void exceptionThrown(QString message); + +private: + fc::thread* m_rpc_thread = nullptr; + std::string m_api_url; + fc::api m_db_api; + + graphene::chain::global_property_object m_global_properties; + + ObjectId m_account_query_num = -1; + account_multi_index_type m_accounts; + asset_multi_index_type m_assets; +}; + diff --git a/programs/light_client/ClientDataModel.hpp b/programs/light_client/ClientDataModel.hpp deleted file mode 100644 index ade9fee1..00000000 --- a/programs/light_client/ClientDataModel.hpp +++ /dev/null @@ -1,253 +0,0 @@ -#pragma once -#pragma GCC diagnostic ignored "-Wunknown-pragmas" - -#include -#include -#include -#include -#include - -#include -#include -#include - -#include -#include -#include - -using boost::multi_index_container; -using namespace boost::multi_index; - -using graphene::chain::by_id; - -using ObjectId = qint64; -Q_DECLARE_METATYPE(ObjectId) - -Q_DECLARE_METATYPE(std::function) - -class GrapheneObject : public QObject -{ - Q_OBJECT - Q_PROPERTY(ObjectId id MEMBER m_id READ id NOTIFY idChanged) - - ObjectId m_id; - -public: - GrapheneObject(ObjectId id = -1, QObject* parent = nullptr) - : QObject(parent), m_id(id) - {} - - ObjectId id() const { - return m_id; - } - -Q_SIGNALS: - void idChanged(); -}; -class Crypto { - Q_GADGET - -public: - Q_INVOKABLE QString sha256(QByteArray data) { - return QCryptographicHash::hash(data, QCryptographicHash::Sha256).toHex(); - } -}; -QML_DECLARE_TYPE(Crypto) - - -class Asset : public GrapheneObject { - Q_OBJECT - - Q_PROPERTY(QString symbol MEMBER m_symbol READ symbol NOTIFY symbolChanged) - Q_PROPERTY(quint32 precision MEMBER m_precision NOTIFY precisionChanged) - - QString m_symbol; - quint32 m_precision; - - graphene::chain::price coreExchangeRate; - -public: - Asset(ObjectId id = -1, QString symbol = QString(), quint32 precision = 0, QObject* parent = nullptr) - : GrapheneObject(id, parent), m_symbol(symbol), m_precision(precision) - {} - - QString symbol() const { - return m_symbol; - } - - quint64 precisionPower() const { - quint64 power = 1; - for (int i = 0; i < m_precision; ++i) - power *= 10; - return power; - } - - void update(const graphene::chain::asset_object& asset); - -Q_SIGNALS: - void symbolChanged(); - void precisionChanged(); -}; - -struct by_symbol_name; -typedef multi_index_container< - Asset*, - indexed_by< - hashed_unique< tag, const_mem_fun >, - ordered_unique< tag, const_mem_fun > - > -> asset_multi_index_type; - -class Balance : public GrapheneObject { - Q_OBJECT - - Q_PROPERTY(Asset* type MEMBER m_type READ type NOTIFY typeChanged) - Q_PROPERTY(qint64 amount MEMBER amount NOTIFY amountChanged) - - Asset* m_type; - qint64 amount; - -public: - // This ultimately needs to be replaced with a string equivalent - Q_INVOKABLE qreal amountReal() const { - return amount / qreal(m_type->precisionPower()); - } - - Asset* type()const { - return m_type; - } - - void update(const graphene::app::account_balance_object& update); - -Q_SIGNALS: - void typeChanged(); - void amountChanged(); -}; - -class Account : public GrapheneObject { - Q_OBJECT - - Q_PROPERTY(QString name MEMBER m_name READ name NOTIFY nameChanged) - Q_PROPERTY(QQmlListProperty balances READ balances NOTIFY balancesChanged) - - QString m_name; - QList m_balances; - -public: - Account(ObjectId id = -1, QString name = QString(), QObject* parent = nullptr) - : GrapheneObject(id, parent), m_name(name) - {} - - QString name()const { return m_name; } - QQmlListProperty balances(); - - void setBalances(QList balances) { - if (balances != m_balances) { - m_balances = balances; - Q_EMIT balancesChanged(); - } - } - - void update(const graphene::app::account_balance_object& balance); - -Q_SIGNALS: - void nameChanged(); - void balancesChanged(); -}; - -struct by_account_name; -typedef multi_index_container< - Account*, - indexed_by< - hashed_unique< tag, const_mem_fun >, - ordered_unique< tag, const_mem_fun > - > -> account_multi_index_type; - -class ChainDataModel : public QObject { - Q_OBJECT - - void processUpdatedObject(const fc::variant& update); - - void getAssetImpl(QString assetIdentifier, Asset* const * assetInContainer); - void getAccountImpl(QString accountIdentifier, Account* const * accountInContainer); - -public: - Q_INVOKABLE Account* getAccount(ObjectId id); - Q_INVOKABLE Account* getAccount(QString name); - Q_INVOKABLE Asset* getAsset(ObjectId id); - Q_INVOKABLE Asset* getAsset(QString symbol); - - ChainDataModel(){} - ChainDataModel( fc::thread& t, QObject* parent = nullptr ); - - void setDatabaseAPI(fc::api dbapi); - - const graphene::chain::global_property_object& global_properties() const { return m_global_properties; } - -Q_SIGNALS: - void queueExecute( const std::function& ); - void exceptionThrown( QString message ); - -private: - fc::thread* m_rpc_thread = nullptr; - std::string m_api_url; - fc::api m_db_api; - - graphene::chain::global_property_object m_global_properties; - - ObjectId m_account_query_num = -1; - account_multi_index_type m_accounts; - asset_multi_index_type m_assets; -}; - -class OperationBuilder; -class GrapheneApplication : public QObject { - Q_OBJECT - - Q_PROPERTY(ChainDataModel* model READ model CONSTANT) - Q_PROPERTY(OperationBuilder* operationBuilder READ operationBuilder CONSTANT) - Q_PROPERTY(bool isConnected READ isConnected NOTIFY isConnectedChanged) - - - fc::thread m_thread; - ChainDataModel* m_model = nullptr; - OperationBuilder* m_operationBuilder = nullptr; - bool m_isConnected = false; - - boost::signals2::scoped_connection m_connectionClosed; - - std::shared_ptr m_client; - fc::future m_done; - - void setIsConnected(bool v); - -protected Q_SLOTS: - void execute(const std::function&)const; - -public: - GrapheneApplication(QObject* parent = nullptr); - ~GrapheneApplication(); - - ChainDataModel* model() const { - return m_model; - } - OperationBuilder* operationBuilder() const { - return m_operationBuilder; - } - - Q_INVOKABLE void start(QString apiUrl, - QString user, - QString pass); - - bool isConnected() const - { - return m_isConnected; - } - -Q_SIGNALS: - void exceptionThrown( QString message ); - void loginFailed(); - void isConnectedChanged(bool isConnected); - void queueExecute( const std::function& ); -}; diff --git a/programs/light_client/GrapheneApplication.cpp b/programs/light_client/GrapheneApplication.cpp new file mode 100644 index 00000000..93f0c4c5 --- /dev/null +++ b/programs/light_client/GrapheneApplication.cpp @@ -0,0 +1,80 @@ +#include "GrapheneApplication.hpp" +#include "ChainDataModel.hpp" +#include "Operations.hpp" + +#include + +#include + +using graphene::app::login_api; +using graphene::app::database_api; + +GrapheneApplication::GrapheneApplication(QObject* parent) +:QObject(parent),m_thread("app") +{ + connect(this, &GrapheneApplication::queueExecute, + this, &GrapheneApplication::execute); + + m_model = new ChainDataModel(m_thread, this); + m_operationBuilder = new OperationBuilder(*m_model, this); + + connect(m_model, &ChainDataModel::queueExecute, + this, &GrapheneApplication::execute); + + connect(m_model, &ChainDataModel::exceptionThrown, + this, &GrapheneApplication::exceptionThrown); +} + +GrapheneApplication::~GrapheneApplication() +{ +} + +void GrapheneApplication::setIsConnected(bool v) +{ + if (v != m_isConnected) + { + m_isConnected = v; + Q_EMIT isConnectedChanged(m_isConnected); + } +} + +void GrapheneApplication::start(QString apiurl, QString user, QString pass) +{ + if (!m_thread.is_current()) + { + m_done = m_thread.async([=](){ return start(apiurl, user, pass); }); + return; + } + try { + m_client = std::make_shared(); + ilog("connecting...${s}", ("s",apiurl.toStdString())); + auto con = m_client->connect(apiurl.toStdString()); + m_connectionClosed = con->closed.connect([this]{queueExecute([this]{setIsConnected(false);});}); + auto apic = std::make_shared(*con); + auto remote_api = apic->get_remote_api(1); + auto db_api = apic->get_remote_api(0); + if (!remote_api->login(user.toStdString(), pass.toStdString())) + { + elog("login failed"); + Q_EMIT loginFailed(); + return; + } + + ilog("connecting..."); + queueExecute([=](){ + m_model->setDatabaseAPI(db_api); + }); + + queueExecute([=](){ setIsConnected(true); }); + } catch (const fc::exception& e) + { + Q_EMIT exceptionThrown(QString::fromStdString(e.to_string())); + } +} + +Q_SLOT void GrapheneApplication::execute(const std::function& func)const +{ + func(); +} + + diff --git a/programs/light_client/GrapheneApplication.hpp b/programs/light_client/GrapheneApplication.hpp new file mode 100644 index 00000000..10253925 --- /dev/null +++ b/programs/light_client/GrapheneApplication.hpp @@ -0,0 +1,65 @@ +#pragma once +#pragma GCC diagnostic ignored "-Wunknown-pragmas" + +#include + +#include + +#include + +namespace fc { namespace http { +class websocket_client; +}} + +class ChainDataModel; +class OperationBuilder; +class GrapheneApplication : public QObject { + Q_OBJECT + + Q_PROPERTY(ChainDataModel* model READ model CONSTANT) + Q_PROPERTY(OperationBuilder* operationBuilder READ operationBuilder CONSTANT) + Q_PROPERTY(bool isConnected READ isConnected NOTIFY isConnectedChanged) + + + fc::thread m_thread; + ChainDataModel* m_model = nullptr; + OperationBuilder* m_operationBuilder = nullptr; + bool m_isConnected = false; + + boost::signals2::scoped_connection m_connectionClosed; + + std::shared_ptr m_client; + fc::future m_done; + + void setIsConnected(bool v); + +protected Q_SLOTS: + void execute(const std::function&)const; + +public: + GrapheneApplication(QObject* parent = nullptr); + ~GrapheneApplication(); + + ChainDataModel* model() const { + return m_model; + } + OperationBuilder* operationBuilder() const { + return m_operationBuilder; + } + + Q_INVOKABLE void start(QString apiUrl, + QString user, + QString pass); + + bool isConnected() const + { + return m_isConnected; + } + +Q_SIGNALS: + void exceptionThrown(QString message); + void loginFailed(); + void isConnectedChanged(bool isConnected); + void queueExecute(const std::function&); +}; + diff --git a/programs/light_client/Operations.hpp b/programs/light_client/Operations.hpp index 1b49a3f4..73572f86 100644 --- a/programs/light_client/Operations.hpp +++ b/programs/light_client/Operations.hpp @@ -1,6 +1,6 @@ #pragma once -#include "ClientDataModel.hpp" +#include "ChainDataModel.hpp" #include diff --git a/programs/light_client/main.cpp b/programs/light_client/main.cpp index 8da5be62..cd9dc41a 100644 --- a/programs/light_client/main.cpp +++ b/programs/light_client/main.cpp @@ -2,8 +2,20 @@ #include #include -#include "ClientDataModel.hpp" +#include "GrapheneApplication.hpp" +#include "ChainDataModel.hpp" #include "Operations.hpp" +#include "Balance.hpp" + +class Crypto { + Q_GADGET + +public: + Q_INVOKABLE QString sha256(QByteArray data) { + return QCryptographicHash::hash(data, QCryptographicHash::Sha256).toHex(); + } +}; +QML_DECLARE_TYPE(Crypto) int main(int argc, char *argv[]) { @@ -38,3 +50,5 @@ int main(int argc, char *argv[]) return app.exec(); } + +#include "main.moc" From 81d2679db9c66a41020f9f9442e3bf95d6e83c48 Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Wed, 22 Jul 2015 11:17:30 -0400 Subject: [PATCH 072/353] Cut back on log spam during resyncing --- libraries/app/application.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp index 227a83db..22fee5e4 100644 --- a/libraries/app/application.cpp +++ b/libraries/app/application.cpp @@ -133,7 +133,7 @@ namespace detail { { string::size_type colon_pos = endpoint_string.find(':'); if (colon_pos == std::string::npos) - FC_THROW("Missing required port number in endpoint string \"${endpoint_string}\"", + FC_THROW("Missing required port number in endpoint string \"${endpoint_string}\"", ("endpoint_string", endpoint_string)); std::string port_string = endpoint_string.substr(colon_pos + 1); try @@ -315,7 +315,9 @@ namespace detail { virtual bool handle_block(const graphene::net::block_message& blk_msg, bool sync_mode, std::vector& contained_transaction_message_ids) override { try { - ilog("Got block #${n} from network", ("n", blk_msg.block.block_num())); + if (!sync_mode || blk_msg.block.block_num() % 10000 == 0) + ilog("Got block #${n} from network", ("n", blk_msg.block.block_num())); + try { bool result = _chain_db->push_block(blk_msg.block, _is_block_producer ? database::skip_nothing : database::skip_transaction_signatures); @@ -324,9 +326,9 @@ namespace detail { { // if we're not in sync mode, there's a chance we will be seeing some transactions // included in blocks before we see the free-floating transaction itself. If that - // happens, there's no reason to fetch the transactions, so construct a list of the + // happens, there's no reason to fetch the transactions, so construct a list of the // transaction message ids we no longer need. - // during sync, it is unlikely that we'll see any old + // during sync, it is unlikely that we'll see any old for (const processed_transaction& transaction : blk_msg.block.transactions) { graphene::net::trx_message transaction_message(transaction); From 63222183cd60b50f5f749e60a3cc4c8cd88d52ea Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Wed, 22 Jul 2015 12:11:49 -0400 Subject: [PATCH 073/353] Resolve #146 in fc --- libraries/fc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/fc b/libraries/fc index 25937606..17b64bb3 160000 --- a/libraries/fc +++ b/libraries/fc @@ -1 +1 @@ -Subproject commit 2593760687e89c8878f0e537ae9b9963fa46b210 +Subproject commit 17b64bb38f73e9bbb9de2c18b6a9dd92bca5b7bd From 3196eb75a7613e73cd0b31808818a053da049475 Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Wed, 22 Jul 2015 13:17:49 -0400 Subject: [PATCH 074/353] Fixes --- .../graphene/chain/protocol/transfer.hpp | 12 +++---- programs/light_client/GrapheneObject.cpp | 3 ++ programs/light_client/GrapheneObject.hpp | 31 +++++++++++++++++++ 3 files changed, 40 insertions(+), 6 deletions(-) create mode 100644 programs/light_client/GrapheneObject.cpp create mode 100644 programs/light_client/GrapheneObject.hpp diff --git a/libraries/chain/include/graphene/chain/protocol/transfer.hpp b/libraries/chain/include/graphene/chain/protocol/transfer.hpp index 7e5b528c..46fc1b2a 100644 --- a/libraries/chain/include/graphene/chain/protocol/transfer.hpp +++ b/libraries/chain/include/graphene/chain/protocol/transfer.hpp @@ -2,7 +2,7 @@ #include #include -namespace graphene { namespace chain { +namespace graphene { namespace chain { /** * @ingroup operations @@ -20,9 +20,9 @@ namespace graphene { namespace chain { */ struct transfer_operation : public base_operation { - struct fee_parameters_type { - uint64_t fee = 20 * GRAPHENE_BLOCKCHAIN_PRECISION; - uint32_t price_per_kbyte = 10; /// only required for large memos. + struct fee_parameters_type { + uint64_t fee = 20 * GRAPHENE_BLOCKCHAIN_PRECISION; + uint32_t price_per_kbyte = 10 * GRAPHENE_BLOCKCHAIN_PRECISION; /// only required for large memos. }; asset fee; @@ -54,7 +54,7 @@ namespace graphene { namespace chain { */ struct override_transfer_operation : public base_operation { - struct fee_parameters_type { + struct fee_parameters_type { uint64_t fee = 20 * GRAPHENE_BLOCKCHAIN_PRECISION; uint32_t price_per_kbyte = 10; /// only required for large memos. }; @@ -76,7 +76,7 @@ namespace graphene { namespace chain { void validate()const; share_type calculate_fee(const fee_parameters_type& k)const; void get_impacted_accounts( flat_set& i )const - { + { i.insert(to); i.insert(from); i.insert(issuer); diff --git a/programs/light_client/GrapheneObject.cpp b/programs/light_client/GrapheneObject.cpp new file mode 100644 index 00000000..9ec55ba2 --- /dev/null +++ b/programs/light_client/GrapheneObject.cpp @@ -0,0 +1,3 @@ +#include "GrapheneObject.hpp" + +// This space intentionally left blank diff --git a/programs/light_client/GrapheneObject.hpp b/programs/light_client/GrapheneObject.hpp new file mode 100644 index 00000000..0c53c562 --- /dev/null +++ b/programs/light_client/GrapheneObject.hpp @@ -0,0 +1,31 @@ +#pragma once +#pragma GCC diagnostic ignored "-Wunknown-pragmas" + +#include + +#include + +using ObjectId = qint64; +Q_DECLARE_METATYPE(ObjectId) + +Q_DECLARE_METATYPE(std::function) + +class GrapheneObject : public QObject +{ + Q_OBJECT + Q_PROPERTY(ObjectId id MEMBER m_id READ id NOTIFY idChanged) + + ObjectId m_id; + +public: + GrapheneObject(ObjectId id = -1, QObject* parent = nullptr) + : QObject(parent), m_id(id) + {} + + ObjectId id() const { + return m_id; + } + +Q_SIGNALS: + void idChanged(); +}; From 3e5d3495e12fe52e9798eb297b7365b103737927 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 22 Jul 2015 12:19:20 -0400 Subject: [PATCH 075/353] Remove some dead code --- libraries/chain/db_balance.cpp | 15 --- .../chain/include/graphene/chain/database.hpp | 7 -- libraries/chain/protocol/operations.cpp | 96 +------------------ 3 files changed, 3 insertions(+), 115 deletions(-) diff --git a/libraries/chain/db_balance.cpp b/libraries/chain/db_balance.cpp index 52cf97df..1afd906b 100644 --- a/libraries/chain/db_balance.cpp +++ b/libraries/chain/db_balance.cpp @@ -72,21 +72,6 @@ void database::adjust_balance(account_id_type account, asset delta ) } FC_CAPTURE_AND_RETHROW( (account)(delta) ) } -void database::adjust_balance(const account_object& account, asset delta ) -{ - adjust_balance( account.id, delta); -} - -void database::adjust_core_in_orders( const account_object& acnt, asset delta ) -{ - if( delta.asset_id == asset_id_type(0) && delta.amount != 0 ) - { - modify( acnt.statistics(*this), [&](account_statistics_object& stat){ - stat.total_core_in_orders += delta.amount; - }); - } -} - optional< vesting_balance_id_type > database::deposit_lazy_vesting( const optional< vesting_balance_id_type >& ovbid, share_type amount, uint32_t req_vesting_seconds, diff --git a/libraries/chain/include/graphene/chain/database.hpp b/libraries/chain/include/graphene/chain/database.hpp index cb68f9f0..9e29fca3 100644 --- a/libraries/chain/include/graphene/chain/database.hpp +++ b/libraries/chain/include/graphene/chain/database.hpp @@ -322,13 +322,6 @@ namespace graphene { namespace chain { * @param delta Asset ID and amount to adjust balance by */ void adjust_balance(account_id_type account, asset delta); - /// This is an overloaded method. - void adjust_balance(const account_object& account, asset delta); - - /** - * If delta.asset_id is a core asset, adjusts account statistics - */ - void adjust_core_in_orders( const account_object& acnt, asset delta ); /** * @brief Helper to make lazy deposit to CDD VBO. diff --git a/libraries/chain/protocol/operations.cpp b/libraries/chain/protocol/operations.cpp index 9743b686..0c5a9cc0 100644 --- a/libraries/chain/protocol/operations.cpp +++ b/libraries/chain/protocol/operations.cpp @@ -19,7 +19,6 @@ namespace graphene { namespace chain { - uint64_t base_operation::calculate_data_fee( uint64_t bytes, uint64_t price_per_kbyte ) { auto result = (fc::uint128(bytes) * price_per_kbyte) / 1024; @@ -27,10 +26,7 @@ uint64_t base_operation::calculate_data_fee( uint64_t bytes, uint64_t price_per_ return result.to_uint64(); } - - - -void balance_claim_operation::validate()const +void balance_claim_operation::validate()const { FC_ASSERT( fee == asset() ); FC_ASSERT( balance_owner_key != public_key_type() ); @@ -54,88 +50,9 @@ struct required_auth_visitor } }; -struct required_active_visitor -{ - typedef void result_type; - - flat_set& result; - - required_active_visitor( flat_set& r ):result(r){} - - /** for most operations this is just the fee payer */ - template - void operator()(const T& o)const - { - result.insert( o.fee_payer() ); - } - void operator()(const account_update_operation& o)const - { - /// if owner authority is required, no active authority is required - if( !(o.owner || o.active) ) - result.insert( o.fee_payer() ); - } - void operator()( const proposal_delete_operation& o )const - { - if( !o.using_owner_authority ) - result.insert( o.fee_payer() ); - } - - void operator()( const proposal_update_operation& o )const - { - result.insert( o.fee_payer() ); - for( auto id : o.active_approvals_to_add ) - result.insert(id); - for( auto id : o.active_approvals_to_remove ) - result.insert(id); - } - void operator()( const custom_operation& o )const - { - result.insert( o.required_auths.begin(), o.required_auths.end() ); - } - void operator()( const assert_operation& o )const - { - result.insert( o.fee_payer() ); - result.insert( o.required_auths.begin(), o.required_auths.end() ); - } -}; - -struct required_owner_visitor -{ - typedef void result_type; - - flat_set& result; - - required_owner_visitor( flat_set& r ):result(r){} - - /** for most operations this is a no-op */ - template - void operator()(const T& o)const {} - - void operator()(const account_update_operation& o)const - { - if( o.owner || o.active ) - result.insert( o.account ); - } - - void operator()( const proposal_delete_operation& o )const - { - if( o.using_owner_authority ) - result.insert( o.fee_payer() ); - } - - void operator()( const proposal_update_operation& o )const - { - for( auto id : o.owner_approvals_to_add ) - result.insert(id); - for( auto id : o.owner_approvals_to_remove ) - result.insert(id); - } -}; - - struct get_impacted_account_visitor { - flat_set& _impacted; + flat_set& _impacted; get_impacted_account_visitor( flat_set& impact ):_impacted(impact) {} typedef void result_type; @@ -145,6 +62,7 @@ struct get_impacted_account_visitor o.get_impacted_accounts( _impacted ); } }; + void operation_get_impacted_accounts( const operation& op, flat_set& result ) { op.visit( get_impacted_account_visitor( result ) ); @@ -154,14 +72,6 @@ void operation_get_required_authorities( const operation& op, vector& { op.visit( required_auth_visitor( result ) ); } -void operation_get_required_active_authorities( const operation& op, flat_set& result ) -{ - op.visit( required_active_visitor( result ) ); -} -void operation_get_required_owner_authorities( const operation& op, flat_set& result ) -{ - op.visit( required_owner_visitor( result ) ); -} /** * @brief Used to validate operations in a polymorphic manner From be65c277c96b96cfa6e31773cce9805d3d51be87 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Wed, 22 Jul 2015 14:45:13 -0400 Subject: [PATCH 076/353] Implement and Test Confidential Transactions This checkin contains a fully functional confidential transaction integration with passing unit tests. --- libraries/app/api.cpp | 21 ++ libraries/app/include/graphene/app/api.hpp | 7 + libraries/chain/CMakeLists.txt | 2 + libraries/chain/confidential_evaluator.cpp | 137 +++++++++ libraries/chain/db_init.cpp | 5 + .../include/graphene/chain/asset_object.hpp | 4 +- .../graphene/chain/confidential_evaluator.hpp | 71 +++++ .../include/graphene/chain/exceptions.hpp | 4 + .../graphene/chain/protocol/authority.hpp | 8 + .../graphene/chain/protocol/confidential.hpp | 284 ++++++++++++++++++ .../graphene/chain/protocol/operations.hpp | 6 +- .../include/graphene/chain/protocol/types.hpp | 13 +- libraries/chain/protocol/confidential.cpp | 122 ++++++++ tests/common/database_fixture.cpp | 2 +- tests/tests/confidential_tests.cpp | 129 ++++++++ 15 files changed, 807 insertions(+), 8 deletions(-) create mode 100644 libraries/chain/confidential_evaluator.cpp create mode 100644 libraries/chain/include/graphene/chain/confidential_evaluator.hpp create mode 100644 libraries/chain/include/graphene/chain/protocol/confidential.hpp create mode 100644 libraries/chain/protocol/confidential.cpp create mode 100644 tests/tests/confidential_tests.cpp diff --git a/libraries/app/api.cpp b/libraries/app/api.cpp index d751c31a..5539ba4c 100644 --- a/libraries/app/api.cpp +++ b/libraries/app/api.cpp @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -684,6 +685,13 @@ namespace graphene { namespace app { result.reserve( impacted.size() ); for( auto& item : impacted ) result.emplace_back(item); break; + } case impl_blinded_balance_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + result.reserve( aobj->owner.account_auths.size() ); + for( const auto& a : aobj->owner.account_auths ) + result.push_back( a.first ); + break; } case impl_block_summary_object_type:{ } case impl_account_transaction_history_object_type:{ } case impl_witness_schedule_object_type: { @@ -1088,5 +1096,18 @@ namespace graphene { namespace app { _db.get_global_properties().parameters.max_authority_depth ); return true; } + vector database_api::get_blinded_balances( const flat_set& commitments )const + { + vector result; result.reserve(commitments.size()); + const auto& bal_idx = _db.get_index_type(); + const auto& by_commitment_idx = bal_idx.indices().get(); + for( const auto& c : commitments ) + { + auto itr = by_commitment_idx.find( c ); + if( itr != by_commitment_idx.end() ) + result.push_back( *itr ); + } + return result; + } } } // graphene::app diff --git a/libraries/app/include/graphene/app/api.hpp b/libraries/app/include/graphene/app/api.hpp index be457af2..db19f305 100644 --- a/libraries/app/include/graphene/app/api.hpp +++ b/libraries/app/include/graphene/app/api.hpp @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -319,6 +320,12 @@ namespace graphene { namespace app { bool verify_authority( const signed_transaction& trx )const; + /** + * @return the set of blinded balance objects by commitment ID + */ + vector get_blinded_balances( const flat_set& commitments )const; + + private: /** called every time a block is applied to report the objects that were changed */ void on_objects_changed(const vector& ids); diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt index 3ad4183a..029c5877 100644 --- a/libraries/chain/CMakeLists.txt +++ b/libraries/chain/CMakeLists.txt @@ -21,6 +21,7 @@ add_library( graphene_chain protocol/transaction.cpp protocol/block.cpp protocol/fee_schedule.cpp + protocol/confidential.cpp pts_address.cpp @@ -37,6 +38,7 @@ add_library( graphene_chain vesting_balance_evaluator.cpp withdraw_permission_evaluator.cpp worker_evaluator.cpp + confidential_evaluator.cpp account_object.cpp asset_object.cpp diff --git a/libraries/chain/confidential_evaluator.cpp b/libraries/chain/confidential_evaluator.cpp new file mode 100644 index 00000000..4e293846 --- /dev/null +++ b/libraries/chain/confidential_evaluator.cpp @@ -0,0 +1,137 @@ +#include +#include +#include +#include + +namespace graphene { namespace chain { + +void_result transfer_to_blind_evaluator::do_evaluate( const transfer_to_blind_operation& o ) +{ try { + const auto& d = db(); + + const auto& atype = o.amount.asset_id(db()); + FC_ASSERT( atype.allow_confidential() ); + FC_ASSERT( !atype.is_transfer_restricted() ); + FC_ASSERT( !atype.enforce_white_list() ); + + for( const auto& out : o.outputs ) + { + for( const auto& a : out.owner.account_auths ) + a.first(d); // verify all accounts exist and are valid + } + return void_result(); +} FC_CAPTURE_AND_RETHROW( (o) ) } + + +void_result transfer_to_blind_evaluator::do_apply( const transfer_to_blind_operation& o ) +{ try { + db().adjust_balance( o.from, -o.amount ); + + const auto& add = o.amount.asset_id(db()).dynamic_asset_data_id(db()); // verify fee is a legit asset + db().modify( add, [&]( asset_dynamic_data_object& obj ){ + obj.confidential_supply += o.amount.amount; + FC_ASSERT( obj.confidential_supply >= 0 ); + }); + for( const auto& out : o.outputs ) + { + db().create( [&]( blinded_balance_object& obj ){ + obj.asset_id = o.amount.asset_id; + obj.owner = out.owner; + obj.commitment = out.commitment; + }); + } + return void_result(); +} FC_CAPTURE_AND_RETHROW( (o) ) } + + +void_result transfer_from_blind_evaluator::do_evaluate( const transfer_from_blind_operation& o ) +{ try { + const auto& d = db(); + o.fee.asset_id(d); // verify fee is a legit asset + const auto& bbi = d.get_index_type(); + const auto& cidx = bbi.indices().get(); + for( const auto& in : o.inputs ) + { + auto itr = cidx.find( in.commitment ); + FC_ASSERT( itr != cidx.end() ); + FC_ASSERT( itr->asset_id == o.fee.asset_id ); + FC_ASSERT( itr->owner == in.owner ); + } + return void_result(); +} FC_CAPTURE_AND_RETHROW( (o) ) } + +void_result transfer_from_blind_evaluator::do_apply( const transfer_from_blind_operation& o ) +{ try { + db().adjust_balance( o.fee_payer(), o.fee ); + db().adjust_balance( o.to, o.amount ); + const auto& bbi = db().get_index_type(); + const auto& cidx = bbi.indices().get(); + for( const auto& in : o.inputs ) + { + auto itr = cidx.find( in.commitment ); + FC_ASSERT( itr != cidx.end() ); + db().remove( *itr ); + } + const auto& add = o.amount.asset_id(db()).dynamic_asset_data_id(db()); // verify fee is a legit asset + db().modify( add, [&]( asset_dynamic_data_object& obj ){ + obj.confidential_supply -= o.amount.amount + o.fee.amount; + FC_ASSERT( obj.confidential_supply >= 0 ); + }); + return void_result(); +} FC_CAPTURE_AND_RETHROW( (o) ) } + + + + + +void_result blind_transfer_evaluator::do_evaluate( const blind_transfer_operation& o ) +{ try { + const auto& d = db(); + o.fee.asset_id(db()); // verify fee is a legit asset + const auto& bbi = db().get_index_type(); + const auto& cidx = bbi.indices().get(); + for( const auto& out : o.outputs ) + { + for( const auto& a : out.owner.account_auths ) + a.first(d); // verify all accounts exist and are valid + } + for( const auto& in : o.inputs ) + { + auto itr = cidx.find( in.commitment ); + GRAPHENE_ASSERT( itr != cidx.end(), blind_transfer_unknown_commitment, "", ("commitment",in.commitment) ); + FC_ASSERT( itr->asset_id == o.fee.asset_id ); + FC_ASSERT( itr->owner == in.owner ); + } + return void_result(); +} FC_CAPTURE_AND_RETHROW( (o) ) } + +void_result blind_transfer_evaluator::do_apply( const blind_transfer_operation& o ) +{ try { + db().adjust_balance( o.fee_payer(), o.fee ); // deposit the fee to the temp account + const auto& bbi = db().get_index_type(); + const auto& cidx = bbi.indices().get(); + for( const auto& in : o.inputs ) + { + auto itr = cidx.find( in.commitment ); + GRAPHENE_ASSERT( itr != cidx.end(), blind_transfer_unknown_commitment, "", ("commitment",in.commitment) ); + db().remove( *itr ); + } + for( const auto& out : o.outputs ) + { + db().create( [&]( blinded_balance_object& obj ){ + obj.asset_id = o.fee.asset_id; + obj.owner = out.owner; + obj.commitment = out.commitment; + }); + } + const auto& add = o.fee.asset_id(db()).dynamic_asset_data_id(db()); + db().modify( add, [&]( asset_dynamic_data_object& obj ){ + obj.confidential_supply -= o.fee.amount; + FC_ASSERT( obj.confidential_supply >= 0 ); + }); + + return void_result(); +} FC_CAPTURE_AND_RETHROW( (o) ) } + + +} } // graphene::chain diff --git a/libraries/chain/db_init.cpp b/libraries/chain/db_init.cpp index 32a724cf..812caad6 100644 --- a/libraries/chain/db_init.cpp +++ b/libraries/chain/db_init.cpp @@ -44,6 +44,7 @@ #include #include #include +#include #include @@ -150,6 +151,9 @@ void database::initialize_evaluators() register_evaluator(); register_evaluator(); register_evaluator(); + register_evaluator(); + register_evaluator(); + register_evaluator(); } void database::initialize_indexes() @@ -177,6 +181,7 @@ void database::initialize_indexes() add_index< primary_index >(); add_index< primary_index >(); add_index< primary_index >(); + add_index< primary_index >(); //Implementation object indexes add_index< primary_index >(); diff --git a/libraries/chain/include/graphene/chain/asset_object.hpp b/libraries/chain/include/graphene/chain/asset_object.hpp index 01376bc5..1e763ff4 100644 --- a/libraries/chain/include/graphene/chain/asset_object.hpp +++ b/libraries/chain/include/graphene/chain/asset_object.hpp @@ -56,6 +56,7 @@ namespace graphene { namespace chain { /// The number of shares currently in existence share_type current_supply; + share_type confidential_supply; ///< total asset held in confidential balances share_type accumulated_fees; ///< fees accumulate to be paid out over time share_type fee_pool; ///< in core asset }; @@ -91,6 +92,7 @@ namespace graphene { namespace chain { /// @return true if this asset may only be transferred to/from the issuer or market orders bool is_transfer_restricted()const { return options.flags & transfer_restricted; } bool can_override()const { return options.flags & override_authority; } + bool allow_confidential()const { return !(options.flags & asset_issuer_permission_flags::disable_confidential); } /// Helper function to get an asset object with the given amount in this asset's type asset amount(share_type a)const { return asset(a, id); } @@ -234,7 +236,7 @@ namespace graphene { namespace chain { } } // graphene::chain FC_REFLECT_DERIVED( graphene::chain::asset_dynamic_data_object, (graphene::db::object), - (current_supply)(accumulated_fees)(fee_pool) ) + (current_supply)(confidential_supply)(accumulated_fees)(fee_pool) ) FC_REFLECT_DERIVED( graphene::chain::asset_bitasset_data_object, (graphene::db::object), (feeds) diff --git a/libraries/chain/include/graphene/chain/confidential_evaluator.hpp b/libraries/chain/include/graphene/chain/confidential_evaluator.hpp new file mode 100644 index 00000000..b22ac23b --- /dev/null +++ b/libraries/chain/include/graphene/chain/confidential_evaluator.hpp @@ -0,0 +1,71 @@ +#pragma once +#include +#include +#include + +namespace graphene { namespace chain { + +/** + * @class blinded_balance_object + * @brief tracks a blinded balance commitment + * @ingroup object + * @ingroup protocol + */ +class blinded_balance_object : public graphene::db::abstract_object +{ + public: + static const uint8_t space_id = implementation_ids; + static const uint8_t type_id = impl_blinded_balance_object_type; + + fc::ecc::commitment_type commitment; + asset_id_type asset_id; + authority owner; +}; + +struct by_asset; +struct by_owner; +struct by_commitment; + +/** + * @ingroup object_index + */ +typedef multi_index_container< + blinded_balance_object, + indexed_by< + ordered_unique< tag, member< object, object_id_type, &object::id > >, + ordered_unique< tag, member > + > +> blinded_balance_object_multi_index_type; +typedef generic_index blinded_balance_index; + + +class transfer_to_blind_evaluator : public evaluator +{ + public: + typedef transfer_to_blind_operation operation_type; + + void_result do_evaluate( const transfer_to_blind_operation& o ); + void_result do_apply( const transfer_to_blind_operation& o ) ; +}; + +class transfer_from_blind_evaluator : public evaluator +{ + public: + typedef transfer_from_blind_operation operation_type; + + void_result do_evaluate( const transfer_from_blind_operation& o ); + void_result do_apply( const transfer_from_blind_operation& o ) ; +}; + +class blind_transfer_evaluator : public evaluator +{ + public: + typedef blind_transfer_operation operation_type; + + void_result do_evaluate( const blind_transfer_operation& o ); + void_result do_apply( const blind_transfer_operation& o ) ; +}; + +} } // namespace graphene::chain + +FC_REFLECT( graphene::chain::blinded_balance_object, (commitment)(asset_id)(owner) ) diff --git a/libraries/chain/include/graphene/chain/exceptions.hpp b/libraries/chain/include/graphene/chain/exceptions.hpp index 4d8a7af4..0e474548 100644 --- a/libraries/chain/include/graphene/chain/exceptions.hpp +++ b/libraries/chain/include/graphene/chain/exceptions.hpp @@ -143,6 +143,10 @@ namespace graphene { namespace chain { GRAPHENE_DECLARE_OP_EVALUATE_EXCEPTION( not_permitted, override_transfer, 1, "not permitted" ) + + GRAPHENE_DECLARE_OP_BASE_EXCEPTIONS( blind_transfer ); + GRAPHENE_DECLARE_OP_EVALUATE_EXCEPTION( unknown_commitment, blind_transfer, 1, "Attempting to claim an unknown prior commitment" ); + /* FC_DECLARE_DERIVED_EXCEPTION( addition_overflow, graphene::chain::chain_exception, 30002, "addition overflow" ) FC_DECLARE_DERIVED_EXCEPTION( subtraction_overflow, graphene::chain::chain_exception, 30003, "subtraction overflow" ) diff --git a/libraries/chain/include/graphene/chain/protocol/authority.hpp b/libraries/chain/include/graphene/chain/protocol/authority.hpp index f00009a6..28e7c7c2 100644 --- a/libraries/chain/include/graphene/chain/protocol/authority.hpp +++ b/libraries/chain/include/graphene/chain/protocol/authority.hpp @@ -83,6 +83,14 @@ namespace graphene { namespace chain { result.push_back(k.first); return result; } + + friend bool operator == ( const authority& a, const authority& b ) + { + return (a.weight_threshold == b.weight_threshold) && + (a.account_auths == b.account_auths) && + (a.key_auths == b.key_auths) && + (a.address_auths == b.address_auths); + } uint32_t num_auths()const { return account_auths.size() + key_auths.size() + address_auths.size(); } void clear() { account_auths.clear(); key_auths.clear(); } diff --git a/libraries/chain/include/graphene/chain/protocol/confidential.hpp b/libraries/chain/include/graphene/chain/protocol/confidential.hpp new file mode 100644 index 00000000..2fc37555 --- /dev/null +++ b/libraries/chain/include/graphene/chain/protocol/confidential.hpp @@ -0,0 +1,284 @@ +/* + * Copyright (c) 2015, Cryptonomex, Inc. + * All rights reserved. + */ + +#pragma once +#include + +namespace graphene { namespace chain { + +using fc::ecc::blind_factor_type; + +/** + * @defgroup stealth Stealth Transfer + * @brief Operations related to stealth transfer of value + * + * Stealth Transfers enable users to maintain their finanical privacy against even + * though all transactions are public. Every account has three balances: + * + * 1. Public Balance - everyone can see the balance changes and the parties involved + * 2. Blinded Balance - everyone can see who is transacting but not the amounts involved + * 3. Stealth Balance - both the amounts and parties involved are obscured + * + * Account owners may set a flag that allows their account to receive(or not) transfers of these kinds + * Asset issuers can enable or disable the use of each of these types of accounts. + * + * Using the "temp account" which has no permissions required, users can transfer a + * stealth balance to the temp account and then use the temp account to register a new + * account. In this way users can use stealth funds to create anonymous accounts with which + * they can perform other actions that are not compatible with blinded balances (such as market orders) + * + * @section referral_program Referral Progam + * + * Stealth transfers that do not specify any account id cannot pay referral fees so 100% of the + * transaction fee is paid to the network. + * + * @section transaction_fees Fees + * + * Stealth transfers can have an arbitrarylly large size and therefore the transaction fee for + * stealth transfers is based purley on the data size of the transaction. + */ +///@{ + +/** + * @ingroup stealth + * This data is encrypted and stored in the + * encrypted memo portion of the blind output. + */ +struct blind_memo +{ + account_id_type from; + share_type amount; + string message; + /** set to the first 4 bytes of the shared secret + * used to encrypt the memo. Used to verify that + * decryption was successful. + */ + uint32_t check= 0; +}; + +/** + * @ingroup stealth + */ +struct blind_input +{ + fc::ecc::commitment_type commitment; + /** provided to maintain the invariant that all authority + * required by an operation is explicit in the operation. Must + * match blinded_balance_id->owner + */ + authority owner; +}; + +/** + * When sending a stealth tranfer we assume users are unable to scan + * the full blockchain; therefore, payments require confirmation data + * to be passed out of band. We assume this out-of-band channel is + * not secure and therefore the contents of the confirmation must be + * encrypted. + */ +struct stealth_confirmation +{ + struct memo_data + { + public_key_type from; + asset amount; + fc::ecc::commitment_type commitment; + uint32_t check = 0; + }; + + /** + * Packs *this then encodes as base58 encoded string. + */ + operator string()const; + /** + * Unpacks from a base58 string + */ + stealth_confirmation( const std::string& base58 ); + stealth_confirmation(){} + + public_key_type one_time_key; + vector encrypted_memo; +}; + +/** + * @class blind_output + * @brief Defines data required to create a new blind commitment + * @ingroup stealth + * + * The blinded output that must be proven to be greater than 0 + */ +struct blind_output +{ + fc::ecc::commitment_type commitment; + /** only required if there is more than one blind output */ + range_proof_type range_proof; + authority owner; + optional stealth_memo; +}; + + +/** + * @class transfer_to_blind_operation + * @ingroup stealth + * @brief Converts public account balance to a blinded or stealth balance + */ +struct transfer_to_blind_operation : public base_operation +{ + struct fee_parameters_type { + uint64_t fee = 5*GRAPHENE_BLOCKCHAIN_PRECISION; ///< the cost to register the cheapest non-free account + uint32_t price_per_output = 5*GRAPHENE_BLOCKCHAIN_PRECISION; + uint32_t price_per_kb = 5*GRAPHENE_BLOCKCHAIN_PRECISION; + }; + + + asset fee; + asset amount; + account_id_type from; + blind_factor_type blinding_factor; + vector outputs; + + account_id_type fee_payer()const { return from; } + void validate()const; + share_type calculate_fee(const fee_parameters_type& )const; + + void get_impacted_accounts( flat_set& i )const + { + i.insert(from); + for( const auto& out : outputs ) + add_authority_accounts( i, out.owner ); + } +}; + +/** + * @ingroup stealth + * @brief Converts blinded/stealth balance to a public account balance + */ +struct transfer_from_blind_operation : public base_operation +{ + struct fee_parameters_type { + uint64_t fee = 5*GRAPHENE_BLOCKCHAIN_PRECISION; ///< the cost to register the cheapest non-free account + }; + + asset fee; + asset amount; + account_id_type to; + blind_factor_type blinding_factor; + vector inputs; + + account_id_type fee_payer()const { return GRAPHENE_TEMP_ACCOUNT; } + void validate()const; + + void get_impacted_accounts( flat_set& i )const + { + i.insert(to); + for( const auto& in : inputs ) + add_authority_accounts( i, in.owner ); + } + void get_required_authorities( vector& a )const + { + for( const auto& in : inputs ) + a.push_back( in.owner ); + } +}; + +/** + * @ingroup stealth + * @brief Transfers from blind to blind + * + * There are two ways to transfer value while maintaining privacy: + * 1. account to account with amount kept secret + * 2. stealth transfers with amount sender/receiver kept secret + * + * When doing account to account transfers, everyone with access to the + * memo key can see the amounts, but they will not have access to the funds. + * + * When using stealth transfers the same key is used for control and reading + * the memo. + * + * This operation is more expensive than a normal transfer and has + * a fee proportional to the size of the operation. + * + * All assets in a blind transfer must be of the same type: fee.asset_id + * The fee_payer is the temp account and can be funded from the blinded values. + * + * Using this operation you can transfer from an account and/or blinded balances + * to an account and/or blinded balances. + * + * Stealth Transfers: + * + * Assuming Receiver has key pair R,r and has shared public key R with Sender + * Assuming Sender has key pair S,s + * Generate one time key pair O,o as s.child(nonce) where nonce can be inferred from transaction + * Calculate secret V = o*R + * blinding_factor = sha256(V) + * memo is encrypted via aes of V + * owner = R.child(sha256(blinding_factor)) + * + * Sender gives Receiver output ID to complete the payment. + * + * This process can also be used to send money to a cold wallet without having to + * pre-register any accounts. + * + * Outputs are assigned the same IDs as the inputs until no more input IDs are available, + * in which case a the return value will be the *first* ID allocated for an output. Additional + * output IDs are allocated sequentially thereafter. If there are fewer outputs than inputs + * then the input IDs are freed and never used again. + */ +struct blind_transfer_operation : public base_operation +{ + struct fee_parameters_type { + uint64_t fee = 5*GRAPHENE_BLOCKCHAIN_PRECISION; ///< the cost to register the cheapest non-free account + uint32_t price_per_output = 5*GRAPHENE_BLOCKCHAIN_PRECISION; + uint32_t price_per_kb = 5*GRAPHENE_BLOCKCHAIN_PRECISION; + }; + + asset fee; + vector inputs; + vector outputs; + + /** graphene TEMP account */ + account_id_type fee_payer()const; + void validate()const; + share_type calculate_fee( const fee_parameters_type& k )const; + + void get_impacted_accounts( flat_set& i )const + { + for( const auto& in : inputs ) + add_authority_accounts( i, in.owner ); + for( const auto& out : outputs ) + add_authority_accounts( i, out.owner ); + } + void get_required_authorities( vector& a )const + { + for( const auto& in : inputs ) + a.push_back( in.owner ); + } +}; + +///@} endgroup stealth +} } // graphene::chain + +FC_REFLECT( graphene::chain::stealth_confirmation, + (one_time_key)(encrypted_memo) ) + +FC_REFLECT( graphene::chain::stealth_confirmation::memo_data, + (from)(amount)(commitment)(check) ); + +FC_REFLECT( graphene::chain::blind_memo, + (from)(amount)(message)(check) ) +FC_REFLECT( graphene::chain::blind_input, + (commitment)(owner) ) +FC_REFLECT( graphene::chain::blind_output, + (commitment)(range_proof)(owner)(stealth_memo) ) +FC_REFLECT( graphene::chain::transfer_to_blind_operation, + (fee)(amount)(from)(blinding_factor)(outputs) ) +FC_REFLECT( graphene::chain::transfer_from_blind_operation, + (fee)(amount)(to)(blinding_factor)(inputs) ) +FC_REFLECT( graphene::chain::blind_transfer_operation, + (fee)(inputs)(outputs) ) +FC_REFLECT( graphene::chain::transfer_to_blind_operation::fee_parameters_type, (fee)(price_per_output)(price_per_kb) ) +FC_REFLECT( graphene::chain::transfer_from_blind_operation::fee_parameters_type, (fee) ) +FC_REFLECT( graphene::chain::blind_transfer_operation::fee_parameters_type, (fee)(price_per_output)(price_per_kb) ) + diff --git a/libraries/chain/include/graphene/chain/protocol/operations.hpp b/libraries/chain/include/graphene/chain/protocol/operations.hpp index 853e9c5c..28a87263 100644 --- a/libraries/chain/include/graphene/chain/protocol/operations.hpp +++ b/libraries/chain/include/graphene/chain/protocol/operations.hpp @@ -14,6 +14,7 @@ #include #include #include +#include namespace graphene { namespace chain { @@ -59,7 +60,10 @@ namespace graphene { namespace chain { custom_operation, assert_operation, balance_claim_operation, - override_transfer_operation + override_transfer_operation, + transfer_to_blind_operation, + blind_transfer_operation, + transfer_from_blind_operation > operation; /// @} // operations group diff --git a/libraries/chain/include/graphene/chain/protocol/types.hpp b/libraries/chain/include/graphene/chain/protocol/types.hpp index f78b93cf..8ef2af12 100644 --- a/libraries/chain/include/graphene/chain/protocol/types.hpp +++ b/libraries/chain/include/graphene/chain/protocol/types.hpp @@ -84,10 +84,11 @@ namespace graphene { namespace chain { override_authority = 0x04, /**< issuer may transfer asset back to himself */ transfer_restricted = 0x08, /**< require the issuer to be one party to every transfer */ disable_force_settle = 0x10, /**< disable force settling */ - global_settle = 0x20 /**< allow the bitasset issuer to force a global settling -- this may be set in permissions, but not flags */ + global_settle = 0x20, /**< allow the bitasset issuer to force a global settling -- this may be set in permissions, but not flags */ + disable_confidential = 0x40 /**< allow the asset to be used with confidential transactions */ }; - const static uint32_t ASSET_ISSUER_PERMISSION_MASK = charge_market_fee|white_list|override_authority|transfer_restricted|disable_force_settle|global_settle; - const static uint32_t UIA_ASSET_ISSUER_PERMISSION_MASK = charge_market_fee|white_list|override_authority|transfer_restricted; + const static uint32_t ASSET_ISSUER_PERMISSION_MASK = charge_market_fee|white_list|override_authority|transfer_restricted|disable_force_settle|global_settle|disable_confidential; + const static uint32_t UIA_ASSET_ISSUER_PERMISSION_MASK = charge_market_fee|white_list|override_authority|transfer_restricted|disable_confidential; enum reserved_spaces { @@ -138,7 +139,8 @@ namespace graphene { namespace chain { impl_transaction_object_type, impl_block_summary_object_type, impl_account_transaction_history_object_type, - impl_witness_schedule_object_type + impl_witness_schedule_object_type, + impl_blinded_balance_object_type }; enum meta_info_object_type @@ -386,6 +388,7 @@ FC_REFLECT_ENUM( graphene::chain::impl_object_type, (impl_block_summary_object_type) (impl_account_transaction_history_object_type) (impl_witness_schedule_object_type) + (impl_blinded_balance_object_type) ) FC_REFLECT_ENUM( graphene::chain::meta_info_object_type, (meta_account_object_type)(meta_asset_object_type) ) @@ -417,4 +420,4 @@ FC_REFLECT_TYPENAME( graphene::chain::account_transaction_history_id_type ) FC_REFLECT_TYPENAME( graphene::chain::witness_schedule_id_type ) FC_REFLECT( graphene::chain::void_t, ) -FC_REFLECT_ENUM( graphene::chain::asset_issuer_permission_flags, (charge_market_fee)(white_list)(transfer_restricted)(override_authority)(disable_force_settle)(global_settle) ) +FC_REFLECT_ENUM( graphene::chain::asset_issuer_permission_flags, (charge_market_fee)(white_list)(transfer_restricted)(override_authority)(disable_force_settle)(global_settle)(disable_confidential) ) diff --git a/libraries/chain/protocol/confidential.cpp b/libraries/chain/protocol/confidential.cpp new file mode 100644 index 00000000..7e4df25f --- /dev/null +++ b/libraries/chain/protocol/confidential.cpp @@ -0,0 +1,122 @@ +#include +#include +#include + +namespace graphene { namespace chain { + +void transfer_to_blind_operation::validate()const +{ + FC_ASSERT( fee.amount >= 0 ); + FC_ASSERT( amount.amount > 0 ); + + vector in; + vector out(outputs.size()); + int64_t net_public = amount.amount.value; + for( uint32_t i = 0; i < out.size(); ++i ) + { + out[i] = outputs[i].commitment; + /// require all outputs to be sorted prevents duplicates AND prevents implementations + /// from accidentally leaking information by how they arrange commitments. + if( i > 0 ) FC_ASSERT( out[i-1] < out[i], "all outputs must be sorted by commitment id" ); + FC_ASSERT( !outputs[i].owner.is_impossible() ); + } + FC_ASSERT( out.size(), "there must be at least one output" ); + + auto public_c = fc::ecc::blind(blinding_factor,net_public); + + FC_ASSERT( fc::ecc::verify_sum( {public_c}, out, 0 ), "", ("net_public",net_public) ); + + if( outputs.size() > 1 ) + { + for( auto out : outputs ) + { + auto info = fc::ecc::range_get_info( out.range_proof ); + FC_ASSERT( info.max_value <= GRAPHENE_MAX_SHARE_SUPPLY ); + } + } +} + +share_type transfer_to_blind_operation::calculate_fee( const fee_parameters_type& k )const +{ + return k.fee + outputs.size() * k.price_per_output + calculate_data_fee( fc::raw::pack_size(*this), k.price_per_kb ); +} + + +void transfer_from_blind_operation::validate()const +{ + FC_ASSERT( amount.amount > 0 ); + FC_ASSERT( fee.amount >= 0 ); + FC_ASSERT( inputs.size() > 0 ); + FC_ASSERT( amount.asset_id == fee.asset_id ); + + + vector in(inputs.size()); + vector out; + int64_t net_public = fee.amount.value + amount.amount.value; + out.push_back( fc::ecc::blind( blinding_factor, net_public ) ); + for( uint32_t i = 0; i < in.size(); ++i ) + { + in[i] = inputs[i].commitment; + /// by requiring all inputs to be sorted we also prevent duplicate commitments on the input + if( i > 0 ) FC_ASSERT( in[i-1] < in[i], "all inputs must be sorted by commitment id" ); + } + FC_ASSERT( in.size(), "there must be at least one input" ); + FC_ASSERT( fc::ecc::verify_sum( in, out, 0 ) ); +} + + +/** + * If fee_payer = temp_account_id, then the fee is paid by the surplus balance of inputs-outputs and + * 100% of the fee goes to the network. + */ +account_id_type blind_transfer_operation::fee_payer()const +{ + return GRAPHENE_TEMP_ACCOUNT; +} + + +/** + * This method can be computationally intensive because it verifies that input commitments - output commitments add up to 0 + */ +void blind_transfer_operation::validate()const +{ try { + vector in(inputs.size()); + vector out(outputs.size()); + int64_t net_public = fee.amount.value;//from_amount.value - to_amount.value; + for( uint32_t i = 0; i < in.size(); ++i ) + { + in[i] = inputs[i].commitment; + /// by requiring all inputs to be sorted we also prevent duplicate commitments on the input + if( i > 0 ) FC_ASSERT( in[i-1] < in[i] ); + } + for( uint32_t i = 0; i < out.size(); ++i ) + { + out[i] = outputs[i].commitment; + if( i > 0 ) FC_ASSERT( out[i-1] < out[i] ); + FC_ASSERT( !outputs[i].owner.is_impossible() ); + } + FC_ASSERT( in.size(), "there must be at least one input" ); + FC_ASSERT( fc::ecc::verify_sum( in, out, net_public ), "", ("net_public", net_public) ); + + if( outputs.size() > 1 ) + { + for( auto out : outputs ) + { + auto info = fc::ecc::range_get_info( out.range_proof ); + FC_ASSERT( info.max_value <= GRAPHENE_MAX_SHARE_SUPPLY ); + } + } +} FC_CAPTURE_AND_RETHROW( (*this) ) } + +share_type blind_transfer_operation::calculate_fee( const fee_parameters_type& k )const +{ + return k.fee + outputs.size() * k.price_per_output + calculate_data_fee( fc::raw::pack_size(*this), k.price_per_kb );; +} + + + + + + + +} } // graphene::chain diff --git a/tests/common/database_fixture.cpp b/tests/common/database_fixture.cpp index b7075ab4..296292bc 100644 --- a/tests/common/database_fixture.cpp +++ b/tests/common/database_fixture.cpp @@ -192,7 +192,7 @@ void database_fixture::verify_asset_supplies( const database& db ) } BOOST_CHECK_EQUAL( core_in_orders.value , reported_core_in_orders.value ); - BOOST_CHECK_EQUAL( total_balances[asset_id_type()].value , core_asset_data.current_supply.value ); + BOOST_CHECK_EQUAL( total_balances[asset_id_type()].value , core_asset_data.current_supply.value - core_asset_data.confidential_supply.value); // wlog("*** End asset supply verification ***"); } diff --git a/tests/tests/confidential_tests.cpp b/tests/tests/confidential_tests.cpp new file mode 100644 index 00000000..dba74eda --- /dev/null +++ b/tests/tests/confidential_tests.cpp @@ -0,0 +1,129 @@ +/* + * Copyright (c) 2015, Cryptonomex, Inc. + * All rights reserved. + * + * This source code is provided for evaluation in private test networks only, until September 8, 2015. After this date, this license expires and + * the code may not be used, modified or distributed for any purpose. Redistribution and use in source and binary forms, with or without modification, + * are permitted until September 8, 2015, provided that the following conditions are met: + * + * 1. The code and/or derivative works are used only for private test networks consisting of no more than 10 P2P nodes. + * + * 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 +#include +#include + +#include +#include +#include +#include + +#include + +#include +#include "../common/database_fixture.hpp" + +using namespace graphene::chain; + +BOOST_FIXTURE_TEST_SUITE( confidential_tests, database_fixture ) +BOOST_AUTO_TEST_CASE( confidential_test ) +{ try { + ACTORS( (dan)(nathan) ) + const asset_object& core = asset_id_type()(db); + + transfer(account_id_type()(db), dan, core.amount(1000000)); + + transfer_to_blind_operation to_blind; + to_blind.amount = core.amount(1000); + to_blind.from = dan.id; + + auto owner1_key = fc::ecc::private_key::generate(); + auto owner1_pub = owner1_key.get_public_key(); + auto owner2_key = fc::ecc::private_key::generate(); + auto owner2_pub = owner2_key.get_public_key(); + + blind_output out1, out2; + out1.owner = authority( 1, public_key_type(owner1_pub), 1 ); + out2.owner = authority( 1, public_key_type(owner2_pub), 1 ); + + + auto InB1 = fc::sha256::hash("InB1"); + auto InB2 = fc::sha256::hash("InB2"); + auto OutB = fc::sha256::hash("InB2"); + auto nonce1 = fc::sha256::hash("nonce"); + auto nonce2 = fc::sha256::hash("nonce2"); + + out1.commitment = fc::ecc::blind(InB1,250); + out1.range_proof = fc::ecc::range_proof_sign( 0, out1.commitment, InB1, nonce1, 0, 0, 250 ); + + out2.commitment = fc::ecc::blind(InB2,750); + out2.range_proof = fc::ecc::range_proof_sign( 0, out2.commitment, InB1, nonce2, 0, 0, 750 ); + + to_blind.blinding_factor = fc::ecc::blind_sum( {InB1,InB2}, 2 ); + to_blind.outputs = {out2,out1}; + + trx.operations = {to_blind}; + trx.sign( dan_private_key ); + db.push_transaction(trx); + trx.signatures.clear(); + + BOOST_TEST_MESSAGE( "Transfering from blind to blind with change address" ); + auto Out3B = fc::sha256::hash("Out3B"); + auto Out4B = fc::ecc::blind_sum( {InB2,Out3B}, 1 ); // add InB2 - Out3b + blind_output out3, out4; + out3.commitment = fc::ecc::blind(Out3B,300); + out3.range_proof = fc::ecc::range_proof_sign( 0, out3.commitment, InB1, nonce1, 0, 0, 300 ); + out4.commitment = fc::ecc::blind(Out4B,750-300-10); + out4.range_proof = fc::ecc::range_proof_sign( 0, out3.commitment, InB1, nonce1, 0, 0, 750-300-10 ); + + + blind_transfer_operation blind_tr; + blind_tr.fee = core.amount(10); + blind_tr.inputs.push_back( {out2.commitment, out2.owner} ); + blind_tr.outputs = {out3,out4}; + blind_tr.validate(); + trx.operations = {blind_tr}; + trx.sign( owner2_key ); + db.push_transaction(trx); + + BOOST_TEST_MESSAGE( "Attempting to double spend the same commitments" ); + blind_tr.fee = core.amount(11); + + Out4B = fc::ecc::blind_sum( {InB2,Out3B}, 1 ); // add InB2 - Out3b + out4.commitment = fc::ecc::blind(Out4B,750-300-11); + auto out4_amount = 750-300-10; + out4.range_proof = fc::ecc::range_proof_sign( 0, out3.commitment, InB1, nonce1, 0, 0, 750-300-11 ); + blind_tr.outputs = {out4,out3}; + trx.operations = {blind_tr}; + BOOST_REQUIRE_THROW( db.push_transaction(trx, ~0), graphene::chain::blind_transfer_unknown_commitment ); + + + BOOST_TEST_MESSAGE( "Transfering from blind to nathan public" ); + out4.commitment = fc::ecc::blind(Out4B,750-300-10); + + transfer_from_blind_operation from_blind; + from_blind.fee = core.amount(10); + from_blind.to = nathan.id; + from_blind.amount = core.amount( out4_amount - 10 ); + from_blind.blinding_factor = Out4B; + from_blind.inputs.push_back( {out4.commitment, out4.owner} ); + trx.operations = {from_blind}; + trx.signatures.clear(); + db.push_transaction(trx); + + BOOST_REQUIRE_EQUAL( get_balance( nathan, core ), 750-300-10-10 ); + +} FC_LOG_AND_RETHROW() } + + + +BOOST_AUTO_TEST_SUITE_END() From 0159a5c36b0298b5e56f48582b64374dda3f06bd Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Wed, 22 Jul 2015 14:56:02 -0400 Subject: [PATCH 077/353] Add missing header --- programs/light_client/BoostMultiIndex.hpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 programs/light_client/BoostMultiIndex.hpp diff --git a/programs/light_client/BoostMultiIndex.hpp b/programs/light_client/BoostMultiIndex.hpp new file mode 100644 index 00000000..b31d00e9 --- /dev/null +++ b/programs/light_client/BoostMultiIndex.hpp @@ -0,0 +1,14 @@ +#pragma once + +#include +#include +#include +#include +#include + +using boost::multi_index_container; +using boost::multi_index::indexed_by; +using boost::multi_index::hashed_unique; +using boost::multi_index::tag; +using boost::multi_index::const_mem_fun; +using boost::multi_index::ordered_unique; From de435d9d51a64812db938c08728fd78d057491a2 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 22 Jul 2015 14:42:24 -0400 Subject: [PATCH 078/353] whitespace fixes --- libraries/chain/include/graphene/chain/protocol/asset.hpp | 1 - .../chain/include/graphene/chain/protocol/asset_ops.hpp | 1 - .../chain/include/graphene/chain/protocol/fee_schedule.hpp | 1 - .../chain/include/graphene/chain/protocol/operations.hpp | 6 ------ .../chain/include/graphene/chain/protocol/transfer.hpp | 1 - 5 files changed, 10 deletions(-) diff --git a/libraries/chain/include/graphene/chain/protocol/asset.hpp b/libraries/chain/include/graphene/chain/protocol/asset.hpp index 4c116c37..967a5c8e 100644 --- a/libraries/chain/include/graphene/chain/protocol/asset.hpp +++ b/libraries/chain/include/graphene/chain/protocol/asset.hpp @@ -203,4 +203,3 @@ FC_REFLECT( graphene::chain::price, (base)(quote) ) (core_exchange_rate) FC_REFLECT( graphene::chain::price_feed, GRAPHENE_PRICE_FEED_FIELDS ) - diff --git a/libraries/chain/include/graphene/chain/protocol/asset_ops.hpp b/libraries/chain/include/graphene/chain/protocol/asset_ops.hpp index d64f4474..b79345af 100644 --- a/libraries/chain/include/graphene/chain/protocol/asset_ops.hpp +++ b/libraries/chain/include/graphene/chain/protocol/asset_ops.hpp @@ -458,4 +458,3 @@ FC_REFLECT( graphene::chain::asset_reserve_operation, (fee)(payer)(amount_to_reserve)(extensions) ) FC_REFLECT( graphene::chain::asset_fund_fee_pool_operation, (fee)(from_account)(asset_id)(amount)(extensions) ); - diff --git a/libraries/chain/include/graphene/chain/protocol/fee_schedule.hpp b/libraries/chain/include/graphene/chain/protocol/fee_schedule.hpp index 5cbb5abd..93caecf9 100644 --- a/libraries/chain/include/graphene/chain/protocol/fee_schedule.hpp +++ b/libraries/chain/include/graphene/chain/protocol/fee_schedule.hpp @@ -55,4 +55,3 @@ namespace graphene { namespace chain { FC_REFLECT_TYPENAME( graphene::chain::fee_parameters ) FC_REFLECT( graphene::chain::fee_schedule, (parameters)(scale) ) - diff --git a/libraries/chain/include/graphene/chain/protocol/operations.hpp b/libraries/chain/include/graphene/chain/protocol/operations.hpp index 853e9c5c..dac09e6a 100644 --- a/libraries/chain/include/graphene/chain/protocol/operations.hpp +++ b/libraries/chain/include/graphene/chain/protocol/operations.hpp @@ -108,9 +108,3 @@ namespace graphene { namespace chain { FC_REFLECT_TYPENAME( graphene::chain::operation ) FC_REFLECT( graphene::chain::op_wrapper, (op) ) - - - - - - diff --git a/libraries/chain/include/graphene/chain/protocol/transfer.hpp b/libraries/chain/include/graphene/chain/protocol/transfer.hpp index 46fc1b2a..46251fd0 100644 --- a/libraries/chain/include/graphene/chain/protocol/transfer.hpp +++ b/libraries/chain/include/graphene/chain/protocol/transfer.hpp @@ -90,4 +90,3 @@ FC_REFLECT( graphene::chain::override_transfer_operation::fee_parameters_type, ( FC_REFLECT( graphene::chain::override_transfer_operation, (fee)(issuer)(from)(to)(amount)(memo)(extensions) ) FC_REFLECT( graphene::chain::transfer_operation, (fee)(from)(to)(amount)(memo)(extensions) ) - From 085013fbd8fd1b4f62fca77711703da3e03f9b08 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 22 Jul 2015 14:43:00 -0400 Subject: [PATCH 079/353] database_fixture.hpp: Add {name}_public_key to fields defined by ACTOR macro --- tests/common/database_fixture.hpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/common/database_fixture.hpp b/tests/common/database_fixture.hpp index 366d95a9..dc73047c 100644 --- a/tests/common/database_fixture.hpp +++ b/tests/common/database_fixture.hpp @@ -117,11 +117,12 @@ using namespace graphene::db; #define INVOKE(test) ((struct test*)this)->test_method(); trx.clear() #define PREP_ACTOR(name) \ - fc::ecc::private_key name ## _private_key = generate_private_key(BOOST_PP_STRINGIZE(name)); + fc::ecc::private_key name ## _private_key = generate_private_key(BOOST_PP_STRINGIZE(name)); \ + public_key_type name ## _public_key = name ## _private_key.get_public_key(); #define ACTOR(name) \ PREP_ACTOR(name) \ - const auto& name = create_account(BOOST_PP_STRINGIZE(name), name ## _private_key.get_public_key()); \ + const auto& name = create_account(BOOST_PP_STRINGIZE(name), name ## _public_key); \ account_id_type name ## _id = name.id; (void)name ## _id; #define GET_ACTOR(name) \ From 9b6998af6dc18b0f518786b11ff21ee5aa8bb37a Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 22 Jul 2015 15:01:52 -0400 Subject: [PATCH 080/353] config.hpp: Increase GRAPHENE_MIN_ACCOUNT_NAME_LENGTH to 3 Length requirement is enforced by RFC 1035 grammar. Use a compiler error to tell anyone changing config.hpp that any value for this constant smaller than 3 is unsupported by the implementation. --- libraries/chain/include/graphene/chain/config.hpp | 2 +- libraries/chain/protocol/account.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libraries/chain/include/graphene/chain/config.hpp b/libraries/chain/include/graphene/chain/config.hpp index 04fcffb4..75e6f54b 100644 --- a/libraries/chain/include/graphene/chain/config.hpp +++ b/libraries/chain/include/graphene/chain/config.hpp @@ -20,7 +20,7 @@ #define GRAPHENE_SYMBOL "CORE" #define GRAPHENE_ADDRESS_PREFIX "GPH" -#define GRAPHENE_MIN_ACCOUNT_NAME_LENGTH 1 +#define GRAPHENE_MIN_ACCOUNT_NAME_LENGTH 3 #define GRAPHENE_MAX_ACCOUNT_NAME_LENGTH 63 #define GRAPHENE_MIN_ASSET_SYMBOL_LENGTH 3 diff --git a/libraries/chain/protocol/account.cpp b/libraries/chain/protocol/account.cpp index 1a4726ae..693720c3 100644 --- a/libraries/chain/protocol/account.cpp +++ b/libraries/chain/protocol/account.cpp @@ -34,6 +34,10 @@ namespace graphene { namespace chain { */ bool is_valid_name( const string& name ) { +#if GRAPHENE_MIN_ACCOUNT_NAME_LENGTH < 3 +#error This is_valid_name implementation implicitly enforces minimum name length of 3. +#endif + const size_t len = name.size(); if( len < GRAPHENE_MIN_ACCOUNT_NAME_LENGTH ) return false; From 9c1be851cd2f14b968f9986b9ef0e3a3ebaa161c Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 22 Jul 2015 14:49:03 -0400 Subject: [PATCH 081/353] authority_tests.cpp: Initial implementation of get_required_signatures_test #182 --- tests/tests/authority_tests.cpp | 120 ++++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) diff --git a/tests/tests/authority_tests.cpp b/tests/tests/authority_tests.cpp index dfabf40a..54947428 100644 --- a/tests/tests/authority_tests.cpp +++ b/tests/tests/authority_tests.cpp @@ -1085,4 +1085,124 @@ BOOST_FIXTURE_TEST_CASE( voting_account, database_fixture ) vikram_committee_member) != db.get_global_properties().active_committee_members.end()); } FC_LOG_AND_RETHROW() } +/** + * Simple corporate accounts: + * + * Well Corp. Alice 50, Bob 50 T=60 + * Xylo Company Alice 30, Cindy 50 T=40 + * Yaya Inc. Bob 10, Dan 10, Edy 10 T=20 + * Zyzz Co. Dan 50 T=40 + * + * Complex corporate accounts: + * + * Mega Corp. Well 30, Yes 30 T=40 + * Nova Ltd. Alice 10, Well 10 T=20 + * Odle Intl. Dan 10, Yes 10, Zyzz 10 T=20 + * Poxx LLC Well 10, Xylo 10, Yes 20, Zyzz 20 T=40 + */ + +BOOST_FIXTURE_TEST_CASE( get_required_signatures_test, database_fixture ) +{ + try + { + ACTORS( + (alice)(bob)(cindy)(dan)(edy) + (mega)(nova)(odle)(poxx) + (well)(xylo)(yaya)(zyzz) + ); + + auto set_auth = [&]( + account_id_type aid, + const authority& auth + ) + { + signed_transaction tx; + account_update_operation op; + op.account = aid; + op.active = auth; + op.owner = auth; + tx.operations.push_back( op ); + tx.set_expiration( db.head_block_time() + fc::minutes( 5 ) ); + PUSH_TX( db, tx, database::skip_transaction_signatures | database::skip_authority_check ); + } ; + + auto get_active = [&]( + account_id_type aid + ) -> const authority* + { + return &(aid(db).active); + } ; + + auto get_owner = [&]( + account_id_type aid + ) -> const authority* + { + return &(aid(db).owner); + } ; + + auto chk = [&]( + const signed_transaction& tx, + flat_set available_keys, + set ref_set + ) -> bool + { + //wdump( (tx)(available_keys) ); + set result_set = tx.get_required_signatures( available_keys, get_active, get_owner ); + //wdump( (result_set)(ref_set) ); + return result_set == ref_set; + } ; + + set_auth( well_id, authority( 60, alice_id, 50, bob_id, 50 ) ); + set_auth( xylo_id, authority( 40, alice_id, 30, cindy_id, 50 ) ); + set_auth( yaya_id, authority( 20, bob_id, 10, dan_id, 10, edy_id, 10 ) ); + set_auth( zyzz_id, authority( 40, dan_id, 50 ) ); + + set_auth( mega_id, authority( 40, well_id, 30, yaya_id, 30 ) ); + set_auth( nova_id, authority( 20, alice_id, 10, well_id, 10 ) ); + set_auth( odle_id, authority( 20, dan_id, 10, yaya_id, 10, zyzz_id, 10 ) ); + set_auth( poxx_id, authority( 40, well_id, 10, xylo_id, 10, yaya_id, 20, zyzz_id, 20 ) ); + + signed_transaction tx; + flat_set< public_key_type > all_keys + { alice_public_key, bob_public_key, cindy_public_key, dan_public_key, edy_public_key }; + + tx.operations.push_back( transfer_operation() ); + transfer_operation& op = tx.operations.back().get(); + op.to = edy_id; + op.amount = asset(1); + + op.from = alice_id; + BOOST_CHECK( chk( tx, all_keys, { alice_public_key } ) ); + op.from = bob_id; + BOOST_CHECK( chk( tx, all_keys, { bob_public_key } ) ); + op.from = well_id; + BOOST_CHECK( chk( tx, all_keys, { alice_public_key, bob_public_key } ) ); + op.from = xylo_id; + BOOST_CHECK( chk( tx, all_keys, { alice_public_key, cindy_public_key } ) ); + op.from = yaya_id; + BOOST_CHECK( chk( tx, all_keys, { bob_public_key, dan_public_key } ) ); + op.from = zyzz_id; + BOOST_CHECK( chk( tx, all_keys, { dan_public_key } ) ); + + op.from = mega_id; + BOOST_CHECK( chk( tx, all_keys, { alice_public_key, bob_public_key, dan_public_key } ) ); + op.from = nova_id; + BOOST_CHECK( chk( tx, all_keys, { alice_public_key, bob_public_key } ) ); + op.from = odle_id; + BOOST_CHECK( chk( tx, all_keys, { bob_public_key, dan_public_key } ) ); + op.from = poxx_id; + BOOST_CHECK( chk( tx, all_keys, { alice_public_key, bob_public_key, cindy_public_key, dan_public_key } ) ); + + // TODO: Add sigs to tx, then check + // TODO: Check removing sigs + // TODO: Accounts with mix of keys and accounts in their authority + // TODO: Tx with multiple ops requiring different sigs + } + catch(fc::exception& e) + { + edump((e.to_detail_string())); + throw; + } +} + BOOST_AUTO_TEST_SUITE_END() From f2638a9cdf96308804205ee47f84fd8abccada0b Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Wed, 22 Jul 2015 16:23:42 -0400 Subject: [PATCH 082/353] Adding stub for Wallet API --- programs/light_client/CMakeLists.txt | 11 ++- programs/light_client/Wallet.cpp | 139 +++++++++++++++++++++++++++ programs/light_client/Wallet.hpp | 121 +++++++++++++++++++++++ 3 files changed, 270 insertions(+), 1 deletion(-) create mode 100644 programs/light_client/Wallet.cpp create mode 100644 programs/light_client/Wallet.hpp diff --git a/programs/light_client/CMakeLists.txt b/programs/light_client/CMakeLists.txt index 6a35f279..36608db3 100644 --- a/programs/light_client/CMakeLists.txt +++ b/programs/light_client/CMakeLists.txt @@ -18,7 +18,16 @@ if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug") qt5_add_resources(QML_QRC qml/qml.qrc) endif() -add_executable(light_client ChainDataModel.cpp Operations.cpp GrapheneApplication.cpp GrapheneObject.cpp Asset.cpp Account.cpp Balance.cpp main.cpp ${QML_QRC} ${QML}) +add_executable(light_client + Wallet.cpp + ChainDataModel.cpp + Operations.cpp + GrapheneApplication.cpp + GrapheneObject.cpp + Asset.cpp + Account.cpp + Balance.cpp + main.cpp ${QML_QRC} ${QML}) if (CMAKE_VERSION VERSION_LESS 3.0) add_dependencies(light_client gen_qrc) diff --git a/programs/light_client/Wallet.cpp b/programs/light_client/Wallet.cpp new file mode 100644 index 00000000..9fd4e43c --- /dev/null +++ b/programs/light_client/Wallet.cpp @@ -0,0 +1,139 @@ +#include "Wallet.hpp" + +Wallet::Wallet() +{ +} + +Wallet::~Wallet() +{ + close(); +} + +bool Wallet::open( QString file_path ) +{ + return false; +} + +bool Wallet::close() +{ + save(); + return false; +} + +bool Wallet::save() +{ + return false; +} + +bool Wallet::saveAs( QString file_path ) +{ + return false; +} + +bool Wallet::create( QString file_path, QString brain_key ) +{ + return false; +} + +bool Wallet::loadBrainKey( QString brain_key ) +{ + return false; +} + +bool Wallet::purgeBrainKey() +{ + return false; +} + +bool Wallet::hasBrainKey()const +{ + return false; +} + +QString Wallet::getBrainKey()const +{ + return QString(); +} + +bool Wallet::isLocked()const +{ + return false; +} +QString Wallet::unlock( QString password ) +{ + return QString(); +} + +bool Wallet::lock() +{ + return false; +} +bool Wallet::changePassword( QString new_password ) +{ + return false; +} + +QString Wallet::getActivePrivateKey( QString owner_pub_key, uint32_t seq ) +{ + return QString(); +} + +QString Wallet::getOwnerPrivateKey( uint32_t seq ) +{ + return QString(); +} + + +QString Wallet::getKeyLabel( QString pubkey ) +{ + return QString(); +} + +QString Wallet::getPublicKey( QString label ) +{ + return QString(); +} + +/** imports a public key and assigns it a label */ +bool Wallet::importPublicKey( QString pubkey, QString label) +{ + return false; +} + +/** + * @param wifkey a private key in (WIF) Wallet Import Format + * @pre !isLocked() + **/ +bool Wallet::importPrivateKey( QString wifkey, QString label ) +{ + return false; +} + +/** removes the key, its lablel and its private key */ +bool Wallet::removePublicKey( QString pubkey ) +{ + return false; +} + +/** removes only the private key, keeping the public key and label */ +bool Wallet::removePrivateKey( QString pubkey ) +{ + return false; +} + +/** + * @pre !isLocked() + */ +vector Wallet::signDigest( const digest_type& d, + const set& keys )const +{ + vector result; + return result; +} + +const flat_set& Wallet::getAvailablePrivateKeys()const +{ + return _available_private_keys; +} + + diff --git a/programs/light_client/Wallet.hpp b/programs/light_client/Wallet.hpp new file mode 100644 index 00000000..3c229365 --- /dev/null +++ b/programs/light_client/Wallet.hpp @@ -0,0 +1,121 @@ +#pragma once +#pragma GCC diagnostic ignored "-Wunknown-pragmas" + +#include +#include + +using std::string; +using std::vector; +using std::set; +using fc::flat_set; +using std::map; +using graphene::chain::public_key_type; +using graphene::chain::digest_type; +using graphene::chain::signature_type; +using fc::optional; + +struct key_data +{ + string label; /** unique label assigned to this key */ + vector encrypted_private_key; +}; +FC_REFLECT( key_data, (label)(encrypted_private_key) ); + +struct wallet_file +{ + optional> encrypted_brain_key; + optional> encrypted_master_key; + map encrypted_private_keys; +}; + +FC_REFLECT( wallet_file, + (encrypted_brain_key) + (encrypted_master_key) + (encrypted_private_keys) + ); + + +/** + * @class Wallet + * @brief Securely maintains a set of labeled public and private keys + */ +class Wallet : public QObject +{ + public: + Q_OBJECT + + Wallet(); + ~Wallet(); + + Q_INVOKABLE bool open( QString file_path ); + Q_INVOKABLE bool close(); + Q_INVOKABLE bool save(); + Q_INVOKABLE bool saveAs( QString file_path ); + Q_INVOKABLE bool create( QString file_path, QString brain_key = QString() ); + + /** required to generate new owner keys */ + Q_INVOKABLE bool loadBrainKey( QString brain_key ); + + /** removes brain key to secure owner keys */ + Q_INVOKABLE bool purgeBrainKey(); + Q_INVOKABLE bool hasBrainKey()const; + + /** @pre hasBrainKey() */ + Q_INVOKABLE QString getBrainKey()const; + + Q_INVOKABLE bool isLocked()const; + Q_INVOKABLE QString unlock( QString password ); + Q_INVOKABLE bool lock(); + Q_INVOKABLE bool changePassword( QString new_password ); + + /** + * @pre !isLocked(); + * @post save() + * @return WIF private key + */ + Q_INVOKABLE QString getActivePrivateKey( QString owner_public_key, uint32_t sequence ); + + /** + * @pre !isLocked(); + * @pre hasBrainKey(); + * @post save() + * @return WIF private key + */ + Q_INVOKABLE QString getOwnerPrivateKey( uint32_t sequence ); + + Q_INVOKABLE QString getKeyLabel( QString pubkey ); + Q_INVOKABLE QString getPublicKey( QString label ); + + /** imports a public key and assigns it a label */ + Q_INVOKABLE bool importPublicKey( QString pubkey, QString label = QString() ); + + /** + * @param wifkey a private key in (WIF) Wallet Import Format + * @pre !isLocked() + **/ + Q_INVOKABLE bool importPrivateKey( QString wifkey, QString label = QString() ); + + /** removes the key, its lablel and its private key */ + Q_INVOKABLE bool removePublicKey( QString pubkey ); + + /** removes only the private key, keeping the public key and label */ + Q_INVOKABLE bool removePrivateKey( QString pubkey ); + + + /** + * @pre !isLocked() + */ + vector signDigest( const digest_type& d, + const set& keys )const; + + const flat_set& getAvailablePrivateKeys()const; + + private: + fc::path _wallet_file_path; + wallet_file _data; + fc::sha512 _decrypted_master_key; + flat_set _available_private_keys; + map _label_to_key; +}; + + From 65bdeddfbe889082230e8329303bac1fcde79fa2 Mon Sep 17 00:00:00 2001 From: valzav Date: Wed, 22 Jul 2015 13:25:11 -0700 Subject: [PATCH 083/353] added Vagrantfile - automates dev env creation; contains Ubuntu 14.04 setup shell script --- Vagrantfile | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) create mode 100644 Vagrantfile diff --git a/Vagrantfile b/Vagrantfile new file mode 100644 index 00000000..a47c45c0 --- /dev/null +++ b/Vagrantfile @@ -0,0 +1,112 @@ +# Configures Ubuntu 14.04 VM to be used with BitShares 2.0 (Graphene) +# Downloads and builds all necessary software to run witness node and web GUI +# Use with Vagrant (http://docs.vagrantup.com/v2/getting-started/index.html) +# or just execute the shell script below. +# Vagrant setup supports the following providers: Virtual Box, Digital Ocean, Amazon EC2 + +$script = < + + + diff --git a/programs/full_web_node/web/vendors.js b/programs/full_web_node/web/vendors.js new file mode 100644 index 00000000..879f4571 --- /dev/null +++ b/programs/full_web_node/web/vendors.js @@ -0,0 +1,80 @@ +!function(e){function t(n){if(r[n])return r[n].exports;var a=r[n]={exports:{},id:n,loaded:!1};return e[n].call(a.exports,a,a.exports,t),a.loaded=!0,a.exports}var n=window.webpackJsonp;window.webpackJsonp=function(o,i){for(var s,l,u=0,c=[];u1)for(var n=1;n-1?t:e}function u(e,t){if(t=t||{},this.url=e,this.credentials=t.credentials||"omit",this.headers=new n(t.headers),this.method=l(t.method||"GET"),this.mode=t.mode||null,this.referrer=null,("GET"===this.method||"HEAD"===this.method)&&t.body)throw new TypeError("Body not allowed for GET or HEAD requests");this._initBody(t.body)}function c(e){var t=new FormData;return e.trim().split("&").forEach(function(e){if(e){var n=e.split("="),r=n.shift().replace(/\+/g," "),a=n.join("=").replace(/\+/g," ");t.append(decodeURIComponent(r),decodeURIComponent(a))}}),t}function d(e){var t=new n,r=e.getAllResponseHeaders().trim().split("\n");return r.forEach(function(e){var n=e.trim().split(":"),r=n.shift().trim(),a=n.join(":").trim();t.append(r,a)}),t}function p(e,t){t||(t={}),this._initBody(e),this.type="default",this.url=null,this.status=t.status,this.ok=this.status>=200&&this.status<300,this.statusText=t.statusText,this.headers=t.headers instanceof n?t.headers:new n(t.headers),this.url=t.url||""}if(!self.fetch){n.prototype.append=function(n,r){n=e(n),r=t(r);var a=this.map[n];a||(a=[],this.map[n]=a),a.push(r)},n.prototype["delete"]=function(t){delete this.map[e(t)]},n.prototype.get=function(t){var n=this.map[e(t)];return n?n[0]:null},n.prototype.getAll=function(t){return this.map[e(t)]||[]},n.prototype.has=function(t){return this.map.hasOwnProperty(e(t))},n.prototype.set=function(n,r){this.map[e(n)]=[t(r)]},n.prototype.forEach=function(e,t){Object.getOwnPropertyNames(this.map).forEach(function(n){this.map[n].forEach(function(r){e.call(t,r,n,this)},this)},this)};var f={blob:"FileReader"in self&&"Blob"in self&&function(){try{return new Blob,!0}catch(e){return!1}}(),formData:"FormData"in self},h=["DELETE","GET","HEAD","OPTIONS","POST","PUT"];s.call(u.prototype),s.call(p.prototype),self.Headers=n,self.Request=u,self.Response=p,self.fetch=function(e,t){var n;return n=u.prototype.isPrototypeOf(e)&&!t?e:new u(e,t),new Promise(function(e,t){function r(){return"responseURL"in a?a.responseURL:/^X-Request-URL:/m.test(a.getAllResponseHeaders())?a.getResponseHeader("X-Request-URL"):void 0}var a=new XMLHttpRequest;a.onload=function(){var n=1223===a.status?204:a.status;if(100>n||n>599)return void t(new TypeError("Network request failed"));var o={status:n,statusText:a.statusText,headers:d(a),url:r()},i="response"in a?a.response:a.responseText;e(new p(i,o))},a.onerror=function(){t(new TypeError("Network request failed"))},a.open(n.method,n.url,!0),"include"===n.credentials&&(a.withCredentials=!0),"responseType"in a&&f.blob&&(a.responseType="blob"),n.headers.forEach(function(e,t){a.setRequestHeader(t,e)}),a.send("undefined"==typeof n._bodyInit?null:n._bodyInit)})},self.fetch.polyfill=!0}}()},,,,,,,,,,,,,,,,,,,,function(e,t,n){e.exports=n(197)},function(e,t,n){(function(t){"use strict";var r=n(198),a=n(202),o=n(216),i=n(231),s=n(206),l=n(211),u=n(205),c=n(226),d=n(234),p=n(236),f=n(285),h=n(213),m=n(261),g=n(222),y=n(316),b=n(223),v=n(348),_=n(207),w=n(305),k=n(350);f.inject();var E=u.createElement,x=u.createFactory,O=u.cloneElement;"production"!==t.env.NODE_ENV&&(E=c.createElement,x=c.createFactory,O=c.cloneElement);var S=g.measure("React","render",m.render),P={Children:{map:a.map,forEach:a.forEach,count:a.count,only:k},Component:o,DOM:d,PropTypes:y,initializeTouchEvents:function(e){r.useTouchEvents=e},createClass:i.createClass,createElement:E,cloneElement:O,createFactory:x,createMixin:function(e){return e},constructAndRenderComponent:m.constructAndRenderComponent,constructAndRenderComponentByID:m.constructAndRenderComponentByID,findDOMNode:w,render:S,renderToString:v.renderToString,renderToStaticMarkup:v.renderToStaticMarkup,unmountComponentAtNode:m.unmountComponentAtNode,isValidElement:u.isValidElement,withContext:s.withContext,__spread:_};if("undefined"!=typeof __REACT_DEVTOOLS_GLOBAL_HOOK__&&"function"==typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.inject&&__REACT_DEVTOOLS_GLOBAL_HOOK__.inject({CurrentOwner:l,InstanceHandles:h,Mount:m,Reconciler:b,TextComponent:p}),"production"!==t.env.NODE_ENV){var A=n(245);if(A.canUseDOM&&window.top===window.self){navigator.userAgent.indexOf("Chrome")>-1&&"undefined"==typeof __REACT_DEVTOOLS_GLOBAL_HOOK__&&console.debug("Download the React DevTools for a better development experience: https://fb.me/react-devtools");for(var j=[Array.isArray,Array.prototype.every,Array.prototype.forEach,Array.prototype.indexOf,Array.prototype.map,Date.now,Function.prototype.bind,Object.keys,String.prototype.split,String.prototype.trim,Object.create,Object.freeze],C=0;C1){for(var p=Array(c),f=0;c>f;f++)p[f]=arguments[f+2];a.children=p}if(e&&e.defaultProps){var h=e.defaultProps;for(r in h)"undefined"==typeof a[r]&&(a[r]=h[r])}return new d(e,s,l,i.current,o.current,a)},d.createFactory=function(e){var t=d.createElement.bind(null,e);return t.type=e,t},d.cloneAndReplaceProps=function(e,n){var r=new d(e.type,e.key,e.ref,e._owner,e._context,n);return"production"!==t.env.NODE_ENV&&(r._store.validated=e._store.validated),r},d.cloneElement=function(e,t,n){var r,a=s({},e.props),o=e.key,l=e.ref,c=e._owner;if(null!=t){void 0!==t.ref&&(l=t.ref,c=i.current),void 0!==t.key&&(o=""+t.key);for(r in t)t.hasOwnProperty(r)&&!u.hasOwnProperty(r)&&(a[r]=t[r])}var p=arguments.length-2;if(1===p)a.children=n;else if(p>1){for(var f=Array(p),h=0;p>h;h++)f[h]=arguments[h+2];a.children=f}return new d(e.type,o,l,c,e._context,a)},d.isValidElement=function(e){var t=!(!e||!e._isReactElement);return t},e.exports=d}).call(t,n(175))},function(e,t,n){(function(t){"use strict";var r=n(207),a=n(208),o=n(209),i=!1,s={current:a,withContext:function(e,n){"production"!==t.env.NODE_ENV&&("production"!==t.env.NODE_ENV?o(i,"withContext is deprecated and will be removed in a future version. Use a wrapper component with getChildContext instead."):null,i=!0);var a,l=s.current;s.current=r({},l,e);try{a=n()}finally{s.current=l}return a}};e.exports=s}).call(t,n(175))},function(e,t){"use strict";function n(e,t){if(null==e)throw new TypeError("Object.assign target cannot be null or undefined");for(var n=Object(e),r=Object.prototype.hasOwnProperty,a=1;ar;r++)n.push(arguments[r]);if(void 0===t)throw new Error("`warning(condition, format, ...args)` requires a warning message argument");if(t.length<10||/^[s\W]*$/.test(t))throw new Error("The warning format should be able to uniquely identify this warning. Please, use a more descriptive format than: "+t);if(0!==t.indexOf("Failed Composite propType: ")&&!e){var o=0,i="Warning: "+t.replace(/%s/g,function(){return n[o++]});console.warn(i);try{throw new Error(i)}catch(s){}}}),e.exports=a}).call(t,n(175))},function(e,t){function n(e){return function(){return e}}function r(){}r.thatReturns=n,r.thatReturnsFalse=n(!1),r.thatReturnsTrue=n(!0),r.thatReturnsNull=n(null),r.thatReturnsThis=function(){return this},r.thatReturnsArgument=function(e){return e},e.exports=r},function(e,t){"use strict";var n={current:null};e.exports=n},function(e,t,n){(function(t){"use strict";function r(e){return y[e]}function a(e,t){return e&&null!=e.key?i(e.key):t.toString(36)}function o(e){return(""+e).replace(b,r)}function i(e){return"$"+o(e)}function s(e,n,r,o,l){var d=typeof e;if(("undefined"===d||"boolean"===d)&&(e=null),null===e||"string"===d||"number"===d||u.isValidElement(e))return o(l,e,""===n?m+a(e,0):n,r),1;var y,b,_,w=0;if(Array.isArray(e))for(var k=0;k=s;s++)if(a(e,s)&&a(n,s))i=s;else if(e.charAt(s)!==n.charAt(s))break;var l=e.substr(0,i);return"production"!==t.env.NODE_ENV?p(o(l),"getFirstCommonAncestorID(%s, %s): Expected a valid React DOM ID: %s",e,n,l):p(o(l)),l}function c(e,n,r,a,o,u){e=e||"",n=n||"","production"!==t.env.NODE_ENV?p(e!==n,"traverseParentPath(...): Cannot traverse from and to the same ID, `%s`.",e):p(e!==n);var c=i(n,e);"production"!==t.env.NODE_ENV?p(c||i(e,n),"traverseParentPath(%s, %s, ...): Cannot traverse from two IDs that do not have a parent path.",e,n):p(c||i(e,n));for(var d=0,f=c?s:l,h=e;;h=f(h,n)){var g;if(o&&h===e||u&&h===n||(g=r(h,c,a)),g===!1||h===n)break;"production"!==t.env.NODE_ENV?p(d++1){var t=e.indexOf(f,1);return t>-1?e.substr(0,t):e}return null},traverseEnterLeave:function(e,t,n,r,a){var o=u(e,t);o!==e&&c(e,o,n,r,!1,!0),o!==t&&c(o,t,n,a,!0,!1)},traverseTwoPhase:function(e,t,n){e&&(c("",e,t,n,!0,!1),c(e,"",t,n,!1,!0))},traverseAncestors:function(e,t,n){c("",e,t,n,!0,!1)},_getFirstCommonAncestorID:u,_getNextDescendantID:l,isAncestorIDOf:i,SEPARATOR:f};e.exports=g}).call(t,n(175))},function(e,t){"use strict";var n={injectCreateReactRootIndex:function(e){r.createReactRootIndex=e}},r={createReactRootIndex:null,injection:n};e.exports=r},function(e,t){"use strict";function n(e){var t=e&&(r&&e[r]||e[a]);return"function"==typeof t?t:void 0}var r="function"==typeof Symbol&&Symbol.iterator,a="@@iterator";e.exports=n},function(e,t,n){(function(t){"use strict";function r(e,t){this.props=e,this.context=t}var a=n(217),o=n(201),i=n(209);if(r.prototype.setState=function(e,n){"production"!==t.env.NODE_ENV?o("object"==typeof e||"function"==typeof e||null==e,"setState(...): takes an object of state variables to update or a function which returns an object of state variables."):o("object"==typeof e||"function"==typeof e||null==e),"production"!==t.env.NODE_ENV&&("production"!==t.env.NODE_ENV?i(null!=e,"setState(...): You passed an undefined or null state object; instead, use forceUpdate()."):null),a.enqueueSetState(this,e),n&&a.enqueueCallback(this,n)},r.prototype.forceUpdate=function(e){a.enqueueForceUpdate(this),e&&a.enqueueCallback(this,e)},"production"!==t.env.NODE_ENV){var s={getDOMNode:["getDOMNode","Use React.findDOMNode(component) instead."],isMounted:["isMounted","Instead, make sure to clean up subscriptions and pending requests in componentWillUnmount to prevent memory leaks."],replaceProps:["replaceProps","Instead, call React.render again at the top level."],replaceState:["replaceState","Refactor your code to use setState instead (see https://github.com/facebook/react/issues/3236)."],setProps:["setProps","Instead, call React.render again at the top level."]},l=function(e,n){try{Object.defineProperty(r.prototype,e,{get:function(){return void("production"!==t.env.NODE_ENV?i(!1,"%s(...) is deprecated in plain JavaScript React classes. %s",n[0],n[1]):null)}})}catch(a){}};for(var u in s)s.hasOwnProperty(u)&&l(u,s[u])}e.exports=r}).call(t,n(175))},function(e,t,n){(function(t){"use strict";function r(e){e!==o.currentlyMountingInstance&&u.enqueueUpdate(e)}function a(e,n){"production"!==t.env.NODE_ENV?d(null==i.current,"%s(...): Cannot update during an existing state transition (such as within `render`). Render methods should be a pure function of props and state.",n):d(null==i.current);var r=l.get(e);return r?r===o.currentlyUnmountingInstance?null:r:("production"!==t.env.NODE_ENV&&("production"!==t.env.NODE_ENV?p(!n,"%s(...): Can only update a mounted or mounting component. This usually means you called %s() on an unmounted component. This is a no-op.",n,n):null),null)}var o=n(218),i=n(211),s=n(205),l=n(219),u=n(220),c=n(207),d=n(201),p=n(209),f={enqueueCallback:function(e,n){"production"!==t.env.NODE_ENV?d("function"==typeof n,"enqueueCallback(...): You called `setProps`, `replaceProps`, `setState`, `replaceState`, or `forceUpdate` with a callback that isn't callable."):d("function"==typeof n);var i=a(e);return i&&i!==o.currentlyMountingInstance?(i._pendingCallbacks?i._pendingCallbacks.push(n):i._pendingCallbacks=[n],void r(i)):null},enqueueCallbackInternal:function(e,n){"production"!==t.env.NODE_ENV?d("function"==typeof n,"enqueueCallback(...): You called `setProps`, `replaceProps`, `setState`, `replaceState`, or `forceUpdate` with a callback that isn't callable."):d("function"==typeof n),e._pendingCallbacks?e._pendingCallbacks.push(n):e._pendingCallbacks=[n],r(e)},enqueueForceUpdate:function(e){var t=a(e,"forceUpdate");t&&(t._pendingForceUpdate=!0,r(t))},enqueueReplaceState:function(e,t){var n=a(e,"replaceState");n&&(n._pendingStateQueue=[t],n._pendingReplaceState=!0,r(n))},enqueueSetState:function(e,t){var n=a(e,"setState");if(n){var o=n._pendingStateQueue||(n._pendingStateQueue=[]);o.push(t),r(n)}},enqueueSetProps:function(e,n){var o=a(e,"setProps");if(o){"production"!==t.env.NODE_ENV?d(o._isTopLevel,"setProps(...): You called `setProps` on a component with a parent. This is an anti-pattern since props will get reactively updated when rendered. Instead, change the owner's `render` method to pass the correct value as props to the component where it is created."):d(o._isTopLevel);var i=o._pendingElement||o._currentElement,l=c({},i.props,n);o._pendingElement=s.cloneAndReplaceProps(i,l),r(o)}},enqueueReplaceProps:function(e,n){var o=a(e,"replaceProps");if(o){"production"!==t.env.NODE_ENV?d(o._isTopLevel,"replaceProps(...): You called `replaceProps` on a component with a parent. This is an anti-pattern since props will get reactively updated when rendered. Instead, change the owner's `render` method to pass the correct value as props to the component where it is created."):d(o._isTopLevel);var i=o._pendingElement||o._currentElement;o._pendingElement=s.cloneAndReplaceProps(i,n),r(o)}},enqueueElementInternal:function(e,t){e._pendingElement=t,r(e)}};e.exports=f}).call(t,n(175))},function(e,t){"use strict";var n={currentlyMountingInstance:null,currentlyUnmountingInstance:null};e.exports=n},function(e,t){"use strict";var n={remove:function(e){e._reactInternalInstance=void 0},get:function(e){return e._reactInternalInstance},has:function(e){return void 0!==e._reactInternalInstance},set:function(e,t){e._reactInternalInstance=t}};e.exports=n},function(e,t,n){(function(t){"use strict";function r(){"production"!==t.env.NODE_ENV?y(A.ReactReconcileTransaction&&k,"ReactUpdates: must inject a reconcile transaction class and batching strategy"):y(A.ReactReconcileTransaction&&k)}function a(){this.reinitializeTransaction(),this.dirtyComponentsLength=null,this.callbackQueue=c.getPooled(),this.reconcileTransaction=A.ReactReconcileTransaction.getPooled()}function o(e,t,n,a,o){r(),k.batchedUpdates(e,t,n,a,o)}function i(e,t){return e._mountOrder-t._mountOrder}function s(e){var n=e.dirtyComponentsLength;"production"!==t.env.NODE_ENV?y(n===v.length,"Expected flush transaction's stored dirty-components length (%s) to match dirty-components array length (%s).",n,v.length):y(n===v.length),v.sort(i);for(var r=0;n>r;r++){var a=v[r],o=a._pendingCallbacks;if(a._pendingCallbacks=null,h.performUpdateIfNecessary(a,e.reconcileTransaction),o)for(var s=0;sr;r++)e[r].call(n[r]);e.length=0,n.length=0}},reset:function(){this._callbacks=null,this._contexts=null},destructor:function(){this.reset()}}),a.addPoolingTo(r),e.exports=r}).call(t,n(175))},function(e,t,n){(function(t){"use strict";function n(e,t,n){return n}var r={enableMeasure:!1,storedMeasure:n,measureMethods:function(e,n,a){if("production"!==t.env.NODE_ENV)for(var o in a)a.hasOwnProperty(o)&&(e[o]=r.measure(n,a[o],e[o]))},measure:function(e,n,a){if("production"!==t.env.NODE_ENV){var o=null,i=function(){return r.enableMeasure?(o||(o=r.storedMeasure(e,n,a)),o.apply(this,arguments)):a.apply(this,arguments)};return i.displayName=e+"_"+n,i}return a},injection:{injectMeasure:function(e){r.storedMeasure=e}}};e.exports=r}).call(t,n(175))},function(e,t,n){(function(t){"use strict";function r(){a.attachRefs(this,this._currentElement)}var a=n(224),o=n(226),i={mountComponent:function(e,n,a,i){var s=e.mountComponent(n,a,i);return"production"!==t.env.NODE_ENV&&o.checkAndWarnForMutatedProps(e._currentElement),a.getReactMountReady().enqueue(r,e),s},unmountComponent:function(e){a.detachRefs(e,e._currentElement),e.unmountComponent()},receiveComponent:function(e,n,i,s){var l=e._currentElement;if(n!==l||null==n._owner){"production"!==t.env.NODE_ENV&&o.checkAndWarnForMutatedProps(n);var u=a.shouldUpdateRefs(l,n);u&&a.detachRefs(e,l),e.receiveComponent(n,i,s),u&&i.getReactMountReady().enqueue(r,e)}},performUpdateIfNecessary:function(e,t){e.performUpdateIfNecessary(t)}};e.exports=i}).call(t,n(175))},function(e,t,n){"use strict";function r(e,t,n){"function"==typeof e?e(t.getPublicInstance()):o.addComponentAsRefTo(t,e,n)}function a(e,t,n){"function"==typeof e?e(null):o.removeComponentAsRefFrom(t,e,n)}var o=n(225),i={};i.attachRefs=function(e,t){var n=t.ref;null!=n&&r(n,e,t._owner)},i.shouldUpdateRefs=function(e,t){return t._owner!==e._owner||t.ref!==e.ref},i.detachRefs=function(e,t){var n=t.ref;null!=n&&a(n,e,t._owner)},e.exports=i},function(e,t,n){(function(t){"use strict";var r=n(201),a={isValidOwner:function(e){return!(!e||"function"!=typeof e.attachRef||"function"!=typeof e.detachRef)},addComponentAsRefTo:function(e,n,o){"production"!==t.env.NODE_ENV?r(a.isValidOwner(o),"addComponentAsRefTo(...): Only a ReactOwner can have refs. This usually means that you're trying to add a ref to a component that doesn't have an owner (that is, was not created inside of another component's `render` method). Try rendering this component inside of a new top-level component which will hold the ref."):r(a.isValidOwner(o)),o.attachRef(n,e)},removeComponentAsRefFrom:function(e,n,o){"production"!==t.env.NODE_ENV?r(a.isValidOwner(o),"removeComponentAsRefFrom(...): Only a ReactOwner can have refs. This usually means that you're trying to remove a ref to a component that doesn't have an owner (that is, was not created inside of another component's `render` method). Try rendering this component inside of a new top-level component which will hold the ref."):r(a.isValidOwner(o)),o.getPublicInstance().refs[n]===e.getPublicInstance()&&o.detachRef(n)}};e.exports=a}).call(t,n(175))},function(e,t,n){(function(t){"use strict";function r(){if(v.current){var e=v.current.getName();if(e)return" Check the render method of `"+e+"`."}return""}function a(e){var t=e&&e.getPublicInstance();if(!t)return void 0;var n=t.constructor;return n?n.displayName||n.name||void 0:void 0}function o(){var e=v.current;return e&&a(e)||void 0}function i(e,t){e._store.validated||null!=e.key||(e._store.validated=!0,l('Each child in an array or iterator should have a unique "key" prop.',e,t))}function s(e,t,n){S.test(e)&&l("Child objects should have non-numeric keys so ordering is preserved.",t,n)}function l(e,n,r){var i=o(),s="string"==typeof r?r:r.displayName||r.name,l=i||s,u=x[e]||(x[e]={});if(!u.hasOwnProperty(l)){u[l]=!0;var c=i?" Check the render method of "+i+".":s?" Check the React.render call using <"+s+">.":"",d="";if(n&&n._owner&&n._owner!==v.current){var p=a(n._owner);d=" It was passed a child from "+p+"."}"production"!==t.env.NODE_ENV?E(!1,e+"%s%s See https://fb.me/react-warning-keys for more information.",c,d):null}}function u(e,t){if(Array.isArray(e))for(var n=0;n");var l="";o&&(l=" The element was created by "+o+"."),"production"!==t.env.NODE_ENV?E(!1,"Don't set .props.%s of the React component%s. Instead, specify the correct value when initially creating the element or use React.cloneElement to make a new element with updated props.%s",e,s,l):null}}function p(e,t){return e!==e?t!==t:0===e&&0===t?1/e===1/t:e===t}function f(e){if(e._store){var t=e._store.originalProps,n=e.props;for(var r in n)n.hasOwnProperty(r)&&(t.hasOwnProperty(r)&&p(t[r],n[r])||(d(r,e),t[r]=n[r]))}}function h(e){if(null!=e.type){var n=_.getComponentClassForElement(e),r=n.displayName||n.name;n.propTypes&&c(r,n.propTypes,e.props,y.prop),"function"==typeof n.getDefaultProps&&("production"!==t.env.NODE_ENV?E(n.getDefaultProps.isReactClassApproved,"getDefaultProps is only used on classic React.createClass definitions. Use a static property named `defaultProps` instead."):null)}}var m=n(205),g=n(204),y=n(227),b=n(228),v=n(211),_=n(229),w=n(215),k=n(201),E=n(209),x={},O={},S=/^\d+$/,P={},A={checkAndWarnForMutatedProps:f,createElement:function(e,n,r){"production"!==t.env.NODE_ENV?E(null!=e,"React.createElement: type should not be null or undefined. It should be a string (for DOM elements) or a ReactClass (for composite components)."):null;var a=m.createElement.apply(this,arguments);if(null==a)return a;for(var o=2;ol;l++)s.push(arguments[l]);if(i!==e&&null!==i)"production"!==t.env.NODE_ENV?O(!1,"bind(): React component methods may only be bound to the component instance. See %s",a):null;else if(!s.length)return"production"!==t.env.NODE_ENV?O(!1,"bind(): You are binding a component method to the component. React does this for you automatically in a high-performance way, so you can safely remove this call. See %s",a):null,r;var c=o.apply(r,arguments);return c.__reactBoundContext=e,c.__reactBoundMethod=n,c.__reactBoundArguments=s,c}}return r}function d(e){for(var t in e.__reactAutoBindMap)if(e.__reactAutoBindMap.hasOwnProperty(t)){var n=e.__reactAutoBindMap[t];e[t]=c(e,m.guard(n,e.constructor.displayName+"."+t))}}var p=n(216),f=n(211),h=n(205),m=n(232),g=n(219),y=n(218),b=n(227),v=n(228),_=n(217),w=n(207),k=n(201),E=n(200),x=n(233),O=n(209),S=x({mixins:null}),P=E({DEFINE_ONCE:null,DEFINE_MANY:null,OVERRIDE_BASE:null,DEFINE_MANY_MERGED:null}),A=[],j={mixins:P.DEFINE_MANY,statics:P.DEFINE_MANY,propTypes:P.DEFINE_MANY,contextTypes:P.DEFINE_MANY,childContextTypes:P.DEFINE_MANY,getDefaultProps:P.DEFINE_MANY_MERGED,getInitialState:P.DEFINE_MANY_MERGED,getChildContext:P.DEFINE_MANY_MERGED,render:P.DEFINE_ONCE,componentWillMount:P.DEFINE_MANY,componentDidMount:P.DEFINE_MANY,componentWillReceiveProps:P.DEFINE_MANY,shouldComponentUpdate:P.DEFINE_ONCE,componentWillUpdate:P.DEFINE_MANY,componentDidUpdate:P.DEFINE_MANY,componentWillUnmount:P.DEFINE_MANY,updateComponent:P.OVERRIDE_BASE},C={displayName:function(e,t){e.displayName=t},mixins:function(e,t){if(t)for(var n=0;n"+a+""},receiveComponent:function(e,t){if(e!==this._currentElement){this._currentElement=e;var n=""+e;n!==this._stringText&&(this._stringText=n,o.BackendIDOperations.updateTextContentByID(this._rootNodeID,n))}},unmountComponent:function(){a.unmountIDFromEnvironment(this._rootNodeID)}}),e.exports=l},function(e,t,n){(function(t){"use strict";function r(e,t){return null==t||a.hasBooleanValue[e]&&!t||a.hasNumericValue[e]&&isNaN(t)||a.hasPositiveNumericValue[e]&&1>t||a.hasOverloadedBooleanValue[e]&&t===!1}var a=n(238),o=n(239),i=n(209);if("production"!==t.env.NODE_ENV)var s={children:!0,dangerouslySetInnerHTML:!0,key:!0,ref:!0},l={},u=function(e){if(!(s.hasOwnProperty(e)&&s[e]||l.hasOwnProperty(e)&&l[e])){l[e]=!0;var n=e.toLowerCase(),r=a.isCustomAttribute(n)?n:a.getPossibleStandardName.hasOwnProperty(n)?a.getPossibleStandardName[n]:null;"production"!==t.env.NODE_ENV?i(null==r,"Unknown DOM property %s. Did you mean %s?",e,r):null}};var c={createMarkupForID:function(e){return a.ID_ATTRIBUTE_NAME+"="+o(e)},createMarkupForProperty:function(e,n){if(a.isStandardName.hasOwnProperty(e)&&a.isStandardName[e]){if(r(e,n))return"";var i=a.getAttributeName[e];return a.hasBooleanValue[e]||a.hasOverloadedBooleanValue[e]&&n===!0?i:i+"="+o(n)}return a.isCustomAttribute(e)?null==n?"":e+"="+o(n):("production"!==t.env.NODE_ENV&&u(e),null)},setValueForProperty:function(e,n,o){if(a.isStandardName.hasOwnProperty(n)&&a.isStandardName[n]){var i=a.getMutationMethod[n];if(i)i(e,o);else if(r(n,o))this.deleteValueForProperty(e,n);else if(a.mustUseAttribute[n])e.setAttribute(a.getAttributeName[n],""+o);else{var s=a.getPropertyName[n];a.hasSideEffects[n]&&""+e[s]==""+o||(e[s]=o)}}else a.isCustomAttribute(n)?null==o?e.removeAttribute(n):e.setAttribute(n,""+o):"production"!==t.env.NODE_ENV&&u(n)},deleteValueForProperty:function(e,n){if(a.isStandardName.hasOwnProperty(n)&&a.isStandardName[n]){var r=a.getMutationMethod[n];if(r)r(e,void 0);else if(a.mustUseAttribute[n])e.removeAttribute(a.getAttributeName[n]);else{var o=a.getPropertyName[n],i=a.getDefaultValueForProperty(e.nodeName,o);a.hasSideEffects[n]&&""+e[o]===i||(e[o]=i)}}else a.isCustomAttribute(n)?e.removeAttribute(n):"production"!==t.env.NODE_ENV&&u(n)}};e.exports=c}).call(t,n(175))},function(e,t,n){(function(t){"use strict";function r(e,t){return(e&t)===t}var a=n(201),o={MUST_USE_ATTRIBUTE:1,MUST_USE_PROPERTY:2,HAS_SIDE_EFFECTS:4,HAS_BOOLEAN_VALUE:8,HAS_NUMERIC_VALUE:16,HAS_POSITIVE_NUMERIC_VALUE:48,HAS_OVERLOADED_BOOLEAN_VALUE:64,injectDOMPropertyConfig:function(e){var n=e.Properties||{},i=e.DOMAttributeNames||{},l=e.DOMPropertyNames||{},u=e.DOMMutationMethods||{};e.isCustomAttribute&&s._isCustomAttributeFunctions.push(e.isCustomAttribute);for(var c in n){"production"!==t.env.NODE_ENV?a(!s.isStandardName.hasOwnProperty(c),"injectDOMPropertyConfig(...): You're trying to inject DOM property '%s' which has already been injected. You may be accidentally injecting the same DOM property config twice, or you may be injecting two configs that have conflicting property names.",c):a(!s.isStandardName.hasOwnProperty(c)),s.isStandardName[c]=!0;var d=c.toLowerCase();if(s.getPossibleStandardName[d]=c,i.hasOwnProperty(c)){var p=i[c];s.getPossibleStandardName[p]=c,s.getAttributeName[c]=p}else s.getAttributeName[c]=d;s.getPropertyName[c]=l.hasOwnProperty(c)?l[c]:c,u.hasOwnProperty(c)?s.getMutationMethod[c]=u[c]:s.getMutationMethod[c]=null;var f=n[c];s.mustUseAttribute[c]=r(f,o.MUST_USE_ATTRIBUTE),s.mustUseProperty[c]=r(f,o.MUST_USE_PROPERTY),s.hasSideEffects[c]=r(f,o.HAS_SIDE_EFFECTS),s.hasBooleanValue[c]=r(f,o.HAS_BOOLEAN_VALUE),s.hasNumericValue[c]=r(f,o.HAS_NUMERIC_VALUE),s.hasPositiveNumericValue[c]=r(f,o.HAS_POSITIVE_NUMERIC_VALUE),s.hasOverloadedBooleanValue[c]=r(f,o.HAS_OVERLOADED_BOOLEAN_VALUE),"production"!==t.env.NODE_ENV?a(!s.mustUseAttribute[c]||!s.mustUseProperty[c],"DOMProperty: Cannot require using both attribute and property: %s",c):a(!s.mustUseAttribute[c]||!s.mustUseProperty[c]),"production"!==t.env.NODE_ENV?a(s.mustUseProperty[c]||!s.hasSideEffects[c],"DOMProperty: Properties that have side effects must use property: %s",c):a(s.mustUseProperty[c]||!s.hasSideEffects[c]),"production"!==t.env.NODE_ENV?a(!!s.hasBooleanValue[c]+!!s.hasNumericValue[c]+!!s.hasOverloadedBooleanValue[c]<=1,"DOMProperty: Value can be one of boolean, overloaded boolean, or numeric value, but not a combination: %s",c):a(!!s.hasBooleanValue[c]+!!s.hasNumericValue[c]+!!s.hasOverloadedBooleanValue[c]<=1)}}},i={},s={ID_ATTRIBUTE_NAME:"data-reactid",isStandardName:{},getPossibleStandardName:{},getAttributeName:{},getPropertyName:{},getMutationMethod:{},mustUseAttribute:{},mustUseProperty:{},hasSideEffects:{},hasBooleanValue:{},hasNumericValue:{},hasPositiveNumericValue:{},hasOverloadedBooleanValue:{},_isCustomAttributeFunctions:[],isCustomAttribute:function(e){for(var t=0;t":">","<":"<",'"':""","'":"'"},o=/[&><"']/g;e.exports=r},function(e,t,n){"use strict";var r=n(242),a=n(261),o={processChildrenUpdates:r.dangerouslyProcessChildrenUpdates,replaceNodeWithMarkupByID:r.dangerouslyReplaceNodeWithMarkupByID,unmountIDFromEnvironment:function(e){a.purgeID(e)}};e.exports=o},function(e,t,n){(function(t){"use strict";var r=n(243),a=n(252),o=n(237),i=n(261),s=n(222),l=n(201),u=n(260),c={dangerouslySetInnerHTML:"`dangerouslySetInnerHTML` must be set using `updateInnerHTMLByID()`.",style:"`style` must be set using `updateStylesByID()`."},d={updatePropertyByID:function(e,n,r){var a=i.getNode(e);"production"!==t.env.NODE_ENV?l(!c.hasOwnProperty(n),"updatePropertyByID(...): %s",c[n]):l(!c.hasOwnProperty(n)),null!=r?o.setValueForProperty(a,n,r):o.deleteValueForProperty(a,n)},deletePropertyByID:function(e,n,r){var a=i.getNode(e);"production"!==t.env.NODE_ENV?l(!c.hasOwnProperty(n),"updatePropertyByID(...): %s",c[n]):l(!c.hasOwnProperty(n)),o.deleteValueForProperty(a,n,r)},updateStylesByID:function(e,t){var n=i.getNode(e);r.setValueForStyles(n,t)},updateInnerHTMLByID:function(e,t){var n=i.getNode(e);u(n,t)},updateTextContentByID:function(e,t){var n=i.getNode(e);a.updateTextContent(n,t)},dangerouslyReplaceNodeWithMarkupByID:function(e,t){var n=i.getNode(e);a.dangerouslyReplaceNodeWithMarkup(n,t)},dangerouslyProcessChildrenUpdates:function(e,t){for(var n=0;n-1?g(e):p.test(e)?y(e):f.test(t)&&b(e,t)};var _={createMarkupForStyles:function(e){var n="";for(var r in e)if(e.hasOwnProperty(r)){var a=e[r];"production"!==t.env.NODE_ENV&&v(r,a),null!=a&&(n+=c(r)+":",n+=i(r,a)+";")}return n||null},setValueForStyles:function(e,n){var a=e.style;for(var o in n)if(n.hasOwnProperty(o)){"production"!==t.env.NODE_ENV&&v(o,n[o]);var s=i(o,n[o]);if("float"===o&&(o=d),s)a[o]=s;else{var l=r.shorthandPropertyExpansions[o];if(l)for(var u in l)a[u]="";else a[o]=""}}}};e.exports=_}).call(t,n(175))},function(e,t){"use strict";function n(e,t){return e+t.charAt(0).toUpperCase()+t.substring(1)}var r={boxFlex:!0,boxFlexGroup:!0,columnCount:!0,flex:!0,flexGrow:!0,flexPositive:!0,flexShrink:!0,flexNegative:!0,fontWeight:!0,lineClamp:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0,fillOpacity:!0,strokeDashoffset:!0,strokeOpacity:!0,strokeWidth:!0},a=["Webkit","ms","Moz","O"];Object.keys(r).forEach(function(e){a.forEach(function(t){r[n(t,e)]=r[e]})});var o={background:{backgroundImage:!0,backgroundPosition:!0,backgroundRepeat:!0,backgroundColor:!0},border:{borderWidth:!0,borderStyle:!0,borderColor:!0},borderBottom:{borderBottomWidth:!0,borderBottomStyle:!0,borderBottomColor:!0},borderLeft:{borderLeftWidth:!0,borderLeftStyle:!0,borderLeftColor:!0},borderRight:{borderRightWidth:!0,borderRightStyle:!0,borderRightColor:!0},borderTop:{borderTopWidth:!0,borderTopStyle:!0,borderTopColor:!0},font:{fontStyle:!0,fontVariant:!0, +fontWeight:!0,fontSize:!0,lineHeight:!0,fontFamily:!0}},i={isUnitlessNumber:r,shorthandPropertyExpansions:o};e.exports=i},function(e,t){"use strict";var n=!("undefined"==typeof window||!window.document||!window.document.createElement),r={canUseDOM:n,canUseWorkers:"undefined"!=typeof Worker,canUseEventListeners:n&&!(!window.addEventListener&&!window.attachEvent),canUseViewport:n&&!!window.screen,isInWorker:!n};e.exports=r},function(e,t,n){"use strict";function r(e){return a(e.replace(o,"ms-"))}var a=n(247),o=/^-ms-/;e.exports=r},function(e,t){function n(e){return e.replace(r,function(e,t){return t.toUpperCase()})}var r=/-(.)/g;e.exports=n},function(e,t,n){"use strict";function r(e,t){var n=null==t||"boolean"==typeof t||""===t;if(n)return"";var r=isNaN(t);return r||0===t||o.hasOwnProperty(e)&&o[e]?""+t:("string"==typeof t&&(t=t.trim()),t+"px")}var a=n(244),o=a.isUnitlessNumber;e.exports=r},function(e,t,n){"use strict";function r(e){return a(e).replace(o,"-ms-")}var a=n(250),o=/^ms-/;e.exports=r},function(e,t){function n(e){return e.replace(r,"-$1").toLowerCase()}var r=/([A-Z])/g;e.exports=n},function(e,t){"use strict";function n(e){var t={};return function(n){return t.hasOwnProperty(n)||(t[n]=e.call(this,n)),t[n]}}e.exports=n},function(e,t,n){(function(t){"use strict";function r(e,t,n){e.insertBefore(t,e.childNodes[n]||null)}var a=n(253),o=n(258),i=n(259),s=n(201),l={dangerouslyReplaceNodeWithMarkup:a.dangerouslyReplaceNodeWithMarkup,updateTextContent:i,processUpdates:function(e,n){for(var l,u=null,c=null,d=0;d when using tables, nesting tags like
,

, or , or using non-SVG elements in an parent. Try inspecting the child nodes of the element with React ID `%s`.",p,h):s(f),u=u||{},u[h]=u[h]||[],u[h][p]=f,c=c||[],c.push(f)}var m=a.dangerouslyRenderMarkup(n);if(c)for(var g=0;g]+)/,c="data-danger-index",d={dangerouslyRenderMarkup:function(e){"production"!==t.env.NODE_ENV?l(a.canUseDOM,"dangerouslyRenderMarkup(...): Cannot render markup in a worker thread. Make sure `window` and `document` are available globally before requiring React when unit testing or use React.renderToString for server rendering."):l(a.canUseDOM);for(var n,d={},p=0;p node. This is because browser quirks make this unreliable and/or slow. If you want to render to the root you must use server rendering. See React.renderToString()."):l("html"!==e.tagName.toLowerCase());var r=o(n,i)[0];e.parentNode.replaceChild(r,e)}};e.exports=d}).call(t,n(175))},function(e,t,n){(function(t){function r(e){var t=e.match(c);return t&&t[1].toLowerCase()}function a(e,n){var a=u;"production"!==t.env.NODE_ENV?l(!!u,"createNodesFromMarkup dummy not initialized"):l(!!u);var o=r(e),c=o&&s(o);if(c){a.innerHTML=c[1]+e+c[2];for(var d=c[0];d--;)a=a.lastChild}else a.innerHTML=e;var p=a.getElementsByTagName("script");p.length&&("production"!==t.env.NODE_ENV?l(n,"createNodesFromMarkup(...): Unexpected ","
"],c=[3,"","
"],d=[1,"",""],p={"*":[1,"?

"],area:[1,"",""],col:[2,"","
"],legend:[1,"
","
"],param:[1,"",""],tr:[2,"","
"],optgroup:l,option:l,caption:u,colgroup:u,tbody:u,tfoot:u,thead:u,td:c,th:c,circle:d,clipPath:d,defs:d,ellipse:d,g:d,line:d,linearGradient:d,path:d,polygon:d,polyline:d,radialGradient:d,rect:d,stop:d,text:d};e.exports=r}).call(t,n(175))},function(e,t,n){"use strict";var r=n(200),a=r({INSERT_MARKUP:null,MOVE_EXISTING:null,REMOVE_NODE:null,TEXT_CONTENT:null});e.exports=a},function(e,t,n){"use strict";var r=n(245),a=n(240),o=n(260),i=function(e,t){e.textContent=t};r.canUseDOM&&("textContent"in document.documentElement||(i=function(e,t){o(e,a(t))})),e.exports=i},function(e,t,n){"use strict";var r=n(245),a=/^[ \r\n\t\f]/,o=/<(!--|link|noscript|meta|script|style)[ \r\n\t\f\/>]/,i=function(e,t){e.innerHTML=t};if("undefined"!=typeof MSApp&&MSApp.execUnsafeLocalFunction&&(i=function(e,t){MSApp.execUnsafeLocalFunction(function(){e.innerHTML=t})}),r.canUseDOM){var s=document.createElement("div");s.innerHTML=" ",""===s.innerHTML&&(i=function(e,t){if(e.parentNode&&e.parentNode.replaceChild(e,e),a.test(t)||"<"===t[0]&&o.test(t)){e.innerHTML="\ufeff"+t;var n=e.firstChild;1===n.data.length?e.removeChild(n):n.deleteData(0,1)}else e.innerHTML=t})}e.exports=i},function(e,t,n){(function(t){"use strict";function r(e,t){for(var n=Math.min(e.length,t.length),r=0;n>r;r++)if(e.charAt(r)!==t.charAt(r))return r;return e.length===t.length?-1:n}function a(e){var t=T(e);return t&&G.getID(t)}function o(e){var n=i(e);if(n)if(L.hasOwnProperty(n)){var r=L[n];r!==e&&("production"!==t.env.NODE_ENV?M(!c(r,n),"ReactMount: Two valid but unequal nodes with the same `%s`: %s",B,n):M(!c(r,n)),L[n]=e)}else L[n]=e;return n}function i(e){return e&&e.getAttribute&&e.getAttribute(B)||""}function s(e,t){var n=i(e);n!==t&&delete L[n],e.setAttribute(B,t),L[t]=e}function l(e){return L.hasOwnProperty(e)&&c(L[e],e)||(L[e]=G.findReactNodeByID(e)),L[e]}function u(e){var t=E.get(e)._rootNodeID;return w.isNullComponentID(t)?null:(L.hasOwnProperty(t)&&c(L[t],t)||(L[t]=G.findReactNodeByID(t)),L[t])}function c(e,n){if(e){"production"!==t.env.NODE_ENV?M(i(e)===n,"ReactMount: Unexpected modification of `%s`",B):M(i(e)===n);var r=G.findReactContainerForID(n);if(r&&C(r,e))return!0}return!1}function d(e){delete L[e]}function p(e){var t=L[e];return t&&c(t,e)?void(K=t):!1}function f(e){K=null,k.traverseAncestors(e,p);var t=K;return K=null,t}function h(e,t,n,r,a){var o=S.mountComponent(e,t,r,j);e._isTopLevel=!0,G._mountImageIntoNode(o,n,a)}function m(e,t,n,r){var a=A.ReactReconcileTransaction.getPooled();a.perform(h,null,e,t,n,a,r),A.ReactReconcileTransaction.release(a)}var g=n(238),y=n(262),b=n(211),v=n(205),_=n(226),w=n(270),k=n(213),E=n(219),x=n(271),O=n(222),S=n(223),P=n(217),A=n(220),j=n(208),C=n(273),T=n(276),D=n(277),M=n(201),N=n(260),z=n(280),I=n(209),R=k.SEPARATOR,B=g.ID_ATTRIBUTE_NAME,L={},q=1,F=9,U={},H={};if("production"!==t.env.NODE_ENV)var W={};var V=[],K=null,G={_instancesByReactRootID:U,scrollMonitor:function(e,t){t()},_updateRootComponent:function(e,n,r,o){return"production"!==t.env.NODE_ENV&&_.checkAndWarnForMutatedProps(n),G.scrollMonitor(r,function(){P.enqueueElementInternal(e,n),o&&P.enqueueCallbackInternal(e,o)}),"production"!==t.env.NODE_ENV&&(W[a(r)]=T(r)),e},_registerComponent:function(e,n){"production"!==t.env.NODE_ENV?M(n&&(n.nodeType===q||n.nodeType===F),"_registerComponent(...): Target container is not a DOM element."):M(n&&(n.nodeType===q||n.nodeType===F)),y.ensureScrollValueMonitoring();var r=G.registerContainer(n);return U[r]=e,r},_renderNewRootComponent:function(e,n,r){"production"!==t.env.NODE_ENV?I(null==b.current,"_renderNewRootComponent(): Render methods should be a pure function of props and state; triggering nested component updates from render is not allowed. If necessary, trigger nested updates in componentDidUpdate."):null;var a=D(e,null),o=G._registerComponent(a,n);return A.batchedUpdates(m,a,o,n,r),"production"!==t.env.NODE_ENV&&(W[o]=T(n)),a},render:function(e,n,r){"production"!==t.env.NODE_ENV?M(v.isValidElement(e),"React.render(): Invalid component element.%s","string"==typeof e?" Instead of passing an element string, make sure to instantiate it by passing it to React.createElement.":"function"==typeof e?" Instead of passing a component class, make sure to instantiate it by passing it to React.createElement.":null!=e&&void 0!==e.props?" This may be caused by unintentionally loading two independent copies of React.":""):M(v.isValidElement(e));var o=U[a(n)];if(o){var i=o._currentElement;if(z(i,e))return G._updateRootComponent(o,e,n,r).getPublicInstance();G.unmountComponentAtNode(n)}var s=T(n),l=s&&G.isRenderedByReact(s);if("production"!==t.env.NODE_ENV&&(!l||s.nextSibling))for(var u=s;u;){if(G.isRenderedByReact(u)){"production"!==t.env.NODE_ENV?I(!1,"render(): Target node has markup rendered by React, but there are unrelated nodes as well. This is most commonly caused by white-space inserted around server-rendered markup."):null;break}u=u.nextSibling}var c=l&&!o,d=G._renderNewRootComponent(e,n,c).getPublicInstance();return r&&r.call(d),d},constructAndRenderComponent:function(e,t,n){var r=v.createElement(e,t);return G.render(r,n)},constructAndRenderComponentByID:function(e,n,r){var a=document.getElementById(r);return"production"!==t.env.NODE_ENV?M(a,'Tried to get element with id of "%s" but it is not present on the page.',r):M(a),G.constructAndRenderComponent(e,n,a)},registerContainer:function(e){var t=a(e);return t&&(t=k.getReactRootIDFromNodeID(t)),t||(t=k.createReactRootID()),H[t]=e,t},unmountComponentAtNode:function(e){"production"!==t.env.NODE_ENV?I(null==b.current,"unmountComponentAtNode(): Render methods should be a pure function of props and state; triggering nested component updates from render is not allowed. If necessary, trigger nested updates in componentDidUpdate."):null,"production"!==t.env.NODE_ENV?M(e&&(e.nodeType===q||e.nodeType===F),"unmountComponentAtNode(...): Target container is not a DOM element."):M(e&&(e.nodeType===q||e.nodeType===F));var n=a(e),r=U[n];return r?(G.unmountComponentFromNode(r,e),delete U[n],delete H[n],"production"!==t.env.NODE_ENV&&delete W[n],!0):!1},unmountComponentFromNode:function(e,t){for(S.unmountComponent(e),t.nodeType===F&&(t=t.documentElement);t.lastChild;)t.removeChild(t.lastChild)},findReactContainerForID:function(e){var n=k.getReactRootIDFromNodeID(e),r=H[n];if("production"!==t.env.NODE_ENV){var a=W[n];if(a&&a.parentNode!==r){"production"!==t.env.NODE_ENV?M(i(a)===n,"ReactMount: Root element ID differed from reactRootID."):M(i(a)===n);var o=r.firstChild;o&&n===i(o)?W[n]=o:"production"!==t.env.NODE_ENV?I(!1,"ReactMount: Root element has been removed from its original container. New container:",a.parentNode):null}}return r},findReactNodeByID:function(e){var t=G.findReactContainerForID(e);return G.findComponentRoot(t,e)},isRenderedByReact:function(e){if(1!==e.nodeType)return!1;var t=G.getID(e);return t?t.charAt(0)===R:!1},getFirstReactDOM:function(e){for(var t=e;t&&t.parentNode!==t;){if(G.isRenderedByReact(t))return t;t=t.parentNode}return null},findComponentRoot:function(e,n){var r=V,a=0,o=f(n)||e;for(r[0]=o.firstChild,r.length=1;a when using tables, nesting tags like ,

, or , or using non-SVG elements in an parent. Try inspecting the child nodes of the element with React ID `%s`.",n,G.getID(e)):M(!1)},_mountImageIntoNode:function(e,n,a){if("production"!==t.env.NODE_ENV?M(n&&(n.nodeType===q||n.nodeType===F),"mountComponentIntoNode(...): Target container is not valid."):M(n&&(n.nodeType===q||n.nodeType===F)),a){var o=T(n);if(x.canReuseMarkup(e,o))return;var i=o.getAttribute(x.CHECKSUM_ATTR_NAME);o.removeAttribute(x.CHECKSUM_ATTR_NAME);var s=o.outerHTML;o.setAttribute(x.CHECKSUM_ATTR_NAME,i);var l=r(e,s),u=" (client) "+e.substring(l-20,l+20)+"\n (server) "+s.substring(l-20,l+20);"production"!==t.env.NODE_ENV?M(n.nodeType!==F,"You're trying to render a component to the document using server rendering but the checksum was invalid. This usually means you rendered a different component type or props on the client from the one on the server, or your render() methods are impure. React cannot handle this case due to cross-browser quirks by rendering at the document root. You should look for environment dependent code in your components and ensure the props are the same client and server side:\n%s",u):M(n.nodeType!==F),"production"!==t.env.NODE_ENV&&("production"!==t.env.NODE_ENV?I(!1,"React attempted to reuse markup in a container but the checksum was invalid. This generally means that you are using server rendering and the markup generated on the server was not what the client was expecting. React injected new markup to compensate which works but you have lost many of the benefits of server rendering. Instead, figure out why the markup being generated is different on the client or server:\n%s",u):null)}"production"!==t.env.NODE_ENV?M(n.nodeType!==F,"You're trying to render a component to the document but you didn't use server rendering. We can't do this without using server rendering due to cross-browser quirks. See React.renderToString() for server rendering."):M(n.nodeType!==F),N(n,e)},getReactRootID:a,getID:o,setID:s,getNode:l,getNodeFromInstance:u,purgeID:d};O.measureMethods(G,"ReactMount",{_renderNewRootComponent:"_renderNewRootComponent",_mountImageIntoNode:"_mountImageIntoNode"}),e.exports=G}).call(t,n(175))},function(e,t,n){"use strict";function r(e){return Object.prototype.hasOwnProperty.call(e,m)||(e[m]=f++,d[e[m]]={}),d[e[m]]}var a=n(199),o=n(263),i=n(264),s=n(267),l=n(268),u=n(207),c=n(269),d={},p=!1,f=0,h={topBlur:"blur",topChange:"change",topClick:"click",topCompositionEnd:"compositionend",topCompositionStart:"compositionstart",topCompositionUpdate:"compositionupdate",topContextMenu:"contextmenu",topCopy:"copy",topCut:"cut",topDoubleClick:"dblclick",topDrag:"drag",topDragEnd:"dragend",topDragEnter:"dragenter",topDragExit:"dragexit",topDragLeave:"dragleave",topDragOver:"dragover",topDragStart:"dragstart",topDrop:"drop",topFocus:"focus",topInput:"input",topKeyDown:"keydown",topKeyPress:"keypress",topKeyUp:"keyup",topMouseDown:"mousedown",topMouseMove:"mousemove",topMouseOut:"mouseout",topMouseOver:"mouseover",topMouseUp:"mouseup",topPaste:"paste",topScroll:"scroll",topSelectionChange:"selectionchange",topTextInput:"textInput",topTouchCancel:"touchcancel",topTouchEnd:"touchend",topTouchMove:"touchmove",topTouchStart:"touchstart",topWheel:"wheel"},m="_reactListenersID"+String(Math.random()).slice(2),g=u({},s,{ReactEventListener:null,injection:{injectReactEventListener:function(e){e.setHandleTopLevel(g.handleTopLevel),g.ReactEventListener=e}},setEnabled:function(e){g.ReactEventListener&&g.ReactEventListener.setEnabled(e)},isEnabled:function(){return!(!g.ReactEventListener||!g.ReactEventListener.isEnabled())},listenTo:function(e,t){for(var n=t,o=r(n),s=i.registrationNameDependencies[e],l=a.topLevelTypes,u=0,d=s.length;d>u;u++){var p=s[u];o.hasOwnProperty(p)&&o[p]||(p===l.topWheel?c("wheel")?g.ReactEventListener.trapBubbledEvent(l.topWheel,"wheel",n):c("mousewheel")?g.ReactEventListener.trapBubbledEvent(l.topWheel,"mousewheel",n):g.ReactEventListener.trapBubbledEvent(l.topWheel,"DOMMouseScroll",n):p===l.topScroll?c("scroll",!0)?g.ReactEventListener.trapCapturedEvent(l.topScroll,"scroll",n):g.ReactEventListener.trapBubbledEvent(l.topScroll,"scroll",g.ReactEventListener.WINDOW_HANDLE):p===l.topFocus||p===l.topBlur?(c("focus",!0)?(g.ReactEventListener.trapCapturedEvent(l.topFocus,"focus",n),g.ReactEventListener.trapCapturedEvent(l.topBlur,"blur",n)):c("focusin")&&(g.ReactEventListener.trapBubbledEvent(l.topFocus,"focusin",n),g.ReactEventListener.trapBubbledEvent(l.topBlur,"focusout",n)),o[l.topBlur]=!0,o[l.topFocus]=!0):h.hasOwnProperty(p)&&g.ReactEventListener.trapBubbledEvent(p,h[p],n),o[p]=!0)}},trapBubbledEvent:function(e,t,n){return g.ReactEventListener.trapBubbledEvent(e,t,n)},trapCapturedEvent:function(e,t,n){return g.ReactEventListener.trapCapturedEvent(e,t,n)},ensureScrollValueMonitoring:function(){if(!p){var e=l.refreshScrollValues;g.ReactEventListener.monitorScrollValue(e),p=!0}},eventNameDispatchConfigs:o.eventNameDispatchConfigs,registrationNameModules:o.registrationNameModules,putListener:o.putListener,getListener:o.getListener,deleteListener:o.deleteListener,deleteAllListeners:o.deleteAllListeners});e.exports=g},function(e,t,n){(function(t){"use strict";function r(){var e=p&&p.traverseTwoPhase&&p.traverseEnterLeave;"production"!==t.env.NODE_ENV?l(e,"InstanceHandle not injected before use!"):l(e)}var a=n(264),o=n(198),i=n(265),s=n(266),l=n(201),u={},c=null,d=function(e){if(e){var t=o.executeDispatch,n=a.getPluginModuleForEvent(e);n&&n.executeDispatch&&(t=n.executeDispatch),o.executeDispatchesInOrder(e,t),e.isPersistent()||e.constructor.release(e)}},p=null,f={injection:{injectMount:o.injection.injectMount,injectInstanceHandle:function(e){p=e,"production"!==t.env.NODE_ENV&&r()},getInstanceHandle:function(){return"production"!==t.env.NODE_ENV&&r(),p},injectEventPluginOrder:a.injectEventPluginOrder,injectEventPluginsByName:a.injectEventPluginsByName},eventNameDispatchConfigs:a.eventNameDispatchConfigs,registrationNameModules:a.registrationNameModules,putListener:function(e,n,r){"production"!==t.env.NODE_ENV?l(!r||"function"==typeof r,"Expected %s listener to be a function, instead got type %s",n,typeof r):l(!r||"function"==typeof r);var a=u[n]||(u[n]={});a[e]=r},getListener:function(e,t){var n=u[t];return n&&n[e]},deleteListener:function(e,t){var n=u[t];n&&delete n[e]},deleteAllListeners:function(e){for(var t in u)delete u[t][e]},extractEvents:function(e,t,n,r){for(var o,s=a.plugins,l=0,u=s.length;u>l;l++){var c=s[l];if(c){var d=c.extractEvents(e,t,n,r);d&&(o=i(o,d))}}return o},enqueueEvents:function(e){e&&(c=i(c,e))},processEventQueue:function(){var e=c;c=null,s(e,d),"production"!==t.env.NODE_ENV?l(!c,"processEventQueue(): Additional events were enqueued while processing an event queue. Support for this has not yet been implemented."):l(!c)},__purge:function(){u={}},__getListenerBank:function(){return u}};e.exports=f}).call(t,n(175))},function(e,t,n){(function(t){"use strict";function r(){if(s)for(var e in l){var n=l[e],r=s.indexOf(e);if("production"!==t.env.NODE_ENV?i(r>-1,"EventPluginRegistry: Cannot inject event plugins that do not exist in the plugin ordering, `%s`.",e):i(r>-1),!u.plugins[r]){"production"!==t.env.NODE_ENV?i(n.extractEvents,"EventPluginRegistry: Event plugins must implement an `extractEvents` method, but `%s` does not.",e):i(n.extractEvents),u.plugins[r]=n;var o=n.eventTypes;for(var c in o)"production"!==t.env.NODE_ENV?i(a(o[c],n,c),"EventPluginRegistry: Failed to publish event `%s` for plugin `%s`.",c,e):i(a(o[c],n,c))}}}function a(e,n,r){"production"!==t.env.NODE_ENV?i(!u.eventNameDispatchConfigs.hasOwnProperty(r),"EventPluginHub: More than one plugin attempted to publish the same event name, `%s`.",r):i(!u.eventNameDispatchConfigs.hasOwnProperty(r)),u.eventNameDispatchConfigs[r]=e;var a=e.phasedRegistrationNames;if(a){for(var s in a)if(a.hasOwnProperty(s)){var l=a[s];o(l,n,r)}return!0}return e.registrationName?(o(e.registrationName,n,r),!0):!1}function o(e,n,r){"production"!==t.env.NODE_ENV?i(!u.registrationNameModules[e],"EventPluginHub: More than one plugin attempted to publish the same registration name, `%s`.",e):i(!u.registrationNameModules[e]),u.registrationNameModules[e]=n,u.registrationNameDependencies[e]=n.eventTypes[r].dependencies}var i=n(201),s=null,l={},u={plugins:[],eventNameDispatchConfigs:{},registrationNameModules:{},registrationNameDependencies:{},injectEventPluginOrder:function(e){"production"!==t.env.NODE_ENV?i(!s,"EventPluginRegistry: Cannot inject event plugin ordering more than once. You are likely trying to load more than one copy of React."):i(!s),s=Array.prototype.slice.call(e),r()},injectEventPluginsByName:function(e){var n=!1;for(var a in e)if(e.hasOwnProperty(a)){var o=e[a];l.hasOwnProperty(a)&&l[a]===o||("production"!==t.env.NODE_ENV?i(!l[a],"EventPluginRegistry: Cannot inject two different event plugins using the same name, `%s`.",a):i(!l[a]),l[a]=o,n=!0)}n&&r()},getPluginModuleForEvent:function(e){var t=e.dispatchConfig;if(t.registrationName)return u.registrationNameModules[t.registrationName]||null;for(var n in t.phasedRegistrationNames)if(t.phasedRegistrationNames.hasOwnProperty(n)){var r=u.registrationNameModules[t.phasedRegistrationNames[n]];if(r)return r}return null},_resetEventPlugins:function(){s=null;for(var e in l)l.hasOwnProperty(e)&&delete l[e];u.plugins.length=0;var t=u.eventNameDispatchConfigs;for(var n in t)t.hasOwnProperty(n)&&delete t[n];var r=u.registrationNameModules;for(var a in r)r.hasOwnProperty(a)&&delete r[a]}};e.exports=u}).call(t,n(175))},function(e,t,n){(function(t){"use strict";function r(e,n){if("production"!==t.env.NODE_ENV?a(null!=n,"accumulateInto(...): Accumulated items must not be null or undefined."):a(null!=n),null==e)return n;var r=Array.isArray(e),o=Array.isArray(n);return r&&o?(e.push.apply(e,n),e):r?(e.push(n),e):o?[e].concat(n):[e,n]}var a=n(201);e.exports=r}).call(t,n(175))},function(e,t){"use strict";var n=function(e,t,n){Array.isArray(e)?e.forEach(t,n):e&&t.call(n,e)};e.exports=n},function(e,t,n){"use strict";function r(e){a.enqueueEvents(e),a.processEventQueue()}var a=n(263),o={handleTopLevel:function(e,t,n,o){var i=a.extractEvents(e,t,n,o);r(i)}};e.exports=o},function(e,t){"use strict";var n={currentScrollLeft:0,currentScrollTop:0,refreshScrollValues:function(e){n.currentScrollLeft=e.x,n.currentScrollTop=e.y}};e.exports=n},function(e,t,n){"use strict";/** + * Checks if an event is supported in the current execution environment. + * + * NOTE: This will not work correctly for non-generic events such as `change`, + * `reset`, `load`, `error`, and `select`. + * + * Borrows from Modernizr. + * + * @param {string} eventNameSuffix Event name, e.g. "click". + * @param {?boolean} capture Check if the capture phase is supported. + * @return {boolean} True if the event is supported. + * @internal + * @license Modernizr 3.0.0pre (Custom Build) | MIT + */ +function r(e,t){if(!o.canUseDOM||t&&!("addEventListener"in document))return!1;var n="on"+e,r=n in document;if(!r){var i=document.createElement("div");i.setAttribute(n,"return;"),r="function"==typeof i[n]}return!r&&a&&"wheel"===e&&(r=document.implementation.hasFeature("Events.wheel","3.0")),r}var a,o=n(245);o.canUseDOM&&(a=document.implementation&&document.implementation.hasFeature&&document.implementation.hasFeature("","")!==!0),e.exports=r},function(e,t,n){(function(t){"use strict";function r(e){c[e]=!0}function a(e){delete c[e]}function o(e){return!!c[e]}var i,s=n(205),l=n(219),u=n(201),c={},d={injectEmptyComponent:function(e){i=s.createFactory(e)}},p=function(){};p.prototype.componentDidMount=function(){var e=l.get(this);e&&r(e._rootNodeID)},p.prototype.componentWillUnmount=function(){var e=l.get(this);e&&a(e._rootNodeID)},p.prototype.render=function(){return"production"!==t.env.NODE_ENV?u(i,"Trying to return null from a render, but no null placeholder component was injected."):u(i),i()};var f=s.createElement(p),h={emptyElement:f,injection:d,isNullComponentID:o};e.exports=h}).call(t,n(175))},function(e,t,n){"use strict";var r=n(272),a={CHECKSUM_ATTR_NAME:"data-react-checksum",addChecksumToMarkup:function(e){var t=r(e);return e.replace(">"," "+a.CHECKSUM_ATTR_NAME+'="'+t+'">')},canReuseMarkup:function(e,t){var n=t.getAttribute(a.CHECKSUM_ATTR_NAME);n=n&&parseInt(n,10);var o=r(e);return o===n}};e.exports=a},function(e,t){"use strict";function n(e){for(var t=1,n=0,a=0;a is being rendered by both %s and %s using the same key (%s) in the same place. Currently, this means that they don't preserve state. This behavior should be very rare so we're considering deprecating it. Please contact the React team and explain your use case so that we can take that into consideration.",u||"Unknown Component",s||"[Unknown]",l||"[Unknown]",e.key):null))),i}}return!1}var a=n(209);e.exports=r}).call(t,n(175))},function(e,t,n){(function(t){"use strict";function r(e){e&&(null!=e.dangerouslySetInnerHTML&&("production"!==t.env.NODE_ENV?y(null==e.children,"Can only set one of `children` or `props.dangerouslySetInnerHTML`."):y(null==e.children),"production"!==t.env.NODE_ENV?y("object"==typeof e.dangerouslySetInnerHTML&&"__html"in e.dangerouslySetInnerHTML,"`props.dangerouslySetInnerHTML` must be in the form `{__html: ...}`. Please visit https://fb.me/react-invariant-dangerously-set-inner-html for more information."):y("object"==typeof e.dangerouslySetInnerHTML&&"__html"in e.dangerouslySetInnerHTML)),"production"!==t.env.NODE_ENV&&("production"!==t.env.NODE_ENV?_(null==e.innerHTML,"Directly setting property `innerHTML` is not permitted. For more information, lookup documentation on `dangerouslySetInnerHTML`."):null,"production"!==t.env.NODE_ENV?_(!e.contentEditable||null==e.children,"A component is `contentEditable` and contains `children` managed by React. It is now your responsibility to guarantee that none of those nodes are unexpectedly modified or duplicated. This is probably not intentional."):null),"production"!==t.env.NODE_ENV?y(null==e.style||"object"==typeof e.style,"The `style` prop expects a mapping from style properties to values, not a string. For example, style={{marginRight: spacing + 'em'}} when using JSX."):y(null==e.style||"object"==typeof e.style))}function a(e,n,r,a){"production"!==t.env.NODE_ENV&&("production"!==t.env.NODE_ENV?_("onScroll"!==n||b("scroll",!0),"This browser doesn't support the `onScroll` event"):null);var o=p.findReactContainerForID(e);if(o){var i=o.nodeType===S?o.ownerDocument:o;k(n,i)}a.getPutListenerQueue().enqueuePutListener(e,n,r)}function o(e){T.call(C,e)||("production"!==t.env.NODE_ENV?y(j.test(e),"Invalid tag: %s",e):y(j.test(e)),C[e]=!0)}function i(e){o(e),this._tag=e,this._renderedChildren=null,this._previousStyleCopy=null,this._rootNodeID=null}var s=n(243),l=n(238),u=n(237),c=n(262),d=n(241),p=n(261),f=n(282),h=n(222),m=n(207),g=n(240),y=n(201),b=n(269),v=n(233),_=n(209),w=c.deleteListener,k=c.listenTo,E=c.registrationNameModules,x={string:!0,number:!0},O=v({style:null}),S=1,P=null,A={area:!0,base:!0,br:!0,col:!0,embed:!0,hr:!0,img:!0,input:!0,keygen:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0},j=/^[a-zA-Z][a-zA-Z:_\.\-\d]*$/,C={},T={}.hasOwnProperty;i.displayName="ReactDOMComponent",i.Mixin={construct:function(e){this._currentElement=e},mountComponent:function(e,t,n){this._rootNodeID=e,r(this._currentElement.props);var a=A[this._tag]?"":"";return this._createOpenTagMarkupAndPutListeners(t)+this._createContentMarkup(t,n)+a},_createOpenTagMarkupAndPutListeners:function(e){var t=this._currentElement.props,n="<"+this._tag;for(var r in t)if(t.hasOwnProperty(r)){var o=t[r];if(null!=o)if(E.hasOwnProperty(r))a(this._rootNodeID,r,o,e);else{r===O&&(o&&(o=this._previousStyleCopy=m({},t.style)),o=s.createMarkupForStyles(o));var i=u.createMarkupForProperty(r,o);i&&(n+=" "+i)}}if(e.renderToStaticMarkup)return n+">";var l=u.createMarkupForID(this._rootNodeID);return n+" "+l+">"},_createContentMarkup:function(e,t){var n="";("listing"===this._tag||"pre"===this._tag||"textarea"===this._tag)&&(n="\n");var r=this._currentElement.props,a=r.dangerouslySetInnerHTML;if(null!=a){if(null!=a.__html)return n+a.__html}else{var o=x[typeof r.children]?r.children:null,i=null!=o?null:r.children;if(null!=o)return n+g(o);if(null!=i){var s=this.mountChildren(i,e,t);return n+s.join("")}}return n},receiveComponent:function(e,t,n){var r=this._currentElement;this._currentElement=e,this.updateComponent(t,r,e,n)},updateComponent:function(e,t,n,a){r(this._currentElement.props),this._updateDOMProperties(t.props,e),this._updateDOMChildren(t.props,e,a)},_updateDOMProperties:function(e,t){var n,r,o,i=this._currentElement.props;for(n in e)if(!i.hasOwnProperty(n)&&e.hasOwnProperty(n))if(n===O){var s=this._previousStyleCopy;for(r in s)s.hasOwnProperty(r)&&(o=o||{},o[r]="");this._previousStyleCopy=null}else E.hasOwnProperty(n)?w(this._rootNodeID,n):(l.isStandardName[n]||l.isCustomAttribute(n))&&P.deletePropertyByID(this._rootNodeID,n);for(n in i){var u=i[n],c=n===O?this._previousStyleCopy:e[n];if(i.hasOwnProperty(n)&&u!==c)if(n===O)if(u?u=this._previousStyleCopy=m({},u):this._previousStyleCopy=null,c){for(r in c)!c.hasOwnProperty(r)||u&&u.hasOwnProperty(r)||(o=o||{},o[r]="");for(r in u)u.hasOwnProperty(r)&&c[r]!==u[r]&&(o=o||{},o[r]=u[r])}else o=u;else E.hasOwnProperty(n)?a(this._rootNodeID,n,u,t):(l.isStandardName[n]||l.isCustomAttribute(n))&&P.updatePropertyByID(this._rootNodeID,n,u)}o&&P.updateStylesByID(this._rootNodeID,o)},_updateDOMChildren:function(e,t,n){var r=this._currentElement.props,a=x[typeof e.children]?e.children:null,o=x[typeof r.children]?r.children:null,i=e.dangerouslySetInnerHTML&&e.dangerouslySetInnerHTML.__html,s=r.dangerouslySetInnerHTML&&r.dangerouslySetInnerHTML.__html,l=null!=a?null:e.children,u=null!=o?null:r.children,c=null!=a||null!=i,d=null!=o||null!=s;null!=l&&null==u?this.updateChildren(null,t,n):c&&!d&&this.updateTextContent(""),null!=o?a!==o&&this.updateTextContent(""+o):null!=s?i!==s&&P.updateInnerHTMLByID(this._rootNodeID,s):null!=u&&this.updateChildren(u,t,n)},unmountComponent:function(){this.unmountChildren(),c.deleteAllListeners(this._rootNodeID),d.unmountIDFromEnvironment(this._rootNodeID),this._rootNodeID=null}},h.measureMethods(i,"ReactDOMComponent",{mountComponent:"mountComponent",updateComponent:"updateComponent"}),m(i.prototype,i.Mixin,f.Mixin),i.injection={injectIDOperations:function(e){i.BackendIDOperations=P=e}},e.exports=i}).call(t,n(175))},function(e,t,n){"use strict";function r(e,t,n){h.push({parentID:e,parentNode:null,type:c.INSERT_MARKUP,markupIndex:m.push(t)-1,textContent:null,fromIndex:null,toIndex:n})}function a(e,t,n){h.push({parentID:e,parentNode:null,type:c.MOVE_EXISTING,markupIndex:null,textContent:null,fromIndex:t,toIndex:n})}function o(e,t){h.push({parentID:e,parentNode:null,type:c.REMOVE_NODE,markupIndex:null,textContent:null,fromIndex:t,toIndex:null})}function i(e,t){h.push({parentID:e,parentNode:null,type:c.TEXT_CONTENT,markupIndex:null,textContent:t,fromIndex:null,toIndex:null})}function s(){h.length&&(u.processChildrenUpdates(h,m),l())}function l(){h.length=0,m.length=0}var u=n(279),c=n(258),d=n(223),p=n(283),f=0,h=[],m=[],g={Mixin:{mountChildren:function(e,t,n){var r=p.instantiateChildren(e,t,n);this._renderedChildren=r;var a=[],o=0;for(var i in r)if(r.hasOwnProperty(i)){var s=r[i],l=this._rootNodeID+i,u=d.mountComponent(s,l,t,n);s._mountIndex=o,a.push(u),o++}return a},updateTextContent:function(e){f++;var t=!0;try{var n=this._renderedChildren;p.unmountChildren(n);for(var r in n)n.hasOwnProperty(r)&&this._unmountChildByName(n[r],r);this.setTextContent(e),t=!1}finally{f--,f||(t?l():s())}},updateChildren:function(e,t,n){f++;var r=!0;try{this._updateChildren(e,t,n),r=!1}finally{f--,f||(r?l():s())}},_updateChildren:function(e,t,n){var r=this._renderedChildren,a=p.updateChildren(r,e,t,n);if(this._renderedChildren=a,a||r){var o,i=0,s=0;for(o in a)if(a.hasOwnProperty(o)){var l=r&&r[o],u=a[o];l===u?(this.moveChild(l,s,i),i=Math.max(l._mountIndex,i),l._mountIndex=s):(l&&(i=Math.max(l._mountIndex,i),this._unmountChildByName(l,o)),this._mountChildByNameAtIndex(u,o,s,t,n)),s++}for(o in r)!r.hasOwnProperty(o)||a&&a.hasOwnProperty(o)||this._unmountChildByName(r[o],o)}},unmountChildren:function(){var e=this._renderedChildren;p.unmountChildren(e),this._renderedChildren=null},moveChild:function(e,t,n){e._mountIndex8&&11>=E),S=32,P=String.fromCharCode(S),A=f.topLevelTypes,j={beforeInput:{phasedRegistrationNames:{bubbled:v({onBeforeInput:null}),captured:v({onBeforeInputCapture:null})},dependencies:[A.topCompositionEnd,A.topKeyPress,A.topTextInput,A.topPaste]},compositionEnd:{phasedRegistrationNames:{bubbled:v({onCompositionEnd:null}),captured:v({onCompositionEndCapture:null})},dependencies:[A.topBlur,A.topCompositionEnd,A.topKeyDown,A.topKeyPress,A.topKeyUp,A.topMouseDown]},compositionStart:{phasedRegistrationNames:{bubbled:v({onCompositionStart:null}),captured:v({onCompositionStartCapture:null})},dependencies:[A.topBlur,A.topCompositionStart,A.topKeyDown,A.topKeyPress,A.topKeyUp,A.topMouseDown]},compositionUpdate:{phasedRegistrationNames:{bubbled:v({onCompositionUpdate:null}),captured:v({onCompositionUpdateCapture:null})},dependencies:[A.topBlur,A.topCompositionUpdate,A.topKeyDown,A.topKeyPress,A.topKeyUp,A.topMouseDown]}},C=!1,T=null,D={eventTypes:j,extractEvents:function(e,t,n,r){return[u(e,t,n,r),p(e,t,n,r)]}};e.exports=D},function(e,t,n){(function(t){"use strict";function r(e,t,n){var r=t.dispatchConfig.phasedRegistrationNames[n];return g(e,r)}function a(e,n,a){if("production"!==t.env.NODE_ENV&&!e)throw new Error("Dispatching id must not be null");var o=n?m.bubbled:m.captured,i=r(e,a,o);i&&(a._dispatchListeners=f(a._dispatchListeners,i),a._dispatchIDs=f(a._dispatchIDs,e))}function o(e){e&&e.dispatchConfig.phasedRegistrationNames&&p.injection.getInstanceHandle().traverseTwoPhase(e.dispatchMarker,a,e)}function i(e,t,n){if(n&&n.dispatchConfig.registrationName){var r=n.dispatchConfig.registrationName,a=g(e,r);a&&(n._dispatchListeners=f(n._dispatchListeners,a),n._dispatchIDs=f(n._dispatchIDs,e))}}function s(e){e&&e.dispatchConfig.registrationName&&i(e.dispatchMarker,null,e)}function l(e){h(e,o)}function u(e,t,n,r){p.injection.getInstanceHandle().traverseEnterLeave(n,r,i,e,t)}function c(e){h(e,s)}var d=n(199),p=n(263),f=n(265),h=n(266),m=d.PropagationPhases,g=p.getListener,y={accumulateTwoPhaseDispatches:l,accumulateDirectDispatches:c,accumulateEnterLeaveDispatches:u};e.exports=y}).call(t,n(175))},function(e,t,n){"use strict";function r(e){this._root=e,this._startText=this.getText(),this._fallbackText=null}var a=n(203),o=n(207),i=n(289);o(r.prototype,{getText:function(){return"value"in this._root?this._root.value:this._root[i()]},getData:function(){if(this._fallbackText)return this._fallbackText;var e,t,n=this._startText,r=n.length,a=this.getText(),o=a.length;for(e=0;r>e&&n[e]===a[e];e++);var i=r-e;for(t=1;i>=t&&n[r-t]===a[o-t];t++);var s=t>1?1-t:void 0;return this._fallbackText=a.slice(e,s),this._fallbackText}}),a.addPoolingTo(r),e.exports=r},function(e,t,n){"use strict";function r(){return!o&&a.canUseDOM&&(o="textContent"in document.documentElement?"textContent":"innerText"),o}var a=n(245),o=null;e.exports=r},function(e,t,n){"use strict";function r(e,t,n){a.call(this,e,t,n)}var a=n(291),o={data:null};a.augmentClass(r,o),e.exports=r},function(e,t,n){"use strict";function r(e,t,n){this.dispatchConfig=e,this.dispatchMarker=t,this.nativeEvent=n;var r=this.constructor.Interface;for(var a in r)if(r.hasOwnProperty(a)){ +var o=r[a];o?this[a]=o(n):this[a]=n[a]}var s=null!=n.defaultPrevented?n.defaultPrevented:n.returnValue===!1;s?this.isDefaultPrevented=i.thatReturnsTrue:this.isDefaultPrevented=i.thatReturnsFalse,this.isPropagationStopped=i.thatReturnsFalse}var a=n(203),o=n(207),i=n(210),s=n(292),l={type:null,target:s,currentTarget:i.thatReturnsNull,eventPhase:null,bubbles:null,cancelable:null,timeStamp:function(e){return e.timeStamp||Date.now()},defaultPrevented:null,isTrusted:null};o(r.prototype,{preventDefault:function(){this.defaultPrevented=!0;var e=this.nativeEvent;e.preventDefault?e.preventDefault():e.returnValue=!1,this.isDefaultPrevented=i.thatReturnsTrue},stopPropagation:function(){var e=this.nativeEvent;e.stopPropagation?e.stopPropagation():e.cancelBubble=!0,this.isPropagationStopped=i.thatReturnsTrue},persist:function(){this.isPersistent=i.thatReturnsTrue},isPersistent:i.thatReturnsFalse,destructor:function(){var e=this.constructor.Interface;for(var t in e)this[t]=null;this.dispatchConfig=null,this.dispatchMarker=null,this.nativeEvent=null}}),r.Interface=l,r.augmentClass=function(e,t){var n=this,r=Object.create(n.prototype);o(r,e.prototype),e.prototype=r,e.prototype.constructor=e,e.Interface=o({},n.Interface,t),e.augmentClass=n.augmentClass,a.addPoolingTo(e,a.threeArgumentPooler)},a.addPoolingTo(r,a.threeArgumentPooler),e.exports=r},function(e,t){"use strict";function n(e){var t=e.target||e.srcElement||window;return 3===t.nodeType?t.parentNode:t}e.exports=n},function(e,t,n){"use strict";function r(e,t,n){a.call(this,e,t,n)}var a=n(291),o={data:null};a.augmentClass(r,o),e.exports=r},function(e,t,n){"use strict";function r(e){return"SELECT"===e.nodeName||"INPUT"===e.nodeName&&"file"===e.type}function a(e){var t=E.getPooled(A.change,C,e);_.accumulateTwoPhaseDispatches(t),k.batchedUpdates(o,t)}function o(e){v.enqueueEvents(e),v.processEventQueue()}function i(e,t){j=e,C=t,j.attachEvent("onchange",a)}function s(){j&&(j.detachEvent("onchange",a),j=null,C=null)}function l(e,t,n){return e===P.topChange?n:void 0}function u(e,t,n){e===P.topFocus?(s(),i(t,n)):e===P.topBlur&&s()}function c(e,t){j=e,C=t,T=e.value,D=Object.getOwnPropertyDescriptor(e.constructor.prototype,"value"),Object.defineProperty(j,"value",z),j.attachEvent("onpropertychange",p)}function d(){j&&(delete j.value,j.detachEvent("onpropertychange",p),j=null,C=null,T=null,D=null)}function p(e){if("value"===e.propertyName){var t=e.srcElement.value;t!==T&&(T=t,a(e))}}function f(e,t,n){return e===P.topInput?n:void 0}function h(e,t,n){e===P.topFocus?(d(),c(t,n)):e===P.topBlur&&d()}function m(e,t,n){return e!==P.topSelectionChange&&e!==P.topKeyUp&&e!==P.topKeyDown||!j||j.value===T?void 0:(T=j.value,C)}function g(e){return"INPUT"===e.nodeName&&("checkbox"===e.type||"radio"===e.type)}function y(e,t,n){return e===P.topClick?n:void 0}var b=n(199),v=n(263),_=n(287),w=n(245),k=n(220),E=n(291),x=n(269),O=n(295),S=n(233),P=b.topLevelTypes,A={change:{phasedRegistrationNames:{bubbled:S({onChange:null}),captured:S({onChangeCapture:null})},dependencies:[P.topBlur,P.topChange,P.topClick,P.topFocus,P.topInput,P.topKeyDown,P.topKeyUp,P.topSelectionChange]}},j=null,C=null,T=null,D=null,M=!1;w.canUseDOM&&(M=x("change")&&(!("documentMode"in document)||document.documentMode>8));var N=!1;w.canUseDOM&&(N=x("input")&&(!("documentMode"in document)||document.documentMode>9));var z={get:function(){return D.get.call(this)},set:function(e){T=""+e,D.set.call(this,e)}},I={eventTypes:A,extractEvents:function(e,t,n,a){var o,i;if(r(t)?M?o=l:i=u:O(t)?N?o=f:(o=m,i=h):g(t)&&(o=y),o){var s=o(e,t,n);if(s){var c=E.getPooled(A.change,s,a);return _.accumulateTwoPhaseDispatches(c),c}}i&&i(e,t,n)}};e.exports=I},function(e,t){"use strict";function n(e){return e&&("INPUT"===e.nodeName&&r[e.type]||"TEXTAREA"===e.nodeName)}var r={color:!0,date:!0,datetime:!0,"datetime-local":!0,email:!0,month:!0,number:!0,password:!0,range:!0,search:!0,tel:!0,text:!0,time:!0,url:!0,week:!0};e.exports=n},function(e,t){"use strict";var n=0,r={createReactRootIndex:function(){return n++}};e.exports=r},function(e,t,n){"use strict";var r=n(233),a=[r({ResponderEventPlugin:null}),r({SimpleEventPlugin:null}),r({TapEventPlugin:null}),r({EnterLeaveEventPlugin:null}),r({ChangeEventPlugin:null}),r({SelectEventPlugin:null}),r({BeforeInputEventPlugin:null}),r({AnalyticsEventPlugin:null}),r({MobileSafariClickEventPlugin:null})];e.exports=a},function(e,t,n){"use strict";var r=n(199),a=n(287),o=n(299),i=n(261),s=n(233),l=r.topLevelTypes,u=i.getFirstReactDOM,c={mouseEnter:{registrationName:s({onMouseEnter:null}),dependencies:[l.topMouseOut,l.topMouseOver]},mouseLeave:{registrationName:s({onMouseLeave:null}),dependencies:[l.topMouseOut,l.topMouseOver]}},d=[null,null],p={eventTypes:c,extractEvents:function(e,t,n,r){if(e===l.topMouseOver&&(r.relatedTarget||r.fromElement))return null;if(e!==l.topMouseOut&&e!==l.topMouseOver)return null;var s;if(t.window===t)s=t;else{var p=t.ownerDocument;s=p?p.defaultView||p.parentWindow:window}var f,h;if(e===l.topMouseOut?(f=t,h=u(r.relatedTarget||r.toElement)||s):(f=s,h=t),f===h)return null;var m=f?i.getID(f):"",g=h?i.getID(h):"",y=o.getPooled(c.mouseLeave,m,r);y.type="mouseleave",y.target=f,y.relatedTarget=h;var b=o.getPooled(c.mouseEnter,g,r);return b.type="mouseenter",b.target=h,b.relatedTarget=f,a.accumulateEnterLeaveDispatches(y,b,m,g),d[0]=y,d[1]=b,d}};e.exports=p},function(e,t,n){"use strict";function r(e,t,n){a.call(this,e,t,n)}var a=n(300),o=n(268),i=n(301),s={screenX:null,screenY:null,clientX:null,clientY:null,ctrlKey:null,shiftKey:null,altKey:null,metaKey:null,getModifierState:i,button:function(e){var t=e.button;return"which"in e?t:2===t?2:4===t?1:0},buttons:null,relatedTarget:function(e){return e.relatedTarget||(e.fromElement===e.srcElement?e.toElement:e.fromElement)},pageX:function(e){return"pageX"in e?e.pageX:e.clientX+o.currentScrollLeft},pageY:function(e){return"pageY"in e?e.pageY:e.clientY+o.currentScrollTop}};a.augmentClass(r,s),e.exports=r},function(e,t,n){"use strict";function r(e,t,n){a.call(this,e,t,n)}var a=n(291),o=n(292),i={view:function(e){if(e.view)return e.view;var t=o(e);if(null!=t&&t.window===t)return t;var n=t.ownerDocument;return n?n.defaultView||n.parentWindow:window},detail:function(e){return e.detail||0}};a.augmentClass(r,i),e.exports=r},function(e,t){"use strict";function n(e){var t=this,n=t.nativeEvent;if(n.getModifierState)return n.getModifierState(e);var r=a[e];return r?!!n[r]:!1}function r(e){return n}var a={Alt:"altKey",Control:"ctrlKey",Meta:"metaKey",Shift:"shiftKey"};e.exports=r},function(e,t,n){"use strict";var r,a=n(238),o=n(245),i=a.injection.MUST_USE_ATTRIBUTE,s=a.injection.MUST_USE_PROPERTY,l=a.injection.HAS_BOOLEAN_VALUE,u=a.injection.HAS_SIDE_EFFECTS,c=a.injection.HAS_NUMERIC_VALUE,d=a.injection.HAS_POSITIVE_NUMERIC_VALUE,p=a.injection.HAS_OVERLOADED_BOOLEAN_VALUE;if(o.canUseDOM){var f=document.implementation;r=f&&f.hasFeature&&f.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure","1.1")}var h={isCustomAttribute:RegExp.prototype.test.bind(/^(data|aria)-[a-z_][a-z\d_.\-]*$/),Properties:{accept:null,acceptCharset:null,accessKey:null,action:null,allowFullScreen:i|l,allowTransparency:i,alt:null,async:l,autoComplete:null,autoPlay:l,cellPadding:null,cellSpacing:null,charSet:i,checked:s|l,classID:i,className:r?i:s,cols:i|d,colSpan:null,content:null,contentEditable:null,contextMenu:i,controls:s|l,coords:null,crossOrigin:null,data:null,dateTime:i,defer:l,dir:null,disabled:i|l,download:p,draggable:null,encType:null,form:i,formAction:i,formEncType:i,formMethod:i,formNoValidate:l,formTarget:i,frameBorder:i,headers:null,height:i,hidden:i|l,high:null,href:null,hrefLang:null,htmlFor:null,httpEquiv:null,icon:null,id:s,label:null,lang:null,list:i,loop:s|l,low:null,manifest:i,marginHeight:null,marginWidth:null,max:null,maxLength:i,media:i,mediaGroup:null,method:null,min:null,multiple:s|l,muted:s|l,name:null,noValidate:l,open:l,optimum:null,pattern:null,placeholder:null,poster:null,preload:null,radioGroup:null,readOnly:s|l,rel:null,required:l,role:i,rows:i|d,rowSpan:null,sandbox:null,scope:null,scoped:l,scrolling:null,seamless:i|l,selected:s|l,shape:null,size:i|d,sizes:i,span:d,spellCheck:null,src:null,srcDoc:s,srcSet:i,start:c,step:null,style:null,tabIndex:null,target:null,title:null,type:null,useMap:null,value:s|u,width:i,wmode:i,autoCapitalize:null,autoCorrect:null,itemProp:i,itemScope:i|l,itemType:i,itemID:i,itemRef:i,property:null,unselectable:i},DOMAttributeNames:{acceptCharset:"accept-charset",className:"class",htmlFor:"for",httpEquiv:"http-equiv"},DOMPropertyNames:{autoCapitalize:"autocapitalize",autoComplete:"autocomplete",autoCorrect:"autocorrect",autoFocus:"autofocus",autoPlay:"autoplay",encType:"encoding",hrefLang:"hreflang",radioGroup:"radiogroup",spellCheck:"spellcheck",srcDoc:"srcdoc",srcSet:"srcset"}};e.exports=h},function(e,t,n){"use strict";var r=n(199),a=n(210),o=r.topLevelTypes,i={eventTypes:null,extractEvents:function(e,t,n,r){if(e===o.topTouchStart){var i=r.target;i&&!i.onclick&&(i.onclick=a)}}};e.exports=i},function(e,t,n){"use strict";var r=n(305),a={getDOMNode:function(){return r(this)}};e.exports=a},function(e,t,n){(function(t){"use strict";function r(e){if("production"!==t.env.NODE_ENV){var n=a.current;null!==n&&("production"!==t.env.NODE_ENV?u(n._warnedAboutRefsInRender,"%s is accessing getDOMNode or findDOMNode inside its render(). render() should be a pure function of props and state. It should never access something that requires stale data from the previous render, such as refs. Move this logic to componentDidMount and componentDidUpdate instead.",n.getName()||"A component"):null,n._warnedAboutRefsInRender=!0)}return null==e?null:l(e)?e:o.has(e)?i.getNodeFromInstance(e):("production"!==t.env.NODE_ENV?s(null==e.render||"function"!=typeof e.render,"Component (with keys: %s) contains `render` method but is not mounted in the DOM",Object.keys(e)):s(null==e.render||"function"!=typeof e.render),void("production"!==t.env.NODE_ENV?s(!1,"Element appears to be neither ReactComponent nor DOMNode (keys: %s)",Object.keys(e)):s(!1)))}var a=n(211),o=n(219),i=n(261),s=n(201),l=n(275),u=n(209);e.exports=r}).call(t,n(175))},function(e,t,n){"use strict";function r(){this.reinitializeTransaction()}var a=n(220),o=n(230),i=n(207),s=n(210),l={initialize:s,close:function(){p.isBatchingUpdates=!1}},u={initialize:s,close:a.flushBatchedUpdates.bind(a)},c=[u,l];i(r.prototype,o.Mixin,{getTransactionWrappers:function(){return c}});var d=new r,p={isBatchingUpdates:!1,batchedUpdates:function(e,t,n,r,a){var o=p.isBatchingUpdates;p.isBatchingUpdates=!0,o?e(t,n,r,a):d.perform(e,null,t,n,r,a)}};e.exports=p},function(e,t,n){"use strict";var r=n(308),a=n(304),o=n(231),i=n(205),s=n(200),l=i.createFactory("button"),u=s({onClick:!0,onDoubleClick:!0,onMouseDown:!0,onMouseMove:!0,onMouseUp:!0,onClickCapture:!0,onDoubleClickCapture:!0,onMouseDownCapture:!0,onMouseMoveCapture:!0,onMouseUpCapture:!0}),c=o.createClass({displayName:"ReactDOMButton",tagName:"BUTTON",mixins:[r,a],render:function(){var e={};for(var t in this.props)!this.props.hasOwnProperty(t)||this.props.disabled&&u[t]||(e[t]=this.props[t]);return l(e,this.props.children)}});e.exports=c},function(e,t,n){"use strict";var r=n(309),a={componentDidMount:function(){this.props.autoFocus&&r(this.getDOMNode())}};e.exports=a},function(e,t){"use strict";function n(e){try{e.focus()}catch(t){}}e.exports=n},function(e,t,n){"use strict";var r=n(199),a=n(311),o=n(304),i=n(231),s=n(205),l=s.createFactory("form"),u=i.createClass({displayName:"ReactDOMForm",tagName:"FORM",mixins:[o,a],render:function(){return l(this.props)},componentDidMount:function(){this.trapBubbledEvent(r.topLevelTypes.topReset,"reset"),this.trapBubbledEvent(r.topLevelTypes.topSubmit,"submit")}});e.exports=u},function(e,t,n){(function(t){"use strict";function r(e){e.remove()}var a=n(262),o=n(265),i=n(266),s=n(201),l={trapBubbledEvent:function(e,n){"production"!==t.env.NODE_ENV?s(this.isMounted(),"Must be mounted to trap events"):s(this.isMounted());var r=this.getDOMNode();"production"!==t.env.NODE_ENV?s(r,"LocalEventTrapMixin.trapBubbledEvent(...): Requires node to be rendered."):s(r);var i=a.trapBubbledEvent(e,n,r);this._localEventListeners=o(this._localEventListeners,i)},componentWillUnmount:function(){this._localEventListeners&&i(this._localEventListeners,r)}};e.exports=l}).call(t,n(175))},function(e,t,n){"use strict";var r=n(199),a=n(311),o=n(304),i=n(231),s=n(205),l=s.createFactory("img"),u=i.createClass({displayName:"ReactDOMImg",tagName:"IMG",mixins:[o,a],render:function(){return l(this.props)},componentDidMount:function(){this.trapBubbledEvent(r.topLevelTypes.topLoad,"load"),this.trapBubbledEvent(r.topLevelTypes.topError,"error")}});e.exports=u},function(e,t,n){"use strict";var r=n(199),a=n(311),o=n(304),i=n(231),s=n(205),l=s.createFactory("iframe"),u=i.createClass({displayName:"ReactDOMIframe",tagName:"IFRAME",mixins:[o,a],render:function(){return l(this.props)},componentDidMount:function(){this.trapBubbledEvent(r.topLevelTypes.topLoad,"load")}});e.exports=u},function(e,t,n){(function(t){"use strict";function r(){this.isMounted()&&this.forceUpdate()}var a=n(308),o=n(237),i=n(315),s=n(304),l=n(231),u=n(205),c=n(261),d=n(220),p=n(207),f=n(201),h=u.createFactory("input"),m={},g=l.createClass({displayName:"ReactDOMInput",tagName:"INPUT",mixins:[a,i.Mixin,s],getInitialState:function(){var e=this.props.defaultValue;return{initialChecked:this.props.defaultChecked||!1,initialValue:null!=e?e:null}},render:function(){var e=p({},this.props);e.defaultChecked=null,e.defaultValue=null;var t=i.getValue(this);e.value=null!=t?t:this.state.initialValue;var n=i.getChecked(this);return e.checked=null!=n?n:this.state.initialChecked,e.onChange=this._handleChange,h(e,this.props.children)},componentDidMount:function(){var e=c.getID(this.getDOMNode());m[e]=this},componentWillUnmount:function(){var e=this.getDOMNode(),t=c.getID(e);delete m[t]},componentDidUpdate:function(e,t,n){var r=this.getDOMNode();null!=this.props.checked&&o.setValueForProperty(r,"checked",this.props.checked||!1);var a=i.getValue(this);null!=a&&o.setValueForProperty(r,"value",""+a)},_handleChange:function(e){var n,a=i.getOnChange(this);a&&(n=a.call(this,e)),d.asap(r,this);var o=this.props.name;if("radio"===this.props.type&&null!=o){for(var s=this.getDOMNode(),l=s;l.parentNode;)l=l.parentNode;for(var u=l.querySelectorAll("input[name="+JSON.stringify(""+o)+'][type="radio"]'),p=0,h=u.length;h>p;p++){var g=u[p];if(g!==s&&g.form===s.form){var y=c.getID(g);"production"!==t.env.NODE_ENV?f(y,"ReactDOMInput: Mixing React and non-React radio inputs with the same `name` is not supported."):f(y);var b=m[y];"production"!==t.env.NODE_ENV?f(b,"ReactDOMInput: Unknown radio button ID %s.",y):f(b),d.asap(r,b)}}}return n}});e.exports=g}).call(t,n(175))},function(e,t,n){(function(t){"use strict";function r(e){"production"!==t.env.NODE_ENV?u(null==e.props.checkedLink||null==e.props.valueLink,"Cannot provide a checkedLink and a valueLink. If you want to use checkedLink, you probably don't want to use valueLink and vice versa."):u(null==e.props.checkedLink||null==e.props.valueLink)}function a(e){r(e),"production"!==t.env.NODE_ENV?u(null==e.props.value&&null==e.props.onChange,"Cannot provide a valueLink and a value or onChange event. If you want to use value or onChange, you probably don't want to use valueLink."):u(null==e.props.value&&null==e.props.onChange)}function o(e){r(e),"production"!==t.env.NODE_ENV?u(null==e.props.checked&&null==e.props.onChange,"Cannot provide a checkedLink and a checked property or onChange event. If you want to use checked or onChange, you probably don't want to use checkedLink"):u(null==e.props.checked&&null==e.props.onChange)}function i(e){this.props.valueLink.requestChange(e.target.value)}function s(e){this.props.checkedLink.requestChange(e.target.checked)}var l=n(316),u=n(201),c={button:!0,checkbox:!0,image:!0,hidden:!0,radio:!0,reset:!0,submit:!0},d={Mixin:{propTypes:{value:function(e,t,n){return!e[t]||c[e.type]||e.onChange||e.readOnly||e.disabled?null:new Error("You provided a `value` prop to a form field without an `onChange` handler. This will render a read-only field. If the field should be mutable use `defaultValue`. Otherwise, set either `onChange` or `readOnly`.")},checked:function(e,t,n){return!e[t]||e.onChange||e.readOnly||e.disabled?null:new Error("You provided a `checked` prop to a form field without an `onChange` handler. This will render a read-only field. If the field should be mutable use `defaultChecked`. Otherwise, set either `onChange` or `readOnly`.")},onChange:l.func}},getValue:function(e){return e.props.valueLink?(a(e),e.props.valueLink.value):e.props.value},getChecked:function(e){return e.props.checkedLink?(o(e),e.props.checkedLink.value):e.props.checked},getOnChange:function(e){return e.props.valueLink?(a(e),i):e.props.checkedLink?(o(e),s):e.props.onChange}};e.exports=d}).call(t,n(175))},function(e,t,n){"use strict";function r(e){function t(t,n,r,a,o){if(a=a||w,null==n[r]){var i=v[o];return t?new Error("Required "+i+" `"+r+"` was not specified in "+("`"+a+"`.")):null}return e(n,r,a,o)}var n=t.bind(null,!1);return n.isRequired=t.bind(null,!0),n}function a(e){function t(t,n,r,a){var o=t[n],i=m(o);if(i!==e){var s=v[a],l=g(o);return new Error("Invalid "+s+" `"+n+"` of type `"+l+"` "+("supplied to `"+r+"`, expected `"+e+"`."))}return null}return r(t)}function o(){return r(_.thatReturns(null))}function i(e){function t(t,n,r,a){var o=t[n];if(!Array.isArray(o)){var i=v[a],s=m(o);return new Error("Invalid "+i+" `"+n+"` of type "+("`"+s+"` supplied to `"+r+"`, expected an array."))}for(var l=0;l>",k=s(),E=p(),x={array:a("array"),bool:a("boolean"),func:a("function"),number:a("number"),object:a("object"),string:a("string"),any:o(),arrayOf:i,element:k,instanceOf:l,node:E,objectOf:c,oneOf:u,oneOfType:d,shape:f};e.exports=x},function(e,t,n){(function(t){"use strict";var r=n(304),a=n(231),o=n(205),i=n(209),s=o.createFactory("option"),l=a.createClass({displayName:"ReactDOMOption",tagName:"OPTION",mixins:[r],componentWillMount:function(){"production"!==t.env.NODE_ENV&&("production"!==t.env.NODE_ENV?i(null==this.props.selected,"Use the `defaultValue` or `value` props on , and ) reliably and efficiently. To fix this, have a single top-level component that never unmounts render these elements.",this.constructor.displayName):i(!1)},render:function(){return n(this.props)}});return r}var a=n(231),o=n(205),i=n(201);e.exports=r}).call(t,n(175))},function(e,t,n){"use strict";function r(e){return Math.floor(100*e)/100}function a(e,t,n){e[t]=(e[t]||0)+n}var o=n(238),i=n(345),s=n(261),l=n(222),u=n(346),c={_allMeasurements:[],_mountStack:[0],_injected:!1,start:function(){c._injected||l.injection.injectMeasure(c.measure),c._allMeasurements.length=0,l.enableMeasure=!0},stop:function(){l.enableMeasure=!1},getLastMeasurements:function(){return c._allMeasurements},printExclusive:function(e){e=e||c._allMeasurements;var t=i.getExclusiveSummary(e);console.table(t.map(function(e){return{"Component class name":e.componentName,"Total inclusive time (ms)":r(e.inclusive),"Exclusive mount time (ms)":r(e.exclusive),"Exclusive render time (ms)":r(e.render),"Mount time per instance (ms)":r(e.exclusive/e.count),"Render time per instance (ms)":r(e.render/e.count),Instances:e.count}}))},printInclusive:function(e){e=e||c._allMeasurements;var t=i.getInclusiveSummary(e);console.table(t.map(function(e){return{"Owner > component":e.componentName,"Inclusive time (ms)":r(e.time),Instances:e.count}})),console.log("Total time:",i.getTotalTime(e).toFixed(2)+" ms")},getMeasurementsSummaryMap:function(e){var t=i.getInclusiveSummary(e,!0);return t.map(function(e){return{"Owner > component":e.componentName,"Wasted time (ms)":e.time,Instances:e.count}})},printWasted:function(e){e=e||c._allMeasurements,console.table(c.getMeasurementsSummaryMap(e)),console.log("Total time:",i.getTotalTime(e).toFixed(2)+" ms")},printDOM:function(e){e=e||c._allMeasurements;var t=i.getDOMSummary(e);console.table(t.map(function(e){var t={};return t[o.ID_ATTRIBUTE_NAME]=e.id,t.type=e.type,t.args=JSON.stringify(e.args),t})),console.log("Total time:",i.getTotalTime(e).toFixed(2)+" ms")},_recordWrite:function(e,t,n,r){var a=c._allMeasurements[c._allMeasurements.length-1].writes;a[e]=a[e]||[],a[e].push({type:t,time:n,args:r})},measure:function(e,t,n){return function(){for(var r=[],o=0,i=arguments.length;i>o;o++)r.push(arguments[o]);var l,d,p;if("_renderNewRootComponent"===t||"flushBatchedUpdates"===t)return c._allMeasurements.push({exclusive:{},inclusive:{},render:{},counts:{},writes:{},displayNames:{},totalTime:0}),p=u(),d=n.apply(this,r),c._allMeasurements[c._allMeasurements.length-1].totalTime=u()-p,d;if("_mountImageIntoNode"===t||"ReactDOMIDOperations"===e){if(p=u(),d=n.apply(this,r),l=u()-p,"_mountImageIntoNode"===t){var f=s.getID(r[1]);c._recordWrite(f,t,l,r[0])}else"dangerouslyProcessChildrenUpdates"===t?r[0].forEach(function(e){var t={};null!==e.fromIndex&&(t.fromIndex=e.fromIndex),null!==e.toIndex&&(t.toIndex=e.toIndex),null!==e.textContent&&(t.textContent=e.textContent),null!==e.markupIndex&&(t.markup=r[1][e.markupIndex]),c._recordWrite(e.parentID,e.type,l,t)}):c._recordWrite(r[0],t,l,Array.prototype.slice.call(r,1));return d}if("ReactCompositeComponent"!==e||"mountComponent"!==t&&"updateComponent"!==t&&"_renderValidatedComponent"!==t)return n.apply(this,r);if("string"==typeof this._currentElement.type)return n.apply(this,r);var h="mountComponent"===t?r[0]:this._rootNodeID,m="_renderValidatedComponent"===t,g="mountComponent"===t,y=c._mountStack,b=c._allMeasurements[c._allMeasurements.length-1];if(m?a(b.counts,h,1):g&&y.push(0),p=u(),d=n.apply(this,r),l=u()-p,m)a(b.render,h,l);else if(g){var v=y.pop();y[y.length-1]+=l,a(b.exclusive,h,l-v),a(b.inclusive,h,l)}else a(b.inclusive,h,l);return b.displayNames[h]={current:this.getName(),owner:this._currentElement._owner?this._currentElement._owner.getName():""},d}}};e.exports=c},function(e,t,n){function r(e){for(var t=0,n=0;n=u&&s.push(n[t]);return s.sort(function(e,t){return t.exclusive-e.exclusive}),s}function i(e,t){for(var n,r={},a=0;a "+p.current,r[n]=r[n]||{componentName:n,time:0,count:0},i.inclusive[d]&&(r[n].time+=i.inclusive[d]),i.counts[d]&&(r[n].count+=i.counts[d])}}var f=[];for(n in r)r[n].time>=u&&f.push(r[n]);return f.sort(function(e,t){return t.time-e.time}),f}function s(e){var t={},n=Object.keys(e.writes),r=l({},e.exclusive,e.inclusive);for(var a in r){for(var o=!1,i=0;i0&&(t[a]=!0)}return t}var l=n(207),u=1.2,c={_mountImageIntoNode:"set innerHTML",INSERT_MARKUP:"set innerHTML",MOVE_EXISTING:"move",REMOVE_NODE:"remove",TEXT_CONTENT:"set textContent",updatePropertyByID:"update attribute",deletePropertyByID:"delete attribute",updateStylesByID:"update styles",updateInnerHTMLByID:"set innerHTML",dangerouslyReplaceNodeWithMarkupByID:"replace"},d={getExclusiveSummary:o,getInclusiveSummary:i,getDOMSummary:a,getTotalTime:r};e.exports=d},function(e,t,n){var r=n(347);r&&r.now||(r=Date);var a=r.now.bind(r);e.exports=a},function(e,t,n){"use strict";var r,a=n(245);a.canUseDOM&&(r=window.performance||window.msPerformance||window.webkitPerformance),e.exports=r||{}},function(e,t,n){(function(t){"use strict";function r(e){"production"!==t.env.NODE_ENV?d(o.isValidElement(e),"renderToString(): You must pass a valid ReactElement."):d(o.isValidElement(e));var n;try{var r=i.createReactRootID();return n=l.getPooled(!1),n.perform(function(){var t=c(e,null),a=t.mountComponent(r,n,u);return s.addChecksumToMarkup(a)},null)}finally{l.release(n)}}function a(e){"production"!==t.env.NODE_ENV?d(o.isValidElement(e),"renderToStaticMarkup(): You must pass a valid ReactElement."):d(o.isValidElement(e));var n;try{var r=i.createReactRootID();return n=l.getPooled(!0),n.perform(function(){var t=c(e,null);return t.mountComponent(r,n,u)},null)}finally{l.release(n)}}var o=n(205),i=n(213),s=n(271),l=n(349),u=n(208),c=n(277),d=n(201);e.exports={renderToString:r,renderToStaticMarkup:a}}).call(t,n(175))},function(e,t,n){"use strict";function r(e){this.reinitializeTransaction(),this.renderToStaticMarkup=e,this.reactMountReady=o.getPooled(null),this.putListenerQueue=i.getPooled()}var a=n(203),o=n(221),i=n(329),s=n(230),l=n(207),u=n(210),c={initialize:function(){this.reactMountReady.reset()},close:u},d={initialize:function(){this.putListenerQueue.reset()},close:u},p=[d,c],f={getTransactionWrappers:function(){return p},getReactMountReady:function(){return this.reactMountReady},getPutListenerQueue:function(){return this.putListenerQueue},destructor:function(){o.release(this.reactMountReady),this.reactMountReady=null,i.release(this.putListenerQueue),this.putListenerQueue=null}};l(r.prototype,s.Mixin,f),a.addPoolingTo(r),e.exports=r},function(e,t,n){(function(t){"use strict";function r(e){return"production"!==t.env.NODE_ENV?o(a.isValidElement(e),"onlyChild must be passed a children with exactly one child."):o(a.isValidElement(e)),e}var a=n(205),o=n(201);e.exports=r}).call(t,n(175))},function(e,t,n){"use strict";t.DefaultRoute=n(352),t.Link=n(365),t.NotFoundRoute=n(366),t.Redirect=n(367),t.Route=n(364),t.ActiveHandler=n(362),t.RouteHandler=t.ActiveHandler,t.HashLocation=n(368),t.HistoryLocation=n(371),t.RefreshLocation=n(372),t.StaticLocation=n(373),t.TestLocation=n(374),t.ImitateBrowserBehavior=n(375),t.ScrollToTopBehavior=n(376),t.History=n(370),t.Navigation=n(377),t.State=n(378),t.createRoute=n(354).createRoute,t.createDefaultRoute=n(354).createDefaultRoute,t.createNotFoundRoute=n(354).createNotFoundRoute,t.createRedirect=n(354).createRedirect,t.createRoutesFromReactChildren=n(379),t.create=n(380),t.run=n(389)},function(e,t,n){"use strict";var r=function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")},a=function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(e.__proto__=t)},o=n(353),i=n(362),s=n(364),l=function(e){function t(){r(this,t),null!=e&&e.apply(this,arguments)}return a(t,e),t}(s);l.propTypes={name:o.string,path:o.falsy,children:o.falsy,handler:o.func.isRequired},l.defaultProps={handler:i},e.exports=l},function(e,t,n){"use strict";var r=n(207),a=n(196).PropTypes,o=n(354),i=r({},a,{falsy:function(e,t,n){return e[t]?new Error("<"+n+'> should not have a "'+t+'" prop'):void 0},route:a.instanceOf(o),router:a.func});e.exports=i},function(e,t,n){"use strict";var r,a=function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")},o=function(){function e(e,t){for(var n=0;n'}}],[{key:"createRoute",value:function(t,n){t=t||{},"string"==typeof t&&(t={path:t});var a=r;a?l(null==t.parentRoute||t.parentRoute===a,"You should not use parentRoute with createRoute inside another route's child callback; it is ignored"):a=t.parentRoute;var o=t.name,i=t.path||o;!i||t.isDefault||t.isNotFound?i=a?a.path:"/":u.isAbsolute(i)?a&&s(i===a.path||0===a.paramNames.length,'You cannot nest path "%s" inside "%s"; the parent requires URL parameters',i,a.path):i=a?u.join(a.path,i):"/"+i,t.isNotFound&&!/\*$/.test(i)&&(i+="*");var c=new e(o,i,t.ignoreScrollBehavior,t.isDefault,t.isNotFound,t.onEnter,t.onLeave,t.handler);if(a&&(c.isDefault?(s(null==a.defaultRoute,"%s may not have more than one default route",a),a.defaultRoute=c):c.isNotFound&&(s(null==a.notFoundRoute,"%s may not have more than one not found route",a),a.notFoundRoute=c),a.appendChild(c)),"function"==typeof n){var d=r;r=c,n.call(c,c),r=d}return c}},{key:"createDefaultRoute",value:function(t){return e.createRoute(i({},t,{isDefault:!0}))}},{key:"createNotFoundRoute",value:function(t){return e.createRoute(i({},t,{isNotFound:!0}))}},{key:"createRedirect",value:function(t){return e.createRoute(i({},t,{path:t.path||t.from||"*",onEnter:function(e,n,r){e.redirect(t.to,t.params||n,t.query||r)}}))}}]),e}();e.exports=c},function(e,t,n){"use strict";function r(e){if(!(e in d)){var t=[],n=e.replace(s,function(e,n){return n?(t.push(n),"([^/?#]+)"):"*"===e?(t.push("splat"),"(.*?)"):"\\"+e});d[e]={matcher:new RegExp("^"+n+"$","i"),paramNames:t}}return d[e]}var a=n(201),o=n(356),i=n(357),s=/:([a-zA-Z_$][a-zA-Z0-9_$]*)|[*.()\[\]\\+|{}^$]/g,l=/:([a-zA-Z_$][a-zA-Z0-9_$?]*[?]?)|[*]/g,u=/\/\/\?|\/\?\/|\/\?/g,c=/\?(.*)$/,d={},p={isAbsolute:function(e){return"/"===e.charAt(0)},join:function(e,t){return e.replace(/\/*$/,"/")+t},extractParamNames:function(e){return r(e).paramNames},extractParams:function(e,t){var n=r(e),a=n.matcher,o=n.paramNames,i=t.match(a);if(!i)return null;var s={};return o.forEach(function(e,t){s[e]=i[t+1]}),s},injectParams:function(e,t){t=t||{};var n=0;return e.replace(l,function(r,o){if(o=o||"splat","?"===o.slice(-1)){if(o=o.slice(0,-1),null==t[o])return""}else a(null!=t[o],'Missing "%s" parameter for path "%s"',o,e);var i;return"splat"===o&&Array.isArray(t[o])?(i=t[o][n++],a(null!=i,'Missing splat # %s for path "%s"',n,e)):i=t[o],i}).replace(u,"/")},extractQuery:function(e){var t=e.match(c);return t&&i.parse(t[1])},withoutQuery:function(e){return e.replace(c,"")},withQuery:function(e,t){var n=p.extractQuery(e);n&&(t=t?o(n,t):n);var r=i.stringify(t,{arrayFormat:"brackets"});return r?p.withoutQuery(e)+"?"+r:p.withoutQuery(e)}};e.exports=p},function(e,t){"use strict";function n(e){if(null==e)throw new TypeError("Object.assign cannot be called with null or undefined");return Object(e)}e.exports=Object.assign||function(e,t){for(var r,a,o=n(e),i=1;is;++s){var u=i[s];o=Array.isArray(e)?o.concat(a.stringify(e[u],n(t,u),n)):o.concat(a.stringify(e[u],t+"["+u+"]",n))}return o},e.exports=function(e,t){t=t||{};var n="undefined"==typeof t.delimiter?a.delimiter:t.delimiter,r=[];if("object"!=typeof e||null===e)return"";var o;o=t.arrayFormat in a.arrayPrefixGenerators?t.arrayFormat:"indices"in t?t.indices?"indices":"repeat":"indices";for(var i=a.arrayPrefixGenerators[o],s=Object.keys(e),l=0,u=s.length;u>l;++l){var c=s[l];r=r.concat(a.stringify(e[c],c,i))}return r.join(n)}},function(e,t){t.arrayToObject=function(e){for(var t={},n=0,r=e.length;r>n;++n)"undefined"!=typeof e[n]&&(t[n]=e[n]);return t},t.merge=function(e,n){if(!n)return e;if("object"!=typeof n)return Array.isArray(e)?e.push(n):e[n]=!0,e;if("object"!=typeof e)return e=[e].concat(n);Array.isArray(e)&&!Array.isArray(n)&&(e=t.arrayToObject(e));for(var r=Object.keys(n),a=0,o=r.length;o>a;++a){var i=r[a],s=n[i];e[i]?e[i]=t.merge(e[i],s):e[i]=s}return e},t.decode=function(e){try{return decodeURIComponent(e.replace(/\+/g," "))}catch(t){return e}},t.compact=function(e,n){if("object"!=typeof e||null===e)return e;n=n||[];var r=n.indexOf(e);if(-1!==r)return n[r];if(n.push(e),Array.isArray(e)){for(var a=[],o=0,i=e.length;i>o;++o)"undefined"!=typeof e[o]&&a.push(e[o]);return a}var s=Object.keys(e);for(o=0,i=s.length;i>o;++o){var l=s[o];e[l]=t.compact(e[l],n)}return e},t.isRegExp=function(e){return"[object RegExp]"===Object.prototype.toString.call(e)},t.isBuffer=function(e){return null===e||"undefined"==typeof e?!1:!!(e.constructor&&e.constructor.isBuffer&&e.constructor.isBuffer(e))}},function(e,t,n){var r=n(360),a={delimiter:"&",depth:5,arrayLimit:20,parameterLimit:1e3};a.parseValues=function(e,t){for(var n={},a=e.split(t.delimiter,t.parameterLimit===1/0?void 0:t.parameterLimit),o=0,i=a.length;i>o;++o){var s=a[o],l=-1===s.indexOf("]=")?s.indexOf("="):s.indexOf("]=")+1;if(-1===l)n[r.decode(s)]="";else{var u=r.decode(s.slice(0,l)),c=r.decode(s.slice(l+1));if(Object.prototype.hasOwnProperty(u))continue;n.hasOwnProperty(u)?n[u]=[].concat(n[u]).concat(c):n[u]=c}}return n},a.parseObject=function(e,t,n){if(!e.length)return t;var r=e.shift(),o={};if("[]"===r)o=[],o=o.concat(a.parseObject(e,t,n));else{var i="["===r[0]&&"]"===r[r.length-1]?r.slice(1,r.length-1):r,s=parseInt(i,10),l=""+s;!isNaN(s)&&r!==i&&l===i&&s>=0&&s<=n.arrayLimit?(o=[],o[s]=a.parseObject(e,t,n)):o[i]=a.parseObject(e,t,n)}return o},a.parseKeys=function(e,t,n){if(e){var r=/^([^\[\]]*)/,o=/(\[[^\[\]]*\])/g,i=r.exec(e);if(!Object.prototype.hasOwnProperty(i[1])){var s=[];i[1]&&s.push(i[1]);for(var l=0;null!==(i=o.exec(e))&&ls;++s){var u=i[s],c=a.parseKeys(u,n[u],t);o=r.merge(o,c)}return r.compact(o)}},function(e,t,n){"use strict";var r=function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")},a=function(){function e(e,t){for(var n=0;n"}};e.exports=d},function(e,t){"use strict";var n={PUSH:"push",REPLACE:"replace",POP:"pop"};e.exports=n},function(e,t,n){"use strict";var r=n(201),a=n(245).canUseDOM,o={length:1,back:function(){r(a,"Cannot use History.back without a DOM"),o.length-=1,window.history.back()}};e.exports=o},function(e,t,n){"use strict";function r(e){var t={path:u.getCurrentPath(),type:e};s.forEach(function(e){e.call(u,t)})}function a(e){void 0!==e.state&&r(o.POP)}var o=n(369),i=n(370),s=[],l=!1,u={addChangeListener:function(e){s.push(e),l||(window.addEventListener?window.addEventListener("popstate",a,!1):window.attachEvent("onpopstate",a),l=!0)},removeChangeListener:function(e){s=s.filter(function(t){return t!==e}),0===s.length&&(window.addEventListener?window.removeEventListener("popstate",a,!1):window.removeEvent("onpopstate",a),l=!1)},push:function(e){window.history.pushState({path:e},"",e),i.length+=1,r(o.PUSH)},replace:function(e){window.history.replaceState({path:e},"",e),r(o.REPLACE)},pop:i.back,getCurrentPath:function(){return decodeURI(window.location.pathname+window.location.search)},toString:function(){return""}};e.exports=u},function(e,t,n){"use strict";var r=n(371),a=n(370),o={push:function(e){window.location=e},replace:function(e){window.location.replace(e)},pop:a.back,getCurrentPath:r.getCurrentPath,toString:function(){return""}};e.exports=o},function(e,t,n){"use strict";function r(){i(!1,"You cannot modify a static location")}var a=function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")},o=function(){function e(e,t){for(var n=0;n'}}]),e}();s.prototype.push=r,s.prototype.replace=r,s.prototype.pop=r,e.exports=s},function(e,t,n){"use strict";var r=function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")},a=function(){function e(e,t){for(var n=0;nn;++n)this.listeners[n].call(this,t)}},{key:"addChangeListener",value:function(e){this.listeners.push(e)}},{key:"removeChangeListener",value:function(e){this.listeners=this.listeners.filter(function(t){return t!==e})}},{key:"push",value:function(e){this.history.push(e),this._updateHistoryLength(),this._notifyChange(i.PUSH)}},{key:"replace",value:function(e){o(this.history.length,"You cannot replace the current path with no history"),this.history[this.history.length-1]=e,this._notifyChange(i.REPLACE)}},{key:"pop",value:function(){this.history.pop(),this._updateHistoryLength(),this._notifyChange(i.POP)}},{key:"getCurrentPath",value:function(){return this.history[this.history.length-1]}},{key:"toString",value:function(){return""}}]),e}();e.exports=l},function(e,t,n){"use strict";var r=n(369),a={updateScrollPosition:function(e,t){switch(t){case r.PUSH:case r.REPLACE:window.scrollTo(0,0);break;case r.POP:e?window.scrollTo(e.x,e.y):window.scrollTo(0,0)}}};e.exports=a},function(e,t){"use strict";var n={updateScrollPosition:function(){window.scrollTo(0,0)}};e.exports=n},function(e,t,n){"use strict";var r=n(353),a={contextTypes:{router:r.router.isRequired},makePath:function(e,t,n){return this.context.router.makePath(e,t,n)},makeHref:function(e,t,n){return this.context.router.makeHref(e,t,n)},transitionTo:function(e,t,n){this.context.router.transitionTo(e,t,n)},replaceWith:function(e,t,n){this.context.router.replaceWith(e,t,n)},goBack:function(){return this.context.router.goBack()}};e.exports=a},function(e,t,n){"use strict";var r=n(353),a={contextTypes:{router:r.router.isRequired},getPath:function(){return this.context.router.getCurrentPath()},getPathname:function(){return this.context.router.getCurrentPathname()},getParams:function(){return this.context.router.getCurrentParams()},getQuery:function(){return this.context.router.getCurrentQuery()},getRoutes:function(){return this.context.router.getCurrentRoutes()},isActive:function(e,t,n){return this.context.router.isActive(e,t,n)}};e.exports=a},function(e,t,n){"use strict";function r(e,t,n){e=e||"UnknownComponent";for(var r in t)if(t.hasOwnProperty(r)){var a=t[r](n,r,e);a instanceof Error&&u(!1,a.message)}}function a(e){var t=l({},e),n=t.handler;return n&&(t.onEnter=n.willTransitionTo,t.onLeave=n.willTransitionFrom),t}function o(e){if(s.isValidElement(e)){var t=e.type,n=l({},t.defaultProps,e.props);return t.propTypes&&r(t.displayName,t.propTypes,n),t===c?f.createDefaultRoute(a(n)):t===d?f.createNotFoundRoute(a(n)):t===p?f.createRedirect(a(n)):f.createRoute(a(n),function(){n.children&&i(n.children)})}}function i(e){var t=[];return s.Children.forEach(e,function(e){(e=o(e))&&t.push(e)}),t}var s=n(196),l=n(207),u=n(209),c=n(352),d=n(366),p=n(367),f=n(354);e.exports=i},function(e,t,n){(function(t){"use strict";function r(e,t){for(var n in t)if(t.hasOwnProperty(n)&&e[n]!==t[n])return!1;return!0}function a(e,t,n,a,o,i){return e.some(function(e){if(e!==t)return!1;for(var s,l=t.paramNames,u=0,c=l.length;c>u;++u)if(s=l[u],a[s]!==n[s])return!1;return r(o,i)&&r(i,o)})}function o(e,t){for(var n,r=0,a=e.length;a>r;++r)n=e[r],n.name&&(p(null==t[n.name],'You may not have more than one route named "%s"',n.name),t[n.name]=n),n.childRoutes&&o(n.childRoutes,t)}function i(e,t){return e.some(function(e){return e.name===t})}function s(e,t){for(var n in t)if(String(e[n])!==String(t[n]))return!1;return!0}function l(e,t){for(var n in t)if(String(e[n])!==String(t[n]))return!1;return!0}function u(e){e=e||{},k(e)&&(e={routes:e});var n=[],r=e.location||D,u=e.scrollBehavior||M,m={},N={},z=null,I=null;"string"==typeof r&&(r=new v(r)),r instanceof v?d(!f||"test"===t.env.NODE_ENV,"You should not use a static location in a DOM environment because the router will not be kept in sync with the current URL"):p(f||r.needsDOM===!1,"You cannot use %s without a DOM",r),r!==y||C()||(r=b);var R=c.createClass({displayName:"Router",statics:{isRunning:!1,cancelPendingTransition:function(){z&&(z.cancel(),z=null)},clearAllRoutes:function(){R.cancelPendingTransition(),R.namedRoutes={},R.routes=[]},addRoutes:function(e){k(e)&&(e=w(e)),o(e,R.namedRoutes),R.routes.push.apply(R.routes,e)},replaceRoutes:function(e){R.clearAllRoutes(),R.addRoutes(e),R.refresh()},match:function(e){return A.findMatch(R.routes,e)},makePath:function(e,t,n){var r;if(T.isAbsolute(e))r=e;else{var a=e instanceof j?e:R.namedRoutes[e];p(a instanceof j,'Cannot find a route named "%s"',e),r=a.path}return T.withQuery(T.injectParams(r,t),n)},makeHref:function(e,t,n){var a=R.makePath(e,t,n);return r===g?"#"+a:a},transitionTo:function(e,t,n){var a=R.makePath(e,t,n);z?r.replace(a):r.push(a)},replaceWith:function(e,t,n){r.replace(R.makePath(e,t,n))},goBack:function(){return S.length>1||r===b?(r.pop(),!0):(d(!1,"goBack() was ignored because there is no router history"),!1)},handleAbort:e.onAbort||function(e){if(r instanceof v)throw new Error("Unhandled aborted transition! Reason: "+e);e instanceof P||(e instanceof O?r.replace(R.makePath(e.to,e.params,e.query)):r.pop())},handleError:e.onError||function(e){throw e},handleLocationChange:function(e){R.dispatch(e.path,e.type)},dispatch:function(e,t){R.cancelPendingTransition();var r=m.path,o=null==t;if(r!==e||o){r&&t===h.PUSH&&R.recordScrollPosition(r);var i=R.match(e);d(null!=i,'No route matches path "%s". Make sure you have somewhere in your routes',e,e),null==i&&(i={});var s,l,u=m.routes||[],c=m.params||{},p=m.query||{},f=i.routes||[],g=i.params||{},y=i.query||{};u.length?(s=u.filter(function(e){return!a(f,e,c,g,p,y)}),l=f.filter(function(e){return!a(u,e,c,g,p,y)})):(s=[],l=f);var b=new E(e,R.replaceWith.bind(R,e));z=b;var v=n.slice(u.length-s.length);E.from(b,s,v,function(n){return n||b.abortReason?I.call(R,n,b):void E.to(b,l,g,y,function(n){I.call(R,n,b,{path:e,action:t,pathname:i.pathname,routes:f,params:g,query:y})})})}},run:function(e){p(!R.isRunning,"Router is already running"),I=function(t,n,r){t&&R.handleError(t),z===n&&(z=null,n.abortReason?R.handleAbort(n.abortReason):e.call(R,R,N=r))},r instanceof v||(r.addChangeListener&&r.addChangeListener(R.handleLocationChange),R.isRunning=!0),R.refresh()},refresh:function(){R.dispatch(r.getCurrentPath(),null)},stop:function(){R.cancelPendingTransition(),r.removeChangeListener&&r.removeChangeListener(R.handleLocationChange),R.isRunning=!1},getLocation:function(){return r},getScrollBehavior:function(){return u},getRouteAtDepth:function(e){var t=m.routes;return t&&t[e]},setRouteComponentAtDepth:function(e,t){n[e]=t},getCurrentPath:function(){return m.path},getCurrentPathname:function(){return m.pathname},getCurrentParams:function(){return m.params},getCurrentQuery:function(){return m.query},getCurrentRoutes:function(){return m.routes},isActive:function(e,t,n){return T.isAbsolute(e)?e===m.path:i(m.routes,e)&&s(m.params,t)&&(null==n||l(m.query,n))}},mixins:[_],propTypes:{children:x.falsy},childContextTypes:{routeDepth:x.number.isRequired,router:x.router.isRequired},getChildContext:function(){return{routeDepth:1,router:R}},getInitialState:function(){return m=N},componentWillReceiveProps:function(){this.setState(m=N)},componentWillUnmount:function(){R.stop()},render:function(){var e=R.getRouteAtDepth(0);return e?c.createElement(e.handler,this.props):null}});return R.clearAllRoutes(),e.routes&&R.addRoutes(e.routes),R}var c=n(196),d=n(209),p=n(201),f=n(245).canUseDOM,h=n(369),m=n(375),g=n(368),y=n(371),b=n(372),v=n(373),_=n(381),w=n(379),k=n(383),E=n(384),x=n(353),O=n(386),S=n(370),P=n(385),A=n(387),j=n(354),C=n(388),T=n(355),D=f?g:"/",M=f?m:null;e.exports=u}).call(t,n(175))},function(e,t,n){"use strict";function r(e,t){if(!t)return!0;if(e.pathname===t.pathname)return!1;var n=e.routes,r=t.routes,a=n.filter(function(e){return-1!==r.indexOf(e)});return!a.some(function(e){return e.ignoreScrollBehavior})}var a=n(201),o=n(245).canUseDOM,i=n(382),s={statics:{recordScrollPosition:function(e){this.scrollHistory||(this.scrollHistory={}),this.scrollHistory[e]=i()},getScrollPosition:function(e){return this.scrollHistory||(this.scrollHistory={}),this.scrollHistory[e]||null}},componentWillMount:function(){a(null==this.constructor.getScrollBehavior()||o,"Cannot use scroll behavior without a DOM")},componentDidMount:function(){this._updateScroll()},componentDidUpdate:function(e,t){this._updateScroll(t)},_updateScroll:function(e){if(r(this.state,e)){var t=this.constructor.getScrollBehavior();t&&t.updateScrollPosition(this.constructor.getScrollPosition(this.state.path),this.state.action)}}};e.exports=s},function(e,t,n){"use strict";function r(){return a(o,"Cannot get current scroll position without a DOM"),{x:window.pageXOffset||document.documentElement.scrollLeft,y:window.pageYOffset||document.documentElement.scrollTop}}var a=n(201),o=n(245).canUseDOM;e.exports=r},function(e,t,n){"use strict";function r(e){return null==e||o.isValidElement(e)}function a(e){return r(e)||Array.isArray(e)&&e.every(r)}var o=n(196);e.exports=a},function(e,t,n){"use strict";function r(e,t){this.path=e,this.abortReason=null,this.retry=t.bind(this)}var a=n(385),o=n(386);r.prototype.abort=function(e){null==this.abortReason&&(this.abortReason=e||"ABORT")},r.prototype.redirect=function(e,t,n){this.abort(new o(e,t,n))},r.prototype.cancel=function(){this.abort(new a)},r.from=function(e,t,n,r){t.reduce(function(t,r,a){return function(o){if(o||e.abortReason)t(o);else if(r.onLeave)try{r.onLeave(e,n[a],t),r.onLeave.length<3&&t()}catch(i){t(i)}else t()}},r)()},r.to=function(e,t,n,r,a){t.reduceRight(function(t,a){return function(o){if(o||e.abortReason)t(o);else if(a.onEnter)try{a.onEnter(e,n,r,t),a.onEnter.length<4&&t()}catch(i){t(i)}else t()}},a)()},e.exports=r},function(e,t){"use strict";function n(){}e.exports=n},function(e,t){"use strict";function n(e,t,n){this.to=e,this.params=t,this.query=n}e.exports=n},function(e,t,n){"use strict";function r(e,t,n){var a=e.childRoutes;if(a)for(var o,l,u=0,c=a.length;c>u;++u)if(l=a[u],!l.isDefault&&!l.isNotFound&&(o=r(l,t,n)))return o.routes.unshift(e),o;var d=e.defaultRoute;if(d&&(f=i.extractParams(d.path,t)))return new s(t,f,n,[e,d]);var p=e.notFoundRoute;if(p&&(f=i.extractParams(p.path,t)))return new s(t,f,n,[e,p]);var f=i.extractParams(e.path,t);return f?new s(t,f,n,[e]):null}var a=function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")},o=function(){function e(e,t){for(var n=0;ns;++s)o=r(e[s],n,a);return o}}]),e}();e.exports=s},function(e,t){"use strict";function n(){/*! taken from modernizr + * https://github.com/Modernizr/Modernizr/blob/master/LICENSE + * https://github.com/Modernizr/Modernizr/blob/master/feature-detects/history.js + * changed to avoid false negatives for Windows Phones: https://github.com/rackt/react-router/issues/586 + */ +var e=navigator.userAgent;return-1===e.indexOf("Android 2.")&&-1===e.indexOf("Android 4.0")||-1===e.indexOf("Mobile Safari")||-1!==e.indexOf("Chrome")||-1!==e.indexOf("Windows Phone")?window.history&&"pushState"in window.history:!1}e.exports=n},function(e,t,n){"use strict";function r(e,t,n){"function"==typeof t&&(n=t,t=null);var r=a({routes:e,location:t});return r.run(n),r}var a=n(380);e.exports=r},,,,,,,,,,,,,,,,,,function(e,t,n){"use strict";function r(e){return"string"==typeof e||"[object String]"===Object.prototype.toString.call(e)}function a(e){return"function"==typeof e||"[object Function]"===Object.prototype.toString.call(e)}function o(e){return null===e?!1:"[object Object]"===Object.prototype.toString.call(e)}function i(e){return r(e)&&":"===e[0]}function s(e,t){return Object.prototype.hasOwnProperty.call(e,t)}function l(e,t){return t.reduce(function(e,t){return o(e)&&s(e,t)?e[t]:null},e)}function u(){this._registry={locale:"en",interpolate:!0,fallbackLocale:null,scope:null,translations:{},interpolations:{},normalizedKeys:{},separator:"."},this.registerTranslations("en",n(419)),this.setMaxListeners(0)}function c(){return v.translate.apply(v,arguments)}var d=n(408),p=n(409).isArray,f=n(409).isDate,h=n(412).sprintf,m=n(413),g=n(414),y=n(416),b="counterpart";d(u.prototype,m.EventEmitter.prototype),u.prototype.getLocale=function(){return this._registry.locale},u.prototype.setLocale=function(e){var t=this._registry.locale;return t!=e&&(this._registry.locale=e,this.emit("localechange",e,t)),t},u.prototype.getFallbackLocale=function(){return this._registry.fallbackLocale},u.prototype.setFallbackLocale=function(e){var t=this._registry.fallbackLocale;return this._registry.fallbackLocale=e,t},u.prototype.getAvailableLocales=function(){return this._registry.availableLocales||Object.keys(this._registry.translations)},u.prototype.setAvailableLocales=function(e){var t=this.getAvailableLocales();return this._registry.availableLocales=e,t},u.prototype.getSeparator=function(){return this._registry.separator},u.prototype.setSeparator=function(e){var t=this._registry.separator;return this._registry.separator=e,t},u.prototype.setInterpolate=function(e){var t=this._registry.interpolate;return this._registry.interpolate=e,t},u.prototype.getInterpolate=function(){return this._registry.interpolate},u.prototype.registerTranslations=function(e,t){var n={};return n[e]=t,d(!0,this._registry.translations,n),n},u.prototype.registerInterpolations=function(e){return d(!0,this._registry.interpolations,e)},u.prototype.onLocaleChange=u.prototype.addLocaleChangeListener=function(e){this.addListener("localechange",e)},u.prototype.offLocaleChange=u.prototype.removeLocaleChangeListener=function(e){this.removeListener("localechange",e)},u.prototype.translate=function(e,t){if(!p(e)&&!r(e)||!e.length)throw new Error("invalid argument: key");i(e)&&(e=e.substr(1)),t=d(!0,{},t);var n=t.locale||this._registry.locale;delete t.locale;var a=t.scope||this._registry.scope;delete t.scope;var o=t.separator||this._registry.separator;delete t.separator;var s=t.fallbackLocale||this._registry.fallbackLocale;delete t.fallbackLocale;var u=this._normalizeKeys(n,a,e,o),c=l(this._registry.translations,u);if(null===c&&t.fallback&&(c=this._fallback(n,a,e,t.fallback,t)),null===c&&s&&n!==s){var f=this._normalizeKeys(s,a,e,o);c=l(this._registry.translations,f),c&&(n=s)}return null===c&&(c="missing translation: "+u.join(o)),c=this._pluralize(n,c,t.count),this._registry.interpolate!==!1&&t.interpolate!==!1&&(c=this._interpolate(c,t)),c},u.prototype.localize=function(e,t){if(!f(e))throw new Error("invalid argument: object must be a date");t=d(!0,{},t);var n=t.locale||this._registry.locale,r=t.scope||b,a=t.type||"datetime",o=t.format||"default";return t={locale:n,scope:r,interpolate:!1},o=this.translate(["formats",a,o],d(!0,{},t)),y(e,o,this.translate("names",t))},u.prototype._pluralize=function(e,t,n){if("object"!=typeof t||null===t||"number"!=typeof n)return t;var r=this.translate("pluralize",{locale:e,scope:b});return"[object Function]"!==Object.prototype.toString.call(r)?r:r(t,n)},u.prototype.withLocale=function(e,t,n){var r=this._registry.locale;this._registry.locale=e;var a=t.call(n);return this._registry.locale=r,a},u.prototype.withScope=function(e,t,n){var r=this._registry.scope;this._registry.scope=e;var a=t.call(n);return this._registry.scope=r,a},u.prototype.withSeparator=function(e,t,n){var r=this.setSeparator(e),a=t.call(n);return this.setSeparator(r),a},u.prototype._normalizeKeys=function(e,t,n,r){var a=[];return a=a.concat(this._normalizeKey(e,r)),a=a.concat(this._normalizeKey(t,r)),a=a.concat(this._normalizeKey(n,r))},u.prototype._normalizeKey=function(e,t){return this._registry.normalizedKeys[t]=this._registry.normalizedKeys[t]||{},this._registry.normalizedKeys[t][e]=this._registry.normalizedKeys[t][e]||function(e){if(p(e)){var n=e.map(function(e){return this._normalizeKey(e,t)}.bind(this));return[].concat.apply([],n)}if("undefined"==typeof e||null===e)return[];for(var r=e.split(t),a=r.length-1;a>=0;a--)""===r[a]&&r.splice(a,1);return r}.bind(this)(e),this._registry.normalizedKeys[t][e]},u.prototype._interpolate=function(e,t){return"string"!=typeof e?e:h(e,d({},this._registry.interpolations,t))},u.prototype._resolve=function(e,t,n,r,o){if(o=o||{},o.resolve===!1)return r;var s;if(i(r))s=this.translate(r,d({},o,{locale:e,scope:t}));else if(a(r)){var l;o.object?(l=o.object,delete o.object):l=n,s=this._resolve(e,t,n,r(l,o))}else s=r;return/^missing translation:/.test(s)?null:s},u.prototype._fallback=function(e,t,n,r,a){if(a=g(a,"fallback"),p(r)){for(var o=0,i=r.length;i>o;o++){var s=this._resolve(e,t,n,r[o],a);if(s)return s}return null}return this._resolve(e,t,n,r,a)};var v=new u;d(c,v,{Instance:u}),e.exports=c},function(e,t){"use strict";var n=Object.prototype.hasOwnProperty,r=Object.prototype.toString,a=function(e){return"function"==typeof Array.isArray?Array.isArray(e):"[object Array]"===r.call(e)},o=function(e){if(!e||"[object Object]"!==r.call(e))return!1;var t=n.call(e,"constructor"),a=e.constructor&&e.constructor.prototype&&n.call(e.constructor.prototype,"isPrototypeOf");if(e.constructor&&!t&&!a)return!1;var o;for(o in e);return"undefined"==typeof o||n.call(e,o)};e.exports=function i(){var e,t,n,r,s,l,u=arguments[0],c=1,d=arguments.length,p=!1;for("boolean"==typeof u?(p=u,u=arguments[1]||{},c=2):("object"!=typeof u&&"function"!=typeof u||null==u)&&(u={});d>c;++c)if(e=arguments[c],null!=e)for(t in e)n=u[t],r=e[t],u!==r&&(p&&r&&(o(r)||(s=a(r)))?(s?(s=!1,l=n&&a(n)?n:[]):l=n&&o(n)?n:{},u[t]=i(p,l,r)):"undefined"!=typeof r&&(u[t]=r));return u}},function(e,t,n){(function(e,r){function a(e,n){var r={seen:[],stylize:i};return arguments.length>=3&&(r.depth=arguments[2]),arguments.length>=4&&(r.colors=arguments[3]),m(n)?r.showHidden=n:n&&t._extend(r,n),w(r.showHidden)&&(r.showHidden=!1),w(r.depth)&&(r.depth=2),w(r.colors)&&(r.colors=!1),w(r.customInspect)&&(r.customInspect=!0),r.colors&&(r.stylize=o),l(r,e,r.depth)}function o(e,t){var n=a.styles[t];return n?"["+a.colors[n][0]+"m"+e+"["+a.colors[n][1]+"m":e}function i(e,t){return e}function s(e){var t={};return e.forEach(function(e,n){t[e]=!0}),t}function l(e,n,r){if(e.customInspect&&n&&S(n.inspect)&&n.inspect!==t.inspect&&(!n.constructor||n.constructor.prototype!==n)){var a=n.inspect(r,e);return v(a)||(a=l(e,a,r)),a}var o=u(e,n);if(o)return o;var i=Object.keys(n),m=s(i);if(e.showHidden&&(i=Object.getOwnPropertyNames(n)),O(n)&&(i.indexOf("message")>=0||i.indexOf("description")>=0))return c(n);if(0===i.length){if(S(n)){var g=n.name?": "+n.name:"";return e.stylize("[Function"+g+"]","special")}if(k(n))return e.stylize(RegExp.prototype.toString.call(n),"regexp");if(x(n))return e.stylize(Date.prototype.toString.call(n),"date");if(O(n))return c(n)}var y="",b=!1,_=["{","}"];if(h(n)&&(b=!0,_=["[","]"]),S(n)){var w=n.name?": "+n.name:"";y=" [Function"+w+"]"}if(k(n)&&(y=" "+RegExp.prototype.toString.call(n)),x(n)&&(y=" "+Date.prototype.toUTCString.call(n)),O(n)&&(y=" "+c(n)),0===i.length&&(!b||0==n.length))return _[0]+y+_[1];if(0>r)return k(n)?e.stylize(RegExp.prototype.toString.call(n),"regexp"):e.stylize("[Object]","special");e.seen.push(n);var E;return E=b?d(e,n,r,m,i):i.map(function(t){return p(e,n,r,m,t,b)}),e.seen.pop(),f(E,y,_)}function u(e,t){if(w(t))return e.stylize("undefined","undefined");if(v(t)){var n="'"+JSON.stringify(t).replace(/^"|"$/g,"").replace(/'/g,"\\'").replace(/\\"/g,'"')+"'";return e.stylize(n,"string")}return b(t)?e.stylize(""+t,"number"):m(t)?e.stylize(""+t,"boolean"):g(t)?e.stylize("null","null"):void 0}function c(e){return"["+Error.prototype.toString.call(e)+"]"}function d(e,t,n,r,a){for(var o=[],i=0,s=t.length;s>i;++i)T(t,String(i))?o.push(p(e,t,n,r,String(i),!0)):o.push("");return a.forEach(function(a){a.match(/^\d+$/)||o.push(p(e,t,n,r,a,!0))}),o}function p(e,t,n,r,a,o){var i,s,u;if(u=Object.getOwnPropertyDescriptor(t,a)||{value:t[a]},u.get?s=u.set?e.stylize("[Getter/Setter]","special"):e.stylize("[Getter]","special"):u.set&&(s=e.stylize("[Setter]","special")),T(r,a)||(i="["+a+"]"),s||(e.seen.indexOf(u.value)<0?(s=g(n)?l(e,u.value,null):l(e,u.value,n-1),s.indexOf("\n")>-1&&(s=o?s.split("\n").map(function(e){return" "+e}).join("\n").substr(2):"\n"+s.split("\n").map(function(e){return" "+e}).join("\n"))):s=e.stylize("[Circular]","special")),w(i)){if(o&&a.match(/^\d+$/))return s;i=JSON.stringify(""+a),i.match(/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/)?(i=i.substr(1,i.length-2),i=e.stylize(i,"name")):(i=i.replace(/'/g,"\\'").replace(/\\"/g,'"').replace(/(^"|"$)/g,"'"),i=e.stylize(i,"string"))}return i+": "+s}function f(e,t,n){var r=0,a=e.reduce(function(e,t){return r++,t.indexOf("\n")>=0&&r++,e+t.replace(/\u001b\[\d\d?m/g,"").length+1},0);return a>60?n[0]+(""===t?"":t+"\n ")+" "+e.join(",\n ")+" "+n[1]:n[0]+t+" "+e.join(", ")+" "+n[1]}function h(e){return Array.isArray(e)}function m(e){return"boolean"==typeof e}function g(e){return null===e}function y(e){return null==e}function b(e){return"number"==typeof e}function v(e){return"string"==typeof e}function _(e){return"symbol"==typeof e}function w(e){return void 0===e}function k(e){return E(e)&&"[object RegExp]"===A(e)}function E(e){return"object"==typeof e&&null!==e}function x(e){return E(e)&&"[object Date]"===A(e)}function O(e){return E(e)&&("[object Error]"===A(e)||e instanceof Error)}function S(e){return"function"==typeof e}function P(e){return null===e||"boolean"==typeof e||"number"==typeof e||"string"==typeof e||"symbol"==typeof e||"undefined"==typeof e}function A(e){return Object.prototype.toString.call(e)}function j(e){return 10>e?"0"+e.toString(10):e.toString(10)}function C(){var e=new Date,t=[j(e.getHours()),j(e.getMinutes()),j(e.getSeconds())].join(":");return[e.getDate(),z[e.getMonth()],t].join(" ")}function T(e,t){return Object.prototype.hasOwnProperty.call(e,t)}var D=/%[sdj%]/g;t.format=function(e){if(!v(e)){for(var t=[],n=0;n=o)return e;switch(e){case"%s":return String(r[n++]);case"%d":return Number(r[n++]);case"%j":try{return JSON.stringify(r[n++])}catch(t){return"[Circular]"}default:return e}}),s=r[n];o>n;s=r[++n])i+=g(s)||!E(s)?" "+s:" "+a(s);return i},t.deprecate=function(n,a){function o(){if(!i){if(r.throwDeprecation)throw new Error(a);r.traceDeprecation?console.trace(a):console.error(a),i=!0}return n.apply(this,arguments)}if(w(e.process))return function(){return t.deprecate(n,a).apply(this,arguments)};if(r.noDeprecation===!0)return n;var i=!1;return o};var M,N={};t.debuglog=function(e){if(w(M)&&(M=r.env.NODE_DEBUG||""),e=e.toUpperCase(),!N[e])if(new RegExp("\\b"+e+"\\b","i").test(M)){var n=r.pid;N[e]=function(){var r=t.format.apply(t,arguments);console.error("%s %d: %s",e,n,r)}}else N[e]=function(){};return N[e]},t.inspect=a,a.colors={bold:[1,22],italic:[3,23],underline:[4,24],inverse:[7,27],white:[37,39],grey:[90,39],black:[30,39],blue:[34,39],cyan:[36,39],green:[32,39],magenta:[35,39],red:[31,39],yellow:[33,39]},a.styles={special:"cyan",number:"yellow","boolean":"yellow",undefined:"grey","null":"bold",string:"green",date:"magenta",regexp:"red"},t.isArray=h,t.isBoolean=m,t.isNull=g,t.isNullOrUndefined=y,t.isNumber=b,t.isString=v,t.isSymbol=_,t.isUndefined=w,t.isRegExp=k,t.isObject=E,t.isDate=x,t.isError=O,t.isFunction=S,t.isPrimitive=P,t.isBuffer=n(410);var z=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];t.log=function(){console.log("%s - %s",C(),t.format.apply(t,arguments))},t.inherits=n(411),t._extend=function(e,t){if(!t||!E(t))return e;for(var n=Object.keys(t),r=n.length;r--;)e[n[r]]=t[n[r]];return e}}).call(t,function(){return this}(),n(175))},function(e,t){e.exports=function(e){return e&&"object"==typeof e&&"function"==typeof e.copy&&"function"==typeof e.fill&&"function"==typeof e.readUInt8}},function(e,t){"function"==typeof Object.create?e.exports=function(e,t){e.super_=t,e.prototype=Object.create(t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}})}:e.exports=function(e,t){e.super_=t;var n=function(){};n.prototype=t.prototype,e.prototype=new n,e.prototype.constructor=e}},function(e,t){var n=function(){function e(e){return Object.prototype.toString.call(e).slice(8,-1).toLowerCase()}function t(e,t){for(var n=[];t>0;n[--t]=e);return n.join("")}var r=function(){return r.cache.hasOwnProperty(arguments[0])||(r.cache[arguments[0]]=r.parse(arguments[0])),r.format.call(null,r.cache[arguments[0]],arguments)};return r.object_stringify=function(e,t,n,a){var o="";if(null!=e)switch(typeof e){case"function":return"[Function"+(e.name?": "+e.name:"")+"]";case"object":if(e instanceof Error)return"["+e.toString()+"]";if(t>=n)return"[Object]";if(a&&(a=a.slice(0),a.push(e)),null!=e.length){o+="[";var i=[];for(var s in e)a&&a.indexOf(e[s])>=0?i.push("[Circular]"):i.push(r.object_stringify(e[s],t+1,n,a));o+=i.join(", ")+"]"}else{if("getMonth"in e)return"Date("+e+")";o+="{";var i=[];for(var l in e)e.hasOwnProperty(l)&&(a&&a.indexOf(e[l])>=0?i.push(l+": [Circular]"):i.push(l+": "+r.object_stringify(e[l],t+1,n,a)));o+=i.join(", ")+"}"}return o;case"string":return'"'+e+'"'}return""+e},r.format=function(a,o){var i,s,l,u,c,d,p,f=1,h=a.length,m="",g=[];for(s=0;h>s;s++)if(m=e(a[s]),"string"===m)g.push(a[s]);else if("array"===m){if(u=a[s],u[2])for(i=o[f],l=0;l=0?"+"+i:i,d=u[4]?"0"==u[4]?"0":u[4].charAt(1):" ",p=u[6]-String(i).length,c=u[6]?t(d,p):"",g.push(u[5]?i+c:c+i)}return g.join("")},r.cache={},r.parse=function(e){for(var t=e,n=[],r=[],a=0;t;){if(null!==(n=/^[^\x25]+/.exec(t)))r.push(n[0]);else if(null!==(n=/^\x25{2}/.exec(t)))r.push("%");else{if(null===(n=/^\x25(?:([1-9]\d*)\$|\(([^\)]+)\))?(\+)?(0|'[^$])?(-)?(\d+)?(?:\.(\d+))?([b-fosOuxX])/.exec(t)))throw new Error("[sprintf] "+t);if(n[2]){a|=1;var o=[],i=n[2],s=[];if(null===(s=/^([a-z_][a-z_\d]*)/i.exec(i)))throw new Error("[sprintf] "+i);for(o.push(s[1]);""!==(i=i.substring(s[0].length));)if(null!==(s=/^\.([a-z_][a-z_\d]*)/i.exec(i)))o.push(s[1]);else{if(null===(s=/^\[(\d+)\]/.exec(i)))throw new Error("[sprintf] "+i);o.push(s[1])}n[2]=o}else a|=2;if(3===a)throw new Error("[sprintf] mixing positional and named placeholders is not (yet) supported");r.push(n)}t=t.substring(n[0].length)}return r},r}(),r=function(e,t){var r=t.slice();return r.unshift(e),n.apply(null,r)};e.exports=n,n.sprintf=n,n.vsprintf=r},function(e,t){function n(){this._events=this._events||{},this._maxListeners=this._maxListeners||void 0}function r(e){return"function"==typeof e}function a(e){return"number"==typeof e}function o(e){return"object"==typeof e&&null!==e}function i(e){return void 0===e}e.exports=n,n.EventEmitter=n,n.prototype._events=void 0,n.prototype._maxListeners=void 0,n.defaultMaxListeners=10,n.prototype.setMaxListeners=function(e){if(!a(e)||0>e||isNaN(e))throw TypeError("n must be a positive number");return this._maxListeners=e,this},n.prototype.emit=function(e){var t,n,a,s,l,u;if(this._events||(this._events={}),"error"===e&&(!this._events.error||o(this._events.error)&&!this._events.error.length)){if(t=arguments[1],t instanceof Error)throw t;throw TypeError('Uncaught, unspecified "error" event.')}if(n=this._events[e],i(n))return!1;if(r(n))switch(arguments.length){case 1:n.call(this);break;case 2:n.call(this,arguments[1]);break;case 3:n.call(this,arguments[1],arguments[2]);break;default:for(a=arguments.length,s=new Array(a-1),l=1;a>l;l++)s[l-1]=arguments[l];n.apply(this,s)}else if(o(n)){for(a=arguments.length,s=new Array(a-1),l=1;a>l;l++)s[l-1]=arguments[l];for(u=n.slice(),a=u.length,l=0;a>l;l++)u[l].apply(this,s)}return!0},n.prototype.addListener=function(e,t){var a;if(!r(t))throw TypeError("listener must be a function");if(this._events||(this._events={}),this._events.newListener&&this.emit("newListener",e,r(t.listener)?t.listener:t),this._events[e]?o(this._events[e])?this._events[e].push(t):this._events[e]=[this._events[e],t]:this._events[e]=t,o(this._events[e])&&!this._events[e].warned){var a;a=i(this._maxListeners)?n.defaultMaxListeners:this._maxListeners,a&&a>0&&this._events[e].length>a&&(this._events[e].warned=!0,console.error("(node) warning: possible EventEmitter memory leak detected. %d listeners added. Use emitter.setMaxListeners() to increase limit.",this._events[e].length),"function"==typeof console.trace&&console.trace())}return this},n.prototype.on=n.prototype.addListener,n.prototype.once=function(e,t){function n(){this.removeListener(e,n),a||(a=!0,t.apply(this,arguments))}if(!r(t))throw TypeError("listener must be a function");var a=!1;return n.listener=t,this.on(e,n),this},n.prototype.removeListener=function(e,t){var n,a,i,s;if(!r(t))throw TypeError("listener must be a function");if(!this._events||!this._events[e])return this;if(n=this._events[e],i=n.length,a=-1,n===t||r(n.listener)&&n.listener===t)delete this._events[e],this._events.removeListener&&this.emit("removeListener",e,t);else if(o(n)){for(s=i;s-->0;)if(n[s]===t||n[s].listener&&n[s].listener===t){a=s;break}if(0>a)return this;1===n.length?(n.length=0,delete this._events[e]):n.splice(a,1),this._events.removeListener&&this.emit("removeListener",e,t)}return this},n.prototype.removeAllListeners=function(e){var t,n;if(!this._events)return this;if(!this._events.removeListener)return 0===arguments.length?this._events={}:this._events[e]&&delete this._events[e],this;if(0===arguments.length){for(t in this._events)"removeListener"!==t&&this.removeAllListeners(t);return this.removeAllListeners("removeListener"),this._events={},this}if(n=this._events[e],r(n))this.removeListener(e,n);else for(;n.length;)this.removeListener(e,n[n.length-1]);return delete this._events[e],this},n.prototype.listeners=function(e){var t;return t=this._events&&this._events[e]?r(this._events[e])?[this._events[e]]:this._events[e].slice():[]},n.listenerCount=function(e,t){var n;return n=e._events&&e._events[t]?r(e._events[t])?1:e._events[t].length:0}},[859,415],function(e,t){var n=[].indexOf;e.exports=function(e,t){if(n)return e.indexOf(t);for(var r=0;r0?"-":"+")+a(Math.round(Math.abs(f/60)),2)+":"+a(f%60,2);default:return l}})}function a(e,t,n){"number"==typeof t&&(n=t,t="0"),null===t&&(t="0"),n=n||2;var r=String(e);if(t)for(;r.length12&&(t-=12),t}function i(e){var t=e%10,n=e%100;if(n>=11&&13>=n||0===t||t>=4)return"th";switch(t){case 1:return"st";case 2:return"nd";case 3:return"rd"}}function s(e,t){t=t||"sunday";var n=e.getDay();"monday"==t&&(0===n?n=6:n--);var r=new Date(e.getFullYear(),0,1),a=(e-r)/864e5,o=(a+7-n)/7;return Math.floor(o)}var l=n(417);e.exports=r},function(e,t,n){e.exports=n(418)},function(e,t){e.exports={__locale:"en",days:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],abbreviated_days:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],months:["January","February","March","April","May","June","July","August","September","October","November","December"],abbreviated_months:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],am:"AM",pm:"PM"}},function(e,t,n){e.exports={counterpart:{names:n(418),pluralize:n(420),formats:{date:{"default":"%a, %e %b %Y","long":"%A, %B %o, %Y","short":"%b %e"},time:{"default":"%H:%M","long":"%H:%M:%S %z","short":"%H:%M"},datetime:{"default":"%a, %e %b %Y %H:%M","long":"%A, %B %o, %Y %H:%M:%S %z","short":"%e %b %H:%M"}}}}},function(e,t){"use strict";e.exports=function(e,t){var n;return 0===t&&"zero"in e&&(n="zero"),n=n||(1===t?"one":"other"),e[n]}},,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,function(e,t,n){var r,r;!function(t){e.exports=t()}(function(){var e;return function t(e,n,a){function o(s,l){if(!n[s]){if(!e[s]){var u="function"==typeof r&&r;if(!l&&u)return r(s,!0);if(i)return i(s,!0);var c=new Error("Cannot find module '"+s+"'");throw c.code="MODULE_NOT_FOUND",c}var d=n[s]={exports:{}};e[s][0].call(d.exports,function(t){var n=e[s][1][t];return o(n?n:t)},d,d.exports,t,e,n,a)}return n[s].exports}for(var i="function"==typeof r&&r,s=0;s + * This version of ByteBuffer.js uses an ArrayBuffer (AB) as its backing buffer and is compatible with modern browsers. + * Released under the Apache License, Version 2.0 + * see: https://github.com/dcodeIO/ByteBuffer.js for details + */ +!function(a){"use strict";function o(e){function t(e){var t=0;return function(){return t1024&&(t.push(s.apply(String,e)),e.length=0),void Array.prototype.push.apply(e,arguments))}}var r=function c(e,t,n){if("undefined"==typeof e&&(e=c.DEFAULT_CAPACITY),"undefined"==typeof t&&(t=c.DEFAULT_ENDIAN),"undefined"==typeof n&&(n=c.DEFAULT_NOASSERT),!n){if(e=0|e,0>e)throw RangeError("Illegal capacity");t=!!t,n=!!n}this.buffer=0===e?o:new ArrayBuffer(e),this.view=0===e?null:new DataView(this.buffer),this.offset=0,this.markedOffset=-1,this.limit=e,this.littleEndian="undefined"!=typeof t?!!t:!1,this.noAssert=!!n};r.VERSION="3.5.4",r.LITTLE_ENDIAN=!0,r.BIG_ENDIAN=!1,r.DEFAULT_CAPACITY=16,r.DEFAULT_ENDIAN=r.BIG_ENDIAN,r.DEFAULT_NOASSERT=!1,r.Long=e||null;var a=r.prototype,o=new ArrayBuffer(0),s=String.fromCharCode;r.allocate=function(e,t,n){return new r(e,t,n)},r.concat=function(e,t,n,a){("boolean"==typeof t||"string"!=typeof t)&&(a=n,n=t,t=void 0);for(var o,i=0,s=0,l=e.length;l>s;++s)r.isByteBuffer(e[s])||(e[s]=r.wrap(e[s],t)),o=e[s].limit-e[s].offset,o>0&&(i+=o);if(0===i)return new r(0,n,a);var u,c=new r(i,n,a),d=new Uint8Array(c.buffer);for(s=0;l>s;)u=e[s++],o=u.limit-u.offset,0>=o||(d.set(new Uint8Array(u.buffer).subarray(u.offset,u.limit),c.offset),c.offset+=o);return c.limit=c.offset,c.offset=0,c},r.isByteBuffer=function(e){return(e&&e instanceof r)===!0},r.type=function(){return ArrayBuffer},r.wrap=function(e,t,n,o){if("string"!=typeof t&&(o=n,n=t,t=void 0),"string"==typeof e)switch("undefined"==typeof t&&(t="utf8"),t){case"base64":return r.fromBase64(e,n);case"hex":return r.fromHex(e,n);case"binary":return r.fromBinary(e,n);case"utf8":return r.fromUTF8(e,n);case"debug":return r.fromDebug(e,n);default:throw Error("Unsupported encoding: "+t)}if(null===e||"object"!=typeof e)throw TypeError("Illegal buffer");var s;if(r.isByteBuffer(e))return s=a.clone.call(e),s.markedOffset=-1,s;if(e instanceof Uint8Array)s=new r(0,n,o),e.length>0&&(s.buffer=e.buffer,s.offset=e.byteOffset,s.limit=e.byteOffset+e.length,s.view=e.length>0?new DataView(e.buffer):null);else if(e instanceof ArrayBuffer)s=new r(0,n,o),e.byteLength>0&&(s.buffer=e,s.offset=0,s.limit=e.byteLength,s.view=e.byteLength>0?new DataView(e):null);else{if("[object Array]"!==Object.prototype.toString.call(e))throw TypeError("Illegal buffer");for(s=new r(e.length,n,o),s.limit=e.length,i=0;i>>=0,0>t||t+0>this.buffer.byteLength)throw RangeError("Illegal offset: 0 <= "+t+" (+0) <= "+this.buffer.byteLength)}t+=1;var r=this.buffer.byteLength;return t>r&&this.resize((r*=2)>t?r:t),t-=1,this.view.setInt8(t,e),n&&(this.offset+=1),this},a.writeByte=a.writeInt8,a.readInt8=function(e){var t="undefined"==typeof e;if(t&&(e=this.offset),!this.noAssert){if("number"!=typeof e||e%1!==0)throw TypeError("Illegal offset: "+e+" (not an integer)");if(e>>>=0,0>e||e+1>this.buffer.byteLength)throw RangeError("Illegal offset: 0 <= "+e+" (+1) <= "+this.buffer.byteLength)}var n=this.view.getInt8(e);return t&&(this.offset+=1),n},a.readByte=a.readInt8,a.writeUint8=function(e,t){var n="undefined"==typeof t;if(n&&(t=this.offset),!this.noAssert){if("number"!=typeof e||e%1!==0)throw TypeError("Illegal value: "+e+" (not an integer)");if(e>>>=0,"number"!=typeof t||t%1!==0)throw TypeError("Illegal offset: "+t+" (not an integer)");if(t>>>=0,0>t||t+0>this.buffer.byteLength)throw RangeError("Illegal offset: 0 <= "+t+" (+0) <= "+this.buffer.byteLength)}t+=1;var r=this.buffer.byteLength;return t>r&&this.resize((r*=2)>t?r:t),t-=1,this.view.setUint8(t,e),n&&(this.offset+=1),this},a.readUint8=function(e){var t="undefined"==typeof e;if(t&&(e=this.offset),!this.noAssert){if("number"!=typeof e||e%1!==0)throw TypeError("Illegal offset: "+e+" (not an integer)");if(e>>>=0,0>e||e+1>this.buffer.byteLength)throw RangeError("Illegal offset: 0 <= "+e+" (+1) <= "+this.buffer.byteLength)}var n=this.view.getUint8(e);return t&&(this.offset+=1),n},a.writeInt16=function(e,t){var n="undefined"==typeof t;if(n&&(t=this.offset),!this.noAssert){if("number"!=typeof e||e%1!==0)throw TypeError("Illegal value: "+e+" (not an integer)");if(e|=0,"number"!=typeof t||t%1!==0)throw TypeError("Illegal offset: "+t+" (not an integer)");if(t>>>=0,0>t||t+0>this.buffer.byteLength)throw RangeError("Illegal offset: 0 <= "+t+" (+0) <= "+this.buffer.byteLength)}t+=2;var r=this.buffer.byteLength;return t>r&&this.resize((r*=2)>t?r:t),t-=2,this.view.setInt16(t,e,this.littleEndian),n&&(this.offset+=2),this},a.writeShort=a.writeInt16,a.readInt16=function(e){var t="undefined"==typeof e;if(t&&(e=this.offset),!this.noAssert){if("number"!=typeof e||e%1!==0)throw TypeError("Illegal offset: "+e+" (not an integer)");if(e>>>=0,0>e||e+2>this.buffer.byteLength)throw RangeError("Illegal offset: 0 <= "+e+" (+2) <= "+this.buffer.byteLength)}var n=this.view.getInt16(e,this.littleEndian);return t&&(this.offset+=2),n},a.readShort=a.readInt16,a.writeUint16=function(e,t){var n="undefined"==typeof t;if(n&&(t=this.offset),!this.noAssert){if("number"!=typeof e||e%1!==0)throw TypeError("Illegal value: "+e+" (not an integer)");if(e>>>=0,"number"!=typeof t||t%1!==0)throw TypeError("Illegal offset: "+t+" (not an integer)");if(t>>>=0,0>t||t+0>this.buffer.byteLength)throw RangeError("Illegal offset: 0 <= "+t+" (+0) <= "+this.buffer.byteLength)}t+=2;var r=this.buffer.byteLength;return t>r&&this.resize((r*=2)>t?r:t),t-=2,this.view.setUint16(t,e,this.littleEndian),n&&(this.offset+=2),this},a.readUint16=function(e){var t="undefined"==typeof e;if(t&&(e=this.offset),!this.noAssert){if("number"!=typeof e||e%1!==0)throw TypeError("Illegal offset: "+e+" (not an integer)");if(e>>>=0,0>e||e+2>this.buffer.byteLength)throw RangeError("Illegal offset: 0 <= "+e+" (+2) <= "+this.buffer.byteLength)}var n=this.view.getUint16(e,this.littleEndian);return t&&(this.offset+=2),n},a.writeInt32=function(e,t){var n="undefined"==typeof t;if(n&&(t=this.offset),!this.noAssert){if("number"!=typeof e||e%1!==0)throw TypeError("Illegal value: "+e+" (not an integer)");if(e|=0,"number"!=typeof t||t%1!==0)throw TypeError("Illegal offset: "+t+" (not an integer)");if(t>>>=0,0>t||t+0>this.buffer.byteLength)throw RangeError("Illegal offset: 0 <= "+t+" (+0) <= "+this.buffer.byteLength)}t+=4;var r=this.buffer.byteLength;return t>r&&this.resize((r*=2)>t?r:t),t-=4,this.view.setInt32(t,e,this.littleEndian),n&&(this.offset+=4),this},a.writeInt=a.writeInt32,a.readInt32=function(e){var t="undefined"==typeof e;if(t&&(e=this.offset),!this.noAssert){if("number"!=typeof e||e%1!==0)throw TypeError("Illegal offset: "+e+" (not an integer)");if(e>>>=0,0>e||e+4>this.buffer.byteLength)throw RangeError("Illegal offset: 0 <= "+e+" (+4) <= "+this.buffer.byteLength)}var n=this.view.getInt32(e,this.littleEndian);return t&&(this.offset+=4),n},a.readInt=a.readInt32,a.writeUint32=function(e,t){var n="undefined"==typeof t;if(n&&(t=this.offset),!this.noAssert){if("number"!=typeof e||e%1!==0)throw TypeError("Illegal value: "+e+" (not an integer)");if(e>>>=0,"number"!=typeof t||t%1!==0)throw TypeError("Illegal offset: "+t+" (not an integer)");if(t>>>=0,0>t||t+0>this.buffer.byteLength)throw RangeError("Illegal offset: 0 <= "+t+" (+0) <= "+this.buffer.byteLength)}t+=4;var r=this.buffer.byteLength;return t>r&&this.resize((r*=2)>t?r:t),t-=4,this.view.setUint32(t,e,this.littleEndian),n&&(this.offset+=4),this},a.readUint32=function(e){var t="undefined"==typeof e;if(t&&(e=this.offset),!this.noAssert){if("number"!=typeof e||e%1!==0)throw TypeError("Illegal offset: "+e+" (not an integer)");if(e>>>=0,0>e||e+4>this.buffer.byteLength)throw RangeError("Illegal offset: 0 <= "+e+" (+4) <= "+this.buffer.byteLength)}var n=this.view.getUint32(e,this.littleEndian);return t&&(this.offset+=4),n},e&&(a.writeInt64=function(t,n){var r="undefined"==typeof n;if(r&&(n=this.offset),!this.noAssert){if("number"==typeof t)t=e.fromNumber(t);else if(!(t&&t instanceof e))throw TypeError("Illegal value: "+t+" (not an integer or Long)");if("number"!=typeof n||n%1!==0)throw TypeError("Illegal offset: "+n+" (not an integer)");if(n>>>=0,0>n||n+0>this.buffer.byteLength)throw RangeError("Illegal offset: 0 <= "+n+" (+0) <= "+this.buffer.byteLength)}"number"==typeof t&&(t=e.fromNumber(t)),n+=8;var a=this.buffer.byteLength;return n>a&&this.resize((a*=2)>n?a:n),n-=8,this.littleEndian?(this.view.setInt32(n,t.low,!0),this.view.setInt32(n+4,t.high,!0)):(this.view.setInt32(n,t.high,!1),this.view.setInt32(n+4,t.low,!1)),r&&(this.offset+=8),this},a.writeLong=a.writeInt64,a.readInt64=function(t){var n="undefined"==typeof t;if(n&&(t=this.offset),!this.noAssert){if("number"!=typeof t||t%1!==0)throw TypeError("Illegal offset: "+t+" (not an integer)");if(t>>>=0,0>t||t+8>this.buffer.byteLength)throw RangeError("Illegal offset: 0 <= "+t+" (+8) <= "+this.buffer.byteLength)}var r=this.littleEndian?new e(this.view.getInt32(t,!0),this.view.getInt32(t+4,!0),!1):new e(this.view.getInt32(t+4,!1),this.view.getInt32(t,!1),!1);return n&&(this.offset+=8),r},a.readLong=a.readInt64,a.writeUint64=function(t,n){var r="undefined"==typeof n;if(r&&(n=this.offset),!this.noAssert){if("number"==typeof t)t=e.fromNumber(t);else if(!(t&&t instanceof e))throw TypeError("Illegal value: "+t+" (not an integer or Long)");if("number"!=typeof n||n%1!==0)throw TypeError("Illegal offset: "+n+" (not an integer)");if(n>>>=0,0>n||n+0>this.buffer.byteLength)throw RangeError("Illegal offset: 0 <= "+n+" (+0) <= "+this.buffer.byteLength)}"number"==typeof t&&(t=e.fromNumber(t)),n+=8;var a=this.buffer.byteLength;return n>a&&this.resize((a*=2)>n?a:n),n-=8,this.littleEndian?(this.view.setInt32(n,t.low,!0),this.view.setInt32(n+4,t.high,!0)):(this.view.setInt32(n,t.high,!1),this.view.setInt32(n+4,t.low,!1)),r&&(this.offset+=8),this},a.readUint64=function(t){var n="undefined"==typeof t;if(n&&(t=this.offset),!this.noAssert){if("number"!=typeof t||t%1!==0)throw TypeError("Illegal offset: "+t+" (not an integer)");if(t>>>=0,0>t||t+8>this.buffer.byteLength)throw RangeError("Illegal offset: 0 <= "+t+" (+8) <= "+this.buffer.byteLength)}var r=this.littleEndian?new e(this.view.getInt32(t,!0),this.view.getInt32(t+4,!0),!0):new e(this.view.getInt32(t+4,!1),this.view.getInt32(t,!1),!0);return n&&(this.offset+=8),r}),a.writeFloat32=function(e,t){var n="undefined"==typeof t;if(n&&(t=this.offset),!this.noAssert){if("number"!=typeof e)throw TypeError("Illegal value: "+e+" (not a number)");if("number"!=typeof t||t%1!==0)throw TypeError("Illegal offset: "+t+" (not an integer)");if(t>>>=0,0>t||t+0>this.buffer.byteLength)throw RangeError("Illegal offset: 0 <= "+t+" (+0) <= "+this.buffer.byteLength)}t+=4;var r=this.buffer.byteLength;return t>r&&this.resize((r*=2)>t?r:t),t-=4,this.view.setFloat32(t,e,this.littleEndian),n&&(this.offset+=4),this},a.writeFloat=a.writeFloat32,a.readFloat32=function(e){var t="undefined"==typeof e;if(t&&(e=this.offset),!this.noAssert){if("number"!=typeof e||e%1!==0)throw TypeError("Illegal offset: "+e+" (not an integer)");if(e>>>=0,0>e||e+4>this.buffer.byteLength)throw RangeError("Illegal offset: 0 <= "+e+" (+4) <= "+this.buffer.byteLength)}var n=this.view.getFloat32(e,this.littleEndian);return t&&(this.offset+=4),n},a.readFloat=a.readFloat32,a.writeFloat64=function(e,t){var n="undefined"==typeof t;if(n&&(t=this.offset),!this.noAssert){if("number"!=typeof e)throw TypeError("Illegal value: "+e+" (not a number)");if("number"!=typeof t||t%1!==0)throw TypeError("Illegal offset: "+t+" (not an integer)");if(t>>>=0,0>t||t+0>this.buffer.byteLength)throw RangeError("Illegal offset: 0 <= "+t+" (+0) <= "+this.buffer.byteLength)}t+=8;var r=this.buffer.byteLength;return t>r&&this.resize((r*=2)>t?r:t),t-=8,this.view.setFloat64(t,e,this.littleEndian),n&&(this.offset+=8),this},a.writeDouble=a.writeFloat64,a.readFloat64=function(e){var t="undefined"==typeof e;if(t&&(e=this.offset),!this.noAssert){if("number"!=typeof e||e%1!==0)throw TypeError("Illegal offset: "+e+" (not an integer)");if(e>>>=0,0>e||e+8>this.buffer.byteLength)throw RangeError("Illegal offset: 0 <= "+e+" (+8) <= "+this.buffer.byteLength)}var n=this.view.getFloat64(e,this.littleEndian);return t&&(this.offset+=8),n},a.readDouble=a.readFloat64,r.MAX_VARINT32_BYTES=5,r.calculateVarint32=function(e){return e>>>=0,128>e?1:16384>e?2:1<<21>e?3:1<<28>e?4:5},r.zigZagEncode32=function(e){return((e|=0)<<1^e>>31)>>>0},r.zigZagDecode32=function(e){return e>>>1^-(1&e)|0},a.writeVarint32=function(e,t){var n="undefined"==typeof t;if(n&&(t=this.offset),!this.noAssert){if("number"!=typeof e||e%1!==0)throw TypeError("Illegal value: "+e+" (not an integer)");if(e|=0,"number"!=typeof t||t%1!==0)throw TypeError("Illegal offset: "+t+" (not an integer)");if(t>>>=0,0>t||t+0>this.buffer.byteLength)throw RangeError("Illegal offset: 0 <= "+t+" (+0) <= "+this.buffer.byteLength)}var a,o=r.calculateVarint32(e);t+=o;var i=this.buffer.byteLength;return t>i&&this.resize((i*=2)>t?i:t),t-=o,this.view.setUint8(t,a=128|e),e>>>=0,e>=128?(a=e>>7|128,this.view.setUint8(t+1,a),e>=16384?(a=e>>14|128,this.view.setUint8(t+2,a),e>=1<<21?(a=e>>21|128,this.view.setUint8(t+3,a),e>=1<<28?(this.view.setUint8(t+4,e>>28&15),o=5):(this.view.setUint8(t+3,127&a),o=4)):(this.view.setUint8(t+2,127&a),o=3)):(this.view.setUint8(t+1,127&a),o=2)):(this.view.setUint8(t,127&a),o=1),n?(this.offset+=o,this):o},a.writeVarint32ZigZag=function(e,t){return this.writeVarint32(r.zigZagEncode32(e),t)},a.readVarint32=function(e){var t="undefined"==typeof e;if(t&&(e=this.offset),!this.noAssert){if("number"!=typeof e||e%1!==0)throw TypeError("Illegal offset: "+e+" (not an integer)");if(e>>>=0,0>e||e+1>this.buffer.byteLength)throw RangeError("Illegal offset: 0 <= "+e+" (+1) <= "+this.buffer.byteLength)}var n,r,a=0,o=0;do{if(r=e+a,!this.noAssert&&r>this.limit){var i=Error("Truncated");throw i.truncated=!0,i}n=this.view.getUint8(r),5>a&&(o|=(127&n)<<7*a>>>0),++a}while(128===(128&n));return o=0|o,t?(this.offset+=a,o):{value:o,length:a}},a.readVarint32ZigZag=function(e){var t=this.readVarint32(e);return"object"==typeof t?t.value=r.zigZagDecode32(t.value):t=r.zigZagDecode32(t),t},e&&(r.MAX_VARINT64_BYTES=10,r.calculateVarint64=function(t){"number"==typeof t&&(t=e.fromNumber(t));var n=t.toInt()>>>0,r=t.shiftRightUnsigned(28).toInt()>>>0,a=t.shiftRightUnsigned(56).toInt()>>>0;return 0==a?0==r?16384>n?128>n?1:2:1<<21>n?3:4:16384>r?128>r?5:6:1<<21>r?7:8:128>a?9:10},r.zigZagEncode64=function(t){return"number"==typeof t?t=e.fromNumber(t,!1):t.unsigned!==!1&&(t=t.toSigned()),t.shiftLeft(1).xor(t.shiftRight(63)).toUnsigned()},r.zigZagDecode64=function(t){return"number"==typeof t?t=e.fromNumber(t,!1):t.unsigned!==!1&&(t=t.toSigned()),t.shiftRightUnsigned(1).xor(t.and(e.ONE).toSigned().negate()).toSigned()},a.writeVarint64=function(t,n){var a="undefined"==typeof n;if(a&&(n=this.offset),!this.noAssert){if("number"==typeof t)t=e.fromNumber(t);else if(!(t&&t instanceof e))throw TypeError("Illegal value: "+t+" (not an integer or Long)");if("number"!=typeof n||n%1!==0)throw TypeError("Illegal offset: "+n+" (not an integer)");if(n>>>=0,0>n||n+0>this.buffer.byteLength)throw RangeError("Illegal offset: 0 <= "+n+" (+0) <= "+this.buffer.byteLength)}"number"==typeof t?t=e.fromNumber(t,!1):t.unsigned!==!1&&(t=t.toSigned());var o=r.calculateVarint64(t),i=t.toInt()>>>0,s=t.shiftRightUnsigned(28).toInt()>>>0,l=t.shiftRightUnsigned(56).toInt()>>>0;n+=o;var u=this.buffer.byteLength;switch(n>u&&this.resize((u*=2)>n?u:n),n-=o,o){case 10:this.view.setUint8(n+9,l>>>7&1);case 9:this.view.setUint8(n+8,9!==o?128|l:127&l);case 8:this.view.setUint8(n+7,8!==o?s>>>21|128:s>>>21&127);case 7:this.view.setUint8(n+6,7!==o?s>>>14|128:s>>>14&127);case 6:this.view.setUint8(n+5,6!==o?s>>>7|128:s>>>7&127);case 5:this.view.setUint8(n+4,5!==o?128|s:127&s);case 4:this.view.setUint8(n+3,4!==o?i>>>21|128:i>>>21&127);case 3:this.view.setUint8(n+2,3!==o?i>>>14|128:i>>>14&127);case 2:this.view.setUint8(n+1,2!==o?i>>>7|128:i>>>7&127);case 1:this.view.setUint8(n,1!==o?128|i:127&i)}return a?(this.offset+=o,this):o},a.writeVarint64ZigZag=function(e,t){return this.writeVarint64(r.zigZagEncode64(e),t)},a.readVarint64=function(t){var n="undefined"==typeof t;if(n&&(t=this.offset),!this.noAssert){if("number"!=typeof t||t%1!==0)throw TypeError("Illegal offset: "+t+" (not an integer)");if(t>>>=0,0>t||t+1>this.buffer.byteLength)throw RangeError("Illegal offset: 0 <= "+t+" (+1) <= "+this.buffer.byteLength)}var r=t,a=0,o=0,i=0,s=0;if(s=this.view.getUint8(t++),a=127&s,128&s&&(s=this.view.getUint8(t++),a|=(127&s)<<7,128&s&&(s=this.view.getUint8(t++),a|=(127&s)<<14,128&s&&(s=this.view.getUint8(t++),a|=(127&s)<<21,128&s&&(s=this.view.getUint8(t++),o=127&s,128&s&&(s=this.view.getUint8(t++),o|=(127&s)<<7,128&s&&(s=this.view.getUint8(t++),o|=(127&s)<<14,128&s&&(s=this.view.getUint8(t++),o|=(127&s)<<21,128&s&&(s=this.view.getUint8(t++),i=127&s,128&s&&(s=this.view.getUint8(t++),i|=(127&s)<<7,128&s))))))))))throw Error("Buffer overrun");var l=e.fromBits(a|o<<28,o>>>4|i<<24,!1);return n?(this.offset=t,l):{value:l,length:t-r}},a.readVarint64ZigZag=function(t){var n=this.readVarint64(t);return n&&n.value instanceof e?n.value=r.zigZagDecode64(n.value):n=r.zigZagDecode64(n),n}),a.writeCString=function(e,n){var r="undefined"==typeof n;r&&(n=this.offset);var a,o=e.length;if(!this.noAssert){if("string"!=typeof e)throw TypeError("Illegal str: Not a string");for(a=0;o>a;++a)if(0===e.charCodeAt(a))throw RangeError("Illegal str: Contains NULL-characters");if("number"!=typeof n||n%1!==0)throw TypeError("Illegal offset: "+n+" (not an integer)");if(n>>>=0,0>n||n+0>this.buffer.byteLength)throw RangeError("Illegal offset: 0 <= "+n+" (+0) <= "+this.buffer.byteLength)}var i=n;o=u.calculateUTF16asUTF8(t(e))[1],n+=o+1;var s=this.buffer.byteLength;return n>s&&this.resize((s*=2)>n?s:n),n-=o+1,u.encodeUTF16toUTF8(t(e),function(e){this.view.setUint8(n++,e)}.bind(this)),this.view.setUint8(n++,0),r?(this.offset=n-i,this):o},a.readCString=function(e){var t="undefined"==typeof e;if(t&&(e=this.offset),!this.noAssert){if("number"!=typeof e||e%1!==0)throw TypeError("Illegal offset: "+e+" (not an integer)");if(e>>>=0,0>e||e+1>this.buffer.byteLength)throw RangeError("Illegal offset: 0 <= "+e+" (+1) <= "+this.buffer.byteLength)}var r,a=e,o=-1;return u.decodeUTF8toUTF16(function(){if(0===o)return null;if(e>=this.limit)throw RangeError("Illegal range: Truncated data, "+e+" < "+this.limit);return 0===(o=this.view.getUint8(e++))?null:o}.bind(this),r=n(),!0),t?(this.offset=e,r()):{string:r(),length:e-a}},a.writeIString=function(e,n){var r="undefined"==typeof n;if(r&&(n=this.offset),!this.noAssert){if("string"!=typeof e)throw TypeError("Illegal str: Not a string");if("number"!=typeof n||n%1!==0)throw TypeError("Illegal offset: "+n+" (not an integer)");if(n>>>=0,0>n||n+0>this.buffer.byteLength)throw RangeError("Illegal offset: 0 <= "+n+" (+0) <= "+this.buffer.byteLength)}var a,o=n;a=u.calculateUTF16asUTF8(t(e),this.noAssert)[1],n+=4+a;var i=this.buffer.byteLength;if(n>i&&this.resize((i*=2)>n?i:n),n-=4+a,this.view.setUint32(n,a,this.littleEndian),n+=4,u.encodeUTF16toUTF8(t(e),function(e){this.view.setUint8(n++,e)}.bind(this)),n!==o+4+a)throw RangeError("Illegal range: Truncated data, "+n+" == "+(n+4+a));return r?(this.offset=n,this):n-o},a.readIString=function(e){var t="undefined"==typeof e;if(t&&(e=this.offset),!this.noAssert){if("number"!=typeof e||e%1!==0)throw TypeError("Illegal offset: "+e+" (not an integer)");if(e>>>=0,0>e||e+4>this.buffer.byteLength)throw RangeError("Illegal offset: 0 <= "+e+" (+4) <= "+this.buffer.byteLength)}var r,a=0,o=e;a=this.view.getUint32(e,this.littleEndian),e+=4;var i,s=e+a;return u.decodeUTF8toUTF16(function(){return s>e?this.view.getUint8(e++):null}.bind(this),i=n(),this.noAssert),r=i(),t?(this.offset=e,r):{string:r,length:e-o}},r.METRICS_CHARS="c",r.METRICS_BYTES="b",a.writeUTF8String=function(e,n){var r="undefined"==typeof n;if(r&&(n=this.offset),!this.noAssert){if("number"!=typeof n||n%1!==0)throw TypeError("Illegal offset: "+n+" (not an integer)");if(n>>>=0,0>n||n+0>this.buffer.byteLength)throw RangeError("Illegal offset: 0 <= "+n+" (+0) <= "+this.buffer.byteLength)}var a,o=n;a=u.calculateUTF16asUTF8(t(e))[1],n+=a;var i=this.buffer.byteLength;return n>i&&this.resize((i*=2)>n?i:n),n-=a,u.encodeUTF16toUTF8(t(e),function(e){this.view.setUint8(n++,e)}.bind(this)),r?(this.offset=n,this):n-o},a.writeString=a.writeUTF8String,r.calculateUTF8Chars=function(e){return u.calculateUTF16asUTF8(t(e))[0]},r.calculateUTF8Bytes=function(e){return u.calculateUTF16asUTF8(t(e))[1]},a.readUTF8String=function(e,t,a){"number"==typeof t&&(a=t,t=void 0);var o="undefined"==typeof a;if(o&&(a=this.offset),"undefined"==typeof t&&(t=r.METRICS_CHARS),!this.noAssert){if("number"!=typeof e||e%1!==0)throw TypeError("Illegal length: "+e+" (not an integer)");if(e|=0,"number"!=typeof a||a%1!==0)throw TypeError("Illegal offset: "+a+" (not an integer)");if(a>>>=0,0>a||a+0>this.buffer.byteLength)throw RangeError("Illegal offset: 0 <= "+a+" (+0) <= "+this.buffer.byteLength)}var i,s=0,l=a;if(t===r.METRICS_CHARS){if(i=n(),u.decodeUTF8(function(){return e>s&&a>>=0,0>a||a+e>this.buffer.byteLength)throw RangeError("Illegal offset: 0 <= "+a+" (+"+e+") <= "+this.buffer.byteLength)}var c=a+e;if(u.decodeUTF8toUTF16(function(){return c>a?this.view.getUint8(a++):null}.bind(this),i=n(),this.noAssert),a!==c)throw RangeError("Illegal range: Truncated data, "+a+" == "+c);return o?(this.offset=a,i()):{string:i(),length:a-l}}throw TypeError("Unsupported metrics: "+t)},a.readString=a.readUTF8String,a.writeVString=function(e,n){var a="undefined"==typeof n;if(a&&(n=this.offset),!this.noAssert){if("string"!=typeof e)throw TypeError("Illegal str: Not a string");if("number"!=typeof n||n%1!==0)throw TypeError("Illegal offset: "+n+" (not an integer)");if(n>>>=0,0>n||n+0>this.buffer.byteLength)throw RangeError("Illegal offset: 0 <= "+n+" (+0) <= "+this.buffer.byteLength)}var o,i,s=n;o=u.calculateUTF16asUTF8(t(e),this.noAssert)[1],i=r.calculateVarint32(o),n+=i+o;var l=this.buffer.byteLength;if(n>l&&this.resize((l*=2)>n?l:n),n-=i+o,n+=this.writeVarint32(o,n),u.encodeUTF16toUTF8(t(e),function(e){this.view.setUint8(n++,e)}.bind(this)),n!==s+o+i)throw RangeError("Illegal range: Truncated data, "+n+" == "+(n+o+i));return a?(this.offset=n,this):n-s},a.readVString=function(e){var t="undefined"==typeof e;if(t&&(e=this.offset),!this.noAssert){if("number"!=typeof e||e%1!==0)throw TypeError("Illegal offset: "+e+" (not an integer)");if(e>>>=0,0>e||e+1>this.buffer.byteLength)throw RangeError("Illegal offset: 0 <= "+e+" (+1) <= "+this.buffer.byteLength)}var r,a=this.readVarint32(e),o=e;e+=a.length,a=a.value;var i=e+a,s=n();return u.decodeUTF8toUTF16(function(){return i>e?this.view.getUint8(e++):null}.bind(this),s,this.noAssert),r=s(),t?(this.offset=e,r):{string:r,length:e-o}},a.append=function(e,t,n){("number"==typeof t||"string"!=typeof t)&&(n=t,t=void 0);var a="undefined"==typeof n;if(a&&(n=this.offset),!this.noAssert){if("number"!=typeof n||n%1!==0)throw TypeError("Illegal offset: "+n+" (not an integer)");if(n>>>=0,0>n||n+0>this.buffer.byteLength)throw RangeError("Illegal offset: 0 <= "+n+" (+0) <= "+this.buffer.byteLength)}e instanceof r||(e=r.wrap(e,t));var o=e.limit-e.offset;if(0>=o)return this;n+=o;var i=this.buffer.byteLength;return n>i&&this.resize((i*=2)>n?i:n),n-=o,new Uint8Array(this.buffer,n).set(new Uint8Array(e.buffer).subarray(e.offset,e.limit)),e.offset+=o,a&&(this.offset+=o),this},a.appendTo=function(e,t){return e.append(this,t),this},a.assert=function(e){return this.noAssert=!e,this},a.capacity=function(){return this.buffer.byteLength},a.clear=function(){return this.offset=0,this.limit=this.buffer.byteLength,this.markedOffset=-1,this},a.clone=function(e){var t=new r(0,this.littleEndian,this.noAssert);if(e){var n=new ArrayBuffer(this.buffer.byteLength);new Uint8Array(n).set(this.buffer),t.buffer=n,t.view=new DataView(n)}else t.buffer=this.buffer,t.view=this.view;return t.offset=this.offset,t.markedOffset=this.markedOffset,t.limit=this.limit,t},a.compact=function(e,t){if("undefined"==typeof e&&(e=this.offset),"undefined"==typeof t&&(t=this.limit),!this.noAssert){if("number"!=typeof e||e%1!==0)throw TypeError("Illegal begin: Not an integer");if(e>>>=0,"number"!=typeof t||t%1!==0)throw TypeError("Illegal end: Not an integer");if(t>>>=0,0>e||e>t||t>this.buffer.byteLength)throw RangeError("Illegal range: 0 <= "+e+" <= "+t+" <= "+this.buffer.byteLength)}if(0===e&&t===this.buffer.byteLength)return this;var n=t-e;if(0===n)return this.buffer=o,this.view=null,this.markedOffset>=0&&(this.markedOffset-=e),this.offset=0,this.limit=0,this;var r=new ArrayBuffer(n);return new Uint8Array(r).set(new Uint8Array(this.buffer).subarray(e,t)),this.buffer=r,this.view=new DataView(r),this.markedOffset>=0&&(this.markedOffset-=e),this.offset=0,this.limit=n,this},a.copy=function(e,t){if("undefined"==typeof e&&(e=this.offset),"undefined"==typeof t&&(t=this.limit),!this.noAssert){if("number"!=typeof e||e%1!==0)throw TypeError("Illegal begin: Not an integer");if(e>>>=0,"number"!=typeof t||t%1!==0)throw TypeError("Illegal end: Not an integer");if(t>>>=0,0>e||e>t||t>this.buffer.byteLength)throw RangeError("Illegal range: 0 <= "+e+" <= "+t+" <= "+this.buffer.byteLength)}if(e===t)return new r(0,this.littleEndian,this.noAssert);var n=t-e,a=new r(n,this.littleEndian,this.noAssert);return a.offset=0,a.limit=n,a.markedOffset>=0&&(a.markedOffset-=e),this.copyTo(a,0,e,t),a},a.copyTo=function(e,t,n,a){var o,i;if(!this.noAssert&&!r.isByteBuffer(e))throw TypeError("Illegal target: Not a ByteBuffer");if(t=(i="undefined"==typeof t)?e.offset:0|t,n=(o="undefined"==typeof n)?this.offset:0|n,a="undefined"==typeof a?this.limit:0|a,0>t||t>e.buffer.byteLength)throw RangeError("Illegal target range: 0 <= "+t+" <= "+e.buffer.byteLength);if(0>n||a>this.buffer.byteLength)throw RangeError("Illegal source range: 0 <= "+n+" <= "+this.buffer.byteLength);var s=a-n;return 0===s?e:(e.ensureCapacity(t+s),new Uint8Array(e.buffer).set(new Uint8Array(this.buffer).subarray(n,a),t),o&&(this.offset+=s),i&&(e.offset+=s),this)},a.ensureCapacity=function(e){var t=this.buffer.byteLength;return e>t?this.resize((t*=2)>e?t:e):this},a.fill=function(e,t,n){var r="undefined"==typeof t;if(r&&(t=this.offset),"string"==typeof e&&e.length>0&&(e=e.charCodeAt(0)),"undefined"==typeof t&&(t=this.offset),"undefined"==typeof n&&(n=this.limit),!this.noAssert){if("number"!=typeof e||e%1!==0)throw TypeError("Illegal value: "+e+" (not an integer)");if(e|=0,"number"!=typeof t||t%1!==0)throw TypeError("Illegal begin: Not an integer");if(t>>>=0,"number"!=typeof n||n%1!==0)throw TypeError("Illegal end: Not an integer");if(n>>>=0,0>t||t>n||n>this.buffer.byteLength)throw RangeError("Illegal range: 0 <= "+t+" <= "+n+" <= "+this.buffer.byteLength)}if(t>=n)return this;for(;n>t;)this.view.setUint8(t++,e);return r&&(this.offset=t),this},a.flip=function(){return this.limit=this.offset,this.offset=0,this},a.mark=function(e){if(e="undefined"==typeof e?this.offset:e,!this.noAssert){if("number"!=typeof e||e%1!==0)throw TypeError("Illegal offset: "+e+" (not an integer)");if(e>>>=0,0>e||e+0>this.buffer.byteLength)throw RangeError("Illegal offset: 0 <= "+e+" (+0) <= "+this.buffer.byteLength)}return this.markedOffset=e,this},a.order=function(e){if(!this.noAssert&&"boolean"!=typeof e)throw TypeError("Illegal littleEndian: Not a boolean");return this.littleEndian=!!e,this},a.LE=function(e){return this.littleEndian="undefined"!=typeof e?!!e:!0,this},a.BE=function(e){return this.littleEndian="undefined"!=typeof e?!e:!1,this},a.prepend=function(e,t,n){("number"==typeof t||"string"!=typeof t)&&(n=t,t=void 0);var a="undefined"==typeof n;if(a&&(n=this.offset),!this.noAssert){if("number"!=typeof n||n%1!==0)throw TypeError("Illegal offset: "+n+" (not an integer)");if(n>>>=0,0>n||n+0>this.buffer.byteLength)throw RangeError("Illegal offset: 0 <= "+n+" (+0) <= "+this.buffer.byteLength)}e instanceof r||(e=r.wrap(e,t));var o=e.limit-e.offset;if(0>=o)return this;var i,s=o-n;if(s>0){var l=new ArrayBuffer(this.buffer.byteLength+s);i=new Uint8Array(l),i.set(new Uint8Array(this.buffer).subarray(n,this.buffer.byteLength),o),this.buffer=l,this.view=new DataView(l),this.offset+=s,this.markedOffset>=0&&(this.markedOffset+=s),this.limit+=s,n+=s}else i=new Uint8Array(this.buffer);return i.set(new Uint8Array(e.buffer).subarray(e.offset,e.limit),n-o),e.offset=e.limit,a&&(this.offset-=o),this},a.prependTo=function(e,t){return e.prepend(this,t),this},a.printDebug=function(e){"function"!=typeof e&&(e=console.log.bind(console)),e(this.toString()+"\n-------------------------------------------------------------------\n"+this.toDebug(!0))},a.remaining=function(){return this.limit-this.offset},a.reset=function(){return this.markedOffset>=0?(this.offset=this.markedOffset,this.markedOffset=-1):this.offset=0,this},a.resize=function(e){if(!this.noAssert){if("number"!=typeof e||e%1!==0)throw TypeError("Illegal capacity: "+e+" (not an integer)");if(e|=0,0>e)throw RangeError("Illegal capacity: 0 <= "+e)}if(this.buffer.byteLength>>=0,"number"!=typeof t||t%1!==0)throw TypeError("Illegal end: Not an integer");if(t>>>=0,0>e||e>t||t>this.buffer.byteLength)throw RangeError("Illegal range: 0 <= "+e+" <= "+t+" <= "+this.buffer.byteLength)}return e===t?this:(Array.prototype.reverse.call(new Uint8Array(this.buffer).subarray(e,t)),this.view=new DataView(this.buffer),this)},a.skip=function(e){if(!this.noAssert){if("number"!=typeof e||e%1!==0)throw TypeError("Illegal length: "+e+" (not an integer)");e|=0}var t=this.offset+e;if(!this.noAssert&&(0>t||t>this.buffer.byteLength))throw RangeError("Illegal length: 0 <= "+this.offset+" + "+e+" <= "+this.buffer.byteLength);return this.offset=t,this},a.slice=function(e,t){if("undefined"==typeof e&&(e=this.offset),"undefined"==typeof t&&(t=this.limit),!this.noAssert){if("number"!=typeof e||e%1!==0)throw TypeError("Illegal begin: Not an integer");if(e>>>=0,"number"!=typeof t||t%1!==0)throw TypeError("Illegal end: Not an integer");if(t>>>=0,0>e||e>t||t>this.buffer.byteLength)throw RangeError("Illegal range: 0 <= "+e+" <= "+t+" <= "+this.buffer.byteLength)}var n=this.clone();return n.offset=e,n.limit=t,n},a.toBuffer=function(e){var t=this.offset,n=this.limit;if(t>n){var r=t;t=n,n=r}if(!this.noAssert){if("number"!=typeof t||t%1!==0)throw TypeError("Illegal offset: Not an integer");if(t>>>=0,"number"!=typeof n||n%1!==0)throw TypeError("Illegal limit: Not an integer");if(n>>>=0,0>t||t>n||n>this.buffer.byteLength)throw RangeError("Illegal range: 0 <= "+t+" <= "+n+" <= "+this.buffer.byteLength)}if(!e&&0===t&&n===this.buffer.byteLength)return this.buffer;if(t===n)return o;var a=new ArrayBuffer(n-t);return new Uint8Array(a).set(new Uint8Array(this.buffer).subarray(t,n),0),a},a.toArrayBuffer=a.toBuffer,a.toString=function(e,t,n){if("undefined"==typeof e)return"ByteBufferAB(offset="+this.offset+",markedOffset="+this.markedOffset+",limit="+this.limit+",capacity="+this.capacity()+")"; +switch("number"==typeof e&&(e="utf8",t=e,n=t),e){case"utf8":return this.toUTF8(t,n);case"base64":return this.toBase64(t,n);case"hex":return this.toHex(t,n);case"binary":return this.toBinary(t,n);case"debug":return this.toDebug();case"columns":return this.toColumns();default:throw Error("Unsupported encoding: "+e)}};var l=function(){for(var e={},t=[65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,48,49,50,51,52,53,54,55,56,57,43,47],n=[],r=0,a=t.length;a>r;++r)n[t[r]]=r;return e.encode=function(e,n){for(var r,a;null!==(r=e());)n(t[r>>2&63]),a=(3&r)<<4,null!==(r=e())?(a|=r>>4&15,n(t[63&(a|r>>4&15)]),a=(15&r)<<2,null!==(r=e())?(n(t[63&(a|r>>6&3)]),n(t[63&r])):(n(t[63&a]),n(61))):(n(t[63&a]),n(61),n(61))},e.decode=function(e,t){function r(e){throw Error("Illegal character code: "+e)}for(var a,o,i;null!==(a=e());)if(o=n[a],"undefined"==typeof o&&r(a),null!==(a=e())&&(i=n[a],"undefined"==typeof i&&r(a),t(o<<2>>>0|(48&i)>>4),null!==(a=e()))){if(o=n[a],"undefined"==typeof o){if(61===a)break;r(a)}if(t((15&i)<<4>>>0|(60&o)>>2),null!==(a=e())){if(i=n[a],"undefined"==typeof i){if(61===a)break;r(a)}t((3&o)<<6>>>0|i)}}},e.test=function(e){return/^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/.test(e)},e}();a.toBase64=function(e,t){if("undefined"==typeof e&&(e=this.offset),"undefined"==typeof t&&(t=this.limit),!this.noAssert){if("number"!=typeof e||e%1!==0)throw TypeError("Illegal begin: Not an integer");if(e>>>=0,"number"!=typeof t||t%1!==0)throw TypeError("Illegal end: Not an integer");if(t>>>=0,0>e||e>t||t>this.buffer.byteLength)throw RangeError("Illegal range: 0 <= "+e+" <= "+t+" <= "+this.buffer.byteLength)}var r;return l.encode(function(){return t>e?this.view.getUint8(e++):null}.bind(this),r=n()),r()},r.fromBase64=function(e,n,a){if(!a){if("string"!=typeof e)throw TypeError("Illegal str: Not a string");if(e.length%4!==0)throw TypeError("Illegal str: Length not a multiple of 4")}var o=new r(e.length/4*3,n,a),i=0;return l.decode(t(e),function(e){o.view.setUint8(i++,e)}),o.limit=i,o},r.btoa=function(e){return r.fromBinary(e).toBase64()},r.atob=function(e){return r.fromBase64(e).toBinary()},a.toBinary=function(e,t){if(e="undefined"==typeof e?this.offset:e,t="undefined"==typeof t?this.limit:t,!this.noAssert){if("number"!=typeof e||e%1!==0)throw TypeError("Illegal begin: Not an integer");if(e>>>=0,"number"!=typeof t||t%1!==0)throw TypeError("Illegal end: Not an integer");if(t>>>=0,0>e||e>t||t>this.buffer.byteLength)throw RangeError("Illegal range: 0 <= "+e+" <= "+t+" <= "+this.buffer.byteLength)}if(e===t)return"";for(var n=[],r=[];t>e;)n.push(this.view.getUint8(e++)),n.length>=1024&&(r.push(String.fromCharCode.apply(String,n)),n=[]);return r.join("")+String.fromCharCode.apply(String,n)},r.fromBinary=function(e,t,n){if(!n&&"string"!=typeof e)throw TypeError("Illegal str: Not a string");for(var a,o=0,i=e.length,s=new r(i,t,n);i>o;){if(a=e.charCodeAt(o),!n&&a>255)throw RangeError("Illegal charCode at "+o+": 0 <= "+a+" <= 255");s.view.setUint8(o++,a)}return s.limit=i,s},a.toDebug=function(e){for(var t,n=-1,r=this.buffer.byteLength,a="",o="",i="";r>n;){if(-1!==n&&(t=this.view.getUint8(n),a+=16>t?"0"+t.toString(16).toUpperCase():t.toString(16).toUpperCase(),e&&(o+=t>32&&127>t?String.fromCharCode(t):".")),++n,e&&n>0&&n%16===0&&n!==r){for(;a.length<51;)a+=" ";i+=a+o+"\n",a=o=""}a+=n===this.offset&&n===this.limit?n===this.markedOffset?"!":"|":n===this.offset?n===this.markedOffset?"[":"<":n===this.limit?n===this.markedOffset?"]":">":n===this.markedOffset?"'":e||0!==n&&n!==r?" ":""}if(e&&" "!==a){for(;a.length<51;)a+=" ";i+=a+o+"\n"}return e?i:a},r.fromDebug=function(e,t,n){for(var a,o,i=e.length,s=new r((i+1)/3|0,t,n),l=0,u=0,c=!1,d=!1,p=!1,f=!1,h=!1;i>l;){switch(a=e.charAt(l++)){case"!":if(!n){if(d||p||f){h=!0;break}d=p=f=!0}s.offset=s.markedOffset=s.limit=u,c=!1;break;case"|":if(!n){if(d||f){h=!0;break}d=f=!0}s.offset=s.limit=u,c=!1;break;case"[":if(!n){if(d||p){h=!0;break}d=p=!0}s.offset=s.markedOffset=u,c=!1;break;case"<":if(!n){if(d){h=!0;break}d=!0}s.offset=u,c=!1;break;case"]":if(!n){if(f||p){h=!0;break}f=p=!0}s.limit=s.markedOffset=u,c=!1;break;case">":if(!n){if(f){h=!0;break}f=!0}s.limit=u,c=!1;break;case"'":if(!n){if(p){h=!0;break}p=!0}s.markedOffset=u,c=!1;break;case" ":c=!1;break;default:if(!n&&c){h=!0;break}if(o=parseInt(a+e.charAt(l++),16),!n&&(isNaN(o)||0>o||o>255))throw TypeError("Illegal str: Not a debug encoded string");s.view.setUint8(u++,o),c=!0}if(h)throw TypeError("Illegal str: Invalid symbol at "+l)}if(!n){if(!d||!f)throw TypeError("Illegal str: Missing offset or limit");if(u>>=0,"number"!=typeof t||t%1!==0)throw TypeError("Illegal end: Not an integer");if(t>>>=0,0>e||e>t||t>this.buffer.byteLength)throw RangeError("Illegal range: 0 <= "+e+" <= "+t+" <= "+this.buffer.byteLength)}for(var n,r=new Array(t-e);t>e;)n=this.view.getUint8(e++),16>n?r.push("0",n.toString(16)):r.push(n.toString(16));return r.join("")},r.fromHex=function(e,t,n){if(!n){if("string"!=typeof e)throw TypeError("Illegal str: Not a string");if(e.length%2!==0)throw TypeError("Illegal str: Length not a multiple of 2")}for(var a,o=e.length,i=new r(o/2|0,t),s=0,l=0;o>s;s+=2){if(a=parseInt(e.substring(s,s+2),16),!n&&(!isFinite(a)||0>a||a>255))throw TypeError("Illegal str: Contains non-hex characters");i.view.setUint8(l++,a)}return i.limit=l,i};var u=function(){var e={};return e.MAX_CODEPOINT=1114111,e.encodeUTF8=function(e,t){var n=null;for("number"==typeof e&&(n=e,e=function(){return null});null!==n||null!==(n=e());)128>n?t(127&n):2048>n?(t(n>>6&31|192),t(63&n|128)):65536>n?(t(n>>12&15|224),t(n>>6&63|128),t(63&n|128)):(t(n>>18&7|240),t(n>>12&63|128),t(n>>6&63|128),t(63&n|128)),n=null},e.decodeUTF8=function(e,t){for(var n,r,a,o,i=function(e){e=e.slice(0,e.indexOf(null));var t=Error(e.toString());throw t.name="TruncatedError",t.bytes=e,t};null!==(n=e());)if(0===(128&n))t(n);else if(192===(224&n))null===(r=e())&&i([n,r]),t((31&n)<<6|63&r);else if(224===(240&n))(null===(r=e())||null===(a=e()))&&i([n,r,a]),t((15&n)<<12|(63&r)<<6|63&a);else{if(240!==(248&n))throw RangeError("Illegal starting byte: "+n);(null===(r=e())||null===(a=e())||null===(o=e()))&&i([n,r,a,o]),t((7&n)<<18|(63&r)<<12|(63&a)<<6|63&o)}},e.UTF16toUTF8=function(e,t){for(var n,r=null;;){if(null===(n=null!==r?r:e()))break;n>=55296&&57343>=n&&null!==(r=e())&&r>=56320&&57343>=r?(t(1024*(n-55296)+r-56320+65536),r=null):t(n)}null!==r&&t(r)},e.UTF8toUTF16=function(e,t){var n=null;for("number"==typeof e&&(n=e,e=function(){return null});null!==n||null!==(n=e());)65535>=n?t(n):(n-=65536,t((n>>10)+55296),t(n%1024+56320)),n=null},e.encodeUTF16toUTF8=function(t,n){e.UTF16toUTF8(t,function(t){e.encodeUTF8(t,n)})},e.decodeUTF8toUTF16=function(t,n){e.decodeUTF8(t,function(t){e.UTF8toUTF16(t,n)})},e.calculateCodePoint=function(e){return 128>e?1:2048>e?2:65536>e?3:4},e.calculateUTF8=function(t){for(var n,r=0;null!==(n=t());)r+=e.calculateCodePoint(n);return r},e.calculateUTF16asUTF8=function(t){var n=0,r=0;return e.UTF16toUTF8(t,function(t){++n,r+=e.calculateCodePoint(t)}),[n,r]},e}();return a.toUTF8=function(e,t){if("undefined"==typeof e&&(e=this.offset),"undefined"==typeof t&&(t=this.limit),!this.noAssert){if("number"!=typeof e||e%1!==0)throw TypeError("Illegal begin: Not an integer");if(e>>>=0,"number"!=typeof t||t%1!==0)throw TypeError("Illegal end: Not an integer");if(t>>>=0,0>e||e>t||t>this.buffer.byteLength)throw RangeError("Illegal range: 0 <= "+e+" <= "+t+" <= "+this.buffer.byteLength)}var r;try{u.decodeUTF8toUTF16(function(){return t>e?this.view.getUint8(e++):null}.bind(this),r=n())}catch(a){if(e!==t)throw RangeError("Illegal range: Truncated data, "+e+" != "+t)}return r()},r.fromUTF8=function(e,n,a){if(!a&&"string"!=typeof e)throw TypeError("Illegal str: Not a string");var o=new r(u.calculateUTF16asUTF8(t(e),!0)[1],n,a),i=0;return u.encodeUTF16toUTF8(t(e),function(e){o.view.setUint8(i++,e)}),o.limit=i,o},r}"function"==typeof t&&"object"==typeof n&&n&&"object"==typeof r&&r?n.exports=function(){var e;try{e=t("long")}catch(n){}return o(e)}():"function"==typeof e&&e.amd?e("ByteBuffer",["Long"],function(e){return o(e)}):(a.dcodeIO=a.dcodeIO||{}).ByteBuffer=o(a.dcodeIO.Long)}(this)},{"long":3}],2:[function(t,n,r){!function(a){"use strict";var o=function(e,t,n){this.low=0|e,this.high=0|t,this.unsigned=!!n};o.isLong=function(e){return(e&&e instanceof o)===!0};var i={},s={};o.fromInt=function(e,t){var n,r;return t?(e>>>=0,e>=0&&256>e&&(r=s[e])?r:(n=new o(e,0>(0|e)?-1:0,!0),e>=0&&256>e&&(s[e]=n),n)):(e=0|e,e>=-128&&128>e&&(r=i[e])?r:(n=new o(e,0>e?-1:0,!1),e>=-128&&128>e&&(i[e]=n),n))},o.fromNumber=function(e,t){return t=!!t,isNaN(e)||!isFinite(e)?o.ZERO:!t&&-p>=e?o.MIN_VALUE:!t&&e+1>=p?o.MAX_VALUE:t&&e>=d?o.MAX_UNSIGNED_VALUE:0>e?o.fromNumber(-e,t).negate():new o(e%c|0,e/c|0,t)},o.fromBits=function(e,t,n){return new o(e,t,n)},o.fromString=function(e,t,n){if(0===e.length)throw Error("number format error: empty string");if("NaN"===e||"Infinity"===e||"+Infinity"===e||"-Infinity"===e)return o.ZERO;if("number"==typeof t&&(n=t,t=!1),n=n||10,2>n||n>36)throw Error("radix out of range: "+n);var r;if((r=e.indexOf("-"))>0)throw Error('number format error: interior "-" character: '+e);if(0===r)return o.fromString(e.substring(1),t,n).negate();for(var a=o.fromNumber(Math.pow(n,8)),i=o.ZERO,s=0;sl){var c=o.fromNumber(Math.pow(n,l));i=i.multiply(c).add(o.fromNumber(u))}else i=i.multiply(a),i=i.add(o.fromNumber(u))}return i.unsigned=t,i},o.fromValue=function(e){return"number"==typeof e?o.fromNumber(e):"string"==typeof e?o.fromString(e):o.isLong(e)?e:new o(e.low,e.high,e.unsigned)};var l=65536,u=1<<24,c=l*l,d=c*c,p=d/2,f=o.fromInt(u);o.ZERO=o.fromInt(0),o.UZERO=o.fromInt(0,!0),o.ONE=o.fromInt(1),o.UONE=o.fromInt(1,!0),o.NEG_ONE=o.fromInt(-1),o.MAX_VALUE=o.fromBits(-1,2147483647,!1),o.MAX_UNSIGNED_VALUE=o.fromBits(-1,-1,!0),o.MIN_VALUE=o.fromBits(0,-2147483648,!1),o.prototype.toInt=function(){return this.unsigned?this.low>>>0:this.low},o.prototype.toNumber=function(){return this.unsigned?(this.high>>>0)*c+(this.low>>>0):this.high*c+(this.low>>>0)},o.prototype.toString=function(e){if(e=e||10,2>e||e>36)throw RangeError("radix out of range: "+e);if(this.isZero())return"0";var t;if(this.isNegative()){if(this.equals(o.MIN_VALUE)){var n=o.fromNumber(e),r=this.div(n);return t=r.multiply(n).subtract(this),r.toString(e)+t.toInt().toString(e)}return"-"+this.negate().toString(e)}var a=o.fromNumber(Math.pow(e,6),this.unsigned);t=this;for(var i="";;){var s=t.div(a),l=t.subtract(s.multiply(a)).toInt()>>>0,u=l.toString(e);if(t=s,t.isZero())return u+i;for(;u.length<6;)u="0"+u;i=""+u+i}},o.prototype.getHighBits=function(){return this.high},o.prototype.getHighBitsUnsigned=function(){return this.high>>>0},o.prototype.getLowBits=function(){return this.low},o.prototype.getLowBitsUnsigned=function(){return this.low>>>0},o.prototype.getNumBitsAbs=function(){if(this.isNegative())return this.equals(o.MIN_VALUE)?64:this.negate().getNumBitsAbs();for(var e=0!=this.high?this.high:this.low,t=31;t>0&&0==(e&1<=0},o.prototype.isOdd=function(){return 1===(1&this.low)},o.prototype.isEven=function(){return 0===(1&this.low)},o.prototype.equals=function(e){return o.isLong(e)||(e=o.fromValue(e)),this.unsigned!==e.unsigned&&this.high>>>31===1&&e.high>>>31===1?!1:this.high===e.high&&this.low===e.low},o.prototype.notEquals=function(e){return o.isLong(e)||(e=o.fromValue(e)),!this.equals(e)},o.prototype.lessThan=function(e){return o.isLong(e)||(e=o.fromValue(e)),this.compare(e)<0},o.prototype.lessThanOrEqual=function(e){return o.isLong(e)||(e=o.fromValue(e)),this.compare(e)<=0},o.prototype.greaterThan=function(e){return o.isLong(e)||(e=o.fromValue(e)),this.compare(e)>0},o.prototype.greaterThanOrEqual=function(e){return this.compare(e)>=0},o.prototype.compare=function(e){if(this.equals(e))return 0;var t=this.isNegative(),n=e.isNegative();return t&&!n?-1:!t&&n?1:this.unsigned?e.high>>>0>this.high>>>0||e.high===this.high&&e.low>>>0>this.low>>>0?-1:1:this.subtract(e).isNegative()?-1:1},o.prototype.negate=function(){return!this.unsigned&&this.equals(o.MIN_VALUE)?o.MIN_VALUE:this.not().add(o.ONE)},o.prototype.add=function(e){o.isLong(e)||(e=o.fromValue(e));var t=this.high>>>16,n=65535&this.high,r=this.low>>>16,a=65535&this.low,i=e.high>>>16,s=65535&e.high,l=e.low>>>16,u=65535&e.low,c=0,d=0,p=0,f=0;return f+=a+u,p+=f>>>16,f&=65535,p+=r+l,d+=p>>>16,p&=65535,d+=n+s,c+=d>>>16,d&=65535,c+=t+i,c&=65535,o.fromBits(p<<16|f,c<<16|d,this.unsigned)},o.prototype.subtract=function(e){return o.isLong(e)||(e=o.fromValue(e)),this.add(e.negate())},o.prototype.multiply=function(e){if(this.isZero())return o.ZERO;if(o.isLong(e)||(e=o.fromValue(e)),e.isZero())return o.ZERO;if(this.equals(o.MIN_VALUE))return e.isOdd()?o.MIN_VALUE:o.ZERO;if(e.equals(o.MIN_VALUE))return this.isOdd()?o.MIN_VALUE:o.ZERO;if(this.isNegative())return e.isNegative()?this.negate().multiply(e.negate()):this.negate().multiply(e).negate();if(e.isNegative())return this.multiply(e.negate()).negate();if(this.lessThan(f)&&e.lessThan(f))return o.fromNumber(this.toNumber()*e.toNumber(),this.unsigned);var t=this.high>>>16,n=65535&this.high,r=this.low>>>16,a=65535&this.low,i=e.high>>>16,s=65535&e.high,l=e.low>>>16,u=65535&e.low,c=0,d=0,p=0,h=0;return h+=a*u,p+=h>>>16,h&=65535,p+=r*u,d+=p>>>16,p&=65535,p+=a*l,d+=p>>>16,p&=65535,d+=n*u,c+=d>>>16,d&=65535,d+=r*l,c+=d>>>16,d&=65535,d+=a*s,c+=d>>>16,d&=65535,c+=t*u+n*l+r*s+a*i,c&=65535,o.fromBits(p<<16|h,c<<16|d,this.unsigned)},o.prototype.div=function(e){if(o.isLong(e)||(e=o.fromValue(e)),e.isZero())throw new Error("division by zero");if(this.isZero())return this.unsigned?o.UZERO:o.ZERO;var t,n,r;if(this.equals(o.MIN_VALUE)){if(e.equals(o.ONE)||e.equals(o.NEG_ONE))return o.MIN_VALUE;if(e.equals(o.MIN_VALUE))return o.ONE;var a=this.shiftRight(1);return t=a.div(e).shiftLeft(1),t.equals(o.ZERO)?e.isNegative()?o.ONE:o.NEG_ONE:(n=this.subtract(e.multiply(t)),r=t.add(n.div(e)))}if(e.equals(o.MIN_VALUE))return this.unsigned?o.UZERO:o.ZERO;if(this.isNegative())return e.isNegative()?this.negate().div(e.negate()):this.negate().div(e).negate();if(e.isNegative())return this.div(e.negate()).negate();for(r=o.ZERO,n=this;n.greaterThanOrEqual(e);){t=Math.max(1,Math.floor(n.toNumber()/e.toNumber()));for(var i=Math.ceil(Math.log(t)/Math.LN2),s=48>=i?1:Math.pow(2,i-48),l=o.fromNumber(t),u=l.multiply(e);u.isNegative()||u.greaterThan(n);)t-=s,l=o.fromNumber(t,this.unsigned),u=l.multiply(e);l.isZero()&&(l=o.ONE),r=r.add(l),n=n.subtract(u)}return r},o.prototype.modulo=function(e){return o.isLong(e)||(e=o.fromValue(e)),this.subtract(this.div(e).multiply(e))},o.prototype.not=function(){return o.fromBits(~this.low,~this.high,this.unsigned)},o.prototype.and=function(e){return o.isLong(e)||(e=o.fromValue(e)),o.fromBits(this.low&e.low,this.high&e.high,this.unsigned)},o.prototype.or=function(e){return o.isLong(e)||(e=o.fromValue(e)),o.fromBits(this.low|e.low,this.high|e.high,this.unsigned)},o.prototype.xor=function(e){return o.isLong(e)||(e=o.fromValue(e)),o.fromBits(this.low^e.low,this.high^e.high,this.unsigned)},o.prototype.shiftLeft=function(e){return o.isLong(e)&&(e=e.toInt()),0===(e&=63)?this:32>e?o.fromBits(this.low<>>32-e,this.unsigned):o.fromBits(0,this.low<e?o.fromBits(this.low>>>e|this.high<<32-e,this.high>>e,this.unsigned):o.fromBits(this.high>>e-32,this.high>=0?0:-1,this.unsigned)},o.prototype.shiftRightUnsigned=function(e){if(o.isLong(e)&&(e=e.toInt()),e&=63,0===e)return this;var t=this.high;if(32>e){var n=this.low;return o.fromBits(n>>>e|t<<32-e,t>>>e,this.unsigned)}return 32===e?o.fromBits(t,0,this.unsigned):o.fromBits(t>>>e-32,0,this.unsigned)},o.prototype.toSigned=function(){return this.unsigned?new o(this.low,this.high,!1):this},o.prototype.toUnsigned=function(){return this.unsigned?this:new o(this.low,this.high,!0)},"function"==typeof t&&"object"==typeof n&&n&&"object"==typeof r&&r?n.exports=o:"function"==typeof e&&e.amd?e(function(){return o}):(a.dcodeIO=a.dcodeIO||{}).Long=o}(this)},{}],3:[function(e,t,n){t.exports=e("./dist/Long.js")},{"./dist/Long.js":2}],4:[function(e,t,n){t.exports=e("bytebuffer")},{bytebuffer:1}]},{},[4])(4)})},,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,function(e,t,n){e.exports=n(565)},function(e,t,n){(function(t){"use strict";var r=n(566),a=n(197),o=n(569),i=n(570),s=n(204),l=n(571),u=n(220),c=n(579),d=n(573),p=n(580);a.addons={CSSTransitionGroup:i,LinkedStateMixin:r,PureRenderMixin:o,TransitionGroup:l,batchedUpdates:u.batchedUpdates,classSet:c,cloneWithProps:d,createFragment:s.create,update:p},"production"!==t.env.NODE_ENV&&(a.addons.Perf=n(344),a.addons.TestUtils=n(581)),e.exports=a}).call(t,n(175))},function(e,t,n){"use strict";var r=n(567),a=n(568),o={linkState:function(e){return new r(this.state[e],a.createStateKeySetter(this,e))}};e.exports=o},function(e,t,n){"use strict";function r(e,t){this.value=e,this.requestChange=t}function a(e){var t={value:"undefined"==typeof e?o.PropTypes.any.isRequired:e.isRequired,requestChange:o.PropTypes.func.isRequired};return o.PropTypes.shape(t)}var o=n(197);r.PropTypes={link:a},e.exports=r},function(e,t){"use strict";function n(e,t){var n={};return function(r){n[t]=r,e.setState(n)}}var r={createStateSetter:function(e,t){return function(n,r,a,o,i,s){var l=t.call(e,n,r,a,o,i,s);l&&e.setState(l)}},createStateKeySetter:function(e,t){var r=e.__keySetters||(e.__keySetters={});return r[t]||(r[t]=n(e,t))}};r.Mixin={createStateSetter:function(e){return r.createStateSetter(this,e)},createStateKeySetter:function(e){return r.createStateKeySetter(this,e)}},e.exports=r},function(e,t,n){"use strict";var r=n(331),a={shouldComponentUpdate:function(e,t){return!r(this.props,e)||!r(this.state,t)}};e.exports=a},function(e,t,n){"use strict";var r=n(197),a=n(207),o=r.createFactory(n(571)),i=r.createFactory(n(576)),s=r.createClass({displayName:"ReactCSSTransitionGroup",propTypes:{transitionName:r.PropTypes.string.isRequired,transitionAppear:r.PropTypes.bool,transitionEnter:r.PropTypes.bool,transitionLeave:r.PropTypes.bool},getDefaultProps:function(){return{transitionAppear:!1,transitionEnter:!0,transitionLeave:!0}},_wrapChild:function(e){return i({name:this.props.transitionName,appear:this.props.transitionAppear,enter:this.props.transitionEnter,leave:this.props.transitionLeave},e)},render:function(){return o(a({},this.props,{childFactory:this._wrapChild}))}});e.exports=s},function(e,t,n){"use strict";var r=n(197),a=n(572),o=n(207),i=n(573),s=n(210),l=r.createClass({displayName:"ReactTransitionGroup",propTypes:{component:r.PropTypes.any,childFactory:r.PropTypes.func},getDefaultProps:function(){return{component:"span",childFactory:s.thatReturnsArgument}},getInitialState:function(){return{children:a.getChildMapping(this.props.children)}},componentWillMount:function(){this.currentlyTransitioningKeys={},this.keysToEnter=[],this.keysToLeave=[]},componentDidMount:function(){var e=this.state.children;for(var t in e)e[t]&&this.performAppear(t)},componentWillReceiveProps:function(e){var t=a.getChildMapping(e.children),n=this.state.children;this.setState({children:a.mergeChildMappings(n,t)});var r;for(r in t){var o=n&&n.hasOwnProperty(r);!t[r]||o||this.currentlyTransitioningKeys[r]||this.keysToEnter.push(r)}for(r in n){var i=t&&t.hasOwnProperty(r);!n[r]||i||this.currentlyTransitioningKeys[r]||this.keysToLeave.push(r)}},componentDidUpdate:function(){var e=this.keysToEnter;this.keysToEnter=[],e.forEach(this.performEnter);var t=this.keysToLeave;this.keysToLeave=[],t.forEach(this.performLeave)},performAppear:function(e){this.currentlyTransitioningKeys[e]=!0;var t=this.refs[e];t.componentWillAppear?t.componentWillAppear(this._handleDoneAppearing.bind(this,e)):this._handleDoneAppearing(e)},_handleDoneAppearing:function(e){var t=this.refs[e];t.componentDidAppear&&t.componentDidAppear(),delete this.currentlyTransitioningKeys[e];var n=a.getChildMapping(this.props.children);n&&n.hasOwnProperty(e)||this.performLeave(e)},performEnter:function(e){this.currentlyTransitioningKeys[e]=!0;var t=this.refs[e];t.componentWillEnter?t.componentWillEnter(this._handleDoneEntering.bind(this,e)):this._handleDoneEntering(e)},_handleDoneEntering:function(e){var t=this.refs[e];t.componentDidEnter&&t.componentDidEnter(),delete this.currentlyTransitioningKeys[e];var n=a.getChildMapping(this.props.children);n&&n.hasOwnProperty(e)||this.performLeave(e)},performLeave:function(e){this.currentlyTransitioningKeys[e]=!0;var t=this.refs[e];t.componentWillLeave?t.componentWillLeave(this._handleDoneLeaving.bind(this,e)):this._handleDoneLeaving(e)},_handleDoneLeaving:function(e){var t=this.refs[e];t.componentDidLeave&&t.componentDidLeave(),delete this.currentlyTransitioningKeys[e];var n=a.getChildMapping(this.props.children);if(n&&n.hasOwnProperty(e))this.performEnter(e);else{var r=o({},this.state.children);delete r[e],this.setState({children:r})}},render:function(){var e=[];for(var t in this.state.children){var n=this.state.children[t];n&&e.push(i(this.props.childFactory(n),{ref:t,key:t}))}return r.createElement(this.props.component,this.props,e)}});e.exports=l},function(e,t,n){"use strict";var r=n(202),a=n(204),o={getChildMapping:function(e){return e?a.extract(r.map(e,function(e){return e})):e},mergeChildMappings:function(e,t){function n(n){return t.hasOwnProperty(n)?t[n]:e[n]}e=e||{},t=t||{};var r={},a=[];for(var o in e)t.hasOwnProperty(o)?a.length&&(r[o]=a,a=[]):a.push(o);var i,s={};for(var l in t){if(r.hasOwnProperty(l))for(i=0;i1)for(var r=1;n>r;r++)t=arguments[r],t&&(e=(e?e+" ":"")+t);return e}e.exports=n},function(e,t,n){(function(t){"use strict";var r=n(197),a=n(577),o=n(578),i=n(350),s=n(209),l=17,u=5e3,c=null;"production"!==t.env.NODE_ENV&&(c=function(){"production"!==t.env.NODE_ENV?s(!1,"transition(): tried to perform an animation without an animationend or transitionend event after timeout (%sms). You should either disable this transition in JS or add a CSS animation/transition.",u):null});var d=r.createClass({displayName:"ReactCSSTransitionGroupChild",transition:function(e,n){var r=this.getDOMNode(),i=this.props.name+"-"+e,s=i+"-active",l=null,d=function(e){e&&e.target!==r||("production"!==t.env.NODE_ENV&&clearTimeout(l),a.removeClass(r,i),a.removeClass(r,s),o.removeEndEventListener(r,d),n&&n())};o.addEndEventListener(r,d),a.addClass(r,i),this.queueClass(s),"production"!==t.env.NODE_ENV&&(l=setTimeout(c,u))},queueClass:function(e){this.classNameQueue.push(e),this.timeout||(this.timeout=setTimeout(this.flushClassNameQueue,l))},flushClassNameQueue:function(){this.isMounted()&&this.classNameQueue.forEach(a.addClass.bind(a,this.getDOMNode())),this.classNameQueue.length=0,this.timeout=null},componentWillMount:function(){this.classNameQueue=[]},componentWillUnmount:function(){this.timeout&&clearTimeout(this.timeout)},componentWillAppear:function(e){this.props.appear?this.transition("appear",e):e()},componentWillEnter:function(e){this.props.enter?this.transition("enter",e):e()},componentWillLeave:function(e){this.props.leave?this.transition("leave",e):e()},render:function(){return i(this.props.children)}});e.exports=d}).call(t,n(175))},function(e,t,n){(function(t){var r=n(201),a={addClass:function(e,n){return"production"!==t.env.NODE_ENV?r(!/\s/.test(n),'CSSCore.addClass takes only a single class name. "%s" contains multiple classes.',n):r(!/\s/.test(n)),n&&(e.classList?e.classList.add(n):a.hasClass(e,n)||(e.className=e.className+" "+n)),e},removeClass:function(e,n){return"production"!==t.env.NODE_ENV?r(!/\s/.test(n),'CSSCore.removeClass takes only a single class name. "%s" contains multiple classes.',n):r(!/\s/.test(n)),n&&(e.classList?e.classList.remove(n):a.hasClass(e,n)&&(e.className=e.className.replace(new RegExp("(^|\\s)"+n+"(?:\\s|$)","g"),"$1").replace(/\s+/g," ").replace(/^\s*|\s*$/g,""))),e},conditionClass:function(e,t,n){return(n?a.addClass:a.removeClass)(e,t)},hasClass:function(e,n){return"production"!==t.env.NODE_ENV?r(!/\s/.test(n),"CSS.hasClass takes only a single class name."):r(!/\s/.test(n)),e.classList?!!n&&e.classList.contains(n):(" "+e.className+" ").indexOf(" "+n+" ")>-1}};e.exports=a}).call(t,n(175))},function(e,t,n){"use strict";function r(){var e=document.createElement("div"),t=e.style;"AnimationEvent"in window||delete s.animationend.animation,"TransitionEvent"in window||delete s.transitionend.transition;for(var n in s){var r=s[n];for(var a in r)if(a in t){l.push(r[a]);break}}}function a(e,t,n){e.addEventListener(t,n,!1)}function o(e,t,n){e.removeEventListener(t,n,!1)}var i=n(245),s={transitionend:{transition:"transitionend",WebkitTransition:"webkitTransitionEnd",MozTransition:"mozTransitionEnd",OTransition:"oTransitionEnd",msTransition:"MSTransitionEnd"},animationend:{animation:"animationend",WebkitAnimation:"webkitAnimationEnd",MozAnimation:"mozAnimationEnd",OAnimation:"oAnimationEnd",msAnimation:"MSAnimationEnd"}},l=[];i.canUseDOM&&r();var u={addEndEventListener:function(e,t){return 0===l.length?void window.setTimeout(t,0):void l.forEach(function(n){a(e,n,t)})},removeEndEventListener:function(e,t){0!==l.length&&l.forEach(function(n){o(e,n,t)})}};e.exports=u},function(e,t,n){(function(t){"use strict";function r(e){return"production"!==t.env.NODE_ENV&&("production"!==t.env.NODE_ENV?a(o,"React.addons.classSet will be deprecated in a future version. See http://fb.me/react-addons-classset"):null,o=!0),"object"==typeof e?Object.keys(e).filter(function(t){return e[t]}).join(" "):Array.prototype.join.call(arguments," ")}var a=n(209),o=!1;e.exports=r}).call(t,n(175))},function(e,t,n){(function(t){"use strict";function r(e){return Array.isArray(e)?e.concat():e&&"object"==typeof e?i(new e.constructor,e):e}function a(e,n,r){"production"!==t.env.NODE_ENV?l(Array.isArray(e),"update(): expected target of %s to be an array; got %s.",r,e):l(Array.isArray(e));var a=n[r];"production"!==t.env.NODE_ENV?l(Array.isArray(a),"update(): expected spec of %s to be an array; got %s. Did you forget to wrap your parameter in an array?",r,a):l(Array.isArray(a))}function o(e,n){if("production"!==t.env.NODE_ENV?l("object"==typeof n,"update(): You provided a key path to update() that did not contain one of %s. Did you forget to include {%s: ...}?",g.join(", "),f):l("object"==typeof n),u.call(n,f))return"production"!==t.env.NODE_ENV?l(1===Object.keys(n).length,"Cannot have more than one key in an object with %s",f):l(1===Object.keys(n).length),n[f];var s=r(e);if(u.call(n,h)){var b=n[h];"production"!==t.env.NODE_ENV?l(b&&"object"==typeof b,"update(): %s expects a spec of type 'object'; got %s",h,b):l(b&&"object"==typeof b),"production"!==t.env.NODE_ENV?l(s&&"object"==typeof s,"update(): %s expects a target of type 'object'; got %s",h,s):l(s&&"object"==typeof s),i(s,n[h])}u.call(n,c)&&(a(e,n,c),n[c].forEach(function(e){s.push(e)})),u.call(n,d)&&(a(e,n,d),n[d].forEach(function(e){s.unshift(e)})),u.call(n,p)&&("production"!==t.env.NODE_ENV?l(Array.isArray(e),"Expected %s target to be an array; got %s",p,e):l(Array.isArray(e)),"production"!==t.env.NODE_ENV?l(Array.isArray(n[p]),"update(): expected spec of %s to be an array of arrays; got %s. Did you forget to wrap your parameters in an array?",p,n[p]):l(Array.isArray(n[p])),n[p].forEach(function(e){"production"!==t.env.NODE_ENV?l(Array.isArray(e),"update(): expected spec of %s to be an array of arrays; got %s. Did you forget to wrap your parameters in an array?",p,n[p]):l(Array.isArray(e)),s.splice.apply(s,e)})),u.call(n,m)&&("production"!==t.env.NODE_ENV?l("function"==typeof n[m],"update(): expected spec of %s to be a function; got %s.",m,n[m]):l("function"==typeof n[m]),s=n[m](s));for(var v in n)y.hasOwnProperty(v)&&y[v]||(s[v]=o(e[v],n[v]));return s}var i=n(207),s=n(233),l=n(201),u={}.hasOwnProperty,c=s({$push:null}),d=s({$unshift:null}),p=s({$splice:null}),f=s({$set:null}),h=s({$merge:null}),m=s({$apply:null}),g=[c,d,p,f,h,m],y={};g.forEach(function(e){y[e]=!0}),e.exports=o}).call(t,n(175))},function(e,t,n){"use strict";function r(e){}function a(e){return function(t,n){var a;E.isDOMComponent(t)?a=t.getDOMNode():t.tagName&&(a=t);var o=new r;o.target=a;var i=new v(f.eventNameDispatchConfigs[e],y.getID(a),o);_(i,n),u.accumulateTwoPhaseDispatches(i),b.batchedUpdates(function(){l.enqueueEvents(i),l.processEventQueue()})}}function o(){E.Simulate={};var e;for(e in f.eventNameDispatchConfigs)E.Simulate[e]=a(e)}function i(e){return function(t,n){var a=new r(e);_(a,n),E.isDOMComponent(t)?E.simulateNativeEventOnDOMComponent(e,t,a):t.tagName&&E.simulateNativeEventOnNode(e,t,a)}}var s=n(199),l=n(263),u=n(287),c=n(197),d=n(205),p=n(270),f=n(262),h=n(278),m=n(213),g=n(219),y=n(261),b=n(220),v=n(291),_=n(207),w=n(208),k=s.topLevelTypes,E={renderIntoDocument:function(e){var t=document.createElement("div");return c.render(e,t)},isElement:function(e){return d.isValidElement(e)},isElementOfType:function(e,t){return d.isValidElement(e)&&e.type===t},isDOMComponent:function(e){return!!(e&&e.tagName&&e.getDOMNode)},isDOMComponentElement:function(e){return!!(e&&d.isValidElement(e)&&e.tagName)},isCompositeComponent:function(e){return"function"==typeof e.render&&"function"==typeof e.setState},isCompositeComponentWithType:function(e,t){return!(!E.isCompositeComponent(e)||e.constructor!==t)},isCompositeComponentElement:function(e){if(!d.isValidElement(e))return!1;var t=e.type.prototype;return"function"==typeof t.render&&"function"==typeof t.setState},isCompositeComponentElementWithType:function(e,t){return!(!E.isCompositeComponentElement(e)||e.constructor!==t)},getRenderedChildOfCompositeComponent:function(e){if(!E.isCompositeComponent(e))return null;var t=g.get(e);return t._renderedComponent.getPublicInstance()},findAllInRenderedTree:function(e,t){if(!e)return[];var n=t(e)?[e]:[];if(E.isDOMComponent(e)){var r,a=g.get(e),o=a._renderedComponent._renderedChildren;for(r in o)o.hasOwnProperty(r)&&o[r].getPublicInstance&&(n=n.concat(E.findAllInRenderedTree(o[r].getPublicInstance(),t)))}else E.isCompositeComponent(e)&&(n=n.concat(E.findAllInRenderedTree(E.getRenderedChildOfCompositeComponent(e),t)));return n},scryRenderedDOMComponentsWithClass:function(e,t){ +return E.findAllInRenderedTree(e,function(e){var n=e.props.className;return E.isDOMComponent(e)&&n&&-1!==(" "+n+" ").indexOf(" "+t+" ")})},findRenderedDOMComponentWithClass:function(e,t){var n=E.scryRenderedDOMComponentsWithClass(e,t);if(1!==n.length)throw new Error("Did not find exactly one match (found: "+n.length+") for class:"+t);return n[0]},scryRenderedDOMComponentsWithTag:function(e,t){return E.findAllInRenderedTree(e,function(e){return E.isDOMComponent(e)&&e.tagName===t.toUpperCase()})},findRenderedDOMComponentWithTag:function(e,t){var n=E.scryRenderedDOMComponentsWithTag(e,t);if(1!==n.length)throw new Error("Did not find exactly one match for tag:"+t);return n[0]},scryRenderedComponentsWithType:function(e,t){return E.findAllInRenderedTree(e,function(e){return E.isCompositeComponentWithType(e,t)})},findRenderedComponentWithType:function(e,t){var n=E.scryRenderedComponentsWithType(e,t);if(1!==n.length)throw new Error("Did not find exactly one match for componentType:"+t);return n[0]},mockComponent:function(e,t){return t=t||e.mockTagName||"div",e.prototype.render.mockImplementation(function(){return c.createElement(t,null,this.props.children)}),this},simulateNativeEventOnNode:function(e,t,n){n.target=t,f.ReactEventListener.dispatchEvent(e,n)},simulateNativeEventOnDOMComponent:function(e,t,n){E.simulateNativeEventOnNode(e,t.getDOMNode(),n)},nativeTouchData:function(e,t){return{touches:[{pageX:e,pageY:t}]}},createRenderer:function(){return new x},Simulate:null,SimulateNative:{}},x=function(){this._instance=null};x.prototype.getRenderOutput=function(){return this._instance&&this._instance._renderedComponent&&this._instance._renderedComponent._renderedOutput||null};var O=function(e){this._renderedOutput=e,this._currentElement=null===e||e===!1?p.emptyElement:e};O.prototype={mountComponent:function(){},receiveComponent:function(e){this._renderedOutput=e,this._currentElement=null===e||e===!1?p.emptyElement:e},unmountComponent:function(){}};var S=function(){};_(S.prototype,h.Mixin,{_instantiateReactComponent:function(e){return new O(e)},_replaceNodeWithMarkupByID:function(){},_renderValidatedComponent:h.Mixin._renderValidatedComponentWithoutOwnerOrContext}),x.prototype.render=function(e,t){t||(t=w);var n=b.ReactReconcileTransaction.getPooled();this._render(e,n,t),b.ReactReconcileTransaction.release(n)},x.prototype.unmount=function(){this._instance&&this._instance.unmountComponent()},x.prototype._render=function(e,t,n){if(this._instance)this._instance.receiveComponent(e,t,n);else{var r=m.createReactRootID(),a=new S(e.type);a.construct(e),a.mountComponent(r,t,n),this._instance=a}};var P=l.injection.injectEventPluginOrder;l.injection.injectEventPluginOrder=function(){P.apply(this,arguments),o()};var A=l.injection.injectEventPluginsByName;l.injection.injectEventPluginsByName=function(){A.apply(this,arguments),o()},o();var j;for(j in k){var C=0===j.indexOf("top")?j.charAt(3).toLowerCase()+j.substr(4):j;E.SimulateNative[C]=i(j)}e.exports=E},,,function(e,t){"use strict";function n(e){return!!e&&("object"==typeof e||"function"==typeof e)&&"function"==typeof e.then}function r(e,t){t.forEach(function(t){Object.keys(Object(t)).forEach(function(n){e(n,t[n])})})}function a(e){for(var t=arguments.length,n=Array(t>1?t-1:0),a=1;t>a;a++)n[a-1]=arguments[a];return r(function(t,n){return e[t]=n},n),e}Object.defineProperty(t,"__esModule",{value:!0}),t.isPromise=n,t.eachObject=r,t.assign=a;var o=function(e){return"function"==typeof e};t.isFunction=o},,function(e,t,n){!function(t,n){e.exports=n()}(this,function(){"use strict";function e(e,t){t&&(e.prototype=Object.create(t.prototype)),e.prototype.constructor=e}function t(e){return e.value=!1,e}function n(e){e&&(e.value=!0)}function r(){}function a(e,t){t=t||0;for(var n=Math.max(0,e.length-t),r=new Array(n),a=0;n>a;a++)r[a]=e[a+t];return r}function o(e){return void 0===e.size&&(e.size=e.__iterate(s)),e.size}function i(e,t){return t>=0?+t:o(e)+ +t}function s(){return!0}function l(e,t,n){return(0===e||void 0!==n&&-n>=e)&&(void 0===t||void 0!==n&&t>=n)}function u(e,t){return d(e,t,0)}function c(e,t){return d(e,t,t)}function d(e,t,n){return void 0===e?n:0>e?Math.max(0,t+e):void 0===t?e:Math.min(t,e)}function p(e){return g(e)?e:j(e)}function f(e){return y(e)?e:C(e)}function h(e){return b(e)?e:T(e)}function m(e){return g(e)&&!v(e)?e:D(e)}function g(e){return!(!e||!e[mn])}function y(e){return!(!e||!e[gn])}function b(e){return!(!e||!e[yn])}function v(e){return y(e)||b(e)}function _(e){return!(!e||!e[bn])}function w(e){this.next=e}function k(e,t,n,r){var a=0===e?t:1===e?n:[t,n];return r?r.value=a:r={value:a,done:!1},r}function E(){return{value:void 0,done:!0}}function x(e){return!!P(e)}function O(e){return e&&"function"==typeof e.next}function S(e){var t=P(e);return t&&t.call(e)}function P(e){var t=e&&(kn&&e[kn]||e[En]);return"function"==typeof t?t:void 0}function A(e){return e&&"number"==typeof e.length}function j(e){return null===e||void 0===e?B():g(e)?e.toSeq():F(e)}function C(e){return null===e||void 0===e?B().toKeyedSeq():g(e)?y(e)?e.toSeq():e.fromEntrySeq():L(e)}function T(e){return null===e||void 0===e?B():g(e)?y(e)?e.entrySeq():e.toIndexedSeq():q(e)}function D(e){return(null===e||void 0===e?B():g(e)?y(e)?e.entrySeq():e:q(e)).toSetSeq()}function M(e){this._array=e,this.size=e.length}function N(e){var t=Object.keys(e);this._object=e,this._keys=t,this.size=t.length}function z(e){this._iterable=e,this.size=e.length||e.size}function I(e){this._iterator=e,this._iteratorCache=[]}function R(e){return!(!e||!e[On])}function B(){return Sn||(Sn=new M([]))}function L(e){var t=Array.isArray(e)?new M(e).fromEntrySeq():O(e)?new I(e).fromEntrySeq():x(e)?new z(e).fromEntrySeq():"object"==typeof e?new N(e):void 0;if(!t)throw new TypeError("Expected Array or iterable object of [k, v] entries, or keyed object: "+e);return t}function q(e){var t=U(e);if(!t)throw new TypeError("Expected Array or iterable object of values: "+e);return t}function F(e){var t=U(e)||"object"==typeof e&&new N(e);if(!t)throw new TypeError("Expected Array or iterable object of values, or keyed object: "+e);return t}function U(e){return A(e)?new M(e):O(e)?new I(e):x(e)?new z(e):void 0}function H(e,t,n,r){var a=e._cache;if(a){for(var o=a.length-1,i=0;o>=i;i++){var s=a[n?o-i:i];if(t(s[1],r?s[0]:i,e)===!1)return i+1}return i}return e.__iterateUncached(t,n)}function W(e,t,n,r){var a=e._cache;if(a){var o=a.length-1,i=0;return new w(function(){var e=a[n?o-i:i];return i++>o?E():k(t,r?e[0]:i-1,e[1])})}return e.__iteratorUncached(t,n)}function V(){throw TypeError("Abstract")}function K(){}function G(){}function Y(){}function X(e,t){if(e===t||e!==e&&t!==t)return!0;if(!e||!t)return!1;if("function"==typeof e.valueOf&&"function"==typeof t.valueOf){if(e=e.valueOf(),t=t.valueOf(),e===t||e!==e&&t!==t)return!0;if(!e||!t)return!1}return"function"==typeof e.equals&&"function"==typeof t.equals&&e.equals(t)?!0:!1}function J(e,t){return t?$(t,e,"",{"":e}):Z(e)}function $(e,t,n,r){return Array.isArray(t)?e.call(r,n,T(t).map(function(n,r){return $(e,n,r,t)})):Q(t)?e.call(r,n,C(t).map(function(n,r){return $(e,n,r,t)})):t}function Z(e){return Array.isArray(e)?T(e).map(Z).toList():Q(e)?C(e).map(Z).toMap():e}function Q(e){return e&&(e.constructor===Object||void 0===e.constructor)}function ee(e){return e>>>1&1073741824|3221225471&e}function te(e){if(e===!1||null===e||void 0===e)return 0;if("function"==typeof e.valueOf&&(e=e.valueOf(),e===!1||null===e||void 0===e))return 0;if(e===!0)return 1;var t=typeof e;if("number"===t){var n=0|e;for(n!==e&&(n^=4294967295*e);e>4294967295;)e/=4294967295,n^=e;return ee(n)}return"string"===t?e.length>Nn?ne(e):re(e):"function"==typeof e.hashCode?e.hashCode():ae(e)}function ne(e){var t=Rn[e];return void 0===t&&(t=re(e),In===zn&&(In=0,Rn={}),In++,Rn[e]=t),t}function re(e){for(var t=0,n=0;n0)switch(e.nodeType){case 1:return e.uniqueID;case 9:return e.documentElement&&e.documentElement.uniqueID}}function ie(e,t){if(!e)throw new Error(t)}function se(e){ie(e!==1/0,"Cannot perform this action with an infinite size.")}function le(e,t){this._iter=e,this._useKeys=t,this.size=e.size}function ue(e){this._iter=e,this.size=e.size}function ce(e){this._iter=e,this.size=e.size}function de(e){this._iter=e,this.size=e.size}function pe(e){var t=Me(e);return t._iter=e,t.size=e.size,t.flip=function(){return e},t.reverse=function(){var t=e.reverse.apply(this);return t.flip=function(){return e.reverse()},t},t.has=function(t){return e.includes(t)},t.includes=function(t){return e.has(t)},t.cacheResult=Ne,t.__iterateUncached=function(t,n){var r=this;return e.__iterate(function(e,n){return t(n,e,r)!==!1},n)},t.__iteratorUncached=function(t,n){if(t===wn){var r=e.__iterator(t,n);return new w(function(){var e=r.next();if(!e.done){var t=e.value[0];e.value[0]=e.value[1],e.value[1]=t}return e})}return e.__iterator(t===_n?vn:_n,n)},t}function fe(e,t,n){var r=Me(e);return r.size=e.size,r.has=function(t){return e.has(t)},r.get=function(r,a){var o=e.get(r,pn);return o===pn?a:t.call(n,o,r,e)},r.__iterateUncached=function(r,a){var o=this;return e.__iterate(function(e,a,i){return r(t.call(n,e,a,i),a,o)!==!1},a)},r.__iteratorUncached=function(r,a){var o=e.__iterator(wn,a);return new w(function(){var a=o.next();if(a.done)return a;var i=a.value,s=i[0];return k(r,s,t.call(n,i[1],s,e),a)})},r}function he(e,t){var n=Me(e);return n._iter=e,n.size=e.size,n.reverse=function(){return e},e.flip&&(n.flip=function(){var t=pe(e);return t.reverse=function(){return e.flip()},t}),n.get=function(n,r){return e.get(t?n:-1-n,r)},n.has=function(n){return e.has(t?n:-1-n)},n.includes=function(t){return e.includes(t)},n.cacheResult=Ne,n.__iterate=function(t,n){var r=this;return e.__iterate(function(e,n){return t(e,n,r)},!n)},n.__iterator=function(t,n){return e.__iterator(t,!n)},n}function me(e,t,n,r){var a=Me(e);return r&&(a.has=function(r){var a=e.get(r,pn);return a!==pn&&!!t.call(n,a,r,e)},a.get=function(r,a){var o=e.get(r,pn);return o!==pn&&t.call(n,o,r,e)?o:a}),a.__iterateUncached=function(a,o){var i=this,s=0;return e.__iterate(function(e,o,l){return t.call(n,e,o,l)?(s++,a(e,r?o:s-1,i)):void 0},o),s},a.__iteratorUncached=function(a,o){var i=e.__iterator(wn,o),s=0;return new w(function(){for(;;){var o=i.next();if(o.done)return o;var l=o.value,u=l[0],c=l[1];if(t.call(n,c,u,e))return k(a,r?u:s++,c,o)}})},a}function ge(e,t,n){var r=Re().asMutable();return e.__iterate(function(a,o){r.update(t.call(n,a,o,e),0,function(e){return e+1})}),r.asImmutable()}function ye(e,t,n){var r=y(e),a=(_(e)?Et():Re()).asMutable();e.__iterate(function(o,i){a.update(t.call(n,o,i,e),function(e){return e=e||[],e.push(r?[i,o]:o),e})});var o=De(e);return a.map(function(t){return je(e,o(t))})}function be(e,t,n,r){var a=e.size;if(l(t,n,a))return e;var o=u(t,a),s=c(n,a);if(o!==o||s!==s)return be(e.toSeq().cacheResult(),t,n,r);var d,p=s-o;p===p&&(d=0>p?0:p);var f=Me(e);return f.size=d,!r&&R(e)&&d>=0&&(f.get=function(t,n){return t=i(this,t),t>=0&&d>t?e.get(t+o,n):n}),f.__iterateUncached=function(t,n){var a=this;if(0===d)return 0;if(n)return this.cacheResult().__iterate(t,n);var i=0,s=!0,l=0;return e.__iterate(function(e,n){return s&&(s=i++d)return E();var e=a.next();return r||t===_n?e:t===vn?k(t,s-1,void 0,e):k(t,s-1,e.value[1],e)})},f}function ve(e,t,n){var r=Me(e);return r.__iterateUncached=function(r,a){var o=this;if(a)return this.cacheResult().__iterate(r,a);var i=0;return e.__iterate(function(e,a,s){return t.call(n,e,a,s)&&++i&&r(e,a,o)}),i},r.__iteratorUncached=function(r,a){var o=this;if(a)return this.cacheResult().__iterator(r,a);var i=e.__iterator(wn,a),s=!0;return new w(function(){if(!s)return E();var e=i.next();if(e.done)return e;var a=e.value,l=a[0],u=a[1];return t.call(n,u,l,o)?r===wn?e:k(r,l,u,e):(s=!1,E())})},r}function _e(e,t,n,r){var a=Me(e);return a.__iterateUncached=function(a,o){var i=this;if(o)return this.cacheResult().__iterate(a,o);var s=!0,l=0;return e.__iterate(function(e,o,u){return s&&(s=t.call(n,e,o,u))?void 0:(l++,a(e,r?o:l-1,i))}),l},a.__iteratorUncached=function(a,o){var i=this;if(o)return this.cacheResult().__iterator(a,o);var s=e.__iterator(wn,o),l=!0,u=0;return new w(function(){var e,o,c;do{if(e=s.next(),e.done)return r||a===_n?e:a===vn?k(a,u++,void 0,e):k(a,u++,e.value[1],e);var d=e.value;o=d[0],c=d[1],l&&(l=t.call(n,c,o,i))}while(l);return a===wn?e:k(a,o,c,e)})},a}function we(e,t){var n=y(e),r=[e].concat(t).map(function(e){return g(e)?n&&(e=f(e)):e=n?L(e):q(Array.isArray(e)?e:[e]),e}).filter(function(e){return 0!==e.size});if(0===r.length)return e;if(1===r.length){var a=r[0];if(a===e||n&&y(a)||b(e)&&b(a))return a}var o=new M(r);return n?o=o.toKeyedSeq():b(e)||(o=o.toSetSeq()),o=o.flatten(!0),o.size=r.reduce(function(e,t){if(void 0!==e){var n=t.size;if(void 0!==n)return e+n}},0),o}function ke(e,t,n){var r=Me(e);return r.__iterateUncached=function(r,a){function o(e,l){var u=this;e.__iterate(function(e,a){return(!t||t>l)&&g(e)?o(e,l+1):r(e,n?a:i++,u)===!1&&(s=!0),!s},a)}var i=0,s=!1;return o(e,0),i},r.__iteratorUncached=function(r,a){var o=e.__iterator(r,a),i=[],s=0;return new w(function(){for(;o;){var e=o.next();if(e.done===!1){var l=e.value;if(r===wn&&(l=l[1]),t&&!(i.length0}function Ae(e,t,n){var r=Me(e);return r.size=new M(n).map(function(e){return e.size}).min(),r.__iterate=function(e,t){for(var n,r=this.__iterator(_n,t),a=0;!(n=r.next()).done&&e(n.value,a++,this)!==!1;);return a},r.__iteratorUncached=function(e,r){var a=n.map(function(e){return e=p(e),S(r?e.reverse():e)}),o=0,i=!1;return new w(function(){var n;return i||(n=a.map(function(e){return e.next()}),i=n.some(function(e){return e.done})),i?E():k(e,o++,t.apply(null,n.map(function(e){return e.value})))})},r}function je(e,t){return R(e)?t:e.constructor(t)}function Ce(e){if(e!==Object(e))throw new TypeError("Expected [K, V] tuple: "+e)}function Te(e){return se(e.size),o(e)}function De(e){return y(e)?f:b(e)?h:m}function Me(e){return Object.create((y(e)?C:b(e)?T:D).prototype)}function Ne(){return this._iter.cacheResult?(this._iter.cacheResult(),this.size=this._iter.size,this):j.prototype.cacheResult.call(this)}function ze(e,t){return e>t?1:t>e?-1:0}function Ie(e){var t=S(e);if(!t){if(!A(e))throw new TypeError("Expected iterable or array-like: "+e);t=S(p(e))}return t}function Re(e){return null===e||void 0===e?Ye():Be(e)?e:Ye().withMutations(function(t){var n=f(e);se(n.size),n.forEach(function(e,n){return t.set(n,e)})})}function Be(e){return!(!e||!e[Bn])}function Le(e,t){this.ownerID=e,this.entries=t}function qe(e,t,n){this.ownerID=e,this.bitmap=t,this.nodes=n}function Fe(e,t,n){this.ownerID=e,this.count=t,this.nodes=n}function Ue(e,t,n){this.ownerID=e,this.keyHash=t,this.entries=n}function He(e,t,n){this.ownerID=e,this.keyHash=t,this.entry=n}function We(e,t,n){this._type=t,this._reverse=n,this._stack=e._root&&Ke(e._root)}function Ve(e,t){return k(e,t[0],t[1])}function Ke(e,t){return{node:e,index:0,__prev:t}}function Ge(e,t,n,r){var a=Object.create(Ln);return a.size=e,a._root=t,a.__ownerID=n,a.__hash=r,a.__altered=!1,a}function Ye(){return qn||(qn=Ge(0))}function Xe(e,n,r){var a,o;if(e._root){var i=t(fn),s=t(hn);if(a=Je(e._root,e.__ownerID,0,void 0,n,r,i,s),!s.value)return e;o=e.size+(i.value?r===pn?-1:1:0)}else{if(r===pn)return e;o=1,a=new Le(e.__ownerID,[[n,r]])}return e.__ownerID?(e.size=o,e._root=a,e.__hash=void 0,e.__altered=!0,e):a?Ge(o,a):Ye()}function Je(e,t,r,a,o,i,s,l){return e?e.update(t,r,a,o,i,s,l):i===pn?e:(n(l),n(s),new He(t,a,[o,i]))}function $e(e){return e.constructor===He||e.constructor===Ue}function Ze(e,t,n,r,a){if(e.keyHash===r)return new Ue(t,r,[e.entry,a]);var o,i=(0===n?e.keyHash:e.keyHash>>>n)&dn,s=(0===n?r:r>>>n)&dn,l=i===s?[Ze(e,t,n+un,r,a)]:(o=new He(t,r,a),s>i?[e,o]:[o,e]);return new qe(t,1<s;s++,l<<=1){var c=t[s];void 0!==c&&s!==r&&(a|=l,i[o++]=c)}return new qe(e,a,i)}function tt(e,t,n,r,a){for(var o=0,i=new Array(cn),s=0;0!==n;s++,n>>>=1)i[s]=1&n?t[o++]:void 0;return i[r]=a,new Fe(e,o+1,i)}function nt(e,t,n){for(var r=[],a=0;a>1&1431655765,e=(858993459&e)+(e>>2&858993459),e=e+(e>>4)&252645135,e+=e>>8,e+=e>>16,127&e}function st(e,t,n,r){var o=r?e:a(e);return o[t]=n,o}function lt(e,t,n,r){var a=e.length+1;if(r&&t+1===a)return e[t]=n,e;for(var o=new Array(a),i=0,s=0;a>s;s++)s===t?(o[s]=n,i=-1):o[s]=e[s+i];return o}function ut(e,t,n){var r=e.length-1;if(n&&t===r)return e.pop(),e;for(var a=new Array(r),o=0,i=0;r>i;i++)i===t&&(o=1),a[i]=e[i+o];return a}function ct(e){var t=mt();if(null===e||void 0===e)return t;if(dt(e))return e;var n=h(e),r=n.size;return 0===r?t:(se(r),r>0&&cn>r?ht(0,r,un,null,new pt(n.toArray())):t.withMutations(function(e){e.setSize(r),n.forEach(function(t,n){return e.set(n,t)})}))}function dt(e){return!(!e||!e[Wn])}function pt(e,t){this.array=e,this.ownerID=t}function ft(e,t){function n(e,t,n){return 0===t?r(e,n):a(e,t,n)}function r(e,n){var r=n===s?l&&l.array:e&&e.array,a=n>o?0:o-n,u=i-n;return u>cn&&(u=cn),function(){if(a===u)return Gn;var e=t?--u:a++;return r&&r[e]}}function a(e,r,a){var s,l=e&&e.array,u=a>o?0:o-a>>r,c=(i-a>>r)+1;return c>cn&&(c=cn),function(){for(;;){if(s){var e=s();if(e!==Gn)return e;s=null}if(u===c)return Gn;var o=t?--c:u++;s=n(l&&l[o],r-un,a+(o<=e.size||0>n)return e.withMutations(function(e){0>n?_t(e,n).set(0,r):_t(e,0,n+1).set(n,r)});n+=e._origin;var a=e._tail,o=e._root,s=t(hn);return n>=kt(e._capacity)?a=yt(a,e.__ownerID,0,n,r,s):o=yt(o,e.__ownerID,e._level,n,r,s),s.value?e.__ownerID?(e._root=o,e._tail=a,e.__hash=void 0,e.__altered=!0,e):ht(e._origin,e._capacity,e._level,o,a):e}function yt(e,t,r,a,o,i){var s=a>>>r&dn,l=e&&s0){var c=e&&e.array[s],d=yt(c,t,r-un,a,o,i);return d===c?e:(u=bt(e,t),u.array[s]=d,u)}return l&&e.array[s]===o?e:(n(i),u=bt(e,t),void 0===o&&s===u.array.length-1?u.array.pop():u.array[s]=o,u)}function bt(e,t){return t&&e&&t===e.ownerID?e:new pt(e?e.array.slice():[],t)}function vt(e,t){if(t>=kt(e._capacity))return e._tail;if(t<1<0;)n=n.array[t>>>r&dn],r-=un;return n}}function _t(e,t,n){var a=e.__ownerID||new r,o=e._origin,i=e._capacity,s=o+t,l=void 0===n?i:0>n?i+n:o+n;if(s===o&&l===i)return e;if(s>=l)return e.clear();for(var u=e._level,c=e._root,d=0;0>s+d;)c=new pt(c&&c.array.length?[void 0,c]:[],a),u+=un,d+=1<=1<f?vt(e,l-1):f>p?new pt([],a):h;if(h&&f>p&&i>s&&h.array.length){c=bt(c,a);for(var g=c,y=u;y>un;y-=un){var b=p>>>y&dn;g=g.array[b]=bt(g.array[b],a)}g.array[p>>>un&dn]=h}if(i>l&&(m=m&&m.removeAfter(a,0,l)),s>=f)s-=f,l-=f,u=un,c=null,m=m&&m.removeBefore(a,0,s);else if(s>o||p>f){for(d=0;c;){var v=s>>>u&dn;if(v!==f>>>u&dn)break;v&&(d+=(1<o&&(c=c.removeBefore(a,u,s-d)),c&&p>f&&(c=c.removeAfter(a,u,f-d)),d&&(s-=d,l-=d)}return e.__ownerID?(e.size=l-s,e._origin=s,e._capacity=l,e._level=u,e._root=c,e._tail=m,e.__hash=void 0,e.__altered=!0,e):ht(s,l,u,c,m)}function wt(e,t,n){for(var r=[],a=0,o=0;oa&&(a=s.size),g(i)||(s=s.map(function(e){return J(e)})),r.push(s)}return a>e.size&&(e=e.setSize(a)),at(e,t,r)}function kt(e){return cn>e?0:e-1>>>un<=cn&&i.size>=2*o.size?(a=i.filter(function(e,t){return void 0!==e&&s!==t}),r=a.toKeyedSeq().map(function(e){return e[0]}).flip().toMap(),e.__ownerID&&(r.__ownerID=a.__ownerID=e.__ownerID)):(r=o.remove(t),a=s===i.size-1?i.pop():i.set(s,void 0))}else if(l){if(n===i.get(s)[1])return e;r=o,a=i.set(s,[t,n])}else r=o.set(t,i.size),a=i.set(i.size,[t,n]);return e.__ownerID?(e.size=r.size,e._map=r,e._list=a,e.__hash=void 0,e):Ot(r,a)}function At(e){return null===e||void 0===e?Tt():jt(e)?e:Tt().unshiftAll(e)}function jt(e){return!(!e||!e[Xn])}function Ct(e,t,n,r){var a=Object.create(Jn);return a.size=e,a._head=t,a.__ownerID=n,a.__hash=r,a.__altered=!1,a}function Tt(){return $n||($n=Ct(0))}function Dt(e){return null===e||void 0===e?It():Mt(e)?e:It().withMutations(function(t){var n=m(e);se(n.size),n.forEach(function(e){return t.add(e)})})}function Mt(e){return!(!e||!e[Zn])}function Nt(e,t){return e.__ownerID?(e.size=t.size,e._map=t,e):t===e._map?e:0===t.size?e.__empty():e.__make(t)}function zt(e,t){var n=Object.create(Qn);return n.size=e?e.size:0,n._map=e,n.__ownerID=t,n}function It(){return er||(er=zt(Ye()))}function Rt(e){return null===e||void 0===e?qt():Bt(e)?e:qt().withMutations(function(t){var n=m(e);se(n.size),n.forEach(function(e){return t.add(e)})})}function Bt(e){return Mt(e)&&_(e)}function Lt(e,t){var n=Object.create(tr);return n.size=e?e.size:0,n._map=e,n.__ownerID=t,n}function qt(){return nr||(nr=Lt(St()))}function Ft(e,t){var n,r=function(o){if(o instanceof r)return o;if(!(this instanceof r))return new r(o);if(!n){n=!0;var i=Object.keys(e);Wt(a,i),a.size=i.length,a._name=t,a._keys=i,a._defaultValues=e}this._map=Re(o)},a=r.prototype=Object.create(rr);return a.constructor=r,r}function Ut(e,t,n){var r=Object.create(Object.getPrototypeOf(e));return r._map=t,r.__ownerID=n,r}function Ht(e){return e._name||e.constructor.name||"Record"}function Wt(e,t){try{t.forEach(Vt.bind(void 0,e))}catch(n){}}function Vt(e,t){Object.defineProperty(e,t,{get:function(){return this.get(t)},set:function(e){ie(this.__ownerID,"Cannot set on an immutable record."),this.set(t,e)}})}function Kt(e,t){if(e===t)return!0;if(!g(t)||void 0!==e.size&&void 0!==t.size&&e.size!==t.size||void 0!==e.__hash&&void 0!==t.__hash&&e.__hash!==t.__hash||y(e)!==y(t)||b(e)!==b(t)||_(e)!==_(t))return!1;if(0===e.size&&0===t.size)return!0;var n=!v(e);if(_(e)){var r=e.entries();return t.every(function(e,t){var a=r.next().value;return a&&X(a[1],e)&&(n||X(a[0],t))})&&r.next().done}var a=!1;if(void 0===e.size)if(void 0===t.size)"function"==typeof e.cacheResult&&e.cacheResult();else{a=!0;var o=e;e=t,t=o}var i=!0,s=t.__iterate(function(t,r){return(n?e.has(t):a?X(t,e.get(r,pn)):X(e.get(r,pn),t))?void 0:(i=!1,!1)});return i&&e.size===s}function Gt(e,t,n){if(!(this instanceof Gt))return new Gt(e,t,n);if(ie(0!==n,"Cannot step a Range by 0"),e=e||0,void 0===t&&(t=1/0),n=void 0===n?1:Math.abs(n),e>t&&(n=-n),this._start=e,this._end=t,this._step=n,this.size=Math.max(0,Math.ceil((t-e)/n-1)+1),0===this.size){if(ar)return ar;ar=this}}function Yt(e,t){if(!(this instanceof Yt))return new Yt(e,t);if(this._value=e,this.size=void 0===t?1/0:Math.max(0,t),0===this.size){if(or)return or;or=this}}function Xt(e,t){var n=function(n){e.prototype[n]=t[n]};return Object.keys(t).forEach(n),Object.getOwnPropertySymbols&&Object.getOwnPropertySymbols(t).forEach(n),e}function Jt(e,t){return t}function $t(e,t){return[t,e]}function Zt(e){return function(){return!e.apply(this,arguments)}}function Qt(e){return function(){return-e.apply(this,arguments)}}function en(e){return"string"==typeof e?JSON.stringify(e):e}function tn(){return a(arguments)}function nn(e,t){return t>e?1:e>t?-1:0}function rn(e){if(e.size===1/0)return 0;var t=_(e),n=y(e),r=t?1:0,a=e.__iterate(n?t?function(e,t){r=31*r+on(te(e),te(t))|0}:function(e,t){r=r+on(te(e),te(t))|0}:t?function(e){r=31*r+te(e)|0}:function(e){r=r+te(e)|0});return an(a,r)}function an(e,t){return t=An(t,3432918353),t=An(t<<15|t>>>-15,461845907),t=An(t<<13|t>>>-13,5),t=(t+3864292196|0)^e,t=An(t^t>>>16,2246822507),t=An(t^t>>>13,3266489909),t=ee(t^t>>>16)}function on(e,t){return e^t+2654435769+(e<<6)+(e>>2)|0}var sn=Array.prototype.slice,ln="delete",un=5,cn=1<=a;a++)if(e(n[t?r-a:a],a,this)===!1)return a+1;return a},M.prototype.__iterator=function(e,t){var n=this._array,r=n.length-1,a=0;return new w(function(){return a>r?E():k(e,a,n[t?r-a++:a++])})},e(N,C),N.prototype.get=function(e,t){return void 0===t||this.has(e)?this._object[e]:t},N.prototype.has=function(e){return this._object.hasOwnProperty(e)},N.prototype.__iterate=function(e,t){for(var n=this._object,r=this._keys,a=r.length-1,o=0;a>=o;o++){var i=r[t?a-o:o];if(e(n[i],i,this)===!1)return o+1}return o},N.prototype.__iterator=function(e,t){var n=this._object,r=this._keys,a=r.length-1,o=0;return new w(function(){var i=r[t?a-o:o];return o++>a?E():k(e,i,n[i])})},N.prototype[bn]=!0,e(z,T),z.prototype.__iterateUncached=function(e,t){if(t)return this.cacheResult().__iterate(e,t);var n=this._iterable,r=S(n),a=0;if(O(r))for(var o;!(o=r.next()).done&&e(o.value,a++,this)!==!1;);return a},z.prototype.__iteratorUncached=function(e,t){if(t)return this.cacheResult().__iterator(e,t);var n=this._iterable,r=S(n);if(!O(r))return new w(E);var a=0;return new w(function(){var t=r.next();return t.done?t:k(e,a++,t.value)})},e(I,T),I.prototype.__iterateUncached=function(e,t){if(t)return this.cacheResult().__iterate(e,t);for(var n=this._iterator,r=this._iteratorCache,a=0;a=r.length){var t=n.next();if(t.done)return t;r[a]=t.value}return k(e,a,r[a++])})};var Sn;e(V,p),e(K,V),e(G,V),e(Y,V),V.Keyed=K,V.Indexed=G,V.Set=Y;var Pn,An="function"==typeof Math.imul&&-2===Math.imul(4294967295,2)?Math.imul:function(e,t){e=0|e,t=0|t;var n=65535&e,r=65535&t;return n*r+((e>>>16)*r+n*(t>>>16)<<16>>>0)|0},jn=Object.isExtensible,Cn=function(){try{return Object.defineProperty({},"@",{}),!0}catch(e){return!1}}(),Tn="function"==typeof WeakMap;Tn&&(Pn=new WeakMap);var Dn=0,Mn="__immutablehash__";"function"==typeof Symbol&&(Mn=Symbol(Mn));var Nn=16,zn=255,In=0,Rn={};e(le,C),le.prototype.get=function(e,t){return this._iter.get(e,t)},le.prototype.has=function(e){return this._iter.has(e)},le.prototype.valueSeq=function(){return this._iter.valueSeq()},le.prototype.reverse=function(){var e=this,t=he(this,!0);return this._useKeys||(t.valueSeq=function(){return e._iter.toSeq().reverse()}),t},le.prototype.map=function(e,t){var n=this,r=fe(this,e,t);return this._useKeys||(r.valueSeq=function(){return n._iter.toSeq().map(e,t)}),r},le.prototype.__iterate=function(e,t){var n,r=this;return this._iter.__iterate(this._useKeys?function(t,n){return e(t,n,r)}:(n=t?Te(this):0,function(a){return e(a,t?--n:n++,r)}),t)},le.prototype.__iterator=function(e,t){if(this._useKeys)return this._iter.__iterator(e,t);var n=this._iter.__iterator(_n,t),r=t?Te(this):0;return new w(function(){ +var a=n.next();return a.done?a:k(e,t?--r:r++,a.value,a)})},le.prototype[bn]=!0,e(ue,T),ue.prototype.includes=function(e){return this._iter.includes(e)},ue.prototype.__iterate=function(e,t){var n=this,r=0;return this._iter.__iterate(function(t){return e(t,r++,n)},t)},ue.prototype.__iterator=function(e,t){var n=this._iter.__iterator(_n,t),r=0;return new w(function(){var t=n.next();return t.done?t:k(e,r++,t.value,t)})},e(ce,D),ce.prototype.has=function(e){return this._iter.includes(e)},ce.prototype.__iterate=function(e,t){var n=this;return this._iter.__iterate(function(t){return e(t,t,n)},t)},ce.prototype.__iterator=function(e,t){var n=this._iter.__iterator(_n,t);return new w(function(){var t=n.next();return t.done?t:k(e,t.value,t.value,t)})},e(de,C),de.prototype.entrySeq=function(){return this._iter.toSeq()},de.prototype.__iterate=function(e,t){var n=this;return this._iter.__iterate(function(t){if(t){Ce(t);var r=g(t);return e(r?t.get(1):t[1],r?t.get(0):t[0],n)}},t)},de.prototype.__iterator=function(e,t){var n=this._iter.__iterator(_n,t);return new w(function(){for(;;){var t=n.next();if(t.done)return t;var r=t.value;if(r){Ce(r);var a=g(r);return k(e,a?r.get(0):r[0],a?r.get(1):r[1],t)}}})},ue.prototype.cacheResult=le.prototype.cacheResult=ce.prototype.cacheResult=de.prototype.cacheResult=Ne,e(Re,K),Re.prototype.toString=function(){return this.__toString("Map {","}")},Re.prototype.get=function(e,t){return this._root?this._root.get(0,void 0,e,t):t},Re.prototype.set=function(e,t){return Xe(this,e,t)},Re.prototype.setIn=function(e,t){return this.updateIn(e,pn,function(){return t})},Re.prototype.remove=function(e){return Xe(this,e,pn)},Re.prototype.deleteIn=function(e){return this.updateIn(e,function(){return pn})},Re.prototype.update=function(e,t,n){return 1===arguments.length?e(this):this.updateIn([e],t,n)},Re.prototype.updateIn=function(e,t,n){n||(n=t,t=void 0);var r=ot(this,Ie(e),t,n);return r===pn?void 0:r},Re.prototype.clear=function(){return 0===this.size?this:this.__ownerID?(this.size=0,this._root=null,this.__hash=void 0,this.__altered=!0,this):Ye()},Re.prototype.merge=function(){return nt(this,void 0,arguments)},Re.prototype.mergeWith=function(e){var t=sn.call(arguments,1);return nt(this,e,t)},Re.prototype.mergeIn=function(e){var t=sn.call(arguments,1);return this.updateIn(e,Ye(),function(e){return"function"==typeof e.merge?e.merge.apply(e,t):t[t.length-1]})},Re.prototype.mergeDeep=function(){return nt(this,rt(void 0),arguments)},Re.prototype.mergeDeepWith=function(e){var t=sn.call(arguments,1);return nt(this,rt(e),t)},Re.prototype.mergeDeepIn=function(e){var t=sn.call(arguments,1);return this.updateIn(e,Ye(),function(e){return"function"==typeof e.mergeDeep?e.mergeDeep.apply(e,t):t[t.length-1]})},Re.prototype.sort=function(e){return Et(Oe(this,e))},Re.prototype.sortBy=function(e,t){return Et(Oe(this,t,e))},Re.prototype.withMutations=function(e){var t=this.asMutable();return e(t),t.wasAltered()?t.__ensureOwner(this.__ownerID):this},Re.prototype.asMutable=function(){return this.__ownerID?this:this.__ensureOwner(new r)},Re.prototype.asImmutable=function(){return this.__ensureOwner()},Re.prototype.wasAltered=function(){return this.__altered},Re.prototype.__iterator=function(e,t){return new We(this,e,t)},Re.prototype.__iterate=function(e,t){var n=this,r=0;return this._root&&this._root.iterate(function(t){return r++,e(t[1],t[0],n)},t),r},Re.prototype.__ensureOwner=function(e){return e===this.__ownerID?this:e?Ge(this.size,this._root,e,this.__hash):(this.__ownerID=e,this.__altered=!1,this)},Re.isMap=Be;var Bn="@@__IMMUTABLE_MAP__@@",Ln=Re.prototype;Ln[Bn]=!0,Ln[ln]=Ln.remove,Ln.removeIn=Ln.deleteIn,Le.prototype.get=function(e,t,n,r){for(var a=this.entries,o=0,i=a.length;i>o;o++)if(X(n,a[o][0]))return a[o][1];return r},Le.prototype.update=function(e,t,r,o,i,s,l){for(var u=i===pn,c=this.entries,d=0,p=c.length;p>d&&!X(o,c[d][0]);d++);var f=p>d;if(f?c[d][1]===i:u)return this;if(n(l),(u||!f)&&n(s),!u||1!==c.length){if(!f&&!u&&c.length>=Fn)return Qe(e,c,o,i);var h=e&&e===this.ownerID,m=h?c:a(c);return f?u?d===p-1?m.pop():m[d]=m.pop():m[d]=[o,i]:m.push([o,i]),h?(this.entries=m,this):new Le(e,m)}},qe.prototype.get=function(e,t,n,r){void 0===t&&(t=te(n));var a=1<<((0===e?t:t>>>e)&dn),o=this.bitmap;return 0===(o&a)?r:this.nodes[it(o&a-1)].get(e+un,t,n,r)},qe.prototype.update=function(e,t,n,r,a,o,i){void 0===n&&(n=te(r));var s=(0===t?n:n>>>t)&dn,l=1<=Un)return tt(e,p,u,s,h);if(c&&!h&&2===p.length&&$e(p[1^d]))return p[1^d];if(c&&h&&1===p.length&&$e(h))return h;var m=e&&e===this.ownerID,g=c?h?u:u^l:u|l,y=c?h?st(p,d,h,m):ut(p,d,m):lt(p,d,h,m);return m?(this.bitmap=g,this.nodes=y,this):new qe(e,g,y)},Fe.prototype.get=function(e,t,n,r){void 0===t&&(t=te(n));var a=(0===e?t:t>>>e)&dn,o=this.nodes[a];return o?o.get(e+un,t,n,r):r},Fe.prototype.update=function(e,t,n,r,a,o,i){void 0===n&&(n=te(r));var s=(0===t?n:n>>>t)&dn,l=a===pn,u=this.nodes,c=u[s];if(l&&!c)return this;var d=Je(c,e,t+un,n,r,a,o,i);if(d===c)return this;var p=this.count;if(c){if(!d&&(p--,Hn>p))return et(e,u,p,s)}else p++;var f=e&&e===this.ownerID,h=st(u,s,d,f);return f?(this.count=p,this.nodes=h,this):new Fe(e,p,h)},Ue.prototype.get=function(e,t,n,r){for(var a=this.entries,o=0,i=a.length;i>o;o++)if(X(n,a[o][0]))return a[o][1];return r},Ue.prototype.update=function(e,t,r,o,i,s,l){void 0===r&&(r=te(o));var u=i===pn;if(r!==this.keyHash)return u?this:(n(l),n(s),Ze(this,e,t,r,[o,i]));for(var c=this.entries,d=0,p=c.length;p>d&&!X(o,c[d][0]);d++);var f=p>d;if(f?c[d][1]===i:u)return this;if(n(l),(u||!f)&&n(s),u&&2===p)return new He(e,this.keyHash,c[1^d]);var h=e&&e===this.ownerID,m=h?c:a(c);return f?u?d===p-1?m.pop():m[d]=m.pop():m[d]=[o,i]:m.push([o,i]),h?(this.entries=m,this):new Ue(e,this.keyHash,m)},He.prototype.get=function(e,t,n,r){return X(n,this.entry[0])?this.entry[1]:r},He.prototype.update=function(e,t,r,a,o,i,s){var l=o===pn,u=X(a,this.entry[0]);return(u?o===this.entry[1]:l)?this:(n(s),l?void n(i):u?e&&e===this.ownerID?(this.entry[1]=o,this):new He(e,this.keyHash,[a,o]):(n(i),Ze(this,e,t,te(a),[a,o])))},Le.prototype.iterate=Ue.prototype.iterate=function(e,t){for(var n=this.entries,r=0,a=n.length-1;a>=r;r++)if(e(n[t?a-r:r])===!1)return!1},qe.prototype.iterate=Fe.prototype.iterate=function(e,t){for(var n=this.nodes,r=0,a=n.length-1;a>=r;r++){var o=n[t?a-r:r];if(o&&o.iterate(e,t)===!1)return!1}},He.prototype.iterate=function(e,t){return e(this.entry)},e(We,w),We.prototype.next=function(){for(var e=this._type,t=this._stack;t;){var n,r=t.node,a=t.index++;if(r.entry){if(0===a)return Ve(e,r.entry)}else if(r.entries){if(n=r.entries.length-1,n>=a)return Ve(e,r.entries[this._reverse?n-a:a])}else if(n=r.nodes.length-1,n>=a){var o=r.nodes[this._reverse?n-a:a];if(o){if(o.entry)return Ve(e,o.entry);t=this._stack=Ke(o,t)}continue}t=this._stack=this._stack.__prev}return E()};var qn,Fn=cn/4,Un=cn/2,Hn=cn/4;e(ct,G),ct.of=function(){return this(arguments)},ct.prototype.toString=function(){return this.__toString("List [","]")},ct.prototype.get=function(e,t){if(e=i(this,e),0>e||e>=this.size)return t;e+=this._origin;var n=vt(this,e);return n&&n.array[e&dn]},ct.prototype.set=function(e,t){return gt(this,e,t)},ct.prototype.remove=function(e){return this.has(e)?0===e?this.shift():e===this.size-1?this.pop():this.splice(e,1):this},ct.prototype.clear=function(){return 0===this.size?this:this.__ownerID?(this.size=this._origin=this._capacity=0,this._level=un,this._root=this._tail=null,this.__hash=void 0,this.__altered=!0,this):mt()},ct.prototype.push=function(){var e=arguments,t=this.size;return this.withMutations(function(n){_t(n,0,t+e.length);for(var r=0;r>>t&dn;if(r>=this.array.length)return new pt([],e);var a,o=0===r;if(t>0){var i=this.array[r];if(a=i&&i.removeBefore(e,t-un,n),a===i&&o)return this}if(o&&!a)return this;var s=bt(this,e);if(!o)for(var l=0;r>l;l++)s.array[l]=void 0;return a&&(s.array[r]=a),s},pt.prototype.removeAfter=function(e,t,n){if(n===t?1<>>t&dn;if(r>=this.array.length)return this;var a,o=r===this.array.length-1;if(t>0){var i=this.array[r];if(a=i&&i.removeAfter(e,t-un,n),a===i&&o)return this}if(o&&!a)return this;var s=bt(this,e);return o||s.array.pop(),a&&(s.array[r]=a),s};var Kn,Gn={};e(Et,Re),Et.of=function(){return this(arguments)},Et.prototype.toString=function(){return this.__toString("OrderedMap {","}")},Et.prototype.get=function(e,t){var n=this._map.get(e);return void 0!==n?this._list.get(n)[1]:t},Et.prototype.clear=function(){return 0===this.size?this:this.__ownerID?(this.size=0,this._map.clear(),this._list.clear(),this):St()},Et.prototype.set=function(e,t){return Pt(this,e,t)},Et.prototype.remove=function(e){return Pt(this,e,pn)},Et.prototype.wasAltered=function(){return this._map.wasAltered()||this._list.wasAltered()},Et.prototype.__iterate=function(e,t){var n=this;return this._list.__iterate(function(t){return t&&e(t[1],t[0],n)},t)},Et.prototype.__iterator=function(e,t){return this._list.fromEntrySeq().__iterator(e,t)},Et.prototype.__ensureOwner=function(e){if(e===this.__ownerID)return this;var t=this._map.__ensureOwner(e),n=this._list.__ensureOwner(e);return e?Ot(t,n,e,this.__hash):(this.__ownerID=e,this._map=t,this._list=n,this)},Et.isOrderedMap=xt,Et.prototype[bn]=!0,Et.prototype[ln]=Et.prototype.remove;var Yn;e(At,G),At.of=function(){return this(arguments)},At.prototype.toString=function(){return this.__toString("Stack [","]")},At.prototype.get=function(e,t){var n=this._head;for(e=i(this,e);n&&e--;)n=n.next;return n?n.value:t},At.prototype.peek=function(){return this._head&&this._head.value},At.prototype.push=function(){if(0===arguments.length)return this;for(var e=this.size+arguments.length,t=this._head,n=arguments.length-1;n>=0;n--)t={value:arguments[n],next:t};return this.__ownerID?(this.size=e,this._head=t,this.__hash=void 0,this.__altered=!0,this):Ct(e,t)},At.prototype.pushAll=function(e){if(e=h(e),0===e.size)return this;se(e.size);var t=this.size,n=this._head;return e.reverse().forEach(function(e){t++,n={value:e,next:n}}),this.__ownerID?(this.size=t,this._head=n,this.__hash=void 0,this.__altered=!0,this):Ct(t,n)},At.prototype.pop=function(){return this.slice(1)},At.prototype.unshift=function(){return this.push.apply(this,arguments)},At.prototype.unshiftAll=function(e){return this.pushAll(e)},At.prototype.shift=function(){return this.pop.apply(this,arguments)},At.prototype.clear=function(){return 0===this.size?this:this.__ownerID?(this.size=0,this._head=void 0,this.__hash=void 0,this.__altered=!0,this):Tt()},At.prototype.slice=function(e,t){if(l(e,t,this.size))return this;var n=u(e,this.size),r=c(t,this.size);if(r!==this.size)return G.prototype.slice.call(this,e,t);for(var a=this.size-n,o=this._head;n--;)o=o.next;return this.__ownerID?(this.size=a,this._head=o,this.__hash=void 0,this.__altered=!0,this):Ct(a,o)},At.prototype.__ensureOwner=function(e){return e===this.__ownerID?this:e?Ct(this.size,this._head,e,this.__hash):(this.__ownerID=e,this.__altered=!1,this)},At.prototype.__iterate=function(e,t){if(t)return this.reverse().__iterate(e);for(var n=0,r=this._head;r&&e(r.value,n++,this)!==!1;)r=r.next;return n},At.prototype.__iterator=function(e,t){if(t)return this.reverse().__iterator(e);var n=0,r=this._head;return new w(function(){if(r){var t=r.value;return r=r.next,k(e,n++,t)}return E()})},At.isStack=jt;var Xn="@@__IMMUTABLE_STACK__@@",Jn=At.prototype;Jn[Xn]=!0,Jn.withMutations=Ln.withMutations,Jn.asMutable=Ln.asMutable,Jn.asImmutable=Ln.asImmutable,Jn.wasAltered=Ln.wasAltered;var $n;e(Dt,Y),Dt.of=function(){return this(arguments)},Dt.fromKeys=function(e){return this(f(e).keySeq())},Dt.prototype.toString=function(){return this.__toString("Set {","}")},Dt.prototype.has=function(e){return this._map.has(e)},Dt.prototype.add=function(e){return Nt(this,this._map.set(e,!0))},Dt.prototype.remove=function(e){return Nt(this,this._map.remove(e))},Dt.prototype.clear=function(){return Nt(this,this._map.clear())},Dt.prototype.union=function(){var e=sn.call(arguments,0);return e=e.filter(function(e){return 0!==e.size}),0===e.length?this:0!==this.size||this.__ownerID||1!==e.length?this.withMutations(function(t){for(var n=0;n1?" by "+this._step:"")+" ]"},Gt.prototype.get=function(e,t){return this.has(e)?this._start+i(this,e)*this._step:t},Gt.prototype.includes=function(e){var t=(e-this._start)/this._step;return t>=0&&t=t?new Gt(0,0):new Gt(this.get(e,this._end),this.get(t,this._end),this._step))},Gt.prototype.indexOf=function(e){var t=e-this._start;if(t%this._step===0){var n=t/this._step;if(n>=0&&n=o;o++){if(e(a,o,this)===!1)return o+1;a+=t?-r:r}return o},Gt.prototype.__iterator=function(e,t){var n=this.size-1,r=this._step,a=t?this._start+n*r:this._start,o=0;return new w(function(){var i=a;return a+=t?-r:r,o>n?E():k(e,o++,i)})},Gt.prototype.equals=function(e){return e instanceof Gt?this._start===e._start&&this._end===e._end&&this._step===e._step:Kt(this,e)};var ar;e(Yt,T),Yt.prototype.toString=function(){return 0===this.size?"Repeat []":"Repeat [ "+this._value+" "+this.size+" times ]"},Yt.prototype.get=function(e,t){return this.has(e)?this._value:t},Yt.prototype.includes=function(e){return X(this._value,e)},Yt.prototype.slice=function(e,t){var n=this.size;return l(e,t,n)?this:new Yt(this._value,c(t,n)-u(e,n))},Yt.prototype.reverse=function(){return this},Yt.prototype.indexOf=function(e){return X(this._value,e)?0:-1},Yt.prototype.lastIndexOf=function(e){return X(this._value,e)?this.size:-1},Yt.prototype.__iterate=function(e,t){for(var n=0;ne||this.size===1/0||void 0!==this.size&&e>this.size?t:this.find(function(t,n){return n===e},void 0,t)},has:function(e){return e=i(this,e),e>=0&&(void 0!==this.size?this.size===1/0||en;n+=1)if(o=e[n],"string"!=typeof o){if(i=o.id,!t||!a.hop.call(t,i))throw new Error("A value must be provided for: "+i);s=t[i],l+=o.options?this._format(o.getOption(s),t):o.format(s)}else l+=o;return l},r.prototype._mergeFormats=function(e,t){var n,r,i={};for(n in e)a.hop.call(e,n)&&(i[n]=r=o.objCreate(e[n]),t&&a.hop.call(t,n)&&a.extend(r,t[n]));return i},r.prototype._resolveLocale=function(e){"string"==typeof e&&(e=[e]),e=(e||[]).concat(r.defaultLocale);var t,n,a,o,i=r.__localeData__;for(t=0,n=e.length;n>t;t+=1)for(a=e[t].toLowerCase().split("-");a.length;){if(o=i[a.join("-")])return o.locale;a.pop()}var s=e.pop();throw new Error("No locale data has been added to IntlMessageFormat for: "+e.join(", ")+", or the default locale: "+s)}},function(e,t){"use strict";function n(e){var t,n,a,o,i=Array.prototype.slice.call(arguments,1);for(t=0,n=i.length;n>t;t+=1)if(a=i[t])for(o in a)r.call(a,o)&&(e[o]=a[o]);return e}t.extend=n;var r=Object.prototype.hasOwnProperty;t.hop=r},function(e,t,n){"use strict";var r=n(597),a=function(){try{return!!Object.defineProperty({},"a",{})}catch(e){return!1}}(),o=(!a&&!Object.prototype.__defineGetter__,a?Object.defineProperty:function(e,t,n){"get"in n&&e.__defineGetter__?e.__defineGetter__(t,n.get):(!r.hop.call(e,t)||"value"in n)&&(e[t]=n.value)}),i=Object.create||function(e,t){function n(){}var a,i;n.prototype=e,a=new n;for(i in t)r.hop.call(t,i)&&o(a,i,t[i]);return a};t.defineProperty=o, +t.objCreate=i},function(e,t){"use strict";function n(e,t,n){this.locales=e,this.formats=t,this.pluralFn=n}function r(e){this.id=e}function a(e,t,n,r,a){this.id=e,this.useOrdinal=t,this.offset=n,this.options=r,this.pluralFn=a}function o(e,t,n,r){this.id=e,this.offset=t,this.numberFormat=n,this.string=r}function i(e,t){this.id=e,this.options=t}t["default"]=n,n.prototype.compile=function(e){return this.pluralStack=[],this.currentPlural=null,this.pluralNumberFormat=null,this.compileMessage(e)},n.prototype.compileMessage=function(e){if(!e||"messageFormatPattern"!==e.type)throw new Error('Message AST is not of type: "messageFormatPattern"');var t,n,r,a=e.elements,o=[];for(t=0,n=a.length;n>t;t+=1)switch(r=a[t],r.type){case"messageTextElement":o.push(this.compileMessageText(r));break;case"argumentElement":o.push(this.compileArgument(r));break;default:throw new Error("Message element does not have a valid type")}return o},n.prototype.compileMessageText=function(e){return this.currentPlural&&/(^|[^\\])#/g.test(e.value)?(this.pluralNumberFormat||(this.pluralNumberFormat=new Intl.NumberFormat(this.locales)),new o(this.currentPlural.id,this.currentPlural.format.offset,this.pluralNumberFormat,e.value)):e.value.replace(/\\#/g,"#")},n.prototype.compileArgument=function(e){var t=e.format;if(!t)return new r(e.id);var n,o=this.formats,s=this.locales,l=this.pluralFn;switch(t.type){case"numberFormat":return n=o.number[t.style],{id:e.id,format:new Intl.NumberFormat(s,n).format};case"dateFormat":return n=o.date[t.style],{id:e.id,format:new Intl.DateTimeFormat(s,n).format};case"timeFormat":return n=o.time[t.style],{id:e.id,format:new Intl.DateTimeFormat(s,n).format};case"pluralFormat":return n=this.compileOptions(e),new a(e.id,t.ordinal,t.offset,n,l);case"selectFormat":return n=this.compileOptions(e),new i(e.id,n);default:throw new Error("Message element does not have a valid format type")}},n.prototype.compileOptions=function(e){var t=e.format,n=t.options,r={};this.pluralStack.push(this.currentPlural),this.currentPlural="pluralFormat"===t.type?e:null;var a,o,i;for(a=0,o=n.length;o>a;a+=1)i=n[a],r[i.selector]=this.compileMessage(i.value);return this.currentPlural=this.pluralStack.pop(),r},r.prototype.format=function(e){return e?"string"==typeof e?e:String(e):""},a.prototype.getOption=function(e){var t=this.options,n=t["="+e]||t[this.pluralFn(e-this.offset,this.useOrdinal)];return n||t.other},o.prototype.format=function(e){var t=this.numberFormat.format(e-this.offset);return this.string.replace(/(^|[^\\])#/g,"$1"+t).replace(/\\#/g,"#")},i.prototype.getOption=function(e){var t=this.options;return t[e]||t.other}},function(e,t,n){"use strict";t=e.exports=n(601)["default"],t["default"]=t},function(e,t){"use strict";t["default"]=function(){function e(e,t){function n(){this.constructor=e}n.prototype=t.prototype,e.prototype=new n}function t(e,t,n,r,a,o){this.message=e,this.expected=t,this.found=n,this.offset=r,this.line=a,this.column=o,this.name="SyntaxError"}function n(e){function n(t){function n(t,n,r){var a,o;for(a=n;r>a;a++)o=e.charAt(a),"\n"===o?(t.seenCR||t.line++,t.column=1,t.seenCR=!1):"\r"===o||"\u2028"===o||"\u2029"===o?(t.line++,t.column=1,t.seenCR=!0):(t.column++,t.seenCR=!1)}return Ke!==t&&(Ke>t&&(Ke=0,Ge={line:1,column:1,seenCR:!1}),n(Ge,Ke,t),Ke=t),Ge}function r(e){Ye>We||(We>Ye&&(Ye=We,Xe=[]),Xe.push(e))}function a(r,a,o){function i(e){var t=1;for(e.sort(function(e,t){return e.descriptiont.description?1:0});t1?i.slice(0,-1).join(", ")+" or "+i[e.length-1]:i[0],a=t?'"'+n(t)+'"':"end of input","Expected "+r+" but "+a+" found."}var l=n(o),u=o1?arguments[1]:{},C={},T={start:o},D=o,M=function(e){return{type:"messageFormatPattern",elements:e}},N=C,z=function(e){var t,n,r,a,o,i="";for(t=0,r=e.length;r>t;t+=1)for(a=e[t],n=0,o=a.length;o>n;n+=1)i+=a[n];return i},I=function(e){return{type:"messageTextElement",value:e}},R=/^[^ \t\n\r,.+={}#]/,B={type:"class",value:"[^ \\t\\n\\r,.+={}#]",description:"[^ \\t\\n\\r,.+={}#]"},L="{",q={type:"literal",value:"{",description:'"{"'},F=null,U=",",H={type:"literal",value:",",description:'","'},W="}",V={type:"literal",value:"}",description:'"}"'},K=function(e,t){return{type:"argumentElement",id:e,format:t&&t[2]}},G="number",Y={type:"literal",value:"number",description:'"number"'},X="date",J={type:"literal",value:"date",description:'"date"'},$="time",Z={type:"literal",value:"time",description:'"time"'},Q=function(e,t){return{type:e+"Format",style:t&&t[2]}},ee="plural",te={type:"literal",value:"plural",description:'"plural"'},ne=function(e){return{type:e.type,ordinal:!1,offset:e.offset||0,options:e.options}},re="selectordinal",ae={type:"literal",value:"selectordinal",description:'"selectordinal"'},oe=function(e){return{type:e.type,ordinal:!0,offset:e.offset||0,options:e.options}},ie="select",se={type:"literal",value:"select",description:'"select"'},le=function(e){return{type:"selectFormat",options:e}},ue="=",ce={type:"literal",value:"=",description:'"="'},de=function(e,t){return{type:"optionalFormatPattern",selector:e,value:t}},pe="offset:",fe={type:"literal",value:"offset:",description:'"offset:"'},he=function(e){return e},me=function(e,t){return{type:"pluralFormat",offset:e,options:t}},ge={type:"other",description:"whitespace"},ye=/^[ \t\n\r]/,be={type:"class",value:"[ \\t\\n\\r]",description:"[ \\t\\n\\r]"},ve={type:"other",description:"optionalWhitespace"},_e=/^[0-9]/,we={type:"class",value:"[0-9]",description:"[0-9]"},ke=/^[0-9a-f]/i,Ee={type:"class",value:"[0-9a-f]i",description:"[0-9a-f]i"},xe="0",Oe={type:"literal",value:"0",description:'"0"'},Se=/^[1-9]/,Pe={type:"class",value:"[1-9]",description:"[1-9]"},Ae=function(e){return parseInt(e,10)},je=/^[^{}\\\0-\x1F \t\n\r]/,Ce={type:"class",value:"[^{}\\\\\\0-\\x1F \\t\\n\\r]",description:"[^{}\\\\\\0-\\x1F \\t\\n\\r]"},Te="\\#",De={type:"literal",value:"\\#",description:'"\\\\#"'},Me=function(){return"\\#"},Ne="\\{",ze={type:"literal",value:"\\{",description:'"\\\\{"'},Ie=function(){return"{"},Re="\\}",Be={type:"literal",value:"\\}",description:'"\\\\}"'},Le=function(){return"}"},qe="\\u",Fe={type:"literal",value:"\\u",description:'"\\\\u"'},Ue=function(e){return String.fromCharCode(parseInt(e,16))},He=function(e){return e.join("")},We=0,Ve=0,Ke=0,Ge={line:1,column:1,seenCR:!1},Ye=0,Xe=[],Je=0;if("startRule"in j){if(!(j.startRule in T))throw new Error("Can't start parsing from rule \""+j.startRule+'".');D=T[j.startRule]}if(A=D(),A!==C&&We===e.length)return A;throw A!==C&&Wes?"past":"future"})},r.prototype._isValidUnits=function(e){if(!e||i.arrIndexOf.call(s,e)>=0)return!0;if("string"==typeof e){var t=/s$/.test(e)&&e.substr(0,e.length-1);if(t&&i.arrIndexOf.call(s,t)>=0)throw new Error('"'+e+'" is not a valid IntlRelativeFormat `units` value, did you mean: '+t)}throw new Error('"'+e+'" is not a valid IntlRelativeFormat `units` value, it must be one of: "'+s.join('", "')+'"')},r.prototype._resolveLocale=function(e){"string"==typeof e&&(e=[e]),e=(e||[]).concat(r.defaultLocale);var t,n,a,o,i=r.__localeData__;for(t=0,n=e.length;n>t;t+=1)for(a=e[t].toLowerCase().split("-");a.length;){if(o=i[a.join("-")])return o.locale;a.pop()}var s=e.pop();throw new Error("No locale data has been added to IntlRelativeFormat for: "+e.join(", ")+", or the default locale: "+s)},r.prototype._resolveStyle=function(e){if(!e)return l[0];if(i.arrIndexOf.call(l,e)>=0)return e;throw new Error('"'+e+'" is not a valid IntlRelativeFormat `style` value, it must be one of: "'+l.join('", "')+'"')},r.prototype._selectUnits=function(e){var t,n,a;for(t=0,n=s.length;n>t&&(a=s[t],!(Math.abs(e[a])r;r++)if(n[r]===e)return r;return-1},l=Array.isArray||function(e){return"[object Array]"===r.call(e)},u=Date.now||function(){return(new Date).getTime()};t.defineProperty=o,t.objCreate=i,t.arrIndexOf=s,t.isArray=l,t.dateNow=u},function(e,t){"use strict";t["default"]={locale:"en",pluralRuleFunction:function(e,t){var n=String(e).split("."),r=!n[1],a=Number(n[0])==e,o=a&&n[0].slice(-1),i=a&&n[0].slice(-2);return t?1==o&&11!=i?"one":2==o&&12!=i?"two":3==o&&13!=i?"few":"other":1==e&&r?"one":"other"},fields:{year:{displayName:"Year",relative:{0:"this year",1:"next year","-1":"last year"},relativeTime:{future:{one:"in {0} year",other:"in {0} years"},past:{one:"{0} year ago",other:"{0} years ago"}}},month:{displayName:"Month",relative:{0:"this month",1:"next month","-1":"last month"},relativeTime:{future:{one:"in {0} month",other:"in {0} months"},past:{one:"{0} month ago",other:"{0} months ago"}}},day:{displayName:"Day",relative:{0:"today",1:"tomorrow","-1":"yesterday"},relativeTime:{future:{one:"in {0} day",other:"in {0} days"},past:{one:"{0} day ago",other:"{0} days ago"}}},hour:{displayName:"Hour",relativeTime:{future:{one:"in {0} hour",other:"in {0} hours"},past:{one:"{0} hour ago",other:"{0} hours ago"}}},minute:{displayName:"Minute",relativeTime:{future:{one:"in {0} minute",other:"in {0} minutes"},past:{one:"{0} minute ago",other:"{0} minutes ago"}}},second:{displayName:"Second",relative:{0:"now"},relativeTime:{future:{one:"in {0} second",other:"in {0} seconds"},past:{one:"{0} second ago",other:"{0} seconds ago"}}}}}},603,609,function(e,t,n){"use strict";function r(e,t){if(!isFinite(e))throw new TypeError(t)}var a=n(613),o=n(594),i=n(604),s=n(614),l={locales:a["default"].PropTypes.oneOfType([a["default"].PropTypes.string,a["default"].PropTypes.array]),formats:a["default"].PropTypes.object,messages:a["default"].PropTypes.object};t["default"]={statics:{filterFormatOptions:function(e,t){return t||(t={}),(this.formatOptions||[]).reduce(function(n,r){return e.hasOwnProperty(r)?n[r]=e[r]:t.hasOwnProperty(r)&&(n[r]=t[r]),n},{})}},propTypes:l,contextTypes:l,childContextTypes:l,getNumberFormat:s["default"](Intl.NumberFormat),getDateTimeFormat:s["default"](Intl.DateTimeFormat),getMessageFormat:s["default"](o["default"]),getRelativeFormat:s["default"](i["default"]),getChildContext:function(){var e=this.context,t=this.props;return{locales:t.locales||e.locales,formats:t.formats||e.formats,messages:t.messages||e.messages}},formatDate:function(e,t){return e=new Date(e),r(e,"A date or timestamp must be provided to formatDate()"),this._format("date",e,t)},formatTime:function(e,t){return e=new Date(e),r(e,"A date or timestamp must be provided to formatTime()"),this._format("time",e,t)},formatRelative:function(e,t,n){return e=new Date(e),r(e,"A date or timestamp must be provided to formatRelative()"),this._format("relative",e,t,n)},formatNumber:function(e,t){return this._format("number",e,t)},formatMessage:function(e,t){var n=this.props.locales||this.context.locales,r=this.props.formats||this.context.formats;return"function"==typeof e?e(t):("string"==typeof e&&(e=this.getMessageFormat(e,n,r)),e.format(t))},getIntlMessage:function(e){var t,n=this.props.messages||this.context.messages,r=e.split(".");try{t=r.reduce(function(e,t){return e[t]},n)}finally{if(void 0===t)throw new ReferenceError("Could not find Intl message: "+e)}return t},getNamedFormat:function(e,t){var n=this.props.formats||this.context.formats,r=null;try{r=n[e][t]}finally{if(!r)throw new ReferenceError("No "+e+" format named: "+t)}return r},_format:function(e,t,n,r){var a=this.props.locales||this.context.locales;switch(n&&"string"==typeof n&&(n=this.getNamedFormat(e,n)),e){case"date":case"time":return this.getDateTimeFormat(a,n).format(t);case"number":return this.getNumberFormat(a,n).format(t);case"relative":return this.getRelativeFormat(a,n).format(t,r);default:throw new Error("Unrecognized format type: "+e)}}}},function(e,t){"use strict";t["default"]=React},function(e,t,n){"use strict";t=e.exports=n(615)["default"],t["default"]=t},function(e,t,n){"use strict";function r(e){var t=i.objCreate(null);return function(){var n=Array.prototype.slice.call(arguments),r=a(n),o=r&&t[r];return o||(o=i.objCreate(e.prototype),e.apply(o,n),r&&(t[r]=o)),o}}function a(e){if("undefined"!=typeof JSON){var t,n,r,a=[];for(t=0,n=e.length;n>t;t+=1)r=e[t],r&&"object"==typeof r?a.push(o(r)):a.push(r);return JSON.stringify(a)}}function o(e){var t,n,r,a,o=[],i=[];for(t in e)e.hasOwnProperty(t)&&i.push(t);var s=i.sort();for(n=0,r=s.length;r>n;n+=1)t=s[n],a={},a[t]=e[t],o[n]=a;return o}var i=n(616);t["default"]=r},function(e,t){"use strict";var n=Object.prototype.hasOwnProperty,r=function(){try{return!!Object.defineProperty({},"a",{})}catch(e){return!1}}(),a=(!r&&!Object.prototype.__defineGetter__,r?Object.defineProperty:function(e,t,r){"get"in r&&e.__defineGetter__?e.__defineGetter__(t,r.get):(!n.call(e,t)||"value"in r)&&(e[t]=r.value)}),o=Object.create||function(e,t){function r(){}var o,i;r.prototype=e,o=new r;for(i in t)n.call(t,i)&&a(o,i,t[i]);return o};t.defineProperty=a,t.objCreate=o},function(e,t,n){"use strict";var r=n(613),a=n(612),o=r["default"].createClass({displayName:"FormattedDate",mixins:[a["default"]],statics:{formatOptions:["localeMatcher","timeZone","hour12","formatMatcher","weekday","era","year","month","day","hour","minute","second","timeZoneName"]},propTypes:{format:r["default"].PropTypes.string,value:r["default"].PropTypes.any.isRequired},render:function(){var e=this.props,t=e.value,n=e.format,a=n&&this.getNamedFormat("date",n),i=o.filterFormatOptions(e,a);return r["default"].DOM.span(null,this.formatDate(t,i))}});t["default"]=o},function(e,t,n){"use strict";var r=n(613),a=n(612),o=r["default"].createClass({displayName:"FormattedTime",mixins:[a["default"]],statics:{formatOptions:["localeMatcher","timeZone","hour12","formatMatcher","weekday","era","year","month","day","hour","minute","second","timeZoneName"]},propTypes:{format:r["default"].PropTypes.string,value:r["default"].PropTypes.any.isRequired},render:function(){var e=this.props,t=e.value,n=e.format,a=n&&this.getNamedFormat("time",n),i=o.filterFormatOptions(e,a);return r["default"].DOM.span(null,this.formatTime(t,i))}});t["default"]=o},function(e,t,n){"use strict";var r=n(613),a=n(612),o=r["default"].createClass({displayName:"FormattedRelative",mixins:[a["default"]],statics:{formatOptions:["style","units"]},propTypes:{format:r["default"].PropTypes.string,value:r["default"].PropTypes.any.isRequired,now:r["default"].PropTypes.any},render:function(){var e=this.props,t=e.value,n=e.format,a=n&&this.getNamedFormat("relative",n),i=o.filterFormatOptions(e,a),s=this.formatRelative(t,i,{now:e.now});return r["default"].DOM.span(null,s)}});t["default"]=o},function(e,t,n){"use strict";var r=n(613),a=n(612),o=r["default"].createClass({displayName:"FormattedNumber",mixins:[a["default"]],statics:{formatOptions:["localeMatcher","style","currency","currencyDisplay","useGrouping","minimumIntegerDigits","minimumFractionDigits","maximumFractionDigits","minimumSignificantDigits","maximumSignificantDigits"]},propTypes:{format:r["default"].PropTypes.string,value:r["default"].PropTypes.any.isRequired},render:function(){var e=this.props,t=e.value,n=e.format,a=n&&this.getNamedFormat("number",n),i=o.filterFormatOptions(e,a);return r["default"].DOM.span(null,this.formatNumber(t,i))}});t["default"]=o},function(e,t,n){"use strict";var r=n(613),a=n(612),o=r["default"].createClass({displayName:"FormattedMessage",mixins:[a["default"]],propTypes:{tagName:r["default"].PropTypes.string,message:r["default"].PropTypes.string.isRequired},getDefaultProps:function(){return{tagName:"span"}},render:function(){var e=this.props,t=e.tagName,n=e.message,a=Math.floor(1099511627776*Math.random()).toString(16),o=new RegExp("(@__ELEMENT-"+a+"-\\d+__@)","g"),i={},s=function(){var e=0;return function(){return"@__ELEMENT-"+a+"-"+(e+=1)+"__@"}}(),l=Object.keys(e).reduce(function(t,n){var a,o=e[n];return r["default"].isValidElement(o)?(a=s(),t[n]=a,i[a]=o):t[n]=o,t},{}),u=this.formatMessage(n,l),c=u.split(o).filter(function(e){return!!e}).map(function(e){return i[e]||e}),d=[t,null].concat(c);return r["default"].createElement.apply(null,d)}});t["default"]=o},function(e,t,n){"use strict";var r=n(613),a=n(623),o=n(612),i=r["default"].createClass({displayName:"FormattedHTMLMessage",mixins:[o["default"]],propTypes:{tagName:r["default"].PropTypes.string,message:r["default"].PropTypes.string.isRequired},getDefaultProps:function(){return{tagName:"span"}},render:function(){var e=this.props,t=e.tagName,n=e.message,o=Object.keys(e).reduce(function(t,n){var o=e[n];return"string"==typeof o?o=a["default"](o):r["default"].isValidElement(o)&&(o=r["default"].renderToStaticMarkup(o)),t[n]=o,t},{});return r["default"].DOM[t]({dangerouslySetInnerHTML:{__html:this.formatMessage(n,o)}})}});t["default"]=i},function(e,t){"use strict";var n={"&":"&",">":">","<":"<",'"':""","'":"'"},r=/[&><"']/g;t["default"]=function(e){return(""+e).replace(r,function(e){return n[e]})}},603,,,,,function(e,t){function n(){}function r(e,t,n,r){this._x=e,this._y=t,this._size=n,this._rotation=r}function a(e,t){this._ctx=e,this._transform=t||r.noTransform,e.beginPath()}function o(e,t,n){var r=(e="string"==typeof e?document.querySelector(e):e).getContext("2d"),a=Math.min(e.width)*(1-2*(n===u?.08:n));r.save(),r.clearRect(0,0,e.width,e.height),r.translate(0|(e.width-a)/2,0|(e.height-a)/2),i(r,t||e.getAttribute(d),a),r.restore()}function i(e,t,o){function i(e,n,o,i,s){var l,u,d,p=i?parseInt(t.charAt(i),16):0,f=n[parseInt(t.charAt(o),16)%n.length];for(l=0;l=0)for(var t=0;t=0)return!0}function l(t){e.fillStyle=p[m[t]].toString()}if(30>o)throw new Error("Jdenticon cannot render identicons smaller than 30 pixels.");if(!/^[0-9a-f]{10,}$/i.test(t))throw new Error("Invalid hash passed to Jdenticon.");o=0|o;for(var u,c=2*(0|o/8),d=parseInt(t.substr(-7),16)/268435455,p=[n.rgb(76,76,76),n.correctedHsl(d,.5,.6),n.rgb(230,230,230),n.correctedHsl(d,.5,.8),n.hsl(d,.5,.4)],m=[],g=0;3>g;g++)u=parseInt(t.charAt(8+g),16)%p.length,(s([0,4])||s([2,3]))&&(u=1),m.push(u);e.clearRect(0,0,o,o),l(0),i(e,h,2,3,[[1,0],[2,0],[2,3],[1,3],[0,1],[3,1],[3,2],[0,2]]),l(1),i(e,h,4,5,[[0,0],[3,0],[3,3],[0,3]]),l(2),i(e,f,1,null,[[1,1],[2,1],[2,2],[1,2]])}function s(e){var t,n=document.getElementById(e);t=n.getAttribute(d),t&&o(n,t,0)}function l(){for(var e,t=document.getElementsByTagName("canvas"),n=0;n=0;r+=n)a.lineTo.apply(a,this._transform.transformPoint(e[r],e[r+1]));a.closePath()},addEllipse:function(e,t,n,r,a){var o=this._ctx,i=.5522848,s=this._transform.transformPoint(e,t,n,r),e=s[0],t=s[1],l=n/2*i,u=r/2*i,c=e+n,d=t+r,p=e+n/2,f=t+r/2;a&&(d=t,t+=r,u=-u),o.moveTo(e,f),o.bezierCurveTo(e,f-u,p-l,t,p,t),o.bezierCurveTo(p+l,t,c,f-u,c,f),o.bezierCurveTo(c,f+u,p+l,d,p,d),o.bezierCurveTo(p-l,d,e,f+u,e,f),o.closePath()},addRectangle:function(e,t,n,r,a){this.addPolygon([e,t,e+n,t,e+n,t+r,e,t+r],a)},addTriangle:function(e,t,n,r,a,o){var i=[e+n,t,e+n,t+r,e,t+r,e,t];i.splice((a||0)%4*2,2),this.addPolygon(i,o)},addRhombus:function(e,t,n,r,a){this.addPolygon([e+n/2,t,e+n,t+r/2,e+n/2,t+r,e,t+r/2],a)},fill:function(){this._ctx.fill()}};var f=[function(e,t,n){var r=.42*t;e.addPolygon([0,0,t,0,t,t-2*r,t-r,t,0,t])},function(e,t,n){var r=0|.5*t,a=0|.8*t;e.addTriangle(t-r,0,r,a,2)},function(e,t,n){var r=0|t/3;e.addRectangle(r,r,t-r,t-r)},function(e,t,n){var r=0|.1*t,a=0|.25*t;e.addRectangle(a,a,t-r-a,t-r-a)},function(e,t,n){var r=0|.15*t,a=0|.5*t;e.addEllipse(t-a-r,t-a-r,a,a)},function(e,t,n){var r=.1*t,a=4*r;e.addRectangle(0,0,t,t),e.addPolygon([a,a,t-r,a,a+(t-a-r)/2,t-r],!0)},function(e,t,n){e.addPolygon([0,0,t,0,t,.7*t,.4*t,.4*t,.7*t,t,0,t])},function(e,t,n){e.addTriangle(t/2,t/2,t/2,t/2,3)},function(e,t,n){e.addRectangle(0,0,t,t/2),e.addRectangle(0,t/2,t/2,t/2),e.addTriangle(t/2,t/2,t/2,t/2,1)},function(e,t,n){var r=0|.14*t,a=0|.35*t;e.addRectangle(0,0,t,t),e.addRectangle(a,a,t-a-r,t-a-r,!0)},function(e,t,n){var r=.12*t,a=3*r;e.addRectangle(0,0,t,t),e.addEllipse(a,a,t-r-a,t-r-a,!0)},function(e,t,n){e.addTriangle(t/2,t/2,t/2,t/2,3)},function(e,t,n){var r=.25*t;e.addRectangle(0,0,t,t),e.addRhombus(r,r,t-r,t-r,!0)},function(e,t,n){var r=.4*t,a=1.2*t;n||e.addEllipse(r,r,a,a)}],h=[function(e,t,n){e.addTriangle(0,0,t,t,0)},function(e,t,n){e.addTriangle(0,t/2,t,t/2,0)},function(e,t,n){e.addRhombus(0,0,t,t)},function(e,t,n){var r=t/6;e.addEllipse(r,r,t-2*r,t-2*r)}];l.drawIcon=i,l.update=o,l.version=c,p&&(p.fn.jdenticon=function(e,t){return this.each(function(n,r){o(r,e,t)}),this}),e.exports={jdenticon:l,updateById:s}},,function(e,t,n){"use strict";var r=n(196),a=n(632),o=n(407),i=n(635),s=r.PropTypes,l=s.shape({getLocale:s.func,onLocaleChange:s.func,offLocaleChange:s.func,translate:s.func}),u=r.createClass({displayName:"Translate",contextTypes:{translator:l},propTypes:{locale:s.string,count:s.number,content:s.oneOfType([s.string,s.arrayOf(s.string)]),scope:s.oneOfType([s.string,s.arrayOf(s.string)]),attributes:s.object},statics:{textContentComponents:["title","option","textarea"]},getDefaultProps:function(){ +return{component:"span"}},getInitialState:function(){return{locale:this.getTranslator().getLocale()}},getTranslator:function(){return this.context.translator||o},componentDidMount:function(){this.props.locale||this.getTranslator().onLocaleChange(this.localeChanged)},componentWillUnmount:function(){this.props.locale||this.getTranslator().offLocaleChange(this.localeChanged)},localeChanged:function(e){this.setState({locale:e})},render:function(){var e=this.getTranslator(),t=u.textContentComponents.indexOf(this.props.component)>-1,n=t||this.props.unsafe===!0,o=i({locale:this.state.locale},this.props,{interpolate:n});if(o.attributes){for(var s in o.attributes)o.attributes[s]&&(o[s]=e.translate(o.attributes[s],o));delete o.attributes}if(o.content){var l=e.translate(o.content,o);return delete o.content,delete o.locale,delete o.scope,delete o.children,delete o.interpolate,r.createElement(a,o,l)}return delete o.locale,delete o.scope,delete o.interpolate,r.createElement(o.component,o)}});e.exports=u,e.exports.translate=function(e,t){return r.createElement(u,i({},t,{content:e}))},e.exports.translatorType=l},function(e,t,n){"use strict";function r(e){return"[object String]"===Object.prototype.toString.call(e)}var a=n(196),o=n(201),i=n(633),s=/\%\((.+?)\)s/,l=["children","format","component","unsafe"],u=a.createClass({displayName:"Interpolate",getDefaultProps:function(){return{component:"span"}},render:function(){var e=this.props.children||this.props.format,t=this.props.component,n=this.props.unsafe===!0,u=i(this.props,l),c=[],d=[];if(o(r(e),"Interpolate expects either a format string as only child or a `format` prop with a string value"),n){var p=e.split(s).reduce(function(e,t,n){var r;if(n%2===0?r=t:(r=u[t],c.push(t)),a.isValidElement(r))throw new Error("cannot interpolate a React component into unsafe text");return e+=r},"");u.dangerouslySetInnerHTML={__html:p}}else e.split(s).reduce(function(e,t,n){var r;if(n%2===0){if(0===t.length)return e;r=t}else r=u[t],c.push(t);return e.push(r),e},d);return u=i(u,c),a.createElement.apply(this,[t,u].concat(d))}});e.exports=u},[859,634],415,356,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,function(e,t,n){var r=n(196),a=r.DOM,o=n(671),i=r.createFactory(o),s=n(675),l=r.createFactory(s),u=n(679),c=n(681),d=n(682),p=n(678);e.exports=r.createClass({propTypes:{data:r.PropTypes.object.isRequired,search:r.PropTypes.component,onClick:r.PropTypes.func,validateQuery:r.PropTypes.func,isExpanded:r.PropTypes.func,filterOptions:r.PropTypes.object},getDefaultProps:function(){return{data:null,search:l,className:"",id:"json-"+Date.now(),onClick:p,filterOptions:{},validateQuery:function(e){return e.length>=2},isExpanded:function(e,t){return!1}}},getInitialState:function(){return{query:""}},render:function(){var e=this.props,t=this.state,n=t.query?t.filterer(t.query):e.data,r=i({data:n,onClick:e.onClick,id:e.id,getOriginal:this.getOriginal,query:t.query,label:"root",root:!0,isExpanded:e.isExpanded,interactiveLabel:e.interactiveLabel}),o=a.div({className:"json-inspector__not-found"},"Nothing found");return a.div({className:"json-inspector "+e.className},this.renderToolbar(),c(n)?o:r)},renderToolbar:function(){var e=this.props.search;return e?a.div({className:"json-inspector__toolbar"},e({onChange:this.search,data:this.props.data})):void 0},search:function(e){(""===e||this.props.validateQuery(e))&&this.setState({query:e})},componentDidMount:function(){this.createFilterer(this.props.data,this.props.filterOptions)},componentWillReceiveProps:function(e){this.createFilterer(e.data,e.filterOptions)},shouldComponentUpdate:function(e,t){return t.query!==this.state.query||e.data!==this.props.data||e.onClick!==this.props.onClick},createFilterer:function(e,t){this.setState({filterer:u(e,t)})},getOriginal:function(e){return d(this.props.data,e)}})},function(e,t,n){function r(e){return e+(1===e?" item":" items")}function a(e,t){return i(t)?e+":"+t:e+"["+c(t)+"]"}function o(e,t){return-1!==e.indexOf(t)}function i(e){var t=c(e);return"Object"!==t&&"Array"!==t}var s=n(196),l=s.DOM,u=n(672),c=n(673),d=n(674),p=s.createFactory(d),f=".root.",h=s.createClass({getInitialState:function(){return{expanded:this._isInitiallyExpanded(this.props)}},getDefaultProps:function(){return{root:!1,prefix:""}},render:function(){var e="id_"+u(),t=this.props,n={path:this.keypath(),key:t.label.toString(),value:t.data},r=this._onClick.bind(this,n);return l.div({className:this.getClassName(),id:"leaf-"+this._rootPath()},l.input({className:"json-inspector__radio",type:"radio",name:t.id,id:e,tabIndex:-1}),l.label({className:"json-inspector__line",htmlFor:e,onClick:r},l.div({className:"json-inspector__flatpath"},n.path),l.span({className:"json-inspector__key"},this.format(n.key),":",this.renderInteractiveLabel(n.key,!0)),this.renderTitle(),this.renderShowOriginalButton()),this.renderChildren())},renderTitle:function(){var e=this.data(),t=c(e);switch(t){case"Array":return l.span({className:"json-inspector__value json-inspector__value_helper"},"[] "+r(e.length));case"Object":return l.span({className:"json-inspector__value json-inspector__value_helper"},"{} "+r(Object.keys(e).length));default:return l.span({className:"json-inspector__value json-inspector__value_"+t.toLowerCase()},this.format(String(e)),this.renderInteractiveLabel(e,!1))}},renderChildren:function(){var e=this.props,t=this._rootPath(),n=this.data();return this.state.expanded&&!i(n)?Object.keys(n).map(function(r){var o=n[r];return m({data:o,label:r,prefix:t,onClick:e.onClick,id:e.id,query:e.query,getOriginal:this.state.original?null:e.getOriginal,key:a(r,o),isExpanded:e.isExpanded,interactiveLabel:e.interactiveLabel})},this):null},renderShowOriginalButton:function(){var e=this.props;return i(e.data)||this.state.original||!e.getOriginal||!e.query||o(this.keypath(),e.query)?null:l.span({className:"json-inspector__show-original",onClick:this._onShowOriginalClick})},renderInteractiveLabel:function(e,t){return"function"==typeof this.props.interactiveLabel?this.props.interactiveLabel({value:String(e),originalValue:e,isKey:t,keypath:this.keypath()}):null},componentWillReceiveProps:function(e){e.query&&this.setState({expanded:!o(e.label,e.query)}),this.props.query&&!e.query&&this.setState({expanded:this._isInitiallyExpanded(e)})},_rootPath:function(){return this.props.prefix+"."+this.props.label},keypath:function(){return this._rootPath().substr(f.length)},data:function(){return this.state.original||this.props.data},format:function(e){return p({string:e,highlight:this.props.query})},getClassName:function(){var e="json-inspector__leaf";return this.props.root&&(e+=" json-inspector__leaf_root"),this.state.expanded&&(e+=" json-inspector__leaf_expanded"),i(this.props.data)||(e+=" json-inspector__leaf_composite"),e},toggle:function(){this.setState({expanded:!this.state.expanded})},_onClick:function(e,t){this.toggle(),this.props.onClick(e),t.stopPropagation()},_onShowOriginalClick:function(e){this.setState({original:this.props.getOriginal(this.keypath())}),e.stopPropagation()},_isInitiallyExpanded:function(e){var t=this.keypath();return e.root?!0:""===e.query?e.isExpanded(t,e.data):!o(t,e.query)&&"function"==typeof e.getOriginal}}),m=s.createFactory(h);e.exports=h},function(e,t){var n=Math.ceil(10*Math.random());e.exports=function(){return++n}},function(e,t){e.exports=function(e){return Object.prototype.toString.call(e).slice(8,-1)}},function(e,t,n){var r=n(196),a=r.DOM.span;e.exports=r.createClass({getDefaultProps:function(){return{string:"",highlight:""}},shouldComponentUpdate:function(e){return e.highlight!==this.props.highlight},render:function(){var e=this.props;return e.highlight&&-1!==e.string.indexOf(e.highlight)?a(null,e.string.split(e.highlight).map(function(t,n){return a({key:n},n>0?a({className:"json-inspector__hl"},e.highlight):null,t)})):a(null,e.string)}})},function(e,t,n){var r=n(676),a=n(196),o=a.DOM.input,i=n(678);e.exports=a.createClass({getDefaultProps:function(){return{timeout:100,onChange:i}},render:function(){return o({className:"json-inspector__search",type:"search",placeholder:"Search",ref:"query",onChange:r(this.update,this.props.timeout)})},update:function(){this.props.onChange(this.refs.query.getDOMNode().value)}})},function(e,t,n){var r=n(677);e.exports=function(e,t,n){function a(){var c=r()-l;t>c&&c>0?o=setTimeout(a,t-c):(o=null,n||(u=e.apply(s,i),o||(s=i=null)))}var o,i,s,l,u;return null==t&&(t=100),function(){s=this,i=arguments,l=r();var c=n&&!o;return o||(o=setTimeout(a,t)),c&&(u=e.apply(s,i),s=i=null),u}}},function(e,t){function n(){return(new Date).getTime()}e.exports=Date.now||n},function(e,t){e.exports=function(){}},function(e,t,n){function r(e,t,n){return l(e).reduce(function(l,u){var d,p=e[u];return o(p)?(a(t,u,n)||a(t,p,n))&&(l[u]=p):a(t,u,n)?l[u]=p:(d=r(p,t,n),c(d)||s(l,i(u,d))),l},{})}function a(e,t,n){return n.ignoreCase?(e=String(e).toLowerCase(),t&&-1!==String(t).toLowerCase().indexOf(e)):t&&-1!==String(t).indexOf(e)}function o(e){var t=u(e);return"Object"!==t&&"Array"!==t}function i(e,t){var n={};return n[e]=t,n}var s=n(680),l=Object.keys,u=n(673),c=n(681);e.exports=function(e,t){t||(t={});var n={};return function(a){var o;if(!n[a])for(var i=a.length-1;i>0;i-=1)if(o=a.substr(0,i),n[o]){n[a]=r(n[o],a,t);break}return n[a]||(n[a]=r(e,a,t)),n[a]}}},356,function(e,t){e.exports=function(e){return 0===Object.keys(e).length}},function(e,t,n){function r(e,t){var n=t.split(i),s=n.shift();if(!s)return e;var l=o(e);return"Array"===l&&e[a(s)]?r(e[a(s)],n.join(i)):"Object"===l&&e[s]?r(e[s],n.join(i)):void 0}function a(e){return parseInt(e,10)}var o=n(673),i=".";e.exports=r},,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,function(e,t,n){var r;/*! + Copyright (c) 2015 Jed Watson. + Licensed under the MIT License (MIT), see + http://jedwatson.github.io/classnames + */ +!function(){"use strict";function a(){for(var e="",t=0;t=0&&n.splice(r,1),e.className=n.join(" ")}t.add=function(e,t){e.classList?e.classList.add(t):n(e,t)},t.remove=function(e,t){e.classList?e.classList.remove(t):r(e,t)},t.list=function(e){return e.classList?e.classList:e.className.split(" ")}},function(e,t,n){"use strict";function r(e){var t=this;t.settings=d.clone(l),t.containerWidth=null,t.containerHeight=null,t.contentWidth=null,t.contentHeight=null,t.isRtl="rtl"===s.css(e,"direction"),t.isNegativeScroll=function(){var t=e.scrollLeft,n=null;return e.scrollLeft=-1,n=e.scrollLeft<0,e.scrollLeft=t,n}(),t.negativeScrollAdjustment=t.isNegativeScroll?e.scrollWidth-e.clientWidth:0,t.event=new u,t.ownerDocument=e.ownerDocument||document,t.scrollbarXRail=s.appendTo(s.e("div","ps-scrollbar-x-rail"),e),t.scrollbarX=s.appendTo(s.e("div","ps-scrollbar-x"),t.scrollbarXRail),t.scrollbarXActive=null,t.scrollbarXWidth=null,t.scrollbarXLeft=null,t.scrollbarXBottom=d.toInt(s.css(t.scrollbarXRail,"bottom")),t.isScrollbarXUsingBottom=t.scrollbarXBottom===t.scrollbarXBottom,t.scrollbarXTop=t.isScrollbarXUsingBottom?null:d.toInt(s.css(t.scrollbarXRail,"top")),t.railBorderXWidth=d.toInt(s.css(t.scrollbarXRail,"borderLeftWidth"))+d.toInt(s.css(t.scrollbarXRail,"borderRightWidth")),s.css(t.scrollbarXRail,"display","block"),t.railXMarginWidth=d.toInt(s.css(t.scrollbarXRail,"marginLeft"))+d.toInt(s.css(t.scrollbarXRail,"marginRight")),s.css(t.scrollbarXRail,"display",""),t.railXWidth=null,t.railXRatio=null,t.scrollbarYRail=s.appendTo(s.e("div","ps-scrollbar-y-rail"),e),t.scrollbarY=s.appendTo(s.e("div","ps-scrollbar-y"),t.scrollbarYRail),t.scrollbarYActive=null,t.scrollbarYHeight=null,t.scrollbarYTop=null,t.scrollbarYRight=d.toInt(s.css(t.scrollbarYRail,"right")),t.isScrollbarYUsingRight=t.scrollbarYRight===t.scrollbarYRight,t.scrollbarYLeft=t.isScrollbarYUsingRight?null:d.toInt(s.css(t.scrollbarYRail,"left")),t.scrollbarYOuterWidth=t.isRtl?d.outerWidth(t.scrollbarY):null,t.railBorderYWidth=d.toInt(s.css(t.scrollbarYRail,"borderTopWidth"))+d.toInt(s.css(t.scrollbarYRail,"borderBottomWidth")),s.css(t.scrollbarYRail,"display","block"),t.railYMarginHeight=d.toInt(s.css(t.scrollbarYRail,"marginTop"))+d.toInt(s.css(t.scrollbarYRail,"marginBottom")),s.css(t.scrollbarYRail,"display",""),t.railYHeight=null,t.railYRatio=null}function a(e){return"undefined"==typeof e.dataset?e.getAttribute("data-ps-id"):e.dataset.psId}function o(e,t){"undefined"==typeof e.dataset?e.setAttribute("data-ps-id",t):e.dataset.psId=t}function i(e){"undefined"==typeof e.dataset?e.removeAttribute("data-ps-id"):delete e.dataset.psId}var s=n(754),l=n(758),u=n(759),c=n(760),d=n(755),p={};t.add=function(e){var t=c();return o(e,t),p[t]=new r(e),p[t]},t.remove=function(e){delete p[a(e)],i(e)},t.get=function(e){return p[a(e)]}},function(e,t){"use strict";e.exports={wheelSpeed:1,wheelPropagation:!1,swipePropagation:!0,minScrollbarLength:null,maxScrollbarLength:null,useBothWheelAxes:!1,useKeyboard:!0,suppressScrollX:!1,suppressScrollY:!1,scrollXMarginOffset:0,scrollYMarginOffset:0,stopPropagationOnClick:!0}},function(e,t){"use strict";var n=function(e){this.element=e,this.events={}};n.prototype.bind=function(e,t){"undefined"==typeof this.events[e]&&(this.events[e]=[]),this.events[e].push(t),this.element.addEventListener(e,t,!1)},n.prototype.unbind=function(e,t){var n="undefined"!=typeof t;this.events[e]=this.events[e].filter(function(r){return n&&r!==t?!0:(this.element.removeEventListener(e,r,!1),!1)},this)},n.prototype.unbindAll=function(){for(var e in this.events)this.unbind(e)};var r=function(){this.eventElements=[]};r.prototype.eventElement=function(e){var t=this.eventElements.filter(function(t){return t.element===e})[0];return"undefined"==typeof t&&(t=new n(e),this.eventElements.push(t)),t},r.prototype.bind=function(e,t,n){this.eventElement(e).bind(t,n)},r.prototype.unbind=function(e,t,n){this.eventElement(e).unbind(t,n)},r.prototype.unbindAll=function(){for(var e=0;e=t.railXWidth-t.scrollbarXWidth&&(t.scrollbarXLeft=t.railXWidth-t.scrollbarXWidth),t.scrollbarYTop>=t.railYHeight-t.scrollbarYHeight&&(t.scrollbarYTop=t.railYHeight-t.scrollbarYHeight),a(e,t),o[t.scrollbarXActive?"add":"remove"](e,"ps-active-x"),o[t.scrollbarYActive?"add":"remove"](e,"ps-active-y")}},function(e,t,n){"use strict";function r(e,t){function n(e){return e.getBoundingClientRect()}var r=window.Event.prototype.stopPropagation.bind;t.settings.stopPropagationOnClick&&t.event.bind(t.scrollbarY,"click",r),t.event.bind(t.scrollbarYRail,"click",function(r){var o=a.toInt(t.scrollbarYHeight/2),s=t.railYRatio*(r.pageY-window.scrollY-n(t.scrollbarYRail).top-o),l=t.railYRatio*(t.railYHeight-t.scrollbarYHeight),u=s/l;0>u?u=0:u>1&&(u=1),e.scrollTop=(t.contentHeight-t.containerHeight)*u,i(e),r.stopPropagation()}),t.settings.stopPropagationOnClick&&t.event.bind(t.scrollbarX,"click",r),t.event.bind(t.scrollbarXRail,"click",function(r){var o=a.toInt(t.scrollbarXWidth/2),s=t.railXRatio*(r.pageX-window.scrollX-n(t.scrollbarXRail).left-o),l=t.railXRatio*(t.railXWidth-t.scrollbarXWidth),u=s/l;0>u?u=0:u>1&&(u=1),e.scrollLeft=(t.contentWidth-t.containerWidth)*u-t.negativeScrollAdjustment,i(e),r.stopPropagation()})}var a=n(755),o=n(757),i=n(762);e.exports=function(e){var t=o.get(e);r(e,t)}},function(e,t,n){"use strict";function r(e,t){function n(n){var a=r+n*t.railXRatio,o=t.scrollbarXRail.getBoundingClientRect().left+t.railXRatio*(t.railXWidth-t.scrollbarXWidth);0>a?t.scrollbarXLeft=0:a>o?t.scrollbarXLeft=o:t.scrollbarXLeft=a;var s=i.toInt(t.scrollbarXLeft*(t.contentWidth-t.containerWidth)/(t.containerWidth-t.railXRatio*t.scrollbarXWidth))-t.negativeScrollAdjustment;e.scrollLeft=s}var r=null,a=null,s=function(t){n(t.pageX-a),l(e),t.stopPropagation(),t.preventDefault()},u=function(){i.stopScrolling(e,"x"),t.event.unbind(t.ownerDocument,"mousemove",s)};t.event.bind(t.scrollbarX,"mousedown",function(n){a=n.pageX,r=i.toInt(o.css(t.scrollbarX,"left"))*t.railXRatio,i.startScrolling(e,"x"),t.event.bind(t.ownerDocument,"mousemove",s),t.event.once(t.ownerDocument,"mouseup",u),n.stopPropagation(),n.preventDefault()})}function a(e,t){function n(n){var a=r+n*t.railYRatio,o=t.scrollbarYRail.getBoundingClientRect().top+t.railYRatio*(t.railYHeight-t.scrollbarYHeight);0>a?t.scrollbarYTop=0:a>o?t.scrollbarYTop=o:t.scrollbarYTop=a;var s=i.toInt(t.scrollbarYTop*(t.contentHeight-t.containerHeight)/(t.containerHeight-t.railYRatio*t.scrollbarYHeight));e.scrollTop=s}var r=null,a=null,s=function(t){n(t.pageY-a),l(e),t.stopPropagation(),t.preventDefault()},u=function(){i.stopScrolling(e,"y"),t.event.unbind(t.ownerDocument,"mousemove",s)};t.event.bind(t.scrollbarY,"mousedown",function(n){a=n.pageY,r=i.toInt(o.css(t.scrollbarY,"top"))*t.railYRatio,i.startScrolling(e,"y"),t.event.bind(t.ownerDocument,"mousemove",s),t.event.once(t.ownerDocument,"mouseup",u),n.stopPropagation(),n.preventDefault()})}var o=n(754),i=n(755),s=n(757),l=n(762);e.exports=function(e){var t=s.get(e);r(e,t),a(e,t)}},function(e,t,n){"use strict";function r(e,t){function n(n,r){var a=e.scrollTop;if(0===n){if(!t.scrollbarYActive)return!1;if(0===a&&r>0||a>=t.contentHeight-t.containerHeight&&0>r)return!t.settings.wheelPropagation}var o=e.scrollLeft;if(0===r){if(!t.scrollbarXActive)return!1;if(0===o&&0>n||o>=t.contentWidth-t.containerWidth&&n>0)return!t.settings.wheelPropagation}return!0}var r=!1;t.event.bind(e,"mouseenter",function(){r=!0}),t.event.bind(e,"mouseleave",function(){r=!1});var o=!1;t.event.bind(t.ownerDocument,"keydown",function(s){if((!s.isDefaultPrevented||!s.isDefaultPrevented())&&r){var l=document.activeElement?document.activeElement:t.ownerDocument.activeElement;if(l){for(;l.shadowRoot;)l=l.shadowRoot.activeElement;if(a.isEditable(l))return}var u=0,c=0;switch(s.which){case 37:u=-30;break;case 38:c=30;break;case 39:u=30;break;case 40:c=-30;break;case 33:c=90;break;case 32:case 34:c=-90;break;case 35:c=s.ctrlKey?-t.contentHeight:-t.containerHeight;break;case 36:c=s.ctrlKey?e.scrollTop:t.containerHeight;break;default:return}e.scrollTop=e.scrollTop-c,e.scrollLeft=e.scrollLeft+u,i(e),o=n(u,c),o&&s.preventDefault()}})}var a=n(755),o=n(757),i=n(762);e.exports=function(e){var t=o.get(e);r(e,t)}},function(e,t,n){"use strict";function r(e,t){function n(n,r){var a=e.scrollTop;if(0===n){if(!t.scrollbarYActive)return!1;if(0===a&&r>0||a>=t.contentHeight-t.containerHeight&&0>r)return!t.settings.wheelPropagation}var o=e.scrollLeft;if(0===r){if(!t.scrollbarXActive)return!1;if(0===o&&0>n||o>=t.contentWidth-t.containerWidth&&n>0)return!t.settings.wheelPropagation}return!0}function r(e){var t=e.deltaX,n=-1*e.deltaY;return("undefined"==typeof t||"undefined"==typeof n)&&(t=-1*e.wheelDeltaX/6,n=e.wheelDeltaY/6),e.deltaMode&&1===e.deltaMode&&(t*=10,n*=10),t!==t&&n!==n&&(t=0,n=e.wheelDelta),[t,n]}function o(t,n){var r=e.querySelector("textarea:hover");if(r){var a=r.scrollHeight-r.clientHeight;if(a>0&&!(0===r.scrollTop&&n>0||r.scrollTop===a&&0>n))return!0;var o=r.scrollLeft-r.clientWidth;if(o>0&&!(0===r.scrollLeft&&0>t||r.scrollLeft===o&&t>0))return!0}return!1}function s(s){if(a.env.isWebKit||!e.querySelector("select:focus")){var u=r(s),c=u[0],d=u[1];o(c,d)||(l=!1,t.settings.useBothWheelAxes?t.scrollbarYActive&&!t.scrollbarXActive?(d?e.scrollTop=e.scrollTop-d*t.settings.wheelSpeed:e.scrollTop=e.scrollTop+c*t.settings.wheelSpeed,l=!0):t.scrollbarXActive&&!t.scrollbarYActive&&(c?e.scrollLeft=e.scrollLeft+c*t.settings.wheelSpeed:e.scrollLeft=e.scrollLeft-d*t.settings.wheelSpeed,l=!0):(e.scrollTop=e.scrollTop-d*t.settings.wheelSpeed,e.scrollLeft=e.scrollLeft+c*t.settings.wheelSpeed),i(e),l=l||n(c,d),l&&(s.stopPropagation(),s.preventDefault()))}}var l=!1;"undefined"!=typeof window.onwheel?t.event.bind(e,"wheel",s):"undefined"!=typeof window.onmousewheel&&t.event.bind(e,"mousewheel",s)}var a=n(755),o=n(757),i=n(762);e.exports=function(e){var t=o.get(e);r(e,t)}},function(e,t,n){"use strict";function r(e,t){t.event.bind(e,"scroll",function(){o(e)})}var a=n(757),o=n(762);e.exports=function(e){var t=a.get(e);r(e,t)}},function(e,t,n){"use strict";function r(e,t){function n(){var e=window.getSelection?window.getSelection():document.getSelection?document.getSelection():"";return 0===e.toString().length?null:e.getRangeAt(0).commonAncestorContainer}function r(){l||(l=setInterval(function(){return o.get(e)?(e.scrollTop=e.scrollTop+u.top,e.scrollLeft=e.scrollLeft+u.left,void i(e)):void clearInterval(l)},50))}function s(){l&&(clearInterval(l),l=null),a.stopScrolling(e)}var l=null,u={top:0,left:0},c=!1;t.event.bind(t.ownerDocument,"selectionchange",function(){e.contains(n())?c=!0:(c=!1,s())}),t.event.bind(window,"mouseup",function(){c&&(c=!1,s())}),t.event.bind(window,"mousemove",function(t){if(c){var n={x:t.pageX,y:t.pageY},o={left:e.offsetLeft,right:e.offsetLeft+e.offsetWidth,top:e.offsetTop,bottom:e.offsetTop+e.offsetHeight};n.xo.right-3?(u.left=5,a.startScrolling(e,"x")):u.left=0,n.yo.bottom-3?(n.y-o.bottom+3<5?u.top=5:u.top=20,a.startScrolling(e,"y")):u.top=0,0===u.top&&0===u.left?s():r()}})}var a=n(755),o=n(757),i=n(762);e.exports=function(e){var t=o.get(e);r(e,t)}},function(e,t,n){"use strict";function r(e,t,n,r){function i(n,r){var a=e.scrollTop,o=e.scrollLeft,i=Math.abs(n),s=Math.abs(r);if(s>i){if(0>r&&a===t.contentHeight-t.containerHeight||r>0&&0===a)return!t.settings.swipePropagation}else if(i>s&&(0>n&&o===t.contentWidth-t.containerWidth||n>0&&0===o))return!t.settings.swipePropagation;return!0}function s(t,n){e.scrollTop=e.scrollTop-n,e.scrollLeft=e.scrollLeft-t,o(e)}function l(){v=!0}function u(){v=!1}function c(e){return e.targetTouches?e.targetTouches[0]:e}function d(e){return e.targetTouches&&1===e.targetTouches.length?!0:e.pointerType&&"mouse"!==e.pointerType&&e.pointerType!==e.MSPOINTER_TYPE_MOUSE?!0:!1}function p(e){if(d(e)){_=!0;var t=c(e);m.pageX=t.pageX,m.pageY=t.pageY,g=(new Date).getTime(),null!==b&&clearInterval(b),e.stopPropagation()}}function f(e){if(!v&&_&&d(e)){var t=c(e),n={pageX:t.pageX,pageY:t.pageY},r=n.pageX-m.pageX,a=n.pageY-m.pageY;s(r,a),m=n;var o=(new Date).getTime(),l=o-g;l>0&&(y.x=r/l,y.y=a/l,g=o),i(r,a)&&(e.stopPropagation(),e.preventDefault())}}function h(){!v&&_&&(_=!1,clearInterval(b),b=setInterval(function(){return a.get(e)?Math.abs(y.x)<.01&&Math.abs(y.y)<.01?void clearInterval(b):(s(30*y.x,30*y.y),y.x*=.8,void(y.y*=.8)):void clearInterval(b)},10))}var m={},g=0,y={},b=null,v=!1,_=!1;n&&(t.event.bind(window,"touchstart",l),t.event.bind(window,"touchend",u),t.event.bind(e,"touchstart",p),t.event.bind(e,"touchmove",f),t.event.bind(e,"touchend",h)),r&&(window.PointerEvent?(t.event.bind(window,"pointerdown",l),t.event.bind(window,"pointerup",u),t.event.bind(e,"pointerdown",p),t.event.bind(e,"pointermove",f),t.event.bind(e,"pointerup",h)):window.MSPointerEvent&&(t.event.bind(window,"MSPointerDown",l),t.event.bind(window,"MSPointerUp",u),t.event.bind(e,"MSPointerDown",p),t.event.bind(e,"MSPointerMove",f),t.event.bind(e,"MSPointerUp",h)))}var a=n(757),o=n(762);e.exports=function(e,t,n){var o=a.get(e);r(e,o,t,n)}},function(e,t,n){"use strict";var r=n(754),a=n(755),o=n(757),i=n(762);e.exports=function(e){var t=o.get(e);t&&(t.negativeScrollAdjustment=t.isNegativeScroll?e.scrollWidth-e.clientWidth:0,r.css(t.scrollbarXRail,"display","block"),r.css(t.scrollbarYRail,"display","block"),t.railXMarginWidth=a.toInt(r.css(t.scrollbarXRail,"marginLeft"))+a.toInt(r.css(t.scrollbarXRail,"marginRight")),t.railYMarginHeight=a.toInt(r.css(t.scrollbarYRail,"marginTop"))+a.toInt(r.css(t.scrollbarYRail,"marginBottom")),r.css(t.scrollbarXRail,"display","none"),r.css(t.scrollbarYRail,"display","none"),i(e),r.css(t.scrollbarXRail,"display",""),r.css(t.scrollbarYRail,"display",""))}},,,,,,,,function(e,t,n){!function(t,r){e.exports=r(n(196),n(564))}(this,function(e,t){return function(e){function t(r){if(n[r])return n[r].exports;var a=n[r]={exports:{},id:r,loaded:!1};return e[r].call(a.exports,a,a.exports,t),a.loaded=!0,a.exports}var n={};return t.m=e,t.c=n,t.p="",t(0)}([function(e,t,n){e.exports=n(7)},,function(e,t){/** + * @license @product.name@ JS v@product.version@ (@product.date@) + * + * Standalone Highcharts Framework + * + * License: MIT License + */ +var n=function(){function e(e){function r(e,t,n){e.removeEventListener(t,n,!1)}function a(e,t,n){n=e.HCProxiedMethods[n.toString()],e.detachEvent("on"+t,n)}function o(e,t){var n,o,i,s,l=e.HCEvents;if(e.removeEventListener)n=r;else{if(!e.attachEvent)return;n=a}t?(o={},o[t]=!0):o=l;for(s in o)if(l[s])for(i=l[s].length;i--;)n(e,s,l[s][i])}return e.HCExtended||Highcharts.extend(e,{HCExtended:!0,HCEvents:{},bind:function(e,n){var r,a=this,o=this.HCEvents;a.addEventListener?a.addEventListener(e,n,!1):a.attachEvent&&(r=function(e){e.target=e.srcElement||window,n.call(a,e)},a.HCProxiedMethods||(a.HCProxiedMethods={}),a.HCProxiedMethods[n.toString()]=r,a.attachEvent("on"+e,r)),o[e]===t&&(o[e]=[]),o[e].push(n)},unbind:function(e,t){var i,s;e?(i=this.HCEvents[e]||[],t?(s=n.inArray(t,i),s>-1&&(i.splice(s,1),this.HCEvents[e]=i),this.removeEventListener?r(this,e,t):this.attachEvent&&a(this,e,t)):(o(this,e),this.HCEvents[e]=[])):(o(this),this.HCEvents={})},trigger:function(e,t){var n,r,a,o=this.HCEvents[e]||[],i=this,s=o.length;for(r=function(){t.defaultPrevented=!0},n=0;s>n;n++){if(a=o[n],t.stopped)return;t.preventDefault=r,t.target=i,t.type||(t.type=e),a.call(this,t)===!1&&t.preventDefault()}}}),e}var t,r,a,o=document,i=[],s=[],l={};return Math.easeInOutSine=function(e,t,n,r){return-n/2*(Math.cos(Math.PI*e/r)-1)+t},{init:function(e){o.defaultView||(this._getStyle=function(e,t){var n;return e.style[t]?e.style[t]:("opacity"===t&&(t="filter"),n=e.currentStyle[t.replace(/\-(\w)/g,function(e,t){return t.toUpperCase()})],"filter"===t&&(n=n.replace(/alpha\(opacity=([0-9]+)\)/,function(e,t){return t/100})),""===n?1:n)},this.adapterRun=function(e,t){var r={width:"clientWidth",height:"clientHeight"}[t];return r?(e.style.zoom=1,e[r]-2*parseInt(n._getStyle(e,"padding"),10)):void 0}),Array.prototype.forEach||(this.each=function(e,t){for(var n=0,r=e.length;r>n;n++)if(t.call(e[n],e[n],n,e)===!1)return n}),Array.prototype.indexOf||(this.inArray=function(e,t){var n,r=0;if(t)for(n=t.length;n>r;r++)if(t[r]===e)return r;return-1}),Array.prototype.filter||(this.grep=function(e,t){for(var n=[],r=0,a=e.length;a>r;r++)t(e[r],r)&&n.push(e[r]);return n}),a=function(e,t,n){this.options=t,this.elem=e,this.prop=n},a.prototype={update:function(){var t,n=this.paths,r=this.elem,a=r.element;l[this.prop]?l[this.prop](this):n&&a?r.attr("d",e.step(n[0],n[1],this.now,this.toD)):r.attr?a&&r.attr(this.prop,this.now):(t={},t[this.prop]=this.now+this.unit,Highcharts.css(r,t)),this.options.step&&this.options.step.call(this.elem,this.now,this)},custom:function(e,t,n){var a,o=this,i=function(e){return o.step(e)};this.startTime=+new Date,this.start=e,this.end=t,this.unit=n,this.now=this.start,this.pos=this.state=0,i.elem=this.elem,i()&&1===s.push(i)&&(r=setInterval(function(){for(a=0;a=o.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),this.options.curAnim[this.prop]=!0,n=!0;for(r in o.curAnim)o.curAnim[r]!==!0&&(n=!1);n&&o.complete&&o.complete.call(i),t=!1}else{var s=a-this.startTime;this.state=s/o.duration,this.pos=o.easing(s,0,1,o.duration),this.now=this.start+(this.end-this.start)*this.pos,this.update(),t=!0}return t}},this.animate=function(t,r,o){var i,s,l,u,c,d="";t.stopAnimation=!1,("object"!=typeof o||null===o)&&(u=arguments,o={duration:u[2],easing:u[3],complete:u[4]}),"number"!=typeof o.duration&&(o.duration=400),o.easing=Math[o.easing]||Math.easeInOutSine,o.curAnim=Highcharts.extend({},r);for(c in r)l=new a(t,o,c),s=null,"d"===c?(l.paths=e.init(t,t.d,r.d),l.toD=r.d,i=0,s=1):t.attr?i=t.attr(c):(i=parseFloat(n._getStyle(t,c))||0,"opacity"!==c&&(d="px")),s||(s=r[c]),l.custom(i,s,d)}},_getStyle:function(e,t){return window.getComputedStyle(e,void 0).getPropertyValue(t)},addAnimSetter:function(e,t){l[e]=t},getScript:function(e,t){var n=o.getElementsByTagName("head")[0],r=o.createElement("script");r.type="text/javascript",r.src=e,r.onload=t,n.appendChild(r)},inArray:function(e,t){return t.indexOf?t.indexOf(e):i.indexOf.call(t,e)},adapterRun:function(e,t){return parseInt(n._getStyle(e,t),10)},grep:function(e,t){return i.filter.call(e,t)},map:function(e,t){for(var n=[],r=0,a=e.length;a>r;r++)n[r]=t.call(e[r],e[r],r,e);return n},offset:function(e){var t=document.documentElement,n=e.getBoundingClientRect();return{top:n.top+(window.pageYOffset||t.scrollTop)-(t.clientTop||0),left:n.left+(window.pageXOffset||t.scrollLeft)-(t.clientLeft||0)}},addEvent:function(t,n,r){e(t).bind(n,r)},removeEvent:function(t,n,r){e(t).unbind(n,r)},fireEvent:function(e,t,n,r){var a;o.createEvent&&(e.dispatchEvent||e.fireEvent)?(a=o.createEvent("Events"),a.initEvent(t,!0,!0),a.target=e,Highcharts.extend(a,n),e.dispatchEvent?e.dispatchEvent(a):e.fireEvent(t,a)):e.HCExtended===!0&&(n=n||{},e.trigger(t,n)),n&&n.defaultPrevented&&(r=null),r&&r(n)},washMouseEvent:function(e){return e},stop:function(e){e.stopAnimation=!0},each:function(e,t){return Array.prototype.forEach.call(e,t)}}}();e.exports=n},,function(t,n){t.exports=e},function(e,n){e.exports=t},,function(e,t,n){(function(t){t.HighchartsAdapter=n(2);var r=n(8),a=n(4),o=n(5).addons.update;e.exports=a.createClass({displayName:"Highcharts",renderChart:function(){if(!this.props.config)throw new Error("Config has to be specified, for the Highchart component");var e=this.props.config,t=this.refs.chart.getDOMNode();e.chart||(e=o(e,{chart:{$set:{}}})),e=o(e,{chart:{renderTo:{$set:t}}}),new r.Chart(e)},componentDidMount:function(){this.renderChart()},componentDidUpdate:function(){this.renderChart()},render:function(){return a.createElement("div",{className:"chart",ref:"chart"})}}),e.exports.Highcharts=r}).call(t,function(){return this}())},function(e,t){/** + * @license Highstock JS v2.1.6-modified () + * + * (c) 2009-2014 Torstein Honsi + * + * License: www.highcharts.com/license + */ +!function(){function e(){var e,t,n=arguments,r={},a=function(e,t){var n,r;"object"!=typeof e&&(e={});for(r in t)t.hasOwnProperty(r)&&(n=t[r],n&&"object"==typeof n&&"[object Array]"!==Object.prototype.toString.call(n)&&"renderTo"!==r&&"number"!=typeof n.nodeType?e[r]=a(e[r]||{},n):e[r]=t[r]);return e};for(n[0]===!0&&(r=n[1],n=Array.prototype.slice.call(n,2)),t=n.length,e=0;t>e;e++)r=a(r,n[e]);return r}function t(e,t){return parseInt(e,t||10)}function n(e){return"string"==typeof e}function r(e){return e&&"object"==typeof e}function a(e){return"[object Array]"===Object.prototype.toString.call(e)}function o(e){return"number"==typeof e}function i(e){return he.log(e)/he.LN10}function s(e){return he.pow(10,e)}function l(e,t){for(var n=e.length;n--;)if(e[n]===t){e.splice(n,1);break}}function u(e){return e!==B&&null!==e}function c(e,t,a){var o,i;if(n(t))u(a)?e.setAttribute(t,a):e&&e.getAttribute&&(i=e.getAttribute(t));else if(u(t)&&r(t))for(o in t)e.setAttribute(o,t[o]);return i}function d(e){return a(e)?e:[e]}function p(e,t){Pe&&!Me&&t&&t.opacity!==B&&(t.filter="alpha(opacity="+100*t.opacity+")"),it(e.style,t)}function f(e,t,n,r,a){var o=pe.createElement(e);return t&&it(o,t),a&&p(o,{padding:0,border:Je,margin:0}),n&&p(o,n),r&&r.appendChild(o),o}function h(e,t){var n=function(){return B};return n.prototype=new e,it(n.prototype,t),n}function m(e,t){return new Array((t||2)+1-String(e).length).join(0)+e}function g(e,t){return/%$/.test(e)?t*parseFloat(e)/100:parseFloat(e)}function y(e){return 6e4*($&&$(e)||J||0)}function b(e,t){var n,r=/f$/,a=/\.([0-9])/,o=U.lang;return r.test(e)?(n=e.match(a),n=n?n[1]:-1,null!==t&&(t=de.numberFormat(t,n,o.decimalPoint,e.indexOf(",")>-1?o.thousandsSep:""))):t=H(e,t),t}function v(e,t){for(var n,r,a,o,i,s,l,u="{",c=!1,d=[];-1!==(l=e.indexOf(u));){if(n=e.slice(0,l),c){for(r=n.split(":"),a=r.shift().split("."),i=a.length,s=t,o=0;i>o;o++)s=s[a[o]];r.length&&(s=b(r.join(":"),s)),d.push(s)}else d.push(n);e=e.slice(l+1),c=!c,u=c?"}":"{"}return d.push(e),d.join("")}function _(e){return he.pow(10,ge(he.log(e)/he.LN10))}function w(e,t,n,r,a){var o,i,s=e;for(n=st(n,1),o=e/n,t||(t=[1,2,2.5,5,10],r===!1&&(1===n?t=[1,2,5,10]:.1>=n&&(t=[1/n]))),i=0;i=e||!a&&o<=(t[i]+(t[i+1]||t[i]))/2));i++);return s*=n}function k(e,t){var n,r,a=e.length;for(r=0;a>r;r++)e[r].ss_i=r;for(e.sort(function(e,r){return n=t(e,r),0===n?e.ss_i-r.ss_i:n}),r=0;a>r;r++)delete e[r].ss_i}function E(e){for(var t=e.length,n=e[0];t--;)e[t]n&&(n=e[t]);return n}function O(e,t){var n;for(n in e)e[n]&&e[n]!==t&&e[n].destroy&&e[n].destroy(),delete e[n]}function S(e){F||(F=f(He)),e&&F.appendChild(e),F.innerHTML=""}function P(e,t){var n="Highcharts error #"+e+": www.highcharts.com/errors/"+e;if(t)throw n;fe.console&&console.log(n)}function A(e){return parseFloat(e.toPrecision(14))}function j(e,t){W=st(e,t.animation)}function C(){var e=U.global,t=e.useUTC,n=t?"getUTC":"get",r=t?"setUTC":"set";Y=e.Date||window.Date,J=t&&e.timezoneOffset,$=t&&e.getTimezoneOffset,X=function(e,n,r,a,o,i){var s;return t?(s=Y.UTC.apply(0,arguments),s+=y(s)):s=new Y(e,n,st(r,1),st(a,0),st(o,0),st(i,0)).getTime(),s},Z=n+"Minutes",Q=n+"Hours",ee=n+"Day",te=n+"Date",ne=n+"Month",re=n+"FullYear",ae=r+"Milliseconds",oe=r+"Seconds",ie=r+"Minutes",se=r+"Hours",le=r+"Date",ue=r+"Month",ce=r+"FullYear"}function T(t){return U=e(!0,U,t),C(),U}function D(){return U}function M(){}function N(e,t,n,r){this.axis=e,this.pos=t,this.type=n||"",this.isNew=!0,n||r||this.addLabel()}function z(e,t,n,r,a){var o=e.chart.inverted;this.axis=e,this.isNegative=n,this.options=t,this.x=r,this.total=null,this.points={},this.stack=a,this.alignOptions={align:t.align||(o?n?"left":"right":"center"),verticalAlign:t.verticalAlign||(o?"middle":n?"bottom":"top"),y:st(t.y,o?4:n?14:-6),x:st(t.x,o?n?-6:6:0)},this.textAlign=t.textAlign||(o?n?"right":"left":"center")}function I(e){var t=e.options,n=t.navigator,r=n.enabled,a=t.scrollbar,o=a.enabled,i=r?n.height:0,s=o?a.height:0;this.handles=[],this.scrollbarButtons=[],this.elementsToDestroy=[],this.chart=e,this.setBaseSeries(),this.height=i,this.scrollbarHeight=s,this.scrollbarEnabled=o,this.navigatorEnabled=r,this.navigatorOptions=n,this.scrollbarOptions=a,this.outlineHeight=i+s,this.init()}function R(e){this.init(e)}var B,L,q,F,U,H,W,V,K,G,Y,X,J,$,Z,Q,ee,te,ne,re,ae,oe,ie,se,le,ue,ce,de,pe=document,fe=window,he=Math,me=he.round,ge=he.floor,ye=he.ceil,be=he.max,ve=he.min,_e=he.abs,we=he.cos,ke=he.sin,Ee=he.PI,xe=2*Ee/360,Oe=navigator.userAgent,Se=fe.opera,Pe=/(msie|trident)/i.test(Oe)&&!Se,Ae=8===pe.documentMode,je=/AppleWebKit/.test(Oe),Ce=/Firefox/.test(Oe),Te=/(Mobile|Android|Windows Phone)/.test(Oe),De="http://www.w3.org/2000/svg",Me=!!pe.createElementNS&&!!pe.createElementNS(De,"svg").createSVGRect,Ne=Ce&&parseInt(Oe.split("Firefox/")[1],10)<4,ze=!Me&&!Pe&&!!pe.createElement("canvas").getContext,Ie={},Re=0,Be=function(){return B},Le=[],qe=0,Fe="Highstock",Ue="2.1.6-modified",He="div",We="absolute",Ve="relative",Ke="hidden",Ge="highcharts-",Ye="visible",Xe="px",Je="none",$e="M",Ze="L",Qe=/^[0-9]+$/,et="",tt="hover",nt="select",rt=["plotTop","marginRight","marginBottom","plotLeft"],at="stroke-width",ot={};de=fe.Highcharts=fe.Highcharts?P(16,!0):{},de.seriesTypes=ot;var it=de.extend=function(e,t){var n;e||(e={});for(n in t)e[n]=t[n];return e},st=de.pick=function(){var e,t,n=arguments,r=n.length;for(e=0;r>e;e++)if(t=n[e],t!==B&&null!==t)return t},lt=de.wrap=function(e,t,n){var r=e[t];e[t]=function(){var e=Array.prototype.slice.call(arguments);return e.unshift(r),n.apply(this,e)}};H=function(e,t,n){if(!u(t)||isNaN(t))return"Invalid date";e=st(e,"%Y-%m-%d %H:%M:%S");var r,a=new Y(t-y(t)),o=a[Q](),i=a[ee](),s=a[te](),l=a[ne](),c=a[re](),d=U.lang,p=d.weekdays,f=it({a:p[i].substr(0,3),A:p[i],d:m(s),e:s,w:i,b:d.shortMonths[l],B:d.months[l],m:m(l+1),y:c.toString().substr(2,2),Y:c,H:m(o),I:m(o%12||12),l:o%12||12,M:m(a[Z]()),p:12>o?"AM":"PM",P:12>o?"am":"pm",S:m(a.getSeconds()),L:m(me(t%1e3),3)},de.dateFormats);for(r in f)for(;-1!==e.indexOf("%"+r);)e=e.replace("%"+r,"function"==typeof f[r]?f[r](t):f[r]);return n?e.substr(0,1).toUpperCase()+e.substr(1):e},K={millisecond:1,second:1e3,minute:6e4,hour:36e5,day:864e5,week:6048e5,month:24192e5,year:314496e5},de.numberFormat=function(e,n,r,a){var o=U.lang,i=+e||0,s=-1===n?ve((i.toString().split(".")[1]||"").length,20):isNaN(n=_e(n))?2:n,l=void 0===r?o.decimalPoint:r,u=void 0===a?o.thousandsSep:a,c=0>i?"-":"",d=String(t(i=_e(i).toFixed(s))),p=d.length>3?d.length%3:0;return c+(p?d.substr(0,p)+u:"")+d.substr(p).replace(/(\d{3})(?=\d)/g,"$1"+u)+(s?l+_e(i-d).toFixed(s).slice(2):"")},V={init:function(e,t,n){t=t||"";var r,a,o,i,s,l=e.shift,u=t.indexOf("C")>-1,c=u?7:3,d=t.split(" "),p=[].concat(n),f=function(e){for(o=e.length;o--;)e[o]===$e&&e.splice(o+1,0,e[o+1],e[o+2],e[o+1],e[o+2])};if(u&&(f(d),f(p)),e.isArea&&(i=d.splice(d.length-6,6),s=p.splice(p.length-6,6)),l<=p.length/c&&d.length===p.length)for(;l--;)p=[].concat(p).splice(0,c).concat(p);if(e.shift=0,d.length)for(r=p.length;d.lengthn)for(;i--;)a=parseFloat(e[i]),o[i]=isNaN(a)?e[i]:n*parseFloat(t[i]-a)+a;else o=t;return o}},function(e){fe.HighchartsAdapter=fe.HighchartsAdapter||e&&{init:function(t){var r=e.fx;e.extend(e.easing,{easeOutQuad:function(e,t,n,r,a){return-r*(t/=a)*(t-2)+n}}),e.each(["cur","_default","width","height","opacity"],function(t,n){var a,o=r.step;"cur"===n?o=r.prototype:"_default"===n&&e.Tween&&(o=e.Tween.propHooks[n],n="set"),a=o[n],a&&(o[n]=function(e){var r;return e=t?e:this,"align"!==e.prop?(r=e.elem,r.attr?r.attr(e.prop,"cur"===n?B:e.now):a.apply(this,arguments)):void 0})}),lt(e.cssHooks.opacity,"get",function(e,t,n){return t.attr?t.opacity||0:e.call(this,t,n)}),this.addAnimSetter("d",function(e){var n,r=e.elem;e.started||(n=t.init(r,r.d,r.toD),e.start=n[0],e.end=n[1],e.started=!0),r.attr("d",t.step(e.start,e.end,e.pos,r.toD))}),this.each=Array.prototype.forEach?function(e,t){return Array.prototype.forEach.call(e,t)}:function(e,t){var n,r=e.length;for(n=0;r>n;n++)if(t.call(e[n],e[n],n,e)===!1)return n},e.fn.highcharts=function(){var e,t,r,a="Chart",o=arguments;return this[0]&&(n(o[0])&&(a=o[0],o=Array.prototype.slice.call(o,1)),e=o[0],e!==B&&(e.chart=e.chart||{},e.chart.renderTo=this[0],r=new de[a](e,o[1]),t=this),e===B&&(t=Le[c(this[0],"data-highcharts-chart")])),t}},addAnimSetter:function(t,n){e.Tween?e.Tween.propHooks[t]={set:n}:e.fx.step[t]=n},getScript:e.getScript,inArray:e.inArray,adapterRun:function(t,n){return e(t)[n]()},grep:e.grep,map:function(e,t){for(var n=[],r=0,a=e.length;a>r;r++)n[r]=t.call(e[r],e[r],r,e);return n},offset:function(t){return e(t).offset()},addEvent:function(t,n,r){e(t).bind(n,r)},removeEvent:function(t,n,r){var a=pe.removeEventListener?"removeEventListener":"detachEvent";pe[a]&&t&&!t[a]&&(t[a]=function(){}),e(t).unbind(n,r)},fireEvent:function(t,n,r,a){var o,i=e.Event(n),s="detached"+n;!Pe&&r&&(delete r.layerX,delete r.layerY,delete r.returnValue),it(i,r),t[n]&&(t[s]=t[n],t[n]=null),e.each(["preventDefault","stopPropagation"],function(e,t){var n=i[t];i[t]=function(){try{n.call(i)}catch(e){"preventDefault"===t&&(o=!0)}}}),e(t).trigger(i),t[s]&&(t[n]=t[s],t[s]=null),!a||i.isDefaultPrevented()||o||a(i)},washMouseEvent:function(e){var t=e.originalEvent||e;return t.pageX===B&&(t.pageX=e.pageX,t.pageY=e.pageY),t},animate:function(t,n,r){var a=e(t);t.style||(t.style={}),n.d&&(t.toD=n.d,n.d=1),a.stop(),n.opacity!==B&&t.attr&&(n.opacity+="px"),t.hasAnim=1,a.animate(n,r)},stop:function(t){t.hasAnim&&e(t).stop()}}}(fe.jQuery);var ut=fe.HighchartsAdapter,ct=ut||{};ut&&ut.init.call(ut,V);var dt=ct.adapterRun,pt=ct.getScript,ft=ct.inArray,ht=de.each=ct.each,mt=ct.grep,gt=ct.offset,yt=ct.map,bt=ct.addEvent,vt=ct.removeEvent,_t=ct.fireEvent,wt=ct.washMouseEvent,kt=ct.animate,Et=ct.stop;U={colors:["#7cb5ec","#434348","#90ed7d","#f7a35c","#8085e9","#f15c80","#e4d354","#2b908f","#f45b5b","#91e8e1"],symbols:["circle","diamond","square","triangle","triangle-down"],lang:{loading:"Loading...",months:["January","February","March","April","May","June","July","August","September","October","November","December"],shortMonths:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],weekdays:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],decimalPoint:".",numericSymbols:["k","M","G","T","P","E"],resetZoom:"Reset zoom",resetZoomTitle:"Reset zoom level 1:1",thousandsSep:" "},global:{useUTC:!0,canvasToolsURL:"http://code.highcharts.com/stock/2.1.6-modified/modules/canvas-tools.js",VMLRadialGradientURL:"http://code.highcharts.com/stock/2.1.6-modified/gfx/vml-radial-gradient.png"},chart:{borderColor:"#4572A7",borderRadius:0,defaultSeriesType:"line",ignoreHiddenSeries:!0,spacing:[10,10,15,10],backgroundColor:"#FFFFFF",plotBorderColor:"#C0C0C0",resetZoomButton:{theme:{zIndex:20},position:{align:"right",x:-10,y:10}}},title:{text:"Chart title",align:"center",margin:15,style:{color:"#333333",fontSize:"18px"}},subtitle:{text:"",align:"center",style:{color:"#555555"}},plotOptions:{line:{allowPointSelect:!1,showCheckbox:!1,animation:{duration:1e3},events:{},lineWidth:2,marker:{lineWidth:0,radius:4,lineColor:"#FFFFFF",states:{hover:{enabled:!0,lineWidthPlus:1,radiusPlus:2},select:{fillColor:"#FFFFFF",lineColor:"#000000",lineWidth:2}}},point:{events:{}},dataLabels:{align:"center",formatter:function(){return null===this.y?"":de.numberFormat(this.y,-1)},style:{color:"contrast",fontSize:"11px",fontWeight:"bold",textShadow:"0 0 6px contrast, 0 0 3px contrast"},verticalAlign:"bottom",x:0,y:0,padding:5},cropThreshold:300,pointRange:0,states:{hover:{lineWidthPlus:1,marker:{},halo:{size:10,opacity:.25}},select:{marker:{}}},stickyTracking:!0,turboThreshold:1e3}},labels:{style:{position:We,color:"#3E576F"}},legend:{enabled:!0,align:"center",layout:"horizontal",labelFormatter:function(){return this.name},borderColor:"#909090",borderRadius:0,navigation:{activeColor:"#274b6d",inactiveColor:"#CCC"},shadow:!1,itemStyle:{color:"#333333",fontSize:"12px",fontWeight:"bold"},itemHoverStyle:{color:"#000"},itemHiddenStyle:{color:"#CCC"},itemCheckboxStyle:{position:We,width:"13px",height:"13px"},symbolPadding:5,verticalAlign:"bottom",x:0,y:0,title:{style:{fontWeight:"bold"}}},loading:{labelStyle:{fontWeight:"bold",position:Ve,top:"45%"},style:{position:We,backgroundColor:"white",opacity:.5,textAlign:"center"}},tooltip:{enabled:!0,animation:Me,backgroundColor:"rgba(249, 249, 249, .85)",borderWidth:1,borderRadius:3,dateTimeLabelFormats:{millisecond:"%A, %b %e, %H:%M:%S.%L",second:"%A, %b %e, %H:%M:%S",minute:"%A, %b %e, %H:%M",hour:"%A, %b %e, %H:%M",day:"%A, %b %e, %Y",week:"Week from %A, %b %e, %Y",month:"%B %Y",year:"%Y"},footerFormat:"",headerFormat:'{point.key}
',pointFormat:'● {series.name}: {point.y}
',shadow:!0,snap:Te?25:10,style:{color:"#333333",cursor:"default",fontSize:"12px",padding:"8px",whiteSpace:"nowrap"}},credits:{enabled:!0,text:"Highcharts.com",href:"http://www.highcharts.com",position:{align:"right",x:-10,verticalAlign:"bottom",y:-5},style:{cursor:"pointer",color:"#909090",fontSize:"9px"}}};var xt=U.plotOptions,Ot=xt.line;C();var St=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]?(?:\.[0-9]+)?)\s*\)/,Pt=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/,At=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/,jt=function(n){function r(e){e&&e.stops?u=yt(e.stops,function(e){return jt(e[1])}):(l=St.exec(e),l?c=[t(l[1]),t(l[2]),t(l[3]),parseFloat(l[4],10)]:(l=Pt.exec(e),l?c=[t(l[1],16),t(l[2],16),t(l[3],16),1]:(l=At.exec(e),l&&(c=[t(l[1]),t(l[2]),t(l[3]),1]))))}function a(t){var r;return u?(r=e(n),r.stops=[].concat(r.stops),ht(u,function(e,n){r.stops[n]=[r.stops[n][0],e.get(t)]})):r=c&&!isNaN(c[0])?"rgb"===t?"rgb("+c[0]+","+c[1]+","+c[2]+")":"a"===t?c[3]:"rgba("+c.join(",")+")":n,r}function i(e){if(u)ht(u,function(t){t.brighten(e)});else if(o(e)&&0!==e){var n;for(n=0;3>n;n++)c[n]+=t(255*e),c[n]<0&&(c[n]=0),c[n]>255&&(c[n]=255)}return this}function s(e){return c[3]=e,this}var l,u,c=[];return r(n),{get:a,brighten:i,rgba:c,setOpacity:s,raw:n}};M.prototype={opacity:1,textProps:["fontSize","fontWeight","fontFamily","fontStyle","color","lineHeight","width","textDecoration","textShadow"],init:function(e,t){var n=this;n.element="span"===t?f(t):pe.createElementNS(De,t),n.renderer=e},animate:function(t,n,r){var a=st(n,W,!0);return Et(this),a?(a=e(a,{}),r&&(a.complete=r),kt(this,t,a)):(this.attr(t),r&&r()),this},colorGradient:function(t,n,r){var o,i,s,l,c,d,p,f,h,m,g,y=this.renderer,b=[];if(t.linearGradient?i="linearGradient":t.radialGradient&&(i="radialGradient"),i){s=t[i],l=y.gradients,d=t.stops,h=r.radialReference,a(s)&&(t[i]=s={x1:s[0],y1:s[1],x2:s[2],y2:s[3],gradientUnits:"userSpaceOnUse"}),"radialGradient"===i&&h&&!u(s.gradientUnits)&&(s=e(s,{cx:h[0]-h[2]/2+s.cx*h[2],cy:h[1]-h[2]/2+s.cy*h[2],r:s.r*h[2],gradientUnits:"userSpaceOnUse"}));for(m in s)"id"!==m&&b.push(m,s[m]);for(m in d)b.push(d[m]);b=b.join(","),l[b]?g=l[b].attr("id"):(s.id=g=Ge+Re++,l[b]=c=y.createElement(i).attr(s).add(y.defs),c.stops=[],ht(d,function(e){var t;0===e[1].indexOf("rgba")?(o=jt(e[1]),p=o.get("rgb"),f=o.get("a")):(p=e[1],f=1),t=y.createElement("stop").attr({offset:e[0],"stop-color":p,"stop-opacity":f}).add(c),c.stops.push(t)})),r.setAttribute(n,"url("+y.url+"#"+g+")")}},applyTextShadow:function(e){var n,r=this.element,a=-1!==e.indexOf("contrast"),o={},i=this.renderer.forExport||r.style.textShadow!==B&&!Pe;a&&(o.textShadow=e=e.replace(/contrast/g,this.renderer.getContrast(r.style.fill))),je&&(o.textRendering="geometricPrecision"),i?p(r,o):(this.fakeTS=!0,this.ySetter=this.xSetter,n=[].slice.call(r.getElementsByTagName("tspan")),ht(e.split(/\s?,\s?/g),function(e){var a,o,i=r.firstChild;e=e.split(" "),a=e[e.length-1],o=e[e.length-2],o&&ht(n,function(e,n){var s;0===n&&(e.setAttribute("x",r.getAttribute("x")),n=r.getAttribute("y"),e.setAttribute("y",n||0),null===n&&r.setAttribute("y",0)),s=e.cloneNode(1),c(s,{"class":Ge+"text-shadow",fill:a,stroke:a,"stroke-opacity":1/be(t(o),3),"stroke-width":o,"stroke-linejoin":"round"}),r.insertBefore(s,i)})}))},attr:function(e,t){var n,r,a,o,i=this.element,s=this;if("string"==typeof e&&t!==B&&(n=e,e={},e[n]=t),"string"==typeof e)s=(this[e+"Getter"]||this._defaultGetter).call(this,e,i);else{for(n in e)r=e[n],o=!1,this.symbolName&&/^(x|y|width|height|r|start|end|innerR|anchorX|anchorY)/.test(n)&&(a||(this.symbolAttr(e),a=!0),o=!0),!this.rotation||"x"!==n&&"y"!==n||(this.doTransform=!0),o||(this[n+"Setter"]||this._defaultSetter).call(this,r,n,i),this.shadows&&/^(width|height|visibility|x|y|d|transform|cx|cy|r)$/.test(n)&&this.updateShadows(n,r);this.doTransform&&(this.updateTransform(),this.doTransform=!1)}return s},updateShadows:function(e,t){for(var n=this.shadows,r=n.length;r--;)n[r].setAttribute(e,"height"===e?be(t-(n[r].cutHeight||0),0):"d"===e?this.d:t)},addClass:function(e){var t=this.element,n=c(t,"class")||"";return-1===n.indexOf(e)&&c(t,"class",n+" "+e),this},symbolAttr:function(e){var t=this;ht(["x","y","r","start","end","width","height","innerR","anchorX","anchorY"],function(n){t[n]=st(e[n],t[n])}),t.attr({d:t.renderer.symbols[t.symbolName](t.x,t.y,t.width,t.height,t)})},clip:function(e){return this.attr("clip-path",e?"url("+this.renderer.url+"#"+e.id+")":Je)},crisp:function(e){var t,n,r=this,a={},o=e.strokeWidth||r.strokeWidth||0;n=me(o)%2/2,e.x=ge(e.x||r.x||0)+n,e.y=ge(e.y||r.y||0)+n,e.width=ge((e.width||r.width||0)-2*n),e.height=ge((e.height||r.height||0)-2*n),e.strokeWidth=o;for(t in e)r[t]!==e[t]&&(r[t]=a[t]=e[t]);return a},css:function(e){var n,r,a,o=this,i=o.styles,s={},l=o.element,u="",d=!i;if(e&&e.color&&(e.fill=e.color),i)for(r in e)e[r]!==i[r]&&(s[r]=e[r],d=!0);if(d){if(n=o.textWidth=e&&e.width&&"text"===l.nodeName.toLowerCase()&&t(e.width)||o.textWidth,i&&(e=it(i,s)),o.styles=e,n&&(ze||!Me&&o.renderer.forExport)&&delete e.width,Pe&&!Me)p(o.element,e);else{a=function(e,t){return"-"+t.toLowerCase()};for(r in e)u+=r.replace(/([A-Z])/g,a)+":"+e[r]+";";c(l,"style",u)}n&&o.added&&o.renderer.buildText(o)}return o},on:function(e,t){var n=this,r=n.element;return q&&"click"===e?(r.ontouchstart=function(e){n.touchEventFired=Y.now(),e.preventDefault(),t.call(r,e)},r.onclick=function(e){(-1===Oe.indexOf("Android")||Y.now()-(n.touchEventFired||0)>1100)&&t.call(r,e)}):r["on"+e]=t,this},setRadialReference:function(e){return this.element.radialReference=e,this},translate:function(e,t){return this.attr({translateX:e,translateY:t})},invert:function(){var e=this;return e.inverted=!0,e.updateTransform(),e},updateTransform:function(){var e,t=this,n=t.translateX||0,r=t.translateY||0,a=t.scaleX,o=t.scaleY,i=t.inverted,s=t.rotation,l=t.element;i&&(n+=t.attr("width"),r+=t.attr("height")),e=["translate("+n+","+r+")"],i?e.push("rotate(90) scale(-1,1)"):s&&e.push("rotate("+s+" "+(l.getAttribute("x")||0)+" "+(l.getAttribute("y")||0)+")"),(u(a)||u(o))&&e.push("scale("+st(a,1)+" "+st(o,1)+")"),e.length&&l.setAttribute("transform",e.join(" "))},toFront:function(){var e=this.element;return e.parentNode.appendChild(e),this},align:function(e,t,r){var a,o,i,s,u,c={},d=this.renderer,p=d.alignedObjects;return e?(this.alignOptions=e,this.alignByTranslate=t,(!r||n(r))&&(this.alignTo=u=r||"renderer",l(p,this),p.push(this),r=null)):(e=this.alignOptions,t=this.alignByTranslate,u=this.alignTo),r=st(r,d[u],d),a=e.align,o=e.verticalAlign,i=(r.x||0)+(e.x||0),s=(r.y||0)+(e.y||0),("right"===a||"center"===a)&&(i+=(r.width-(e.width||0))/{right:1,center:2}[a]),c[t?"translateX":"x"]=me(i),("bottom"===o||"middle"===o)&&(s+=(r.height-(e.height||0))/({bottom:1,middle:2}[o]||1)),c[t?"translateY":"y"]=me(s),this[this.placed?"animate":"attr"](c),this.placed=!0,this.alignAttr=c,this},getBBox:function(e){var t,n,r,a,o,i,s=this,l=s.renderer,u=s.rotation,c=s.element,d=s.styles,p=u*xe,f=s.textStr,h=c.style;if(f!==B&&(i=["",u||0,d&&d.fontSize,c.style.width].join(","),i=""===f||Qe.test(f)?"num:"+f.toString().length+i:f+i),i&&!e&&(t=l.cache[i]),!t){if(c.namespaceURI===De||l.forExport){try{o=this.fakeTS&&function(e){ht(c.querySelectorAll("."+Ge+"text-shadow"),function(t){t.style.display=e})},Ce&&h.textShadow?(a=h.textShadow,h.textShadow=""):o&&o(Je),t=c.getBBox?it({},c.getBBox()):{width:c.offsetWidth,height:c.offsetHeight},a?h.textShadow=a:o&&o("")}catch(m){}(!t||t.width<0)&&(t={width:0,height:0})}else t=s.htmlGetBBox();l.isSVG&&(n=t.width,r=t.height,Pe&&d&&"11px"===d.fontSize&&"16.9"===r.toPrecision(3)&&(t.height=r=14),u&&(t.width=_e(r*ke(p))+_e(n*we(p)),t.height=_e(r*we(p))+_e(n*ke(p)))),l.cache[i]=t}return t},show:function(e){return e&&this.element.namespaceURI===De?this.element.removeAttribute("visibility"):this.attr({visibility:e?"inherit":Ye}),this},hide:function(){return this.attr({visibility:Ke})},fadeOut:function(e){var t=this;t.animate({opacity:0},{duration:e||150,complete:function(){t.attr({y:-9999})}})},add:function(e){var t,n=this.renderer,r=this.element;return e&&(this.parentGroup=e),this.parentInverted=e&&e.inverted,void 0!==this.textStr&&n.buildText(this),this.added=!0,(!e||e.handleZ||this.zIndex)&&(t=this.zIndexSetter()),t||(e?e.element:n.box).appendChild(r),this.onAdd&&this.onAdd(),this},safeRemoveChild:function(e){var t=e.parentNode;t&&t.removeChild(e)},destroy:function(){var e,t,n,r=this,a=r.element||{},o=r.shadows,i=r.renderer.isSVG&&"SPAN"===a.nodeName&&r.parentGroup;if(a.onclick=a.onmouseout=a.onmouseover=a.onmousemove=a.point=null,Et(r),r.clipPath&&(r.clipPath=r.clipPath.destroy()),r.stops){for(n=0;n=r;r++)a=d.cloneNode(0),o=2*i+1-2*r,c(a,{isShadow:"true",stroke:e.color||"black","stroke-opacity":s*r,"stroke-width":o,transform:"translate"+l,fill:Je}),n&&(c(a,"height",be(c(a,"height")-o,0)),a.cutHeight=o),t?t.element.appendChild(a):d.parentNode.insertBefore(a,d),u.push(a);this.shadows=u}return this},xGetter:function(e){return"circle"===this.element.nodeName&&(e={x:"cx",y:"cy"}[e]||e),this._defaultGetter(e)},_defaultGetter:function(e){var t=st(this[e],this.element?this.element.getAttribute(e):null,0);return/^[\-0-9\.]+$/.test(t)&&(t=parseFloat(t)),t},dSetter:function(e,t,n){e&&e.join&&(e=e.join(" ")),/(NaN| {2}|^$)/.test(e)&&(e="M 0 0"),n.setAttribute(t,e),this[t]=e},dashstyleSetter:function(e){var n;if(e=e&&e.toLowerCase()){for(e=e.replace("shortdashdotdot","3,1,1,1,1,1,").replace("shortdashdot","3,1,1,1").replace("shortdot","1,1,").replace("shortdash","3,1,").replace("longdash","8,3,").replace(/dot/g,"1,3,").replace("dash","4,3,").replace(/,$/,"").split(","),n=e.length;n--;)e[n]=t(e[n])*this["stroke-width"];e=e.join(",").replace("NaN","none"),this.element.setAttribute("stroke-dasharray",e)}},alignSetter:function(e){this.element.setAttribute("text-anchor",{left:"start",center:"middle",right:"end"}[e])},opacitySetter:function(e,t,n){this[t]=e,n.setAttribute(t,e)},titleSetter:function(e){var t=this.element.getElementsByTagName("title")[0];t||(t=pe.createElementNS(De,"title"),this.element.appendChild(t)),t.appendChild(pe.createTextNode(String(st(e),"").replace(/<[^>]*>/g,"")))},textSetter:function(e){e!==this.textStr&&(delete this.bBox,this.textStr=e,this.added&&this.renderer.buildText(this))},fillSetter:function(e,t,n){"string"==typeof e?n.setAttribute(t,e):e&&this.colorGradient(e,t,n)},zIndexSetter:function(e,n){var r,a,o,i,s,l=this.renderer,d=this.parentGroup,p=d||l,f=p.element||l.box,h=this.element,m=this.added;if(u(e)&&(h.setAttribute(n,e),e=+e,this[n]===e&&(m=!1),this[n]=e),m){for(e=this.zIndex,e&&d&&(d.handleZ=!0),r=f.childNodes,s=0;se||!u(e)&&u(o))&&(f.insertBefore(h,a),i=!0);i||f.appendChild(h)}return i},_defaultSetter:function(e,t,n){n.setAttribute(t,e)}},M.prototype.yGetter=M.prototype.xGetter,M.prototype.translateXSetter=M.prototype.translateYSetter=M.prototype.rotationSetter=M.prototype.verticalAlignSetter=M.prototype.scaleXSetter=M.prototype.scaleYSetter=function(e,t){this[t]=e,this.doTransform=!0},M.prototype["stroke-widthSetter"]=M.prototype.strokeSetter=function(e,t,n){this[t]=e,this.stroke&&this["stroke-width"]?(this.strokeWidth=this["stroke-width"],M.prototype.fillSetter.call(this,this.stroke,"stroke",n),n.setAttribute("stroke-width",this["stroke-width"]),this.hasStroke=!0):"stroke-width"===t&&0===e&&this.hasStroke&&(n.removeAttribute("stroke"),this.hasStroke=!1)};var Ct=function(){this.init.apply(this,arguments)};Ct.prototype={Element:M,init:function(e,t,n,r,a){var o,i,s,l=this,u=location;o=l.createElement("svg").attr({version:"1.1"}).css(this.getStyle(r)),i=o.element,e.appendChild(i),-1===e.innerHTML.indexOf("xmlns")&&c(i,"xmlns",De),l.isSVG=!0,l.box=i,l.boxWrapper=o,l.alignedObjects=[],l.url=(Ce||je)&&pe.getElementsByTagName("base").length?u.href.replace(/#.*?$/,"").replace(/([\('\)])/g,"\\$1").replace(/ /g,"%20"):"",s=this.createElement("desc").add(),s.element.appendChild(pe.createTextNode("Created with "+Fe+" "+Ue)),l.defs=this.createElement("defs").add(),l.forExport=a,l.gradients={},l.cache={},l.setSize(t,n,!1);var d,f;Ce&&e.getBoundingClientRect&&(l.subPixelFix=d=function(){p(e,{left:0,top:0}),f=e.getBoundingClientRect(),p(e,{left:ye(f.left)-f.left+Xe,top:ye(f.top)-f.top+Xe})},d(),bt(fe,"resize",d))},getStyle:function(e){return this.style=it({fontFamily:'"Lucida Grande", "Lucida Sans Unicode", Arial, Helvetica, sans-serif',fontSize:"12px"},e)},isHidden:function(){return!this.boxWrapper.getBBox().width},destroy:function(){var e=this,t=e.defs;return e.box=null,e.boxWrapper=e.boxWrapper.destroy(),O(e.gradients||{}),e.gradients=null,t&&(e.defs=t.destroy()),e.subPixelFix&&vt(fe,"resize",e.subPixelFix),e.alignedObjects=null,null},createElement:function(e){var t=new this.Element;return t.init(this,e),t},draw:function(){},buildText:function(e){for(var n,r,a,o=e.element,i=this,s=i.forExport,l=st(e.textStr,"").toString(),u=-1!==l.indexOf("<"),d=o.childNodes,f=c(o,"x"),h=e.styles,m=e.textWidth,g=h&&h.lineHeight,y=h&&h.textShadow,b=h&&"ellipsis"===h.textOverflow,v=d.length,_=m&&!e.added&&this.box,w=function(e){return g?t(g):i.fontMetrics(/(px|em)$/.test(e&&e.style.fontSize)?e.style.fontSize:h&&h.fontSize||i.style.fontSize||12,e).h},k=function(e){return e.replace(/</g,"<").replace(/>/g,">")};v--;)o.removeChild(d[v]);return u||y||b||-1!==l.indexOf(" ")?(r=/<.*style="([^"]+)".*>/,a=/<.*href="(http[^"]+)".*>/,_&&_.appendChild(o),n=u?l.replace(/<(b|strong)>/g,'').replace(/<(i|em)>/g,'').replace(//g,"").split(//g):[l],""===n[n.length-1]&&n.pop(),ht(n,function(t,n){var l,u=0;t=t.replace(//g,"|||"),l=t.split("|||"),ht(l,function(t){if(""!==t||1===l.length){var d,g={},y=pe.createElementNS(De,"tspan");if(r.test(t)&&(d=t.match(r)[1].replace(/(;| |^)color([ :])/,"$1fill$2"),c(y,"style",d)),a.test(t)&&!s&&(c(y,"onclick",'location.href="'+t.match(a)[1]+'"'),p(y,{cursor:"pointer"})),t=k(t.replace(/<(.|\n)*?>/g,"")||" ")," "!==t){if(y.appendChild(pe.createTextNode(t)),u?g.dx=0:n&&null!==f&&(g.x=f),c(y,g),o.appendChild(y),!u&&n&&(!Me&&s&&p(y,{display:"block"}),c(y,"dy",w(y))),m){for(var v,_,E,x,O=t.replace(/([^\^])-/g,"$1- ").split(" "),S=l.length>1||n||O.length>1&&"nowrap"!==h.whiteSpace,P=[],A=w(y),j=1,C=e.rotation,T=t,D=T.length;(S||b)&&(O.length||P.length);)e.rotation=0,x=e.getBBox(!0),E=x.width,!Me&&i.forExport&&(E=i.measureSpanWidth(y.firstChild.data,e.styles)),v=E>m,void 0===_&&(_=v),b&&_?(D/=2,""===T||!v&&.5>D?O=[]:(v&&(_=!0),T=t.substring(0,T.length+(v?-1:1)*ye(D)),O=[T+(m>3?"…":"")],y.removeChild(y.firstChild))):v&&1!==O.length?(y.removeChild(y.firstChild),P.unshift(O.pop())):(O=P,P=[],O.length&&(j++,y=pe.createElementNS(De,"tspan"),c(y,{dy:A,x:f}),d&&c(y,"style",d),o.appendChild(y)),E>m&&(m=E)),O.length&&y.appendChild(pe.createTextNode(O.join(" ").replace(/- /g,"-")));_&&e.attr("title",e.textStr),e.rotation=C}u++}}})}),_&&_.removeChild(o),y&&e.applyTextShadow&&e.applyTextShadow(y),void 0):void o.appendChild(pe.createTextNode(k(l)))},getContrast:function(e){return e=jt(e).rgba,e[0]+e[1]+e[2]>384?"#000000":"#FFFFFF"},button:function(t,n,r,a,o,i,s,l,u){var c,d,p,f,h,m,g=this.label(t,n,r,u,null,null,null,null,"button"),y=0,b={x1:0,y1:0,x2:0,y2:1};return o=e({"stroke-width":1,stroke:"#CCCCCC",fill:{linearGradient:b,stops:[[0,"#FEFEFE"],[1,"#F6F6F6"]]},r:2,padding:5,style:{color:"black"}},o),p=o.style,delete o.style,i=e(o,{stroke:"#68A",fill:{linearGradient:b,stops:[[0,"#FFF"],[1,"#ACF"]]}},i),f=i.style,delete i.style,s=e(o,{stroke:"#68A",fill:{linearGradient:b,stops:[[0,"#9BD"],[1,"#CDF"]]}},s),h=s.style,delete s.style,l=e(o,{style:{color:"#CCC"}},l),m=l.style,delete l.style,bt(g.element,Pe?"mouseover":"mouseenter",function(){3!==y&&g.attr(i).css(f)}),bt(g.element,Pe?"mouseout":"mouseleave",function(){3!==y&&(c=[o,i,s][y],d=[p,f,h][y],g.attr(c).css(d))}),g.setState=function(e){g.state=y=e,e?2===e?g.attr(s).css(h):3===e&&g.attr(l).css(m):g.attr(o).css(p)},g.on("click",function(){3!==y&&a.call(g)}).attr(o).css(it({cursor:"default"},p))},crispLine:function(e,t){return e[1]===e[4]&&(e[1]=e[4]=me(e[1])-t%2/2),e[2]===e[5]&&(e[2]=e[5]=me(e[2])+t%2/2),e},path:function(e){var t={fill:Je};return a(e)?t.d=e:r(e)&&it(t,e),this.createElement("path").attr(t)},circle:function(e,t,n){var a=r(e)?e:{x:e,y:t,r:n},o=this.createElement("circle");return o.xSetter=function(e){this.element.setAttribute("cx",e)},o.ySetter=function(e){this.element.setAttribute("cy",e)},o.attr(a)},arc:function(e,t,n,a,o,i){var s;return r(e)&&(t=e.y,n=e.r,a=e.innerR,o=e.start,i=e.end,e=e.x),s=this.symbol("arc",e||0,t||0,n||0,n||0,{innerR:a||0,start:o||0,end:i||0}),s.r=n,s},rect:function(e,t,n,a,o,i){o=r(e)?e.r:o;var s=this.createElement("rect"),l=r(e)?e:e===B?{}:{x:e,y:t,width:be(n,0),height:be(a,0)};return i!==B&&(l.strokeWidth=i,l=s.crisp(l)),o&&(l.r=o),s.rSetter=function(e){c(this.element,{rx:e,ry:e})},s.attr(l)},setSize:function(e,t,n){var r=this,a=r.alignedObjects,o=a.length;for(r.width=e,r.height=t,r.boxWrapper[st(n,!0)?"animate":"attr"]({width:e,height:t});o--;)a[o].align()},g:function(e){var t=this.createElement("g");return u(e)?t.attr({"class":Ge+e}):t},image:function(e,t,n,r,a){var o,i={preserveAspectRatio:Je};return arguments.length>1&&it(i,{x:t,y:n,width:r,height:a}),o=this.createElement("image").attr(i),o.element.setAttributeNS?o.element.setAttributeNS("http://www.w3.org/1999/xlink","href",e):o.element.setAttribute("hc-svg-href",e),o},symbol:function(e,t,n,r,a,o){var i,s,l,u,c,d=this.symbols[e],p=d&&d(me(t),me(n),r,a,o),h=/^url\((.*?)\)$/;return p?(i=this.path(p),it(i,{symbolName:e,x:t,y:n,width:r,height:a}),o&&it(i,o)):h.test(e)&&(c=function(e,t){e.element&&(e.attr({width:t[0],height:t[1]}),e.alignByTranslate||e.translate(me((r-t[0])/2),me((a-t[1])/2)))},l=e.match(h)[1],u=Ie[l]||o&&o.width&&o.height&&[o.width,o.height],i=this.image(l).attr({x:t,y:n}),i.isImg=!0,u?c(i,u):(i.attr({width:0,height:0}),s=f("img",{onload:function(){c(i,Ie[l]=[this.width,this.height])},src:l}))),i},symbols:{circle:function(e,t,n,r){var a=.166*n;return[$e,e+n/2,t,"C",e+n+a,t,e+n+a,t+r,e+n/2,t+r,"C",e-a,t+r,e-a,t,e+n/2,t,"Z"]},square:function(e,t,n,r){return[$e,e,t,Ze,e+n,t,e+n,t+r,e,t+r,"Z"]},triangle:function(e,t,n,r){return[$e,e+n/2,t,Ze,e+n,t+r,e,t+r,"Z"]; +},"triangle-down":function(e,t,n,r){return[$e,e,t,Ze,e+n,t,e+n/2,t+r,"Z"]},diamond:function(e,t,n,r){return[$e,e+n/2,t,Ze,e+n,t+r/2,e+n/2,t+r,e,t+r/2,"Z"]},arc:function(e,t,n,r,a){var o=a.start,i=a.r||n||r,s=a.end-.001,l=a.innerR,u=a.open,c=we(o),d=ke(o),p=we(s),f=ke(s),h=a.end-on&&d>t+u&&t+r-u>d?o.splice(13,3,"L",e+n,d-s,e+n+i,d,e+n,d+s,e+n,t+r-l):c&&0>c&&d>t+u&&t+r-u>d?o.splice(33,3,"L",e,d+s,e-i,d,e,d-s,e,t+l):d&&d>r&&c>e+u&&e+n-u>c?o.splice(23,3,"L",c+s,t+r,c,t+r+i,c-s,t+r,e+l,t+r):d&&0>d&&c>e+u&&e+n-u>c&&o.splice(3,3,"L",c-s,t,c,t-i,c+s,t,n-l,t),o}},clipRect:function(e,t,n,r){var a,o=Ge+Re++,i=this.createElement("clipPath").attr({id:o}).add(this.defs);return a=this.rect(e,t,n,r,0).add(i),a.id=o,a.clipPath=i,a.count=0,a},text:function(e,t,n,r){var a,o=this,i=ze||!Me&&o.forExport,s={};return r&&!o.forExport?o.html(e,t,n):(s.x=Math.round(t||0),n&&(s.y=Math.round(n)),(e||0===e)&&(s.text=e),a=o.createElement("text").attr(s),i&&a.css({position:We}),r||(a.xSetter=function(e,t,n){var r,a,o=n.getElementsByTagName("tspan"),i=n.getAttribute(t);for(a=0;ae?e+3:me(1.2*e),a=me(.8*r),{h:r,b:a,f:e}},rotCorr:function(e,t,n){var r=e;return t&&n&&(r=be(r*we(t*xe),4)),{x:-e/3*ke(t*xe),y:r}},label:function(t,n,r,a,o,i,s,l,c){function d(){var e,t,n=x.element.style;m=(void 0===g||void 0===y||E.styles.textAlign)&&u(x.textStr)&&x.getBBox(),E.width=(g||m.width||0)+2*S+P,E.height=(y||m.height||0)+2*S,_=S+k.fontMetrics(n&&n.fontSize,x).b,w&&(h||(e=me(-O*S)+A,t=(l?-_:0)+A,E.box=h=a?k.symbol(a,e,t,E.width,E.height,j):k.rect(e,t,E.width,E.height,0,j[at]),h.attr("fill",Je).add(E)),h.isImg||h.attr(it({width:me(E.width),height:me(E.height)},j)),j=null)}function p(){var e,t=E.styles,n=t&&t.textAlign,r=P+S*(1-O);e=l?0:_,u(g)&&m&&("center"===n||"right"===n)&&(r+={center:.5,right:1}[n]*(g-m.width)),(r!==x.x||e!==x.y)&&(x.attr("x",r),e!==B&&x.attr("y",e)),x.x=r,x.y=e}function f(e,t){h?h.attr(e,t):j[e]=t}var h,m,g,y,b,v,_,w,k=this,E=k.g(c),x=k.text("",0,0,s).attr({zIndex:1}),O=0,S=3,P=0,A=0,j={};E.onAdd=function(){x.add(E),E.attr({text:t||0===t?t:"",x:n,y:r}),h&&u(o)&&E.attr({anchorX:o,anchorY:i})},E.widthSetter=function(e){g=e},E.heightSetter=function(e){y=e},E.paddingSetter=function(e){u(e)&&e!==S&&(S=E.padding=e,p())},E.paddingLeftSetter=function(e){u(e)&&e!==P&&(P=e,p())},E.alignSetter=function(e){O={left:0,center:.5,right:1}[e]},E.textSetter=function(e){e!==B&&x.textSetter(e),d(),p()},E["stroke-widthSetter"]=function(e,t){e&&(w=!0),A=e%2/2,f(t,e)},E.strokeSetter=E.fillSetter=E.rSetter=function(e,t){"fill"===t&&e&&(w=!0),f(t,e)},E.anchorXSetter=function(e,t){o=e,f(t,me(e)-A-b)},E.anchorYSetter=function(e,t){i=e,f(t,e-v)},E.xSetter=function(e){E.x=e,O&&(e-=O*((g||m.width)+S)),b=me(e),E.attr("translateX",b)},E.ySetter=function(e){v=E.y=me(e),E.attr("translateY",v)};var C=E.css;return it(E,{css:function(t){if(t){var n={};t=e(t),ht(E.textProps,function(e){t[e]!==B&&(n[e]=t[e],delete t[e])}),x.css(n)}return C.call(E,t)},getBBox:function(){return{width:m.width+2*S,height:m.height+2*S,x:m.x-S,y:m.y-S}},shadow:function(e){return h&&h.shadow(e),E},destroy:function(){vt(E.element,"mouseenter"),vt(E.element,"mouseleave"),x&&(x=x.destroy()),h&&(h=h.destroy()),M.prototype.destroy.call(E),E=k=d=p=f=null}})}},L=Ct,it(M.prototype,{htmlCss:function(e){var t=this,n=t.element,r=e&&"SPAN"===n.tagName&&e.width;return r&&(delete e.width,t.textWidth=r,t.updateTransform()),e&&"ellipsis"===e.textOverflow&&(e.whiteSpace="nowrap",e.overflow="hidden"),t.styles=it(t.styles,e),p(t.element,e),t},htmlGetBBox:function(){var e=this,t=e.element;return"text"===t.nodeName&&(t.style.position=We),{x:t.offsetLeft,y:t.offsetTop,width:t.offsetWidth,height:t.offsetHeight}},htmlUpdateTransform:function(){if(!this.added)return void(this.alignOnAdd=!0);var e=this,n=e.renderer,r=e.element,a=e.translateX||0,o=e.translateY||0,i=e.x||0,s=e.y||0,l=e.textAlign||"left",c={left:0,center:.5,right:1}[l],d=e.shadows,f=e.styles;if(p(r,{marginLeft:a,marginTop:o}),d&&ht(d,function(e){p(e,{marginLeft:a+1,marginTop:o+1})}),e.inverted&&ht(r.childNodes,function(e){n.invertChild(e,r)}),"SPAN"===r.tagName){var h,m,g=e.rotation,y=t(e.textWidth),b=[g,l,r.innerHTML,e.textWidth].join(",");b!==e.cTT&&(m=n.fontMetrics(r.style.fontSize).b,u(g)&&e.setSpanRotation(g,c,m),h=st(e.elemWidth,r.offsetWidth),h>y&&/[ \-]/.test(r.textContent||r.innerText)&&(p(r,{width:y+Xe,display:"block",whiteSpace:f&&f.whiteSpace||"normal"}),h=y),e.getSpanCorrection(h,m,c,g,l)),p(r,{left:i+(e.xCorr||0)+Xe,top:s+(e.yCorr||0)+Xe}),je&&(m=r.offsetHeight),e.cTT=b}},setSpanRotation:function(e,t,n){var r={},a=Pe?"-ms-transform":je?"-webkit-transform":Ce?"MozTransform":Se?"-o-transform":"";r[a]=r.transform="rotate("+e+"deg)",r[a+(Ce?"Origin":"-origin")]=r.transformOrigin=100*t+"% "+n+"px",p(this.element,r)},getSpanCorrection:function(e,t,n){this.xCorr=-e*n,this.yCorr=-t}}),it(Ct.prototype,{html:function(e,t,n){var r=this.createElement("span"),a=r.element,o=r.renderer;return r.textSetter=function(e){e!==a.innerHTML&&delete this.bBox,a.innerHTML=this.textStr=e},r.xSetter=r.ySetter=r.alignSetter=r.rotationSetter=function(e,t){"align"===t&&(t="textAlign"),r[t]=e,r.htmlUpdateTransform()},r.attr({text:e,x:me(t),y:me(n)}).css({position:We,fontFamily:this.style.fontFamily,fontSize:this.style.fontSize}),a.style.whiteSpace="nowrap",r.css=r.htmlCss,o.isSVG&&(r.add=function(e){var t,n,i=o.box.parentNode,s=[];if(this.parentGroup=e,e){if(t=e.div,!t){for(n=e;n;)s.push(n),n=n.parentGroup;ht(s.reverse(),function(e){var n,r=c(e.element,"class");r&&(r={className:r}),t=e.div=e.div||f(He,r,{position:We,left:(e.translateX||0)+Xe,top:(e.translateY||0)+Xe},t||i),n=t.style,it(e,{translateXSetter:function(t,r){n.left=t+Xe,e[r]=t,e.doTransform=!0},translateYSetter:function(t,r){n.top=t+Xe,e[r]=t,e.doTransform=!0},visibilitySetter:function(e,t){n[t]=e}})})}}else t=i;return t.appendChild(a),r.added=!0,r.alignOnAdd&&r.htmlUpdateTransform(),r}),r}});var Tt,Dt;if(!Me&&!ze){Dt={init:function(e,t){var n=this,r=["<",t,' filled="f" stroked="f"'],a=["position: ",We,";"],o=t===He;("shape"===t||o)&&a.push("left:0;top:0;width:1px;height:1px;"),a.push("visibility: ",o?Ke:Ye),r.push(' style="',a.join(""),'"/>'),t&&(r=o||"span"===t||"img"===t?r.join(""):e.prepVML(r),n.element=f(r)),n.renderer=e},add:function(e){var t=this,n=t.renderer,r=t.element,a=n.box,o=e&&e.inverted,i=e?e.element||e:a;return o&&n.invertChild(r,i),i.appendChild(r),t.added=!0,t.alignOnAdd&&!t.deferUpdateTransform&&t.updateTransform(),t.onAdd&&t.onAdd(),t},updateTransform:M.prototype.htmlUpdateTransform,setSpanRotation:function(){var e=this.rotation,t=we(e*xe),n=ke(e*xe);p(this.element,{filter:e?["progid:DXImageTransform.Microsoft.Matrix(M11=",t,", M12=",-n,", M21=",n,", M22=",t,", sizingMethod='auto expand')"].join(""):Je})},getSpanCorrection:function(e,t,n,r,a){var o,i=r?we(r*xe):1,s=r?ke(r*xe):0,l=st(this.elemHeight,this.element.offsetHeight),u=a&&"left"!==a;this.xCorr=0>i&&-e,this.yCorr=0>s&&-l,o=0>i*s,this.xCorr+=s*t*(o?1-n:n),this.yCorr-=i*t*(r?o?n:1-n:1),u&&(this.xCorr-=e*n*(0>i?-1:1),r&&(this.yCorr-=l*n*(0>s?-1:1)),p(this.element,{textAlign:a}))},pathToVML:function(e){for(var t=e.length,n=[];t--;)o(e[t])?n[t]=me(10*e[t])-5:"Z"===e[t]?n[t]="x":(n[t]=e[t],!e.isArc||"wa"!==e[t]&&"at"!==e[t]||(n[t+5]===n[t+7]&&(n[t+7]+=e[t+7]>e[t+5]?1:-1),n[t+6]===n[t+8]&&(n[t+8]+=e[t+8]>e[t+6]?1:-1)));return n.join(" ")||"x"},clip:function(e){var t,n,r=this;return e?(t=e.members,l(t,r),t.push(r),r.destroyClip=function(){l(t,r)},n=e.getCSS(r)):(r.destroyClip&&r.destroyClip(),n={clip:Ae?"inherit":"rect(auto)"}),r.css(n)},css:M.prototype.htmlCss,safeRemoveChild:function(e){e.parentNode&&S(e)},destroy:function(){return this.destroyClip&&this.destroyClip(),M.prototype.destroy.apply(this)},on:function(e,t){return this.element["on"+e]=function(){var e=fe.event;e.target=e.srcElement,t(e)},this},cutOffPath:function(e,n){var r;return e=e.split(/[ ,]/),r=e.length,(9===r||11===r)&&(e[r-4]=e[r-2]=t(e[r-2])-10*n),e.join(" ")},shadow:function(e,n,r){var a,o,i,s,l,u,c,d=[],p=this.element,h=this.renderer,m=p.style,g=p.path;if(g&&"string"!=typeof g.value&&(g="x"),l=g,e){for(u=st(e.width,3),c=(e.opacity||.15)/u,a=1;3>=a;a++)s=2*u+1-2*a,r&&(l=this.cutOffPath(g.value,s+.5)),i=[''],o=f(h.prepVML(i),null,{left:t(m.left)+st(e.offsetX,1),top:t(m.top)+st(e.offsetY,1)}),r&&(o.cutOff=s+1),i=[''],f(h.prepVML(i),null,null,o),n?n.element.appendChild(o):p.parentNode.insertBefore(o,p),d.push(o);this.shadows=d}return this},updateShadows:Be,setAttr:function(e,t){Ae?this.element[e]=t:this.element.setAttribute(e,t)},classSetter:function(e){this.element.className=e},dashstyleSetter:function(e,t,n){var r=n.getElementsByTagName("stroke")[0]||f(this.renderer.prepVML([""]),null,null,n);r[t]=e||"solid",this[t]=e},dSetter:function(e,t,n){var r,a=this.shadows;if(e=e||[],this.d=e.join&&e.join(" "),n.path=e=this.pathToVML(e),a)for(r=a.length;r--;)a[r].path=a[r].cutOff?this.cutOffPath(e,a[r].cutOff):e;this.setAttr(t,e)},fillSetter:function(e,t,n){var r=n.nodeName;"SPAN"===r?n.style.color=e:"IMG"!==r&&(n.filled=e!==Je,this.setAttr("fillcolor",this.renderer.color(e,n,t,this)))},opacitySetter:Be,rotationSetter:function(e,t,n){var r=n.style;this[t]=r[t]=e,r.left=-me(ke(e*xe)+1)+Xe,r.top=me(we(e*xe))+Xe},strokeSetter:function(e,t,n){this.setAttr("strokecolor",this.renderer.color(e,n,t))},"stroke-widthSetter":function(e,t,n){n.stroked=!!e,this[t]=e,o(e)&&(e+=Xe),this.setAttr("strokeweight",e)},titleSetter:function(e,t){this.setAttr(t,e)},visibilitySetter:function(e,t,n){"inherit"===e&&(e=Ye),this.shadows&&ht(this.shadows,function(n){n.style[t]=e}),"DIV"===n.nodeName&&(e=e===Ke?"-999em":0,Ae||(n.style[t]=e?Ye:Ke),t="top"),n.style[t]=e},xSetter:function(e,t,n){this[t]=e,"x"===t?t="left":"y"===t&&(t="top"),this.updateClipping?(this[t]=e,this.updateClipping()):n.style[t]=e},zIndexSetter:function(e,t,n){n.style[t]=e}},de.VMLElement=Dt=h(M,Dt),Dt.prototype.ySetter=Dt.prototype.widthSetter=Dt.prototype.heightSetter=Dt.prototype.xSetter;var Mt={Element:Dt,isIE8:Oe.indexOf("MSIE 8.0")>-1,init:function(e,t,n,r){var a,o,i,s=this;if(s.alignedObjects=[],a=s.createElement(He).css(it(this.getStyle(r),{position:Ve})),o=a.element,e.appendChild(a.element),s.isVML=!0,s.box=o,s.boxWrapper=a,s.cache={},s.setSize(t,n,!1),!pe.namespaces.hcv){pe.namespaces.add("hcv","urn:schemas-microsoft-com:vml"),i="hcv\\:fill, hcv\\:path, hcv\\:shape, hcv\\:stroke{ behavior:url(#default#VML); display: inline-block; } ";try{pe.createStyleSheet().cssText=i}catch(l){pe.styleSheets[0].cssText+=i}}},isHidden:function(){return!this.box.offsetWidth},clipRect:function(e,t,n,a){var o=this.createElement(),i=r(e);return it(o,{members:[],count:0,left:(i?e.x:e)+1,top:(i?e.y:t)+1,width:(i?e.width:n)-1,height:(i?e.height:a)-1,getCSS:function(e){var t=e.element,n=t.nodeName,r="shape"===n,a=e.inverted,o=this,i=o.top-(r?t.offsetTop:0),s=o.left,l=s+o.width,u=i+o.height,c={clip:"rect("+me(a?s:i)+"px,"+me(a?u:l)+"px,"+me(a?l:u)+"px,"+me(a?i:s)+"px)"};return!a&&Ae&&"DIV"===n&&it(c,{width:l+Xe,height:u+Xe}),c},updateClipping:function(){ht(o.members,function(e){e.element&&e.css(o.getCSS(e))})}})},color:function(e,t,n,r){var a,o,i,s=this,l=/^rgba/,u=Je;if(e&&e.linearGradient?i="gradient":e&&e.radialGradient&&(i="pattern"),i){var c,d,p,h,m,g,y,b,v,_,w,k,E=e.linearGradient||e.radialGradient,x="",O=e.stops,S=[],P=function(){o=[''],f(s.prepVML(o),null,null,t)};if(w=O[0],k=O[O.length-1],w[0]>0&&O.unshift([0,w[1]]),k[0]<1&&O.push([1,k[1]]),ht(O,function(e,t){l.test(e[1])?(a=jt(e[1]),c=a.get("rgb"),d=a.get("a")):(c=e[1],d=1),S.push(100*e[0]+"% "+c),t?(b=d,v=c):(y=d,_=c)}),"fill"===n)if("gradient"===i)p=E.x1||E[0]||0,h=E.y1||E[1]||0,m=E.x2||E[2]||0,g=E.y2||E[3]||0,x='angle="'+(90-180*he.atan((g-h)/(m-p))/Ee)+'"',P();else{var A,j=E.r,C=2*j,T=2*j,D=E.cx,M=E.cy,N=t.radialReference,z=function(){N&&(A=r.getBBox(),D+=(N[0]-A.x)/A.width-.5,M+=(N[1]-A.y)/A.height-.5,C*=N[2]/A.width,T*=N[2]/A.height),x='src="'+U.global.VMLRadialGradientURL+'" size="'+C+","+T+'" origin="0.5,0.5" position="'+D+","+M+'" color2="'+_+'" ',P()};r.added?z():r.onAdd=z,u=v}else u=c}else if(l.test(e)&&"IMG"!==t.tagName)a=jt(e),o=["<",n,' opacity="',a.get("a"),'"/>'],f(this.prepVML(o),null,null,t),u=a.get("rgb");else{var I=t.getElementsByTagName(n);I.length&&(I[0].opacity=1,I[0].type="solid"),u=e}return u},prepVML:function(e){var t="display:inline-block;behavior:url(#default#VML);",n=this.isIE8;return e=e.join(""),n?(e=e.replace("/>",' xmlns="urn:schemas-microsoft-com:vml" />'),e=-1===e.indexOf('style="')?e.replace("/>",' style="'+t+'" />'):e.replace('style="','style="'+t)):e=e.replace("<","1&&o.attr({x:t,y:n,width:r,height:a}),o},createElement:function(e){return"rect"===e?this.symbol(e):Ct.prototype.createElement.call(this,e)},invertChild:function(e,n){var r=this,a=n.style,o="IMG"===e.tagName&&e.style;p(e,{flip:"x",left:t(a.width)-(o?t(o.top):1),top:t(a.height)-(o?t(o.left):1),rotation:-90}),ht(e.childNodes,function(t){r.invertChild(t,e)})},symbols:{arc:function(e,t,n,r,a){var o,i=a.start,s=a.end,l=a.r||n||r,u=a.innerR,c=we(i),d=ke(i),p=we(s),f=ke(s);return s-i===0?["x"]:(o=["wa",e-l,t-l,e+l,t+l,e+l*c,t+l*d,e+l*p,t+l*f],a.open&&!u&&o.push("e",$e,e,t),o.push("at",e-u,t-u,e+u,t+u,e+u*p,t+u*f,e+u*c,t+u*d,"x","e"),o.isArc=!0,o)},circle:function(e,t,n,r,a){return a&&(n=r=2*a.r),a&&a.isCircle&&(e-=n/2,t-=r/2),["wa",e,t,e+n,t+r,e+n,t+r/2,e+n,t+r/2,"e"]},rect:function(e,t,n,r,a){return Ct.prototype.symbols[u(a)&&a.r?"callout":"square"].call(0,e,t,n,r,a)}}};de.VMLRenderer=Tt=function(){this.init.apply(this,arguments)},Tt.prototype=e(Ct.prototype,Mt),L=Tt}Ct.prototype.measureSpanWidth=function(e,t){var n,r=pe.createElement("span"),a=pe.createTextNode(e);return r.appendChild(a),p(r,t),this.box.appendChild(r),n=r.offsetWidth,S(r),n};var Nt,zt;ze&&(de.CanVGRenderer=Nt=function(){De="http://www.w3.org/1999/xhtml"},Nt.prototype.symbols={},zt=function(){function e(){var e,n=t.length;for(e=0;n>e;e++)t[e]();t=[]}var t=[];return{push:function(n,r){0===t.length&&pt(r,e),t.push(n)}}}(),L=Nt),N.prototype={addLabel:function(){var t,n,r=this,a=r.axis,o=a.options,i=a.chart,l=a.categories,c=a.names,d=r.pos,p=o.labels,f=a.tickPositions,h=d===f[0],m=d===f[f.length-1],g=l?st(l[d],c[d],d):d,y=r.label,b=f.info;a.isDatetimeAxis&&b&&(n=o.dateTimeLabelFormats[b.higherRanks[d]||b.unitName]),r.isFirst=h,r.isLast=m,t=a.labelFormatter.call({axis:a,chart:i,isFirst:h,isLast:m,dateTimeLabelFormat:n,value:a.isLog?A(s(g)):g}),u(y)?y&&y.attr({text:t}):(r.label=y=u(t)&&p.enabled?i.renderer.text(t,0,0,p.useHTML).css(e(p.style)).add(a.labelGroup):null,r.labelLength=y&&y.getBBox().width,r.rotation=0)},getLabelSize:function(){return this.label?this.label.getBBox()[this.axis.horiz?"height":"width"]:0},handleOverflow:function(e){var t,n,r,a=this.axis,o=e.x,i=a.chart.chartWidth,s=a.chart.spacing,l=st(a.labelLeft,ve(a.pos,s[3])),u=st(a.labelRight,be(a.pos+a.len,i-s[1])),c=this.label,d=this.rotation,p={left:0,center:.5,right:1}[a.labelAlign],f=c.getBBox().width,h=a.slotWidth,m=p,g=1,y={};d?0>d&&l>o-p*f?r=me(o/we(d*xe)-l):d>0&&o+p*f>u&&(r=me((i-o)/we(d*xe))):(t=o-p*f,n=o+(1-p)*f,l>t?h=e.x+h*(1-p)-l:n>u&&(h=u-e.x+h*p,g=-1),h=ve(a.slotWidth,h),hh||a.autoRotation&&c.styles.width)&&(r=h)),r&&(y.width=r,a.options.labels.style.textOverflow||(y.textOverflow="ellipsis"),c.css(y))},getPosition:function(e,t,n,r){var a=this.axis,o=a.chart,i=r&&o.oldChartHeight||o.chartHeight;return{x:e?a.translate(t+n,null,null,r)+a.transB:a.left+a.offset+(a.opposite?(r&&o.oldChartWidth||o.chartWidth)-a.right-a.left:0),y:e?i-a.bottom+a.offset-(a.opposite?a.height:0):i-a.translate(t+n,null,null,r)-a.transB}},getLabelPosition:function(e,t,n,r,a,o,i,s){var l,u=this.axis,c=u.transA,d=u.reversed,p=u.staggerLines,f=u.tickRotCorr||{x:0,y:0},h=st(a.y,f.y+(2===u.side?8:-(n.getBBox().height/2)));return e=e+a.x+f.x-(o&&r?o*c*(d?-1:1):0),t=t+h-(o&&!r?o*c*(d?1:-1):0),p&&(l=i/(s||1)%p,t+=l*(u.labelOffset/p)),{x:e,y:me(t)}},getMarkPath:function(e,t,n,r,a,o){return o.crispLine([$e,e,t,Ze,e+(a?0:-n),t+(a?n:0)],r)},render:function(e,t,n){var r,a,o,i=this,s=i.axis,l=s.options,u=s.chart,c=u.renderer,d=s.horiz,p=i.type,f=i.label,h=i.pos,m=l.labels,g=i.gridLine,y=p?p+"Grid":"grid",b=p?p+"Tick":"tick",v=l[y+"LineWidth"],_=l[y+"LineColor"],w=l[y+"LineDashStyle"],k=l[b+"Length"],E=l[b+"Width"]||0,x=l[b+"Color"],O=l[b+"Position"],S=i.mark,P=m.step,A=!0,j=s.tickmarkOffset,C=i.getPosition(d,h,j,t),T=C.x,D=C.y,M=d&&T===s.pos+s.len||!d&&D===s.pos?-1:1;n=st(n,1),this.isActive=!0,v&&(r=s.getPlotLinePath(h+j,v*M,t,!0),g===B&&(o={stroke:_,"stroke-width":v},w&&(o.dashstyle=w),p||(o.zIndex=1),t&&(o.opacity=0),i.gridLine=g=v?c.path(r).attr(o).add(s.gridGroup):null),!t&&g&&r&&g[i.isNew?"attr":"animate"]({d:r,opacity:n})),E&&k&&("inside"===O&&(k=-k),s.opposite&&(k=-k),a=i.getMarkPath(T,D,k,E*M,d,c),S?S.animate({d:a,opacity:n}):i.mark=c.path(a).attr({stroke:x,"stroke-width":E,opacity:n}).add(s.axisGroup)),f&&!isNaN(T)&&(f.xy=C=i.getLabelPosition(T,D,f,d,m,j,e,P),i.isFirst&&!i.isLast&&!st(l.showFirstLabel,1)||i.isLast&&!i.isFirst&&!st(l.showLastLabel,1)?A=!1:!d||s.isRadial||m.step||m.rotation||t||0===n||i.handleOverflow(C),P&&e%P&&(A=!1),A&&!isNaN(C.y)?(C.opacity=n,f[i.isNew?"attr":"animate"](C),i.isNew=!1):f.attr("y",-9999))},destroy:function(){O(this,this.axis)}},de.PlotLineOrBand=function(e,t){this.axis=e,t&&(this.options=t,this.id=t.id)},de.PlotLineOrBand.prototype={render:function(){var t,n,r,a,o,s,l=this,c=l.axis,d=c.horiz,p=l.options,f=p.label,h=l.label,m=p.width,g=p.to,y=p.from,b=u(y)&&u(g),v=p.value,_=p.dashStyle,w=l.svgElem,k=[],O=p.color,S=p.zIndex,P=p.events,A={},j=c.chart.renderer;if(c.isLog&&(y=i(y),g=i(g),v=i(v)),m)k=c.getPlotLinePath(v,m),A={stroke:O,"stroke-width":m},_&&(A.dashstyle=_);else{if(!b)return;k=c.getPlotBandPath(y,g,p),O&&(A.fill=O),p.borderWidth&&(A.stroke=p.borderColor,A["stroke-width"]=p.borderWidth)}if(u(S)&&(A.zIndex=S),w)k?w.animate({d:k},null,w.onGetPath):(w.hide(),w.onGetPath=function(){w.show()},h&&(l.label=h=h.destroy()));else if(k&&k.length&&(l.svgElem=w=j.path(k).attr(A).add(),P)){t=function(e){w.on(e,function(t){P[e].apply(l,[t])})};for(n in P)t(n)}return f&&u(f.text)&&k&&k.length&&c.width>0&&c.height>0?(f=e({align:d&&b&&"center",x:d?!b&&4:10,verticalAlign:!d&&b&&"middle",y:d?b?16:10:b?6:-4,rotation:d&&!b&&90},f),h||(A={align:f.textAlign||f.align,rotation:f.rotation},u(S)&&(A.zIndex=S),l.label=h=j.text(f.text,0,0,f.useHTML).attr(A).css(f.style).add()),r=[k[1],k[4],b?k[6]:k[1]],a=[k[2],k[5],b?k[7]:k[2]],o=E(r),s=E(a),h.align(f,!1,{x:o,y:s,width:x(r)-o,height:x(a)-s}),h.show()):h&&h.hide(),l},destroy:function(){l(this.axis.plotLinesAndBands,this),delete this.axis,O(this)}},G={getPlotBandPath:function(e,t){var n=this.getPlotLinePath(t,null,null,!0),r=this.getPlotLinePath(e,null,null,!0);return r&&n&&r.toString()!==n.toString()?r.push(n[4],n[5],n[1],n[2]):r=null,r},addPlotBand:function(e){return this.addPlotBandOrLine(e,"plotBands")},addPlotLine:function(e){return this.addPlotBandOrLine(e,"plotLines")},addPlotBandOrLine:function(e,t){var n=new de.PlotLineOrBand(this,e).render(),r=this.userOptions;return n&&(t&&(r[t]=r[t]||[],r[t].push(e)),this.plotLinesAndBands.push(n)),n},removePlotBandOrLine:function(e){for(var t=this.plotLinesAndBands,n=this.options,r=this.userOptions,a=t.length;a--;)t[a].id===e&&t[a].destroy();ht([n.plotLines||[],r.plotLines||[],n.plotBands||[],r.plotBands||[]],function(t){for(a=t.length;a--;)t[a].id===e&&l(t,t[a])})}};var It=de.Axis=function(){this.init.apply(this,arguments)};It.prototype={defaultOptions:{dateTimeLabelFormats:{millisecond:"%H:%M:%S.%L",second:"%H:%M:%S",minute:"%H:%M",hour:"%H:%M",day:"%e. %b",week:"%e. %b",month:"%b '%y",year:"%Y"},endOnTick:!1,gridLineColor:"#D8D8D8",labels:{enabled:!0,style:{color:"#606060",cursor:"default",fontSize:"11px"},x:0,y:15},lineColor:"#C0D0E0",lineWidth:1,minPadding:.01,maxPadding:.01,minorGridLineColor:"#E0E0E0",minorGridLineWidth:1,minorTickColor:"#A0A0A0",minorTickLength:2,minorTickPosition:"outside",startOfWeek:1,startOnTick:!1,tickColor:"#C0D0E0",tickLength:10,tickmarkPlacement:"between",tickPixelInterval:100,tickPosition:"outside",tickWidth:1,title:{align:"middle",style:{color:"#707070"}},type:"linear"},defaultYAxisOptions:{endOnTick:!0,gridLineWidth:1,tickPixelInterval:72,showLastLabel:!0,labels:{x:-8,y:3},lineWidth:0,maxPadding:.05,minPadding:.05,startOnTick:!0,tickWidth:0,title:{rotation:270,text:"Values"},stackLabels:{enabled:!1,formatter:function(){return de.numberFormat(this.total,-1)},style:e(xt.line.dataLabels.style,{color:"#000000"})}},defaultLeftAxisOptions:{labels:{x:-15,y:null},title:{rotation:270}},defaultRightAxisOptions:{labels:{x:15,y:null},title:{rotation:90}},defaultBottomAxisOptions:{labels:{autoRotation:[-45],x:0,y:null},title:{rotation:0}},defaultTopAxisOptions:{labels:{autoRotation:[-45],x:0,y:-15},title:{rotation:0}},init:function(e,t){var n=t.isX,r=this;r.horiz=e.inverted?!n:n,r.isXAxis=n,r.coll=n?"xAxis":"yAxis",r.opposite=t.opposite,r.side=t.side||(r.horiz?r.opposite?0:2:r.opposite?1:3),r.setOptions(t);var a=this.options,o=a.type,l="datetime"===o;r.labelFormatter=a.labels.formatter||r.defaultLabelFormatter,r.userOptions=t,r.minPixelPadding=0,r.chart=e,r.reversed=a.reversed,r.zoomEnabled=a.zoomEnabled!==!1,r.categories=a.categories||"category"===o,r.names=r.names||[],r.isLog="logarithmic"===o,r.isDatetimeAxis=l,r.isLinked=u(a.linkedTo),r.ticks={},r.labelEdge=[],r.minorTicks={},r.plotLinesAndBands=[],r.alternateBands={},r.len=0,r.minRange=r.userMinRange=a.minRange||a.maxZoom,r.range=a.range,r.offset=a.offset||0,r.stacks={},r.oldStacks={},r.max=null,r.min=null,r.crosshair=st(a.crosshair,d(e.options.tooltip.crosshairs)[n?0:1],!1);var c,p=r.options.events;-1===ft(r,e.axes)&&(n&&!this.isColorAxis?e.axes.splice(e.xAxis.length,0,r):e.axes.push(r),e[r.coll].push(r)),r.series=r.series||[],e.inverted&&n&&r.reversed===B&&(r.reversed=!0),r.removePlotBand=r.removePlotBandOrLine,r.removePlotLine=r.removePlotBandOrLine;for(c in p)bt(r,c,p[c]);r.isLog&&(r.val2lin=i,r.lin2val=s)},setOptions:function(t){this.options=e(this.defaultOptions,this.isXAxis?{}:this.defaultYAxisOptions,[this.defaultTopAxisOptions,this.defaultRightAxisOptions,this.defaultBottomAxisOptions,this.defaultLeftAxisOptions][this.side],e(U[this.coll],t))},defaultLabelFormatter:function(){var e,t,n=this.axis,r=this.value,a=n.categories,o=this.dateTimeLabelFormat,i=U.lang.numericSymbols,s=i&&i.length,l=n.options.labels.format,u=n.isLog?r:n.tickInterval;if(l)t=v(l,this);else if(a)t=r;else if(o)t=H(o,r);else if(s&&u>=1e3)for(;s--&&t===B;)e=Math.pow(1e3,s+1),u>=e&&10*r%e===0&&null!==i[s]&&(t=de.numberFormat(r/e,-1)+i[s]);return t===B&&(t=_e(r)>=1e4?de.numberFormat(r,-1):de.numberFormat(r,-1,B,"")),t},getSeriesExtremes:function(){var e=this,t=e.chart;e.hasVisibleSeries=!1,e.dataMin=e.dataMax=e.ignoreMinPadding=e.ignoreMaxPadding=null,e.buildStacks&&e.buildStacks(),ht(e.series,function(n){if(n.visible||!t.options.chart.ignoreHiddenSeries){var r,a,o,i=n.options,s=i.threshold;e.hasVisibleSeries=!0,e.isLog&&0>=s&&(s=null),e.isXAxis?(r=n.xData,r.length&&(e.dataMin=ve(st(e.dataMin,r[0]),E(r)),e.dataMax=be(st(e.dataMax,r[0]),x(r)))):(n.getExtremes(),o=n.dataMax,a=n.dataMin,u(a)&&u(o)&&(e.dataMin=ve(st(e.dataMin,a),a),e.dataMax=be(st(e.dataMax,o),o)),u(s)&&(e.dataMin>=s?(e.dataMin=s,e.ignoreMinPadding=!0):e.dataMaxe||e>n)&&(r?e=ve(be(t,e),n):u=!0),e};return a=st(a,c.translate(e,null,null,n)),o=s=me(a+g),i=l=me(h-a-g),isNaN(a)?u=!0:c.horiz?(i=f,l=h-c.bottom,o=s=y(o,p,p+c.width)):(o=p,s=m-c.right,i=l=y(i,f,f+c.height)),u&&!r?null:d.renderer.crispLine([$e,o,i,Ze,s,l],t||1)},getLinearTickPositions:function(e,t,n){var r,a,i=A(ge(t/e)*e),s=A(ye(n/e)*e),l=[];if(t===n&&o(t))return[t];for(r=i;s>=r&&(l.push(r),r=A(r+e),r!==a);)a=r;return l},getMinorTickPositions:function(){var e,t,n,r=this,a=r.options,o=r.tickPositions,i=r.minorTickInterval,s=[],l=r.min,u=r.max,c=u-l;if(c&&c/it;t++)s=s.concat(r.getLogTickPositions(i,o[t-1],o[t],!0));else if(r.isDatetimeAxis&&"auto"===a.minorTickInterval)s=s.concat(r.getTimeTicks(r.normalizeTimeTickInterval(i),l,u,a.startOfWeek));else for(e=l+(o[0]-l)%i;u>=e;e+=i)s.push(e);return r.trimTicks(s),s},adjustForMinRange:function(){var e,t,n,r,a,o,i,s,l=this,c=l.options,d=l.min,p=l.max,f=l.dataMax-l.dataMin>=l.minRange;if(l.isXAxis&&l.minRange===B&&!l.isLog&&(u(c.min)||u(c.max)?l.minRange=null:(ht(l.series,function(e){for(a=e.xData,o=e.xIncrement?1:a.length-1,n=o;n>0;n--)r=a[n]-a[n-1],(t===B||t>r)&&(t=r)}),l.minRange=ve(5*t,l.dataMax-l.dataMin))),p-dp-d&&(i[0]=p-h,i[1]=st(c.min,p-h),d=x(i))}l.min=d,l.max=p},setAxisTranslation:function(e){var t,r,a=this,o=a.max-a.min,i=a.axisPointRange||0,s=0,l=0,c=a.linkedParent,d=!!a.categories,p=a.transA,f=a.isXAxis;(f||d||i)&&(c?(s=c.minPointOffset,l=c.pointRangePadding):ht(a.series,function(e){var r=d?1:f?e.pointRange:a.axisPointRange||0,c=e.options.pointPlacement,p=e.closestPointRange;r>o&&(r=0),i=be(i,r),a.single||(s=be(s,n(c)?0:r/2),l=be(l,"on"===c?0:r)),!e.noSharedTooltip&&u(p)&&(t=u(t)?ve(t,p):p)}),r=a.ordinalSlope&&t?a.ordinalSlope/t:1,a.minPointOffset=s*=r,a.pointRangePadding=l*=r,a.pointRange=ve(i,o),f&&(a.closestPointRange=t)),e&&(a.oldTransA=p),a.translationSlope=a.transA=p=a.len/(o+l||1),a.transB=a.horiz?a.left:a.bottom,a.minPixelPadding=p*s},setTickInterval:function(e){var t,n,r,a=this,s=a.chart,l=a.options,c=a.isLog,d=a.isDatetimeAxis,p=a.isXAxis,f=a.isLinked,h=l.maxPadding,m=l.minPadding,g=l.tickInterval,y=l.tickPixelInterval,b=a.categories;d||b||f||this.getTickAmount(),f?(a.linkedParent=s[a.coll][l.linkedTo],n=a.linkedParent.getExtremes(),a.min=st(n.min,n.dataMin),a.max=st(n.max,n.dataMax),l.type!==a.linkedParent.options.type&&P(11,1)):(a.min=st(a.userMin,l.min,a.dataMin),a.max=st(a.userMax,l.max,a.dataMax)),c&&(!e&&ve(a.min,st(a.dataMin,a.min))<=0&&P(10,1),a.min=A(i(a.min)),a.max=A(i(a.max))),a.range&&u(a.max)&&(a.userMin=a.min=be(a.min,a.max-a.range),a.userMax=a.max,a.range=null),a.beforePadding&&a.beforePadding(),a.adjustForMinRange(),b||a.axisPointRange||a.usePercentage||f||!u(a.min)||!u(a.max)||(t=a.max-a.min,t&&(u(l.min)||u(a.userMin)||!m||!(a.dataMin<0)&&a.ignoreMinPadding||(a.min-=t*m),u(l.max)||u(a.userMax)||!h||!(a.dataMax>0)&&a.ignoreMaxPadding||(a.max+=t*h))),o(l.floor)&&(a.min=be(a.min,l.floor)),o(l.ceiling)&&(a.max=ve(a.max,l.ceiling)),a.min===a.max||void 0===a.min||void 0===a.max?a.tickInterval=1:f&&!g&&y===a.linkedParent.options.tickPixelInterval?a.tickInterval=g=a.linkedParent.tickInterval:a.tickInterval=st(g,this.tickAmount?(a.max-a.min)/be(this.tickAmount-1,1):void 0,b?1:(a.max-a.min)*y/be(a.len,y)),p&&!e&&ht(a.series,function(e){e.processData(a.min!==a.oldMin||a.max!==a.oldMax)}),a.setAxisTranslation(!0),a.beforeSetTickPositions&&a.beforeSetTickPositions(),a.postProcessTickInterval&&(a.tickInterval=a.postProcessTickInterval(a.tickInterval)),a.pointRange&&(a.tickInterval=be(a.pointRange,a.tickInterval)),r=st(l.minTickInterval,a.isDatetimeAxis&&a.closestPointRange),!g&&a.tickInterval.5&&a.tickInterval<5&&a.max>1e3&&a.max<9999)),!!this.tickAmount)),!this.tickAmount&&this.len&&(a.tickInterval=a.unsquish()),this.setTickPositions()},setTickPositions:function(){var e,t,n=this.options,r=n.tickPositions,a=n.tickPositioner,o=n.startOnTick,i=n.endOnTick;this.tickmarkOffset=this.categories&&"between"===n.tickmarkPlacement&&1===this.tickInterval?.5:0,this.minorTickInterval="auto"===n.minorTickInterval&&this.tickInterval?this.tickInterval/5:n.minorTickInterval,this.tickPositions=e=r&&r.slice(),e||(e=this.isDatetimeAxis?this.getTimeTicks(this.normalizeTimeTickInterval(this.tickInterval,n.units),this.min,this.max,n.startOfWeek,this.ordinalPositions,this.closestPointRange,!0):this.isLog?this.getLogTickPositions(this.tickInterval,this.min,this.max):this.getLinearTickPositions(this.tickInterval,this.min,this.max),this.tickPositions=e,a&&(a=a.apply(this,[this.min,this.max]),a&&(this.tickPositions=e=a))),this.isLinked||(this.trimTicks(e,o,i),this.min===this.max&&u(this.min)&&!this.tickAmount&&(t=!0,this.min-=.5,this.max+=.5),this.single=t,r||a||this.adjustTickAmount())},trimTicks:function(e,t,n){var r=e[0],a=e[e.length-1],o=this.minPointOffset||0;t?this.min=r:this.min-o>r&&e.shift(),n?this.max=a:this.max+or&&(this.finalTickAmt=r,r=5),this.tickAmount=r},adjustTickAmount:function(){var e,t,n=this.tickInterval,r=this.tickPositions,a=this.tickAmount,o=this.finalTickAmt,i=r&&r.length;if(a>i){for(;r.lengtha&&(this.tickInterval*=2,this.setTickPositions());if(u(o)){for(e=t=r.length;e--;)(3===o&&e%2===1||2>=o&&e>0&&t-1>e)&&r.splice(e,1);this.finalTickAmt=B}},setScale:function(){var e,t,n,r,a=this,o=a.stacks;if(a.oldMin=a.min,a.oldMax=a.max,a.oldAxisLength=a.len,a.setAxisSize(),r=a.len!==a.oldAxisLength,ht(a.series,function(e){(e.isDirtyData||e.isDirty||e.xAxis.isDirty)&&(n=!0)}),r||n||a.isLinked||a.forceRedraw||a.userMin!==a.oldUserMin||a.userMax!==a.oldUserMax){if(!a.isXAxis)for(e in o)for(t in o[e])o[e][t].total=null, +o[e][t].cum=0;a.forceRedraw=!1,a.getSeriesExtremes(),a.setTickInterval(),a.oldUserMin=a.userMin,a.oldUserMax=a.userMax,a.isDirty||(a.isDirty=r||a.min!==a.oldMin||a.max!==a.oldMax)}else if(!a.isXAxis){a.oldStacks&&(o=a.stacks=a.oldStacks);for(e in o)for(t in o[e])o[e][t].cum=o[e][t].total}},setExtremes:function(e,t,n,r,a){var o=this,i=o.chart;n=st(n,!0),ht(o.series,function(e){delete e.kdTree}),a=it(a,{min:e,max:t}),_t(o,"setExtremes",a,function(){o.userMin=e,o.userMax=t,o.eventArgs=a,o.isDirtyExtremes=!0,n&&i.redraw(r)})},zoom:function(e,t){var n=this.dataMin,r=this.dataMax,a=this.options;return this.allowZoomOutside||(u(n)&&e<=ve(n,st(a.min,n))&&(e=B),u(r)&&t>=be(r,st(a.max,r))&&(t=B)),this.displayBtn=e!==B||t!==B,this.setExtremes(e,t,!1,B,{trigger:"zoom"}),!0},setAxisSize:function(){var e=this.chart,t=this.options,n=t.offsetLeft||0,r=t.offsetRight||0,a=this.horiz,o=st(t.width,e.plotWidth-n+r),i=st(t.height,e.plotHeight),s=st(t.top,e.plotTop),l=st(t.left,e.plotLeft+n),u=/%$/;u.test(i)&&(i=parseFloat(i)/100*e.plotHeight),u.test(s)&&(s=parseFloat(s)/100*e.plotHeight+e.plotTop),this.left=l,this.top=s,this.width=o,this.height=i,this.bottom=e.chartHeight-i-s,this.right=e.chartWidth-o-l,this.len=be(a?o:i,0),this.pos=a?l:s},getExtremes:function(){var e=this,t=e.isLog;return{min:t?A(s(e.min)):e.min,max:t?A(s(e.max)):e.max,dataMin:e.dataMin,dataMax:e.dataMax,userMin:e.userMin,userMax:e.userMax}},getThreshold:function(e){var t=this,n=t.isLog,r=n?s(t.min):t.min,a=n?s(t.max):t.max;return null===e?e=0>a?a:r:r>e?e=r:e>a&&(e=a),t.translate(e,0,1,0,1)},autoLabelAlign:function(e){var t,n=(st(e,0)-90*this.side+720)%360;return t=n>15&&165>n?"right":n>195&&345>n?"left":"center"},unsquish:function(){var e,t,n,r=this.chart,a=this.ticks,o=this.options.labels,i=this.horiz,s=this.tickInterval,l=s,c=this.len/(((this.categories?1:0)+this.max-this.min)/s),d=o.rotation,p=r.renderer.fontMetrics(o.style.fontSize,a[0]&&a[0].label),f=Number.MAX_VALUE,h=function(e){var t=e/(c||1);return t=t>1?ye(t):1,t*s};return i?(n=u(d)?[d]:c=-90&&90>=n)&&(t=h(_e(p.h/ke(xe*n))),r=t+_e(n/360),f>r&&(f=r,e=n,l=t))})):l=h(p.h),this.autoRotation=n,this.labelRotation=e,l},renderUnsquish:function(){var t,r,a,o,i=this.chart,s=i.renderer,l=this.tickPositions,u=this.ticks,c=this.options.labels,d=this.horiz,p=i.margin,f=this.categories?l.length:l.length-1,h=this.slotWidth=d&&!c.step&&!c.rotation&&(this.staggerLines||1)*i.plotWidth/f||!d&&(p[3]&&p[3]-i.spacing[3]||.33*i.chartWidth),m=be(1,me(h-2*(c.padding||5))),g={},y=s.fontMetrics(c.style.fontSize,u[0]&&u[0].label),b=c.style.textOverflow,v=0;if(n(c.rotation)||(g.rotation=c.rotation),this.autoRotation)ht(l,function(e){e=u[e],e&&e.labelLength>v&&(v=e.labelLength)}),v>m&&v>y.h?g.rotation=this.labelRotation:this.labelRotation=0;else if(h&&(t={width:m+Xe},!b))for(t.textOverflow="clip",a=l.length;!d&&a--;)o=l[a],r=u[o].label,r&&("ellipsis"===r.styles.textOverflow&&r.css({textOverflow:"clip"}),r.getBBox().height>this.len/l.length-(y.h-y.f)&&(r.specCss={textOverflow:"ellipsis"}));g.rotation&&(t={width:(v>.5*i.chartHeight?.33*i.chartHeight:i.chartHeight)+Xe},b||(t.textOverflow="ellipsis")),this.labelAlign=g.align=c.align||this.autoLabelAlign(this.labelRotation),ht(l,function(n){var r=u[n],a=r&&r.label;a&&(t&&a.css(e(t,a.specCss)),delete a.specCss,a.attr(g),r.rotation=g.rotation)}),this.tickRotCorr=s.rotCorr(y.b,this.labelRotation||0,2===this.side)},hasData:function(){return this.hasVisibleSeries||u(this.min)&&u(this.max)&&!!this.tickPositions},getOffset:function(){var e,t,n,r,a,o,i,s=this,l=s.chart,c=l.renderer,d=s.options,p=s.tickPositions,f=s.ticks,h=s.horiz,m=s.side,g=l.inverted?[1,0,3,2][m]:m,y=0,b=0,v=d.title,_=d.labels,w=0,k=l.axisOffset,E=l.clipOffset,x=[-1,1,1,-1][m];if(e=s.hasData(),s.showAxis=t=e||st(d.showEmpty,!0),s.staggerLines=s.horiz&&_.staggerLines,s.axisGroup||(s.gridGroup=c.g("grid").attr({zIndex:d.gridZIndex||1}).add(),s.axisGroup=c.g("axis").attr({zIndex:d.zIndex||2}).add(),s.labelGroup=c.g("axis-labels").attr({zIndex:_.zIndex||7}).addClass(Ge+s.coll.toLowerCase()+"-labels").add()),e||s.isLinked)ht(p,function(e){f[e]?f[e].addLabel():f[e]=new N(s,e)}),s.renderUnsquish(),ht(p,function(e){(0===m||2===m||{1:"left",3:"right"}[m]===s.labelAlign)&&(w=be(f[e].getLabelSize(),w))}),s.staggerLines&&(w*=s.staggerLines,s.labelOffset=w);else for(o in f)f[o].destroy(),delete f[o];v&&v.text&&v.enabled!==!1&&(s.axisTitle||(s.axisTitle=c.text(v.text,0,0,v.useHTML).attr({zIndex:7,rotation:v.rotation||0,align:v.textAlign||{low:"left",middle:"center",high:"right"}[v.align]}).addClass(Ge+this.coll.toLowerCase()+"-title").css(v.style).add(s.axisGroup),s.axisTitle.isNew=!0),t&&(y=s.axisTitle.getBBox()[h?"height":"width"],n=v.offset,b=u(n)?0:st(v.margin,h?5:10)),s.axisTitle[t?"show":"hide"]()),s.offset=x*st(d.offset,k[m]),s.tickRotCorr=s.tickRotCorr||{x:0,y:0},i=2===m?s.tickRotCorr.y:0,r=w+b+(w&&x*(h?st(_.y,s.tickRotCorr.y+8):_.x)-i),s.axisTitleMargin=st(n,r),k[m]=be(k[m],s.axisTitleMargin+y+x*s.offset,r),a=2*ge(d.lineWidth/2),d.offset&&(a=be(0,a-d.offset)),E[g]=be(E[g],a)},getLinePath:function(e){var t=this.chart,n=this.opposite,r=this.offset,a=this.horiz,o=this.left+(n?this.width:0)+r,i=t.chartHeight-this.bottom-(n?this.height:0)+r;return n&&(e*=-1),t.renderer.crispLine([$e,a?this.left:o,a?i:this.top,Ze,a?t.chartWidth-this.right:o,a?i:t.chartHeight-this.bottom],e)},getTitlePosition:function(){var e=this.horiz,n=this.left,r=this.top,a=this.len,o=this.options.title,i=e?n:r,s=this.opposite,l=this.offset,u=o.x||0,c=o.y||0,d=t(o.style.fontSize||12),p={low:i+(e?0:a),middle:i+a/2,high:i+(e?a:0)}[o.align],f=(e?r+this.height:n)+(e?1:-1)*(s?-1:1)*this.axisTitleMargin+(2===this.side?d:0);return{x:e?p+u:f+(s?this.width:0)+l+u,y:e?f+c-(s?this.height:0)+l:p+c}},render:function(){var e,t,n,r=this,a=r.chart,o=a.renderer,i=r.options,l=r.isLog,c=r.isLinked,d=r.tickPositions,p=r.axisTitle,f=r.ticks,h=r.minorTicks,m=r.alternateBands,g=i.stackLabels,y=i.alternateGridColor,b=r.tickmarkOffset,v=i.lineWidth,_=a.hasRendered,w=_&&u(r.oldMin)&&!isNaN(r.oldMin),k=r.showAxis;r.labelEdge.length=0,r.overlap=!1,ht([f,h,m],function(e){var t;for(t in e)e[t].isActive=!1}),(r.hasData()||c)&&(r.minorTickInterval&&!r.categories&&ht(r.getMinorTickPositions(),function(e){h[e]||(h[e]=new N(r,e,"minor")),w&&h[e].isNew&&h[e].render(null,!0),h[e].render(null,!1,1)}),d.length&&(ht(d,function(e,t){(!c||e>=r.min&&e<=r.max)&&(f[e]||(f[e]=new N(r,e)),w&&f[e].isNew&&f[e].render(t,!0,.1),f[e].render(t))}),b&&(0===r.min||r.single)&&(f[-1]||(f[-1]=new N(r,-1,null,!0)),f[-1].render(-1))),y&&ht(d,function(e,a){a%2===0&&e=K.second?0:p*ge(c.getMilliseconds()/p)),d>=K.second&&c[oe](d>=K.minute?0:p*ge(c.getSeconds()/p)),d>=K.minute&&c[ie](d>=K.hour?0:p*ge(c[Z]()/p)),d>=K.hour&&c[se](d>=K.day?0:p*ge(c[Q]()/p)),d>=K.day&&c[le](d>=K.month?1:p*ge(c[te]()/p)),d>=K.month&&(c[ue](d>=K.year?0:p*ge(c[ne]()/p)),o=c[re]()),d>=K.year&&(o-=o%p,c[ce](o)),d===K.week&&c[le](c[te]()-c[ee]()+st(r,1)),a=1,(J||$)&&(c=c.getTime(),c=new Y(c+y(c))),o=c[re]();for(var f=c.getTime(),h=c[ne](),m=c[te](),g=(K.day+(l?y(c):60*c.getTimezoneOffset()*1e3))%K.day;n>f;)i.push(f),d===K.year?f=X(o+a*p,0):d===K.month?f=X(o,h+a*p):l||d!==K.day&&d!==K.week?f+=d*p:f=X(o,h,m+a*p*(d===K.day?1:7)),a++;i.push(f),ht(mt(i,function(e){return d<=K.hour&&e%K.day===g}),function(e){s[e]="day"})}return i.info=it(e,{higherRanks:s,totalRange:d*p}),i},It.prototype.normalizeTimeTickInterval=function(e,t){var n,r,a=t||[["millisecond",[1,2,5,10,20,25,50,100,200,500]],["second",[1,2,5,10,15,30]],["minute",[1,2,5,10,15,30]],["hour",[1,2,3,4,6,8,12]],["day",[1,2]],["week",[1,2]],["month",[1,2,3,4,6]],["year",null]],o=a[a.length-1],i=K[o[0]],s=o[1];for(r=0;r=e)break}return i===K.year&&5*i>e&&(s=[1,2,5]),n=w(e/i,s,"year"===o[0]?be(_(e/i),1):1),{unitRange:i,count:n,unitName:o[0]}},It.prototype.getLogTickPositions=function(e,t,n,r){var a=this,o=a.options,l=a.len,u=[];if(r||(a._minorAutoInterval=null),e>=.5)e=me(e),u=a.getLinearTickPositions(e,t,n);else if(e>=.08){var c,d,p,f,h,m,g,y=ge(t);for(c=e>.3?[1,2,4]:e>.15?[1,2,4,6,8]:[1,2,3,4,5,6,7,8,9],d=y;n+1>d&&!g;d++)for(f=c.length,p=0;f>p&&!g;p++)h=i(s(d)*c[p]),h>t&&(!r||n>=m)&&m!==B&&u.push(m),m>n&&(g=!0),m=h}else{var b=s(t),v=s(n),k=o[r?"minorTickInterval":"tickInterval"],E="auto"===k?null:k,x=o.tickPixelInterval/(r?5:1),O=r?l/a.tickPositions.length:l;e=st(E,a._minorAutoInterval,(v-b)*x/(O||1)),e=w(e,null,_(e)),u=yt(a.getLinearTickPositions(e,b,v),i),r||(a._minorAutoInterval=e/5)}return r||(a.tickInterval=e),u};var Rt=de.Tooltip=function(){this.init.apply(this,arguments)};Rt.prototype={init:function(e,n){var r=n.borderWidth,a=n.style,o=t(a.padding);this.chart=e,this.options=n,this.crosshairs=[],this.now={x:0,y:0},this.isHidden=!0,this.label=e.renderer.label("",0,0,n.shape||"callout",null,null,n.useHTML,null,"tooltip").attr({padding:o,fill:n.backgroundColor,"stroke-width":r,r:n.borderRadius,zIndex:8}).css(a).css({padding:0}).add().attr({y:-9999}),ze||this.label.shadow(n.shadow),this.shared=n.shared},destroy:function(){this.label&&(this.label=this.label.destroy()),clearTimeout(this.hideTimer),clearTimeout(this.tooltipTimeout)},move:function(e,t,n,r){var a=this,o=a.now,i=a.options.animation!==!1&&!a.isHidden&&(_e(e-o.x)>1||_e(t-o.y)>1),s=a.followPointer||a.len>1;it(o,{x:i?(2*o.x+e)/3:e,y:i?(o.y+t)/2:t,anchorX:s?B:i?(2*o.anchorX+n)/3:n,anchorY:s?B:i?(o.anchorY+r)/2:r}),a.label.attr(o),i&&(clearTimeout(this.tooltipTimeout),this.tooltipTimeout=setTimeout(function(){a&&a.move(e,t,n,r)},32))},hide:function(e){var t,n=this;clearTimeout(this.hideTimer),this.isHidden||(t=this.chart.hoverPoints,this.hideTimer=setTimeout(function(){n.label.fadeOut(),n.isHidden=!0},st(e,this.options.hideDelay,500)))},getAnchor:function(e,t){var n,r,a,o=this.chart,i=o.inverted,s=o.plotTop,l=o.plotLeft,u=0,c=0;return e=d(e),n=e[0].tooltipPos,this.followPointer&&t&&(t.chartX===B&&(t=o.pointer.normalize(t)),n=[t.chartX-o.plotLeft,t.chartY-s]),n||(ht(e,function(e){r=e.series.yAxis,a=e.series.xAxis,u+=e.plotX+(!i&&a?a.left-l:0),c+=(e.plotLow?(e.plotLow+e.plotHigh)/2:e.plotY)+(!i&&r?r.top-s:0)}),u/=e.length,c/=e.length,n=[i?o.plotWidth-c:u,this.shared&&!i&&e.length>1&&t?t.chartY-s:i?o.plotHeight-u:c]),yt(n,me)},getPosition:function(e,t,n){var r,a=this.chart,o=this.distance,i={},s=n.h||0,l=["y",a.chartHeight,t,n.plotY+a.plotTop],u=["x",a.chartWidth,e,n.plotX+a.plotLeft],c=st(n.ttBelow,a.inverted&&!n.negative||!a.inverted&&n.negative),d=function(e,t,n,r){var a=r-o>n,l=t>r+o+n,u=r-o-n,d=r+o;if(c&&l)i[e]=d;else if(!c&&a)i[e]=u;else if(a)i[e]=0>u-s?u:u-s;else{if(!l)return!1;i[e]=d+s+n>t?d:d+s}},p=function(e,t,n,r){return o>r||r>t-o?!1:void(n/2>r?i[e]=1:r>t-n/2?i[e]=t-n-2:i[e]=r-n/2)},f=function(e){var t=l;l=u,u=t,r=e},h=function(){d.apply(0,l)!==!1?p.apply(0,u)!==!1||r||(f(!0),h()):r?i.x=i.y=0:(f(!0),h())};return(a.inverted||this.len>1)&&f(),h(),i},defaultFormatter:function(e){var t,n=this.points||d(this);return t=[e.tooltipFooterHeaderFormatter(n[0])],t=t.concat(e.bodyFormatter(n)),t.push(e.tooltipFooterHeaderFormatter(n[0],!0)),t.join("")},refresh:function(e,t){var n,r,a,o,i,s,l=this,u=l.chart,c=l.label,p=l.options,f={},h=[],m=p.formatter||l.defaultFormatter,g=u.hoverPoints,y=l.shared;clearTimeout(this.hideTimer),l.followPointer=d(e)[0].series.tooltipOptions.followPointer,a=l.getAnchor(e,t),n=a[0],r=a[1],!y||e.series&&e.series.noSharedTooltip?f=e.getLabelConfig():(u.hoverPoints=e,g&&ht(g,function(e){e.setState()}),ht(e,function(e){e.setState(tt),h.push(e.getLabelConfig())}),f={x:e[0].category,y:e[0].y},f.points=h,this.len=h.length,e=e[0]),o=m.call(f,l),s=e.series,this.distance=st(s.tooltipOptions.distance,16),o===!1?this.hide():(l.isHidden&&(Et(c),c.attr("opacity",1).show()),c.attr({text:o}),i=p.borderColor||e.color||s.color||"#606060",c.attr({stroke:i}),l.updatePosition({plotX:n,plotY:r,negative:e.negative,ttBelow:e.ttBelow,h:a[2]||0}),this.isHidden=!1),_t(u,"tooltipRefresh",{text:o,x:n+u.plotLeft,y:r+u.plotTop,borderColor:i})},updatePosition:function(e){var t=this.chart,n=this.label,r=(this.options.positioner||this.getPosition).call(this,n.width,n.height,e);this.move(me(r.x),me(r.y||0),e.plotX+t.plotLeft,e.plotY+t.plotTop)},getXDateFormat:function(e,t,n){var r,a,o,i=t.dateTimeLabelFormats,s=n&&n.closestPointRange,l="01-01 00:00:00.000",u={millisecond:15,second:12,minute:9,hour:6,day:3},c="millisecond";if(s){o=H("%m-%d %H:%M:%S.%L",e.x);for(a in K){if(s===K.week&&+H("%w",e.x)===n.options.startOfWeek&&o.substr(6)===l.substr(6)){a="week";break}if(K[a]>s){a=c;break}if(u[a]&&o.substr(u[a])!==l.substr(u[a]))break;"week"!==a&&(c=a)}a&&(r=i[a])}else r=i.day;return r||i.year},tooltipFooterHeaderFormatter:function(e,t){var n=t?"footer":"header",r=e.series,a=r.tooltipOptions,i=a.xDateFormat,s=r.xAxis,l=s&&"datetime"===s.options.type&&o(e.key),u=a[n+"Format"];return l&&!i&&(i=this.getXDateFormat(e,a,s)),l&&i&&(u=u.replace("{point.key}","{point.key:"+i+"}")),v(u,{point:e,series:r})},bodyFormatter:function(e){return yt(e,function(e){var t=e.series.tooltipOptions;return(t.pointFormatter||e.point.tooltipFormatter).call(e.point,t.pointFormat)})}};var Bt;q=pe.documentElement.ontouchstart!==B;var Lt=de.Pointer=function(e,t){this.init(e,t)};if(Lt.prototype={init:function(e,t){var n,r,a=t.chart,o=a.events,i=ze?"":a.zoomType,s=e.inverted;this.options=t,this.chart=e,this.zoomX=n=/x/.test(i),this.zoomY=r=/y/.test(i),this.zoomHor=n&&!s||r&&s,this.zoomVert=r&&!s||n&&s,this.hasZoom=n||r,this.runChartClick=o&&!!o.click,this.pinchDown=[],this.lastValidTouch={},de.Tooltip&&t.tooltip.enabled&&(e.tooltip=new Rt(e,t.tooltip),this.followTouchMove=st(t.tooltip.followTouchMove,!0)),this.setDOMEvents()},normalize:function(e,t){var n,r,a;return e=e||window.event,e=wt(e),e.target||(e.target=e.srcElement),a=e.touches?e.touches.length?e.touches.item(0):e.changedTouches[0]:e,t||(this.chartPosition=t=gt(this.chart.container)),a.pageX===B?(n=be(e.x,e.clientX-t.left),r=e.y):(n=a.pageX-t.left,r=a.pageY-t.top),it(e,{chartX:me(n),chartY:me(r)})},getCoordinates:function(e){var t={xAxis:[],yAxis:[]};return ht(this.chart.axes,function(n){t[n.isXAxis?"xAxis":"yAxis"].push({axis:n,value:n.toValue(e[n.horiz?"chartX":"chartY"])})}),t},runPointActions:function(e){var t,n,r,a,o,i,s,l=this,u=l.chart,c=u.series,d=u.tooltip,p=d?d.shared:!1,f=u.hoverPoint,h=u.hoverSeries,m=u.chartWidth,g=[];if(!p&&!h)for(n=0;no?o=u:o>u+d&&(o=u+d),c>i?i=c:i>c+p&&(i=c+p),this.hasDragged=Math.sqrt(Math.pow(f-o,2)+Math.pow(h-i,2)),this.hasDragged>10&&(t=r.isInsidePlot(f-u,h-c),r.hasCartesianSeries&&(this.zoomX||this.zoomY)&&t&&!m&&(this.selectionMarker||(this.selectionMarker=r.renderer.rect(u,c,s?1:d,l?1:p,0).attr({fill:a.selectionMarkerFill||"rgba(69,114,167,0.25)",zIndex:7}).add())),this.selectionMarker&&s&&(n=o-f,this.selectionMarker.attr({width:_e(n),x:(n>0?0:n)+f})),this.selectionMarker&&l&&(n=i-h,this.selectionMarker.attr({height:_e(n),y:(n>0?0:n)+h})),t&&!this.selectionMarker&&a.panning&&r.pan(e,a.panning))},drop:function(e){var t=this,n=this.chart,r=this.hasPinched;if(this.selectionMarker){var a,o={xAxis:[],yAxis:[],originalEvent:e.originalEvent||e},i=this.selectionMarker,s=i.attr?i.attr("x"):i.x,l=i.attr?i.attr("y"):i.y,c=i.attr?i.attr("width"):i.width,d=i.attr?i.attr("height"):i.height;(this.hasDragged||r)&&(ht(n.axes,function(n){if(n.zoomEnabled&&u(n.min)&&(r||t[{xAxis:"zoomX",yAxis:"zoomY"}[n.coll]])){var i=n.horiz,p="touchend"===e.type?n.minPixelPadding:0,f=n.toValue((i?s:l)+p),h=n.toValue((i?s+c:l+d)-p);o[n.coll].push({axis:n,min:ve(f,h),max:be(f,h)}),a=!0}}),a&&_t(n,"selection",o,function(e){n.zoom(it(e,r?{animation:!1}:null))})),this.selectionMarker=this.selectionMarker.destroy(),r&&this.scaleGroups()}n&&(p(n.container,{cursor:n._cursor}),n.cancelClick=this.hasDragged>10,n.mouseIsDown=this.hasDragged=this.hasPinched=!1,this.pinchDown=[])},onContainerMouseDown:function(e){e=this.normalize(e),e.preventDefault&&e.preventDefault(),this.dragStart(e)},onDocumentMouseUp:function(e){Le[Bt]&&Le[Bt].pointer.drop(e)},onDocumentMouseMove:function(e){var t=this.chart,n=this.chartPosition;e=this.normalize(e,n),!n||this.inClass(e.target,"highcharts-tracker")||t.isInsidePlot(e.chartX-t.plotLeft,e.chartY-t.plotTop)||this.reset()},onContainerMouseLeave:function(){var e=Le[Bt];e&&(e.pointer.reset(),e.pointer.chartPosition=null)},onContainerMouseMove:function(e){var t=this.chart;Bt=t.index,e=this.normalize(e),e.returnValue=!1,"mousedown"===t.mouseIsDown&&this.drag(e),!this.inClass(e.target,"highcharts-tracker")&&!t.isInsidePlot(e.chartX-t.plotLeft,e.chartY-t.plotTop)||t.openMenu||this.runPointActions(e)},inClass:function(e,t){for(var n;e;){if(n=c(e,"class")){if(-1!==n.indexOf(t))return!0;if(-1!==n.indexOf(Ge+"container"))return!1}e=e.parentNode}},onTrackerMouseOut:function(e){var t=this.chart.hoverSeries,n=e.relatedTarget||e.toElement,r=n&&n.point&&n.point.series;!t||t.options.stickyTracking||this.inClass(n,Ge+"tooltip")||r===t||t.onMouseOut()},onContainerClick:function(e){var t=this.chart,n=t.hoverPoint,r=t.plotLeft,a=t.plotTop;e=this.normalize(e),e.originalEvent=e,t.cancelClick||(n&&this.inClass(e.target,Ge+"tracker")?(_t(n.series,"click",it(e,{point:n})),t.hoverPoint&&n.firePointEvent("click",e)):(it(e,this.getCoordinates(e)),t.isInsidePlot(e.chartX-r,e.chartY-a)&&_t(t,"click",e)))},setDOMEvents:function(){var e=this,t=e.chart.container;t.onmousedown=function(t){e.onContainerMouseDown(t)},t.onmousemove=function(t){e.onContainerMouseMove(t)},t.onclick=function(t){e.onContainerClick(t)},bt(t,"mouseleave",e.onContainerMouseLeave),1===qe&&bt(pe,"mouseup",e.onDocumentMouseUp),q&&(t.ontouchstart=function(t){e.onContainerTouchStart(t)},t.ontouchmove=function(t){e.onContainerTouchMove(t)},1===qe&&bt(pe,"touchend",e.onDocumentTouchEnd))},destroy:function(){var e;vt(this.chart.container,"mouseleave",this.onContainerMouseLeave),qe||(vt(pe,"mouseup",this.onDocumentMouseUp),vt(pe,"touchend",this.onDocumentTouchEnd)),clearInterval(this.tooltipTimeout);for(e in this)this[e]=null}},it(de.Pointer.prototype,{pinchTranslate:function(e,t,n,r,a,o){(this.zoomHor||this.pinchHor)&&this.pinchTranslateDirection(!0,e,t,n,r,a,o),(this.zoomVert||this.pinchVert)&&this.pinchTranslateDirection(!1,e,t,n,r,a,o)},pinchTranslateDirection:function(e,t,n,r,a,o,i,s){var l,u,c,d,p,f,h=this.chart,m=e?"x":"y",g=e?"X":"Y",y="chart"+g,b=e?"width":"height",v=h["plot"+(e?"Left":"Top")],_=s||1,w=h.inverted,k=h.bounds[e?"h":"v"],E=1===t.length,x=t[0][y],O=n[0][y],S=!E&&t[1][y],P=!E&&n[1][y],A=function(){!E&&_e(x-S)>20&&(_=s||_e(O-P)/_e(x-S)),c=(v-O)/_+x,l=h["plot"+(e?"Width":"Height")]/_};A(),u=c,uk.max&&(u=k.max-l,d=!0),d?(O-=.8*(O-i[m][0]),E||(P-=.8*(P-i[m][1])),A()):i[m]=[O,P],w||(o[m]=c-v,o[b]=l),f=w?e?"scaleY":"scaleX":"scale"+g,p=w?1/_:_,a[b]=l,a[m]=u,r[f]=_,r["translate"+g]=p*v+(O-p*x)},pinch:function(e){var t=this,n=t.chart,r=t.pinchDown,a=e.touches,o=a.length,i=t.lastValidTouch,s=t.hasZoom,l=t.selectionMarker,u={},c=1===o&&(t.inClass(e.target,Ge+"tracker")&&n.runTrackerClick||t.runChartClick),d={};o>1&&(t.initiated=!0),s&&t.initiated&&!c&&e.preventDefault(),yt(a,function(e){return t.normalize(e)}),"touchstart"===e.type?(ht(a,function(e,t){r[t]={chartX:e.chartX,chartY:e.chartY}}),i.x=[r[0].chartX,r[1]&&r[1].chartX],i.y=[r[0].chartY,r[1]&&r[1].chartY],ht(n.axes,function(e){if(e.zoomEnabled){var t=n.bounds[e.horiz?"h":"v"],r=e.minPixelPadding,a=e.toPixels(st(e.options.min,e.dataMin)),o=e.toPixels(st(e.options.max,e.dataMax)),i=ve(a,o),s=be(a,o);t.min=ve(e.pos,i-r),t.max=be(e.pos+e.len,s+r)}}),t.res=!0):r.length&&(l||(t.selectionMarker=l=it({destroy:Be},n.plotBox)),t.pinchTranslate(r,a,u,l,d,i),t.hasPinched=s,t.scaleGroups(u,d),!s&&t.followTouchMove&&1===o?this.runPointActions(t.normalize(e)):t.res&&(t.res=!1,this.reset(!1,0)))},touch:function(e,t){var n=this.chart;Bt=n.index,1===e.touches.length?(e=this.normalize(e),n.isInsidePlot(e.chartX-n.plotLeft,e.chartY-n.plotTop)&&!n.openMenu?(t&&this.runPointActions(e),this.pinch(e)):t&&this.reset()):2===e.touches.length&&this.pinch(e)},onContainerTouchStart:function(e){this.touch(e,!0)},onContainerTouchMove:function(e){this.touch(e)},onDocumentTouchEnd:function(e){Le[Bt]&&Le[Bt].pointer.drop(e)}}),fe.PointerEvent||fe.MSPointerEvent){var qt={},Ft=!!fe.PointerEvent,Ut=function(){var e,t=[];t.item=function(e){return this[e]};for(e in qt)qt.hasOwnProperty(e)&&t.push({pageX:qt[e].pageX,pageY:qt[e].pageY,target:qt[e].target});return t},Ht=function(e,t,n,r){var a;e=e.originalEvent||e,"touch"!==e.pointerType&&e.pointerType!==e.MSPOINTER_TYPE_TOUCH||!Le[Bt]||(r(e),a=Le[Bt].pointer,a[t]({type:n,target:e.currentTarget,preventDefault:Be,touches:Ut()}))};it(Lt.prototype,{onContainerPointerDown:function(e){Ht(e,"onContainerTouchStart","touchstart",function(e){qt[e.pointerId]={pageX:e.pageX,pageY:e.pageY,target:e.currentTarget}})},onContainerPointerMove:function(e){Ht(e,"onContainerTouchMove","touchmove",function(e){qt[e.pointerId]={pageX:e.pageX,pageY:e.pageY},qt[e.pointerId].target||(qt[e.pointerId].target=e.currentTarget)})},onDocumentPointerUp:function(e){Ht(e,"onDocumentTouchEnd","touchend",function(e){delete qt[e.pointerId]})},batchMSEvents:function(e){e(this.chart.container,Ft?"pointerdown":"MSPointerDown",this.onContainerPointerDown),e(this.chart.container,Ft?"pointermove":"MSPointerMove",this.onContainerPointerMove),e(pe,Ft?"pointerup":"MSPointerUp",this.onDocumentPointerUp)}}),lt(Lt.prototype,"init",function(e,t,n){e.call(this,t,n),this.hasZoom&&p(t.container,{"-ms-touch-action":Je,"touch-action":Je})}),lt(Lt.prototype,"setDOMEvents",function(e){e.apply(this),(this.hasZoom||this.followTouchMove)&&this.batchMSEvents(bt)}),lt(Lt.prototype,"destroy",function(e){this.batchMSEvents(vt),e.call(this)})}var Wt=de.Legend=function(e,t){this.init(e,t)};Wt.prototype={init:function(t,n){var r,a=this,o=n.itemStyle,i=n.itemMarginTop||0;this.options=n,n.enabled&&(a.itemStyle=o,a.itemHiddenStyle=e(o,n.itemHiddenStyle),a.itemMarginTop=i,a.padding=r=st(n.padding,8),a.initialItemX=r,a.initialItemY=r-5,a.maxItemWidth=0,a.chart=t,a.itemHeight=0,a.symbolWidth=st(n.symbolWidth,16),a.pages=[],a.render(),bt(a.chart,"endResize",function(){a.positionCheckboxes()}))},colorizeItem:function(e,t){var n,r,a=this,o=a.options,i=e.legendItem,s=e.legendLine,l=e.legendSymbol,u=a.itemHiddenStyle.color,c=t?o.itemStyle.color:u,d=t?e.legendColor||e.color||"#CCC":u,p=e.options&&e.options.marker,f={fill:d};if(i&&i.css({fill:c,color:c}),s&&s.attr({stroke:d}),l){if(p&&l.isMarker){f.stroke=d,p=e.convertAttribs(p);for(n in p)r=p[n],r!==B&&(f[n]=r)}l.attr(f)}},positionItem:function(e){var t=this,n=t.options,r=n.symbolPadding,a=!n.rtl,o=e._legendItemPos,i=o[0],s=o[1],l=e.checkbox,u=e.legendGroup;u&&u.element&&u.translate(a?i:t.legendWidth-i-2*r-4,s),l&&(l.x=i,l.y=s)},destroyItem:function(e){var t=e.checkbox;ht(["legendItem","legendLine","legendSymbol","legendGroup"],function(t){e[t]&&(e[t]=e[t].destroy())}),t&&S(e.checkbox)},destroy:function(){var e=this,t=e.group,n=e.box;n&&(e.box=n.destroy()),t&&(e.group=t.destroy())},positionCheckboxes:function(e){var t,n=this.group.alignAttr,r=this.clipHeight||this.legendHeight;n&&(t=n.translateY,ht(this.allItems,function(a){var o,i=a.checkbox;i&&(o=t+i.y+(e||0)+3,p(i,{left:n.translateX+a.checkboxOffset+i.x-20+Xe,top:o+Xe,display:o>t-6&&t+r-6>o?"":Je}))}))},renderTitle:function(){var e,t=this.options,n=this.padding,r=t.title,a=0;r.text&&(this.title||(this.title=this.chart.renderer.label(r.text,n-3,n-4,null,null,null,null,null,"legend-title").attr({zIndex:1}).css(r.style).add(this.group)),e=this.title.getBBox(),a=e.height,this.offsetWidth=e.width,this.contentGroup.attr({translateY:a})),this.titleHeight=a},setText:function(e){var t=this.options;e.legendItem.attr({text:t.labelFormat?v(t.labelFormat,e):t.labelFormatter.call(e)})},renderItem:function(t){var n,r,a,o=this,i=o.chart,s=i.renderer,l=o.options,u="horizontal"===l.layout,c=o.symbolWidth,d=l.symbolPadding,p=o.itemStyle,f=o.itemHiddenStyle,h=o.padding,m=u?st(l.itemDistance,20):0,g=!l.rtl,y=l.width,b=l.itemMarginBottom||0,v=o.itemMarginTop,_=o.initialItemX,w=t.legendItem,k=t.series&&t.series.drawLegendSymbol?t.series:t,E=k.options,x=o.createCheckboxForItem&&E&&E.showCheckbox,O=l.useHTML;w||(t.legendGroup=s.g("legend-item").attr({zIndex:1}).add(o.scrollGroup),t.legendItem=w=s.text("",g?c+d:-d,o.baseline||0,O).css(e(t.visible?p:f)).attr({align:g?"left":"right",zIndex:2}).add(t.legendGroup),o.baseline||(o.fontMetrics=s.fontMetrics(p.fontSize,w),o.baseline=o.fontMetrics.f+3+v,w.attr("y",o.baseline)),k.drawLegendSymbol(o,t),o.setItemEvents&&o.setItemEvents(t,w,O,p,f),o.colorizeItem(t,t.visible),x&&o.createCheckboxForItem(t)),o.setText(t),r=w.getBBox(),a=t.checkboxOffset=l.itemWidth||t.legendItemWidth||c+d+r.width+m+(x?20:0),o.itemHeight=n=me(t.legendItemHeight||r.height),u&&o.itemX-_+a>(y||i.chartWidth-2*h-_-l.x)&&(o.itemX=_,o.itemY+=v+o.lastLineHeight+b,o.lastLineHeight=0),o.maxItemWidth=be(o.maxItemWidth,a),o.lastItemY=v+o.itemY+b,o.lastLineHeight=be(n,o.lastLineHeight),t._legendItemPos=[o.itemX,o.itemY],u?o.itemX+=a:(o.itemY+=v+n+b,o.lastLineHeight=n),o.offsetWidth=y||be((u?o.itemX-_-m:a)+h,o.offsetWidth)},getAllItems:function(){var e=[];return ht(this.chart.series,function(t){var n=t.options;st(n.showInLegend,u(n.linkedTo)?!1:B,!0)&&(e=e.concat(t.legendItems||("point"===n.legendType?t.data:t)))}),e},adjustMargins:function(e,t){var n=this.chart,r=this.options,a=r.align[0]+r.verticalAlign[0]+r.layout[0];this.display&&!r.floating&&ht([/(lth|ct|rth)/,/(rtv|rm|rbv)/,/(rbh|cb|lbh)/,/(lbv|lm|ltv)/],function(o,i){o.test(a)&&!u(e[i])&&(n[rt[i]]=be(n[rt[i]],n.legend[(i+1)%2?"legendHeight":"legendWidth"]+[1,-1,-1,1][i]*r[i%2?"x":"y"]+st(r.margin,12)+t[i]))})},render:function(){var e,t,n,r,a=this,o=a.chart,i=o.renderer,s=a.group,l=a.box,u=a.options,c=a.padding,d=u.borderWidth,p=u.backgroundColor;a.itemX=a.initialItemX,a.itemY=a.initialItemY,a.offsetWidth=0,a.lastItemY=0,s||(a.group=s=i.g("legend").attr({zIndex:7}).add(),a.contentGroup=i.g().attr({zIndex:1}).add(s),a.scrollGroup=i.g().add(a.contentGroup)),a.renderTitle(),e=a.getAllItems(),k(e,function(e,t){return(e.options&&e.options.legendIndex||0)-(t.options&&t.options.legendIndex||0)}),u.reversed&&e.reverse(),a.allItems=e,a.display=t=!!e.length,a.lastLineHeight=0,ht(e,function(e){a.renderItem(e)}),n=(u.width||a.offsetWidth)+c,r=a.lastItemY+a.lastLineHeight+a.titleHeight,r=a.handleOverflow(r),r+=c,(d||p)&&(l?n>0&&r>0&&(l[l.isNew?"attr":"animate"](l.crisp({width:n,height:r})),l.isNew=!1):(a.box=l=i.rect(0,0,n,r,u.borderRadius,d||0).attr({stroke:u.borderColor,"stroke-width":d||0,fill:p||Je}).add(s).shadow(u.shadow),l.isNew=!0),l[t?"show":"hide"]()),a.legendWidth=n,a.legendHeight=r,ht(e,function(e){a.positionItem(e)}),t&&s.align(it({width:n,height:r},u),!0,"spacingBox"),o.isResizing||this.positionCheckboxes()},handleOverflow:function(e){var t,n,r=this,a=this.chart,o=a.renderer,i=this.options,s=i.y,l="top"===i.verticalAlign,u=a.spacingBox.height+(l?-s:s)-this.padding,c=i.maxHeight,d=this.clipRect,p=i.navigation,f=st(p.animation,!0),h=p.arrowSize||12,m=this.nav,g=this.pages,y=this.padding,b=this.allItems,v=function(e){d.attr({height:e}),r.contentGroup.div&&(r.contentGroup.div.style.clip="rect("+y+"px,9999px,"+(y+e)+"px,0)"); +};return"horizontal"===i.layout&&(u/=2),c&&(u=ve(u,c)),g.length=0,e>u?(this.clipHeight=t=be(u-20-this.titleHeight-y,0),this.currentPage=st(this.currentPage,1),this.fullHeight=e,ht(b,function(e,r){var a=e._legendItemPos[1],o=me(e.legendItem.getBBox().height),i=g.length;(!i||a-g[i-1]>t&&(n||a)!==g[i-1])&&(g.push(n||a),i++),r===b.length-1&&a+o-g[i-1]>t&&g.push(a),a!==n&&(n=a)}),d||(d=r.clipRect=o.clipRect(0,y,9999,0),r.contentGroup.clip(d)),v(t),m||(this.nav=m=o.g().attr({zIndex:1}).add(this.group),this.up=o.symbol("triangle",0,0,h,h).on("click",function(){r.scroll(-1,f)}).add(m),this.pager=o.text("",15,10).css(p.style).add(m),this.down=o.symbol("triangle-down",0,0,h,h).on("click",function(){r.scroll(1,f)}).add(m)),r.scroll(0),e=u):m&&(v(a.chartHeight),m.hide(),this.scrollGroup.attr({translateY:1}),this.clipHeight=0),e},scroll:function(e,t){var n,r=this.pages,a=r.length,o=this.currentPage+e,i=this.clipHeight,s=this.options.navigation,l=s.activeColor,u=s.inactiveColor,c=this.pager,d=this.padding;o>a&&(o=a),o>0&&(t!==B&&j(t,this.chart),this.nav.attr({translateX:d,translateY:i+this.padding+7+this.titleHeight,visibility:Ye}),this.up.attr({fill:1===o?u:l}).css({cursor:1===o?"default":"pointer"}),c.attr({text:o+"/"+a}),this.down.attr({x:18+this.pager.getBBox().width,fill:o===a?u:l}).css({cursor:o===a?"default":"pointer"}),n=-r[o-1]+this.initialItemY,this.scrollGroup.animate({translateY:n}),this.currentPage=o,this.positionCheckboxes(n))}};var Vt=de.LegendSymbolMixin={drawRectangle:function(e,t){var n=e.options.symbolHeight||e.fontMetrics.f;t.legendSymbol=this.chart.renderer.rect(0,e.baseline-n+1,e.symbolWidth,n,e.options.symbolRadius||0).attr({zIndex:3}).add(t.legendGroup)},drawLineMarker:function(e){var t,n,r,a=this.options,o=a.marker,i=e.symbolWidth,s=this.chart.renderer,l=this.legendGroup,u=e.baseline-me(.3*e.fontMetrics.b);a.lineWidth&&(r={"stroke-width":a.lineWidth},a.dashStyle&&(r.dashstyle=a.dashStyle),this.legendLine=s.path([$e,0,u,Ze,i,u]).attr(r).add(l)),o&&o.enabled!==!1&&(t=o.radius,this.legendSymbol=n=s.symbol(this.symbol,i/2-t,u-t,2*t,2*t).add(l),n.isMarker=!0)}};(/Trident\/7\.0/.test(Oe)||Ce)&<(Wt.prototype,"positionItem",function(e,t){var n=this,r=function(){t._legendItemPos&&e.call(n,t)};r(),setTimeout(r)});var Kt=de.Chart=function(){this.init.apply(this,arguments)};Kt.prototype={callbacks:[],init:function(t,n){var r,a=t.series;t.series=null,r=e(U,t),r.series=t.series=a,this.userOptions=t;var o=r.chart;this.margin=this.splashArray("margin",o),this.spacing=this.splashArray("spacing",o);var i=o.events;this.bounds={h:{},v:{}},this.callback=n,this.isResizing=0,this.options=r,this.axes=[],this.series=[],this.hasCartesianSeries=o.showAxes;var s,l=this;if(l.index=Le.length,Le.push(l),qe++,o.reflow!==!1&&bt(l,"load",function(){l.initReflow()}),i)for(s in i)bt(l,s,i[s]);l.xAxis=[],l.yAxis=[],l.animation=ze?!1:st(o.animation,!0),l.pointCount=l.colorCounter=l.symbolCounter=0,l.firstRender()},initSeries:function(e){var t,n=this,r=n.options.chart,a=e.type||r.type||r.defaultSeriesType,o=ot[a];return o||P(17,!0),t=new o,t.init(this,e),t},isInsidePlot:function(e,t,n){var r=n?t:e,a=n?e:t;return r>=0&&r<=this.plotWidth&&a>=0&&a<=this.plotHeight},redraw:function(e){var t,n,r,a=this,o=a.axes,i=a.series,s=a.pointer,l=a.legend,u=a.isDirtyLegend,c=a.hasCartesianSeries,d=a.isDirtyBox,p=i.length,f=p,h=a.renderer,m=h.isHidden(),g=[];for(j(e,a),m&&a.cloneRenderTo(),a.layOutTitles();f--;)if(r=i[f],r.options.stacking&&(t=!0,r.isDirty)){n=!0;break}if(n)for(f=p;f--;)r=i[f],r.options.stacking&&(r.isDirty=!0);ht(i,function(e){e.isDirty&&"point"===e.options.legendType&&(e.updateTotals&&e.updateTotals(),u=!0)}),u&&l.options.enabled&&(l.render(),a.isDirtyLegend=!1),t&&a.getStacks(),c&&(a.isResizing||(a.maxTicks=null,ht(o,function(e){e.setScale()}))),a.getMargins(),c&&(ht(o,function(e){e.isDirty&&(d=!0)}),ht(o,function(e){e.isDirtyExtremes&&(e.isDirtyExtremes=!1,g.push(function(){_t(e,"afterSetExtremes",it(e.eventArgs,e.getExtremes())),delete e.eventArgs})),(d||t)&&e.redraw()})),d&&a.drawChartBox(),ht(i,function(e){e.isDirty&&e.visible&&(!e.isCartesian||e.xAxis)&&e.redraw()}),s&&s.reset(!0),h.draw(),_t(a,"redraw"),m&&a.cloneRenderTo(!0),ht(g,function(e){e.call()})},get:function(e){var t,n,r,a=this,o=a.axes,i=a.series;for(t=0;t19?e.containerHeight:400))},cloneRenderTo:function(e){var t=this.renderToClone,n=this.container;e?t&&(this.renderTo.appendChild(n),S(t),delete this.renderToClone):(n&&n.parentNode===this.renderTo&&this.renderTo.removeChild(n),this.renderToClone=t=this.renderTo.cloneNode(0),p(t,{position:We,top:"-9999px",display:"block"}),t.style.setProperty&&t.style.setProperty("display","block","important"),pe.body.appendChild(t),n&&t.appendChild(n))},getContainer:function(){var e,r,a,o,i,s,l=this,u=l.options.chart,d="data-highcharts-chart";l.renderTo=o=u.renderTo,s=Ge+Re++,n(o)&&(l.renderTo=o=pe.getElementById(o)),o||P(13,!0),i=t(c(o,d)),!isNaN(i)&&Le[i]&&Le[i].hasRendered&&Le[i].destroy(),c(o,d,l.index),o.innerHTML="",u.skipClone||o.offsetWidth||l.cloneRenderTo(),l.getChartSize(),r=l.chartWidth,a=l.chartHeight,l.container=e=f(He,{className:Ge+"container"+(u.className?" "+u.className:""),id:s},it({position:Ve,overflow:Ke,width:r+Xe,height:a+Xe,textAlign:"left",lineHeight:"normal",zIndex:0,"-webkit-tap-highlight-color":"rgba(0,0,0,0)"},u.style),l.renderToClone||o),l._cursor=e.style.cursor,l.renderer=u.forExport?new Ct(e,r,a,u.style,!0):new L(e,r,a,u.style),ze&&l.renderer.create(l,e,r,a),l.renderer.chartIndex=l.index},getMargins:function(e){var t=this,n=t.spacing,r=t.margin,a=t.titleOffset;t.resetMargins(),a&&!u(r[0])&&(t.plotTop=be(t.plotTop,a+t.options.title.margin+n[0])),t.legend.adjustMargins(r,n),t.extraBottomMargin&&(t.marginBottom+=t.extraBottomMargin),t.extraTopMargin&&(t.plotTop+=t.extraTopMargin),e||this.getAxisMargins()},getAxisMargins:function(){var e=this,t=e.axisOffset=[0,0,0,0],n=e.margin;e.hasCartesianSeries&&ht(e.axes,function(e){e.getOffset()}),ht(rt,function(r,a){u(n[a])||(e[r]+=t[a])}),e.setChartSize()},reflow:function(e){var t=this,n=t.options.chart,r=t.renderTo,a=n.width||dt(r,"width"),o=n.height||dt(r,"height"),i=e?e.target:fe,s=function(){t.container&&(t.setSize(a,o,!1),t.hasUserSize=null)};t.hasUserSize||t.isPrinting||!a||!o||i!==fe&&i!==pe||((a!==t.containerWidth||o!==t.containerHeight)&&(clearTimeout(t.reflowTimeout),e?t.reflowTimeout=setTimeout(s,100):s()),t.containerWidth=a,t.containerHeight=o)},initReflow:function(){var e=this,t=function(t){e.reflow(t)};bt(fe,"resize",t),bt(e,"destroy",function(){vt(fe,"resize",t)})},setSize:function(e,t,n){var r,a,o,i=this;i.isResizing+=1,o=function(){i&&_t(i,"endResize",null,function(){i.isResizing-=1})},j(n,i),i.oldChartHeight=i.chartHeight,i.oldChartWidth=i.chartWidth,u(e)&&(i.chartWidth=r=be(0,me(e)),i.hasUserSize=!!r),u(t)&&(i.chartHeight=a=be(0,me(t))),(W?kt:p)(i.container,{width:r+Xe,height:a+Xe},W),i.setChartSize(!0),i.renderer.setSize(r,a,n),i.maxTicks=null,ht(i.axes,function(e){e.isDirty=!0,e.setScale()}),ht(i.series,function(e){e.isDirty=!0}),i.isDirtyLegend=!0,i.isDirtyBox=!0,i.layOutTitles(),i.getMargins(),i.redraw(n),i.oldChartHeight=null,_t(i,"resize"),W===!1?o():setTimeout(o,W&&W.duration||500)},setChartSize:function(e){var t,n,r,a,o,i,s,l=this,u=l.inverted,c=l.renderer,d=l.chartWidth,p=l.chartHeight,f=l.options.chart,h=l.spacing,m=l.clipOffset;l.plotLeft=r=me(l.plotLeft),l.plotTop=a=me(l.plotTop),l.plotWidth=o=be(0,me(d-r-l.marginRight)),l.plotHeight=i=be(0,me(p-a-l.marginBottom)),l.plotSizeX=u?i:o,l.plotSizeY=u?o:i,l.plotBorderWidth=f.plotBorderWidth||0,l.spacingBox=c.spacingBox={x:h[3],y:h[0],width:d-h[3]-h[1],height:p-h[0]-h[2]},l.plotBox=c.plotBox={x:r,y:a,width:o,height:i},s=2*ge(l.plotBorderWidth/2),t=ye(be(s,m[3])/2),n=ye(be(s,m[0])/2),l.clipBox={x:t,y:n,width:ge(l.plotSizeX-be(s,m[1])/2-t),height:be(0,ge(l.plotSizeY-be(s,m[2])/2-n))},e||ht(l.axes,function(e){e.setAxisSize(),e.setAxisTranslation()})},resetMargins:function(){var e=this;ht(rt,function(t,n){e[t]=st(e.margin[n],e.spacing[n])}),e.axisOffset=[0,0,0,0],e.clipOffset=[0,0,0,0]},drawChartBox:function(){var e,t,n=this,r=n.options.chart,a=n.renderer,o=n.chartWidth,i=n.chartHeight,s=n.chartBackground,l=n.plotBackground,u=n.plotBorder,c=n.plotBGImage,d=r.borderWidth||0,p=r.backgroundColor,f=r.plotBackgroundColor,h=r.plotBackgroundImage,m=r.plotBorderWidth||0,g=n.plotLeft,y=n.plotTop,b=n.plotWidth,v=n.plotHeight,_=n.plotBox,w=n.clipRect,k=n.clipBox;e=d+(r.shadow?8:0),(d||p)&&(s?s.animate(s.crisp({width:o-e,height:i-e})):(t={fill:p||Je},d&&(t.stroke=r.borderColor,t["stroke-width"]=d),n.chartBackground=a.rect(e/2,e/2,o-e,i-e,r.borderRadius,d).attr(t).addClass(Ge+"background").add().shadow(r.shadow))),f&&(l?l.animate(_):n.plotBackground=a.rect(g,y,b,v,0).attr({fill:f}).add().shadow(r.plotShadow)),h&&(c?c.animate(_):n.plotBGImage=a.image(h,g,y,b,v).add()),w?w.animate({width:k.width,height:k.height}):n.clipRect=a.clipRect(k),m&&(u?u.animate(u.crisp({x:g,y:y,width:b,height:v,strokeWidth:-m})):n.plotBorder=a.rect(g,y,b,v,0,-m).attr({stroke:r.plotBorderColor,"stroke-width":m,fill:Je,zIndex:1}).add()),n.isDirtyBox=!1},propFromSeries:function(){var e,t,n,r=this,a=r.options.chart,o=r.options.series;ht(["inverted","angular","polar"],function(i){for(e=ot[a.type||a.defaultSeriesType],n=r[i]||a[i]||e&&e.prototype[i],t=o&&o.length;!n&&t--;)e=ot[o[t].type],e&&e.prototype[i]&&(n=!0);r[i]=n})},linkSeries:function(){var e=this,t=e.series;ht(t,function(e){e.linkedSeries.length=0}),ht(t,function(t){var r=t.options.linkedTo;n(r)&&(r=":previous"===r?e.series[t.index-1]:e.get(r),r&&(r.linkedSeries.push(t),t.linkedParent=r))})},renderSeries:function(){ht(this.series,function(e){e.translate(),e.render()})},renderLabels:function(){var e=this,n=e.options.labels;n.items&&ht(n.items,function(r){var a=it(n.style,r.style),o=t(a.left)+e.plotLeft,i=t(a.top)+e.plotTop+12;delete a.left,delete a.top,e.renderer.text(r.html,o,i).attr({zIndex:2}).css(a).add()})},render:function(){var e,t,n,r,a=this,o=a.axes,i=a.renderer,s=a.options;a.setTitle(),a.legend=new Wt(a,s.legend),a.getStacks(),a.getMargins(!0),a.setChartSize(),e=a.plotWidth,t=a.plotHeight=a.plotHeight-13,ht(o,function(e){e.setScale()}),a.getAxisMargins(),n=e/a.plotWidth>1.1,r=t/a.plotHeight>1.1,(n||r)&&(a.maxTicks=null,ht(o,function(e){(e.horiz&&n||!e.horiz&&r)&&e.setTickInterval(!0)}),a.getMargins()),a.drawChartBox(),a.hasCartesianSeries&&ht(o,function(e){e.render()}),a.seriesGroup||(a.seriesGroup=i.g("series-group").attr({zIndex:3}).add()),a.renderSeries(),a.renderLabels(),a.showCredits(s.credits),a.hasRendered=!0},showCredits:function(e){e.enabled&&!this.credits&&(this.credits=this.renderer.text(e.text,0,0).on("click",function(){e.href&&(location.href=e.href)}).attr({align:e.position.align,zIndex:8}).css(e.style).add().align(e.position))},destroy:function(){var e,t=this,n=t.axes,r=t.series,a=t.container,o=a&&a.parentNode;for(_t(t,"destroy"),Le[t.index]=B,qe--,t.renderTo.removeAttribute("data-highcharts-chart"),vt(t),e=n.length;e--;)n[e]=n[e].destroy();for(e=r.length;e--;)r[e]=r[e].destroy();ht(["title","subtitle","chartBackground","plotBackground","plotBGImage","plotBorder","seriesGroup","clipRect","credits","pointer","scroller","rangeSelector","legend","resetZoomButton","tooltip","renderer"],function(e){var n=t[e];n&&n.destroy&&(t[e]=n.destroy())}),a&&(a.innerHTML="",vt(a),o&&S(a));for(e in t)delete t[e]},isReadyToRender:function(){var e=this;return!Me&&fe==fe.top&&"complete"!==pe.readyState||ze&&!fe.canvg?(ze?zt.push(function(){e.firstRender()},e.options.global.canvasToolsURL):pe.attachEvent("onreadystatechange",function(){pe.detachEvent("onreadystatechange",e.firstRender),"complete"===pe.readyState&&e.firstRender()}),!1):!0},firstRender:function(){var e=this,t=e.options,n=e.callback;e.isReadyToRender()&&(e.getContainer(),_t(e,"init"),e.resetMargins(),e.setChartSize(),e.propFromSeries(),e.getAxes(),ht(t.series||[],function(t){e.initSeries(t)}),e.linkSeries(),_t(e,"beforeRender"),de.Pointer&&(e.pointer=new Lt(e,t)),e.render(),e.renderer.draw(),n&&n.apply(e,[e]),ht(e.callbacks,function(t){e.index!==B&&t.apply(e,[e])}),_t(e,"load"),e.cloneRenderTo(!0))},splashArray:function(e,t){var n=t[e],a=r(n)?n:[n,n,n,n];return[st(t[e+"Top"],a[0]),st(t[e+"Right"],a[1]),st(t[e+"Bottom"],a[2]),st(t[e+"Left"],a[3])]}};var Gt=de.CenteredSeriesMixin={getCenter:function(){var e,t,n,r=this.options,a=this.chart,o=2*(r.slicedOffset||0),i=a.plotWidth-2*o,s=a.plotHeight-2*o,l=r.center,u=[st(l[0],"50%"),st(l[1],"50%"),r.size||"100%",r.innerSize||0],c=ve(i,s);for(t=0;4>t;++t)n=u[t],e=2>t||2===t&&/%$/.test(n),u[t]=g(n,[i,s,c,u[2]][t])+(e?o:0);return u}},Yt=function(){};Yt.prototype={init:function(e,t,n){var r,a=this;return a.series=e,a.color=e.color,a.applyOptions(t,n),a.pointAttr={},e.options.colorByPoint&&(r=e.options.colors||e.chart.options.colors,a.color=a.color||r[e.colorCounter++],e.colorCounter===r.length&&(e.colorCounter=0)),e.chart.pointCount++,a},applyOptions:function(e,t){var n=this,r=n.series,a=r.options.pointValKey||r.pointValKey;return e=Yt.prototype.optionsToObject.call(this,e),it(n,e),n.options=n.options?it(n.options,e):e,a&&(n.y=n[a]),n.x===B&&r&&(n.x=t===B?r.autoIncrement():t),n},optionsToObject:function(e){var t,n={},r=this.series,o=r.options.keys,i=o||r.pointArrayMap||["y"],s=i.length,l=0,u=0;if("number"==typeof e||null===e)n[i[0]]=e;else if(a(e))for(!o&&e.length>s&&(t=typeof e[0],"string"===t?n.name=e[0]:"number"===t&&(n.x=e[0]),l++);s>u;)n[i[u++]]=e[l++];else"object"==typeof e&&(n=e,e.dataLabels&&(r._hasPointLabels=!0),e.marker&&(r._hasPointMarkers=!0));return n},destroy:function(){var e,t=this,n=t.series,r=n.chart,a=r.hoverPoints;r.pointCount--,a&&(t.setState(),l(a,t),a.length||(r.hoverPoints=null)),t===r.hoverPoint&&t.onMouseOut(),(t.graphic||t.dataLabel)&&(vt(t),t.destroyElements()),t.legendItem&&r.legend.destroyItem(t);for(e in t)t[e]=null},destroyElements:function(){for(var e,t=this,n=["graphic","dataLabel","dataLabelUpper","group","connector","shadowGroup"],r=6;r--;)e=n[r],t[e]&&(t[e]=t[e].destroy())},getLabelConfig:function(){var e=this;return{x:e.category,y:e.y,key:e.name||e.category,series:e.series,point:e,percentage:e.percentage,total:e.total||e.stackTotal}},tooltipFormatter:function(e){var t=this.series,n=t.tooltipOptions,r=st(n.valueDecimals,""),a=n.valuePrefix||"",o=n.valueSuffix||"";return ht(t.pointArrayMap||["y"],function(t){t="{point."+t,(a||o)&&(e=e.replace(t+"}",a+t+"}"+o)),e=e.replace(t+"}",t+":,."+r+"f}")}),v(e,{point:this,series:this.series})},firePointEvent:function(e,t,n){var r=this,a=this.series,o=a.options;(o.point.events[e]||r.options&&r.options.events&&r.options.events[e])&&this.importEvents(),"click"===e&&o.allowPointSelect&&(n=function(e){r.select&&r.select(null,e.ctrlKey||e.metaKey||e.shiftKey)}),_t(this,e,t,n)}};var Xt=de.Series=function(){};Xt.prototype={isCartesian:!0,type:"line",pointClass:Yt,sorted:!0,requireSorting:!0,pointAttrToOptions:{stroke:"lineColor","stroke-width":"lineWidth",fill:"fillColor",r:"radius"},axisTypes:["xAxis","yAxis"],colorCounter:0,parallelArrays:["x","y"],init:function(e,t){var n,r,a=this,o=e.series,i=function(e,t){return st(e.options.index,e._i)-st(t.options.index,t._i)};a.chart=e,a.options=t=a.setOptions(t),a.linkedSeries=[],a.bindAxes(),it(a,{name:t.name,state:et,pointAttr:{},visible:t.visible!==!1,selected:t.selected===!0}),ze&&(t.animation=!1),r=t.events;for(n in r)bt(a,n,r[n]);(r&&r.click||t.point&&t.point.events&&t.point.events.click||t.allowPointSelect)&&(e.runTrackerClick=!0),a.getColor(),a.getSymbol(),ht(a.parallelArrays,function(e){a[e+"Data"]=[]}),a.setData(t.data,!1),a.isCartesian&&(e.hasCartesianSeries=!0),o.push(a),a._i=o.length-1,k(o,i),this.yAxis&&k(this.yAxis.series,i),ht(o,function(e,t){e.index=t,e.name=e.name||"Series "+(t+1)})},bindAxes:function(){var e,t=this,n=t.options,r=t.chart;ht(t.axisTypes||[],function(a){ht(r[a],function(r){e=r.options,(n[a]===e.index||n[a]!==B&&n[a]===e.id||n[a]===B&&0===e.index)&&(r.series.push(t),t[a]=r,r.isDirty=!0)}),t[a]||t.optionalAxis===a||P(18,!0)})},updateParallelArrays:function(e,t){var n=e.series,r=arguments,a="number"==typeof t?function(r){var a="y"===r&&n.toYData?n.toYData(e):e[r];n[r+"Data"][t]=a}:function(e){Array.prototype[t].apply(n[e+"Data"],Array.prototype.slice.call(r,2))};ht(n.parallelArrays,a)},autoIncrement:function(){var e,t,n=this.options,r=this.xIncrement,a=n.pointIntervalUnit;return r=st(r,n.pointStart,0),this.pointInterval=t=st(this.pointInterval,n.pointInterval,1),("month"===a||"year"===a)&&(e=new Y(r),e="month"===a?+e[ue](e[ne]()+t):+e[ce](e[re]()+t),t=e-r),this.xIncrement=r+t,r},getSegments:function(){var e,t=this,n=-1,r=[],a=t.points,o=a.length;if(o)if(t.options.connectNulls){for(e=o;e--;)null===a[e].y&&a.splice(e,1);a.length&&(r=[a])}else ht(a,function(e,t){null===e.y?(t>n+1&&r.push(a.slice(n+1,t)),n=t):t===o-1&&r.push(a.slice(n+1,t+1))});t.segments=r},setOptions:function(t){var n,r,a=this.chart,o=a.options,i=o.plotOptions,s=a.userOptions||{},l=s.plotOptions||{},c=i[this.type];return this.userOptions=t,n=e(c,i.series,t),this.tooltipOptions=e(U.tooltip,U.plotOptions[this.type].tooltip,s.tooltip,l.series&&l.series.tooltip,l[this.type]&&l[this.type].tooltip,t.tooltip),null===c.marker&&delete n.marker,this.zoneAxis=n.zoneAxis,r=this.zones=(n.zones||[]).slice(),!n.negativeColor&&!n.negativeFillColor||n.zones||r.push({value:n[this.zoneAxis+"Threshold"]||n.threshold||0,color:n.negativeColor,fillColor:n.negativeFillColor}),r.length&&u(r[r.length-1].value)&&r.push({color:this.color,fillColor:this.fillColor}),n},getCyclic:function(e,t,n){var r,a=this.userOptions,o="_"+e+"Index",i=e+"Counter";t||(u(a[o])?r=a[o]:(a[o]=r=this.chart[i]%n.length,this.chart[i]+=1),t=n[r]),this[e]=t},getColor:function(){this.options.colorByPoint||this.getCyclic("color",this.options.color||xt[this.type].color,this.chart.options.colors)},getSymbol:function(){var e=this.options.marker;this.getCyclic("symbol",e.symbol,this.chart.options.symbols),/^url/.test(this.symbol)&&(e.radius=0)},drawLegendSymbol:Vt.drawLineMarker,setData:function(e,t,r,i){var s,l,u,c=this,d=c.points,p=d&&d.length||0,f=c.options,h=c.chart,m=null,g=c.xAxis,y=g&&!!g.categories,b=f.turboThreshold,v=this.xData,_=this.yData,w=c.pointArrayMap,k=w&&w.length;if(e=e||[],s=e.length,t=st(t,!0),i!==!1&&s&&p===s&&!c.cropped&&!c.hasGroupedData&&c.visible)ht(e,function(e,t){d[t].update&&d[t].update(e,!1,null,!1)});else{if(c.xIncrement=null,c.pointRange=y?1:f.pointRange,c.colorCounter=0,ht(this.parallelArrays,function(e){c[e+"Data"].length=0}),b&&s>b){for(l=0;null===m&&s>l;)m=e[l],l++;if(o(m)){var E=st(f.pointStart,0),x=st(f.pointInterval,1);for(l=0;s>l;l++)v[l]=E,_[l]=e[l],E+=x;c.xIncrement=E}else if(a(m))if(k)for(l=0;s>l;l++)u=e[l],v[l]=u[0],_[l]=u.slice(1,k+1);else for(l=0;s>l;l++)u=e[l],v[l]=u[0],_[l]=u[1];else P(12)}else for(l=0;s>l;l++)e[l]!==B&&(u={series:c},c.pointClass.prototype.applyOptions.apply(u,[e[l]]),c.updateParallelArrays(u,l),y&&u.name&&(g.names[u.x]=u.name));for(n(_[0])&&P(14,!0),c.data=[],c.options.data=e,l=p;l--;)d[l]&&d[l].destroy&&d[l].destroy();g&&(g.minRange=g.userMinRange),c.isDirty=c.isDirtyData=h.isDirtyBox=!0,r=!1}t&&h.redraw(r)},processData:function(e){var t,n,r,a,o,i,s,l,u=this,c=u.xData,d=u.yData,p=c.length,f=0,h=u.xAxis,m=u.options,g=m.cropThreshold,y=u.isCartesian;if(y&&!u.isDirty&&!h.isDirty&&!u.yAxis.isDirty&&!e)return!1;for(h&&(i=h.getExtremes(),s=i.min,l=i.max),y&&u.sorted&&(!g||p>g||u.forceCrop)&&(c[p-1]l?(c=[],d=[]):(c[0]l)&&(t=this.cropData(u.xData,u.yData,s,l),c=t.xData,d=t.yData,f=t.start,n=!0)),o=c.length-1;o>=0;o--)r=c[o]-c[o-1],r>0&&(a===B||a>r)?a=r:0>r&&u.requireSorting&&P(15);u.cropped=n,u.cropStart=f,u.processedXData=c,u.processedYData=d,null===m.pointRange&&(u.pointRange=a||1),u.closestPointRange=a},cropData:function(e,t,n,r){var a,o=e.length,i=0,s=o,l=st(this.cropShoulder,1);for(a=0;o>a;a++)if(e[a]>=n){i=be(0,a-l);break}for(;o>a;a++)if(e[a]>r){s=a+l;break}return{xData:e.slice(i,s),yData:t.slice(i,s),start:i,end:s}},generatePoints:function(){var e,t,n,r,a=this,o=a.options,i=o.data,s=a.data,l=a.processedXData,u=a.processedYData,c=a.pointClass,p=l.length,f=a.cropStart||0,h=a.hasGroupedData,m=[];if(!s&&!h){var g=[];g.length=i.length,s=a.data=g}for(r=0;p>r;r++)t=f+r,h?m[r]=(new c).init(a,[l[r]].concat(d(u[r]))):(s[t]?n=s[t]:i[t]!==B&&(s[t]=n=(new c).init(a,i[t],l[r])),m[r]=n),m[r].index=t;if(s&&(p!==(e=s.length)||h))for(r=0;e>r;r++)r!==f||h||(r+=p),s[r]&&(s[r].destroyElements(),s[r].plotX=B);a.data=s,a.points=m},getExtremes:function(e){var t,n,r,a,o,i,s,l=this.xAxis,u=this.yAxis,c=this.processedXData,d=[],p=0,f=l.getExtremes(),h=f.min,m=f.max;for(e=e||this.stackedYData||this.processedYData,t=e.length,i=0;t>i;i++)if(a=c[i],o=e[i],n=null!==o&&o!==B&&(!u.isLog||o.length||o>0),r=this.getExtremesFromAll||this.options.getExtremesFromAll||this.cropped||(c[i+1]||a)>=h&&(c[i-1]||a)<=m,n&&r)if(s=o.length)for(;s--;)null!==o[s]&&(d[p++]=o[s]);else d[p++]=o;this.dataMin=E(d),this.dataMax=x(d)},translate:function(){this.processedXData||this.processData(),this.generatePoints();var e,t,n,r,a=this,i=a.options,s=i.stacking,l=a.xAxis,c=l.categories,d=a.yAxis,p=a.points,f=p.length,h=!!a.modifyValue,m=i.pointPlacement,g="between"===m||o(m),y=i.threshold,b=i.startFromThreshold?y:0,v=Number.MAX_VALUE;for(e=0;f>e;e++){var _,w,k=p[e],E=k.x,x=k.y,O=k.low,S=s&&d.stacks[(a.negStacks&&(b?0:y)>x?"-":"")+a.stackKey];d.isLog&&null!==x&&0>=x&&(k.y=x=null,P(10)),k.plotX=t=ve(be(-1e5,l.translate(E,0,0,0,1,m,"flags"===this.type)),1e5),s&&a.visible&&S&&S[E]&&(_=S[E],w=_.points[a.index+","+e],O=w[0],x=w[1],O===b&&(O=st(y,d.min)),d.isLog&&0>=O&&(O=null),k.total=k.stackTotal=_.total,k.percentage=_.total&&k.y/_.total*100,k.stackY=x,_.setOffset(a.pointXOffset||0,a.barW||0)),k.yBottom=u(O)?d.translate(O,0,1,0,1):null,h&&(x=a.modifyValue(x,k)),k.plotY=n="number"==typeof x&&x!==1/0?ve(be(-1e5,d.translate(x,0,1,0,1)),1e5):B,k.isInside=n!==B&&n>=0&&n<=d.len&&t>=0&&t<=l.len,k.clientX=g?l.translate(E,0,0,0,1):t,k.negative=k.y<(y||0),k.category=c&&c[k.x]!==B?c[k.x]:k.x,e&&(v=ve(v,_e(t-r))),r=t}a.closestPointRangePx=v,a.getSegments()},setClip:function(e){var t=this.chart,n=t.renderer,r=t.inverted,a=this.clipBox,o=a||t.clipBox,i=this.sharedClipKey||["_sharedClip",e&&e.duration,e&&e.easing,o.height].join(","),s=t[i],l=t[i+"m"];s||(e&&(o.width=0,t[i+"m"]=l=n.clipRect(-99,r?-t.plotLeft:-t.plotTop,99,r?t.chartWidth:t.chartHeight)),t[i]=s=n.clipRect(o)),e&&(s.count+=1),this.options.clip!==!1&&(this.group.clip(e||a?s:t.clipRect),this.markerGroup.clip(l),this.sharedClipKey=i),e||(s.count-=1,s.count<=0&&i&&t[i]&&(a||(t[i]=t[i].destroy()),t[i+"m"]&&(t[i+"m"]=t[i+"m"].destroy())))},animate:function(e){var t,n,a=this,o=a.chart,i=a.options.animation;i&&!r(i)&&(i=xt[a.type].animation),e?a.setClip(i):(n=this.sharedClipKey,t=o[n],t&&t.animate({width:o.plotSizeX},i),o[n+"m"]&&o[n+"m"].animate({width:o.plotSizeX+99},i),a.animate=null)},afterAnimate:function(){this.setClip(),_t(this,"afterAnimate")},drawPoints:function(){var e,t,n,r,a,o,i,s,l,u,c,d,p,f=this,h=f.points,m=f.chart,g=f.options,y=g.marker,b=f.pointAttr[""],v=f.markerGroup,_=f.xAxis,w=st(y.enabled,_.isRadial,f.closestPointRangePx>2*y.radius);if(y.enabled!==!1||f._hasPointMarkers)for(r=h.length;r--;)a=h[r],t=ge(a.plotX),n=a.plotY,l=a.graphic,u=a.marker||{},c=!!a.marker,d=w&&u.enabled===B||u.enabled,p=a.isInside,d&&n!==B&&!isNaN(n)&&null!==a.y?(e=a.pointAttr[a.selected?nt:et]||b,o=e.r,i=st(u.symbol,f.symbol),s=0===i.indexOf("url"),l?l[p?"show":"hide"](!0).animate(it({x:t-o,y:n-o},l.symbolName?{width:2*o,height:2*o}:{})):p&&(o>0||s)&&(a.graphic=l=m.renderer.symbol(i,t-o,n-o,2*o,2*o,c?u:y).attr(e).add(v))):l&&(a.graphic=l.destroy())},convertAttribs:function(e,t,n,r){var a,o,i=this.pointAttrToOptions,s={};e=e||{},t=t||{},n=n||{},r=r||{};for(a in i)o=i[a],s[a]=st(e[o],t[a],n[a],r[a]);return s},getAttribs:function(){var e,t,n,r,a,o,i=this,s=i.options,l=xt[i.type].marker?s.marker:s,c=l.states,d=c[tt],p=i.color,f=i.options.negativeColor,h={stroke:p,fill:p},m=i.points||[],g=[],y=i.pointAttrToOptions,b=i.hasPointSpecificOptions,v=l.lineColor,_=l.fillColor,w=s.turboThreshold,k=i.zones,E=i.zoneAxis||"y";if(s.marker?(d.radius=d.radius||l.radius+d.radiusPlus,d.lineWidth=d.lineWidth||l.lineWidth+d.lineWidthPlus):(d.color=d.color||jt(d.color||p).brighten(d.brightness).get(),d.negativeColor=d.negativeColor||jt(d.negativeColor||f).brighten(d.brightness).get()),g[et]=i.convertAttribs(l,h),ht([tt,nt],function(e){g[e]=i.convertAttribs(c[e],g[et])}),i.pointAttr=g,t=m.length,!w||w>t||b)for(;t--;){if(n=m[t],l=n.options&&n.options.marker||n.options,l&&l.enabled===!1&&(l.radius=0),k.length){for(var x=0,O=k[x];n[E]>=O.value;)O=k[++x];n.color=n.fillColor=O.color}if(b=s.colorByPoint||n.color,n.options)for(o in y)u(l[y[o]])&&(b=!0);b?(l=l||{},r=[],c=l.states||{},e=c[tt]=c[tt]||{},s.marker||(e.color=e.color||!n.options.color&&d[n.negative&&f?"negativeColor":"color"]||jt(n.color).brighten(e.brightness||d.brightness).get()),a={color:n.color},_||(a.fillColor=n.color),v||(a.lineColor=n.color),l.hasOwnProperty("color")&&!l.color&&delete l.color,r[et]=i.convertAttribs(it(a,l),g[et]),r[tt]=i.convertAttribs(c[tt],g[tt],r[et]),r[nt]=i.convertAttribs(c[nt],g[nt],r[et])):r=g,n.pointAttr=r}},destroy:function(){var e,t,n,r,a,o=this,i=o.chart,s=/AppleWebKit\/533/.test(Oe),u=o.data||[];for(_t(o,"destroy"),vt(o),ht(o.axisTypes||[],function(e){a=o[e],a&&(l(a.series,o),a.isDirty=a.forceRedraw=!0)}),o.legendItem&&o.chart.legend.destroyItem(o),t=u.length;t--;)n=u[t],n&&n.destroy&&n.destroy();o.points=null,clearTimeout(o.animationTimeout);for(r in o)o[r]instanceof M&&!o[r].survive&&(e=s&&"group"===r?"hide":"destroy",o[r][e]());i.hoverSeries===o&&(i.hoverSeries=null),l(i.series,o);for(r in o)delete o[r]},getSegmentPath:function(e){var t=this,n=[],r=t.options.step;return ht(e,function(a,o){var i,s=a.plotX,l=a.plotY;t.getPointSpline?n.push.apply(n,t.getPointSpline(e,a,o)):(n.push(o?Ze:$e),r&&o&&(i=e[o-1],"right"===r?n.push(i.plotX,l):"center"===r?n.push((i.plotX+s)/2,i.plotY,(i.plotX+s)/2,l):n.push(s,i.plotY)),n.push(a.plotX,a.plotY))}),n},getGraphPath:function(){var e,t=this,n=[],r=[];return ht(t.segments,function(a){e=t.getSegmentPath(a),a.length>1?n=n.concat(e):r.push(a[0])}),t.singlePoints=r,t.graphPath=n,n},drawGraph:function(){var e=this,t=this.options,n=[["graph",t.lineColor||this.color,t.dashStyle]],r=t.lineWidth,a="square"!==t.linecap,o=this.getGraphPath(),i=this.fillGraph&&this.color||Je,s=this.zones;ht(s,function(r,a){n.push(["zoneGraph"+a,r.color||e.color,r.dashStyle||t.dashStyle])}),ht(n,function(n,s){var l,u=n[0],c=e[u];c?(Et(c),c.animate({d:o})):(r||i)&&o.length&&(l={stroke:n[1],"stroke-width":r,fill:i,zIndex:1},n[2]?l.dashstyle=n[2]:a&&(l["stroke-linecap"]=l["stroke-linejoin"]="round"),e[u]=e.chart.renderer.path(o).attr(l).add(e.group).shadow(2>s&&t.shadow))})},applyZones:function(){var e,t,n,r,a,o,i,s=this,l=this.chart,u=l.renderer,c=this.zones,d=this.clips||[],p=this.graph,f=this.area,h=be(l.chartWidth,l.chartHeight),m=this.zoneAxis||"y",g=this[m+"Axis"],y=g.reversed,b=l.inverted,v=g.horiz,_=!1;c.length&&(p||f)&&(p&&p.hide(),f&&f.hide(),r=g.getExtremes(),ht(c,function(c,m){e=y?v?l.plotWidth:0:v?0:g.toPixels(r.min),e=ve(be(st(t,e),0),h),t=ve(be(me(g.toPixels(st(c.value,r.max),!0)),0),h),_&&(e=t=g.toPixels(r.max)),a=Math.abs(e-t),o=ve(e,t),i=be(e,t),g.isXAxis?(n={x:b?i:o,y:0,width:a,height:h},v||(n.x=l.plotHeight-n.x)):(n={x:0,y:b?i:o,width:h,height:a},v&&(n.y=l.plotWidth-n.y)),l.inverted&&u.isVML&&(n=g.isXAxis?{x:0,y:y?o:i,height:n.width,width:l.chartWidth}:{x:n.y-l.plotLeft-l.spacingBox.x,y:0,width:n.height,height:l.chartHeight}),d[m]?d[m].animate(n):(d[m]=u.clipRect(n),p&&s["zoneGraph"+m].clip(d[m]),f&&s["zoneArea"+m].clip(d[m])),_=c.value>r.max}),this.clips=d)},invertGroups:function(){function e(){var e={width:t.yAxis.len,height:t.xAxis.len};ht(["group","markerGroup"],function(n){t[n]&&t[n].attr(e).invert()})}var t=this,n=t.chart;t.xAxis&&(bt(n,"resize",e),bt(t,"destroy",function(){vt(n,"resize",e)}),e(),t.invertGroups=e)},plotGroup:function(e,t,n,r,a){var o=this[e],i=!o;return i&&(this[e]=o=this.chart.renderer.g(t).attr({visibility:n,zIndex:r||.1}).add(a)),o[i?"attr":"animate"](this.getPlotBox()),o},getPlotBox:function(){var e=this.chart,t=this.xAxis,n=this.yAxis;return e.inverted&&(t=n,n=this.xAxis),{translateX:t?t.left:e.plotLeft,translateY:n?n.top:e.plotTop,scaleX:1,scaleY:1}},render:function(){var e,t=this,n=t.chart,r=t.options,a=r.animation,o=a&&!!t.animate&&n.renderer.isSVG&&st(a.duration,500)||0,i=t.visible?Ye:Ke,s=r.zIndex,l=t.hasRendered,u=n.seriesGroup;e=t.plotGroup("group","series",i,s,u),t.markerGroup=t.plotGroup("markerGroup","markers",i,s,u),o&&t.animate(!0),t.getAttribs(),e.inverted=t.isCartesian?n.inverted:!1,t.drawGraph&&(t.drawGraph(),t.applyZones()),ht(t.points,function(e){e.redraw&&e.redraw()}),t.drawDataLabels&&t.drawDataLabels(),t.visible&&t.drawPoints(),t.drawTracker&&t.options.enableMouseTracking!==!1&&t.drawTracker(),n.inverted&&t.invertGroups(),r.clip===!1||t.sharedClipKey||l||e.clip(n.clipRect),o&&t.animate(),l||(o?t.animationTimeout=setTimeout(function(){t.afterAnimate()},o):t.afterAnimate()),t.isDirty=t.isDirtyData=!1,t.hasRendered=!0},redraw:function(){var e=this,t=e.chart,n=e.isDirtyData,r=e.isDirty,a=e.group,o=e.xAxis,i=e.yAxis;a&&(t.inverted&&a.attr({width:t.plotWidth,height:t.plotHeight}),a.animate({translateX:st(o&&o.left,t.plotLeft),translateY:st(i&&i.top,t.plotTop)})),e.translate(),e.render(),n&&_t(e,"updatedData"),(r||n)&&delete this.kdTree},kdDimensions:1,kdAxisArray:["clientX","plotY"],searchPoint:function(e,t){var n=this,r=n.xAxis,a=n.yAxis,o=n.chart.inverted;return this.searchKDTree({clientX:o?r.len-e.chartY+r.pos:e.chartX-r.pos,plotY:o?a.len-e.chartX+a.pos:e.chartY-a.pos},t)},buildKDTree:function(){function e(t,r,a){var o,i,s=t&&t.length;return s?(o=n.kdAxisArray[r%a],t.sort(function(e,t){return e[o]-t[o]; +}),i=Math.floor(s/2),{point:t[i],left:e(t.slice(0,i),r+1,a),right:e(t.slice(i+1),r+1,a)}):void 0}function t(){var t=mt(n.points,function(e){return null!==e.y});n.kdTree=e(t,r,r)}var n=this,r=n.kdDimensions;delete n.kdTree,n.options.kdSync?t():setTimeout(t)},searchKDTree:function(e,t){function n(e,t){var n=u(e[o])&&u(t[o])?Math.pow(e[o]-t[o],2):null,r=u(e[i])&&u(t[i])?Math.pow(e[i]-t[i],2):null,a=(n||0)+(r||0);t.dist=u(a)?Math.sqrt(a):Number.MAX_VALUE,t.distX=u(n)?Math.sqrt(n):Number.MAX_VALUE}function r(e,t,o,i){var l,u,c,d,p,f=t.point,h=a.kdAxisArray[o%i],m=f;return n(e,f),l=e[h]-f[h],u=0>l?"left":"right",c=0>l?"right":"left",t[u]&&(d=r(e,t[u],o+1,i),m=d[s]o;o++)i=u[o],s=c[o],a=l.index+","+o,e=_&&(m?0:h)>s,r=e?v:b,k[r]||(k[r]={}),k[r][i]||(E[r]&&E[r][i]?(k[r][i]=E[r][i],k[r][i].total=null):k[r][i]=new z(w,w.options.stackLabels,e,i,g)),t=k[r][i],t.points[a]=[st(t.cum,m)],"percent"===y?(n=e?b:v,_&&k[n]&&k[n][i]?(n=k[n][i],t.total=n.total=be(n.total,t.total)+_e(s)||0):t.total=A(t.total+(_e(s)||0))):t.total=A(t.total+(s||0)),t.cum=st(t.cum,m)+(s||0),t.points[a].push(t.cum),d[o]=t.cum;"percent"===y&&(w.usePercentage=!0),this.stackedYData=d,w.oldStacks={}}},Xt.prototype.setPercentStacks=function(){var e=this,t=e.stackKey,n=e.yAxis.stacks,r=e.processedXData;ht([t,"-"+t],function(t){for(var a,o,i,s,l=r.length;l--;)a=r[l],o=n[t]&&n[t][a],i=o&&o.points[e.index+","+l],i&&(s=o.total?100/o.total:0,i[0]=A(i[0]*s),i[1]=A(i[1]*s),e.stackedYData[l]=i[1])})},it(Kt.prototype,{addSeries:function(e,t,n){var r,a=this;return e&&(t=st(t,!0),_t(a,"addSeries",{options:e},function(){r=a.initSeries(e),a.isDirtyLegend=!0,a.linkSeries(),t&&a.redraw(n)})),r},addAxis:function(t,n,r,a){var o,i=n?"xAxis":"yAxis",s=this.options;o=new It(this,e(t,{index:this[i].length,isX:n})),s[i]=d(s[i]||{}),s[i].push(t),st(r,!0)&&this.redraw(a)},showLoading:function(e){var t=this,n=t.options,r=t.loadingDiv,a=n.loading,o=function(){r&&p(r,{left:t.plotLeft+Xe,top:t.plotTop+Xe,width:t.plotWidth+Xe,height:t.plotHeight+Xe})};r||(t.loadingDiv=r=f(He,{className:Ge+"loading"},it(a.style,{zIndex:10,display:Je}),t.container),t.loadingSpan=f("span",null,a.labelStyle,r),bt(t,"redraw",o)),t.loadingSpan.innerHTML=e||n.lang.loading,t.loadingShown||(p(r,{opacity:0,display:""}),kt(r,{opacity:a.style.opacity},{duration:a.showDuration||0}),t.loadingShown=!0),o()},hideLoading:function(){var e=this.options,t=this.loadingDiv;t&&kt(t,{opacity:0},{duration:e.loading.hideDuration||100,complete:function(){p(t,{display:Je})}}),this.loadingShown=!1}}),it(Yt.prototype,{update:function(e,t,n,o){function i(){l.applyOptions(e),null===l.y&&c&&(l.graphic=c.destroy()),r(e)&&!a(e)&&(l.redraw=function(){c&&(e&&e.marker&&e.marker.symbol?l.graphic=c.destroy():c.attr(l.pointAttr[l.state||""])[l.visible===!1?"hide":"show"]()),e&&e.dataLabels&&l.dataLabel&&(l.dataLabel=l.dataLabel.destroy()),l.redraw=null}),s=l.index,u.updateParallelArrays(l,s),f&&l.name&&(f[l.x]=l.name),p.data[s]=l.options,u.isDirty=u.isDirtyData=!0,!u.fixedBox&&u.hasCartesianSeries&&(d.isDirtyBox=!0),"point"===p.legendType&&(d.isDirtyLegend=!0),t&&d.redraw(n)}var s,l=this,u=l.series,c=l.graphic,d=u.chart,p=u.options,f=u.xAxis&&u.xAxis.names;t=st(t,!0),o===!1?i():l.firePointEvent("update",{options:e},i)},remove:function(e,t){this.series.removePoint(ft(this,this.series.data),e,t)}}),it(Xt.prototype,{addPoint:function(e,t,n,r){var a,o,i,s,l=this,u=l.options,c=l.data,d=l.graph,p=l.area,f=l.chart,h=l.xAxis&&l.xAxis.names,m=d&&d.shift||0,g=["graph","area"],y=u.data,b=l.xData;if(j(r,f),n){for(i=l.zones.length;i--;)g.push("zoneGraph"+i,"zoneArea"+i);ht(g,function(e){l[e]&&(l[e].shift=m+1)})}if(p&&(p.isArea=!0),t=st(t,!0),a={series:l},l.pointClass.prototype.applyOptions.apply(a,[e]),s=a.x,i=b.length,l.requireSorting&&ss;)i--;l.updateParallelArrays(a,"splice",i,0,0),l.updateParallelArrays(a,i),h&&a.name&&(h[s]=a.name),y.splice(i,0,e),o&&(l.data.splice(i,0,null),l.processData()),"point"===u.legendType&&l.generatePoints(),n&&(c[0]&&c[0].remove?c[0].remove(!1):(c.shift(),l.updateParallelArrays(a,"shift"),y.shift())),l.isDirty=!0,l.isDirtyData=!0,t&&(l.getAttribs(),f.redraw())},removePoint:function(e,t,n){var r=this,a=r.data,o=a[e],i=r.points,s=r.chart,l=function(){a.length===i.length&&i.splice(e,1),a.splice(e,1),r.options.data.splice(e,1),r.updateParallelArrays(o||{series:r},"splice",e,1),o&&o.destroy(),r.isDirty=!0,r.isDirtyData=!0,t&&s.redraw()};j(n,s),t=st(t,!0),o?o.firePointEvent("remove",null,l):l()},remove:function(e,t){var n=this,r=n.chart;e=st(e,!0),n.isRemoving||(n.isRemoving=!0,_t(n,"remove",null,function(){n.destroy(),r.isDirtyLegend=r.isDirtyBox=!0,r.linkSeries(),e&&r.redraw(t)})),n.isRemoving=!1},update:function(t,n){var r,a=this,o=this.chart,i=this.userOptions,s=this.type,l=ot[s].prototype,u=["group","markerGroup","dataLabelsGroup"];(t.type&&t.type!==s||void 0!==t.zIndex)&&(u.length=0),ht(u,function(e){u[e]=a[e],delete a[e]}),t=e(i,{animation:!1,index:this.index,pointStart:this.xData[0]},{data:this.options.data},t),this.remove(!1);for(r in l)this[r]=B;it(this,ot[t.type||s].prototype),ht(u,function(e){a[e]=u[e]}),this.init(o,t),o.linkSeries(),st(n,!0)&&o.redraw(!1)}}),it(It.prototype,{update:function(t,n){var r=this.chart;t=r.options[this.coll][this.options.index]=e(this.userOptions,t),this.destroy(!0),this._addedPlotLB=this.chart._labelPanes=B,this.init(r,it(t,{events:B})),r.isDirtyBox=!0,st(n,!0)&&r.redraw()},remove:function(e){for(var t=this.chart,n=this.coll,r=this.series,a=r.length;a--;)r[a]&&r[a].remove(!1);l(t.axes,this),l(t[n],this),t.options[n].splice(this.options.index,1),ht(t[n],function(e,t){e.options.index=t}),this.destroy(),t.isDirtyBox=!0,st(e,!0)&&t.redraw()},setTitle:function(e,t){this.update({title:e},t)},setCategories:function(e,t){this.update({categories:e},t)}});var Jt=h(Xt);ot.line=Jt,xt.area=e(Ot,{threshold:0});var $t=h(Xt,{type:"area",getSegments:function(){var e,t,n,r,a=this,o=[],i=[],s=[],l=this.xAxis,u=this.yAxis,c=u.stacks[this.stackKey],d={},p=this.points,f=this.options.connectNulls;if(this.options.stacking&&!this.cropped){for(n=0;n=0;t--)n=st(e[t].yBottom,s),tg&&a>d?(a=be(g,d),i=2*d-a):g>a&&d>a&&(a=ve(g,d),i=2*d-a),i>b&&i>d?(i=be(b,d),a=2*d-i):b>i&&d>i&&(i=ve(b,d),a=2*d-i),t.rightContX=o,t.rightContY=i}return n?(s=["C",p.rightContX||p.plotX,p.rightContY||p.plotY,r||c,a||d,c,d],p.rightContX=p.rightContY=null):s=[$e,c,d],s}});ot.spline=Zt,xt.areaspline=e(xt.area);var Qt=$t.prototype,en=h(Zt,{type:"areaspline",closedStacks:!0,getSegmentPath:Qt.getSegmentPath,closeSegment:Qt.closeSegment,drawGraph:Qt.drawGraph,drawLegendSymbol:Vt.drawRectangle});ot.areaspline=en,xt.column=e(Ot,{borderColor:"#FFFFFF",borderRadius:0,groupPadding:.2,marker:null,pointPadding:.1,minPointLength:0,cropThreshold:50,pointRange:null,states:{hover:{brightness:.1,shadow:!1,halo:!1},select:{color:"#C0C0C0",borderColor:"#000000",shadow:!1}},dataLabels:{align:null,verticalAlign:null,y:null},startFromThreshold:!0,stickyTracking:!1,tooltip:{distance:6},threshold:0});var tn=h(Xt,{type:"column",pointAttrToOptions:{stroke:"borderColor",fill:"color",r:"borderRadius"},cropShoulder:0,directTouch:!0,trackerGroups:["group","dataLabelsGroup"],negStacks:!0,init:function(){Xt.prototype.init.apply(this,arguments);var e=this,t=e.chart;t.hasRendered&&ht(t.series,function(t){t.type===e.type&&(t.isDirty=!0)})},getColumnMetrics:function(){var e,t,n=this,r=n.options,a=n.xAxis,o=n.yAxis,i=a.reversed,s={},l=0;r.grouping===!1?l=1:ht(n.chart.series,function(r){var a=r.options,i=r.yAxis;r.type===n.type&&r.visible&&o.len===i.len&&o.pos===i.pos&&(a.stacking?(e=r.stackKey,s[e]===B&&(s[e]=l++),t=s[e]):a.grouping!==!1&&(t=l++),r.columnIndex=t)});var c=ve(_e(a.transA)*(a.ordinalSlope||r.pointRange||a.closestPointRange||a.tickInterval||1),a.len),d=c*r.groupPadding,p=c-2*d,f=p/l,h=r.pointWidth,m=u(h)?(f-h)/2:f*r.pointPadding,g=st(h,f-2*m),y=(i?l-(n.columnIndex||0):n.columnIndex)||0,b=m+(d+y*f-c/2)*(i?-1:1);return n.columnMetrics={width:g,offset:b}},translate:function(){var e=this,t=e.chart,n=e.options,r=e.borderWidth=st(n.borderWidth,e.closestPointRange*e.xAxis.transA<2?0:1),a=e.yAxis,o=n.threshold,i=e.translatedThreshold=a.getThreshold(o),s=st(n.minPointLength,5),l=e.getColumnMetrics(),u=l.width,c=e.barW=be(u,1+2*r),d=e.pointXOffset=l.offset,p=-(r%2?.5:0),f=r%2?.5:1;t.inverted&&(i-=.5,t.renderer.isVML&&(f+=1)),n.pointPadding&&(c=ye(c)),Xt.prototype.translate.apply(e),ht(e.points,function(n){var r,o,l,h,m=st(n.yBottom,i),g=999+_e(m),y=ve(be(-g,n.plotY),a.len+g),b=n.plotX+d,v=c,_=ve(y,m),w=be(y,m)-_;_e(w)s?m-s:i-(h?s:0))),n.barX=b,n.pointWidth=u,r=me(b+v)+p,b=me(b)+p,v=r-b,l=_e(_)<.5,o=ve(me(_+w)+f,9e4),_=me(_)+f,w=o-_,l&&(_-=1,w+=1),n.tooltipPos=t.inverted?[a.len+a.pos-t.plotLeft-y,e.xAxis.len-b-v/2,w]:[b+v/2,y+a.pos-t.plotTop,w],n.shapeType="rect",n.shapeArgs={x:b,y:_,width:v,height:w}})},getSymbol:Be,drawLegendSymbol:Vt.drawRectangle,drawGraph:Be,drawPoints:function(){var t,n,r=this,a=this.chart,o=r.options,i=a.renderer,s=o.animationLimit||250;ht(r.points,function(l){var c,d=l.plotY,p=l.graphic;d===B||isNaN(d)||null===l.y?p&&(l.graphic=p.destroy()):(t=l.shapeArgs,c=u(r.borderWidth)?{"stroke-width":r.borderWidth}:{},n=l.pointAttr[l.selected?nt:et]||r.pointAttr[et],p?(Et(p),p.attr(c)[a.pointCount● {series.name}
',pointFormat:"x: {point.x}
y: {point.y}
"}});var rn=h(Xt,{type:"scatter",sorted:!1,requireSorting:!1,noSharedTooltip:!0,trackerGroups:["group","markerGroup","dataLabelsGroup"],takeOrdinalPosition:!1,kdDimensions:2,drawGraph:function(){this.options.lineWidth&&Xt.prototype.drawGraph.call(this)}});ot.scatter=rn,xt.pie=e(Ot,{borderColor:"#FFFFFF",borderWidth:1,center:[null,null],clip:!1,colorByPoint:!0,dataLabels:{distance:30,enabled:!0,formatter:function(){return this.point.name},x:0},ignoreHiddenPoint:!0,legendType:"point",marker:null,size:null,showInLegend:!1,slicedOffset:10,states:{hover:{brightness:.1,shadow:!1}},stickyTracking:!1,tooltip:{followPointer:!0}});var an=h(Yt,{init:function(){Yt.prototype.init.apply(this,arguments);var e,t=this;return it(t,{visible:t.visible!==!1,name:st(t.name,"Slice")}),e=function(e){t.slice("select"===e.type)},bt(t,"select",e),bt(t,"unselect",e),t},setVisible:function(e,t){var n=this,r=n.series,a=r.chart,o=r.options.ignoreHiddenPoint;t=st(t,o),e!==n.visible&&(n.visible=n.options.visible=e=e===B?!n.visible:e,r.options.data[ft(n,r.data)]=n.options,ht(["graphic","dataLabel","connector","shadowGroup"],function(t){n[t]&&n[t][e?"show":"hide"](!0)}),n.legendItem&&a.legend.colorizeItem(n,e),e||"hover"!==n.state||n.setState(""),o&&(r.isDirty=!0),t&&a.redraw())},slice:function(e,t,n){var r,a=this,o=a.series,i=o.chart;j(n,i),t=st(t,!0),a.sliced=a.options.sliced=e=u(e)?e:!a.sliced,o.options.data[ft(a,o.data)]=a.options,r=e?a.slicedTranslation:{translateX:0,translateY:0},a.graphic.animate(r),a.shadowGroup&&a.shadowGroup.animate(r)},haloPath:function(e){var t=this.shapeArgs,n=this.series.chart;return this.sliced||!this.visible?[]:this.series.chart.renderer.symbols.arc(n.plotLeft+t.x,n.plotTop+t.y,t.r+e,t.r+e,{innerR:this.shapeArgs.r,start:t.start,end:t.end})}}),on={type:"pie",isCartesian:!1,pointClass:an,requireSorting:!1,directTouch:!0,noSharedTooltip:!0,trackerGroups:["group","dataLabelsGroup"],axisTypes:[],pointAttrToOptions:{stroke:"borderColor","stroke-width":"borderWidth",fill:"color"},getColor:Be,animate:function(e){var t=this,n=t.points,r=t.startAngleRad;e||(ht(n,function(e){var n=e.graphic,a=e.shapeArgs;n&&(n.attr({r:e.startR||t.center[3]/2,start:r,end:r}),n.animate({r:a.r,start:a.start,end:a.end},t.options.animation))}),t.animate=null)},setData:function(e,t,n,r){Xt.prototype.setData.call(this,e,!1,n,r),this.processData(),this.generatePoints(),st(t,!0)&&this.chart.redraw(n)},updateTotals:function(){var e,t,n=0,r=this.points,a=r.length,o=this.options.ignoreHiddenPoint;for(e=0;a>e;e++)t=r[e],n+=o&&!t.visible?0:t.y;for(this.total=n,e=0;a>e;e++)t=r[e],t.percentage=n>0&&(t.visible||!o)?t.y/n*100:0,t.total=n},generatePoints:function(){Xt.prototype.generatePoints.call(this),this.updateTotals()},translate:function(e){this.generatePoints();var t,n,r,a,o,i,s,l=this,u=0,c=1e3,d=l.options,p=d.slicedOffset,f=p+d.borderWidth,h=d.startAngle||0,m=l.startAngleRad=Ee/180*(h-90),g=l.endAngleRad=Ee/180*(st(d.endAngle,h+360)-90),y=g-m,b=l.points,v=d.dataLabels.distance,_=d.ignoreHiddenPoint,w=b.length;for(e||(l.center=e=l.getCenter()),l.getX=function(t,n){return r=he.asin(ve((t-e[1])/(e[2]/2+v),1)),e[0]+(n?-1:1)*(we(r)*(e[2]/2+v))},i=0;w>i;i++)s=b[i],t=m+u*y,(!_||s.visible)&&(u+=s.percentage/100),n=m+u*y,s.shapeType="arc",s.shapeArgs={x:e[0],y:e[1],r:e[2]/2,innerR:e[3]/2,start:me(t*c)/c,end:me(n*c)/c},r=(n+t)/2,r>1.5*Ee?r-=2*Ee:-Ee/2>r&&(r+=2*Ee),s.slicedTranslation={translateX:me(we(r)*p),translateY:me(ke(r)*p)},a=we(r)*e[2]/2,o=ke(r)*e[2]/2,s.tooltipPos=[e[0]+.7*a,e[1]+.7*o],s.half=-Ee/2>r||r>Ee/2?1:0,s.angle=r,f=ve(f,v/2),s.labelPos=[e[0]+a+we(r)*v,e[1]+o+ke(r)*v,e[0]+a+we(r)*f,e[1]+o+ke(r)*f,e[0]+a,e[1]+o,0>v?"center":s.half?"right":"left",r]},drawGraph:null,drawPoints:function(){var e,t,n,r,a,o=this,i=o.chart,s=i.renderer,l=o.options.shadow;l&&!o.shadowGroup&&(o.shadowGroup=s.g("shadow").add(o.group)),ht(o.points,function(i){t=i.graphic,r=i.shapeArgs,n=i.shadowGroup,l&&!n&&(n=i.shadowGroup=s.g("shadow").add(o.shadowGroup)),e=i.sliced?i.slicedTranslation:{translateX:0,translateY:0},n&&n.attr(e),t?t.animate(it(r,e)):(a={"stroke-linejoin":"round"},i.visible||(a.visibility="hidden"),i.graphic=t=s[i.shapeType](r).setRadialReference(o.center).attr(i.pointAttr[i.selected?nt:et]).attr(a).attr(e).add(o.group).shadow(l,n))})},searchPoint:Be,sortByAngle:function(e,t){e.sort(function(e,n){return void 0!==e.angle&&(n.angle-e.angle)*t})},drawLegendSymbol:Vt.drawRectangle,getCenter:Gt.getCenter,getSymbol:Be};on=h(Xt,on),ot.pie=on,Xt.prototype.drawDataLabels=function(){var t,n,r,a,o=this,i=o.options,s=i.cursor,l=i.dataLabels,c=o.points,d=o.hasRendered||0,p=o.chart.renderer;(l.enabled||o._hasPointLabels)&&(o.dlProcessOptions&&o.dlProcessOptions(l),a=o.plotGroup("dataLabelsGroup","data-labels",l.defer?Ke:Ye,l.zIndex||6),st(l.defer,!0)&&(a.attr({opacity:+d}),d||bt(o,"afterAnimate",function(){o.visible&&a.show(),a[i.animation?"animate":"attr"]({opacity:1},{duration:200})})),n=l,ht(c,function(c){var d,f,h,m,g,y,b=c.dataLabel,_=c.connector,w=!0,k={};if(t=c.dlOptions||c.options&&c.options.dataLabels,d=st(t&&t.enabled,n.enabled),b&&!d)c.dataLabel=b.destroy();else if(d){if(l=e(n,t),y=l.style,g=l.rotation,f=c.getLabelConfig(),r=l.format?v(l.format,f):l.formatter.call(f,l),y.color=st(l.color,y.color,o.color,"black"),b)u(r)?(b.attr({text:r}),w=!1):(c.dataLabel=b=b.destroy(),_&&(c.connector=_.destroy()));else if(u(r)){h={fill:l.backgroundColor,stroke:l.borderColor,"stroke-width":l.borderWidth,r:l.borderRadius||0,rotation:g,padding:l.padding,zIndex:1},"contrast"===y.color&&(k.color=l.inside||l.distance<0||i.stacking?p.getContrast(c.color||o.color):"#000000"),s&&(k.cursor=s);for(m in h)h[m]===B&&delete h[m];b=c.dataLabel=p[g?"text":"label"](r,0,-999,l.shape,null,null,l.useHTML).attr(h).css(it(y,k)).add(a).shadow(l.shadow)}b&&o.alignDataLabel(c,b,l,null,w)}}))},Xt.prototype.alignDataLabel=function(e,t,n,r,a){var o,i,s=this.chart,l=s.inverted,u=st(e.plotX,-999),c=st(e.plotY,-999),d=t.getBBox(),p=s.renderer.fontMetrics(n.style.fontSize).b,f=this.visible&&(e.series.forceDL||s.isInsidePlot(u,me(c),l)||r&&s.isInsidePlot(u,l?r.x+1:r.y+r.height-1,l));f&&(r=it({x:l?s.plotWidth-c:u,y:me(l?s.plotHeight-u:c),width:0,height:0},r),it(n,{width:d.width,height:d.height}),n.rotation?(o=s.renderer.rotCorr(p,n.rotation),t[a?"attr":"animate"]({x:r.x+n.x+r.width/2+o.x,y:r.y+n.y+r.height/2}).attr({align:n.align})):(t.align(n,null,r),i=t.alignAttr,"justify"===st(n.overflow,"justify")?this.justifyDataLabel(t,n,i,d,r,a):st(n.crop,!0)&&(f=s.isInsidePlot(i.x,i.y)&&s.isInsidePlot(i.x+d.width,i.y+d.height)),n.shape&&t.attr({anchorX:e.plotX,anchorY:e.plotY}))),f||(t.attr({y:-999}),t.placed=!1)},Xt.prototype.justifyDataLabel=function(e,t,n,r,a,o){var i,s,l=this.chart,u=t.align,c=t.verticalAlign,d=e.box?0:e.padding||0;i=n.x+d,0>i&&("right"===u?t.align="left":t.x=-i,s=!0),i=n.x+r.width-d,i>l.plotWidth&&("left"===u?t.align="right":t.x=l.plotWidth-i,s=!0),i=n.y+d,0>i&&("bottom"===c?t.verticalAlign="top":t.y=-i,s=!0),i=n.y+r.height-d,i>l.plotHeight&&("top"===c?t.verticalAlign="bottom":t.y=l.plotHeight-i,s=!0),s&&(e.placed=!o,e.align(t,null,a))},ot.pie&&(ot.pie.prototype.drawDataLabels=function(){var e,t,n,r,a,o,i,s,l,u,c,d,p,f=this,h=f.data,m=f.chart,g=f.options.dataLabels,y=st(g.connectorPadding,10),b=st(g.connectorWidth,1),v=m.plotWidth,_=m.plotHeight,w=st(g.softConnector,!0),k=g.distance,E=f.center,O=E[2]/2,S=E[1],P=k>0,A=[[],[]],j=[0,0,0,0],C=function(e,t){return t.y-e.y};if(f.visible&&(g.enabled||f._hasPointLabels)){for(Xt.prototype.drawDataLabels.apply(f),ht(h,function(e){e.dataLabel&&e.visible&&A[e.half].push(e)}),d=2;d--;){var T,D,M,N,z=[],I=[],R=A[d],B=R.length;if(B){for(f.sortByAngle(R,d-.5),p=i=0;!i&&R[p];)i=R[p]&&R[p].dataLabel&&(R[p].dataLabel.getBBox().height||21),p++;if(k>0){for(M=ve(S+O+k,m.plotHeight),D=be(0,S-O-k);M>=D;D+=i)z.push(D);if(T=z.length,B>T){for(c=[].concat(R),c.sort(C),p=B;p--;)c[p].rank=p;for(p=B;p--;)R[p].rank>=T&&R.splice(p,1);B=R.length}for(p=0;B>p;p++){e=R[p],o=e.labelPos;var L,q,F=9999;for(q=0;T>q;q++)L=_e(z[q]-o[1]),F>L&&(F=L,N=q);if(p>N&&null!==z[p])N=p;else if(B-p+N>T&&null!==z[p])for(N=T-B+p;null===z[N];)N++;else for(;null===z[N];)N++;I.push({i:N,y:z[N]}),z[N]=null}I.sort(C)}for(p=0;B>p;p++){var U,H;e=R[p],o=e.labelPos,r=e.dataLabel,u=e.visible===!1?Ke:"inherit",H=o[1],k>0?(U=I.pop(),N=U.i,l=U.y,(H>l&&null!==z[N+1]||l>H&&null!==z[N-1])&&(l=ve(be(0,H),m.plotHeight))):l=H,s=g.justify?E[0]+(d?-1:1)*(O+k):f.getX(l===S-O-k||l===S+O+k?H:l,d),r._attr={visibility:u,align:o[6]},r._pos={x:s+g.x+({left:y,right:-y}[o[6]]||0),y:l+g.y-10},r.connX=s,r.connY=l,null===this.options.size&&(a=r.width,y>s-a?j[3]=be(me(a-s+y),j[3]):s+a>v-y&&(j[1]=be(me(s+a-v+y),j[1])),0>l-i/2?j[0]=be(me(-l+i/2),j[0]):l+i/2>_&&(j[2]=be(me(l+i/2-_),j[2])))}}}(0===x(j)||this.verifyDataLabelOverflow(j))&&(this.placeDataLabels(),P&&b&&ht(this.points,function(e){t=e.connector,o=e.labelPos,r=e.dataLabel,r&&r._pos&&e.visible?(u=r._attr.visibility,s=r.connX,l=r.connY,n=w?[$e,s+("left"===o[6]?5:-5),l,"C",s,l,2*o[2]-o[4],2*o[3]-o[5],o[2],o[3],Ze,o[4],o[5]]:[$e,s+("left"===o[6]?5:-5),l,Ze,o[2],o[3],Ze,o[4],o[5]],t?(t.animate({d:n}),t.attr("visibility",u)):e.connector=t=f.chart.renderer.path(n).attr({"stroke-width":b,stroke:g.connectorColor||e.color||"#606060",visibility:u}).add(f.dataLabelsGroup)):t&&(e.connector=t.destroy())}))}},ot.pie.prototype.placeDataLabels=function(){ht(this.points,function(e){var t,n=e.dataLabel;n&&e.visible&&(t=n._pos,t?(n.attr(n._attr),n[n.moved?"animate":"attr"](t),n.moved=!0):n&&n.attr({y:-999}))})},ot.pie.prototype.alignDataLabel=Be,ot.pie.prototype.verifyDataLabelOverflow=function(e){var t,n=this.center,r=this.options,a=r.center,o=r.minSize||80,i=o;return null!==a[0]?i=be(n[2]-be(e[1],e[3]),o):(i=be(n[2]-e[1]-e[3],o),n[0]+=(e[3]-e[1])/2),null!==a[1]?i=be(ve(i,n[2]-be(e[0],e[2])),o):(i=be(ve(i,n[2]-e[0]-e[2]),o),n[1]+=(e[0]-e[2])/2),ist(this.translatedThreshold,s.yAxis.len)),c=st(r.inside,!!this.options.stacking);l&&(a=e(l),i&&(a={x:s.yAxis.len-a.y-a.height,y:s.xAxis.len-a.x-a.width,width:a.height,height:a.width}),c||(i?(a.x+=u?0:a.width,a.width=0):(a.y+=u?a.height:0,a.height=0))),r.align=st(r.align,!i||c?"center":u?"right":"left"),r.verticalAlign=st(r.verticalAlign,i||c?"middle":u?"top":"bottom"),Xt.prototype.alignDataLabel.call(this,t,n,r,a,o)}),function(e){var t=e.Chart,n=e.each,r=e.pick,a=HighchartsAdapter.addEvent;t.prototype.callbacks.push(function(e){function t(){var t=[];n(e.series,function(e){var a=e.options.dataLabels;(a.enabled||e._hasPointLabels)&&!a.allowOverlap&&e.visible&&n(e.points,function(e){e.dataLabel&&(e.dataLabel.labelrank=r(e.labelrank,e.shapeArgs&&e.shapeArgs.height),t.push(e.dataLabel))})}),e.hideOverlappingLabels(t)}t(),a(e,"redraw",t)}),t.prototype.hideOverlappingLabels=function(e){var t,n,r,a,o,i=e.length,s=function(e,t,n,r){return!(t.x>e.x+n.width||t.x+r.widthe.y+n.height||t.y+r.heightn;n++)t=e[n],t&&(t.oldOpacity=t.opacity,t.newOpacity=1);for(e.sort(function(e,t){return t.labelrank-e.labelrank}),n=0;i>n;n++)for(a=e[n],r=n+1;i>r;++r)o=e[r],a&&o&&a.placed&&o.placed&&0!==a.newOpacity&&0!==o.newOpacity&&s(a.alignAttr,o.alignAttr,a,o)&&((a.labelrankn;n++)t=e[n],t&&(t.oldOpacity!==t.newOpacity&&t.placed&&(t.alignAttr.opacity=t.newOpacity,t[t.isOld&&t.newOpacity?"animate":"attr"](t.alignAttr)),t.isOld=!0)}}(de);var sn=de.TrackerMixin={drawTrackerPoint:function(){var e=this,t=e.chart,n=t.pointer,r=e.options.cursor,a=r&&{cursor:r},o=function(e){for(var n,r=e.target;r&&!n;)n=r.point,r=r.parentNode;n!==B&&n!==t.hoverPoint&&n.onMouseOver(e)};ht(e.points,function(e){e.graphic&&(e.graphic.element.point=e),e.dataLabel&&(e.dataLabel.element.point=e)}),e._hasTracking||(ht(e.trackerGroups,function(t){e[t]&&(e[t].addClass(Ge+"tracker").on("mouseover",o).on("mouseout",function(e){n.onTrackerMouseOut(e)}).css(a),q&&e[t].on("touchstart",o))}),e._hasTracking=!0)},drawTrackerGraph:function(){var e,t,n=this,r=n.options,a=r.trackByArea,o=[].concat(a?n.areaPath:n.graphPath),i=o.length,s=n.chart,l=s.pointer,u=s.renderer,c=s.options.tooltip.snap,d=n.tracker,p=r.cursor,f=p&&{cursor:p},h=n.singlePoints,m=function(){s.hoverSeries!==n&&n.onMouseOver()},g="rgba(192,192,192,"+(Me?1e-4:.002)+")";if(i&&!a)for(t=i+1;t--;)o[t]===$e&&o.splice(t+1,0,o[t+1]-c,o[t+2],Ze),(t&&o[t]===$e||t===i)&&o.splice(t,0,Ze,o[t-2]+c,o[t-1]);for(t=0;ta;o.series.length&&(d||u>ve(l.dataMin,l.min))&&(!d||cm;m++){if(f=m&&o[m-1]>r,o[m]5*i||f){if(o[m]>b){for(l=e.call(this,t,o[h],o[m],a);l.length&&l[0]<=b;)l.shift();l.length&&(b=l[l.length-1]),y=y.concat(l)}h=m+1}if(f)break}if(d=l.info,s&&d.unitRange<=K.hour){for(m=y.length-1,h=1;m>h;h++)H("%d",y[h])!==H("%d",y[h-1])&&(g[y[h]]="day",c=!0);c&&(g[y[0]]="day"),d.higherRanks=g}if(y.info=d,s&&u(v)){for(var _,w,k,E,x,O=y.length,S=O,P=[],A=[];S--;)w=this.translate(y[S]),k&&(A[S]=k-w),P[S]=k=w;for(A.sort(),E=A[ge(A.length/2)],.6*v>E&&(E=null),S=y[O-1]>r?O-1:O,k=void 0;S--;)w=P[S],x=k-w,k&&.8*v>x&&(null===E||.8*E>x)?(g[y[S]]&&!g[y[S+1]]?(_=S+1,k=w):_=S,y.splice(_,1)):k=w}return y}),it(It.prototype,{beforeSetTickPositions:function(){var e,t,n,r,a,o,i=this,s=[],l=!1,u=i.getExtremes(),c=u.min,d=u.max,p=i.isXAxis&&!!i.options.breaks,f=i.options.ordinal;if(f||p){if(ht(i.series,function(t,n){if(t.visible!==!1&&(t.takeOrdinalPosition!==!1||p)&&(s=s.concat(t.processedXData),e=s.length,s.sort(function(e,t){return e-t}),e))for(n=e-1;n--;)s[n]===s[n+1]&&s.splice(n,1)}),e=s.length,e>2){for(t=s[1]-s[0],o=e-1;o--&&!l;)s[o+1]-s[o]!==t&&(l=!0);!i.options.keepOrdinalPadding&&(s[0]-c>t||d-s[s.length-1]>t)&&(l=!0)}l?(i.ordinalPositions=s,n=i.val2lin(be(c,s[0]),!0),r=be(i.val2lin(ve(d,s[s.length-1]),!0),1),i.ordinalSlope=a=(d-c)/(r-n),i.ordinalOffset=c-n*a):i.ordinalPositions=i.ordinalSlope=i.ordinalOffset=B}i.doPostTranslate=f&&l||p,i.groupIntervalFactor=null},val2lin:function(e,t){var n=this,r=n.ordinalPositions;if(r){var a,o,i,s=r.length;for(a=s;a--;)if(r[a]===e){i=a;break}for(a=s-1;a--;)if(e>r[a]||0===a){o=(e-r[a])/(r[a+1]-r[a]),i=a+o;break}return t?i:n.ordinalSlope*(i||0)+n.ordinalOffset}return e},lin2val:function(e,t){var n=this,r=n.ordinalPositions;if(r){var a,o,i,s=n.ordinalSlope,l=n.ordinalOffset,u=r.length-1;if(t)0>e?e=r[0]:e>u?e=r[u]:(u=ge(e),i=e-u);else for(;u--;)if(a=s*u+l,e>=a){o=s*(u+1)+l,i=(e-a)/(o-a);break}return i!==B&&r[u]!==B?r[u]+(i?i*(r[u+1]-r[u]):0):e}return e},getExtendedPositions:function(){var e,t,n=this,r=n.chart,a=n.series[0].currentDataGrouping,o=n.ordinalIndex,i=a?a.count+a.unitName:"raw",s=n.getExtremes();return o||(o=n.ordinalIndex={}),o[i]||(e={series:[],getExtremes:function(){return{min:s.dataMin,max:s.dataMax}},options:{ordinal:!0},val2lin:It.prototype.val2lin},ht(n.series,function(n){t={xAxis:e,xData:n.xData,chart:r,destroyGroupedData:Be},t.options={dataGrouping:a?{enabled:!0,forced:!0,approximation:"open",units:[[a.unitName,[a.count]]]}:{enabled:!1}},n.processData.apply(t),e.series.push(t)}),n.beforeSetTickPositions.apply(e),o[i]=e.ordinalPositions),o[i]},getGroupIntervalFactor:function(e,t,n){var r,a=0,o=n.processedXData,i=o.length,s=[],l=this.groupIntervalFactor;if(!l){for(;i-1>a;a++)s[a]=o[a+1]-o[a];s.sort(function(e,t){return e-t}),r=s[ge(i/2)],e=be(e,o[0]),t=ve(t,o[i-1]),this.groupIntervalFactor=l=i*r/(t-e)}return l},postProcessTickInterval:function(e){var t=this.ordinalSlope;return t?this.options.breaks?this.closestPointRange:e/(t/this.closestPointRange):e}}),lt(Kt.prototype,"pan",function(e,t){var n=this,r=n.xAxis[0],a=t.chartX,o=!1;if(r.options.ordinal&&r.series.length){var i,s,l,u,c=n.mouseDownX,d=r.getExtremes(),f=d.dataMax,h=d.min,m=d.max,g=n.hoverPoints,y=r.closestPointRange,b=r.translationSlope*(r.ordinalSlope||y),v=(c-a)/b,_={ordinalPositions:r.getExtendedPositions()},w=r.lin2val,k=r.val2lin;_.ordinalPositions?_e(v)>1&&(g&&ht(g,function(e){e.setState()}),0>v?(l=_,u=r.ordinalPositions?r:_):(l=r.ordinalPositions?r:_,u=_),s=u.ordinalPositions,f>s[s.length-1]&&s.push(f),n.fixedRange=m-h,i=r.toFixedRange(null,null,w.apply(l,[k.apply(l,[h,!0])+v,!0]),w.apply(u,[k.apply(u,[m,!0])+v,!0])),i.min>=ve(d.dataMin,h)&&i.max<=be(f,m)&&r.setExtremes(i.min,i.max,!0,!1,{trigger:"pan"}),n.mouseDownX=a,p(n.container,{cursor:"move"})):o=!0}else o=!0;o&&e.apply(this,Array.prototype.slice.call(arguments,1))}),lt(Xt.prototype,"getSegments",function(e){var t,n=this,r=n.options.gapSize,a=n.xAxis;e.apply(this,Array.prototype.slice.call(arguments,1)),r&&(t=n.segments,ht(t,function(e,n){for(var o=e.length-1;o--;){if(e[o].xa.max){t.length=0;break}e[o+1].x-e[o].x>a.closestPointRange*r&&t.splice(n+1,0,e.splice(o+1,e.length-o))}}))}),function(e){"use strict";function t(){return Array.prototype.slice.call(arguments,1)}var n=e.pick,r=e.wrap,a=e.extend,o=HighchartsAdapter.fireEvent,i=e.Axis,s=e.Series;a(i.prototype,{isInBreak:function(e,t){var n=e.repeat||1/0,r=e.from,a=e.to-e.from,o=t>=r?(t-r)%n:n-(r-t)%n;return e.inclusive?a>=o:a>o&&0!==o},isInAnyBreak:function(e,t){var r,a,o,i=this.options.breaks,s=i&&i.length;if(s){for(;s--;)this.isInBreak(i[s],e)&&(r=!0,a||(a=n(i[s].showPoints,this.isXAxis?!1:!0)));o=r&&t?r&&!a:r}return o}}),r(i.prototype,"setTickPositions",function(e){if(e.apply(this,Array.prototype.slice.call(arguments,1)),this.options.breaks){var t,n=this,r=this.tickPositions,a=this.tickPositions.info,o=[];if(a&&a.totalRange>=n.closestPointRange)return;for(t=0;t=e)break;if(r.isInBreak(t,e)){a-=e-t.from;break}}return a},this.lin2val=function(e){var t,n,a=e;for(n=0;n=a));n++)t.toh;)s-=n;for(;h>s;)s+=n;for(u=s;m>u;u+=n)d.push({value:u,move:"in"}),d.push({value:u+(a.to-a.from),move:"out",size:a.breakSize})}d.sort(function(e,t){return e.value===t.value?("in"===e.move?0:1)-("in"===t.move?0:1):e.value-t.value}),t=0,s=h;for(l in d)a=d[l],t+="in"===a.move?1:-1,1===t&&"in"===a.move&&(s=a.value),0===t&&(p.push({from:s,to:a.value,len:a.value-s-(a.size||0)}),f+=a.value-s-(a.size||0));r.breakArray=p,o(r,"afterBreaks"),r.transA*=(m-r.min)/(m-h-f),r.min=h,r.max=m}}}),r(s.prototype,"generatePoints",function(e){e.apply(this,t(arguments));var n,r,a=this,o=a.xAxis,i=a.yAxis,s=a.points,l=s.length,u=a.options.connectNulls;if(o&&i&&(o.options.breaks||i.options.breaks))for(;l--;)n=s[l],r=null===n.y&&u===!1,r||!o.isInAnyBreak(n.x,!0)&&!i.isInAnyBreak(n.y,!0)||(s.splice(l,1),this.data[l]&&this.data[l].destroyElements())}),r(e.seriesTypes.column.prototype,"drawPoints",function(e){e.apply(this);var t,n,r,a,i,s=this,l=s.points,u=s.yAxis,c=u.breakArray||[];for(r=0;rn.to?o(u,"pointBreak",{point:t,brk:n}):o(u,"pointInBreak",{point:t,brk:n})})}(de);var ln="dataGrouping",un=Xt.prototype,cn=Rt.prototype,dn=un.processData,pn=un.generatePoints,fn=un.destroy,hn=cn.tooltipFooterHeaderFormatter,mn="number",gn={approximation:"average",groupPixelWidth:2,dateTimeLabelFormats:{millisecond:["%A, %b %e, %H:%M:%S.%L","%A, %b %e, %H:%M:%S.%L","-%H:%M:%S.%L"],second:["%A, %b %e, %H:%M:%S","%A, %b %e, %H:%M:%S","-%H:%M:%S"],minute:["%A, %b %e, %H:%M","%A, %b %e, %H:%M","-%H:%M"],hour:["%A, %b %e, %H:%M","%A, %b %e, %H:%M","-%H:%M"],day:["%A, %b %e, %Y","%A, %b %e","-%A, %b %e, %Y"],week:["Week from %A, %b %e, %Y","%A, %b %e","-%A, %b %e, %Y"],month:["%B %Y","%B","-%B %Y"],year:["%Y","%Y","-%Y"]}},yn={line:{},spline:{},area:{},areaspline:{},column:{approximation:"sum",groupPixelWidth:10},arearange:{approximation:"range"},areasplinerange:{approximation:"range"},columnrange:{approximation:"range",groupPixelWidth:10},candlestick:{approximation:"ohlc",groupPixelWidth:10},ohlc:{approximation:"ohlc",groupPixelWidth:5}},bn=[["millisecond",[1,2,5,10,20,25,50,100,200,500]],["second",[1,2,5,10,15,30]],["minute",[1,2,5,10,15,30]],["hour",[1,2,3,4,6,8,12]],["day",[1]],["week",[1]],["month",[1,3,6]],["year",null]],vn={sum:function(e){var t,n=e.length;if(!n&&e.hasNulls)t=null;else if(n)for(t=0;n--;)t+=e[n];return t},average:function(e){var t=e.length,n=vn.sum(e);return typeof n===mn&&t&&(n/=t),n},open:function(e){return e.length?e[0]:e.hasNulls?null:B},high:function(e){return e.length?x(e):e.hasNulls?null:B},low:function(e){return e.length?E(e):e.hasNulls?null:B},close:function(e){return e.length?e[e.length-1]:e.hasNulls?null:B},ohlc:function(e,t,n,r){return e=vn.open(e),t=vn.high(t),n=vn.low(n),r=vn.close(r),typeof e===mn||typeof t===mn||typeof n===mn||typeof r===mn?[e,t,n,r]:void 0},range:function(e,t){return e=vn.low(e),t=vn.high(t),typeof e===mn||typeof t===mn?[e,t]:void 0}};un.groupData=function(e,t,n,r){var a,o,i,s,l=this,u=l.data,c=l.options.data,d=[],p=[],f=e.length,h=!!t,m=[[],[],[],[]],g="function"==typeof r?r:vn[r],y=l.pointArrayMap,b=y&&y.length;for(s=0;f>=s&&!(e[s]>=n[0]);s++);for(;f>=s;s++){for(;(n[1]!==B&&e[s]>=n[1]||s===f)&&(a=n.shift(),i=g.apply(0,m),i!==B&&(d.push(a),p.push(i)),m[0]=[],m[1]=[],m[2]=[],m[3]=[],s!==f););if(s===f)break;if(y){var v,_,w=l.cropStart+s,k=u&&u[w]||l.pointClass.prototype.applyOptions.apply({series:l},[c[w]]);for(v=0;b>v;v++)_=k[y[v]],typeof _===mn?m[v].push(_):null===_&&(m[v].hasNulls=!0)}else o=h?t[s]:null,typeof o===mn?m[0].push(o):null===o&&(m[0].hasNulls=!0)}return[d,p]},un.processData=function(){var e,t=this,n=t.chart,r=t.options,a=r[ln],o=t.allowDG!==!1&&a&&st(a.enabled,n.options._stock);if(t.forceCrop=o,t.groupPixelWidth=null,t.hasProcessed=!0,dn.apply(t,arguments)!==!1&&o){t.destroyGroupedData();var i,s=t.processedXData,l=t.processedYData,c=n.plotSizeX,d=t.xAxis,p=d.options.ordinal,f=t.groupPixelWidth=d.getGroupPixelWidth&&d.getGroupPixelWidth(),h=t.pointRange;if(f){e=!0,t.points=null;var m=d.getExtremes(),g=m.min,y=m.max,b=p&&d.getGroupIntervalFactor(g,y,t)||1,v=f*(y-g)/c*b,_=d.getTimeTicks(d.normalizeTimeTickInterval(v,a.units||bn),g,y,d.options.startOfWeek,s,t.closestPointRange),w=un.groupData.apply(t,[s,l,_,a.approximation]),k=w[0],E=w[1];if(a.smoothed){for(i=k.length-1,k[i]=y;i--&&i>0;)k[i]+=v/2;k[0]=g}t.currentDataGrouping=_.info,null===r.pointRange&&(t.pointRange=_.info.totalRange),t.closestPointRange=_.info.totalRange,u(k[0])&&k[0]this.chart.plotSizeX/o||t&&n.forced)&&(i=!0));return i?o:0},It.prototype.setDataGrouping=function(e,t){t=st(t,!0),e||(e={forced:!1,units:null}),this instanceof It?ht(this.series,function(t){t.update({dataGrouping:e},!1)}):ht(this.chart.options.series,function(t){t.dataGrouping=e})},xt.ohlc=e(xt.column,{lineWidth:1,tooltip:{pointFormat:'● {series.name}
Open: {point.open}
High: {point.high}
Low: {point.low}
Close: {point.close}
'},states:{hover:{lineWidth:3}},threshold:null});var _n=h(ot.column,{type:"ohlc",pointArrayMap:["open","high","low","close"],toYData:function(e){return[e.open,e.high,e.low,e.close]},pointValKey:"high",pointAttrToOptions:{stroke:"color","stroke-width":"lineWidth"},upColorProp:"stroke",getAttribs:function(){ot.column.prototype.getAttribs.apply(this,arguments);var t=this,n=t.options,r=n.states,a=n.upColor||t.color,o=e(t.pointAttr),i=t.upColorProp;o[""][i]=a,o.hover[i]=r.hover.upColor||a,o.select[i]=r.select.upColor||a,ht(t.points,function(e){e.open"},threshold:null,y:-30}),ot.flags=h(ot.column,{type:"flags",sorted:!1,noSharedTooltip:!0,allowDG:!1,takeOrdinalPosition:!1,trackerGroups:["markerGroup"],forceCrop:!0,init:Xt.prototype.init,pointAttrToOptions:{fill:"fillColor",stroke:"color","stroke-width":"lineWidth",r:"radius"},translate:function(){ot.column.prototype.translate.apply(this);var e,t,n,r,a,o,i=this,s=i.options,l=i.chart,u=i.points,c=u.length-1,d=s.onSeries,p=d&&l.get(d),f=p&&p.options.step,h=p&&p.points,m=h&&h.length,g=i.xAxis,y=g.getExtremes();if(p&&p.visible&&m)for(o=p.currentDataGrouping,r=h[m-1].x+(o?o.totalRange:0),u.sort(function(e,t){return e.x-t.x});m--&&u[c]&&(e=u[c],n=h[m],!(n.x<=e.x&&n.plotY!==B&&(e.x<=r&&(e.plotY=n.plotY,n.xc))););ht(u,function(e,n){var r;e.plotY===B&&(e.x>=y.min&&e.x<=y.max?e.plotY=l.chartHeight-g.bottom-(g.opposite?g.height:0)+g.offset-l.plotTop:e.shapeArgs={}),t=u[n-1],t&&t.plotX===e.plotX&&(t.stackIndex===B&&(t.stackIndex=0),r=t.stackIndex+1),e.stackIndex=r})},drawPoints:function(){var t,n,r,a,o,i,s,l,u,c,d,p=this,f=p.pointAttr[""],h=p.points,m=p.chart,g=m.renderer,y=p.options,b=y.y;for(o=h.length;o--;)i=h[o],d=i.plotX>p.xAxis.len,n=i.plotX-st(i.lineWidth,y.lineWidth)%2,l=i.stackIndex,a=i.options.shape||y.shape,r=i.plotY,r!==B&&(r=i.plotY+b-(l!==B&&l*y.stackDistance)),u=l?B:i.plotX,c=l?B:i.plotY,s=i.graphic,r!==B&&n>=0&&!d?(t=i.pointAttr[i.selected?"select":""]||f,s?s.attr({x:n,y:r,r:t.r,anchorX:u,anchorY:c}):s=i.graphic=g.label(i.options.title||y.title||"A",n,r,a,u,c,y.useHTML).css(e(y.style,i.style)).attr(t).attr({align:"flag"===a?"left":"center",width:y.width,height:y.height}).add(p.markerGroup).shadow(y.shadow),i.tooltipPos=[n,r]):s&&(i.graphic=s.destroy())},drawTracker:function(){var e=this,t=e.points;sn.drawTrackerPoint.apply(this),ht(t,function(e){var n=e.graphic;n&&bt(n.element,"mouseover",function(){e.stackIndex>0&&!e.raised&&(e._y=n.y,n.attr({y:e._y-8}),e.raised=!0),ht(t,function(t){t!==e&&t.raised&&t.graphic&&(t.graphic.attr({y:t._y}),t.raised=!1)})})})},animate:Be,buildKDTree:Be,setClip:Be}),kn.flag=function(e,t,n,r,a){var o=a&&a.anchorX||e,i=a&&a.anchorY||t;return["M",o,i,"L",e,t+r,e,t,e+n,t,e+n,t+r,e,t+r,"Z"]},ht(["circle","square"],function(e){kn[e+"pin"]=function(t,n,r,a,o){var i,s,l=o&&o.anchorX,u=o&&o.anchorY;return"circle"===e&&a>r&&(t-=me((a-r)/2),r=a),i=kn[e](t,n,r,a),l&&u&&(s=n>u?n:n+a,i.push("M",l,s,"L",l,u)),i}}),L===de.VMLRenderer&&ht(["flag","circlepin","squarepin"],function(e){Tt.prototype.symbols[e]=kn[e]});var En,xn=[].concat(bn),On=function(e){var t=mt(arguments,function(e){return"number"==typeof e});return t.length?Math[e].apply(0,t):void 0};xn[4]=["day",[1,2,3,4]],xn[5]=["week",[1,2,3]],En=ot.areaspline===B?"line":"areaspline",it(U,{navigator:{handles:{backgroundColor:"#ebe7e8",borderColor:"#b2b1b6"},height:40,margin:25,maskFill:"rgba(128,179,236,0.3)",maskInside:!0,outlineColor:"#b2b1b6",outlineWidth:1,series:{type:En,color:"#4572A7",compare:null,fillOpacity:.05,dataGrouping:{approximation:"average",enabled:!0,groupPixelWidth:2,smoothed:!0,units:xn},dataLabels:{enabled:!1,zIndex:2},id:Ge+"navigator-series",lineColor:"#4572A7",lineWidth:1,marker:{enabled:!1},pointRange:0,shadow:!1,threshold:null},xAxis:{tickWidth:0,lineWidth:0,gridLineColor:"#EEE",gridLineWidth:1,tickPixelInterval:200,labels:{align:"left",style:{color:"#888"},x:3,y:-4},crosshair:!1},yAxis:{gridLineWidth:0,startOnTick:!1,endOnTick:!1,minPadding:.1,maxPadding:.1,labels:{enabled:!1},crosshair:!1,title:{text:null},tickWidth:0}},scrollbar:{height:Te?20:14,barBackgroundColor:"#bfc8d1",barBorderRadius:0,barBorderWidth:1,barBorderColor:"#bfc8d1",buttonArrowColor:"#666",buttonBackgroundColor:"#ebe7e8",buttonBorderColor:"#bbb",buttonBorderRadius:0,buttonBorderWidth:1,minWidth:6,rifleColor:"#666",trackBackgroundColor:"#eeeeee",trackBorderColor:"#eeeeee",trackBorderWidth:1,liveRedraw:Me&&!Te}}),I.prototype={drawHandle:function(e,t){var n,r=this,a=r.chart,o=a.renderer,i=r.elementsToDestroy,s=r.handles,l=r.navigatorOptions.handles,u={fill:l.backgroundColor,stroke:l.borderColor,"stroke-width":1};r.rendered||(s[t]=o.g("navigator-handle-"+["left","right"][t]).css({cursor:"ew-resize"}).attr({zIndex:4-t}).add(),n=o.rect(-4.5,0,9,16,0,1).attr(u).add(s[t]),i.push(n),n=o.path(["M",-1.5,4,"L",-1.5,12,"M",.5,4,"L",.5,12]).attr(u).add(s[t]),i.push(n)),s[t][a.isResizing?"animate":"attr"]({translateX:r.scrollerLeft+r.scrollbarHeight+parseInt(e,10),translateY:r.top+r.height/2-8})},drawScrollbarButton:function(e){var t,n=this,r=n.chart,a=r.renderer,o=n.elementsToDestroy,i=n.scrollbarButtons,s=n.scrollbarHeight,l=n.scrollbarOptions;n.rendered||(i[e]=a.g().add(n.scrollbarGroup),t=a.rect(-.5,-.5,s+1,s+1,l.buttonBorderRadius,l.buttonBorderWidth).attr({stroke:l.buttonBorderColor,"stroke-width":l.buttonBorderWidth,fill:l.buttonBackgroundColor}).add(i[e]),o.push(t),t=a.path(["M",s/2+(e?-1:1),s/2-3,"L",s/2+(e?-1:1),s/2+3,s/2+(e?2:-2),s/2]).attr({fill:l.buttonArrowColor}).add(i[e]),o.push(t)),e&&i[e].attr({translateX:n.scrollerWidth-s})},render:function(e,t,n,r){var a,o,i,s,l,c,d,p,f,h,m,g,y,b=this,v=b.chart,_=v.renderer,w=b.scrollbarGroup,k=b.navigatorGroup,E=b.scrollbar,x=b.xAxis,O=b.scrollbarTrack,S=b.scrollbarHeight,P=b.scrollbarEnabled,A=b.navigatorOptions,j=b.scrollbarOptions,C=j.minWidth,T=b.height,D=b.top,M=b.navigatorEnabled,N=A.outlineWidth,z=N/2,I=0,R=b.outlineHeight,B=j.barBorderRadius,L=j.barBorderWidth,q=D+z;u(e)&&!isNaN(e)&&(b.navigatorLeft=a=st(x.left,v.plotLeft+S),b.navigatorWidth=o=st(x.len,v.plotWidth-2*S),b.scrollerLeft=i=a-S,b.scrollerWidth=s=s=o+2*S,x.getExtremes&&(y=b.getUnionExtremes(!0),!y||y.dataMin===x.min&&y.dataMax===x.max||x.setExtremes(y.dataMin,y.dataMax,!0,!1)),n=st(n,x.translate(e)),r=st(r,x.translate(t)),(isNaN(n)||_e(n)===1/0)&&(n=0,r=s),x.translate(r,!0)-x.translate(n,!0)f&&(I=(C-f)/2,f=C,p-=I),b.scrollbarPad=I,E[g]({x:ge(p)+L%2/2,width:f}),m=S+l+d/2-.5,b.scrollbarRifles.attr({visibility:d>12?Ye:Ke})[g]({d:[$e,m-3,S/4,Ze,m-3,2*S/3,$e,m,S/4,Ze,m,2*S/3,$e,m+3,S/4,Ze,m+3,2*S/3]})),b.scrollbarPad=I,b.rendered=!0))},addEvents:function(){var e,t=this.chart.container,n=this.mouseDownHandler,r=this.mouseMoveHandler,a=this.mouseUpHandler;e=[[t,"mousedown",n],[t,"mousemove",r],[document,"mouseup",a]],q&&e.push([t,"touchstart",n],[t,"touchmove",r],[document,"touchend",a]),ht(e,function(e){bt.apply(null,e)}),this._events=e},removeEvents:function(){ht(this._events,function(e){vt.apply(null,e)}),this._events=B,this.navigatorEnabled&&this.baseSeries&&vt(this.baseSeries,"updatedData",this.updatedDataHandler)},init:function(){var t,n,r,a,o=this,i=o.chart,s=o.scrollbarHeight,l=o.navigatorOptions,u=o.height,c=o.top,d=o.baseSeries;o.mouseDownHandler=function(e){e=i.pointer.normalize(e);var n,a,s,l,c=o.zoomedMin,d=o.zoomedMax,p=o.top,f=o.scrollbarHeight,h=o.scrollerLeft,m=o.scrollerWidth,g=o.navigatorLeft,y=o.navigatorWidth,b=o.scrollbarPad,v=o.range,_=e.chartX,w=e.chartY,k=i.xAxis[0],E=Te?10:7;w>p&&p+u+f>w&&(l=!o.scrollbarEnabled||p+u>w,l&&he.abs(_-c-g)g+c-b&&g+d+b>_?(o.grabbedCenter=_,o.fixedWidth=v,r=_-c):_>h&&h+m>_&&(s=l?_-g-v/2:g>_?c-.2*v:_>h+m-f?c+.2*v:g+c>_?c-v:d,0>s?s=0:s+v>=y&&(s=y-v,n=o.getUnionExtremes().dataMax),s!==c&&(o.fixedWidth=v,a=t.toFixedRange(s,s+v,null,n),k.setExtremes(a.min,a.max,!0,!1,{trigger:"navigator"}))))},o.mouseMoveHandler=function(e){var t,n=o.scrollbarHeight,s=o.navigatorLeft,l=o.navigatorWidth,u=o.scrollerLeft,c=o.scrollerWidth,d=o.range;0!==e.pageX&&(e=i.pointer.normalize(e),t=e.chartX,s>t?t=s:t>u+c-n&&(t=u+c-n),o.grabbedLeft?(a=!0,o.render(0,0,t-s,o.otherHandlePos)):o.grabbedRight?(a=!0,o.render(0,0,o.otherHandlePos,t-s)):o.grabbedCenter&&(a=!0,r>t?t=r:t>l+r-d&&(t=l+r-d),o.render(0,0,t-r,t-r+d)),a&&o.scrollbarOptions.liveRedraw&&setTimeout(function(){o.mouseUpHandler(e)},0))},o.mouseUpHandler=function(e){var n,s,l;a&&(o.zoomedMin===o.otherHandlePos?s=o.fixedExtreme:o.zoomedMax===o.otherHandlePos&&(l=o.fixedExtreme),n=t.toFixedRange(o.zoomedMin,o.zoomedMax,s,l),i.xAxis[0].setExtremes(n.min,n.max,!0,!1,{trigger:"navigator",triggerOp:"navigator-drag",DOMEvent:e})),"mousemove"!==e.type&&(o.grabbedLeft=o.grabbedRight=o.grabbedCenter=o.fixedWidth=o.fixedExtreme=o.otherHandlePos=a=r=null)};var p=i.xAxis.length,f=i.yAxis.length;i.extraBottomMargin=o.outlineHeight+l.margin,o.navigatorEnabled?(o.xAxis=t=new It(i,e({breaks:d&&d.xAxis.options.breaks,ordinal:d&&d.xAxis.options.ordinal},l.xAxis,{id:"navigator-x-axis",isX:!0,type:"datetime",index:p,height:u,offset:0,offsetLeft:s,offsetRight:-s,keepOrdinalPadding:!0,startOnTick:!1,endOnTick:!1,minPadding:0,maxPadding:0,zoomEnabled:!1})),o.yAxis=n=new It(i,e(l.yAxis,{id:"navigator-y-axis",alignTicks:!1,height:u,offset:0,index:f,zoomEnabled:!1})),d||l.series.data?o.addBaseSeries():0===i.series.length&<(i,"redraw",function(e,t){i.series.length>0&&!o.series&&(o.setBaseSeries(),i.redraw=e),e.call(i,t)})):o.xAxis=t={translate:function(e,t){var n=i.xAxis[0],r=n.getExtremes(),a=i.plotWidth-2*s,o=On("min",n.options.min,r.dataMin),l=On("max",n.options.max,r.dataMax)-o;return t?e*l/a+o:a*(e-o)/l},toFixedRange:It.prototype.toFixedRange},lt(i,"getMargins",function(e){var r=this.legend,a=r.options;e.apply(this,[].slice.call(arguments,1)),o.top=c=o.navigatorOptions.top||this.chartHeight-o.height-o.scrollbarHeight-this.spacing[2]-("bottom"===a.verticalAlign&&a.enabled&&!a.floating?r.legendHeight+st(a.margin,10):0),t&&n&&(t.options.top=n.options.top=c,t.setAxisSize(),n.setAxisSize())}),o.addEvents()},getUnionExtremes:function(e){var t,n=this.chart.xAxis[0],r=this.xAxis,a=r.options,o=n.options;return e&&null===n.dataMin||(t={dataMin:st(a&&a.min,On("min",o.min,n.dataMin,r.dataMin)),dataMax:st(a&&a.max,On("max",o.max,n.dataMax,r.dataMax))}),t},setBaseSeries:function(e){var t=this.chart;e=e||t.options.navigator.baseSeries,this.series&&this.series.remove(),this.baseSeries=t.series[e]||"string"==typeof e&&t.get(e)||t.series[0],this.xAxis&&this.addBaseSeries()},addBaseSeries:function(){var t,n,r=this.baseSeries,a=r?r.options:{},o=a.data,i=this.navigatorOptions.series;n=i.data,this.hasNavigatorData=!!n,t=e(a,i,{enableMouseTracking:!1,group:"nav",padXAxis:!1,xAxis:"navigator-x-axis",yAxis:"navigator-y-axis",name:"Navigator",showInLegend:!1,isInternal:!0,visible:!0}),t.data=n||o,this.series=this.chart.initSeries(t),r&&this.navigatorOptions.adaptToUpdatedData!==!1&&(bt(r,"updatedData",this.updatedDataHandler),r.userOptions.events=it(r.userOptions.event,{updatedData:this.updatedDataHandler}))},updatedDataHandler:function(){var e,t,n,r,a,o=this.chart.scroller,i=o.baseSeries,s=i.xAxis,l=s.getExtremes(),u=l.min,c=l.max,d=l.dataMin,p=l.dataMax,f=c-u,h=o.series,m=h.xData,g=!!s.setExtremes;t=c>=m[m.length-1]-(this.closestPointRange||0),e=d>=u,o.hasNavigatorData||(h.options.pointStart=i.xData[0],h.setData(i.options.data,!1),a=!0),e&&(r=d,n=r+f),t&&(n=p,e||(r=be(n-f,h.xData[0]))),g&&(e||t)?isNaN(r)||s.setExtremes(r,n,!0,!1,{trigger:"updatedData"}):(a&&this.chart.redraw(!1),o.render(be(u,d),ve(c,p)))},destroy:function(){var e=this;e.removeEvents(),ht([e.xAxis,e.yAxis,e.leftShade,e.rightShade,e.outline,e.scrollbarTrack,e.scrollbarRifles,e.scrollbarGroup,e.scrollbar],function(e){e&&e.destroy&&e.destroy()}),e.xAxis=e.yAxis=e.leftShade=e.rightShade=e.outline=e.scrollbarTrack=e.scrollbarRifles=e.scrollbarGroup=e.scrollbar=null,ht([e.scrollbarButtons,e.handles,e.elementsToDestroy],function(e){O(e)})}},de.Scroller=I,lt(It.prototype,"zoom",function(e,t,n){var r,a,o=this.chart,i=o.options,s=i.chart.zoomType,l=i.navigator,c=i.rangeSelector;return this.isXAxis&&(l&&l.enabled||c&&c.enabled)&&("x"===s?o.resetZoomButton="blocked":"y"===s?a=!1:"xy"===s&&(r=this.previousZoom,u(t)?this.previousZoom=[this.min,this.max]:r&&(t=r[0],n=r[1],delete this.previousZoom))),a!==B?a:e.call(this,t,n)}),lt(Kt.prototype,"init",function(e,t,n){bt(this,"beforeRender",function(){var e=this.options;(e.navigator.enabled||e.scrollbar.enabled)&&(this.scroller=new I(this))}),e.call(this,t,n)}),lt(Xt.prototype,"addPoint",function(e,t,n,o,i){var s=this.options.turboThreshold;s&&this.xData.length>s&&r(t)&&!a(t)&&this.chart.scroller&&P(20,!0),e.call(this,t,n,o,i)}),it(U,{rangeSelector:{buttonTheme:{width:28,height:18,fill:"#f7f7f7",padding:2,r:0,"stroke-width":0,style:{color:"#444",cursor:"pointer",fontWeight:"normal"},zIndex:7,states:{hover:{fill:"#e7e7e7"},select:{fill:"#e7f0f9",style:{color:"black",fontWeight:"bold"}}}},inputPosition:{align:"right"},labelStyle:{color:"#666"}}}),U.lang=e(U.lang,{rangeSelectorZoom:"Zoom",rangeSelectorFrom:"From",rangeSelectorTo:"To"}),R.prototype={clickButton:function(e,t){var n,r,a,o,i,s,l,u,c=this,d=c.selected,p=c.chart,f=c.buttons,h=c.buttonOptions[e],m=p.xAxis[0],g=p.scroller&&p.scroller.getUnionExtremes()||m||{},y=g.dataMin,b=g.dataMax,v=m&&me(ve(m.max,st(b,m.max))),_=new Y(v),w=h.type,k=h.count,E=h._range,x=h.dataGrouping;if(null!==y&&null!==b&&e!==c.selected){if(x&&(this.forcedDataGrouping=!0,It.prototype.setDataGrouping.call(m||{chart:this.chart},x,!1)),"month"===w||"year"===w)s={month:"Month",year:"FullYear"}[w],_["set"+s](_["get"+s]()-k),n=_.getTime(),y=st(y,Number.MIN_VALUE),isNaN(n)||y>n?(n=y,v=ve(n+E,b)):E=v-n;else if(E)n=be(v-E,y),v=ve(n+E,b);else if("ytd"===w){if(!m)return void bt(p,"beforeRender",function(){ +c.clickButton(e)});b===B&&(y=Number.MAX_VALUE,b=Number.MIN_VALUE,ht(p.series,function(e){var t=e.xData;y=ve(t[0],y),b=be(t[t.length-1],b)}),t=!1),r=new Y(b),i=r.getFullYear(),n=o=be(y||0,Y.UTC(i,0,1)),r=r.getTime(),v=ve(b||r,r)}else"all"===w&&m&&(n=y,v=b);f[d]&&f[d].setState(0),f[e]&&f[e].setState(2),p.fixedRange=E,m?(m.setExtremes(n,v,st(t,1),0,{trigger:"rangeSelectorButton",rangeSelectorButton:h}),c.setSelected(e)):(a=p.options.xAxis[0],u=a.range,a.range=E,l=a.min,a.min=o,c.setSelected(e),bt(p,"load",function(){a.range=u,a.min=l}))}},setSelected:function(e){this.selected=this.options.selected=e},defaultButtons:[{type:"month",count:1,text:"1m"},{type:"month",count:3,text:"3m"},{type:"month",count:6,text:"6m"},{type:"ytd",text:"YTD"},{type:"year",count:1,text:"1y"},{type:"all",text:"All"}],init:function(e){var t=this,n=e.options.rangeSelector,r=n.buttons||[].concat(t.defaultButtons),a=n.selected,o=t.blurInputs=function(){var e=t.minInput,n=t.maxInput;e&&e.blur&&_t(e,"blur"),n&&n.blur&&_t(n,"blur")};t.chart=e,t.options=n,t.buttons=[],e.extraTopMargin=35,t.buttonOptions=r,bt(e.container,"mousedown",o),bt(e,"resize",o),ht(r,t.computeButtonRange),a!==B&&r[a]&&this.clickButton(a,!1),bt(e,"load",function(){bt(e.xAxis[0],"setExtremes",function(n){this.max-this.min!==e.fixedRange&&"rangeSelectorButton"!==n.trigger&&"updatedData"!==n.trigger&&t.forcedDataGrouping&&this.setDataGrouping(!1,!1)}),bt(e.xAxis[0],"afterSetExtremes",function(){t.updateButtonStates(!0)})})},updateButtonStates:function(e){var t=this,n=this.chart,r=n.xAxis[0],a=n.scroller&&n.scroller.getUnionExtremes()||r,o=a.dataMin,i=a.dataMax,s=t.selected,l=t.options.allButtonsEnabled,u=t.buttons;e&&n.fixedRange!==me(r.max-r.min)&&(u[s]&&u[s].setState(0),t.setSelected(null)),ht(t.buttonOptions,function(e,n){var a=e._range,c=a>i-o,d=a=i-o&&2!==u[n].state,f="ytd"===e.type&&H("%Y",o)===H("%Y",i);a===me(r.max-r.min)&&n!==s?(t.setSelected(n),u[n].setState(2)):!l&&(c||d||p||f)?u[n].setState(3):3===u[n].state&&u[n].setState(0)})},computeButtonRange:function(e){var t=e.type,n=e.count||1,r={millisecond:1,second:1e3,minute:6e4,hour:36e5,day:864e5,week:6048e5};r[t]?e._range=r[t]*n:("month"===t||"year"===t)&&(e._range=24*{month:30,year:365}[t]*36e5*n)},setInputValue:function(e,t){var n=this.chart.options.rangeSelector;u(t)&&(this[e+"Input"].HCTime=t),this[e+"Input"].value=H(n.inputEditDateFormat||"%Y-%m-%d",this[e+"Input"].HCTime),this[e+"DateBox"].attr({text:H(n.inputDateFormat||"%b %e, %Y",this[e+"Input"].HCTime)})},showInput:function(e){var t=this.inputGroup,n=this[e+"DateBox"];p(this[e+"Input"],{left:t.translateX+n.x+Xe,top:t.translateY+Xe,width:n.width-2+Xe,height:n.height-2+Xe,border:"2px solid silver"})},hideInput:function(e){document.activeElement===this[e+"Input"]&&(p(this[e+"Input"],{border:0,width:"1px",height:"1px"}),this.setInputValue(e))},drawInput:function(n){var r,a,o,i=this,s=i.chart,l=s.renderer.style,u=s.renderer,c=s.options.rangeSelector,d=U.lang,p=i.div,h="min"===n,m=this.inputGroup;this[n+"Label"]=a=u.label(d[h?"rangeSelectorFrom":"rangeSelectorTo"],this.inputGroup.offset).attr({padding:2}).css(e(l,c.labelStyle)).add(m),m.offset+=a.width+5,this[n+"DateBox"]=o=u.label("",m.offset).attr({padding:2,width:c.inputBoxWidth||90,height:c.inputBoxHeight||17,stroke:c.inputBoxBorderColor||"silver","stroke-width":1}).css(e({textAlign:"center",color:"#444"},l,c.inputStyle)).on("click",function(){i.showInput(n),i[n+"Input"].focus()}).add(m),m.offset+=o.width+(h?10:0),this[n+"Input"]=r=f("input",{name:n,className:Ge+"range-selector",type:"text"},it({position:We,border:0,width:"1px",height:"1px",padding:0,textAlign:"center",fontSize:l.fontSize,fontFamily:l.fontFamily,top:s.plotTop+Xe},c.inputStyle),p),r.onfocus=function(){i.showInput(n)},r.onblur=function(){i.hideInput(n)},r.onchange=function(){var e=r.value,n=(c.inputDateParser||Y.parse)(e),a=s.xAxis[0],o=a.dataMin,l=a.dataMax;isNaN(n)&&(n=e.split("-"),n=Y.UTC(t(n[0]),t(n[1])-1,t(n[2]))),isNaN(n)||(U.global.useUTC||(n+=60*(new Y).getTimezoneOffset()*1e3),h?n>i.maxInput.HCTime?n=B:o>n&&(n=o):nl&&(n=l),n!==B&&s.xAxis[0].setExtremes(h?n:a.min,h?a.max:n,B,B,{trigger:"rangeSelectorInput"}))}},getPosition:function(){var e=this.chart,t=e.options.rangeSelector,n=st((t.buttonPosition||{}).y,e.plotTop-e.axisOffset[0]-35);return{buttonTop:n,inputTop:n-10}},render:function(e,t){var n,r,a=this,o=a.chart,i=o.renderer,s=o.container,l=o.options,c=l.exporting&&l.navigation&&l.navigation.buttonOptions,d=l.rangeSelector,p=a.buttons,h=U.lang,m=a.div,g=a.inputGroup,y=d.buttonTheme,b=d.buttonPosition||{},v=d.inputEnabled,_=y&&y.states,w=o.plotLeft,k=this.getPosition(),E=a.group;a.rendered||(a.group=E=i.g("range-selector-buttons").add(),a.zoomText=i.text(h.rangeSelectorZoom,st(b.x,w),k.buttonTop+15).css(d.labelStyle).add(E),n=st(b.x,w)+a.zoomText.getBBox().width+5,ht(a.buttonOptions,function(e,t){p[t]=i.button(e.text,n,k.buttonTop,function(){a.clickButton(t),a.isActive=!0},y,_&&_.hover,_&&_.select,_&&_.disabled).css({textAlign:"center"}).add(E),n+=p[t].width+st(d.buttonSpacing,5),a.selected===t&&p[t].setState(2)}),a.updateButtonStates(),v!==!1&&(a.div=m=f("div",null,{position:"relative",height:0,zIndex:1}),s.parentNode.insertBefore(m,s),a.inputGroup=g=i.g("input-group").add(),g.offset=0,a.drawInput("min"),a.drawInput("max"))),v!==!1&&(g.align(it({y:k.inputTop,width:g.offset,x:c&&k.inputTop<(c.y||0)+c.height-o.spacing[0]?-40:0},d.inputPosition),!0,o.spacingBox),u(v)||(r=E.getBBox(),g[g.translateX.7&&1.3>s&&(r?o=i-a:i=o+a),{min:o,max:i}},lt(Kt.prototype,"init",function(e,t,n){bt(this,"init",function(){this.options.rangeSelector.enabled&&(this.rangeSelector=new R(this))}),e.call(this,t,n)}),de.RangeSelector=R,Kt.prototype.callbacks.push(function(e){function t(){i=e.xAxis[0].getExtremes(),s.render(i.min,i.max)}function n(){i=e.xAxis[0].getExtremes(),isNaN(i.min)||l.render(i.min,i.max)}function r(e){"navigator-drag"!==e.triggerOp&&s.render(e.min,e.max)}function a(e){l.render(e.min,e.max)}function o(){s&&vt(e.xAxis[0],"afterSetExtremes",r),l&&(vt(e,"resize",n),vt(e.xAxis[0],"afterSetExtremes",a))}var i,s=e.scroller,l=e.rangeSelector;s&&(bt(e.xAxis[0],"afterSetExtremes",r),lt(e,"drawChartBox",function(e){var n=this.isDirtyBox;e.call(this),n&&t()}),t()),l&&(bt(e.xAxis[0],"afterSetExtremes",a),bt(e,"resize",n),n()),bt(e,"destroy",o)}),de.StockChart=function(t,n){var r,a=t.series,o=st(t.navigator&&t.navigator.enabled,!0),i=o?{startOnTick:!1,endOnTick:!1}:null,s={marker:{enabled:!1,radius:2}},l={shadow:!1,borderWidth:0};return t.xAxis=yt(d(t.xAxis||{}),function(t){return e({minPadding:0,maxPadding:0,ordinal:!0,title:{text:null},labels:{overflow:"justify"},showLastLabel:!0},t,{type:"datetime",categories:null},i)}),t.yAxis=yt(d(t.yAxis||{}),function(t){return r=st(t.opposite,!0),e({labels:{y:-2},opposite:r,showLastLabel:!1,title:{text:null}},t)}),t.series=null,t=e({chart:{panning:!0,pinchType:"x"},navigator:{enabled:!0},scrollbar:{enabled:!0},rangeSelector:{enabled:!0},title:{text:null,style:{fontSize:"16px"}},tooltip:{shared:!0,crosshairs:!0},legend:{enabled:!1},plotOptions:{line:s,spline:s,area:s,areaspline:s,arearange:s,areasplinerange:s,column:l,columnrange:l,candlestick:l,ohlc:l}},t,{_stock:!0,chart:{inverted:!1}}),t.series=a,new Kt(t,n)},lt(Lt.prototype,"init",function(e,t,n){var r=n.chart.pinchType||"";e.call(this,t,n),this.pinchX=this.pinchHor=-1!==r.indexOf("x"),this.pinchY=this.pinchVert=-1!==r.indexOf("y"),this.hasZoom=this.hasZoom||this.pinchHor||this.pinchVert}),lt(It.prototype,"autoLabelAlign",function(e){var t,n=this.chart,r=this.options,a=n._labelPanes=n._labelPanes||{},o=this.options.labels;return this.chart.options._stock&&"yAxis"===this.coll&&(t=r.top+","+r.height,!a[t]&&o.enabled)?(15===o.x&&(o.x=0),void 0===o.align&&(o.align="right"),a[t]=1,"right"):e.call(this,[].slice.call(arguments,1))}),lt(It.prototype,"getPlotLinePath",function(e,t,n,r,a,o){var i,s,l,c,d,p,f=this,h=this.isLinked&&!this.series?this.linkedParent.series:this.series,m=f.chart,g=m.renderer,y=f.left,b=f.top,v=[],_=[];return"colorAxis"===f.coll?e.apply(this,[].slice.call(arguments,1)):(_=f.isXAxis?u(f.options.yAxis)?[m.yAxis[f.options.yAxis]]:yt(h,function(e){return e.yAxis}):u(f.options.xAxis)?[m.xAxis[f.options.xAxis]]:yt(h,function(e){return e.xAxis}),d=f.isXAxis?m.yAxis:m.xAxis,ht(d,function(e){if(u(e.options.id)?-1===e.options.id.indexOf("navigator"):!0){var t=e.isXAxis?"yAxis":"xAxis",n=u(e.options[t])?m[t][e.options[t]]:m[t][0];f===n&&_.push(e)}}),p=_.length?[]:[f.isXAxis?m.yAxis[0]:m.xAxis[0]],ht(_,function(e){-1===ft(e,p)&&p.push(e)}),o=st(o,f.translate(t,null,null,r)),isNaN(o)||(f.horiz?ht(p,function(e){var t;s=e.pos,c=s+e.len,i=l=me(o+f.transB),(y>i||i>y+f.width)&&(a?i=l=ve(be(y,i),y+f.width):t=!0),t||v.push("M",i,s,"L",l,c)}):ht(p,function(e){var t;i=e.pos,l=i+e.len,s=c=me(b+f.height-o),(b>s||s>b+f.height)&&(a?s=c=ve(be(b,s),f.top+f.height):t=!0),t||v.push("M",i,s,"L",l,c)})),v.length>0?g.crispPolyLine(v,n||1):null)}),It.prototype.getPlotBandPath=function(e,t){var n,r=this.getPlotLinePath(t,null,null,!0),a=this.getPlotLinePath(e,null,null,!0),o=[];if(a&&r&&a.toString()!==r.toString())for(n=0;na||a>h+this.height)return void this.hideCrosshair();g||l.formatter||(this.isDatetimeAxis&&(y="%b %d, %Y"),g="{value"+(y?":"+y:"")+"}"),m.attr({text:g?v(g,{value:n[c]}):l.formatter.call(this,n[c]),x:r,y:a,visibility:Ye}),o=m.getBBox(),d?("inside"===this.options.tickPosition&&!p||"inside"!==this.options.tickPosition&&p)&&(a=m.y-o.height):a=m.y-o.height/2,i=d?{left:f-o.x,right:f+this.width-o.x}:{left:"left"===this.labelAlign?f:0,right:"right"===this.labelAlign?f+this.width:s.chartWidth},m.translateX=i.right&&(r-=m.translateX+o.width-i.right),m.attr({x:r,y:a,visibility:Ye})}});var Sn=un.init,Pn=un.processData,An=Yt.prototype.tooltipFormatter;un.init=function(){Sn.apply(this,arguments),this.setCompare(this.options.compare)},un.setCompare=function(e){this.modifyValue="value"===e||"percent"===e?function(t,n){var r=this.compareValue;return t!==B&&(t="value"===e?t-r:t=100*(t/r)-100,n&&(n.change=t)),t}:null,this.chart.hasRendered&&(this.isDirty=!0)},un.processData=function(){var e,t,n,r=this,a=0;if(Pn.apply(this,arguments),r.xAxis&&r.processedYData)for(e=r.processedXData,t=r.processedYData,n=t.length;n>a;a++)if(typeof t[a]===mn&&e[a]>=r.xAxis.min){r.compareValue=t[a];break}},lt(un,"getExtremes",function(e){e.apply(this,[].slice.call(arguments,1)),this.modifyValue&&(this.dataMax=this.modifyValue(this.dataMax),this.dataMin=this.modifyValue(this.dataMin))}),It.prototype.setCompare=function(e,t){this.isXAxis||(ht(this.series,function(t){t.setCompare(e)}),st(t,!0)&&this.chart.redraw())},Yt.prototype.tooltipFormatter=function(e){var t=this;return e=e.replace("{point.change}",(t.change>0?"+":"")+de.numberFormat(t.change,st(t.series.tooltipOptions.changeDecimals,2))),An.apply(this,[e])},lt(Xt.prototype,"render",function(t){this.chart.options._stock&&(!this.clipBox&&this.animate?(this.clipBox=e(this.chart.clipBox),this.clipBox.width=this.xAxis.len,this.clipBox.height=this.yAxis.len):this.chart[this.sharedClipKey]&&(Et(this.chart[this.sharedClipKey]),this.chart[this.sharedClipKey].attr({width:this.xAxis.len,height:this.yAxis.len}))),t.call(this)}),it(de,{Color:jt,Point:Yt,Tick:N,Renderer:L,SVGElement:M,SVGRenderer:Ct,arrayMin:E,arrayMax:x,charts:Le,dateFormat:H,error:P,format:v,pathAnim:V,getOptions:D,hasBidiBug:Ne,isTouchDevice:Te,setOptions:T,addEvent:bt,removeEvent:vt,createElement:f,discardElement:S,css:p,each:ht,map:yt,merge:e,splat:d,extendClass:h,pInt:t,svg:Me,canvas:ze,vml:!Me&&!ze,product:Fe,version:Ue})}(),e.exports=Highcharts}])})},,,,function(e,t,n){var r=n(196),a=n(783),o=n(784),i=n(786),s=n(787),l=(n(788),r.createClass({displayName:"NotificationSystem",uid:3400,_getStyles:{overrideStyle:{},overrideWidth:null,setOverrideStyle:function(e){this.overrideStyle=e},wrapper:function(){if(!this.overrideStyle)return{};this.overrideStyle.Wrapper||{};return a({},s.Wrapper,this.overrideStyle)},container:function(e){if(!this.overrideStyle)return{};var t=this.overrideStyle.Containers||{};return this.overrideWidth=s.Containers.DefaultStyle.width,t.DefaultStyle&&t.DefaultStyle.width&&(this.overrideWidth=t.DefaultStyle.width),t[e]&&t[e].width&&(this.overrideWidth=t[e].width),a({},s.Containers.DefaultStyle,s.Containers[e],t.DefaultStyle,t[e])},notification:function(e){if(!this.overrideStyle)return{};var t=this.overrideStyle.NotificationItem||{};return a({},s.NotificationItem.DefaultStyle,s.NotificationItem[e],t.DefaultStyle,t[e])},title:function(e){if(!this.overrideStyle)return{};var t=this.overrideStyle.Title||{};return a({},s.Title.DefaultStyle,s.Title[e],t.DefaultStyle,t[e])},messageWrapper:function(e){if(!this.overrideStyle)return{};var t=this.overrideStyle.MessageWrapper||{};return a({},s.MessageWrapper.DefaultStyle,s.MessageWrapper[e],t.DefaultStyle,t[e])},dismiss:function(e){if(!this.overrideStyle)return{};var t=this.overrideStyle.Dismiss||{};return a({},s.Dismiss.DefaultStyle,s.Dismiss[e],t.DefaultStyle,t[e])},action:function(e){if(!this.overrideStyle)return{};var t=this.overrideStyle.Action||{};return a({},s.Action.DefaultStyle,s.Action[e],t.DefaultStyle,t[e])},actionWrapper:function(e){if(!this.overrideStyle)return{};var t=this.overrideStyle.ActionWrapper||{};return a({},s.ActionWrapper.DefaultStyle,s.ActionWrapper[e],t.DefaultStyle,t[e])}},_didNotificationRemoved:function(e){var t,n=this.state.notifications.filter(function(n){return n.uid===e&&(t=n),n.uid!==e});t&&t.onRemove&&t.onRemove(t),this.setState({notifications:n})},getInitialState:function(){return{notifications:[]}},getDefaultProps:function(){return{style:{},noAnimation:!1}},addNotification:function(e){var e=a({},i.notification,e),t=!1;try{if(!e.level)throw"notification level is required.";if(isNaN(e.autoDismiss))throw"'autoDismiss' must be a number.";if(-1===Object.keys(i.positions).indexOf(e.position))throw"'"+e.position+"' is not a valid position.";if(-1===Object.keys(i.levels).indexOf(e.level))throw"'"+e.level+"' is not a valid level.";if(!e.dismissible&&!e.action)throw"You need to set notification dismissible to true or set an action, otherwise user will not be able to dismiss the notification."}catch(n){t=!0,console.error("Error adding notification: "+n)}if(!t){var r=this.state.notifications;e.position=e.position.toLowerCase(),e.level=e.level.toLowerCase(),e.autoDismiss=parseInt(e.autoDismiss),e.uid=e.uid||this.uid,e.ref="notification-"+e.uid,this.uid+=1;for(var o=0;o-1&&this.props.notifications.reverse();var t=this.props.notifications.map(function(t){return r.createElement(a,{key:t.uid,notification:t,getStyles:e.props.getStyles,onRemove:e.props.onRemove,noAnimation:e.props.noAnimation,allowHTML:e.props.allowHTML})});return r.createElement("div",{className:"notifications-"+this.props.position,style:this._style},t)}}));e.exports=i},function(e,t,n){function r(){var e,t=document.createElement("fakeelement"),n={transition:"transitionend",OTransition:"oTransitionEnd",MozTransition:"transitionend",WebkitTransition:"webkitTransitionEnd"};for(e in n)if(void 0!==t.style[e])return n[e]}var a=n(196),o=(n(783),n(786)),i=(n(787),n(788)),s=a.createClass({displayName:"NotificationItem",propTypes:{notification:a.PropTypes.object,onRemove:a.PropTypes.func,allowHTML:a.PropTypes.bool},getDefaultProps:function(){return{noAnimation:!1,onRemove:function(e){},allowHTML:!1}},getInitialState:function(){return{visible:!1,removed:!1}},componentWillMount:function(){var e=this.props.getStyles,t=this.props.notification.level;this._noAnimation=this.props.noAnimation,this._styles={notification:e.notification(t),title:e.title(t),dismiss:e.dismiss(t),messageWrapper:e.messageWrapper(t),actionWrapper:e.actionWrapper(t),action:e.action(t)},this.props.notification.dismissible||(this._styles.notification.cursor="default")},_styles:{},_notificationTimer:null,_height:0,_noAnimation:null,_getCssPropertyByPosition:function(){var e=this.props.notification.position,t={};switch(e){case o.positions.tl:case o.positions.bl:t={property:"left",value:-200};break;case o.positions.tr:case o.positions.br:t={property:"right",value:-200};break;case o.positions.tc:t={property:"top",value:-100};break;case o.positions.bc:t={property:"bottom",value:-100}}return t},_defaultAction:function(e){e.preventDefault();var t=this.props.notification;this._hideNotification(),t.action.callback()},_hideNotification:function(){this._notificationTimer&&this._notificationTimer.clear(),this.isMounted()&&this.setState({visible:!1,removed:!0}),this._noAnimation&&this._removeNotification()},_removeNotification:function(){this.props.onRemove(this.props.notification.uid)},_dismiss:function(){this.props.notification.dismissible&&this._hideNotification()},_showNotification:function(){var e=this;setTimeout(function(){e.setState({visible:!0})},50)},componentDidMount:function(){var e=this,t=r(),n=this.props.notification,o=a.findDOMNode(this);this._height=o.offsetHeight;var s=0;this._noAnimation||(t?o.addEventListener(t,function(){s>0||e.state.removed&&(s++,e._removeNotification())}):this._noAnimation=!0),n.autoDismiss&&(this._notificationTimer=new i.timer(function(){e._hideNotification()},1e3*n.autoDismiss),o.addEventListener("mouseenter",function(){e._notificationTimer.pause()}),o.addEventListener("mouseleave",function(){e._notificationTimer.resume()})),this._showNotification()},_allowHTML:function(e){return{__html:e}},render:function(){var e=this.props.notification,t="notification notification-"+e.level;if(t+=this.state.visible?" notification-visible":" notification-hidden",e.dismissible||(t+=" notification-not-dismissible"),this.props.getStyles.overrideStyle){var n=this._getCssPropertyByPosition();this.state.visible||this.state.removed||(this._styles.notification[n.property]=n.value),this.state.visible&&!this.state.removed&&(this._styles.notification.height=this._height,this._styles.notification[n.property]=0),this.state.removed&&(this._styles.notification.overlay="hidden",this._styles.notification.height=0,this._styles.notification.marginTop=0,this._styles.notification.paddingTop=0,this._styles.notification.paddingBottom=0),this._styles.notification.opacity=this.state.visible?this._styles.notification.isVisible.opacity:this._styles.notification.isHidden.opacity}var r=null,o=null,i=null,s=null;return e.title&&(i=a.createElement("h4",{className:"notification-title",style:this._styles.title},e.title)),e.message&&(s=this.props.allowHTML?a.createElement("div",{className:"notification-message",style:this._styles.messageWrapper,dangerouslySetInnerHTML:this._allowHTML(e.message)}):a.createElement("div",{className:"notification-message",style:this._styles.messageWrapper},e.message)),e.dismissible&&(r=a.createElement("span",{className:"notification-dismiss",style:this._styles.dismiss},"×")),e.action&&(o=a.createElement("div",{className:"notification-action-wrapper",style:this._styles.actionWrapper},a.createElement("button",{className:"notification-action-button",onClick:this._defaultAction,style:this._styles.action},e.action.label))),a.createElement("div",{className:t,onClick:this._dismiss,style:this._styles.notification},i,s,r,o)}});e.exports=s},function(e,t){var n={positions:{tl:"tl",tr:"tr",tc:"tc",bl:"bl",br:"br",bc:"bc"},levels:{success:"success",error:"error",warning:"warning",info:"info"},notification:{title:null,message:null,level:null,position:"tr",autoDismiss:5,dismissible:!0,action:null}};e.exports=n},function(e,t){var n=320,r={success:"#5ea400",error:"#ec3d3d",warning:"#ebad1a",info:"#369cc7"},a={Wrapper:{},Containers:{DefaultStyle:{fontFamily:"inherit",position:"fixed",width:n,padding:"0 10px 10px 10px",zIndex:9998,WebkitBoxSizing:"border-box",MozBoxSizing:"border-box",boxSizing:"border-box",height:"auto"},tl:{top:"0px",bottom:"auto",left:"0px",right:"auto"},tr:{top:"0px",bottom:"auto",left:"auto",right:"0px"},tc:{top:"0px",bottom:"auto",margin:"0 auto",left:"50%",marginLeft:-(n/2)},bl:{top:"auto",bottom:"0px",left:"0px",right:"auto"},br:{top:"auto",bottom:"0px",left:"auto",right:"0px"},bc:{top:"auto",bottom:"0px",margin:"0 auto",left:"50%",marginLeft:-(n/2)}},NotificationItem:{DefaultStyle:{position:"relative",width:"100%",cursor:"pointer",borderRadius:"2px",fontSize:"13px",border:"1px solid",borderTopWidth:"4px",margin:"10px 0 0",padding:"10px",display:"block",WebkitBoxSizing:"border-box",MozBoxSizing:"border-box",boxSizing:"border-box",WebkitBoxShadow:"0px 0px 5px 2px rgba(0,0,0,0.1)",MozBoxShadow:"0px 0px 5px 2px rgba(0,0,0,0.1)",boxShadow:"0px 0px 5px 2px rgba(0,0,0,0.1)",opacity:0,transition:"0.3s ease-in-out",isHidden:{opacity:0},isVisible:{opacity:.9}},success:{borderColor:"#d0ddbe",borderTopColor:r.success,backgroundColor:"#f0f5ea",color:"#4b583a"},error:{borderColor:"#edbfbf",borderTopColor:r.error,backgroundColor:"#f4e9e9",color:"#412f2f"},warning:{borderColor:"#ecd9ab",borderTopColor:r.warning,backgroundColor:"#f9f6f0",color:"#5a5343"},info:{borderColor:"#b2d0dd",borderTopColor:r.info,backgroundColor:"#e8f0f4",color:"#41555d"}},Title:{DefaultStyle:{fontSize:"14px",margin:"0 0 5px 0",padding:0,fontWeight:"bold"},success:{color:r.success},error:{color:r.error},warning:{color:r.warning},info:{color:r.info}},MessageWrapper:{DefaultStyle:{margin:0,padding:0}},Dismiss:{DefaultStyle:{fontFamily:"Arial",fontSize:"17px",position:"absolute",top:"4px",right:"5px",lineHeight:"15px",backgroundColor:"#dededf",color:"#ffffff",borderRadius:"50%",width:"14px",height:"14px",fontWeight:"bold",textAlign:"center"},success:{color:"#f0f5ea",backgroundColor:"#b0ca92"},error:{color:"#f4e9e9",backgroundColor:"#e4bebe"},warning:{color:"#f9f6f0",backgroundColor:"#e1cfac"},info:{color:"#e8f0f4",backgroundColor:"#a4becb"}},Action:{DefaultStyle:{background:"#ffffff",borderRadius:"2px",padding:"6px 20px",fontWeight:"bold",margin:"10px 0 0 0",border:0},success:{backgroundColor:r.success,color:"#ffffff"},error:{backgroundColor:r.error,color:"#ffffff"},warning:{backgroundColor:r.warning,color:"#ffffff"},info:{backgroundColor:r.info,color:"#ffffff"}},ActionWrapper:{DefaultStyle:{margin:0,padding:0}}};e.exports=a},function(e,t){var n={timer:function(e,t){var n,r,a=t;this.pause=function(){clearTimeout(n),a-=new Date-r},this.resume=function(){r=new Date,clearTimeout(n),n=setTimeout(e,a)},this.clear=function(){clearTimeout(n)},this.resume()}};e.exports=n},,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{"default":e}}function a(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(t,"__esModule",{value:!0});var i=function(){function e(e,t){for(var n=0;nr;r++)n[r]=arguments[r];n.forEach(function(t){return e[t]=e[t].bind(e)})}}]),i(t,[{key:"componentDidMount",value:function(){this._updatePosition(),this.bindListener()}},{key:"componentWillUnmount",value:function(){this.unbindListener()}},{key:"componentWillUpdate",value:function(){this.unbindListener()}},{key:"componentDidUpdate",value:function(){this._updatePosition(),this.bindListener()}},{key:"bindListener",value:function(){for(var e=document.querySelectorAll("[data-tip]"),t=0;t0)if("float"===this.state.effect)this.setState({show:!0,x:e.clientX,y:e.clientY});else if("solid"===this.state.effect){var t=e.target.getBoundingClientRect().top,n=e.target.getBoundingClientRect().left,r=u["default"].findDOMNode(this),a=r.clientWidth,o=r.clientHeight,i=e.target.clientWidth,s=e.target.clientHeight,l=this.state.place,c=void 0,d=void 0;"top"===l?(c=n-a/2+i/2,d=t-o-8):"bottom"===l?(c=n-a/2+i/2,d=t+s+8):"left"===l?(c=n-a-6,d=t+s/2-o/2):"right"===l&&(c=n+i+6,d=t+s/2-o/2),this.setState({show:!0,x:"NONE"===this.state.x?c:this.state.x,y:"NONE"===this.state.y?d:this.state.y})}}},{key:"hideTooltip",value:function(e){this.setState({show:!1,x:"NONE",y:"NONE"})}},{key:"render",value:function(){var e=d["default"]("reactTooltip",{show:this.state.show},{"place-top":"top"===this.state.place},{"place-bottom":"bottom"===this.state.place},{"place-left":"left"===this.state.place},{"place-right":"right"===this.state.place},{"type-dark":"dark"===this.state.type},{"type-success":"success"===this.state.type},{"type-warning":"warning"===this.state.type},{"type-error":"error"===this.state.type},{"type-info":"info"===this.state.type},{"type-light":"light"===this.state.type});return u["default"].createElement("span",{className:e,"data-id":"tooltip"},this.state.placeholder)}},{key:"trim",value:function(e){for(var t=e.split(""),n=0,r=0,a=0;a=0&&" "===e[a];a--)r++;return t.splice(0,n),t.splice(-r,r),t.join("")}}]),t}(u["default"].Component);p.displayName="ReactTooltip",p.propTypes={place:l.PropTypes.string,type:l.PropTypes.string,effect:l.PropTypes.string,positon:l.PropTypes.object},t["default"]=p,e.exports=t["default"]},function(e,t,n){/*! + Copyright (c) 2015 Jed Watson. + Licensed under the MIT License (MIT), see + http://jedwatson.github.io/classnames + */ +function r(){for(var e,t="",n=0;n | MIT +var a;a=r(),e.exports.LZMA=function(){return a},e.exports.compress=a.compress,e.exports.decompress=a.decompress},function(e,t,n){(function(e){function n(e,t){for(var n=0,r=e.length-1;r>=0;r--){var a=e[r];"."===a?e.splice(r,1):".."===a?(e.splice(r,1),n++):n&&(e.splice(r,1),n--)}if(t)for(;n--;n)e.unshift("..");return e}function r(e,t){if(e.filter)return e.filter(t);for(var n=[],r=0;r=-1&&!a;o--){var i=o>=0?arguments[o]:e.cwd();if("string"!=typeof i)throw new TypeError("Arguments to path.resolve must be strings");i&&(t=i+"/"+t,a="/"===i.charAt(0))}return t=n(r(t.split("/"),function(e){return!!e}),!a).join("/"),(a?"/":"")+t||"."},t.normalize=function(e){var a=t.isAbsolute(e),o="/"===i(e,-1);return e=n(r(e.split("/"),function(e){return!!e}),!a).join("/"),e||a||(e="."),e&&o&&(e+="/"),(a?"/":"")+e},t.isAbsolute=function(e){return"/"===e.charAt(0)},t.join=function(){var e=Array.prototype.slice.call(arguments,0);return t.normalize(r(e,function(e,t){if("string"!=typeof e)throw new TypeError("Arguments to path.join must be strings");return e}).join("/"))},t.relative=function(e,n){function r(e){for(var t=0;t=0&&""===e[n];n--);return t>n?[]:e.slice(t,n-t+1)}e=t.resolve(e).substr(1),n=t.resolve(n).substr(1);for(var a=r(e.split("/")),o=r(n.split("/")),i=Math.min(a.length,o.length),s=i,l=0;i>l;l++)if(a[l]!==o[l]){s=l;break}for(var u=[],l=s;lt&&(t=e.length+t),e.substr(t,n)}}).call(t,n(175))},function(e,t,n){function r(e){return n(a(e))}function a(e){return o[e]||function(){throw new Error("Cannot find module '"+e+"'.")}()}var o={"./src/lzma_worker.js":838};r.keys=function(){return Object.keys(o)},r.resolve=a,e.exports=r,r.id=837},function(e,t,n){(function(e){var t=function(){"use strict";function n(e,t){postMessage({action:Rt,cbn:t,result:e})}function r(e){var t=[];return t[e-1]=void 0,t}function a(e,t){return s(e[0]+t[0],e[1]+t[1])}function o(e,t){return d(~~Math.max(Math.min(e[1]/Lt,2147483647),-2147483648)&~~Math.max(Math.min(t[1]/Lt,2147483647),-2147483648),c(e)&c(t))}function i(e,t){var n,r;return e[0]==t[0]&&e[1]==t[1]?0:(n=e[1]<0,r=t[1]<0,n&&!r?-1:!n&&r?1:g(e,t)[1]<0?-1:1)}function s(e,t){var n,r;for(t%=0x10000000000000000,e%=0x10000000000000000,n=t%Lt,r=Math.floor(e/Lt)*Lt,t=t-n+r,e=e-r+n;0>e;)e+=Lt,t-=Lt;for(;e>4294967295;)e-=Lt,t+=Lt;for(t%=0x10000000000000000;t>0x7fffffff00000000;)t-=0x10000000000000000;for(;-0x8000000000000000>t;)t+=0x10000000000000000;return[e,t]}function l(e,t){return e[0]==t[0]&&e[1]==t[1]}function u(e){return e>=0?[e,0]:[e+Lt,-Lt]}function c(e){return e[0]>=2147483648?~~Math.max(Math.min(e[0]-Lt,2147483647),-2147483648):~~Math.max(Math.min(e[0],2147483647),-2147483648)}function d(e,t){var n,r;return n=e*Lt,r=t,0>t&&(r+=Lt),[r,n]}function p(e){return 30>=e?1<=0x8000000000000000&&(r-=0x10000000000000000),[a,r]}function h(e,t){var n;return t&=63,n=p(t),s(Math.floor(e[0]/n),e[1]/n)}function m(e,t){var n;return t&=63,n=h(e,t),e[1]<0&&(n=a(n,f([2,0],63-t))),n}function g(e,t){return s(e[0]-t[0],e[1]-t[1])}function y(e,t){return e.buf=t,e.pos=0,e.count=t.length,e}function b(e){return e.pos>=e.count?-1:255&e.buf[e.pos++]}function v(e,t,n,r){return e.pos>=e.count?-1:(r=Math.min(r,e.count-e.pos),O(e.buf,e.pos,t,n,r),e.pos+=r,r)}function _(e){return e.buf=r(32),e.count=0,e}function w(e){var t=e.buf;return t.length=e.count,t}function k(e,t){e.buf[e.count++]=t<<24>>24}function E(e,t,n,r){O(t,n,e.buf,e.count,r),e.count+=r}function x(e,t,n,r,a){var o;for(o=t;n>o;++o)r[a++]=e.charCodeAt(o)}function O(e,t,n,r,a){for(var o=0;a>o;++o)n[r+o]=e[t+o]}function S(e,t){Le(t,1<s;s+=8)k(n,255&c(h(r,s)));e.chunker=(o._needReleaseMFStream=0,o._inStream=t,o._finished=0,Oe(o),o._rangeEncoder.Stream=n,Ne(o),Ae(o),Pe(o),o._lenEncoder._tableSize=o._numFastBytes+1-2,Ze(o._lenEncoder,1<a;++a){if(o=b(t),-1==o)throw new Error("truncated input");l[a]=o<<24>>24}if(r=se({}),!ue(r,l))throw new Error("corrupted input");for(a=0;64>a;a+=8){if(o=b(t),-1==o)throw new Error("truncated input");o=o.toString(16),1==o.length&&(o="0"+o),s=o+""+s}/^0+$|^f+$/i.test(s)?e.length_0=qt:(i=parseInt(s,16),i>4294967295?e.length_0=qt:e.length_0=u(i)),e.chunker=oe(r,t,n,e.length_0)}function C(e,t){return e.output=_({}),j(e,y({},t),e.output),e}function T(e,t,n,a){var o;e._keepSizeBefore=t,e._keepSizeAfter=n,o=t+n+a,(null==e._bufferBase||e._blockSize!=o)&&(e._bufferBase=null,e._blockSize=o,e._bufferBase=r(e._blockSize)),e._pointerToLastSafePosition=e._blockSize-n}function D(e,t){return e._bufferBase[e._bufferOffset+e._pos+t]}function M(e,t,n,r){var a,o;for(e._streamEndWasReached&&e._pos+t+r>e._streamPos&&(r=e._streamPos-(e._pos+t)),++n,o=e._bufferOffset+e._pos+t,a=0;r>a&&e._bufferBase[o+a]==e._bufferBase[o+a-n];++a);return a}function N(e){return e._streamPos-e._pos}function z(e){var t,n,r;for(r=e._bufferOffset+e._pos-e._keepSizeBefore,r>0&&--r,n=e._bufferOffset+e._streamPos-r,t=0;n>t;++t)e._bufferBase[t]=e._bufferBase[r+t];e._bufferOffset-=r}function I(e){var t;++e._pos,e._pos>e._posLimit&&(t=e._bufferOffset+e._pos,t>e._pointerToLastSafePosition&&z(e),R(e))}function R(e){var t,n,r;if(!e._streamEndWasReached)for(;;){if(r=-e._bufferOffset+e._blockSize-e._streamPos,!r)return;if(t=v(e._stream,e._bufferBase,e._bufferOffset+e._streamPos,r),-1==t)return e._posLimit=e._streamPos,n=e._bufferOffset+e._posLimit,n>e._pointerToLastSafePosition&&(e._posLimit=e._pointerToLastSafePosition-e._bufferOffset),void(e._streamEndWasReached=1);e._streamPos+=t,e._streamPos>=e._pos+e._keepSizeAfter&&(e._posLimit=e._streamPos-e._keepSizeAfter)}}function B(e,t){e._bufferOffset+=t,e._posLimit-=t,e._pos-=t,e._streamPos-=t}function L(e,t,n,a,o){var i,s,l;1073741567>t&&(e._cutValue=16+(a>>1),l=~~((t+n+a+o)/2)+256,T(e,t+n,a+o,l),e._matchMaxLen=a,i=t+1,e._cyclicBufferSize!=i&&(e._son=r(2*(e._cyclicBufferSize=i))),s=65536,e.HASH_ARRAY&&(s=t-1,s|=s>>1,s|=s>>2,s|=s>>4,s|=s>>8,s>>=1,s|=65535,s>16777216&&(s>>=1),e._hashMask=s,++s,s+=e.kFixHashSize),s!=e._hashSizeSum&&(e._hash=r(e._hashSizeSum=s)))}function q(e,t){var n,r,a,o,i,s,l,u,c,d,p,f,h,m,g,y,b,v,_,w,k;if(e._pos+e._matchMaxLen<=e._streamPos)m=e._matchMaxLen;else if(m=e._streamPos-e._pos,me._cyclicBufferSize?e._pos-e._cyclicBufferSize:0,r=e._bufferOffset+e._pos,y=1,u=0,c=0,e.HASH_ARRAY?(k=Wt[255&e._bufferBase[r]]^255&e._bufferBase[r+1],u=1023&k,k^=(255&e._bufferBase[r+2])<<8,c=65535&k,d=(k^Wt[255&e._bufferBase[r+3]]<<5)&e._hashMask):d=255&e._bufferBase[r]^(255&e._bufferBase[r+1])<<8,a=e._hash[e.kFixHashSize+d]||0,e.HASH_ARRAY&&(o=e._hash[u]||0,i=e._hash[1024+c]||0,e._hash[u]=e._pos,e._hash[1024+c]=e._pos,o>g&&e._bufferBase[e._bufferOffset+o]==e._bufferBase[r]&&(t[b++]=y=2,t[b++]=e._pos-o-1),i>g&&e._bufferBase[e._bufferOffset+i]==e._bufferBase[r]&&(i==o&&(b-=2),t[b++]=y=3,t[b++]=e._pos-i-1,o=i),0!=b&&o==a&&(b-=2,y=1)),e._hash[e.kFixHashSize+d]=e._pos,_=(e._cyclicBufferPos<<1)+1,w=e._cyclicBufferPos<<1,f=h=e.kNumHashDirectBytes,0!=e.kNumHashDirectBytes&&a>g&&e._bufferBase[e._bufferOffset+a+e.kNumHashDirectBytes]!=e._bufferBase[r+e.kNumHashDirectBytes]&&(t[b++]=y=e.kNumHashDirectBytes,t[b++]=e._pos-a-1),n=e._cutValue;;){if(g>=a||0==n--){e._son[_]=e._son[w]=0;break}if(l=e._pos-a,s=(l<=e._cyclicBufferPos?e._cyclicBufferPos-l:e._cyclicBufferPos-l+e._cyclicBufferSize)<<1,v=e._bufferOffset+a,p=h>f?f:h,e._bufferBase[v+p]==e._bufferBase[r+p]){for(;++p!=m&&e._bufferBase[v+p]==e._bufferBase[r+p];);if(p>y&&(t[b++]=y=p,t[b++]=l-1,p==m)){e._son[w]=e._son[s],e._son[_]=e._son[s+1];break}}(255&e._bufferBase[v+p])<(255&e._bufferBase[r+p])?(e._son[w]=a,w=s+1,a=e._son[w],h=p):(e._son[_]=a,_=s,a=e._son[_],f=p)}return U(e),b}function F(e){e._bufferOffset=0,e._pos=0,e._streamPos=0,e._streamEndWasReached=0,R(e),e._cyclicBufferPos=0,B(e,-1)}function U(e){var t;++e._cyclicBufferPos>=e._cyclicBufferSize&&(e._cyclicBufferPos=0),I(e),1073741823==e._pos&&(t=e._pos-e._cyclicBufferSize,H(e._son,2*e._cyclicBufferSize,t),H(e._hash,e._hashSizeSum,t),B(e,t))}function H(e,t,n){var r,a;for(r=0;t>r;++r)a=e[r]||0,n>=a?a=0:a-=n,e[r]=a}function W(e,t){e.HASH_ARRAY=t>2,e.HASH_ARRAY?(e.kNumHashDirectBytes=0,e.kMinMatchCheck=4,e.kFixHashSize=66560):(e.kNumHashDirectBytes=2,e.kMinMatchCheck=3,e.kFixHashSize=0)}function V(e,t){var n,r,a,o,i,s,l,u,c,d,p,f,h,m,g,y,b;do{if(e._pos+e._matchMaxLen<=e._streamPos)f=e._matchMaxLen;else if(f=e._streamPos-e._pos,fe._cyclicBufferSize?e._pos-e._cyclicBufferSize:0,r=e._bufferOffset+e._pos,e.HASH_ARRAY?(b=Wt[255&e._bufferBase[r]]^255&e._bufferBase[r+1],s=1023&b,e._hash[s]=e._pos,b^=(255&e._bufferBase[r+2])<<8,l=65535&b,e._hash[1024+l]=e._pos,u=(b^Wt[255&e._bufferBase[r+3]]<<5)&e._hashMask):u=255&e._bufferBase[r]^(255&e._bufferBase[r+1])<<8,a=e._hash[e.kFixHashSize+u],e._hash[e.kFixHashSize+u]=e._pos,g=(e._cyclicBufferPos<<1)+1,y=e._cyclicBufferPos<<1,d=p=e.kNumHashDirectBytes,n=e._cutValue;;){if(h>=a||0==n--){e._son[g]=e._son[y]=0;break}if(i=e._pos-a,o=(i<=e._cyclicBufferPos?e._cyclicBufferPos-i:e._cyclicBufferPos-i+e._cyclicBufferSize)<<1,m=e._bufferOffset+a,c=p>d?d:p,e._bufferBase[m+c]==e._bufferBase[r+c]){for(;++c!=f&&e._bufferBase[m+c]==e._bufferBase[r+c];);if(c==f){e._son[y]=e._son[o],e._son[g]=e._son[o+1];break}}(255&e._bufferBase[m+c])<(255&e._bufferBase[r+c])?(e._son[y]=a,y=o+1,a=e._son[y],p=c):(e._son[g]=a,g=o,a=e._son[g],d=c)}U(e)}while(0!=--t)}function K(e,t,n){var r=e._pos-t-1;for(0>r&&(r+=e._windowSize);0!=n;--n)r>=e._windowSize&&(r=0),e._buffer[e._pos++]=e._buffer[r++],e._pos>=e._windowSize&&Y(e)}function G(e,t){(null==e._buffer||e._windowSize!=t)&&(e._buffer=r(t)),e._windowSize=t,e._pos=0,e._streamPos=0}function Y(e){var t=e._pos-e._streamPos;t&&(E(e._stream,e._buffer,e._streamPos,t),e._pos>=e._windowSize&&(e._pos=0),e._streamPos=e._pos)}function X(e,t){var n=e._pos-t-1;return 0>n&&(n+=e._windowSize),e._buffer[n]}function J(e,t){e._buffer[e._pos++]=t,e._pos>=e._windowSize&&Y(e)}function $(e){Y(e),e._stream=null}function Z(e){return e-=2,4>e?e:3}function Q(e){return 4>e?0:10>e?e-3:e-6}function ee(e,t){return e.encoder=t,e.decoder=null,e.alive=1,e}function te(e,t){return e.decoder=t,e.encoder=null,e.alive=1,e}function ne(e){if(!e.alive)throw new Error("bad state");return e.encoder?ae(e):re(e),e.alive}function re(e){var t=ie(e.decoder);if(-1==t)throw new Error("corrupted input");e.inBytesProcessed=qt,e.outBytesProcessed=e.decoder.nowPos64,(t||i(e.decoder.outSize,Ut)>=0&&i(e.decoder.nowPos64,e.decoder.outSize)>=0)&&(Y(e.decoder.m_OutWindow),$(e.decoder.m_OutWindow),e.decoder.m_RangeDecoder.Stream=null,e.alive=0)}function ae(e){xe(e.encoder,e.encoder.processedInSize,e.encoder.processedOutSize,e.encoder.finished),e.inBytesProcessed=e.encoder.processedInSize[0],e.encoder.finished[0]&&(Be(e.encoder),e.alive=0)}function oe(e,t,n,r){return e.m_RangeDecoder.Stream=t,$(e.m_OutWindow),e.m_OutWindow._stream=n,le(e),e.state=0,e.rep0=0,e.rep1=0,e.rep2=0,e.rep3=0,e.outSize=r,e.nowPos64=Ut,e.prevByte=0,te({},e)}function ie(e){var t,n,r,o,s,l;if(l=c(e.nowPos64)&e.m_PosStateMask,vt(e.m_RangeDecoder,e.m_IsMatchDecoders,(e.state<<4)+l)){if(vt(e.m_RangeDecoder,e.m_IsRepDecoders,e.state))r=0,vt(e.m_RangeDecoder,e.m_IsRepG0Decoders,e.state)?(vt(e.m_RangeDecoder,e.m_IsRepG1Decoders,e.state)?(vt(e.m_RangeDecoder,e.m_IsRepG2Decoders,e.state)?(n=e.rep3,e.rep3=e.rep2):n=e.rep2,e.rep2=e.rep1):n=e.rep1,e.rep1=e.rep0,e.rep0=n):vt(e.m_RangeDecoder,e.m_IsRep0LongDecoders,(e.state<<4)+l)||(e.state=e.state<7?9:11,r=1),r||(r=fe(e.m_RepLenDecoder,e.m_RangeDecoder,l)+2,e.state=e.state<7?8:11);else if(e.rep3=e.rep2,e.rep2=e.rep1,e.rep1=e.rep0,r=2+fe(e.m_LenDecoder,e.m_RangeDecoder,l),e.state=e.state<7?7:10,s=ut(e.m_PosSlotDecoder[Z(r)],e.m_RangeDecoder),s>=4){if(o=(s>>1)-1,e.rep0=(2|1&s)<s)e.rep0+=dt(e.m_PosDecoders,e.rep0-s-1,e.m_RangeDecoder,o);else if(e.rep0+=_t(e.m_RangeDecoder,o-4)<<4,e.rep0+=ct(e.m_PosAlignDecoder,e.m_RangeDecoder),e.rep0<0)return-1==e.rep0?1:-1}else e.rep0=s;if(i(u(e.rep0),e.nowPos64)>=0||e.rep0>=e.m_DictionarySizeCheck)return-1;K(e.m_OutWindow,e.rep0,r),e.nowPos64=a(e.nowPos64,u(r)),e.prevByte=X(e.m_OutWindow,0)}else t=ye(e.m_LiteralDecoder,c(e.nowPos64),e.prevByte),e.state<7?e.prevByte=ve(t,e.m_RangeDecoder):e.prevByte=_e(t,e.m_RangeDecoder,X(e.m_OutWindow,e.rep0)),J(e.m_OutWindow,e.prevByte),e.state=Q(e.state),e.nowPos64=a(e.nowPos64,Ht);return 0}function se(e){e.m_OutWindow={},e.m_RangeDecoder={},e.m_IsMatchDecoders=r(192),e.m_IsRepDecoders=r(12),e.m_IsRepG0Decoders=r(12),e.m_IsRepG1Decoders=r(12),e.m_IsRepG2Decoders=r(12),e.m_IsRep0LongDecoders=r(192),e.m_PosSlotDecoder=r(4),e.m_PosDecoders=r(114),e.m_PosAlignDecoder=lt({},4),e.m_LenDecoder=he({}),e.m_RepLenDecoder=he({}),e.m_LiteralDecoder={};for(var t=0;4>t;++t)e.m_PosSlotDecoder[t]=lt({},6);return e}function le(e){e.m_OutWindow._streamPos=0,e.m_OutWindow._pos=0,kt(e.m_IsMatchDecoders),kt(e.m_IsRep0LongDecoders),kt(e.m_IsRepDecoders),kt(e.m_IsRepG0Decoders),kt(e.m_IsRepG1Decoders),kt(e.m_IsRepG2Decoders),kt(e.m_PosDecoders),be(e.m_LiteralDecoder);for(var t=0;4>t;++t)kt(e.m_PosSlotDecoder[t].Models);me(e.m_LenDecoder),me(e.m_RepLenDecoder),kt(e.m_PosAlignDecoder.Models),wt(e.m_RangeDecoder)}function ue(e,t){var n,r,a,o,i,s,l;if(t.length<5)return 0;for(l=255&t[0],a=l%9,s=~~(l/9),o=s%5,i=~~(s/5),n=0,r=0;4>r;++r)n+=(255&t[1+r])<<8*r;return n>99999999||!de(e,a,o,i)?0:ce(e,n)}function ce(e,t){return 0>t?0:(e.m_DictionarySize!=t&&(e.m_DictionarySize=t,e.m_DictionarySizeCheck=Math.max(e.m_DictionarySize,1),G(e.m_OutWindow,Math.max(e.m_DictionarySizeCheck,4096))),1)}function de(e,t,n,r){if(t>8||n>4||r>4)return 0;ge(e.m_LiteralDecoder,n,t);var a=1<a;++a)e.m_Coders[a]=we({})}function ye(e,t,n){return e.m_Coders[((t&e.m_PosMask)<>>8-e.m_NumPrevBits)]}function be(e){var t,n;for(n=1<t;++t)kt(e.m_Coders[t].m_Decoders)}function ve(e,t){var n=1;do n=n<<1|vt(t,e.m_Decoders,n);while(256>n);return n<<24>>24}function _e(e,t,n){var r,a,o=1;do if(a=n>>7&1,n<<=1,r=vt(t,e.m_Decoders,(1+a<<8)+o),o=o<<1|r,a!=r){for(;256>o;)o=o<<1|vt(t,e.m_Decoders,o);break}while(256>o);return o<<24>>24}function we(e){return e.m_Decoders=r(768),e}function ke(e,t){var n,r,a,o;e._optimumEndIndex=t,a=e._optimum[t].PosPrev,r=e._optimum[t].BackPrev;do e._optimum[t].Prev1IsChar&&(it(e._optimum[a]),e._optimum[a].PosPrev=a-1,e._optimum[t].Prev2&&(e._optimum[a-1].Prev1IsChar=0,e._optimum[a-1].PosPrev=e._optimum[t].PosPrev2,e._optimum[a-1].BackPrev=e._optimum[t].BackPrev2)),o=a,n=r,r=e._optimum[o].BackPrev,a=e._optimum[o].PosPrev,e._optimum[o].BackPrev=n,e._optimum[o].PosPrev=t,t=o;while(t>0);return e.backRes=e._optimum[0].BackPrev,e._optimumCurrentIndex=e._optimum[0].PosPrev,e._optimumCurrentIndex}function Ee(e){e._state=0,e._previousByte=0;for(var t=0;4>t;++t)e._repDistances[t]=0}function xe(e,t,n,r){var o,s,d,p,f,h,m,y,b,v,_,w,k,E,x;if(t[0]=Ut,n[0]=Ut,r[0]=1,e._inStream&&(e._matchFinder._stream=e._inStream,F(e._matchFinder),e._needReleaseMFStream=1,e._inStream=null),!e._finished){if(e._finished=1,E=e.nowPos64,l(e.nowPos64,Ut)){if(!N(e._matchFinder))return void je(e,c(e.nowPos64));Ie(e),k=c(e.nowPos64)&e._posStateMask,Et(e._rangeEncoder,e._isMatch,(e._state<<4)+k,0),e._state=Q(e._state),d=D(e._matchFinder,-e._additionalOffset),nt(et(e._literalEncoder,c(e.nowPos64),e._previousByte),e._rangeEncoder,d),e._previousByte=d,--e._additionalOffset,e.nowPos64=a(e.nowPos64,Ht)}if(!N(e._matchFinder))return void je(e,c(e.nowPos64));for(;;){if(m=Ce(e,c(e.nowPos64)),v=e.backRes,k=c(e.nowPos64)&e._posStateMask,s=(e._state<<4)+k,1==m&&-1==v)Et(e._rangeEncoder,e._isMatch,s,0),d=D(e._matchFinder,-e._additionalOffset),x=et(e._literalEncoder,c(e.nowPos64),e._previousByte),e._state<7?nt(x,e._rangeEncoder,d):(b=D(e._matchFinder,-e._repDistances[0]-1-e._additionalOffset),rt(x,e._rangeEncoder,b,d)),e._previousByte=d,e._state=Q(e._state);else{if(Et(e._rangeEncoder,e._isMatch,s,1),4>v){if(Et(e._rangeEncoder,e._isRep,e._state,1),v?(Et(e._rangeEncoder,e._isRepG0,e._state,1),1==v?Et(e._rangeEncoder,e._isRepG1,e._state,0):(Et(e._rangeEncoder,e._isRepG1,e._state,1),Et(e._rangeEncoder,e._isRepG2,e._state,v-2))):(Et(e._rangeEncoder,e._isRepG0,e._state,0),1==m?Et(e._rangeEncoder,e._isRep0Long,s,0):Et(e._rangeEncoder,e._isRep0Long,s,1)),1==m?e._state=e._state<7?9:11:(Xe(e._repMatchLenEncoder,e._rangeEncoder,m-2,k),e._state=e._state<7?8:11),p=e._repDistances[v],0!=v){for(h=v;h>=1;--h)e._repDistances[h]=e._repDistances[h-1];e._repDistances[0]=p}}else{for(Et(e._rangeEncoder,e._isRep,e._state,0),e._state=e._state<7?7:10,Xe(e._lenEncoder,e._rangeEncoder,m-2,k),v-=4,w=He(v),y=Z(m),ft(e._posSlotEncoder[y],e._rangeEncoder,w),w>=4&&(f=(w>>1)-1,o=(2|1&w)<w?yt(e._posEncoders,o-w-1,e._rangeEncoder,f,_):(xt(e._rangeEncoder,_>>4,f-4),mt(e._posAlignEncoder,e._rangeEncoder,15&_),++e._alignPriceCount)),p=v,h=3;h>=1;--h)e._repDistances[h]=e._repDistances[h-1];e._repDistances[0]=p,++e._matchPriceCount}e._previousByte=D(e._matchFinder,m-1-e._additionalOffset)}if(e._additionalOffset-=m,e.nowPos64=a(e.nowPos64,u(m)),!e._additionalOffset){if(e._matchPriceCount>=128&&Ae(e),e._alignPriceCount>=16&&Pe(e),t[0]=e.nowPos64,n[0]=St(e._rangeEncoder),!N(e._matchFinder))return void je(e,c(e.nowPos64));if(i(g(e.nowPos64,E),[4096,0])>=0)return e._finished=0,void(r[0]=0)}}}}function Oe(e){var t,n;e._matchFinder||(t={},n=4,e._matchFinderType||(n=2),W(t,n),e._matchFinder=t),Qe(e._literalEncoder,e._numLiteralPosStateBits,e._numLiteralContextBits),(e._dictionarySize!=e._dictionarySizePrev||e._numFastBytesPrev!=e._numFastBytes)&&(L(e._matchFinder,e._dictionarySize,4096,e._numFastBytes,274),e._dictionarySizePrev=e._dictionarySize,e._numFastBytesPrev=e._numFastBytes)}function Se(e){var t;for(e._repDistances=r(4),e._optimum=[],e._rangeEncoder={},e._isMatch=r(192),e._isRep=r(12),e._isRepG0=r(12),e._isRepG1=r(12),e._isRepG2=r(12),e._isRep0Long=r(192),e._posSlotEncoder=[],e._posEncoders=r(114),e._posAlignEncoder=pt({},4),e._lenEncoder=Je({}),e._repMatchLenEncoder=Je({}),e._literalEncoder={},e._matchDistances=[],e._posSlotPrices=[],e._distancesPrices=[],e._alignPrices=r(16),e.reps=r(4),e.repLens=r(4),e.processedInSize=[Ut],e.processedOutSize=[Ut],e.finished=[0],e.properties=r(5),e.tempPrices=r(128),e._longestMatchLength=0,e._matchFinderType=1,e._numDistancePairs=0,e._numFastBytesPrev=-1,e.backRes=0,t=0;4096>t;++t)e._optimum[t]={};for(t=0;4>t;++t)e._posSlotEncoder[t]=pt({},6);return e}function Pe(e){for(var t=0;16>t;++t)e._alignPrices[t]=gt(e._posAlignEncoder,t);e._alignPriceCount=0}function Ae(e){var t,n,r,a,o,i,s,l;for(a=4;128>a;++a)i=He(a),r=(i>>1)-1,t=(2|1&i)<o;++o){for(n=e._posSlotEncoder[o],s=o<<6,i=0;i>1)-1-4<<6;for(l=128*o,a=0;4>a;++a)e._distancesPrices[l+a]=e._posSlotPrices[s+a];for(;128>a;++a)e._distancesPrices[l+a]=e._posSlotPrices[s+He(a)]+e.tempPrices[a]}e._matchPriceCount=0}function je(e,t){Re(e),Ue(e,t&e._posStateMask),Ot(e._rangeEncoder)}function Ce(e,t){var n,r,a,o,i,s,l,u,c,d,p,f,h,m,g,y,b,v,_,w,k,E,x,O,S,P,A,j,C,T,z,I,R,B,L,q,F,U,H,W,V,K,G,Y,X,J,$,Z,ee,te;if(e._optimumEndIndex!=e._optimumCurrentIndex)return h=e._optimum[e._optimumCurrentIndex].PosPrev-e._optimumCurrentIndex,e.backRes=e._optimum[e._optimumCurrentIndex].BackPrev,e._optimumCurrentIndex=e._optimum[e._optimumCurrentIndex].PosPrev,h;if(e._optimumCurrentIndex=e._optimumEndIndex=0,e._longestMatchWasFound?(f=e._longestMatchLength,e._longestMatchWasFound=0):f=Ie(e),A=e._numDistancePairs,S=N(e._matchFinder)+1,2>S)return e.backRes=-1,1;for(S>273&&(S=273),W=0,c=0;4>c;++c)e.reps[c]=e._repDistances[c],e.repLens[c]=M(e._matchFinder,-1,e.reps[c],273),e.repLens[c]>e.repLens[W]&&(W=c);if(e.repLens[W]>=e._numFastBytes)return e.backRes=W,h=e.repLens[W],ze(e,h-1),h;if(f>=e._numFastBytes)return e.backRes=e._matchDistances[A-1]+4,ze(e,f-1),f;if(l=D(e._matchFinder,-1),b=D(e._matchFinder,-e._repDistances[0]-1-1),2>f&&l!=b&&e.repLens[W]<2)return e.backRes=-1,1;if(e._optimum[0].State=e._state,B=t&e._posStateMask,e._optimum[1].Price=Kt[e._isMatch[(e._state<<4)+B]>>>2]+ot(et(e._literalEncoder,t,e._previousByte),e._state>=7,b,l),it(e._optimum[1]),v=Kt[2048-e._isMatch[(e._state<<4)+B]>>>2],H=v+Kt[2048-e._isRep[e._state]>>>2],b==l&&(V=H+Me(e,e._state,B),V=e.repLens[W]?f:e.repLens[W],2>p)return e.backRes=e._optimum[1].BackPrev,1;e._optimum[1].PosPrev=0,e._optimum[0].Backs0=e.reps[0],e._optimum[0].Backs1=e.reps[1],e._optimum[0].Backs2=e.reps[2],e._optimum[0].Backs3=e.reps[3],d=p;do e._optimum[d--].Price=268435455;while(d>=2);for(c=0;4>c;++c)if(U=e.repLens[c],!(2>U)){q=H+De(e,c,e._state,B);do o=q+$e(e._repMatchLenEncoder,U-2,B),z=e._optimum[U],o=2)}if(O=v+Kt[e._isRep[e._state]>>>2],d=e.repLens[0]>=2?e.repLens[0]+1:2,f>=d){for(j=0;d>e._matchDistances[j];)j+=2;for(;u=e._matchDistances[j+1],o=O+Te(e,u,d,B),z=e._optimum[d],o=e._numFastBytes)return e._longestMatchLength=_,e._longestMatchWasFound=1,ke(e,n);if(++t,R=e._optimum[n].PosPrev,e._optimum[n].Prev1IsChar?(--R,e._optimum[n].Prev2?(G=e._optimum[e._optimum[n].PosPrev2].State,G=e._optimum[n].BackPrev2<4?7>G?8:11:7>G?7:10):G=e._optimum[R].State,G=Q(G)):G=e._optimum[R].State,R==n-1?G=e._optimum[n].BackPrev?Q(G):7>G?9:11:(e._optimum[n].Prev1IsChar&&e._optimum[n].Prev2?(R=e._optimum[n].PosPrev2,I=e._optimum[n].BackPrev2,G=7>G?8:11):(I=e._optimum[n].BackPrev,G=4>I?7>G?8:11:7>G?7:10),T=e._optimum[R],4>I?I?1==I?(e.reps[0]=T.Backs1,e.reps[1]=T.Backs0,e.reps[2]=T.Backs2,e.reps[3]=T.Backs3):2==I?(e.reps[0]=T.Backs2,e.reps[1]=T.Backs0,e.reps[2]=T.Backs1,e.reps[3]=T.Backs3):(e.reps[0]=T.Backs3,e.reps[1]=T.Backs0,e.reps[2]=T.Backs1,e.reps[3]=T.Backs2):(e.reps[0]=T.Backs0,e.reps[1]=T.Backs1,e.reps[2]=T.Backs2,e.reps[3]=T.Backs3):(e.reps[0]=I-4,e.reps[1]=T.Backs0,e.reps[2]=T.Backs1,e.reps[3]=T.Backs2)),e._optimum[n].State=G,e._optimum[n].Backs0=e.reps[0],e._optimum[n].Backs1=e.reps[1],e._optimum[n].Backs2=e.reps[2],e._optimum[n].Backs3=e.reps[3],s=e._optimum[n].Price,l=D(e._matchFinder,-1),b=D(e._matchFinder,-e.reps[0]-1-1),B=t&e._posStateMask,r=s+Kt[e._isMatch[(G<<4)+B]>>>2]+ot(et(e._literalEncoder,t,D(e._matchFinder,-2)),G>=7,b,l),E=e._optimum[n+1],w=0,r>>2],H=v+Kt[2048-e._isRep[G]>>>2],b!=l||E.PosPrev>>2]+Kt[e._isRep0Long[(G<<4)+B]>>>2]),V<=E.Price&&(E.Price=V,E.PosPrev=n,E.BackPrev=0,E.Prev1IsChar=0,w=1)),P=N(e._matchFinder)+1,P=P>4095-n?4095-n:P,S=P,!(2>S)){if(S>e._numFastBytes&&(S=e._numFastBytes),!w&&b!=l&&(X=Math.min(P-1,e._numFastBytes),g=M(e._matchFinder,0,e.reps[0],X),g>=2)){for(Y=Q(G),L=t+1&e._posStateMask,x=r+Kt[2048-e._isMatch[(Y<<4)+L]>>>2]+Kt[2048-e._isRep[Y]>>>2],C=n+1+g;C>p;)e._optimum[++p].Price=268435455;o=x+(J=$e(e._repMatchLenEncoder,g-2,L),J+De(e,0,Y,L)),z=e._optimum[C],oF;++F)if(m=M(e._matchFinder,-1,e.reps[F],S),!(2>m)){y=m;do{for(;n+m>p;)e._optimum[++p].Price=268435455;o=H+($=$e(e._repMatchLenEncoder,m-2,B),$+De(e,F,G,B)),z=e._optimum[n+m],o=2);if(m=y,F||(K=m+1),P>m&&(X=Math.min(P-1-m,e._numFastBytes),g=M(e._matchFinder,m,e.reps[F],X),g>=2)){for(Y=7>G?8:11,L=t+m&e._posStateMask,a=H+(Z=$e(e._repMatchLenEncoder,m-2,B),Z+De(e,F,G,B))+Kt[e._isMatch[(Y<<4)+L]>>>2]+ot(et(e._literalEncoder,t+m,D(e._matchFinder,m-1-1)),1,D(e._matchFinder,m-1-(e.reps[F]+1)),D(e._matchFinder,m-1)),Y=Q(Y),L=t+m+1&e._posStateMask,k=a+Kt[2048-e._isMatch[(Y<<4)+L]>>>2],x=k+Kt[2048-e._isRep[Y]>>>2],C=m+1+g;n+C>p;)e._optimum[++p].Price=268435455;o=x+(ee=$e(e._repMatchLenEncoder,g-2,L),ee+De(e,0,Y,L)),z=e._optimum[n+C],oS){for(_=S,A=0;_>e._matchDistances[A];A+=2);e._matchDistances[A]=_,A+=2}if(_>=K){for(O=v+Kt[e._isRep[G]>>>2];n+_>p;)e._optimum[++p].Price=268435455;for(j=0;K>e._matchDistances[j];)j+=2;for(m=K;;++m)if(i=e._matchDistances[j+1],o=O+Te(e,i,m,B),z=e._optimum[n+m],om&&(X=Math.min(P-1-m,e._numFastBytes),g=M(e._matchFinder,m,i,X),g>=2)){for(Y=7>G?7:10,L=t+m&e._posStateMask,a=o+Kt[e._isMatch[(Y<<4)+L]>>>2]+ot(et(e._literalEncoder,t+m,D(e._matchFinder,m-1-1)),1,D(e._matchFinder,m-(i+1)-1),D(e._matchFinder,m-1)),Y=Q(Y),L=t+m+1&e._posStateMask,k=a+Kt[2048-e._isMatch[(Y<<4)+L]>>>2],x=k+Kt[2048-e._isRep[Y]>>>2],C=m+1+g;n+C>p;)e._optimum[++p].Price=268435455;o=x+(te=$e(e._repMatchLenEncoder,g-2,L),te+De(e,0,Y,L)),z=e._optimum[n+C],ot?e._distancesPrices[128*o+t]:e._posSlotPrices[(o<<6)+We(t)]+e._alignPrices[15&t],a+$e(e._lenEncoder,n-2,r)}function De(e,t,n,r){var a;return t?(a=Kt[2048-e._isRepG0[n]>>>2],1==t?a+=Kt[e._isRepG1[n]>>>2]:(a+=Kt[2048-e._isRepG1[n]>>>2],a+=jt(e._isRepG2[n],t-2))):(a=Kt[e._isRepG0[n]>>>2],a+=Kt[2048-e._isRep0Long[(n<<4)+r]>>>2]),a}function Me(e,t,n){return Kt[e._isRepG0[t]>>>2]+Kt[e._isRep0Long[(t<<4)+n]>>>2]}function Ne(e){Ee(e),Pt(e._rangeEncoder),kt(e._isMatch),kt(e._isRep0Long),kt(e._isRep),kt(e._isRepG0),kt(e._isRepG1),kt(e._isRepG2),kt(e._posEncoders),tt(e._literalEncoder);for(var t=0;4>t;++t)kt(e._posSlotEncoder[t].Models);Ge(e._lenEncoder,1<0&&(V(e._matchFinder,t),e._additionalOffset+=t)}function Ie(e){var t=0;return e._numDistancePairs=q(e._matchFinder,e._matchDistances),e._numDistancePairs>0&&(t=e._matchDistances[e._numDistancePairs-2],t==e._numFastBytes&&(t+=M(e._matchFinder,t-1,e._matchDistances[e._numDistancePairs-1],273-t))),++e._additionalOffset,t}function Re(e){e._matchFinder&&e._needReleaseMFStream&&(e._matchFinder._stream=null,e._needReleaseMFStream=0)}function Be(e){Re(e),e._rangeEncoder.Stream=null}function Le(e,t){e._dictionarySize=t;for(var n=0;t>1<>24;for(var n=0;4>n;++n)e.properties[1+n]=e._dictionarySize>>8*n<<24>>24;E(t,e.properties,0,5)}function Ue(e,t){if(e._writeEndMark){Et(e._rangeEncoder,e._isMatch,(e._state<<4)+t,1),Et(e._rangeEncoder,e._isRep,e._state,0),e._state=e._state<7?7:10,Xe(e._lenEncoder,e._rangeEncoder,0,t);var n=Z(2);ft(e._posSlotEncoder[n],e._rangeEncoder,63),xt(e._rangeEncoder,67108863,26),mt(e._posAlignEncoder,e._rangeEncoder,15)}}function He(e){return 2048>e?Vt[e]:2097152>e?Vt[e>>10]+20:Vt[e>>20]+40}function We(e){return 131072>e?Vt[e>>6]+12:134217728>e?Vt[e>>16]+32:Vt[e>>26]+52}function Ve(e,t,n,r){8>n?(Et(t,e._choice,0,0),ft(e._lowCoder[r],t,n)):(n-=8,Et(t,e._choice,0,1),8>n?(Et(t,e._choice,1,0),ft(e._midCoder[r],t,n)):(Et(t,e._choice,1,1),ft(e._highCoder,t,n-8)))}function Ke(e){e._choice=r(2),e._lowCoder=r(16),e._midCoder=r(16),e._highCoder=pt({},8);for(var t=0;16>t;++t)e._lowCoder[t]=pt({},3),e._midCoder[t]=pt({},3);return e}function Ge(e,t){kt(e._choice);for(var n=0;t>n;++n)kt(e._lowCoder[n].Models),kt(e._midCoder[n].Models);kt(e._highCoder.Models)}function Ye(e,t,n,r,a){var o,i,s,l,u;for(o=Kt[e._choice[0]>>>2],i=Kt[2048-e._choice[0]>>>2],s=i+Kt[e._choice[1]>>>2],l=i+Kt[2048-e._choice[1]>>>2],u=0,u=0;8>u;++u){if(u>=n)return;r[a+u]=o+ht(e._lowCoder[t],u)}for(;16>u;++u){if(u>=n)return;r[a+u]=s+ht(e._midCoder[t],u-8)}for(;n>u;++u)r[a+u]=l+ht(e._highCoder,u-8-8)}function Xe(e,t,n,r){Ve(e,t,n,r),0==--e._counters[r]&&(Ye(e,r,e._tableSize,e._prices,272*r),e._counters[r]=e._tableSize)}function Je(e){return Ke(e),e._prices=[],e._counters=[],e}function $e(e,t,n){return e._prices[272*n+t]}function Ze(e,t){for(var n=0;t>n;++n)Ye(e,n,e._tableSize,e._prices,272*n),e._counters[n]=e._tableSize}function Qe(e,t,n){var a,o;if(null==e.m_Coders||e.m_NumPrevBits!=n||e.m_NumPosBits!=t)for(e.m_NumPosBits=t,e.m_PosMask=(1<a;++a)e.m_Coders[a]=at({})}function et(e,t,n){return e.m_Coders[((t&e.m_PosMask)<>>8-e.m_NumPrevBits)]}function tt(e){var t,n=1<t;++t)kt(e.m_Coders[t].m_Encoders)}function nt(e,t,n){var r,a,o=1;for(a=7;a>=0;--a)r=n>>a&1,Et(t,e.m_Encoders,o,r),o=o<<1|r}function rt(e,t,n,r){var a,o,i,s,l=1,u=1;for(o=7;o>=0;--o)a=r>>o&1,s=u,l&&(i=n>>o&1,s+=1+i<<8,l=i==a),Et(t,e.m_Encoders,s,a),u=u<<1|a}function at(e){return e.m_Encoders=r(768),e}function ot(e,t,n,r){var a,o,i=1,s=7,l=0;if(t)for(;s>=0;--s)if(o=n>>s&1,a=r>>s&1,l+=jt(e.m_Encoders[(1+o<<8)+i],a),i=i<<1|a,o!=a){--s;break}for(;s>=0;--s)a=r>>s&1,l+=jt(e.m_Encoders[i],a),i=i<<1|a;return l}function it(e){e.BackPrev=-1,e.Prev1IsChar=0}function st(e){e.BackPrev=0,e.Prev1IsChar=0}function lt(e,t){return e.NumBitLevels=t,e.Models=r(1<o;++o)a=vt(n,e,t+i),i<<=1,i+=a,s|=a<>>a&1,Et(t,e.Models,o,r),o=o<<1|r}function ht(e,t){var n,r,a=1,o=0;for(r=e.NumBitLevels;0!=r;)--r,n=t>>>r&1,o+=jt(e.Models[a],n),a=(a<<1)+n;return o}function mt(e,t,n){var r,a,o=1;for(a=0;a>=1}function gt(e,t){var n,r,a=1,o=0;for(r=e.NumBitLevels;0!=r;--r)n=1&t,t>>>=1,o+=jt(e.Models[a],n),a=a<<1|n;return o}function yt(e,t,n,r,a){var o,i,s=1;for(i=0;r>i;++i)o=1&a,Et(n,e,t+s,o),s=s<<1|o,a>>=1}function bt(e,t,n,r){var a,o,i=1,s=0;for(o=n;0!=o;--o)a=1&r,r>>>=1,s+=Kt[(2047&(e[t+i]-a^-a))>>>2],i=i<<1|a;return s}function vt(e,t,n){var r,a=t[n];return r=(e.Range>>>11)*a,(-2147483648^e.Code)<(-2147483648^r)?(e.Range=r,t[n]=a+(2048-a>>>5)<<16>>16,-16777216&e.Range||(e.Code=e.Code<<8|b(e.Stream),e.Range<<=8),0):(e.Range-=r,e.Code-=r,t[n]=a-(a>>>5)<<16>>16,-16777216&e.Range||(e.Code=e.Code<<8|b(e.Stream),e.Range<<=8),1)}function _t(e,t){var n,r,a=0;for(n=t;0!=n;--n)e.Range>>>=1,r=e.Code-e.Range>>>31,e.Code-=e.Range&r-1,a=a<<1|1-r,-16777216&e.Range||(e.Code=e.Code<<8|b(e.Stream),e.Range<<=8);return a}function wt(e){e.Code=0,e.Range=-1;for(var t=0;5>t;++t)e.Code=e.Code<<8|b(e.Stream)}function kt(e){for(var t=e.length-1;t>=0;--t)e[t]=1024}function Et(e,t,n,r){var i,s=t[n];i=(e.Range>>>11)*s,r?(e.Low=a(e.Low,o(u(i),[4294967295,0])),e.Range-=i,t[n]=s-(s>>>5)<<16>>16):(e.Range=i,t[n]=s+(2048-s>>>5)<<16>>16),-16777216&e.Range||(e.Range<<=8,At(e))}function xt(e,t,n){for(var r=n-1;r>=0;--r)e.Range>>>=1,1==(t>>>r&1)&&(e.Low=a(e.Low,u(e.Range))),-16777216&e.Range||(e.Range<<=8,At(e))}function Ot(e){for(var t=0;5>t;++t)At(e)}function St(e){return a(a(u(e._cacheSize),e._position),[4,0])}function Pt(e){e._position=Ut,e.Low=Ut,e.Range=-1,e._cacheSize=1,e._cache=0}function At(e){var t,n=c(m(e.Low,32));if(0!=n||i(e.Low,[4278190080,0])<0){e._position=a(e._position,u(e._cacheSize)),t=e._cache;do k(e.Stream,t+n),t=255;while(0!=--e._cacheSize);e._cache=c(e.Low)>>>24}++e._cacheSize,e.Low=f(o(e.Low,[16777215,0]),8)}function jt(e,t){return Kt[(2047&(e-t^-t))>>>2]}function Ct(e){var t,n,r,a,o="",i=e.length;for(t=0;i>t;++t)if(n=255&e[t],128&n)if(192==(224&n)){if(t+1>=e.length)return e;if(r=255&e[++t],128!=(192&r))return e;o+=String.fromCharCode((31&n)<<6&65535|63&r)}else{if(224!=(240&n))return e;if(t+2>=e.length)return e;if(r=255&e[++t],128!=(192&r))return e;if(a=255&e[++t],128!=(192&a))return e;o+=String.fromCharCode(65535&((15&n)<<12|(63&r)<<6|63&a))}else{if(!n)return e;o+=String.fromCharCode(65535&n)}return o}function Tt(e){var t,n,r,a=[],o=0,i=e.length;if("object"==typeof e)return e;for(x(e,0,i,a,0),r=0;i>r;++r)t=a[r],t>=1&&127>=t?++o:o+=!t||t>=128&&2047>=t?2:3;for(n=[],o=0,r=0;i>r;++r)t=a[r],t>=1&&127>=t?n[o++]=t<<24>>24:!t||t>=128&&2047>=t?(n[o++]=(192|t>>6&31)<<24>>24,n[o++]=(128|63&t)<<24>>24):(n[o++]=(224|t>>12&15)<<24>>24,n[o++]=(128|t>>6&63)<<24>>24,n[o++]=(128|63&t)<<24>>24);return n}function Dt(e){return e[1]+e[0]}function Mt(e,t,r,a){function o(){for(var e,t=(new Date).getTime();ne(l.c.chunker);)if(i=Dt(l.c.chunker.inBytesProcessed)/Dt(l.c.length_0),(new Date).getTime()-t>200)return a?a(i):"undefined"!=typeof s&&n(i,s),Bt(o,0),0;a?a(1):"undefined"!=typeof s&&n(1,s),e=w(l.c.output),r?r(e):"undefined"!=typeof s&&postMessage({action:zt,cbn:s,result:e})}var i,s,l={};"function"!=typeof r&&(s=r,r=a=0),l.c=A({},Tt(e),Gt(t)),a?a(0):"undefined"!=typeof s&&n(0,s),Bt(o,0)}function Nt(e,t,r){function a(){for(var e,c=0,d=(new Date).getTime();ne(u.d.chunker);)if(++c%1e3==0&&(new Date).getTime()-d>200)return s&&(o=Dt(u.d.chunker.decoder.nowPos64)/l,r?r(o):"undefined"!=typeof i&&n(o,i)),Bt(a,0),0;s&&(r?r(1):"undefined"!=typeof i&&n(1,i)),e=Ct(w(u.d.output)),t?t(e):"undefined"!=typeof i&&postMessage({action:It,cbn:i,result:e})}var o,i,s,l,u={};"function"!=typeof t&&(i=t,t=r=0),u.d=C({},e),l=Dt(u.d.length_0),s=l>-1,r?r(s?0:-1):"undefined"!=typeof i&&n(s?0:-1,i),Bt(a,0)}var zt=1,It=2,Rt=3,Bt="function"==typeof e?e:setTimeout,Lt=4294967296,qt=[4294967295,-Lt],Ft=[0,-0x8000000000000000],Ut=[0,0],Ht=[1,0],Wt=function(){var e,t,n,r=[];for(e=0;256>e;++e){for(n=e,t=0;8>t;++t)0!=(1&n)?n=n>>>1^-306674912:n>>>=1;r[e]=n}return r}(),Vt=function(){var e,t,n,r=2,a=[0,1];for(n=2;22>n;++n)for(t=1<<(n>>1)-1,e=0;t>e;++e,++r)a[r]=n<<24>>24;return a}(),Kt=function(){var e,t,n,r,a=[];for(t=8;t>=0;--t)for(r=1<<9-t-1,e=1<<9-t,n=r;e>n;++n)a[n]=(t<<6)+(e-n<<6>>>9-t-1);return a}(),Gt=function(){var e=[{s:16,f:64,m:0},{s:20,f:64,m:0},{s:19,f:64,m:1},{s:20,f:64,m:1},{s:21,f:128,m:1},{s:22,f:128,m:1},{s:23,f:128,m:1},{s:24,f:255,m:1},{s:25,f:255,m:1}];return function(t){return e[t-1]||e[6]}}();return"undefined"==typeof onmessage||"undefined"!=typeof window&&"undefined"!=typeof window.document||!function(){onmessage=function(e){e&&e.data&&(e.data.action==It?t.decompress(e.data.data,e.data.cbn):e.data.action==zt&&t.compress(e.data.data,e.data.mode,e.data.cbn))}}(),{compress:Mt,decompress:Nt}}();this.LZMA=this.LZMA_WORKER=t}).call(t,n(839).setImmediate)},function(e,t,n){(function(e,r){function a(e,t){this._id=e,this._clearFn=t}var o=n(175).nextTick,i=Function.prototype.apply,s=Array.prototype.slice,l={},u=0;t.setTimeout=function(){return new a(i.call(setTimeout,window,arguments),clearTimeout)},t.setInterval=function(){return new a(i.call(setInterval,window,arguments),clearInterval)},t.clearTimeout=t.clearInterval=function(e){e.close()},a.prototype.unref=a.prototype.ref=function(){},a.prototype.close=function(){this._clearFn.call(window,this._id)},t.enroll=function(e,t){clearTimeout(e._idleTimeoutId),e._idleTimeout=t},t.unenroll=function(e){clearTimeout(e._idleTimeoutId),e._idleTimeout=-1},t._unrefActive=t.active=function(e){clearTimeout(e._idleTimeoutId);var t=e._idleTimeout;t>=0&&(e._idleTimeoutId=setTimeout(function(){e._onTimeout&&e._onTimeout()},t))},t.setImmediate="function"==typeof e?e:function(e){var n=u++,r=arguments.length<2?!1:s.call(arguments,1);return l[n]=!0,o(function(){l[n]&&(r?e.apply(null,r):e.call(null),t.clearImmediate(n))}),n},t.clearImmediate="function"==typeof r?r:function(e){delete l[e]}}).call(t,n(839).setImmediate,n(839).clearImmediate)},,,function(e,t,n){(function(r){var a=n(843),o=a["default"];r.IntlPolyfill=o,n(846),r.Intl||(r.Intl=o,o.__applyLocaleSensitivePrototypes()),e.exports=t=o,t["default"]=o}).call(t,function(){return this}())},function(e,t,n){/** + * @license Copyright 2013 Andy Earnshaw, MIT License + * + * Implements the ECMAScript Internationalization API in ES5-compatible environments, + * following the ECMA-402 specification as closely as possible + * + * ECMA-402: http://ecma-international.org/ecma-402/1.0/ + * + * CLDR format locale data should be provided using IntlPolyfill.__addLocaleData(). + */ +"use strict";function r(e){return V.expBCP47Syntax.test(e)?V.expVariantDupes.test(e)?!1:V.expSingletonDupes.test(e)?!1:!0:!1}function a(e){var t,n;e=e.toLowerCase(),n=e.split("-");for(var r=1,a=n.length;a>r;r++)if(2===n[r].length)n[r]=n[r].toUpperCase();else if(4===n[r].length)n[r]=n[r].charAt(0).toUpperCase()+n[r].slice(1);else if(1===n[r].length&&"x"!==n[r])break;e=re.call(n,"-"),(t=e.match(V.expExtSequences))&&t.length>1&&(t.sort(),e=e.replace(RegExp("(?:"+V.expExtSequences.source+")+","i"),re.call(t,""))),J.call(fe.tags,e)&&(e=fe.tags[e]),n=e.split("-");for(var r=1,a=n.length;a>r;r++)J.call(fe.subtags,n[r])?n[r]=fe.subtags[n[r]]:J.call(fe.extLang,n[r])&&(n[r]=fe.extLang[n[r]][0],1===r&&fe.extLang[n[1]][1]===n[0]&&(n=ee.call(n,r++),a-=1));return re.call(n,"-")}function o(){return W}function i(e){var t=String(e),n=F(t);return de.test(n)===!1?!1:!0}function s(e){if(void 0===e)return new L;for(var t=new L,e="string"==typeof e?[e]:e,n=U(e),o=n.length,i=0;o>i;){var s=String(i),l=s in n;if(l){var u=n[s];if(null==u||"string"!=typeof u&&"object"!=typeof u)throw new TypeError("String or Object type expected");var c=String(u);if(!r(c))throw new RangeError("'"+c+"' is not a structurally valid language tag");c=a(c),-1===Z.call(t,c)&&ne.call(t,c)}i++}return t}function l(e,t){for(var n=t;;){if(Z.call(e,n)>-1)return n;var r=n.lastIndexOf("-");if(0>r)return;r>=2&&"-"===n.charAt(r-2)&&(r-=2),n=n.substring(0,r)}}function u(e,t){for(var n,r=0,a=t.length;a>r&&!n;){var i=t[r],s=String(i).replace(pe,""),n=l(e,s);r++}var u=new B;if(void 0!==n){if(u["[[locale]]"]=n,String(i)!==String(s)){var c=i.match(pe)[0],d=i.indexOf("-u-");u["[[extension]]"]=c,u["[[extensionIndex]]"]=d}}else u["[[locale]]"]=o();return u}function c(e,t){return u(e,t)}function d(e,t,n,r,a){if(0===e.length)throw new ReferenceError("No locale data has been provided for this object yet.");var o=n["[[localeMatcher]]"];if("lookup"===o)var i=u(e,t);else var i=c(e,t);var s=i["[[locale]]"];if(J.call(i,"[[extension]]"))var l=i["[[extension]]"],d=i["[[extensionIndex]]"],p=String.prototype.split,f=p.call(l,"-"),h=f.length;var m=new B;m["[[dataLocale]]"]=s;for(var g="-u",y=0,b=r.length;b>y;){var v=r[y],_=a[s],w=_[v],k=w[0],E="",x=Z;if(void 0!==f){var O=x.call(f,v);if(-1!==O)if(h>O+1&&f[O+1].length>2){var S=f[O+1],P=x.call(w,S);if(-1!==P)var k=S,E="-"+v+"-"+k}else{var P=x(w,"true");if(-1!==P)var k="true"}}if(J.call(n,"[["+v+"]]")){var A=n["[["+v+"]]"];-1!==x.call(w,A)&&A!==k&&(k=A,E="")}m["[["+v+"]]"]=k,g+=E,y++}if(g.length>2)var j=s.substring(0,d),C=s.substring(d),s=j+g+C;return m["[[locale]]"]=s,m}function p(e,t){for(var n=t.length,r=new L,a=0;n>a;){var o=t[a],i=String(o).replace(pe,""),s=l(e,i);void 0!==s&&ne.call(r,o),a++}var u=ee.call(r);return u}function f(e,t){return p(e,t)}function h(e,t,n){if(void 0!==n){var n=new B(U(n)),r=n.localeMatcher;if(void 0!==r&&(r=String(r),"lookup"!==r&&"best fit"!==r))throw new RangeError('matcher should be "lookup" or "best fit"')}if(void 0===r||"best fit"===r)var a=f(e,t);else var a=p(e,t);for(var o in a)J.call(a,o)&&$(a,o,{writable:!1,configurable:!1,value:a[o]});return $(a,"length",{writable:!1}),a}function m(e,t,n,r,a){var o=e[t];if(void 0!==o){if(o="boolean"===n?Boolean(o):"string"===n?String(o):o,void 0!==r&&-1===Z.call(r,o))throw new RangeError("'"+o+"' is not an allowed value for `"+t+"`");return o}return a}function g(e,t,n,r,a){var o=e[t];if(void 0!==o){if(o=Number(o),isNaN(o)||n>o||o>r)throw new RangeError("Value is not a number or outside accepted range");return Math.floor(o)}return a}function y(){var e=arguments[0],t=arguments[1];return this&&this!==G?b(U(this),e,t):new G.NumberFormat(e,t)}function b(e,t,n){var r=H(e),a=q();if(r["[[initializedIntlObject]]"]===!0)throw new TypeError("`this` object has already been initialized as an Intl object");$(e,"__getInternalProperties",{value:function(){return arguments[0]===se?r:void 0}}),r["[[initializedIntlObject]]"]=!0;var o=s(t);n=void 0===n?{}:U(n);var l=new B,u=m(n,"localeMatcher","string",new L("lookup","best fit"),"best fit");l["[[localeMatcher]]"]=u;var c=ie.NumberFormat["[[localeData]]"],p=d(ie.NumberFormat["[[availableLocales]]"],o,l,ie.NumberFormat["[[relevantExtensionKeys]]"],c);r["[[locale]]"]=p["[[locale]]"],r["[[numberingSystem]]"]=p["[[nu]]"],r["[[dataLocale]]"]=p["[[dataLocale]]"];var f=p["[[dataLocale]]"],h=m(n,"style","string",new L("decimal","percent","currency"),"decimal");r["[[style]]"]=h;var y=m(n,"currency","string");if(void 0!==y&&!i(y))throw new RangeError("'"+y+"' is not a valid currency code");if("currency"===h&&void 0===y)throw new TypeError("Currency code is required when style is currency");if("currency"===h){y=y.toUpperCase(),r["[[currency]]"]=y;var b=v(y)}var w=m(n,"currencyDisplay","string",new L("code","symbol","name"),"symbol");"currency"===h&&(r["[[currencyDisplay]]"]=w);var k=g(n,"minimumIntegerDigits",1,21,1);r["[[minimumIntegerDigits]]"]=k;var E="currency"===h?b:0,x=g(n,"minimumFractionDigits",0,20,E);r["[[minimumFractionDigits]]"]=x;var O="currency"===h?Math.max(x,b):"percent"===h?Math.max(x,0):Math.max(x,3),S=g(n,"maximumFractionDigits",x,20,O);r["[[maximumFractionDigits]]"]=S;var P=n.minimumSignificantDigits,A=n.maximumSignificantDigits;(void 0!==P||void 0!==A)&&(P=g(n,"minimumSignificantDigits",1,21,1),A=g(n,"maximumSignificantDigits",P,21,21),r["[[minimumSignificantDigits]]"]=P,r["[[maximumSignificantDigits]]"]=A);var j=m(n,"useGrouping","boolean",void 0,!0);r["[[useGrouping]]"]=j;var C=c[f],T=C.patterns,D=T[h];return r["[[positivePattern]]"]=D.positivePattern,r["[[negativePattern]]"]=D.negativePattern,r["[[boundFormat]]"]=void 0,r["[[initializedNumberFormat]]"]=!0,X&&(e.format=_.call(e)),a.exp.test(a.input),e}function v(e){return void 0!==he[e]?he[e]:2}function _(){var e=null!=this&&"object"==typeof this&&H(this);if(!e||!e["[[initializedNumberFormat]]"])throw new TypeError("`this` value for format() is not an initialized Intl.NumberFormat object.");if(void 0===e["[[boundFormat]]"]){var t=function(e){return w(this,Number(e))},n=oe.call(t,this);e["[[boundFormat]]"]=n}return e["[[boundFormat]]"]}function w(e,t){var n,r=q(),a=H(e),o=a["[[dataLocale]]"],i=a["[[numberingSystem]]"],s=ie.NumberFormat["[[localeData]]"][o],l=s.symbols[i]||s.symbols.latn,u=!1;if(isFinite(t)===!1)isNaN(t)?n=l.nan:(n=l.infinity,0>t&&(u=!0));else{if(0>t&&(u=!0,t=-t),"percent"===a["[[style]]"]&&(t*=100),n=J.call(a,"[[minimumSignificantDigits]]")&&J.call(a,"[[maximumSignificantDigits]]")?k(t,a["[[minimumSignificantDigits]]"],a["[[maximumSignificantDigits]]"]):E(t,a["[[minimumIntegerDigits]]"],a["[[minimumFractionDigits]]"],a["[[maximumFractionDigits]]"]),me[i]){var c=me[a["[[numberingSystem]]"]];n=String(n).replace(/\d/g,function(e){return c[e]})}else n=String(n);if(n=n.replace(/\./g,l.decimal),a["[[useGrouping]]"]===!0){var d=n.split(l.decimal),p=d[0],f=s.patterns.primaryGroupSize||3,h=s.patterns.secondaryGroupSize||f;if(p.length>f){var m=new L,g=p.length-f,y=g%h,b=p.slice(0,y);for(b.length&&ne.call(m,b);g>y;)ne.call(m,p.slice(y,y+h)),y+=h;ne.call(m,p.slice(g)),d[0]=re.call(m,l.group)}n=re.call(d,l.decimal)}}var v=a[u===!0?"[[negativePattern]]":"[[positivePattern]]"];if(v=v.replace("{number}",n),"currency"===a["[[style]]"]){var _,w=a["[[currency]]"],x=s.currencies[w];switch(a["[[currencyDisplay]]"]){case"symbol":_=x||w;break;default:case"code":case"name":_=w}v=v.replace("{currency}",_)}return r.exp.test(r.input),v}function k(e,t,n){var r=n;if(0===e)var a=re.call(Array(r+1),"0"),o=0;else var o=z(Math.abs(e)),i=Math.round(Math.exp(Math.abs(o-r+1)*Math.LN10)),a=String(Math.round(0>o-r+1?e*i:e/i));if(o>=r)return a+re.call(Array(o-r+1+1),"0");if(o===r-1)return a;if(o>=0?a=a.slice(0,o+1)+"."+a.slice(o+1):0>o&&(a="0."+re.call(Array(-(o+1)+1),"0")+a),a.indexOf(".")>=0&&n>t){for(var s=n-t;s>0&&"0"===a.charAt(a.length-1);)a=a.slice(0,-1),s--;"."===a.charAt(a.length-1)&&(a=a.slice(0,-1))}return a}function E(e,t,n,r){var a,o=Number.prototype.toFixed.call(e,r),i=o.split(".")[0].length,s=r-n,l=(a=o.indexOf("e"))>-1?o.slice(a+1):0;for(l&&(o=o.slice(0,a).replace(".",""),o+=re.call(Array(l-(o.length-1)+1),"0")+"."+re.call(Array(r+1),"0"),i=o.length);s>0&&"0"===o.slice(-1);)o=o.slice(0,-1),s--;if("."===o.slice(-1)&&(o=o.slice(0,-1)),t>i)var u=re.call(Array(t-i+1),"0");return(u?u:"")+o}function x(){var e=arguments[0],t=arguments[1];return this&&this!==G?O(U(this),e,t):new G.DateTimeFormat(e,t)}function O(e,t,n){var r=H(e),a=q();if(r["[[initializedIntlObject]]"]===!0)throw new TypeError("`this` object has already been initialized as an Intl object");$(e,"__getInternalProperties",{value:function(){return arguments[0]===se?r:void 0}}),r["[[initializedIntlObject]]"]=!0;var o=s(t),n=P(n,"any","date"),i=new B;_=m(n,"localeMatcher","string",new L("lookup","best fit"),"best fit"),i["[[localeMatcher]]"]=_;var l=ie.DateTimeFormat,u=l["[[localeData]]"],c=d(l["[[availableLocales]]"],o,i,l["[[relevantExtensionKeys]]"],u);r["[[locale]]"]=c["[[locale]]"],r["[[calendar]]"]=c["[[ca]]"],r["[[numberingSystem]]"]=c["[[nu]]"],r["[[dataLocale]]"]=c["[[dataLocale]]"];var p=c["[[dataLocale]]"],f=n.timeZone;if(void 0!==f&&(f=F(f),"UTC"!==f))throw new RangeError("timeZone is not supported.");r["[[timeZone]]"]=f,i=new B;for(var h in ge)if(J.call(ge,h)){var g=m(n,h,"string",ge[h]);i["[["+h+"]]"]=g}var y,b=u[p],v=S(b.formats),_=m(n,"formatMatcher","string",new L("basic","best fit"),"best fit");b.formats=v,y="basic"===_?A(i,v):C(i,v);for(var h in ge)if(J.call(ge,h)&&J.call(y,h)){var w=y[h];r["[["+h+"]]"]=w}var k,E=m(n,"hour12","boolean");if(r["[[hour]]"])if(E=void 0===E?b.hour12:E,r["[[hour12]]"]=E,E===!0){var x=b.hourNo0;r["[[hourNo0]]"]=x,k=y.pattern12}else k=y.pattern;else k=y.pattern;return r["[[pattern]]"]=k,r["[[boundFormat]]"]=void 0,r["[[initializedDateTimeFormat]]"]=!0,X&&(e.format=T.call(e)),a.exp.test(a.input),e}function S(e){return"[object Array]"===Object.prototype.toString.call(e)?e:K.createDateTimeFormats(e)}function P(e,t,n){if(void 0===e)e=null;else{var r=U(e);e=new B;for(var a in r)e[a]=r[a]}var o=Q,e=o(e),i=!0;return("date"===t||"any"===t)&&(void 0!==e.weekday||void 0!==e.year||void 0!==e.month||void 0!==e.day)&&(i=!1),("time"===t||"any"===t)&&(void 0!==e.hour||void 0!==e.minute||void 0!==e.second)&&(i=!1),!i||"date"!==n&&"all"!==n||(e.year=e.month=e.day="numeric"),!i||"time"!==n&&"all"!==n||(e.hour=e.minute=e.second="numeric"),e}function A(e,t){return j(e,t)}function j(e,t,n){for(var r,a=8,o=120,i=20,s=8,l=6,u=6,c=3,d=-(1/0),p=0,f=t.length;f>p;){var h=t[p],m=0;for(var g in ge)if(J.call(ge,g)){var y=e["[["+g+"]]"],b=J.call(h,g)?h[g]:void 0;if(void 0===y&&void 0!==b)m-=i;else if(void 0!==y&&void 0===b)m-=o;else{var v=["2-digit","numeric","narrow","short","long"],_=Z.call(v,y),w=Z.call(v,b),k=Math.max(Math.min(w-_,2),-2);!n||("numeric"!==y&&"2-digit"!==y||"numeric"===b||"2-digit"===b)&&("numeric"===y||"2-digit"===y||"2-digit"!==b&&"numeric"!==b)||(m-=a),2===k?m-=l:1===k?m-=c:-1===k?m-=u:-2===k&&(m-=s)}}m>d&&(d=m,r=h),p++}return r}function C(e,t){return j(e,t,!0)}function T(){var e=null!=this&&"object"==typeof this&&H(this);if(!e||!e["[[initializedDateTimeFormat]]"])throw new TypeError("`this` value for format() is not an initialized Intl.DateTimeFormat object.");if(void 0===e["[[boundFormat]]"]){var t=function(){var e=Number(0===arguments.length?Date.now():arguments[0]);return D(this,e)},n=oe.call(t,this);e["[[boundFormat]]"]=n}return e["[[boundFormat]]"]}function D(e,t){if(!isFinite(t))throw new RangeError("Invalid valid date passed to format");var n=e.__getInternalProperties(se),r=q(),a=n["[[locale]]"],o=new G.NumberFormat([a],{useGrouping:!1}),i=new G.NumberFormat([a],{minimumIntegerDigits:2,useGrouping:!1}),s=M(t,n["[[calendar]]"],n["[[timeZone]]"]),l=n["[[pattern]]"],u=n["[[dataLocale]]"],c=ie.DateTimeFormat["[[localeData]]"][u].calendars,d=n["[[calendar]]"];for(var p in ge)if(J.call(n,"[["+p+"]]")){var f,h,m=n["[["+p+"]]"],g=s["[["+p+"]]"];if("year"===p&&0>=g?g=1-g:"month"===p?g++:"hour"===p&&n["[[hour12]]"]===!0&&(g%=12,f=g!==s["[["+p+"]]"],0===g&&n["[[hourNo0]]"]===!0&&(g=12)),"numeric"===m)h=w(o,g);else if("2-digit"===m)h=w(i,g),h.length>2&&(h=h.slice(-2));else if(m in le)switch(p){case"month":h=R(c,d,"months",m,s["[["+p+"]]"]);break;case"weekday":try{h=R(c,d,"days",m,s["[["+p+"]]"])}catch(y){throw new Error("Could not find weekday data for locale "+a)}break;case"timeZoneName":h="";break;default:h=s["[["+p+"]]"]}l=l.replace("{"+p+"}",h)}return n["[[hour12]]"]===!0&&(h=R(c,d,"dayPeriods",f?"pm":"am"),l=l.replace("{ampm}",h)),r.exp.test(r.input),l}function M(e,t,n){var r=new Date(e),a="get"+(n||"");return new B({"[[weekday]]":r[a+"Day"](),"[[era]]":+(r[a+"FullYear"]()>=0),"[[year]]":r[a+"FullYear"](),"[[month]]":r[a+"Month"](),"[[day]]":r[a+"Date"](),"[[hour]]":r[a+"Hours"](),"[[minute]]":r[a+"Minutes"](),"[[second]]":r[a+"Seconds"](),"[[inDST]]":!1})}function N(e,t){if(!e.number)throw new Error("Object passed doesn't contain locale data for Intl.NumberFormat");var n,r=[t],a=t.split("-");for(a.length>2&&4===a[1].length&&ne.call(r,a[0]+"-"+a[2]);n=ae.call(r);)ne.call(ie.NumberFormat["[[availableLocales]]"],n),ie.NumberFormat["[[localeData]]"][n]=e.number,e.date&&(e.date.nu=e.number.nu,ne.call(ie.DateTimeFormat["[[availableLocales]]"],n),ie.DateTimeFormat["[[localeData]]"][n]=e.date);void 0===W&&(W=t),ue||(b(G.NumberFormat.prototype),ue=!0),e.date&&!ce&&(O(G.DateTimeFormat.prototype),ce=!0)}function z(e){if("function"==typeof Math.log10)return Math.floor(Math.log10(e));var t=Math.round(Math.log(e)*Math.LOG10E);return t-(Number("1e"+t)>e)}function I(e){if(!J.call(this,"[[availableLocales]]"))throw new TypeError("supportedLocalesOf() is not a constructor");var t=q(),n=arguments[1],r=this["[[availableLocales]]"],a=s(e);return t.exp.test(t.input),h(r,a,n)}function R(e,t,n,r,a){var o=e[t]&&e[t][n]?e[t][n]:e.gregory[n],i={narrow:["short","long"],"short":["long","narrow"],"long":["short","narrow"]},s=J.call(o,r)?o[r]:J.call(o,i[r][0])?o[i[r][0]]:o[i[r][1]];return null!=a?s[a]:s}function B(e){for(var t in e)(e instanceof B||J.call(e,t))&&$(this,t,{value:e[t],enumerable:!0,writable:!0,configurable:!0})}function L(){$(this,"length",{writable:!0,value:0}),arguments.length&&ne.apply(this,ee.call(arguments))}function q(){for(var e=/[.?*+^$[\]\\(){}|-]/g,t=RegExp.lastMatch||"",n=RegExp.multiline?"m":"",r={input:RegExp.input},a=new L,o=!1,i={},s=1;9>=s;s++)o=(i["$"+s]=RegExp["$"+s])||o;if(t=t.replace(e,"\\$&"),o)for(var s=1;9>=s;s++){var l=i["$"+s];l?(l=l.replace(e,"\\$&"),t=t.replace(l,"("+l+")")):t="()"+t,ne.call(a,t.slice(0,t.indexOf("(")+1)),t=t.slice(t.indexOf("(")+1)}return r.exp=new RegExp(re.call(a,"")+t,n),r}function F(e){for(var t=e.length;t--;){var n=e.charAt(t);n>="a"&&"z">=n&&(e=e.slice(0,t)+n.toUpperCase()+e.slice(t+1))}return e}function U(e){if(null==e)throw new TypeError("Cannot convert null or undefined to object");return Object(e)}function H(e){return J.call(e,"__getInternalProperties")?e.__getInternalProperties(se):Q(null)}var W,V=n(844),K=n(845),G={},Y=function(){var e={};try{return Object.defineProperty(e,"a",{}),"a"in e}catch(t){return!1}}(),X=!Y&&!Object.prototype.__defineGetter__,J=Object.prototype.hasOwnProperty,$=Y?Object.defineProperty:function(e,t,n){"get"in n&&e.__defineGetter__?e.__defineGetter__(t,n.get):(!J.call(e,t)||"value"in n)&&(e[t]=n.value)},Z=Array.prototype.indexOf||function(e){var t=this;if(!t.length)return-1;for(var n=arguments[1]||0,r=t.length;r>n;n++)if(t[n]===e)return n;return-1},Q=Object.create||function(e,t){function n(){}var r;n.prototype=e,r=new n;for(var a in t)J.call(t,a)&&$(r,a,t[a]);return r},ee=Array.prototype.slice,te=Array.prototype.concat,ne=Array.prototype.push,re=Array.prototype.join,ae=Array.prototype.shift,oe=(Array.prototype.unshift,Function.prototype.bind||function(e){var t=this,n=ee.call(arguments,1);return 1===t.length?function(r){return t.apply(e,te.call(n,ee.call(arguments)))}:function(){return t.apply(e,te.call(n,ee.call(arguments)))}}),ie=Q(null),se=Math.random(),le=Q(null,{narrow:{},"short":{},"long":{}}),ue=!1,ce=!1,de=/^[A-Z]{3}$/,pe=/-u(?:-[0-9a-z]{2,8})+/gi,fe={tags:{"art-lojban":"jbo","i-ami":"ami","i-bnn":"bnn","i-hak":"hak","i-klingon":"tlh","i-lux":"lb","i-navajo":"nv","i-pwn":"pwn","i-tao":"tao","i-tay":"tay","i-tsu":"tsu","no-bok":"nb","no-nyn":"nn","sgn-BE-FR":"sfb","sgn-BE-NL":"vgt","sgn-CH-DE":"sgg","zh-guoyu":"cmn","zh-hakka":"hak","zh-min-nan":"nan","zh-xiang":"hsn","sgn-BR":"bzs","sgn-CO":"csn","sgn-DE":"gsg","sgn-DK":"dsl","sgn-ES":"ssp","sgn-FR":"fsl","sgn-GB":"bfi","sgn-GR":"gss","sgn-IE":"isg","sgn-IT":"ise","sgn-JP":"jsl","sgn-MX":"mfs","sgn-NI":"ncs","sgn-NL":"dse","sgn-NO":"nsl","sgn-PT":"psr","sgn-SE":"swl","sgn-US":"ase","sgn-ZA":"sfs","zh-cmn":"cmn","zh-cmn-Hans":"cmn-Hans","zh-cmn-Hant":"cmn-Hant","zh-gan":"gan","zh-wuu":"wuu","zh-yue":"yue"},subtags:{BU:"MM",DD:"DE",FX:"FR",TP:"TL",YD:"YE",ZR:"CD",heploc:"alalc97","in":"id",iw:"he",ji:"yi",jw:"jv",mo:"ro",ayx:"nun",bjd:"drl",ccq:"rki",cjr:"mom",cka:"cmr",cmk:"xch",drh:"khk",drw:"prs",gav:"dev",hrr:"jal",ibi:"opa",kgh:"kml",lcq:"ppr",mst:"mry",myt:"mry",sca:"hle",tie:"ras",tkk:"twm",tlw:"weo",tnf:"prs",ybd:"rki",yma:"lrr"},extLang:{aao:["aao","ar"],abh:["abh","ar"],abv:["abv","ar"],acm:["acm","ar"],acq:["acq","ar"],acw:["acw","ar"],acx:["acx","ar"],acy:["acy","ar"],adf:["adf","ar"],ads:["ads","sgn"],aeb:["aeb","ar"],aec:["aec","ar"],aed:["aed","sgn"],aen:["aen","sgn"],afb:["afb","ar"],afg:["afg","sgn"],ajp:["ajp","ar"],apc:["apc","ar"],apd:["apd","ar"],arb:["arb","ar"],arq:["arq","ar"],ars:["ars","ar"],ary:["ary","ar"],arz:["arz","ar"],ase:["ase","sgn"],asf:["asf","sgn"],asp:["asp","sgn"],asq:["asq","sgn"],asw:["asw","sgn"],auz:["auz","ar"],avl:["avl","ar"],ayh:["ayh","ar"],ayl:["ayl","ar"],ayn:["ayn","ar"],ayp:["ayp","ar"],bbz:["bbz","ar"],bfi:["bfi","sgn"],bfk:["bfk","sgn"],bjn:["bjn","ms"],bog:["bog","sgn"],bqn:["bqn","sgn"],bqy:["bqy","sgn"],btj:["btj","ms"],bve:["bve","ms"],bvl:["bvl","sgn"],bvu:["bvu","ms"],bzs:["bzs","sgn"],cdo:["cdo","zh"],cds:["cds","sgn"],cjy:["cjy","zh"],cmn:["cmn","zh"],coa:["coa","ms"],cpx:["cpx","zh"],csc:["csc","sgn"],csd:["csd","sgn"],cse:["cse","sgn"],csf:["csf","sgn"],csg:["csg","sgn"],csl:["csl","sgn"],csn:["csn","sgn"],csq:["csq","sgn"],csr:["csr","sgn"],czh:["czh","zh"],czo:["czo","zh"],doq:["doq","sgn"],dse:["dse","sgn"],dsl:["dsl","sgn"],dup:["dup","ms"],ecs:["ecs","sgn"],esl:["esl","sgn"],esn:["esn","sgn"],eso:["eso","sgn"],eth:["eth","sgn"],fcs:["fcs","sgn"],fse:["fse","sgn"],fsl:["fsl","sgn"],fss:["fss","sgn"],gan:["gan","zh"],gds:["gds","sgn"],gom:["gom","kok"],gse:["gse","sgn"],gsg:["gsg","sgn"],gsm:["gsm","sgn"],gss:["gss","sgn"],gus:["gus","sgn"],hab:["hab","sgn"],haf:["haf","sgn"],hak:["hak","zh"],hds:["hds","sgn"],hji:["hji","ms"],hks:["hks","sgn"],hos:["hos","sgn"],hps:["hps","sgn"],hsh:["hsh","sgn"],hsl:["hsl","sgn"],hsn:["hsn","zh"],icl:["icl","sgn"],ils:["ils","sgn"],inl:["inl","sgn"],ins:["ins","sgn"],ise:["ise","sgn"],isg:["isg","sgn"],isr:["isr","sgn"],jak:["jak","ms"],jax:["jax","ms"],jcs:["jcs","sgn"],jhs:["jhs","sgn"],jls:["jls","sgn"],jos:["jos","sgn"],jsl:["jsl","sgn"],jus:["jus","sgn"],kgi:["kgi","sgn"],knn:["knn","kok"],kvb:["kvb","ms"],kvk:["kvk","sgn"],kvr:["kvr","ms"],kxd:["kxd","ms"],lbs:["lbs","sgn"],lce:["lce","ms"],lcf:["lcf","ms"],liw:["liw","ms"],lls:["lls","sgn"],lsg:["lsg","sgn"],lsl:["lsl","sgn"],lso:["lso","sgn"],lsp:["lsp","sgn"],lst:["lst","sgn"],lsy:["lsy","sgn"],ltg:["ltg","lv"],lvs:["lvs","lv"],lzh:["lzh","zh"],max:["max","ms"],mdl:["mdl","sgn"],meo:["meo","ms"],mfa:["mfa","ms"],mfb:["mfb","ms"],mfs:["mfs","sgn"],min:["min","ms"],mnp:["mnp","zh"],mqg:["mqg","ms"],mre:["mre","sgn"],msd:["msd","sgn"],msi:["msi","ms"],msr:["msr","sgn"],mui:["mui","ms"],mzc:["mzc","sgn"],mzg:["mzg","sgn"],mzy:["mzy","sgn"],nan:["nan","zh"],nbs:["nbs","sgn"],ncs:["ncs","sgn"],nsi:["nsi","sgn"],nsl:["nsl","sgn"],nsp:["nsp","sgn"],nsr:["nsr","sgn"],nzs:["nzs","sgn"],okl:["okl","sgn"],orn:["orn","ms"],ors:["ors","ms"],pel:["pel","ms"],pga:["pga","ar"],pks:["pks","sgn"],prl:["prl","sgn"],prz:["prz","sgn"],psc:["psc","sgn"],psd:["psd","sgn"],pse:["pse","ms"],psg:["psg","sgn"],psl:["psl","sgn"],pso:["pso","sgn"],psp:["psp","sgn"],psr:["psr","sgn"],pys:["pys","sgn"],rms:["rms","sgn"],rsi:["rsi","sgn"],rsl:["rsl","sgn"],sdl:["sdl","sgn"],sfb:["sfb","sgn"],sfs:["sfs","sgn"],sgg:["sgg","sgn"],sgx:["sgx","sgn"],shu:["shu","ar"],slf:["slf","sgn"],sls:["sls","sgn"],sqk:["sqk","sgn"],sqs:["sqs","sgn"],ssh:["ssh","ar"],ssp:["ssp","sgn"],ssr:["ssr","sgn"],svk:["svk","sgn"],swc:["swc","sw"],swh:["swh","sw"],swl:["swl","sgn"],syy:["syy","sgn"],tmw:["tmw","ms"],tse:["tse","sgn"],tsm:["tsm","sgn"],tsq:["tsq","sgn"],tss:["tss","sgn"],tsy:["tsy","sgn"],tza:["tza","sgn"],ugn:["ugn","sgn"],ugy:["ugy","sgn"],ukl:["ukl","sgn"],uks:["uks","sgn"],urk:["urk","ms"],uzn:["uzn","uz"],uzs:["uzs","uz"],vgt:["vgt","sgn"],vkk:["vkk","ms"],vkt:["vkt","ms"],vsi:["vsi","sgn"],vsl:["vsl","sgn"],vsv:["vsv","sgn"],wuu:["wuu","zh"],xki:["xki","sgn"],xml:["xml","sgn"],xmm:["xmm","ms"],xms:["xms","sgn"],yds:["yds","sgn"],ysl:["ysl","sgn"],yue:["yue","zh"],zib:["zib","sgn"],zlm:["zlm","ms"],zmi:["zmi","ms"],zsl:["zsl","sgn"],zsm:["zsm","ms"]}},he={BHD:3,BYR:0,XOF:0,BIF:0,XAF:0,CLF:4,CLP:0,KMF:0,DJF:0,XPF:0,GNF:0,ISK:0,IQD:3,JPY:0,JOD:3,KRW:0,KWD:3,LYD:3,OMR:3,PYG:0,RWF:0,TND:3,UGX:0,UYI:0,VUV:0,VND:0};$(G,"NumberFormat",{configurable:!0,writable:!0,value:y}),$(G.NumberFormat,"prototype",{writable:!1}),ie.NumberFormat={"[[availableLocales]]":[],"[[relevantExtensionKeys]]":["nu"],"[[localeData]]":{}},$(G.NumberFormat,"supportedLocalesOf",{configurable:!0,writable:!0,value:oe.call(I,ie.NumberFormat)}),$(G.NumberFormat.prototype,"format",{configurable:!0,get:_});var me={arab:["٠","١","٢","٣","٤","٥","٦","٧","٨","٩"],arabext:["۰","۱","۲","۳","۴","۵","۶","۷","۸","۹"],bali:["᭐","᭑","᭒","᭓","᭔","᭕","᭖","᭗","᭘","᭙"],beng:["০","১","২","৩","৪","৫","৬","৭","৮","৯"],deva:["०","१","२","३","४","५","६","७","८","९"],fullwide:["０","１","２","３","４","５","６","７","８","９"],gujr:["૦","૧","૨","૩","૪","૫","૬","૭","૮","૯"],guru:["੦","੧","੨","੩","੪","੫","੬","੭","੮","੯"],hanidec:["〇","一","二","三","四","五","六","七","八","九"],khmr:["០","១","២","៣","៤","៥","៦","៧","៨","៩"],knda:["೦","೧","೨","೩","೪","೫","೬","೭","೮","೯"],laoo:["໐","໑","໒","໓","໔","໕","໖","໗","໘","໙"],latn:["0","1","2","3","4","5","6","7","8","9"],limb:["᥆","᥇","᥈","᥉","᥊","᥋","᥌","᥍","᥎","᥏"],mlym:["൦","൧","൨","൩","൪","൫","൬","൭","൮","൯"],mong:["᠐","᠑","᠒","᠓","᠔","᠕","᠖","᠗","᠘","᠙"],mymr:["၀","၁","၂","၃","၄","၅","၆","၇","၈","၉"],orya:["୦","୧","୨","୩","୪","୫","୬","୭","୮","୯"],tamldec:["௦","௧","௨","௩","௪","௫","௬","௭","௮","௯"],telu:["౦","౧","౨","౩","౪","౫","౬","౭","౮","౯"],thai:["๐","๑","๒","๓","๔","๕","๖","๗","๘","๙"],tibt:["༠","༡","༢","༣","༤","༥","༦","༧","༨","༩"]};$(G.NumberFormat.prototype,"resolvedOptions",{configurable:!0,writable:!0,value:function(){var e,t=new B,n=["locale","numberingSystem","style","currency","currencyDisplay","minimumIntegerDigits","minimumFractionDigits","maximumFractionDigits","minimumSignificantDigits","maximumSignificantDigits","useGrouping"],r=null!=this&&"object"==typeof this&&H(this);if(!r||!r["[[initializedNumberFormat]]"])throw new TypeError("`this` value for resolvedOptions() is not an initialized Intl.NumberFormat object.");for(var a=0,o=n.length;o>a;a++)J.call(r,e="[["+n[a]+"]]")&&(t[n[a]]={value:r[e],writable:!0,configurable:!0,enumerable:!0});return Q({},t)}}),$(G,"DateTimeFormat",{configurable:!0,writable:!0,value:x}),$(x,"prototype",{writable:!1});var ge={weekday:["narrow","short","long"],era:["narrow","short","long"],year:["2-digit","numeric"],month:["2-digit","numeric","narrow","short","long"],day:["2-digit","numeric"],hour:["2-digit","numeric"],minute:["2-digit","numeric"],second:["2-digit","numeric"],timeZoneName:["short","long"]};ie.DateTimeFormat={"[[availableLocales]]":[],"[[relevantExtensionKeys]]":["ca","nu"],"[[localeData]]":{}},$(G.DateTimeFormat,"supportedLocalesOf",{configurable:!0,writable:!0,value:oe.call(I,ie.DateTimeFormat)}),$(G.DateTimeFormat.prototype,"format",{configurable:!0,get:T}),$(G.DateTimeFormat.prototype,"resolvedOptions",{writable:!0,configurable:!0,value:function(){var e,t=new B,n=["locale","calendar","numberingSystem","timeZone","hour12","weekday","era","year","month","day","hour","minute","second","timeZoneName"],r=null!=this&&"object"==typeof this&&H(this);if(!r||!r["[[initializedDateTimeFormat]]"])throw new TypeError("`this` value for resolvedOptions() is not an initialized Intl.DateTimeFormat object.");for(var a=0,o=n.length;o>a;a++)J.call(r,e="[["+n[a]+"]]")&&(t[n[a]]={value:r[e],writable:!0,configurable:!0,enumerable:!0});return Q({},t)}});var ye=G.__localeSensitiveProtos={Number:{},Date:{}};ye.Number.toLocaleString=function(){if("[object Number]"!==Object.prototype.toString.call(this))throw new TypeError("`this` value must be a number for Number.prototype.toLocaleString()");return w(new y(arguments[0],arguments[1]),this)},ye.Date.toLocaleString=function(){if("[object Date]"!==Object.prototype.toString.call(this))throw new TypeError("`this` value must be a Date instance for Date.prototype.toLocaleString()");var e=+this;if(isNaN(e))return"Invalid Date";var t=arguments[0],n=arguments[1],n=P(n,"any","all"),r=new x(t,n);return D(r,e)},ye.Date.toLocaleDateString=function(){if("[object Date]"!==Object.prototype.toString.call(this))throw new TypeError("`this` value must be a Date instance for Date.prototype.toLocaleDateString()");var e=+this;if(isNaN(e))return"Invalid Date";var t=arguments[0],n=arguments[1],n=P(n,"date","date"),r=new x(t,n);return D(r,e)},ye.Date.toLocaleTimeString=function(){if("[object Date]"!==Object.prototype.toString.call(this))throw new TypeError("`this` value must be a Date instance for Date.prototype.toLocaleTimeString()");var e=+this;if(isNaN(e))return"Invalid Date";var t=arguments[0],n=arguments[1],n=P(n,"time","time"),r=new x(t,n);return D(r,e)},$(G,"__applyLocaleSensitivePrototypes",{writable:!0,configurable:!0,value:function(){$(Number.prototype,"toLocaleString",{writable:!0,configurable:!0,value:ye.Number.toLocaleString}),$(Date.prototype,"toLocaleString",{writable:!0,configurable:!0,value:ye.Date.toLocaleString});for(var e in ye.Date)J.call(ye.Date,e)&&$(Date.prototype,e,{writable:!0,configurable:!0,value:ye.Date[e]})}}),$(G,"__addLocaleData",{value:function(e){if(!r(e.locale))throw new Error("Object passed doesn't identify itself with a valid language tag");N(e,e.locale)}}),B.prototype=Q(null),L.prototype=Q(null),t["default"]=G},function(e,t){"use strict";var n="[a-z]{3}(?:-[a-z]{3}){0,2}",r="(?:[a-z]{2,3}(?:-"+n+")?|[a-z]{4}|[a-z]{5,8})",a="[a-z]{4}",o="(?:[a-z]{2}|\\d{3})",i="(?:[a-z0-9]{5,8}|\\d[a-z0-9]{3})",s="[0-9a-wy-z]",l=s+"(?:-[a-z0-9]{2,8})+",u="x(?:-[a-z0-9]{1,8})+",c="(?:en-GB-oed|i-(?:ami|bnn|default|enochian|hak|klingon|lux|mingo|navajo|pwn|tao|tay|tsu)|sgn-(?:BE-FR|BE-NL|CH-DE))",d="(?:art-lojban|cel-gaulish|no-bok|no-nyn|zh-(?:guoyu|hakka|min|min-nan|xiang))",p="(?:"+c+"|"+d+")",f=r+"(?:-"+a+")?(?:-"+o+")?(?:-"+i+")*(?:-"+l+")*(?:-"+u+")?",h=RegExp("^(?:"+f+"|"+u+"|"+p+")$","i"),m=RegExp("^(?!x).*?-("+i+")-(?:\\w{4,8}-(?!x-))*\\1\\b","i"),g=RegExp("^(?!x).*?-("+s+")-(?:\\w+-(?!x-))*\\1\\b","i"),y=RegExp("-"+l,"ig");t.expBCP47Syntax=h,t.expVariantDupes=m,t.expSingletonDupes=g,t.expExtSequences=y},function(e,t){"use strict";function n(e){for(var t=0;t-1&&(t.hour12=!0,t.pattern12=t.pattern,t.pattern=t.pattern.replace("{ampm}","").replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,"")),t}function o(e){function t(e,t){var n=new Array((e.match(/M/g)||[]).length+1),r=new Array((e.match(/E/g)||[]).length+1);return n.length>2&&(t=t.replace(/(M|L)+/,n.join("$1"))),r.length>2&&(t=t.replace(/([Eec])+/,r.join("$1"))),t}var o,i,s,l,u,c=e.availableFormats,d=e.timeFormats,p=e.dateFormats,f=e.medium,h=[],m=[],g=[];for(o in c)c.hasOwnProperty(o)&&(i=t(o,c[o]),s=a(i),s&&(h.push(s),n(s)?g.push(i):r(s)&&m.push(i)));for(l=0;l1?t-1:0),r=1;t>r;r++)n[r-1]=arguments[r];this.dispatch(n.length?[e].concat(n):e)}function s(){}Object.defineProperty(t,"__esModule",{value:!0}),t.getInternalMethods=n,t.warn=r,t.uid=a,t.formatAsConstant=o,t.dispatchIdentity=i;var l=Object.getOwnPropertyNames(s),u=Object.getOwnPropertyNames(s.prototype)},[865,584,856],function(e,t){"use strict";function n(){var e=[],t=function(t){var n=e.indexOf(t);n>=0&&e.splice(n,1)},n=function(n){e.push(n);var r=function(){return t(n)};return{dispose:r}},r=function(t){e.forEach(function(e){return e(t)})};return{subscribe:n,push:r,unsubscribe:t}}e.exports=n},[866,856,584],[867,584,854],function(e,t,n,r){"use strict";function a(e){var t={},n=i.apply(o,s.call(arguments,1));for(var r in e)-1===l(n,r)&&(t[r]=e[r]);return t}var o=Array.prototype,i=o.concat,s=o.slice,l=n(r);e.exports=a},function(e,t,n,r,a,o,i,s,l){"use strict";function u(e){return e&&e.__esModule?e:{"default":e}}function c(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t["default"]=e,t}function d(e){if(Array.isArray(e)){for(var t=0,n=Array(e.length);t1?r-1:0),o=1;r>o;o++)a[o-1]=arguments[o];return w.isFunction(n)?E.createStoreFromClass.apply(E,[this,n,t].concat(a)):E.createStoreFromObject(this,n,t)}},{key:"createStore",value:function(e,t){var n=t||e.displayName||e.name||"";E.createStoreConfig(this.config,e);var r=E.transformStore(this.storeTransforms,e);(this.stores[n]||!n)&&(this.stores[n]?O.warn("A store named "+n+" already exists, double check your store names or pass in your own custom identifier for each store"):O.warn("Store name was not specified"),n=O.uid(this.stores,n));for(var a=arguments.length,o=Array(a>2?a-2:0),i=2;a>i;i++)o[i-2]=arguments[i];var s=w.isFunction(r)?E.createStoreFromClass.apply(E,[this,r,n].concat(o)):E.createStoreFromObject(this,r,n);return this.stores[n]=s,v.saveInitialSnapshot(this,n),s}},{key:"generateActions",value:function(){for(var e={name:"global"},t=arguments.length,n=Array(t),r=0;t>r;r++)n[r]=arguments[r];return this.createActions(n.reduce(function(e,t){return e[t]=O.dispatchIdentity,e},e))}},{key:"createAction",value:function(e,t,n){return P["default"](this,"global",e,t,n)}},{key:"createActions",value:function(e){var t=arguments,n=this,r=void 0===arguments[1]?{}:arguments[1],a={},o=O.uid(this._actionsRegistry,e.displayName||e.name||"Unknown");if(w.isFunction(e)){var i,s,l;!function(){w.assign(a,O.getInternalMethods(e,!0));var n=function(e){function t(){f(this,t);for(var e=arguments.length,n=Array(e),r=0;e>r;r++)n[r]=arguments[r];m(Object.getPrototypeOf(t.prototype),"constructor",this).apply(this,n)}return p(t,e),g(t,[{key:"generateActions",value:function(){for(var e=arguments.length,t=Array(e),n=0;e>n;n++)t[n]=arguments[n];t.forEach(function(e){a[e]=O.dispatchIdentity})}}]),t}(e);for(i=t.length,s=Array(i>2?i-2:0),l=2;i>l;l++)s[l-2]=t[l];w.assign(a,new(h.apply(n,[null].concat(d(s)))))}()}else w.assign(a,e);return this.actions[o]=this.actions[o]||{},w.eachObject(function(e,t){if(w.isFunction(t)){r[e]=P["default"](n,o,e,t,r);var a=O.formatAsConstant(e);r[a]=r[e].id}},[a]),r}},{key:"takeSnapshot",value:function(){for(var e=arguments.length,t=Array(e),n=0;e>n;n++)t[n]=arguments[n];var r=v.snapshot(this,t);return w.assign(this._lastSnapshot,r),this.serialize(r)}},{key:"rollback",value:function(){v.setAppState(this,this.serialize(this._lastSnapshot),function(e){e.lifecycle("rollback"),e.emitChange()})}},{key:"recycle",value:function(){for(var e=arguments.length,t=Array(e),n=0;e>n;n++)t[n]=arguments[n];var r=t.length?v.filterSnapshots(this,this._initSnapshot,t):this._initSnapshot;v.setAppState(this,this.serialize(r),function(e){e.lifecycle("init"),e.emitChange()})}},{key:"flush",value:function(){var e=this.serialize(v.snapshot(this));return this.recycle(),e}},{key:"bootstrap",value:function(e){v.setAppState(this,e,function(e){e.lifecycle("bootstrap"),e.emitChange()})}},{key:"prepare",value:function(e,t){var n={};if(!e.displayName)throw new ReferenceError("Store provided does not have a name");return n[e.displayName]=t,this.serialize(n)}},{key:"addActions",value:function(e,t){for(var n=arguments.length,r=Array(n>2?n-2:0),a=2;n>a;a++)r[a-2]=arguments[a];this.actions[e]=Array.isArray(t)?this.generateActions.apply(this,t):this.createActions.apply(this,[t].concat(r))}},{key:"addStore",value:function(e,t){for(var n=arguments.length,r=Array(n>2?n-2:0),a=2;n>a;a++)r[a-2]=arguments[a];this.createStore.apply(this,[t,e].concat(r))}},{key:"getActions",value:function(e){return this.actions[e]}},{key:"getStore",value:function(e){return this.stores[e]}}],[{key:"debug",value:function(e,t){var n="alt.js.org";return"undefined"!=typeof window&&(window[n]=window[n]||[],window[n].push({name:e,alt:t})),t}}]),e}();t["default"]=A,e.exports=t["default"]},function(e,t,n,r){e.exports.Dispatcher=n(r)},function(e,t,n,r){"use strict";function a(){this.$Dispatcher_callbacks={},this.$Dispatcher_isPending={},this.$Dispatcher_isHandled={},this.$Dispatcher_isDispatching=!1,this.$Dispatcher_pendingPayload=null}var o=n(r),i=1,s="ID_";a.prototype.register=function(e){var t=s+i++;return this.$Dispatcher_callbacks[t]=e,t},a.prototype.unregister=function(e){o(this.$Dispatcher_callbacks[e],"Dispatcher.unregister(...): `%s` does not map to a registered callback.",e),delete this.$Dispatcher_callbacks[e]},a.prototype.waitFor=function(e){o(this.$Dispatcher_isDispatching,"Dispatcher.waitFor(...): Must be invoked while dispatching.");for(var t=0;tr;r++)n[r]=arguments[r];b(Object.getPrototypeOf(t.prototype),"constructor",this).apply(this,n)}return c(t,e),t}(t);p(o.prototype,e,n,{getInstance:function(){return r},setState:function(e){d(this,r,e)}});for(var i=arguments.length,s=Array(i>3?i-3:0),l=3;i>l;l++)s[l-3]=arguments[l];var f=new(y.apply(o,[null].concat(s)));return a.bindListeners&&f.bindListeners(a.bindListeners),a.datasource&&f.registerAsync(a.datasource),r=k.assign(new x["default"](e,f,"object"==typeof f.state?f.state:null,t),_.getInternalMethods(t),a.publicMethods,{displayName:n})}Object.defineProperty(t,"__esModule",{value:!0});var y=Function.prototype.bind,b=function(e,t,n){for(var r=!0;r;){var a=e,o=t,i=n;s=u=l=void 0,r=!1,null===a&&(a=Function.prototype);var s=Object.getOwnPropertyDescriptor(a,o);if(void 0!==s){if("value"in s)return s.value;var l=s.get;return void 0===l?void 0:l.call(i)}var u=Object.getPrototypeOf(a);if(null===u)return void 0;e=u,t=o,n=i,r=!0}};t.createStoreConfig=f,t.transformStore=h,t.createStoreFromObject=m,t.createStoreFromClass=g;var v=n(r),_=l(v),w=n(a),k=l(w),E=n(o),x=s(E),O=n(i),S=s(O)},function(e,t,n,r,a){"use strict";function o(e){return e&&e.__esModule?e:{"default":e}}function i(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t["default"]=e,t}function s(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(t,"__esModule",{value:!0});var l=function(){function e(e,t){for(var n=0;nn;n++)t[n]=arguments[n];if(!t.length)throw new ReferenceError("Dispatch tokens not provided");var r=t;1===t.length&&(r=Array.isArray(t[0])?t[0]:t);var a=r.map(function(e){return e.dispatchToken||e});this.dispatcher.waitFor(a)},exportAsync:function(e){this.registerAsync(e)},registerAsync:function(e){var t=this,n=0,r=c.isFunction(e)?e(this.alt):e,a=Object.keys(r).reduce(function(e,a){var o=r[a],i=c.isFunction(o)?o(t):o,s=["success","error","loading"];return s.forEach(function(e){if(i[e]&&!i[e].id)throw new Error(e+" handler must be an action function")}),e[a]=function(){for(var e=arguments.length,r=Array(e),a=0;e>a;a++)r[a]=arguments[a];var o=t.getInstance().getState(),s=i.local&&i.local.apply(i,[o].concat(r)),l=i.shouldFetch?i.shouldFetch.apply(i,[o].concat(r)):null==s,u=i.interceptResponse||function(e){return e},c=function(e,a){return function(o){var i=function(){if(n-=1,e(u(o,e,r)),a)throw o};return t.alt.trapAsync?function(){return i()}:i()}};return l?(n+=1,i.loading&&i.loading(u(null,i.loading,r)),i.remote.apply(i,[o].concat(r)).then(c(i.success),c(i.error,1))):void t.emitChange()},e},{});this.exportPublicMethods(a),this.exportPublicMethods({isLoading:function(){return n>0}})},exportPublicMethods:function(e){var t=this;c.eachObject(function(e,n){if(!c.isFunction(n))throw new TypeError("exportPublicMethods expects a function");t.publicMethods[e]=n},[e])},emitChange:function(){this.getInstance().emitChange()},on:function(e,t){"error"===e&&(this.handlesOwnErrors=!0);var n=this.lifecycleEvents[e]||l["default"]();return this.lifecycleEvents[e]=n,n.subscribe(t.bind(this))},bindAction:function(e,t){if(!e)throw new ReferenceError("Invalid action reference passed in");if(!c.isFunction(t))throw new TypeError("bindAction expects a function");if(t.length>1)throw new TypeError("Action handler in store "+this.displayName+" for "+((e.id||e).toString()+" was defined with ")+"two parameters. Only a single parameter is passed through the dispatcher, did you mean to pass in an Object instead?");var n=e.id?e.id:e;this.actionListeners[n]=t.bind(this),this.boundListeners.push(n)},bindActions:function(e){var t=this;c.eachObject(function(e,n){var r=/./,a=e.replace(r,function(e){return"on"+e[0].toUpperCase()}),o=null;if(t[e]&&t[a])throw new ReferenceError("You have multiple action handlers bound to an action: "+(e+" and "+a));t[e]?o=t[e]:t[a]&&(o=t[a]),o&&t.bindAction(n,o)},[e])},bindListeners:function(e){var t=this;c.eachObject(function(e,n){var r=t[e];if(!r)throw new ReferenceError(e+" defined but does not exist in "+t.displayName);Array.isArray(n)?n.forEach(function(e){t.bindAction(e,r)}):t.bindAction(n,r)},[e])}};t["default"]=d,e.exports=t["default"]},function(e,t,n,r,a){"use strict";function o(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t["default"]=e,t}function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function s(e,t,n,r,a){var o=p.uid(e._actionsRegistry,t+"."+n);e._actionsRegistry[o]=1;var i={id:o,namespace:t,name:n},s=new f(e,o,r,a,i),l=function(t){return e.dispatch(o,t,i)},u=function(){s.dispatched=!1;var e=s._dispatch.apply(s,arguments);return s.dispatched||void 0===e||c.isPromise(e)||(c.isFunction(e)?e(l):l(e)),e};u.defer=function(){for(var e=arguments.length,t=Array(e),n=0;e>n;n++)t[n]=arguments[n];setTimeout(function(){s._dispatch.apply(null,t)})},u.id=o,u.data=i;var d=e.actions[t],h=p.uid(d,n);return d[h]=u,u}Object.defineProperty(t,"__esModule",{value:!0});var l=function(){function e(e,t){for(var n=0;n + + 1.app.js + app.css + app.js + favicon.ico + fonts + fonts/Roboto-Bold.eot + fonts/Roboto-Bold.svg + fonts/Roboto-Bold.ttf + fonts/Roboto-Bold.woff + fonts/Roboto-Light.eot + fonts/Roboto-Light.svg + fonts/Roboto-Light.ttf + fonts/Roboto-Light.woff + fonts/Roboto-Regular.eot + fonts/Roboto-Regular.svg + fonts/Roboto-Regular.ttf + fonts/Roboto-Regular.woff + fonts/RobotoCondensed-Regular.eot + fonts/RobotoCondensed-Regular.svg + fonts/RobotoCondensed-Regular.ttf + fonts/RobotoCondensed-Regular.woff + index.html + vendors.js + + From 50b460f21508813c61c552bbc9f18c115a2c0ff5 Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Fri, 14 Aug 2015 15:52:25 -0400 Subject: [PATCH 191/353] [FWN] Fix improper initialization of plugins --- programs/full_web_node/BlockChain.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/full_web_node/BlockChain.cpp b/programs/full_web_node/BlockChain.cpp index a5b192bc..e2a0137b 100644 --- a/programs/full_web_node/BlockChain.cpp +++ b/programs/full_web_node/BlockChain.cpp @@ -47,6 +47,7 @@ void BlockChain::start() map.insert({"rpc-endpoint",boost::program_options::variable_value(std::string("127.0.0.1:8090"), false)}); map.insert({"seed-node",boost::program_options::variable_value(std::vector{("104.200.28.117:61705")}, false)}); grapheneApp->initialize(dataDir.toStdString(), map); + grapheneApp->initialize_plugins(map); grapheneApp->startup(); grapheneApp->startup_plugins(); } catch (const fc::exception& e) { From 03175707ff1153536241df6c3cfd348a172c9fac Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Fri, 14 Aug 2015 16:22:21 -0400 Subject: [PATCH 192/353] [FWN] Serve web from QRC instead of HTTP --- programs/full_web_node/main.cpp | 27 --------------------------- programs/full_web_node/qml/main.qml | 2 +- programs/full_web_node/web/app.js | 4 ++-- 3 files changed, 3 insertions(+), 30 deletions(-) diff --git a/programs/full_web_node/main.cpp b/programs/full_web_node/main.cpp index 8c089f8b..fc64eda6 100644 --- a/programs/full_web_node/main.cpp +++ b/programs/full_web_node/main.cpp @@ -1,9 +1,6 @@ #include "BlockChain.hpp" #include -#include -#include -#include #include #include @@ -21,30 +18,6 @@ int main(int argc, char *argv[]) app.setOrganizationName("Cryptonomex, Inc."); QtWebEngine::initialize(); - fc::http::server webGuiServer; - fc::thread serverThread("HTTP server thread"); - serverThread.async([&webGuiServer] { - webGuiServer.listen(fc::ip::endpoint::from_string("127.0.0.1:8080")); - webGuiServer.on_request([](const fc::http::request& request, const fc::http::server::response& response) { - QString path = QStringLiteral(":") + QString::fromStdString(request.path); - if (path.endsWith('/')) - path.append(QStringLiteral("index.html")); - QFile file(path); - - if (file.exists()) { - file.open(QIODevice::ReadOnly); - auto buffer = file.readAll(); - response.set_status(fc::http::reply::OK); - response.set_length(buffer.size()); - response.write(buffer.data(), buffer.size()); - } else { - response.set_status(fc::http::reply::NotFound); - response.set_length(18); - response.write("I can't find that.", 18); - } - }); - }); - qmlRegisterType("Graphene.FullNode", 1, 0, "BlockChain"); QQmlApplicationEngine engine; engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); diff --git a/programs/full_web_node/qml/main.qml b/programs/full_web_node/qml/main.qml index c3280179..f19ea3ae 100644 --- a/programs/full_web_node/qml/main.qml +++ b/programs/full_web_node/qml/main.qml @@ -12,7 +12,7 @@ Window { BlockChain { id: blockChain - onStarted: webView.url = "http://localhost:8080" + onStarted: webView.url = "qrc:/index.html" } Component.onCompleted: blockChain.start() diff --git a/programs/full_web_node/web/app.js b/programs/full_web_node/web/app.js index 42e1c1b5..882831d7 100644 --- a/programs/full_web_node/web/app.js +++ b/programs/full_web_node/web/app.js @@ -2,8 +2,8 @@ webpackJsonp([0],[function(e,t,a){"use strict";a(1),window.Intl?a(195):a.e(1,fun a(e)})}}),b(b.S+b.F*(!q||r(!0)),A,{resolve:function(e){return n(e)&&o(e.constructor,this)?e:new this(function(t){t(e)})}}),b(b.S+b.F*!(q&&a(109)(function(e){T.all(e)["catch"](function(){})})),A,{all:function(e){var t=i(this),a=[];return new t(function(r,n){E(e,!1,a.push,a);var o=a.length,i=Array(o);o?p.each.call(a,function(e,a){t.resolve(e).then(function(e){i[a]=e,--o||r(i)},n)}):r(i)})},race:function(e){var t=i(this);return new t(function(a,r){E(e,!1,function(e){t.resolve(e).then(a,r)})})}})},function(e,t){e.exports=function(e,t,a){if(!(e instanceof t))throw TypeError(a+": use the 'new' operator!");return e}},function(e,t,a){var r=a(32),n=a(106),o=a(107),i=a(36),s=a(34),l=a(108);e.exports=function(e,t,a,u){var c,d,f,p=l(e),m=r(a,u,t?2:1),h=0;if("function"!=typeof p)throw TypeError(e+" is not iterable!");if(o(p))for(c=s(e.length);c>h;h++)t?m(i(d=e[h])[0],d[1]):m(e[h]);else for(f=p.call(e);!(d=f.next()).done;)n(f,m,d.value,t)}},function(e,t,a){"use strict";function r(){var e=+this;if(b.hasOwnProperty(e)){var t=b[e];delete b[e],t()}}function n(e){r.call(e.data)}var o,i,s,l=a(32),u=a(27),c=a(16),d=a(18),f=a(17),p=f.process,m=f.setImmediate,h=f.clearImmediate,y=f.MessageChannel,g=0,b={},v="onreadystatechange";m&&h||(m=function(e){for(var t=[],a=1;arguments.length>a;)t.push(arguments[a++]);return b[++g]=function(){u("function"==typeof e?e:Function(e),t)},o(g),g},h=function(e){delete b[e]},"process"==a(21)(p)?o=function(e){p.nextTick(l(r,e,1))}:f.addEventListener&&"function"==typeof postMessage&&!f.importScripts?(o=function(e){f.postMessage(e,"*")},f.addEventListener("message",n,!1)):y?(i=new y,s=i.port2,i.port1.onmessage=n,o=l(s.postMessage,s,1)):o=v in d("script")?function(e){c.appendChild(d("script"))[v]=function(){c.removeChild(this),r.call(e)}}:function(e){setTimeout(l(r,e,1),0)}),e.exports={set:m,clear:h}},function(e,t,a){var r=a(25);e.exports=function(e,t){for(var a in t)r(e,a,t[a]);return e}},function(e,t,a){"use strict";var r=a(134);a(135)("Map",function(e){return function(){return e(this,arguments[0])}},{get:function(e){var t=r.getEntry(this,e);return t&&t.v},set:function(e,t){return r.def(this,0===e?0:e,t)}},r,!0)},function(e,t,a){"use strict";function r(e,t){if(!h(e))return"symbol"==typeof e?e:("string"==typeof e?"S":"P")+e;if(!m(e,p)){if(!y(e))return"F";if(!t)return"E";i(e,p,++v)}return"O"+e[p]}function n(e,t){var a,n=r(t);if("F"!==n)return e._i[n];for(a=e._f;a;a=a.n)if(a.k==t)return a}var o=a(13),i=a(24),s=a(32),l=a(115),u=a(129),c=a(31),d=a(130),f=a(113),p=a(26)("id"),m=a(20),h=a(19),y=Object.isExtensible||h,g=a(14),b=g?"_s":"size",v=0;e.exports={getConstructor:function(e,t,r,i){var l=e(function(e,a){u(e,l,t),e._i=o.create(null),e._f=void 0,e._l=void 0,e[b]=0,void 0!=a&&d(a,r,e[i],e)});return a(132)(l.prototype,{clear:function(){for(var e=this,t=e._i,a=e._f;a;a=a.n)a.r=!0,a.p&&(a.p=a.p.n=void 0),delete t[a.i];e._f=e._l=void 0,e[b]=0},"delete":function(e){var t=this,a=n(t,e);if(a){var r=a.n,o=a.p;delete t._i[a.i],a.r=!0,o&&(o.n=r),r&&(r.p=o),t._f==a&&(t._f=r),t._l==a&&(t._l=o),t[b]--}return!!a},forEach:function(e){for(var t,a=s(e,arguments[1],3);t=t?t.n:this._f;)for(a(t.v,t.k,this);t&&t.r;)t=t.p},has:function(e){return!!n(this,e)}}),g&&o.setDesc(l.prototype,"size",{get:function(){return c(this[b])}}),l},def:function(e,t,a){var o,i,s=n(e,t);return s?s.v=a:(e._l=s={i:i=r(t,!0),k:t,v:a,p:o=e._l,n:void 0,r:!1},e._f||(e._f=s),o&&(o.n=s),e[b]++,"F"!==i&&(e._i[i]=s)),e},getEntry:n,setStrong:function(e,t,r){a(94)(e,t,function(e,t){this._t=e,this._k=t,this._l=void 0},function(){for(var e=this,t=e._k,a=e._l;a&&a.r;)a=a.p;return e._t&&(e._l=a=a?a.n:e._t._f)?"keys"==t?f(0,a.k):"values"==t?f(0,a.v):f(0,[a.k,a.v]):(e._t=void 0,f(1))},r?"entries":"values",!r,!0),l(e),l(a(23)[t])}}},function(e,t,a){"use strict";var r=a(17),n=a(22),o=a(97),i=a(130),s=a(129);e.exports=function(e,t,l,u,c,d){function f(e){var t=y[e];a(25)(y,e,"delete"==e?function(e){return t.call(this,0===e?0:e)}:"has"==e?function(e){return t.call(this,0===e?0:e)}:"get"==e?function(e){return t.call(this,0===e?0:e)}:"add"==e?function(e){return t.call(this,0===e?0:e),this}:function(e,a){return t.call(this,0===e?0:e,a),this})}var p=r[e],m=p,h=c?"set":"add",y=m&&m.prototype,g={};if("function"==typeof m&&(d||!o&&y.forEach&&y.entries)){var b,v=new m,w=v[h](d?{}:-0,1);a(109)(function(e){new m(e)})||(m=t(function(t,a){s(t,m,e);var r=new p;return void 0!=a&&i(a,c,r[h],r),r}),m.prototype=y,y.constructor=m),d||v.forEach(function(e,t){b=1/t===-(1/0)}),b&&(f("delete"),f("has"),c&&f("get")),(b||w!==v)&&f(h),d&&y.clear&&delete y.clear}else m=u.getConstructor(t,e,c,h),a(132)(m.prototype,l);return a(43)(m,e),g[e]=m,n(n.G+n.W+n.F*(m!=p),g),d||u.setStrong(m,e,c),m}},function(e,t,a){"use strict";var r=a(134);a(135)("Set",function(e){return function(){return e(this,arguments[0])}},{add:function(e){return r.def(this,e=0===e?0:e,e)}},r)},function(e,t,a){"use strict";var r=a(13),n=a(138),o=a(19),i=a(20),s=n.frozenStore,l=n.WEAK,u=Object.isExtensible||o,c={},d=a(135)("WeakMap",function(e){return function(){return e(this,arguments[0])}},{get:function(e){if(o(e)){if(!u(e))return s(this).get(e);if(i(e,l))return e[l][this._i]}},set:function(e,t){return n.def(this,e,t)}},n,!0,!0);7!=(new d).set((Object.freeze||Object)(c),7).get(c)&&r.each.call(["delete","has","get","set"],function(e){var t=d.prototype,r=t[e];a(25)(t,e,function(t,a){if(o(t)&&!u(t)){var n=s(this)[e](t,a);return"set"==e?this:n}return r.call(this,t,a)})})},function(e,t,a){"use strict";function r(e){return e._l||(e._l=new n)}function n(){this.a=[]}function o(e,t){return h(e.a,function(e){return e[0]===t})}var i=a(24),s=a(36),l=a(129),u=a(130),c=a(28),d=a(26)("weak"),f=a(19),p=a(20),m=Object.isExtensible||f,h=c(5),y=c(6),g=0;n.prototype={get:function(e){var t=o(this,e);return t?t[1]:void 0},has:function(e){return!!o(this,e)},set:function(e,t){var a=o(this,e);a?a[1]=t:this.a.push([e,t])},"delete":function(e){var t=y(this.a,function(t){return t[0]===e});return~t&&this.a.splice(t,1),!!~t}},e.exports={getConstructor:function(e,t,n,o){var i=e(function(e,a){l(e,i,t),e._i=g++,e._l=void 0,void 0!=a&&u(a,n,e[o],e)});return a(132)(i.prototype,{"delete":function(e){return f(e)?m(e)?p(e,d)&&p(e[d],this._i)&&delete e[d][this._i]:r(this)["delete"](e):!1},has:function(e){return f(e)?m(e)?p(e,d)&&p(e[d],this._i):r(this).has(e):!1}}),i},def:function(e,t,a){return m(s(t))?(p(t,d)||i(t,d,{}),t[d][e._i]=a):r(e).set(t,a),e},frozenStore:r,WEAK:d}},function(e,t,a){"use strict";var r=a(138);a(135)("WeakSet",function(e){return function(){return e(this,arguments[0])}},{add:function(e){return r.def(this,e,!0)}},r,!1,!0)},function(e,t,a){var r=a(22),n=Function.apply;r(r.S,"Reflect",{apply:function(e,t,a){return n.call(e,t,a)}})},function(e,t,a){var r=a(13),n=a(22),o=a(33),i=a(19),s=Function.apply,l=Function.bind||a(23).Function.prototype.bind;n(n.S,"Reflect",{construct:function(e,t){if(arguments.length<3)return new(l.apply(e,[null].concat(t)));var a=o(arguments[2]).prototype,n=r.create(i(a)?a:Object.prototype),u=s.call(e,n,t);return i(u)?u:n}})},function(e,t,a){var r=a(13),n=a(22),o=a(36);n(n.S+n.F*a(40)(function(){Reflect.defineProperty(r.setDesc({},1,{value:1}),1,{value:2})}),"Reflect",{defineProperty:function(e,t,a){o(e);try{return r.setDesc(e,t,a),!0}catch(n){return!1}}})},function(e,t,a){var r=a(22),n=a(13).getDesc,o=a(36);r(r.S,"Reflect",{deleteProperty:function(e,t){var a=n(o(e),t);return a&&!a.configurable?!1:delete e[t]}})},function(e,t,a){function r(e){this._t=o(e),this._k=void 0,this._i=0}var n=a(22),o=a(36);a(96)(r,"Object",function(){var e,t=this,a=t._k;if(void 0==a){t._k=a=[];for(e in t._t)a.push(e)}do if(t._i>=a.length)return{value:void 0,done:!0};while(!((e=a[t._i++])in t._t));return{value:e,done:!1}}),n(n.S,"Reflect",{enumerate:function(e){return new r(e)}})},function(e,t,a){function r(e,t){var a,i,u=arguments.length<3?e:arguments[2];return l(e)===u?e[t]:(a=n.getDesc(e,t))?o(a,"value")?a.value:void 0!==a.get?a.get.call(u):void 0:s(i=n.getProto(e))?r(i,t,u):void 0}var n=a(13),o=a(20),i=a(22),s=a(19),l=a(36);i(i.S,"Reflect",{get:r})},function(e,t,a){var r=a(13),n=a(22),o=a(36);n(n.S,"Reflect",{getOwnPropertyDescriptor:function(e,t){return r.getDesc(o(e),t)}})},function(e,t,a){var r=a(22),n=a(13).getProto,o=a(36);r(r.S,"Reflect",{getPrototypeOf:function(e){return n(o(e))}})},function(e,t,a){var r=a(22);r(r.S,"Reflect",{has:function(e,t){return t in e}})},function(e,t,a){var r=a(22),n=a(36),o=Object.isExtensible||a(19);r(r.S,"Reflect",{isExtensible:function(e){return o(n(e))}})},function(e,t,a){var r=a(22);r(r.S,"Reflect",{ownKeys:a(151)})},function(e,t,a){var r=a(13),n=a(36);e.exports=function(e){var t=r.getNames(n(e)),a=r.getSymbols;return a?t.concat(a(e)):t}},function(e,t,a){var r=a(22),n=a(36),o=Object.preventExtensions;r(r.S,"Reflect",{preventExtensions:function(e){n(e);try{return o&&o(e),!0}catch(t){return!1}}})},function(e,t,a){function r(e,t,a){var i,c,d=arguments.length<4?e:arguments[3],f=n.getDesc(l(e),t);if(!f){if(u(c=n.getProto(e)))return r(c,t,a,d);f=s(0)}return o(f,"value")?f.writable!==!1&&u(d)?(i=n.getDesc(d,t)||s(0),i.value=a,n.setDesc(d,t,i),!0):!1:void 0===f.set?!1:(f.set.call(d,a),!0)}var n=a(13),o=a(20),i=a(22),s=a(15),l=a(36),u=a(19);i(i.S,"Reflect",{set:r})},function(e,t,a){var r=a(22),n=a(54);n&&r(r.S,"Reflect",{setPrototypeOf:function(e,t){n.check(e,t);try{return n.set(e,t),!0}catch(a){return!1}}})},function(e,t,a){"use strict";var r=a(22),n=a(38)(!0);r(r.P,"Array",{includes:function(e){return n(this,e,arguments[1])}}),a(112)("includes")},function(e,t,a){"use strict";var r=a(22),n=a(93)(!0);r(r.P,"String",{at:function(e){return n(this,e)}})},function(e,t,a){"use strict";var r=a(22),n=a(158);r(r.P,"String",{lpad:function(e){return n(this,e,arguments[1],!0)}})},function(e,t,a){var r=a(35),n=a(103),o=a(31);e.exports=function(e,t,a,i){var s=String(o(e));if(void 0===t)return s;var l=r(t),u=l-s.length;if(0>u||u===1/0)throw new RangeError("Cannot satisfy string length "+t+" for string: "+s);var c=void 0===a?" ":String(a),d=n.call(c,Math.ceil(u/c.length));return d.length>u&&(d=i?d.slice(d.length-u):d.slice(0,u)),i?d.concat(s):s.concat(d)}},function(e,t,a){"use strict";var r=a(22),n=a(158);r(r.P,"String",{rpad:function(e){return n(this,e,arguments[1],!1)}})},function(e,t,a){var r=a(22),n=a(39)(/[\\^$*+?.()|[\]{}]/g,"\\$&");r(r.S,"RegExp",{escape:function(e){return n(e)}})},function(e,t,a){var r=a(13),n=a(22),o=a(151),i=a(29),s=a(15);n(n.S,"Object",{getOwnPropertyDescriptors:function(e){for(var t,a,n=i(e),l=r.setDesc,u=r.getDesc,c=o(n),d={},f=0;c.length>f;)a=u(n,t=c[f++]),t in d?l(d,t,s(0,a)):d[t]=a;return d}})},function(e,t,a){var r=a(22),n=a(163)(!1);r(r.S,"Object",{values:function(e){return n(e)}})},function(e,t,a){var r=a(13),n=a(29);e.exports=function(e){return function(t){var a,o=n(t),i=r.getKeys(o),s=i.length,l=0,u=Array(s);if(e)for(;s>l;)u[l]=[a=i[l++],o[a]];else for(;s>l;)u[l]=o[i[l++]];return u}}},function(e,t,a){var r=a(22),n=a(163)(!0);r(r.S,"Object",{entries:function(e){return n(e)}})},function(e,t,a){var r=a(22);r(r.P,"Map",{toJSON:a(166)("Map")})},function(e,t,a){var r=a(130),n=a(56);e.exports=function(e){return function(){if(n(this)!=e)throw TypeError(e+"#toJSON isn't generic");var t=[];return r(this,!1,t.push,t),t}}},function(e,t,a){var r=a(22);r(r.P,"Set",{toJSON:a(166)("Set")})},function(e,t,a){function r(e,t){n.each.call(e.split(","),function(e){void 0==t&&e in i?s[e]=i[e]:e in[]&&(s[e]=a(32)(Function.call,[][e],t))})}var n=a(13),o=a(22),i=a(23).Array||Array,s={};r("pop,reverse,shift,keys,values,entries",1),r("indexOf,every,some,forEach,map,filter,find,findIndex,includes",3),r("join,slice,concat,push,splice,unshift,sort,lastIndexOf,reduce,reduceRight,copyWithin,fill"),o(o.S,"Array",s)},function(e,t,a){function r(e){return u?function(t,a){return e(i(s,[].slice.call(arguments,2),"function"==typeof t?t:Function(t)),a)}:e}var n=a(17),o=a(22),i=a(27),s=a(170),l=n.navigator,u=!!l&&/MSIE .\./.test(l.userAgent);o(o.G+o.B+o.F*u,{setTimeout:r(n.setTimeout),setInterval:r(n.setInterval)})},function(e,t,a){"use strict";var r=a(171),n=a(27),o=a(33);e.exports=function(){for(var e=o(this),t=arguments.length,a=Array(t),i=0,s=r._,l=!1;t>i;)(a[i]=arguments[i++])===s&&(l=!0);return function(){var r,o=this,i=arguments.length,u=0,c=0;if(!l&&!i)return n(e,a,o);if(r=a.slice(),l)for(;t>u;u++)r[u]===s&&(r[u]=arguments[c++]);for(;i>c;)r.push(arguments[c++]);return n(e,r,o)}}},function(e,t,a){e.exports=a(17)},function(e,t,a){var r=a(22),n=a(131);r(r.G+r.B,{setImmediate:n.set,clearImmediate:n.clear})},function(e,t,a){a(111);var r=a(17),n=a(24),o=a(95),i=a(44)("iterator"),s=r.NodeList,l=r.HTMLCollection,u=s&&s.prototype,c=l&&l.prototype,d=o.NodeList=o.HTMLCollection=o.Array;!s||i in u||n(u,i,d),!l||i in c||n(c,i,d)},function(e,t,a){(function(t,a){!function(t){"use strict";function r(e,t,a,r){var n=Object.create((t||o).prototype);return n._invoke=d(e,a||null,new m(r||[])),n}function n(e,t,a){try{return{type:"normal",arg:e.call(t,a)}}catch(r){return{type:"throw",arg:r}}}function o(){}function i(){}function s(){}function l(e){["next","throw","return"].forEach(function(t){e[t]=function(e){return this._invoke(t,e)}})}function u(e){this.arg=e}function c(e){function t(t,a){var r=e[t](a),n=r.value;return n instanceof u?Promise.resolve(n.arg).then(o,i):Promise.resolve(n).then(function(e){return r.value=e,r})}function r(e,a){var r=n?n.then(function(){return t(e,a)}):new Promise(function(r){r(t(e,a))});return n=r["catch"](function(e){}),r}"object"==typeof a&&a.domain&&(t=a.domain.bind(t));var n,o=t.bind(e,"next"),i=t.bind(e,"throw");t.bind(e,"return");this._invoke=r}function d(e,t,a){var r=k;return function(o,i){if(r===x)throw new Error("Generator is already running");if(r===j){if("throw"===o)throw i;return y()}for(;;){var s=a.delegate;if(s){if("return"===o||"throw"===o&&s.iterator[o]===g){a.delegate=null;var l=s.iterator["return"];if(l){var u=n(l,s.iterator,i);if("throw"===u.type){o="throw",i=u.arg;continue}}if("return"===o)continue}var u=n(s.iterator[o],s.iterator,i);if("throw"===u.type){a.delegate=null,o="throw",i=u.arg;continue}o="next",i=g;var c=u.arg;if(!c.done)return r=E,c;a[s.resultName]=c.value,a.next=s.nextLoc,a.delegate=null}if("next"===o)r===E?a.sent=i:a.sent=g;else if("throw"===o){if(r===k)throw r=j,i;a.dispatchException(i)&&(o="next",i=g)}else"return"===o&&a.abrupt("return",i);r=x;var u=n(e,t,a);if("normal"===u.type){r=a.done?j:E;var c={value:u.arg,done:a.done};if(u.arg!==O)return c;a.delegate&&"next"===o&&(i=g)}else"throw"===u.type&&(r=j,o="throw",i=u.arg)}}}function f(e){var t={tryLoc:e[0]};1 in e&&(t.catchLoc=e[1]),2 in e&&(t.finallyLoc=e[2],t.afterLoc=e[3]),this.tryEntries.push(t)}function p(e){var t=e.completion||{};t.type="normal",delete t.arg,e.completion=t}function m(e){this.tryEntries=[{tryLoc:"root"}],e.forEach(f,this),this.reset(!0)}function h(e){if(e){var t=e[v];if(t)return t.call(e);if("function"==typeof e.next)return e;if(!isNaN(e.length)){var a=-1,r=function n(){for(;++a=0;--r){var n=this.tryEntries[r],o=n.completion;if("root"===n.tryLoc)return t("end");if(n.tryLoc<=this.prev){var i=b.call(n,"catchLoc"),s=b.call(n,"finallyLoc");if(i&&s){if(this.prev=0;--a){var r=this.tryEntries[a];if(r.tryLoc<=this.prev&&b.call(r,"finallyLoc")&&this.prev=0;--t){var a=this.tryEntries[t];if(a.finallyLoc===e)return this.complete(a.completion,a.afterLoc),p(a),O}},"catch":function(e){for(var t=this.tryEntries.length-1;t>=0;--t){var a=this.tryEntries[t];if(a.tryLoc===e){var r=a.completion;if("throw"===r.type){var n=r.arg;p(a)}return n}}throw new Error("illegal catch attempt")},delegateYield:function(e,t,a){return this.delegate={iterator:h(e),resultName:t,nextLoc:a},O}}}("object"==typeof t?t:"object"==typeof window?window:"object"==typeof self?self:this)}).call(t,function(){return this}(),a(175))},,,function(module,exports){var idbModules={util:{cleanInterface:!1}};!function(){"use strict";var e={test:!0};if(Object.defineProperty)try{Object.defineProperty(e,"test",{enumerable:!1}),e.test&&(idbModules.util.cleanInterface=!0)}catch(t){}}(),function(e){"use strict";function t(e,t,a){a.target=t,"function"==typeof t[e]&&t[e].apply(t,[a])}var a=function(){this.length=0,this._items=[],e.util.cleanInterface&&Object.defineProperty(this,"_items",{enumerable:!1})};if(a.prototype={contains:function(e){return-1!==this._items.indexOf(e)},item:function(e){return this._items[e]},indexOf:function(e){return this._items.indexOf(e)},push:function(e){this._items.push(e),this.length+=1;for(var t=0;t889)throw e.util.createDOMException("DataError","The encoded key is "+t.length+" characters long, but IE only allows 889 characters. Consider replacing numeric keys with strings to reduce the encoded length.")}var d="__$$compoundKey",f=/\$\$/g,p="$$$$",m="$_$";e.polyfill=t}(idbModules),function(idbModules){"use strict";var Sca=function(){return{decycle:function(object,callback){function checkForCompletion(){0===queuedObjects.length&&returnCallback(derezObj)}function readBlobAsDataURL(e,t){var a=new FileReader;a.onloadend=function(a){var r=a.target.result,n="Blob";e instanceof File,updateEncodedBlob(r,t,n)},a.readAsDataURL(e)}function updateEncodedBlob(dataURL,path,blobtype){var encoded=queuedObjects.indexOf(path);path=path.replace("$","derezObj"),eval(path+'.$enc="'+dataURL+'"'),eval(path+'.$type="'+blobtype+'"'),queuedObjects.splice(encoded,1),checkForCompletion()}function derez(e,t){var a,r,n;if(!("object"!=typeof e||null===e||e instanceof Boolean||e instanceof Date||e instanceof Number||e instanceof RegExp||e instanceof Blob||e instanceof String)){for(a=0;as;++s)i[s]=r.charCodeAt(s);return new Blob([i.buffer],{type:t})}function rez(value){var i,item,name,path;if(value&&"object"==typeof value)if("[object Array]"===Object.prototype.toString.apply(value))for(i=0;it?roundToPrecision(parseInt(e,32)*Math.pow(32,t-10)):11>t?(a=e.slice(0,t),a=parseInt(a,32),r=e.slice(t),r=parseInt(r,32)*Math.pow(32,t-11),roundToPrecision(a+r)):(n=e+zeros(t-11),parseInt(n,32))}function roundToPrecision(e,t){return t=t||16,parseFloat(e.toPrecision(t))}function zeros(e){for(var t="";e--;)t+="0";return t}function negate(e){return"-"+e}function getType(e){return e instanceof Date?"date":e instanceof Array?"array":typeof e}function validate(e){var t=getType(e);if("array"===t)for(var a=0;a1:t===e}function isKeyInRange(e,t){var a=void 0===t.lower,r=void 0===t.upper,n=idbModules.Key.encode(e,!0);return void 0!==t.lower&&(t.lowerOpen&&n>t.__lower&&(a=!0),!t.lowerOpen&&n>=t.__lower&&(a=!0)),void 0!==t.upper&&(t.upperOpen&&n0&&a.push(n);continue}n=n[0]}isKeyInRange(n,t)&&a.push(n)}else isKeyInRange(e,t)&&a.push(e);return a}var collations=["undefined","number","date","string","array"],signValues=["negativeInfinity","bigNegative","smallNegative","smallPositive","bigPositive","positiveInfinity"],types={undefined:{encode:function(e){return collations.indexOf("undefined")+"-"},decode:function(e){return void 0}},date:{encode:function(e){return collations.indexOf("date")+"-"+e.toJSON()},decode:function(e){return new Date(e.substring(2))}},number:{encode:function(e){var t=Math.abs(e).toString(32),a=t.indexOf(".");t=-1!==a?t.replace(".",""):t;var r=t.search(/[^0]/);t=t.slice(r);var n,o=zeros(2),i=zeros(11);return isFinite(e)?0>e?e>-1?(n=signValues.indexOf("smallNegative"),o=padBase32Exponent(r),i=flipBase32(padBase32Mantissa(t))):(n=signValues.indexOf("bigNegative"),o=flipBase32(padBase32Exponent(-1!==a?a:t.length)),i=flipBase32(padBase32Mantissa(t))):1>e?(n=signValues.indexOf("smallPositive"),o=flipBase32(padBase32Exponent(r)),i=padBase32Mantissa(t)):(n=signValues.indexOf("bigPositive"),o=padBase32Exponent(-1!==a?a:t.length),i=padBase32Mantissa(t)):n=signValues.indexOf(e>0?"positiveInfinity":"negativeInfinity"),collations.indexOf("number")+"-"+n+o+i},decode:function(e){var t=+e.substr(2,1),a=e.substr(3,2),r=e.substr(5,11);switch(signValues[t]){case"negativeInfinity":return-(1/0);case"positiveInfinity":return 1/0;case"bigPositive":return pow32(r,a);case"smallPositive":return a=negate(flipBase32(a)),pow32(r,a);case"smallNegative":return a=negate(a),r=flipBase32(r),-pow32(r,a);case"bigNegative":return a=flipBase32(a),r=flipBase32(r),-pow32(r,a);default:throw new Error("Invalid number.")}}},string:{encode:function(e,t){return t&&(e=e.replace(/(.)/g,"-$1")+" "),collations.indexOf("string")+"-"+e},decode:function(e,t){return e=e.substring(2),t&&(e=e.substr(0,e.length-1).replace(/-(.)/g,"$1")),e}},array:{encode:function(e){for(var t=[],a=0;a":">=","?"),c.push(s.__range.__lower)),s.__range.lower!==t&&s.__range.upper!==t&&u.push("AND"),s.__range.upper!==t&&(u.push(l,s.__range.upperOpen?"<":"<=","?"),c.push(s.__range.__upper))),"undefined"!=typeof a&&(s.__lastKeyContinued=a,s.__offset=0),s.__lastKeyContinued!==t&&(u.push("AND",l,">= ?"),e.Key.validate(s.__lastKeyContinued),c.push(e.Key.encode(s.__lastKeyContinued)));var d="prev"===s.direction||"prevunique"===s.direction?"DESC":"ASC";u.push("ORDER BY",l,d),u.push("LIMIT",i,"OFFSET",s.__offset),u=u.join(" "),e.DEBUG&&console.log(u,c),s.__prefetchedData=null,s.__prefetchedIndex=0,r.executeSql(u,c,function(a,r){r.rows.length>1?(s.__prefetchedData=r.rows,s.__prefetchedIndex=0,e.DEBUG&&console.log("Preloaded "+s.__prefetchedData.length+" records for cursor"),s.__decode(r.rows.item(0),n)):1===r.rows.length?s.__decode(r.rows.item(0),n):(e.DEBUG&&console.log("Reached end of cursors"),n(t,t,t))},function(t,a){e.DEBUG&&console.log("Could not execute Cursor.continue",u,c),o(a)})},a.prototype.__findMultiEntry=function(a,r,n,o){var i=this;if(i.__prefetchedData&&i.__prefetchedData.length===i.__prefetchedIndex)return e.DEBUG&&console.log("Reached end of multiEntry cursor"),void n(t,t,t);var s=e.util.quote(i.__keyColumnName),l=["SELECT * FROM",e.util.quote(i.__store.name)],u=[];l.push("WHERE",s,"NOT NULL"),i.__range&&i.__range.lower!==t&&i.__range.upper!==t&&0===i.__range.upper.indexOf(i.__range.lower)&&(l.push("AND",s,"LIKE ?"),u.push("%"+i.__range.__lower.slice(0,-1)+"%")),"undefined"!=typeof a&&(i.__lastKeyContinued=a,i.__offset=0),i.__lastKeyContinued!==t&&(l.push("AND",s,">= ?"),e.Key.validate(i.__lastKeyContinued),u.push(e.Key.encode(i.__lastKeyContinued)));var c="prev"===i.direction||"prevunique"===i.direction?"DESC":"ASC";l.push("ORDER BY key",c),l=l.join(" "),e.DEBUG&&console.log(l,u),i.__prefetchedData=null,i.__prefetchedIndex=0,r.executeSql(l,u,function(a,r){if(i.__multiEntryOffset=r.rows.length,r.rows.length>0){for(var o=[],s=0;st.matchingKey.replace("[","z")?m?-1:1:e.keyt.key?"prev"===i.direction?-1:1:0}),i.__prefetchedData={data:o,length:o.length,item:function(e){return this.data[e]}},i.__prefetchedIndex=0,o.length>1?(e.DEBUG&&console.log("Preloaded "+i.__prefetchedData.length+" records for multiEntry cursor"),i.__decode(o[0],n)):1===o.length?(e.DEBUG&&console.log("Reached end of multiEntry cursor"),i.__decode(o[0],n)):(e.DEBUG&&console.log("Reached end of multiEntry cursor"),n(t,t,t))}else e.DEBUG&&console.log("Reached end of multiEntry cursor"),n(t,t,t)},function(t,a){e.DEBUG&&console.log("Could not execute Cursor.continue",l,u),o(a)})},a.prototype.__onsuccess=function(e){var a=this;return function(r,n,o){a.key=r===t?null:r,a.value=n===t?null:n,a.primaryKey=o===t?null:o;var i=r===t?null:a;e(i,a.__req)}},a.prototype.__decode=function(a,r){if(this.__multiEntryIndex&&this.__unique){if(this.__matchedKeys||(this.__matchedKeys={}),this.__matchedKeys[a.matchingKey])return void r(t,t,t);this.__matchedKeys[a.matchingKey]=!0}var n=e.Key.decode(this.__multiEntryIndex?a.matchingKey:a[this.__keyColumnName],this.__multiEntryIndex),o=this.__valueDecoder.decode(a[this.__valueColumnName]),i=e.Key.decode(a.key);r(n,o,i)},a.prototype["continue"]=function(t){var a=e.cursorPreloadPackSize||100,r=this;this.__store.transaction.__pushToQueue(r.__req,function(e,n,o,i){return r.__offset++,r.__prefetchedData&&(r.__prefetchedIndex++,r.__prefetchedIndex=a)throw e.util.createDOMException("Type Error","Count is invalid - 0 or negative",a);var r=this;this.__store.transaction.__pushToQueue(r.__req,function(e,n,o,i){r.__offset+=a,r.__find(t,e,r.__onsuccess(o),i)})},a.prototype.update=function(a){var r=this;return r.__store.transaction.__assertWritable(),r.__store.transaction.__addToTransactionQueue(function(n,o,i,s){e.Sca.encode(a,function(o){r.__find(t,n,function(t,l,u){var c=r.__store,d=[o],f=["UPDATE",e.util.quote(c.name),"SET value = ?"];e.Key.validate(u);for(var p=0;p0&&t.executeSql("DROP TABLE "+e.util.quote(a.name),[],function(){t.executeSql("DELETE FROM __sys__ WHERE name = ?",[a.name],function(){n()},i)},i)})})},t.prototype.__validateKey=function(t,a){if(this.keyPath){if("undefined"!=typeof a)throw e.util.createDOMException("DataError","The object store uses in-line keys and the key parameter was provided",this);if(!t||"object"!=typeof t)throw e.util.createDOMException("DataError","KeyPath was specified, but value was not an object");if(a=e.Key.getValue(t,this.keyPath),void 0===a){if(this.autoIncrement)return;throw e.util.createDOMException("DataError","Could not eval key from keyPath")}}else if("undefined"==typeof a){if(this.autoIncrement)return;throw e.util.createDOMException("DataError","The object store uses out-of-line keys and has no key generator and the key parameter was not provided. ",this)}e.Key.validate(a)},t.prototype.__deriveKey=function(t,a,r,n,o){function i(a){t.executeSql("SELECT * FROM sqlite_sequence where name like ?",[s.name],function(e,t){a(1!==t.rows.length?1:t.rows.item(0).seq+1)},function(t,a){o(e.util.createDOMException("DataError","Could not get the auto increment value for key",a))})}var s=this;if(s.keyPath){var l=e.Key.getValue(a,s.keyPath);void 0===l&&s.autoIncrement?i(function(t){try{e.Key.setValue(a,s.keyPath,t),n(t)}catch(r){o(e.util.createDOMException("DataError","Could not assign a generated value to the keyPath",r))}}):n(l)}else"undefined"==typeof r&&s.autoIncrement?i(n):n(r)},t.prototype.__insertData=function(t,a,r,n,o,i){try{var s={};"undefined"!=typeof n&&(e.Key.validate(n),s.key=e.Key.encode(n));for(var l=0;l0&&(r=!0,e.Key.validate(t)),a.transaction.__addToTransactionQueue(function(n,o,i,s){var l="SELECT * FROM "+e.util.quote(a.name)+(r?" WHERE key = ?":""),u=[];r&&u.push(e.Key.encode(t)),n.executeSql(l,u,function(e,t){i(t.rows.length)},function(e,t){s(t)})})},t.prototype.openCursor=function(t,a){return new e.IDBCursor(t,a,this,this,"key","value").__req},t.prototype.index=function(t){if(0===arguments.length)throw new TypeError("No index name was specified");var a=this.__indexes[t];if(!a)throw e.util.createDOMException("NotFoundError",'Index "'+t+'" does not exist on '+this.name);return e.IDBIndex.__clone(a,this)},t.prototype.createIndex=function(t,a,r){if(0===arguments.length)throw new TypeError("No index name was specified");if(1===arguments.length)throw new TypeError("No key path was specified");if(a instanceof Array&&r&&r.multiEntry)throw e.util.createDOMException("InvalidAccessError","The keyPath argument was an array and the multiEntry option is true.");if(this.__indexes[t]&&!this.__indexes[t].__deleted)throw e.util.createDOMException("ConstraintError",'Index "'+t+'" already exists on '+this.name);this.transaction.__assertVersionChange(),r=r||{};var n={columnName:t,keyPath:a,optionalParams:{unique:!!r.unique,multiEntry:!!r.multiEntry}},o=new e.IDBIndex(this,n);return e.IDBIndex.__createIndex(this,o),o},t.prototype.deleteIndex=function(t){if(0===arguments.length)throw new TypeError("No index name was specified");var a=this.__indexes[t];if(!a)throw e.util.createDOMException("NotFoundError",'Index "'+t+'" does not exist on '+this.name);this.transaction.__assertVersionChange(),e.IDBIndex.__deleteIndex(this,a)},e.IDBObjectStore=t}(idbModules),function(e){"use strict";function t(e,t,r){this.__id=++a,this.__active=!0,this.__running=!1,this.__requests=[],this.__storeNames=t,this.mode=r,this.db=e,this.error=null,this.onabort=this.onerror=this.oncomplete=null;var n=this;setTimeout(function(){n.__executeRequests()},0)}var a=0;t.prototype.__executeRequests=function(){function t(t){if(!r.__active)throw t;try{e.util.logError("Error","An error occurred in a transaction",t),r.error=t;var a=e.util.createEvent("error");e.util.callback("onerror",r,a)}finally{r.abort()}}function a(){e.DEBUG&&console.log("Transaction completed");var t=e.util.createEvent("complete");e.util.callback("oncomplete",r,t),e.util.callback("__oncomplete",r,t)}if(this.__running)return void(e.DEBUG&&console.log("Looks like the request set is already running",this.mode));this.__running=!0;var r=this;r.db.__db.transaction(function(n){function o(t,a){a&&(l.req=a),l.req.readyState="done",l.req.result=t,delete l.req.error;var r=e.util.createEvent("success");e.util.callback("onsuccess",l.req,r),u++,s()}function i(a,r){r=e.util.findError(arguments);try{l.req.readyState="done",l.req.error=r||"DOMError",l.req.result=void 0;var n=e.util.createEvent("error",r);e.util.callback("onerror",l.req,n)}finally{t(r)}}function s(){if(u>=r.__requests.length)r.__requests=[],r.__active&&(r.__active=!1,a());else try{l=r.__requests[u],l.op(n,l.args,o,i)}catch(e){i(e)}}r.__tx=n;var l=null,u=0;s()},t)},t.prototype.__createRequest=function(){var t=new e.IDBRequest;return t.source=this.db,t.transaction=this,t},t.prototype.__addToTransactionQueue=function(e,t){var a=this.__createRequest();return this.__pushToQueue(a,e,t),a},t.prototype.__pushToQueue=function(e,t,a){this.__assertActive(),this.__requests.push({op:t,args:a,req:e})},t.prototype.__assertActive=function(){if(!this.__active)throw e.util.createDOMException("TransactionInactiveError","A request was placed against a transaction which is currently not active, or which is finished")},t.prototype.__assertWritable=function(){if(this.mode===t.READ_ONLY)throw e.util.createDOMException("ReadOnlyError","The transaction is read only")},t.prototype.__assertVersionChange=function(){t.__assertVersionChange(this)},t.__assertVersionChange=function(a){if(!a||a.mode!==t.VERSION_CHANGE)throw e.util.createDOMException("InvalidStateError","Not a version transaction")},t.prototype.objectStore=function(a){if(0===arguments.length)throw new TypeError("No object store name was specified");if(!this.__active)throw e.util.createDOMException("InvalidStateError","A request was placed against a transaction which is currently not active, or which is finished");if(-1===this.__storeNames.indexOf(a)&&this.mode!==t.VERSION_CHANGE)throw e.util.createDOMException("NotFoundError",a+" is not participating in this transaction");var r=this.db.__objectStores[a];if(!r)throw e.util.createDOMException("NotFoundError",a+" does not exist in "+this.db.name);return e.IDBObjectStore.__clone(r,this)},t.prototype.abort=function(){var t=this;e.DEBUG&&console.log("The transaction was aborted",t),t.__active=!1;var a=e.util.createEvent("abort");setTimeout(function(){e.util.callback("onabort",t,a)},0)},t.READ_ONLY="readonly",t.READ_WRITE="readwrite",t.VERSION_CHANGE="versionchange",e.IDBTransaction=t}(idbModules),function(e){"use strict";function t(t,a,r,n){this.__db=t,this.__closed=!1,this.version=r,this.name=a,this.onabort=this.onerror=this.onversionchange=null,this.__objectStores={},this.objectStoreNames=new e.util.StringList;for(var o=0;o=o||t>o){var u=e.util.createDOMError("VersionError","An attempt was made to open a database using a lower version than the existing version.",o);return void i(u)}s.transaction(function(n){n.executeSql("CREATE TABLE IF NOT EXISTS __sys__ (name VARCHAR(255), keyPath VARCHAR(255), autoInc BOOLEAN, indexList BLOB)",[],function(){n.executeSql("SELECT * FROM __sys__",[],function(n,u){var c=e.util.createEvent("success");l.source=l.result=new e.IDBDatabase(s,a,o,u),o>t?r.transaction(function(r){r.executeSql("UPDATE dbVersions set version = ? where name = ?",[o,a],function(){var a=e.util.createEvent("upgradeneeded");a.oldVersion=t,a.newVersion=o,l.transaction=l.result.__versionTransaction=new e.IDBTransaction(l.source,[],e.IDBTransaction.VERSION_CHANGE),l.transaction.__addToTransactionQueue(function(t,r,n){e.util.callback("onupgradeneeded",l,a),n()}),l.transaction.__oncomplete=function(){l.transaction=null;var t=e.util.createEvent("success");e.util.callback("onsuccess",l,t)}},i)},i):e.util.callback("onsuccess",l,c)},i)},i)},i)}var l=new e.IDBOpenDBRequest,u=!1;if(0===arguments.length)throw new TypeError("Database name is required");if(2===arguments.length&&(o=parseFloat(o),isNaN(o)||!isFinite(o)||0>=o))throw new TypeError("Invalid database version: "+o);return a+="",t(function(){r.transaction(function(e){e.executeSql("SELECT * FROM dbVersions where name = ?",[a],function(e,t){0===t.rows.length?e.executeSql("INSERT INTO dbVersions VALUES (?,?)",[a,o||1],function(){s(0)},i):s(t.rows.item(0).version)},i)},i)},i),l},a.prototype.deleteDatabase=function(a){function o(t,a){if(!l){a=e.util.findError(arguments),s.readyState="done",s.error=a||"DOMError";var r=e.util.createEvent("error");r.debug=arguments,e.util.callback("onerror",s,r),l=!0}}function i(){r.transaction(function(t){t.executeSql("DELETE FROM dbVersions where name = ? ",[a],function(){s.result=void 0;var t=e.util.createEvent("success");t.newVersion=null,t.oldVersion=u,e.util.callback("onsuccess",s,t)},o)},o)}var s=new e.IDBOpenDBRequest,l=!1,u=null;if(0===arguments.length)throw new TypeError("Database name is required");return a+="",t(function(){r.transaction(function(t){t.executeSql("SELECT * FROM dbVersions where name = ?",[a],function(t,r){if(0===r.rows.length){s.result=void 0;var l=e.util.createEvent("success");return l.newVersion=null,l.oldVersion=u,void e.util.callback("onsuccess",s,l)}u=r.rows.item(0).version;var c=window.openDatabase(a,1,a,n);c.transaction(function(t){t.executeSql("SELECT * FROM __sys__",[],function(t,a){var r=a.rows;!function n(a){a>=r.length?t.executeSql("DROP TABLE IF EXISTS __sys__",[],function(){i()},o):t.executeSql("DROP TABLE "+e.util.quote(r.item(a).name),[],function(){n(a+1)},function(){n(a+1)})}(0)},function(e){i()})})},o)},o)},o),s},a.prototype.cmp=function(t,a){if(arguments.length<2)throw new TypeError("You must provide two keys to be compared");e.Key.validate(t),e.Key.validate(a);var r=e.Key.encode(t),n=e.Key.encode(a),o=r>n?1:r===n?0:-1;if(e.DEBUG){var i=e.Key.decode(r),s=e.Key.decode(n);"object"==typeof t&&(t=JSON.stringify(t),i=JSON.stringify(i)),"object"==typeof a&&(a=JSON.stringify(a),s=JSON.stringify(s)),i!==t&&console.warn(t+" was incorrectly encoded as "+i),s!==a&&console.warn(a+" was incorrectly encoded as "+s)}return o},e.shimIndexedDB=new a,e.IDBFactory=a}(idbModules),function(e,t){"use strict";function a(t,a){try{e[t]=a}catch(r){}if(e[t]!==a&&Object.defineProperty){try{Object.defineProperty(e,t,{value:a})}catch(r){}e[t]!==a&&e.console&&console.warn&&console.warn("Unable to shim "+t)}}a("shimIndexedDB",t.shimIndexedDB),e.shimIndexedDB&&(e.shimIndexedDB.__useShim=function(){"undefined"!=typeof e.openDatabase?(a("indexedDB",t.shimIndexedDB),a("IDBFactory",t.IDBFactory),a("IDBDatabase",t.IDBDatabase),a("IDBObjectStore",t.IDBObjectStore),a("IDBIndex",t.IDBIndex),a("IDBTransaction",t.IDBTransaction),a("IDBCursor",t.IDBCursor),a("IDBKeyRange",t.IDBKeyRange),a("IDBRequest",t.IDBRequest),a("IDBOpenDBRequest",t.IDBOpenDBRequest),a("IDBVersionChangeEvent",t.IDBVersionChangeEvent)):"object"==typeof e.indexedDB&&t.polyfill()},e.shimIndexedDB.__debug=function(e){t.DEBUG=e}),"indexedDB"in e||(e.indexedDB=e.indexedDB||e.webkitIndexedDB||e.mozIndexedDB||e.oIndexedDB||e.msIndexedDB);var r=!1;if((navigator.userAgent.match(/Android 2/)||navigator.userAgent.match(/Android 3/)||navigator.userAgent.match(/Android 4\.[0-3]/))&&(navigator.userAgent.match(/Chrome/)||(r=!0)),"undefined"!=typeof e.indexedDB&&e.indexedDB&&!r||"undefined"==typeof e.openDatabase){ e.IDBDatabase=e.IDBDatabase||e.webkitIDBDatabase,e.IDBTransaction=e.IDBTransaction||e.webkitIDBTransaction,e.IDBCursor=e.IDBCursor||e.webkitIDBCursor,e.IDBKeyRange=e.IDBKeyRange||e.webkitIDBKeyRange,e.IDBTransaction||(e.IDBTransaction={});try{e.IDBTransaction.READ_ONLY=e.IDBTransaction.READ_ONLY||"readonly",e.IDBTransaction.READ_WRITE=e.IDBTransaction.READ_WRITE||"readwrite"}catch(n){}}else e.shimIndexedDB.__useShim()}(window,idbModules)},function(e,t,a){function r(e){return a(n(e))}function n(e){return o[e]||function(){throw new Error("Cannot find module '"+e+"'.")}()}var o={"./Roboto-Bold.eot":179,"./Roboto-Bold.svg":180,"./Roboto-Bold.ttf":181,"./Roboto-Bold.woff":182,"./Roboto-Light.eot":183,"./Roboto-Light.svg":184,"./Roboto-Light.ttf":185,"./Roboto-Light.woff":186,"./Roboto-Regular.eot":187,"./Roboto-Regular.svg":188,"./Roboto-Regular.ttf":189,"./Roboto-Regular.woff":190,"./RobotoCondensed-Regular.eot":191,"./RobotoCondensed-Regular.svg":192,"./RobotoCondensed-Regular.ttf":193,"./RobotoCondensed-Regular.woff":194};r.keys=function(){return Object.keys(o)},r.resolve=n,e.exports=r,r.id=178},function(e,t,a){e.exports=a.p+"fonts/Roboto-Bold.eot?f2560085ffa6e6ef89f689dcd7e76de5"},function(e,t,a){e.exports=a.p+"fonts/Roboto-Bold.svg?5691d36c5c2e0f39d60882cec833d526"},function(e,t,a){e.exports=a.p+"fonts/Roboto-Bold.ttf?98e7cf4c382f271d821aed5b72c8a01f"},function(e,t,a){e.exports=a.p+"fonts/Roboto-Bold.woff?5c761f3bdd9e9d80466973275663785c"},function(e,t,a){e.exports=a.p+"fonts/Roboto-Light.eot?1801e86a898eab25899daa4cdccbe9dc"},function(e,t,a){e.exports=a.p+"fonts/Roboto-Light.svg?5691d36c5c2e0f39d60882cec833d526"},function(e,t,a){e.exports=a.p+"fonts/Roboto-Light.ttf?6190cbf23a93f3c145de3ee7b55460fa"},function(e,t,a){e.exports=a.p+"fonts/Roboto-Light.woff?405782143d67122bc25413bf23966d62"},function(e,t,a){e.exports=a.p+"fonts/Roboto-Regular.eot?01f3aa219c5b8e487d083790e4e123ab"},function(e,t,a){e.exports=a.p+"fonts/Roboto-Regular.svg?5691d36c5c2e0f39d60882cec833d526"},function(e,t,a){e.exports=a.p+"fonts/Roboto-Regular.ttf?dab605765566d58fc063a486ac820b05"},function(e,t,a){e.exports=a.p+"fonts/Roboto-Regular.woff?e9415d2d7178ec455c06bad7f0853ed7"},function(e,t,a){e.exports=a.p+"fonts/RobotoCondensed-Regular.eot?198e8ae47771146b02d44052dbed8fed"},function(e,t,a){e.exports=a.p+"fonts/RobotoCondensed-Regular.svg?5691d36c5c2e0f39d60882cec833d526"},function(e,t,a){e.exports=a.p+"fonts/RobotoCondensed-Regular.ttf?0949b22f1374bf6c927ea08a4067e1b7"},function(e,t,a){e.exports=a.p+"fonts/RobotoCondensed-Regular.woff?38bed6d05764bc1161f71eda65144af7"},function(e,t,a){"use strict";function r(e){return e&&e.__esModule?e:{"default":e}}function n(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var i=function(){function e(e,t){for(var a=0;a",t,t.stack),e.setState({loading:!1})})}},{key:"_onNotificationChange",value:function(){var e=Ve["default"].getState().notification;void 0===e.autoDismiss&&(e.autoDismiss=10),this.refs.notificationSystem.addNotification(e)}},{key:"render",value:function(){var e=u["default"].createElement("div",{className:"grid-frame vertical"},u["default"].createElement(L["default"],{isUnlocked:this.state.isUnlocked}),u["default"].createElement(qe["default"],{isUnlocked:this.state.isUnlocked,id:"mobile-menu"}),u["default"].createElement(Ue["default"],null),u["default"].createElement("div",{className:"grid-block vertical"},u["default"].createElement(yt,null)),u["default"].createElement(U["default"],null),u["default"].createElement(ft["default"],{type:"dark",effect:"solid"}));return this.state.loading&&(e=u["default"].createElement(Ne["default"],null)),u["default"].createElement("div",null,e,u["default"].createElement(We["default"],{ref:"notificationSystem",allowHTML:!0}),u["default"].createElement(Ie["default"],null),u["default"].createElement(Le["default"],null))}}]),t}(u["default"].Component);bt.willTransitionTo=function(e,t,a,r){Je["default"].init_instance(window.openDatabase?shimIndexedDB||indexedDB:indexedDB).init_promise.then(function(){it["default"].loadDbData().then(function(){it["default"].getWallet()||"/create-account"===e.path||e.redirect("/create-account"),r()})["catch"](function(e){console.error("[App.jsx:172] ----- WalletDb.loadDbData error ----->",e)})})};var vt=u["default"].createElement(ht,{handler:bt},u["default"].createElement(ht,{name:"dashboard",path:"/dashboard",handler:y["default"]}),u["default"].createElement(ht,{name:"explorer",path:"/explorer",handler:b["default"]}),u["default"].createElement(ht,{name:"blocks",path:"/explorer/blocks",handler:w["default"]}),u["default"].createElement(ht,{name:"assets",path:"/explorer/assets",handler:k["default"]}),u["default"].createElement(ht,{name:"accounts2",path:"/explorer/accounts2",handler:x["default"]}),u["default"].createElement(ht,{name:"accounts",path:"/explorer/accounts",handler:O["default"]}),u["default"].createElement(ht,{name:"witnesses",path:"/explorer/witnesses",handler:S["default"]},u["default"].createElement(gt,{handler:P["default"]}),u["default"].createElement(ht,{name:"witness",path:":name",handler:B["default"]})),u["default"].createElement(ht,{name:"delegates",path:"/explorer/delegates",handler:q["default"]},u["default"].createElement(gt,{handler:N["default"]}),u["default"].createElement(ht,{name:"delegate",path:":name",handler:I["default"]})),u["default"].createElement(ht,{name:"wallet",path:"wallet",handler:et["default"]}),u["default"].createElement(ht,{name:"create-wallet",path:"create-wallet",handler:at["default"]}),u["default"].createElement(ht,{name:"console",path:"console",handler:ct["default"]}),u["default"].createElement(ht,{name:"transfer",path:"transfer",handler:fe["default"]}),u["default"].createElement(ht,{name:"invoice",path:"invoice/:data",handler:mt["default"]}),u["default"].createElement(ht,{name:"markets",path:"markets",handler:ce["default"]}),u["default"].createElement(ht,{name:"exchange",path:"exchange/trade/:marketID",handler:le["default"]}),u["default"].createElement(ht,{name:"settings",path:"settings",handler:me["default"]}),u["default"].createElement(ht,{name:"block",path:"block/:height",handler:ye["default"]}),u["default"].createElement(ht,{name:"asset",path:"asset/:symbol",handler:be["default"]}),u["default"].createElement(ht,{name:"tx",path:"tx",handler:we["default"]}),u["default"].createElement(ht,{name:"create-account",path:"create-account",handler:ke["default"]}),u["default"].createElement(ht,{name:"existing-account",path:"existing-account",handler:Qe["default"]}),u["default"].createElement(ht,{name:"import-keys",path:"import-keys",handler:nt["default"]}),u["default"].createElement(ht,{name:"account",path:"/account/:account_name",handler:W["default"]},u["default"].createElement(ht,{name:"account-overview",path:"overview",handler:V["default"]}),u["default"].createElement(ht,{name:"account-assets",path:"user-assets",handler:$["default"]}),u["default"].createElement(ht,{name:"account-member-stats",path:"member-stats",handler:J["default"]}),u["default"].createElement(ht,{name:"account-history",path:"history",handler:Q["default"]}),u["default"].createElement(ht,{name:"account-payees",path:"payees",handler:ee["default"]}),u["default"].createElement(ht,{name:"account-permissions",path:"permissions",handler:ae["default"]}),u["default"].createElement(ht,{name:"account-voting",path:"voting",handler:ne["default"]}),u["default"].createElement(ht,{name:"account-orders",path:"orders",handler:ie["default"]}),u["default"].createElement(gt,{handler:V["default"]})),u["default"].createElement(gt,{handler:y["default"]}));d["default"].run(vt,function(e){u["default"].render(u["default"].createElement(e,null),document.getElementById("content"))})},,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,function(e,t,a){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function n(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}var o=function(){function e(e,t){for(var a=0;an;n++)r[n]=arguments[n];r.forEach(function(a){if(!e[a])throw new Error("BaseStore._export: method '"+a+"' not found in "+e.__proto__._storeName);e[a]=e[a].bind(e),t[a]=e[a]}),this.exportPublicMethods(t)}}]),e}();t["default"]=n,e.exports=t["default"]},function(e,t,a){"use strict";function r(e){return e&&e.__esModule?e:{"default":e}}Object.defineProperty(t,"__esModule",{value:!0});var n=a(407),o=r(n);t["default"]=o["default"],e.exports=t["default"]},,,,,,,,,,,,,,,function(e,t){"use strict";e.exports={languages:{en:"English",cn:"简体中文",fr:"Français",ko:"한국어",de:"Deutsch"},header:{title:"Graphene UI",dashboard:"Dashboard",explorer:"Explorer",exchange:"Exchange",payments:"Transfer",logout:"Logout",settings:"Settings",current:"Current Account"},account:{asset:"Asset",market_value:"Market Value",hour_24:"24hr Change",recent:"Recent activity",name:"Account name",more:"see more",member:{stats:"Member stats",join:"Joined on",reg:"Registered by",ref:"Referred by",ref_percentage:"Referrer fee percentage",network_percentage:"Network fee percentage",fees_paid:"Lifetime fees paid",fees_pending:"Pending fees",fees_vested:"Pending vested fees",in_orders:"Total %(core_asset)s in orders",referrals:"Referrals",rewards:"Cashback Rewards",cashback:"Cashback",vested:"Vested"},user_issued_assets:{symbol:"Symbol",name:"Asset Name",description:"Description",max_supply:"Maximum supply",precision:"Precision",to:"Issue to account"},connections:{known:"Known by",black:"Blacklisted by"},perm:{active:"Active Permissions",owner:"Owner Permissions",publish:"Publish Changes",reset:"Reset Changes",add:"Add Permission",type:"Type",key:"Key/Name",weight:"Weight",threshold:"Threshold",confirm_add:"Add",cancel:"Cancel"},votes:{proxy:"Proxy Voting Account",no_proxy:"No Proxy",name:"Name",info:"Info",votes:"Votes",url:"Webpage",support:"Support",workers:"Budget Items",publish:"Publish Changes",add_witness:"Add",remove_witness:"Remove",remove_committee:"Remove",add_committee:"Add",add_committee_label:"Committee Member",add_witness_label:"Witness"},options:{num_witnesses:"Desired Witnesses",num_committee:"Desired Committee Members",memo_key:"Memo Key"},upgrade:"Upgrade account",unlink:"Unlink",link:"Link",pay:"Pay",overview:"Overview",history:"History",payees:"Payees",permissions:"Permissions",voting:"Voting",orders:"Orders",select_placeholder:"Select Account...",errors:{not_found:"The account %(name)s does not exist, are you sure you spelled it correctly?"}},pagination:{newer:"Newer",older:"Older"},transfer:{from:"From",amount:"Amount",to:"To",memo:"Memo",fee:"Fee",send:"Send","final":"Final balance",balances:"Balances",available:"Available: ",errors:{req:"Required field",pos:"Amount must be positive",valid:"Please enter a valid, positive number",balance:"The final balance must be larger than 0"},back:"BACK",confirm:"CONFIRM",broadcasting:"Broadcasting...",broadcast:"Your transfer has been broadcast to the network",again:"MAKE ANOTHER TRANSFER",see:"SEE MY TRANSFERS"},transaction:{confirm:"Please confirm the transaction",broadcast_success:"Transaction has been broadcast",broadcast_fail:"Failed to broadcast the transaction: %(message)s",sent:"Sent",to:"to",received:"Received",from:"from",amount_sell:"Amount to sell",expiration:"Expiration",fill_or:"Fill or kill",min_receive:"Minimum amount to receive",seller:"Seller",collateral:"Collateral",coll_ratio:"Initial collateral ratio",coll_maint:"Collateral maintenance ratio",create_key:"Created a public key",reg_account:"Registered the account",was_reg_account:"registered by",create_asset:"Created the asset",limit_order_sell:"Placed limit order to sell %(sell_amount)s at %(sell_price)s",limit_order_buy:"Placed limit order to buy %(buy_amount)s at %(buy_price)s",limit_order_cancel:"Cancelled limit order with id",short_order:"Placed short order to sell",short_order_cancel:"Cancelled short with id",at:"at",coll_of:"with collateral of",call_order_update:"Updated call order",upgrade_account:"Upgraded the account to lifetime member",update_account:"Updated account",whitelist_account:"Whitelisted the account",whitelisted_by:"Was whitelisted by the account",transfer_account:"Transferred the account",update_asset:"Updated the asset",update_feed_producers:"Updated the feed producers of asset",feed_producer:"Became a feed producer for the asset",asset_issue:"Issued",was_issued:"Was issued",by:"by",burn_asset:"Burnt",fund_pool:"Funded asset fee pool with",asset_settle:"Requested settlement of",asset_global_settle:"Requested global settlement of",publish_feed:"Published new feed for asset",delegate_create:"Created the delegate",witness_create:"Created the witness",witness_pay:"Withdrew witness pay to account",witness_receive:"Received witness from witness",proposal_create:"Created a proposal",proposal_update:"Updated a proposal",proposal_delete:"Deleted a proposal",withdraw_permission_create:"Gave withdrawal permission for account",withdraw_permission_update:"Updated withdrawal permission for account",withdraw_permission_claim:"Claimed withdrawal permission for account",withdraw_permission_delete:"Deleted withdrawal permissions for account",paid:"Paid",obtain:"to obtain",global_parameters_update:"Updated global parameters",file_write:"Wrote a file",vesting_balance_create:"created vesting balance of","for":"for",vesting_balance_withdraw:"Withdrew vesting balance of",bond_create_offer:"Created bond offer",bond_cancel_offer:"Cancelled bond offer",bond_accept_offer:"Accepted bond offer of",bond_claim_collateral:"Claimed collateral of",bond_pay_collateral:"Paid collateral of",create_worker:"Created a budget item with a pay of",custom:"Created a custom operation",order_id:"Order ID",balance_claim:"Claimed a balance of %(balance_amount)s from balance ID #%(balance_id)s",balance_owner:"Balance owner key",balance_id:"Balance ID",deposit_to:"Deposited to account",claimed:"Total claimed",trxTypes:{transfer:"Transfer",limit_order_create:"Limit order",limit_order_cancel:"Cancel limit order",call_order_update:"Update call order",account_create:"Create account",account_update:"Account update",account_whitelist:"Account whitelist",account_upgrade:"Account upgrade",account_transfer:"Account transfer",asset_create:"Create asset",asset_update:"Update asset",asset_update_bitasset:"Update SmartCoin",asset_update_feed_producers:"Update asset feed producers",asset_issue:"Issue asset",asset_reserve:"Burn asset",asset_fund_fee_pool:"Fund asset fee pool",asset_settle:"Asset settlement",asset_global_settle:"Global asset settlement",asset_publish_feed:"Publish asset feed",delegate_create:"Create delegate",witness_create:"Create witness",witness_withdraw_pay:"Witness pay withdrawal",proposal_create:"Create proposal",proposal_update:"Update proposal",proposal_delete:"Delete proposal",withdraw_permission_create:"Create withdrawal permission",withdraw_permission_update:"Update withdrawal permission",withdraw_permission_claim:"Claim withdrawal permission",withdraw_permission_delete:"Delete withdrawal permission",fill_order:"Fill order",delegate_update_global_parameters:"Global parameters update",vesting_balance_create:"Create vesting balance",vesting_balance_withdraw:"Withdraw vesting balance",worker_create:"Create budget item",custom:"Custom",assert:"Assert operation",balance_claim:"Claim balance",override_transfer:"Override transfer"}},explorer:{accounts:{title:"Accounts"},blocks:{title:"Blockchain",globals:"Global parameters",recent:"Recent blocks"},block:{title:"Block",id:"Block ID",witness:"Witness",count:"Transaction count",date:"Date",previous:"Previous",previous_secret:"Previous secret",next_secret:"Next secret hash",op:"Operation",trx:"Transaction",op_type:"Operation type",fee_payer:"Fee paying account",key:"Public key",transactions:"Transaction count",account_upgrade:"Account to upgrade",lifetime:"Upgrade to lifetime member",authorizing_account:"Authorizing account",listed_account:"Listed account",new_listing:"New listing",asset_update:"Asset to update",common_options:"Common options",new_options:"New options",new_producers:"New feed producers",asset_issue:"Amount to issue",max_margin_period_sec:"Max margin period (s)",call_limit:"Call limit",short_limit:"Short limit",settlement_price:"Settlement price"},assets:{title:"Assets",market:"SmartCoins",user:"User Issued Assets",symbol:"Symbol",id:"ID",issuer:"Issuer",precision:"Precision"},asset:{title:"Asset",not_found:"The asset %(name)s does not exist"},witnesses:{title:"Witnesses"},delegates:{title:"Delegates"},delegate:{title:"Delegate"},workers:{title:"Budget Items"},proposals:{title:"Proposals"},account:{title:"Account"}},settings:{inverseMarket:"Market orientation preference",unit:"Preferred unit of account",confirmMarketOrder:"Ask for confirmation of market orders",locale:"Switch language",confirm_yes:"Always",confirm_no:"Never",always_confirm:"Always ask for confirmation"},footer:{title:"Graphene",block:"Head block",loading:"Loading..."},exchange:{price_history:"Price History",order_depth:"Order Depth",market_history:"Market History",balance:"Balance",total:"Total",value:"Value",price:"Price",latest:"Latest Price",call:"Call Price",volume:"Volume",spread:"Spread",quantity:"Quantity",buy:"Buy",sell:"Sell",confirm_buy:"Confirm order: Buy %(buy_amount)s %(buy_symbol)s at a price of %(price_amount)s %(price_symbol)s",confirm_sell:"Confirm order: Sell %(sell_amount)s %(sell_symbol)s at a price of %(price_amount)s %(price_symbol)s"},markets:{choose_base:"Choose base asset",filter:"Filter",core_rate:"Core rate",supply:"Supply",search:"Search"}}},function(e,t,a){function r(e){return a(n(e))}function n(e){return o[e]||function(){throw new Error("Cannot find module '"+e+"'.")}()}var o={"./locale-cn":423,"./locale-cn.js":423,"./locale-de":424,"./locale-de.js":424,"./locale-en":421,"./locale-en.js":421,"./locale-fr":425,"./locale-fr.js":425,"./locale-ko":426,"./locale-ko.js":426};r.keys=function(){return Object.keys(o)},r.resolve=n,e.exports=r,r.id=422},function(e,t){"use strict";e.exports={languages:{en:"English",cn:"简体中文",fr:"Français",ko:"한국어",de:"Deutsch"},header:{title:"比特股 2.0",dashboard:"概览",explorer:"浏览",exchange:"交易",payments:"支付",logout:"注销",settings:"设置",current:"当前账户"},account:{assets:"资产",value:"价值",hour_24:"24小时",recent:"近期活动",name:"账户名",member:{stats:"会员统计",join:"加入于",reg:"注册人",ref:"推荐人",referrals:"被推荐人",rewards:"返现奖励",cashback:"返现",vested:"既得"},connections:{known:"Known by",black:"被屏蔽"}},transfer:{from:"来自",amount:"金额",to:"发往",memo:"备注消息",fee:"手续费",send:"发送","final":"转账后余额",balances:"余额",errors:{req:"必填信息",pos:"数量必须大于0",valid:"请输入一个合法的大于0的半角数字"},back:"返回",confirm:"确认发送",broadcast:"你的转账已经向网络广播",again:"发起新的转账",see:"查看我的转账记录"},transaction:{sent:"已发送",to:"发往",received:"已接收",from:"来自",amount_sell:"出售数量",expiration:"过期时间",fill_or:"成交或取消",min_receive:"接收的最小数量",seller:"卖家",collateral:"抵押",coll_ratio:"初始抵押率",coll_maint:"Collateral maintenance ratio",create_key:"创建一个公钥",reg_account:"注册账户",was_reg_account:"注册人",create_asset:"Created the asset",limit_order:"限价出售单",limit_order_buy:"限价买入单",limit_order_cancel:"已取消的限价单",short_order:"空单",short_order_cancel:"已取消的空单Cancelled short with id",at:"at",coll_of:"抵押为",call_order_update:"Updated call order",upgrade_account:"升级到终身会员账户",update_account:"Updated account",whitelist_account:"Whitelisted the account",whitelisted_by:"Was whitelisted by the account",transfer_account:"Transferred the account",update_asset:"Updated the asset",update_feed_producers:"Updated the feed producers of asset",feed_producer:"Became a feed producer for the asset",asset_issue:"Issued",was_issued:"Was issued",by:"by",burn_asset:"Burnt",fund_pool:"Funded asset fee pool with",asset_settle:"Requested settlement of",asset_global_settle:"Requested global settlement of",publish_feed:"Published new feed for asset",delegate_create:"Created the delegate",witness_create:"Created the witness",witness_pay:"Withdrew witness pay to account",witness_receive:"Received witness from witness",proposal_create:"Created a proposal",proposal_update:"Updated a proposal",proposal_delete:"Deleted a proposal",withdraw_permission_create:"Gave withdrawal permission for account",withdraw_permission_update:"Updated withdrawal permission for account",withdraw_permission_claim:"Claimed withdrawal permission for account",withdraw_permission_delete:"Deleted withdrawal permissions for account",paid:"Paid",obtain:"to obtain",global_parameters_update:"Updated global parameters",file_write:"Wrote a file",vesting_balance_create:"created vesting balance of","for":"for",vesting_balance_withdraw:"Withdrew vesting balance of",bond_create_offer:"Created bond offer",bond_cancel_offer:"Cancelled bond offer",bond_accept_offer:"Accepted bond offer of",bond_claim_collateral:"Claimed collateral of",bond_pay_collateral:"Paid collateral of",create_worker:"Created a worker with a pay of",custom:"Created a custom operation",order_id:"Order ID",trxTypes:{transfer:"转账",limit_order_create:"限价单",limit_order_cancel:"取消限价单",call_order_update:"Update call order",account_create:"创建账户",account_update:"更新账户",account_whitelist:"Account whitelist",account_upgrade:"升级账户",account_transfer:"账户转移",asset_create:"创建资产",asset_update:"更新资产",asset_update_bitasset:"更新智能币",asset_update_feed_producers:"更新资产喂价者",asset_issue:"发行资产",asset_reserve:"销毁资产",asset_fund_fee_pool:"积存资产费用池",asset_settle:"资产结算",asset_global_settle:"Global asset settlement",asset_publish_feed:"发布资产喂价",delegate_create:"创建受托人",witness_create:"创建见证人",witness_withdraw_pay:"见证人取回报酬",proposal_create:"创建提案",proposal_update:"更新提案",proposal_delete:"删除提案",withdraw_permission_create:"创建取回权限",withdraw_permission_update:"更新取回权限",withdraw_permission_claim:"Claim withdrawal permission",withdraw_permission_delete:"删除取回权限",fill_order:"撮合订单",delegate_update_global_parameters:"全局参数更新",vesting_balance_create:"创建冻结账目余额",vesting_balance_withdraw:"取回解冻账户余额",worker_create:"创建雇员",custom:"自定义",assert:"Assert operation",balance_claim:"Claim balance",override_transfer:"Override transfer"}},explorer:{accounts:{title:"账户"},blocks:{title:"区块链",globals:"全局参数",recent:"最近区块"},block:{title:"区块",id:"区块 ID",witness:"见证人",count:"交易数",date:"日期",previous:"上一个",previous_secret:"上一个密文",next_secret:"下一个密文哈希值",op:"操作",trx:"交易",op_type:"操作类型",fee_payer:"手续费支付账户",key:"公钥",transactions:"交易数量",account_upgrade:"可升级账户",lifetime:"升级到终身会员账户",authorizing_account:"授权账户",listed_account:"Listed account",new_listing:"New listing",asset_update:"可更新资产",common_options:"Common options",new_options:"New options",new_producers:"New feed producers",asset_issue:"发行数量",max_margin_period_sec:"Max margin period (s)",call_limit:"Call limit",short_limit:"Short limit",settlement_price:"结算价格"},assets:{title:"资产",market:"智能币",user:"用户发行资产",symbol:"代码",id:"ID",issuer:"发行人",precision:"精度"},asset:{title:"资产"},witnesses:{title:"见证人"},delegates:{title:"受托人"},delegate:{title:"受托人"},workers:{title:"雇员"},proposals:{title:"提案"},account:{title:"账户"}},settings:{inverseMarket:"市场交易对视角",unit:"显示记账单位",confirmMarketOrder:"Ask for confirmation of market orders",locale:"语言选择",confirm_yes:"Always",confirm_no:"Never",always_confirm:"Always ask for confirmation"}}},function(e,t){"use strict";e.exports={languages:{en:"English",cn:"简体中文",fr:"Français",ko:"한국어",de:"Deutsch"},header:{title:"Graphene UI",dashboard:"Hauptseite",explorer:"Explorer",exchange:"Börse",payments:"Transaktionen",logout:"Abmeldung",settings:"Einstellungen",current:"Aktives Konto"},account:{asset:"Asset",market_value:"Marktwert",hour_24:"24hr Wechsel",recent:"Letzte Aktivität",name:"Konto Name",more:"mehr",member:{stats:"Mitgliederstatistiken",join:"Beitritt am",reg:"Registriert von",ref:"Empfohlen von",ref_percentage:"Prozent für Werbenden",network_percentage:"Prozent für Netzwerk",fees_paid:"Ingesamt bezahlte Gebühren",fees_pending:"Anstehende Gebühren",fees_vested:"Anstehnde Gebühren in Sperrfristguthaben",in_orders:"Insgesamt %(core_asset)s in Anweisungen",referrals:"Empfehlungen",rewards:"Belohnungen",cashback:"Skonto",vested:"Zugesichert"},user_issued_assets:{symbol:"Symbol",name:"Asset Name",description:"Beschreibung",max_supply:"Maximale Verfügbarkeit",precision:"Genauigkeit",to:"An Konto emittieren"},connections:{known:"Bekannt von",black:"Schwarzgelistet von"},perm:{active:"Aktive Berechitigungen",owner:"Eigentümer Berechtigungen",publish:"Änderungen veröffentlichen",reset:"Zurücksetzen",add:"Berechtigung hinzufügen",type:"Typ",key:"Schlüssel/Name",weight:"Gewicht",threshold:"Schwellwert",confirm_add:"Hinzufügen",cancel:"Abbrechen"},votes:{proxy:"Abstimmkonto vermitteln",name:"Name",info:"Info",support:"Support",workers:"Budgetpunkte"},upgrade:"Konto erweitern",unlink:"Trennen",link:"Verdinden",pay:"Bezahlen",overview:"Übersicht",history:"Historie",payees:"Empfänger",permissions:"Berechitigungen",voting:"Abstimmung",orders:"Anweisungen",select_placeholder:"Konto auswählen...",errors:{not_found:"Das Konto %(name)s existiert nicht. Bitte prüfgen Sie die Schreibweise!"}},pagination:{newer:"Jüngere",older:"Ältere"},transfer:{from:"Von",amount:"Betrag",to:"Zu",memo:"Memo",fee:"Gebühr",send:"Senden","final":"Abschließendes Guthaben",balances:"Guthaben",errors:{req:"Plfichtfeld",pos:"Betrag darf nicht negativ sein",valid:"Bitte geben Sie einen positiven Betrag ein",balance:"Ihr abschließendes Guthaben kann nicht negativ sein!"},back:"ZURÜCK",confirm:"BESTÄTIGEN",broadcast:"Deine Überweisung wurde gesendet",again:"WEITERE ÜBERWEISUNG",see:"ÜBERWEISUNGSÜBERSICHT"},transaction:{confirm:"Bitte bestätigen Sie die Transaktion",broadcast_success:"Transaktion wurde übermittelt",broadcast_fail:"Bei der Übermittlung der Transaction ist ein Fehler aufgetreten: %(message)s",sent:"Gesendet",to:"an",received:"Empfangen",from:"von",amount_sell:"Betrag",expiration:"Frist",fill_or:"sofortige Ausführung oder Annullierung",min_receive:"Mindestbetrag", -seller:"Verkäufer",collateral:"Sicherheit/Pfand",coll_ratio:"Anfängliche Sicherheit (Verhältnis)",coll_maint:"Unterhalt der Sicherheit (Verhältnis)",create_key:"Ein öffentlicher Schlüssel wurde erzeugt",reg_account:"Ein Konto wurde angelegt",was_reg_account:"registriert von",create_asset:"Neuen Asset erstellen",limit_order:"Limit-Order für den Verkauf platziert",limit_order_buy:"Limit-Order für den Ankauf platziert",limit_order_cancel:"Limit-Order abgebrochen. ID:",short_order:"Short-Order für Verkauf platziert",short_order_cancel:"Short-Order abgebrochen. ID:",at:"für",coll_of:"mit einer Sicherheit bestehend aus",call_order_update:"Call-Order aktualisiert",upgrade_account:"Kontostatus auf Lifetime Member aktualisiert.",update_account:"Konto aktualisiert",whitelist_account:"Konto zur Positivliste hinzugefügt",whitelisted_by:"Wurde zur Postitivliste hinzugefügt von Konto",transfer_account:"Das Konto wurde übertragen",update_asset:"Das Asset wurde aktualisiert",update_feed_producers:"Die Liste der Feed-Erzeuger wurde aktualisiert",feed_producer:"Werde Feed-Erzeuger für ein Asset",asset_issue:"Emittiert",was_issued:"Wurde emittiert",by:"von",burn_asset:"Vernichtet",fund_pool:"Asset-Gebührenpool finanziert mit",asset_settle:"Settlement erbeten für",asset_global_settle:"Globales Settlement erbeten für",publish_feed:"Neuer Feed wurde publiziert für Asset",delegate_create:"Neuer Delegate wurde angelegt",witness_create:"Neuer Witness wurde angelegt",witness_pay:"Witnesslohn ausgezahlt an Konto",witness_receive:"Received witness from witness",proposal_create:"Ein Vorschlag wurde erzeugt",proposal_update:"Ein Vorschlag wurde aktualisiert",proposal_delete:"Ein Vorschlag wurde gelöscht",withdraw_permission_create:"Einzugsermächtigung wurde verliegen an Konto",withdraw_permission_update:"Einzugsermächtigung wurde aktualisiert für Konto",withdraw_permission_claim:"Einzugsermächtigung wurde eingefordert für Konto",withdraw_permission_delete:"Einzugsermächtigung wurde aufgehoben für Konto",paid:"Bezahlt",obtain:"zu erhalten",global_parameters_update:"Globale Parameter aktualisiert",file_write:"Eine Datei wurde geschrieben",vesting_balance_create:"Ein Sperrfristguthaben wurde erzeugt","for":"für",vesting_balance_withdraw:"Sperrfristguthaben wurde abgehoben",bond_create_offer:"Ein Bondangebot wurde erstellt",bond_cancel_offer:"Ein Bondangebot wurde abgebrochen",bond_accept_offer:"Ein Bondangebot wurde akzeptiert",bond_claim_collateral:"Eine Sicherheit wurde eingefordert",bond_pay_collateral:"Eine Sicherheit wurde bezahlt",create_worker:"Ein Budgetpunkt wurde erzeugt. Bezahlung",custom:"Eine benutzerdefinierte Operation wurde definiert",order_id:"Anweisungskennung (ID)",balance_claim:"Guthaben von %(balance_amount)s der Guthabenskennung (ID) #%(balance_id)s wurde beansprucht",balance_owner:"Schlüssel des Guthabeneigentümers",balance_id:"Guthabenskennung (ID)",deposit_to:"Dem Konto gutgeschrieben",claimed:"Ingesamt beantsprucht",trxTypes:{transfer:"Überweisung",limit_order_create:"Limit-Order",limit_order_cancel:"Limit-Order abbrechen",call_order_update:"Call-Order aktualisieren",account_create:"Konto erstellen",account_update:"Kontoaktualisierung",account_whitelist:"Konto Positivliste",account_upgrade:"Konto Upgrade",account_transfer:"Konto Überweisung",asset_create:"Asset erstellen",asset_update:"Asset aktualisieren",asset_update_bitasset:"SmartCoin aktualisieren",asset_update_feed_producers:"Asset Feederzeuger aktualisieren",asset_issue:"Asset emittieren",asset_reserve:"Assetanteile vernichten",asset_fund_fee_pool:"Asset Gebührenpool finanzieren",asset_settle:"Asset Settlement",asset_global_settle:"Globales Asset Settlement",asset_publish_feed:"Asset Feed publiszieren",delegate_create:"Delegate erstellen",witness_create:"Witness erstellen",witness_withdraw_pay:"Witnesslohn ausbezahlen",proposal_create:"Proposal erstellen",proposal_update:"Proposal aktualisieren",proposal_delete:"Proposal löschen",withdraw_permission_create:"Einzugsermächtigung erstellen",withdraw_permission_update:"Einzugsermächtigung aktualisiert",withdraw_permission_claim:"Einzugsermächtigung eingefordert",withdraw_permission_delete:"Einzugsermächtigung aufgehoben",fill_order:"Order ausgeführt",delegate_update_global_parameters:"Globale Parameters aktualisiert",vesting_balance_create:"Sperrfristguthaben erstellt",vesting_balance_withdraw:"Sperrfristguthaben eingefordert",worker_create:"Budgetpunkt erstellt",custom:"benutzerdefiniert",assert:"Assert Pperation",balance_claim:"Guthaben eingefordert",override_transfer:"Transaktion überschreiben"}},explorer:{accounts:{title:"Konten"},blocks:{title:"Blockchain",globals:"Globale Einstellungen",recent:"Letzte Blöcke"},block:{title:"Block",id:"Block ID",witness:"Witness",count:"Transaktionszähler",date:"Datum",previous:"Vorherige",previous_secret:"Vorheriges Geheimnis",next_secret:"Hash des nächsten Geheimnisses",op:"Aktion",trx:"Transaktion",op_type:"Aktionstyp",fee_payer:"Gebührenkonto",key:"Öffentlicher Schlüssel",transactions:"Anzahl der Transaktionen",account_upgrade:"Kontoerweiterung",lifetime:"Lebenslanges Mitglied werden",authorizing_account:"Kontovollmacht",listed_account:"Kontenübersicht",new_listing:"Neuer Eintrag",asset_update:"zu aktualisierender Asset",common_options:"Common Optionen",new_options:"New Option",new_producers:"Neue Feederzeuger",asset_issue:"Zu emittierender Betrag",max_margin_period_sec:"Max Margin Periode (s)",call_limit:"Call-Limit",short_limit:"Short-Limit",settlement_price:"Settlement-Preis"},assets:{title:"Assets",market:"SmartCoins",user:"User Issued Assets",symbol:"Symbol",id:"ID",issuer:"Herausgeber",precision:"Genauigkeit"},asset:{title:"Asset",not_found:"Das Asset %(name)s existiert nicht"},witnesses:{title:"Witnesses"},delegates:{title:"Delegates"},delegate:{title:"Delegate"},workers:{title:"Budgetpunkte"},proposals:{title:"Vorschlag"},account:{title:"Konto"}},settings:{inverseMarket:"Bevorzugte Marktorientierung",unit:"Bevorzugte Rechnungseinheit",confirmMarketOrder:"Nach Bestätigung für Marktanweisungen fragen",locale:"Sprache wechseln",confirm_yes:"Immer",confirm_no:"Nie",always_confirm:"Für jede Transaction nach Bestätigung fragen"},footer:{title:"Graphene",block:"Spitzenblock"},exchange:{price_history:"Preisverlauf",order_depth:"Ordertiefe",market_history:"Marktverlauf",balance:"Guthaben",total:"Ingesammt",value:"Wert",price:"Preis",latest:"Letzer Preis",call:"Call Preis",volume:"Volumen",spread:"Spread",quantity:"Quantität",buy:"Kaufen",sell:"Verkaufen",confirm_buy:"Bestätigen Sie die Anweisung: Kauf von %(buy_amount)s %(buy_symbol)s zum Preis von %(price_amount)s %(price_symbol)s",confirm_sell:"Bestätigen Sie die Anweisung: Verkauf von %(sell_amount)s %(sell_symbol)s zum Preis von %(price_amount)s %(price_symbol)s"},markets:{choose_base:"Wählen Sie Ihre Grundwährung (base)",filter:"Filter",core_rate:"Kernrate:",supply:"Verfügbarkeit"}}},function(e,t){"use strict";e.exports={languages:{en:"English",cn:"简体中文",fr:"Français",ko:"한국어",de:"Deutsch"},header:{title:"Graphene",dashboard:"Accueil",explorer:"Explorer",exchange:"Échange",payments:"Paiments",logout:"Déconnexion",settings:"Options",current:"Mon Compte"},account:{asset:"Actif",market_value:"Valeur",hour_24:"24hrs",recent:"Activité recent",name:"Nom du compte",more:"voir plus",member:{stats:"Stats membre",join:"Inscription",reg:"Enregistré par",ref:"Recruté par",ref_percentage:"Pourcentage de frais pour le recruteur",network_percentage:"Pourcentage de frais pour le reseau",fees_paid:"Frais payé",fees_pending:"Frais en attente",fees_vested:"Frais en attente bloqué",in_orders:"Total de %(core_asset)s en ordres",referrals:"Recrutements",rewards:"Gains totaux",cashback:"Gagné",vested:"Bloqué"},connections:{known:"Connu par",black:"Blacklisté par"},perm:{active:"Permissions actifs",owner:"Permissions de proprietaire",publish:"Publier les changements",reset:"Annuler les changements",add:"Rajouter une permission",type:"Type",key:"Cléf/Nom",weight:"Poids",threshold:"Limite",confirm_add:"Rajouter",cancel:"Annuler"},votes:{proxy:"Proxy Voting Account",name:"Nom",info:"Info",support:"Support",workers:"Ouvriers"},upgrade:"Mettre à niveau",unlink:"Délier",link:"Lier",pay:"Payer",overview:"Sommaire",history:"Historique",payees:"Payees",permissions:"Permissions",voting:"Votes",orders:"Ordres",select_placeholder:"Selectionnez un compte..",errors:{not_found:"Le compte %(name)s n'existe pas, veuillez vérifier le nom"}},transfer:{from:"De",amount:"Montant",to:"À",memo:"Message",fee:"Frais",send:"Envoyer","final":"Soldes finaux",balances:"Soldes",errors:{req:"Champ obligatoire",pos:"Le montant doit étre positif",valid:"Veuillez rentrer un chiffre positif",balance:"Le solde final doit être superieur à 0"},back:"REVENIR",confirm:"CONFIRMER",broadcast:"Votre transfert a bien été soumis au reseau",again:"FAIRE UN AUTRE TRANSFERT",see:"VOIRE MES TRANSFERTS"},transaction:{sent:"A envoyé",to:"à",received:"A reçu",from:"de",amount_sell:"Montant à vendre",expiration:"Expiration",fill_or:"Fill or kill",min_receive:"Montant minimum à recevoir",seller:"Vendeur",collateral:"Collateral",coll_ratio:"Ratio de collateral initiale",coll_maint:"Ratio de Collateral de maintenance",create_key:"A créé une cléf public",reg_account:"A créé le compte",was_reg_account:" a été créé par",create_asset:"A créé l'actif",limit_order:"A placé un ordre à limite pour vendre",limit_order_buy:"A placé un ordre à limite pour acheter",limit_order_cancel:"Annulation de l'ordre à limite avec id",short_order:"A placé un ordre à découvert pour vendre",at:"à",coll_of:"avec collateral de",call_order_update:"A mis à jour un ordre à découvert",upgrade_account:"A mis à niveau le compte",update_account:"A mis à jour le compte",whitelist_account:"A whitelisté le compte",whitelisted_by:"A été whitelisté par le compte",transfer_account:"A transferé le compte",update_asset:"A mis à jour l'actif",update_feed_producers:"A mis à jour les fornisseurs de flux de l'actif",feed_producer:"Est devenu un fornisseur de flux pour l'actif",asset_issue:"A assigné",was_issued:"A été assigné",by:"par",burn_asset:"A détruit",fund_pool:"A financé un pot de frais avec",asset_settle:"Requested settlement of",asset_global_settle:"Requested global settlement of",publish_feed:"A publié un nouveau flux pour l'actif",delegate_create:"A créé le délégué",witness_create:"A créé le témoin",witness_pay:"A retiré",proposal_create:"A créé une proposition",proposal_update:"A mis à jour une proposition",proposal_delete:"A supprimé une proposition",withdraw_permission_create:"A donné une permission de retrait du compte",withdraw_permission_update:"A mis à jour les permissions de retrait du compte",withdraw_permission_claim:"A pris les permissions de retrait du compte",withdraw_permission_delete:"A supprimé les permissions de retrait du compte",paid:"A payé",obtain:"pour obtenir",global_parameters_update:"A mis à jour les parametres globaux",file_write:"A écrit un fichier",vesting_balance_create:"a créé un solde bloqué pour","for":"pour",vesting_balance_withdraw:"A retiré du solde bloqué",bond_create_offer:"A créé une offre d'obligation",bond_cancel_offer:"A annulé l'offre d'obligation",bond_accept_offer:"A accepté l'offre d'obligation pour",bond_claim_collateral:"A récuperé un collateral de",bond_pay_collateral:"A payé un collateral de",create_worker:"A créé un ouvrier avec un salaire de",custom:"A créé une operation spéciale",order_id:"ID de l'ordre",balance_claim:"A recuperé un solde de %(balance_amount)s du solde ID #%(balance_id)s",balance_owner:"Clèf du solde",balance_id:"ID du solde",deposit_to:"Versé sur le compte",claimed:"Total recuperé",trxTypes:{transfer:"Transfert",limit_order_create:"Ordre à limite",limit_order_cancel:"Annulation d'ordre à limite",call_order_update:"Mise à jour d'ordre à découvert",account_create:"Création de compte",account_update:"Mise à jour de compte",account_whitelist:"Whiteliste de compte",account_upgrade:"Mise à niveau de compte",account_transfer:"Transfert de compte",asset_create:"Creation d'actif",asset_update:"Mise à jour d'actif",asset_update_bitasset:"Mise à jour d'actif de marché",asset_update_feed_producers:"Mise à jour des flux",asset_issue:"Assigner d'un actif",asset_reserve:"Destruction d'actif",asset_fund_fee_pool:"Financement de pot de frais",asset_settle:"Couvrement d'actif",asset_global_settle:"Couvrement global d'actif",asset_publish_feed:"Publication de flux",delegate_create:"Création de délégué",witness_create:"Création de témoin",witness_withdraw_pay:"Retrait de salaire de témoin",proposal_create:"Création d'une proposition",proposal_update:"Mise à jour d'une proposition",proposal_delete:"Suppresion d'une proposition",withdraw_permission_create:"Accord de permission de retrait",withdraw_permission_update:"Mise à jour de permission de retrait",withdraw_permission_claim:"Prise de permissions de retrait",withdraw_permission_delete:"Suppresion des permissions de retrait",fill_order:"Remplissage d'ordre",delegate_update_global_parameters:"Mise à jour des parametres globaux",vesting_balance_create:"Création de solde bloqué",vesting_balance_withdraw:"Retrait de solde bloqué",worker_create:"Création d'ouvrier",custom:"Spécial",assert:"Assert operation",balance_claim:"Récuperation de solde",override_transfer:"Forcing de transfert"}},explorer:{accounts:{title:"Comptes"},blocks:{title:"Blockchain",globals:"Parametres globaux",recent:"Blocs recent"},block:{title:"Bloc",id:"ID du bloc",witness:"Témoin",count:"Nombre de transactions",date:"Date",previous:"Précédent",previous_secret:"Précédent secret",next_secret:"Prochain hash secret",op:"Operation",trx:"Transaction",op_type:"Type d'operation",fee_payer:"Compte payant le frai",key:"Cléf public",transactions:"Nombre de transactions",account_upgrade:"Compte à mettre à niveau",lifetime:"Devenir membre à vie",authorizing_account:"Compte donnant l'autorisation",listed_account:"Compte etant autorisé",new_listing:"Nouvel autorisation",asset_update:"Actif à mettre à jour",common_options:"Options",new_options:"Nouvelles options",new_producers:"Nouveaux fornisseurs de flux",asset_issue:"Montant à créer",max_margin_period_sec:"Periode max de marge (s)",call_limit:"Limite de couverture",short_limit:"Limite de short",settlement_price:"Prix de règlement"},assets:{title:"Actifs",market:"SmartCoins",user:"Actifs des utilisateurs",symbol:"Symbol",id:"ID",issuer:"Créateur",precision:"Précision"},asset:{title:"Actif",not_found:"L'actif %(name)s n'existe pas"},witnesses:{title:"Témoins"},delegates:{title:"Délégués"},delegate:{title:"Delegate"},workers:{title:"Ouvriers"},proposals:{title:"Propositions"},account:{title:"Compte"}},settings:{inverseMarket:"Orientation préféré pour les marchés",unit:"Unité de valeur préféré",confirmMarketOrder:"Demander une confirmation pour des ordres du marché",locale:"Changer de langue",confirm_yes:"Toujours",confirm_no:"Jamais",always_confirm:"Toujours demander une confirmation"},footer:{title:"Graphene",block:"Bloc courant"},exchange:{price_history:"Historique du prix",order_depth:"Carnet d'ordres",market_history:"Historique du marché",balance:"Solde",total:"Total",value:"Valeur",price:"Prix",latest:"Dernier Prix",call:"Prix de flux",volume:"Volume",spread:"Spread",quantity:"Quantité",buy:"Acheter",sell:"Vendre",confirm_buy:"Confirmation d'ordre: Acheter %(buy_amount)s %(buy_symbol)s au prix de %(price_amount)s %(price_symbol)s",confirm_sell:"Confirmation d'ordre: Vendre %(sell_amount)s %(sell_symbol)s au prix de %(price_amount)s %(price_symbol)s"},markets:{choose_base:"Selectionner l'actif de base",filter:"Filtrer",core_rate:"Taux de base",supply:"Réserve",search:"Chercher"}}},function(e,t){"use strict";e.exports={languages:{en:"English",cn:"简体中文",fr:"Français",ko:"한국어",de:"Deutsch"},header:{title:"그래핀 UI",dashboard:"대시보드",explorer:"탐색기",exchange:"거래소",payments:"전송",logout:"로그아웃",settings:"설정",current:"현재 계정"},account:{asset:"자산",market_value:"시장가치",hour_24:"24시간 변동액",recent:"최근 활동",name:"계정명",member:{stats:"회원 정보",join:"가입일",reg:"Registered by",ref:"Referred by",referrals:"Referrals",rewards:"Cashback Rewards",cashback:"캐쉬백",vested:"Vested"},connections:{known:"Known by",black:"Blacklisted by"}},transfer:{from:"보내는 사람",amount:"금액",to:"받는 사람",memo:"메모",fee:"수수료",send:"전송","final":"전송 후 잔고",balances:"잔고",errors:{req:"필수 입력",pos:"금액은 양수를 입력해주세요",valid:"유효한 값을 입력해주세요"},back:"뒤로가기",confirm:"확인",broadcast:"전송요청이 네트워크에 전파되었습니다",again:"전송요청 추가",see:"전송내역 보기"},transaction:{sent:"전송됨",to:"받는 사람",received:"수신됨",from:"보낸 사람",amount_sell:"판매 금액",expiration:"만기",fill_or:"Fill or kill",min_receive:"Minimum amount to receive",seller:"판매자",collateral:"담보",coll_ratio:"초기 담보 비율",coll_maint:"담보 유지 비율",create_key:"공개키 생성",reg_account:"계정 등록",was_reg_account:"registered by",create_asset:"자산 생성",limit_order:"매도주문 요청",limit_order_buy:"매수주문 요청",limit_order_cancel:"주문 취소",short_order:"공매도주문 요청",short_order_cancel:"공매도 취소",at:"at",coll_of:"with collateral of",call_order_update:"콜 주문 업데이트",upgrade_account:"평생회원으로 업그레이드",update_account:"계정 업데이트",whitelist_account:"계정을 화이트리스트에 추가",whitelisted_by:"화이트리스트에 추가됨",transfer_account:"계정 이전",update_asset:"자산 업데이트",update_feed_producers:"Updated the feed producers of asset",feed_producer:"자산에 대한 가격정보 제공자로 추가됨",asset_issue:"발행",was_issued:"발행됨",by:"by",burn_asset:"소각",fund_pool:"자산 수수료 기금을 충전",asset_settle:"다음 자산에 대한 강제청산을 요청",asset_global_settle:"전체 자산 강제청산을 요청",publish_feed:"자산에 대한 가격정보를 발행",delegate_create:"대표자 생성",witness_create:"증인 생성",witness_pay:"증인 봉급을 다음 계정으로 인출",witness_receive:"Received witness from witness",proposal_create:"제안서를 생성",proposal_update:"제안서를 업데이트",proposal_delete:"제안서를 삭제",withdraw_permission_create:"다음 계정에 출금 권한을 부여",withdraw_permission_update:"다음 계정의 출금 권한을 업데이트",withdraw_permission_claim:"다음 계정에 출금 권한을 요청",withdraw_permission_delete:"다음 계정에 출금 권한을 삭제",paid:"지불됨",obtain:"to obtain",global_parameters_update:"전체 매개변수를 업데이트",file_write:"파일 쓰기",vesting_balance_create:"created vesting balance of","for":"for",vesting_balance_withdraw:"Withdrew vesting balance of",bond_create_offer:"Created bond offer",bond_cancel_offer:"Cancelled bond offer",bond_accept_offer:"Accepted bond offer of",bond_claim_collateral:"Claimed collateral of",bond_pay_collateral:"Paid collateral of",create_worker:"Created a worker with a pay of",custom:"Created a custom operation",order_id:"주문 ID",trxTypes:{transfer:"전송",limit_order_create:"주문",limit_order_cancel:"주문 취소",call_order_update:"Update call order",account_create:"계정 생성",account_update:"계정 업데이트",account_whitelist:"계정 화이트리스트",account_upgrade:"계정 업그레이드",account_transfer:"계정 거래",asset_create:"자산 생성",asset_update:"자산 업데이트",asset_update_bitasset:"스마트코인 업데이트",asset_update_feed_producers:"자산 피드 생성자 업데이트",asset_issue:"자산 발행",asset_reserve:"자산 소각",asset_fund_fee_pool:"자산 수수료 기금 충전",asset_settle:"자산 강제청산",asset_global_settle:"자산 전체 강제청산",asset_publish_feed:"자산 가격정보 발행",delegate_create:"대표자 생성",witness_create:"증인 생성",witness_withdraw_pay:"증인 봉급 인출",proposal_create:"제안서 생성",proposal_update:"제안서 업데이트",proposal_delete:"제안서 삭제",withdraw_permission_create:"출금권한 생성",withdraw_permission_update:"출금권한 업데이트",withdraw_permission_claim:"출금권한 요청",withdraw_permission_delete:"출금권한 삭제",fill_order:"매매 체결",delegate_update_global_parameters:"전체 매개변수 업데이트",vesting_balance_create:"Create vesting balance",vesting_balance_withdraw:"Withdraw vesting balance",worker_create:"직원 생성",custom:"사용자 정의",assert:"Assert operation",balance_claim:"Claim balance",override_transfer:"Override transfer"}},explorer:{accounts:{title:"계정"},blocks:{title:"블록체인",globals:"Global parameters",recent:"최근 블록"},block:{title:"블록",id:"블록 ID",witness:"증인",count:"거래 수",date:"일시",previous:"이전",previous_secret:"이전 비밀해쉬",next_secret:"다음 비밀해쉬",op:"Operation",trx:"거래",op_type:"Operation type",fee_payer:"수수료 지불 계정",key:"공개키",transactions:"거래 수",account_upgrade:"업그레이드할 계정",lifetime:"평생회원으로 업그레이드",authorizing_account:"계정 인증",listed_account:"Listed account",new_listing:"New listing",asset_update:"업데이트할 자산",common_options:"Common options",new_options:"New options",new_producers:"새로운 가격정보 발행자",asset_issue:"발행량",max_margin_period_sec:"Max margin period (s)",call_limit:"콜 한도",short_limit:"공매도 한도",settlement_price:"강제청산 가격"},assets:{title:"자산",market:"스마트코인",user:"사용자 자산",symbol:"기호",id:"ID",issuer:"발행자",precision:"소수 자리수"},asset:{title:"자산"},witnesses:{title:"증인"},delegates:{title:"대표자"},delegate:{title:"대표자"},workers:{title:"직원"},proposals:{title:"제안서"},account:{title:"계정"}},settings:{inverseMarket:"선호 거래단위",unit:"선호 화폐단위",confirmMarketOrder:"Ask for confirmation of market orders",locale:"언어 전환",confirm_yes:"Always",confirm_no:"Never",always_confirm:"Always ask for confirmation"}}},function(e,t,a){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var n,o=function(){function e(e,t){for(var a=0;a"),e.ws_rpc.login("","").then(function(){e._db_api.init(),e._network_api.init(),e._history_api.init()})},Promise.all([t,e._network_api.init(),e._history_api.init()])}))}},{key:"close",value:function(){this.ws_rpc.close(),this.ws_rpc=null}},{key:"db_api",value:function(){return this._db_api}},{key:"network_api",value:function(){return this._network_api}},{key:"history_api",value:function(){return this._history_api}}]),e}();e.exports={instance:function(){return n||(n=new l),n.connect(),n}}},function(e,t,a){(function(t){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var n=function(){function e(e,t){for(var a=0;a id:",this.current_callback_id+1,e),this.current_callback_id+=1;var t=this;if(("subscribe_to_objects"===e[1]||"subscribe_to_market"===e[1]||"broadcast_transaction_with_callback"===e[1])&&(t.subscriptions[t.current_callback_id]={callback:e[2][0],params:o.fromJS(e[2][1])},e[2][0]=this.current_callback_id),"get_full_accounts"===e[1]){var a=e[2][1][0],r=!1;for(var n in t.subscriptions)if(t.subscriptions[n].account&&t.subscriptions[n].account===a){r=!0,e[2][0]=n;break}r||(t.subscriptions[t.current_callback_id]={callback:e[2][0].bind(a),account:a,params:o.fromJS(e[2][1])},e[2][0]=t.current_callback_id)}if("unsubscribe_from_objects"===e[1]||"unsubscribe_from_market"===e[1]||"unsubscribe_from_accounts"===e[1]){var s=o.fromJS(e[2][0]);for(var l in t.subscriptions)if(o.is(t.subscriptions[l].params,s)){t.unsub[this.current_callback_id]=l;break}}var u={method:"call",params:e};return u.id=this.current_callback_id,new Promise(function(e,a){t.callbacks[t.current_callback_id]={time:new Date,resolve:e,reject:a},t.web_socket.onerror=function(e){console.log("!!! WebSocket Error ",e),a(e)},t.web_socket.send(JSON.stringify(u))})}},{key:"listener",value:function(e){i&&console.log("[websocketrpc] <--- reply ----",e);var t=!1,a=null;"notice"===e.method&&(t=!0,e.id=e.params[0]),a=t?this.subscriptions[e.id].callback:this.callbacks[e.id],a&&!t?(e.error?a.reject(e.error):a.resolve(e.result),delete this.callbacks[e.id],this.unsub[e.id]&&(delete this.subscriptions[this.unsub[e.id]],delete this.unsub[e.id])):a&&t?a(e.params[1]):console.log("Warning: unknown websocket response: ",e)}},{key:"login",value:function(e,t){var a=this;return this.connect_promise.then(function(){return a.call([1,"login",[e,t]])})}},{key:"close",value:function(){this.web_socket.close()}}]),e}();e.exports=s}).call(t,a(175))},586,function(e,t,a){var r,n,o;!function(a,i){n=[],r=i,o="function"==typeof r?r.apply(t,n):r,!(void 0!==o&&(e.exports=o))}(this,function(){function e(t,a,r){function n(e,t){var a=document.createEvent("CustomEvent");return a.initCustomEvent(e,!1,!1,t),a}var o={debug:!1,automaticOpen:!0,reconnectInterval:1e3,maxReconnectInterval:3e4,reconnectDecay:1.5,timeoutInterval:2e3,maxReconnectAttempts:null,binaryType:"blob"};r||(r={});for(var i in o)"undefined"!=typeof r[i]?this[i]=r[i]:this[i]=o[i];this.url=t,this.reconnectAttempts=0,this.readyState=WebSocket.CONNECTING,this.protocol=null;var s,l=this,u=!1,c=!1,d=document.createElement("div");d.addEventListener("open",function(e){l.onopen(e)}),d.addEventListener("close",function(e){l.onclose(e)}),d.addEventListener("connecting",function(e){l.onconnecting(e)}),d.addEventListener("message",function(e){l.onmessage(e)}),d.addEventListener("error",function(e){l.onerror(e)}),this.addEventListener=d.addEventListener.bind(d),this.removeEventListener=d.removeEventListener.bind(d),this.dispatchEvent=d.dispatchEvent.bind(d),this.open=function(t){if(s=new WebSocket(l.url,a||[]),s.binaryType=this.binaryType,t){if(this.maxReconnectAttempts&&this.reconnectAttempts>this.maxReconnectAttempts)return}else d.dispatchEvent(n("connecting")),this.reconnectAttempts=0;(l.debug||e.debugAll)&&console.debug("ReconnectingWebSocket","attempt-connect",l.url);var r=s,o=setTimeout(function(){(l.debug||e.debugAll)&&console.debug("ReconnectingWebSocket","connection-timeout",l.url),c=!0,r.close(),c=!1},l.timeoutInterval);s.onopen=function(a){clearTimeout(o),(l.debug||e.debugAll)&&console.debug("ReconnectingWebSocket","onopen",l.url),l.protocol=s.protocol,l.readyState=WebSocket.OPEN,l.reconnectAttempts=0;var r=n("open");r.isReconnect=t,t=!1,d.dispatchEvent(r)},s.onclose=function(a){if(clearTimeout(o),s=null,u)l.readyState=WebSocket.CLOSED,d.dispatchEvent(n("close"));else{l.readyState=WebSocket.CONNECTING;var r=n("connecting");r.code=a.code,r.reason=a.reason,r.wasClean=a.wasClean,d.dispatchEvent(r),t||c||((l.debug||e.debugAll)&&console.debug("ReconnectingWebSocket","onclose",l.url),d.dispatchEvent(n("close")));var o=l.reconnectInterval*Math.pow(l.reconnectDecay,l.reconnectAttempts);setTimeout(function(){l.reconnectAttempts++,l.open(!0)},o>l.maxReconnectInterval?l.maxReconnectInterval:o)}},s.onmessage=function(t){(l.debug||e.debugAll)&&console.debug("ReconnectingWebSocket","onmessage",l.url,t.data);var a=n("message");a.data=t.data,d.dispatchEvent(a)},s.onerror=function(t){(l.debug||e.debugAll)&&console.debug("ReconnectingWebSocket","onerror",l.url,t),d.dispatchEvent(n("error"))}},1==this.automaticOpen&&this.open(!1),this.send=function(t){if(s)return(l.debug||e.debugAll)&&console.debug("ReconnectingWebSocket","send",l.url,t),s.send(t);throw"INVALID_STATE_ERR : Pausing to reconnect websocket"},this.close=function(e,t){"undefined"==typeof e&&(e=1e3),u=!0,s&&s.close(e,t)},this.refresh=function(){s&&s.close()}}if("WebSocket"in window)return e.prototype.onopen=function(e){},e.prototype.onclose=function(e){},e.prototype.onconnecting=function(e){},e.prototype.onmessage=function(e){},e.prototype.onerror=function(e){},e.debugAll=!1,e.CONNECTING=WebSocket.CONNECTING,e.OPEN=WebSocket.OPEN,e.CLOSING=WebSocket.CLOSING,e.CLOSED=WebSocket.CLOSED,e})},function(e,t,a){function r(e,t){var a;return a=t?new o(e,t):new o(e)}var n=function(){return this}(),o=n.WebSocket||n.MozWebSocket;e.exports={w3cwebsocket:o?r:null,version:a(432)}},function(e,t,a){e.exports=a(433).version},function(e,t){e.exports={name:"websocket",description:"Websocket Client & Server Library implementing the WebSocket protocol as specified in RFC 6455.",keywords:["websocket","websockets","socket","networking","comet","push","RFC-6455","realtime","server","client"],author:{name:"Brian McKelvey",email:"brian@worlize.com",url:"https://www.worlize.com/"},contributors:[{name:"Iñaki Baz Castillo",email:"ibc@aliax.net",url:"http://dev.sipdoc.net"}],version:"1.0.21",repository:{type:"git",url:"git+https://github.com/theturtle32/WebSocket-Node.git"},homepage:"https://github.com/theturtle32/WebSocket-Node",engines:{node:">=0.8.0"},dependencies:{debug:"~2.2.0",nan:"~1.8.x","typedarray-to-buffer":"~3.0.3",yaeti:"~0.0.4"},devDependencies:{"buffer-equal":"^0.0.1",faucet:"^0.0.1",gulp:"git+https://github.com/gulpjs/gulp.git#4.0","gulp-jshint":"^1.11.2","jshint-stylish":"^1.0.2",tape:"^4.0.1"},config:{verbose:!1},scripts:{install:"(node-gyp rebuild 2> builderror.log) || (exit 0)",test:"faucet test/unit",gulp:"gulp"},main:"index",directories:{lib:"./lib"},browser:"lib/browser.js",license:"Apache-2.0",gitHead:"8f5d5f3ef3d946324fe016d525893546ff6500e1",bugs:{url:"https://github.com/theturtle32/WebSocket-Node/issues"},_id:"websocket@1.0.21",_shasum:"f51f0a96ed19629af39922470ab591907f1c5bd9",_from:"websocket@>=1.0.18 <2.0.0",_npmVersion:"2.12.1",_nodeVersion:"2.3.4",_npmUser:{name:"theturtle32",email:"brian@worlize.com"},maintainers:[{name:"theturtle32",email:"brian@worlize.com"}],dist:{shasum:"f51f0a96ed19629af39922470ab591907f1c5bd9",tarball:"http://registry.npmjs.org/websocket/-/websocket-1.0.21.tgz"},_resolved:"https://registry.npmjs.org/websocket/-/websocket-1.0.21.tgz"}},function(e,t){"use strict";function a(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var r=function(){function e(e,t){for(var a=0;a0?e.forEach(function(e){t.push({amount:parseInt(e.balance,10),asset_id:e.asset_type})}):t=[{amount:0,asset_id:"1.3.0"}],t}if(null===e.fullAccount)return this.cachedAccounts=this.cachedAccounts.set(e.name,{notFound:!0}),!0;var a=e.fullAccount,r=a.account,n=a.vesting_balances,o=a.statistics,i=a.call_orders,s=a.limit_orders,l=a.referrer_name,u=a.registrar_name,c=a.lifetime_referrer_name;if(e.sub){if(e.history_updates){var d=this.accountHistories.get(e.account_name),f=!0,p=!1,m=void 0;try{for(var h,g=e.history_updates[Symbol.iterator]();!(f=(h=g.next()).done);f=!0){var b=h.value;d.unshift(b)}}catch(v){p=!0,m=v}finally{try{!f&&g["return"]&&g["return"]()}finally{if(p)throw m}}this.accountHistories=this.accountHistories.set(e.account_name,d)}if(e.balance_updates){for(var w=this.balances.get(e.account_name),_=t(e.balance_updates),k=0;k<_.length;k++)for(var E=0;E0)this.setCurrentAccount(this.linkedAccounts.first());else{var e=this.cachedAccounts.first();e&&"nathan"===e.name&&"GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV"===e.owner.key_auths[0][0]&&this.setCurrentAccount("nathan")}}},{key:"setCurrentAccount",value:function(e){e?this.currentAccount={name:e,id:this.account_name_to_id[e]}:this.currentAccount=null}},{key:"onSetCurrentAccount",value:function(e){this.setCurrentAccount(e)}},{key:"onTransfer",value:function(e){}},{key:"onAddAccount",value:function(e){this.onCreateAccount(e)}},{key:"onCreateAccount",value:function(e){var t=this,a=e;if("string"==typeof a&&(a={name:a}),a.toJS&&(a=a.toJS()),!k["default"].is_account_name(a.name))throw new Error("Invalid account name: "+a.name);b["default"].add_to_store("linked_accounts",a).then(function(){console.log("[AccountStore.js] ----- Added account to store: ----->",name),t.linkedAccounts=t.linkedAccounts.add(a.name),1===t.linkedAccounts.size&&t.setCurrentAccount(a.name)})}},{key:"onUpgradeAccount",value:function(e){console.log("[AccountStore.js] ----- onUpgradeAccount ----->",e)}},{key:"onLinkAccount",value:function(e){b["default"].add_to_store("linked_accounts",{name:e}),this.linkedAccounts=this.linkedAccounts.add(e),1===this.linkedAccounts.size&&this.setCurrentAccount(e)}},{key:"onUnlinkAccount",value:function(e){b["default"].remove_from_store("linked_accounts",e),this.linkedAccounts=this.linkedAccounts.remove(e),0===this.linkedAccounts.size&&this.setCurrentAccount(null)}},{key:"onTransactUpdateAccount",value:function(e){console.log("[AccountStore.js:154] ----- onTransactUpdateAccount ----->",e)}},{key:"onChange",value:function(){}}]),t}(u["default"]);e.exports=p["default"].createStore(E,"AccountStore")},function(e,t,a){"use strict";function r(e){return e&&e.__esModule?e:{"default":e}}function n(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var o=function(){function e(e,t){for(var a=0;a",c),new Promise(function(e,t){t(c)})}return u}},{key:"addAccount",value:function(e){this.dispatch(e)}},{key:"createAccount",value:function(e,t,a){var r=this,n=arguments.length<=3||void 0===arguments[3]?100:arguments[3];return g["default"].createBrainKeyAccount(e,t,a,n).then(function(){return r.dispatch(e),e})}},{key:"upgradeAccount",value:function(e){var t=_.new_transaction();return t.add_type_operation("account_upgrade",{fee:{amount:0,asset_id:0},account_to_upgrade:e,upgrade_to_lifetime_member:!0}),h["default"].process_transaction(t,null,!0)}},{key:"linkAccount",value:function(e){this.dispatch(e)}},{key:"unlinkAccount",value:function(e){this.dispatch(e)}},{key:"change",value:function(){this.dispatch()}}]),e}();e.exports=s["default"].createActions(E)},function(e,t,a){"use strict";var r=a(439),n=a(440),o=/\b\d+\.\d+\.(\d+)\b/,i={get_object_id:function(e){var t=o.exec(e);return t?Number.parseInt(t[1]):0},is_object_id:function(e){if("string"!=typeof e)return!1;var t=o.exec(e);return null!==t&&3===e.split(".").length},get_asset_precision:function(e){return Math.pow(10,e)},get_asset_amount:function(e,t){return e/this.get_asset_precision(t.precision)},get_asset_price:function(e,t,a,r){return this.get_asset_amount(e,t)/this.get_asset_amount(a,r)},format_number:function(e,t){for(var a=".",r=0;t>r;r++)a+="0";return n(e).format("0,0"+a)},format_asset:function(e,t,a){var r=this.get_asset_precision(t.precision);return""+this.format_number(e/r,t.precision)+(a?"":" "+t.symbol)},format_price:function(e,t,a,r,n,o){var i=this.get_asset_precision(t.precision),s=this.get_asset_precision(r.precision);return o?parseInt(t.id.split(".")[2],10)parseInt(r.id.split(".")[2],10)?""+this.format_number(e/i/(a/s),Math.max(5,t.precision))+(n?"":" "+t.symbol+"/"+r.symbol):""+this.format_number(a/s/(e/i),Math.max(5,r.precision))+(n?"":" "+r.symbol+"/"+t.symbol)},get_op_type:function(e){var t=parseInt(e.split(".")[1],10);for(var a in r.object_type)if(r.object_type[a]===t)return a}};e.exports=i},function(e,t){var a;e.exports=a={},a.reserved_spaces={relative_protocol_ids:0,protocol_ids:1,implementation_ids:2},a.object_type={"null":0,base:1,account:2,asset:3,force_settlement:4,committee_member:5,witness:6,limit_order:7,call_order:8,custom:9,proposal:10,operation_history:11,withdraw_permission:12,vesting_balance:13,worker:14,balance:15},a.vote_type={committee:0,witness:1,worker:2},a.operations={transfer:0,limit_order_create:1,limit_order_cancel:2,call_order_update:3,fill_order:4,account_create:5,account_update:6,account_whitelist:7,account_upgrade:8,account_transfer:9,asset_create:10,asset_update:11,asset_update_bitasset:12,asset_update_feed_producers:13,asset_issue:14,asset_reserve:15,asset_fund_fee_pool:16,asset_settle:17,asset_global_settle:18,asset_publish_feed:19,witness_create:20,proposal_create:21,proposal_update:22,proposal_delete:23,withdraw_permission_create:24,withdraw_permission_update:25,withdraw_permission_claim:26,withdraw_permission_delete:27,committee_member_create:28,committee_member_update_global_parameters:29,vesting_balance_create:30,vesting_balance_withdraw:31,worker_create:32,custom:33,assert:34,balance_claim:35,override_transfer:36,transfer_to_blind:37,blind_transfer:38,transfer_from_blind:39}},function(e,t,a){var r,n;/*! +seller:"Verkäufer",collateral:"Sicherheit/Pfand",coll_ratio:"Anfängliche Sicherheit (Verhältnis)",coll_maint:"Unterhalt der Sicherheit (Verhältnis)",create_key:"Ein öffentlicher Schlüssel wurde erzeugt",reg_account:"Ein Konto wurde angelegt",was_reg_account:"registriert von",create_asset:"Neuen Asset erstellen",limit_order:"Limit-Order für den Verkauf platziert",limit_order_buy:"Limit-Order für den Ankauf platziert",limit_order_cancel:"Limit-Order abgebrochen. ID:",short_order:"Short-Order für Verkauf platziert",short_order_cancel:"Short-Order abgebrochen. ID:",at:"für",coll_of:"mit einer Sicherheit bestehend aus",call_order_update:"Call-Order aktualisiert",upgrade_account:"Kontostatus auf Lifetime Member aktualisiert.",update_account:"Konto aktualisiert",whitelist_account:"Konto zur Positivliste hinzugefügt",whitelisted_by:"Wurde zur Postitivliste hinzugefügt von Konto",transfer_account:"Das Konto wurde übertragen",update_asset:"Das Asset wurde aktualisiert",update_feed_producers:"Die Liste der Feed-Erzeuger wurde aktualisiert",feed_producer:"Werde Feed-Erzeuger für ein Asset",asset_issue:"Emittiert",was_issued:"Wurde emittiert",by:"von",burn_asset:"Vernichtet",fund_pool:"Asset-Gebührenpool finanziert mit",asset_settle:"Settlement erbeten für",asset_global_settle:"Globales Settlement erbeten für",publish_feed:"Neuer Feed wurde publiziert für Asset",delegate_create:"Neuer Delegate wurde angelegt",witness_create:"Neuer Witness wurde angelegt",witness_pay:"Witnesslohn ausgezahlt an Konto",witness_receive:"Received witness from witness",proposal_create:"Ein Vorschlag wurde erzeugt",proposal_update:"Ein Vorschlag wurde aktualisiert",proposal_delete:"Ein Vorschlag wurde gelöscht",withdraw_permission_create:"Einzugsermächtigung wurde verliegen an Konto",withdraw_permission_update:"Einzugsermächtigung wurde aktualisiert für Konto",withdraw_permission_claim:"Einzugsermächtigung wurde eingefordert für Konto",withdraw_permission_delete:"Einzugsermächtigung wurde aufgehoben für Konto",paid:"Bezahlt",obtain:"zu erhalten",global_parameters_update:"Globale Parameter aktualisiert",file_write:"Eine Datei wurde geschrieben",vesting_balance_create:"Ein Sperrfristguthaben wurde erzeugt","for":"für",vesting_balance_withdraw:"Sperrfristguthaben wurde abgehoben",bond_create_offer:"Ein Bondangebot wurde erstellt",bond_cancel_offer:"Ein Bondangebot wurde abgebrochen",bond_accept_offer:"Ein Bondangebot wurde akzeptiert",bond_claim_collateral:"Eine Sicherheit wurde eingefordert",bond_pay_collateral:"Eine Sicherheit wurde bezahlt",create_worker:"Ein Budgetpunkt wurde erzeugt. Bezahlung",custom:"Eine benutzerdefinierte Operation wurde definiert",order_id:"Anweisungskennung (ID)",balance_claim:"Guthaben von %(balance_amount)s der Guthabenskennung (ID) #%(balance_id)s wurde beansprucht",balance_owner:"Schlüssel des Guthabeneigentümers",balance_id:"Guthabenskennung (ID)",deposit_to:"Dem Konto gutgeschrieben",claimed:"Ingesamt beantsprucht",trxTypes:{transfer:"Überweisung",limit_order_create:"Limit-Order",limit_order_cancel:"Limit-Order abbrechen",call_order_update:"Call-Order aktualisieren",account_create:"Konto erstellen",account_update:"Kontoaktualisierung",account_whitelist:"Konto Positivliste",account_upgrade:"Konto Upgrade",account_transfer:"Konto Überweisung",asset_create:"Asset erstellen",asset_update:"Asset aktualisieren",asset_update_bitasset:"SmartCoin aktualisieren",asset_update_feed_producers:"Asset Feederzeuger aktualisieren",asset_issue:"Asset emittieren",asset_reserve:"Assetanteile vernichten",asset_fund_fee_pool:"Asset Gebührenpool finanzieren",asset_settle:"Asset Settlement",asset_global_settle:"Globales Asset Settlement",asset_publish_feed:"Asset Feed publiszieren",delegate_create:"Delegate erstellen",witness_create:"Witness erstellen",witness_withdraw_pay:"Witnesslohn ausbezahlen",proposal_create:"Proposal erstellen",proposal_update:"Proposal aktualisieren",proposal_delete:"Proposal löschen",withdraw_permission_create:"Einzugsermächtigung erstellen",withdraw_permission_update:"Einzugsermächtigung aktualisiert",withdraw_permission_claim:"Einzugsermächtigung eingefordert",withdraw_permission_delete:"Einzugsermächtigung aufgehoben",fill_order:"Order ausgeführt",delegate_update_global_parameters:"Globale Parameters aktualisiert",vesting_balance_create:"Sperrfristguthaben erstellt",vesting_balance_withdraw:"Sperrfristguthaben eingefordert",worker_create:"Budgetpunkt erstellt",custom:"benutzerdefiniert",assert:"Assert Pperation",balance_claim:"Guthaben eingefordert",override_transfer:"Transaktion überschreiben"}},explorer:{accounts:{title:"Konten"},blocks:{title:"Blockchain",globals:"Globale Einstellungen",recent:"Letzte Blöcke"},block:{title:"Block",id:"Block ID",witness:"Witness",count:"Transaktionszähler",date:"Datum",previous:"Vorherige",previous_secret:"Vorheriges Geheimnis",next_secret:"Hash des nächsten Geheimnisses",op:"Aktion",trx:"Transaktion",op_type:"Aktionstyp",fee_payer:"Gebührenkonto",key:"Öffentlicher Schlüssel",transactions:"Anzahl der Transaktionen",account_upgrade:"Kontoerweiterung",lifetime:"Lebenslanges Mitglied werden",authorizing_account:"Kontovollmacht",listed_account:"Kontenübersicht",new_listing:"Neuer Eintrag",asset_update:"zu aktualisierender Asset",common_options:"Common Optionen",new_options:"New Option",new_producers:"Neue Feederzeuger",asset_issue:"Zu emittierender Betrag",max_margin_period_sec:"Max Margin Periode (s)",call_limit:"Call-Limit",short_limit:"Short-Limit",settlement_price:"Settlement-Preis"},assets:{title:"Assets",market:"SmartCoins",user:"User Issued Assets",symbol:"Symbol",id:"ID",issuer:"Herausgeber",precision:"Genauigkeit"},asset:{title:"Asset",not_found:"Das Asset %(name)s existiert nicht"},witnesses:{title:"Witnesses"},delegates:{title:"Delegates"},delegate:{title:"Delegate"},workers:{title:"Budgetpunkte"},proposals:{title:"Vorschlag"},account:{title:"Konto"}},settings:{inverseMarket:"Bevorzugte Marktorientierung",unit:"Bevorzugte Rechnungseinheit",confirmMarketOrder:"Nach Bestätigung für Marktanweisungen fragen",locale:"Sprache wechseln",confirm_yes:"Immer",confirm_no:"Nie",always_confirm:"Für jede Transaction nach Bestätigung fragen"},footer:{title:"Graphene",block:"Spitzenblock"},exchange:{price_history:"Preisverlauf",order_depth:"Ordertiefe",market_history:"Marktverlauf",balance:"Guthaben",total:"Ingesammt",value:"Wert",price:"Preis",latest:"Letzer Preis",call:"Call Preis",volume:"Volumen",spread:"Spread",quantity:"Quantität",buy:"Kaufen",sell:"Verkaufen",confirm_buy:"Bestätigen Sie die Anweisung: Kauf von %(buy_amount)s %(buy_symbol)s zum Preis von %(price_amount)s %(price_symbol)s",confirm_sell:"Bestätigen Sie die Anweisung: Verkauf von %(sell_amount)s %(sell_symbol)s zum Preis von %(price_amount)s %(price_symbol)s"},markets:{choose_base:"Wählen Sie Ihre Grundwährung (base)",filter:"Filter",core_rate:"Kernrate:",supply:"Verfügbarkeit"}}},function(e,t){"use strict";e.exports={languages:{en:"English",cn:"简体中文",fr:"Français",ko:"한국어",de:"Deutsch"},header:{title:"Graphene",dashboard:"Accueil",explorer:"Explorer",exchange:"Échange",payments:"Paiments",logout:"Déconnexion",settings:"Options",current:"Mon Compte"},account:{asset:"Actif",market_value:"Valeur",hour_24:"24hrs",recent:"Activité recent",name:"Nom du compte",more:"voir plus",member:{stats:"Stats membre",join:"Inscription",reg:"Enregistré par",ref:"Recruté par",ref_percentage:"Pourcentage de frais pour le recruteur",network_percentage:"Pourcentage de frais pour le reseau",fees_paid:"Frais payé",fees_pending:"Frais en attente",fees_vested:"Frais en attente bloqué",in_orders:"Total de %(core_asset)s en ordres",referrals:"Recrutements",rewards:"Gains totaux",cashback:"Gagné",vested:"Bloqué"},connections:{known:"Connu par",black:"Blacklisté par"},perm:{active:"Permissions actifs",owner:"Permissions de proprietaire",publish:"Publier les changements",reset:"Annuler les changements",add:"Rajouter une permission",type:"Type",key:"Cléf/Nom",weight:"Poids",threshold:"Limite",confirm_add:"Rajouter",cancel:"Annuler"},votes:{proxy:"Proxy Voting Account",name:"Nom",info:"Info",support:"Support",workers:"Ouvriers"},upgrade:"Mettre à niveau",unlink:"Délier",link:"Lier",pay:"Payer",overview:"Sommaire",history:"Historique",payees:"Payees",permissions:"Permissions",voting:"Votes",orders:"Ordres",select_placeholder:"Selectionnez un compte..",errors:{not_found:"Le compte %(name)s n'existe pas, veuillez vérifier le nom"}},transfer:{from:"De",amount:"Montant",to:"À",memo:"Message",fee:"Frais",send:"Envoyer","final":"Soldes finaux",balances:"Soldes",errors:{req:"Champ obligatoire",pos:"Le montant doit étre positif",valid:"Veuillez rentrer un chiffre positif",balance:"Le solde final doit être superieur à 0"},back:"REVENIR",confirm:"CONFIRMER",broadcast:"Votre transfert a bien été soumis au reseau",again:"FAIRE UN AUTRE TRANSFERT",see:"VOIRE MES TRANSFERTS"},transaction:{sent:"A envoyé",to:"à",received:"A reçu",from:"de",amount_sell:"Montant à vendre",expiration:"Expiration",fill_or:"Fill or kill",min_receive:"Montant minimum à recevoir",seller:"Vendeur",collateral:"Collateral",coll_ratio:"Ratio de collateral initiale",coll_maint:"Ratio de Collateral de maintenance",create_key:"A créé une cléf public",reg_account:"A créé le compte",was_reg_account:" a été créé par",create_asset:"A créé l'actif",limit_order:"A placé un ordre à limite pour vendre",limit_order_buy:"A placé un ordre à limite pour acheter",limit_order_cancel:"Annulation de l'ordre à limite avec id",short_order:"A placé un ordre à découvert pour vendre",at:"à",coll_of:"avec collateral de",call_order_update:"A mis à jour un ordre à découvert",upgrade_account:"A mis à niveau le compte",update_account:"A mis à jour le compte",whitelist_account:"A whitelisté le compte",whitelisted_by:"A été whitelisté par le compte",transfer_account:"A transferé le compte",update_asset:"A mis à jour l'actif",update_feed_producers:"A mis à jour les fornisseurs de flux de l'actif",feed_producer:"Est devenu un fornisseur de flux pour l'actif",asset_issue:"A assigné",was_issued:"A été assigné",by:"par",burn_asset:"A détruit",fund_pool:"A financé un pot de frais avec",asset_settle:"Requested settlement of",asset_global_settle:"Requested global settlement of",publish_feed:"A publié un nouveau flux pour l'actif",delegate_create:"A créé le délégué",witness_create:"A créé le témoin",witness_pay:"A retiré",proposal_create:"A créé une proposition",proposal_update:"A mis à jour une proposition",proposal_delete:"A supprimé une proposition",withdraw_permission_create:"A donné une permission de retrait du compte",withdraw_permission_update:"A mis à jour les permissions de retrait du compte",withdraw_permission_claim:"A pris les permissions de retrait du compte",withdraw_permission_delete:"A supprimé les permissions de retrait du compte",paid:"A payé",obtain:"pour obtenir",global_parameters_update:"A mis à jour les parametres globaux",file_write:"A écrit un fichier",vesting_balance_create:"a créé un solde bloqué pour","for":"pour",vesting_balance_withdraw:"A retiré du solde bloqué",bond_create_offer:"A créé une offre d'obligation",bond_cancel_offer:"A annulé l'offre d'obligation",bond_accept_offer:"A accepté l'offre d'obligation pour",bond_claim_collateral:"A récuperé un collateral de",bond_pay_collateral:"A payé un collateral de",create_worker:"A créé un ouvrier avec un salaire de",custom:"A créé une operation spéciale",order_id:"ID de l'ordre",balance_claim:"A recuperé un solde de %(balance_amount)s du solde ID #%(balance_id)s",balance_owner:"Clèf du solde",balance_id:"ID du solde",deposit_to:"Versé sur le compte",claimed:"Total recuperé",trxTypes:{transfer:"Transfert",limit_order_create:"Ordre à limite",limit_order_cancel:"Annulation d'ordre à limite",call_order_update:"Mise à jour d'ordre à découvert",account_create:"Création de compte",account_update:"Mise à jour de compte",account_whitelist:"Whiteliste de compte",account_upgrade:"Mise à niveau de compte",account_transfer:"Transfert de compte",asset_create:"Creation d'actif",asset_update:"Mise à jour d'actif",asset_update_bitasset:"Mise à jour d'actif de marché",asset_update_feed_producers:"Mise à jour des flux",asset_issue:"Assigner d'un actif",asset_reserve:"Destruction d'actif",asset_fund_fee_pool:"Financement de pot de frais",asset_settle:"Couvrement d'actif",asset_global_settle:"Couvrement global d'actif",asset_publish_feed:"Publication de flux",delegate_create:"Création de délégué",witness_create:"Création de témoin",witness_withdraw_pay:"Retrait de salaire de témoin",proposal_create:"Création d'une proposition",proposal_update:"Mise à jour d'une proposition",proposal_delete:"Suppresion d'une proposition",withdraw_permission_create:"Accord de permission de retrait",withdraw_permission_update:"Mise à jour de permission de retrait",withdraw_permission_claim:"Prise de permissions de retrait",withdraw_permission_delete:"Suppresion des permissions de retrait",fill_order:"Remplissage d'ordre",delegate_update_global_parameters:"Mise à jour des parametres globaux",vesting_balance_create:"Création de solde bloqué",vesting_balance_withdraw:"Retrait de solde bloqué",worker_create:"Création d'ouvrier",custom:"Spécial",assert:"Assert operation",balance_claim:"Récuperation de solde",override_transfer:"Forcing de transfert"}},explorer:{accounts:{title:"Comptes"},blocks:{title:"Blockchain",globals:"Parametres globaux",recent:"Blocs recent"},block:{title:"Bloc",id:"ID du bloc",witness:"Témoin",count:"Nombre de transactions",date:"Date",previous:"Précédent",previous_secret:"Précédent secret",next_secret:"Prochain hash secret",op:"Operation",trx:"Transaction",op_type:"Type d'operation",fee_payer:"Compte payant le frai",key:"Cléf public",transactions:"Nombre de transactions",account_upgrade:"Compte à mettre à niveau",lifetime:"Devenir membre à vie",authorizing_account:"Compte donnant l'autorisation",listed_account:"Compte etant autorisé",new_listing:"Nouvel autorisation",asset_update:"Actif à mettre à jour",common_options:"Options",new_options:"Nouvelles options",new_producers:"Nouveaux fornisseurs de flux",asset_issue:"Montant à créer",max_margin_period_sec:"Periode max de marge (s)",call_limit:"Limite de couverture",short_limit:"Limite de short",settlement_price:"Prix de règlement"},assets:{title:"Actifs",market:"SmartCoins",user:"Actifs des utilisateurs",symbol:"Symbol",id:"ID",issuer:"Créateur",precision:"Précision"},asset:{title:"Actif",not_found:"L'actif %(name)s n'existe pas"},witnesses:{title:"Témoins"},delegates:{title:"Délégués"},delegate:{title:"Delegate"},workers:{title:"Ouvriers"},proposals:{title:"Propositions"},account:{title:"Compte"}},settings:{inverseMarket:"Orientation préféré pour les marchés",unit:"Unité de valeur préféré",confirmMarketOrder:"Demander une confirmation pour des ordres du marché",locale:"Changer de langue",confirm_yes:"Toujours",confirm_no:"Jamais",always_confirm:"Toujours demander une confirmation"},footer:{title:"Graphene",block:"Bloc courant"},exchange:{price_history:"Historique du prix",order_depth:"Carnet d'ordres",market_history:"Historique du marché",balance:"Solde",total:"Total",value:"Valeur",price:"Prix",latest:"Dernier Prix",call:"Prix de flux",volume:"Volume",spread:"Spread",quantity:"Quantité",buy:"Acheter",sell:"Vendre",confirm_buy:"Confirmation d'ordre: Acheter %(buy_amount)s %(buy_symbol)s au prix de %(price_amount)s %(price_symbol)s",confirm_sell:"Confirmation d'ordre: Vendre %(sell_amount)s %(sell_symbol)s au prix de %(price_amount)s %(price_symbol)s"},markets:{choose_base:"Selectionner l'actif de base",filter:"Filtrer",core_rate:"Taux de base",supply:"Réserve",search:"Chercher"}}},function(e,t){"use strict";e.exports={languages:{en:"English",cn:"简体中文",fr:"Français",ko:"한국어",de:"Deutsch"},header:{title:"그래핀 UI",dashboard:"대시보드",explorer:"탐색기",exchange:"거래소",payments:"전송",logout:"로그아웃",settings:"설정",current:"현재 계정"},account:{asset:"자산",market_value:"시장가치",hour_24:"24시간 변동액",recent:"최근 활동",name:"계정명",member:{stats:"회원 정보",join:"가입일",reg:"Registered by",ref:"Referred by",referrals:"Referrals",rewards:"Cashback Rewards",cashback:"캐쉬백",vested:"Vested"},connections:{known:"Known by",black:"Blacklisted by"}},transfer:{from:"보내는 사람",amount:"금액",to:"받는 사람",memo:"메모",fee:"수수료",send:"전송","final":"전송 후 잔고",balances:"잔고",errors:{req:"필수 입력",pos:"금액은 양수를 입력해주세요",valid:"유효한 값을 입력해주세요"},back:"뒤로가기",confirm:"확인",broadcast:"전송요청이 네트워크에 전파되었습니다",again:"전송요청 추가",see:"전송내역 보기"},transaction:{sent:"전송됨",to:"받는 사람",received:"수신됨",from:"보낸 사람",amount_sell:"판매 금액",expiration:"만기",fill_or:"Fill or kill",min_receive:"Minimum amount to receive",seller:"판매자",collateral:"담보",coll_ratio:"초기 담보 비율",coll_maint:"담보 유지 비율",create_key:"공개키 생성",reg_account:"계정 등록",was_reg_account:"registered by",create_asset:"자산 생성",limit_order:"매도주문 요청",limit_order_buy:"매수주문 요청",limit_order_cancel:"주문 취소",short_order:"공매도주문 요청",short_order_cancel:"공매도 취소",at:"at",coll_of:"with collateral of",call_order_update:"콜 주문 업데이트",upgrade_account:"평생회원으로 업그레이드",update_account:"계정 업데이트",whitelist_account:"계정을 화이트리스트에 추가",whitelisted_by:"화이트리스트에 추가됨",transfer_account:"계정 이전",update_asset:"자산 업데이트",update_feed_producers:"Updated the feed producers of asset",feed_producer:"자산에 대한 가격정보 제공자로 추가됨",asset_issue:"발행",was_issued:"발행됨",by:"by",burn_asset:"소각",fund_pool:"자산 수수료 기금을 충전",asset_settle:"다음 자산에 대한 강제청산을 요청",asset_global_settle:"전체 자산 강제청산을 요청",publish_feed:"자산에 대한 가격정보를 발행",delegate_create:"대표자 생성",witness_create:"증인 생성",witness_pay:"증인 봉급을 다음 계정으로 인출",witness_receive:"Received witness from witness",proposal_create:"제안서를 생성",proposal_update:"제안서를 업데이트",proposal_delete:"제안서를 삭제",withdraw_permission_create:"다음 계정에 출금 권한을 부여",withdraw_permission_update:"다음 계정의 출금 권한을 업데이트",withdraw_permission_claim:"다음 계정에 출금 권한을 요청",withdraw_permission_delete:"다음 계정에 출금 권한을 삭제",paid:"지불됨",obtain:"to obtain",global_parameters_update:"전체 매개변수를 업데이트",file_write:"파일 쓰기",vesting_balance_create:"created vesting balance of","for":"for",vesting_balance_withdraw:"Withdrew vesting balance of",bond_create_offer:"Created bond offer",bond_cancel_offer:"Cancelled bond offer",bond_accept_offer:"Accepted bond offer of",bond_claim_collateral:"Claimed collateral of",bond_pay_collateral:"Paid collateral of",create_worker:"Created a worker with a pay of",custom:"Created a custom operation",order_id:"주문 ID",trxTypes:{transfer:"전송",limit_order_create:"주문",limit_order_cancel:"주문 취소",call_order_update:"Update call order",account_create:"계정 생성",account_update:"계정 업데이트",account_whitelist:"계정 화이트리스트",account_upgrade:"계정 업그레이드",account_transfer:"계정 거래",asset_create:"자산 생성",asset_update:"자산 업데이트",asset_update_bitasset:"스마트코인 업데이트",asset_update_feed_producers:"자산 피드 생성자 업데이트",asset_issue:"자산 발행",asset_reserve:"자산 소각",asset_fund_fee_pool:"자산 수수료 기금 충전",asset_settle:"자산 강제청산",asset_global_settle:"자산 전체 강제청산",asset_publish_feed:"자산 가격정보 발행",delegate_create:"대표자 생성",witness_create:"증인 생성",witness_withdraw_pay:"증인 봉급 인출",proposal_create:"제안서 생성",proposal_update:"제안서 업데이트",proposal_delete:"제안서 삭제",withdraw_permission_create:"출금권한 생성",withdraw_permission_update:"출금권한 업데이트",withdraw_permission_claim:"출금권한 요청",withdraw_permission_delete:"출금권한 삭제",fill_order:"매매 체결",delegate_update_global_parameters:"전체 매개변수 업데이트",vesting_balance_create:"Create vesting balance",vesting_balance_withdraw:"Withdraw vesting balance",worker_create:"직원 생성",custom:"사용자 정의",assert:"Assert operation",balance_claim:"Claim balance",override_transfer:"Override transfer"}},explorer:{accounts:{title:"계정"},blocks:{title:"블록체인",globals:"Global parameters",recent:"최근 블록"},block:{title:"블록",id:"블록 ID",witness:"증인",count:"거래 수",date:"일시",previous:"이전",previous_secret:"이전 비밀해쉬",next_secret:"다음 비밀해쉬",op:"Operation",trx:"거래",op_type:"Operation type",fee_payer:"수수료 지불 계정",key:"공개키",transactions:"거래 수",account_upgrade:"업그레이드할 계정",lifetime:"평생회원으로 업그레이드",authorizing_account:"계정 인증",listed_account:"Listed account",new_listing:"New listing",asset_update:"업데이트할 자산",common_options:"Common options",new_options:"New options",new_producers:"새로운 가격정보 발행자",asset_issue:"발행량",max_margin_period_sec:"Max margin period (s)",call_limit:"콜 한도",short_limit:"공매도 한도",settlement_price:"강제청산 가격"},assets:{title:"자산",market:"스마트코인",user:"사용자 자산",symbol:"기호",id:"ID",issuer:"발행자",precision:"소수 자리수"},asset:{title:"자산"},witnesses:{title:"증인"},delegates:{title:"대표자"},delegate:{title:"대표자"},workers:{title:"직원"},proposals:{title:"제안서"},account:{title:"계정"}},settings:{inverseMarket:"선호 거래단위",unit:"선호 화폐단위",confirmMarketOrder:"Ask for confirmation of market orders",locale:"언어 전환",confirm_yes:"Always",confirm_no:"Never",always_confirm:"Always ask for confirmation"}}},function(e,t,a){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var n,o=function(){function e(e,t){for(var a=0;a"),e.ws_rpc.login("","").then(function(){e._db_api.init(),e._network_api.init(),e._history_api.init()})},Promise.all([t,e._network_api.init(),e._history_api.init()])}))}},{key:"close",value:function(){this.ws_rpc.close(),this.ws_rpc=null}},{key:"db_api",value:function(){return this._db_api}},{key:"network_api",value:function(){return this._network_api}},{key:"history_api",value:function(){return this._history_api}}]),e}();e.exports={instance:function(){return n||(n=new l),n.connect(),n}}},function(e,t,a){(function(t){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var n=function(){function e(e,t){for(var a=0;a id:",this.current_callback_id+1,e),this.current_callback_id+=1;var t=this;if(("subscribe_to_objects"===e[1]||"subscribe_to_market"===e[1]||"broadcast_transaction_with_callback"===e[1])&&(t.subscriptions[t.current_callback_id]={callback:e[2][0],params:o.fromJS(e[2][1])},e[2][0]=this.current_callback_id),"get_full_accounts"===e[1]){var a=e[2][1][0],r=!1;for(var n in t.subscriptions)if(t.subscriptions[n].account&&t.subscriptions[n].account===a){r=!0,e[2][0]=n;break}r||(t.subscriptions[t.current_callback_id]={callback:e[2][0].bind(a),account:a,params:o.fromJS(e[2][1])},e[2][0]=t.current_callback_id)}if("unsubscribe_from_objects"===e[1]||"unsubscribe_from_market"===e[1]||"unsubscribe_from_accounts"===e[1]){var s=o.fromJS(e[2][0]);for(var l in t.subscriptions)if(o.is(t.subscriptions[l].params,s)){t.unsub[this.current_callback_id]=l;break}}var u={method:"call",params:e};return u.id=this.current_callback_id,new Promise(function(e,a){t.callbacks[t.current_callback_id]={time:new Date,resolve:e,reject:a},t.web_socket.onerror=function(e){console.log("!!! WebSocket Error ",e),a(e)},t.web_socket.send(JSON.stringify(u))})}},{key:"listener",value:function(e){i&&console.log("[websocketrpc] <--- reply ----",e);var t=!1,a=null;"notice"===e.method&&(t=!0,e.id=e.params[0]),a=t?this.subscriptions[e.id].callback:this.callbacks[e.id],a&&!t?(e.error?a.reject(e.error):a.resolve(e.result),delete this.callbacks[e.id],this.unsub[e.id]&&(delete this.subscriptions[this.unsub[e.id]],delete this.unsub[e.id])):a&&t?a(e.params[1]):console.log("Warning: unknown websocket response: ",e)}},{key:"login",value:function(e,t){var a=this;return this.connect_promise.then(function(){return a.call([1,"login",[e,t]])})}},{key:"close",value:function(){this.web_socket.close()}}]),e}();e.exports=s}).call(t,a(175))},586,function(e,t,a){var r,n,o;!function(a,i){n=[],r=i,o="function"==typeof r?r.apply(t,n):r,!(void 0!==o&&(e.exports=o))}(this,function(){function e(t,a,r){function n(e,t){var a=document.createEvent("CustomEvent");return a.initCustomEvent(e,!1,!1,t),a}var o={debug:!1,automaticOpen:!0,reconnectInterval:1e3,maxReconnectInterval:3e4,reconnectDecay:1.5,timeoutInterval:2e3,maxReconnectAttempts:null,binaryType:"blob"};r||(r={});for(var i in o)"undefined"!=typeof r[i]?this[i]=r[i]:this[i]=o[i];this.url=t,this.reconnectAttempts=0,this.readyState=WebSocket.CONNECTING,this.protocol=null;var s,l=this,u=!1,c=!1,d=document.createElement("div");d.addEventListener("open",function(e){l.onopen(e)}),d.addEventListener("close",function(e){l.onclose(e)}),d.addEventListener("connecting",function(e){l.onconnecting(e)}),d.addEventListener("message",function(e){l.onmessage(e)}),d.addEventListener("error",function(e){l.onerror(e)}),this.addEventListener=d.addEventListener.bind(d),this.removeEventListener=d.removeEventListener.bind(d),this.dispatchEvent=d.dispatchEvent.bind(d),this.open=function(t){if(s=new WebSocket(l.url,a||[]),s.binaryType=this.binaryType,t){if(this.maxReconnectAttempts&&this.reconnectAttempts>this.maxReconnectAttempts)return}else d.dispatchEvent(n("connecting")),this.reconnectAttempts=0;(l.debug||e.debugAll)&&console.debug("ReconnectingWebSocket","attempt-connect",l.url);var r=s,o=setTimeout(function(){(l.debug||e.debugAll)&&console.debug("ReconnectingWebSocket","connection-timeout",l.url),c=!0,r.close(),c=!1},l.timeoutInterval);s.onopen=function(a){clearTimeout(o),(l.debug||e.debugAll)&&console.debug("ReconnectingWebSocket","onopen",l.url),l.protocol=s.protocol,l.readyState=WebSocket.OPEN,l.reconnectAttempts=0;var r=n("open");r.isReconnect=t,t=!1,d.dispatchEvent(r)},s.onclose=function(a){if(clearTimeout(o),s=null,u)l.readyState=WebSocket.CLOSED,d.dispatchEvent(n("close"));else{l.readyState=WebSocket.CONNECTING;var r=n("connecting");r.code=a.code,r.reason=a.reason,r.wasClean=a.wasClean,d.dispatchEvent(r),t||c||((l.debug||e.debugAll)&&console.debug("ReconnectingWebSocket","onclose",l.url),d.dispatchEvent(n("close")));var o=l.reconnectInterval*Math.pow(l.reconnectDecay,l.reconnectAttempts);setTimeout(function(){l.reconnectAttempts++,l.open(!0)},o>l.maxReconnectInterval?l.maxReconnectInterval:o)}},s.onmessage=function(t){(l.debug||e.debugAll)&&console.debug("ReconnectingWebSocket","onmessage",l.url,t.data);var a=n("message");a.data=t.data,d.dispatchEvent(a)},s.onerror=function(t){(l.debug||e.debugAll)&&console.debug("ReconnectingWebSocket","onerror",l.url,t),d.dispatchEvent(n("error"))}},1==this.automaticOpen&&this.open(!1),this.send=function(t){if(s)return(l.debug||e.debugAll)&&console.debug("ReconnectingWebSocket","send",l.url,t),s.send(t);throw"INVALID_STATE_ERR : Pausing to reconnect websocket"},this.close=function(e,t){"undefined"==typeof e&&(e=1e3),u=!0,s&&s.close(e,t)},this.refresh=function(){s&&s.close()}}if("WebSocket"in window)return e.prototype.onopen=function(e){},e.prototype.onclose=function(e){},e.prototype.onconnecting=function(e){},e.prototype.onmessage=function(e){},e.prototype.onerror=function(e){},e.debugAll=!1,e.CONNECTING=WebSocket.CONNECTING,e.OPEN=WebSocket.OPEN,e.CLOSING=WebSocket.CLOSING,e.CLOSED=WebSocket.CLOSED,e})},function(e,t,a){function r(e,t){var a;return a=t?new o(e,t):new o(e)}var n=function(){return this}(),o=n.WebSocket||n.MozWebSocket;e.exports={w3cwebsocket:o?r:null,version:a(432)}},function(e,t,a){e.exports=a(433).version},function(e,t){e.exports={name:"websocket",description:"Websocket Client & Server Library implementing the WebSocket protocol as specified in RFC 6455.",keywords:["websocket","websockets","socket","networking","comet","push","RFC-6455","realtime","server","client"],author:{name:"Brian McKelvey",email:"brian@worlize.com",url:"https://www.worlize.com/"},contributors:[{name:"Iñaki Baz Castillo",email:"ibc@aliax.net",url:"http://dev.sipdoc.net"}],version:"1.0.21",repository:{type:"git",url:"git+https://github.com/theturtle32/WebSocket-Node.git"},homepage:"https://github.com/theturtle32/WebSocket-Node",engines:{node:">=0.8.0"},dependencies:{debug:"~2.2.0",nan:"~1.8.x","typedarray-to-buffer":"~3.0.3",yaeti:"~0.0.4"},devDependencies:{"buffer-equal":"^0.0.1",faucet:"^0.0.1",gulp:"git+https://github.com/gulpjs/gulp.git#4.0","gulp-jshint":"^1.11.2","jshint-stylish":"^1.0.2",tape:"^4.0.1"},config:{verbose:!1},scripts:{install:"(node-gyp rebuild 2> builderror.log) || (exit 0)",test:"faucet test/unit",gulp:"gulp"},main:"index",directories:{lib:"./lib"},browser:"lib/browser.js",license:"Apache-2.0",gitHead:"8f5d5f3ef3d946324fe016d525893546ff6500e1",bugs:{url:"https://github.com/theturtle32/WebSocket-Node/issues"},_id:"websocket@1.0.21",_shasum:"f51f0a96ed19629af39922470ab591907f1c5bd9",_from:"websocket@>=1.0.18 <2.0.0",_npmVersion:"2.12.1",_nodeVersion:"2.3.4",_npmUser:{name:"theturtle32",email:"brian@worlize.com"},maintainers:[{name:"theturtle32",email:"brian@worlize.com"}],dist:{shasum:"f51f0a96ed19629af39922470ab591907f1c5bd9",tarball:"http://registry.npmjs.org/websocket/-/websocket-1.0.21.tgz"},_resolved:"https://registry.npmjs.org/websocket/-/websocket-1.0.21.tgz"}},function(e,t){"use strict";function a(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var r=function(){function e(e,t){for(var a=0;a0?e.forEach(function(e){t.push({amount:parseInt(e.balance,10),asset_id:e.asset_type})}):t=[{amount:0,asset_id:"1.3.0"}],t}if(null===e.fullAccount)return this.cachedAccounts=this.cachedAccounts.set(e.name,{notFound:!0}),!0;var a=e.fullAccount,r=a.account,n=a.vesting_balances,o=a.statistics,i=a.call_orders,s=a.limit_orders,l=a.referrer_name,u=a.registrar_name,c=a.lifetime_referrer_name;if(e.sub){if(e.history_updates){var d=this.accountHistories.get(e.account_name),f=!0,p=!1,m=void 0;try{for(var h,g=e.history_updates[Symbol.iterator]();!(f=(h=g.next()).done);f=!0){var b=h.value;d.unshift(b)}}catch(v){p=!0,m=v}finally{try{!f&&g["return"]&&g["return"]()}finally{if(p)throw m}}this.accountHistories=this.accountHistories.set(e.account_name,d)}if(e.balance_updates){for(var w=this.balances.get(e.account_name),_=t(e.balance_updates),k=0;k<_.length;k++)for(var E=0;E0)this.setCurrentAccount(this.linkedAccounts.first());else{var e=this.cachedAccounts.first();e&&"nathan"===e.name&&"GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV"===e.owner.key_auths[0][0]&&this.setCurrentAccount("nathan")}}},{key:"setCurrentAccount",value:function(e){e?this.currentAccount={name:e,id:this.account_name_to_id[e]}:this.currentAccount=null}},{key:"onSetCurrentAccount",value:function(e){this.setCurrentAccount(e)}},{key:"onTransfer",value:function(e){}},{key:"onAddAccount",value:function(e){this.onCreateAccount(e)}},{key:"onCreateAccount",value:function(e){var t=this,a=e;if("string"==typeof a&&(a={name:a}),a.toJS&&(a=a.toJS()),!k["default"].is_account_name(a.name))throw new Error("Invalid account name: "+a.name);b["default"].add_to_store("linked_accounts",a).then(function(){console.log("[AccountStore.js] ----- Added account to store: ----->",name),t.linkedAccounts=t.linkedAccounts.add(a.name),1===t.linkedAccounts.size&&t.setCurrentAccount(a.name)})}},{key:"onUpgradeAccount",value:function(e){console.log("[AccountStore.js] ----- onUpgradeAccount ----->",e)}},{key:"onLinkAccount",value:function(e){b["default"].add_to_store("linked_accounts",{name:e}),this.linkedAccounts=this.linkedAccounts.add(e),1===this.linkedAccounts.size&&this.setCurrentAccount(e)}},{key:"onUnlinkAccount",value:function(e){b["default"].remove_from_store("linked_accounts",e),this.linkedAccounts=this.linkedAccounts.remove(e),0===this.linkedAccounts.size&&this.setCurrentAccount(null)}},{key:"onTransactUpdateAccount",value:function(e){console.log("[AccountStore.js:154] ----- onTransactUpdateAccount ----->",e)}},{key:"onChange",value:function(){}}]),t}(u["default"]);e.exports=p["default"].createStore(E,"AccountStore")},function(e,t,a){"use strict";function r(e){return e&&e.__esModule?e:{"default":e}}function n(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var o=function(){function e(e,t){for(var a=0;a",c),new Promise(function(e,t){t(c)})}return u}},{key:"addAccount",value:function(e){this.dispatch(e)}},{key:"createAccount",value:function(e,t,a){var r=this,n=arguments.length<=3||void 0===arguments[3]?100:arguments[3];return g["default"].createBrainKeyAccount(e,t,a,n).then(function(){return r.dispatch(e),e})}},{key:"upgradeAccount",value:function(e){var t=_.new_transaction();return t.add_type_operation("account_upgrade",{fee:{amount:0,asset_id:0},account_to_upgrade:e,upgrade_to_lifetime_member:!0}),h["default"].process_transaction(t,null,!0)}},{key:"linkAccount",value:function(e){this.dispatch(e)}},{key:"unlinkAccount",value:function(e){this.dispatch(e)}},{key:"change",value:function(){this.dispatch()}}]),e}();e.exports=s["default"].createActions(E)},function(e,t,a){"use strict";var r=a(439),n=a(440),o=/\b\d+\.\d+\.(\d+)\b/,i={get_object_id:function(e){var t=o.exec(e);return t?Number.parseInt(t[1]):0},is_object_id:function(e){if("string"!=typeof e)return!1;var t=o.exec(e);return null!==t&&3===e.split(".").length},get_asset_precision:function(e){return Math.pow(10,e)},get_asset_amount:function(e,t){return e/this.get_asset_precision(t.precision)},get_asset_price:function(e,t,a,r){return this.get_asset_amount(e,t)/this.get_asset_amount(a,r)},format_number:function(e,t){for(var a=".",r=0;t>r;r++)a+="0";return n(e).format("0,0"+a)},format_asset:function(e,t,a){var r=this.get_asset_precision(t.precision);return""+this.format_number(e/r,t.precision)+(a?"":" "+t.symbol)},format_price:function(e,t,a,r,n,o){var i=this.get_asset_precision(t.precision),s=this.get_asset_precision(r.precision);return o?parseInt(t.id.split(".")[2],10)parseInt(r.id.split(".")[2],10)?""+this.format_number(e/i/(a/s),Math.max(5,t.precision))+(n?"":" "+t.symbol+"/"+r.symbol):""+this.format_number(a/s/(e/i),Math.max(5,r.precision))+(n?"":" "+r.symbol+"/"+t.symbol)},get_op_type:function(e){var t=parseInt(e.split(".")[1],10);for(var a in r.object_type)if(r.object_type[a]===t)return a}};e.exports=i},function(e,t){var a;e.exports=a={},a.reserved_spaces={relative_protocol_ids:0,protocol_ids:1,implementation_ids:2},a.object_type={"null":0,base:1,account:2,asset:3,force_settlement:4,committee_member:5,witness:6,limit_order:7,call_order:8,custom:9,proposal:10,operation_history:11,withdraw_permission:12,vesting_balance:13,worker:14,balance:15},a.vote_type={committee:0,witness:1,worker:2},a.operations={transfer:0,limit_order_create:1,limit_order_cancel:2,call_order_update:3,fill_order:4,account_create:5,account_update:6,account_whitelist:7,account_upgrade:8,account_transfer:9,asset_create:10,asset_update:11,asset_update_bitasset:12,asset_update_feed_producers:13,asset_issue:14,asset_reserve:15,asset_fund_fee_pool:16,asset_settle:17,asset_global_settle:18,asset_publish_feed:19,witness_create:20,proposal_create:21,proposal_update:22,proposal_delete:23,withdraw_permission_create:24,withdraw_permission_update:25,withdraw_permission_claim:26,withdraw_permission_delete:27,committee_member_create:28,committee_member_update_global_parameters:29,vesting_balance_create:30,vesting_balance_withdraw:31,worker_create:32,custom:33,assert:34,balance_claim:35,override_transfer:36,transfer_to_blind:37,blind_transfer:38,transfer_from_blind:39}},function(e,t,a){var r,n;/*! * numeral.js * version : 1.5.3 * author : Adam Draper From be55df25d0bca4dade213bed3e5dc8e94faec56e Mon Sep 17 00:00:00 2001 From: Vikram Rajkumar Date: Fri, 14 Aug 2015 16:51:04 -0400 Subject: [PATCH 193/353] Initial work on BTS1 key import in CLI wallet --- .../wallet/include/graphene/wallet/wallet.hpp | 6 ++ libraries/wallet/wallet.cpp | 102 ++++++++++++++++++ 2 files changed, 108 insertions(+) diff --git a/libraries/wallet/include/graphene/wallet/wallet.hpp b/libraries/wallet/include/graphene/wallet/wallet.hpp index d64c784d..ac1c334b 100644 --- a/libraries/wallet/include/graphene/wallet/wallet.hpp +++ b/libraries/wallet/include/graphene/wallet/wallet.hpp @@ -523,6 +523,10 @@ class wallet_api */ bool import_key(string account_name_or_id, string wif_key); + map import_accounts( string filename, string password ); + + bool import_account_keys( string filename, string password, string src_account_name, string dest_account_name ); + /** * This call will construct a transaction that will claim all balances controled * by wif_keys and deposit them into the given account. @@ -1255,6 +1259,8 @@ FC_API( graphene::wallet::wallet_api, (list_account_balances) (list_assets) (import_key) + (import_accounts) + (import_account_keys) (import_balance) (suggest_brain_key) (register_account) diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp index 3b497ea2..5e697667 100644 --- a/libraries/wallet/wallet.cpp +++ b/libraries/wallet/wallet.cpp @@ -2225,6 +2225,108 @@ bool wallet_api::import_key(string account_name_or_id, string wif_key) return false; } +map wallet_api::import_accounts( string filename, string password ) +{ + FC_ASSERT( !is_locked() ); + FC_ASSERT( fc::exists( filename ) ); + + const auto imported_keys = fc::json::from_file( filename ); + + const auto password_hash = fc::sha512::hash( password ); + FC_ASSERT( fc::sha512::hash( password_hash ) == imported_keys.password_checksum ); + + map result; + for( const auto& item : imported_keys.account_keys ) + { + const auto import_this_account = [ & ]() -> bool + { + try + { + const account_object account = get_account( item.account_name ); + const auto& owner_keys = account.owner.get_keys(); + const auto& active_keys = account.active.get_keys(); + + for( const auto& public_key : item.public_keys ) + { + if( std::find( owner_keys.begin(), owner_keys.end(), public_key ) != owner_keys.end() ) + return true; + + if( std::find( active_keys.begin(), active_keys.end(), public_key ) != active_keys.end() ) + return true; + } + } + catch( ... ) + { + } + + return false; + }; + + const auto should_proceed = import_this_account(); + result[ item.account_name ] = should_proceed; + + if( should_proceed ) + { + // TODO: First check that all private keys match public keys + for( const auto& encrypted_key : item.encrypted_private_keys ) + { + const auto plain_text = fc::aes_decrypt( password_hash, encrypted_key ); + const auto private_key = fc::raw::unpack( plain_text ); + + import_key( item.account_name, string( graphene::utilities::key_to_wif( private_key ) ) ); + } + } + } + + return result; +} + +bool wallet_api::import_account_keys( string filename, string password, string src_account_name, string dest_account_name ) +{ + FC_ASSERT( !is_locked() ); + FC_ASSERT( fc::exists( filename ) ); + + bool is_my_account = false; + const auto accounts = list_my_accounts(); + for( const auto& account : accounts ) + { + if( account.name == dest_account_name ) + { + is_my_account = true; + break; + } + } + FC_ASSERT( is_my_account ); + + const auto imported_keys = fc::json::from_file( filename ); + + const auto password_hash = fc::sha512::hash( password ); + FC_ASSERT( fc::sha512::hash( password_hash ) == imported_keys.password_checksum ); + + bool found_account = false; + for( const auto& item : imported_keys.account_keys ) + { + if( item.account_name != src_account_name ) + continue; + + found_account = true; + + for( const auto& encrypted_key : item.encrypted_private_keys ) + { + const auto plain_text = fc::aes_decrypt( password_hash, encrypted_key ); + const auto private_key = fc::raw::unpack( plain_text ); + + import_key( dest_account_name, string( graphene::utilities::key_to_wif( private_key ) ) ); + } + + return true; + } + + FC_ASSERT( found_account ); + + return false; +} + string wallet_api::normalize_brain_key(string s) const { return detail::normalize_brain_key( s ); From c0c36ca63916e0b8fd73cc8edcd9501fa575b05c Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Fri, 14 Aug 2015 17:56:21 -0400 Subject: [PATCH 194/353] votable objects now keep track of their most recent vote count --- docs | 2 +- libraries/chain/db_maint.cpp | 28 +++++++++++++++++++ .../chain/committee_member_object.hpp | 3 +- .../chain/include/graphene/chain/database.hpp | 1 + .../include/graphene/chain/witness_object.hpp | 2 ++ .../graphene/chain/worker_evaluator.hpp | 7 ++++- libraries/fc | 2 +- 7 files changed, 41 insertions(+), 4 deletions(-) diff --git a/docs b/docs index 3910642c..cdc8ea81 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit 3910642c234595beb88beaf9cae71913b6c81ded +Subproject commit cdc8ea8133a999afef8051700a4ce8edb0988ec4 diff --git a/libraries/chain/db_maint.cpp b/libraries/chain/db_maint.cpp index 1806e718..ca080360 100644 --- a/libraries/chain/db_maint.cpp +++ b/libraries/chain/db_maint.cpp @@ -82,6 +82,19 @@ struct worker_pay_visitor worker.pay_worker(pay, db); } }; +void database::update_worker_votes() +{ + auto& idx = get_index_type(); + auto itr = idx.begin(); + while( itr != idx.end() ) + { + modify( **itr, [&]( worker_object& obj ){ + obj.total_votes_for = _vote_tally_buffer[obj.vote_for]; + obj.total_votes_against = _vote_tally_buffer[obj.vote_against]; + }); + ++itr; + } +} void database::pay_workers( share_type& budget ) { @@ -140,6 +153,13 @@ void database::update_active_witnesses() auto wits = sort_votable_objects(std::max(witness_count*2+1, (size_t)GRAPHENE_MIN_WITNESS_COUNT)); const global_property_object& gpo = get_global_properties(); + for( const witness_object& wit : wits ) + { + modify( wit, [&]( witness_object& obj ){ + obj.total_votes = _vote_tally_buffer[wit.vote_id]; + }); + } + // Update witness authority modify( get(GRAPHENE_WITNESS_ACCOUNT), [&]( account_object& a ) { uint64_t total_votes = 0; @@ -205,6 +225,13 @@ void database::update_active_committee_members() auto committee_members = sort_votable_objects(std::max(committee_member_count*2+1, (size_t)GRAPHENE_MIN_COMMITTEE_MEMBER_COUNT)); + for( const committee_member_object& del : committee_members ) + { + modify( del, [&]( committee_member_object& obj ){ + obj.total_votes = _vote_tally_buffer[del.vote_id]; + }); + } + // Update committee authorities if( !committee_members.empty() ) { @@ -459,6 +486,7 @@ void database::perform_chain_maintenance(const signed_block& next_block, const g update_active_witnesses(); update_active_committee_members(); + update_worker_votes(); modify(gpo, [this](global_property_object& p) { // Remove scaling of account registration fee diff --git a/libraries/chain/include/graphene/chain/committee_member_object.hpp b/libraries/chain/include/graphene/chain/committee_member_object.hpp index f767cf79..2ab34ac7 100644 --- a/libraries/chain/include/graphene/chain/committee_member_object.hpp +++ b/libraries/chain/include/graphene/chain/committee_member_object.hpp @@ -44,6 +44,7 @@ namespace graphene { namespace chain { account_id_type committee_member_account; vote_id_type vote_id; + uint64_t total_votes = 0; string url; }; @@ -67,4 +68,4 @@ namespace graphene { namespace chain { } } // graphene::chain FC_REFLECT_DERIVED( graphene::chain::committee_member_object, (graphene::db::object), - (committee_member_account)(vote_id)(url) ) + (committee_member_account)(vote_id)(total_votes)(url) ) diff --git a/libraries/chain/include/graphene/chain/database.hpp b/libraries/chain/include/graphene/chain/database.hpp index a26addc5..d31dd264 100644 --- a/libraries/chain/include/graphene/chain/database.hpp +++ b/libraries/chain/include/graphene/chain/database.hpp @@ -465,6 +465,7 @@ namespace graphene { namespace chain { void perform_chain_maintenance(const signed_block& next_block, const global_property_object& global_props); void update_active_witnesses(); void update_active_committee_members(); + void update_worker_votes(); template void perform_account_maintenance(std::tuple helpers); diff --git a/libraries/chain/include/graphene/chain/witness_object.hpp b/libraries/chain/include/graphene/chain/witness_object.hpp index 54216dfd..17b94ed5 100644 --- a/libraries/chain/include/graphene/chain/witness_object.hpp +++ b/libraries/chain/include/graphene/chain/witness_object.hpp @@ -37,6 +37,7 @@ namespace graphene { namespace chain { secret_hash_type previous_secret; optional< vesting_balance_id_type > pay_vb; vote_id_type vote_id; + uint64_t total_votes = 0; string url; witness_object() : vote_id(vote_id_type::witness) {} @@ -68,4 +69,5 @@ FC_REFLECT_DERIVED( graphene::chain::witness_object, (graphene::db::object), (previous_secret) (pay_vb) (vote_id) + (total_votes) (url) ) diff --git a/libraries/chain/include/graphene/chain/worker_evaluator.hpp b/libraries/chain/include/graphene/chain/worker_evaluator.hpp index d22843b5..91b4da85 100644 --- a/libraries/chain/include/graphene/chain/worker_evaluator.hpp +++ b/libraries/chain/include/graphene/chain/worker_evaluator.hpp @@ -121,11 +121,14 @@ namespace graphene { namespace chain { /// Voting ID which represents disapproval of this worker vote_id_type vote_against; + uint64_t total_votes_for = 0; + uint64_t total_votes_against = 0; + bool is_active(fc::time_point_sec now)const { return now >= work_begin_date && now <= work_end_date; } share_type approving_stake(const vector& stake_vote_tallies)const { - return stake_vote_tallies[vote_for] - stake_vote_tallies[vote_against]; + return total_votes_for - total_votes_against;// stake_vote_tallies[vote_for] - stake_vote_tallies[vote_against]; } }; @@ -155,6 +158,8 @@ FC_REFLECT_DERIVED( graphene::chain::worker_object, (graphene::db::object), (worker) (vote_for) (vote_against) + (total_votes_for) + (total_votes_against) (name) (url) ) diff --git a/libraries/fc b/libraries/fc index 9c868b39..458b6017 160000 --- a/libraries/fc +++ b/libraries/fc @@ -1 +1 @@ -Subproject commit 9c868b3927a7c0aad3f628ad0071c92f11a0923c +Subproject commit 458b601774c36b702e2d4712320b5d53c6b2ee1c From ab7fcb9b4a5ffb3307147be2cfcd9689db21bd67 Mon Sep 17 00:00:00 2001 From: Eric Frias Date: Mon, 17 Aug 2015 11:32:26 -0400 Subject: [PATCH 195/353] Win32 build fixes --- libraries/egenesis/CMakeLists.txt | 2 +- libraries/fc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/egenesis/CMakeLists.txt b/libraries/egenesis/CMakeLists.txt index 99b1f1d6..68de4b00 100644 --- a/libraries/egenesis/CMakeLists.txt +++ b/libraries/egenesis/CMakeLists.txt @@ -32,7 +32,7 @@ add_custom_command( "${CMAKE_CURRENT_BINARY_DIR}/egenesis_brief.cpp" "${CMAKE_CURRENT_BINARY_DIR}/egenesis_full.cpp" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMAND "${CMAKE_CURRENT_BINARY_DIR}/embed_genesis" ${embed_genesis_args} + COMMAND embed_genesis ${embed_genesis_args} DEPENDS "${GRAPHENE_EGENESIS_JSON}" "${CMAKE_CURRENT_SOURCE_DIR}/egenesis_brief.cpp.tmpl" diff --git a/libraries/fc b/libraries/fc index 458b6017..18ed468c 160000 --- a/libraries/fc +++ b/libraries/fc @@ -1 +1 @@ -Subproject commit 458b601774c36b702e2d4712320b5d53c6b2ee1c +Subproject commit 18ed468c6f0b19bb1e322548d8be64d7faafe4e5 From 3a7e65c888a758b20ddc6a0eb0bdeb153d2dba71 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Mon, 17 Aug 2015 12:59:51 -0400 Subject: [PATCH 196/353] chain_property_object: Implement chain_property_object as container for unchangeable properties set at genesis #238 --- libraries/app/api.cpp | 6 +++ libraries/app/application.cpp | 4 +- libraries/app/include/graphene/app/api.hpp | 17 +++++--- libraries/chain/db_getter.cpp | 8 +++- libraries/chain/db_init.cpp | 12 +++++- .../graphene/chain/chain_property_object.hpp | 40 +++++++++++++++++++ .../chain/include/graphene/chain/database.hpp | 1 + .../include/graphene/chain/protocol/types.hpp | 6 ++- libraries/wallet/wallet.cpp | 7 +++- tests/tests/operation_tests2.cpp | 2 +- 10 files changed, 90 insertions(+), 13 deletions(-) create mode 100644 libraries/chain/include/graphene/chain/chain_property_object.hpp diff --git a/libraries/app/api.cpp b/libraries/app/api.cpp index 9b20df99..b587dba3 100644 --- a/libraries/app/api.cpp +++ b/libraries/app/api.cpp @@ -136,6 +136,11 @@ namespace graphene { namespace app { return result; } + chain_property_object database_api::get_chain_properties()const + { + return _db.get(chain_property_id_type()); + } + global_property_object database_api::get_global_properties()const { return _db.get(global_property_id_type()); @@ -780,6 +785,7 @@ namespace graphene { namespace app { } case impl_block_summary_object_type:{ } case impl_account_transaction_history_object_type:{ } case impl_witness_schedule_object_type: { + } case impl_chain_property_object_type: { } } } diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp index da87cf93..d7e35936 100644 --- a/libraries/app/application.cpp +++ b/libraries/app/application.cpp @@ -266,7 +266,7 @@ namespace detail { } if (!_options->count("genesis-json") && - _chain_db->get_global_properties().chain_id != graphene::egenesis::get_egenesis_chain_id()) { + _chain_db->get_chain_id() != graphene::egenesis::get_egenesis_chain_id()) { elog("Detected old database. Nuking and starting over."); _chain_db->wipe(_data_dir / "blockchain", true); _chain_db.reset(); @@ -450,7 +450,7 @@ namespace detail { virtual chain_id_type get_chain_id()const override { - return _chain_db->get_global_properties().chain_id; + return _chain_db->get_chain_id(); } /** diff --git a/libraries/app/include/graphene/app/api.hpp b/libraries/app/include/graphene/app/api.hpp index 129da370..639545eb 100644 --- a/libraries/app/include/graphene/app/api.hpp +++ b/libraries/app/include/graphene/app/api.hpp @@ -24,13 +24,14 @@ #include #include -#include #include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include #include @@ -84,6 +85,11 @@ namespace graphene { namespace app { */ processed_transaction get_transaction( uint32_t block_num, uint32_t trx_in_block )const; + /** + * @brief Retrieve the @ref chain_property_object associated with the chain + */ + chain_property_object get_chain_properties()const; + /** * @brief Retrieve the current @ref global_property_object */ @@ -546,6 +552,7 @@ FC_API(graphene::app::database_api, (get_block_header) (get_block) (get_transaction) + (get_chain_properties) (get_global_properties) (get_chain_id) (get_dynamic_global_properties) diff --git a/libraries/chain/db_getter.cpp b/libraries/chain/db_getter.cpp index b10c702d..d9a08105 100644 --- a/libraries/chain/db_getter.cpp +++ b/libraries/chain/db_getter.cpp @@ -19,6 +19,7 @@ #include #include +#include #include namespace graphene { namespace chain { @@ -33,6 +34,11 @@ const global_property_object& database::get_global_properties()const return get( global_property_id_type() ); } +const chain_property_object& database::get_chain_properties()const +{ + return get( chain_property_id_type() ); +} + const dynamic_global_property_object&database::get_dynamic_global_properties() const { return get( dynamic_global_property_id_type() ); @@ -65,7 +71,7 @@ decltype( chain_parameters::block_interval ) database::block_interval( )const const chain_id_type& database::get_chain_id( )const { - return get_global_properties().chain_id; + return get_chain_properties().chain_id; } const node_property_object& database::get_node_properties()const diff --git a/libraries/chain/db_init.cpp b/libraries/chain/db_init.cpp index 2ab28d9f..e043588f 100644 --- a/libraries/chain/db_init.cpp +++ b/libraries/chain/db_init.cpp @@ -20,10 +20,11 @@ #include #include +#include #include +#include #include #include -#include #include #include #include @@ -193,6 +194,7 @@ void database::initialize_indexes() add_index< primary_index> >(); add_index< primary_index> >(); add_index< primary_index> >(); + add_index< primary_index > >(); } void database::init_genesis(const genesis_state_type& genesis_state) @@ -301,9 +303,11 @@ void database::init_genesis(const genesis_state_type& genesis_state) assert( get_balance(account_id_type(), asset_id_type()) == asset(dyn_asset.current_supply) ); (void)core_asset; + chain_id_type chain_id = genesis_state.compute_chain_id(); + // Create global properties create([&](global_property_object& p) { - p.chain_id = genesis_state.compute_chain_id(); + p.chain_id = chain_id; p.parameters = genesis_state.initial_parameters; // Set fees to zero initially, so that genesis initialization needs not pay them // We'll fix it at the end of the function @@ -315,6 +319,10 @@ void database::init_genesis(const genesis_state_type& genesis_state) p.dynamic_flags = 0; p.witness_budget = 0; }); + create([&](chain_property_object& p) + { + p.chain_id = chain_id; + } ); create([&](block_summary_object&) {}); // Create initial accounts diff --git a/libraries/chain/include/graphene/chain/chain_property_object.hpp b/libraries/chain/include/graphene/chain/chain_property_object.hpp new file mode 100644 index 00000000..2b8a8054 --- /dev/null +++ b/libraries/chain/include/graphene/chain/chain_property_object.hpp @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2015, Cryptonomex, Inc. + * All rights reserved. + * + * This source code is provided for evaluation in private test networks only, until September 8, 2015. After this date, this license expires and + * the code may not be used, modified or distributed for any purpose. Redistribution and use in source and binary forms, with or without modification, + * are permitted until September 8, 2015, provided that the following conditions are met: + * + * 1. The code and/or derivative works are used only for private test networks consisting of no more than 10 P2P nodes. + * + * 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. + */ +#pragma once + +namespace graphene { namespace chain { + +class chain_property_object; + +/** + * Contains invariants which are set at genesis and never changed. + */ +class chain_property_object : public abstract_object +{ + public: + static const uint8_t space_id = implementation_ids; + static const uint8_t type_id = impl_chain_property_object_type; + + chain_id_type chain_id; +}; + +} } + +FC_REFLECT_DERIVED( graphene::chain::chain_property_object, (graphene::db::object), + (chain_id) + ) diff --git a/libraries/chain/include/graphene/chain/database.hpp b/libraries/chain/include/graphene/chain/database.hpp index d31dd264..755d18a6 100644 --- a/libraries/chain/include/graphene/chain/database.hpp +++ b/libraries/chain/include/graphene/chain/database.hpp @@ -254,6 +254,7 @@ namespace graphene { namespace chain { const chain_id_type& get_chain_id()const; const asset_object& get_core_asset()const; + const chain_property_object& get_chain_properties()const; const global_property_object& get_global_properties()const; const dynamic_global_property_object& get_dynamic_global_properties()const; const node_property_object& get_node_properties()const; diff --git a/libraries/chain/include/graphene/chain/protocol/types.hpp b/libraries/chain/include/graphene/chain/protocol/types.hpp index e9b5ea7b..af8a2ace 100644 --- a/libraries/chain/include/graphene/chain/protocol/types.hpp +++ b/libraries/chain/include/graphene/chain/protocol/types.hpp @@ -141,7 +141,8 @@ namespace graphene { namespace chain { impl_block_summary_object_type, impl_account_transaction_history_object_type, impl_witness_schedule_object_type, - impl_blinded_balance_object_type + impl_blinded_balance_object_type, + impl_chain_property_object_type }; enum meta_info_object_type @@ -194,6 +195,7 @@ namespace graphene { namespace chain { class transaction_object; class block_summary_object; class account_transaction_history_object; + class chain_property_object; typedef object_id< implementation_ids, impl_global_property_object_type, global_property_object> global_property_id_type; typedef object_id< implementation_ids, impl_dynamic_global_property_object_type, dynamic_global_property_object> dynamic_global_property_id_type; @@ -208,6 +210,7 @@ namespace graphene { namespace chain { impl_account_transaction_history_object_type, account_transaction_history_object> account_transaction_history_id_type; typedef object_id< implementation_ids, impl_witness_schedule_object_type, witness_schedule_object > witness_schedule_id_type; + typedef object_id< implementation_ids, impl_chain_property_object_type, chain_property_object> chain_property_id_type; typedef fc::array symbol_type; typedef fc::ripemd160 block_id_type; @@ -285,6 +288,7 @@ FC_REFLECT_ENUM( graphene::chain::impl_object_type, (impl_account_transaction_history_object_type) (impl_witness_schedule_object_type) (impl_blinded_balance_object_type) + (impl_chain_property_object_type) ) FC_REFLECT_ENUM( graphene::chain::meta_info_object_type, (meta_account_object_type)(meta_asset_object_type) ) diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp index 5e697667..0eefe792 100644 --- a/libraries/wallet/wallet.cpp +++ b/libraries/wallet/wallet.cpp @@ -462,6 +462,7 @@ public: variant info() const { + auto chain_props = get_chain_properties(); auto global_props = get_global_properties(); auto dynamic_props = get_dynamic_global_properties(); fc::mutable_variant_object result; @@ -471,12 +472,16 @@ public: time_point_sec(time_point::now()), " old"); result["next_maintenance_time"] = fc::get_approximate_relative_time_string(dynamic_props.next_maintenance_time); - result["chain_id"] = global_props.chain_id; + result["chain_id"] = chain_props.chain_id; result["active_witnesses"] = global_props.active_witnesses; result["active_committee_members"] = global_props.active_committee_members; result["entropy"] = dynamic_props.random; return result; } + chain_property_object get_chain_properties() const + { + return _remote_db->get_chain_properties(); + } global_property_object get_global_properties() const { return _remote_db->get_global_properties(); diff --git a/tests/tests/operation_tests2.cpp b/tests/tests/operation_tests2.cpp index d7d9f299..28192b2e 100644 --- a/tests/tests/operation_tests2.cpp +++ b/tests/tests/operation_tests2.cpp @@ -1204,7 +1204,7 @@ BOOST_AUTO_TEST_CASE(transfer_with_memo) { op.memo = memo_data(); op.memo->set_message(alice_private_key, bob_public_key, "Dear Bob,\n\nMoney!\n\nLove, Alice"); trx.operations = {op}; - trx.sign(alice_private_key, db.get_global_properties().chain_id); + trx.sign(alice_private_key, db.get_chain_id()); db.push_transaction(trx); BOOST_CHECK_EQUAL(get_balance(alice_id, asset_id_type()), 500); From 73cc012db90fce64671a6669af3cd7671a49be28 Mon Sep 17 00:00:00 2001 From: Vikram Rajkumar Date: Mon, 17 Aug 2015 13:52:45 -0400 Subject: [PATCH 197/353] Allow restarting block production with dummy checkpoint --- docs | 2 +- libraries/chain/db_block.cpp | 18 +++--------------- libraries/chain/db_update.cpp | 8 ++++++-- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/docs b/docs index cdc8ea81..f42a917c 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit cdc8ea8133a999afef8051700a4ce8edb0988ec4 +Subproject commit f42a917c0cb93784567d649be60d610469c33ee0 diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index a91ba696..b84a7995 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -357,26 +357,14 @@ const vector& database::get_applied_operations() const void database::apply_block( const signed_block& next_block, uint32_t skip ) { auto block_num = next_block.block_num(); - if( _checkpoints.size() ) + if( _checkpoints.size() && _checkpoints.rbegin()->second != block_id_type() ) { auto itr = _checkpoints.find( block_num ); if( itr != _checkpoints.end() ) FC_ASSERT( next_block.id() == itr->second, "Block did not match checkpoint", ("checkpoint",*itr)("block_id",next_block.id()) ); - auto last = _checkpoints.rbegin(); - if( last->first >= block_num ) - { - // WE CAN SKIP ALMOST EVERYTHING - skip = ~0; - - /** clear the recently missed count because the checkpoint indicates that - * we will never have to go back further than this. - */ - const auto& _dgp = dynamic_global_property_id_type(0)(*this); - modify( _dgp, [&]( dynamic_global_property_object& dgp ){ - dgp.recently_missed_count = 0; - }); - } + if( _checkpoints.rbegin()->first >= block_num ) + skip = ~0;// WE CAN SKIP ALMOST EVERYTHING } with_skip_flags( skip, [&]() diff --git a/libraries/chain/db_update.cpp b/libraries/chain/db_update.cpp index 4370d81b..d8328b13 100644 --- a/libraries/chain/db_update.cpp +++ b/libraries/chain/db_update.cpp @@ -49,8 +49,12 @@ void database::update_global_dynamic_data( const signed_block& b ) fc::raw::pack( enc, b.previous_secret ); dgp.random = enc.result(); - if( missed_blocks ) - dgp.recently_missed_count += 2*missed_blocks; + if( _checkpoints.size() && _checkpoints.rbegin()->first >= b.block_num() ) + dgp.recently_missed_count = 0; + else if( missed_blocks ) + dgp.recently_missed_count += 4*missed_blocks; + else if( dgp.recently_missed_count > 4 ) + dgp.recently_missed_count -= 3; else if( dgp.recently_missed_count > 0 ) dgp.recently_missed_count--; From 29b7f343a69e9b6f121986e87913b5c12501e889 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Mon, 17 Aug 2015 13:14:03 -0400 Subject: [PATCH 198/353] Remove chain_id from global_property_object --- libraries/chain/db_init.cpp | 1 - .../chain/include/graphene/chain/global_property_object.hpp | 3 --- 2 files changed, 4 deletions(-) diff --git a/libraries/chain/db_init.cpp b/libraries/chain/db_init.cpp index e043588f..edc7c65f 100644 --- a/libraries/chain/db_init.cpp +++ b/libraries/chain/db_init.cpp @@ -307,7 +307,6 @@ void database::init_genesis(const genesis_state_type& genesis_state) // Create global properties create([&](global_property_object& p) { - p.chain_id = chain_id; p.parameters = genesis_state.initial_parameters; // Set fees to zero initially, so that genesis initialization needs not pay them // We'll fix it at the end of the function diff --git a/libraries/chain/include/graphene/chain/global_property_object.hpp b/libraries/chain/include/graphene/chain/global_property_object.hpp index 2771ffcc..dacb5ce2 100644 --- a/libraries/chain/include/graphene/chain/global_property_object.hpp +++ b/libraries/chain/include/graphene/chain/global_property_object.hpp @@ -47,8 +47,6 @@ namespace graphene { namespace chain { flat_set active_witnesses; // updated once per maintenance interval // n.b. witness scheduling is done by witness_schedule object flat_set witness_accounts; // updated once per maintenance interval - - chain_id_type chain_id; }; /** @@ -124,5 +122,4 @@ FC_REFLECT_DERIVED( graphene::chain::global_property_object, (graphene::db::obje (next_available_vote_id) (active_committee_members) (active_witnesses) - (chain_id) ) From a888c81ac4adcc43d46838f57ac3f9b165c07409 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Mon, 17 Aug 2015 14:11:39 -0400 Subject: [PATCH 199/353] worker_evaluator.hpp: Explicitly cast types in signed subtraction --- libraries/chain/include/graphene/chain/worker_evaluator.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/chain/include/graphene/chain/worker_evaluator.hpp b/libraries/chain/include/graphene/chain/worker_evaluator.hpp index 91b4da85..de32fa3a 100644 --- a/libraries/chain/include/graphene/chain/worker_evaluator.hpp +++ b/libraries/chain/include/graphene/chain/worker_evaluator.hpp @@ -128,7 +128,7 @@ namespace graphene { namespace chain { return now >= work_begin_date && now <= work_end_date; } share_type approving_stake(const vector& stake_vote_tallies)const { - return total_votes_for - total_votes_against;// stake_vote_tallies[vote_for] - stake_vote_tallies[vote_against]; + return int64_t( total_votes_for ) - int64_t( total_votes_against );// stake_vote_tallies[vote_for] - stake_vote_tallies[vote_against]; } }; From 4ecdea1ce2170373685f3d8d090c197c0d1f969d Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Mon, 17 Aug 2015 14:33:10 -0400 Subject: [PATCH 200/353] Move min_witness_count and min_committee_member_count from config.hpp to chain_properties #235 --- libraries/app/application.cpp | 3 +- libraries/chain/db_init.cpp | 5 +++ libraries/chain/db_maint.cpp | 6 ++- libraries/chain/get_config.cpp | 2 - .../graphene/chain/chain_property_object.hpp | 6 ++- .../chain/include/graphene/chain/config.hpp | 4 +- .../include/graphene/chain/genesis_state.hpp | 5 ++- .../chain/immutable_chain_parameters.hpp | 39 +++++++++++++++++++ 8 files changed, 61 insertions(+), 9 deletions(-) create mode 100644 libraries/chain/include/graphene/chain/immutable_chain_parameters.hpp diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp index d7e35936..51b861ed 100644 --- a/libraries/app/application.cpp +++ b/libraries/app/application.cpp @@ -70,7 +70,7 @@ namespace detail { dlog("Allocating all stake to ${key}", ("key", utilities::key_to_wif(nathan_key))); genesis_state_type initial_state; initial_state.initial_parameters.current_fees = fee_schedule::get_default();//->set_all_fees(GRAPHENE_BLOCKCHAIN_PRECISION); - initial_state.initial_active_witnesses = 10; + initial_state.initial_active_witnesses = GRAPHENE_DEFAULT_MIN_WITNESS_COUNT; initial_state.initial_timestamp = time_point_sec(time_point::now().sec_since_epoch() / initial_state.initial_parameters.block_interval * initial_state.initial_parameters.block_interval); @@ -89,6 +89,7 @@ namespace detail { initial_state.initial_balances.push_back({nathan_key.get_public_key(), GRAPHENE_SYMBOL, GRAPHENE_MAX_SHARE_SUPPLY}); + return initial_state; } diff --git a/libraries/chain/db_init.cpp b/libraries/chain/db_init.cpp index edc7c65f..3b7a07f3 100644 --- a/libraries/chain/db_init.cpp +++ b/libraries/chain/db_init.cpp @@ -318,9 +318,14 @@ void database::init_genesis(const genesis_state_type& genesis_state) p.dynamic_flags = 0; p.witness_budget = 0; }); + + FC_ASSERT( (genesis_state.immutable_parameters.min_witness_count & 1) == 1, "min_witness_count must be odd" ); + FC_ASSERT( (genesis_state.immutable_parameters.min_committee_member_count & 1) == 1, "min_committee_member_count must be odd" ); + create([&](chain_property_object& p) { p.chain_id = chain_id; + p.immutable_parameters = genesis_state.immutable_parameters; } ); create([&](block_summary_object&) {}); diff --git a/libraries/chain/db_maint.cpp b/libraries/chain/db_maint.cpp index ca080360..1648906b 100644 --- a/libraries/chain/db_maint.cpp +++ b/libraries/chain/db_maint.cpp @@ -150,7 +150,8 @@ void database::update_active_witnesses() && (stake_tally <= stake_target) ) stake_tally += _witness_count_histogram_buffer[++witness_count]; - auto wits = sort_votable_objects(std::max(witness_count*2+1, (size_t)GRAPHENE_MIN_WITNESS_COUNT)); + const chain_property_object& cpo = get_chain_properties(); + auto wits = sort_votable_objects(std::max(witness_count*2+1, (size_t)cpo.immutable_parameters.min_witness_count)); const global_property_object& gpo = get_global_properties(); for( const witness_object& wit : wits ) @@ -223,7 +224,8 @@ void database::update_active_committee_members() && (stake_tally <= stake_target) ) stake_tally += _committee_count_histogram_buffer[++committee_member_count]; - auto committee_members = sort_votable_objects(std::max(committee_member_count*2+1, (size_t)GRAPHENE_MIN_COMMITTEE_MEMBER_COUNT)); + const chain_property_object& cpo = get_chain_properties(); + auto committee_members = sort_votable_objects(std::max(committee_member_count*2+1, (size_t)cpo.immutable_parameters.min_committee_member_count)); for( const committee_member_object& del : committee_members ) { diff --git a/libraries/chain/get_config.cpp b/libraries/chain/get_config.cpp index a6fbc478..61f84f52 100644 --- a/libraries/chain/get_config.cpp +++ b/libraries/chain/get_config.cpp @@ -36,8 +36,6 @@ fc::variant_object get_config() result[ "GRAPHENE_MAX_SHARE_SUPPLY" ] = GRAPHENE_MAX_SHARE_SUPPLY; result[ "GRAPHENE_MAX_PAY_RATE" ] = GRAPHENE_MAX_PAY_RATE; result[ "GRAPHENE_MAX_SIG_CHECK_DEPTH" ] = GRAPHENE_MAX_SIG_CHECK_DEPTH; - result[ "GRAPHENE_MIN_WITNESS_COUNT" ] = GRAPHENE_MIN_WITNESS_COUNT; - result[ "GRAPHENE_MIN_COMMITTEE_MEMBER_COUNT" ] = GRAPHENE_MIN_COMMITTEE_MEMBER_COUNT; result[ "GRAPHENE_MIN_TRANSACTION_SIZE_LIMIT" ] = GRAPHENE_MIN_TRANSACTION_SIZE_LIMIT; result[ "GRAPHENE_MIN_BLOCK_INTERVAL" ] = GRAPHENE_MIN_BLOCK_INTERVAL; result[ "GRAPHENE_MAX_BLOCK_INTERVAL" ] = GRAPHENE_MAX_BLOCK_INTERVAL; diff --git a/libraries/chain/include/graphene/chain/chain_property_object.hpp b/libraries/chain/include/graphene/chain/chain_property_object.hpp index 2b8a8054..2f629b4c 100644 --- a/libraries/chain/include/graphene/chain/chain_property_object.hpp +++ b/libraries/chain/include/graphene/chain/chain_property_object.hpp @@ -17,6 +17,8 @@ */ #pragma once +#include + namespace graphene { namespace chain { class chain_property_object; @@ -29,12 +31,14 @@ class chain_property_object : public abstract_object public: static const uint8_t space_id = implementation_ids; static const uint8_t type_id = impl_chain_property_object_type; - + chain_id_type chain_id; + immutable_chain_parameters immutable_parameters; }; } } FC_REFLECT_DERIVED( graphene::chain::chain_property_object, (graphene::db::object), (chain_id) + (immutable_parameters) ) diff --git a/libraries/chain/include/graphene/chain/config.hpp b/libraries/chain/include/graphene/chain/config.hpp index 7d2c6570..ac482b89 100644 --- a/libraries/chain/include/graphene/chain/config.hpp +++ b/libraries/chain/include/graphene/chain/config.hpp @@ -31,8 +31,6 @@ #define GRAPHENE_MAX_SHARE_SUPPLY int64_t(1000000000000000ll) #define GRAPHENE_MAX_PAY_RATE 10000 /* 100% */ #define GRAPHENE_MAX_SIG_CHECK_DEPTH 2 -#define GRAPHENE_MIN_WITNESS_COUNT 10 -#define GRAPHENE_MIN_COMMITTEE_MEMBER_COUNT 10 /** * Don't allow the committee_members to publish a limit that would * make the network unable to operate. @@ -89,6 +87,8 @@ #define GRAPHENE_DEFAULT_NUM_WITNESSES (101) #define GRAPHENE_DEFAULT_NUM_COMMITTEE (11) +#define GRAPHENE_DEFAULT_MIN_WITNESS_COUNT (11) +#define GRAPHENE_DEFAULT_MIN_COMMITTEE_MEMBER_COUNT (11) #define GRAPHENE_DEFAULT_MAX_WITNESSES (1001) // SHOULD BE ODD #define GRAPHENE_DEFAULT_MAX_COMMITTEE (1001) // SHOULD BE ODD #define GRAPHENE_DEFAULT_MAX_PROPOSAL_LIFETIME_SEC (60*60*24*7*4) // Four weeks diff --git a/libraries/chain/include/graphene/chain/genesis_state.hpp b/libraries/chain/include/graphene/chain/genesis_state.hpp index ee9b2803..fafd3017 100644 --- a/libraries/chain/include/graphene/chain/genesis_state.hpp +++ b/libraries/chain/include/graphene/chain/genesis_state.hpp @@ -2,6 +2,7 @@ #include #include +#include #include @@ -78,6 +79,7 @@ struct genesis_state_type { time_point_sec initial_timestamp; share_type max_core_supply = GRAPHENE_MAX_SHARE_SUPPLY; chain_parameters initial_parameters; + immutable_chain_parameters immutable_parameters; vector initial_accounts; vector initial_assets; vector initial_balances; @@ -120,4 +122,5 @@ FC_REFLECT(graphene::chain::genesis_state_type::initial_worker_type, (owner_name FC_REFLECT(graphene::chain::genesis_state_type, (initial_timestamp)(max_core_supply)(initial_parameters)(initial_accounts)(initial_assets)(initial_balances) (initial_vesting_balances)(initial_active_witnesses)(initial_witness_candidates) - (initial_committee_candidates)(initial_worker_candidates)) + (initial_committee_candidates)(initial_worker_candidates) + (immutable_parameters)) diff --git a/libraries/chain/include/graphene/chain/immutable_chain_parameters.hpp b/libraries/chain/include/graphene/chain/immutable_chain_parameters.hpp new file mode 100644 index 00000000..46bfa934 --- /dev/null +++ b/libraries/chain/include/graphene/chain/immutable_chain_parameters.hpp @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2015, Cryptonomex, Inc. + * All rights reserved. + * + * This source code is provided for evaluation in private test networks only, until September 8, 2015. After this date, this license expires and + * the code may not be used, modified or distributed for any purpose. Redistribution and use in source and binary forms, with or without modification, + * are permitted until September 8, 2015, provided that the following conditions are met: + * + * 1. The code and/or derivative works are used only for private test networks consisting of no more than 10 P2P nodes. + * + * 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. + */ +#pragma once + +#include + +#include + +#include + +namespace graphene { namespace chain { + +struct immutable_chain_parameters +{ + uint16_t min_committee_member_count = GRAPHENE_DEFAULT_MIN_COMMITTEE_MEMBER_COUNT; + uint16_t min_witness_count = GRAPHENE_DEFAULT_MIN_WITNESS_COUNT; +}; + +} } // graphene::chain + +FC_REFLECT( graphene::chain::immutable_chain_parameters, + (min_committee_member_count) + (min_witness_count) +) From 2212cfe95b86f68aea1e2022074504cd07a24470 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Mon, 17 Aug 2015 15:00:59 -0400 Subject: [PATCH 201/353] config.hpp: Remove unused constants GRAPHENE_DEFAULT_NUM_WITNESSES, GRAPHENE_DEFAULT_NUM_COMMITTEE --- libraries/chain/get_config.cpp | 2 -- libraries/chain/include/graphene/chain/config.hpp | 2 -- libraries/chain/include/graphene/chain/genesis_state.hpp | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/libraries/chain/get_config.cpp b/libraries/chain/get_config.cpp index 61f84f52..ada12de2 100644 --- a/libraries/chain/get_config.cpp +++ b/libraries/chain/get_config.cpp @@ -71,8 +71,6 @@ fc::variant_object get_config() result[ "GRAPHENE_DEFAULT_MAINTENANCE_COLLATERAL_RATIO" ] = GRAPHENE_DEFAULT_MAINTENANCE_COLLATERAL_RATIO; result[ "GRAPHENE_DEFAULT_MAX_SHORT_SQUEEZE_RATIO" ] = GRAPHENE_DEFAULT_MAX_SHORT_SQUEEZE_RATIO; result[ "GRAPHENE_DEFAULT_MARGIN_PERIOD_SEC" ] = GRAPHENE_DEFAULT_MARGIN_PERIOD_SEC; - result[ "GRAPHENE_DEFAULT_NUM_WITNESSES" ] = GRAPHENE_DEFAULT_NUM_WITNESSES; - result[ "GRAPHENE_DEFAULT_NUM_COMMITTEE" ] = GRAPHENE_DEFAULT_NUM_COMMITTEE; result[ "GRAPHENE_DEFAULT_MAX_WITNESSES" ] = GRAPHENE_DEFAULT_MAX_WITNESSES; result[ "GRAPHENE_DEFAULT_MAX_COMMITTEE" ] = GRAPHENE_DEFAULT_MAX_COMMITTEE; result[ "GRAPHENE_DEFAULT_MAX_PROPOSAL_LIFETIME_SEC" ] = GRAPHENE_DEFAULT_MAX_PROPOSAL_LIFETIME_SEC; diff --git a/libraries/chain/include/graphene/chain/config.hpp b/libraries/chain/include/graphene/chain/config.hpp index ac482b89..f77f7144 100644 --- a/libraries/chain/include/graphene/chain/config.hpp +++ b/libraries/chain/include/graphene/chain/config.hpp @@ -85,8 +85,6 @@ ///@} #define GRAPHENE_DEFAULT_MARGIN_PERIOD_SEC (30*60*60*24) -#define GRAPHENE_DEFAULT_NUM_WITNESSES (101) -#define GRAPHENE_DEFAULT_NUM_COMMITTEE (11) #define GRAPHENE_DEFAULT_MIN_WITNESS_COUNT (11) #define GRAPHENE_DEFAULT_MIN_COMMITTEE_MEMBER_COUNT (11) #define GRAPHENE_DEFAULT_MAX_WITNESSES (1001) // SHOULD BE ODD diff --git a/libraries/chain/include/graphene/chain/genesis_state.hpp b/libraries/chain/include/graphene/chain/genesis_state.hpp index fafd3017..5780acdc 100644 --- a/libraries/chain/include/graphene/chain/genesis_state.hpp +++ b/libraries/chain/include/graphene/chain/genesis_state.hpp @@ -84,7 +84,7 @@ struct genesis_state_type { vector initial_assets; vector initial_balances; vector initial_vesting_balances; - uint64_t initial_active_witnesses = GRAPHENE_DEFAULT_NUM_WITNESSES; + uint64_t initial_active_witnesses; vector initial_witness_candidates; vector initial_committee_candidates; vector initial_worker_candidates; From 2244e467ed64ca3af86c10c931c1a9fd21234a5a Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Mon, 17 Aug 2015 11:44:11 -0400 Subject: [PATCH 202/353] Fix whitespace --- libraries/chain/db_block.cpp | 16 ++--- libraries/chain/fork_database.cpp | 59 ++++++++++--------- .../include/graphene/chain/fork_database.hpp | 23 ++++---- 3 files changed, 51 insertions(+), 47 deletions(-) diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index b84a7995..1f01d76f 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -85,10 +85,10 @@ bool database::push_block(const signed_block& new_block, uint32_t skip) { bool result; - with_skip_flags( skip, [&]() + with_skip_flags(skip, [&]() { - result = _push_block( new_block ); - } ); + result = _push_block(new_block); + }); return result; } @@ -293,7 +293,7 @@ signed_block database::_generate_block( _pending_block.transactions.clear(); bool failed = false; - try { push_block( tmp, skip ); } + try { push_block( tmp, skip ); } catch ( const undo_database_exception& e ) { throw; } catch ( const fc::exception& e ) { failed = true; } if( failed ) @@ -443,7 +443,7 @@ void database::notify_changed_objects() for( const auto& item : head_undo.new_ids ) changed_ids.push_back(item); vector removed; removed.reserve( head_undo.removed.size() ); - for( const auto& item : head_undo.removed ) + for( const auto& item : head_undo.removed ) { changed_ids.push_back( item.first ); removed.emplace_back( item.second.get() ); @@ -491,12 +491,12 @@ processed_transaction database::_apply_transaction(const signed_transaction& trx //Verify TaPoS block summary has correct ID prefix, and that this block's time is not past the expiration FC_ASSERT( trx.ref_block_prefix == tapos_block_summary.block_id._hash[1] ); - } - + } + FC_ASSERT( trx.expiration <= _pending_block.timestamp + chain_parameters.maximum_time_until_expiration, "", ("trx.expiration",trx.expiration)("_pending_block.timestamp",_pending_block.timestamp)("max_til_exp",chain_parameters.maximum_time_until_expiration)); FC_ASSERT( _pending_block.timestamp <= trx.expiration, "", ("pending.timestamp",_pending_block.timestamp)("trx.exp",trx.expiration) ); - } + } //Insert transaction into unique transactions database. if( !(skip & skip_transaction_dupe_check) ) diff --git a/libraries/chain/fork_database.cpp b/libraries/chain/fork_database.cpp index 4be19289..d11e34ca 100644 --- a/libraries/chain/fork_database.cpp +++ b/libraries/chain/fork_database.cpp @@ -34,48 +34,48 @@ void fork_database::pop_block() if( _head ) _head = _head->prev.lock(); } -void fork_database::start_block( signed_block b ) +void fork_database::start_block(signed_block b) { - auto item = std::make_shared( std::move(b) ); - _index.insert( item ); + auto item = std::make_shared(std::move(b)); + _index.insert(item); _head = item; } -shared_ptr fork_database::push_block( const signed_block& b ) +shared_ptr fork_database::push_block(const signed_block& b) { - auto item = std::make_shared( b ); + auto item = std::make_shared(b); if( _head && b.previous != block_id_type() ) { - auto itr = _index.get().find( b.previous ); - FC_ASSERT( itr != _index.get().end() ); - FC_ASSERT( !(*itr)->invalid ); + auto itr = _index.get().find(b.previous); + FC_ASSERT(itr != _index.get().end()); + FC_ASSERT(!(*itr)->invalid); item->prev = *itr; } - _index.insert( item ); + _index.insert(item); if( !_head ) _head = item; else if( item->num > _head->num ) { _head = item; - _index.get().erase( _head->num - 1024 ); + _index.get().erase(_head->num - 1024); } return _head; } -bool fork_database::is_known_block( const block_id_type& id )const +bool fork_database::is_known_block(const block_id_type& id)const { auto& index = _index.get(); auto itr = index.find(id); return itr != index.end(); } -item_ptr fork_database::fetch_block( const block_id_type& id )const +item_ptr fork_database::fetch_block(const block_id_type& id)const { auto itr = _index.get().find(id); if( itr != _index.get().end() ) return *itr; return item_ptr(); } -vector fork_database::fetch_block_by_number( uint32_t num )const +vector fork_database::fetch_block_by_number(uint32_t num)const { vector result; auto itr = _index.get().find(num); @@ -91,48 +91,53 @@ vector fork_database::fetch_block_by_number( uint32_t num )const } pair - fork_database::fetch_branch_from( block_id_type first, block_id_type second )const + fork_database::fetch_branch_from(block_id_type first, block_id_type second)const { try { pair result; auto first_branch_itr = _index.get().find(first); - FC_ASSERT( first_branch_itr != _index.get().end() ); + FC_ASSERT(first_branch_itr != _index.get().end()); auto first_branch = *first_branch_itr; auto second_branch_itr = _index.get().find(second); - FC_ASSERT( second_branch_itr != _index.get().end() ); + FC_ASSERT(second_branch_itr != _index.get().end()); auto second_branch = *second_branch_itr; while( first_branch->data.block_num() > second_branch->data.block_num() ) { - result.first.push_back( first_branch ); - first_branch = first_branch->prev.lock(); FC_ASSERT( first_branch ); + result.first.push_back(first_branch); + first_branch = first_branch->prev.lock(); + FC_ASSERT(first_branch); } while( second_branch->data.block_num() > first_branch->data.block_num() ) { result.second.push_back( second_branch ); - second_branch = second_branch->prev.lock(); FC_ASSERT( second_branch ); + second_branch = second_branch->prev.lock(); + FC_ASSERT(second_branch); } while( first_branch->data.previous != second_branch->data.previous ) { - result.first.push_back( first_branch ); - result.second.push_back( second_branch ); - first_branch = first_branch->prev.lock(); FC_ASSERT( first_branch ); - second_branch = second_branch->prev.lock(); FC_ASSERT( second_branch ); + result.first.push_back(first_branch); + result.second.push_back(second_branch); + first_branch = first_branch->prev.lock(); + FC_ASSERT(first_branch); + second_branch = second_branch->prev.lock(); + FC_ASSERT(second_branch); } if( first_branch && second_branch ) { - result.first.push_back( first_branch ); - result.second.push_back( second_branch ); + result.first.push_back(first_branch); + result.second.push_back(second_branch); } return result; } FC_CAPTURE_AND_RETHROW( (first)(second) ) } -void fork_database::set_head( shared_ptr h ) + +void fork_database::set_head(shared_ptr h) { _head = h; } -void fork_database::remove( block_id_type id ) +void fork_database::remove(block_id_type id) { _index.get().erase(id); } diff --git a/libraries/chain/include/graphene/chain/fork_database.hpp b/libraries/chain/include/graphene/chain/fork_database.hpp index cf79f955..7750d311 100644 --- a/libraries/chain/include/graphene/chain/fork_database.hpp +++ b/libraries/chain/include/graphene/chain/fork_database.hpp @@ -62,31 +62,30 @@ namespace graphene { namespace chain { fork_database(); void reset(); - void start_block( signed_block b ); - void remove( block_id_type b ); - void set_head( shared_ptr h ); - bool is_known_block( const block_id_type& id )const; - shared_ptr fetch_block( const block_id_type& id )const; - vector fetch_block_by_number( uint32_t n )const; - shared_ptr push_block(const signed_block& b ); + void start_block(signed_block b); + void remove(block_id_type b); + void set_head(shared_ptr h); + bool is_known_block(const block_id_type& id)const; + shared_ptr fetch_block(const block_id_type& id)const; + vector fetch_block_by_number(uint32_t n)const; + shared_ptr push_block(const signed_block& b); shared_ptr head()const { return _head; } void pop_block(); - /** * Given two head blocks, return two branches of the fork graph that * end with a common ancestor (same prior block) */ - pair< branch_type, branch_type > fetch_branch_from( block_id_type first, - block_id_type second )const; + pair< branch_type, branch_type > fetch_branch_from(block_id_type first, + block_id_type second)const; struct block_id; struct block_num; typedef multi_index_container< item_ptr, indexed_by< - hashed_unique< tag, member< fork_item, block_id_type, &fork_item::id>, std::hash >, - ordered_non_unique< tag, member > + hashed_unique, member, std::hash>, + ordered_non_unique, member> > > fork_multi_index_type; From baf6bfc17b32a1bf4ade567414b35baf5f3713c9 Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Mon, 17 Aug 2015 14:21:30 -0400 Subject: [PATCH 203/353] Progress #237: Begin work on delayed_node_plugin --- libraries/plugins/CMakeLists.txt | 1 + libraries/plugins/delayed_node/CMakeLists.txt | 21 +++++ .../delayed_node/delayed_node_plugin.cpp | 89 +++++++++++++++++++ .../delayed_node/delayed_node_plugin.hpp | 44 +++++++++ 4 files changed, 155 insertions(+) create mode 100644 libraries/plugins/delayed_node/CMakeLists.txt create mode 100644 libraries/plugins/delayed_node/delayed_node_plugin.cpp create mode 100644 libraries/plugins/delayed_node/include/graphene/delayed_node/delayed_node_plugin.hpp diff --git a/libraries/plugins/CMakeLists.txt b/libraries/plugins/CMakeLists.txt index a8bf2c23..128d8aa1 100644 --- a/libraries/plugins/CMakeLists.txt +++ b/libraries/plugins/CMakeLists.txt @@ -1,3 +1,4 @@ add_subdirectory( witness ) add_subdirectory( account_history ) add_subdirectory( market_history ) +add_subdirectory( delayed_node ) diff --git a/libraries/plugins/delayed_node/CMakeLists.txt b/libraries/plugins/delayed_node/CMakeLists.txt new file mode 100644 index 00000000..63dd73e5 --- /dev/null +++ b/libraries/plugins/delayed_node/CMakeLists.txt @@ -0,0 +1,21 @@ +file(GLOB HEADERS "include/graphene/delayed_node/*.hpp") + +add_library( graphene_delayed_node + delayed_node_plugin.cpp + ) + +target_link_libraries( graphene_delayed_node graphene_chain graphene_app ) +target_include_directories( graphene_delayed_node + PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" ) + +if(MSVC) + set_source_files_properties( delayed_node_plugin.cpp PROPERTIES COMPILE_FLAGS "/bigobj" ) +endif(MSVC) + +install( TARGETS + graphene_delayed_node + + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) diff --git a/libraries/plugins/delayed_node/delayed_node_plugin.cpp b/libraries/plugins/delayed_node/delayed_node_plugin.cpp new file mode 100644 index 00000000..de3a6e7f --- /dev/null +++ b/libraries/plugins/delayed_node/delayed_node_plugin.cpp @@ -0,0 +1,89 @@ +/* + * Copyright (c) 2015, Cryptonomex, Inc. + * All rights reserved. + * + * This source code is provided for evaluation in private test networks only, until September 8, 2015. After this date, this license expires and + * the code may not be used, modified or distributed for any purpose. Redistribution and use in source and binary forms, with or without modification, + * are permitted until September 8, 2015, provided that the following conditions are met: + * + * 1. The code and/or derivative works are used only for private test networks consisting of no more than 10 P2P nodes. + * + * 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 +#include + +#include +#include +#include + +namespace graphene { namespace delayed_node { +namespace bpo = boost::program_options; + +namespace detail { +struct delayed_node_plugin_impl { + std::string remote_endpoint; + int delay_blocks; + std::shared_ptr client_connection; + fc::api database_api; + boost::signals2::scoped_connection client_connection_closed; +}; +} + +delayed_node_plugin::delayed_node_plugin() + : my(new detail::delayed_node_plugin_impl) +{} + +void delayed_node_plugin::plugin_set_program_options(bpo::options_description&, bpo::options_description& cfg) +{ + cfg.add_options() + ("trusted_node", boost::program_options::value()->required(), "RPC endpoint of a trusted validating node") + ("delay_block_count", boost::program_options::value()->required(), "Number of blocks to delay before advancing chain state") + ; + +} + +void delayed_node_plugin::connect() +{ + fc::http::websocket_client client; + my->client_connection = std::make_shared(*client.connect(my->remote_endpoint)); + my->database_api = my->client_connection->get_remote_api(0); + my->client_connection_closed = my->client_connection->closed.connect([this] { + connection_failed(); + }); +} + +void delayed_node_plugin::plugin_initialize(const boost::program_options::variables_map& options) +{ + my->remote_endpoint = options.at("trusted_node").as(); + my->delay_blocks = options.at("delay_block_count").as(); + + try { + connect(); + } catch (const fc::exception& e) { + elog("Error during connection: ${e}", ("e", e.to_detail_string())); + connection_failed(); + } +} + +void delayed_node_plugin::connection_failed() +{ + elog("Connection to trusted node failed; retrying in 5 seconds..."); + fc::usleep(fc::seconds(5)); + + try { + connect(); + } catch (const fc::exception& e) { + elog("Error during connection: ${e}", ("e", e.to_detail_string())); + fc::async([this]{connection_failed();}); + } +} + +} } diff --git a/libraries/plugins/delayed_node/include/graphene/delayed_node/delayed_node_plugin.hpp b/libraries/plugins/delayed_node/include/graphene/delayed_node/delayed_node_plugin.hpp new file mode 100644 index 00000000..0ab64ad0 --- /dev/null +++ b/libraries/plugins/delayed_node/include/graphene/delayed_node/delayed_node_plugin.hpp @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2015, Cryptonomex, Inc. + * All rights reserved. + * + * This source code is provided for evaluation in private test networks only, until September 8, 2015. After this date, this license expires and + * the code may not be used, modified or distributed for any purpose. Redistribution and use in source and binary forms, with or without modification, + * are permitted until September 8, 2015, provided that the following conditions are met: + * + * 1. The code and/or derivative works are used only for private test networks consisting of no more than 10 P2P nodes. + * + * 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. + */ +#pragma once + +#include + +namespace graphene { namespace delayed_node { +namespace detail { struct delayed_node_plugin_impl; } + +class delayed_node_plugin : public graphene::app::plugin +{ + std::unique_ptr my; +public: + delayed_node_plugin(); + virtual ~delayed_node_plugin(){} + + std::string plugin_name()const override { return "delayed_node"; } + virtual void plugin_set_program_options(boost::program_options::options_description&, + boost::program_options::options_description& cfg) override; + virtual void plugin_initialize(const boost::program_options::variables_map& options) override; + virtual void plugin_startup() override; + +protected: + void connection_failed(); + void connect(); +}; + +} } //graphene::account_history + From 5aa884c57487ab37fbfde83f40ffb5a85322a3b6 Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Mon, 17 Aug 2015 16:37:53 -0400 Subject: [PATCH 204/353] #237: Create new delayed_node app Delayed node is much like witness_node, except it doesn't have support for block productuion (thus cannot be a witness) and it is not intended to use the P2P network. The delayed node requires a trusted node it can connect to via RPC and download blocks from. The delayed node will only download blocks from the trusted node if those blocks have received a configurable number of confirmations. This commit effectively resolves #237 --- libraries/app/include/graphene/app/api.hpp | 6 +- .../delayed_node/delayed_node_plugin.cpp | 63 +++- .../delayed_node/delayed_node_plugin.hpp | 3 +- programs/CMakeLists.txt | 1 + programs/delayed_node/CMakeLists.txt | 21 ++ programs/delayed_node/main.cpp | 286 ++++++++++++++++++ 6 files changed, 360 insertions(+), 20 deletions(-) create mode 100644 programs/delayed_node/CMakeLists.txt create mode 100644 programs/delayed_node/main.cpp diff --git a/libraries/app/include/graphene/app/api.hpp b/libraries/app/include/graphene/app/api.hpp index 639545eb..bf848a12 100644 --- a/libraries/app/include/graphene/app/api.hpp +++ b/libraries/app/include/graphene/app/api.hpp @@ -229,9 +229,9 @@ namespace graphene { namespace app { fc::optional get_witness_by_account(account_id_type account)const; /** - * @brief Given a set of votes, return the objects they are voting for. + * @brief Given a set of votes, return the objects they are voting for. * - * This will be a mixture of committee_member_object, witness_objects, and worker_objects + * This will be a mixture of committee_member_object, witness_objects, and worker_objects * * The results will be in the same order as the votes. Null will be returned for * any vote ids that are not found. @@ -355,7 +355,7 @@ namespace graphene { namespace app { /** * This method will return the set of all public keys that could possibly sign for a given transaction. This call can * be used by wallets to filter their set of public keys to just the relevant subset prior to calling @ref get_required_signatures - * to get the minimum subset. + * to get the minimum subset. */ set get_potential_signatures( const signed_transaction& trx )const; diff --git a/libraries/plugins/delayed_node/delayed_node_plugin.cpp b/libraries/plugins/delayed_node/delayed_node_plugin.cpp index de3a6e7f..9d648fea 100644 --- a/libraries/plugins/delayed_node/delayed_node_plugin.cpp +++ b/libraries/plugins/delayed_node/delayed_node_plugin.cpp @@ -31,9 +31,11 @@ namespace detail { struct delayed_node_plugin_impl { std::string remote_endpoint; int delay_blocks; + fc::http::websocket_client client; std::shared_ptr client_connection; fc::api database_api; boost::signals2::scoped_connection client_connection_closed; + bool currently_fetching = false; }; } @@ -41,19 +43,20 @@ delayed_node_plugin::delayed_node_plugin() : my(new detail::delayed_node_plugin_impl) {} +delayed_node_plugin::~delayed_node_plugin() +{} + void delayed_node_plugin::plugin_set_program_options(bpo::options_description&, bpo::options_description& cfg) { cfg.add_options() - ("trusted_node", boost::program_options::value()->required(), "RPC endpoint of a trusted validating node") - ("delay_block_count", boost::program_options::value()->required(), "Number of blocks to delay before advancing chain state") + ("trusted-node", boost::program_options::value()->required(), "RPC endpoint of a trusted validating node (required)") + ("delay-block-count", boost::program_options::value()->required(), "Number of blocks to delay before advancing chain state (required)") ; - } void delayed_node_plugin::connect() { - fc::http::websocket_client client; - my->client_connection = std::make_shared(*client.connect(my->remote_endpoint)); + my->client_connection = std::make_shared(*my->client.connect(my->remote_endpoint)); my->database_api = my->client_connection->get_remote_api(0); my->client_connection_closed = my->client_connection->closed.connect([this] { connection_failed(); @@ -62,28 +65,56 @@ void delayed_node_plugin::connect() void delayed_node_plugin::plugin_initialize(const boost::program_options::variables_map& options) { - my->remote_endpoint = options.at("trusted_node").as(); - my->delay_blocks = options.at("delay_block_count").as(); + my->remote_endpoint = "ws://" + options.at("trusted-node").as(); + my->delay_blocks = options.at("delay-block-count").as(); +} +void delayed_node_plugin::sync_with_trusted_node(uint32_t remote_head_block_num) +{ + struct raii { + bool* target; + ~raii() { + *target = false; + } + }; + + if (my->currently_fetching) return; + raii releaser{&my->currently_fetching}; + my->currently_fetching = true; + + auto head_block = database().head_block_num(); + while (remote_head_block_num - head_block > my->delay_blocks) { + fc::optional block = my->database_api->get_block(++head_block); + FC_ASSERT(block, "Trusted node claims it has blocks it doesn't actually have."); + ilog("Pushing block #${n}", ("n", block->block_num())); + database().push_block(*block); + } +} + +void delayed_node_plugin::plugin_startup() +{ try { connect(); + + // Go ahead and get in sync now, before subscribing + chain::dynamic_global_property_object props = my->database_api->get_dynamic_global_properties(); + sync_with_trusted_node(props.head_block_number); + + my->database_api->subscribe_to_objects([this] (const fc::variant& v) { + auto props = v.as(); + sync_with_trusted_node(props.head_block_number); + }, {graphene::chain::dynamic_global_property_id_type()}); + return; } catch (const fc::exception& e) { elog("Error during connection: ${e}", ("e", e.to_detail_string())); - connection_failed(); } + fc::async([this]{connection_failed();}); } void delayed_node_plugin::connection_failed() { elog("Connection to trusted node failed; retrying in 5 seconds..."); - fc::usleep(fc::seconds(5)); - - try { - connect(); - } catch (const fc::exception& e) { - elog("Error during connection: ${e}", ("e", e.to_detail_string())); - fc::async([this]{connection_failed();}); - } + fc::schedule([this]{plugin_startup();}, fc::time_point::now() + fc::seconds(5)); } } } diff --git a/libraries/plugins/delayed_node/include/graphene/delayed_node/delayed_node_plugin.hpp b/libraries/plugins/delayed_node/include/graphene/delayed_node/delayed_node_plugin.hpp index 0ab64ad0..c25b1203 100644 --- a/libraries/plugins/delayed_node/include/graphene/delayed_node/delayed_node_plugin.hpp +++ b/libraries/plugins/delayed_node/include/graphene/delayed_node/delayed_node_plugin.hpp @@ -27,7 +27,7 @@ class delayed_node_plugin : public graphene::app::plugin std::unique_ptr my; public: delayed_node_plugin(); - virtual ~delayed_node_plugin(){} + virtual ~delayed_node_plugin(); std::string plugin_name()const override { return "delayed_node"; } virtual void plugin_set_program_options(boost::program_options::options_description&, @@ -38,6 +38,7 @@ public: protected: void connection_failed(); void connect(); + void sync_with_trusted_node(uint32_t remote_head_block_num); }; } } //graphene::account_history diff --git a/programs/CMakeLists.txt b/programs/CMakeLists.txt index 19267c02..75bb6af3 100644 --- a/programs/CMakeLists.txt +++ b/programs/CMakeLists.txt @@ -1,5 +1,6 @@ add_subdirectory( cli_wallet ) add_subdirectory( witness_node ) +add_subdirectory( delayed_node ) add_subdirectory( js_operation_serializer ) add_subdirectory( size_checker ) diff --git a/programs/delayed_node/CMakeLists.txt b/programs/delayed_node/CMakeLists.txt new file mode 100644 index 00000000..4dbe2bbf --- /dev/null +++ b/programs/delayed_node/CMakeLists.txt @@ -0,0 +1,21 @@ +add_executable( delayed_node main.cpp ) +if( UNIX AND NOT APPLE ) + set(rt_library rt ) +endif() + +find_package( Gperftools QUIET ) +if( GPERFTOOLS_FOUND ) + message( STATUS "Found gperftools; compiling delayed_node with TCMalloc") + list( APPEND PLATFORM_SPECIFIC_LIBS tcmalloc ) +endif() + +target_link_libraries( delayed_node + PRIVATE graphene_app graphene_account_history graphene_market_history graphene_delayed_node graphene_chain graphene_egenesis_full fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} ) + +install( TARGETS + delayed_node + + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) diff --git a/programs/delayed_node/main.cpp b/programs/delayed_node/main.cpp new file mode 100644 index 00000000..97a8b4ed --- /dev/null +++ b/programs/delayed_node/main.cpp @@ -0,0 +1,286 @@ +/* + * Copyright (c) 2015, Cryptonomex, Inc. + * All rights reserved. + * + * This source code is provided for evaluation in private test networks only, until September 8, 2015. After this date, this license expires and + * the code may not be used, modified or distributed for any purpose. Redistribution and use in source and binary forms, with or without modification, + * are permitted until September 8, 2015, provided that the following conditions are met: + * + * 1. The code and/or derivative works are used only for private test networks consisting of no more than 10 P2P nodes. + * + * 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 +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include +#include +#include +#include + +#include +#include + +#ifndef WIN32 +#include +#endif + +using namespace graphene; +namespace bpo = boost::program_options; + +void write_default_logging_config_to_stream(std::ostream& out); +fc::optional load_logging_config_from_ini_file(const fc::path& config_ini_filename); + +int main(int argc, char** argv) { + try { + app::application node; + bpo::options_description app_options("Graphene Delayed Node"); + bpo::options_description cfg_options("Graphene Delayed Node"); + app_options.add_options() + ("help,h", "Print this help message and exit.") + ("data-dir,d", bpo::value()->default_value("delayed_node_data_dir"), "Directory containing databases, configuration file, etc.") + ; + + bpo::variables_map options; + + auto delayed_plug = node.register_plugin(); + auto history_plug = node.register_plugin(); + auto market_history_plug = node.register_plugin(); + + try + { + bpo::options_description cli, cfg; + node.set_program_options(cli, cfg); + app_options.add(cli); + cfg_options.add(cfg); + bpo::store(bpo::parse_command_line(argc, argv, app_options), options); + } + catch (const boost::program_options::error& e) + { + std::cerr << "Error parsing command line: " << e.what() << "\n"; + return 1; + } + + if( options.count("help") ) + { + std::cout << app_options << "\n"; + return 0; + } + + fc::path data_dir; + if( options.count("data-dir") ) + { + data_dir = options["data-dir"].as(); + if( data_dir.is_relative() ) + data_dir = fc::current_path() / data_dir; + } + + fc::path config_ini_path = data_dir / "config.ini"; + // Create config file if not already present + if( !fc::exists(config_ini_path) ) + { + ilog("Writing new config file at ${path}", ("path", config_ini_path)); + if( !fc::exists(data_dir) ) + fc::create_directories(data_dir); + + std::ofstream out_cfg(config_ini_path.preferred_string()); + for( const boost::shared_ptr od : cfg_options.options() ) + { + if( !od->description().empty() ) + out_cfg << "# " << od->description() << "\n"; + boost::any store; + if( !od->semantic()->apply_default(store) ) + out_cfg << "# " << od->long_name() << " = \n"; + else { + auto example = od->format_parameter(); + if( example.empty() ) + // This is a boolean switch + out_cfg << od->long_name() << " = " << "false\n"; + else { + // The string is formatted "arg (=)" + example.erase(0, 6); + example.erase(example.length()-1); + out_cfg << od->long_name() << " = " << example << "\n"; + } + } + out_cfg << "\n"; + } + write_default_logging_config_to_stream(out_cfg); + out_cfg.close(); + // read the default logging config we just wrote out to the file and start using it + fc::optional logging_config = load_logging_config_from_ini_file(config_ini_path); + if (logging_config) + fc::configure_logging(*logging_config); + } + + // Parse configuration file + try { + bpo::store(bpo::parse_config_file(config_ini_path.preferred_string().c_str(), cfg_options, true), options); + // try to get logging options from the config file. + try + { + fc::optional logging_config = load_logging_config_from_ini_file(config_ini_path); + if (logging_config) + fc::configure_logging(*logging_config); + } + catch (const fc::exception&) + { + wlog("Error parsing logging config from config file ${config}, using default config", ("config", config_ini_path.preferred_string())); + } + + bpo::notify(options); + } catch( const boost::program_options::error& e ) { + elog("Error parsing configuration file: ${e}", ("e", e.what())); + return 1; + } + node.initialize(data_dir, options); + node.initialize_plugins( options ); + + node.startup(); + node.startup_plugins(); + + fc::promise::ptr exit_promise = new fc::promise("UNIX Signal Handler"); +#if defined __APPLE__ || defined __unix__ + fc::set_signal_handler([&exit_promise](int signal) { + exit_promise->set_value(signal); + }, SIGINT); +#endif + + ilog("Started delayed node on a chain with ${h} blocks.", ("h", node.chain_database()->head_block_num())); + ilog("Chain ID is ${id}", ("id", node.chain_database()->get_chain_id()) ); + + int signal = exit_promise->wait(); + ilog("Exiting from signal ${n}", ("n", signal)); + node.shutdown_plugins(); + return 0; + } catch( const fc::exception& e ) { + elog("Exiting with error:\n${e}", ("e", e.to_detail_string())); + return 1; + } +} + +// logging config is too complicated to be parsed by boost::program_options, +// so we do it by hand +// +// Currently, you can only specify the filenames and logging levels, which +// are all most users would want to change. At a later time, options can +// be added to control rotation intervals, compression, and other seldom- +// used features +void write_default_logging_config_to_stream(std::ostream& out) +{ + out << "# declare an appender named \"stderr\" that writes messages to the console\n" + "[log.console_appender.stderr]\n" + "stream=std_error\n\n" + "# declare an appender named \"p2p\" that writes messages to p2p.log\n" + "[log.file_appender.p2p]\n" + "filename=logs/p2p/p2p.log\n" + "# filename can be absolute or relative to this config file\n\n" + "# route any messages logged to the default logger to the \"stderr\" logger we\n" + "# declared above, if they are info level are higher\n" + "[logger.default]\n" + "level=info\n" + "appenders=stderr\n\n" + "# route messages sent to the \"p2p\" logger to the p2p appender declared above\n" + "[logger.p2p]\n" + "level=debug\n" + "appenders=p2p\n\n"; +} + +fc::optional load_logging_config_from_ini_file(const fc::path& config_ini_filename) +{ + try + { + fc::logging_config logging_config; + bool found_logging_config = false; + + boost::property_tree::ptree config_ini_tree; + boost::property_tree::ini_parser::read_ini(config_ini_filename.preferred_string().c_str(), config_ini_tree); + for (const auto& section : config_ini_tree) + { + const std::string& section_name = section.first; + const boost::property_tree::ptree& section_tree = section.second; + + const std::string console_appender_section_prefix = "log.console_appender."; + const std::string file_appender_section_prefix = "log.file_appender."; + const std::string logger_section_prefix = "logger."; + + if (boost::starts_with(section_name, console_appender_section_prefix)) + { + std::string console_appender_name = section_name.substr(console_appender_section_prefix.length()); + std::string stream_name = section_tree.get("stream"); + + // construct a default console appender config here + // stdout/stderr will be taken from ini file, everything else hard-coded here + fc::console_appender::config console_appender_config; + console_appender_config.level_colors.emplace_back( + fc::console_appender::level_color(fc::log_level::debug, + fc::console_appender::color::green)); + console_appender_config.level_colors.emplace_back( + fc::console_appender::level_color(fc::log_level::warn, + fc::console_appender::color::brown)); + console_appender_config.level_colors.emplace_back( + fc::console_appender::level_color(fc::log_level::error, + fc::console_appender::color::cyan)); + console_appender_config.stream = fc::variant(stream_name).as(); + logging_config.appenders.push_back(fc::appender_config(console_appender_name, "console", fc::variant(console_appender_config))); + found_logging_config = true; + } + else if (boost::starts_with(section_name, file_appender_section_prefix)) + { + std::string file_appender_name = section_name.substr(file_appender_section_prefix.length()); + fc::path file_name = section_tree.get("filename"); + if (file_name.is_relative()) + file_name = fc::absolute(config_ini_filename).parent_path() / file_name; + + + // construct a default file appender config here + // filename will be taken from ini file, everything else hard-coded here + fc::file_appender::config file_appender_config; + file_appender_config.filename = file_name; + file_appender_config.flush = true; + file_appender_config.rotate = true; + file_appender_config.rotation_interval = fc::hours(1); + file_appender_config.rotation_limit = fc::days(1); + logging_config.appenders.push_back(fc::appender_config(file_appender_name, "file", fc::variant(file_appender_config))); + found_logging_config = true; + } + else if (boost::starts_with(section_name, logger_section_prefix)) + { + std::string logger_name = section_name.substr(logger_section_prefix.length()); + std::string level_string = section_tree.get("level"); + std::string appenders_string = section_tree.get("appenders"); + fc::logger_config logger_config(logger_name); + logger_config.level = fc::variant(level_string).as(); + boost::split(logger_config.appenders, appenders_string, + boost::is_any_of(" ,"), + boost::token_compress_on); + logging_config.loggers.push_back(logger_config); + found_logging_config = true; + } + } + if (found_logging_config) + return logging_config; + else + return fc::optional(); + } + FC_RETHROW_EXCEPTIONS(warn, "") +} From 383db4c473363622cc92cbbe5677dab9a978ec64 Mon Sep 17 00:00:00 2001 From: Vikram Rajkumar Date: Mon, 17 Aug 2015 16:46:35 -0400 Subject: [PATCH 205/353] Save more values for testnet genesis --- testnet-shared-accounts.txt | 506 +++++++++++++++++++++++++++ testnet-shared-committee-members.txt | 204 +++++++++++ testnet-shared-witnesses.txt | 304 ++++++++++++++++ 3 files changed, 1014 insertions(+) create mode 100644 testnet-shared-committee-members.txt create mode 100644 testnet-shared-witnesses.txt diff --git a/testnet-shared-accounts.txt b/testnet-shared-accounts.txt index c3777468..99392365 100644 --- a/testnet-shared-accounts.txt +++ b/testnet-shared-accounts.txt @@ -1,3 +1,509 @@ + "initial_accounts": [{ + "name": "init0", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init1", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init2", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init3", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init4", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init5", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init6", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init7", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init8", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init9", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init10", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init11", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init12", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init13", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init14", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init15", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init16", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init17", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init18", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init19", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init20", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init21", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init22", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init23", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init24", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init25", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init26", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init27", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init28", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init29", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init30", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init31", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init32", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init33", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init34", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init35", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init36", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init37", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init38", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init39", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init40", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init41", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init42", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init43", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init44", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init45", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init46", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init47", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init48", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init49", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init50", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init51", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init52", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init53", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init54", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init55", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init56", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init57", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init58", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init59", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init60", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init61", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init62", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init63", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init64", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init65", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init66", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init67", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init68", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init69", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init70", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init71", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init72", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init73", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init74", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init75", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init76", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init77", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init78", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init79", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init80", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init81", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init82", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init83", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init84", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init85", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init86", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init87", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init88", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init89", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init90", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init91", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init92", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init93", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init94", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init95", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init96", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init97", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init98", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init99", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ + "name": "init100", + "owner_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "active_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV", + "is_lifetime_member": true + },{ "name": "dummy0", "owner_key": "BTS6qkMe8pHmQ4zUetLV1bbVKoQJYTNb1fSUbkQzuzpscYhonWpgk", "active_key": "BTS6qkMe8pHmQ4zUetLV1bbVKoQJYTNb1fSUbkQzuzpscYhonWpgk", diff --git a/testnet-shared-committee-members.txt b/testnet-shared-committee-members.txt new file mode 100644 index 00000000..7d7ae11b --- /dev/null +++ b/testnet-shared-committee-members.txt @@ -0,0 +1,204 @@ + "initial_committee_candidates": [{ + "owner_name": "init0" + },{ + "owner_name": "init1" + },{ + "owner_name": "init2" + },{ + "owner_name": "init3" + },{ + "owner_name": "init4" + },{ + "owner_name": "init5" + },{ + "owner_name": "init6" + },{ + "owner_name": "init7" + },{ + "owner_name": "init8" + },{ + "owner_name": "init9" + },{ + "owner_name": "init10" + },{ + "owner_name": "init11" + },{ + "owner_name": "init12" + },{ + "owner_name": "init13" + },{ + "owner_name": "init14" + },{ + "owner_name": "init15" + },{ + "owner_name": "init16" + },{ + "owner_name": "init17" + },{ + "owner_name": "init18" + },{ + "owner_name": "init19" + },{ + "owner_name": "init20" + },{ + "owner_name": "init21" + },{ + "owner_name": "init22" + },{ + "owner_name": "init23" + },{ + "owner_name": "init24" + },{ + "owner_name": "init25" + },{ + "owner_name": "init26" + },{ + "owner_name": "init27" + },{ + "owner_name": "init28" + },{ + "owner_name": "init29" + },{ + "owner_name": "init30" + },{ + "owner_name": "init31" + },{ + "owner_name": "init32" + },{ + "owner_name": "init33" + },{ + "owner_name": "init34" + },{ + "owner_name": "init35" + },{ + "owner_name": "init36" + },{ + "owner_name": "init37" + },{ + "owner_name": "init38" + },{ + "owner_name": "init39" + },{ + "owner_name": "init40" + },{ + "owner_name": "init41" + },{ + "owner_name": "init42" + },{ + "owner_name": "init43" + },{ + "owner_name": "init44" + },{ + "owner_name": "init45" + },{ + "owner_name": "init46" + },{ + "owner_name": "init47" + },{ + "owner_name": "init48" + },{ + "owner_name": "init49" + },{ + "owner_name": "init50" + },{ + "owner_name": "init51" + },{ + "owner_name": "init52" + },{ + "owner_name": "init53" + },{ + "owner_name": "init54" + },{ + "owner_name": "init55" + },{ + "owner_name": "init56" + },{ + "owner_name": "init57" + },{ + "owner_name": "init58" + },{ + "owner_name": "init59" + },{ + "owner_name": "init60" + },{ + "owner_name": "init61" + },{ + "owner_name": "init62" + },{ + "owner_name": "init63" + },{ + "owner_name": "init64" + },{ + "owner_name": "init65" + },{ + "owner_name": "init66" + },{ + "owner_name": "init67" + },{ + "owner_name": "init68" + },{ + "owner_name": "init69" + },{ + "owner_name": "init70" + },{ + "owner_name": "init71" + },{ + "owner_name": "init72" + },{ + "owner_name": "init73" + },{ + "owner_name": "init74" + },{ + "owner_name": "init75" + },{ + "owner_name": "init76" + },{ + "owner_name": "init77" + },{ + "owner_name": "init78" + },{ + "owner_name": "init79" + },{ + "owner_name": "init80" + },{ + "owner_name": "init81" + },{ + "owner_name": "init82" + },{ + "owner_name": "init83" + },{ + "owner_name": "init84" + },{ + "owner_name": "init85" + },{ + "owner_name": "init86" + },{ + "owner_name": "init87" + },{ + "owner_name": "init88" + },{ + "owner_name": "init89" + },{ + "owner_name": "init90" + },{ + "owner_name": "init91" + },{ + "owner_name": "init92" + },{ + "owner_name": "init93" + },{ + "owner_name": "init94" + },{ + "owner_name": "init95" + },{ + "owner_name": "init96" + },{ + "owner_name": "init97" + },{ + "owner_name": "init98" + },{ + "owner_name": "init99" + },{ + "owner_name": "init100" + } + ], diff --git a/testnet-shared-witnesses.txt b/testnet-shared-witnesses.txt new file mode 100644 index 00000000..c09b1329 --- /dev/null +++ b/testnet-shared-witnesses.txt @@ -0,0 +1,304 @@ + "initial_witness_candidates": [{ + "owner_name": "init0", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init1", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init2", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init3", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init4", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init5", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init6", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init7", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init8", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init9", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init10", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init11", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init12", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init13", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init14", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init15", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init16", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init17", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init18", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init19", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init20", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init21", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init22", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init23", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init24", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init25", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init26", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init27", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init28", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init29", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init30", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init31", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init32", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init33", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init34", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init35", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init36", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init37", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init38", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init39", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init40", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init41", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init42", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init43", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init44", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init45", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init46", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init47", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init48", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init49", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init50", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init51", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init52", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init53", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init54", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init55", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init56", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init57", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init58", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init59", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init60", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init61", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init62", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init63", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init64", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init65", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init66", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init67", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init68", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init69", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init70", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init71", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init72", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init73", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init74", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init75", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init76", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init77", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init78", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init79", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init80", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init81", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init82", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init83", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init84", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init85", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init86", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init87", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init88", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init89", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init90", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init91", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init92", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init93", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init94", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init95", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init96", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init97", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init98", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init99", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ + "owner_name": "init100", + "block_signing_key": "GPH6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV" + },{ From 9c2af06cc64718221487783c7b5b679c6bb847c6 Mon Sep 17 00:00:00 2001 From: Vikram Rajkumar Date: Mon, 17 Aug 2015 17:09:19 -0400 Subject: [PATCH 206/353] Fix Linux build --- libraries/plugins/delayed_node/delayed_node_plugin.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/plugins/delayed_node/delayed_node_plugin.cpp b/libraries/plugins/delayed_node/delayed_node_plugin.cpp index 9d648fea..d0461a39 100644 --- a/libraries/plugins/delayed_node/delayed_node_plugin.cpp +++ b/libraries/plugins/delayed_node/delayed_node_plugin.cpp @@ -23,6 +23,7 @@ #include #include #include +#include namespace graphene { namespace delayed_node { namespace bpo = boost::program_options; From d5cc6da54a4c78f26f0fce64e3ce016101794bfe Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Tue, 18 Aug 2015 10:50:06 -0400 Subject: [PATCH 207/353] adding proposed transactons to the result of get_full_account --- libraries/app/api.cpp | 12 ++++++++++++ libraries/app/include/graphene/app/full_account.hpp | 5 ++++- libraries/fc | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/libraries/app/api.cpp b/libraries/app/api.cpp index b587dba3..8c8f4512 100644 --- a/libraries/app/api.cpp +++ b/libraries/app/api.cpp @@ -276,6 +276,18 @@ namespace graphene { namespace app { { acnt.cashback_balance = account->cashback_balance(_db); } + // Add the account's proposals + const auto& proposal_idx = _db.get_index_type(); + const auto& pidx = dynamic_cast&>(proposal_idx); + const auto& proposals_by_account = pidx.get_secondary_index(); + auto required_approvals_itr = proposals_by_account._account_to_proposals.find( account->id ); + if( required_approvals_itr != proposals_by_account._account_to_proposals.end() ) + { + acnt.proposals.reserve( required_approvals_itr->second.size() ); + for( auto proposal_id : required_approvals_itr->second ) + acnt.proposals.push_back( proposal_id(_db) ); + } + // Add the account's balances auto balance_range = _db.get_index_type().indices().get().equal_range(account->id); diff --git a/libraries/app/include/graphene/app/full_account.hpp b/libraries/app/include/graphene/app/full_account.hpp index 3132a0ca..9967c11f 100644 --- a/libraries/app/include/graphene/app/full_account.hpp +++ b/libraries/app/include/graphene/app/full_account.hpp @@ -20,6 +20,7 @@ namespace graphene { namespace app { vector vesting_balances; vector limit_orders; vector call_orders; + vector proposals; }; } } @@ -35,4 +36,6 @@ FC_REFLECT( graphene::app::full_account, (balances) (vesting_balances) (limit_orders) - (call_orders) ) + (call_orders) + (proposals) + ) diff --git a/libraries/fc b/libraries/fc index 18ed468c..458b6017 160000 --- a/libraries/fc +++ b/libraries/fc @@ -1 +1 @@ -Subproject commit 18ed468c6f0b19bb1e322548d8be64d7faafe4e5 +Subproject commit 458b601774c36b702e2d4712320b5d53c6b2ee1c From 80f007faeb4016108ae95703ff62373776d286b4 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Tue, 18 Aug 2015 11:03:44 -0400 Subject: [PATCH 208/353] Fix #224 - Improve log messages - it is not an error to have the next slot be in the future, it happens every maitenance interval when the skip slots is greater than 0. - re-order the failure conditions to report configuration issues first, then other issues second. --- libraries/plugins/witness/witness.cpp | 41 ++++++++++++++------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/libraries/plugins/witness/witness.cpp b/libraries/plugins/witness/witness.cpp index 6380fba7..637447ee 100644 --- a/libraries/plugins/witness/witness.cpp +++ b/libraries/plugins/witness/witness.cpp @@ -185,10 +185,30 @@ void witness_plugin::block_production_loop() { // conditions needed to produce a block: + // we must control the witness scheduled to produce the next block. + if( _witnesses.find( scheduled_witness ) == _witnesses.end() ) { + return false; + } + + // we must know the private key corresponding to the witness's + // published block production key. + if( _private_keys.find( scheduled_key ) == _private_keys.end() ) { + elog("Not producing block because I don't have the private key for ${id}.", ("id", scheduled_key)); + return false; + } + + // the next block must be scheduled after the head block. + // if this check fails, the local clock has not advanced far + // enough from the head block. + if( slot == 0 ) { + ilog("Not producing block because next slot time is in the future (likely a maitenance block)."); + return false; + } + // block production must be enabled (i.e. witness must be synced) if( !_production_enabled ) { - elog("Not producing block because production is disabled."); + wlog("Not producing block because production is disabled until we receive a recent block (see: --enable-stale-production)"); return false; } @@ -200,19 +220,6 @@ void witness_plugin::block_production_loop() return false; } - // the next block must be scheduled after the head block. - // if this check fails, the local clock has not advanced far - // enough from the head block. - if( slot == 0 ) { - elog("Not producing block because head block time is in the future (is the system clock set correctly?)."); - return false; - } - - // we must control the witness scheduled to produce the next block. - if( _witnesses.find( scheduled_witness ) == _witnesses.end() ) { - return false; - } - // the local clock must be at least 1 second ahead of head_block_time. if( (now - db.head_block_time()).to_seconds() < GRAPHENE_MIN_BLOCK_INTERVAL ) { elog("Not producing block because head block is less than a second old."); @@ -226,12 +233,6 @@ void witness_plugin::block_production_loop() return false; } - // we must know the private key corresponding to the witness's - // published block production key. - if( _private_keys.find( scheduled_key ) == _private_keys.end() ) { - elog("Not producing block because I don't have the private key for ${id}.", ("id", scheduled_key)); - return false; - } return true; }; From 437a112a66aa56fd3d3751599e90c2918a6e5250 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Tue, 18 Aug 2015 11:03:44 -0400 Subject: [PATCH 209/353] Fix #244 - Improve log messages - it is not an error to have the next slot be in the future, it happens every maitenance interval when the skip slots is greater than 0. - re-order the failure conditions to report configuration issues first, then other issues second. --- libraries/plugins/witness/witness.cpp | 41 ++++++++++++++------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/libraries/plugins/witness/witness.cpp b/libraries/plugins/witness/witness.cpp index 6380fba7..637447ee 100644 --- a/libraries/plugins/witness/witness.cpp +++ b/libraries/plugins/witness/witness.cpp @@ -185,10 +185,30 @@ void witness_plugin::block_production_loop() { // conditions needed to produce a block: + // we must control the witness scheduled to produce the next block. + if( _witnesses.find( scheduled_witness ) == _witnesses.end() ) { + return false; + } + + // we must know the private key corresponding to the witness's + // published block production key. + if( _private_keys.find( scheduled_key ) == _private_keys.end() ) { + elog("Not producing block because I don't have the private key for ${id}.", ("id", scheduled_key)); + return false; + } + + // the next block must be scheduled after the head block. + // if this check fails, the local clock has not advanced far + // enough from the head block. + if( slot == 0 ) { + ilog("Not producing block because next slot time is in the future (likely a maitenance block)."); + return false; + } + // block production must be enabled (i.e. witness must be synced) if( !_production_enabled ) { - elog("Not producing block because production is disabled."); + wlog("Not producing block because production is disabled until we receive a recent block (see: --enable-stale-production)"); return false; } @@ -200,19 +220,6 @@ void witness_plugin::block_production_loop() return false; } - // the next block must be scheduled after the head block. - // if this check fails, the local clock has not advanced far - // enough from the head block. - if( slot == 0 ) { - elog("Not producing block because head block time is in the future (is the system clock set correctly?)."); - return false; - } - - // we must control the witness scheduled to produce the next block. - if( _witnesses.find( scheduled_witness ) == _witnesses.end() ) { - return false; - } - // the local clock must be at least 1 second ahead of head_block_time. if( (now - db.head_block_time()).to_seconds() < GRAPHENE_MIN_BLOCK_INTERVAL ) { elog("Not producing block because head block is less than a second old."); @@ -226,12 +233,6 @@ void witness_plugin::block_production_loop() return false; } - // we must know the private key corresponding to the witness's - // published block production key. - if( _private_keys.find( scheduled_key ) == _private_keys.end() ) { - elog("Not producing block because I don't have the private key for ${id}.", ("id", scheduled_key)); - return false; - } return true; }; From 7e42d4b3e8f478b65956776f2654615399276e16 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Tue, 18 Aug 2015 11:36:50 -0400 Subject: [PATCH 210/353] Fix #242 - witness node crash Rather than using futures and waiting in the destructor, the APIs now use enable_shared_from_this and the lambda captures a shared pointer to the API to prevent it from going out of scope. As a result the destructor can not be called while there is a pending async operation which removes the need to wait in the destructor and thereby removing the potential for an exception to be thrown causing this crash. --- libraries/app/api.cpp | 40 ++++++++-------------- libraries/app/include/graphene/app/api.hpp | 6 ++-- 2 files changed, 17 insertions(+), 29 deletions(-) diff --git a/libraries/app/api.cpp b/libraries/app/api.cpp index 8c8f4512..c0625711 100644 --- a/libraries/app/api.cpp +++ b/libraries/app/api.cpp @@ -50,24 +50,6 @@ namespace graphene { namespace app { database_api::~database_api() { elog("freeing database api ${x}", ("x",int64_t(this)) ); - try { - if(_broadcast_changes_complete.valid()) - { - _broadcast_changes_complete.cancel(); - ilog( "waiting.."); - _broadcast_changes_complete.wait(); - } - if(_broadcast_removed_complete.valid()) - { - _broadcast_removed_complete.cancel(); - ilog( "waiting.."); - _broadcast_removed_complete.wait(); - } - ilog( "done" ); - } catch (const fc::exception& e) - { - wlog("${e}", ("e",e.to_detail_string())); - } } fc::variants database_api::get_objects(const vector& ids)const @@ -610,15 +592,18 @@ namespace graphene { namespace app { { if( _callbacks.size() ) { + /// we need to ensure the database_api is not deleted for the life of the async operation + auto capture_this = shared_from_this(); for( uint32_t trx_num = 0; trx_num < b.transactions.size(); ++trx_num ) { const auto& trx = b.transactions[trx_num]; auto id = trx.id(); auto itr = _callbacks.find(id); - auto block_num = b.block_num(); if( itr != _callbacks.end() ) { - fc::async( [=](){ itr->second( fc::variant(transaction_confirmation{ id, block_num, trx_num, trx}) ); } ); + auto block_num = b.block_num(); + auto& callback = _callbacks.find(id)->second; + fc::async( [capture_this,this,id,block_num,trx_num,trx,callback](){ callback( fc::variant(transaction_confirmation{ id, block_num, trx_num, trx}) ); } ); } } } @@ -807,6 +792,9 @@ namespace graphene { namespace app { void database_api::on_objects_removed( const vector& objs ) { + /// we need to ensure the database_api is not deleted for the life of the async operation + auto capture_this = shared_from_this(); + if( _account_subscriptions.size() ) { map > broadcast_queue; @@ -823,7 +811,7 @@ namespace graphene { namespace app { if( broadcast_queue.size() ) { - _broadcast_removed_complete = fc::async([=](){ + fc::async([capture_this,broadcast_queue,this](){ for( const auto& item : broadcast_queue ) { auto sub = _account_subscriptions.find(item.first); @@ -848,7 +836,7 @@ namespace graphene { namespace app { } if( broadcast_queue.size() ) { - _broadcast_removed_complete = fc::async([=](){ + fc::async([capture_this,this,broadcast_queue](){ for( const auto& item : broadcast_queue ) { auto sub = _market_subscriptions.find(item.first); @@ -904,12 +892,12 @@ namespace graphene { namespace app { } } + auto capture_this = shared_from_this(); - /// TODO: consider making _broadcast_changes_complete a deque and /// pushing the future back / popping the prior future if it is complete. /// if a connection hangs then this could get backed up and result in /// a failure to exit cleanly. - _broadcast_changes_complete = fc::async([=](){ + fc::async([capture_this,this,broadcast_queue,market_broadcast_queue,my_objects](){ for( const auto& item : broadcast_queue ) { edump( (item) ); @@ -980,7 +968,9 @@ namespace graphene { namespace app { if(_market_subscriptions.count(market)) subscribed_markets_ops[market].push_back(std::make_pair(op.op, op.result)); } - fc::async([=](){ + /// we need to ensure the database_api is not deleted for the life of the async operation + auto capture_this = shared_from_this(); + fc::async([this,capture_this,subscribed_markets_ops](){ for(auto item : subscribed_markets_ops) { auto itr = _market_subscriptions.find(item.first); diff --git a/libraries/app/include/graphene/app/api.hpp b/libraries/app/include/graphene/app/api.hpp index bf848a12..04ad5cfb 100644 --- a/libraries/app/include/graphene/app/api.hpp +++ b/libraries/app/include/graphene/app/api.hpp @@ -54,7 +54,7 @@ namespace graphene { namespace app { * read-only; all modifications to the database must be performed via transactions. Transactions are broadcast via * the @ref network_broadcast_api. */ - class database_api + class database_api : public std::enable_shared_from_this { public: database_api(graphene::chain::database& db); @@ -383,8 +383,6 @@ namespace graphene { namespace app { void on_objects_removed(const vector& objs); void on_applied_block(); - fc::future _broadcast_changes_complete; - fc::future _broadcast_removed_complete; boost::signals2::scoped_connection _change_connection; boost::signals2::scoped_connection _removed_connection; boost::signals2::scoped_connection _applied_block_connection; @@ -427,7 +425,7 @@ namespace graphene { namespace app { /** * @brief The network_broadcast_api class allows broadcasting of transactions. */ - class network_broadcast_api + class network_broadcast_api : public std::enable_shared_from_this { public: network_broadcast_api(application& a); From 15c99bd65b0c90854d430126582fee49ec645fe6 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Wed, 19 Aug 2015 09:47:10 -0400 Subject: [PATCH 211/353] Address #247 - out-of-order blocks in fork db - with this change the fork database now caches blocks that do not link and attempts to link the unlinked blocks after every new block is successfully linked. - with this change the fork database only tracks blocks as far back as the undo history allows. This significantly reduces memory usage when there is high witness participation. --- docs | 2 +- libraries/chain/CMakeLists.txt | 2 +- libraries/chain/db_block.cpp | 3 + libraries/chain/db_update.cpp | 1 + libraries/chain/fork_database.cpp | 94 +++++++++++++++++-- .../include/graphene/chain/exceptions.hpp | 1 + .../include/graphene/chain/fork_database.hpp | 20 ++++ 7 files changed, 115 insertions(+), 8 deletions(-) diff --git a/docs b/docs index f42a917c..cdc8ea81 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit f42a917c0cb93784567d649be60d610469c33ee0 +Subproject commit cdc8ea8133a999afef8051700a4ce8edb0988ec4 diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt index fd666c87..33ae255b 100644 --- a/libraries/chain/CMakeLists.txt +++ b/libraries/chain/CMakeLists.txt @@ -5,6 +5,7 @@ add_library( graphene_chain # As database takes the longest to compile, start it first database.cpp + fork_database.cpp # db_balance.cpp # db_block.cpp @@ -65,7 +66,6 @@ add_library( graphene_chain proposal_object.cpp vesting_balance_object.cpp - fork_database.cpp block_database.cpp ${HEADERS} diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index 1f01d76f..62c77109 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -97,6 +97,9 @@ bool database::_push_block(const signed_block& new_block) uint32_t skip = get_node_properties().skip_flags; if( !(skip&skip_fork_db) ) { + /// TODO: if the block is greater than the head block and before the next maitenance interval + // verify that the block signer is in the current set of active witnesses. + shared_ptr new_head = _fork_db.push_block(new_block); //If the head block from the longest chain does not build off of the current head, we need to switch forks. if( new_head->data.previous != head_block_id() ) diff --git a/libraries/chain/db_update.cpp b/libraries/chain/db_update.cpp index d8328b13..ded6a04a 100644 --- a/libraries/chain/db_update.cpp +++ b/libraries/chain/db_update.cpp @@ -73,6 +73,7 @@ void database::update_global_dynamic_data( const signed_block& b ) } _undo_db.set_max_size( _dgp.recently_missed_count + GRAPHENE_MIN_UNDO_HISTORY ); + _fork_db.set_max_size( _dgp.recently_missed_count + GRAPHENE_MIN_UNDO_HISTORY ); } void database::update_signing_witness(const witness_object& signing_witness, const signed_block& new_block) diff --git a/libraries/chain/fork_database.cpp b/libraries/chain/fork_database.cpp index d11e34ca..f867e69a 100644 --- a/libraries/chain/fork_database.cpp +++ b/libraries/chain/fork_database.cpp @@ -16,6 +16,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include +#include #include #include @@ -41,14 +42,36 @@ void fork_database::start_block(signed_block b) _head = item; } +/** + * Pushes the block into the fork database and caches it if it doesn't link + * + */ shared_ptr fork_database::push_block(const signed_block& b) { auto item = std::make_shared(b); - - if( _head && b.previous != block_id_type() ) + try { + _push_block(item); + } + catch ( const unlinkable_block_exception& e ) { - auto itr = _index.get().find(b.previous); - FC_ASSERT(itr != _index.get().end()); + wlog( "Pushing block to fork database that failed to link." ); + _unlinked_index.insert( item ); + } + return _head; +} + +void fork_database::_push_block(const item_ptr& item) +{ + if( _head ) // make sure the block is within the range that we are caching + { + FC_ASSERT( item->num > std::max( 0, int64_t(_head->num) - (_max_size) ) ); + FC_ASSERT( item->num < _head->num + 32 ); + } + + if( _head && item->previous_id() != block_id_type() ) + { + auto itr = _index.get().find(item->previous_id()); + GRAPHENE_ASSERT(itr != _index.get().end(), unlinkable_block_exception, "block does not link to known chain"); FC_ASSERT(!(*itr)->invalid); item->prev = *itr; } @@ -58,10 +81,69 @@ shared_ptr fork_database::push_block(const signed_block& b) else if( item->num > _head->num ) { _head = item; - _index.get().erase(_head->num - 1024); + _index.get().erase(_head->num - _max_size); + _unlinked_index.get().erase(_head->num - _max_size); } - return _head; + + _push_next( item ); } + +/** + * Iterate through the unlinked cache and insert anything that + * links to the newly inserted item. This will start a recursive + * set of calls performing a depth-first insertion of pending blocks as + * _push_next(..) calls _push_block(...) which will in turn call _push_next + */ +void fork_database::_push_next( const item_ptr& new_item ) +{ + auto& prev_idx = _unlinked_index.get(); + vector newly_inserted; + + auto itr = prev_idx.find( new_item->id ); + while( itr != prev_idx.end() ) + { + auto tmp = *itr; + prev_idx.erase( itr ); + _push_block( tmp ); + + itr = prev_idx.find( new_item->id ); + } +} + +void fork_database::set_max_size( uint32_t s ) +{ + _max_size = s; + if( !_head ) return; + + { /// index + auto& by_num_idx = _index.get(); + auto itr = by_num_idx.begin(); + while( itr != by_num_idx.end() ) + { + if( (*itr)->num < std::max(int64_t(0),int64_t(_head->num) - _max_size) ) + by_num_idx.erase(itr); + else + break; + itr = by_num_idx.begin(); + } + } + { /// unlinked_index + auto& by_num_idx = _unlinked_index.get(); + auto itr = by_num_idx.begin(); + while( itr != by_num_idx.end() ) + { + if( (*itr)->num < std::max(int64_t(0),int64_t(_head->num) - _max_size) ) + by_num_idx.erase(itr); + else + break; + itr = by_num_idx.begin(); + } + } +} + + + + bool fork_database::is_known_block(const block_id_type& id)const { auto& index = _index.get(); diff --git a/libraries/chain/include/graphene/chain/exceptions.hpp b/libraries/chain/include/graphene/chain/exceptions.hpp index d77960f2..3860e33b 100644 --- a/libraries/chain/include/graphene/chain/exceptions.hpp +++ b/libraries/chain/include/graphene/chain/exceptions.hpp @@ -69,6 +69,7 @@ namespace graphene { namespace chain { FC_DECLARE_DERIVED_EXCEPTION( operation_evaluate_exception, graphene::chain::chain_exception, 3050000, "operation evaluation exception" ) FC_DECLARE_DERIVED_EXCEPTION( utility_exception, graphene::chain::chain_exception, 3060000, "utility method exception" ) FC_DECLARE_DERIVED_EXCEPTION( undo_database_exception, graphene::chain::chain_exception, 3070000, "undo database exception" ) + FC_DECLARE_DERIVED_EXCEPTION( unlinkable_block_exception, graphene::chain::chain_exception, 3080000, "unlinkable block" ) FC_DECLARE_DERIVED_EXCEPTION( tx_missing_active_auth, graphene::chain::transaction_exception, 3030001, "missing required active authority" ) FC_DECLARE_DERIVED_EXCEPTION( tx_missing_owner_auth, graphene::chain::transaction_exception, 3030002, "missing required owner authority" ) diff --git a/libraries/chain/include/graphene/chain/fork_database.hpp b/libraries/chain/include/graphene/chain/fork_database.hpp index 7750d311..a2144c41 100644 --- a/libraries/chain/include/graphene/chain/fork_database.hpp +++ b/libraries/chain/include/graphene/chain/fork_database.hpp @@ -22,6 +22,8 @@ #include #include #include +#include + namespace graphene { namespace chain { using boost::multi_index_container; @@ -32,6 +34,8 @@ namespace graphene { namespace chain { fork_item( signed_block d ) :num(d.block_num()),id(d.id()),data( std::move(d) ){} + block_id_type previous_id()const { return data.previous; } + weak_ptr< fork_item > prev; uint32_t num; /** @@ -44,6 +48,7 @@ namespace graphene { namespace chain { }; typedef shared_ptr item_ptr; + /** * As long as blocks are pushed in order the fork * database will maintain a linked tree of all blocks @@ -68,6 +73,10 @@ namespace graphene { namespace chain { bool is_known_block(const block_id_type& id)const; shared_ptr fetch_block(const block_id_type& id)const; vector fetch_block_by_number(uint32_t n)const; + + /** + * @return the new head block ( the longest fork ) + */ shared_ptr push_block(const signed_block& b); shared_ptr head()const { return _head; } void pop_block(); @@ -81,15 +90,26 @@ namespace graphene { namespace chain { struct block_id; struct block_num; + struct by_previous; typedef multi_index_container< item_ptr, indexed_by< hashed_unique, member, std::hash>, + hashed_non_unique, const_mem_fun, std::hash>, ordered_non_unique, member> > > fork_multi_index_type; + void set_max_size( uint32_t s ); + private: + /** @return a pointer to the newly pushed item */ + void _push_block(const item_ptr& b ); + void _push_next(const item_ptr& newly_inserted); + + uint32_t _max_size = 1024; + + fork_multi_index_type _unlinked_index; fork_multi_index_type _index; shared_ptr _head; }; From 5fbff6cf522ff490b644632b29ca005b70bf9e3c Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Wed, 19 Aug 2015 10:23:06 -0400 Subject: [PATCH 212/353] Resolve #238: Light client now fetches chain_id from chain_properties --- programs/light_client/ChainDataModel.cpp | 2 ++ programs/light_client/ChainDataModel.hpp | 2 ++ programs/light_client/GrapheneApplication.cpp | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/programs/light_client/ChainDataModel.cpp b/programs/light_client/ChainDataModel.cpp index 62a843da..56643533 100644 --- a/programs/light_client/ChainDataModel.cpp +++ b/programs/light_client/ChainDataModel.cpp @@ -35,6 +35,8 @@ void ChainDataModel::setDatabaseAPI(fc::api dbapi) { m_db_api->subscribe_to_objects([this](const variant& d) { m_dynamic_global_properties = d.as(); }, {m_dynamic_global_properties.id}); + + m_chain_properties = m_db_api->get_chain_properties(); }); } diff --git a/programs/light_client/ChainDataModel.hpp b/programs/light_client/ChainDataModel.hpp index 39700246..d213bec4 100644 --- a/programs/light_client/ChainDataModel.hpp +++ b/programs/light_client/ChainDataModel.hpp @@ -61,6 +61,7 @@ public: const graphene::chain::global_property_object& global_properties() const { return m_global_properties; } const graphene::chain::dynamic_global_property_object& dynamic_global_properties() const { return m_dynamic_global_properties; } + const graphene::chain::chain_property_object& chain_properties() const { return m_chain_properties; } public Q_SLOTS: void broadcast(Transaction* transaction); @@ -78,6 +79,7 @@ private: graphene::chain::global_property_object m_global_properties; graphene::chain::dynamic_global_property_object m_dynamic_global_properties; + graphene::chain::chain_property_object m_chain_properties; ObjectId m_account_query_num = -1; account_multi_index_type m_accounts; diff --git a/programs/light_client/GrapheneApplication.cpp b/programs/light_client/GrapheneApplication.cpp index 463b2c4b..9365f968 100644 --- a/programs/light_client/GrapheneApplication.cpp +++ b/programs/light_client/GrapheneApplication.cpp @@ -100,7 +100,7 @@ void GrapheneApplication::signTransaction(Transaction* transaction) const return &model()->getAccount(id.instance.value)->accountObject().owner; }; - auto& chainId = model()->global_properties().chain_id; + auto& chainId = model()->chain_properties().chain_id; auto& trx = transaction->internalTransaction(); trx.set_reference_block(model()->dynamic_global_properties().head_block_id); flat_set pubKeys = wallet()->getAvailablePrivateKeys(); From 3a9d0df75c383e4a0e961d45384079b07e7a1c82 Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Wed, 19 Aug 2015 11:16:22 -0400 Subject: [PATCH 213/353] [FWN] Create privileged API login for web UI This resolves #249 --- libraries/app/application.cpp | 10 ++++++++++ libraries/app/include/graphene/app/application.hpp | 1 + programs/full_web_node/BlockChain.cpp | 11 ++++++++++- programs/full_web_node/BlockChain.hpp | 4 ++++ programs/full_web_node/qml/main.qml | 6 +++++- 5 files changed, 30 insertions(+), 2 deletions(-) diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp index 51b861ed..00dc0dfc 100644 --- a/libraries/app/application.cpp +++ b/libraries/app/application.cpp @@ -313,6 +313,11 @@ namespace detail { return it->second; } + void set_api_access_info(const string& username, api_access_info&& permissions) + { + _apiaccess.permission_map.insert(std::make_pair(username, std::move(permissions))); + } + /** * If delegate has the item, the network has no need to fetch it. */ @@ -668,6 +673,11 @@ optional< api_access_info > application::get_api_access_info( const string& user return my->get_api_access_info( username ); } +void application::set_api_access_info(const string& username, api_access_info&& permissions) +{ + my->set_api_access_info(username, std::move(permissions)); +} + bool application::is_finished_syncing() const { return my->_is_finished_syncing; diff --git a/libraries/app/include/graphene/app/application.hpp b/libraries/app/include/graphene/app/application.hpp index 5c76d021..9518b608 100644 --- a/libraries/app/include/graphene/app/application.hpp +++ b/libraries/app/include/graphene/app/application.hpp @@ -76,6 +76,7 @@ namespace graphene { namespace app { void set_block_production(bool producing_blocks); fc::optional< api_access_info > get_api_access_info( const string& username )const; + void set_api_access_info(const string& username, api_access_info&& permissions); bool is_finished_syncing()const; /// Emitted when syncing finishes (is_finished_syncing will return true) diff --git a/programs/full_web_node/BlockChain.cpp b/programs/full_web_node/BlockChain.cpp index e2a0137b..0214c7f9 100644 --- a/programs/full_web_node/BlockChain.cpp +++ b/programs/full_web_node/BlockChain.cpp @@ -17,7 +17,9 @@ BlockChain::BlockChain() : chainThread(new fc::thread("chainThread")), fcTaskScheduler(new QTimer(this)), - grapheneApp(new graphene::app::application) + grapheneApp(new graphene::app::application), + webUsername(QStringLiteral("webui")), + webPassword(QString::fromStdString(fc::sha256::hash(fc::ecc::private_key::generate()))) { fcTaskScheduler->setInterval(100); fcTaskScheduler->setSingleShot(false); @@ -50,6 +52,13 @@ void BlockChain::start() grapheneApp->initialize_plugins(map); grapheneApp->startup(); grapheneApp->startup_plugins(); + + graphene::app::api_access_info webPermissions; + auto passHash = fc::sha256::hash(webPassword.toStdString()); + webPermissions.password_hash_b64 = fc::base64_encode(passHash.data(), passHash.data_size()); + webPermissions.password_salt_b64 = fc::base64_encode(""); + webPermissions.allowed_apis = {"database_api", "network_broadcast_api", "network_node_api", "history_api"}; + grapheneApp->set_api_access_info(webUsername.toStdString(), std::move(webPermissions)); } catch (const fc::exception& e) { elog("Crap went wrong: ${e}", ("e", e.to_detail_string())); } diff --git a/programs/full_web_node/BlockChain.hpp b/programs/full_web_node/BlockChain.hpp index b1efef63..90c745ea 100644 --- a/programs/full_web_node/BlockChain.hpp +++ b/programs/full_web_node/BlockChain.hpp @@ -10,11 +10,15 @@ namespace fc { class thread; } namespace graphene { namespace app { class application; } } class BlockChain : public QObject { Q_OBJECT + Q_PROPERTY(QString webUsername MEMBER webUsername CONSTANT) + Q_PROPERTY(QString webPassword MEMBER webPassword CONSTANT) fc::thread* chainThread; QTimer* fcTaskScheduler; graphene::app::application* grapheneApp; fc::future startFuture; + QString webUsername; + QString webPassword; public: BlockChain(); diff --git a/programs/full_web_node/qml/main.qml b/programs/full_web_node/qml/main.qml index f19ea3ae..7c156cb9 100644 --- a/programs/full_web_node/qml/main.qml +++ b/programs/full_web_node/qml/main.qml @@ -12,7 +12,11 @@ Window { BlockChain { id: blockChain - onStarted: webView.url = "qrc:/index.html" + onStarted: { + var url = "qrc:/index.html#authTokens/" + webUsername + ":" + webPassword + console.log("Loading %1 in web view".arg(url)) + webView.url = url + } } Component.onCompleted: blockChain.start() From 9c0c588ed62165886a510775d76c8524c50c09c5 Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Wed, 19 Aug 2015 11:31:57 -0400 Subject: [PATCH 214/353] [FWN] Remove deprecated scheduling code --- programs/full_web_node/BlockChain.cpp | 8 +------- programs/full_web_node/BlockChain.hpp | 1 - 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/programs/full_web_node/BlockChain.cpp b/programs/full_web_node/BlockChain.cpp index 0214c7f9..65fa4b4b 100644 --- a/programs/full_web_node/BlockChain.cpp +++ b/programs/full_web_node/BlockChain.cpp @@ -16,16 +16,10 @@ BlockChain::BlockChain() : chainThread(new fc::thread("chainThread")), - fcTaskScheduler(new QTimer(this)), grapheneApp(new graphene::app::application), webUsername(QStringLiteral("webui")), webPassword(QString::fromStdString(fc::sha256::hash(fc::ecc::private_key::generate()))) -{ - fcTaskScheduler->setInterval(100); - fcTaskScheduler->setSingleShot(false); - connect(fcTaskScheduler, &QTimer::timeout, [] {fc::yield();}); - fcTaskScheduler->start(); -} +{} BlockChain::~BlockChain() { startFuture.cancel_and_wait(__FUNCTION__); diff --git a/programs/full_web_node/BlockChain.hpp b/programs/full_web_node/BlockChain.hpp index 90c745ea..fbb45183 100644 --- a/programs/full_web_node/BlockChain.hpp +++ b/programs/full_web_node/BlockChain.hpp @@ -14,7 +14,6 @@ class BlockChain : public QObject { Q_PROPERTY(QString webPassword MEMBER webPassword CONSTANT) fc::thread* chainThread; - QTimer* fcTaskScheduler; graphene::app::application* grapheneApp; fc::future startFuture; QString webUsername; From eeeab17477a635fcff7f2d294dff8ecf25449b10 Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Wed, 19 Aug 2015 13:07:13 -0400 Subject: [PATCH 215/353] Polish out-of-order-block handling, write test case --- libraries/chain/fork_database.cpp | 12 ++--- .../include/graphene/chain/fork_database.hpp | 2 + tests/tests/block_tests.cpp | 53 +++++++++++++++++++ 3 files changed, 61 insertions(+), 6 deletions(-) diff --git a/libraries/chain/fork_database.cpp b/libraries/chain/fork_database.cpp index f867e69a..dcd48be1 100644 --- a/libraries/chain/fork_database.cpp +++ b/libraries/chain/fork_database.cpp @@ -51,7 +51,7 @@ shared_ptr fork_database::push_block(const signed_block& b) auto item = std::make_shared(b); try { _push_block(item); - } + } catch ( const unlinkable_block_exception& e ) { wlog( "Pushing block to fork database that failed to link." ); @@ -65,13 +65,14 @@ void fork_database::_push_block(const item_ptr& item) if( _head ) // make sure the block is within the range that we are caching { FC_ASSERT( item->num > std::max( 0, int64_t(_head->num) - (_max_size) ) ); - FC_ASSERT( item->num < _head->num + 32 ); + FC_ASSERT( item->num < _head->num + MAX_BLOCK_REORDERING ); } if( _head && item->previous_id() != block_id_type() ) { - auto itr = _index.get().find(item->previous_id()); - GRAPHENE_ASSERT(itr != _index.get().end(), unlinkable_block_exception, "block does not link to known chain"); + auto& index = _index.get(); + auto itr = index.find(item->previous_id()); + GRAPHENE_ASSERT(itr != index.end(), unlinkable_block_exception, "block does not link to known chain"); FC_ASSERT(!(*itr)->invalid); item->prev = *itr; } @@ -97,14 +98,13 @@ void fork_database::_push_block(const item_ptr& item) void fork_database::_push_next( const item_ptr& new_item ) { auto& prev_idx = _unlinked_index.get(); - vector newly_inserted; auto itr = prev_idx.find( new_item->id ); while( itr != prev_idx.end() ) { auto tmp = *itr; prev_idx.erase( itr ); - _push_block( tmp ); + _push_block( tmp ); itr = prev_idx.find( new_item->id ); } diff --git a/libraries/chain/include/graphene/chain/fork_database.hpp b/libraries/chain/include/graphene/chain/fork_database.hpp index a2144c41..34801b1a 100644 --- a/libraries/chain/include/graphene/chain/fork_database.hpp +++ b/libraries/chain/include/graphene/chain/fork_database.hpp @@ -63,6 +63,8 @@ namespace graphene { namespace chain { { public: typedef vector branch_type; + /// The maximum number of blocks that may be skipped in an out-of-order push + const static int MAX_BLOCK_REORDERING = 32; fork_database(); void reset(); diff --git a/tests/tests/block_tests.cpp b/tests/tests/block_tests.cpp index 7af5fc91..427fdd51 100644 --- a/tests/tests/block_tests.cpp +++ b/tests/tests/block_tests.cpp @@ -276,6 +276,59 @@ BOOST_AUTO_TEST_CASE( fork_blocks ) } } +BOOST_AUTO_TEST_CASE( out_of_order_blocks ) +{ + try { + fc::temp_directory data_dir1( graphene::utilities::temp_directory_path() ); + fc::temp_directory data_dir2( graphene::utilities::temp_directory_path() ); + + database db1; + db1.open(data_dir1.path(), make_genesis); + database db2; + db2.open(data_dir2.path(), make_genesis); + BOOST_CHECK( db1.get_chain_id() == db2.get_chain_id() ); + + auto init_account_priv_key = fc::ecc::private_key::regenerate(fc::sha256::hash(string("null_key")) ); + auto b1 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); + auto b2 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); + auto b3 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); + auto b4 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); + auto b5 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); + auto b6 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); + auto b7 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); + auto b8 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); + auto b9 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); + auto b10 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); + auto b11 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); + auto b12 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); + BOOST_CHECK_EQUAL(db1.head_block_num(), 12); + BOOST_CHECK_EQUAL(db2.head_block_num(), 0); + PUSH_BLOCK( db2, b1 ); + BOOST_CHECK_EQUAL(db2.head_block_num(), 1); + PUSH_BLOCK( db2, b3 ); + BOOST_CHECK_EQUAL(db2.head_block_num(), 1); + PUSH_BLOCK( db2, b2 ); + BOOST_CHECK_EQUAL(db2.head_block_num(), 3); + PUSH_BLOCK( db2, b5 ); + PUSH_BLOCK( db2, b6 ); + PUSH_BLOCK( db2, b7 ); + BOOST_CHECK_EQUAL(db2.head_block_num(), 3); + PUSH_BLOCK( db2, b4 ); + BOOST_CHECK_EQUAL(db2.head_block_num(), 7); + PUSH_BLOCK( db2, b8 ); + BOOST_CHECK_EQUAL(db2.head_block_num(), 8); + PUSH_BLOCK( db2, b11 ); + PUSH_BLOCK( db2, b10 ); + PUSH_BLOCK( db2, b12 ); + BOOST_CHECK_EQUAL(db2.head_block_num(), 8); + PUSH_BLOCK( db2, b9 ); + BOOST_CHECK_EQUAL(db2.head_block_num(), 12); + } catch (fc::exception& e) { + edump((e.to_detail_string())); + throw; + } +} + BOOST_AUTO_TEST_CASE( undo_pending ) { try { From 7332797b76bc0040830e4bd47aed6cc4c9b53771 Mon Sep 17 00:00:00 2001 From: James Calfee Date: Thu, 20 Aug 2015 06:30:01 -0500 Subject: [PATCH 216/353] Updated witness command in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 55df22f1..1ab2ecfa 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,7 @@ Witness node The role of the witness node is to broadcast transactions, download blocks, and optionally sign them. ``` -./witness_node --rpc-endpoint 127.0.0.1:8090 --enable-stale-production -w '"1.6.0"' '"1.6.1"' '"1.6.2"' '"1.6.3"' '"1.6.4"' '"1.6.5"' '"1.6.6"' '"1.6.7"' '"1.6.8"' '"1.6.9"' +./witness_node --rpc-endpoint 127.0.0.1:8090 --enable-stale-production -w '"1.6.0"' '"1.6.1"' '"1.6.2"' '"1.6.3"' '"1.6.4"' '"1.6.5"' '"1.6.6"' '"1.6.7"' '"1.6.8"' '"1.6.9"' '"1.6.10"' '"1.6.11"' '"1.6.12"' '"1.6.13"' '"1.6.14"' '"1.6.15"' '"1.6.16"' '"1.6.17"' '"1.6.18"' '"1.6.19"' '"1.6.20"' '"1.6.21"' '"1.6.22"' '"1.6.23"' '"1.6.24"' '"1.6.25"' '"1.6.26"' '"1.6.27"' '"1.6.28"' '"1.6.29"' '"1.6.30"' '"1.6.31"' '"1.6.32"' '"1.6.33"' '"1.6.34"' '"1.6.35"' '"1.6.36"' '"1.6.37"' '"1.6.38"' '"1.6.39"' '"1.6.40"' '"1.6.41"' '"1.6.42"' '"1.6.43"' '"1.6.44"' '"1.6.45"' '"1.6.46"' '"1.6.47"' '"1.6.48"' '"1.6.49"' '"1.6.50"' '"1.6.51"' '"1.6.52"' '"1.6.53"' '"1.6.54"' '"1.6.55"' '"1.6.56"' '"1.6.57"' '"1.6.58"' '"1.6.59"' '"1.6.60"' '"1.6.61"' '"1.6.62"' '"1.6.63"' '"1.6.64"' '"1.6.65"' '"1.6.66"' '"1.6.67"' '"1.6.68"' '"1.6.69"' '"1.6.70"' '"1.6.71"' '"1.6.72"' '"1.6.73"' '"1.6.74"' '"1.6.75"' '"1.6.76"' '"1.6.77"' '"1.6.78"' '"1.6.79"' '"1.6.80"' '"1.6.81"' '"1.6.82"' '"1.6.83"' '"1.6.84"' '"1.6.85"' '"1.6.86"' '"1.6.87"' '"1.6.88"' '"1.6.89"' '"1.6.90"' '"1.6.91"' '"1.6.92"' '"1.6.93"' '"1.6.94"' '"1.6.95"' '"1.6.96"' '"1.6.97"' '"1.6.98"' '"1.6.99"' '"1.6.100"' ``` Running specific tests From 8a9120e5179eed2640a8d0b926b7e61980bb42a2 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Thu, 20 Aug 2015 08:47:38 -0400 Subject: [PATCH 217/353] increasing the default minimum number of witnesses to 101 for testing --- libraries/chain/fork_database.cpp | 4 +++- libraries/chain/include/graphene/chain/config.hpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/chain/fork_database.cpp b/libraries/chain/fork_database.cpp index f867e69a..6c70fdde 100644 --- a/libraries/chain/fork_database.cpp +++ b/libraries/chain/fork_database.cpp @@ -64,7 +64,9 @@ void fork_database::_push_block(const item_ptr& item) { if( _head ) // make sure the block is within the range that we are caching { - FC_ASSERT( item->num > std::max( 0, int64_t(_head->num) - (_max_size) ) ); + FC_ASSERT( item->num > std::max( 0, int64_t(_head->num) - (_max_size) ), + "attempting to push a block that is too old", + ("item->num",item->num)("head",_head->num)("max_size",_max_size)); FC_ASSERT( item->num < _head->num + 32 ); } diff --git a/libraries/chain/include/graphene/chain/config.hpp b/libraries/chain/include/graphene/chain/config.hpp index f77f7144..388133c2 100644 --- a/libraries/chain/include/graphene/chain/config.hpp +++ b/libraries/chain/include/graphene/chain/config.hpp @@ -85,7 +85,7 @@ ///@} #define GRAPHENE_DEFAULT_MARGIN_PERIOD_SEC (30*60*60*24) -#define GRAPHENE_DEFAULT_MIN_WITNESS_COUNT (11) +#define GRAPHENE_DEFAULT_MIN_WITNESS_COUNT (101) #define GRAPHENE_DEFAULT_MIN_COMMITTEE_MEMBER_COUNT (11) #define GRAPHENE_DEFAULT_MAX_WITNESSES (1001) // SHOULD BE ODD #define GRAPHENE_DEFAULT_MAX_COMMITTEE (1001) // SHOULD BE ODD From 2f0065d593dfd06deda970f9a8df59a930c50bff Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Thu, 20 Aug 2015 13:23:25 -0400 Subject: [PATCH 218/353] genesis file specifies 101 min --- libraries/chain/include/graphene/chain/config.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/chain/include/graphene/chain/config.hpp b/libraries/chain/include/graphene/chain/config.hpp index 388133c2..f77f7144 100644 --- a/libraries/chain/include/graphene/chain/config.hpp +++ b/libraries/chain/include/graphene/chain/config.hpp @@ -85,7 +85,7 @@ ///@} #define GRAPHENE_DEFAULT_MARGIN_PERIOD_SEC (30*60*60*24) -#define GRAPHENE_DEFAULT_MIN_WITNESS_COUNT (101) +#define GRAPHENE_DEFAULT_MIN_WITNESS_COUNT (11) #define GRAPHENE_DEFAULT_MIN_COMMITTEE_MEMBER_COUNT (11) #define GRAPHENE_DEFAULT_MAX_WITNESSES (1001) // SHOULD BE ODD #define GRAPHENE_DEFAULT_MAX_COMMITTEE (1001) // SHOULD BE ODD From 4228360409a7dcced0ea8adfcaf32b2ec0597ab2 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Thu, 20 Aug 2015 15:19:15 -0400 Subject: [PATCH 219/353] adding extra indexing of accounts by address auths --- libraries/app/api.cpp | 21 +++++ libraries/chain/account_object.cpp | 87 +++++++++++++------ .../include/graphene/chain/account_object.hpp | 4 + 3 files changed, 86 insertions(+), 26 deletions(-) diff --git a/libraries/app/api.cpp b/libraries/app/api.cpp index c0625711..ef7f3a13 100644 --- a/libraries/app/api.cpp +++ b/libraries/app/api.cpp @@ -1090,17 +1090,38 @@ namespace graphene { namespace app { */ vector> database_api::get_key_references( vector keys )const { + wdump( (keys) ); vector< vector > final_result; final_result.reserve(keys.size()); for( auto& key : keys ) { + address a1( pts_address(key, false, 56) ); + address a2( pts_address(key, true, 56) ); + address a3( pts_address(key, false, 0) ); + address a4( pts_address(key, true, 0) ); + address a5( key ); + const auto& idx = _db.get_index_type(); const auto& aidx = dynamic_cast&>(idx); const auto& refs = aidx.get_secondary_index(); auto itr = refs.account_to_key_memberships.find(key); vector result; + for( auto& a : {a1,a2,a3,a4,a5} ) + { + auto itr = refs.account_to_address_memberships.find(a); + if( itr != refs.account_to_address_memberships.end() ) + { + result.reserve( itr->second.size() ); + for( auto item : itr->second ) + { + wdump((a)(item)(item(_db).name)); + result.push_back(item); + } + } + } + if( itr != refs.account_to_key_memberships.end() ) { result.reserve( itr->second.size() ); diff --git a/libraries/chain/account_object.cpp b/libraries/chain/account_object.cpp index 387ad917..bd670c12 100644 --- a/libraries/chain/account_object.cpp +++ b/libraries/chain/account_object.cpp @@ -140,6 +140,13 @@ set account_member_index::get_key_members(const account_object& result.insert(auth.first); return result; } +set

account_member_index::get_address_members(const account_object& a)const +{ + set
result; + for( auto auth : a.owner.address_auths ) + result.insert(auth.first); + return result; +} void account_member_index::object_inserted(const object& obj) { @@ -153,6 +160,10 @@ void account_member_index::object_inserted(const object& obj) auto key_members = get_key_members(a); for( auto item : key_members ) account_to_key_memberships[item].insert(obj.id); + + auto address_members = get_address_members(a); + for( auto item : address_members ) + account_to_address_memberships[item].insert(obj.id); } void account_member_index::object_removed(const object& obj) @@ -163,6 +174,11 @@ void account_member_index::object_removed(const object& obj) auto key_members = get_key_members(a); for( auto item : key_members ) account_to_key_memberships[item].erase( obj.id ); + + auto address_members = get_address_members(a); + for( auto item : address_members ) + account_to_address_memberships[item].erase( obj.id ); + auto account_members = get_account_members(a); for( auto item : account_members ) account_to_account_memberships[item].erase( obj.id ); @@ -175,6 +191,7 @@ void account_member_index::about_to_modify(const object& before) assert( dynamic_cast(&before) ); // for debug only const account_object& a = static_cast(before); before_key_members = get_key_members(a); + before_address_members = get_address_members(a); before_account_members = get_account_members(a); } @@ -182,47 +199,65 @@ void account_member_index::object_modified(const object& after) { assert( dynamic_cast(&after) ); // for debug only const account_object& a = static_cast(after); - set after_account_members = get_account_members(a); { - vector removed; removed.reserve(before_account_members.size()); - std::set_difference(before_account_members.begin(), before_account_members.end(), - after_account_members.begin(), after_account_members.end(), - std::inserter(removed, removed.end())); + set after_account_members = get_account_members(a); + vector removed; removed.reserve(before_account_members.size()); + std::set_difference(before_account_members.begin(), before_account_members.end(), + after_account_members.begin(), after_account_members.end(), + std::inserter(removed, removed.end())); - for( auto itr = removed.begin(); itr != removed.end(); ++itr ) - account_to_account_memberships[*itr].erase(after.id); + for( auto itr = removed.begin(); itr != removed.end(); ++itr ) + account_to_account_memberships[*itr].erase(after.id); - vector added; added.reserve(after_account_members.size()); - std::set_difference(after_account_members.begin(), after_account_members.end(), - before_account_members.begin(), before_account_members.end(), - std::inserter(added, added.end())); + vector added; added.reserve(after_account_members.size()); + std::set_difference(after_account_members.begin(), after_account_members.end(), + before_account_members.begin(), before_account_members.end(), + std::inserter(added, added.end())); - for( auto itr = added.begin(); itr != added.end(); ++itr ) - account_to_account_memberships[*itr].insert(after.id); + for( auto itr = added.begin(); itr != added.end(); ++itr ) + account_to_account_memberships[*itr].insert(after.id); } + { + set after_key_members = get_key_members(a); + vector removed; removed.reserve(before_key_members.size()); + std::set_difference(before_key_members.begin(), before_key_members.end(), + after_key_members.begin(), after_key_members.end(), + std::inserter(removed, removed.end())); + + for( auto itr = removed.begin(); itr != removed.end(); ++itr ) + account_to_key_memberships[*itr].erase(after.id); + + vector added; added.reserve(after_key_members.size()); + std::set_difference(after_key_members.begin(), after_key_members.end(), + before_key_members.begin(), before_key_members.end(), + std::inserter(added, added.end())); + + for( auto itr = added.begin(); itr != added.end(); ++itr ) + account_to_key_memberships[*itr].insert(after.id); + } { - set after_key_members = get_key_members(a); + set
after_address_members = get_address_members(a); - vector removed; removed.reserve(before_key_members.size()); - std::set_difference(before_key_members.begin(), before_key_members.end(), - after_key_members.begin(), after_key_members.end(), - std::inserter(removed, removed.end())); + vector
removed; removed.reserve(before_address_members.size()); + std::set_difference(before_address_members.begin(), before_address_members.end(), + after_address_members.begin(), after_address_members.end(), + std::inserter(removed, removed.end())); - for( auto itr = removed.begin(); itr != removed.end(); ++itr ) - account_to_key_memberships[*itr].erase(after.id); + for( auto itr = removed.begin(); itr != removed.end(); ++itr ) + account_to_address_memberships[*itr].erase(after.id); - vector added; added.reserve(after_key_members.size()); - std::set_difference(after_key_members.begin(), after_key_members.end(), - before_key_members.begin(), before_key_members.end(), - std::inserter(added, added.end())); + vector
added; added.reserve(after_address_members.size()); + std::set_difference(after_address_members.begin(), after_address_members.end(), + before_address_members.begin(), before_address_members.end(), + std::inserter(added, added.end())); - for( auto itr = added.begin(); itr != added.end(); ++itr ) - account_to_key_memberships[*itr].insert(after.id); + for( auto itr = added.begin(); itr != added.end(); ++itr ) + account_to_address_memberships[*itr].insert(after.id); } } diff --git a/libraries/chain/include/graphene/chain/account_object.hpp b/libraries/chain/include/graphene/chain/account_object.hpp index cb4f61c7..675f11b8 100644 --- a/libraries/chain/include/graphene/chain/account_object.hpp +++ b/libraries/chain/include/graphene/chain/account_object.hpp @@ -250,14 +250,18 @@ namespace graphene { namespace chain { /** given an account or key, map it to the set of accounts that reference it in an active or owner authority */ map< account_id_type, set > account_to_account_memberships; map< public_key_type, set > account_to_key_memberships; + /** some accounts use address authorities in the genesis block */ + map< address, set > account_to_address_memberships; protected: set get_account_members( const account_object& a )const; set get_key_members( const account_object& a )const; + set
get_address_members( const account_object& a )const; set before_account_members; set before_key_members; + set
before_address_members; }; /** From 6372b25dea2e2a38f6665ae425a5676c1adce909 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Thu, 20 Aug 2015 18:41:54 -0400 Subject: [PATCH 220/353] cli_wallet: Expose get_private_key() --- libraries/wallet/include/graphene/wallet/wallet.hpp | 7 +++++++ libraries/wallet/wallet.cpp | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/libraries/wallet/include/graphene/wallet/wallet.hpp b/libraries/wallet/include/graphene/wallet/wallet.hpp index ac1c334b..68b191e9 100644 --- a/libraries/wallet/include/graphene/wallet/wallet.hpp +++ b/libraries/wallet/include/graphene/wallet/wallet.hpp @@ -356,6 +356,12 @@ class wallet_api */ string get_wallet_filename() const; + /** + * Get the WIF private key corresponding to a public key. The + * private key must already be in the wallet. + */ + string get_private_key( public_key_type pubkey )const; + /** * @ingroup Transaction Builder API */ @@ -1301,6 +1307,7 @@ FC_API( graphene::wallet::wallet_api, (get_global_properties) (get_dynamic_global_properties) (get_object) + (get_private_key) (load_wallet_file) (normalize_brain_key) (get_limit_orders) diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp index 0eefe792..1c211d32 100644 --- a/libraries/wallet/wallet.cpp +++ b/libraries/wallet/wallet.cpp @@ -2800,6 +2800,11 @@ string wallet_api::get_key_label( public_key_type key )const return string(); } +string wallet_api::get_private_key( public_key_type pubkey )const +{ + return key_to_wif( my->get_private_key( pubkey ) ); +} + public_key_type wallet_api::get_public_key( string label )const { try { return fc::variant(label).as(); } catch ( ... ){} From 32b18f6c20f8c66c50e4a4a613b1f7cf17fdf83f Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Fri, 21 Aug 2015 13:16:17 -0400 Subject: [PATCH 221/353] block_database.cpp: Argument validation and logging in store() and fetch_block_id() --- libraries/chain/block_database.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/libraries/chain/block_database.cpp b/libraries/chain/block_database.cpp index 95c37790..314b77c1 100644 --- a/libraries/chain/block_database.cpp +++ b/libraries/chain/block_database.cpp @@ -68,8 +68,14 @@ void block_database::flush() _block_num_to_pos.flush(); } -void block_database::store( const block_id_type& id, const signed_block& b ) +void block_database::store( const block_id_type& _id, const signed_block& b ) { + block_id_type id = _id; + if( id == block_id_type() ) + { + id = b.id(); + elog( "id argument of block_database::store() was not initialized for block ${id}", ("id", id) ); + } auto num = block_header::num_from_id(id); _block_num_to_pos.seekp( sizeof( index_entry ) * num ); index_entry e; @@ -116,6 +122,7 @@ bool block_database::contains( const block_id_type& id )const block_id_type block_database::fetch_block_id( uint32_t block_num )const { + assert( block_num != 0 ); index_entry e; auto index_pos = sizeof(e)*block_num; _block_num_to_pos.seekg( 0, _block_num_to_pos.end ); @@ -125,6 +132,7 @@ block_id_type block_database::fetch_block_id( uint32_t block_num )const _block_num_to_pos.seekg( index_pos ); _block_num_to_pos.read( (char*)&e, sizeof(e) ); + FC_ASSERT( e.block_id != block_id_type(), "Empty block_id in block_database (maybe corrupt on disk?)" ); return e.block_id; } From a5850bdb914b744e903ba6b31731941899fe848c Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Fri, 21 Aug 2015 13:17:46 -0400 Subject: [PATCH 222/353] fork_database.cpp: Update is_known_block and fetch_block to also look in unlinked_index --- libraries/chain/fork_database.cpp | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/libraries/chain/fork_database.cpp b/libraries/chain/fork_database.cpp index 0fab49a3..7910b417 100644 --- a/libraries/chain/fork_database.cpp +++ b/libraries/chain/fork_database.cpp @@ -143,22 +143,30 @@ void fork_database::set_max_size( uint32_t s ) } } - - - bool fork_database::is_known_block(const block_id_type& id)const { auto& index = _index.get(); auto itr = index.find(id); - return itr != index.end(); + if( itr != index.end() ) + return true; + auto& unlinked_index = _unlinked_index.get(); + auto unlinked_itr = unlinked_index.find(id); + return unlinked_itr != unlinked_index.end(); } + item_ptr fork_database::fetch_block(const block_id_type& id)const { - auto itr = _index.get().find(id); - if( itr != _index.get().end() ) + auto& index = _index.get(); + auto itr = index.find(id); + if( itr != index.end() ) return *itr; + auto& unlinked_index = _unlinked_index.get(); + auto unlinked_itr = unlinked_index.find(id); + if( unlinked_itr != unlinked_index.end() ) + return *unlinked_itr; return item_ptr(); } + vector fork_database::fetch_block_by_number(uint32_t num)const { vector result; From 5b3d7d21492f5bfaa07cb24e31ee8cc1e05f6c04 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Fri, 21 Aug 2015 13:18:47 -0400 Subject: [PATCH 223/353] block_database.cpp: Special-case to return false when contains() is passed all-zeros block_id #260 --- libraries/chain/block_database.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libraries/chain/block_database.cpp b/libraries/chain/block_database.cpp index 314b77c1..cd1f1e29 100644 --- a/libraries/chain/block_database.cpp +++ b/libraries/chain/block_database.cpp @@ -109,6 +109,9 @@ void block_database::remove( const block_id_type& id ) bool block_database::contains( const block_id_type& id )const { + if( id == block_id_type() ) + return false; + index_entry e; auto index_pos = sizeof(e)*block_header::num_from_id(id); _block_num_to_pos.seekg( 0, _block_num_to_pos.end ); From 8d0409e524f8b12b972e0f49c2eb0752f5698518 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Fri, 21 Aug 2015 18:44:32 -0400 Subject: [PATCH 224/353] Ground work for new p2p protocol --- libraries/p2p/CMakeLists.txt | 32 ++ libraries/p2p/design.md | 90 ++++ .../p2p/include/graphene/p2p/message.hpp | 151 +++++++ .../p2p/message_oriented_connection.hpp | 49 +++ libraries/p2p/include/graphene/p2p/node.hpp | 74 ++++ .../include/graphene/p2p/peer_connection.hpp | 179 ++++++++ .../p2p/include/graphene/p2p/stcp_socket.hpp | 59 +++ libraries/p2p/message_oriented_connection.cpp | 393 ++++++++++++++++++ libraries/p2p/node.cpp | 141 +++++++ libraries/p2p/peer_connection.cpp | 7 + libraries/p2p/stcp_socket.cpp | 181 ++++++++ 11 files changed, 1356 insertions(+) create mode 100644 libraries/p2p/CMakeLists.txt create mode 100644 libraries/p2p/design.md create mode 100644 libraries/p2p/include/graphene/p2p/message.hpp create mode 100644 libraries/p2p/include/graphene/p2p/message_oriented_connection.hpp create mode 100644 libraries/p2p/include/graphene/p2p/node.hpp create mode 100644 libraries/p2p/include/graphene/p2p/peer_connection.hpp create mode 100644 libraries/p2p/include/graphene/p2p/stcp_socket.hpp create mode 100644 libraries/p2p/message_oriented_connection.cpp create mode 100644 libraries/p2p/node.cpp create mode 100644 libraries/p2p/peer_connection.cpp create mode 100644 libraries/p2p/stcp_socket.cpp diff --git a/libraries/p2p/CMakeLists.txt b/libraries/p2p/CMakeLists.txt new file mode 100644 index 00000000..6b5918d5 --- /dev/null +++ b/libraries/p2p/CMakeLists.txt @@ -0,0 +1,32 @@ +file(GLOB HEADERS "include/graphene/p2p/*.hpp") + +set(SOURCES node.cpp + stcp_socket.cpp + peer_connection.cpp + message_oriented_connection.cpp) + +add_library( graphene_p2p ${SOURCES} ${HEADERS} ) + +target_link_libraries( graphene_p2p + PUBLIC fc graphene_db ) +target_include_directories( graphene_p2p + PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" + PRIVATE "${CMAKE_SOURCE_DIR}/libraries/chain/include" +) + +#if(MSVC) +# set_source_files_properties( node.cpp PROPERTIES COMPILE_FLAGS "/bigobj" ) +#endif(MSVC) + +#if (USE_PCH) +# set_target_properties(graphene_p2p PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE) +# cotire(graphene_p2p ) +#endif(USE_PCH) + +install( TARGETS + graphene_p2p + + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) diff --git a/libraries/p2p/design.md b/libraries/p2p/design.md new file mode 100644 index 00000000..d55c1411 --- /dev/null +++ b/libraries/p2p/design.md @@ -0,0 +1,90 @@ +# Network Protocol 2 + +Building a low-latency network requires P2P nodes that have low-latency +connections and a protocol designed to minimize latency. for the purpose +of this document we will assume that two nodes are located on opposite +sides of the globe with a ping time of 250ms. + + +## Announce, Request, Send Protocol +Under the prior network archtiecture, transactions and blocks were broadcast +in a manner similar to the Bitcoin protocol: inventory messages notify peers of +transactions and blocks, then peers fetch the transaction or block from one +peer. After validating the item a node will broadcast an inventory message to +its peers. + +Under this model it will take 0.75 seconds for a peer to communicate a transaction +or block to another peer even if their size was 0 and there was no processing overhead. +This level of performance is unacceptable for a network attempting to produce one block +every second. + +This prior protocol also sent every transaction twice: initial broadcast, and again as +part of a block. + + +## Push Protocol +To minimize latency each node needs to immediately broadcast the data it receives +to its peers after validating it. Given the average transaction size is less than +100 bytes, it is almost as effecient to send the transaction as it is to send +the notice (assuming a 20 byte transaction id) + +Each node implements the following protocol: + + + onReceiveTransaction( from_peer, transaction ) + if( isKnown( transaction.id() ) ) + return + + markKnown( transaction.id() ) + + if( !validate( transaction ) ) + return + + for( peer : peers ) + if( peer != from_peer ) + send( peer, transaction ) + + + onReceiveBlock( from_peer, block_summary ) + if( isKnown( block_summary ) + return + + full_block = reconstructFullBlcok( from_peer, block_summary ) + if( !full_block ) disconnect from_peer + + markKnown( block_summary ) + + if( !pushBlock( full_block ) ) disconnect from_peer + + for( peer : peers ) + if( peer != from_peer ) + send( peer, block_summary ) + + + onConnect( new_peer, new_peer_head_block_num ) + if( peers.size() >= max_peers ) + send( new_peer, peers ) + disconnect( new_peer ) + return + + while( new_peer_head_block_num < our_head_block_num ) + sendFullBlock( new_peer, ++new_peer_head_block_num ) + + new_peer.synced = true + for( peer : peers ) + send( peer, new_peer ) + + onReceivePeers( from_peer, peers ) + addToPotentialPeers( peers ) + + onUpdateConnectionsTimer + if( peers.size() < desired_peers ) + connect( random_potential_peer ) + + onFullBlock( from_peer, full_block ) + if( !pushBlock( full_block ) ) disconnect from_peer + + onStartup + init_potential_peers from config + start onUpdateConnectionsTimer + diff --git a/libraries/p2p/include/graphene/p2p/message.hpp b/libraries/p2p/include/graphene/p2p/message.hpp new file mode 100644 index 00000000..926180d1 --- /dev/null +++ b/libraries/p2p/include/graphene/p2p/message.hpp @@ -0,0 +1,151 @@ +/** Copyright (c) 2015, Cryptonomex, Inc. All rights reserved. */ +#pragma once +#include +#include +#include +#include +#include +#include + +namespace graphene { namespace p2p { + + struct message_header + { + uint32_t size; // number of bytes in message, capped at MAX_MESSAGE_SIZE + uint32_t msg_type; + }; + + typedef fc::uint160_t message_hash_type; + + /** + * Abstracts the process of packing/unpacking a message for a + * particular channel. + */ + struct message : public message_header + { + std::vector data; + + message(){} + + message( message&& m ) + :message_header(m),data( std::move(m.data) ){} + + message( const message& m ) + :message_header(m),data( m.data ){} + + /** + * Assumes that T::type specifies the message type + */ + template + message( const T& m ) + { + msg_type = T::type; + data = fc::raw::pack(m); + size = (uint32_t)data.size(); + } + + fc::uint160_t id()const + { + return fc::ripemd160::hash( data.data(), (uint32_t)data.size() ); + } + + /** + * Automatically checks the type and deserializes T in the + * opposite process from the constructor. + */ + template + T as()const + { + try { + FC_ASSERT( msg_type == T::type ); + T tmp; + if( data.size() ) + { + fc::datastream ds( data.data(), data.size() ); + fc::raw::unpack( ds, tmp ); + } + else + { + // just to make sure that tmp shouldn't have any data + fc::datastream ds( nullptr, 0 ); + fc::raw::unpack( ds, tmp ); + } + return tmp; + } FC_RETHROW_EXCEPTIONS( warn, + "error unpacking network message as a '${type}' ${x} !=? ${msg_type}", + ("type", fc::get_typename::name() ) + ("x", T::type) + ("msg_type", msg_type) + ); + } + }; + + enum core_message_type_enum { + hello_message_type = 1000, + transaction_message_type = 1001, + block_message_type = 1002, + peer_message_type = 1003, + error_message_type = 1004 + }; + + struct hello_message + { + static const core_message_type_enum type; + + std::string user_agent; + uint16_t version; + + fc::ip::address inbound_address; + uint16_t inbound_port; + uint16_t outbound_port; + node_id_t node_public_key; + fc::sha256 chain_id; + fc::variant_object user_data; + block_id_type head_block; + }; + + struct transaction_message + { + static const core_message_type_enum type; + signed_transaction trx; + }; + + struct block_summary_message + { + static const core_message_type_enum type; + + signed_block_header header; + vector transaction_ids; + }; + + struct full_block_message + { + static const core_message_type_enum type; + signed_block block; + }; + + struct peers_message + { + static const core_message_type_enum type; + + vector peers; + }; + + struct error_message + { + static const core_message_type_enum type; + string message; + }; + + +} } // graphene::p2p + +FC_REFLECT( graphene::p2p::message_header, (size)(msg_type) ) +FC_REFLECT_DERIVED( graphene::p2p::message, (graphene::p2p::message_header), (data) ) +FC_REFLECT_ENUM( graphene::p2p::core_message_type_enum, + (hello_message_type) + (transaction_message_type) + (block_message_type) + (peer_message_type) + (error_message_type) +) diff --git a/libraries/p2p/include/graphene/p2p/message_oriented_connection.hpp b/libraries/p2p/include/graphene/p2p/message_oriented_connection.hpp new file mode 100644 index 00000000..82b73195 --- /dev/null +++ b/libraries/p2p/include/graphene/p2p/message_oriented_connection.hpp @@ -0,0 +1,49 @@ +/** Copyright (c) 2015, Cryptonomex, Inc. All rights reserved. */ +#pragma once +#include +#include + +namespace graphene { namespace p2p { + + namespace detail { class message_oriented_connection_impl; } + + class message_oriented_connection; + + /** receives incoming messages from a message_oriented_connection object */ + class message_oriented_connection_delegate + { + public: + virtual void on_message( message_oriented_connection* originating_connection, + const message& received_message) = 0; + + virtual void on_connection_closed(message_oriented_connection* originating_connection) = 0; + }; + + /** uses a secure socket to create a connection that reads and writes a stream of `fc::p2p::message` objects */ + class message_oriented_connection + { + public: + message_oriented_connection(message_oriented_connection_delegate* delegate = nullptr); + ~message_oriented_connection(); + fc::tcp_socket& get_socket(); + + void accept(); + void bind(const fc::ip::endpoint& local_endpoint); + void connect_to(const fc::ip::endpoint& remote_endpoint); + + void send_message(const message& message_to_send); + void close_connection(); + void destroy_connection(); + + uint64_t get_total_bytes_sent() const; + uint64_t get_total_bytes_received() const; + fc::time_point get_last_message_sent_time() const; + fc::time_point get_last_message_received_time() const; + fc::time_point get_connection_time() const; + fc::sha512 get_shared_secret() const; + private: + std::unique_ptr my; + }; + typedef std::shared_ptr message_oriented_connection_ptr; + +} } // graphene::net diff --git a/libraries/p2p/include/graphene/p2p/node.hpp b/libraries/p2p/include/graphene/p2p/node.hpp new file mode 100644 index 00000000..aa7f5e46 --- /dev/null +++ b/libraries/p2p/include/graphene/p2p/node.hpp @@ -0,0 +1,74 @@ +/** Copyright (c) 2015, Cryptonomex, Inc. */ + +#pragma once +#include +#include + + + +namespace graphene { namespace p2p { + using namespace graphene::chain; + + struct node_config + { + fc::ip::endpoint server_endpoint; + bool wait_if_not_available = true; + uint32_t desired_peers; + uint32_t max_peers; + /** receive, but don't rebroadcast data */ + bool subscribe_only = false; + public_key_type node_id; + vector seed_nodes; + }; + + struct by_remote_endpoint; + struct by_peer_id; + + /** + * @ingroup object_index + */ + typedef multi_index_container< + peer_connection_ptr, + indexed_by< + ordered_unique< tag, + const_mem_fun< peer_connection, fc::ip::endpoint, &peer_connection::get_remote_endpoint > >, + ordered_unique< tag, member< peer_connection, public_key_type, &peer_connection::node_id > > + > + > peer_connection_index; + + + class node : public std::enable_shared_from_this + { + public: + server( chain_database& db ); + + void add_peer( const fc::ip::endpoint& ep ); + void configure( const node_config& cfg ); + + void on_incomming_connection( peer_connection_ptr new_peer ); + void on_hello( peer_connection_ptr new_peer, hello_message m ); + void on_transaction( peer_connection_ptr from_peer, transaction_message m ); + void on_block( peer_connection_ptr from_peer, block_message m ); + void on_peers( peer_connection_ptr from_peer, peers_message m ); + void on_error( peer_connection_ptr from_peer, error_message m ); + void on_full_block( peer_connection_ptr from_peer, full_block_message m ); + void on_update_connections(); + + private: + /** + * Specifies the network interface and port upon which incoming + * connections should be accepted. + */ + void listen_on_endpoint( fc::ip::endpoint ep, bool wait_if_not_available ); + void accept_loop(); + + graphene::chain::database& _db; + + fc::tcp_server _tcp_server; + fc::ip::endpoint _actual_listening_endpoint; + fc::future _accept_loop_complete; + peer_connection_index _peers; + + }; + +} } /// graphene::p2p diff --git a/libraries/p2p/include/graphene/p2p/peer_connection.hpp b/libraries/p2p/include/graphene/p2p/peer_connection.hpp new file mode 100644 index 00000000..8f0ab594 --- /dev/null +++ b/libraries/p2p/include/graphene/p2p/peer_connection.hpp @@ -0,0 +1,179 @@ +/* + * Copyright (c) 2015, Cryptonomex, Inc. + * All rights reserved. + * + * This source code is provided for evaluation in private test networks only, until September 8, 2015. After this date, this license expires and + * the code may not be used, modified or distributed for any purpose. Redistribution and use in source and binary forms, with or without modification, + * are permitted until September 8, 2015, provided that the following conditions are met: + * + * 1. The code and/or derivative works are used only for private test networks consisting of no more than 10 P2P nodes. + * + * 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. + */ +#pragma once + +#include +#include +#include + +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +namespace graphene { namespace p2p { + + class peer_connection; + class peer_connection_delegate + { + public: + virtual void on_message(peer_connection* originating_peer, + const message& received_message) = 0; + virtual void on_connection_closed(peer_connection* originating_peer) = 0; + virtual message get_message_for_item(const item_id& item) = 0; + }; + + class peer_connection; + typedef std::shared_ptr peer_connection_ptr; + + + class peer_connection : public message_oriented_connection_delegate, + public std::enable_shared_from_this + { + public: + enum direction_type { inbound, outbound }; + enum connection_state { + connecting = 0, + syncing = 1, + synced = 2 + }; + + fc::time_point connection_initiation_time; + fc::time_point connection_closed_time; + fc::time_point connection_terminated_time; + direction_type direction = outbound; + connection_state state = connecting; + bool is_firewalled = true + + //connection_state state; + fc::microseconds clock_offset; + fc::microseconds round_trip_delay; + + /// data about the peer node + /// @{ + + /** the unique identifier we'll use to refer to the node with. zero-initialized before + * we receive the hello message, at which time it will be filled with either the "node_id" + * from the user_data field of the hello, or if none is present it will be filled with a + * copy of node_public_key */ + public_key_type node_id; + uint32_t core_protocol_version; + std::string user_agent; + + fc::optional graphene_git_revision_sha; + fc::optional graphene_git_revision_unix_timestamp; + fc::optional fc_git_revision_sha; + fc::optional fc_git_revision_unix_timestamp; + fc::optional platform; + fc::optional bitness; + + // for inbound connections, these fields record what the peer sent us in + // its hello message. For outbound, they record what we sent the peer + // in our hello message + fc::ip::address inbound_address; + uint16_t inbound_port; + uint16_t outbound_port; + /// @} + + void send( transaction_message_ptr msg ) + { + // if not in sent_or_received then insert into _pending_send + // if process_send_queue is invalid or complete then + // async process_send_queue + } + + void received_transaction( const transaction_id_type& id ) + { + _sent_or_received.insert(id); + } + + void process_send_queue() + { + // while _pending_send.size() || _pending_blocks.size() + // while there are pending blocks, then take the oldest + // for each transaction id, verify that it exists in _sent_or_received + // else find it in the _pending_send queue and send it + // send one from _pending_send + } + + + std::unordered_map _pending_send; + /// todo: make multi-index that tracks how long items have been cached and removes them + /// after a resasonable period of time (say 10 seconds) + std::unordered_set _sent_or_received; + std::map _pending_blocks; + + + fc::ip::endpoint get_remote_endpoint()const + { return get_socket().get_remote_endpoint(); } + + void on_message(message_oriented_connection* originating_connection, + const message& received_message) override + { + switch( core_message_type_enum( received_message.type ) ) + { + case hello_message_type: + _node->on_hello( shared_from_this(), + received_message.as() ); + break; + case transaction_message_type: + _node->on_transaction( shared_from_this(), + received_message.as() ); + break; + case block_message_type: + _node->on_block( shared_from_this(), + received_message.as() ); + break; + case peer_message_type: + _node->on_peers( shared_from_this(), + received_message.as() ); + break; + } + } + + void on_connection_closed(message_oriented_connection* originating_connection) override + { + _node->on_close( shared_from_this() ); + } + + fc::tcp_socket& get_socket() { return _message_connection.get_socket(); } + + private: + peer_connection_delegate* _node; + fc::optional _remote_endpoint; + message_oriented_connection _message_connection; + + }; + typedef std::shared_ptr peer_connection_ptr; + + + } } // end namespace graphene::p2p + +// not sent over the wire, just reflected for logging +FC_REFLECT_ENUM(graphene::p2p::peer_connection::connection_state, (connecting)(syncing)(synced) ) +FC_REFLECT_ENUM(graphene::p2p::peer_connection::direction_type, (inbound)(outbound) ) diff --git a/libraries/p2p/include/graphene/p2p/stcp_socket.hpp b/libraries/p2p/include/graphene/p2p/stcp_socket.hpp new file mode 100644 index 00000000..01e6df34 --- /dev/null +++ b/libraries/p2p/include/graphene/p2p/stcp_socket.hpp @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2015, Cryptonomex, Inc. All rights reserved. + */ +#pragma once +#include +#include +#include + +namespace graphene { namespace p2p { + +/** + * Uses ECDH to negotiate a aes key for communicating + * with other nodes on the network. + */ +class stcp_socket : public virtual fc::iostream +{ + public: + stcp_socket(); + ~stcp_socket(); + fc::tcp_socket& get_socket() { return _sock; } + void accept(); + + void connect_to( const fc::ip::endpoint& remote_endpoint ); + void bind( const fc::ip::endpoint& local_endpoint ); + + virtual size_t readsome( char* buffer, size_t max ); + virtual size_t readsome( const std::shared_ptr& buf, size_t len, size_t offset ); + virtual bool eof()const; + + virtual size_t writesome( const char* buffer, size_t len ); + virtual size_t writesome( const std::shared_ptr& buf, size_t len, size_t offset ); + + virtual void flush(); + virtual void close(); + + using istream::get; + void get( char& c ) { read( &c, 1 ); } + fc::sha512 get_shared_secret() const { return _shared_secret; } + private: + void do_key_exchange(); + + fc::sha512 _shared_secret; + fc::ecc::private_key _priv_key; + fc::array _buf; + //uint32_t _buf_len; + fc::tcp_socket _sock; + fc::aes_encoder _send_aes; + fc::aes_decoder _recv_aes; + std::shared_ptr _read_buffer; + std::shared_ptr _write_buffer; +#ifndef NDEBUG + bool _read_buffer_in_use; + bool _write_buffer_in_use; +#endif +}; + +typedef std::shared_ptr stcp_socket_ptr; + +} } // graphene::p2p diff --git a/libraries/p2p/message_oriented_connection.cpp b/libraries/p2p/message_oriented_connection.cpp new file mode 100644 index 00000000..a17ec541 --- /dev/null +++ b/libraries/p2p/message_oriented_connection.cpp @@ -0,0 +1,393 @@ +/* + * Copyright (c) 2015, Cryptonomex, Inc. + * All rights reserved. + */ +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#ifdef DEFAULT_LOGGER +# undef DEFAULT_LOGGER +#endif +#define DEFAULT_LOGGER "p2p" + +#ifndef NDEBUG +# define VERIFY_CORRECT_THREAD() assert(_thread->is_current()) +#else +# define VERIFY_CORRECT_THREAD() do {} while (0) +#endif + +namespace graphene { namespace p2p { + namespace detail + { + class message_oriented_connection_impl + { + private: + message_oriented_connection* _self; + message_oriented_connection_delegate *_delegate; + stcp_socket _sock; + fc::future _read_loop_done; + uint64_t _bytes_received; + uint64_t _bytes_sent; + + fc::time_point _connected_time; + fc::time_point _last_message_received_time; + fc::time_point _last_message_sent_time; + + bool _send_message_in_progress; + +#ifndef NDEBUG + fc::thread* _thread; +#endif + + void read_loop(); + void start_read_loop(); + public: + fc::tcp_socket& get_socket(); + void accept(); + void connect_to(const fc::ip::endpoint& remote_endpoint); + void bind(const fc::ip::endpoint& local_endpoint); + + message_oriented_connection_impl(message_oriented_connection* self, + message_oriented_connection_delegate* delegate = nullptr); + ~message_oriented_connection_impl(); + + void send_message(const message& message_to_send); + void close_connection(); + void destroy_connection(); + + uint64_t get_total_bytes_sent() const; + uint64_t get_total_bytes_received() const; + + fc::time_point get_last_message_sent_time() const; + fc::time_point get_last_message_received_time() const; + fc::time_point get_connection_time() const { return _connected_time; } + fc::sha512 get_shared_secret() const; + }; + + message_oriented_connection_impl::message_oriented_connection_impl(message_oriented_connection* self, + message_oriented_connection_delegate* delegate) + : _self(self), + _delegate(delegate), + _bytes_received(0), + _bytes_sent(0), + _send_message_in_progress(false) +#ifndef NDEBUG + ,_thread(&fc::thread::current()) +#endif + { + } + message_oriented_connection_impl::~message_oriented_connection_impl() + { + VERIFY_CORRECT_THREAD(); + destroy_connection(); + } + + fc::tcp_socket& message_oriented_connection_impl::get_socket() + { + VERIFY_CORRECT_THREAD(); + return _sock.get_socket(); + } + + void message_oriented_connection_impl::accept() + { + VERIFY_CORRECT_THREAD(); + _sock.accept(); + assert(!_read_loop_done.valid()); // check to be sure we never launch two read loops + _read_loop_done = fc::async([=](){ read_loop(); }, "message read_loop"); + } + + void message_oriented_connection_impl::connect_to(const fc::ip::endpoint& remote_endpoint) + { + VERIFY_CORRECT_THREAD(); + _sock.connect_to(remote_endpoint); + assert(!_read_loop_done.valid()); // check to be sure we never launch two read loops + _read_loop_done = fc::async([=](){ read_loop(); }, "message read_loop"); + } + + void message_oriented_connection_impl::bind(const fc::ip::endpoint& local_endpoint) + { + VERIFY_CORRECT_THREAD(); + _sock.bind(local_endpoint); + } + + + void message_oriented_connection_impl::read_loop() + { + VERIFY_CORRECT_THREAD(); + const int BUFFER_SIZE = 16; + const int LEFTOVER = BUFFER_SIZE - sizeof(message_header); + static_assert(BUFFER_SIZE >= sizeof(message_header), "insufficient buffer"); + + _connected_time = fc::time_point::now(); + + fc::oexception exception_to_rethrow; + bool call_on_connection_closed = false; + + try + { + message m; + while( true ) + { + char buffer[BUFFER_SIZE]; + _sock.read(buffer, BUFFER_SIZE); + _bytes_received += BUFFER_SIZE; + memcpy((char*)&m, buffer, sizeof(message_header)); + + FC_ASSERT( m.size <= MAX_MESSAGE_SIZE, "", ("m.size",m.size)("MAX_MESSAGE_SIZE",MAX_MESSAGE_SIZE) ); + + size_t remaining_bytes_with_padding = 16 * ((m.size - LEFTOVER + 15) / 16); + m.data.resize(LEFTOVER + remaining_bytes_with_padding); //give extra 16 bytes to allow for padding added in send call + std::copy(buffer + sizeof(message_header), buffer + sizeof(buffer), m.data.begin()); + if (remaining_bytes_with_padding) + { + _sock.read(&m.data[LEFTOVER], remaining_bytes_with_padding); + _bytes_received += remaining_bytes_with_padding; + } + m.data.resize(m.size); // truncate off the padding bytes + + _last_message_received_time = fc::time_point::now(); + + try + { + // message handling errors are warnings... + _delegate->on_message(_self, m); + } + /// Dedicated catches needed to distinguish from general fc::exception + catch ( const fc::canceled_exception& e ) { throw e; } + catch ( const fc::eof_exception& e ) { throw e; } + catch ( const fc::exception& e) + { + /// Here loop should be continued so exception should be just caught locally. + wlog( "message transmission failed ${er}", ("er", e.to_detail_string() ) ); + throw; + } + } + } + catch ( const fc::canceled_exception& e ) + { + wlog( "caught a canceled_exception in read_loop. this should mean we're in the process of deleting this object already, so there's no need to notify the delegate: ${e}", ("e", e.to_detail_string() ) ); + throw; + } + catch ( const fc::eof_exception& e ) + { + wlog( "disconnected ${e}", ("e", e.to_detail_string() ) ); + call_on_connection_closed = true; + } + catch ( const fc::exception& e ) + { + elog( "disconnected ${er}", ("er", e.to_detail_string() ) ); + call_on_connection_closed = true; + exception_to_rethrow = fc::unhandled_exception(FC_LOG_MESSAGE(warn, "disconnected: ${e}", ("e", e.to_detail_string()))); + } + catch ( const std::exception& e ) + { + elog( "disconnected ${er}", ("er", e.what() ) ); + call_on_connection_closed = true; + exception_to_rethrow = fc::unhandled_exception(FC_LOG_MESSAGE(warn, "disconnected: ${e}", ("e", e.what()))); + } + catch ( ... ) + { + elog( "unexpected exception" ); + call_on_connection_closed = true; + exception_to_rethrow = fc::unhandled_exception(FC_LOG_MESSAGE(warn, "disconnected: ${e}", ("e", fc::except_str()))); + } + + if (call_on_connection_closed) + _delegate->on_connection_closed(_self); + + if (exception_to_rethrow) + throw *exception_to_rethrow; + } + + void message_oriented_connection_impl::send_message(const message& message_to_send) + { + VERIFY_CORRECT_THREAD(); +#if 0 // this gets too verbose +#ifndef NDEBUG + fc::optional remote_endpoint; + if (_sock.get_socket().is_open()) + remote_endpoint = _sock.get_socket().remote_endpoint(); + struct scope_logger { + const fc::optional& endpoint; + scope_logger(const fc::optional& endpoint) : endpoint(endpoint) { dlog("entering message_oriented_connection::send_message() for peer ${endpoint}", ("endpoint", endpoint)); } + ~scope_logger() { dlog("leaving message_oriented_connection::send_message() for peer ${endpoint}", ("endpoint", endpoint)); } + } send_message_scope_logger(remote_endpoint); +#endif +#endif + struct verify_no_send_in_progress { + bool& var; + verify_no_send_in_progress(bool& var) : var(var) + { + if (var) + elog("Error: two tasks are calling message_oriented_connection::send_message() at the same time"); + assert(!var); + var = true; + } + ~verify_no_send_in_progress() { var = false; } + } _verify_no_send_in_progress(_send_message_in_progress); + + try + { + size_t size_of_message_and_header = sizeof(message_header) + message_to_send.size; + if( message_to_send.size > MAX_MESSAGE_SIZE ) + elog("Trying to send a message larger than MAX_MESSAGE_SIZE. This probably won't work..."); + //pad the message we send to a multiple of 16 bytes + size_t size_with_padding = 16 * ((size_of_message_and_header + 15) / 16); + std::unique_ptr padded_message(new char[size_with_padding]); + memcpy(padded_message.get(), (char*)&message_to_send, sizeof(message_header)); + memcpy(padded_message.get() + sizeof(message_header), message_to_send.data.data(), message_to_send.size ); + _sock.write(padded_message.get(), size_with_padding); + _sock.flush(); + _bytes_sent += size_with_padding; + _last_message_sent_time = fc::time_point::now(); + } FC_RETHROW_EXCEPTIONS( warn, "unable to send message" ); + } + + void message_oriented_connection_impl::close_connection() + { + VERIFY_CORRECT_THREAD(); + _sock.close(); + } + + void message_oriented_connection_impl::destroy_connection() + { + VERIFY_CORRECT_THREAD(); + + fc::optional remote_endpoint; + if (_sock.get_socket().is_open()) + remote_endpoint = _sock.get_socket().remote_endpoint(); + ilog( "in destroy_connection() for ${endpoint}", ("endpoint", remote_endpoint) ); + + if (_send_message_in_progress) + elog("Error: message_oriented_connection is being destroyed while a send_message is in progress. " + "The task calling send_message() should have been canceled already"); + assert(!_send_message_in_progress); + + try + { + _read_loop_done.cancel_and_wait(__FUNCTION__); + } + catch ( const fc::exception& e ) + { + wlog( "Exception thrown while canceling message_oriented_connection's read_loop, ignoring: ${e}", ("e",e) ); + } + catch (...) + { + wlog( "Exception thrown while canceling message_oriented_connection's read_loop, ignoring" ); + } + } + + uint64_t message_oriented_connection_impl::get_total_bytes_sent() const + { + VERIFY_CORRECT_THREAD(); + return _bytes_sent; + } + + uint64_t message_oriented_connection_impl::get_total_bytes_received() const + { + VERIFY_CORRECT_THREAD(); + return _bytes_received; + } + + fc::time_point message_oriented_connection_impl::get_last_message_sent_time() const + { + VERIFY_CORRECT_THREAD(); + return _last_message_sent_time; + } + + fc::time_point message_oriented_connection_impl::get_last_message_received_time() const + { + VERIFY_CORRECT_THREAD(); + return _last_message_received_time; + } + + fc::sha512 message_oriented_connection_impl::get_shared_secret() const + { + VERIFY_CORRECT_THREAD(); + return _sock.get_shared_secret(); + } + + } // end namespace graphene::p2p::detail + + + message_oriented_connection::message_oriented_connection(message_oriented_connection_delegate* delegate) : + my(new detail::message_oriented_connection_impl(this, delegate)) + { + } + + message_oriented_connection::~message_oriented_connection() + { + } + + fc::tcp_socket& message_oriented_connection::get_socket() + { + return my->get_socket(); + } + + void message_oriented_connection::accept() + { + my->accept(); + } + + void message_oriented_connection::connect_to(const fc::ip::endpoint& remote_endpoint) + { + my->connect_to(remote_endpoint); + } + + void message_oriented_connection::bind(const fc::ip::endpoint& local_endpoint) + { + my->bind(local_endpoint); + } + + void message_oriented_connection::send_message(const message& message_to_send) + { + my->send_message(message_to_send); + } + + void message_oriented_connection::close_connection() + { + my->close_connection(); + } + + void message_oriented_connection::destroy_connection() + { + my->destroy_connection(); + } + + uint64_t message_oriented_connection::get_total_bytes_sent() const + { + return my->get_total_bytes_sent(); + } + + uint64_t message_oriented_connection::get_total_bytes_received() const + { + return my->get_total_bytes_received(); + } + + fc::time_point message_oriented_connection::get_last_message_sent_time() const + { + return my->get_last_message_sent_time(); + } + + fc::time_point message_oriented_connection::get_last_message_received_time() const + { + return my->get_last_message_received_time(); + } + fc::time_point message_oriented_connection::get_connection_time() const + { + return my->get_connection_time(); + } + fc::sha512 message_oriented_connection::get_shared_secret() const + { + return my->get_shared_secret(); + } + +} } // end namespace graphene::p2p diff --git a/libraries/p2p/node.cpp b/libraries/p2p/node.cpp new file mode 100644 index 00000000..5a8da3a4 --- /dev/null +++ b/libraries/p2p/node.cpp @@ -0,0 +1,141 @@ +#include + +namespace graphene { namespace p2p { + + node::node( chain_database& db ) + :_db(db) + { + + } + + node::~node() + { + + } + + void node::add_peer( const fc::ip::endpoint& ep ) + { + + } + + void node::configure( const node_config& cfg ) + { + listen_on_endpoint( cfg.server_endpoint, wait_if_not_available ); + + /** don't allow node to go out of scope until accept loop exits */ + auto self = shared_from_this(); + _accept_loop_complete = fc::async( [self](){ self->accept_loop(); } ) + } + + void node::accept_loop() + { + auto self = shared_from_this(); + while( !_accept_loop_complete.canceled() ) + { + try { + auto new_peer = std::make_shared(self); + _tcp_server.accept( new_peer.get_socket() ); + + if( _accept_loop_complete.canceled() ) + return; + + _peers.insert( new_peer ); + + + + // limit the rate at which we accept connections to mitigate DOS attacks + fc::usleep( fc::milliseconds(10) ); + } FC_CAPTURE_AND_RETHROW() + } + } // accept_loop() + + + + void node::listen_on_endpoint( fc::ip::endpoint ep, bool wait_if_not_available ) + { + if( ep.port() != 0 ) + { + // if the user specified a port, we only want to bind to it if it's not already + // being used by another application. During normal operation, we set the + // SO_REUSEADDR/SO_REUSEPORT flags so that we can bind outbound sockets to the + // same local endpoint as we're listening on here. On some platforms, setting + // those flags will prevent us from detecting that other applications are + // listening on that port. We'd like to detect that, so we'll set up a temporary + // tcp server without that flag to see if we can listen on that port. + bool first = true; + for( ;; ) + { + bool listen_failed = false; + + try + { + fc::tcp_server temporary_server; + if( listen_endpoint.get_address() != fc::ip::address() ) + temporary_server.listen( ep ); + else + temporary_server.listen( ep.port() ); + break; + } + catch ( const fc::exception&) + { + listen_failed = true; + } + + if (listen_failed) + { + if( wait_if_endpoint_is_busy ) + { + std::ostringstream error_message_stream; + if( first ) + { + error_message_stream << "Unable to listen for connections on port " + << ep.port() + << ", retrying in a few seconds\n"; + error_message_stream << "You can wait for it to become available, or restart " + "this program using\n"; + error_message_stream << "the --p2p-port option to specify another port\n"; + first = false; + } + else + { + error_message_stream << "\nStill waiting for port " << listen_endpoint.port() << " to become available\n"; + } + + std::string error_message = error_message_stream.str(); + ulog(error_message); + fc::usleep( fc::seconds(5 ) ); + } + else // don't wait, just find a random port + { + wlog( "unable to bind on the requested endpoint ${endpoint}, " + "which probably means that endpoint is already in use", + ( "endpoint", ep ) ); + ep.set_port( 0 ); + } + } // if (listen_failed) + } // for(;;) + } // if (listen_endpoint.port() != 0) + + + _tcp_server.set_reuse_address(); + try + { + if( ep.get_address() != fc::ip::address() ) + _tcp_server.listen( ep ); + else + _tcp_server.listen( ep.port() ); + + _actual_listening_endpoint = _tcp_server.get_local_endpoint(); + ilog( "listening for connections on endpoint ${endpoint} (our first choice)", + ( "endpoint", _actual_listening_endpoint ) ); + } + catch ( fc::exception& e ) + { + FC_RETHROW_EXCEPTION( e, error, + "unable to listen on ${endpoint}", ("endpoint",listen_endpoint ) ); + } + } + + + +} } diff --git a/libraries/p2p/peer_connection.cpp b/libraries/p2p/peer_connection.cpp new file mode 100644 index 00000000..605113b1 --- /dev/null +++ b/libraries/p2p/peer_connection.cpp @@ -0,0 +1,7 @@ +#include + +namespace graphene { namespace p2p { + +} } //graphene::p2p + + diff --git a/libraries/p2p/stcp_socket.cpp b/libraries/p2p/stcp_socket.cpp new file mode 100644 index 00000000..7112cc34 --- /dev/null +++ b/libraries/p2p/stcp_socket.cpp @@ -0,0 +1,181 @@ +/* + * Copyright (c) 2015, Cryptonomex, Inc. + * All rights reserved. + * + * This source code is provided for evaluation in private test networks only, until September 8, 2015. After this date, this license expires and + * the code may not be used, modified or distributed for any purpose. Redistribution and use in source and binary forms, with or without modification, + * are permitted until September 8, 2015, provided that the following conditions are met: + * + * 1. The code and/or derivative works are used only for private test networks consisting of no more than 10 P2P nodes. + * + * 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 + +#include +#include +#include +#include +#include +#include + +#include + +namespace graphene { namespace p2p { + +stcp_socket::stcp_socket() +//:_buf_len(0) +#ifndef NDEBUG + : _read_buffer_in_use(false), + _write_buffer_in_use(false) +#endif +{ +} +stcp_socket::~stcp_socket() +{ +} + +void stcp_socket::do_key_exchange() +{ + _priv_key = fc::ecc::private_key::generate(); + fc::ecc::public_key pub = _priv_key.get_public_key(); + fc::ecc::public_key_data s = pub.serialize(); + std::shared_ptr serialized_key_buffer(new char[sizeof(fc::ecc::public_key_data)], [](char* p){ delete[] p; }); + memcpy(serialized_key_buffer.get(), (char*)&s, sizeof(fc::ecc::public_key_data)); + _sock.write( serialized_key_buffer, sizeof(fc::ecc::public_key_data) ); + _sock.read( serialized_key_buffer, sizeof(fc::ecc::public_key_data) ); + fc::ecc::public_key_data rpub; + memcpy((char*)&rpub, serialized_key_buffer.get(), sizeof(fc::ecc::public_key_data)); + + _shared_secret = _priv_key.get_shared_secret( rpub ); +// ilog("shared secret ${s}", ("s", shared_secret) ); + _send_aes.init( fc::sha256::hash( (char*)&_shared_secret, sizeof(_shared_secret) ), + fc::city_hash_crc_128((char*)&_shared_secret,sizeof(_shared_secret) ) ); + _recv_aes.init( fc::sha256::hash( (char*)&_shared_secret, sizeof(_shared_secret) ), + fc::city_hash_crc_128((char*)&_shared_secret,sizeof(_shared_secret) ) ); +} + + +void stcp_socket::connect_to( const fc::ip::endpoint& remote_endpoint ) +{ + _sock.connect_to( remote_endpoint ); + do_key_exchange(); +} + +void stcp_socket::bind( const fc::ip::endpoint& local_endpoint ) +{ + _sock.bind(local_endpoint); +} + +/** + * This method must read at least 16 bytes at a time from + * the underlying TCP socket so that it can decrypt them. It + * will buffer any left-over. + */ +size_t stcp_socket::readsome( char* buffer, size_t len ) +{ try { + assert( len > 0 && (len % 16) == 0 ); + +#ifndef NDEBUG + // This code was written with the assumption that you'd only be making one call to readsome + // at a time so it reuses _read_buffer. If you really need to make concurrent calls to + // readsome(), you'll need to prevent reusing _read_buffer here + struct check_buffer_in_use { + bool& _buffer_in_use; + check_buffer_in_use(bool& buffer_in_use) : _buffer_in_use(buffer_in_use) { assert(!_buffer_in_use); _buffer_in_use = true; } + ~check_buffer_in_use() { assert(_buffer_in_use); _buffer_in_use = false; } + } buffer_in_use_checker(_read_buffer_in_use); +#endif + + const size_t read_buffer_length = 4096; + if (!_read_buffer) + _read_buffer.reset(new char[read_buffer_length], [](char* p){ delete[] p; }); + + len = std::min(read_buffer_length, len); + + size_t s = _sock.readsome( _read_buffer, len, 0 ); + if( s % 16 ) + { + _sock.read(_read_buffer, 16 - (s%16), s); + s += 16-(s%16); + } + _recv_aes.decode( _read_buffer.get(), s, buffer ); + return s; +} FC_RETHROW_EXCEPTIONS( warn, "", ("len",len) ) } + +size_t stcp_socket::readsome( const std::shared_ptr& buf, size_t len, size_t offset ) +{ + return readsome(buf.get() + offset, len); +} + +bool stcp_socket::eof()const +{ + return _sock.eof(); +} + +size_t stcp_socket::writesome( const char* buffer, size_t len ) +{ try { + assert( len > 0 && (len % 16) == 0 ); + +#ifndef NDEBUG + // This code was written with the assumption that you'd only be making one call to writesome + // at a time so it reuses _write_buffer. If you really need to make concurrent calls to + // writesome(), you'll need to prevent reusing _write_buffer here + struct check_buffer_in_use { + bool& _buffer_in_use; + check_buffer_in_use(bool& buffer_in_use) : _buffer_in_use(buffer_in_use) { assert(!_buffer_in_use); _buffer_in_use = true; } + ~check_buffer_in_use() { assert(_buffer_in_use); _buffer_in_use = false; } + } buffer_in_use_checker(_write_buffer_in_use); +#endif + + const std::size_t write_buffer_length = 4096; + if (!_write_buffer) + _write_buffer.reset(new char[write_buffer_length], [](char* p){ delete[] p; }); + len = std::min(write_buffer_length, len); + memset(_write_buffer.get(), 0, len); // just in case aes.encode screws up + /** + * every sizeof(crypt_buf) bytes the aes channel + * has an error and doesn't decrypt properly... disable + * for now because we are going to upgrade to something + * better. + */ + uint32_t ciphertext_len = _send_aes.encode( buffer, len, _write_buffer.get() ); + assert(ciphertext_len == len); + _sock.write( _write_buffer, ciphertext_len ); + return ciphertext_len; +} FC_RETHROW_EXCEPTIONS( warn, "", ("len",len) ) } + +size_t stcp_socket::writesome( const std::shared_ptr& buf, size_t len, size_t offset ) +{ + return writesome(buf.get() + offset, len); +} + +void stcp_socket::flush() +{ + _sock.flush(); +} + + +void stcp_socket::close() +{ + try + { + _sock.close(); + }FC_RETHROW_EXCEPTIONS( warn, "error closing stcp socket" ); +} + +void stcp_socket::accept() +{ + do_key_exchange(); +} + + +}} // namespace graphene::p2p + From c0b9af9a996c0ae90b6816d6b995006ff0b8e5b2 Mon Sep 17 00:00:00 2001 From: Eric Frias Date: Fri, 21 Aug 2015 19:53:35 -0400 Subject: [PATCH 225/353] Greatly reduce the amount of time the p2p network code will wait for a peer to return a requested block/transaction. Make this time dependent on the actual block interval. This should allow the the node to give up and request the block from another peer before the ~30 second undo interval has passed. Fix the merkle root calculation to avoid reading past the end of a vector. Modify the algorithm to do what was likely intended (this modification is currently disabled because it will yield different results than the currently-running testnet) Fix windows build errors. --- libraries/app/application.cpp | 5 +++ libraries/chain/block_database.cpp | 3 +- libraries/chain/protocol/block.cpp | 34 ++++++++++++++++++--- libraries/fc | 2 +- libraries/net/include/graphene/net/node.hpp | 2 ++ libraries/net/node.cpp | 23 +++++++++----- 6 files changed, 56 insertions(+), 13 deletions(-) diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp index 00dc0dfc..4895bd2c 100644 --- a/libraries/app/application.cpp +++ b/libraries/app/application.cpp @@ -550,6 +550,11 @@ namespace detail { // notify GUI or something cool } + uint8_t get_current_block_interval_in_seconds() const override + { + return _chain_db->get_global_properties().parameters.block_interval; + } + application* _self; fc::path _data_dir; diff --git a/libraries/chain/block_database.cpp b/libraries/chain/block_database.cpp index cd1f1e29..e197a469 100644 --- a/libraries/chain/block_database.cpp +++ b/libraries/chain/block_database.cpp @@ -156,7 +156,8 @@ optional block_database::fetch_optional( const block_id_type& id ) vector data( e.block_size ); _blocks.seekg( e.block_pos ); - _blocks.read( data.data(), e.block_size ); + if (e.block_size) + _blocks.read( data.data(), e.block_size ); auto result = fc::raw::unpack(data); FC_ASSERT( result.id() == e.block_id ); return result; diff --git a/libraries/chain/protocol/block.cpp b/libraries/chain/protocol/block.cpp index 5ae676fb..808eb927 100644 --- a/libraries/chain/protocol/block.cpp +++ b/libraries/chain/protocol/block.cpp @@ -58,18 +58,44 @@ namespace graphene { namespace chain { checksum_type signed_block::calculate_merkle_root()const { - if( transactions.size() == 0 ) return checksum_type(); + if( transactions.size() == 0 ) + return checksum_type(); vector ids; ids.resize( ((transactions.size() + 1)/2)*2 ); for( uint32_t i = 0; i < transactions.size(); ++i ) ids[i] = transactions[i].merkle_digest(); - while( ids.size() > 1 ) + vector::size_type current_number_of_hashes = ids.size(); + while( true ) { +#define AUG_20_TESTNET_COMPATIBLE +#ifdef AUG_20_TESTNET_COMPATIBLE for( uint32_t i = 0; i < transactions.size(); i += 2 ) - ids[i/2] = digest_type::hash( std::make_pair( ids[i], ids[i+1] ) ); - ids.resize( ids.size() / 2 ); +#else + for( uint32_t i = 0; i < current_number_of_hashes; i += 2 ) +#endif + ids[i/2] = digest_type::hash( std::make_pair( ids[i], ids[i+1] ) ); + // since we're processing hashes in pairs, we need to ensure that we always + // have an even number of hashes in the ids list. If we would end up with + // an odd number, add a default-initialized hash to compensate + current_number_of_hashes /= 2; +#ifdef AUG_20_TESTNET_COMPATIBLE + if (current_number_of_hashes <= 1) + break; +#else + if (current_number_of_hashes == 1) + break; + if (current_number_of_hashes % 2) + { + ++current_number_of_hashes; + // TODO: HARD FORK: we should probably enable the next line the next time we fire + // up a new testnet; it will change the merkle roots we generate, but will + // give us a better-defined algorithm for calculating them + // + ids[current_number_of_hashes - 1] = digest_type(); + } +#endif } return checksum_type::hash( ids[0] ); } diff --git a/libraries/fc b/libraries/fc index 458b6017..71be796a 160000 --- a/libraries/fc +++ b/libraries/fc @@ -1 +1 @@ -Subproject commit 458b601774c36b702e2d4712320b5d53c6b2ee1c +Subproject commit 71be796af50c407281a40e61e4199a87e0a19314 diff --git a/libraries/net/include/graphene/net/node.hpp b/libraries/net/include/graphene/net/node.hpp index b8685ff9..c8e53f00 100644 --- a/libraries/net/include/graphene/net/node.hpp +++ b/libraries/net/include/graphene/net/node.hpp @@ -158,6 +158,8 @@ namespace graphene { namespace net { virtual uint32_t estimate_last_known_fork_from_git_revision_timestamp(uint32_t unix_timestamp) const = 0; virtual void error_encountered(const std::string& message, const fc::oexception& error) = 0; + virtual uint8_t get_current_block_interval_in_seconds() const = 0; + }; /** diff --git a/libraries/net/node.cpp b/libraries/net/node.cpp index 08137457..c72a16be 100644 --- a/libraries/net/node.cpp +++ b/libraries/net/node.cpp @@ -289,7 +289,9 @@ namespace graphene { namespace net { namespace detail { (get_block_time) \ (get_head_block_id) \ (estimate_last_known_fork_from_git_revision_timestamp) \ - (error_encountered) + (error_encountered) \ + (get_current_block_interval_in_seconds) + #define DECLARE_ACCUMULATOR(r, data, method_name) \ mutable call_stats_accumulator BOOST_PP_CAT(_, BOOST_PP_CAT(method_name, _execution_accumulator)); \ @@ -390,6 +392,7 @@ namespace graphene { namespace net { namespace detail { item_hash_t get_head_block_id() const override; uint32_t estimate_last_known_fork_from_git_revision_timestamp(uint32_t unix_timestamp) const override; void error_encountered(const std::string& message, const fc::oexception& error) override; + uint8_t get_current_block_interval_in_seconds() const override; }; ///////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -1282,9 +1285,10 @@ namespace graphene { namespace net { namespace detail { } // timeout for any active peers is two block intervals - uint32_t active_disconnect_timeout = std::max(5 * GRAPHENE_MAX_BLOCK_INTERVAL / 2, 30); - uint32_t active_send_keepalive_timeount = std::max(active_disconnect_timeout / 2, 11); - uint32_t active_ignored_request_timeount = std::max(GRAPHENE_MAX_BLOCK_INTERVAL / 4, 10); + uint8_t current_block_interval_in_seconds = _delegate->get_current_block_interval_in_seconds(); + uint32_t active_disconnect_timeout = 10 * current_block_interval_in_seconds; + uint32_t active_send_keepalive_timeount = active_disconnect_timeout / 2; + uint32_t active_ignored_request_timeount = 3 * current_block_interval_in_seconds; fc::time_point active_disconnect_threshold = fc::time_point::now() - fc::seconds(active_disconnect_timeout); fc::time_point active_send_keepalive_threshold = fc::time_point::now() - fc::seconds(active_send_keepalive_timeount); fc::time_point active_ignored_request_threshold = fc::time_point::now() - fc::seconds(active_ignored_request_timeount); @@ -1334,7 +1338,7 @@ namespace graphene { namespace net { namespace detail { peers_to_disconnect_forcibly.push_back(active_peer); } else if (active_peer->connection_initiation_time < active_send_keepalive_threshold && - active_peer->get_last_message_received_time() < active_send_keepalive_threshold) + active_peer->get_last_message_received_time() < active_send_keepalive_threshold) { wlog( "Sending a keepalive message to peer ${peer} who hasn't sent us any messages in the last ${timeout} seconds", ( "peer", active_peer->get_remote_endpoint() )("timeout", active_send_keepalive_timeount ) ); @@ -1387,11 +1391,11 @@ namespace graphene { namespace net { namespace detail { peers_to_send_keep_alive.clear(); for (const peer_connection_ptr& peer : peers_to_terminate ) - { + { assert(_terminating_connections.find(peer) != _terminating_connections.end()); _terminating_connections.erase(peer); schedule_peer_for_deletion(peer); - } + } if (!_node_is_shutting_down && !_terminate_inactive_connections_loop_done.canceled()) _terminate_inactive_connections_loop_done = fc::schedule( [this](){ terminate_inactive_connections_loop(); }, @@ -5217,6 +5221,11 @@ namespace graphene { namespace net { namespace detail { INVOKE_AND_COLLECT_STATISTICS(error_encountered, message, error); } + uint8_t statistics_gathering_node_delegate_wrapper::get_current_block_interval_in_seconds() const + { + INVOKE_AND_COLLECT_STATISTICS(get_current_block_interval_in_seconds); + } + #undef INVOKE_AND_COLLECT_STATISTICS } // end namespace detail From aeebb1be099fd325f014f4f35aa9e90bf2431839 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Mon, 24 Aug 2015 15:08:09 -0400 Subject: [PATCH 226/353] cli_wallet: Copy ws_server, ws_user, ws_password to new wallet --- libraries/wallet/include/graphene/wallet/wallet.hpp | 2 +- libraries/wallet/wallet.cpp | 13 ++++++++----- programs/cli_wallet/main.cpp | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/libraries/wallet/include/graphene/wallet/wallet.hpp b/libraries/wallet/include/graphene/wallet/wallet.hpp index 68b191e9..e044c94b 100644 --- a/libraries/wallet/include/graphene/wallet/wallet.hpp +++ b/libraries/wallet/include/graphene/wallet/wallet.hpp @@ -214,7 +214,7 @@ class wallet_api_impl; class wallet_api { public: - wallet_api( const chain_id_type& chain_id, fc::api rapi ); + wallet_api( const wallet_data& initial_data, fc::api rapi ); virtual ~wallet_api(); bool copy_wallet_file( string destination_filename ); diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp index 1c211d32..f34dbdb7 100644 --- a/libraries/wallet/wallet.cpp +++ b/libraries/wallet/wallet.cpp @@ -359,9 +359,9 @@ private: public: wallet_api& self; - wallet_api_impl( wallet_api& s, const chain_id_type& chain_id, fc::api rapi ) + wallet_api_impl( wallet_api& s, const wallet_data& initial_data, fc::api rapi ) : self(s), - _chain_id(chain_id), + _chain_id(initial_data.chain_id), _remote_api(rapi), _remote_db(rapi->database()), _remote_net_broadcast(rapi->network_broadcast()), @@ -372,7 +372,7 @@ public: { FC_THROW( "Remote server gave us an unexpected chain_id", ("remote_chain_id", remote_chain_id) - ("chain_id", chain_id) ); + ("chain_id", _chain_id) ); } init_prototype_ops(); _remote_db->subscribe_to_objects( [=]( const fc::variant& obj ) @@ -380,6 +380,9 @@ public: fc::async([this]{resync();}, "Resync after block"); }, {dynamic_global_property_id_type()} ); _wallet.chain_id = _chain_id; + _wallet.ws_server = initial_data.ws_server; + _wallet.ws_user = initial_data.ws_user; + _wallet.ws_password = initial_data.ws_password; } virtual ~wallet_api_impl() { @@ -2026,8 +2029,8 @@ void operation_printer::operator()(const asset_create_operation& op) const namespace graphene { namespace wallet { -wallet_api::wallet_api(const chain_id_type& chain_id, fc::api rapi) - : my(new detail::wallet_api_impl(*this, chain_id, rapi)) +wallet_api::wallet_api(const wallet_data& initial_data, fc::api rapi) + : my(new detail::wallet_api_impl(*this, initial_data, rapi)) { } diff --git a/programs/cli_wallet/main.cpp b/programs/cli_wallet/main.cpp index cf2c259b..aa1a0585 100644 --- a/programs/cli_wallet/main.cpp +++ b/programs/cli_wallet/main.cpp @@ -169,7 +169,7 @@ int main( int argc, char** argv ) // TODO: Error message here FC_ASSERT( remote_api->login( wdata.ws_user, wdata.ws_password ) ); - auto wapiptr = std::make_shared( wdata.chain_id, remote_api ); + auto wapiptr = std::make_shared( wdata, remote_api ); wapiptr->set_wallet_filename( wallet_file.generic_string() ); wapiptr->load_wallet_file(); From 2464b788adf0e8b9cb909746095848e499fa7520 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Mon, 24 Aug 2015 17:57:44 -0400 Subject: [PATCH 227/353] improve reindexing performance --- libraries/CMakeLists.txt | 1 + libraries/chain/db_block.cpp | 27 ++++++++------ libraries/chain/db_management.cpp | 9 +++-- .../graphene/chain/witness_scheduler.hpp | 21 ++++++----- .../db/include/graphene/db/undo_database.hpp | 1 + .../net/message_oriented_connection.hpp | 37 ++++++++++--------- 6 files changed, 53 insertions(+), 43 deletions(-) diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt index 6af806f9..2a0754ef 100644 --- a/libraries/CMakeLists.txt +++ b/libraries/CMakeLists.txt @@ -4,6 +4,7 @@ add_subdirectory( deterministic_openssl_rand ) add_subdirectory( chain ) add_subdirectory( egenesis ) add_subdirectory( net ) +add_subdirectory( p2p ) add_subdirectory( time ) add_subdirectory( utilities ) add_subdirectory( app ) diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index 62c77109..2cf8e9d1 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -439,20 +439,23 @@ void database::_apply_block( const signed_block& next_block ) } FC_CAPTURE_AND_RETHROW( (next_block.block_num()) ) } void database::notify_changed_objects() -{ - const auto& head_undo = _undo_db.head(); - vector changed_ids; changed_ids.reserve(head_undo.old_values.size()); - for( const auto& item : head_undo.old_values ) changed_ids.push_back(item.first); - for( const auto& item : head_undo.new_ids ) changed_ids.push_back(item); - vector removed; - removed.reserve( head_undo.removed.size() ); - for( const auto& item : head_undo.removed ) +{ try { + if( _undo_db.enabled() ) { - changed_ids.push_back( item.first ); - removed.emplace_back( item.second.get() ); + const auto& head_undo = _undo_db.head(); + vector changed_ids; changed_ids.reserve(head_undo.old_values.size()); + for( const auto& item : head_undo.old_values ) changed_ids.push_back(item.first); + for( const auto& item : head_undo.new_ids ) changed_ids.push_back(item); + vector removed; + removed.reserve( head_undo.removed.size() ); + for( const auto& item : head_undo.removed ) + { + changed_ids.push_back( item.first ); + removed.emplace_back( item.second.get() ); + } + changed_objects(changed_ids); } - changed_objects(changed_ids); -} +} FC_CAPTURE_AND_RETHROW() } processed_transaction database::apply_transaction(const signed_transaction& trx, uint32_t skip) { diff --git a/libraries/chain/db_management.cpp b/libraries/chain/db_management.cpp index 15466734..a28d40d3 100644 --- a/libraries/chain/db_management.cpp +++ b/libraries/chain/db_management.cpp @@ -38,6 +38,7 @@ database::~database(){ void database::reindex(fc::path data_dir, const genesis_state_type& initial_allocation) { try { + ilog( "reindexing blockchain" ); wipe(data_dir, false); open(data_dir, [&initial_allocation]{return initial_allocation;}); @@ -47,19 +48,21 @@ void database::reindex(fc::path data_dir, const genesis_state_type& initial_allo const auto last_block_num = last_block->block_num(); + ilog( "Replaying blocks..." ); // TODO: disable undo tracking during reindex, this currently causes crashes in the benchmark test - //_undo_db.disable(); + _undo_db.disable(); for( uint32_t i = 1; i <= last_block_num; ++i ) { + if( i % 1000 == 0 ) std::cerr << " " << double(i*100)/last_block_num << "% \r"; apply_block(*_block_id_to_block.fetch_by_number(i), skip_witness_signature | skip_transaction_signatures | skip_transaction_dupe_check | skip_tapos_check | skip_authority_check); } - //_undo_db.enable(); + _undo_db.enable(); auto end = fc::time_point::now(); - wdump( ((end-start).count()/1000000.0) ); + ilog( "Done reindexing, elapsed time: ${t} sec", ("t",double((end-start).count())/1000000.0 ) ); } FC_CAPTURE_AND_RETHROW( (data_dir) ) } void database::wipe(const fc::path& data_dir, bool include_blocks) diff --git a/libraries/chain/include/graphene/chain/witness_scheduler.hpp b/libraries/chain/include/graphene/chain/witness_scheduler.hpp index ec595922..5feef417 100644 --- a/libraries/chain/include/graphene/chain/witness_scheduler.hpp +++ b/libraries/chain/include/graphene/chain/witness_scheduler.hpp @@ -26,7 +26,7 @@ namespace graphene { namespace chain { -using boost::container::flat_set; +//using boost::container::flat_set; enum witness_scheduler_relax_flags { @@ -50,7 +50,7 @@ class generic_witness_scheduler assert( _turns == turns ); #endif - flat_set< WitnessID > witness_set; + set< WitnessID > witness_set; // make sure each witness_id occurs only once among the three states auto process_id = [&]( WitnessID item ) { @@ -249,14 +249,15 @@ class generic_witness_scheduler template< typename T > void update( const T& revised_set ) { - flat_set< WitnessID > current_set; - flat_set< WitnessID > schedule_set; + set< WitnessID > current_set; + set< WitnessID > schedule_set; - current_set.reserve( + /* current_set.reserve( _ineligible_waiting_for_token.size() + _ineligible_no_turn.size() + _eligible.size() + _schedule.size() ); + */ for( const auto& item : _ineligible_waiting_for_token ) current_set.insert( item.first ); for( const WitnessID& item : _ineligible_no_turn ) @@ -269,16 +270,16 @@ class generic_witness_scheduler schedule_set.insert( item ); } - flat_set< WitnessID > insertion_set; - insertion_set.reserve( revised_set.size() ); + set< WitnessID > insertion_set; + //insertion_set.reserve( revised_set.size() ); for( const WitnessID& item : revised_set ) { if( current_set.find( item ) == current_set.end() ) insertion_set.insert( item ); } - flat_set< WitnessID > removal_set; - removal_set.reserve( current_set.size() ); + set< WitnessID > removal_set; + //removal_set.reserve( current_set.size() ); for( const WitnessID& item : current_set ) { if( revised_set.find( item ) == revised_set.end() ) @@ -366,7 +367,7 @@ class generic_witness_scheduler std::deque < WitnessID > _schedule; // in _schedule, but not to be replaced - flat_set< WitnessID > _lame_duck; + set< WitnessID > _lame_duck; }; template< typename WitnessID, typename RNG, typename CountType, typename OffsetType, bool debug = true > diff --git a/libraries/db/include/graphene/db/undo_database.hpp b/libraries/db/include/graphene/db/undo_database.hpp index 3b698798..4cf206ee 100644 --- a/libraries/db/include/graphene/db/undo_database.hpp +++ b/libraries/db/include/graphene/db/undo_database.hpp @@ -85,6 +85,7 @@ namespace graphene { namespace db { void disable(); void enable(); + bool enabled()const { return !_disabled; } session start_undo_session(); /** diff --git a/libraries/net/include/graphene/net/message_oriented_connection.hpp b/libraries/net/include/graphene/net/message_oriented_connection.hpp index dec5e994..9547fcef 100644 --- a/libraries/net/include/graphene/net/message_oriented_connection.hpp +++ b/libraries/net/include/graphene/net/message_oriented_connection.hpp @@ -36,26 +36,27 @@ namespace graphene { namespace net { /** uses a secure socket to create a connection that reads and writes a stream of `fc::net::message` objects */ class message_oriented_connection { - public: - message_oriented_connection(message_oriented_connection_delegate* delegate = nullptr); - ~message_oriented_connection(); - fc::tcp_socket& get_socket(); - void accept(); - void bind(const fc::ip::endpoint& local_endpoint); - void connect_to(const fc::ip::endpoint& remote_endpoint); + public: + message_oriented_connection(message_oriented_connection_delegate* delegate = nullptr); + ~message_oriented_connection(); + fc::tcp_socket& get_socket(); - void send_message(const message& message_to_send); - void close_connection(); - void destroy_connection(); + void accept(); + void bind(const fc::ip::endpoint& local_endpoint); + void connect_to(const fc::ip::endpoint& remote_endpoint); - uint64_t get_total_bytes_sent() const; - uint64_t get_total_bytes_received() const; - fc::time_point get_last_message_sent_time() const; - fc::time_point get_last_message_received_time() const; - fc::time_point get_connection_time() const; - fc::sha512 get_shared_secret() const; - private: - std::unique_ptr my; + void send_message(const message& message_to_send); + void close_connection(); + void destroy_connection(); + + uint64_t get_total_bytes_sent() const; + uint64_t get_total_bytes_received() const; + fc::time_point get_last_message_sent_time() const; + fc::time_point get_last_message_received_time() const; + fc::time_point get_connection_time() const; + fc::sha512 get_shared_secret() const; + private: + std::unique_ptr my; }; typedef std::shared_ptr message_oriented_connection_ptr; From 0532661937ad91b2dc5b4a99cfd08422a0789e67 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Mon, 24 Aug 2015 18:50:09 -0400 Subject: [PATCH 228/353] extra performance while reindexing --- libraries/chain/db_block.cpp | 15 ++++++++++----- libraries/chain/db_management.cpp | 3 ++- libraries/chain/db_witness_schedule.cpp | 7 +++++++ .../chain/include/graphene/chain/database.hpp | 3 ++- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index 2cf8e9d1..99131146 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -557,13 +557,18 @@ const witness_object& database::validate_block_header( uint32_t skip, const sign const witness_object& witness = next_block.witness(*this); FC_ASSERT( secret_hash_type::hash( next_block.previous_secret ) == witness.next_secret_hash, "", ("previous_secret", next_block.previous_secret)("next_secret_hash", witness.next_secret_hash)); - if( !(skip&skip_witness_signature) ) FC_ASSERT( next_block.validate_signee( witness.signing_key ) ); - uint32_t slot_num = get_slot_at_time( next_block.timestamp ); - FC_ASSERT( slot_num > 0 ); + if( !(skip&skip_witness_signature) ) + FC_ASSERT( next_block.validate_signee( witness.signing_key ) ); - witness_id_type scheduled_witness = get_scheduled_witness( slot_num ).first; - FC_ASSERT( next_block.witness == scheduled_witness ); + if( !skip_witness_schedule_check ) + { + uint32_t slot_num = get_slot_at_time( next_block.timestamp ); + FC_ASSERT( slot_num > 0 ); + + witness_id_type scheduled_witness = get_scheduled_witness( slot_num ).first; + FC_ASSERT( next_block.witness == scheduled_witness ); + } return witness; } diff --git a/libraries/chain/db_management.cpp b/libraries/chain/db_management.cpp index a28d40d3..52bc39b0 100644 --- a/libraries/chain/db_management.cpp +++ b/libraries/chain/db_management.cpp @@ -53,11 +53,12 @@ void database::reindex(fc::path data_dir, const genesis_state_type& initial_allo _undo_db.disable(); for( uint32_t i = 1; i <= last_block_num; ++i ) { - if( i % 1000 == 0 ) std::cerr << " " << double(i*100)/last_block_num << "% \r"; + if( i % 2000 == 0 ) std::cerr << " " << double(i*100)/last_block_num << "% "< database::get_near_witness_schedule()const void database::update_witness_schedule(const signed_block& next_block) { + auto start = fc::time_point::now(); const global_property_object& gpo = get_global_properties(); const witness_schedule_object& wso = get(witness_schedule_id_type()); uint32_t schedule_needs_filled = gpo.active_witnesses.size(); @@ -168,6 +169,12 @@ void database::update_witness_schedule(const signed_block& next_block) (_wso.recent_slots_filled << 1) + 1) << (schedule_slot - 1); }); + auto end = fc::time_point::now(); + static uint64_t total_time = 0; + static uint64_t calls = 0; + total_time += (end - start).count(); + if( ++calls % 1000 == 0 ) + idump( ( double(total_time/1000000.0)/calls) ); } uint32_t database::witness_participation_rate()const diff --git a/libraries/chain/include/graphene/chain/database.hpp b/libraries/chain/include/graphene/chain/database.hpp index 755d18a6..e1a56e90 100644 --- a/libraries/chain/include/graphene/chain/database.hpp +++ b/libraries/chain/include/graphene/chain/database.hpp @@ -89,7 +89,8 @@ namespace graphene { namespace chain { skip_authority_check = 1 << 6, ///< used while reindexing -- disables any checking of authority on transactions skip_merkle_check = 1 << 7, ///< used while reindexing skip_assert_evaluation = 1 << 8, ///< used while reindexing - skip_undo_history_check = 1 << 9 ///< used while reindexing + skip_undo_history_check = 1 << 9, ///< used while reindexing + skip_witness_schedule_check = 1 << 10 ///< used whiel reindexing }; /** From cb3c23a17b0ea99816e3c3f35cbcc7b0cbce9f42 Mon Sep 17 00:00:00 2001 From: Eric Frias Date: Mon, 24 Aug 2015 19:34:28 -0400 Subject: [PATCH 229/353] Avoid referencing uninitialized memory --- libraries/app/application.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp index 4895bd2c..5c8ec195 100644 --- a/libraries/app/application.cpp +++ b/libraries/app/application.cpp @@ -429,7 +429,7 @@ namespace detail { if( num > 0 ) result.push_back(_chain_db->get_block_id_for_num(num)); - if( block_header::num_from_id(result.back()) < _chain_db->head_block_num() ) + if( !result.empty() && block_header::num_from_id(result.back()) < _chain_db->head_block_num() ) remaining_item_count = _chain_db->head_block_num() - block_header::num_from_id(result.back()); return result; From a79eff2761119b34d9c8854c0a9ab9c2fafae16e Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Tue, 25 Aug 2015 13:45:20 -0400 Subject: [PATCH 230/353] progress toward witness schedule refactor --- libraries/CMakeLists.txt | 2 +- libraries/chain/db_block.cpp | 20 ------------------- libraries/chain/db_update.cpp | 8 +------- libraries/chain/db_witness_schedule.cpp | 6 +++--- .../graphene/chain/global_property_object.hpp | 10 +++++++--- .../include/graphene/chain/protocol/block.hpp | 5 +---- .../include/graphene/chain/witness_object.hpp | 5 +++-- libraries/wallet/wallet.cpp | 1 - programs/size_checker/main.cpp | 15 ++++++++++++++ 9 files changed, 31 insertions(+), 41 deletions(-) diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt index 2a0754ef..be71012d 100644 --- a/libraries/CMakeLists.txt +++ b/libraries/CMakeLists.txt @@ -4,7 +4,7 @@ add_subdirectory( deterministic_openssl_rand ) add_subdirectory( chain ) add_subdirectory( egenesis ) add_subdirectory( net ) -add_subdirectory( p2p ) +#add_subdirectory( p2p ) add_subdirectory( time ) add_subdirectory( utilities ) add_subdirectory( app ) diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index 99131146..89dd4613 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -267,24 +267,6 @@ signed_block database::_generate_block( _pending_block.timestamp = when; - // Genesis witnesses start with a default initial secret - if( witness_obj.next_secret_hash == secret_hash_type::hash( secret_hash_type() ) ) - { - _pending_block.previous_secret = secret_hash_type(); - } - else - { - secret_hash_type::encoder last_enc; - fc::raw::pack( last_enc, block_signing_private_key ); - fc::raw::pack( last_enc, witness_obj.previous_secret ); - _pending_block.previous_secret = last_enc.result(); - } - - secret_hash_type::encoder next_enc; - fc::raw::pack( next_enc, block_signing_private_key ); - fc::raw::pack( next_enc, _pending_block.previous_secret ); - _pending_block.next_secret_hash = secret_hash_type::hash(next_enc.result()); - _pending_block.transaction_merkle_root = _pending_block.calculate_merkle_root(); _pending_block.witness = witness_id; @@ -555,8 +537,6 @@ const witness_object& database::validate_block_header( uint32_t skip, const sign FC_ASSERT( _pending_block.previous == next_block.previous, "", ("pending.prev",_pending_block.previous)("next.prev",next_block.previous) ); FC_ASSERT( _pending_block.timestamp <= next_block.timestamp, "", ("_pending_block.timestamp",_pending_block.timestamp)("next",next_block.timestamp)("blocknum",next_block.block_num()) ); const witness_object& witness = next_block.witness(*this); - FC_ASSERT( secret_hash_type::hash( next_block.previous_secret ) == witness.next_secret_hash, "", - ("previous_secret", next_block.previous_secret)("next_secret_hash", witness.next_secret_hash)); if( !(skip&skip_witness_signature) ) FC_ASSERT( next_block.validate_signee( witness.signing_key ) ); diff --git a/libraries/chain/db_update.cpp b/libraries/chain/db_update.cpp index ded6a04a..da6e84ef 100644 --- a/libraries/chain/db_update.cpp +++ b/libraries/chain/db_update.cpp @@ -44,11 +44,6 @@ void database::update_global_dynamic_data( const signed_block& b ) // dynamic global properties updating modify( _dgp, [&]( dynamic_global_property_object& dgp ){ - secret_hash_type::encoder enc; - fc::raw::pack( enc, dgp.random ); - fc::raw::pack( enc, b.previous_secret ); - dgp.random = enc.result(); - if( _checkpoints.size() && _checkpoints.rbegin()->first >= b.block_num() ) dgp.recently_missed_count = 0; else if( missed_blocks ) @@ -92,8 +87,7 @@ void database::update_signing_witness(const witness_object& signing_witness, con modify( signing_witness, [&]( witness_object& _wit ) { - _wit.previous_secret = new_block.previous_secret; - _wit.next_secret_hash = new_block.next_secret_hash; + _wit.last_slot_num = new_block.block_num(); /// TODO: plus total missed blocks } ); } diff --git a/libraries/chain/db_witness_schedule.cpp b/libraries/chain/db_witness_schedule.cpp index 2cb8b711..30389bc8 100644 --- a/libraries/chain/db_witness_schedule.cpp +++ b/libraries/chain/db_witness_schedule.cpp @@ -132,9 +132,8 @@ void database::update_witness_schedule(const signed_block& next_block) witness_id_type wit; - const dynamic_global_property_object& dpo = get_dynamic_global_properties(); + //const dynamic_global_property_object& dpo = get_dynamic_global_properties(); - assert( dpo.random.data_size() == witness_scheduler_rng::seed_length ); assert( witness_scheduler_rng::seed_length == wso.rng_seed.size() ); modify(wso, [&](witness_schedule_object& _wso) @@ -161,8 +160,9 @@ void database::update_witness_schedule(const signed_block& next_block) } while( !_wso.scheduler.get_slot(schedule_needs_filled, wit) ) { + auto random = fc::ripemd160::hash( next_block.timestamp ); if( _wso.scheduler.produce_schedule(rng) & emit_turn ) - memcpy(_wso.rng_seed.begin(), dpo.random.data(), dpo.random.data_size()); + memcpy(_wso.rng_seed.begin(), random.data(), random.data_size()); } _wso.last_scheduling_block = next_block.block_num(); _wso.recent_slots_filled = ( diff --git a/libraries/chain/include/graphene/chain/global_property_object.hpp b/libraries/chain/include/graphene/chain/global_property_object.hpp index dacb5ce2..82a5703b 100644 --- a/libraries/chain/include/graphene/chain/global_property_object.hpp +++ b/libraries/chain/include/graphene/chain/global_property_object.hpp @@ -42,7 +42,7 @@ namespace graphene { namespace chain { chain_parameters parameters; optional pending_parameters; - uint32_t next_available_vote_id = 0; + uint32_t next_available_vote_id = 0; vector active_committee_members; // updated once per maintenance interval flat_set active_witnesses; // updated once per maintenance interval // n.b. witness scheduling is done by witness_schedule object @@ -64,7 +64,6 @@ namespace graphene { namespace chain { static const uint8_t space_id = implementation_ids; static const uint8_t type_id = impl_dynamic_global_property_object_type; - secret_hash_type random; uint32_t head_block_number = 0; block_id_type head_block_id; time_point_sec time; @@ -81,6 +80,11 @@ namespace graphene { namespace chain { */ uint32_t recently_missed_count = 0; + /** this is the set of witnesses that may produce the next block because they + * haven't produced any blocks recently. + */ + vector potential_witnesses; + /** * dynamic_flags specifies chain state properties that can be * expressed in one bit. @@ -104,7 +108,6 @@ namespace graphene { namespace chain { }} FC_REFLECT_DERIVED( graphene::chain::dynamic_global_property_object, (graphene::db::object), - (random) (head_block_number) (head_block_id) (time) @@ -114,6 +117,7 @@ FC_REFLECT_DERIVED( graphene::chain::dynamic_global_property_object, (graphene:: (accounts_registered_this_interval) (recently_missed_count) (dynamic_flags) + (potential_witnesses) ) FC_REFLECT_DERIVED( graphene::chain::global_property_object, (graphene::db::object), diff --git a/libraries/chain/include/graphene/chain/protocol/block.hpp b/libraries/chain/include/graphene/chain/protocol/block.hpp index d9e882a1..34b0cfc2 100644 --- a/libraries/chain/include/graphene/chain/protocol/block.hpp +++ b/libraries/chain/include/graphene/chain/protocol/block.hpp @@ -27,8 +27,6 @@ namespace graphene { namespace chain { uint32_t block_num()const { return num_from_id(previous) + 1; } fc::time_point_sec timestamp; witness_id_type witness; - secret_hash_type next_secret_hash; - secret_hash_type previous_secret; checksum_type transaction_merkle_root; extensions_type extensions; @@ -53,7 +51,6 @@ namespace graphene { namespace chain { } } // graphene::chain -FC_REFLECT( graphene::chain::block_header, (previous)(timestamp)(witness) - (next_secret_hash)(previous_secret)(transaction_merkle_root)(extensions) ) +FC_REFLECT( graphene::chain::block_header, (previous)(timestamp)(witness)(transaction_merkle_root)(extensions) ) FC_REFLECT_DERIVED( graphene::chain::signed_block_header, (graphene::chain::block_header), (witness_signature) ) FC_REFLECT_DERIVED( graphene::chain::signed_block, (graphene::chain::signed_block_header), (transactions) ) diff --git a/libraries/chain/include/graphene/chain/witness_object.hpp b/libraries/chain/include/graphene/chain/witness_object.hpp index 17b94ed5..0b392eb8 100644 --- a/libraries/chain/include/graphene/chain/witness_object.hpp +++ b/libraries/chain/include/graphene/chain/witness_object.hpp @@ -32,6 +32,7 @@ namespace graphene { namespace chain { static const uint8_t type_id = witness_object_type; account_id_type witness_account; + uint32_t last_slot_num = 0; public_key_type signing_key; secret_hash_type next_secret_hash; secret_hash_type previous_secret; @@ -45,6 +46,7 @@ namespace graphene { namespace chain { struct by_account; struct by_vote_id; + struct by_last_block; using witness_multi_index_type = multi_index_container< witness_object, indexed_by< @@ -64,9 +66,8 @@ namespace graphene { namespace chain { FC_REFLECT_DERIVED( graphene::chain::witness_object, (graphene::db::object), (witness_account) + (last_slot_num) (signing_key) - (next_secret_hash) - (previous_secret) (pay_vb) (vote_id) (total_votes) diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp index f34dbdb7..b61c752c 100644 --- a/libraries/wallet/wallet.cpp +++ b/libraries/wallet/wallet.cpp @@ -478,7 +478,6 @@ public: result["chain_id"] = chain_props.chain_id; result["active_witnesses"] = global_props.active_witnesses; result["active_committee_members"] = global_props.active_committee_members; - result["entropy"] = dynamic_props.random; return result; } chain_property_object get_chain_properties() const diff --git a/programs/size_checker/main.cpp b/programs/size_checker/main.cpp index 5950f6aa..0d3fc7f1 100644 --- a/programs/size_checker/main.cpp +++ b/programs/size_checker/main.cpp @@ -64,6 +64,20 @@ int main( int argc, char** argv ) { graphene::chain::operation op; + + vector witnesses; witnesses.resize(50); + for( uint32_t i = 0; i < 60*60*24*30; ++i ) + { + witnesses[ rand() % 50 ]++; + } + + std::sort( witnesses.begin(), witnesses.end() ); + idump((witnesses.back() - witnesses.front()) ); + idump((60*60*24*30/50)); + idump(("deviation: ")((60*60*24*30/50-witnesses.front())/(60*60*24*30/50.0))); + + idump( (witnesses) ); + for( int32_t i = 0; i < op.count(); ++i ) { op.set_which(i); @@ -85,6 +99,7 @@ int main( int argc, char** argv ) std::cout << "\n"; } std::cout << "]\n"; + std::cerr << "Size of block header: " << sizeof( block_header ) << " " << fc::raw::pack_size( block_header() ) << "\n"; } catch ( const fc::exception& e ){ edump((e.to_detail_string())); } idump((sizeof(signed_block))); From 30296d9c3603c1f58e0ba76bf72507407272bfa6 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Tue, 25 Aug 2015 14:46:56 -0400 Subject: [PATCH 231/353] database.hpp: Simplify get_scheduled_witness() return value --- libraries/chain/db_block.cpp | 4 +- libraries/chain/db_witness_schedule.cpp | 6 +- .../chain/include/graphene/chain/database.hpp | 6 +- libraries/plugins/witness/witness.cpp | 2 +- tests/app/main.cpp | 2 +- tests/benchmarks/genesis_allocation.cpp | 4 +- tests/common/database_fixture.cpp | 2 +- tests/intense/block_tests.cpp | 2 +- tests/tests/block_tests.cpp | 60 +++++++++---------- tests/tests/operation_tests2.cpp | 10 ++-- 10 files changed, 48 insertions(+), 50 deletions(-) diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index 99131146..94b02511 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -257,7 +257,7 @@ signed_block database::_generate_block( uint32_t skip = get_node_properties().skip_flags; uint32_t slot_num = get_slot_at_time( when ); FC_ASSERT( slot_num > 0 ); - witness_id_type scheduled_witness = get_scheduled_witness( slot_num ).first; + witness_id_type scheduled_witness = get_scheduled_witness( slot_num ); FC_ASSERT( scheduled_witness == witness_id ); const auto& witness_obj = witness_id(*this); @@ -566,7 +566,7 @@ const witness_object& database::validate_block_header( uint32_t skip, const sign uint32_t slot_num = get_slot_at_time( next_block.timestamp ); FC_ASSERT( slot_num > 0 ); - witness_id_type scheduled_witness = get_scheduled_witness( slot_num ).first; + witness_id_type scheduled_witness = get_scheduled_witness( slot_num ); FC_ASSERT( next_block.witness == scheduled_witness ); } diff --git a/libraries/chain/db_witness_schedule.cpp b/libraries/chain/db_witness_schedule.cpp index 2cb8b711..90aab09e 100644 --- a/libraries/chain/db_witness_schedule.cpp +++ b/libraries/chain/db_witness_schedule.cpp @@ -23,10 +23,10 @@ namespace graphene { namespace chain { -pair database::get_scheduled_witness(uint32_t slot_num)const +witness_id_type database::get_scheduled_witness(uint32_t slot_num)const { if( slot_num == 0 ) - return pair(witness_id_type(), false); + return witness_id_type(); const witness_schedule_object& wso = witness_schedule_id_type()(*this); @@ -53,7 +53,7 @@ pair database::get_scheduled_witness(uint32_t slot_num)co assert( false ); } } - return pair(wid, slot_is_near); + return wid; } fc::time_point_sec database::get_slot_time(uint32_t slot_num)const diff --git a/libraries/chain/include/graphene/chain/database.hpp b/libraries/chain/include/graphene/chain/database.hpp index e1a56e90..99df3cb0 100644 --- a/libraries/chain/include/graphene/chain/database.hpp +++ b/libraries/chain/include/graphene/chain/database.hpp @@ -220,11 +220,9 @@ namespace graphene { namespace chain { * Use the get_slot_time() and get_slot_at_time() functions * to convert between slot_num and timestamp. * - * Passing slot_num == 0 returns (witness_id_type(), false) - * - * The bool value is true if near schedule, false if far schedule. + * Passing slot_num == 0 returns witness_id_type() */ - pair get_scheduled_witness(uint32_t slot_num)const; + witness_id_type get_scheduled_witness(uint32_t slot_num)const; /** * Get the time at which the given slot occurs. diff --git a/libraries/plugins/witness/witness.cpp b/libraries/plugins/witness/witness.cpp index 637447ee..9290837d 100644 --- a/libraries/plugins/witness/witness.cpp +++ b/libraries/plugins/witness/witness.cpp @@ -177,7 +177,7 @@ void witness_plugin::block_production_loop() // is anyone scheduled to produce now or one second in the future? const fc::time_point_sec now = graphene::time::now(); uint32_t slot = db.get_slot_at_time( now ); - graphene::chain::witness_id_type scheduled_witness = db.get_scheduled_witness( slot ).first; + graphene::chain::witness_id_type scheduled_witness = db.get_scheduled_witness( slot ); fc::time_point_sec scheduled_time = db.get_slot_time( slot ); graphene::chain::public_key_type scheduled_key = scheduled_witness( db ).signing_key; diff --git a/tests/app/main.cpp b/tests/app/main.cpp index 1e7bfcad..b498ec01 100644 --- a/tests/app/main.cpp +++ b/tests/app/main.cpp @@ -128,7 +128,7 @@ BOOST_AUTO_TEST_CASE( two_node_network ) auto block_1 = db2->generate_block( db2->get_slot_time(1), - db2->get_scheduled_witness(1).first, + db2->get_scheduled_witness(1), committee_key, database::skip_nothing); diff --git a/tests/benchmarks/genesis_allocation.cpp b/tests/benchmarks/genesis_allocation.cpp index eb93700a..5dedaedf 100644 --- a/tests/benchmarks/genesis_allocation.cpp +++ b/tests/benchmarks/genesis_allocation.cpp @@ -86,7 +86,7 @@ BOOST_AUTO_TEST_CASE( genesis_and_persistence_bench ) int blocks_out = 0; auto witness_priv_key = fc::ecc::private_key::regenerate(fc::sha256::hash(string("null_key")) ); auto aw = db.get_global_properties().active_witnesses; - auto b = db.generate_block( db.get_slot_time( 1 ), db.get_scheduled_witness( 1 ).first, witness_priv_key, ~0 ); + auto b = db.generate_block( db.get_slot_time( 1 ), db.get_scheduled_witness( 1 ), witness_priv_key, ~0 ); start_time = fc::time_point::now(); /* TODO: get this buliding again @@ -97,7 +97,7 @@ BOOST_AUTO_TEST_CASE( genesis_and_persistence_bench ) db.push_transaction(trx, ~0); aw = db.get_global_properties().active_witnesses; - b = db.generate_block( db.get_slot_time( 1 ), db.get_scheduled_witness( 1 ).first, witness_priv_key, ~0 ); + b = db.generate_block( db.get_slot_time( 1 ), db.get_scheduled_witness( 1 ), witness_priv_key, ~0 ); } */ ilog("Pushed ${c} blocks (1 op each, no validation) in ${t} milliseconds.", diff --git a/tests/common/database_fixture.cpp b/tests/common/database_fixture.cpp index 53cbd00a..61fb036d 100644 --- a/tests/common/database_fixture.cpp +++ b/tests/common/database_fixture.cpp @@ -297,7 +297,7 @@ signed_block database_fixture::generate_block(uint32_t skip, const fc::ecc::priv skip |= database::skip_undo_history_check; // skip == ~0 will skip checks specified in database::validation_steps return db.generate_block(db.get_slot_time(miss_blocks + 1), - db.get_scheduled_witness(miss_blocks + 1).first, + db.get_scheduled_witness(miss_blocks + 1), key, skip); } diff --git a/tests/intense/block_tests.cpp b/tests/intense/block_tests.cpp index e9f1196e..fd77132e 100644 --- a/tests/intense/block_tests.cpp +++ b/tests/intense/block_tests.cpp @@ -279,7 +279,7 @@ BOOST_FIXTURE_TEST_CASE( witness_order_mc_test, database_fixture ) { wdump( (db.head_block_num()) ); } - witness_id_type wid = db.get_scheduled_witness( 1 ).first; + witness_id_type wid = db.get_scheduled_witness( 1 ); full_schedule.push_back( wid ); cur_round.push_back( wid ); if( cur_round.size() == num_witnesses ) diff --git a/tests/tests/block_tests.cpp b/tests/tests/block_tests.cpp index 427fdd51..d8301856 100644 --- a/tests/tests/block_tests.cpp +++ b/tests/tests/block_tests.cpp @@ -131,13 +131,13 @@ BOOST_AUTO_TEST_CASE( generate_empty_blocks ) { database db; db.open(data_dir.path(), make_genesis ); - b = db.generate_block(db.get_slot_time(1), db.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); + b = db.generate_block(db.get_slot_time(1), db.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); for( uint32_t i = 1; i < 200; ++i ) { BOOST_CHECK( db.head_block_id() == b.id() ); witness_id_type prev_witness = b.witness; - witness_id_type cur_witness = db.get_scheduled_witness(1).first; + witness_id_type cur_witness = db.get_scheduled_witness(1); BOOST_CHECK( cur_witness != prev_witness ); b = db.generate_block(db.get_slot_time(1), cur_witness, init_account_priv_key, database::skip_nothing); BOOST_CHECK( b.witness == cur_witness ); @@ -152,7 +152,7 @@ BOOST_AUTO_TEST_CASE( generate_empty_blocks ) { BOOST_CHECK( db.head_block_id() == b.id() ); witness_id_type prev_witness = b.witness; - witness_id_type cur_witness = db.get_scheduled_witness(1).first; + witness_id_type cur_witness = db.get_scheduled_witness(1); BOOST_CHECK( cur_witness != prev_witness ); b = db.generate_block(db.get_slot_time(1), cur_witness, init_account_priv_key, database::skip_nothing); } @@ -179,7 +179,7 @@ BOOST_AUTO_TEST_CASE( undo_block ) { now = db.get_slot_time(1); time_stack.push_back( now ); - auto b = db.generate_block( now, db.get_scheduled_witness( 1 ).first, init_account_priv_key, database::skip_nothing ); + auto b = db.generate_block( now, db.get_scheduled_witness( 1 ), init_account_priv_key, database::skip_nothing ); } BOOST_CHECK( db.head_block_num() == 5 ); BOOST_CHECK( db.head_block_time() == now ); @@ -202,7 +202,7 @@ BOOST_AUTO_TEST_CASE( undo_block ) { now = db.get_slot_time(1); time_stack.push_back( now ); - auto b = db.generate_block( now, db.get_scheduled_witness( 1 ).first, init_account_priv_key, database::skip_nothing ); + auto b = db.generate_block( now, db.get_scheduled_witness( 1 ), init_account_priv_key, database::skip_nothing ); } BOOST_CHECK( db.head_block_num() == 7 ); } @@ -227,20 +227,20 @@ BOOST_AUTO_TEST_CASE( fork_blocks ) auto init_account_priv_key = fc::ecc::private_key::regenerate(fc::sha256::hash(string("null_key")) ); for( uint32_t i = 0; i < 10; ++i ) { - auto b = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); + auto b = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); try { PUSH_BLOCK( db2, b ); } FC_CAPTURE_AND_RETHROW( ("db2") ); } for( uint32_t i = 10; i < 13; ++i ) { - auto b = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); + auto b = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); } string db1_tip = db1.head_block_id().str(); uint32_t next_slot = 3; for( uint32_t i = 13; i < 16; ++i ) { - auto b = db2.generate_block(db2.get_slot_time(next_slot), db2.get_scheduled_witness(next_slot).first, init_account_priv_key, database::skip_nothing); + auto b = db2.generate_block(db2.get_slot_time(next_slot), db2.get_scheduled_witness(next_slot), init_account_priv_key, database::skip_nothing); next_slot = 1; // notify both databases of the new block. // only db2 should switch to the new fork, db1 should not @@ -255,7 +255,7 @@ BOOST_AUTO_TEST_CASE( fork_blocks ) BOOST_CHECK_EQUAL(db1.head_block_num(), 13); BOOST_CHECK_EQUAL(db2.head_block_num(), 13); { - auto b = db2.generate_block(db2.get_slot_time(1), db2.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); + auto b = db2.generate_block(db2.get_slot_time(1), db2.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); good_block = b; b.transactions.emplace_back(signed_transaction()); b.transactions.back().operations.emplace_back(transfer_operation()); @@ -289,18 +289,18 @@ BOOST_AUTO_TEST_CASE( out_of_order_blocks ) BOOST_CHECK( db1.get_chain_id() == db2.get_chain_id() ); auto init_account_priv_key = fc::ecc::private_key::regenerate(fc::sha256::hash(string("null_key")) ); - auto b1 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); - auto b2 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); - auto b3 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); - auto b4 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); - auto b5 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); - auto b6 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); - auto b7 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); - auto b8 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); - auto b9 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); - auto b10 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); - auto b11 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); - auto b12 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); + auto b1 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); + auto b2 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); + auto b3 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); + auto b4 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); + auto b5 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); + auto b6 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); + auto b7 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); + auto b8 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); + auto b9 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); + auto b10 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); + auto b11 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); + auto b12 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); BOOST_CHECK_EQUAL(db1.head_block_num(), 12); BOOST_CHECK_EQUAL(db2.head_block_num(), 0); PUSH_BLOCK( db2, b1 ); @@ -351,7 +351,7 @@ BOOST_AUTO_TEST_CASE( undo_pending ) trx.operations.push_back(t); PUSH_TX( db, trx, ~0 ); - auto b = db.generate_block(db.get_slot_time(1), db.get_scheduled_witness(1).first, init_account_priv_key, ~0); + auto b = db.generate_block(db.get_slot_time(1), db.get_scheduled_witness(1), init_account_priv_key, ~0); } signed_transaction trx; @@ -366,7 +366,7 @@ BOOST_AUTO_TEST_CASE( undo_pending ) //sign( trx, init_account_priv_key ); PUSH_TX( db, trx ); - auto b = db.generate_block(db.get_slot_time(1), db.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); + auto b = db.generate_block(db.get_slot_time(1), db.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); BOOST_CHECK(nathan_id(db).name == "nathan"); @@ -424,14 +424,14 @@ BOOST_AUTO_TEST_CASE( switch_forks_undo_create ) // db2 : B C D auto aw = db1.get_global_properties().active_witnesses; - auto b = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); + auto b = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); BOOST_CHECK(nathan_id(db1).name == "nathan"); - b = db2.generate_block(db2.get_slot_time(1), db2.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); + b = db2.generate_block(db2.get_slot_time(1), db2.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); db1.push_block(b); aw = db2.get_global_properties().active_witnesses; - b = db2.generate_block(db2.get_slot_time(1), db2.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); + b = db2.generate_block(db2.get_slot_time(1), db2.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); db1.push_block(b); GRAPHENE_CHECK_THROW(nathan_id(db1), fc::exception); @@ -439,7 +439,7 @@ BOOST_AUTO_TEST_CASE( switch_forks_undo_create ) PUSH_TX( db2, trx ); aw = db2.get_global_properties().active_witnesses; - b = db2.generate_block(db2.get_slot_time(1), db2.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); + b = db2.generate_block(db2.get_slot_time(1), db2.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); db1.push_block(b); BOOST_CHECK(nathan_id(db1).name == "nathan"); @@ -489,7 +489,7 @@ BOOST_AUTO_TEST_CASE( duplicate_transactions ) GRAPHENE_CHECK_THROW(PUSH_TX( db1, trx, skip_sigs ), fc::exception); - auto b = db1.generate_block( db1.get_slot_time(1), db1.get_scheduled_witness( 1 ).first, init_account_priv_key, skip_sigs ); + auto b = db1.generate_block( db1.get_slot_time(1), db1.get_scheduled_witness( 1 ), init_account_priv_key, skip_sigs ); PUSH_BLOCK( db2, b, skip_sigs ); GRAPHENE_CHECK_THROW(PUSH_TX( db1, trx, skip_sigs ), fc::exception); @@ -515,7 +515,7 @@ BOOST_AUTO_TEST_CASE( tapos ) public_key_type init_account_pub_key = init_account_priv_key.get_public_key(); const graphene::db::index& account_idx = db1.get_index(protocol_ids, account_object_type); - auto b = db1.generate_block( db1.get_slot_time(1), db1.get_scheduled_witness( 1 ).first, init_account_priv_key, database::skip_nothing); + auto b = db1.generate_block( db1.get_slot_time(1), db1.get_scheduled_witness( 1 ), init_account_priv_key, database::skip_nothing); signed_transaction trx; //This transaction must be in the next block after its reference, or it is invalid. @@ -531,7 +531,7 @@ BOOST_AUTO_TEST_CASE( tapos ) trx.operations.push_back(cop); trx.sign( init_account_priv_key, db1.get_chain_id() ); db1.push_transaction(trx); - b = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); + b = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); trx.clear(); transfer_operation t; diff --git a/tests/tests/operation_tests2.cpp b/tests/tests/operation_tests2.cpp index 28192b2e..59c34c92 100644 --- a/tests/tests/operation_tests2.cpp +++ b/tests/tests/operation_tests2.cpp @@ -1098,7 +1098,7 @@ BOOST_AUTO_TEST_CASE( balance_object_test ) BOOST_CHECK(db.find_object(balance_id_type(1)) != nullptr); auto slot = db.get_slot_at_time(starting_time); - db.generate_block(starting_time, db.get_scheduled_witness(slot).first, init_account_priv_key, skip_flags); + db.generate_block(starting_time, db.get_scheduled_witness(slot), init_account_priv_key, skip_flags); set_expiration( db, trx ); const balance_object& vesting_balance_1 = balance_id_type(2)(db); @@ -1149,9 +1149,9 @@ BOOST_AUTO_TEST_CASE( balance_object_test ) // Attempting to claim twice within a day GRAPHENE_CHECK_THROW(db.push_transaction(trx), balance_claim_claimed_too_often); - db.generate_block(db.get_slot_time(1), db.get_scheduled_witness(1).first, init_account_priv_key, skip_flags); + db.generate_block(db.get_slot_time(1), db.get_scheduled_witness(1), init_account_priv_key, skip_flags); slot = db.get_slot_at_time(vesting_balance_1.vesting_policy->begin_timestamp + 60); - db.generate_block(db.get_slot_time(slot), db.get_scheduled_witness(slot).first, init_account_priv_key, skip_flags); + db.generate_block(db.get_slot_time(slot), db.get_scheduled_witness(slot), init_account_priv_key, skip_flags); set_expiration( db, trx ); op.balance_to_claim = vesting_balance_1.id; @@ -1175,9 +1175,9 @@ BOOST_AUTO_TEST_CASE( balance_object_test ) // Attempting to claim twice within a day GRAPHENE_CHECK_THROW(db.push_transaction(trx), balance_claim_claimed_too_often); - db.generate_block(db.get_slot_time(1), db.get_scheduled_witness(1).first, init_account_priv_key, skip_flags); + db.generate_block(db.get_slot_time(1), db.get_scheduled_witness(1), init_account_priv_key, skip_flags); slot = db.get_slot_at_time(db.head_block_time() + fc::days(1)); - db.generate_block(db.get_slot_time(slot), db.get_scheduled_witness(slot).first, init_account_priv_key, skip_flags); + db.generate_block(db.get_slot_time(slot), db.get_scheduled_witness(slot), init_account_priv_key, skip_flags); set_expiration( db, trx ); op.total_claimed = vesting_balance_2.balance; From c2e5432a3093c338e2e8cdd6df3bb3bfabf206bf Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Tue, 25 Aug 2015 17:54:04 -0400 Subject: [PATCH 232/353] Remove block randomness and rewrite witness scheduling --- libraries/app/api.cpp | 1 - libraries/chain/db_block.cpp | 21 - libraries/chain/db_init.cpp | 31 +- libraries/chain/db_maint.cpp | 8 +- libraries/chain/db_management.cpp | 1 + libraries/chain/db_update.cpp | 27 +- libraries/chain/db_witness_schedule.cpp | 175 +++----- .../chain/include/graphene/chain/config.hpp | 3 + .../chain/include/graphene/chain/database.hpp | 8 - .../graphene/chain/global_property_object.hpp | 27 +- .../include/graphene/chain/protocol/block.hpp | 5 +- .../include/graphene/chain/protocol/types.hpp | 5 - .../include/graphene/chain/witness_object.hpp | 4 +- .../chain/witness_schedule_object.hpp | 88 ---- .../graphene/chain/witness_scheduler.hpp | 417 ------------------ .../graphene/chain/witness_scheduler_rng.hpp | 124 ------ libraries/wallet/wallet.cpp | 1 - programs/size_checker/main.cpp | 1 + tests/intense/block_tests.cpp | 1 - tests/tests/basic_tests.cpp | 130 ------ tests/tests/block_tests.cpp | 30 +- tests/tests/operation_tests2.cpp | 37 +- 22 files changed, 123 insertions(+), 1022 deletions(-) delete mode 100644 libraries/chain/include/graphene/chain/witness_schedule_object.hpp delete mode 100644 libraries/chain/include/graphene/chain/witness_scheduler.hpp delete mode 100644 libraries/chain/include/graphene/chain/witness_scheduler_rng.hpp diff --git a/libraries/app/api.cpp b/libraries/app/api.cpp index ef7f3a13..a946491d 100644 --- a/libraries/app/api.cpp +++ b/libraries/app/api.cpp @@ -781,7 +781,6 @@ namespace graphene { namespace app { break; } case impl_block_summary_object_type:{ } case impl_account_transaction_history_object_type:{ - } case impl_witness_schedule_object_type: { } case impl_chain_property_object_type: { } } diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index 94b02511..a78fb506 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -267,24 +267,6 @@ signed_block database::_generate_block( _pending_block.timestamp = when; - // Genesis witnesses start with a default initial secret - if( witness_obj.next_secret_hash == secret_hash_type::hash( secret_hash_type() ) ) - { - _pending_block.previous_secret = secret_hash_type(); - } - else - { - secret_hash_type::encoder last_enc; - fc::raw::pack( last_enc, block_signing_private_key ); - fc::raw::pack( last_enc, witness_obj.previous_secret ); - _pending_block.previous_secret = last_enc.result(); - } - - secret_hash_type::encoder next_enc; - fc::raw::pack( next_enc, block_signing_private_key ); - fc::raw::pack( next_enc, _pending_block.previous_secret ); - _pending_block.next_secret_hash = secret_hash_type::hash(next_enc.result()); - _pending_block.transaction_merkle_root = _pending_block.calculate_merkle_root(); _pending_block.witness = witness_id; @@ -404,7 +386,6 @@ void database::_apply_block( const signed_block& next_block ) ++_current_trx_in_block; } - update_witness_schedule(next_block); update_global_dynamic_data(next_block); update_signing_witness(signing_witness, next_block); @@ -555,8 +536,6 @@ const witness_object& database::validate_block_header( uint32_t skip, const sign FC_ASSERT( _pending_block.previous == next_block.previous, "", ("pending.prev",_pending_block.previous)("next.prev",next_block.previous) ); FC_ASSERT( _pending_block.timestamp <= next_block.timestamp, "", ("_pending_block.timestamp",_pending_block.timestamp)("next",next_block.timestamp)("blocknum",next_block.block_num()) ); const witness_object& witness = next_block.witness(*this); - FC_ASSERT( secret_hash_type::hash( next_block.previous_secret ) == witness.next_secret_hash, "", - ("previous_secret", next_block.previous_secret)("next_secret_hash", witness.next_secret_hash)); if( !(skip&skip_witness_signature) ) FC_ASSERT( next_block.validate_signee( witness.signing_key ) ); diff --git a/libraries/chain/db_init.cpp b/libraries/chain/db_init.cpp index 3b7a07f3..3376b2b8 100644 --- a/libraries/chain/db_init.cpp +++ b/libraries/chain/db_init.cpp @@ -30,7 +30,6 @@ #include #include #include -#include #include #include @@ -107,9 +106,6 @@ const uint8_t withdraw_permission_object::type_id; const uint8_t witness_object::space_id; const uint8_t witness_object::type_id; -const uint8_t witness_schedule_object::space_id; -const uint8_t witness_schedule_object::type_id; - const uint8_t worker_object::space_id; const uint8_t worker_object::type_id; @@ -193,7 +189,6 @@ void database::initialize_indexes() add_index< primary_index> >(); add_index< primary_index> >(); add_index< primary_index> >(); - add_index< primary_index> >(); add_index< primary_index > >(); } @@ -317,6 +312,7 @@ void database::init_genesis(const genesis_state_type& genesis_state) p.time = genesis_state.initial_timestamp; p.dynamic_flags = 0; p.witness_budget = 0; + p.recent_slots_filled = fc::uint128::max_value(); }); FC_ASSERT( (genesis_state.immutable_parameters.min_witness_count & 1) == 1, "min_witness_count must be odd" ); @@ -538,31 +534,6 @@ void database::init_genesis(const genesis_state_type& genesis_state) } }); - // Initialize witness schedule -#ifndef NDEBUG - const witness_schedule_object& wso = -#endif - create([&](witness_schedule_object& _wso) - { - memset(_wso.rng_seed.begin(), 0, _wso.rng_seed.size()); - - witness_scheduler_rng rng(_wso.rng_seed.begin(), GRAPHENE_NEAR_SCHEDULE_CTR_IV); - - auto init_witnesses = get_global_properties().active_witnesses; - - _wso.scheduler = witness_scheduler(); - _wso.scheduler._min_token_count = std::max(int(init_witnesses.size()) / 2, 1); - _wso.scheduler.update(init_witnesses); - - for( size_t i=0; i + #include #include @@ -27,7 +29,6 @@ #include #include #include -#include #include namespace graphene { namespace chain { @@ -206,11 +207,6 @@ void database::update_active_witnesses() }); }); - const witness_schedule_object& wso = witness_schedule_id_type()(*this); - modify(wso, [&](witness_schedule_object& _wso) - { - _wso.scheduler.update(gpo.active_witnesses); - }); } FC_CAPTURE_AND_RETHROW() } void database::update_active_committee_members() diff --git a/libraries/chain/db_management.cpp b/libraries/chain/db_management.cpp index 52bc39b0..0a6c75ce 100644 --- a/libraries/chain/db_management.cpp +++ b/libraries/chain/db_management.cpp @@ -22,6 +22,7 @@ #include #include +#include namespace graphene { namespace chain { diff --git a/libraries/chain/db_update.cpp b/libraries/chain/db_update.cpp index ded6a04a..e4f8ab86 100644 --- a/libraries/chain/db_update.cpp +++ b/libraries/chain/db_update.cpp @@ -36,25 +36,18 @@ void database::update_global_dynamic_data( const signed_block& b ) const dynamic_global_property_object& _dgp = dynamic_global_property_id_type(0)(*this); - const auto& global_props = get_global_properties(); - auto delta_time = b.timestamp - _dgp.time; - auto missed_blocks = (delta_time.to_seconds() / global_props.parameters.block_interval) - 1; - if( _dgp.head_block_number == 0 ) - missed_blocks = 0; + uint32_t missed_blocks = get_slot_at_time( b.timestamp ); + assert( missed_blocks != 0 ); + missed_blocks--; // dynamic global properties updating modify( _dgp, [&]( dynamic_global_property_object& dgp ){ - secret_hash_type::encoder enc; - fc::raw::pack( enc, dgp.random ); - fc::raw::pack( enc, b.previous_secret ); - dgp.random = enc.result(); - if( _checkpoints.size() && _checkpoints.rbegin()->first >= b.block_num() ) dgp.recently_missed_count = 0; else if( missed_blocks ) - dgp.recently_missed_count += 4*missed_blocks; - else if( dgp.recently_missed_count > 4 ) - dgp.recently_missed_count -= 3; + dgp.recently_missed_count += GRAPHENE_RECENTLY_MISSED_COUNT_INCREMENT*missed_blocks; + else if( dgp.recently_missed_count > GRAPHENE_RECENTLY_MISSED_COUNT_INCREMENT ) + dgp.recently_missed_count -= GRAPHENE_RECENTLY_MISSED_COUNT_DECREMENT; else if( dgp.recently_missed_count > 0 ) dgp.recently_missed_count--; @@ -62,6 +55,10 @@ void database::update_global_dynamic_data( const signed_block& b ) dgp.head_block_id = b.id(); dgp.time = b.timestamp; dgp.current_witness = b.witness; + dgp.recent_slots_filled = ( + (dgp.recent_slots_filled << 1) + + 1) << missed_blocks; + dgp.current_aslot += missed_blocks+1; }); if( !(get_node_properties().skip_flags & skip_undo_history_check) ) @@ -80,6 +77,7 @@ void database::update_signing_witness(const witness_object& signing_witness, con { const global_property_object& gpo = get_global_properties(); const dynamic_global_property_object& dpo = get_dynamic_global_properties(); + uint64_t new_block_aslot = dpo.current_aslot + get_slot_at_time( new_block.timestamp ); share_type witness_pay = std::min( gpo.parameters.witness_pay_per_block, dpo.witness_budget ); @@ -92,8 +90,7 @@ void database::update_signing_witness(const witness_object& signing_witness, con modify( signing_witness, [&]( witness_object& _wit ) { - _wit.previous_secret = new_block.previous_secret; - _wit.next_secret_hash = new_block.next_secret_hash; + _wit.last_aslot = new_block_aslot; } ); } diff --git a/libraries/chain/db_witness_schedule.cpp b/libraries/chain/db_witness_schedule.cpp index 90aab09e..d12bf69e 100644 --- a/libraries/chain/db_witness_schedule.cpp +++ b/libraries/chain/db_witness_schedule.cpp @@ -15,45 +15,87 @@ * 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. */ +#pragma once #include - #include -#include +#include namespace graphene { namespace chain { -witness_id_type database::get_scheduled_witness(uint32_t slot_num)const +using boost::container::flat_set; + +witness_id_type database::get_scheduled_witness( uint32_t slot_num )const { - if( slot_num == 0 ) - return witness_id_type(); + // + // Each witness gets an arbitration key H(time, witness_id). + // The witness with the smallest key is selected to go first. + // + // As opposed to just using H(time) to determine an index into + // an array of eligible witnesses, this has the following desirable + // properties: + // + // - Avoid dynamic memory allocation + // - Decreases (but does not eliminate) the probability that a + // missed block will change the witness assigned to a future slot + // + // The hash function is xorshift* as given in + // [1] https://en.wikipedia.org/wiki/Xorshift#Xorshift.2A + // - const witness_schedule_object& wso = witness_schedule_id_type()(*this); + const flat_set< witness_id_type >& active_witnesses = get_global_properties().active_witnesses; + uint32_t n = active_witnesses.size(); + uint64_t min_witness_separation = (n / 2)+1; + uint64_t current_aslot = get_dynamic_global_properties().current_aslot + slot_num; - // ask the near scheduler who goes in the given slot - witness_id_type wid; - bool slot_is_near = wso.scheduler.get_slot(slot_num-1, wid); - if( ! slot_is_near ) + uint64_t start_of_current_round_aslot = current_aslot - (current_aslot % n); + uint64_t first_ineligible_aslot = std::min( + start_of_current_round_aslot, current_aslot - min_witness_separation ); + // + // overflow analysis of above subtraction: + // + // we always have min_witness_separation <= n, so + // if current_aslot < min_witness_separation it follows that + // start_of_current_round_aslot == 0 + // + // therefore result of above min() is 0 when subtraction overflows + // + + first_ineligible_aslot = std::max( first_ineligible_aslot, uint64_t( 1 ) ); + + uint64_t best_k = 0; + witness_id_type best_wit; + bool success = false; + + uint64_t now_hi = get_slot_time( slot_num ).sec_since_epoch(); + now_hi <<= 32; + + for( const witness_id_type& wit_id : active_witnesses ) { - // if the near scheduler doesn't know, we have to extend it to - // a far scheduler. - // n.b. instantiating it is slow, but block gaps long enough to - // need it are likely pretty rare. + const witness_object& wit = wit_id(*this); + if( wit.last_aslot >= first_ineligible_aslot ) + continue; - witness_scheduler_rng far_rng(wso.rng_seed.begin(), GRAPHENE_FAR_SCHEDULE_CTR_IV); - - far_future_witness_scheduler far_scheduler = - far_future_witness_scheduler(wso.scheduler, far_rng); - if( !far_scheduler.get_slot(slot_num-1, wid) ) + uint64_t k = now_hi + uint64_t(wit_id); + k ^= (k >> 12); + k ^= (k << 25); + k ^= (k >> 27); + k *= 2685821657736338717ULL; + if( k >= best_k ) { - // no scheduled witness -- somebody set up us the bomb - // n.b. this code path is impossible, the present - // implementation of far_future_witness_scheduler - // returns true unconditionally - assert( false ); + best_k = k; + best_wit = wit_id; + success = true; } } - return wid; + + // the above loop should choose at least 1 because + // at most K elements are susceptible to the filter, + // otherwise we have an inconsistent database (such as + // wit.last_aslot values that are non-unique or in the future) + + assert( success ); + return best_wit; } fc::time_point_sec database::get_slot_time(uint32_t slot_num)const @@ -98,89 +140,10 @@ uint32_t database::get_slot_at_time(fc::time_point_sec when)const return (when - first_slot_time).to_seconds() / block_interval() + 1; } -vector database::get_near_witness_schedule()const -{ - const witness_schedule_object& wso = witness_schedule_id_type()(*this); - - vector result; - result.reserve(wso.scheduler.size()); - uint32_t slot_num = 0; - witness_id_type wid; - - while( wso.scheduler.get_slot(slot_num++, wid) ) - result.emplace_back(wid); - - return result; -} - -void database::update_witness_schedule(const signed_block& next_block) -{ - auto start = fc::time_point::now(); - const global_property_object& gpo = get_global_properties(); - const witness_schedule_object& wso = get(witness_schedule_id_type()); - uint32_t schedule_needs_filled = gpo.active_witnesses.size(); - uint32_t schedule_slot = get_slot_at_time(next_block.timestamp); - - // We shouldn't be able to generate _pending_block with timestamp - // in the past, and incoming blocks from the network with timestamp - // in the past shouldn't be able to make it this far without - // triggering FC_ASSERT elsewhere - - assert( schedule_slot > 0 ); - witness_id_type first_witness; - bool slot_is_near = wso.scheduler.get_slot( schedule_slot-1, first_witness ); - - witness_id_type wit; - - const dynamic_global_property_object& dpo = get_dynamic_global_properties(); - - assert( dpo.random.data_size() == witness_scheduler_rng::seed_length ); - assert( witness_scheduler_rng::seed_length == wso.rng_seed.size() ); - - modify(wso, [&](witness_schedule_object& _wso) - { - _wso.slots_since_genesis += schedule_slot; - witness_scheduler_rng rng(wso.rng_seed.data, _wso.slots_since_genesis); - - _wso.scheduler._min_token_count = std::max(int(gpo.active_witnesses.size()) / 2, 1); - - if( slot_is_near ) - { - uint32_t drain = schedule_slot; - while( drain > 0 ) - { - if( _wso.scheduler.size() == 0 ) - break; - _wso.scheduler.consume_schedule(); - --drain; - } - } - else - { - _wso.scheduler.reset_schedule( first_witness ); - } - while( !_wso.scheduler.get_slot(schedule_needs_filled, wit) ) - { - if( _wso.scheduler.produce_schedule(rng) & emit_turn ) - memcpy(_wso.rng_seed.begin(), dpo.random.data(), dpo.random.data_size()); - } - _wso.last_scheduling_block = next_block.block_num(); - _wso.recent_slots_filled = ( - (_wso.recent_slots_filled << 1) - + 1) << (schedule_slot - 1); - }); - auto end = fc::time_point::now(); - static uint64_t total_time = 0; - static uint64_t calls = 0; - total_time += (end - start).count(); - if( ++calls % 1000 == 0 ) - idump( ( double(total_time/1000000.0)/calls) ); -} - uint32_t database::witness_participation_rate()const { - const witness_schedule_object& wso = get(witness_schedule_id_type()); - return uint64_t(GRAPHENE_100_PERCENT) * wso.recent_slots_filled.popcount() / 128; + const dynamic_global_property_object& dpo = get_dynamic_global_properties(); + return uint64_t(GRAPHENE_100_PERCENT) * dpo.recent_slots_filled.popcount() / 128; } } } diff --git a/libraries/chain/include/graphene/chain/config.hpp b/libraries/chain/include/graphene/chain/config.hpp index f77f7144..38d3db6d 100644 --- a/libraries/chain/include/graphene/chain/config.hpp +++ b/libraries/chain/include/graphene/chain/config.hpp @@ -139,6 +139,9 @@ #define GRAPHENE_MAX_INTEREST_APR uint16_t( 10000 ) +#define GRAPHENE_RECENTLY_MISSED_COUNT_INCREMENT 4 +#define GRAPHENE_RECENTLY_MISSED_COUNT_DECREMENT 3 + /** * Reserved Account IDs with special meaning */ diff --git a/libraries/chain/include/graphene/chain/database.hpp b/libraries/chain/include/graphene/chain/database.hpp index 99df3cb0..ec197889 100644 --- a/libraries/chain/include/graphene/chain/database.hpp +++ b/libraries/chain/include/graphene/chain/database.hpp @@ -244,11 +244,6 @@ namespace graphene { namespace chain { */ uint32_t get_slot_at_time(fc::time_point_sec when)const; - /** - * Get the near schedule. - */ - vector get_near_witness_schedule()const; - //////////////////// db_getter.cpp //////////////////// const chain_id_type& get_chain_id()const; @@ -451,9 +446,6 @@ namespace graphene { namespace chain { void update_maintenance_flag( bool new_maintenance_flag ); void update_withdraw_permissions(); - //////////////////// db_witness_schedule.cpp //////////////////// - void update_witness_schedule(const signed_block& next_block); /// no-op except for scheduling blocks - ///Steps performed only at maintenance intervals ///@{ diff --git a/libraries/chain/include/graphene/chain/global_property_object.hpp b/libraries/chain/include/graphene/chain/global_property_object.hpp index dacb5ce2..c52997fb 100644 --- a/libraries/chain/include/graphene/chain/global_property_object.hpp +++ b/libraries/chain/include/graphene/chain/global_property_object.hpp @@ -42,7 +42,7 @@ namespace graphene { namespace chain { chain_parameters parameters; optional pending_parameters; - uint32_t next_available_vote_id = 0; + uint32_t next_available_vote_id = 0; vector active_committee_members; // updated once per maintenance interval flat_set active_witnesses; // updated once per maintenance interval // n.b. witness scheduling is done by witness_schedule object @@ -64,7 +64,6 @@ namespace graphene { namespace chain { static const uint8_t space_id = implementation_ids; static const uint8_t type_id = impl_dynamic_global_property_object_type; - secret_hash_type random; uint32_t head_block_number = 0; block_id_type head_block_id; time_point_sec time; @@ -74,13 +73,28 @@ namespace graphene { namespace chain { share_type witness_budget; uint32_t accounts_registered_this_interval = 0; /** - * Every time a block is missed this increases by 2, every time a block is found it decreases by 1 it is - * never less than 0 + * Every time a block is missed this increases by + * RECENTLY_MISSED_COUNT_INCREMENT, + * every time a block is found it decreases by + * RECENTLY_MISSED_COUNT_DECREMENT. It is + * never less than 0. * - * If the recently_missed_count hits 2*UNDO_HISTORY then no ew blocks may be pushed. + * If the recently_missed_count hits 2*UNDO_HISTORY then no new blocks may be pushed. */ uint32_t recently_missed_count = 0; + /** + * The current absolute slot number. Equal to the total + * number of slots since genesis. Also equal to the total + * number of missed slots plus head_block_number. + */ + uint64_t current_aslot = 0; + + /** + * used to compute witness participation. + */ + fc::uint128_t recent_slots_filled; + /** * dynamic_flags specifies chain state properties that can be * expressed in one bit. @@ -104,7 +118,6 @@ namespace graphene { namespace chain { }} FC_REFLECT_DERIVED( graphene::chain::dynamic_global_property_object, (graphene::db::object), - (random) (head_block_number) (head_block_id) (time) @@ -113,6 +126,8 @@ FC_REFLECT_DERIVED( graphene::chain::dynamic_global_property_object, (graphene:: (witness_budget) (accounts_registered_this_interval) (recently_missed_count) + (current_aslot) + (recent_slots_filled) (dynamic_flags) ) diff --git a/libraries/chain/include/graphene/chain/protocol/block.hpp b/libraries/chain/include/graphene/chain/protocol/block.hpp index d9e882a1..34b0cfc2 100644 --- a/libraries/chain/include/graphene/chain/protocol/block.hpp +++ b/libraries/chain/include/graphene/chain/protocol/block.hpp @@ -27,8 +27,6 @@ namespace graphene { namespace chain { uint32_t block_num()const { return num_from_id(previous) + 1; } fc::time_point_sec timestamp; witness_id_type witness; - secret_hash_type next_secret_hash; - secret_hash_type previous_secret; checksum_type transaction_merkle_root; extensions_type extensions; @@ -53,7 +51,6 @@ namespace graphene { namespace chain { } } // graphene::chain -FC_REFLECT( graphene::chain::block_header, (previous)(timestamp)(witness) - (next_secret_hash)(previous_secret)(transaction_merkle_root)(extensions) ) +FC_REFLECT( graphene::chain::block_header, (previous)(timestamp)(witness)(transaction_merkle_root)(extensions) ) FC_REFLECT_DERIVED( graphene::chain::signed_block_header, (graphene::chain::block_header), (witness_signature) ) FC_REFLECT_DERIVED( graphene::chain::signed_block, (graphene::chain::signed_block_header), (transactions) ) diff --git a/libraries/chain/include/graphene/chain/protocol/types.hpp b/libraries/chain/include/graphene/chain/protocol/types.hpp index af8a2ace..17b4049c 100644 --- a/libraries/chain/include/graphene/chain/protocol/types.hpp +++ b/libraries/chain/include/graphene/chain/protocol/types.hpp @@ -140,7 +140,6 @@ namespace graphene { namespace chain { impl_transaction_object_type, impl_block_summary_object_type, impl_account_transaction_history_object_type, - impl_witness_schedule_object_type, impl_blinded_balance_object_type, impl_chain_property_object_type }; @@ -165,7 +164,6 @@ namespace graphene { namespace chain { class operation_history_object; class withdraw_permission_object; class vesting_balance_object; - class witness_schedule_object; class worker_object; class balance_object; @@ -209,7 +207,6 @@ namespace graphene { namespace chain { typedef object_id< implementation_ids, impl_account_transaction_history_object_type, account_transaction_history_object> account_transaction_history_id_type; - typedef object_id< implementation_ids, impl_witness_schedule_object_type, witness_schedule_object > witness_schedule_id_type; typedef object_id< implementation_ids, impl_chain_property_object_type, chain_property_object> chain_property_id_type; typedef fc::array symbol_type; @@ -286,7 +283,6 @@ FC_REFLECT_ENUM( graphene::chain::impl_object_type, (impl_transaction_object_type) (impl_block_summary_object_type) (impl_account_transaction_history_object_type) - (impl_witness_schedule_object_type) (impl_blinded_balance_object_type) (impl_chain_property_object_type) ) @@ -317,7 +313,6 @@ FC_REFLECT_TYPENAME( graphene::chain::account_statistics_id_type ) FC_REFLECT_TYPENAME( graphene::chain::transaction_obj_id_type ) FC_REFLECT_TYPENAME( graphene::chain::block_summary_id_type ) FC_REFLECT_TYPENAME( graphene::chain::account_transaction_history_id_type ) -FC_REFLECT_TYPENAME( graphene::chain::witness_schedule_id_type ) FC_REFLECT( graphene::chain::void_t, ) FC_REFLECT_ENUM( graphene::chain::asset_issuer_permission_flags, (charge_market_fee)(white_list)(transfer_restricted)(override_authority)(disable_force_settle)(global_settle)(disable_confidential) ) diff --git a/libraries/chain/include/graphene/chain/witness_object.hpp b/libraries/chain/include/graphene/chain/witness_object.hpp index 17b94ed5..0576df6c 100644 --- a/libraries/chain/include/graphene/chain/witness_object.hpp +++ b/libraries/chain/include/graphene/chain/witness_object.hpp @@ -32,6 +32,7 @@ namespace graphene { namespace chain { static const uint8_t type_id = witness_object_type; account_id_type witness_account; + uint64_t last_aslot = 0; public_key_type signing_key; secret_hash_type next_secret_hash; secret_hash_type previous_secret; @@ -64,9 +65,8 @@ namespace graphene { namespace chain { FC_REFLECT_DERIVED( graphene::chain::witness_object, (graphene::db::object), (witness_account) + (last_aslot) (signing_key) - (next_secret_hash) - (previous_secret) (pay_vb) (vote_id) (total_votes) diff --git a/libraries/chain/include/graphene/chain/witness_schedule_object.hpp b/libraries/chain/include/graphene/chain/witness_schedule_object.hpp deleted file mode 100644 index cd11ebca..00000000 --- a/libraries/chain/include/graphene/chain/witness_schedule_object.hpp +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (c) 2015, Cryptonomex, Inc. - * All rights reserved. - * - * This source code is provided for evaluation in private test networks only, until September 8, 2015. After this date, this license expires and - * the code may not be used, modified or distributed for any purpose. Redistribution and use in source and binary forms, with or without modification, - * are permitted until September 8, 2015, provided that the following conditions are met: - * - * 1. The code and/or derivative works are used only for private test networks consisting of no more than 10 P2P nodes. - * - * 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. - */ -#pragma once - -// needed to serialize witness_scheduler -#include -#include - -#include -#include -#include - -namespace graphene { namespace chain { - -typedef hash_ctr_rng< - /* HashClass = */ fc::sha256, - /* SeedLength = */ GRAPHENE_RNG_SEED_LENGTH - > witness_scheduler_rng; - -typedef generic_witness_scheduler< - /* WitnessID = */ witness_id_type, - /* RNG = */ witness_scheduler_rng, - /* CountType = */ decltype( chain_parameters::maximum_witness_count ), - /* OffsetType = */ uint32_t, - /* debug = */ true - > witness_scheduler; - -typedef generic_far_future_witness_scheduler< - /* WitnessID = */ witness_id_type, - /* RNG = */ witness_scheduler_rng, - /* CountType = */ decltype( chain_parameters::maximum_witness_count ), - /* OffsetType = */ uint32_t, - /* debug = */ true - > far_future_witness_scheduler; - -class witness_schedule_object : public abstract_object -{ - public: - static const uint8_t space_id = implementation_ids; - static const uint8_t type_id = impl_witness_schedule_object_type; - - witness_scheduler scheduler; - uint32_t last_scheduling_block; - uint64_t slots_since_genesis = 0; - fc::array< char, sizeof(secret_hash_type) > rng_seed; - - /** - * Not necessary for consensus, but used for figuring out the participation rate. - * The nth bit is 0 if the nth slot was unfilled, else it is 1. - */ - fc::uint128 recent_slots_filled; -}; - -} } - -FC_REFLECT( graphene::chain::witness_scheduler, - (_turns) - (_tokens) - (_min_token_count) - (_ineligible_waiting_for_token) - (_ineligible_no_turn) - (_eligible) - (_schedule) - (_lame_duck) - ) - -FC_REFLECT_DERIVED( graphene::chain::witness_schedule_object, (graphene::chain::object), - (scheduler) - (last_scheduling_block) - (slots_since_genesis) - (rng_seed) - (recent_slots_filled) - ) diff --git a/libraries/chain/include/graphene/chain/witness_scheduler.hpp b/libraries/chain/include/graphene/chain/witness_scheduler.hpp deleted file mode 100644 index 5feef417..00000000 --- a/libraries/chain/include/graphene/chain/witness_scheduler.hpp +++ /dev/null @@ -1,417 +0,0 @@ -/* - * Copyright (c) 2015, Cryptonomex, Inc. - * All rights reserved. - * - * This source code is provided for evaluation in private test networks only, until September 8, 2015. After this date, this license expires and - * the code may not be used, modified or distributed for any purpose. Redistribution and use in source and binary forms, with or without modification, - * are permitted until September 8, 2015, provided that the following conditions are met: - * - * 1. The code and/or derivative works are used only for private test networks consisting of no more than 10 P2P nodes. - * - * 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. - */ -#pragma once - -#include -#include -#include -#include - -#include - -namespace graphene { namespace chain { - -//using boost::container::flat_set; - -enum witness_scheduler_relax_flags -{ - emit_turn = 0x01, - emit_token = 0x02 -}; - -template< typename WitnessID, typename RNG, typename CountType, typename OffsetType, bool debug = true > -class generic_witness_scheduler -{ - public: - void check_invariant() const - { -#ifndef NDEBUG - CountType tokens = _ineligible_no_turn.size() + _eligible.size(); - CountType turns = _eligible.size(); - for( const std::pair< WitnessID, bool >& item : _ineligible_waiting_for_token ) - turns += (item.second ? 1 : 0 ); - - assert( _tokens == tokens ); - assert( _turns == turns ); -#endif - - set< WitnessID > witness_set; - // make sure each witness_id occurs only once among the three states - auto process_id = [&]( WitnessID item ) - { - assert( witness_set.find( item ) == witness_set.end() ); - witness_set.insert( item ); - } ; - - for( const std::pair< WitnessID, bool >& item : _ineligible_waiting_for_token ) - process_id( item.first ); - for( const WitnessID& item : _ineligible_no_turn ) - process_id( item ); - for( const WitnessID& item : _eligible ) - process_id( item ); - return; - } - - /** - * Deterministically evolve over time - */ - uint32_t relax() - { - uint32_t relax_flags = 0; - - if( debug ) check_invariant(); - assert( _min_token_count > 0 ); - - // turn distribution - if( _turns == 0 ) - { - relax_flags |= emit_turn; - for( const WitnessID& item : _ineligible_no_turn ) - _eligible.push_back( item ); - _turns += _ineligible_no_turn.size(); - _ineligible_no_turn.clear(); - if( debug ) check_invariant(); - - for( std::pair< WitnessID, bool >& item : _ineligible_waiting_for_token ) - { - assert( item.second == false ); - item.second = true; - } - _turns += _ineligible_waiting_for_token.size(); - if( debug ) check_invariant(); - } - - // token distribution - while( true ) - { - if( _ineligible_waiting_for_token.empty() ) - { - // eligible must be non-empty - assert( !_eligible.empty() ); - return relax_flags; - } - - if( _tokens >= _min_token_count ) - { - if( !_eligible.empty() ) - return relax_flags; - } - - const std::pair< WitnessID, bool >& item = _ineligible_waiting_for_token.front(); - if( item.second ) - _eligible.push_back( item.first ); - else - _ineligible_no_turn.push_back( item.first ); - _ineligible_waiting_for_token.pop_front(); - relax_flags |= emit_token; - _tokens++; - if( debug ) check_invariant(); - } - - return relax_flags; - } - - /** - * Add another element to _schedule - */ - uint32_t produce_schedule( RNG& rng ) - { - uint32_t relax_flags = relax(); - if( debug ) check_invariant(); - if( _eligible.empty() ) - return relax_flags; - - decltype( rng( _eligible.size() ) ) pos = rng( _eligible.size() ); - assert( (pos >= 0) && (pos < _eligible.size()) ); - auto it = _eligible.begin() + pos; - _schedule.push_back( *it ); - _ineligible_waiting_for_token.emplace_back( *it, false ); - _eligible.erase( it ); - _turns--; - _tokens--; - if( debug ) check_invariant(); - return relax_flags; - } - - /** - * Pull an element from _schedule - */ - WitnessID consume_schedule() - { - assert( _schedule.size() > 0 ); - - WitnessID result = _schedule.front(); - _schedule.pop_front(); - - auto it = _lame_duck.find( result ); - if( it != _lame_duck.end() ) - _lame_duck.erase( it ); - if( debug ) check_invariant(); - return result; - } - - /** - * Remove all witnesses in the removal_set from - * future scheduling (but not from the current schedule). - */ - template< typename T > - void remove_all( const T& removal_set ) - { - if( debug ) check_invariant(); - - _ineligible_waiting_for_token.erase( - std::remove_if( - _ineligible_waiting_for_token.begin(), - _ineligible_waiting_for_token.end(), - [&]( const std::pair< WitnessID, bool >& item ) -> bool - { - bool found = removal_set.find( item.first ) != removal_set.end(); - _turns -= (found & item.second) ? 1 : 0; - return found; - } ), - _ineligible_waiting_for_token.end() ); - if( debug ) check_invariant(); - - _ineligible_no_turn.erase( - std::remove_if( - _ineligible_no_turn.begin(), - _ineligible_no_turn.end(), - [&]( WitnessID item ) -> bool - { - bool found = (removal_set.find( item ) != removal_set.end()); - _tokens -= (found ? 1 : 0); - return found; - } ), - _ineligible_no_turn.end() ); - if( debug ) check_invariant(); - - _eligible.erase( - std::remove_if( - _eligible.begin(), - _eligible.end(), - [&]( WitnessID item ) -> bool - { - bool found = (removal_set.find( item ) != removal_set.end()); - _tokens -= (found ? 1 : 0); - _turns -= (found ? 1 : 0); - return found; - } ), - _eligible.end() ); - if( debug ) check_invariant(); - - return; - } - - /** - * Convenience function to call insert_all() and remove_all() - * as needed to update to the given revised_set. - */ - template< typename T > - void insert_all( const T& insertion_set ) - { - if( debug ) check_invariant(); - for( const WitnessID wid : insertion_set ) - { - _eligible.push_back( wid ); - } - _turns += insertion_set.size(); - _tokens += insertion_set.size(); - if( debug ) check_invariant(); - return; - } - - /** - * Convenience function to call insert_all() and remove_all() - * as needed to update to the given revised_set. - * - * This function calls find() on revised_set for all current - * witnesses. Running time is O(n*log(n)) if the revised_set - * implementation of find() is O(log(n)). - * - * TODO: Rewriting to use std::set_difference may marginally - * increase efficiency, but a benchmark is needed to justify this. - */ - template< typename T > - void update( const T& revised_set ) - { - set< WitnessID > current_set; - set< WitnessID > schedule_set; - - /* current_set.reserve( - _ineligible_waiting_for_token.size() - + _ineligible_no_turn.size() - + _eligible.size() - + _schedule.size() ); - */ - for( const auto& item : _ineligible_waiting_for_token ) - current_set.insert( item.first ); - for( const WitnessID& item : _ineligible_no_turn ) - current_set.insert( item ); - for( const WitnessID& item : _eligible ) - current_set.insert( item ); - for( const WitnessID& item : _schedule ) - { - current_set.insert( item ); - schedule_set.insert( item ); - } - - set< WitnessID > insertion_set; - //insertion_set.reserve( revised_set.size() ); - for( const WitnessID& item : revised_set ) - { - if( current_set.find( item ) == current_set.end() ) - insertion_set.insert( item ); - } - - set< WitnessID > removal_set; - //removal_set.reserve( current_set.size() ); - for( const WitnessID& item : current_set ) - { - if( revised_set.find( item ) == revised_set.end() ) - { - if( schedule_set.find( item ) == schedule_set.end() ) - removal_set.insert( item ); - else - _lame_duck.insert( item ); - } - } - - insert_all( insertion_set ); - remove_all( removal_set ); - - return; - } - - /** - * Get the number of scheduled witnesses - */ - - size_t size( )const - { - return _schedule.size(); - } - - bool get_slot( OffsetType offset, WitnessID& wit )const - { - if( offset >= _schedule.size() ) - return false; - wit = _schedule[ offset ]; - return true; - } - - /** - * Reset the schedule, then re-schedule the given witness as the - * first witness. - */ - void reset_schedule( WitnessID first_witness ) - { - _schedule.clear(); - for( const WitnessID& wid : _ineligible_no_turn ) - { - _eligible.push_back( wid ); - } - _turns += _ineligible_no_turn.size(); - _ineligible_no_turn.clear(); - for( const auto& item : _ineligible_waiting_for_token ) - { - _eligible.push_back( item.first ); - _turns += (item.second ? 0 : 1); - } - _tokens += _ineligible_waiting_for_token.size(); - _ineligible_waiting_for_token.clear(); - if( debug ) check_invariant(); - - auto it = std::find( _eligible.begin(), _eligible.end(), first_witness ); - assert( it != _eligible.end() ); - - _schedule.push_back( *it ); - _ineligible_waiting_for_token.emplace_back( *it, false ); - _eligible.erase( it ); - _turns--; - _tokens--; - if( debug ) check_invariant(); - return; - } - - // keep track of total turns / tokens in existence - CountType _turns = 0; - CountType _tokens = 0; - - // new tokens handed out when _tokens < _min_token_count - CountType _min_token_count; - - // WitnessID appears in exactly one of the following: - // has no token; second indicates whether we have a turn or not: - std::deque < std::pair< WitnessID, bool > > _ineligible_waiting_for_token; // ".." | "T." - // has token, but no turn - std::vector< WitnessID > _ineligible_no_turn; // ".t" - // has token and turn - std::vector< WitnessID > _eligible; // "Tt" - - // scheduled - std::deque < WitnessID > _schedule; - - // in _schedule, but not to be replaced - set< WitnessID > _lame_duck; -}; - -template< typename WitnessID, typename RNG, typename CountType, typename OffsetType, bool debug = true > -class generic_far_future_witness_scheduler -{ - public: - generic_far_future_witness_scheduler( - const generic_witness_scheduler< WitnessID, RNG, CountType, OffsetType, debug >& base_scheduler, - RNG rng - ) - { - generic_witness_scheduler< WitnessID, RNG, CountType, OffsetType, debug > extended_scheduler = base_scheduler; - _begin_offset = base_scheduler.size()+1; - while( (extended_scheduler.produce_schedule( rng ) & emit_turn) == 0 ) - _begin_offset++; - assert( _begin_offset == extended_scheduler.size() ); - - _end_offset = _begin_offset; - while( (extended_scheduler.produce_schedule( rng ) & emit_turn) == 0 ) - _end_offset++; - assert( _end_offset == extended_scheduler.size()-1 ); - _schedule.resize( extended_scheduler._schedule.size() ); - std::copy( extended_scheduler._schedule.begin(), - extended_scheduler._schedule.end(), - _schedule.begin() ); - return; - } - - bool get_slot( OffsetType offset, WitnessID& wit )const - { - if( offset <= _end_offset ) - wit = _schedule[ offset ]; - else - wit = _schedule[ _begin_offset + - ( - (offset - _begin_offset) % - (_end_offset + 1 - _begin_offset) - ) ]; - return true; - } - - std::vector< WitnessID > _schedule; - OffsetType _begin_offset; - OffsetType _end_offset; -}; - -} } diff --git a/libraries/chain/include/graphene/chain/witness_scheduler_rng.hpp b/libraries/chain/include/graphene/chain/witness_scheduler_rng.hpp deleted file mode 100644 index e7467010..00000000 --- a/libraries/chain/include/graphene/chain/witness_scheduler_rng.hpp +++ /dev/null @@ -1,124 +0,0 @@ -/* - * Copyright (c) 2015, Cryptonomex, Inc. - * All rights reserved. - * - * This source code is provided for evaluation in private test networks only, until September 8, 2015. After this date, this license expires and - * the code may not be used, modified or distributed for any purpose. Redistribution and use in source and binary forms, with or without modification, - * are permitted until September 8, 2015, provided that the following conditions are met: - * - * 1. The code and/or derivative works are used only for private test networks consisting of no more than 10 P2P nodes. - * - * 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. - */ -#pragma once - -#include - -namespace graphene { namespace chain { - -/** - * Always returns 0. Useful for testing. - */ -class nullary_rng -{ - public: - nullary_rng() {} - virtual ~nullary_rng() {} - - template< typename T > T operator()( T max ) - { return T(0); } -} ; - -/** - * The sha256_ctr_rng generates bits using SHA256 in counter (CTR) - * mode. - */ -template< class HashClass, int SeedLength=sizeof(secret_hash_type) > -class hash_ctr_rng -{ - public: - hash_ctr_rng( const char* seed, uint64_t counter = 0 ) - : _counter( counter ), _current_offset( 0 ) - { - memcpy( _seed, seed, SeedLength ); - _reset_current_value(); - return; - } - - virtual ~hash_ctr_rng() {} - - uint64_t get_bits( uint8_t count ) - { - uint64_t result = 0; - uint64_t mask = 1; - // grab the requested number of bits - while( count > 0 ) - { - result |= - ( - ( - ( - _current_value.data()[ (_current_offset >> 3) & 0x1F ] - & ( 1 << (_current_offset & 0x07) ) - ) - != 0 - ) ? mask : 0 - ); - mask += mask; - --count; - ++_current_offset; - if( _current_offset == (_current_value.data_size() << 3) ) - { - _counter++; - _current_offset = 0; - _reset_current_value(); - } - } - return result; - } - - uint64_t operator()( uint64_t bound ) - { - if( bound <= 1 ) - return 0; - uint8_t bitcount = boost::multiprecision::detail::find_msb( bound ) + 1; - - // probability of loop exiting is >= 1/2, so probability of - // running N times is bounded above by (1/2)^N - while( true ) - { - uint64_t result = get_bits( bitcount ); - if( result < bound ) - return result; - } - } - - // convenience method which does casting for types other than uint64_t - template< typename T > T operator()( T bound ) - { return (T) ( (*this)(uint64_t( bound )) ); } - - void _reset_current_value() - { - // internal implementation detail, called to update - // _current_value when _counter changes - typename HashClass::encoder enc; - enc.write( _seed , SeedLength ); - enc.write( (char *) &_counter, 8 ); - _current_value = enc.result(); - return; - } - - uint64_t _counter; - char _seed[ SeedLength ]; - HashClass _current_value; - uint16_t _current_offset; - - static const int seed_length = SeedLength; -} ; - -} } diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp index f34dbdb7..b61c752c 100644 --- a/libraries/wallet/wallet.cpp +++ b/libraries/wallet/wallet.cpp @@ -478,7 +478,6 @@ public: result["chain_id"] = chain_props.chain_id; result["active_witnesses"] = global_props.active_witnesses; result["active_committee_members"] = global_props.active_committee_members; - result["entropy"] = dynamic_props.random; return result; } chain_property_object get_chain_properties() const diff --git a/programs/size_checker/main.cpp b/programs/size_checker/main.cpp index 5950f6aa..9ef4420a 100644 --- a/programs/size_checker/main.cpp +++ b/programs/size_checker/main.cpp @@ -85,6 +85,7 @@ int main( int argc, char** argv ) std::cout << "\n"; } std::cout << "]\n"; + std::cerr << "Size of block header: " << sizeof( block_header ) << " " << fc::raw::pack_size( block_header() ) << "\n"; } catch ( const fc::exception& e ){ edump((e.to_detail_string())); } idump((sizeof(signed_block))); diff --git a/tests/intense/block_tests.cpp b/tests/intense/block_tests.cpp index fd77132e..7e975537 100644 --- a/tests/intense/block_tests.cpp +++ b/tests/intense/block_tests.cpp @@ -25,7 +25,6 @@ #include #include #include -#include #include #include diff --git a/tests/tests/basic_tests.cpp b/tests/tests/basic_tests.cpp index 6aeae968..c0779013 100644 --- a/tests/tests/basic_tests.cpp +++ b/tests/tests/basic_tests.cpp @@ -23,7 +23,6 @@ #include #include -#include #include #include @@ -166,7 +165,6 @@ BOOST_AUTO_TEST_CASE( price_test ) BOOST_CHECK(dummy == dummy2); } - BOOST_AUTO_TEST_CASE( memo_test ) { try { memo_data m; @@ -186,134 +184,6 @@ BOOST_AUTO_TEST_CASE( memo_test ) BOOST_CHECK_EQUAL(m.get_message(receiver, sender.get_public_key()), "Hello, world!"); } FC_LOG_AND_RETHROW() } -BOOST_AUTO_TEST_CASE( witness_rng_test_bits ) -{ - try - { - const uint64_t COUNT = 131072; - const uint64_t HASH_SIZE = 32; - string ref_bits = ""; - ref_bits.reserve( COUNT * HASH_SIZE ); - static const char seed_data[] = "\xe3\xb0\xc4\x42\x98\xfc\x1c\x14\x9a\xfb\xf4\xc8\x99\x6f\xb9\x24\x27\xae\x41\xe4\x64\x9b\x93\x4c\xa4\x95\x99\x1b\x78\x52\xb8\x55"; - - for( uint64_t i=0; i> 0x08) & 0xFF) ); - enc.put( char((i >> 0x10) & 0xFF) ); - enc.put( char((i >> 0x18) & 0xFF) ); - enc.put( char((i >> 0x20) & 0xFF) ); - enc.put( char((i >> 0x28) & 0xFF) ); - enc.put( char((i >> 0x30) & 0xFF) ); - enc.put( char((i >> 0x38) & 0xFF) ); - - fc::sha256 result = enc.result(); - auto result_data = result.data(); - std::copy( result_data, result_data+HASH_SIZE, std::back_inserter( ref_bits ) ); - } - - fc::sha256 seed = fc::sha256::hash( string("") ); - // seed = sha256("") = e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - BOOST_CHECK( memcmp( seed.data(), seed_data, HASH_SIZE ) == 0 ); - - hash_ctr_rng< fc::sha256, 32 > test_rng(seed.data(), 0); - // python2 -c 'import hashlib; import struct; h = lambda x : hashlib.sha256(x).digest(); i = lambda x : struct.pack(" uint64_t - { - uint64_t result = 0; - uint64_t i = ref_get_bits_offset; - uint64_t mask = 1; - while( count > 0 ) - { - if( ref_bits[ i >> 3 ] & (1 << (i & 7)) ) - result |= mask; - mask += mask; - i++; - count--; - } - ref_get_bits_offset = i; - return result; - }; - - // use PRNG to decide between 0-64 bits - std::minstd_rand rng; - rng.seed( 9999 ); - std::uniform_int_distribution< uint16_t > bit_dist( 0, 64 ); - for( int i=0; i<10000; i++ ) - { - uint8_t bit_count = bit_dist( rng ); - uint64_t ref_bits = ref_get_bits( bit_count ); - uint64_t test_bits = test_rng.get_bits( bit_count ); - //std::cout << i << ": get(" << int(bit_count) << ") -> " << test_bits << " (expect " << ref_bits << ")\n"; - if( bit_count < 64 ) - { - BOOST_CHECK( ref_bits < (uint64_t( 1 ) << bit_count ) ); - BOOST_CHECK( test_bits < (uint64_t( 1 ) << bit_count ) ); - } - BOOST_CHECK( ref_bits == test_bits ); - if( ref_bits != test_bits ) - break; - } - - std::uniform_int_distribution< uint64_t > whole_dist( - 0, std::numeric_limits::max() ); - for( int i=0; i<10000; i++ ) - { - uint8_t bit_count = bit_dist( rng ); - uint64_t bound = whole_dist( rng ) & ((uint64_t(1) << bit_count) - 1); - //std::cout << "bound:" << bound << "\n"; - uint64_t rnum = test_rng( bound ); - //std::cout << "rnum:" << rnum << "\n"; - if( bound > 1 ) - { - BOOST_CHECK( rnum < bound ); - } - else - { - BOOST_CHECK( rnum == 0 ); - } - } - - } FC_LOG_AND_RETHROW() -} - BOOST_AUTO_TEST_CASE( exceptions ) { GRAPHENE_CHECK_THROW(FC_THROW_EXCEPTION(balance_claim_invalid_claim_amount, "Etc"), balance_claim_invalid_claim_amount); diff --git a/tests/tests/block_tests.cpp b/tests/tests/block_tests.cpp index d8301856..e6677213 100644 --- a/tests/tests/block_tests.cpp +++ b/tests/tests/block_tests.cpp @@ -25,7 +25,6 @@ #include #include #include -#include #include @@ -644,7 +643,6 @@ BOOST_FIXTURE_TEST_CASE( maintenance_interval, database_fixture ) initial_properties.parameters.maximum_transaction_size); BOOST_CHECK_EQUAL(db.get_dynamic_global_properties().next_maintenance_time.sec_since_epoch(), db.head_block_time().sec_since_epoch() + db.get_global_properties().parameters.block_interval); - // shuffling is now handled by the witness_schedule_object. BOOST_CHECK(db.get_global_properties().active_witnesses == initial_properties.active_witnesses); BOOST_CHECK(db.get_global_properties().active_committee_members == initial_properties.active_committee_members); @@ -870,32 +868,6 @@ BOOST_FIXTURE_TEST_CASE( pop_block_twice, database_fixture ) } } -BOOST_FIXTURE_TEST_CASE( witness_scheduler_missed_blocks, database_fixture ) -{ try { - db.get_near_witness_schedule(); - generate_block(); - auto near_schedule = db.get_near_witness_schedule(); - - std::for_each(near_schedule.begin(), near_schedule.end(), [&](witness_id_type id) { - generate_block(0); - BOOST_CHECK(db.get_dynamic_global_properties().current_witness == id); - }); - - near_schedule = db.get_near_witness_schedule(); - generate_block(0, init_account_priv_key, 2); - BOOST_CHECK(db.get_dynamic_global_properties().current_witness == near_schedule[2]); - - near_schedule.erase(near_schedule.begin(), near_schedule.begin() + 3); - auto new_schedule = db.get_near_witness_schedule(); - new_schedule.erase(new_schedule.end() - 3, new_schedule.end()); - BOOST_CHECK(new_schedule == near_schedule); - - std::for_each(near_schedule.begin(), near_schedule.end(), [&](witness_id_type id) { - generate_block(0); - BOOST_CHECK(db.get_dynamic_global_properties().current_witness == id); - }); -} FC_LOG_AND_RETHROW() } - BOOST_FIXTURE_TEST_CASE( rsf_missed_blocks, database_fixture ) { try @@ -904,7 +876,7 @@ BOOST_FIXTURE_TEST_CASE( rsf_missed_blocks, database_fixture ) auto rsf = [&]() -> string { - fc::uint128 rsf = db.get( witness_schedule_id_type() ).recent_slots_filled; + fc::uint128 rsf = db.get_dynamic_global_properties().recent_slots_filled; string result = ""; result.reserve(128); for( int i=0; i<128; i++ ) diff --git a/tests/tests/operation_tests2.cpp b/tests/tests/operation_tests2.cpp index 59c34c92..925c8a8d 100644 --- a/tests/tests/operation_tests2.cpp +++ b/tests/tests/operation_tests2.cpp @@ -443,34 +443,15 @@ BOOST_AUTO_TEST_CASE( witness_create ) auto itr = std::find(witnesses.begin(), witnesses.end(), nathan_witness_id); BOOST_CHECK(itr != witnesses.end()); - generate_blocks(witnesses.size()); - - // make sure we're scheduled to produce - vector near_witnesses = db.get_near_witness_schedule(); - BOOST_CHECK( std::find( near_witnesses.begin(), near_witnesses.end(), nathan_witness_id ) - != near_witnesses.end() ); - - struct generator_helper { - database_fixture& f; - witness_id_type nathan_id; - fc::ecc::private_key nathan_key; - bool nathan_generated_block; - - void operator()(witness_id_type id) { - if( id == nathan_id ) - { - nathan_generated_block = true; - f.generate_block(0, nathan_key); - } else - f.generate_block(0); - BOOST_CHECK_EQUAL(f.db.get_dynamic_global_properties().current_witness.instance.value, id.instance.value); - f.db.get_near_witness_schedule(); - } - }; - - generator_helper h = std::for_each(near_witnesses.begin(), near_witnesses.end(), - generator_helper{*this, nathan_witness_id, nathan_private_key, false}); - BOOST_CHECK(h.nathan_generated_block); + int produced = 0; + // Make sure we get scheduled exactly once in witnesses.size() blocks + // TODO: intense_test that repeats this loop many times + for( size_t i=0; i Date: Mon, 24 Aug 2015 22:33:15 -0400 Subject: [PATCH 233/353] cli_wallet: Implement propose_parameter_change to more easily make proposals --- .../graphene/chain/protocol/proposal.hpp | 13 ++++- .../wallet/include/graphene/wallet/wallet.hpp | 27 +++++++++ libraries/wallet/wallet.cpp | 57 +++++++++++++++++++ 3 files changed, 94 insertions(+), 3 deletions(-) diff --git a/libraries/chain/include/graphene/chain/protocol/proposal.hpp b/libraries/chain/include/graphene/chain/protocol/proposal.hpp index d7136690..8b9cd40e 100644 --- a/libraries/chain/include/graphene/chain/protocol/proposal.hpp +++ b/libraries/chain/include/graphene/chain/protocol/proposal.hpp @@ -57,8 +57,16 @@ namespace graphene { namespace chain { optional review_period_seconds; extensions_type extensions; - /// Constructs a proposal_create_operation suitable for committee proposals, with fee, expiration time and review - /// period set appropriately. + /** + * Constructs a proposal_create_operation suitable for committee + * proposals, with expiration time and review period set + * appropriately. No proposed_ops are added. When used to + * create a proposal to change chain parameters, this method + * expects to receive the currently effective parameters, not + * the proposed parameters. (The proposed parameters will go + * in proposed_ops, and proposed_ops is untouched by this + * function.) + */ static proposal_create_operation committee_proposal(const chain_parameters& param, fc::time_point_sec head_block_time ); account_id_type fee_payer()const { return fee_paying_account; } @@ -148,4 +156,3 @@ FC_REFLECT( graphene::chain::proposal_update_operation, (fee)(fee_paying_account (active_approvals_to_add)(active_approvals_to_remove)(owner_approvals_to_add)(owner_approvals_to_remove) (key_approvals_to_add)(key_approvals_to_remove)(extensions) ) FC_REFLECT( graphene::chain::proposal_delete_operation, (fee)(fee_paying_account)(using_owner_authority)(proposal)(extensions) ) - diff --git a/libraries/wallet/include/graphene/wallet/wallet.hpp b/libraries/wallet/include/graphene/wallet/wallet.hpp index e044c94b..80738fc5 100644 --- a/libraries/wallet/include/graphene/wallet/wallet.hpp +++ b/libraries/wallet/include/graphene/wallet/wallet.hpp @@ -1186,6 +1186,31 @@ class wallet_api */ operation get_prototype_operation(string operation_type); + /** Creates a transaction to propose a parameter change. + * + * Multiple parameters can be specified if an atomic change is + * desired. + * + * @param proposing_account The account paying the fee to propose the tx + * @param changed_values The values to change; all other chain parameters are filled in with default values + * @param broadcast true if you wish to broadcast the transaction + * @return the signed version of the transaction + */ + signed_transaction propose_parameter_change( + const string& proposing_account, + const variant_object& changed_values, + bool broadcast = false); + + /** Propose a fee change. + * + * Not implemented. + * + */ + signed_transaction propose_fee_change( + const string& proposing_account, + const variant_object& changed_values, + bool broadcast = false); + void dbg_make_uia(string creator, string symbol); void dbg_make_mia(string creator, string symbol); void flood_network(string prefix, uint32_t number_of_transactions); @@ -1317,6 +1342,8 @@ FC_API( graphene::wallet::wallet_api, (serialize_transaction) (sign_transaction) (get_prototype_operation) + (propose_parameter_change) + (propose_fee_change) (dbg_make_uia) (dbg_make_mia) (flood_network) diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp index f34dbdb7..b632d7c3 100644 --- a/libraries/wallet/wallet.cpp +++ b/libraries/wallet/wallet.cpp @@ -1840,6 +1840,45 @@ public: return m; } + signed_transaction propose_parameter_change( + const string& proposing_account, + const variant_object& changed_values, + bool broadcast = false) + { + FC_ASSERT( !changed_values.contains("current_fees") ); + + const chain_parameters& current_params = get_global_properties().parameters; + chain_parameters new_params = current_params; + fc::reflector::visit( + fc::from_variant_visitor( changed_values, new_params ) + ); + + committee_member_update_global_parameters_operation update_op; + update_op.new_parameters = new_params; + + proposal_create_operation prop_op = proposal_create_operation::committee_proposal( + current_params, get_dynamic_global_properties().time ); + prop_op.fee_paying_account = get_account(proposing_account).id; + + prop_op.proposed_ops.emplace_back( update_op ); + current_params.current_fees->set_fee( prop_op.proposed_ops.back().op ); + + signed_transaction tx; + tx.operations.push_back(prop_op); + set_operation_fees(tx, current_params.current_fees); + tx.validate(); + + return sign_transaction(tx, broadcast); + } + + signed_transaction propose_fee_change( + const string& proposing_account, + const variant_object& changed_values, + bool broadcast = false) + { + FC_ASSERT( false, "not implemented" ); + } + void dbg_make_uia(string creator, string symbol) { asset_options opts; @@ -2558,6 +2597,24 @@ void wallet_api::flood_network(string prefix, uint32_t number_of_transactions) my->flood_network(prefix, number_of_transactions); } +signed_transaction wallet_api::propose_parameter_change( + const string& proposing_account, + const variant_object& changed_values, + bool broadcast /* = false */ + ) +{ + return my->propose_parameter_change( proposing_account, changed_values, broadcast ); +} + +signed_transaction wallet_api::propose_fee_change( + const string& proposing_account, + const variant_object& changed_values, + bool broadcast /* = false */ + ) +{ + return my->propose_fee_change( proposing_account, changed_values, broadcast ); +} + global_property_object wallet_api::get_global_properties() const { return my->get_global_properties(); From d1484fb41e35a367a9784da0f80e0153ae2dcaec Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Mon, 24 Aug 2015 23:20:11 -0400 Subject: [PATCH 234/353] cli_wallet: Implement approve_proposal to more easily approve proposals --- .../wallet/include/graphene/wallet/wallet.hpp | 37 +++++++++++++++- libraries/wallet/wallet.cpp | 43 +++++++++++++++++++ 2 files changed, 78 insertions(+), 2 deletions(-) diff --git a/libraries/wallet/include/graphene/wallet/wallet.hpp b/libraries/wallet/include/graphene/wallet/wallet.hpp index 80738fc5..f8f90978 100644 --- a/libraries/wallet/include/graphene/wallet/wallet.hpp +++ b/libraries/wallet/include/graphene/wallet/wallet.hpp @@ -203,6 +203,16 @@ struct exported_keys vector account_keys; }; +struct approval_delta +{ + vector active_approvals_to_add; + vector active_approvals_to_remove; + vector owner_approvals_to_add; + vector owner_approvals_to_remove; + vector key_approvals_to_add; + vector key_approvals_to_remove; +}; + namespace detail { class wallet_api_impl; } @@ -1211,11 +1221,25 @@ class wallet_api const variant_object& changed_values, bool broadcast = false); + /** Approve or disapprove a proposal. + * + * @param fee_paying_account The account paying the fee for the op. + * @param proposal_id The proposal to modify. + * @param delta Members contain approvals to create or remove. In JSON you can leave empty members undefined. + * @param broadcast true if you wish to broadcast the transaction + * @return the signed version of the transaction + */ + signed_transaction approve_proposal( + const string& fee_paying_account, + const string& proposal_id, + const approval_delta& delta, + bool broadcast /* = false */ + ); + void dbg_make_uia(string creator, string symbol); void dbg_make_mia(string creator, string symbol); void flood_network(string prefix, uint32_t number_of_transactions); - /** * Used to transfer from one set of blinded balances to another */ @@ -1269,6 +1293,15 @@ FC_REFLECT( graphene::wallet::exported_keys, (password_checksum)(account_keys) ) FC_REFLECT( graphene::wallet::blind_receipt, (date)(from_key)(from_label)(to_key)(to_label)(amount)(memo)(control_authority)(data)(used)(conf) ) +FC_REFLECT( graphene::wallet::approval_delta, + (active_approvals_to_add) + (active_approvals_to_remove) + (owner_approvals_to_add) + (owner_approvals_to_remove) + (key_approvals_to_add) + (key_approvals_to_remove) +) + FC_API( graphene::wallet::wallet_api, (help) (gethelp) @@ -1344,6 +1377,7 @@ FC_API( graphene::wallet::wallet_api, (get_prototype_operation) (propose_parameter_change) (propose_fee_change) + (approve_proposal) (dbg_make_uia) (dbg_make_mia) (flood_network) @@ -1360,4 +1394,3 @@ FC_API( graphene::wallet::wallet_api, (blind_history) (receive_blind_transfer) ) - diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp index b632d7c3..a7567c57 100644 --- a/libraries/wallet/wallet.cpp +++ b/libraries/wallet/wallet.cpp @@ -1879,6 +1879,39 @@ public: FC_ASSERT( false, "not implemented" ); } + signed_transaction approve_proposal( + const string& fee_paying_account, + const string& proposal_id, + const approval_delta& delta, + bool broadcast = false) + { + proposal_update_operation update_op; + + update_op.fee_paying_account = get_account(fee_paying_account).id; + update_op.proposal = fc::variant(proposal_id).as(); + // make sure the proposal exists + get_object( update_op.proposal ); + + for( const std::string& name : delta.active_approvals_to_add ) + update_op.active_approvals_to_add.insert( get_account( name ).id ); + for( const std::string& name : delta.active_approvals_to_remove ) + update_op.active_approvals_to_remove.insert( get_account( name ).id ); + for( const std::string& name : delta.owner_approvals_to_add ) + update_op.owner_approvals_to_add.insert( get_account( name ).id ); + for( const std::string& name : delta.owner_approvals_to_remove ) + update_op.owner_approvals_to_remove.insert( get_account( name ).id ); + for( const std::string& k : delta.key_approvals_to_add ) + update_op.key_approvals_to_add.insert( public_key_type( k ) ); + for( const std::string& k : delta.key_approvals_to_remove ) + update_op.key_approvals_to_remove.insert( public_key_type( k ) ); + + signed_transaction tx; + tx.operations.push_back(update_op); + set_operation_fees(tx, get_global_properties().parameters.current_fees); + tx.validate(); + return sign_transaction(tx, broadcast); + } + void dbg_make_uia(string creator, string symbol) { asset_options opts; @@ -2615,6 +2648,16 @@ signed_transaction wallet_api::propose_fee_change( return my->propose_fee_change( proposing_account, changed_values, broadcast ); } +signed_transaction wallet_api::approve_proposal( + const string& fee_paying_account, + const string& proposal_id, + const approval_delta& delta, + bool broadcast /* = false */ + ) +{ + return my->approve_proposal( fee_paying_account, proposal_id, delta, broadcast ); +} + global_property_object wallet_api::get_global_properties() const { return my->get_global_properties(); From 0bcfc69da23b7e215d62778da63eb4c760568af2 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Mon, 24 Aug 2015 13:22:20 -0400 Subject: [PATCH 235/353] Further improve Merkle root algorithm, implement unit test #266 This commit redefines the hash h of a node in the Merkle tree as: h(unary_node) = unary_node h(binary_node) = H(left_child + right_child) Previous code in c0b9af9a996c0ae90b6816d6b995006ff0b8e5b2 defined hash as: h(unary_node) = H(unary_node + digest_type()) h(binary_node) = H(left_child + right_child) The improved definition in this commit saves some hash computations. --- libraries/chain/protocol/block.cpp | 43 +++---- tests/tests/basic_tests.cpp | 177 +++++++++++++++++++++++++++++ 2 files changed, 190 insertions(+), 30 deletions(-) diff --git a/libraries/chain/protocol/block.cpp b/libraries/chain/protocol/block.cpp index 808eb927..cda95a32 100644 --- a/libraries/chain/protocol/block.cpp +++ b/libraries/chain/protocol/block.cpp @@ -61,41 +61,24 @@ namespace graphene { namespace chain { if( transactions.size() == 0 ) return checksum_type(); - vector ids; - ids.resize( ((transactions.size() + 1)/2)*2 ); + vector ids; + ids.resize( transactions.size() ); for( uint32_t i = 0; i < transactions.size(); ++i ) ids[i] = transactions[i].merkle_digest(); vector::size_type current_number_of_hashes = ids.size(); - while( true ) + while( current_number_of_hashes > 1 ) { -#define AUG_20_TESTNET_COMPATIBLE -#ifdef AUG_20_TESTNET_COMPATIBLE - for( uint32_t i = 0; i < transactions.size(); i += 2 ) -#else - for( uint32_t i = 0; i < current_number_of_hashes; i += 2 ) -#endif - ids[i/2] = digest_type::hash( std::make_pair( ids[i], ids[i+1] ) ); - // since we're processing hashes in pairs, we need to ensure that we always - // have an even number of hashes in the ids list. If we would end up with - // an odd number, add a default-initialized hash to compensate - current_number_of_hashes /= 2; -#ifdef AUG_20_TESTNET_COMPATIBLE - if (current_number_of_hashes <= 1) - break; -#else - if (current_number_of_hashes == 1) - break; - if (current_number_of_hashes % 2) - { - ++current_number_of_hashes; - // TODO: HARD FORK: we should probably enable the next line the next time we fire - // up a new testnet; it will change the merkle roots we generate, but will - // give us a better-defined algorithm for calculating them - // - ids[current_number_of_hashes - 1] = digest_type(); - } -#endif + // hash ID's in pairs + uint32_t i_max = current_number_of_hashes - (current_number_of_hashes&1); + uint32_t k = 0; + + for( uint32_t i = 0; i < i_max; i += 2 ) + ids[k++] = digest_type::hash( std::make_pair( ids[i], ids[i+1] ) ); + + if( current_number_of_hashes&1 ) + ids[k++] = ids[i_max]; + current_number_of_hashes = k; } return checksum_type::hash( ids[0] ); } diff --git a/tests/tests/basic_tests.cpp b/tests/tests/basic_tests.cpp index 6aeae968..8b92ec4e 100644 --- a/tests/tests/basic_tests.cpp +++ b/tests/tests/basic_tests.cpp @@ -350,4 +350,181 @@ BOOST_AUTO_TEST_CASE( scaled_precision ) GRAPHENE_CHECK_THROW( asset::scaled_precision(19), fc::exception ); } +BOOST_AUTO_TEST_CASE( merkle_root ) +{ + signed_block block; + vector tx; + vector t; + const uint32_t num_tx = 10; + + for( uint32_t i=0; i checksum_type + { return checksum_type::hash( digest ); }; + + auto d = []( const digest_type& left, const digest_type& right ) -> digest_type + { return digest_type::hash( std::make_pair( left, right ) ); }; + + BOOST_CHECK( block.calculate_merkle_root() == checksum_type() ); + + block.transactions.push_back( tx[0] ); + BOOST_CHECK( block.calculate_merkle_root() == + c(t[0]) + ); + + digest_type dA, dB, dC, dD, dE, dI, dJ, dK, dM, dN, dO; + + /* + A=d(0,1) + / \ + 0 1 + */ + + dA = d(t[0], t[1]); + + block.transactions.push_back( tx[1] ); + BOOST_CHECK( block.calculate_merkle_root() == c(dA) ); + + /* + I=d(A,B) + / \ + A=d(0,1) B=2 + / \ / + 0 1 2 + */ + + dB = t[2]; + dI = d(dA, dB); + + block.transactions.push_back( tx[2] ); + BOOST_CHECK( block.calculate_merkle_root() == c(dI) ); + + /* + I=d(A,B) + / \ + A=d(0,1) B=d(2,3) + / \ / \ + 0 1 2 3 + */ + + dB = d(t[2], t[3]); + dI = d(dA, dB); + + block.transactions.push_back( tx[3] ); + BOOST_CHECK( block.calculate_merkle_root() == c(dI) ); + + /* + __M=d(I,J)__ + / \ + I=d(A,B) J=C + / \ / + A=d(0,1) B=d(2,3) C=4 + / \ / \ / + 0 1 2 3 4 + */ + + dC = t[4]; + dJ = dC; + dM = d(dI, dJ); + + block.transactions.push_back( tx[4] ); + BOOST_CHECK( block.calculate_merkle_root() == c(dM) ); + + /* + __M=d(I,J)__ + / \ + I=d(A,B) J=C + / \ / + A=d(0,1) B=d(2,3) C=d(4,5) + / \ / \ / \ + 0 1 2 3 4 5 + */ + + dC = d(t[4], t[5]); + dJ = dC; + dM = d(dI, dJ); + + block.transactions.push_back( tx[5] ); + BOOST_CHECK( block.calculate_merkle_root() == c(dM) ); + + /* + __M=d(I,J)__ + / \ + I=d(A,B) J=d(C,D) + / \ / \ + A=d(0,1) B=d(2,3) C=d(4,5) D=6 + / \ / \ / \ / + 0 1 2 3 4 5 6 + */ + + dD = t[6]; + dJ = d(dC, dD); + dM = d(dI, dJ); + + block.transactions.push_back( tx[6] ); + BOOST_CHECK( block.calculate_merkle_root() == c(dM) ); + + /* + __M=d(I,J)__ + / \ + I=d(A,B) J=d(C,D) + / \ / \ + A=d(0,1) B=d(2,3) C=d(4,5) D=d(6,7) + / \ / \ / \ / \ + 0 1 2 3 4 5 6 7 + */ + + dD = d(t[6], t[7]); + dJ = d(dC, dD); + dM = d(dI, dJ); + + block.transactions.push_back( tx[7] ); + BOOST_CHECK( block.calculate_merkle_root() == c(dM) ); + + /* + _____________O=d(M,N)______________ + / \ + __M=d(I,J)__ N=K + / \ / + I=d(A,B) J=d(C,D) K=E + / \ / \ / + A=d(0,1) B=d(2,3) C=d(4,5) D=d(6,7) E=8 + / \ / \ / \ / \ / + 0 1 2 3 4 5 6 7 8 + */ + + dE = t[8]; + dK = dE; + dN = dK; + dO = d(dM, dN); + + block.transactions.push_back( tx[8] ); + BOOST_CHECK( block.calculate_merkle_root() == c(dO) ); + + /* + _____________O=d(M,N)______________ + / \ + __M=d(I,J)__ N=K + / \ / + I=d(A,B) J=d(C,D) K=E + / \ / \ / + A=d(0,1) B=d(2,3) C=d(4,5) D=d(6,7) E=d(8,9) + / \ / \ / \ / \ / \ + 0 1 2 3 4 5 6 7 8 9 + */ + + dE = d(t[8], t[9]); + dK = dE; + dN = dK; + dO = d(dM, dN); + + block.transactions.push_back( tx[9] ); + BOOST_CHECK( block.calculate_merkle_root() == c(dO) ); +} + BOOST_AUTO_TEST_SUITE_END() From dcc4f8076bdff5f53088eae8dc922993e41a4f25 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Tue, 25 Aug 2015 14:46:56 -0400 Subject: [PATCH 236/353] database.hpp: Simplify get_scheduled_witness() return value --- libraries/chain/db_block.cpp | 4 +- libraries/chain/db_witness_schedule.cpp | 6 +- .../chain/include/graphene/chain/database.hpp | 6 +- libraries/plugins/witness/witness.cpp | 2 +- tests/app/main.cpp | 2 +- tests/benchmarks/genesis_allocation.cpp | 4 +- tests/common/database_fixture.cpp | 2 +- tests/intense/block_tests.cpp | 2 +- tests/tests/block_tests.cpp | 60 +++++++++---------- tests/tests/operation_tests2.cpp | 10 ++-- 10 files changed, 48 insertions(+), 50 deletions(-) diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index 99131146..94b02511 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -257,7 +257,7 @@ signed_block database::_generate_block( uint32_t skip = get_node_properties().skip_flags; uint32_t slot_num = get_slot_at_time( when ); FC_ASSERT( slot_num > 0 ); - witness_id_type scheduled_witness = get_scheduled_witness( slot_num ).first; + witness_id_type scheduled_witness = get_scheduled_witness( slot_num ); FC_ASSERT( scheduled_witness == witness_id ); const auto& witness_obj = witness_id(*this); @@ -566,7 +566,7 @@ const witness_object& database::validate_block_header( uint32_t skip, const sign uint32_t slot_num = get_slot_at_time( next_block.timestamp ); FC_ASSERT( slot_num > 0 ); - witness_id_type scheduled_witness = get_scheduled_witness( slot_num ).first; + witness_id_type scheduled_witness = get_scheduled_witness( slot_num ); FC_ASSERT( next_block.witness == scheduled_witness ); } diff --git a/libraries/chain/db_witness_schedule.cpp b/libraries/chain/db_witness_schedule.cpp index 2cb8b711..90aab09e 100644 --- a/libraries/chain/db_witness_schedule.cpp +++ b/libraries/chain/db_witness_schedule.cpp @@ -23,10 +23,10 @@ namespace graphene { namespace chain { -pair database::get_scheduled_witness(uint32_t slot_num)const +witness_id_type database::get_scheduled_witness(uint32_t slot_num)const { if( slot_num == 0 ) - return pair(witness_id_type(), false); + return witness_id_type(); const witness_schedule_object& wso = witness_schedule_id_type()(*this); @@ -53,7 +53,7 @@ pair database::get_scheduled_witness(uint32_t slot_num)co assert( false ); } } - return pair(wid, slot_is_near); + return wid; } fc::time_point_sec database::get_slot_time(uint32_t slot_num)const diff --git a/libraries/chain/include/graphene/chain/database.hpp b/libraries/chain/include/graphene/chain/database.hpp index e1a56e90..99df3cb0 100644 --- a/libraries/chain/include/graphene/chain/database.hpp +++ b/libraries/chain/include/graphene/chain/database.hpp @@ -220,11 +220,9 @@ namespace graphene { namespace chain { * Use the get_slot_time() and get_slot_at_time() functions * to convert between slot_num and timestamp. * - * Passing slot_num == 0 returns (witness_id_type(), false) - * - * The bool value is true if near schedule, false if far schedule. + * Passing slot_num == 0 returns witness_id_type() */ - pair get_scheduled_witness(uint32_t slot_num)const; + witness_id_type get_scheduled_witness(uint32_t slot_num)const; /** * Get the time at which the given slot occurs. diff --git a/libraries/plugins/witness/witness.cpp b/libraries/plugins/witness/witness.cpp index 637447ee..9290837d 100644 --- a/libraries/plugins/witness/witness.cpp +++ b/libraries/plugins/witness/witness.cpp @@ -177,7 +177,7 @@ void witness_plugin::block_production_loop() // is anyone scheduled to produce now or one second in the future? const fc::time_point_sec now = graphene::time::now(); uint32_t slot = db.get_slot_at_time( now ); - graphene::chain::witness_id_type scheduled_witness = db.get_scheduled_witness( slot ).first; + graphene::chain::witness_id_type scheduled_witness = db.get_scheduled_witness( slot ); fc::time_point_sec scheduled_time = db.get_slot_time( slot ); graphene::chain::public_key_type scheduled_key = scheduled_witness( db ).signing_key; diff --git a/tests/app/main.cpp b/tests/app/main.cpp index 1e7bfcad..b498ec01 100644 --- a/tests/app/main.cpp +++ b/tests/app/main.cpp @@ -128,7 +128,7 @@ BOOST_AUTO_TEST_CASE( two_node_network ) auto block_1 = db2->generate_block( db2->get_slot_time(1), - db2->get_scheduled_witness(1).first, + db2->get_scheduled_witness(1), committee_key, database::skip_nothing); diff --git a/tests/benchmarks/genesis_allocation.cpp b/tests/benchmarks/genesis_allocation.cpp index eb93700a..5dedaedf 100644 --- a/tests/benchmarks/genesis_allocation.cpp +++ b/tests/benchmarks/genesis_allocation.cpp @@ -86,7 +86,7 @@ BOOST_AUTO_TEST_CASE( genesis_and_persistence_bench ) int blocks_out = 0; auto witness_priv_key = fc::ecc::private_key::regenerate(fc::sha256::hash(string("null_key")) ); auto aw = db.get_global_properties().active_witnesses; - auto b = db.generate_block( db.get_slot_time( 1 ), db.get_scheduled_witness( 1 ).first, witness_priv_key, ~0 ); + auto b = db.generate_block( db.get_slot_time( 1 ), db.get_scheduled_witness( 1 ), witness_priv_key, ~0 ); start_time = fc::time_point::now(); /* TODO: get this buliding again @@ -97,7 +97,7 @@ BOOST_AUTO_TEST_CASE( genesis_and_persistence_bench ) db.push_transaction(trx, ~0); aw = db.get_global_properties().active_witnesses; - b = db.generate_block( db.get_slot_time( 1 ), db.get_scheduled_witness( 1 ).first, witness_priv_key, ~0 ); + b = db.generate_block( db.get_slot_time( 1 ), db.get_scheduled_witness( 1 ), witness_priv_key, ~0 ); } */ ilog("Pushed ${c} blocks (1 op each, no validation) in ${t} milliseconds.", diff --git a/tests/common/database_fixture.cpp b/tests/common/database_fixture.cpp index 53cbd00a..61fb036d 100644 --- a/tests/common/database_fixture.cpp +++ b/tests/common/database_fixture.cpp @@ -297,7 +297,7 @@ signed_block database_fixture::generate_block(uint32_t skip, const fc::ecc::priv skip |= database::skip_undo_history_check; // skip == ~0 will skip checks specified in database::validation_steps return db.generate_block(db.get_slot_time(miss_blocks + 1), - db.get_scheduled_witness(miss_blocks + 1).first, + db.get_scheduled_witness(miss_blocks + 1), key, skip); } diff --git a/tests/intense/block_tests.cpp b/tests/intense/block_tests.cpp index e9f1196e..fd77132e 100644 --- a/tests/intense/block_tests.cpp +++ b/tests/intense/block_tests.cpp @@ -279,7 +279,7 @@ BOOST_FIXTURE_TEST_CASE( witness_order_mc_test, database_fixture ) { wdump( (db.head_block_num()) ); } - witness_id_type wid = db.get_scheduled_witness( 1 ).first; + witness_id_type wid = db.get_scheduled_witness( 1 ); full_schedule.push_back( wid ); cur_round.push_back( wid ); if( cur_round.size() == num_witnesses ) diff --git a/tests/tests/block_tests.cpp b/tests/tests/block_tests.cpp index 427fdd51..d8301856 100644 --- a/tests/tests/block_tests.cpp +++ b/tests/tests/block_tests.cpp @@ -131,13 +131,13 @@ BOOST_AUTO_TEST_CASE( generate_empty_blocks ) { database db; db.open(data_dir.path(), make_genesis ); - b = db.generate_block(db.get_slot_time(1), db.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); + b = db.generate_block(db.get_slot_time(1), db.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); for( uint32_t i = 1; i < 200; ++i ) { BOOST_CHECK( db.head_block_id() == b.id() ); witness_id_type prev_witness = b.witness; - witness_id_type cur_witness = db.get_scheduled_witness(1).first; + witness_id_type cur_witness = db.get_scheduled_witness(1); BOOST_CHECK( cur_witness != prev_witness ); b = db.generate_block(db.get_slot_time(1), cur_witness, init_account_priv_key, database::skip_nothing); BOOST_CHECK( b.witness == cur_witness ); @@ -152,7 +152,7 @@ BOOST_AUTO_TEST_CASE( generate_empty_blocks ) { BOOST_CHECK( db.head_block_id() == b.id() ); witness_id_type prev_witness = b.witness; - witness_id_type cur_witness = db.get_scheduled_witness(1).first; + witness_id_type cur_witness = db.get_scheduled_witness(1); BOOST_CHECK( cur_witness != prev_witness ); b = db.generate_block(db.get_slot_time(1), cur_witness, init_account_priv_key, database::skip_nothing); } @@ -179,7 +179,7 @@ BOOST_AUTO_TEST_CASE( undo_block ) { now = db.get_slot_time(1); time_stack.push_back( now ); - auto b = db.generate_block( now, db.get_scheduled_witness( 1 ).first, init_account_priv_key, database::skip_nothing ); + auto b = db.generate_block( now, db.get_scheduled_witness( 1 ), init_account_priv_key, database::skip_nothing ); } BOOST_CHECK( db.head_block_num() == 5 ); BOOST_CHECK( db.head_block_time() == now ); @@ -202,7 +202,7 @@ BOOST_AUTO_TEST_CASE( undo_block ) { now = db.get_slot_time(1); time_stack.push_back( now ); - auto b = db.generate_block( now, db.get_scheduled_witness( 1 ).first, init_account_priv_key, database::skip_nothing ); + auto b = db.generate_block( now, db.get_scheduled_witness( 1 ), init_account_priv_key, database::skip_nothing ); } BOOST_CHECK( db.head_block_num() == 7 ); } @@ -227,20 +227,20 @@ BOOST_AUTO_TEST_CASE( fork_blocks ) auto init_account_priv_key = fc::ecc::private_key::regenerate(fc::sha256::hash(string("null_key")) ); for( uint32_t i = 0; i < 10; ++i ) { - auto b = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); + auto b = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); try { PUSH_BLOCK( db2, b ); } FC_CAPTURE_AND_RETHROW( ("db2") ); } for( uint32_t i = 10; i < 13; ++i ) { - auto b = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); + auto b = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); } string db1_tip = db1.head_block_id().str(); uint32_t next_slot = 3; for( uint32_t i = 13; i < 16; ++i ) { - auto b = db2.generate_block(db2.get_slot_time(next_slot), db2.get_scheduled_witness(next_slot).first, init_account_priv_key, database::skip_nothing); + auto b = db2.generate_block(db2.get_slot_time(next_slot), db2.get_scheduled_witness(next_slot), init_account_priv_key, database::skip_nothing); next_slot = 1; // notify both databases of the new block. // only db2 should switch to the new fork, db1 should not @@ -255,7 +255,7 @@ BOOST_AUTO_TEST_CASE( fork_blocks ) BOOST_CHECK_EQUAL(db1.head_block_num(), 13); BOOST_CHECK_EQUAL(db2.head_block_num(), 13); { - auto b = db2.generate_block(db2.get_slot_time(1), db2.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); + auto b = db2.generate_block(db2.get_slot_time(1), db2.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); good_block = b; b.transactions.emplace_back(signed_transaction()); b.transactions.back().operations.emplace_back(transfer_operation()); @@ -289,18 +289,18 @@ BOOST_AUTO_TEST_CASE( out_of_order_blocks ) BOOST_CHECK( db1.get_chain_id() == db2.get_chain_id() ); auto init_account_priv_key = fc::ecc::private_key::regenerate(fc::sha256::hash(string("null_key")) ); - auto b1 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); - auto b2 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); - auto b3 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); - auto b4 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); - auto b5 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); - auto b6 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); - auto b7 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); - auto b8 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); - auto b9 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); - auto b10 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); - auto b11 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); - auto b12 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); + auto b1 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); + auto b2 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); + auto b3 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); + auto b4 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); + auto b5 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); + auto b6 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); + auto b7 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); + auto b8 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); + auto b9 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); + auto b10 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); + auto b11 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); + auto b12 = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); BOOST_CHECK_EQUAL(db1.head_block_num(), 12); BOOST_CHECK_EQUAL(db2.head_block_num(), 0); PUSH_BLOCK( db2, b1 ); @@ -351,7 +351,7 @@ BOOST_AUTO_TEST_CASE( undo_pending ) trx.operations.push_back(t); PUSH_TX( db, trx, ~0 ); - auto b = db.generate_block(db.get_slot_time(1), db.get_scheduled_witness(1).first, init_account_priv_key, ~0); + auto b = db.generate_block(db.get_slot_time(1), db.get_scheduled_witness(1), init_account_priv_key, ~0); } signed_transaction trx; @@ -366,7 +366,7 @@ BOOST_AUTO_TEST_CASE( undo_pending ) //sign( trx, init_account_priv_key ); PUSH_TX( db, trx ); - auto b = db.generate_block(db.get_slot_time(1), db.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); + auto b = db.generate_block(db.get_slot_time(1), db.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); BOOST_CHECK(nathan_id(db).name == "nathan"); @@ -424,14 +424,14 @@ BOOST_AUTO_TEST_CASE( switch_forks_undo_create ) // db2 : B C D auto aw = db1.get_global_properties().active_witnesses; - auto b = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); + auto b = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); BOOST_CHECK(nathan_id(db1).name == "nathan"); - b = db2.generate_block(db2.get_slot_time(1), db2.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); + b = db2.generate_block(db2.get_slot_time(1), db2.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); db1.push_block(b); aw = db2.get_global_properties().active_witnesses; - b = db2.generate_block(db2.get_slot_time(1), db2.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); + b = db2.generate_block(db2.get_slot_time(1), db2.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); db1.push_block(b); GRAPHENE_CHECK_THROW(nathan_id(db1), fc::exception); @@ -439,7 +439,7 @@ BOOST_AUTO_TEST_CASE( switch_forks_undo_create ) PUSH_TX( db2, trx ); aw = db2.get_global_properties().active_witnesses; - b = db2.generate_block(db2.get_slot_time(1), db2.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); + b = db2.generate_block(db2.get_slot_time(1), db2.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); db1.push_block(b); BOOST_CHECK(nathan_id(db1).name == "nathan"); @@ -489,7 +489,7 @@ BOOST_AUTO_TEST_CASE( duplicate_transactions ) GRAPHENE_CHECK_THROW(PUSH_TX( db1, trx, skip_sigs ), fc::exception); - auto b = db1.generate_block( db1.get_slot_time(1), db1.get_scheduled_witness( 1 ).first, init_account_priv_key, skip_sigs ); + auto b = db1.generate_block( db1.get_slot_time(1), db1.get_scheduled_witness( 1 ), init_account_priv_key, skip_sigs ); PUSH_BLOCK( db2, b, skip_sigs ); GRAPHENE_CHECK_THROW(PUSH_TX( db1, trx, skip_sigs ), fc::exception); @@ -515,7 +515,7 @@ BOOST_AUTO_TEST_CASE( tapos ) public_key_type init_account_pub_key = init_account_priv_key.get_public_key(); const graphene::db::index& account_idx = db1.get_index(protocol_ids, account_object_type); - auto b = db1.generate_block( db1.get_slot_time(1), db1.get_scheduled_witness( 1 ).first, init_account_priv_key, database::skip_nothing); + auto b = db1.generate_block( db1.get_slot_time(1), db1.get_scheduled_witness( 1 ), init_account_priv_key, database::skip_nothing); signed_transaction trx; //This transaction must be in the next block after its reference, or it is invalid. @@ -531,7 +531,7 @@ BOOST_AUTO_TEST_CASE( tapos ) trx.operations.push_back(cop); trx.sign( init_account_priv_key, db1.get_chain_id() ); db1.push_transaction(trx); - b = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1).first, init_account_priv_key, database::skip_nothing); + b = db1.generate_block(db1.get_slot_time(1), db1.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); trx.clear(); transfer_operation t; diff --git a/tests/tests/operation_tests2.cpp b/tests/tests/operation_tests2.cpp index 28192b2e..59c34c92 100644 --- a/tests/tests/operation_tests2.cpp +++ b/tests/tests/operation_tests2.cpp @@ -1098,7 +1098,7 @@ BOOST_AUTO_TEST_CASE( balance_object_test ) BOOST_CHECK(db.find_object(balance_id_type(1)) != nullptr); auto slot = db.get_slot_at_time(starting_time); - db.generate_block(starting_time, db.get_scheduled_witness(slot).first, init_account_priv_key, skip_flags); + db.generate_block(starting_time, db.get_scheduled_witness(slot), init_account_priv_key, skip_flags); set_expiration( db, trx ); const balance_object& vesting_balance_1 = balance_id_type(2)(db); @@ -1149,9 +1149,9 @@ BOOST_AUTO_TEST_CASE( balance_object_test ) // Attempting to claim twice within a day GRAPHENE_CHECK_THROW(db.push_transaction(trx), balance_claim_claimed_too_often); - db.generate_block(db.get_slot_time(1), db.get_scheduled_witness(1).first, init_account_priv_key, skip_flags); + db.generate_block(db.get_slot_time(1), db.get_scheduled_witness(1), init_account_priv_key, skip_flags); slot = db.get_slot_at_time(vesting_balance_1.vesting_policy->begin_timestamp + 60); - db.generate_block(db.get_slot_time(slot), db.get_scheduled_witness(slot).first, init_account_priv_key, skip_flags); + db.generate_block(db.get_slot_time(slot), db.get_scheduled_witness(slot), init_account_priv_key, skip_flags); set_expiration( db, trx ); op.balance_to_claim = vesting_balance_1.id; @@ -1175,9 +1175,9 @@ BOOST_AUTO_TEST_CASE( balance_object_test ) // Attempting to claim twice within a day GRAPHENE_CHECK_THROW(db.push_transaction(trx), balance_claim_claimed_too_often); - db.generate_block(db.get_slot_time(1), db.get_scheduled_witness(1).first, init_account_priv_key, skip_flags); + db.generate_block(db.get_slot_time(1), db.get_scheduled_witness(1), init_account_priv_key, skip_flags); slot = db.get_slot_at_time(db.head_block_time() + fc::days(1)); - db.generate_block(db.get_slot_time(slot), db.get_scheduled_witness(slot).first, init_account_priv_key, skip_flags); + db.generate_block(db.get_slot_time(slot), db.get_scheduled_witness(slot), init_account_priv_key, skip_flags); set_expiration( db, trx ); op.total_claimed = vesting_balance_2.balance; From 6c052294e18f7520469931af973d1a8588f6140a Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Tue, 25 Aug 2015 17:54:04 -0400 Subject: [PATCH 237/353] Remove block randomness and rewrite witness scheduling --- libraries/app/api.cpp | 1 - libraries/chain/db_block.cpp | 21 - libraries/chain/db_init.cpp | 31 +- libraries/chain/db_maint.cpp | 8 +- libraries/chain/db_management.cpp | 1 + libraries/chain/db_update.cpp | 27 +- libraries/chain/db_witness_schedule.cpp | 175 +++----- .../chain/include/graphene/chain/config.hpp | 3 + .../chain/include/graphene/chain/database.hpp | 8 - .../graphene/chain/global_property_object.hpp | 27 +- .../include/graphene/chain/protocol/block.hpp | 5 +- .../include/graphene/chain/protocol/types.hpp | 5 - .../include/graphene/chain/witness_object.hpp | 4 +- .../chain/witness_schedule_object.hpp | 88 ---- .../graphene/chain/witness_scheduler.hpp | 417 ------------------ .../graphene/chain/witness_scheduler_rng.hpp | 124 ------ libraries/wallet/wallet.cpp | 1 - programs/size_checker/main.cpp | 1 + tests/intense/block_tests.cpp | 1 - tests/tests/basic_tests.cpp | 130 ------ tests/tests/block_tests.cpp | 30 +- tests/tests/operation_tests2.cpp | 37 +- 22 files changed, 123 insertions(+), 1022 deletions(-) delete mode 100644 libraries/chain/include/graphene/chain/witness_schedule_object.hpp delete mode 100644 libraries/chain/include/graphene/chain/witness_scheduler.hpp delete mode 100644 libraries/chain/include/graphene/chain/witness_scheduler_rng.hpp diff --git a/libraries/app/api.cpp b/libraries/app/api.cpp index ef7f3a13..a946491d 100644 --- a/libraries/app/api.cpp +++ b/libraries/app/api.cpp @@ -781,7 +781,6 @@ namespace graphene { namespace app { break; } case impl_block_summary_object_type:{ } case impl_account_transaction_history_object_type:{ - } case impl_witness_schedule_object_type: { } case impl_chain_property_object_type: { } } diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index 94b02511..a78fb506 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -267,24 +267,6 @@ signed_block database::_generate_block( _pending_block.timestamp = when; - // Genesis witnesses start with a default initial secret - if( witness_obj.next_secret_hash == secret_hash_type::hash( secret_hash_type() ) ) - { - _pending_block.previous_secret = secret_hash_type(); - } - else - { - secret_hash_type::encoder last_enc; - fc::raw::pack( last_enc, block_signing_private_key ); - fc::raw::pack( last_enc, witness_obj.previous_secret ); - _pending_block.previous_secret = last_enc.result(); - } - - secret_hash_type::encoder next_enc; - fc::raw::pack( next_enc, block_signing_private_key ); - fc::raw::pack( next_enc, _pending_block.previous_secret ); - _pending_block.next_secret_hash = secret_hash_type::hash(next_enc.result()); - _pending_block.transaction_merkle_root = _pending_block.calculate_merkle_root(); _pending_block.witness = witness_id; @@ -404,7 +386,6 @@ void database::_apply_block( const signed_block& next_block ) ++_current_trx_in_block; } - update_witness_schedule(next_block); update_global_dynamic_data(next_block); update_signing_witness(signing_witness, next_block); @@ -555,8 +536,6 @@ const witness_object& database::validate_block_header( uint32_t skip, const sign FC_ASSERT( _pending_block.previous == next_block.previous, "", ("pending.prev",_pending_block.previous)("next.prev",next_block.previous) ); FC_ASSERT( _pending_block.timestamp <= next_block.timestamp, "", ("_pending_block.timestamp",_pending_block.timestamp)("next",next_block.timestamp)("blocknum",next_block.block_num()) ); const witness_object& witness = next_block.witness(*this); - FC_ASSERT( secret_hash_type::hash( next_block.previous_secret ) == witness.next_secret_hash, "", - ("previous_secret", next_block.previous_secret)("next_secret_hash", witness.next_secret_hash)); if( !(skip&skip_witness_signature) ) FC_ASSERT( next_block.validate_signee( witness.signing_key ) ); diff --git a/libraries/chain/db_init.cpp b/libraries/chain/db_init.cpp index 3b7a07f3..3376b2b8 100644 --- a/libraries/chain/db_init.cpp +++ b/libraries/chain/db_init.cpp @@ -30,7 +30,6 @@ #include #include #include -#include #include #include @@ -107,9 +106,6 @@ const uint8_t withdraw_permission_object::type_id; const uint8_t witness_object::space_id; const uint8_t witness_object::type_id; -const uint8_t witness_schedule_object::space_id; -const uint8_t witness_schedule_object::type_id; - const uint8_t worker_object::space_id; const uint8_t worker_object::type_id; @@ -193,7 +189,6 @@ void database::initialize_indexes() add_index< primary_index> >(); add_index< primary_index> >(); add_index< primary_index> >(); - add_index< primary_index> >(); add_index< primary_index > >(); } @@ -317,6 +312,7 @@ void database::init_genesis(const genesis_state_type& genesis_state) p.time = genesis_state.initial_timestamp; p.dynamic_flags = 0; p.witness_budget = 0; + p.recent_slots_filled = fc::uint128::max_value(); }); FC_ASSERT( (genesis_state.immutable_parameters.min_witness_count & 1) == 1, "min_witness_count must be odd" ); @@ -538,31 +534,6 @@ void database::init_genesis(const genesis_state_type& genesis_state) } }); - // Initialize witness schedule -#ifndef NDEBUG - const witness_schedule_object& wso = -#endif - create([&](witness_schedule_object& _wso) - { - memset(_wso.rng_seed.begin(), 0, _wso.rng_seed.size()); - - witness_scheduler_rng rng(_wso.rng_seed.begin(), GRAPHENE_NEAR_SCHEDULE_CTR_IV); - - auto init_witnesses = get_global_properties().active_witnesses; - - _wso.scheduler = witness_scheduler(); - _wso.scheduler._min_token_count = std::max(int(init_witnesses.size()) / 2, 1); - _wso.scheduler.update(init_witnesses); - - for( size_t i=0; i + #include #include @@ -27,7 +29,6 @@ #include #include #include -#include #include namespace graphene { namespace chain { @@ -206,11 +207,6 @@ void database::update_active_witnesses() }); }); - const witness_schedule_object& wso = witness_schedule_id_type()(*this); - modify(wso, [&](witness_schedule_object& _wso) - { - _wso.scheduler.update(gpo.active_witnesses); - }); } FC_CAPTURE_AND_RETHROW() } void database::update_active_committee_members() diff --git a/libraries/chain/db_management.cpp b/libraries/chain/db_management.cpp index 52bc39b0..0a6c75ce 100644 --- a/libraries/chain/db_management.cpp +++ b/libraries/chain/db_management.cpp @@ -22,6 +22,7 @@ #include #include +#include namespace graphene { namespace chain { diff --git a/libraries/chain/db_update.cpp b/libraries/chain/db_update.cpp index ded6a04a..e4f8ab86 100644 --- a/libraries/chain/db_update.cpp +++ b/libraries/chain/db_update.cpp @@ -36,25 +36,18 @@ void database::update_global_dynamic_data( const signed_block& b ) const dynamic_global_property_object& _dgp = dynamic_global_property_id_type(0)(*this); - const auto& global_props = get_global_properties(); - auto delta_time = b.timestamp - _dgp.time; - auto missed_blocks = (delta_time.to_seconds() / global_props.parameters.block_interval) - 1; - if( _dgp.head_block_number == 0 ) - missed_blocks = 0; + uint32_t missed_blocks = get_slot_at_time( b.timestamp ); + assert( missed_blocks != 0 ); + missed_blocks--; // dynamic global properties updating modify( _dgp, [&]( dynamic_global_property_object& dgp ){ - secret_hash_type::encoder enc; - fc::raw::pack( enc, dgp.random ); - fc::raw::pack( enc, b.previous_secret ); - dgp.random = enc.result(); - if( _checkpoints.size() && _checkpoints.rbegin()->first >= b.block_num() ) dgp.recently_missed_count = 0; else if( missed_blocks ) - dgp.recently_missed_count += 4*missed_blocks; - else if( dgp.recently_missed_count > 4 ) - dgp.recently_missed_count -= 3; + dgp.recently_missed_count += GRAPHENE_RECENTLY_MISSED_COUNT_INCREMENT*missed_blocks; + else if( dgp.recently_missed_count > GRAPHENE_RECENTLY_MISSED_COUNT_INCREMENT ) + dgp.recently_missed_count -= GRAPHENE_RECENTLY_MISSED_COUNT_DECREMENT; else if( dgp.recently_missed_count > 0 ) dgp.recently_missed_count--; @@ -62,6 +55,10 @@ void database::update_global_dynamic_data( const signed_block& b ) dgp.head_block_id = b.id(); dgp.time = b.timestamp; dgp.current_witness = b.witness; + dgp.recent_slots_filled = ( + (dgp.recent_slots_filled << 1) + + 1) << missed_blocks; + dgp.current_aslot += missed_blocks+1; }); if( !(get_node_properties().skip_flags & skip_undo_history_check) ) @@ -80,6 +77,7 @@ void database::update_signing_witness(const witness_object& signing_witness, con { const global_property_object& gpo = get_global_properties(); const dynamic_global_property_object& dpo = get_dynamic_global_properties(); + uint64_t new_block_aslot = dpo.current_aslot + get_slot_at_time( new_block.timestamp ); share_type witness_pay = std::min( gpo.parameters.witness_pay_per_block, dpo.witness_budget ); @@ -92,8 +90,7 @@ void database::update_signing_witness(const witness_object& signing_witness, con modify( signing_witness, [&]( witness_object& _wit ) { - _wit.previous_secret = new_block.previous_secret; - _wit.next_secret_hash = new_block.next_secret_hash; + _wit.last_aslot = new_block_aslot; } ); } diff --git a/libraries/chain/db_witness_schedule.cpp b/libraries/chain/db_witness_schedule.cpp index 90aab09e..d12bf69e 100644 --- a/libraries/chain/db_witness_schedule.cpp +++ b/libraries/chain/db_witness_schedule.cpp @@ -15,45 +15,87 @@ * 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. */ +#pragma once #include - #include -#include +#include namespace graphene { namespace chain { -witness_id_type database::get_scheduled_witness(uint32_t slot_num)const +using boost::container::flat_set; + +witness_id_type database::get_scheduled_witness( uint32_t slot_num )const { - if( slot_num == 0 ) - return witness_id_type(); + // + // Each witness gets an arbitration key H(time, witness_id). + // The witness with the smallest key is selected to go first. + // + // As opposed to just using H(time) to determine an index into + // an array of eligible witnesses, this has the following desirable + // properties: + // + // - Avoid dynamic memory allocation + // - Decreases (but does not eliminate) the probability that a + // missed block will change the witness assigned to a future slot + // + // The hash function is xorshift* as given in + // [1] https://en.wikipedia.org/wiki/Xorshift#Xorshift.2A + // - const witness_schedule_object& wso = witness_schedule_id_type()(*this); + const flat_set< witness_id_type >& active_witnesses = get_global_properties().active_witnesses; + uint32_t n = active_witnesses.size(); + uint64_t min_witness_separation = (n / 2)+1; + uint64_t current_aslot = get_dynamic_global_properties().current_aslot + slot_num; - // ask the near scheduler who goes in the given slot - witness_id_type wid; - bool slot_is_near = wso.scheduler.get_slot(slot_num-1, wid); - if( ! slot_is_near ) + uint64_t start_of_current_round_aslot = current_aslot - (current_aslot % n); + uint64_t first_ineligible_aslot = std::min( + start_of_current_round_aslot, current_aslot - min_witness_separation ); + // + // overflow analysis of above subtraction: + // + // we always have min_witness_separation <= n, so + // if current_aslot < min_witness_separation it follows that + // start_of_current_round_aslot == 0 + // + // therefore result of above min() is 0 when subtraction overflows + // + + first_ineligible_aslot = std::max( first_ineligible_aslot, uint64_t( 1 ) ); + + uint64_t best_k = 0; + witness_id_type best_wit; + bool success = false; + + uint64_t now_hi = get_slot_time( slot_num ).sec_since_epoch(); + now_hi <<= 32; + + for( const witness_id_type& wit_id : active_witnesses ) { - // if the near scheduler doesn't know, we have to extend it to - // a far scheduler. - // n.b. instantiating it is slow, but block gaps long enough to - // need it are likely pretty rare. + const witness_object& wit = wit_id(*this); + if( wit.last_aslot >= first_ineligible_aslot ) + continue; - witness_scheduler_rng far_rng(wso.rng_seed.begin(), GRAPHENE_FAR_SCHEDULE_CTR_IV); - - far_future_witness_scheduler far_scheduler = - far_future_witness_scheduler(wso.scheduler, far_rng); - if( !far_scheduler.get_slot(slot_num-1, wid) ) + uint64_t k = now_hi + uint64_t(wit_id); + k ^= (k >> 12); + k ^= (k << 25); + k ^= (k >> 27); + k *= 2685821657736338717ULL; + if( k >= best_k ) { - // no scheduled witness -- somebody set up us the bomb - // n.b. this code path is impossible, the present - // implementation of far_future_witness_scheduler - // returns true unconditionally - assert( false ); + best_k = k; + best_wit = wit_id; + success = true; } } - return wid; + + // the above loop should choose at least 1 because + // at most K elements are susceptible to the filter, + // otherwise we have an inconsistent database (such as + // wit.last_aslot values that are non-unique or in the future) + + assert( success ); + return best_wit; } fc::time_point_sec database::get_slot_time(uint32_t slot_num)const @@ -98,89 +140,10 @@ uint32_t database::get_slot_at_time(fc::time_point_sec when)const return (when - first_slot_time).to_seconds() / block_interval() + 1; } -vector database::get_near_witness_schedule()const -{ - const witness_schedule_object& wso = witness_schedule_id_type()(*this); - - vector result; - result.reserve(wso.scheduler.size()); - uint32_t slot_num = 0; - witness_id_type wid; - - while( wso.scheduler.get_slot(slot_num++, wid) ) - result.emplace_back(wid); - - return result; -} - -void database::update_witness_schedule(const signed_block& next_block) -{ - auto start = fc::time_point::now(); - const global_property_object& gpo = get_global_properties(); - const witness_schedule_object& wso = get(witness_schedule_id_type()); - uint32_t schedule_needs_filled = gpo.active_witnesses.size(); - uint32_t schedule_slot = get_slot_at_time(next_block.timestamp); - - // We shouldn't be able to generate _pending_block with timestamp - // in the past, and incoming blocks from the network with timestamp - // in the past shouldn't be able to make it this far without - // triggering FC_ASSERT elsewhere - - assert( schedule_slot > 0 ); - witness_id_type first_witness; - bool slot_is_near = wso.scheduler.get_slot( schedule_slot-1, first_witness ); - - witness_id_type wit; - - const dynamic_global_property_object& dpo = get_dynamic_global_properties(); - - assert( dpo.random.data_size() == witness_scheduler_rng::seed_length ); - assert( witness_scheduler_rng::seed_length == wso.rng_seed.size() ); - - modify(wso, [&](witness_schedule_object& _wso) - { - _wso.slots_since_genesis += schedule_slot; - witness_scheduler_rng rng(wso.rng_seed.data, _wso.slots_since_genesis); - - _wso.scheduler._min_token_count = std::max(int(gpo.active_witnesses.size()) / 2, 1); - - if( slot_is_near ) - { - uint32_t drain = schedule_slot; - while( drain > 0 ) - { - if( _wso.scheduler.size() == 0 ) - break; - _wso.scheduler.consume_schedule(); - --drain; - } - } - else - { - _wso.scheduler.reset_schedule( first_witness ); - } - while( !_wso.scheduler.get_slot(schedule_needs_filled, wit) ) - { - if( _wso.scheduler.produce_schedule(rng) & emit_turn ) - memcpy(_wso.rng_seed.begin(), dpo.random.data(), dpo.random.data_size()); - } - _wso.last_scheduling_block = next_block.block_num(); - _wso.recent_slots_filled = ( - (_wso.recent_slots_filled << 1) - + 1) << (schedule_slot - 1); - }); - auto end = fc::time_point::now(); - static uint64_t total_time = 0; - static uint64_t calls = 0; - total_time += (end - start).count(); - if( ++calls % 1000 == 0 ) - idump( ( double(total_time/1000000.0)/calls) ); -} - uint32_t database::witness_participation_rate()const { - const witness_schedule_object& wso = get(witness_schedule_id_type()); - return uint64_t(GRAPHENE_100_PERCENT) * wso.recent_slots_filled.popcount() / 128; + const dynamic_global_property_object& dpo = get_dynamic_global_properties(); + return uint64_t(GRAPHENE_100_PERCENT) * dpo.recent_slots_filled.popcount() / 128; } } } diff --git a/libraries/chain/include/graphene/chain/config.hpp b/libraries/chain/include/graphene/chain/config.hpp index f77f7144..38d3db6d 100644 --- a/libraries/chain/include/graphene/chain/config.hpp +++ b/libraries/chain/include/graphene/chain/config.hpp @@ -139,6 +139,9 @@ #define GRAPHENE_MAX_INTEREST_APR uint16_t( 10000 ) +#define GRAPHENE_RECENTLY_MISSED_COUNT_INCREMENT 4 +#define GRAPHENE_RECENTLY_MISSED_COUNT_DECREMENT 3 + /** * Reserved Account IDs with special meaning */ diff --git a/libraries/chain/include/graphene/chain/database.hpp b/libraries/chain/include/graphene/chain/database.hpp index 99df3cb0..ec197889 100644 --- a/libraries/chain/include/graphene/chain/database.hpp +++ b/libraries/chain/include/graphene/chain/database.hpp @@ -244,11 +244,6 @@ namespace graphene { namespace chain { */ uint32_t get_slot_at_time(fc::time_point_sec when)const; - /** - * Get the near schedule. - */ - vector get_near_witness_schedule()const; - //////////////////// db_getter.cpp //////////////////// const chain_id_type& get_chain_id()const; @@ -451,9 +446,6 @@ namespace graphene { namespace chain { void update_maintenance_flag( bool new_maintenance_flag ); void update_withdraw_permissions(); - //////////////////// db_witness_schedule.cpp //////////////////// - void update_witness_schedule(const signed_block& next_block); /// no-op except for scheduling blocks - ///Steps performed only at maintenance intervals ///@{ diff --git a/libraries/chain/include/graphene/chain/global_property_object.hpp b/libraries/chain/include/graphene/chain/global_property_object.hpp index dacb5ce2..c52997fb 100644 --- a/libraries/chain/include/graphene/chain/global_property_object.hpp +++ b/libraries/chain/include/graphene/chain/global_property_object.hpp @@ -42,7 +42,7 @@ namespace graphene { namespace chain { chain_parameters parameters; optional pending_parameters; - uint32_t next_available_vote_id = 0; + uint32_t next_available_vote_id = 0; vector active_committee_members; // updated once per maintenance interval flat_set active_witnesses; // updated once per maintenance interval // n.b. witness scheduling is done by witness_schedule object @@ -64,7 +64,6 @@ namespace graphene { namespace chain { static const uint8_t space_id = implementation_ids; static const uint8_t type_id = impl_dynamic_global_property_object_type; - secret_hash_type random; uint32_t head_block_number = 0; block_id_type head_block_id; time_point_sec time; @@ -74,13 +73,28 @@ namespace graphene { namespace chain { share_type witness_budget; uint32_t accounts_registered_this_interval = 0; /** - * Every time a block is missed this increases by 2, every time a block is found it decreases by 1 it is - * never less than 0 + * Every time a block is missed this increases by + * RECENTLY_MISSED_COUNT_INCREMENT, + * every time a block is found it decreases by + * RECENTLY_MISSED_COUNT_DECREMENT. It is + * never less than 0. * - * If the recently_missed_count hits 2*UNDO_HISTORY then no ew blocks may be pushed. + * If the recently_missed_count hits 2*UNDO_HISTORY then no new blocks may be pushed. */ uint32_t recently_missed_count = 0; + /** + * The current absolute slot number. Equal to the total + * number of slots since genesis. Also equal to the total + * number of missed slots plus head_block_number. + */ + uint64_t current_aslot = 0; + + /** + * used to compute witness participation. + */ + fc::uint128_t recent_slots_filled; + /** * dynamic_flags specifies chain state properties that can be * expressed in one bit. @@ -104,7 +118,6 @@ namespace graphene { namespace chain { }} FC_REFLECT_DERIVED( graphene::chain::dynamic_global_property_object, (graphene::db::object), - (random) (head_block_number) (head_block_id) (time) @@ -113,6 +126,8 @@ FC_REFLECT_DERIVED( graphene::chain::dynamic_global_property_object, (graphene:: (witness_budget) (accounts_registered_this_interval) (recently_missed_count) + (current_aslot) + (recent_slots_filled) (dynamic_flags) ) diff --git a/libraries/chain/include/graphene/chain/protocol/block.hpp b/libraries/chain/include/graphene/chain/protocol/block.hpp index d9e882a1..34b0cfc2 100644 --- a/libraries/chain/include/graphene/chain/protocol/block.hpp +++ b/libraries/chain/include/graphene/chain/protocol/block.hpp @@ -27,8 +27,6 @@ namespace graphene { namespace chain { uint32_t block_num()const { return num_from_id(previous) + 1; } fc::time_point_sec timestamp; witness_id_type witness; - secret_hash_type next_secret_hash; - secret_hash_type previous_secret; checksum_type transaction_merkle_root; extensions_type extensions; @@ -53,7 +51,6 @@ namespace graphene { namespace chain { } } // graphene::chain -FC_REFLECT( graphene::chain::block_header, (previous)(timestamp)(witness) - (next_secret_hash)(previous_secret)(transaction_merkle_root)(extensions) ) +FC_REFLECT( graphene::chain::block_header, (previous)(timestamp)(witness)(transaction_merkle_root)(extensions) ) FC_REFLECT_DERIVED( graphene::chain::signed_block_header, (graphene::chain::block_header), (witness_signature) ) FC_REFLECT_DERIVED( graphene::chain::signed_block, (graphene::chain::signed_block_header), (transactions) ) diff --git a/libraries/chain/include/graphene/chain/protocol/types.hpp b/libraries/chain/include/graphene/chain/protocol/types.hpp index af8a2ace..17b4049c 100644 --- a/libraries/chain/include/graphene/chain/protocol/types.hpp +++ b/libraries/chain/include/graphene/chain/protocol/types.hpp @@ -140,7 +140,6 @@ namespace graphene { namespace chain { impl_transaction_object_type, impl_block_summary_object_type, impl_account_transaction_history_object_type, - impl_witness_schedule_object_type, impl_blinded_balance_object_type, impl_chain_property_object_type }; @@ -165,7 +164,6 @@ namespace graphene { namespace chain { class operation_history_object; class withdraw_permission_object; class vesting_balance_object; - class witness_schedule_object; class worker_object; class balance_object; @@ -209,7 +207,6 @@ namespace graphene { namespace chain { typedef object_id< implementation_ids, impl_account_transaction_history_object_type, account_transaction_history_object> account_transaction_history_id_type; - typedef object_id< implementation_ids, impl_witness_schedule_object_type, witness_schedule_object > witness_schedule_id_type; typedef object_id< implementation_ids, impl_chain_property_object_type, chain_property_object> chain_property_id_type; typedef fc::array symbol_type; @@ -286,7 +283,6 @@ FC_REFLECT_ENUM( graphene::chain::impl_object_type, (impl_transaction_object_type) (impl_block_summary_object_type) (impl_account_transaction_history_object_type) - (impl_witness_schedule_object_type) (impl_blinded_balance_object_type) (impl_chain_property_object_type) ) @@ -317,7 +313,6 @@ FC_REFLECT_TYPENAME( graphene::chain::account_statistics_id_type ) FC_REFLECT_TYPENAME( graphene::chain::transaction_obj_id_type ) FC_REFLECT_TYPENAME( graphene::chain::block_summary_id_type ) FC_REFLECT_TYPENAME( graphene::chain::account_transaction_history_id_type ) -FC_REFLECT_TYPENAME( graphene::chain::witness_schedule_id_type ) FC_REFLECT( graphene::chain::void_t, ) FC_REFLECT_ENUM( graphene::chain::asset_issuer_permission_flags, (charge_market_fee)(white_list)(transfer_restricted)(override_authority)(disable_force_settle)(global_settle)(disable_confidential) ) diff --git a/libraries/chain/include/graphene/chain/witness_object.hpp b/libraries/chain/include/graphene/chain/witness_object.hpp index 17b94ed5..0576df6c 100644 --- a/libraries/chain/include/graphene/chain/witness_object.hpp +++ b/libraries/chain/include/graphene/chain/witness_object.hpp @@ -32,6 +32,7 @@ namespace graphene { namespace chain { static const uint8_t type_id = witness_object_type; account_id_type witness_account; + uint64_t last_aslot = 0; public_key_type signing_key; secret_hash_type next_secret_hash; secret_hash_type previous_secret; @@ -64,9 +65,8 @@ namespace graphene { namespace chain { FC_REFLECT_DERIVED( graphene::chain::witness_object, (graphene::db::object), (witness_account) + (last_aslot) (signing_key) - (next_secret_hash) - (previous_secret) (pay_vb) (vote_id) (total_votes) diff --git a/libraries/chain/include/graphene/chain/witness_schedule_object.hpp b/libraries/chain/include/graphene/chain/witness_schedule_object.hpp deleted file mode 100644 index cd11ebca..00000000 --- a/libraries/chain/include/graphene/chain/witness_schedule_object.hpp +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (c) 2015, Cryptonomex, Inc. - * All rights reserved. - * - * This source code is provided for evaluation in private test networks only, until September 8, 2015. After this date, this license expires and - * the code may not be used, modified or distributed for any purpose. Redistribution and use in source and binary forms, with or without modification, - * are permitted until September 8, 2015, provided that the following conditions are met: - * - * 1. The code and/or derivative works are used only for private test networks consisting of no more than 10 P2P nodes. - * - * 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. - */ -#pragma once - -// needed to serialize witness_scheduler -#include -#include - -#include -#include -#include - -namespace graphene { namespace chain { - -typedef hash_ctr_rng< - /* HashClass = */ fc::sha256, - /* SeedLength = */ GRAPHENE_RNG_SEED_LENGTH - > witness_scheduler_rng; - -typedef generic_witness_scheduler< - /* WitnessID = */ witness_id_type, - /* RNG = */ witness_scheduler_rng, - /* CountType = */ decltype( chain_parameters::maximum_witness_count ), - /* OffsetType = */ uint32_t, - /* debug = */ true - > witness_scheduler; - -typedef generic_far_future_witness_scheduler< - /* WitnessID = */ witness_id_type, - /* RNG = */ witness_scheduler_rng, - /* CountType = */ decltype( chain_parameters::maximum_witness_count ), - /* OffsetType = */ uint32_t, - /* debug = */ true - > far_future_witness_scheduler; - -class witness_schedule_object : public abstract_object -{ - public: - static const uint8_t space_id = implementation_ids; - static const uint8_t type_id = impl_witness_schedule_object_type; - - witness_scheduler scheduler; - uint32_t last_scheduling_block; - uint64_t slots_since_genesis = 0; - fc::array< char, sizeof(secret_hash_type) > rng_seed; - - /** - * Not necessary for consensus, but used for figuring out the participation rate. - * The nth bit is 0 if the nth slot was unfilled, else it is 1. - */ - fc::uint128 recent_slots_filled; -}; - -} } - -FC_REFLECT( graphene::chain::witness_scheduler, - (_turns) - (_tokens) - (_min_token_count) - (_ineligible_waiting_for_token) - (_ineligible_no_turn) - (_eligible) - (_schedule) - (_lame_duck) - ) - -FC_REFLECT_DERIVED( graphene::chain::witness_schedule_object, (graphene::chain::object), - (scheduler) - (last_scheduling_block) - (slots_since_genesis) - (rng_seed) - (recent_slots_filled) - ) diff --git a/libraries/chain/include/graphene/chain/witness_scheduler.hpp b/libraries/chain/include/graphene/chain/witness_scheduler.hpp deleted file mode 100644 index 5feef417..00000000 --- a/libraries/chain/include/graphene/chain/witness_scheduler.hpp +++ /dev/null @@ -1,417 +0,0 @@ -/* - * Copyright (c) 2015, Cryptonomex, Inc. - * All rights reserved. - * - * This source code is provided for evaluation in private test networks only, until September 8, 2015. After this date, this license expires and - * the code may not be used, modified or distributed for any purpose. Redistribution and use in source and binary forms, with or without modification, - * are permitted until September 8, 2015, provided that the following conditions are met: - * - * 1. The code and/or derivative works are used only for private test networks consisting of no more than 10 P2P nodes. - * - * 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. - */ -#pragma once - -#include -#include -#include -#include - -#include - -namespace graphene { namespace chain { - -//using boost::container::flat_set; - -enum witness_scheduler_relax_flags -{ - emit_turn = 0x01, - emit_token = 0x02 -}; - -template< typename WitnessID, typename RNG, typename CountType, typename OffsetType, bool debug = true > -class generic_witness_scheduler -{ - public: - void check_invariant() const - { -#ifndef NDEBUG - CountType tokens = _ineligible_no_turn.size() + _eligible.size(); - CountType turns = _eligible.size(); - for( const std::pair< WitnessID, bool >& item : _ineligible_waiting_for_token ) - turns += (item.second ? 1 : 0 ); - - assert( _tokens == tokens ); - assert( _turns == turns ); -#endif - - set< WitnessID > witness_set; - // make sure each witness_id occurs only once among the three states - auto process_id = [&]( WitnessID item ) - { - assert( witness_set.find( item ) == witness_set.end() ); - witness_set.insert( item ); - } ; - - for( const std::pair< WitnessID, bool >& item : _ineligible_waiting_for_token ) - process_id( item.first ); - for( const WitnessID& item : _ineligible_no_turn ) - process_id( item ); - for( const WitnessID& item : _eligible ) - process_id( item ); - return; - } - - /** - * Deterministically evolve over time - */ - uint32_t relax() - { - uint32_t relax_flags = 0; - - if( debug ) check_invariant(); - assert( _min_token_count > 0 ); - - // turn distribution - if( _turns == 0 ) - { - relax_flags |= emit_turn; - for( const WitnessID& item : _ineligible_no_turn ) - _eligible.push_back( item ); - _turns += _ineligible_no_turn.size(); - _ineligible_no_turn.clear(); - if( debug ) check_invariant(); - - for( std::pair< WitnessID, bool >& item : _ineligible_waiting_for_token ) - { - assert( item.second == false ); - item.second = true; - } - _turns += _ineligible_waiting_for_token.size(); - if( debug ) check_invariant(); - } - - // token distribution - while( true ) - { - if( _ineligible_waiting_for_token.empty() ) - { - // eligible must be non-empty - assert( !_eligible.empty() ); - return relax_flags; - } - - if( _tokens >= _min_token_count ) - { - if( !_eligible.empty() ) - return relax_flags; - } - - const std::pair< WitnessID, bool >& item = _ineligible_waiting_for_token.front(); - if( item.second ) - _eligible.push_back( item.first ); - else - _ineligible_no_turn.push_back( item.first ); - _ineligible_waiting_for_token.pop_front(); - relax_flags |= emit_token; - _tokens++; - if( debug ) check_invariant(); - } - - return relax_flags; - } - - /** - * Add another element to _schedule - */ - uint32_t produce_schedule( RNG& rng ) - { - uint32_t relax_flags = relax(); - if( debug ) check_invariant(); - if( _eligible.empty() ) - return relax_flags; - - decltype( rng( _eligible.size() ) ) pos = rng( _eligible.size() ); - assert( (pos >= 0) && (pos < _eligible.size()) ); - auto it = _eligible.begin() + pos; - _schedule.push_back( *it ); - _ineligible_waiting_for_token.emplace_back( *it, false ); - _eligible.erase( it ); - _turns--; - _tokens--; - if( debug ) check_invariant(); - return relax_flags; - } - - /** - * Pull an element from _schedule - */ - WitnessID consume_schedule() - { - assert( _schedule.size() > 0 ); - - WitnessID result = _schedule.front(); - _schedule.pop_front(); - - auto it = _lame_duck.find( result ); - if( it != _lame_duck.end() ) - _lame_duck.erase( it ); - if( debug ) check_invariant(); - return result; - } - - /** - * Remove all witnesses in the removal_set from - * future scheduling (but not from the current schedule). - */ - template< typename T > - void remove_all( const T& removal_set ) - { - if( debug ) check_invariant(); - - _ineligible_waiting_for_token.erase( - std::remove_if( - _ineligible_waiting_for_token.begin(), - _ineligible_waiting_for_token.end(), - [&]( const std::pair< WitnessID, bool >& item ) -> bool - { - bool found = removal_set.find( item.first ) != removal_set.end(); - _turns -= (found & item.second) ? 1 : 0; - return found; - } ), - _ineligible_waiting_for_token.end() ); - if( debug ) check_invariant(); - - _ineligible_no_turn.erase( - std::remove_if( - _ineligible_no_turn.begin(), - _ineligible_no_turn.end(), - [&]( WitnessID item ) -> bool - { - bool found = (removal_set.find( item ) != removal_set.end()); - _tokens -= (found ? 1 : 0); - return found; - } ), - _ineligible_no_turn.end() ); - if( debug ) check_invariant(); - - _eligible.erase( - std::remove_if( - _eligible.begin(), - _eligible.end(), - [&]( WitnessID item ) -> bool - { - bool found = (removal_set.find( item ) != removal_set.end()); - _tokens -= (found ? 1 : 0); - _turns -= (found ? 1 : 0); - return found; - } ), - _eligible.end() ); - if( debug ) check_invariant(); - - return; - } - - /** - * Convenience function to call insert_all() and remove_all() - * as needed to update to the given revised_set. - */ - template< typename T > - void insert_all( const T& insertion_set ) - { - if( debug ) check_invariant(); - for( const WitnessID wid : insertion_set ) - { - _eligible.push_back( wid ); - } - _turns += insertion_set.size(); - _tokens += insertion_set.size(); - if( debug ) check_invariant(); - return; - } - - /** - * Convenience function to call insert_all() and remove_all() - * as needed to update to the given revised_set. - * - * This function calls find() on revised_set for all current - * witnesses. Running time is O(n*log(n)) if the revised_set - * implementation of find() is O(log(n)). - * - * TODO: Rewriting to use std::set_difference may marginally - * increase efficiency, but a benchmark is needed to justify this. - */ - template< typename T > - void update( const T& revised_set ) - { - set< WitnessID > current_set; - set< WitnessID > schedule_set; - - /* current_set.reserve( - _ineligible_waiting_for_token.size() - + _ineligible_no_turn.size() - + _eligible.size() - + _schedule.size() ); - */ - for( const auto& item : _ineligible_waiting_for_token ) - current_set.insert( item.first ); - for( const WitnessID& item : _ineligible_no_turn ) - current_set.insert( item ); - for( const WitnessID& item : _eligible ) - current_set.insert( item ); - for( const WitnessID& item : _schedule ) - { - current_set.insert( item ); - schedule_set.insert( item ); - } - - set< WitnessID > insertion_set; - //insertion_set.reserve( revised_set.size() ); - for( const WitnessID& item : revised_set ) - { - if( current_set.find( item ) == current_set.end() ) - insertion_set.insert( item ); - } - - set< WitnessID > removal_set; - //removal_set.reserve( current_set.size() ); - for( const WitnessID& item : current_set ) - { - if( revised_set.find( item ) == revised_set.end() ) - { - if( schedule_set.find( item ) == schedule_set.end() ) - removal_set.insert( item ); - else - _lame_duck.insert( item ); - } - } - - insert_all( insertion_set ); - remove_all( removal_set ); - - return; - } - - /** - * Get the number of scheduled witnesses - */ - - size_t size( )const - { - return _schedule.size(); - } - - bool get_slot( OffsetType offset, WitnessID& wit )const - { - if( offset >= _schedule.size() ) - return false; - wit = _schedule[ offset ]; - return true; - } - - /** - * Reset the schedule, then re-schedule the given witness as the - * first witness. - */ - void reset_schedule( WitnessID first_witness ) - { - _schedule.clear(); - for( const WitnessID& wid : _ineligible_no_turn ) - { - _eligible.push_back( wid ); - } - _turns += _ineligible_no_turn.size(); - _ineligible_no_turn.clear(); - for( const auto& item : _ineligible_waiting_for_token ) - { - _eligible.push_back( item.first ); - _turns += (item.second ? 0 : 1); - } - _tokens += _ineligible_waiting_for_token.size(); - _ineligible_waiting_for_token.clear(); - if( debug ) check_invariant(); - - auto it = std::find( _eligible.begin(), _eligible.end(), first_witness ); - assert( it != _eligible.end() ); - - _schedule.push_back( *it ); - _ineligible_waiting_for_token.emplace_back( *it, false ); - _eligible.erase( it ); - _turns--; - _tokens--; - if( debug ) check_invariant(); - return; - } - - // keep track of total turns / tokens in existence - CountType _turns = 0; - CountType _tokens = 0; - - // new tokens handed out when _tokens < _min_token_count - CountType _min_token_count; - - // WitnessID appears in exactly one of the following: - // has no token; second indicates whether we have a turn or not: - std::deque < std::pair< WitnessID, bool > > _ineligible_waiting_for_token; // ".." | "T." - // has token, but no turn - std::vector< WitnessID > _ineligible_no_turn; // ".t" - // has token and turn - std::vector< WitnessID > _eligible; // "Tt" - - // scheduled - std::deque < WitnessID > _schedule; - - // in _schedule, but not to be replaced - set< WitnessID > _lame_duck; -}; - -template< typename WitnessID, typename RNG, typename CountType, typename OffsetType, bool debug = true > -class generic_far_future_witness_scheduler -{ - public: - generic_far_future_witness_scheduler( - const generic_witness_scheduler< WitnessID, RNG, CountType, OffsetType, debug >& base_scheduler, - RNG rng - ) - { - generic_witness_scheduler< WitnessID, RNG, CountType, OffsetType, debug > extended_scheduler = base_scheduler; - _begin_offset = base_scheduler.size()+1; - while( (extended_scheduler.produce_schedule( rng ) & emit_turn) == 0 ) - _begin_offset++; - assert( _begin_offset == extended_scheduler.size() ); - - _end_offset = _begin_offset; - while( (extended_scheduler.produce_schedule( rng ) & emit_turn) == 0 ) - _end_offset++; - assert( _end_offset == extended_scheduler.size()-1 ); - _schedule.resize( extended_scheduler._schedule.size() ); - std::copy( extended_scheduler._schedule.begin(), - extended_scheduler._schedule.end(), - _schedule.begin() ); - return; - } - - bool get_slot( OffsetType offset, WitnessID& wit )const - { - if( offset <= _end_offset ) - wit = _schedule[ offset ]; - else - wit = _schedule[ _begin_offset + - ( - (offset - _begin_offset) % - (_end_offset + 1 - _begin_offset) - ) ]; - return true; - } - - std::vector< WitnessID > _schedule; - OffsetType _begin_offset; - OffsetType _end_offset; -}; - -} } diff --git a/libraries/chain/include/graphene/chain/witness_scheduler_rng.hpp b/libraries/chain/include/graphene/chain/witness_scheduler_rng.hpp deleted file mode 100644 index e7467010..00000000 --- a/libraries/chain/include/graphene/chain/witness_scheduler_rng.hpp +++ /dev/null @@ -1,124 +0,0 @@ -/* - * Copyright (c) 2015, Cryptonomex, Inc. - * All rights reserved. - * - * This source code is provided for evaluation in private test networks only, until September 8, 2015. After this date, this license expires and - * the code may not be used, modified or distributed for any purpose. Redistribution and use in source and binary forms, with or without modification, - * are permitted until September 8, 2015, provided that the following conditions are met: - * - * 1. The code and/or derivative works are used only for private test networks consisting of no more than 10 P2P nodes. - * - * 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. - */ -#pragma once - -#include - -namespace graphene { namespace chain { - -/** - * Always returns 0. Useful for testing. - */ -class nullary_rng -{ - public: - nullary_rng() {} - virtual ~nullary_rng() {} - - template< typename T > T operator()( T max ) - { return T(0); } -} ; - -/** - * The sha256_ctr_rng generates bits using SHA256 in counter (CTR) - * mode. - */ -template< class HashClass, int SeedLength=sizeof(secret_hash_type) > -class hash_ctr_rng -{ - public: - hash_ctr_rng( const char* seed, uint64_t counter = 0 ) - : _counter( counter ), _current_offset( 0 ) - { - memcpy( _seed, seed, SeedLength ); - _reset_current_value(); - return; - } - - virtual ~hash_ctr_rng() {} - - uint64_t get_bits( uint8_t count ) - { - uint64_t result = 0; - uint64_t mask = 1; - // grab the requested number of bits - while( count > 0 ) - { - result |= - ( - ( - ( - _current_value.data()[ (_current_offset >> 3) & 0x1F ] - & ( 1 << (_current_offset & 0x07) ) - ) - != 0 - ) ? mask : 0 - ); - mask += mask; - --count; - ++_current_offset; - if( _current_offset == (_current_value.data_size() << 3) ) - { - _counter++; - _current_offset = 0; - _reset_current_value(); - } - } - return result; - } - - uint64_t operator()( uint64_t bound ) - { - if( bound <= 1 ) - return 0; - uint8_t bitcount = boost::multiprecision::detail::find_msb( bound ) + 1; - - // probability of loop exiting is >= 1/2, so probability of - // running N times is bounded above by (1/2)^N - while( true ) - { - uint64_t result = get_bits( bitcount ); - if( result < bound ) - return result; - } - } - - // convenience method which does casting for types other than uint64_t - template< typename T > T operator()( T bound ) - { return (T) ( (*this)(uint64_t( bound )) ); } - - void _reset_current_value() - { - // internal implementation detail, called to update - // _current_value when _counter changes - typename HashClass::encoder enc; - enc.write( _seed , SeedLength ); - enc.write( (char *) &_counter, 8 ); - _current_value = enc.result(); - return; - } - - uint64_t _counter; - char _seed[ SeedLength ]; - HashClass _current_value; - uint16_t _current_offset; - - static const int seed_length = SeedLength; -} ; - -} } diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp index a7567c57..47aeed33 100644 --- a/libraries/wallet/wallet.cpp +++ b/libraries/wallet/wallet.cpp @@ -478,7 +478,6 @@ public: result["chain_id"] = chain_props.chain_id; result["active_witnesses"] = global_props.active_witnesses; result["active_committee_members"] = global_props.active_committee_members; - result["entropy"] = dynamic_props.random; return result; } chain_property_object get_chain_properties() const diff --git a/programs/size_checker/main.cpp b/programs/size_checker/main.cpp index 5950f6aa..9ef4420a 100644 --- a/programs/size_checker/main.cpp +++ b/programs/size_checker/main.cpp @@ -85,6 +85,7 @@ int main( int argc, char** argv ) std::cout << "\n"; } std::cout << "]\n"; + std::cerr << "Size of block header: " << sizeof( block_header ) << " " << fc::raw::pack_size( block_header() ) << "\n"; } catch ( const fc::exception& e ){ edump((e.to_detail_string())); } idump((sizeof(signed_block))); diff --git a/tests/intense/block_tests.cpp b/tests/intense/block_tests.cpp index fd77132e..7e975537 100644 --- a/tests/intense/block_tests.cpp +++ b/tests/intense/block_tests.cpp @@ -25,7 +25,6 @@ #include #include #include -#include #include #include diff --git a/tests/tests/basic_tests.cpp b/tests/tests/basic_tests.cpp index 8b92ec4e..e016571b 100644 --- a/tests/tests/basic_tests.cpp +++ b/tests/tests/basic_tests.cpp @@ -23,7 +23,6 @@ #include #include -#include #include #include @@ -166,7 +165,6 @@ BOOST_AUTO_TEST_CASE( price_test ) BOOST_CHECK(dummy == dummy2); } - BOOST_AUTO_TEST_CASE( memo_test ) { try { memo_data m; @@ -186,134 +184,6 @@ BOOST_AUTO_TEST_CASE( memo_test ) BOOST_CHECK_EQUAL(m.get_message(receiver, sender.get_public_key()), "Hello, world!"); } FC_LOG_AND_RETHROW() } -BOOST_AUTO_TEST_CASE( witness_rng_test_bits ) -{ - try - { - const uint64_t COUNT = 131072; - const uint64_t HASH_SIZE = 32; - string ref_bits = ""; - ref_bits.reserve( COUNT * HASH_SIZE ); - static const char seed_data[] = "\xe3\xb0\xc4\x42\x98\xfc\x1c\x14\x9a\xfb\xf4\xc8\x99\x6f\xb9\x24\x27\xae\x41\xe4\x64\x9b\x93\x4c\xa4\x95\x99\x1b\x78\x52\xb8\x55"; - - for( uint64_t i=0; i> 0x08) & 0xFF) ); - enc.put( char((i >> 0x10) & 0xFF) ); - enc.put( char((i >> 0x18) & 0xFF) ); - enc.put( char((i >> 0x20) & 0xFF) ); - enc.put( char((i >> 0x28) & 0xFF) ); - enc.put( char((i >> 0x30) & 0xFF) ); - enc.put( char((i >> 0x38) & 0xFF) ); - - fc::sha256 result = enc.result(); - auto result_data = result.data(); - std::copy( result_data, result_data+HASH_SIZE, std::back_inserter( ref_bits ) ); - } - - fc::sha256 seed = fc::sha256::hash( string("") ); - // seed = sha256("") = e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - BOOST_CHECK( memcmp( seed.data(), seed_data, HASH_SIZE ) == 0 ); - - hash_ctr_rng< fc::sha256, 32 > test_rng(seed.data(), 0); - // python2 -c 'import hashlib; import struct; h = lambda x : hashlib.sha256(x).digest(); i = lambda x : struct.pack(" uint64_t - { - uint64_t result = 0; - uint64_t i = ref_get_bits_offset; - uint64_t mask = 1; - while( count > 0 ) - { - if( ref_bits[ i >> 3 ] & (1 << (i & 7)) ) - result |= mask; - mask += mask; - i++; - count--; - } - ref_get_bits_offset = i; - return result; - }; - - // use PRNG to decide between 0-64 bits - std::minstd_rand rng; - rng.seed( 9999 ); - std::uniform_int_distribution< uint16_t > bit_dist( 0, 64 ); - for( int i=0; i<10000; i++ ) - { - uint8_t bit_count = bit_dist( rng ); - uint64_t ref_bits = ref_get_bits( bit_count ); - uint64_t test_bits = test_rng.get_bits( bit_count ); - //std::cout << i << ": get(" << int(bit_count) << ") -> " << test_bits << " (expect " << ref_bits << ")\n"; - if( bit_count < 64 ) - { - BOOST_CHECK( ref_bits < (uint64_t( 1 ) << bit_count ) ); - BOOST_CHECK( test_bits < (uint64_t( 1 ) << bit_count ) ); - } - BOOST_CHECK( ref_bits == test_bits ); - if( ref_bits != test_bits ) - break; - } - - std::uniform_int_distribution< uint64_t > whole_dist( - 0, std::numeric_limits::max() ); - for( int i=0; i<10000; i++ ) - { - uint8_t bit_count = bit_dist( rng ); - uint64_t bound = whole_dist( rng ) & ((uint64_t(1) << bit_count) - 1); - //std::cout << "bound:" << bound << "\n"; - uint64_t rnum = test_rng( bound ); - //std::cout << "rnum:" << rnum << "\n"; - if( bound > 1 ) - { - BOOST_CHECK( rnum < bound ); - } - else - { - BOOST_CHECK( rnum == 0 ); - } - } - - } FC_LOG_AND_RETHROW() -} - BOOST_AUTO_TEST_CASE( exceptions ) { GRAPHENE_CHECK_THROW(FC_THROW_EXCEPTION(balance_claim_invalid_claim_amount, "Etc"), balance_claim_invalid_claim_amount); diff --git a/tests/tests/block_tests.cpp b/tests/tests/block_tests.cpp index d8301856..e6677213 100644 --- a/tests/tests/block_tests.cpp +++ b/tests/tests/block_tests.cpp @@ -25,7 +25,6 @@ #include #include #include -#include #include @@ -644,7 +643,6 @@ BOOST_FIXTURE_TEST_CASE( maintenance_interval, database_fixture ) initial_properties.parameters.maximum_transaction_size); BOOST_CHECK_EQUAL(db.get_dynamic_global_properties().next_maintenance_time.sec_since_epoch(), db.head_block_time().sec_since_epoch() + db.get_global_properties().parameters.block_interval); - // shuffling is now handled by the witness_schedule_object. BOOST_CHECK(db.get_global_properties().active_witnesses == initial_properties.active_witnesses); BOOST_CHECK(db.get_global_properties().active_committee_members == initial_properties.active_committee_members); @@ -870,32 +868,6 @@ BOOST_FIXTURE_TEST_CASE( pop_block_twice, database_fixture ) } } -BOOST_FIXTURE_TEST_CASE( witness_scheduler_missed_blocks, database_fixture ) -{ try { - db.get_near_witness_schedule(); - generate_block(); - auto near_schedule = db.get_near_witness_schedule(); - - std::for_each(near_schedule.begin(), near_schedule.end(), [&](witness_id_type id) { - generate_block(0); - BOOST_CHECK(db.get_dynamic_global_properties().current_witness == id); - }); - - near_schedule = db.get_near_witness_schedule(); - generate_block(0, init_account_priv_key, 2); - BOOST_CHECK(db.get_dynamic_global_properties().current_witness == near_schedule[2]); - - near_schedule.erase(near_schedule.begin(), near_schedule.begin() + 3); - auto new_schedule = db.get_near_witness_schedule(); - new_schedule.erase(new_schedule.end() - 3, new_schedule.end()); - BOOST_CHECK(new_schedule == near_schedule); - - std::for_each(near_schedule.begin(), near_schedule.end(), [&](witness_id_type id) { - generate_block(0); - BOOST_CHECK(db.get_dynamic_global_properties().current_witness == id); - }); -} FC_LOG_AND_RETHROW() } - BOOST_FIXTURE_TEST_CASE( rsf_missed_blocks, database_fixture ) { try @@ -904,7 +876,7 @@ BOOST_FIXTURE_TEST_CASE( rsf_missed_blocks, database_fixture ) auto rsf = [&]() -> string { - fc::uint128 rsf = db.get( witness_schedule_id_type() ).recent_slots_filled; + fc::uint128 rsf = db.get_dynamic_global_properties().recent_slots_filled; string result = ""; result.reserve(128); for( int i=0; i<128; i++ ) diff --git a/tests/tests/operation_tests2.cpp b/tests/tests/operation_tests2.cpp index 59c34c92..925c8a8d 100644 --- a/tests/tests/operation_tests2.cpp +++ b/tests/tests/operation_tests2.cpp @@ -443,34 +443,15 @@ BOOST_AUTO_TEST_CASE( witness_create ) auto itr = std::find(witnesses.begin(), witnesses.end(), nathan_witness_id); BOOST_CHECK(itr != witnesses.end()); - generate_blocks(witnesses.size()); - - // make sure we're scheduled to produce - vector near_witnesses = db.get_near_witness_schedule(); - BOOST_CHECK( std::find( near_witnesses.begin(), near_witnesses.end(), nathan_witness_id ) - != near_witnesses.end() ); - - struct generator_helper { - database_fixture& f; - witness_id_type nathan_id; - fc::ecc::private_key nathan_key; - bool nathan_generated_block; - - void operator()(witness_id_type id) { - if( id == nathan_id ) - { - nathan_generated_block = true; - f.generate_block(0, nathan_key); - } else - f.generate_block(0); - BOOST_CHECK_EQUAL(f.db.get_dynamic_global_properties().current_witness.instance.value, id.instance.value); - f.db.get_near_witness_schedule(); - } - }; - - generator_helper h = std::for_each(near_witnesses.begin(), near_witnesses.end(), - generator_helper{*this, nathan_witness_id, nathan_private_key, false}); - BOOST_CHECK(h.nathan_generated_block); + int produced = 0; + // Make sure we get scheduled exactly once in witnesses.size() blocks + // TODO: intense_test that repeats this loop many times + for( size_t i=0; i Date: Tue, 25 Aug 2015 18:32:04 -0400 Subject: [PATCH 238/353] genesis: Set aside some low ID's for future special accounts and assets #230 --- libraries/chain/db_init.cpp | 47 ++++++++++++++++++- .../chain/immutable_chain_parameters.hpp | 4 ++ 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/libraries/chain/db_init.cpp b/libraries/chain/db_init.cpp index 3376b2b8..42aebdbd 100644 --- a/libraries/chain/db_init.cpp +++ b/libraries/chain/db_init.cpp @@ -275,6 +275,26 @@ void database::init_genesis(const genesis_state_type& genesis_state) a.lifetime_referrer_fee_percentage = GRAPHENE_100_PERCENT - GRAPHENE_DEFAULT_NETWORK_PERCENT_OF_FEE; }).get_id() == GRAPHENE_TEMP_ACCOUNT); + // Create more special accounts + while( true ) + { + uint64_t id = get_index().get_next_id().instance(); + if( id >= genesis_state.immutable_parameters.num_special_accounts ) + break; + const account_object& acct = create([&](account_object& a) { + a.name = "special-account-" + std::to_string(id); + a.statistics = create([&](account_statistics_object& s){s.owner = a.id;}).id; + a.owner.weight_threshold = 1; + a.active.weight_threshold = 1; + a.registrar = a.lifetime_referrer = a.referrer = id; + a.membership_expiration_date = time_point_sec::maximum(); + a.network_fee_percentage = GRAPHENE_DEFAULT_NETWORK_PERCENT_OF_FEE; + a.lifetime_referrer_fee_percentage = GRAPHENE_100_PERCENT - GRAPHENE_DEFAULT_NETWORK_PERCENT_OF_FEE; + }); + FC_ASSERT( acct.get_id() == account_id_type(id) ); + remove( acct ); + } + // Create core asset const asset_dynamic_data_object& dyn_asset = create([&](asset_dynamic_data_object& a) { @@ -296,7 +316,32 @@ void database::init_genesis(const genesis_state_type& genesis_state) }); assert( asset_id_type(core_asset.id) == asset().asset_id ); assert( get_balance(account_id_type(), asset_id_type()) == asset(dyn_asset.current_supply) ); - (void)core_asset; + // Create more special assets + while( true ) + { + const asset_dynamic_data_object& dyn_asset = + create([&](asset_dynamic_data_object& a) { + a.current_supply = 0; + }); + uint64_t id = get_index().get_next_id().instance(); + if( id >= genesis_state.immutable_parameters.num_special_assets ) + break; + const asset_object& asset_obj = create( [&]( asset_object& a ) { + a.symbol = "SPECIAL" + std::to_string( id ); + a.options.max_supply = 0; + a.precision = GRAPHENE_BLOCKCHAIN_PRECISION_DIGITS; + a.options.flags = 0; + a.options.issuer_permissions = 0; + a.issuer = GRAPHENE_NULL_ACCOUNT; + a.options.core_exchange_rate.base.amount = 1; + a.options.core_exchange_rate.base.asset_id = 0; + a.options.core_exchange_rate.quote.amount = 1; + a.options.core_exchange_rate.quote.asset_id = 0; + a.dynamic_asset_data_id = dyn_asset.id; + }); + FC_ASSERT( asset_obj.get_id() == asset_id_type(id) ); + remove( asset_obj ); + } chain_id_type chain_id = genesis_state.compute_chain_id(); diff --git a/libraries/chain/include/graphene/chain/immutable_chain_parameters.hpp b/libraries/chain/include/graphene/chain/immutable_chain_parameters.hpp index 46bfa934..2c63dc1b 100644 --- a/libraries/chain/include/graphene/chain/immutable_chain_parameters.hpp +++ b/libraries/chain/include/graphene/chain/immutable_chain_parameters.hpp @@ -29,6 +29,8 @@ struct immutable_chain_parameters { uint16_t min_committee_member_count = GRAPHENE_DEFAULT_MIN_COMMITTEE_MEMBER_COUNT; uint16_t min_witness_count = GRAPHENE_DEFAULT_MIN_WITNESS_COUNT; + uint32_t num_special_accounts = 0; + uint32_t num_special_assets = 0; }; } } // graphene::chain @@ -36,4 +38,6 @@ struct immutable_chain_parameters FC_REFLECT( graphene::chain::immutable_chain_parameters, (min_committee_member_count) (min_witness_count) + (num_special_accounts) + (num_special_assets) ) From 0ae94f88d4a19c5ae04808d175435e1e3af45a36 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 26 Aug 2015 14:56:20 -0400 Subject: [PATCH 239/353] operation_tests2.cpp: Fix production check in witness_create --- tests/tests/operation_tests2.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/tests/operation_tests2.cpp b/tests/tests/operation_tests2.cpp index 925c8a8d..dd40976b 100644 --- a/tests/tests/operation_tests2.cpp +++ b/tests/tests/operation_tests2.cpp @@ -443,12 +443,17 @@ BOOST_AUTO_TEST_CASE( witness_create ) auto itr = std::find(witnesses.begin(), witnesses.end(), nathan_witness_id); BOOST_CHECK(itr != witnesses.end()); + // generate blocks until we are at the beginning of a round + while( ((db.get_dynamic_global_properties().current_aslot + 1) % witnesses.size()) != 0 ) + generate_block(); + int produced = 0; // Make sure we get scheduled exactly once in witnesses.size() blocks // TODO: intense_test that repeats this loop many times for( size_t i=0; i Date: Wed, 26 Aug 2015 15:31:05 -0400 Subject: [PATCH 240/353] Be more explicit about GRAPHENE_COMMITTEE_ACCOUNT --- libraries/chain/asset_evaluator.cpp | 2 +- libraries/chain/proposal_evaluator.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/chain/asset_evaluator.cpp b/libraries/chain/asset_evaluator.cpp index 5b3bde4f..8c1b899d 100644 --- a/libraries/chain/asset_evaluator.cpp +++ b/libraries/chain/asset_evaluator.cpp @@ -457,7 +457,7 @@ void_result asset_publish_feeds_evaluator::do_evaluate(const asset_publish_feed_ FC_ASSERT( !bitasset.has_settlement(), "No further feeds may be published after a settlement event" ); FC_ASSERT(o.feed.settlement_price.quote.asset_id == bitasset.options.short_backing_asset); //Verify that the publisher is authoritative to publish a feed - if( base.issuer == account_id_type() ) + if( base.issuer == GRAPHENE_COMMITTEE_ACCOUNT ) { //It's a committee_member-fed asset. Verify that publisher is an active committee_member or witness. FC_ASSERT(d.get(GRAPHENE_COMMITTEE_ACCOUNT).active.account_auths.count(o.publisher) || diff --git a/libraries/chain/proposal_evaluator.cpp b/libraries/chain/proposal_evaluator.cpp index 0fe7e81b..6512c244 100644 --- a/libraries/chain/proposal_evaluator.cpp +++ b/libraries/chain/proposal_evaluator.cpp @@ -47,7 +47,7 @@ void_result proposal_create_evaluator::do_evaluate(const proposal_create_operati FC_ASSERT( other.size() == 0 ); // TODO: what about other??? - if( auths.find(account_id_type()) != auths.end() ) + if( auths.find(GRAPHENE_COMMITTEE_ACCOUNT) != auths.end() ) { GRAPHENE_ASSERT( o.review_period_seconds.valid(), From 19d10e462cfb59d41fadd98ade71436d6597192e Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 26 Aug 2015 15:35:36 -0400 Subject: [PATCH 241/353] Implement GRAPHENE_PROXY_TO_SELF_ACCOUNT #267 --- libraries/chain/db_init.cpp | 10 ++++++++++ libraries/chain/db_maint.cpp | 2 +- libraries/chain/include/graphene/chain/config.hpp | 2 ++ .../chain/include/graphene/chain/protocol/account.hpp | 5 +++-- libraries/wallet/wallet.cpp | 4 ++-- tests/common/database_fixture.cpp | 3 +++ tests/tests/operation_tests.cpp | 2 +- 7 files changed, 22 insertions(+), 6 deletions(-) diff --git a/libraries/chain/db_init.cpp b/libraries/chain/db_init.cpp index 42aebdbd..c69e7b91 100644 --- a/libraries/chain/db_init.cpp +++ b/libraries/chain/db_init.cpp @@ -274,6 +274,16 @@ void database::init_genesis(const genesis_state_type& genesis_state) a.network_fee_percentage = GRAPHENE_DEFAULT_NETWORK_PERCENT_OF_FEE; a.lifetime_referrer_fee_percentage = GRAPHENE_100_PERCENT - GRAPHENE_DEFAULT_NETWORK_PERCENT_OF_FEE; }).get_id() == GRAPHENE_TEMP_ACCOUNT); + FC_ASSERT(create([this](account_object& a) { + a.name = "proxy-to-self"; + a.statistics = create([&](account_statistics_object& s){s.owner = a.id;}).id; + a.owner.weight_threshold = 1; + a.active.weight_threshold = 1; + a.registrar = a.lifetime_referrer = a.referrer = GRAPHENE_NULL_ACCOUNT; + a.membership_expiration_date = time_point_sec::maximum(); + a.network_fee_percentage = 0; + a.lifetime_referrer_fee_percentage = GRAPHENE_100_PERCENT; + }).get_id() == GRAPHENE_PROXY_TO_SELF_ACCOUNT); // Create more special accounts while( true ) diff --git a/libraries/chain/db_maint.cpp b/libraries/chain/db_maint.cpp index 7bba2f3a..824e64ae 100644 --- a/libraries/chain/db_maint.cpp +++ b/libraries/chain/db_maint.cpp @@ -415,7 +415,7 @@ void database::perform_chain_maintenance(const signed_block& next_block, const g // specifying the opinions. const account_object& opinion_account = (stake_account.options.voting_account == - account_id_type())? stake_account + GRAPHENE_PROXY_TO_SELF_ACCOUNT)? stake_account : d.get(stake_account.options.voting_account); const auto& stats = stake_account.statistics(d); diff --git a/libraries/chain/include/graphene/chain/config.hpp b/libraries/chain/include/graphene/chain/config.hpp index 38d3db6d..a090eaa7 100644 --- a/libraries/chain/include/graphene/chain/config.hpp +++ b/libraries/chain/include/graphene/chain/config.hpp @@ -156,4 +156,6 @@ #define GRAPHENE_NULL_ACCOUNT (graphene::chain::account_id_type(3)) /// Represents the canonical account with WILDCARD authority (anybody can access funds in temp account) #define GRAPHENE_TEMP_ACCOUNT (graphene::chain::account_id_type(4)) +/// Represents the canonical account for specifying you will vote directly (as opposed to a proxy) +#define GRAPHENE_PROXY_TO_SELF_ACCOUNT (graphene::chain::account_id_type(5)) ///@} diff --git a/libraries/chain/include/graphene/chain/protocol/account.hpp b/libraries/chain/include/graphene/chain/protocol/account.hpp index 5c0045e3..c68334d6 100644 --- a/libraries/chain/include/graphene/chain/protocol/account.hpp +++ b/libraries/chain/include/graphene/chain/protocol/account.hpp @@ -14,9 +14,10 @@ namespace graphene { namespace chain { /// validated account activities. This field is here to prevent confusion if the active authority has zero or /// multiple keys in it. public_key_type memo_key; - /// If this field is set to an account ID other than 0, this account's votes will be ignored and its stake + /// If this field is set to an account ID other than GRAPHENE_PROXY_TO_SELF_ACCOUNT, + /// then this account's votes will be ignored; its stake /// will be counted as voting for the referenced account's selected votes instead. - account_id_type voting_account; + account_id_type voting_account = GRAPHENE_PROXY_TO_SELF_ACCOUNT; /// The number of active witnesses this account votes the blockchain should appoint /// Must not exceed the actual number of witnesses voted for in @ref votes diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp index 47aeed33..4b7cc064 100644 --- a/libraries/wallet/wallet.cpp +++ b/libraries/wallet/wallet.cpp @@ -1418,9 +1418,9 @@ public: } else { - if (account_object_to_modify.options.voting_account == account_id_type()) + if (account_object_to_modify.options.voting_account == GRAPHENE_PROXY_TO_SELF_ACCOUNT) FC_THROW("Account ${account} is already voting for itself", ("account", account_to_modify)); - account_object_to_modify.options.voting_account = account_id_type(); + account_object_to_modify.options.voting_account = GRAPHENE_PROXY_TO_SELF_ACCOUNT; } account_update_operation account_update_op; diff --git a/tests/common/database_fixture.cpp b/tests/common/database_fixture.cpp index 61fb036d..730cb434 100644 --- a/tests/common/database_fixture.cpp +++ b/tests/common/database_fixture.cpp @@ -333,6 +333,7 @@ account_create_operation database_fixture::make_account( create_account.owner = authority(123, key, 123); create_account.active = authority(321, key, 321); create_account.options.memo_key = key; + create_account.options.voting_account = GRAPHENE_PROXY_TO_SELF_ACCOUNT; auto& active_committee_members = db.get_global_properties().active_committee_members; if( active_committee_members.size() > 0 ) @@ -371,6 +372,7 @@ account_create_operation database_fixture::make_account( create_account.owner = authority(123, key, 123); create_account.active = authority(321, key, 321); create_account.options.memo_key = key; + create_account.options.voting_account = GRAPHENE_PROXY_TO_SELF_ACCOUNT; const vector& active_committee_members = db.get_global_properties().active_committee_members; if( active_committee_members.size() > 0 ) @@ -555,6 +557,7 @@ const account_object& database_fixture::create_account( account_create_op.owner = authority(1234, public_key_type(key.get_public_key()), 1234); account_create_op.active = authority(5678, public_key_type(key.get_public_key()), 5678); account_create_op.options.memo_key = key.get_public_key(); + account_create_op.options.voting_account = GRAPHENE_PROXY_TO_SELF_ACCOUNT; trx.operations.push_back( account_create_op ); trx.validate(); diff --git a/tests/tests/operation_tests.cpp b/tests/tests/operation_tests.cpp index c1971142..00eca382 100644 --- a/tests/tests/operation_tests.cpp +++ b/tests/tests/operation_tests.cpp @@ -345,7 +345,7 @@ BOOST_AUTO_TEST_CASE( create_account_test ) BOOST_CHECK(nathan_account.owner.key_auths.at(committee_key) == 123); BOOST_REQUIRE(nathan_account.active.num_auths() == 1); BOOST_CHECK(nathan_account.active.key_auths.at(committee_key) == 321); - BOOST_CHECK(nathan_account.options.voting_account == account_id_type()); + BOOST_CHECK(nathan_account.options.voting_account == GRAPHENE_PROXY_TO_SELF_ACCOUNT); BOOST_CHECK(nathan_account.options.memo_key == committee_key); const account_statistics_object& statistics = nathan_account.statistics(db); From 7db477b9d7860a4f0a5a56be21a280e1c6cd4af2 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 26 Aug 2015 16:59:22 -0400 Subject: [PATCH 242/353] Implement witness_update_operation #258 --- libraries/app/impacted.cpp | 9 +++++- libraries/chain/db_init.cpp | 3 +- .../graphene/chain/protocol/operations.hpp | 1 + .../graphene/chain/protocol/witness.hpp | 29 ++++++++++++++++++- .../graphene/chain/witness_evaluator.hpp | 9 ++++++ libraries/chain/protocol/witness.cpp | 7 +++++ libraries/chain/witness_evaluator.cpp | 21 ++++++++++++++ 7 files changed, 76 insertions(+), 3 deletions(-) diff --git a/libraries/app/impacted.cpp b/libraries/app/impacted.cpp index 7fb87397..9b49ef7a 100644 --- a/libraries/app/impacted.cpp +++ b/libraries/app/impacted.cpp @@ -92,7 +92,14 @@ struct get_impacted_account_visitor void operator()( const asset_settle_operation& op ) {} void operator()( const asset_global_settle_operation& op ) {} void operator()( const asset_publish_feed_operation& op ) {} - void operator()( const witness_create_operation& op ) {} + void operator()( const witness_create_operation& op ) + { + _impacted.insert( op.witness_account ); + } + void operator()( const witness_update_operation& op ) + { + _impacted.insert( op.witness_account ); + } void operator()( const proposal_create_operation& op ) { diff --git a/libraries/chain/db_init.cpp b/libraries/chain/db_init.cpp index c69e7b91..d3cefd02 100644 --- a/libraries/chain/db_init.cpp +++ b/libraries/chain/db_init.cpp @@ -139,9 +139,10 @@ void database::initialize_evaluators() register_evaluator(); register_evaluator(); register_evaluator(); - register_evaluator(); register_evaluator(); register_evaluator(); + register_evaluator(); + register_evaluator(); register_evaluator(); register_evaluator(); register_evaluator(); diff --git a/libraries/chain/include/graphene/chain/protocol/operations.hpp b/libraries/chain/include/graphene/chain/protocol/operations.hpp index 68860bc2..fd5e8357 100644 --- a/libraries/chain/include/graphene/chain/protocol/operations.hpp +++ b/libraries/chain/include/graphene/chain/protocol/operations.hpp @@ -45,6 +45,7 @@ namespace graphene { namespace chain { asset_global_settle_operation, asset_publish_feed_operation, witness_create_operation, + witness_update_operation, proposal_create_operation, proposal_update_operation, proposal_delete_operation, diff --git a/libraries/chain/include/graphene/chain/protocol/witness.hpp b/libraries/chain/include/graphene/chain/protocol/witness.hpp index 57d5a1ee..f976b857 100644 --- a/libraries/chain/include/graphene/chain/protocol/witness.hpp +++ b/libraries/chain/include/graphene/chain/protocol/witness.hpp @@ -25,10 +25,37 @@ namespace graphene { namespace chain { void validate()const; }; + /** + * @brief Update a witness object's URL and block signing key. + * @ingroup operations + */ + struct witness_update_operation : public base_operation + { + struct fee_parameters_type + { + share_type fee = 20 * GRAPHENE_BLOCKCHAIN_PRECISION; + }; + + asset fee; + /// The witness object to update. + witness_id_type witness; + /// The account which owns the witness. This account pays the fee for this operation. + account_id_type witness_account; + /// The new URL. + optional< string > new_url; + /// The new block signing key. + optional< public_key_type > new_signing_key; + + account_id_type fee_payer()const { return witness_account; } + void validate()const; + }; + /// TODO: witness_resign_operation : public base_operation } } // graphene::chain FC_REFLECT( graphene::chain::witness_create_operation::fee_parameters_type, (fee) ) - FC_REFLECT( graphene::chain::witness_create_operation, (fee)(witness_account)(url)(block_signing_key)(initial_secret) ) + +FC_REFLECT( graphene::chain::witness_update_operation::fee_parameters_type, (fee) ) +FC_REFLECT( graphene::chain::witness_update_operation, (fee)(witness)(witness_account)(new_url)(new_signing_key) ) diff --git a/libraries/chain/include/graphene/chain/witness_evaluator.hpp b/libraries/chain/include/graphene/chain/witness_evaluator.hpp index 4e98cd56..dd10ba06 100644 --- a/libraries/chain/include/graphene/chain/witness_evaluator.hpp +++ b/libraries/chain/include/graphene/chain/witness_evaluator.hpp @@ -30,4 +30,13 @@ namespace graphene { namespace chain { object_id_type do_apply( const witness_create_operation& o ); }; + class witness_update_evaluator : public evaluator + { + public: + typedef witness_update_operation operation_type; + + void_result do_evaluate( const witness_update_operation& o ); + void_result do_apply( const witness_update_operation& o ); + }; + } } // graphene::chain diff --git a/libraries/chain/protocol/witness.cpp b/libraries/chain/protocol/witness.cpp index 12d7ecb0..e7e8a75e 100644 --- a/libraries/chain/protocol/witness.cpp +++ b/libraries/chain/protocol/witness.cpp @@ -9,4 +9,11 @@ void witness_create_operation::validate() const FC_ASSERT(url.size() < GRAPHENE_MAX_URL_LENGTH ); } +void witness_update_operation::validate() const +{ + FC_ASSERT(fee.amount >= 0); + if( new_url.valid() ) + FC_ASSERT(new_url->size() < GRAPHENE_MAX_URL_LENGTH ); +} + } } // graphene::chain diff --git a/libraries/chain/witness_evaluator.cpp b/libraries/chain/witness_evaluator.cpp index cd7787a4..d0e733f1 100644 --- a/libraries/chain/witness_evaluator.cpp +++ b/libraries/chain/witness_evaluator.cpp @@ -47,4 +47,25 @@ object_id_type witness_create_evaluator::do_apply( const witness_create_operatio return new_witness_object.id; } FC_CAPTURE_AND_RETHROW( (op) ) } +void_result witness_update_evaluator::do_evaluate( const witness_update_operation& op ) +{ try { + FC_ASSERT(db().get(op.witness).witness_account == op.witness_account); + return void_result(); +} FC_CAPTURE_AND_RETHROW( (op) ) } + +void_result witness_update_evaluator::do_apply( const witness_update_operation& op ) +{ try { + database& _db = db(); + _db.modify( + _db.get(op.witness), + [&]( witness_object& wit ) + { + if( op.new_url.valid() ) + wit.url = *op.new_url; + if( op.new_signing_key.valid() ) + wit.signing_key = *op.new_signing_key; + }); + return void_result(); +} FC_CAPTURE_AND_RETHROW( (op) ) } + } } // graphene::chain From 695978cfa1e698c64aaf823dcac47780c4a51735 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 26 Aug 2015 17:30:44 -0400 Subject: [PATCH 243/353] Implement committee_member_update operation #258 --- libraries/app/impacted.cpp | 9 ++++++- .../chain/committee_member_evaluator.cpp | 19 ++++++++++++++ libraries/chain/db_init.cpp | 1 + .../chain/committee_member_evaluator.hpp | 10 ++++++- .../chain/protocol/committee_member.hpp | 26 ++++++++++++++++++- .../graphene/chain/protocol/operations.hpp | 1 + libraries/chain/protocol/committee_member.cpp | 8 +++++- 7 files changed, 70 insertions(+), 4 deletions(-) diff --git a/libraries/app/impacted.cpp b/libraries/app/impacted.cpp index 9b49ef7a..c0674621 100644 --- a/libraries/app/impacted.cpp +++ b/libraries/app/impacted.cpp @@ -133,7 +133,14 @@ struct get_impacted_account_visitor _impacted.insert( op.authorized_account ); } - void operator()( const committee_member_create_operation& op ) {} + void operator()( const committee_member_create_operation& op ) + { + _impacted.insert( op.committee_member_account ); + } + void operator()( const committee_member_update_operation& op ) + { + _impacted.insert( op.committee_member_account ); + } void operator()( const committee_member_update_global_parameters_operation& op ) {} void operator()( const vesting_balance_create_operation& op ) diff --git a/libraries/chain/committee_member_evaluator.cpp b/libraries/chain/committee_member_evaluator.cpp index 12f901e7..861e766d 100644 --- a/libraries/chain/committee_member_evaluator.cpp +++ b/libraries/chain/committee_member_evaluator.cpp @@ -48,6 +48,25 @@ object_id_type committee_member_create_evaluator::do_apply( const committee_memb return new_del_object.id; } FC_CAPTURE_AND_RETHROW( (op) ) } +void_result committee_member_update_evaluator::do_evaluate( const committee_member_update_operation& op ) +{ try { + FC_ASSERT(db().get(op.committee_member).committee_member_account == op.committee_member_account); + return void_result(); +} FC_CAPTURE_AND_RETHROW( (op) ) } + +void_result committee_member_update_evaluator::do_apply( const committee_member_update_operation& op ) +{ try { + database& _db = db(); + _db.modify( + _db.get(op.committee_member), + [&]( committee_member_object& com ) + { + if( op.new_url.valid() ) + com.url = *op.new_url; + }); + return void_result(); +} FC_CAPTURE_AND_RETHROW( (op) ) } + void_result committee_member_update_global_parameters_evaluator::do_evaluate(const committee_member_update_global_parameters_operation& o) { try { FC_ASSERT(trx_state->_is_proposed_trx); diff --git a/libraries/chain/db_init.cpp b/libraries/chain/db_init.cpp index d3cefd02..71cb12c7 100644 --- a/libraries/chain/db_init.cpp +++ b/libraries/chain/db_init.cpp @@ -118,6 +118,7 @@ void database::initialize_evaluators() register_evaluator(); register_evaluator(); register_evaluator(); + register_evaluator(); register_evaluator(); register_evaluator(); register_evaluator(); diff --git a/libraries/chain/include/graphene/chain/committee_member_evaluator.hpp b/libraries/chain/include/graphene/chain/committee_member_evaluator.hpp index 1728e77e..eecc860f 100644 --- a/libraries/chain/include/graphene/chain/committee_member_evaluator.hpp +++ b/libraries/chain/include/graphene/chain/committee_member_evaluator.hpp @@ -30,6 +30,15 @@ namespace graphene { namespace chain { object_id_type do_apply( const committee_member_create_operation& o ); }; + class committee_member_update_evaluator : public evaluator + { + public: + typedef committee_member_update_operation operation_type; + + void_result do_evaluate( const committee_member_update_operation& o ); + void_result do_apply( const committee_member_update_operation& o ); + }; + class committee_member_update_global_parameters_evaluator : public evaluator { public: @@ -39,5 +48,4 @@ namespace graphene { namespace chain { void_result do_apply( const committee_member_update_global_parameters_operation& o ); }; - } } // graphene::chain diff --git a/libraries/chain/include/graphene/chain/protocol/committee_member.hpp b/libraries/chain/include/graphene/chain/protocol/committee_member.hpp index 0b774468..9fdf2e35 100644 --- a/libraries/chain/include/graphene/chain/protocol/committee_member.hpp +++ b/libraries/chain/include/graphene/chain/protocol/committee_member.hpp @@ -24,6 +24,28 @@ namespace graphene { namespace chain { void validate()const; }; + /** + * @brief Update a committee_member object. + * @ingroup operations + * + * Currently the only field which can be updated is the `url` + * field. + */ + struct committee_member_update_operation : public base_operation + { + struct fee_parameters_type { uint64_t fee = 20 * GRAPHENE_BLOCKCHAIN_PRECISION; }; + + asset fee; + /// The committee member to update. + committee_member_id_type committee_member; + /// The account which owns the committee_member. This account pays the fee for this operation. + account_id_type committee_member_account; + optional< string > new_url; + + account_id_type fee_payer()const { return committee_member_account; } + void validate()const; + }; + /** * @brief Used by committee_members to update the global parameters of the blockchain. * @ingroup operations @@ -50,10 +72,12 @@ namespace graphene { namespace chain { } } // graphene::chain FC_REFLECT( graphene::chain::committee_member_create_operation::fee_parameters_type, (fee) ) +FC_REFLECT( graphene::chain::committee_member_update_operation::fee_parameters_type, (fee) ) FC_REFLECT( graphene::chain::committee_member_update_global_parameters_operation::fee_parameters_type, (fee) ) FC_REFLECT( graphene::chain::committee_member_create_operation, (fee)(committee_member_account)(url) ) - +FC_REFLECT( graphene::chain::committee_member_update_operation, + (fee)(committee_member)(committee_member_account)(new_url) ) FC_REFLECT( graphene::chain::committee_member_update_global_parameters_operation, (fee)(new_parameters) ); diff --git a/libraries/chain/include/graphene/chain/protocol/operations.hpp b/libraries/chain/include/graphene/chain/protocol/operations.hpp index fd5e8357..b60504bd 100644 --- a/libraries/chain/include/graphene/chain/protocol/operations.hpp +++ b/libraries/chain/include/graphene/chain/protocol/operations.hpp @@ -54,6 +54,7 @@ namespace graphene { namespace chain { withdraw_permission_claim_operation, withdraw_permission_delete_operation, committee_member_create_operation, + committee_member_update_operation, committee_member_update_global_parameters_operation, vesting_balance_create_operation, vesting_balance_withdraw_operation, diff --git a/libraries/chain/protocol/committee_member.cpp b/libraries/chain/protocol/committee_member.cpp index 75b9193a..01d9d22e 100644 --- a/libraries/chain/protocol/committee_member.cpp +++ b/libraries/chain/protocol/committee_member.cpp @@ -9,11 +9,17 @@ void committee_member_create_operation::validate()const FC_ASSERT(url.size() < GRAPHENE_MAX_URL_LENGTH ); } +void committee_member_update_operation::validate()const +{ + FC_ASSERT( fee.amount >= 0 ); + if( new_url.valid() ) + FC_ASSERT(new_url->size() < GRAPHENE_MAX_URL_LENGTH ); +} + void committee_member_update_global_parameters_operation::validate() const { FC_ASSERT( fee.amount >= 0 ); new_parameters.validate(); } - } } // graphene::chain From 59a3ca32b7bf55158883743545b8b4a68d022e4b Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 26 Aug 2015 17:38:03 -0400 Subject: [PATCH 244/353] Remove secret hashes from witnesses --- libraries/chain/db_init.cpp | 1 - libraries/chain/get_config.cpp | 1 - libraries/chain/include/graphene/chain/config.hpp | 4 ---- libraries/chain/include/graphene/chain/protocol/types.hpp | 1 - libraries/chain/include/graphene/chain/protocol/witness.hpp | 3 +-- libraries/chain/include/graphene/chain/witness_object.hpp | 2 -- libraries/chain/witness_evaluator.cpp | 1 - libraries/wallet/wallet.cpp | 5 ----- tests/common/database_fixture.cpp | 4 ---- 9 files changed, 1 insertion(+), 21 deletions(-) diff --git a/libraries/chain/db_init.cpp b/libraries/chain/db_init.cpp index 71cb12c7..2f9f034f 100644 --- a/libraries/chain/db_init.cpp +++ b/libraries/chain/db_init.cpp @@ -555,7 +555,6 @@ void database::init_genesis(const genesis_state_type& genesis_state) witness_create_operation op; op.witness_account = get_account_id(witness.owner_name); op.block_signing_key = witness.block_signing_key; - op.initial_secret = secret_hash_type::hash( secret_hash_type() ); apply_operation(genesis_eval_state, op); }); diff --git a/libraries/chain/get_config.cpp b/libraries/chain/get_config.cpp index ada12de2..9f10ce78 100644 --- a/libraries/chain/get_config.cpp +++ b/libraries/chain/get_config.cpp @@ -92,7 +92,6 @@ fc::variant_object get_config() result[ "GRAPHENE_MAX_URL_LENGTH" ] = GRAPHENE_MAX_URL_LENGTH; result[ "GRAPHENE_NEAR_SCHEDULE_CTR_IV" ] = GRAPHENE_NEAR_SCHEDULE_CTR_IV; result[ "GRAPHENE_FAR_SCHEDULE_CTR_IV" ] = GRAPHENE_FAR_SCHEDULE_CTR_IV; - result[ "GRAPHENE_RNG_SEED_LENGTH" ] = GRAPHENE_RNG_SEED_LENGTH; result[ "GRAPHENE_CORE_ASSET_CYCLE_RATE" ] = GRAPHENE_CORE_ASSET_CYCLE_RATE; result[ "GRAPHENE_CORE_ASSET_CYCLE_RATE_BITS" ] = GRAPHENE_CORE_ASSET_CYCLE_RATE_BITS; result[ "GRAPHENE_DEFAULT_WITNESS_PAY_PER_BLOCK" ] = GRAPHENE_DEFAULT_WITNESS_PAY_PER_BLOCK; diff --git a/libraries/chain/include/graphene/chain/config.hpp b/libraries/chain/include/graphene/chain/config.hpp index a090eaa7..381d2f65 100644 --- a/libraries/chain/include/graphene/chain/config.hpp +++ b/libraries/chain/include/graphene/chain/config.hpp @@ -122,10 +122,6 @@ | (uint64_t( 0x84ca ) << 0x10) \ | (uint64_t( 0xa73b ) ) ) -// counter used to determine bits of entropy -// must be less than or equal to secret_hash_type::data_length() -#define GRAPHENE_RNG_SEED_LENGTH (160 / 8) - /** * every second, the fraction of burned core asset which cycles is * GRAPHENE_CORE_ASSET_CYCLE_RATE / (1 << GRAPHENE_CORE_ASSET_CYCLE_RATE_BITS) diff --git a/libraries/chain/include/graphene/chain/protocol/types.hpp b/libraries/chain/include/graphene/chain/protocol/types.hpp index 17b4049c..c34aa1b0 100644 --- a/libraries/chain/include/graphene/chain/protocol/types.hpp +++ b/libraries/chain/include/graphene/chain/protocol/types.hpp @@ -216,7 +216,6 @@ namespace graphene { namespace chain { typedef fc::sha256 digest_type; typedef fc::ecc::compact_signature signature_type; typedef safe share_type; - typedef fc::ripemd160 secret_hash_type; typedef uint16_t weight_type; struct public_key_type diff --git a/libraries/chain/include/graphene/chain/protocol/witness.hpp b/libraries/chain/include/graphene/chain/protocol/witness.hpp index f976b857..1c74e4b4 100644 --- a/libraries/chain/include/graphene/chain/protocol/witness.hpp +++ b/libraries/chain/include/graphene/chain/protocol/witness.hpp @@ -19,7 +19,6 @@ namespace graphene { namespace chain { account_id_type witness_account; string url; public_key_type block_signing_key; - secret_hash_type initial_secret; account_id_type fee_payer()const { return witness_account; } void validate()const; @@ -55,7 +54,7 @@ namespace graphene { namespace chain { } } // graphene::chain FC_REFLECT( graphene::chain::witness_create_operation::fee_parameters_type, (fee) ) -FC_REFLECT( graphene::chain::witness_create_operation, (fee)(witness_account)(url)(block_signing_key)(initial_secret) ) +FC_REFLECT( graphene::chain::witness_create_operation, (fee)(witness_account)(url)(block_signing_key) ) FC_REFLECT( graphene::chain::witness_update_operation::fee_parameters_type, (fee) ) FC_REFLECT( graphene::chain::witness_update_operation, (fee)(witness)(witness_account)(new_url)(new_signing_key) ) diff --git a/libraries/chain/include/graphene/chain/witness_object.hpp b/libraries/chain/include/graphene/chain/witness_object.hpp index 0576df6c..8fff82a0 100644 --- a/libraries/chain/include/graphene/chain/witness_object.hpp +++ b/libraries/chain/include/graphene/chain/witness_object.hpp @@ -34,8 +34,6 @@ namespace graphene { namespace chain { account_id_type witness_account; uint64_t last_aslot = 0; public_key_type signing_key; - secret_hash_type next_secret_hash; - secret_hash_type previous_secret; optional< vesting_balance_id_type > pay_vb; vote_id_type vote_id; uint64_t total_votes = 0; diff --git a/libraries/chain/witness_evaluator.cpp b/libraries/chain/witness_evaluator.cpp index d0e733f1..39c33bd1 100644 --- a/libraries/chain/witness_evaluator.cpp +++ b/libraries/chain/witness_evaluator.cpp @@ -40,7 +40,6 @@ object_id_type witness_create_evaluator::do_apply( const witness_create_operatio const auto& new_witness_object = db().create( [&]( witness_object& obj ){ obj.witness_account = op.witness_account; obj.signing_key = op.block_signing_key; - obj.next_secret_hash = op.initial_secret; obj.vote_id = vote_id; obj.url = op.url; }); diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp index 4b7cc064..1b17b8d5 100644 --- a/libraries/wallet/wallet.cpp +++ b/libraries/wallet/wallet.cpp @@ -1317,11 +1317,6 @@ public: witness_create_op.witness_account = witness_account.id; witness_create_op.block_signing_key = witness_public_key; witness_create_op.url = url; - - secret_hash_type::encoder enc; - fc::raw::pack(enc, witness_private_key); - fc::raw::pack(enc, secret_hash_type()); - witness_create_op.initial_secret = secret_hash_type::hash(enc.result()); if (_remote_db->get_witness_by_account(witness_create_op.witness_account)) FC_THROW("Account ${owner_account} is already a witness", ("owner_account", owner_account)); diff --git a/tests/common/database_fixture.cpp b/tests/common/database_fixture.cpp index 730cb434..9c86055d 100644 --- a/tests/common/database_fixture.cpp +++ b/tests/common/database_fixture.cpp @@ -593,10 +593,6 @@ const witness_object& database_fixture::create_witness( const account_object& ow witness_create_operation op; op.witness_account = owner.id; op.block_signing_key = signing_private_key.get_public_key(); - secret_hash_type::encoder enc; - fc::raw::pack(enc, signing_private_key); - fc::raw::pack(enc, secret_hash_type()); - op.initial_secret = secret_hash_type::hash(enc.result()); trx.operations.push_back(op); trx.validate(); processed_transaction ptx = db.push_transaction(trx, ~0); From e5ada2756a79f01fb9e1fd133b8965bc9fe920cf Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 26 Aug 2015 17:43:40 -0400 Subject: [PATCH 245/353] Remove experimental p2p code #273 --- libraries/CMakeLists.txt | 1 - libraries/p2p/CMakeLists.txt | 32 -- libraries/p2p/design.md | 90 ---- .../p2p/include/graphene/p2p/message.hpp | 151 ------- .../p2p/message_oriented_connection.hpp | 49 --- libraries/p2p/include/graphene/p2p/node.hpp | 74 ---- .../include/graphene/p2p/peer_connection.hpp | 179 -------- .../p2p/include/graphene/p2p/stcp_socket.hpp | 59 --- libraries/p2p/message_oriented_connection.cpp | 393 ------------------ libraries/p2p/node.cpp | 141 ------- libraries/p2p/peer_connection.cpp | 7 - libraries/p2p/stcp_socket.cpp | 181 -------- 12 files changed, 1357 deletions(-) delete mode 100644 libraries/p2p/CMakeLists.txt delete mode 100644 libraries/p2p/design.md delete mode 100644 libraries/p2p/include/graphene/p2p/message.hpp delete mode 100644 libraries/p2p/include/graphene/p2p/message_oriented_connection.hpp delete mode 100644 libraries/p2p/include/graphene/p2p/node.hpp delete mode 100644 libraries/p2p/include/graphene/p2p/peer_connection.hpp delete mode 100644 libraries/p2p/include/graphene/p2p/stcp_socket.hpp delete mode 100644 libraries/p2p/message_oriented_connection.cpp delete mode 100644 libraries/p2p/node.cpp delete mode 100644 libraries/p2p/peer_connection.cpp delete mode 100644 libraries/p2p/stcp_socket.cpp diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt index 2a0754ef..6af806f9 100644 --- a/libraries/CMakeLists.txt +++ b/libraries/CMakeLists.txt @@ -4,7 +4,6 @@ add_subdirectory( deterministic_openssl_rand ) add_subdirectory( chain ) add_subdirectory( egenesis ) add_subdirectory( net ) -add_subdirectory( p2p ) add_subdirectory( time ) add_subdirectory( utilities ) add_subdirectory( app ) diff --git a/libraries/p2p/CMakeLists.txt b/libraries/p2p/CMakeLists.txt deleted file mode 100644 index 6b5918d5..00000000 --- a/libraries/p2p/CMakeLists.txt +++ /dev/null @@ -1,32 +0,0 @@ -file(GLOB HEADERS "include/graphene/p2p/*.hpp") - -set(SOURCES node.cpp - stcp_socket.cpp - peer_connection.cpp - message_oriented_connection.cpp) - -add_library( graphene_p2p ${SOURCES} ${HEADERS} ) - -target_link_libraries( graphene_p2p - PUBLIC fc graphene_db ) -target_include_directories( graphene_p2p - PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" - PRIVATE "${CMAKE_SOURCE_DIR}/libraries/chain/include" -) - -#if(MSVC) -# set_source_files_properties( node.cpp PROPERTIES COMPILE_FLAGS "/bigobj" ) -#endif(MSVC) - -#if (USE_PCH) -# set_target_properties(graphene_p2p PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE) -# cotire(graphene_p2p ) -#endif(USE_PCH) - -install( TARGETS - graphene_p2p - - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib -) diff --git a/libraries/p2p/design.md b/libraries/p2p/design.md deleted file mode 100644 index d55c1411..00000000 --- a/libraries/p2p/design.md +++ /dev/null @@ -1,90 +0,0 @@ -# Network Protocol 2 - -Building a low-latency network requires P2P nodes that have low-latency -connections and a protocol designed to minimize latency. for the purpose -of this document we will assume that two nodes are located on opposite -sides of the globe with a ping time of 250ms. - - -## Announce, Request, Send Protocol -Under the prior network archtiecture, transactions and blocks were broadcast -in a manner similar to the Bitcoin protocol: inventory messages notify peers of -transactions and blocks, then peers fetch the transaction or block from one -peer. After validating the item a node will broadcast an inventory message to -its peers. - -Under this model it will take 0.75 seconds for a peer to communicate a transaction -or block to another peer even if their size was 0 and there was no processing overhead. -This level of performance is unacceptable for a network attempting to produce one block -every second. - -This prior protocol also sent every transaction twice: initial broadcast, and again as -part of a block. - - -## Push Protocol -To minimize latency each node needs to immediately broadcast the data it receives -to its peers after validating it. Given the average transaction size is less than -100 bytes, it is almost as effecient to send the transaction as it is to send -the notice (assuming a 20 byte transaction id) - -Each node implements the following protocol: - - - onReceiveTransaction( from_peer, transaction ) - if( isKnown( transaction.id() ) ) - return - - markKnown( transaction.id() ) - - if( !validate( transaction ) ) - return - - for( peer : peers ) - if( peer != from_peer ) - send( peer, transaction ) - - - onReceiveBlock( from_peer, block_summary ) - if( isKnown( block_summary ) - return - - full_block = reconstructFullBlcok( from_peer, block_summary ) - if( !full_block ) disconnect from_peer - - markKnown( block_summary ) - - if( !pushBlock( full_block ) ) disconnect from_peer - - for( peer : peers ) - if( peer != from_peer ) - send( peer, block_summary ) - - - onConnect( new_peer, new_peer_head_block_num ) - if( peers.size() >= max_peers ) - send( new_peer, peers ) - disconnect( new_peer ) - return - - while( new_peer_head_block_num < our_head_block_num ) - sendFullBlock( new_peer, ++new_peer_head_block_num ) - - new_peer.synced = true - for( peer : peers ) - send( peer, new_peer ) - - onReceivePeers( from_peer, peers ) - addToPotentialPeers( peers ) - - onUpdateConnectionsTimer - if( peers.size() < desired_peers ) - connect( random_potential_peer ) - - onFullBlock( from_peer, full_block ) - if( !pushBlock( full_block ) ) disconnect from_peer - - onStartup - init_potential_peers from config - start onUpdateConnectionsTimer - diff --git a/libraries/p2p/include/graphene/p2p/message.hpp b/libraries/p2p/include/graphene/p2p/message.hpp deleted file mode 100644 index 926180d1..00000000 --- a/libraries/p2p/include/graphene/p2p/message.hpp +++ /dev/null @@ -1,151 +0,0 @@ -/** Copyright (c) 2015, Cryptonomex, Inc. All rights reserved. */ -#pragma once -#include -#include -#include -#include -#include -#include - -namespace graphene { namespace p2p { - - struct message_header - { - uint32_t size; // number of bytes in message, capped at MAX_MESSAGE_SIZE - uint32_t msg_type; - }; - - typedef fc::uint160_t message_hash_type; - - /** - * Abstracts the process of packing/unpacking a message for a - * particular channel. - */ - struct message : public message_header - { - std::vector data; - - message(){} - - message( message&& m ) - :message_header(m),data( std::move(m.data) ){} - - message( const message& m ) - :message_header(m),data( m.data ){} - - /** - * Assumes that T::type specifies the message type - */ - template - message( const T& m ) - { - msg_type = T::type; - data = fc::raw::pack(m); - size = (uint32_t)data.size(); - } - - fc::uint160_t id()const - { - return fc::ripemd160::hash( data.data(), (uint32_t)data.size() ); - } - - /** - * Automatically checks the type and deserializes T in the - * opposite process from the constructor. - */ - template - T as()const - { - try { - FC_ASSERT( msg_type == T::type ); - T tmp; - if( data.size() ) - { - fc::datastream ds( data.data(), data.size() ); - fc::raw::unpack( ds, tmp ); - } - else - { - // just to make sure that tmp shouldn't have any data - fc::datastream ds( nullptr, 0 ); - fc::raw::unpack( ds, tmp ); - } - return tmp; - } FC_RETHROW_EXCEPTIONS( warn, - "error unpacking network message as a '${type}' ${x} !=? ${msg_type}", - ("type", fc::get_typename::name() ) - ("x", T::type) - ("msg_type", msg_type) - ); - } - }; - - enum core_message_type_enum { - hello_message_type = 1000, - transaction_message_type = 1001, - block_message_type = 1002, - peer_message_type = 1003, - error_message_type = 1004 - }; - - struct hello_message - { - static const core_message_type_enum type; - - std::string user_agent; - uint16_t version; - - fc::ip::address inbound_address; - uint16_t inbound_port; - uint16_t outbound_port; - node_id_t node_public_key; - fc::sha256 chain_id; - fc::variant_object user_data; - block_id_type head_block; - }; - - struct transaction_message - { - static const core_message_type_enum type; - signed_transaction trx; - }; - - struct block_summary_message - { - static const core_message_type_enum type; - - signed_block_header header; - vector transaction_ids; - }; - - struct full_block_message - { - static const core_message_type_enum type; - signed_block block; - }; - - struct peers_message - { - static const core_message_type_enum type; - - vector peers; - }; - - struct error_message - { - static const core_message_type_enum type; - string message; - }; - - -} } // graphene::p2p - -FC_REFLECT( graphene::p2p::message_header, (size)(msg_type) ) -FC_REFLECT_DERIVED( graphene::p2p::message, (graphene::p2p::message_header), (data) ) -FC_REFLECT_ENUM( graphene::p2p::core_message_type_enum, - (hello_message_type) - (transaction_message_type) - (block_message_type) - (peer_message_type) - (error_message_type) -) diff --git a/libraries/p2p/include/graphene/p2p/message_oriented_connection.hpp b/libraries/p2p/include/graphene/p2p/message_oriented_connection.hpp deleted file mode 100644 index 82b73195..00000000 --- a/libraries/p2p/include/graphene/p2p/message_oriented_connection.hpp +++ /dev/null @@ -1,49 +0,0 @@ -/** Copyright (c) 2015, Cryptonomex, Inc. All rights reserved. */ -#pragma once -#include -#include - -namespace graphene { namespace p2p { - - namespace detail { class message_oriented_connection_impl; } - - class message_oriented_connection; - - /** receives incoming messages from a message_oriented_connection object */ - class message_oriented_connection_delegate - { - public: - virtual void on_message( message_oriented_connection* originating_connection, - const message& received_message) = 0; - - virtual void on_connection_closed(message_oriented_connection* originating_connection) = 0; - }; - - /** uses a secure socket to create a connection that reads and writes a stream of `fc::p2p::message` objects */ - class message_oriented_connection - { - public: - message_oriented_connection(message_oriented_connection_delegate* delegate = nullptr); - ~message_oriented_connection(); - fc::tcp_socket& get_socket(); - - void accept(); - void bind(const fc::ip::endpoint& local_endpoint); - void connect_to(const fc::ip::endpoint& remote_endpoint); - - void send_message(const message& message_to_send); - void close_connection(); - void destroy_connection(); - - uint64_t get_total_bytes_sent() const; - uint64_t get_total_bytes_received() const; - fc::time_point get_last_message_sent_time() const; - fc::time_point get_last_message_received_time() const; - fc::time_point get_connection_time() const; - fc::sha512 get_shared_secret() const; - private: - std::unique_ptr my; - }; - typedef std::shared_ptr message_oriented_connection_ptr; - -} } // graphene::net diff --git a/libraries/p2p/include/graphene/p2p/node.hpp b/libraries/p2p/include/graphene/p2p/node.hpp deleted file mode 100644 index aa7f5e46..00000000 --- a/libraries/p2p/include/graphene/p2p/node.hpp +++ /dev/null @@ -1,74 +0,0 @@ -/** Copyright (c) 2015, Cryptonomex, Inc. */ - -#pragma once -#include -#include - - - -namespace graphene { namespace p2p { - using namespace graphene::chain; - - struct node_config - { - fc::ip::endpoint server_endpoint; - bool wait_if_not_available = true; - uint32_t desired_peers; - uint32_t max_peers; - /** receive, but don't rebroadcast data */ - bool subscribe_only = false; - public_key_type node_id; - vector seed_nodes; - }; - - struct by_remote_endpoint; - struct by_peer_id; - - /** - * @ingroup object_index - */ - typedef multi_index_container< - peer_connection_ptr, - indexed_by< - ordered_unique< tag, - const_mem_fun< peer_connection, fc::ip::endpoint, &peer_connection::get_remote_endpoint > >, - ordered_unique< tag, member< peer_connection, public_key_type, &peer_connection::node_id > > - > - > peer_connection_index; - - - class node : public std::enable_shared_from_this - { - public: - server( chain_database& db ); - - void add_peer( const fc::ip::endpoint& ep ); - void configure( const node_config& cfg ); - - void on_incomming_connection( peer_connection_ptr new_peer ); - void on_hello( peer_connection_ptr new_peer, hello_message m ); - void on_transaction( peer_connection_ptr from_peer, transaction_message m ); - void on_block( peer_connection_ptr from_peer, block_message m ); - void on_peers( peer_connection_ptr from_peer, peers_message m ); - void on_error( peer_connection_ptr from_peer, error_message m ); - void on_full_block( peer_connection_ptr from_peer, full_block_message m ); - void on_update_connections(); - - private: - /** - * Specifies the network interface and port upon which incoming - * connections should be accepted. - */ - void listen_on_endpoint( fc::ip::endpoint ep, bool wait_if_not_available ); - void accept_loop(); - - graphene::chain::database& _db; - - fc::tcp_server _tcp_server; - fc::ip::endpoint _actual_listening_endpoint; - fc::future _accept_loop_complete; - peer_connection_index _peers; - - }; - -} } /// graphene::p2p diff --git a/libraries/p2p/include/graphene/p2p/peer_connection.hpp b/libraries/p2p/include/graphene/p2p/peer_connection.hpp deleted file mode 100644 index 8f0ab594..00000000 --- a/libraries/p2p/include/graphene/p2p/peer_connection.hpp +++ /dev/null @@ -1,179 +0,0 @@ -/* - * Copyright (c) 2015, Cryptonomex, Inc. - * All rights reserved. - * - * This source code is provided for evaluation in private test networks only, until September 8, 2015. After this date, this license expires and - * the code may not be used, modified or distributed for any purpose. Redistribution and use in source and binary forms, with or without modification, - * are permitted until September 8, 2015, provided that the following conditions are met: - * - * 1. The code and/or derivative works are used only for private test networks consisting of no more than 10 P2P nodes. - * - * 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. - */ -#pragma once - -#include -#include -#include - -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -namespace graphene { namespace p2p { - - class peer_connection; - class peer_connection_delegate - { - public: - virtual void on_message(peer_connection* originating_peer, - const message& received_message) = 0; - virtual void on_connection_closed(peer_connection* originating_peer) = 0; - virtual message get_message_for_item(const item_id& item) = 0; - }; - - class peer_connection; - typedef std::shared_ptr peer_connection_ptr; - - - class peer_connection : public message_oriented_connection_delegate, - public std::enable_shared_from_this - { - public: - enum direction_type { inbound, outbound }; - enum connection_state { - connecting = 0, - syncing = 1, - synced = 2 - }; - - fc::time_point connection_initiation_time; - fc::time_point connection_closed_time; - fc::time_point connection_terminated_time; - direction_type direction = outbound; - connection_state state = connecting; - bool is_firewalled = true - - //connection_state state; - fc::microseconds clock_offset; - fc::microseconds round_trip_delay; - - /// data about the peer node - /// @{ - - /** the unique identifier we'll use to refer to the node with. zero-initialized before - * we receive the hello message, at which time it will be filled with either the "node_id" - * from the user_data field of the hello, or if none is present it will be filled with a - * copy of node_public_key */ - public_key_type node_id; - uint32_t core_protocol_version; - std::string user_agent; - - fc::optional graphene_git_revision_sha; - fc::optional graphene_git_revision_unix_timestamp; - fc::optional fc_git_revision_sha; - fc::optional fc_git_revision_unix_timestamp; - fc::optional platform; - fc::optional bitness; - - // for inbound connections, these fields record what the peer sent us in - // its hello message. For outbound, they record what we sent the peer - // in our hello message - fc::ip::address inbound_address; - uint16_t inbound_port; - uint16_t outbound_port; - /// @} - - void send( transaction_message_ptr msg ) - { - // if not in sent_or_received then insert into _pending_send - // if process_send_queue is invalid or complete then - // async process_send_queue - } - - void received_transaction( const transaction_id_type& id ) - { - _sent_or_received.insert(id); - } - - void process_send_queue() - { - // while _pending_send.size() || _pending_blocks.size() - // while there are pending blocks, then take the oldest - // for each transaction id, verify that it exists in _sent_or_received - // else find it in the _pending_send queue and send it - // send one from _pending_send - } - - - std::unordered_map _pending_send; - /// todo: make multi-index that tracks how long items have been cached and removes them - /// after a resasonable period of time (say 10 seconds) - std::unordered_set _sent_or_received; - std::map _pending_blocks; - - - fc::ip::endpoint get_remote_endpoint()const - { return get_socket().get_remote_endpoint(); } - - void on_message(message_oriented_connection* originating_connection, - const message& received_message) override - { - switch( core_message_type_enum( received_message.type ) ) - { - case hello_message_type: - _node->on_hello( shared_from_this(), - received_message.as() ); - break; - case transaction_message_type: - _node->on_transaction( shared_from_this(), - received_message.as() ); - break; - case block_message_type: - _node->on_block( shared_from_this(), - received_message.as() ); - break; - case peer_message_type: - _node->on_peers( shared_from_this(), - received_message.as() ); - break; - } - } - - void on_connection_closed(message_oriented_connection* originating_connection) override - { - _node->on_close( shared_from_this() ); - } - - fc::tcp_socket& get_socket() { return _message_connection.get_socket(); } - - private: - peer_connection_delegate* _node; - fc::optional _remote_endpoint; - message_oriented_connection _message_connection; - - }; - typedef std::shared_ptr peer_connection_ptr; - - - } } // end namespace graphene::p2p - -// not sent over the wire, just reflected for logging -FC_REFLECT_ENUM(graphene::p2p::peer_connection::connection_state, (connecting)(syncing)(synced) ) -FC_REFLECT_ENUM(graphene::p2p::peer_connection::direction_type, (inbound)(outbound) ) diff --git a/libraries/p2p/include/graphene/p2p/stcp_socket.hpp b/libraries/p2p/include/graphene/p2p/stcp_socket.hpp deleted file mode 100644 index 01e6df34..00000000 --- a/libraries/p2p/include/graphene/p2p/stcp_socket.hpp +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (c) 2015, Cryptonomex, Inc. All rights reserved. - */ -#pragma once -#include -#include -#include - -namespace graphene { namespace p2p { - -/** - * Uses ECDH to negotiate a aes key for communicating - * with other nodes on the network. - */ -class stcp_socket : public virtual fc::iostream -{ - public: - stcp_socket(); - ~stcp_socket(); - fc::tcp_socket& get_socket() { return _sock; } - void accept(); - - void connect_to( const fc::ip::endpoint& remote_endpoint ); - void bind( const fc::ip::endpoint& local_endpoint ); - - virtual size_t readsome( char* buffer, size_t max ); - virtual size_t readsome( const std::shared_ptr& buf, size_t len, size_t offset ); - virtual bool eof()const; - - virtual size_t writesome( const char* buffer, size_t len ); - virtual size_t writesome( const std::shared_ptr& buf, size_t len, size_t offset ); - - virtual void flush(); - virtual void close(); - - using istream::get; - void get( char& c ) { read( &c, 1 ); } - fc::sha512 get_shared_secret() const { return _shared_secret; } - private: - void do_key_exchange(); - - fc::sha512 _shared_secret; - fc::ecc::private_key _priv_key; - fc::array _buf; - //uint32_t _buf_len; - fc::tcp_socket _sock; - fc::aes_encoder _send_aes; - fc::aes_decoder _recv_aes; - std::shared_ptr _read_buffer; - std::shared_ptr _write_buffer; -#ifndef NDEBUG - bool _read_buffer_in_use; - bool _write_buffer_in_use; -#endif -}; - -typedef std::shared_ptr stcp_socket_ptr; - -} } // graphene::p2p diff --git a/libraries/p2p/message_oriented_connection.cpp b/libraries/p2p/message_oriented_connection.cpp deleted file mode 100644 index a17ec541..00000000 --- a/libraries/p2p/message_oriented_connection.cpp +++ /dev/null @@ -1,393 +0,0 @@ -/* - * Copyright (c) 2015, Cryptonomex, Inc. - * All rights reserved. - */ -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#ifdef DEFAULT_LOGGER -# undef DEFAULT_LOGGER -#endif -#define DEFAULT_LOGGER "p2p" - -#ifndef NDEBUG -# define VERIFY_CORRECT_THREAD() assert(_thread->is_current()) -#else -# define VERIFY_CORRECT_THREAD() do {} while (0) -#endif - -namespace graphene { namespace p2p { - namespace detail - { - class message_oriented_connection_impl - { - private: - message_oriented_connection* _self; - message_oriented_connection_delegate *_delegate; - stcp_socket _sock; - fc::future _read_loop_done; - uint64_t _bytes_received; - uint64_t _bytes_sent; - - fc::time_point _connected_time; - fc::time_point _last_message_received_time; - fc::time_point _last_message_sent_time; - - bool _send_message_in_progress; - -#ifndef NDEBUG - fc::thread* _thread; -#endif - - void read_loop(); - void start_read_loop(); - public: - fc::tcp_socket& get_socket(); - void accept(); - void connect_to(const fc::ip::endpoint& remote_endpoint); - void bind(const fc::ip::endpoint& local_endpoint); - - message_oriented_connection_impl(message_oriented_connection* self, - message_oriented_connection_delegate* delegate = nullptr); - ~message_oriented_connection_impl(); - - void send_message(const message& message_to_send); - void close_connection(); - void destroy_connection(); - - uint64_t get_total_bytes_sent() const; - uint64_t get_total_bytes_received() const; - - fc::time_point get_last_message_sent_time() const; - fc::time_point get_last_message_received_time() const; - fc::time_point get_connection_time() const { return _connected_time; } - fc::sha512 get_shared_secret() const; - }; - - message_oriented_connection_impl::message_oriented_connection_impl(message_oriented_connection* self, - message_oriented_connection_delegate* delegate) - : _self(self), - _delegate(delegate), - _bytes_received(0), - _bytes_sent(0), - _send_message_in_progress(false) -#ifndef NDEBUG - ,_thread(&fc::thread::current()) -#endif - { - } - message_oriented_connection_impl::~message_oriented_connection_impl() - { - VERIFY_CORRECT_THREAD(); - destroy_connection(); - } - - fc::tcp_socket& message_oriented_connection_impl::get_socket() - { - VERIFY_CORRECT_THREAD(); - return _sock.get_socket(); - } - - void message_oriented_connection_impl::accept() - { - VERIFY_CORRECT_THREAD(); - _sock.accept(); - assert(!_read_loop_done.valid()); // check to be sure we never launch two read loops - _read_loop_done = fc::async([=](){ read_loop(); }, "message read_loop"); - } - - void message_oriented_connection_impl::connect_to(const fc::ip::endpoint& remote_endpoint) - { - VERIFY_CORRECT_THREAD(); - _sock.connect_to(remote_endpoint); - assert(!_read_loop_done.valid()); // check to be sure we never launch two read loops - _read_loop_done = fc::async([=](){ read_loop(); }, "message read_loop"); - } - - void message_oriented_connection_impl::bind(const fc::ip::endpoint& local_endpoint) - { - VERIFY_CORRECT_THREAD(); - _sock.bind(local_endpoint); - } - - - void message_oriented_connection_impl::read_loop() - { - VERIFY_CORRECT_THREAD(); - const int BUFFER_SIZE = 16; - const int LEFTOVER = BUFFER_SIZE - sizeof(message_header); - static_assert(BUFFER_SIZE >= sizeof(message_header), "insufficient buffer"); - - _connected_time = fc::time_point::now(); - - fc::oexception exception_to_rethrow; - bool call_on_connection_closed = false; - - try - { - message m; - while( true ) - { - char buffer[BUFFER_SIZE]; - _sock.read(buffer, BUFFER_SIZE); - _bytes_received += BUFFER_SIZE; - memcpy((char*)&m, buffer, sizeof(message_header)); - - FC_ASSERT( m.size <= MAX_MESSAGE_SIZE, "", ("m.size",m.size)("MAX_MESSAGE_SIZE",MAX_MESSAGE_SIZE) ); - - size_t remaining_bytes_with_padding = 16 * ((m.size - LEFTOVER + 15) / 16); - m.data.resize(LEFTOVER + remaining_bytes_with_padding); //give extra 16 bytes to allow for padding added in send call - std::copy(buffer + sizeof(message_header), buffer + sizeof(buffer), m.data.begin()); - if (remaining_bytes_with_padding) - { - _sock.read(&m.data[LEFTOVER], remaining_bytes_with_padding); - _bytes_received += remaining_bytes_with_padding; - } - m.data.resize(m.size); // truncate off the padding bytes - - _last_message_received_time = fc::time_point::now(); - - try - { - // message handling errors are warnings... - _delegate->on_message(_self, m); - } - /// Dedicated catches needed to distinguish from general fc::exception - catch ( const fc::canceled_exception& e ) { throw e; } - catch ( const fc::eof_exception& e ) { throw e; } - catch ( const fc::exception& e) - { - /// Here loop should be continued so exception should be just caught locally. - wlog( "message transmission failed ${er}", ("er", e.to_detail_string() ) ); - throw; - } - } - } - catch ( const fc::canceled_exception& e ) - { - wlog( "caught a canceled_exception in read_loop. this should mean we're in the process of deleting this object already, so there's no need to notify the delegate: ${e}", ("e", e.to_detail_string() ) ); - throw; - } - catch ( const fc::eof_exception& e ) - { - wlog( "disconnected ${e}", ("e", e.to_detail_string() ) ); - call_on_connection_closed = true; - } - catch ( const fc::exception& e ) - { - elog( "disconnected ${er}", ("er", e.to_detail_string() ) ); - call_on_connection_closed = true; - exception_to_rethrow = fc::unhandled_exception(FC_LOG_MESSAGE(warn, "disconnected: ${e}", ("e", e.to_detail_string()))); - } - catch ( const std::exception& e ) - { - elog( "disconnected ${er}", ("er", e.what() ) ); - call_on_connection_closed = true; - exception_to_rethrow = fc::unhandled_exception(FC_LOG_MESSAGE(warn, "disconnected: ${e}", ("e", e.what()))); - } - catch ( ... ) - { - elog( "unexpected exception" ); - call_on_connection_closed = true; - exception_to_rethrow = fc::unhandled_exception(FC_LOG_MESSAGE(warn, "disconnected: ${e}", ("e", fc::except_str()))); - } - - if (call_on_connection_closed) - _delegate->on_connection_closed(_self); - - if (exception_to_rethrow) - throw *exception_to_rethrow; - } - - void message_oriented_connection_impl::send_message(const message& message_to_send) - { - VERIFY_CORRECT_THREAD(); -#if 0 // this gets too verbose -#ifndef NDEBUG - fc::optional remote_endpoint; - if (_sock.get_socket().is_open()) - remote_endpoint = _sock.get_socket().remote_endpoint(); - struct scope_logger { - const fc::optional& endpoint; - scope_logger(const fc::optional& endpoint) : endpoint(endpoint) { dlog("entering message_oriented_connection::send_message() for peer ${endpoint}", ("endpoint", endpoint)); } - ~scope_logger() { dlog("leaving message_oriented_connection::send_message() for peer ${endpoint}", ("endpoint", endpoint)); } - } send_message_scope_logger(remote_endpoint); -#endif -#endif - struct verify_no_send_in_progress { - bool& var; - verify_no_send_in_progress(bool& var) : var(var) - { - if (var) - elog("Error: two tasks are calling message_oriented_connection::send_message() at the same time"); - assert(!var); - var = true; - } - ~verify_no_send_in_progress() { var = false; } - } _verify_no_send_in_progress(_send_message_in_progress); - - try - { - size_t size_of_message_and_header = sizeof(message_header) + message_to_send.size; - if( message_to_send.size > MAX_MESSAGE_SIZE ) - elog("Trying to send a message larger than MAX_MESSAGE_SIZE. This probably won't work..."); - //pad the message we send to a multiple of 16 bytes - size_t size_with_padding = 16 * ((size_of_message_and_header + 15) / 16); - std::unique_ptr padded_message(new char[size_with_padding]); - memcpy(padded_message.get(), (char*)&message_to_send, sizeof(message_header)); - memcpy(padded_message.get() + sizeof(message_header), message_to_send.data.data(), message_to_send.size ); - _sock.write(padded_message.get(), size_with_padding); - _sock.flush(); - _bytes_sent += size_with_padding; - _last_message_sent_time = fc::time_point::now(); - } FC_RETHROW_EXCEPTIONS( warn, "unable to send message" ); - } - - void message_oriented_connection_impl::close_connection() - { - VERIFY_CORRECT_THREAD(); - _sock.close(); - } - - void message_oriented_connection_impl::destroy_connection() - { - VERIFY_CORRECT_THREAD(); - - fc::optional remote_endpoint; - if (_sock.get_socket().is_open()) - remote_endpoint = _sock.get_socket().remote_endpoint(); - ilog( "in destroy_connection() for ${endpoint}", ("endpoint", remote_endpoint) ); - - if (_send_message_in_progress) - elog("Error: message_oriented_connection is being destroyed while a send_message is in progress. " - "The task calling send_message() should have been canceled already"); - assert(!_send_message_in_progress); - - try - { - _read_loop_done.cancel_and_wait(__FUNCTION__); - } - catch ( const fc::exception& e ) - { - wlog( "Exception thrown while canceling message_oriented_connection's read_loop, ignoring: ${e}", ("e",e) ); - } - catch (...) - { - wlog( "Exception thrown while canceling message_oriented_connection's read_loop, ignoring" ); - } - } - - uint64_t message_oriented_connection_impl::get_total_bytes_sent() const - { - VERIFY_CORRECT_THREAD(); - return _bytes_sent; - } - - uint64_t message_oriented_connection_impl::get_total_bytes_received() const - { - VERIFY_CORRECT_THREAD(); - return _bytes_received; - } - - fc::time_point message_oriented_connection_impl::get_last_message_sent_time() const - { - VERIFY_CORRECT_THREAD(); - return _last_message_sent_time; - } - - fc::time_point message_oriented_connection_impl::get_last_message_received_time() const - { - VERIFY_CORRECT_THREAD(); - return _last_message_received_time; - } - - fc::sha512 message_oriented_connection_impl::get_shared_secret() const - { - VERIFY_CORRECT_THREAD(); - return _sock.get_shared_secret(); - } - - } // end namespace graphene::p2p::detail - - - message_oriented_connection::message_oriented_connection(message_oriented_connection_delegate* delegate) : - my(new detail::message_oriented_connection_impl(this, delegate)) - { - } - - message_oriented_connection::~message_oriented_connection() - { - } - - fc::tcp_socket& message_oriented_connection::get_socket() - { - return my->get_socket(); - } - - void message_oriented_connection::accept() - { - my->accept(); - } - - void message_oriented_connection::connect_to(const fc::ip::endpoint& remote_endpoint) - { - my->connect_to(remote_endpoint); - } - - void message_oriented_connection::bind(const fc::ip::endpoint& local_endpoint) - { - my->bind(local_endpoint); - } - - void message_oriented_connection::send_message(const message& message_to_send) - { - my->send_message(message_to_send); - } - - void message_oriented_connection::close_connection() - { - my->close_connection(); - } - - void message_oriented_connection::destroy_connection() - { - my->destroy_connection(); - } - - uint64_t message_oriented_connection::get_total_bytes_sent() const - { - return my->get_total_bytes_sent(); - } - - uint64_t message_oriented_connection::get_total_bytes_received() const - { - return my->get_total_bytes_received(); - } - - fc::time_point message_oriented_connection::get_last_message_sent_time() const - { - return my->get_last_message_sent_time(); - } - - fc::time_point message_oriented_connection::get_last_message_received_time() const - { - return my->get_last_message_received_time(); - } - fc::time_point message_oriented_connection::get_connection_time() const - { - return my->get_connection_time(); - } - fc::sha512 message_oriented_connection::get_shared_secret() const - { - return my->get_shared_secret(); - } - -} } // end namespace graphene::p2p diff --git a/libraries/p2p/node.cpp b/libraries/p2p/node.cpp deleted file mode 100644 index 5a8da3a4..00000000 --- a/libraries/p2p/node.cpp +++ /dev/null @@ -1,141 +0,0 @@ -#include - -namespace graphene { namespace p2p { - - node::node( chain_database& db ) - :_db(db) - { - - } - - node::~node() - { - - } - - void node::add_peer( const fc::ip::endpoint& ep ) - { - - } - - void node::configure( const node_config& cfg ) - { - listen_on_endpoint( cfg.server_endpoint, wait_if_not_available ); - - /** don't allow node to go out of scope until accept loop exits */ - auto self = shared_from_this(); - _accept_loop_complete = fc::async( [self](){ self->accept_loop(); } ) - } - - void node::accept_loop() - { - auto self = shared_from_this(); - while( !_accept_loop_complete.canceled() ) - { - try { - auto new_peer = std::make_shared(self); - _tcp_server.accept( new_peer.get_socket() ); - - if( _accept_loop_complete.canceled() ) - return; - - _peers.insert( new_peer ); - - - - // limit the rate at which we accept connections to mitigate DOS attacks - fc::usleep( fc::milliseconds(10) ); - } FC_CAPTURE_AND_RETHROW() - } - } // accept_loop() - - - - void node::listen_on_endpoint( fc::ip::endpoint ep, bool wait_if_not_available ) - { - if( ep.port() != 0 ) - { - // if the user specified a port, we only want to bind to it if it's not already - // being used by another application. During normal operation, we set the - // SO_REUSEADDR/SO_REUSEPORT flags so that we can bind outbound sockets to the - // same local endpoint as we're listening on here. On some platforms, setting - // those flags will prevent us from detecting that other applications are - // listening on that port. We'd like to detect that, so we'll set up a temporary - // tcp server without that flag to see if we can listen on that port. - bool first = true; - for( ;; ) - { - bool listen_failed = false; - - try - { - fc::tcp_server temporary_server; - if( listen_endpoint.get_address() != fc::ip::address() ) - temporary_server.listen( ep ); - else - temporary_server.listen( ep.port() ); - break; - } - catch ( const fc::exception&) - { - listen_failed = true; - } - - if (listen_failed) - { - if( wait_if_endpoint_is_busy ) - { - std::ostringstream error_message_stream; - if( first ) - { - error_message_stream << "Unable to listen for connections on port " - << ep.port() - << ", retrying in a few seconds\n"; - error_message_stream << "You can wait for it to become available, or restart " - "this program using\n"; - error_message_stream << "the --p2p-port option to specify another port\n"; - first = false; - } - else - { - error_message_stream << "\nStill waiting for port " << listen_endpoint.port() << " to become available\n"; - } - - std::string error_message = error_message_stream.str(); - ulog(error_message); - fc::usleep( fc::seconds(5 ) ); - } - else // don't wait, just find a random port - { - wlog( "unable to bind on the requested endpoint ${endpoint}, " - "which probably means that endpoint is already in use", - ( "endpoint", ep ) ); - ep.set_port( 0 ); - } - } // if (listen_failed) - } // for(;;) - } // if (listen_endpoint.port() != 0) - - - _tcp_server.set_reuse_address(); - try - { - if( ep.get_address() != fc::ip::address() ) - _tcp_server.listen( ep ); - else - _tcp_server.listen( ep.port() ); - - _actual_listening_endpoint = _tcp_server.get_local_endpoint(); - ilog( "listening for connections on endpoint ${endpoint} (our first choice)", - ( "endpoint", _actual_listening_endpoint ) ); - } - catch ( fc::exception& e ) - { - FC_RETHROW_EXCEPTION( e, error, - "unable to listen on ${endpoint}", ("endpoint",listen_endpoint ) ); - } - } - - - -} } diff --git a/libraries/p2p/peer_connection.cpp b/libraries/p2p/peer_connection.cpp deleted file mode 100644 index 605113b1..00000000 --- a/libraries/p2p/peer_connection.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include - -namespace graphene { namespace p2p { - -} } //graphene::p2p - - diff --git a/libraries/p2p/stcp_socket.cpp b/libraries/p2p/stcp_socket.cpp deleted file mode 100644 index 7112cc34..00000000 --- a/libraries/p2p/stcp_socket.cpp +++ /dev/null @@ -1,181 +0,0 @@ -/* - * Copyright (c) 2015, Cryptonomex, Inc. - * All rights reserved. - * - * This source code is provided for evaluation in private test networks only, until September 8, 2015. After this date, this license expires and - * the code may not be used, modified or distributed for any purpose. Redistribution and use in source and binary forms, with or without modification, - * are permitted until September 8, 2015, provided that the following conditions are met: - * - * 1. The code and/or derivative works are used only for private test networks consisting of no more than 10 P2P nodes. - * - * 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 - -#include -#include -#include -#include -#include -#include - -#include - -namespace graphene { namespace p2p { - -stcp_socket::stcp_socket() -//:_buf_len(0) -#ifndef NDEBUG - : _read_buffer_in_use(false), - _write_buffer_in_use(false) -#endif -{ -} -stcp_socket::~stcp_socket() -{ -} - -void stcp_socket::do_key_exchange() -{ - _priv_key = fc::ecc::private_key::generate(); - fc::ecc::public_key pub = _priv_key.get_public_key(); - fc::ecc::public_key_data s = pub.serialize(); - std::shared_ptr serialized_key_buffer(new char[sizeof(fc::ecc::public_key_data)], [](char* p){ delete[] p; }); - memcpy(serialized_key_buffer.get(), (char*)&s, sizeof(fc::ecc::public_key_data)); - _sock.write( serialized_key_buffer, sizeof(fc::ecc::public_key_data) ); - _sock.read( serialized_key_buffer, sizeof(fc::ecc::public_key_data) ); - fc::ecc::public_key_data rpub; - memcpy((char*)&rpub, serialized_key_buffer.get(), sizeof(fc::ecc::public_key_data)); - - _shared_secret = _priv_key.get_shared_secret( rpub ); -// ilog("shared secret ${s}", ("s", shared_secret) ); - _send_aes.init( fc::sha256::hash( (char*)&_shared_secret, sizeof(_shared_secret) ), - fc::city_hash_crc_128((char*)&_shared_secret,sizeof(_shared_secret) ) ); - _recv_aes.init( fc::sha256::hash( (char*)&_shared_secret, sizeof(_shared_secret) ), - fc::city_hash_crc_128((char*)&_shared_secret,sizeof(_shared_secret) ) ); -} - - -void stcp_socket::connect_to( const fc::ip::endpoint& remote_endpoint ) -{ - _sock.connect_to( remote_endpoint ); - do_key_exchange(); -} - -void stcp_socket::bind( const fc::ip::endpoint& local_endpoint ) -{ - _sock.bind(local_endpoint); -} - -/** - * This method must read at least 16 bytes at a time from - * the underlying TCP socket so that it can decrypt them. It - * will buffer any left-over. - */ -size_t stcp_socket::readsome( char* buffer, size_t len ) -{ try { - assert( len > 0 && (len % 16) == 0 ); - -#ifndef NDEBUG - // This code was written with the assumption that you'd only be making one call to readsome - // at a time so it reuses _read_buffer. If you really need to make concurrent calls to - // readsome(), you'll need to prevent reusing _read_buffer here - struct check_buffer_in_use { - bool& _buffer_in_use; - check_buffer_in_use(bool& buffer_in_use) : _buffer_in_use(buffer_in_use) { assert(!_buffer_in_use); _buffer_in_use = true; } - ~check_buffer_in_use() { assert(_buffer_in_use); _buffer_in_use = false; } - } buffer_in_use_checker(_read_buffer_in_use); -#endif - - const size_t read_buffer_length = 4096; - if (!_read_buffer) - _read_buffer.reset(new char[read_buffer_length], [](char* p){ delete[] p; }); - - len = std::min(read_buffer_length, len); - - size_t s = _sock.readsome( _read_buffer, len, 0 ); - if( s % 16 ) - { - _sock.read(_read_buffer, 16 - (s%16), s); - s += 16-(s%16); - } - _recv_aes.decode( _read_buffer.get(), s, buffer ); - return s; -} FC_RETHROW_EXCEPTIONS( warn, "", ("len",len) ) } - -size_t stcp_socket::readsome( const std::shared_ptr& buf, size_t len, size_t offset ) -{ - return readsome(buf.get() + offset, len); -} - -bool stcp_socket::eof()const -{ - return _sock.eof(); -} - -size_t stcp_socket::writesome( const char* buffer, size_t len ) -{ try { - assert( len > 0 && (len % 16) == 0 ); - -#ifndef NDEBUG - // This code was written with the assumption that you'd only be making one call to writesome - // at a time so it reuses _write_buffer. If you really need to make concurrent calls to - // writesome(), you'll need to prevent reusing _write_buffer here - struct check_buffer_in_use { - bool& _buffer_in_use; - check_buffer_in_use(bool& buffer_in_use) : _buffer_in_use(buffer_in_use) { assert(!_buffer_in_use); _buffer_in_use = true; } - ~check_buffer_in_use() { assert(_buffer_in_use); _buffer_in_use = false; } - } buffer_in_use_checker(_write_buffer_in_use); -#endif - - const std::size_t write_buffer_length = 4096; - if (!_write_buffer) - _write_buffer.reset(new char[write_buffer_length], [](char* p){ delete[] p; }); - len = std::min(write_buffer_length, len); - memset(_write_buffer.get(), 0, len); // just in case aes.encode screws up - /** - * every sizeof(crypt_buf) bytes the aes channel - * has an error and doesn't decrypt properly... disable - * for now because we are going to upgrade to something - * better. - */ - uint32_t ciphertext_len = _send_aes.encode( buffer, len, _write_buffer.get() ); - assert(ciphertext_len == len); - _sock.write( _write_buffer, ciphertext_len ); - return ciphertext_len; -} FC_RETHROW_EXCEPTIONS( warn, "", ("len",len) ) } - -size_t stcp_socket::writesome( const std::shared_ptr& buf, size_t len, size_t offset ) -{ - return writesome(buf.get() + offset, len); -} - -void stcp_socket::flush() -{ - _sock.flush(); -} - - -void stcp_socket::close() -{ - try - { - _sock.close(); - }FC_RETHROW_EXCEPTIONS( warn, "error closing stcp socket" ); -} - -void stcp_socket::accept() -{ - do_key_exchange(); -} - - -}} // namespace graphene::p2p - From e5106c15a376c3ee71d72aa7a19278ba5b43a4b0 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Wed, 26 Aug 2015 18:01:48 -0400 Subject: [PATCH 246/353] update subscribe callback --- libraries/app/api.cpp | 164 ++++++++---------- libraries/app/include/graphene/app/api.hpp | 42 ++--- .../delayed_node/delayed_node_plugin.cpp | 20 ++- libraries/wallet/wallet.cpp | 15 +- programs/CMakeLists.txt | 2 +- 5 files changed, 100 insertions(+), 143 deletions(-) diff --git a/libraries/app/api.cpp b/libraries/app/api.cpp index ef7f3a13..e851258c 100644 --- a/libraries/app/api.cpp +++ b/libraries/app/api.cpp @@ -52,8 +52,44 @@ namespace graphene { namespace app { elog("freeing database api ${x}", ("x",int64_t(this)) ); } + void database_api::set_subscribe_callback( std::function cb, bool clear_filter ) + { + edump((clear_filter)); + _subscribe_callback = cb; + if( clear_filter || !cb ) + { + static fc::bloom_parameters param; + param.projected_element_count = 10000; + param.false_positive_probability = 1.0/10000; + param.maximum_size = 1024*8*8*2; + _subscribe_filter = fc::bloom_filter(param); + } + } + + void database_api::subscribe_to_id( object_id_type id )const + { + idump((id)); + if( _subscribe_callback ) + _subscribe_filter.insert( (const unsigned char*)&id, sizeof(id) ); + else + elog( "unable to subscribe to id because there is no subscribe callback set" ); + } fc::variants database_api::get_objects(const vector& ids)const { + if( _subscribe_callback ) { + for( auto id : ids ) + { + if( id.type() == operation_history_object_type && id.space() == protocol_ids ) continue; + if( id.type() == impl_account_transaction_history_object_type && id.space() == implementation_ids ) continue; + + subscribe_to_id( id ); + } + } + else + { + elog( "getObjects without subscribe callback??" ); + } + fc::variants result; result.reserve(ids.size()); @@ -150,7 +186,10 @@ namespace graphene { namespace app { std::transform(account_ids.begin(), account_ids.end(), std::back_inserter(result), [this](account_id_type id) -> optional { if(auto o = _db.find(id)) + { + subscribe_to_id( id ); return *o; + } return {}; }); return result; @@ -162,7 +201,10 @@ namespace graphene { namespace app { std::transform(asset_ids.begin(), asset_ids.end(), std::back_inserter(result), [this](asset_id_type id) -> optional { if(auto o = _db.find(id)) + { + subscribe_to_id( id ); return *o; + } return {}; }); return result; @@ -182,35 +224,17 @@ namespace graphene { namespace app { for( auto itr = accounts_by_name.lower_bound(lower_bound_name); limit-- && itr != accounts_by_name.end(); ++itr ) + { result.insert(make_pair(itr->name, itr->get_id())); + if( limit == 1 ) + subscribe_to_id( itr->get_id() ); + } return result; } - void database_api::unsubscribe_from_accounts( const vector& names_or_ids ) - { - for (const std::string& account_name_or_id : names_or_ids) - { - const account_object* account = nullptr; - if (std::isdigit(account_name_or_id[0])) - account = _db.find(fc::variant(account_name_or_id).as()); - else - { - const auto& idx = _db.get_index_type().indices().get(); - auto itr = idx.find(account_name_or_id); - if (itr != idx.end()) - account = &*itr; - } - if (account == nullptr) - continue; - _account_subscriptions.erase(account->id); - } - } - - std::map database_api::get_full_accounts(std::function callback, - const vector& names_or_ids, bool subscribe) + std::map database_api::get_full_accounts( const vector& names_or_ids, bool subscribe) { - FC_ASSERT( _account_subscriptions.size() < 1024 ); std::map results; for (const std::string& account_name_or_id : names_or_ids) @@ -231,12 +255,7 @@ namespace graphene { namespace app { if( subscribe ) { ilog( "subscribe to ${id}", ("id",account->name) ); - _account_subscriptions[account->id] = callback; - } - else - { - wlog( "unsubscribe to ${id}", ("id",account->name) ); - _account_subscriptions.erase(account->id); + subscribe_to_id( account->id ); } // fc::mutable_variant_object full_account; @@ -795,7 +814,7 @@ namespace graphene { namespace app { /// we need to ensure the database_api is not deleted for the life of the async operation auto capture_this = shared_from_this(); - if( _account_subscriptions.size() ) + if( _subscribe_callback ) { map > broadcast_queue; for( const auto& obj : objs ) @@ -803,24 +822,21 @@ namespace graphene { namespace app { auto relevant = get_relevant_accounts( obj ); for( const auto& r : relevant ) { - auto sub = _account_subscriptions.find(r); - if( sub != _account_subscriptions.end() ) + if( _subscribe_filter.contains(r) ) broadcast_queue[r].emplace_back(obj->to_variant()); } + if( relevant.size() == 0 && _subscribe_filter.contains(obj->id) ) + broadcast_queue[account_id_type()].emplace_back(obj->to_variant()); } if( broadcast_queue.size() ) { fc::async([capture_this,broadcast_queue,this](){ - for( const auto& item : broadcast_queue ) - { - auto sub = _account_subscriptions.find(item.first); - if( sub != _account_subscriptions.end() ) - sub->second( fc::variant(item.second ) ); - } + _subscribe_callback( fc::variant(broadcast_queue) ); }); } } + if( _market_subscriptions.size() ) { map< pair, vector > broadcast_queue; @@ -850,16 +866,14 @@ namespace graphene { namespace app { void database_api::on_objects_changed(const vector& ids) { - vector my_objects; - map > broadcast_queue; + vector updates; map< pair, vector > market_broadcast_queue; + + idump((ids)); for(auto id : ids) { - if(_subscriptions.find(id) != _subscriptions.end()) - my_objects.push_back(id); - const object* obj = nullptr; - if( _account_subscriptions.size() ) + if( _subscribe_callback ) { obj = _db.find_object( id ); if( obj ) @@ -867,18 +881,23 @@ namespace graphene { namespace app { vector relevant = get_relevant_accounts( obj ); for( const auto& r : relevant ) { - auto sub = _account_subscriptions.find(r); - if( sub != _account_subscriptions.end() ) - broadcast_queue[r].emplace_back(obj->to_variant()); + if( _subscribe_filter.contains(r) ) + updates.emplace_back(obj->to_variant()); } + if( relevant.size() == 0 && _subscribe_filter.contains(obj->id) ) + updates.emplace_back(obj->to_variant()); } else - elog( "unable to find object ${id}", ("id",id) ); + { + if( _subscribe_filter.contains(id) ) + updates.emplace_back(id); // send just the id to indicate removal + } } if( _market_subscriptions.size() ) { - if( !_account_subscriptions.size() ) obj = _db.find_object( id ); + if( !_subscribe_callback ) + obj = _db.find_object( id ); if( obj ) { const limit_order_object* order = dynamic_cast(obj); @@ -897,42 +916,15 @@ namespace graphene { namespace app { /// pushing the future back / popping the prior future if it is complete. /// if a connection hangs then this could get backed up and result in /// a failure to exit cleanly. - fc::async([capture_this,this,broadcast_queue,market_broadcast_queue,my_objects](){ - for( const auto& item : broadcast_queue ) - { - edump( (item) ); - try { - auto sub = _account_subscriptions.find(item.first); - if( sub != _account_subscriptions.end() ) - sub->second( fc::variant(item.second ) ); - } catch ( const fc::exception& e ) - { - edump((e.to_detail_string())); - } - } + fc::async([capture_this,this,updates,market_broadcast_queue](){ + if( _subscribe_callback ) _subscribe_callback( updates ); + for( const auto& item : market_broadcast_queue ) { auto sub = _market_subscriptions.find(item.first); if( sub != _market_subscriptions.end() ) sub->second( fc::variant(item.second ) ); } - for(auto id : my_objects) - { - // just incase _usbscriptions changed between filter and broadcast - auto itr = _subscriptions.find( id ); - if( itr != _subscriptions.end() ) - { - const object* obj = _db.find_object( id ); - if( obj != nullptr ) - { - itr->second(obj->to_variant()); - } - else - { - itr->second(fc::variant(id)); - } - } - } }); } @@ -980,20 +972,6 @@ namespace graphene { namespace app { }); } - - vector database_api::subscribe_to_objects( const std::function& callback, const vector& ids) - { - FC_ASSERT( _subscriptions.size() < 1024 ); - for(auto id : ids) _subscriptions[id] = callback; - return get_objects( ids ); - } - - bool database_api::unsubscribe_from_objects(const vector& ids) - { - for(auto id : ids) _subscriptions.erase(id); - return true; - } - void database_api::subscribe_to_market(std::function callback, asset_id_type a, asset_id_type b) { if(a > b) std::swap(a,b); diff --git a/libraries/app/include/graphene/app/api.hpp b/libraries/app/include/graphene/app/api.hpp index 04ad5cfb..0d459bf5 100644 --- a/libraries/app/include/graphene/app/api.hpp +++ b/libraries/app/include/graphene/app/api.hpp @@ -40,6 +40,7 @@ #include #include +#include namespace graphene { namespace app { using namespace graphene::chain; @@ -176,13 +177,8 @@ namespace graphene { namespace app { * ignored. All other accounts will be retrieved and subscribed. * */ - std::map get_full_accounts(std::function callback, - const vector& names_or_ids, bool subscribe ); + std::map get_full_accounts( const vector& names_or_ids, bool subscribe ); - /** - * Stop receiving updates generated by get_full_accounts() - */ - void unsubscribe_from_accounts( const vector& names_or_ids ); /** * @brief Get limit orders in a given market @@ -277,24 +273,6 @@ namespace graphene { namespace app { */ vector> get_committee_members(const vector& committee_member_ids)const; - /** - * @group Push Notification Methods - * These methods may be used to get push notifications whenever an object or market is changed - * @{ - */ - /** - * @brief Request notifications when some object(s) change - * @param callback Callback method which is called with the new version of a changed object - * @param ids The set of object IDs to watch - * @return get_objects(ids) - */ - vector subscribe_to_objects(const std::function& callback, - const vector& ids); - /** - * @brief Stop receiving notifications for some object(s) - * @param ids The set of object IDs to stop watching - */ - bool unsubscribe_from_objects(const vector& ids); /** * @brief Request notification when the active orders in the market between two assets changes * @param callback Callback method which is called when the market changes @@ -318,7 +296,7 @@ namespace graphene { namespace app { * This unsubscribes from all subscribed markets and objects. */ void cancel_all_subscriptions() - { _subscriptions.clear(); _market_subscriptions.clear(); } + { set_subscribe_callback( std::function(), true); _market_subscriptions.clear(); } ///@} /// @brief Get a hexdump of the serialized binary form of a transaction @@ -377,18 +355,22 @@ namespace graphene { namespace app { */ vector get_required_fees( const vector& ops, asset_id_type id = asset_id_type() )const; + void set_subscribe_callback( std::function cb, bool clear_filter ); private: + void subscribe_to_id( object_id_type id )const; + /** called every time a block is applied to report the objects that were changed */ void on_objects_changed(const vector& ids); void on_objects_removed(const vector& objs); void on_applied_block(); + mutable fc::bloom_filter _subscribe_filter; + std::function _subscribe_callback; + boost::signals2::scoped_connection _change_connection; boost::signals2::scoped_connection _removed_connection; boost::signals2::scoped_connection _applied_block_connection; - map > _subscriptions; - map > _account_subscriptions; - map< pair, std::function > _market_subscriptions; + map< pair, std::function > _market_subscriptions; graphene::chain::database& _db; }; @@ -561,7 +543,6 @@ FC_API(graphene::app::database_api, (get_account_count) (lookup_accounts) (get_full_accounts) - (unsubscribe_from_accounts) (get_account_balances) (get_named_account_balances) (lookup_asset_symbols) @@ -577,8 +558,6 @@ FC_API(graphene::app::database_api, (get_witness_count) (lookup_witness_accounts) (lookup_committee_member_accounts) - (subscribe_to_objects) - (unsubscribe_from_objects) (subscribe_to_market) (unsubscribe_from_market) (cancel_all_subscriptions) @@ -594,6 +573,7 @@ FC_API(graphene::app::database_api, (verify_authority) (get_blinded_balances) (get_required_fees) + (set_subscribe_callback) ) FC_API(graphene::app::history_api, (get_account_history) diff --git a/libraries/plugins/delayed_node/delayed_node_plugin.cpp b/libraries/plugins/delayed_node/delayed_node_plugin.cpp index d0461a39..be5cbe2a 100644 --- a/libraries/plugins/delayed_node/delayed_node_plugin.cpp +++ b/libraries/plugins/delayed_node/delayed_node_plugin.cpp @@ -97,14 +97,26 @@ void delayed_node_plugin::plugin_startup() try { connect(); + my->database_api->set_subscribe_callback([this] (const fc::variant& v) { + auto& updates = v.get_array(); + for( const auto& v : updates ) + { + if( v.is_object() ) + { + auto& obj = v.get_object(); + if( obj["id"].as() == graphene::chain::dynamic_global_property_id_type() ) + { + auto props = v.as(); + sync_with_trusted_node(props.head_block_number); + } + } + } + }, true); + // Go ahead and get in sync now, before subscribing chain::dynamic_global_property_object props = my->database_api->get_dynamic_global_properties(); sync_with_trusted_node(props.head_block_number); - my->database_api->subscribe_to_objects([this] (const fc::variant& v) { - auto props = v.as(); - sync_with_trusted_node(props.head_block_number); - }, {graphene::chain::dynamic_global_property_id_type()}); return; } catch (const fc::exception& e) { elog("Error during connection: ${e}", ("e", e.to_detail_string())); diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp index b61c752c..cf9ab236 100644 --- a/libraries/wallet/wallet.cpp +++ b/libraries/wallet/wallet.cpp @@ -375,10 +375,6 @@ public: ("chain_id", _chain_id) ); } init_prototype_ops(); - _remote_db->subscribe_to_objects( [=]( const fc::variant& obj ) - { - fc::async([this]{resync();}, "Resync after block"); - }, {dynamic_global_property_id_type()} ); _wallet.chain_id = _chain_id; _wallet.ws_server = initial_data.ws_server; _wallet.ws_user = initial_data.ws_user; @@ -629,10 +625,7 @@ public: _keys[wif_pub_key] = wif_key; - if( _wallet.update_account(account) ) - _remote_db->subscribe_to_objects([this](const fc::variant& v) { - _wallet.update_account(v.as()); - }, {account.id}); + _wallet.update_account(account); _wallet.extra_keys[account.id].insert(wif_pub_key); @@ -649,17 +642,11 @@ public: if( ! fc::exists( wallet_filename ) ) return false; - if( !_wallet.my_accounts.empty() ) - _remote_db->unsubscribe_from_objects(_wallet.my_account_ids()); _wallet = fc::json::from_file( wallet_filename ).as< wallet_data >(); if( _wallet.chain_id != _chain_id ) FC_THROW( "Wallet chain ID does not match", ("wallet.chain_id", _wallet.chain_id) ("chain_id", _chain_id) ); - if( !_wallet.my_accounts.empty() ) - _remote_db->subscribe_to_objects([this](const fc::variant& v) { - _wallet.update_account(v.as()); - }, _wallet.my_account_ids()); return true; } void save_wallet_file(string wallet_filename = "") diff --git a/programs/CMakeLists.txt b/programs/CMakeLists.txt index 75bb6af3..ab267cb1 100644 --- a/programs/CMakeLists.txt +++ b/programs/CMakeLists.txt @@ -6,7 +6,7 @@ add_subdirectory( size_checker ) set(BUILD_QT_GUI FALSE CACHE BOOL "Build the Qt-based light client GUI") if(BUILD_QT_GUI) - add_subdirectory(light_client) +# add_subdirectory(light_client) endif() set(BUILD_WEB_NODE FALSE CACHE BOOL "Build the Qt-based full node with web GUI") if(BUILD_WEB_NODE) From 013033001fc0ca7d75316e043eae7b7451afa37b Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 26 Aug 2015 18:13:58 -0400 Subject: [PATCH 247/353] Don't infinitely recurse when block generation fails #261 --- libraries/chain/db_block.cpp | 44 +++++++++++++++---- .../chain/include/graphene/chain/database.hpp | 3 +- 2 files changed, 38 insertions(+), 9 deletions(-) diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index a78fb506..c3e6408d 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -242,7 +242,7 @@ signed_block database::generate_block( signed_block result; with_skip_flags( skip, [&]() { - result = _generate_block( when, witness_id, block_signing_private_key ); + result = _generate_block( when, witness_id, block_signing_private_key, true ); } ); return result; } @@ -250,7 +250,8 @@ signed_block database::generate_block( signed_block database::_generate_block( fc::time_point_sec when, witness_id_type witness_id, - const fc::ecc::private_key& block_signing_private_key + const fc::ecc::private_key& block_signing_private_key, + bool retry_on_failure ) { try { @@ -280,18 +281,45 @@ signed_block database::_generate_block( bool failed = false; try { push_block( tmp, skip ); } catch ( const undo_database_exception& e ) { throw; } - catch ( const fc::exception& e ) { failed = true; } + catch ( const fc::exception& e ) + { + if( !retry_on_failure ) + { + failed = true; + } + else + { + wlog( "Reason for block production failure: ${e}", ("e",e) ); + throw; + } + } if( failed ) { + uint32_t failed_tx_count = 0; for( const auto& trx : tmp.transactions ) { - try { - push_transaction( trx, skip ); - } catch ( const fc::exception& e ) { - wlog( "Transaction is no longer valid: ${trx}", ("trx",trx) ); + try + { + push_transaction( trx, skip ); + } + catch ( const fc::exception& e ) + { + wlog( "Transaction is no longer valid: ${trx}", ("trx",trx) ); + failed_tx_count++; } } - return _generate_block( when, witness_id, block_signing_private_key ); + if( failed_tx_count == 0 ) + { + // + // this is in generate_block() so this intensive logging + // (dumping a whole block) should be rate-limited + // to once per block production attempt + // + // TODO: Turn this off again once #261 is resolved. + // + wlog( "Block creation failed even though all tx's are still valid. Block: ${b}", ("b",tmp) ); + } + return _generate_block( when, witness_id, block_signing_private_key, false ); } return tmp; } FC_CAPTURE_AND_RETHROW( (witness_id) ) } diff --git a/libraries/chain/include/graphene/chain/database.hpp b/libraries/chain/include/graphene/chain/database.hpp index ec197889..66c859e9 100644 --- a/libraries/chain/include/graphene/chain/database.hpp +++ b/libraries/chain/include/graphene/chain/database.hpp @@ -164,7 +164,8 @@ namespace graphene { namespace chain { signed_block _generate_block( const fc::time_point_sec when, witness_id_type witness_id, - const fc::ecc::private_key& block_signing_private_key + const fc::ecc::private_key& block_signing_private_key, + bool retry_on_failure ); void pop_block(); From 761fcb3d20d7c1a5e1f53dc2672ca5fa9212c7b5 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Wed, 26 Aug 2015 18:45:06 -0400 Subject: [PATCH 248/353] fix bloom filter to set optimal parameters --- libraries/app/api.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/app/api.cpp b/libraries/app/api.cpp index 18b3311d..13df7dfc 100644 --- a/libraries/app/api.cpp +++ b/libraries/app/api.cpp @@ -62,6 +62,7 @@ namespace graphene { namespace app { param.projected_element_count = 10000; param.false_positive_probability = 1.0/10000; param.maximum_size = 1024*8*8*2; + param.compute_optimal_parameters(); _subscribe_filter = fc::bloom_filter(param); } } From 4a350a5c0cc93aa197c13e80f7e15294b41a2ffb Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 26 Aug 2015 18:59:19 -0400 Subject: [PATCH 249/353] Initialize recently_missed_count to 0 if slots were missed at genesis --- libraries/chain/db_update.cpp | 4 +++- libraries/plugins/witness/witness.cpp | 25 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/libraries/chain/db_update.cpp b/libraries/chain/db_update.cpp index e4f8ab86..8c7a00ae 100644 --- a/libraries/chain/db_update.cpp +++ b/libraries/chain/db_update.cpp @@ -42,7 +42,9 @@ void database::update_global_dynamic_data( const signed_block& b ) // dynamic global properties updating modify( _dgp, [&]( dynamic_global_property_object& dgp ){ - if( _checkpoints.size() && _checkpoints.rbegin()->first >= b.block_num() ) + if( BOOST_UNLIKELY( b.block_num() == 1 ) ) + dgp.recently_missed_count = 0; + else if( _checkpoints.size() && _checkpoints.rbegin()->first >= b.block_num() ) dgp.recently_missed_count = 0; else if( missed_blocks ) dgp.recently_missed_count += GRAPHENE_RECENTLY_MISSED_COUNT_INCREMENT*missed_blocks; diff --git a/libraries/plugins/witness/witness.cpp b/libraries/plugins/witness/witness.cpp index 9290837d..3b646f97 100644 --- a/libraries/plugins/witness/witness.cpp +++ b/libraries/plugins/witness/witness.cpp @@ -26,12 +26,35 @@ #include #include +#include + using namespace graphene::witness_plugin; using std::string; using std::vector; namespace bpo = boost::program_options; +void new_chain_banner( const graphene::chain::database& db ) +{ + std::cerr << "\n" + "********************************\n" + "* *\n" + "* ------- NEW CHAIN ------ *\n" + "* - Welcome to Graphene! - *\n" + "* ------------------------ *\n" + "* *\n" + "********************************\n" + "\n"; + if( db.get_slot_at_time( graphene::time::now() ) > 200 ) + { + std::cerr << "Your genesis seems to have an old timestamp\n" + "Please consider using a script to produce a genesis file with a recent timestamp\n" + "\n" + ; + } + return; +} + void witness_plugin::plugin_set_program_options( boost::program_options::options_description& command_line_options, boost::program_options::options_description& config_file_options) @@ -138,6 +161,8 @@ void witness_plugin::plugin_startup() { ilog("Launching block production for ${n} witnesses.", ("n", _witnesses.size())); app().set_block_production(true); + if( _production_enabled && (d.head_block_num() == 0) ) + new_chain_banner(d); schedule_next_production(d.get_global_properties().parameters); } else elog("No witnesses configured! Please add witness IDs and private keys to configuration."); From df3318efc6d6bbde5aee9b9ab4c5fe264c60a5af Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Thu, 27 Aug 2015 09:08:38 -0400 Subject: [PATCH 250/353] adding extra checks for unusual failure of get_scheduled_witness --- libraries/app/api.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libraries/app/api.cpp b/libraries/app/api.cpp index 13df7dfc..b0fab7fe 100644 --- a/libraries/app/api.cpp +++ b/libraries/app/api.cpp @@ -823,7 +823,10 @@ namespace graphene { namespace app { for( const auto& r : relevant ) { if( _subscribe_filter.contains(r) ) + { broadcast_queue[r].emplace_back(obj->to_variant()); + break; + } } if( relevant.size() == 0 && _subscribe_filter.contains(obj->id) ) broadcast_queue[account_id_type()].emplace_back(obj->to_variant()); @@ -882,7 +885,10 @@ namespace graphene { namespace app { for( const auto& r : relevant ) { if( _subscribe_filter.contains(r) ) + { updates.emplace_back(obj->to_variant()); + break; + } } if( relevant.size() == 0 && _subscribe_filter.contains(obj->id) ) updates.emplace_back(obj->to_variant()); From b8e16e2e9468f071dac871581beb342bd58457cc Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Thu, 27 Aug 2015 10:45:44 -0400 Subject: [PATCH 251/353] fix object id math --- libraries/db/include/graphene/db/object_id.hpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libraries/db/include/graphene/db/object_id.hpp b/libraries/db/include/graphene/db/object_id.hpp index 84428c7e..b195e8c3 100644 --- a/libraries/db/include/graphene/db/object_id.hpp +++ b/libraries/db/include/graphene/db/object_id.hpp @@ -54,6 +54,9 @@ namespace graphene { namespace db { object_id_type& operator++(int) { ++number; return *this; } object_id_type& operator++() { ++number; return *this; } + friend object_id_type operator+(const object_id a, int delta ) { + return object_id_type( space(), type(), instance() + delta ); + } friend size_t hash_value( object_id_type v ) { return std::hash()(v.number); } friend bool operator < ( const object_id_type& a, const object_id_type& b ) @@ -83,6 +86,9 @@ namespace graphene { namespace db { object_id( object_id_type id ):instance(id.instance()) { } + + friend object_id operator+(const object_id a, int delta ) { return object_id( instance+delta ); } + operator object_id_type()const { return object_id_type( SpaceID, TypeID, instance.value ); } operator uint64_t()const { return object_id_type( *this ).number; } From 3bc66e31a21d160073648f3dcef92266a975ea82 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Thu, 27 Aug 2015 10:46:09 -0400 Subject: [PATCH 252/353] potential fix and extra debugging for get_scheduled_witness --- libraries/chain/db_witness_schedule.cpp | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/libraries/chain/db_witness_schedule.cpp b/libraries/chain/db_witness_schedule.cpp index d12bf69e..2174a19f 100644 --- a/libraries/chain/db_witness_schedule.cpp +++ b/libraries/chain/db_witness_schedule.cpp @@ -45,12 +45,11 @@ witness_id_type database::get_scheduled_witness( uint32_t slot_num )const const flat_set< witness_id_type >& active_witnesses = get_global_properties().active_witnesses; uint32_t n = active_witnesses.size(); - uint64_t min_witness_separation = (n / 2)+1; + uint64_t min_witness_separation = (n / 2); /// should work in cases where n is 0,1, and 2 uint64_t current_aslot = get_dynamic_global_properties().current_aslot + slot_num; uint64_t start_of_current_round_aslot = current_aslot - (current_aslot % n); - uint64_t first_ineligible_aslot = std::min( - start_of_current_round_aslot, current_aslot - min_witness_separation ); + uint64_t first_ineligible_aslot = std::min( start_of_current_round_aslot + 1, current_aslot - min_witness_separation ); // // overflow analysis of above subtraction: // @@ -76,7 +75,9 @@ witness_id_type database::get_scheduled_witness( uint32_t slot_num )const if( wit.last_aslot >= first_ineligible_aslot ) continue; - uint64_t k = now_hi + uint64_t(wit_id); + /// High performance random generator + /// http://xorshift.di.unimi.it/ + uint64_t k = now_hi + uint64_t(wit_id)*2685821657736338717ULL; k ^= (k >> 12); k ^= (k << 25); k ^= (k >> 27); @@ -93,8 +94,17 @@ witness_id_type database::get_scheduled_witness( uint32_t slot_num )const // at most K elements are susceptible to the filter, // otherwise we have an inconsistent database (such as // wit.last_aslot values that are non-unique or in the future) + if( !success ) { + edump((best_k)(slot_num)(first_ineligible_aslot)(current_aslot)(start_of_current_round_aslot)(min_witness_separation)(active_witnesses.size())); - assert( success ); + for( const witness_id_type& wit_id : active_witnesses ) + { + const witness_object& wit = wit_id(*this); + if( wit.last_aslot >= first_ineligible_aslot ) + idump((wit_id)(wit.last_aslot)); + } + assert( success ); + } return best_wit; } From 363a7fbeb159d72923916e9002f30ecbc4fb5dca Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Thu, 27 Aug 2015 15:23:04 -0400 Subject: [PATCH 253/353] embed_genesis: Update program name in status messages --- libraries/egenesis/embed_genesis.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/egenesis/embed_genesis.cpp b/libraries/egenesis/embed_genesis.cpp index 423fb46d..0413e568 100644 --- a/libraries/egenesis/embed_genesis.cpp +++ b/libraries/egenesis/embed_genesis.cpp @@ -196,7 +196,7 @@ void load_genesis( if( options.count("genesis-json") ) { fc::path genesis_json_filename = get_path( options, "genesis-json" ); - std::cerr << "chain_identifier: Reading genesis from file " << genesis_json_filename.preferred_string() << "\n"; + std::cerr << "embed_genesis: Reading genesis from file " << genesis_json_filename.preferred_string() << "\n"; info.genesis_json = std::string(); read_file_contents( genesis_json_filename, *info.genesis_json ); } @@ -206,7 +206,7 @@ void load_genesis( if( options.count("chain-id") ) { std::string chain_id_str = options["chain-id"].as(); - std::cerr << "chain_identifier: Genesis ID from argument is " << chain_id_str << "\n"; + std::cerr << "embed_genesis: Genesis ID from argument is " << chain_id_str << "\n"; info.chain_id = chain_id_str; } return; @@ -230,7 +230,7 @@ int main( int argc, char** argv ) } catch (const boost::program_options::error& e) { - std::cerr << "chain_identifier: error parsing command line: " << e.what() << "\n"; + std::cerr << "embed_genesis: error parsing command line: " << e.what() << "\n"; return 1; } @@ -260,11 +260,11 @@ int main( int argc, char** argv ) for( const std::string& src_dest : options["tmplsub"].as< std::vector< std::string > >() ) { - std::cerr << "chain_identifier: parsing tmplsub parameter \"" << src_dest << "\"\n"; + std::cerr << "embed_genesis: parsing tmplsub parameter \"" << src_dest << "\"\n"; size_t pos = src_dest.find( "---" ); if( pos == std::string::npos ) { - std::cerr << "chain_identifier: could not parse tmplsub parameter: '---' not found\n"; + std::cerr << "embed_genesis: could not parse tmplsub parameter: '---' not found\n"; main_return = 1; continue; } From 40fce42421f4057ea60f8d11b4ce86c6cd68d088 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Thu, 27 Aug 2015 14:56:52 -0400 Subject: [PATCH 254/353] db_witness_schedule.cpp: Fix min_witness_separation computation (again) --- libraries/chain/db_witness_schedule.cpp | 28 +++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/libraries/chain/db_witness_schedule.cpp b/libraries/chain/db_witness_schedule.cpp index 29ffeb7b..ebfbcae4 100644 --- a/libraries/chain/db_witness_schedule.cpp +++ b/libraries/chain/db_witness_schedule.cpp @@ -45,11 +45,35 @@ witness_id_type database::get_scheduled_witness( uint32_t slot_num )const const flat_set< witness_id_type >& active_witnesses = get_global_properties().active_witnesses; uint32_t n = active_witnesses.size(); - uint64_t min_witness_separation = (n / 2); /// should work in cases where n is 0,1, and 2 + uint64_t min_witness_separation; + if( BOOST_UNLIKELY( n < 5 ) ) + { + // special-case 0 and 1. + // for 2 give a value which results in witnesses alternating slots + // when there is no missed block + // for 3-4 give values which don't lock in a single permutation + switch( n ) + { + case 0: + assert(false); + case 1: + return *active_witnesses.begin(); + case 2: + case 3: + min_witness_separation = 1; + break; + case 4: + min_witness_separation = 2; + break; + } + } + else + min_witness_separation = (n/2)+1; + uint64_t current_aslot = get_dynamic_global_properties().current_aslot + slot_num; uint64_t start_of_current_round_aslot = current_aslot - (current_aslot % n); - uint64_t first_ineligible_aslot = std::min( start_of_current_round_aslot + 1, current_aslot - min_witness_separation ); + uint64_t first_ineligible_aslot = std::min( start_of_current_round_aslot, current_aslot - min_witness_separation ); // // overflow analysis of above subtraction: // From 823adbbed588a47d1da2401bf980674f2e211902 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Thu, 27 Aug 2015 15:46:43 -0400 Subject: [PATCH 255/353] generate_empty_blocks: Create binary to generate many blocks for testing --- tests/CMakeLists.txt | 2 + tests/generate_empty_blocks/CMakeLists.txt | 15 ++ tests/generate_empty_blocks/main.cpp | 169 +++++++++++++++++++++ 3 files changed, 186 insertions(+) create mode 100644 tests/generate_empty_blocks/CMakeLists.txt create mode 100644 tests/generate_empty_blocks/main.cpp diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index b30e4357..b03d58a8 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -28,3 +28,5 @@ target_link_libraries( app_test graphene_app graphene_account_history graphene_n file(GLOB INTENSE_SOURCES "intense/*.cpp") add_executable( intense_test ${INTENSE_SOURCES} ${COMMON_SOURCES} ) target_link_libraries( intense_test graphene_chain graphene_app graphene_account_history graphene_egenesis_none fc ${PLATFORM_SPECIFIC_LIBS} ) + +add_subdirectory( generate_empty_blocks ) diff --git a/tests/generate_empty_blocks/CMakeLists.txt b/tests/generate_empty_blocks/CMakeLists.txt new file mode 100644 index 00000000..af53ee91 --- /dev/null +++ b/tests/generate_empty_blocks/CMakeLists.txt @@ -0,0 +1,15 @@ +add_executable( generate_empty_blocks main.cpp ) +if( UNIX AND NOT APPLE ) + set(rt_library rt ) +endif() + +target_link_libraries( generate_empty_blocks + PRIVATE graphene_app graphene_chain graphene_egenesis_none fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} ) + +install( TARGETS + generate_empty_blocks + + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) diff --git a/tests/generate_empty_blocks/main.cpp b/tests/generate_empty_blocks/main.cpp new file mode 100644 index 00000000..d022cb94 --- /dev/null +++ b/tests/generate_empty_blocks/main.cpp @@ -0,0 +1,169 @@ +/* + * Copyright (c) 2015, Cryptonomex, Inc. + * All rights reserved. + * + * This source code is provided for evaluation in private test networks only, until September 8, 2015. After this date, this license expires and + * the code may not be used, modified or distributed for any purpose. Redistribution and use in source and binary forms, with or without modification, + * are permitted until September 8, 2015, provided that the following conditions are met: + * + * 1. The code and/or derivative works are used only for private test networks consisting of no more than 10 P2P nodes. + * + * 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 +#include +#include + +#include +#include +#include +#include + +#include +#include +#include +#include + +#include + +#ifndef WIN32 +#include +#endif + +using namespace graphene::app; +using namespace graphene::chain; +using namespace graphene::utilities; +using namespace std; +namespace bpo = boost::program_options; + +// hack: import create_example_genesis() even though it's a way, way +// specific internal detail +namespace graphene { namespace app { namespace detail { +genesis_state_type create_example_genesis(); +} } } // graphene::app::detail + +int main( int argc, char** argv ) +{ + try + { + bpo::options_description cli_options("Graphene empty blocks"); + cli_options.add_options() + ("help,h", "Print this help message and exit.") + ("data-dir", bpo::value()->default_value("empty_blocks_data_dir"), "Directory containing generator database") + ("genesis-json,g", bpo::value(), "File to read genesis state from") + ("genesis-time,t", bpo::value()->default_value(0), "Timestamp for genesis state (0=use value from file/example)") + ("num-blocks,n", bpo::value()->default_value(1000000), "Number of blocks to generate") + ("miss-rate,r", bpo::value()->default_value(3), "Percentage of blocks to miss") + ("verbose,v", "Enter verbose mode") + ; + + bpo::variables_map options; + try + { + boost::program_options::store( boost::program_options::parse_command_line(argc, argv, cli_options), options ); + } + catch (const boost::program_options::error& e) + { + std::cerr << "empty_blocks: error parsing command line: " << e.what() << "\n"; + return 1; + } + + if( options.count("help") ) + { + std::cout << cli_options << "\n"; + return 0; + } + + fc::path data_dir; + if( options.count("data-dir") ) + { + data_dir = options["data-dir"].as(); + if( data_dir.is_relative() ) + data_dir = fc::current_path() / data_dir; + } + + genesis_state_type genesis; + if( options.count("genesis-json") ) + { + fc::path genesis_json_filename = options["genesis-json"].as(); + std::cerr << "embed_genesis: Reading genesis from file " << genesis_json_filename.preferred_string() << "\n"; + std::string genesis_json; + read_file_contents( genesis_json_filename, genesis_json ); + genesis = fc::json::from_string( genesis_json ).as< genesis_state_type >(); + } + else + genesis = graphene::app::detail::create_example_genesis(); + uint32_t timestamp = options["genesis-time"].as(); + if( timestamp != 0 ) + { + genesis.initial_timestamp = fc::time_point_sec( timestamp ); + std::cerr << "embed_genesis: Genesis timestamp is " << genesis.initial_timestamp.sec_since_epoch() << " (from CLI)\n"; + } + else + std::cerr << "embed_genesis: Genesis timestamp is " << genesis.initial_timestamp.sec_since_epoch() << " (from state)\n"; + bool verbose = (options.count("verbose") != 0); + + uint32_t num_blocks = options["num-blocks"].as(); + uint32_t miss_rate = options["miss-rate"].as(); + + fc::ecc::private_key init_account_priv_key = fc::ecc::private_key::regenerate(fc::sha256::hash(string("null_key")) ); + fc::ecc::private_key nathan_priv_key = fc::ecc::private_key::regenerate(fc::sha256::hash(string("nathan"))); + + database db; + fc::path db_path = data_dir / "db"; + db.open(db_path, [&]() { return genesis; } ); + + uint32_t slot = 1; + uint32_t missed = 0; + + for( uint32_t i = 1; i < num_blocks; ++i ) + { + signed_block b = db.generate_block(db.get_slot_time(slot), db.get_scheduled_witness(slot), nathan_priv_key, database::skip_nothing); + FC_ASSERT( db.head_block_id() == b.id() ); + fc::sha256 h = b.digest(); + uint64_t rand = h._hash[0]; + slot = 1; + while(true) + { + if( (rand % 100) < miss_rate ) + { + slot++; + rand = (rand/100) ^ h._hash[slot&3]; + missed++; + } + else + break; + } + + witness_id_type prev_witness = b.witness; + witness_id_type cur_witness = db.get_scheduled_witness(1); + if( verbose ) + { + wdump( (prev_witness)(cur_witness) ); + } + else if( (i%10000) == 0 ) + { + std::cerr << "\rblock #" << i << " missed " << missed; + } + if( slot == 1 ) // can possibly get consecutive production if block missed + { + FC_ASSERT( cur_witness != prev_witness ); + } + } + std::cerr << "\n"; + db.close(); + } + catch ( const fc::exception& e ) + { + std::cout << e.to_detail_string() << "\n"; + return 1; + } + return 0; +} From a23e2ec3fe5963aef12fd19554fb486689765112 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Fri, 28 Aug 2015 00:06:19 -0400 Subject: [PATCH 256/353] cli_wallet: Include block_id and signed_by in get_block API result #253 --- .../wallet/include/graphene/wallet/wallet.hpp | 14 +++++++++++++- libraries/wallet/wallet.cpp | 9 ++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/libraries/wallet/include/graphene/wallet/wallet.hpp b/libraries/wallet/include/graphene/wallet/wallet.hpp index f8f90978..3ebfe0f1 100644 --- a/libraries/wallet/include/graphene/wallet/wallet.hpp +++ b/libraries/wallet/include/graphene/wallet/wallet.hpp @@ -213,6 +213,15 @@ struct approval_delta vector key_approvals_to_remove; }; +struct signed_block_with_info : public signed_block +{ + signed_block_with_info( const signed_block& block ); + signed_block_with_info( const signed_block_with_info& block ) = default; + + block_id_type block_id; + fc::ecc::public_key signing_key; +}; + namespace detail { class wallet_api_impl; } @@ -232,7 +241,7 @@ class wallet_api fc::ecc::private_key derive_private_key(const std::string& prefix_string, int sequence_number) const; variant info(); - optional get_block( uint32_t num ); + optional get_block( uint32_t num ); /** Returns the number of accounts registered on the blockchain * @returns the number of registered accounts */ @@ -1302,6 +1311,9 @@ FC_REFLECT( graphene::wallet::approval_delta, (key_approvals_to_remove) ) +FC_REFLECT_DERIVED( graphene::wallet::signed_block_with_info, (graphene::chain::signed_block), + (block_id)(signing_key) ) + FC_API( graphene::wallet::wallet_api, (help) (gethelp) diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp index 44c0a7c7..c0231841 100644 --- a/libraries/wallet/wallet.cpp +++ b/libraries/wallet/wallet.cpp @@ -2096,7 +2096,7 @@ bool wallet_api::copy_wallet_file(string destination_filename) return my->copy_wallet_file(destination_filename); } -optional wallet_api::get_block(uint32_t num) +optional wallet_api::get_block(uint32_t num) { return my->_remote_db->get_block(num); } @@ -3389,6 +3389,13 @@ vector wallet_api::blind_history( string key_or_account ) return result; } +signed_block_with_info::signed_block_with_info( const signed_block& block ) + : signed_block( block ) +{ + block_id = id(); + signing_key = signee(); +} + } } // graphene::wallet void fc::to_variant(const account_multi_index_type& accts, fc::variant& vo) From c1b5eb95e11a661306f9b175217ad497989dbaf5 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Fri, 28 Aug 2015 13:58:49 -0400 Subject: [PATCH 257/353] update subscriptions to work with keys --- libraries/app/api.cpp | 63 +++++++++++++++------- libraries/app/include/graphene/app/api.hpp | 15 +++++- libraries/chain/db_witness_schedule.cpp | 2 +- 3 files changed, 59 insertions(+), 21 deletions(-) diff --git a/libraries/app/api.cpp b/libraries/app/api.cpp index b0fab7fe..dff9626d 100644 --- a/libraries/app/api.cpp +++ b/libraries/app/api.cpp @@ -67,14 +67,6 @@ namespace graphene { namespace app { } } - void database_api::subscribe_to_id( object_id_type id )const - { - idump((id)); - if( _subscribe_callback ) - _subscribe_filter.insert( (const unsigned char*)&id, sizeof(id) ); - else - elog( "unable to subscribe to id because there is no subscribe callback set" ); - } fc::variants database_api::get_objects(const vector& ids)const { if( _subscribe_callback ) { @@ -83,7 +75,7 @@ namespace graphene { namespace app { if( id.type() == operation_history_object_type && id.space() == protocol_ids ) continue; if( id.type() == impl_account_transaction_history_object_type && id.space() == implementation_ids ) continue; - subscribe_to_id( id ); + this->subscribe_to_item( id ); } } else @@ -188,7 +180,7 @@ namespace graphene { namespace app { [this](account_id_type id) -> optional { if(auto o = _db.find(id)) { - subscribe_to_id( id ); + subscribe_to_item( id ); return *o; } return {}; @@ -203,7 +195,7 @@ namespace graphene { namespace app { [this](asset_id_type id) -> optional { if(auto o = _db.find(id)) { - subscribe_to_id( id ); + subscribe_to_item( id ); return *o; } return {}; @@ -228,7 +220,7 @@ namespace graphene { namespace app { { result.insert(make_pair(itr->name, itr->get_id())); if( limit == 1 ) - subscribe_to_id( itr->get_id() ); + subscribe_to_item( itr->get_id() ); } return result; @@ -256,7 +248,7 @@ namespace graphene { namespace app { if( subscribe ) { ilog( "subscribe to ${id}", ("id",account->name) ); - subscribe_to_id( account->id ); + subscribe_to_item( account->id ); } // fc::mutable_variant_object full_account; @@ -881,6 +873,28 @@ namespace graphene { namespace app { obj = _db.find_object( id ); if( obj ) { + auto acnt = dynamic_cast(obj); + if( acnt ) + { + bool added_account = false; + for( const auto& key : acnt->owner.key_auths ) + if( is_subscribed_to_item( key.first ) ) + { + updates.emplace_back( obj->to_variant() ); + added_account = true; + break; + } + for( const auto& key : acnt->active.key_auths ) + if( is_subscribed_to_item( key.first ) ) + { + updates.emplace_back( obj->to_variant() ); + added_account = true; + break; + } + if( added_account ) + continue; + } + vector relevant = get_relevant_accounts( obj ); for( const auto& r : relevant ) { @@ -1080,11 +1094,19 @@ namespace graphene { namespace app { for( auto& key : keys ) { - address a1( pts_address(key, false, 56) ); - address a2( pts_address(key, true, 56) ); - address a3( pts_address(key, false, 0) ); - address a4( pts_address(key, true, 0) ); - address a5( key ); + + address a1( pts_address(key, false, 56) ); + address a2( pts_address(key, true, 56) ); + address a3( pts_address(key, false, 0) ); + address a4( pts_address(key, true, 0) ); + address a5( key ); + + subscribe_to_item( key ); + subscribe_to_item( a1 ); + subscribe_to_item( a2 ); + subscribe_to_item( a3 ); + subscribe_to_item( a4 ); + subscribe_to_item( a5 ); const auto& idx = _db.get_index_type(); const auto& aidx = dynamic_cast&>(idx); @@ -1113,6 +1135,10 @@ namespace graphene { namespace app { } final_result.emplace_back( std::move(result) ); } + + for( auto i : final_result ) + subscribe_to_item(i); + return final_result; } @@ -1169,6 +1195,7 @@ namespace graphene { namespace app { for( const auto& owner : addrs ) { + subscribe_to_item( owner ); auto itr = by_owner_idx.lower_bound( boost::make_tuple( owner, asset_id_type(0) ) ); while( itr != by_owner_idx.end() && itr->owner == owner ) { diff --git a/libraries/app/include/graphene/app/api.hpp b/libraries/app/include/graphene/app/api.hpp index 0d459bf5..82c82cae 100644 --- a/libraries/app/include/graphene/app/api.hpp +++ b/libraries/app/include/graphene/app/api.hpp @@ -297,7 +297,6 @@ namespace graphene { namespace app { */ void cancel_all_subscriptions() { set_subscribe_callback( std::function(), true); _market_subscriptions.clear(); } - ///@} /// @brief Get a hexdump of the serialized binary form of a transaction std::string get_transaction_hex(const signed_transaction& trx)const; @@ -357,7 +356,19 @@ namespace graphene { namespace app { void set_subscribe_callback( std::function cb, bool clear_filter ); private: - void subscribe_to_id( object_id_type id )const; + template + void subscribe_to_item( const T& i )const + { + if( !_subscribe_callback ) return; + _subscribe_filter.insert( (const char*)&i, sizeof(i) ); + } + + template + bool is_subscribed_to_item( const T& i )const + { + if( !_subscribe_callback ) return false; + return _subscribe_filter.contains( i ); + } /** called every time a block is applied to report the objects that were changed */ void on_objects_changed(const vector& ids); diff --git a/libraries/chain/db_witness_schedule.cpp b/libraries/chain/db_witness_schedule.cpp index ebfbcae4..adc7b315 100644 --- a/libraries/chain/db_witness_schedule.cpp +++ b/libraries/chain/db_witness_schedule.cpp @@ -46,7 +46,7 @@ witness_id_type database::get_scheduled_witness( uint32_t slot_num )const const flat_set< witness_id_type >& active_witnesses = get_global_properties().active_witnesses; uint32_t n = active_witnesses.size(); uint64_t min_witness_separation; - if( BOOST_UNLIKELY( n < 5 ) ) + if( GRAPHENE_DEFAULT_MIN_WITNESS_COUNT < 5 && BOOST_UNLIKELY( n < 5 ) ) { // special-case 0 and 1. // for 2 give a value which results in witnesses alternating slots From 92340a48a29f8121ab341a43e999f682cf0af161 Mon Sep 17 00:00:00 2001 From: Bruce Steedman Date: Fri, 28 Aug 2015 20:08:40 +0100 Subject: [PATCH 258/353] fix broken link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1ab2ecfa..2b1fed10 100644 --- a/README.md +++ b/README.md @@ -220,7 +220,7 @@ Questions The second number specifies the *type*. The type of the object determines what fields it has. For a complete list of type ID's, see `enum object_type` and `enum impl_object_type` in - [types.hpp](https://github.com/cryptonomex/graphene/blob/master/libraries/chain/include/graphene/chain/types.hpp). + [types.hpp](https://github.com/cryptonomex/graphene/blob/master/libraries/chain/include/graphene/chain/protocol/types.hpp). The third number specifies the *instance*. The instance of the object is different for each individual object. From 3f1b9bbb27fda41d7641071b1441a8dae53e79d3 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Mon, 31 Aug 2015 12:18:45 -0400 Subject: [PATCH 259/353] adding fix for edge case --- libraries/chain/db_witness_schedule.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/libraries/chain/db_witness_schedule.cpp b/libraries/chain/db_witness_schedule.cpp index adc7b315..22e1a074 100644 --- a/libraries/chain/db_witness_schedule.cpp +++ b/libraries/chain/db_witness_schedule.cpp @@ -72,6 +72,17 @@ witness_id_type database::get_scheduled_witness( uint32_t slot_num )const uint64_t current_aslot = get_dynamic_global_properties().current_aslot + slot_num; + if( slot_num == 0 ) // then return the witness that produced the last block + { + for( const witness_id_type& wit_id : active_witnesses ) + { + const witness_object& wit = wit_id(*this); + if( wit.last_aslot >= current_aslot ) + return wit_id; + } + } + + uint64_t start_of_current_round_aslot = current_aslot - (current_aslot % n); uint64_t first_ineligible_aslot = std::min( start_of_current_round_aslot, current_aslot - min_witness_separation ); // From 2a891ac89bae8f39ba95bc5607c25464366c22dd Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Mon, 31 Aug 2015 12:50:45 -0400 Subject: [PATCH 260/353] Revert "adding fix for edge case" This reverts commit 3f1b9bbb27fda41d7641071b1441a8dae53e79d3. --- libraries/chain/db_witness_schedule.cpp | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/libraries/chain/db_witness_schedule.cpp b/libraries/chain/db_witness_schedule.cpp index 22e1a074..adc7b315 100644 --- a/libraries/chain/db_witness_schedule.cpp +++ b/libraries/chain/db_witness_schedule.cpp @@ -72,17 +72,6 @@ witness_id_type database::get_scheduled_witness( uint32_t slot_num )const uint64_t current_aslot = get_dynamic_global_properties().current_aslot + slot_num; - if( slot_num == 0 ) // then return the witness that produced the last block - { - for( const witness_id_type& wit_id : active_witnesses ) - { - const witness_object& wit = wit_id(*this); - if( wit.last_aslot >= current_aslot ) - return wit_id; - } - } - - uint64_t start_of_current_round_aslot = current_aslot - (current_aslot % n); uint64_t first_ineligible_aslot = std::min( start_of_current_round_aslot, current_aslot - min_witness_separation ); // From f63cbe48680e324e75a28bbc2ad0ff9869e45839 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Fri, 28 Aug 2015 13:56:05 -0400 Subject: [PATCH 261/353] application.cpp: Fix compiler warning --- libraries/app/application.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp index 5c8ec195..e9e27b43 100644 --- a/libraries/app/application.cpp +++ b/libraries/app/application.cpp @@ -74,7 +74,7 @@ namespace detail { initial_state.initial_timestamp = time_point_sec(time_point::now().sec_since_epoch() / initial_state.initial_parameters.block_interval * initial_state.initial_parameters.block_interval); - for( int i = 0; i < initial_state.initial_active_witnesses; ++i ) + for( uint64_t i = 0; i < initial_state.initial_active_witnesses; ++i ) { auto name = "init"+fc::to_string(i); initial_state.initial_accounts.emplace_back(name, From 9b4e270bc47897704982cb2c41a6c643bb3cbc4c Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Fri, 28 Aug 2015 14:12:54 -0400 Subject: [PATCH 262/353] witness_node: Implement --genesis-timestamp command line parameter --- libraries/app/application.cpp | 13 +++++++++++-- libraries/plugins/witness/witness.cpp | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp index e9e27b43..856aa2d0 100644 --- a/libraries/app/application.cpp +++ b/libraries/app/application.cpp @@ -227,8 +227,16 @@ namespace detail { auto initial_state = [&] { ilog("Initializing database..."); if( _options->count("genesis-json") ) - return fc::json::from_file(_options->at("genesis-json").as()) - .as(); + { + genesis_state_type genesis = fc::json::from_file(_options->at("genesis-json").as()).as(); + if( _options->count("genesis-timestamp") ) + { + genesis.initial_timestamp = graphene::time::now() + genesis.initial_parameters.block_interval + _options->at("genesis-timestamp").as(); + genesis.initial_timestamp -= genesis.initial_timestamp.sec_since_epoch() % genesis.initial_parameters.block_interval; + std::cerr << "Used genesis timestamp: " << genesis.initial_timestamp.to_iso_string() << " (PLEASE RECORD THIS)\n"; + } + return genesis; + } else { std::string egenesis_json; @@ -612,6 +620,7 @@ void application::set_program_options(boost::program_options::options_descriptio "invalid file is found, it will be replaced with an example Genesis State.") ("replay-blockchain", "Rebuild object graph by replaying all blocks") ("resync-blockchain", "Delete all blocks and re-sync with network from scratch") + ("genesis-timestamp", bpo::value(), "Replace timestamp from genesis.json with current time plus this many seconds (experts only!)") ; command_line_options.add(_cli_options); configuration_file_options.add(_cfg_options); diff --git a/libraries/plugins/witness/witness.cpp b/libraries/plugins/witness/witness.cpp index 3b646f97..2c3619fe 100644 --- a/libraries/plugins/witness/witness.cpp +++ b/libraries/plugins/witness/witness.cpp @@ -48,7 +48,7 @@ void new_chain_banner( const graphene::chain::database& db ) if( db.get_slot_at_time( graphene::time::now() ) > 200 ) { std::cerr << "Your genesis seems to have an old timestamp\n" - "Please consider using a script to produce a genesis file with a recent timestamp\n" + "Please consider using the --genesis-timestamp option to give your genesis a recent timestamp\n" "\n" ; } From 5a923697adcaa7a9329eaf283770d2e74196d056 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Fri, 28 Aug 2015 14:46:03 -0400 Subject: [PATCH 263/353] genesis_util: Implement utility for updating keys of genesis.json witnesses / testnet dev accounts --- programs/CMakeLists.txt | 1 + programs/genesis_util/CMakeLists.txt | 29 ++++ programs/genesis_util/genesis_update.cpp | 172 +++++++++++++++++++++++ programs/genesis_util/get_dev_key.cpp | 122 ++++++++++++++++ 4 files changed, 324 insertions(+) create mode 100644 programs/genesis_util/CMakeLists.txt create mode 100644 programs/genesis_util/genesis_update.cpp create mode 100644 programs/genesis_util/get_dev_key.cpp diff --git a/programs/CMakeLists.txt b/programs/CMakeLists.txt index ab267cb1..271c1664 100644 --- a/programs/CMakeLists.txt +++ b/programs/CMakeLists.txt @@ -1,4 +1,5 @@ add_subdirectory( cli_wallet ) +add_subdirectory( genesis_util ) add_subdirectory( witness_node ) add_subdirectory( delayed_node ) add_subdirectory( js_operation_serializer ) diff --git a/programs/genesis_util/CMakeLists.txt b/programs/genesis_util/CMakeLists.txt new file mode 100644 index 00000000..1125a108 --- /dev/null +++ b/programs/genesis_util/CMakeLists.txt @@ -0,0 +1,29 @@ + +add_executable( genesis_update genesis_update.cpp ) +if( UNIX AND NOT APPLE ) + set(rt_library rt ) +endif() + +target_link_libraries( genesis_update + PRIVATE graphene_app graphene_chain graphene_egenesis_none fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} ) + +install( TARGETS + genesis_update + + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +add_executable( get_dev_key get_dev_key.cpp ) + +target_link_libraries( get_dev_key + PRIVATE graphene_app graphene_chain graphene_egenesis_none graphene_utilities fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} ) + +install( TARGETS + get_dev_key + + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) diff --git a/programs/genesis_util/genesis_update.cpp b/programs/genesis_util/genesis_update.cpp new file mode 100644 index 00000000..4923e72e --- /dev/null +++ b/programs/genesis_util/genesis_update.cpp @@ -0,0 +1,172 @@ +/* + * Copyright (c) 2015, Cryptonomex, Inc. + * All rights reserved. + * + * This source code is provided for evaluation in private test networks only, until September 8, 2015. After this date, this license expires and + * the code may not be used, modified or distributed for any purpose. Redistribution and use in source and binary forms, with or without modification, + * are permitted until September 8, 2015, provided that the following conditions are met: + * + * 1. The code and/or derivative works are used only for private test networks consisting of no more than 10 P2P nodes. + * + * 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 +#include +#include + +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include + +#ifndef WIN32 +#include +#endif + +using namespace graphene::app; +using namespace graphene::chain; +using namespace graphene::utilities; +using namespace std; +namespace bpo = boost::program_options; + +// hack: import create_example_genesis() even though it's a way, way +// specific internal detail +namespace graphene { namespace app { namespace detail { +genesis_state_type create_example_genesis(); +} } } // graphene::app::detail + +int main( int argc, char** argv ) +{ + try + { + bpo::options_description cli_options("Graphene empty blocks"); + cli_options.add_options() + ("help,h", "Print this help message and exit.") + ("genesis-json,g", bpo::value(), "File to read genesis state from") + ("out,o", bpo::value(), "File to output new genesis to") + ("dev-account-prefix", bpo::value()->default_value("devacct"), "Prefix for dev accounts") + ("dev-key-prefix", bpo::value()->default_value("devkey-"), "Prefix for dev key") + ("dev-account-count", bpo::value()->default_value(0), "Prefix for dev accounts") + ("dev-balance-count", bpo::value()->default_value(0), "Prefix for dev balances") + ("dev-balance-amount", bpo::value()->default_value(uint64_t(1000)*uint64_t(1000)*uint64_t(100000)), "Amount in each dev balance") + ; + + bpo::variables_map options; + try + { + boost::program_options::store( boost::program_options::parse_command_line(argc, argv, cli_options), options ); + } + catch (const boost::program_options::error& e) + { + std::cerr << "empty_blocks: error parsing command line: " << e.what() << "\n"; + return 1; + } + + if( options.count("help") ) + { + std::cout << cli_options << "\n"; + return 1; + } + + if( !options.count( "genesis-json" ) ) + { + std::cerr << "--genesis-json option is required\n"; + return 1; + } + + if( !options.count( "out" ) ) + { + std::cerr << "--out option is required\n"; + return 1; + } + + genesis_state_type genesis; + if( options.count("genesis-json") ) + { + fc::path genesis_json_filename = options["genesis-json"].as(); + std::cerr << "update_genesis: Reading genesis from file " << genesis_json_filename.preferred_string() << "\n"; + std::string genesis_json; + read_file_contents( genesis_json_filename, genesis_json ); + genesis = fc::json::from_string( genesis_json ).as< genesis_state_type >(); + } + else + { + std::cerr << "update_genesis: Using example genesis\n"; + genesis = graphene::app::detail::create_example_genesis(); + } + + std::string dev_key_prefix = options["dev-key-prefix"].as(); + + auto get_dev_key = [&]( std::string prefix, uint32_t i ) -> public_key_type + { + return fc::ecc::private_key::regenerate( fc::sha256::hash( dev_key_prefix + prefix + std::to_string(i) ) ).get_public_key(); + }; + + uint32_t dev_account_count = options["dev-account-count"].as(); + std::string dev_account_prefix = options["dev-account-prefix"].as(); + for(uint32_t i=0;i(); + uint64_t dev_balance_amount = options["dev-balance-amount"].as(); + for(uint32_t i=0;i name2index; + size_t num_accounts = genesis.initial_accounts.size(); + for( size_t i=0; i(); + fc::json::save_to_file( genesis, output_filename ); + } + catch ( const fc::exception& e ) + { + std::cout << e.to_detail_string() << "\n"; + return 1; + } + return 0; +} diff --git a/programs/genesis_util/get_dev_key.cpp b/programs/genesis_util/get_dev_key.cpp new file mode 100644 index 00000000..2a5b110e --- /dev/null +++ b/programs/genesis_util/get_dev_key.cpp @@ -0,0 +1,122 @@ +/* + * Copyright (c) 2015, Cryptonomex, Inc. + * All rights reserved. + * + * This source code is provided for evaluation in private test networks only, until September 8, 2015. After this date, this license expires and + * the code may not be used, modified or distributed for any purpose. Redistribution and use in source and binary forms, with or without modification, + * are permitted until September 8, 2015, provided that the following conditions are met: + * + * 1. The code and/or derivative works are used only for private test networks consisting of no more than 10 P2P nodes. + * + * 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 + +#include +#include + +#include +#include +#include + +#ifndef WIN32 +#include +#endif + +using namespace std; + +int main( int argc, char** argv ) +{ + try + { + std::string dev_key_prefix; + bool need_help; + if( argc < 2 ) + need_help = true; + else + { + dev_key_prefix = argv[1]; + if( (dev_key_prefix == "-h") + || (dev_key_prefix == "--help") + ) + need_help = true; + } + + if( need_help ) + { + std::cerr << "get-dev-key ...\n" + "\n" + "example:\n" + "\n" + "get-dev-key wxyz- owner-5 active-7 balance-9 wit-block-signing-3 wit-owner-5 wit-active-33\n" + "get-dev-key wxyz- wit-block-signing-0:101\n" + "\n"; + return 1; + } + + bool comma = false; + + auto show_key = [&]( const fc::ecc::private_key& priv_key ) + { + fc::mutable_variant_object mvo; + graphene::chain::public_key_type pub_key = priv_key.get_public_key(); + mvo( "private_key", graphene::utilities::key_to_wif( priv_key ) ) + ( "public_key", std::string( pub_key ) ) + ( "address", graphene::chain::address( pub_key ) ) + ; + if( comma ) + std::cout << ",\n"; + std::cout << fc::json::to_string( mvo ); + comma = true; + }; + + std::cout << "["; + + for( int i=2; i keys; + if( lep >= 0 ) + { + for( int k=lep; k Date: Fri, 28 Aug 2015 21:57:10 -0400 Subject: [PATCH 264/353] witness.cpp: Simplify block production loop --- libraries/fc | 2 +- .../include/graphene/witness/witness.hpp | 21 +- libraries/plugins/witness/witness.cpp | 223 ++++++++++-------- 3 files changed, 144 insertions(+), 102 deletions(-) diff --git a/libraries/fc b/libraries/fc index 71be796a..80d967a7 160000 --- a/libraries/fc +++ b/libraries/fc @@ -1 +1 @@ -Subproject commit 71be796af50c407281a40e61e4199a87e0a19314 +Subproject commit 80d967a70d21d26d27ef3a1544a177925b2a7bbe diff --git a/libraries/plugins/witness/include/graphene/witness/witness.hpp b/libraries/plugins/witness/include/graphene/witness/witness.hpp index 3d2dc0bc..c82b83d8 100644 --- a/libraries/plugins/witness/include/graphene/witness/witness.hpp +++ b/libraries/plugins/witness/include/graphene/witness/witness.hpp @@ -24,6 +24,22 @@ namespace graphene { namespace witness_plugin { +namespace block_production_condition +{ + enum block_production_condition_enum + { + produced = 0, + not_synced = 1, + not_my_turn = 2, + not_time_yet = 3, + no_private_key = 4, + low_participation = 5, + lag = 6, + consecutive = 7, + exception_producing_block = 8 + }; +} + class witness_plugin : public graphene::app::plugin { public: ~witness_plugin() { @@ -51,8 +67,9 @@ public: virtual void plugin_shutdown() override; private: - void schedule_next_production(const graphene::chain::chain_parameters& global_parameters); - void block_production_loop(); + void schedule_production_loop(); + block_production_condition::block_production_condition_enum block_production_loop(); + block_production_condition::block_production_condition_enum maybe_produce_block( fc::mutable_variant_object& capture ); boost::program_options::variables_map _options; bool _production_enabled = false; diff --git a/libraries/plugins/witness/witness.cpp b/libraries/plugins/witness/witness.cpp index 2c3619fe..439a2e36 100644 --- a/libraries/plugins/witness/witness.cpp +++ b/libraries/plugins/witness/witness.cpp @@ -163,7 +163,7 @@ void witness_plugin::plugin_startup() app().set_block_production(true); if( _production_enabled && (d.head_block_num() == 0) ) new_chain_banner(d); - schedule_next_production(d.get_global_properties().parameters); + schedule_production_loop(); } else elog("No witnesses configured! Please add witness IDs and private keys to configuration."); } FC_CAPTURE_AND_RETHROW() } @@ -174,123 +174,148 @@ void witness_plugin::plugin_shutdown() return; } -void witness_plugin::schedule_next_production(const graphene::chain::chain_parameters& global_parameters) +void witness_plugin::schedule_production_loop() { - //Get next production time for *any* witness - auto block_interval = global_parameters.block_interval; - fc::time_point next_block_time = fc::time_point_sec() + - (graphene::time::now().sec_since_epoch() / block_interval + 1) * block_interval; - - if( graphene::time::ntp_time().valid() ) - next_block_time -= graphene::time::ntp_error(); - - //Sleep until the next production time for *any* witness + //Schedule for the next second's tick regardless of chain state + fc::time_point_sec next_second( graphene::time::now().sec_since_epoch() + 1 ); + wdump( (next_second) ); _block_production_task = fc::schedule([this]{block_production_loop();}, - next_block_time, "Witness Block Production"); + next_second, "Witness Block Production"); } -void witness_plugin::block_production_loop() +block_production_condition::block_production_condition_enum witness_plugin::block_production_loop() +{ + block_production_condition::block_production_condition_enum result; + fc::mutable_variant_object capture; + try + { + result = maybe_produce_block(capture); + } + catch( const fc::canceled_exception& ) + { + //We're trying to exit. Go ahead and let this one out. + throw; + } + catch( const fc::exception& e ) + { + elog("Got exception while generating block:\n${e}", ("e", e.to_detail_string())); + result = block_production_condition::exception_producing_block; + } + + switch( result ) + { + case block_production_condition::produced: + ilog("Generated block #${n} with timestamp ${t} at time ${c}", (capture)); + break; + case block_production_condition::not_synced: + ilog("Not producing block because production is disabled until we receive a recent block (see: --enable-stale-production)"); + break; + case block_production_condition::not_my_turn: + ilog("Not producing block because it isn't my turn"); + break; + case block_production_condition::not_time_yet: + ilog("Not producing block because slot has not yet arrived"); + break; + case block_production_condition::no_private_key: + ilog("Not producing block because I don't have the private key for ${scheduled_key}", (capture) ); + break; + case block_production_condition::low_participation: + elog("Not producing block because node appears to be on a minority fork with only ${pct}% witness participation", (capture) ); + break; + case block_production_condition::lag: + elog("Not producing block because node didn't wake up within 500ms of the slot time."); + break; + case block_production_condition::consecutive: + elog("Not producting block because the last block was generated by the same witness.\nThis node is probably disconnected from the network so block production has been disabled.\nDisable this check with --allow-consecutive option."); + break; + case block_production_condition::exception_producing_block: + break; + } + + schedule_production_loop(); + return result; +} + +block_production_condition::block_production_condition_enum witness_plugin::maybe_produce_block( fc::mutable_variant_object& capture ) { chain::database& db = database(); - const auto& global_parameters = db.get_global_properties().parameters; + fc::time_point_sec now = graphene::time::now(); - // Is there a head block within a block interval of now? If so, we're synced and can begin production. - if( !_production_enabled && - llabs((db.head_block_time() - graphene::time::now()).to_seconds()) <= global_parameters.block_interval ) - _production_enabled = true; + // If the next block production opportunity is in the present or future, we're synced. + if( !_production_enabled ) + { + if( db.get_slot_time(1) >= now ) + _production_enabled = true; + else + return block_production_condition::not_synced; + } // is anyone scheduled to produce now or one second in the future? - const fc::time_point_sec now = graphene::time::now(); uint32_t slot = db.get_slot_at_time( now ); + if( slot == 0 ) + { + capture("next_time", db.get_slot_time(1)); + return block_production_condition::not_time_yet; + } + + // + // this assert should not fail, because now <= db.head_block_time() + // should have resulted in slot == 0. + // + // if this assert triggers, there is a serious bug in get_slot_at_time() + // which would result in allowing a later block to have a timestamp + // less than or equal to the previous block + // + assert( now > db.head_block_time() ); + graphene::chain::witness_id_type scheduled_witness = db.get_scheduled_witness( slot ); + // we must control the witness scheduled to produce the next block. + if( _witnesses.find( scheduled_witness ) == _witnesses.end() ) + { + capture("scheduled_witness", scheduled_witness); + return block_production_condition::not_my_turn; + } + fc::time_point_sec scheduled_time = db.get_slot_time( slot ); graphene::chain::public_key_type scheduled_key = scheduled_witness( db ).signing_key; + auto private_key_itr = _private_keys.find( scheduled_key ); - auto is_scheduled = [&]() + if( private_key_itr == _private_keys.end() ) { - // conditions needed to produce a block: + capture("scheduled_key", scheduled_key); + return block_production_condition::no_private_key; + } - // we must control the witness scheduled to produce the next block. - if( _witnesses.find( scheduled_witness ) == _witnesses.end() ) { - return false; - } - - // we must know the private key corresponding to the witness's - // published block production key. - if( _private_keys.find( scheduled_key ) == _private_keys.end() ) { - elog("Not producing block because I don't have the private key for ${id}.", ("id", scheduled_key)); - return false; - } - - // the next block must be scheduled after the head block. - // if this check fails, the local clock has not advanced far - // enough from the head block. - if( slot == 0 ) { - ilog("Not producing block because next slot time is in the future (likely a maitenance block)."); - return false; - } - - // block production must be enabled (i.e. witness must be synced) - if( !_production_enabled ) - { - wlog("Not producing block because production is disabled until we receive a recent block (see: --enable-stale-production)"); - return false; - } - - uint32_t prate = db.witness_participation_rate(); - if( prate < _required_witness_participation ) - { - elog("Not producing block because node appears to be on a minority fork with only ${x}% witness participation", - ("x",uint32_t(100*uint64_t(prate) / GRAPHENE_1_PERCENT) ) ); - return false; - } - - // the local clock must be at least 1 second ahead of head_block_time. - if( (now - db.head_block_time()).to_seconds() < GRAPHENE_MIN_BLOCK_INTERVAL ) { - elog("Not producing block because head block is less than a second old."); - return false; - } - - // the local clock must be within 500 milliseconds of - // the scheduled production time. - if( llabs((scheduled_time - now).count()) > fc::milliseconds( 500 ).count() ) { - elog("Not producing block because network time is not within 250ms of scheduled block time."); - return false; - } - - - return true; - }; - - wdump((slot)(scheduled_witness)(scheduled_time)(now)); - if( is_scheduled() ) + uint32_t prate = db.witness_participation_rate(); + if( prate < _required_witness_participation ) { - ilog("Witness ${id} production slot has arrived; generating a block now...", ("id", scheduled_witness)); - try + capture("pct", uint32_t(100*uint64_t(prate) / GRAPHENE_1_PERCENT)); + return block_production_condition::low_participation; + } + + if( llabs((scheduled_time - now).count()) > fc::milliseconds( 500 ).count() ) + { + capture("scheduled_time", scheduled_time)("now", now); + return block_production_condition::lag; + } + + if( !_consecutive_production_enabled ) + { + if( db.get_dynamic_global_properties().current_witness == scheduled_witness ) { - FC_ASSERT( _consecutive_production_enabled || db.get_dynamic_global_properties().current_witness != scheduled_witness, - "Last block was generated by the same witness, this node is probably disconnected from the network so block production" - " has been disabled. Disable this check with --allow-consecutive option." ); - auto block = db.generate_block( - scheduled_time, - scheduled_witness, - _private_keys[ scheduled_key ], - graphene::chain::database::skip_nothing - ); - ilog("Generated block #${n} with timestamp ${t} at time ${c}", - ("n", block.block_num())("t", block.timestamp)("c", now)); - p2p_node().broadcast(net::block_message(block)); - } - catch( const fc::canceled_exception& ) - { - //We're trying to exit. Go ahead and let this one out. - throw; - } - catch( const fc::exception& e ) - { - elog("Got exception while generating block:\n${e}", ("e", e.to_detail_string())); + capture("scheduled_witness", scheduled_witness); + return block_production_condition::consecutive; } } - schedule_next_production(global_parameters); + auto block = db.generate_block( + scheduled_time, + scheduled_witness, + private_key_itr->second, + graphene::chain::database::skip_nothing + ); + capture("n", block.block_num())("t", block.timestamp)("c", now); + p2p_node().broadcast(net::block_message(block)); + + return block_production_condition::produced; } From dd9dbca38c58e992fdaa202ad4fbcf9e2ce04afb Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Fri, 28 Aug 2015 22:45:44 -0400 Subject: [PATCH 265/353] Reserve witness ID 0 --- libraries/chain/db_init.cpp | 7 ++++++- libraries/chain/db_witness_schedule.cpp | 3 +++ libraries/chain/include/graphene/chain/config.hpp | 2 ++ libraries/chain/include/graphene/chain/database.hpp | 2 +- libraries/plugins/witness/witness.cpp | 4 ++-- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/libraries/chain/db_init.cpp b/libraries/chain/db_init.cpp index 2f9f034f..f3361bf1 100644 --- a/libraries/chain/db_init.cpp +++ b/libraries/chain/db_init.cpp @@ -549,6 +549,11 @@ void database::init_genesis(const genesis_state_type& genesis_state) // TODO: Assert that bitasset debt = supply + // Create special witness account + const witness_object& wit = create([&](witness_object& w) {}); + FC_ASSERT( wit.id == GRAPHENE_NULL_WITNESS ); + remove(wit); + // Create initial witnesses std::for_each(genesis_state.initial_witness_candidates.begin(), genesis_state.initial_witness_candidates.end(), [&](const genesis_state_type::initial_witness_type& witness) { @@ -583,7 +588,7 @@ void database::init_genesis(const genesis_state_type& genesis_state) // Set active witnesses modify(get_global_properties(), [&](global_property_object& p) { - for( int i = 0; i < genesis_state.initial_active_witnesses; ++i ) + for( int i = 1; i <= genesis_state.initial_active_witnesses; ++i ) { p.active_witnesses.insert(i); p.witness_accounts.insert(get(witness_id_type(i)).witness_account); diff --git a/libraries/chain/db_witness_schedule.cpp b/libraries/chain/db_witness_schedule.cpp index adc7b315..a55a8c8a 100644 --- a/libraries/chain/db_witness_schedule.cpp +++ b/libraries/chain/db_witness_schedule.cpp @@ -43,6 +43,9 @@ witness_id_type database::get_scheduled_witness( uint32_t slot_num )const // [1] https://en.wikipedia.org/wiki/Xorshift#Xorshift.2A // + if( slot_num == 0 ) + return GRAPHENE_NULL_WITNESS; + const flat_set< witness_id_type >& active_witnesses = get_global_properties().active_witnesses; uint32_t n = active_witnesses.size(); uint64_t min_witness_separation; diff --git a/libraries/chain/include/graphene/chain/config.hpp b/libraries/chain/include/graphene/chain/config.hpp index 381d2f65..7256fbb2 100644 --- a/libraries/chain/include/graphene/chain/config.hpp +++ b/libraries/chain/include/graphene/chain/config.hpp @@ -154,4 +154,6 @@ #define GRAPHENE_TEMP_ACCOUNT (graphene::chain::account_id_type(4)) /// Represents the canonical account for specifying you will vote directly (as opposed to a proxy) #define GRAPHENE_PROXY_TO_SELF_ACCOUNT (graphene::chain::account_id_type(5)) +/// Sentinel value used in the scheduler. +#define GRAPHENE_NULL_WITNESS (graphene::chain::witness_id_type(0)) ///@} diff --git a/libraries/chain/include/graphene/chain/database.hpp b/libraries/chain/include/graphene/chain/database.hpp index 66c859e9..43056a73 100644 --- a/libraries/chain/include/graphene/chain/database.hpp +++ b/libraries/chain/include/graphene/chain/database.hpp @@ -221,7 +221,7 @@ namespace graphene { namespace chain { * Use the get_slot_time() and get_slot_at_time() functions * to convert between slot_num and timestamp. * - * Passing slot_num == 0 returns witness_id_type() + * Passing slot_num == 0 returns GRAPHENE_NULL_WITNESS */ witness_id_type get_scheduled_witness(uint32_t slot_num)const; diff --git a/libraries/plugins/witness/witness.cpp b/libraries/plugins/witness/witness.cpp index 439a2e36..8d2b37ec 100644 --- a/libraries/plugins/witness/witness.cpp +++ b/libraries/plugins/witness/witness.cpp @@ -60,7 +60,7 @@ void witness_plugin::plugin_set_program_options( boost::program_options::options_description& config_file_options) { auto default_priv_key = fc::ecc::private_key::regenerate(fc::sha256::hash(std::string("nathan"))); - string witness_id_example = fc::json::to_string(chain::witness_id_type()); + string witness_id_example = fc::json::to_string(chain::witness_id_type(5)); command_line_options.add_options() ("enable-stale-production", bpo::bool_switch()->notifier([this](bool e){_production_enabled = e;}), "Enable block production, even if the chain is stale.") ("required-participation", bpo::bool_switch()->notifier([this](int e){_required_witness_participation = uint32_t(e*GRAPHENE_1_PERCENT);}), "Percent of witnesses (0-99) that must be participating in order to produce blocks") @@ -226,7 +226,7 @@ block_production_condition::block_production_condition_enum witness_plugin::bloc elog("Not producing block because node didn't wake up within 500ms of the slot time."); break; case block_production_condition::consecutive: - elog("Not producting block because the last block was generated by the same witness.\nThis node is probably disconnected from the network so block production has been disabled.\nDisable this check with --allow-consecutive option."); + elog("Not producing block because the last block was generated by the same witness.\nThis node is probably disconnected from the network so block production has been disabled.\nDisable this check with --allow-consecutive option."); break; case block_production_condition::exception_producing_block: break; From c14494fb684b0caa8a66eb2e8f8d3f0ab0c1383f Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Sat, 29 Aug 2015 20:18:17 -0400 Subject: [PATCH 266/353] time: Make timer use fc::time_point instead of fc::time_point_sec so witness plugin can control quantization --- libraries/app/application.cpp | 2 +- libraries/plugins/witness/witness.cpp | 9 ++++++--- libraries/time/include/graphene/time/time.hpp | 4 ++-- libraries/time/time.cpp | 4 ++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp index 856aa2d0..cf88be5a 100644 --- a/libraries/app/application.cpp +++ b/libraries/app/application.cpp @@ -231,7 +231,7 @@ namespace detail { genesis_state_type genesis = fc::json::from_file(_options->at("genesis-json").as()).as(); if( _options->count("genesis-timestamp") ) { - genesis.initial_timestamp = graphene::time::now() + genesis.initial_parameters.block_interval + _options->at("genesis-timestamp").as(); + genesis.initial_timestamp = fc::time_point_sec( graphene::time::now() ) + genesis.initial_parameters.block_interval + _options->at("genesis-timestamp").as(); genesis.initial_timestamp -= genesis.initial_timestamp.sec_since_epoch() % genesis.initial_parameters.block_interval; std::cerr << "Used genesis timestamp: " << genesis.initial_timestamp.to_iso_string() << " (PLEASE RECORD THIS)\n"; } diff --git a/libraries/plugins/witness/witness.cpp b/libraries/plugins/witness/witness.cpp index 8d2b37ec..b7a1f6b4 100644 --- a/libraries/plugins/witness/witness.cpp +++ b/libraries/plugins/witness/witness.cpp @@ -177,8 +177,10 @@ void witness_plugin::plugin_shutdown() void witness_plugin::schedule_production_loop() { //Schedule for the next second's tick regardless of chain state - fc::time_point_sec next_second( graphene::time::now().sec_since_epoch() + 1 ); - wdump( (next_second) ); + // If we would wait less than 200ms, wait for the whole second. + fc::time_point now = graphene::time::now(); + fc::time_point_sec next_second( now + fc::microseconds( 1200000 ) ); + wdump( (now.time_since_epoch().count())(next_second) ); _block_production_task = fc::schedule([this]{block_production_loop();}, next_second, "Witness Block Production"); } @@ -239,7 +241,8 @@ block_production_condition::block_production_condition_enum witness_plugin::bloc block_production_condition::block_production_condition_enum witness_plugin::maybe_produce_block( fc::mutable_variant_object& capture ) { chain::database& db = database(); - fc::time_point_sec now = graphene::time::now(); + fc::time_point now_fine = graphene::time::now(); + fc::time_point_sec now = now_fine + fc::microseconds( 500000 ); // If the next block production opportunity is in the present or future, we're synced. if( !_production_enabled ) diff --git a/libraries/time/include/graphene/time/time.hpp b/libraries/time/include/graphene/time/time.hpp index 3b7d6b42..e4252400 100644 --- a/libraries/time/include/graphene/time/time.hpp +++ b/libraries/time/include/graphene/time/time.hpp @@ -27,8 +27,8 @@ namespace graphene { namespace time { extern time_discontinuity_signal_type time_discontinuity_signal; fc::optional ntp_time(); - fc::time_point_sec now(); - fc::time_point_sec nonblocking_now(); // identical to now() but guaranteed not to block + fc::time_point now(); + fc::time_point nonblocking_now(); // identical to now() but guaranteed not to block void update_ntp_time(); fc::microseconds ntp_error(); void shutdown_ntp_time(); diff --git a/libraries/time/time.cpp b/libraries/time/time.cpp index 5a7fd939..98f83bed 100644 --- a/libraries/time/time.cpp +++ b/libraries/time/time.cpp @@ -60,7 +60,7 @@ void shutdown_ntp_time() delete actual_ntp_service; } -fc::time_point_sec now() +fc::time_point now() { if( simulated_time ) return fc::time_point() + fc::seconds( simulated_time + adjusted_time_sec ); @@ -72,7 +72,7 @@ fc::time_point_sec now() return fc::time_point::now() + fc::seconds( adjusted_time_sec ); } -fc::time_point_sec nonblocking_now() +fc::time_point nonblocking_now() { if (simulated_time) return fc::time_point() + fc::seconds(simulated_time + adjusted_time_sec); From 8ad1a12149fbc214e83a3d2396a77696af0e3951 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Mon, 31 Aug 2015 13:08:30 -0400 Subject: [PATCH 267/353] db_witness_schedule.cpp: Give best_wit a default value of GRAPHENE_NULL_WITNESS #274 --- libraries/chain/db_witness_schedule.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libraries/chain/db_witness_schedule.cpp b/libraries/chain/db_witness_schedule.cpp index a55a8c8a..cc428ad8 100644 --- a/libraries/chain/db_witness_schedule.cpp +++ b/libraries/chain/db_witness_schedule.cpp @@ -90,7 +90,7 @@ witness_id_type database::get_scheduled_witness( uint32_t slot_num )const first_ineligible_aslot = std::max( first_ineligible_aslot, uint64_t( 1 ) ); uint64_t best_k = 0; - witness_id_type best_wit; + witness_id_type best_wit = GRAPHENE_NULL_WITNESS; bool success = false; uint64_t now_hi = get_slot_time( slot_num ).sec_since_epoch(); @@ -131,6 +131,13 @@ witness_id_type database::get_scheduled_witness( uint32_t slot_num )const idump((wit_id)(wit.last_aslot)); } + // + // TODO: Comment out assert( success ) for production network. + // This code should never be reached, but it has been observed + // to rarely happen under conditions we have been unable to + // reproduce. If this point is reached, we want deterministic, + // non-crashing behavior. See #274. + // assert( success ); } From 687aa7253ecf834fe256f76b3dc5c614559a2838 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Mon, 31 Aug 2015 14:23:14 -0400 Subject: [PATCH 268/353] witness.cpp: Add a little logging on startup --- libraries/plugins/witness/witness.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libraries/plugins/witness/witness.cpp b/libraries/plugins/witness/witness.cpp index b7a1f6b4..7b4c0c56 100644 --- a/libraries/plugins/witness/witness.cpp +++ b/libraries/plugins/witness/witness.cpp @@ -81,6 +81,7 @@ std::string witness_plugin::plugin_name()const void witness_plugin::plugin_initialize(const boost::program_options::variables_map& options) { try { + ilog("witness plugin: plugin_initialize() begin"); _options = &options; LOAD_VALUE_SET(options, "witness-id", _witnesses, chain::witness_id_type) @@ -108,10 +109,12 @@ void witness_plugin::plugin_initialize(const boost::program_options::variables_m _private_keys[key_id_to_wif_pair.first] = *private_key; } } + ilog("witness plugin: plugin_initialize() end"); } FC_LOG_AND_RETHROW() } void witness_plugin::plugin_startup() { try { + ilog("witness plugin: plugin_startup() begin"); chain::database& d = database(); std::set bad_wits; //Start NTP time client @@ -166,6 +169,7 @@ void witness_plugin::plugin_startup() schedule_production_loop(); } else elog("No witnesses configured! Please add witness IDs and private keys to configuration."); + ilog("witness plugin: plugin_startup() end"); } FC_CAPTURE_AND_RETHROW() } void witness_plugin::plugin_shutdown() From c9fbc8a4115938af9866de8b66f29c54cd51a34e Mon Sep 17 00:00:00 2001 From: abitmore Date: Tue, 1 Sep 2015 13:05:02 +0200 Subject: [PATCH 269/353] Fix log issue in witness.cpp block_production_loop --- libraries/plugins/witness/witness.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/plugins/witness/witness.cpp b/libraries/plugins/witness/witness.cpp index 7b4c0c56..c638da87 100644 --- a/libraries/plugins/witness/witness.cpp +++ b/libraries/plugins/witness/witness.cpp @@ -211,7 +211,7 @@ block_production_condition::block_production_condition_enum witness_plugin::bloc switch( result ) { case block_production_condition::produced: - ilog("Generated block #${n} with timestamp ${t} at time ${c}", (capture)); + ilog("Generated block #${n} with timestamp ${t} at time ${c}", ("n",capture)("t",capture)("c",capture)); break; case block_production_condition::not_synced: ilog("Not producing block because production is disabled until we receive a recent block (see: --enable-stale-production)"); @@ -223,10 +223,10 @@ block_production_condition::block_production_condition_enum witness_plugin::bloc ilog("Not producing block because slot has not yet arrived"); break; case block_production_condition::no_private_key: - ilog("Not producing block because I don't have the private key for ${scheduled_key}", (capture) ); + ilog("Not producing block because I don't have the private key for ${scheduled_key}", ("scheduled_key",capture) ); break; case block_production_condition::low_participation: - elog("Not producing block because node appears to be on a minority fork with only ${pct}% witness participation", (capture) ); + elog("Not producing block because node appears to be on a minority fork with only ${pct}% witness participation", ("pct",capture) ); break; case block_production_condition::lag: elog("Not producing block because node didn't wake up within 500ms of the slot time."); From fb8d17bb4b5c36f31866116c1c77c02a93d2d044 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Tue, 1 Sep 2015 08:57:42 -0400 Subject: [PATCH 270/353] max block re-ordering increase --- libraries/chain/include/graphene/chain/fork_database.hpp | 2 +- libraries/fc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/chain/include/graphene/chain/fork_database.hpp b/libraries/chain/include/graphene/chain/fork_database.hpp index 34801b1a..2d65ccc4 100644 --- a/libraries/chain/include/graphene/chain/fork_database.hpp +++ b/libraries/chain/include/graphene/chain/fork_database.hpp @@ -64,7 +64,7 @@ namespace graphene { namespace chain { public: typedef vector branch_type; /// The maximum number of blocks that may be skipped in an out-of-order push - const static int MAX_BLOCK_REORDERING = 32; + const static int MAX_BLOCK_REORDERING = 1024; fork_database(); void reset(); diff --git a/libraries/fc b/libraries/fc index 80d967a7..71be796a 160000 --- a/libraries/fc +++ b/libraries/fc @@ -1 +1 @@ -Subproject commit 80d967a70d21d26d27ef3a1544a177925b2a7bbe +Subproject commit 71be796af50c407281a40e61e4199a87e0a19314 From 2f88cc86baf7bb56af05a2d4a4ec9fb17dc3ef90 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Tue, 1 Sep 2015 12:09:39 -0400 Subject: [PATCH 271/353] cli_wallet: Implement update_witness command #282 --- .../wallet/include/graphene/wallet/wallet.hpp | 14 ++++++++ libraries/wallet/wallet.cpp | 34 +++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/libraries/wallet/include/graphene/wallet/wallet.hpp b/libraries/wallet/include/graphene/wallet/wallet.hpp index 3ebfe0f1..49cb5b71 100644 --- a/libraries/wallet/include/graphene/wallet/wallet.hpp +++ b/libraries/wallet/include/graphene/wallet/wallet.hpp @@ -1086,6 +1086,19 @@ class wallet_api string url, bool broadcast = false); + /** + * Update a witness object owned by the given account. + * + * @param witness The name of the witness's owner account. Also accepts the ID of the owner account or the ID of the witness. + * @param url Same as for create_witness. The empty string makes it remain the same. + * @param block_signing_key The new block signing public key. The empty string makes it remain the same. + * @param broadcast true if you wish to broadcast the transaction. + */ + signed_transaction update_witness(string witness_name, + string url, + string block_signing_key, + bool broadcast = false); + /** Vote for a given committee_member. * * An account can publish a list of all committee_memberes they approve of. This @@ -1364,6 +1377,7 @@ FC_API( graphene::wallet::wallet_api, (list_witnesses) (list_committee_members) (create_witness) + (update_witness) (vote_for_committee_member) (vote_for_witness) (set_voting_proxy) diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp index c0231841..655685bc 100644 --- a/libraries/wallet/wallet.cpp +++ b/libraries/wallet/wallet.cpp @@ -1318,6 +1318,31 @@ public: return sign_transaction( tx, broadcast ); } FC_CAPTURE_AND_RETHROW( (owner_account)(broadcast) ) } + signed_transaction update_witness(string witness_name, + string url, + string block_signing_key, + bool broadcast /* = false */) + { try { + witness_object witness = get_witness(witness_name); + account_object witness_account = get_account( witness.witness_account ); + fc::ecc::private_key active_private_key = get_private_key_for_account(witness_account); + + witness_update_operation witness_update_op; + witness_update_op.witness = witness.id; + witness_update_op.witness_account = witness_account.id; + if( url != "" ) + witness_update_op.new_url = url; + if( block_signing_key != "" ) + witness_update_op.new_signing_key = public_key_type( block_signing_key ); + + signed_transaction tx; + tx.operations.push_back( witness_update_op ); + set_operation_fees( tx, _remote_db->get_global_properties().parameters.current_fees ); + tx.validate(); + + return sign_transaction( tx, broadcast ); + } FC_CAPTURE_AND_RETHROW( (witness_name)(url)(block_signing_key)(broadcast) ) } + signed_transaction vote_for_committee_member(string voting_account, string committee_member, bool approve, @@ -2546,6 +2571,15 @@ signed_transaction wallet_api::create_witness(string owner_account, return my->create_witness(owner_account, url, broadcast); } +signed_transaction wallet_api::update_witness( + string witness_name, + string url, + string block_signing_key, + bool broadcast /* = false */) +{ + return my->update_witness(witness_name, url, block_signing_key, broadcast); +} + signed_transaction wallet_api::vote_for_committee_member(string voting_account, string witness, bool approve, From efac97e060560db5b94b329e6ec0cfee084cc786 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Tue, 1 Sep 2015 14:19:34 -0400 Subject: [PATCH 272/353] cli_wallet: Implement withdrawal for vesting balance objects #286 --- libraries/app/api.cpp | 15 ++++ libraries/app/include/graphene/app/api.hpp | 2 + .../graphene/chain/vesting_balance_object.hpp | 5 ++ libraries/chain/vesting_balance_object.cpp | 7 ++ .../wallet/include/graphene/wallet/wallet.hpp | 42 ++++++++++ libraries/wallet/wallet.cpp | 80 +++++++++++++++++++ 6 files changed, 151 insertions(+) diff --git a/libraries/app/api.cpp b/libraries/app/api.cpp index dff9626d..871f20bc 100644 --- a/libraries/app/api.cpp +++ b/libraries/app/api.cpp @@ -1186,6 +1186,21 @@ namespace graphene { namespace app { return result; } FC_CAPTURE_AND_RETHROW( (objs) ) } + vector database_api::get_vesting_balances( account_id_type account_id )const + { + try + { + vector result; + auto vesting_range = _db.get_index_type().indices().get().equal_range(account_id); + std::for_each(vesting_range.first, vesting_range.second, + [&result](const vesting_balance_object& balance) { + result.emplace_back(balance); + }); + return result; + } + FC_CAPTURE_AND_RETHROW( (account_id) ); + } + vector database_api::get_balance_objects( const vector
& addrs )const { try { const auto& bal_idx = _db.get_index_type(); diff --git a/libraries/app/include/graphene/app/api.hpp b/libraries/app/include/graphene/app/api.hpp index 82c82cae..649eea3f 100644 --- a/libraries/app/include/graphene/app/api.hpp +++ b/libraries/app/include/graphene/app/api.hpp @@ -322,6 +322,7 @@ namespace graphene { namespace app { vector get_vested_balances( const vector& objs )const; + vector get_vesting_balances( account_id_type account_id )const; /** * This API will take a partially signed transaction and a set of public keys that the owner has the ability to sign for @@ -579,6 +580,7 @@ FC_API(graphene::app::database_api, (get_margin_positions) (get_balance_objects) (get_vested_balances) + (get_vesting_balances) (get_required_signatures) (get_potential_signatures) (verify_authority) diff --git a/libraries/chain/include/graphene/chain/vesting_balance_object.hpp b/libraries/chain/include/graphene/chain/vesting_balance_object.hpp index 3386d021..ee14dc89 100644 --- a/libraries/chain/include/graphene/chain/vesting_balance_object.hpp +++ b/libraries/chain/include/graphene/chain/vesting_balance_object.hpp @@ -155,6 +155,11 @@ namespace graphene { namespace chain { */ void withdraw(const fc::time_point_sec& now, const asset& amount); bool is_withdraw_allowed(const fc::time_point_sec& now, const asset& amount)const; + + /** + * Get amount of allowed withdrawal. + */ + asset get_allowed_withdraw(const time_point_sec& now)const; }; /** * @ingroup object_index diff --git a/libraries/chain/vesting_balance_object.cpp b/libraries/chain/vesting_balance_object.cpp index d4f70d75..799863f1 100644 --- a/libraries/chain/vesting_balance_object.cpp +++ b/libraries/chain/vesting_balance_object.cpp @@ -182,6 +182,7 @@ VESTING_VISITOR(on_withdraw,); VESTING_VISITOR(is_deposit_allowed, const); VESTING_VISITOR(is_deposit_vested_allowed, const); VESTING_VISITOR(is_withdraw_allowed, const); +VESTING_VISITOR(get_allowed_withdraw, const); bool vesting_balance_object::is_deposit_allowed(const time_point_sec& now, const asset& amount)const { @@ -224,4 +225,10 @@ void vesting_balance_object::withdraw(const time_point_sec& now, const asset& am balance -= amount; } +asset vesting_balance_object::get_allowed_withdraw(const time_point_sec& now)const +{ + asset amount = asset(); + return policy.visit(get_allowed_withdraw_visitor(balance, now, amount)); +} + } } // graphene::chain diff --git a/libraries/wallet/include/graphene/wallet/wallet.hpp b/libraries/wallet/include/graphene/wallet/wallet.hpp index 49cb5b71..e7f0b367 100644 --- a/libraries/wallet/include/graphene/wallet/wallet.hpp +++ b/libraries/wallet/include/graphene/wallet/wallet.hpp @@ -222,6 +222,22 @@ struct signed_block_with_info : public signed_block fc::ecc::public_key signing_key; }; +struct vesting_balance_object_with_info : public vesting_balance_object +{ + vesting_balance_object_with_info( const vesting_balance_object& vbo, fc::time_point_sec now ); + vesting_balance_object_with_info( const vesting_balance_object_with_info& vbo ) = default; + + /** + * How much is allowed to be withdrawn. + */ + asset allowed_withdraw; + + /** + * The time at which allowed_withdrawal was calculated. + */ + fc::time_point_sec allowed_withdraw_time; +}; + namespace detail { class wallet_api_impl; } @@ -1099,6 +1115,27 @@ class wallet_api string block_signing_key, bool broadcast = false); + /** + * Get information about a vesting balance object. + * + * @param account_name An account name, account ID, or vesting balance object ID. + */ + vector< vesting_balance_object_with_info > get_vesting_balances( string account_name ); + + /** + * Withdraw a vesting balance. + * + * @param witness_name The account name of the witness, also accepts account ID or vesting balance ID type. + * @param amount The amount to withdraw. + * @param asset_symbol The symbol of the asset to withdraw. + * @param broadcast true if you wish to broadcast the transaction + */ + signed_transaction withdraw_vesting( + string witness_name, + string amount, + string asset_symbol, + bool broadcast = false); + /** Vote for a given committee_member. * * An account can publish a list of all committee_memberes they approve of. This @@ -1327,6 +1364,9 @@ FC_REFLECT( graphene::wallet::approval_delta, FC_REFLECT_DERIVED( graphene::wallet::signed_block_with_info, (graphene::chain::signed_block), (block_id)(signing_key) ) +FC_REFLECT_DERIVED( graphene::wallet::vesting_balance_object_with_info, (graphene::chain::vesting_balance_object), + (allowed_withdraw)(allowed_withdraw_time) ) + FC_API( graphene::wallet::wallet_api, (help) (gethelp) @@ -1378,6 +1418,8 @@ FC_API( graphene::wallet::wallet_api, (list_committee_members) (create_witness) (update_witness) + (get_vesting_balances) + (withdraw_vesting) (vote_for_committee_member) (vote_for_witness) (set_voting_proxy) diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp index 655685bc..10c4a72a 100644 --- a/libraries/wallet/wallet.cpp +++ b/libraries/wallet/wallet.cpp @@ -1343,6 +1343,65 @@ public: return sign_transaction( tx, broadcast ); } FC_CAPTURE_AND_RETHROW( (witness_name)(url)(block_signing_key)(broadcast) ) } + vector< vesting_balance_object_with_info > get_vesting_balances( string account_name ) + { try { + fc::optional vbid = maybe_id( account_name ); + std::vector result; + fc::time_point_sec now = _remote_db->get_dynamic_global_properties().time; + + if( vbid ) + { + result.emplace_back( get_object(*vbid), now ); + return result; + } + + // try casting to avoid a round-trip if we were given an account ID + fc::optional acct_id = maybe_id( account_name ); + if( !acct_id ) + acct_id = get_account( account_name ).id; + + vector< vesting_balance_object > vbos = _remote_db->get_vesting_balances( *acct_id ); + if( vbos.size() == 0 ) + return result; + + for( const vesting_balance_object& vbo : vbos ) + result.emplace_back( vbo, now ); + + return result; + } FC_CAPTURE_AND_RETHROW( (account_name) ) + } + + signed_transaction withdraw_vesting( + string witness_name, + string amount, + string asset_symbol, + bool broadcast = false ) + { try { + asset_object asset_obj = get_asset( asset_symbol ); + fc::optional vbid = maybe_id(witness_name); + if( !vbid ) + { + witness_object wit = get_witness( witness_name ); + FC_ASSERT( wit.pay_vb ); + vbid = wit.pay_vb; + } + + vesting_balance_object vbo = get_object< vesting_balance_object >( *vbid ); + vesting_balance_withdraw_operation vesting_balance_withdraw_op; + + vesting_balance_withdraw_op.vesting_balance = *vbid; + vesting_balance_withdraw_op.owner = vbo.owner; + vesting_balance_withdraw_op.amount = asset_obj.amount_from_string(amount); + + signed_transaction tx; + tx.operations.push_back( vesting_balance_withdraw_op ); + set_operation_fees( tx, _remote_db->get_global_properties().parameters.current_fees ); + tx.validate(); + + return sign_transaction( tx, broadcast ); + } FC_CAPTURE_AND_RETHROW( (witness_name)(amount) ) + } + signed_transaction vote_for_committee_member(string voting_account, string committee_member, bool approve, @@ -2580,6 +2639,20 @@ signed_transaction wallet_api::update_witness( return my->update_witness(witness_name, url, block_signing_key, broadcast); } +vector< vesting_balance_object_with_info > wallet_api::get_vesting_balances( string account_name ) +{ + return my->get_vesting_balances( account_name ); +} + +signed_transaction wallet_api::withdraw_vesting( + string witness_name, + string amount, + string asset_symbol, + bool broadcast /* = false */) +{ + return my->withdraw_vesting( witness_name, amount, asset_symbol, broadcast ); +} + signed_transaction wallet_api::vote_for_committee_member(string voting_account, string witness, bool approve, @@ -3430,6 +3503,13 @@ signed_block_with_info::signed_block_with_info( const signed_block& block ) signing_key = signee(); } +vesting_balance_object_with_info::vesting_balance_object_with_info( const vesting_balance_object& vbo, fc::time_point_sec now ) + : vesting_balance_object( vbo ) +{ + allowed_withdraw = get_allowed_withdraw( now ); + allowed_withdraw_time = now; +} + } } // graphene::wallet void fc::to_variant(const account_multi_index_type& accts, fc::variant& vo) From 2dedebdca80c2f954ee815d1e25cf3f8fc695cc7 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Tue, 1 Sep 2015 16:11:58 -0400 Subject: [PATCH 273/353] witness.cpp: Don't filter witnesses prematurely If invalid witness ID's or keys are specified in the config file, we simply don't produce until they become valid. --- libraries/plugins/witness/witness.cpp | 41 --------------------------- 1 file changed, 41 deletions(-) diff --git a/libraries/plugins/witness/witness.cpp b/libraries/plugins/witness/witness.cpp index c638da87..f86e0d97 100644 --- a/libraries/plugins/witness/witness.cpp +++ b/libraries/plugins/witness/witness.cpp @@ -116,49 +116,8 @@ void witness_plugin::plugin_startup() { try { ilog("witness plugin: plugin_startup() begin"); chain::database& d = database(); - std::set bad_wits; //Start NTP time client graphene::time::now(); - for( auto wit : _witnesses ) - { - if( d.find(wit) == nullptr ) - { - if( app().is_finished_syncing() ) - { - elog("ERROR: Unable to find witness ${w}, even though syncing has finished. This witness will be ignored.", - ("w", wit)); - continue; - } else { - wlog("WARNING: Unable to find witness ${w}. Postponing initialization until syncing finishes.", - ("w", wit)); - app().syncing_finished.connect([this]{plugin_startup();}); - return; - } - } - - auto signing_key = wit(d).signing_key; - if( !_private_keys.count(signing_key) ) - { - // Check if it's a duplicate key of one I do have - bool found_duplicate = false; - for( const auto& private_key : _private_keys ) - if( chain::public_key_type(private_key.second.get_public_key()) == signing_key ) - { - ilog("Found duplicate key: ${k1} matches ${k2}; using this key to sign for ${w}", - ("k1", private_key.first)("k2", signing_key)("w", wit)); - _private_keys[signing_key] = private_key.second; - found_duplicate = true; - break; - } - if( found_duplicate ) - continue; - - elog("Unable to find key for witness ${w}. Removing it from my witnesses.", ("w", wit)); - bad_wits.insert(wit); - } - } - for( auto wit : bad_wits ) - _witnesses.erase(wit); if( !_witnesses.empty() ) { From b0fd510d51df8f7a322a5d1488233bb41dfff9b5 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Tue, 1 Sep 2015 16:29:03 -0400 Subject: [PATCH 274/353] cli_wallet: Print signing_key in base58 --- libraries/wallet/include/graphene/wallet/wallet.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/wallet/include/graphene/wallet/wallet.hpp b/libraries/wallet/include/graphene/wallet/wallet.hpp index e7f0b367..590212fe 100644 --- a/libraries/wallet/include/graphene/wallet/wallet.hpp +++ b/libraries/wallet/include/graphene/wallet/wallet.hpp @@ -219,7 +219,7 @@ struct signed_block_with_info : public signed_block signed_block_with_info( const signed_block_with_info& block ) = default; block_id_type block_id; - fc::ecc::public_key signing_key; + public_key_type signing_key; }; struct vesting_balance_object_with_info : public vesting_balance_object From 00a2d2dac73188e7e265163dfec04c2a523b8e23 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Tue, 1 Sep 2015 16:31:08 -0400 Subject: [PATCH 275/353] Revert "Fix log issue in witness.cpp block_production_loop" This reverts commit c9fbc8a4115938af9866de8b66f29c54cd51a34e. Updated version of fc is published, so this fix is no longer necessary. --- libraries/plugins/witness/witness.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/plugins/witness/witness.cpp b/libraries/plugins/witness/witness.cpp index f86e0d97..24eb0309 100644 --- a/libraries/plugins/witness/witness.cpp +++ b/libraries/plugins/witness/witness.cpp @@ -170,7 +170,7 @@ block_production_condition::block_production_condition_enum witness_plugin::bloc switch( result ) { case block_production_condition::produced: - ilog("Generated block #${n} with timestamp ${t} at time ${c}", ("n",capture)("t",capture)("c",capture)); + ilog("Generated block #${n} with timestamp ${t} at time ${c}", (capture)); break; case block_production_condition::not_synced: ilog("Not producing block because production is disabled until we receive a recent block (see: --enable-stale-production)"); @@ -182,10 +182,10 @@ block_production_condition::block_production_condition_enum witness_plugin::bloc ilog("Not producing block because slot has not yet arrived"); break; case block_production_condition::no_private_key: - ilog("Not producing block because I don't have the private key for ${scheduled_key}", ("scheduled_key",capture) ); + ilog("Not producing block because I don't have the private key for ${scheduled_key}", (capture) ); break; case block_production_condition::low_participation: - elog("Not producing block because node appears to be on a minority fork with only ${pct}% witness participation", ("pct",capture) ); + elog("Not producing block because node appears to be on a minority fork with only ${pct}% witness participation", (capture) ); break; case block_production_condition::lag: elog("Not producing block because node didn't wake up within 500ms of the slot time."); From 96a20bbd354c3ac5a15a4a9c78ce5caa662d86cb Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Wed, 2 Sep 2015 09:03:04 -0400 Subject: [PATCH 276/353] adding extra test of fork db --- tests/tests/block_tests.cpp | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/tests/tests/block_tests.cpp b/tests/tests/block_tests.cpp index e6677213..2504e7ce 100644 --- a/tests/tests/block_tests.cpp +++ b/tests/tests/block_tests.cpp @@ -275,6 +275,32 @@ BOOST_AUTO_TEST_CASE( fork_blocks ) } } + +BOOST_AUTO_TEST_CASE( fork_db_tests ) +{ + try { + fork_database fdb; + signed_block prev; + signed_block skipped_block; + for( uint32_t i = 0; i < 2000; ++i ) + { + signed_block b; + b.previous = prev.id(); + if( b.block_num() == 1800 ) + skipped_block = b; + else + fdb.push_block( b ); + prev = b; + } + auto head = fdb.head(); + FC_ASSERT( head && head->data.block_num() == 1799 ); + + fdb.push_block(skipped_block); + head = fdb.head(); + FC_ASSERT( head && head->data.block_num() == 2001, "", ("head",head->data.block_num()) ); + } FC_LOG_AND_RETHROW() +} + BOOST_AUTO_TEST_CASE( out_of_order_blocks ) { try { From dd04bab521bcb2edf549e8079a9f3e9ba830fa79 Mon Sep 17 00:00:00 2001 From: Eric Frias Date: Wed, 2 Sep 2015 09:48:17 -0400 Subject: [PATCH 277/353] Fix compile errors, win32 and otherwise --- libraries/chain/CMakeLists.txt | 2 +- libraries/fc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt index 33ae255b..199bf104 100644 --- a/libraries/chain/CMakeLists.txt +++ b/libraries/chain/CMakeLists.txt @@ -76,7 +76,7 @@ target_include_directories( graphene_chain PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" ) if(MSVC) - set_source_files_properties( db_init.cpp db_block.cpp database.cpp PROPERTIES COMPILE_FLAGS "/bigobj" ) + set_source_files_properties( db_init.cpp db_block.cpp database.cpp block_database.cpp PROPERTIES COMPILE_FLAGS "/bigobj" ) endif(MSVC) INSTALL( TARGETS diff --git a/libraries/fc b/libraries/fc index 71be796a..80d967a7 160000 --- a/libraries/fc +++ b/libraries/fc @@ -1 +1 @@ -Subproject commit 71be796af50c407281a40e61e4199a87e0a19314 +Subproject commit 80d967a70d21d26d27ef3a1544a177925b2a7bbe From d35e2d6d4ea81c574d1fed1ce279d81447b30511 Mon Sep 17 00:00:00 2001 From: Eric Frias Date: Wed, 2 Sep 2015 12:15:02 -0400 Subject: [PATCH 278/353] reorder the p2p network's terminate_inactive_connections_loop() to prevent us from being interrupted before we delete an unresponsive peer #288 --- libraries/net/node.cpp | 227 ++++++++++++++++++++++------------------- 1 file changed, 123 insertions(+), 104 deletions(-) diff --git a/libraries/net/node.cpp b/libraries/net/node.cpp index c72a16be..103eb54d 100644 --- a/libraries/net/node.cpp +++ b/libraries/net/node.cpp @@ -1253,6 +1253,8 @@ namespace graphene { namespace net { namespace detail { std::list peers_to_send_keep_alive; std::list peers_to_terminate; + uint8_t current_block_interval_in_seconds = _delegate->get_current_block_interval_in_seconds(); + // Disconnect peers that haven't sent us any data recently // These numbers are just guesses and we need to think through how this works better. // If we and our peers get disconnected from the rest of the network, we will not @@ -1261,113 +1263,144 @@ namespace graphene { namespace net { namespace detail { // them (but they won't have sent us anything since they aren't getting blocks either). // This might not be so bad because it could make us initiate more connections and // reconnect with the rest of the network, or it might just futher isolate us. - - uint32_t handshaking_timeout = _peer_inactivity_timeout; - fc::time_point handshaking_disconnect_threshold = fc::time_point::now() - fc::seconds(handshaking_timeout); - for( const peer_connection_ptr handshaking_peer : _handshaking_connections ) - if( handshaking_peer->connection_initiation_time < handshaking_disconnect_threshold && - handshaking_peer->get_last_message_received_time() < handshaking_disconnect_threshold && - handshaking_peer->get_last_message_sent_time() < handshaking_disconnect_threshold ) - { - wlog( "Forcibly disconnecting from handshaking peer ${peer} due to inactivity of at least ${timeout} seconds", - ( "peer", handshaking_peer->get_remote_endpoint() )("timeout", handshaking_timeout ) ); - wlog("Peer's negotiating status: ${status}, bytes sent: ${sent}, bytes received: ${received}", - ("status", handshaking_peer->negotiation_status) - ("sent", handshaking_peer->get_total_bytes_sent()) - ("received", handshaking_peer->get_total_bytes_received())); - handshaking_peer->connection_closed_error = fc::exception(FC_LOG_MESSAGE(warn, "Terminating handshaking connection due to inactivity of ${timeout} seconds. Negotiating status: ${status}, bytes sent: ${sent}, bytes received: ${received}", - ("peer", handshaking_peer->get_remote_endpoint()) - ("timeout", handshaking_timeout) - ("status", handshaking_peer->negotiation_status) - ("sent", handshaking_peer->get_total_bytes_sent()) - ("received", handshaking_peer->get_total_bytes_received()))); - peers_to_disconnect_forcibly.push_back( handshaking_peer ); - } - - // timeout for any active peers is two block intervals - uint8_t current_block_interval_in_seconds = _delegate->get_current_block_interval_in_seconds(); - uint32_t active_disconnect_timeout = 10 * current_block_interval_in_seconds; - uint32_t active_send_keepalive_timeount = active_disconnect_timeout / 2; - uint32_t active_ignored_request_timeount = 3 * current_block_interval_in_seconds; - fc::time_point active_disconnect_threshold = fc::time_point::now() - fc::seconds(active_disconnect_timeout); - fc::time_point active_send_keepalive_threshold = fc::time_point::now() - fc::seconds(active_send_keepalive_timeount); - fc::time_point active_ignored_request_threshold = fc::time_point::now() - fc::seconds(active_ignored_request_timeount); - for( const peer_connection_ptr& active_peer : _active_connections ) { - if( active_peer->connection_initiation_time < active_disconnect_threshold && - active_peer->get_last_message_received_time() < active_disconnect_threshold ) + // As usual, the first step is to walk through all our peers and figure out which + // peers need action (disconneting, sending keepalives, etc), then we walk through + // those lists yielding at our leisure later. + ASSERT_TASK_NOT_PREEMPTED(); + + uint32_t handshaking_timeout = _peer_inactivity_timeout; + fc::time_point handshaking_disconnect_threshold = fc::time_point::now() - fc::seconds(handshaking_timeout); + for( const peer_connection_ptr handshaking_peer : _handshaking_connections ) + if( handshaking_peer->connection_initiation_time < handshaking_disconnect_threshold && + handshaking_peer->get_last_message_received_time() < handshaking_disconnect_threshold && + handshaking_peer->get_last_message_sent_time() < handshaking_disconnect_threshold ) + { + wlog( "Forcibly disconnecting from handshaking peer ${peer} due to inactivity of at least ${timeout} seconds", + ( "peer", handshaking_peer->get_remote_endpoint() )("timeout", handshaking_timeout ) ); + wlog("Peer's negotiating status: ${status}, bytes sent: ${sent}, bytes received: ${received}", + ("status", handshaking_peer->negotiation_status) + ("sent", handshaking_peer->get_total_bytes_sent()) + ("received", handshaking_peer->get_total_bytes_received())); + handshaking_peer->connection_closed_error = fc::exception(FC_LOG_MESSAGE(warn, "Terminating handshaking connection due to inactivity of ${timeout} seconds. Negotiating status: ${status}, bytes sent: ${sent}, bytes received: ${received}", + ("peer", handshaking_peer->get_remote_endpoint()) + ("timeout", handshaking_timeout) + ("status", handshaking_peer->negotiation_status) + ("sent", handshaking_peer->get_total_bytes_sent()) + ("received", handshaking_peer->get_total_bytes_received()))); + peers_to_disconnect_forcibly.push_back( handshaking_peer ); + } + + // timeout for any active peers is two block intervals + uint32_t active_disconnect_timeout = 10 * current_block_interval_in_seconds; + uint32_t active_send_keepalive_timeount = active_disconnect_timeout / 2; + uint32_t active_ignored_request_timeount = 3 * current_block_interval_in_seconds; + fc::time_point active_disconnect_threshold = fc::time_point::now() - fc::seconds(active_disconnect_timeout); + fc::time_point active_send_keepalive_threshold = fc::time_point::now() - fc::seconds(active_send_keepalive_timeount); + fc::time_point active_ignored_request_threshold = fc::time_point::now() - fc::seconds(active_ignored_request_timeount); + for( const peer_connection_ptr& active_peer : _active_connections ) { - wlog( "Closing connection with peer ${peer} due to inactivity of at least ${timeout} seconds", - ( "peer", active_peer->get_remote_endpoint() )("timeout", active_disconnect_timeout ) ); - peers_to_disconnect_gently.push_back( active_peer ); - } - else - { - bool disconnect_due_to_request_timeout = false; - for (const peer_connection::item_to_time_map_type::value_type& item_and_time : active_peer->sync_items_requested_from_peer) - if (item_and_time.second < active_ignored_request_threshold) - { - wlog("Disconnecting peer ${peer} because they didn't respond to my request for sync item ${id}", - ("peer", active_peer->get_remote_endpoint())("id", item_and_time.first.item_hash)); - disconnect_due_to_request_timeout = true; - break; - } - if (!disconnect_due_to_request_timeout && - active_peer->item_ids_requested_from_peer && - active_peer->item_ids_requested_from_peer->get<1>() < active_ignored_request_threshold) - { - wlog("Disconnecting peer ${peer} because they didn't respond to my request for sync item ids after ${id}", - ("peer", active_peer->get_remote_endpoint()) - ("id", active_peer->item_ids_requested_from_peer->get<0>().item_hash)); - disconnect_due_to_request_timeout = true; - } - if (!disconnect_due_to_request_timeout) - for (const peer_connection::item_to_time_map_type::value_type& item_and_time : active_peer->items_requested_from_peer) + if( active_peer->connection_initiation_time < active_disconnect_threshold && + active_peer->get_last_message_received_time() < active_disconnect_threshold ) + { + wlog( "Closing connection with peer ${peer} due to inactivity of at least ${timeout} seconds", + ( "peer", active_peer->get_remote_endpoint() )("timeout", active_disconnect_timeout ) ); + peers_to_disconnect_gently.push_back( active_peer ); + } + else + { + bool disconnect_due_to_request_timeout = false; + for (const peer_connection::item_to_time_map_type::value_type& item_and_time : active_peer->sync_items_requested_from_peer) if (item_and_time.second < active_ignored_request_threshold) { - wlog("Disconnecting peer ${peer} because they didn't respond to my request for item ${id}", + wlog("Disconnecting peer ${peer} because they didn't respond to my request for sync item ${id}", ("peer", active_peer->get_remote_endpoint())("id", item_and_time.first.item_hash)); disconnect_due_to_request_timeout = true; break; } - if (disconnect_due_to_request_timeout) - { - // we should probably disconnect nicely and give them a reason, but right now the logic - // for rescheduling the requests only executes when the connection is fully closed, - // and we want to get those requests rescheduled as soon as possible - peers_to_disconnect_forcibly.push_back(active_peer); - } - else if (active_peer->connection_initiation_time < active_send_keepalive_threshold && - active_peer->get_last_message_received_time() < active_send_keepalive_threshold) - { - wlog( "Sending a keepalive message to peer ${peer} who hasn't sent us any messages in the last ${timeout} seconds", - ( "peer", active_peer->get_remote_endpoint() )("timeout", active_send_keepalive_timeount ) ); - peers_to_send_keep_alive.push_back(active_peer); + if (!disconnect_due_to_request_timeout && + active_peer->item_ids_requested_from_peer && + active_peer->item_ids_requested_from_peer->get<1>() < active_ignored_request_threshold) + { + wlog("Disconnecting peer ${peer} because they didn't respond to my request for sync item ids after ${id}", + ("peer", active_peer->get_remote_endpoint()) + ("id", active_peer->item_ids_requested_from_peer->get<0>().item_hash)); + disconnect_due_to_request_timeout = true; + } + if (!disconnect_due_to_request_timeout) + for (const peer_connection::item_to_time_map_type::value_type& item_and_time : active_peer->items_requested_from_peer) + if (item_and_time.second < active_ignored_request_threshold) + { + wlog("Disconnecting peer ${peer} because they didn't respond to my request for item ${id}", + ("peer", active_peer->get_remote_endpoint())("id", item_and_time.first.item_hash)); + disconnect_due_to_request_timeout = true; + break; + } + if (disconnect_due_to_request_timeout) + { + // we should probably disconnect nicely and give them a reason, but right now the logic + // for rescheduling the requests only executes when the connection is fully closed, + // and we want to get those requests rescheduled as soon as possible + peers_to_disconnect_forcibly.push_back(active_peer); + } + else if (active_peer->connection_initiation_time < active_send_keepalive_threshold && + active_peer->get_last_message_received_time() < active_send_keepalive_threshold) + { + wlog( "Sending a keepalive message to peer ${peer} who hasn't sent us any messages in the last ${timeout} seconds", + ( "peer", active_peer->get_remote_endpoint() )("timeout", active_send_keepalive_timeount ) ); + peers_to_send_keep_alive.push_back(active_peer); + } } } - } - fc::time_point closing_disconnect_threshold = fc::time_point::now() - fc::seconds(GRAPHENE_NET_PEER_DISCONNECT_TIMEOUT); - for( const peer_connection_ptr& closing_peer : _closing_connections ) - if( closing_peer->connection_closed_time < closing_disconnect_threshold ) + fc::time_point closing_disconnect_threshold = fc::time_point::now() - fc::seconds(GRAPHENE_NET_PEER_DISCONNECT_TIMEOUT); + for( const peer_connection_ptr& closing_peer : _closing_connections ) + if( closing_peer->connection_closed_time < closing_disconnect_threshold ) + { + // we asked this peer to close their connectoin to us at least GRAPHENE_NET_PEER_DISCONNECT_TIMEOUT + // seconds ago, but they haven't done it yet. Terminate the connection now + wlog( "Forcibly disconnecting peer ${peer} who failed to close their connection in a timely manner", + ( "peer", closing_peer->get_remote_endpoint() ) ); + peers_to_disconnect_forcibly.push_back( closing_peer ); + } + + uint32_t failed_terminate_timeout_seconds = 120; + fc::time_point failed_terminate_threshold = fc::time_point::now() - fc::seconds(failed_terminate_timeout_seconds); + for (const peer_connection_ptr& peer : _terminating_connections ) + if (peer->get_connection_terminated_time() != fc::time_point::min() && + peer->get_connection_terminated_time() < failed_terminate_threshold) + { + wlog("Terminating connection with peer ${peer}, closing the connection didn't work", ("peer", peer->get_remote_endpoint())); + peers_to_terminate.push_back(peer); + } + + // That's the end of the sorting step; now all peers that require further processing are now in one of the + // lists peers_to_disconnect_gently, peers_to_disconnect_forcibly, peers_to_send_keep_alive, or peers_to_terminate + + // if we've decided to delete any peers, do it now; in its current implementation this doesn't yield, + // and once we start yielding, we may find that we've moved that peer to another list (closed or active) + // and that triggers assertions, maybe even errors + for (const peer_connection_ptr& peer : peers_to_terminate ) { - // we asked this peer to close their connectoin to us at least GRAPHENE_NET_PEER_DISCONNECT_TIMEOUT - // seconds ago, but they haven't done it yet. Terminate the connection now - wlog( "Forcibly disconnecting peer ${peer} who failed to close their connection in a timely manner", - ( "peer", closing_peer->get_remote_endpoint() ) ); - peers_to_disconnect_forcibly.push_back( closing_peer ); + assert(_terminating_connections.find(peer) != _terminating_connections.end()); + _terminating_connections.erase(peer); + schedule_peer_for_deletion(peer); } + peers_to_terminate.clear(); - uint32_t failed_terminate_timeout_seconds = 120; - fc::time_point failed_terminate_threshold = fc::time_point::now() - fc::seconds(failed_terminate_timeout_seconds); - for (const peer_connection_ptr& peer : _terminating_connections ) - if (peer->get_connection_terminated_time() != fc::time_point::min() && - peer->get_connection_terminated_time() < failed_terminate_threshold) + // if we're going to abruptly disconnect anyone, do it here + // (it doesn't yield). I don't think there would be any harm if this were + // moved to the yielding section + for( const peer_connection_ptr& peer : peers_to_disconnect_forcibly ) { - wlog("Terminating connection with peer ${peer}, closing the connection didn't work", ("peer", peer->get_remote_endpoint())); - peers_to_terminate.push_back(peer); + move_peer_to_terminating_list(peer); + peer->close_connection(); } + peers_to_disconnect_forcibly.clear(); + } // end ASSERT_TASK_NOT_PREEMPTED() + // Now process the peers that we need to do yielding functions with (disconnect sends a message with the + // disconnect reason, so it may yield) for( const peer_connection_ptr& peer : peers_to_disconnect_gently ) { fc::exception detailed_error( FC_LOG_MESSAGE(warn, "Disconnecting due to inactivity", @@ -1378,25 +1411,11 @@ namespace graphene { namespace net { namespace detail { } peers_to_disconnect_gently.clear(); - for( const peer_connection_ptr& peer : peers_to_disconnect_forcibly ) - { - move_peer_to_terminating_list(peer); - peer->close_connection(); - } - peers_to_disconnect_forcibly.clear(); - for( const peer_connection_ptr& peer : peers_to_send_keep_alive ) peer->send_message(current_time_request_message(), offsetof(current_time_request_message, request_sent_time)); peers_to_send_keep_alive.clear(); - for (const peer_connection_ptr& peer : peers_to_terminate ) - { - assert(_terminating_connections.find(peer) != _terminating_connections.end()); - _terminating_connections.erase(peer); - schedule_peer_for_deletion(peer); - } - if (!_node_is_shutting_down && !_terminate_inactive_connections_loop_done.canceled()) _terminate_inactive_connections_loop_done = fc::schedule( [this](){ terminate_inactive_connections_loop(); }, fc::time_point::now() + fc::seconds(GRAPHENE_NET_PEER_HANDSHAKE_INACTIVITY_TIMEOUT / 2), From b67e30846446b543a5695875fee3c8c20b7e152d Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Wed, 2 Sep 2015 12:17:59 -0400 Subject: [PATCH 279/353] updating submodule --- libraries/fc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/fc b/libraries/fc index 71be796a..c89a25a5 160000 --- a/libraries/fc +++ b/libraries/fc @@ -1 +1 @@ -Subproject commit 71be796af50c407281a40e61e4199a87e0a19314 +Subproject commit c89a25a55c333bd202185cebf3f87eeae2b54761 From d2092e0d3a142aab5dbf4bd104d23615981fd2ff Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 2 Sep 2015 13:42:05 -0400 Subject: [PATCH 280/353] cli_wallet: Expose network_node API --- libraries/app/include/graphene/app/api.hpp | 6 --- .../wallet/include/graphene/wallet/wallet.hpp | 5 ++ libraries/wallet/wallet.cpp | 53 +++++++++++++++++++ 3 files changed, 58 insertions(+), 6 deletions(-) diff --git a/libraries/app/include/graphene/app/api.hpp b/libraries/app/include/graphene/app/api.hpp index 649eea3f..5bb36f65 100644 --- a/libraries/app/include/graphene/app/api.hpp +++ b/libraries/app/include/graphene/app/api.hpp @@ -480,12 +480,6 @@ namespace graphene { namespace app { /** * @brief Get status of all current connections to peers - * @brief Not reflected, thus not accessible to API clients. - * - * This function is registered to receive the applied_block - * signal from the chain database when a block is received. - * It then dispatches callbacks to clients who have requested - * to be notified when a particular txid is included in a block. */ std::vector get_connected_peers() const; diff --git a/libraries/wallet/include/graphene/wallet/wallet.hpp b/libraries/wallet/include/graphene/wallet/wallet.hpp index 590212fe..f4288d34 100644 --- a/libraries/wallet/include/graphene/wallet/wallet.hpp +++ b/libraries/wallet/include/graphene/wallet/wallet.hpp @@ -1299,6 +1299,9 @@ class wallet_api void dbg_make_mia(string creator, string symbol); void flood_network(string prefix, uint32_t number_of_transactions); + void network_add_nodes( const vector& nodes ); + vector< variant > network_get_connected_peers(); + /** * Used to transfer from one set of blinded balances to another */ @@ -1449,6 +1452,8 @@ FC_API( graphene::wallet::wallet_api, (dbg_make_uia) (dbg_make_mia) (flood_network) + (network_add_nodes) + (network_get_connected_peers) (set_key_label) (get_key_label) (get_public_key) diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp index 10c4a72a..ddcf65d1 100644 --- a/libraries/wallet/wallet.cpp +++ b/libraries/wallet/wallet.cpp @@ -1996,6 +1996,48 @@ public: create_asset(get_account(creator).name, symbol, 2, opts, bopts, true); } + void use_network_node_api() + { + if( _remote_net_node ) + return; + try + { + _remote_net_node = _remote_api->network_node(); + } + catch( const fc::exception& e ) + { + std::cerr << "\nCouldn't get network node API. You probably are not configured\n" + "to access the network API on the witness_node you are\n" + "connecting to. Please follow the instructions in README.md to set up an apiaccess file.\n" + "\n"; + throw(e); + } + } + + void network_add_nodes( const vector& nodes ) + { + use_network_node_api(); + for( const string& node_address : nodes ) + { + (*_remote_net_node)->add_node( fc::ip::endpoint::from_string( node_address ) ); + } + } + + vector< variant > network_get_connected_peers() + { + use_network_node_api(); + const auto peers = (*_remote_net_node)->get_connected_peers(); + vector< variant > result; + result.reserve( peers.size() ); + for( const auto& peer : peers ) + { + variant v; + fc::to_variant( peer, v ); + result.push_back( v ); + } + return result; + } + void flood_network(string prefix, uint32_t number_of_transactions) { try @@ -2064,6 +2106,7 @@ public: fc::api _remote_db; fc::api _remote_net_broadcast; fc::api _remote_hist; + optional< fc::api > _remote_net_node; flat_map _prototype_ops; @@ -2712,6 +2755,16 @@ void wallet_api::dbg_make_mia(string creator, string symbol) my->dbg_make_mia(creator, symbol); } +void wallet_api::network_add_nodes( const vector& nodes ) +{ + my->network_add_nodes( nodes ); +} + +vector< variant > wallet_api::network_get_connected_peers() +{ + return my->network_get_connected_peers(); +} + void wallet_api::flood_network(string prefix, uint32_t number_of_transactions) { FC_ASSERT(!is_locked()); From 025130b09655f4e7a884640818081930be994dab Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 2 Sep 2015 14:05:33 -0400 Subject: [PATCH 281/353] application.cpp: Fix --api-access option name --- libraries/app/application.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp index cf88be5a..70b2899a 100644 --- a/libraries/app/application.cpp +++ b/libraries/app/application.cpp @@ -286,8 +286,8 @@ namespace detail { graphene::time::now(); - if( _options->count("apiaccess") ) - _apiaccess = fc::json::from_file( _options->at("apiaccess").as() ) + if( _options->count("api-access") ) + _apiaccess = fc::json::from_file( _options->at("api-access").as() ) .as(); else { From c65f37ed6bd062f07b5a2aa3e8956a7e7900a808 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 2 Sep 2015 14:25:06 -0400 Subject: [PATCH 282/353] cli_wallet: Exit instead of hanging when disconnected #291 --- programs/cli_wallet/main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/cli_wallet/main.cpp b/programs/cli_wallet/main.cpp index aa1a0585..ef3e4118 100644 --- a/programs/cli_wallet/main.cpp +++ b/programs/cli_wallet/main.cpp @@ -179,8 +179,9 @@ int main( int argc, char** argv ) for( auto& name_formatter : wapiptr->get_result_formatters() ) wallet_cli->format_result( name_formatter.first, name_formatter.second ); - boost::signals2::scoped_connection closed_connection(con->closed.connect([]{ + boost::signals2::scoped_connection closed_connection(con->closed.connect([=]{ cerr << "Server has disconnected us.\n"; + wallet_cli->stop(); })); (void)(closed_connection); From cb2c5945b3049e0befd8f8bb9f932760f61cbadd Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 2 Sep 2015 14:56:37 -0400 Subject: [PATCH 283/353] README.md: More detailed instructions for restricted APIs --- README.md | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2b1fed10..0fa53eb2 100644 --- a/README.md +++ b/README.md @@ -119,7 +119,8 @@ Accessing restricted API's -------------------------- You can restrict API's to particular users by specifying an `apiaccess` file in `config.ini`. Here is an example `apiaccess` file which allows -user `bytemaster` with password `supersecret` to access four different API's: +user `bytemaster` with password `supersecret` to access four different API's, while allowing any other user to access the three public API's +necessary to use the wallet: { "permission_map" : @@ -131,6 +132,14 @@ user `bytemaster` with password `supersecret` to access four different API's: "password_salt_b64" : "INDdM6iCi/8=", "allowed_apis" : ["database_api", "network_broadcast_api", "history_api", "network_node_api"] } + ], + [ + "*", + { + "password_hash_b64" : "*", + "password_salt_b64" : "*", + "allowed_apis" : ["database_api", "network_broadcast_api", "history_api"] + } ] ] } @@ -237,3 +246,16 @@ Questions The first and second number together identify the kind of thing you're talking about (`1.2` for accounts, `1.3` for assets). The third number identifies the particular thing. + +- How do I get the `network_add_nodes` command to work? Why is it so complicated? + + You need to follow the instructions in the "Accessing restricted API's" section to + allow a username/password access to the `network_node` API. Then you need + to pass the username/password to the `cli_wallet` on the command line or in a config file. + + It's set up this way so that the default configuration is secure even if the RPC port is + publicly accessible. It's fine if your `witness_node` allows the general public to query + the database or broadcast transactions (in fact, this is how the hosted web UI works). It's + less fine if your `witness_node` allows the general public to control which p2p nodes it's + connecting to. Therefore the API to add p2p connections needs to be set up with proper access + controls. From 5662a8423cc78b8d9aa58f2d0d936b9f88036f44 Mon Sep 17 00:00:00 2001 From: Eric Frias Date: Wed, 2 Sep 2015 17:25:52 -0400 Subject: [PATCH 284/353] Increase duration of message cache from two blocks (which in practice meant anything > 1 block) to 30 blocks, and move the constant to config.hpp --- libraries/net/include/graphene/net/config.hpp | 8 ++++++++ libraries/net/node.cpp | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libraries/net/include/graphene/net/config.hpp b/libraries/net/include/graphene/net/config.hpp index 3242658c..5273be0f 100644 --- a/libraries/net/include/graphene/net/config.hpp +++ b/libraries/net/include/graphene/net/config.hpp @@ -51,6 +51,14 @@ #define GRAPHENE_NET_MAXIMUM_QUEUED_MESSAGES_IN_BYTES (1024 * 1024) +/** + * When we receive a message from the network, we advertise it to + * our peers and save a copy in a cache were we will find it if + * a peer requests it. We expire out old items out of the cache + * after this number of blocks go by. + */ +#define GRAPHENE_NET_MESSAGE_CACHE_DURATION_IN_BLOCKS 30 + /** * We prevent a peer from offering us a list of blocks which, if we fetched them * all, would result in a blockchain that extended into the future. diff --git a/libraries/net/node.cpp b/libraries/net/node.cpp index 103eb54d..55005b86 100644 --- a/libraries/net/node.cpp +++ b/libraries/net/node.cpp @@ -120,7 +120,7 @@ namespace graphene { namespace net { class blockchain_tied_message_cache { private: - static const uint32_t cache_duration_in_blocks = 2; + static const uint32_t cache_duration_in_blocks = GRAPHENE_NET_MESSAGE_CACHE_DURATION_IN_BLOCKS; struct message_hash_index{}; struct message_contents_hash_index{}; From 1ebd0f5af6d77c1418ffd89497ba54e53dcbdd20 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Wed, 2 Sep 2015 18:42:42 -0400 Subject: [PATCH 285/353] Updating wallet to report participation rate. --- libraries/wallet/wallet.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp index 10c4a72a..672d546d 100644 --- a/libraries/wallet/wallet.cpp +++ b/libraries/wallet/wallet.cpp @@ -472,6 +472,7 @@ public: " old"); result["next_maintenance_time"] = fc::get_approximate_relative_time_string(dynamic_props.next_maintenance_time); result["chain_id"] = chain_props.chain_id; + result["participation"] = (100*dynamic_props.recent_slots_filled.popcount()) / 128.0; result["active_witnesses"] = global_props.active_witnesses; result["active_committee_members"] = global_props.active_committee_members; return result; From 86bb4cdbca1bbb5c18ae6ea888b1e1c253774b0f Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Thu, 3 Sep 2015 08:31:03 -0400 Subject: [PATCH 286/353] restoring p2p code --- libraries/p2p/CMakeLists.txt | 32 ++ libraries/p2p/design.md | 90 ++++ .../p2p/include/graphene/p2p/message.hpp | 151 +++++++ .../p2p/message_oriented_connection.hpp | 49 +++ libraries/p2p/include/graphene/p2p/node.hpp | 74 ++++ .../include/graphene/p2p/peer_connection.hpp | 179 ++++++++ .../p2p/include/graphene/p2p/stcp_socket.hpp | 59 +++ libraries/p2p/message_oriented_connection.cpp | 393 ++++++++++++++++++ libraries/p2p/node.cpp | 141 +++++++ libraries/p2p/peer_connection.cpp | 7 + libraries/p2p/stcp_socket.cpp | 181 ++++++++ 11 files changed, 1356 insertions(+) create mode 100644 libraries/p2p/CMakeLists.txt create mode 100644 libraries/p2p/design.md create mode 100644 libraries/p2p/include/graphene/p2p/message.hpp create mode 100644 libraries/p2p/include/graphene/p2p/message_oriented_connection.hpp create mode 100644 libraries/p2p/include/graphene/p2p/node.hpp create mode 100644 libraries/p2p/include/graphene/p2p/peer_connection.hpp create mode 100644 libraries/p2p/include/graphene/p2p/stcp_socket.hpp create mode 100644 libraries/p2p/message_oriented_connection.cpp create mode 100644 libraries/p2p/node.cpp create mode 100644 libraries/p2p/peer_connection.cpp create mode 100644 libraries/p2p/stcp_socket.cpp diff --git a/libraries/p2p/CMakeLists.txt b/libraries/p2p/CMakeLists.txt new file mode 100644 index 00000000..6b5918d5 --- /dev/null +++ b/libraries/p2p/CMakeLists.txt @@ -0,0 +1,32 @@ +file(GLOB HEADERS "include/graphene/p2p/*.hpp") + +set(SOURCES node.cpp + stcp_socket.cpp + peer_connection.cpp + message_oriented_connection.cpp) + +add_library( graphene_p2p ${SOURCES} ${HEADERS} ) + +target_link_libraries( graphene_p2p + PUBLIC fc graphene_db ) +target_include_directories( graphene_p2p + PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" + PRIVATE "${CMAKE_SOURCE_DIR}/libraries/chain/include" +) + +#if(MSVC) +# set_source_files_properties( node.cpp PROPERTIES COMPILE_FLAGS "/bigobj" ) +#endif(MSVC) + +#if (USE_PCH) +# set_target_properties(graphene_p2p PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE) +# cotire(graphene_p2p ) +#endif(USE_PCH) + +install( TARGETS + graphene_p2p + + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) diff --git a/libraries/p2p/design.md b/libraries/p2p/design.md new file mode 100644 index 00000000..d55c1411 --- /dev/null +++ b/libraries/p2p/design.md @@ -0,0 +1,90 @@ +# Network Protocol 2 + +Building a low-latency network requires P2P nodes that have low-latency +connections and a protocol designed to minimize latency. for the purpose +of this document we will assume that two nodes are located on opposite +sides of the globe with a ping time of 250ms. + + +## Announce, Request, Send Protocol +Under the prior network archtiecture, transactions and blocks were broadcast +in a manner similar to the Bitcoin protocol: inventory messages notify peers of +transactions and blocks, then peers fetch the transaction or block from one +peer. After validating the item a node will broadcast an inventory message to +its peers. + +Under this model it will take 0.75 seconds for a peer to communicate a transaction +or block to another peer even if their size was 0 and there was no processing overhead. +This level of performance is unacceptable for a network attempting to produce one block +every second. + +This prior protocol also sent every transaction twice: initial broadcast, and again as +part of a block. + + +## Push Protocol +To minimize latency each node needs to immediately broadcast the data it receives +to its peers after validating it. Given the average transaction size is less than +100 bytes, it is almost as effecient to send the transaction as it is to send +the notice (assuming a 20 byte transaction id) + +Each node implements the following protocol: + + + onReceiveTransaction( from_peer, transaction ) + if( isKnown( transaction.id() ) ) + return + + markKnown( transaction.id() ) + + if( !validate( transaction ) ) + return + + for( peer : peers ) + if( peer != from_peer ) + send( peer, transaction ) + + + onReceiveBlock( from_peer, block_summary ) + if( isKnown( block_summary ) + return + + full_block = reconstructFullBlcok( from_peer, block_summary ) + if( !full_block ) disconnect from_peer + + markKnown( block_summary ) + + if( !pushBlock( full_block ) ) disconnect from_peer + + for( peer : peers ) + if( peer != from_peer ) + send( peer, block_summary ) + + + onConnect( new_peer, new_peer_head_block_num ) + if( peers.size() >= max_peers ) + send( new_peer, peers ) + disconnect( new_peer ) + return + + while( new_peer_head_block_num < our_head_block_num ) + sendFullBlock( new_peer, ++new_peer_head_block_num ) + + new_peer.synced = true + for( peer : peers ) + send( peer, new_peer ) + + onReceivePeers( from_peer, peers ) + addToPotentialPeers( peers ) + + onUpdateConnectionsTimer + if( peers.size() < desired_peers ) + connect( random_potential_peer ) + + onFullBlock( from_peer, full_block ) + if( !pushBlock( full_block ) ) disconnect from_peer + + onStartup + init_potential_peers from config + start onUpdateConnectionsTimer + diff --git a/libraries/p2p/include/graphene/p2p/message.hpp b/libraries/p2p/include/graphene/p2p/message.hpp new file mode 100644 index 00000000..926180d1 --- /dev/null +++ b/libraries/p2p/include/graphene/p2p/message.hpp @@ -0,0 +1,151 @@ +/** Copyright (c) 2015, Cryptonomex, Inc. All rights reserved. */ +#pragma once +#include +#include +#include +#include +#include +#include + +namespace graphene { namespace p2p { + + struct message_header + { + uint32_t size; // number of bytes in message, capped at MAX_MESSAGE_SIZE + uint32_t msg_type; + }; + + typedef fc::uint160_t message_hash_type; + + /** + * Abstracts the process of packing/unpacking a message for a + * particular channel. + */ + struct message : public message_header + { + std::vector data; + + message(){} + + message( message&& m ) + :message_header(m),data( std::move(m.data) ){} + + message( const message& m ) + :message_header(m),data( m.data ){} + + /** + * Assumes that T::type specifies the message type + */ + template + message( const T& m ) + { + msg_type = T::type; + data = fc::raw::pack(m); + size = (uint32_t)data.size(); + } + + fc::uint160_t id()const + { + return fc::ripemd160::hash( data.data(), (uint32_t)data.size() ); + } + + /** + * Automatically checks the type and deserializes T in the + * opposite process from the constructor. + */ + template + T as()const + { + try { + FC_ASSERT( msg_type == T::type ); + T tmp; + if( data.size() ) + { + fc::datastream ds( data.data(), data.size() ); + fc::raw::unpack( ds, tmp ); + } + else + { + // just to make sure that tmp shouldn't have any data + fc::datastream ds( nullptr, 0 ); + fc::raw::unpack( ds, tmp ); + } + return tmp; + } FC_RETHROW_EXCEPTIONS( warn, + "error unpacking network message as a '${type}' ${x} !=? ${msg_type}", + ("type", fc::get_typename::name() ) + ("x", T::type) + ("msg_type", msg_type) + ); + } + }; + + enum core_message_type_enum { + hello_message_type = 1000, + transaction_message_type = 1001, + block_message_type = 1002, + peer_message_type = 1003, + error_message_type = 1004 + }; + + struct hello_message + { + static const core_message_type_enum type; + + std::string user_agent; + uint16_t version; + + fc::ip::address inbound_address; + uint16_t inbound_port; + uint16_t outbound_port; + node_id_t node_public_key; + fc::sha256 chain_id; + fc::variant_object user_data; + block_id_type head_block; + }; + + struct transaction_message + { + static const core_message_type_enum type; + signed_transaction trx; + }; + + struct block_summary_message + { + static const core_message_type_enum type; + + signed_block_header header; + vector transaction_ids; + }; + + struct full_block_message + { + static const core_message_type_enum type; + signed_block block; + }; + + struct peers_message + { + static const core_message_type_enum type; + + vector peers; + }; + + struct error_message + { + static const core_message_type_enum type; + string message; + }; + + +} } // graphene::p2p + +FC_REFLECT( graphene::p2p::message_header, (size)(msg_type) ) +FC_REFLECT_DERIVED( graphene::p2p::message, (graphene::p2p::message_header), (data) ) +FC_REFLECT_ENUM( graphene::p2p::core_message_type_enum, + (hello_message_type) + (transaction_message_type) + (block_message_type) + (peer_message_type) + (error_message_type) +) diff --git a/libraries/p2p/include/graphene/p2p/message_oriented_connection.hpp b/libraries/p2p/include/graphene/p2p/message_oriented_connection.hpp new file mode 100644 index 00000000..82b73195 --- /dev/null +++ b/libraries/p2p/include/graphene/p2p/message_oriented_connection.hpp @@ -0,0 +1,49 @@ +/** Copyright (c) 2015, Cryptonomex, Inc. All rights reserved. */ +#pragma once +#include +#include + +namespace graphene { namespace p2p { + + namespace detail { class message_oriented_connection_impl; } + + class message_oriented_connection; + + /** receives incoming messages from a message_oriented_connection object */ + class message_oriented_connection_delegate + { + public: + virtual void on_message( message_oriented_connection* originating_connection, + const message& received_message) = 0; + + virtual void on_connection_closed(message_oriented_connection* originating_connection) = 0; + }; + + /** uses a secure socket to create a connection that reads and writes a stream of `fc::p2p::message` objects */ + class message_oriented_connection + { + public: + message_oriented_connection(message_oriented_connection_delegate* delegate = nullptr); + ~message_oriented_connection(); + fc::tcp_socket& get_socket(); + + void accept(); + void bind(const fc::ip::endpoint& local_endpoint); + void connect_to(const fc::ip::endpoint& remote_endpoint); + + void send_message(const message& message_to_send); + void close_connection(); + void destroy_connection(); + + uint64_t get_total_bytes_sent() const; + uint64_t get_total_bytes_received() const; + fc::time_point get_last_message_sent_time() const; + fc::time_point get_last_message_received_time() const; + fc::time_point get_connection_time() const; + fc::sha512 get_shared_secret() const; + private: + std::unique_ptr my; + }; + typedef std::shared_ptr message_oriented_connection_ptr; + +} } // graphene::net diff --git a/libraries/p2p/include/graphene/p2p/node.hpp b/libraries/p2p/include/graphene/p2p/node.hpp new file mode 100644 index 00000000..aa7f5e46 --- /dev/null +++ b/libraries/p2p/include/graphene/p2p/node.hpp @@ -0,0 +1,74 @@ +/** Copyright (c) 2015, Cryptonomex, Inc. */ + +#pragma once +#include +#include + + + +namespace graphene { namespace p2p { + using namespace graphene::chain; + + struct node_config + { + fc::ip::endpoint server_endpoint; + bool wait_if_not_available = true; + uint32_t desired_peers; + uint32_t max_peers; + /** receive, but don't rebroadcast data */ + bool subscribe_only = false; + public_key_type node_id; + vector seed_nodes; + }; + + struct by_remote_endpoint; + struct by_peer_id; + + /** + * @ingroup object_index + */ + typedef multi_index_container< + peer_connection_ptr, + indexed_by< + ordered_unique< tag, + const_mem_fun< peer_connection, fc::ip::endpoint, &peer_connection::get_remote_endpoint > >, + ordered_unique< tag, member< peer_connection, public_key_type, &peer_connection::node_id > > + > + > peer_connection_index; + + + class node : public std::enable_shared_from_this + { + public: + server( chain_database& db ); + + void add_peer( const fc::ip::endpoint& ep ); + void configure( const node_config& cfg ); + + void on_incomming_connection( peer_connection_ptr new_peer ); + void on_hello( peer_connection_ptr new_peer, hello_message m ); + void on_transaction( peer_connection_ptr from_peer, transaction_message m ); + void on_block( peer_connection_ptr from_peer, block_message m ); + void on_peers( peer_connection_ptr from_peer, peers_message m ); + void on_error( peer_connection_ptr from_peer, error_message m ); + void on_full_block( peer_connection_ptr from_peer, full_block_message m ); + void on_update_connections(); + + private: + /** + * Specifies the network interface and port upon which incoming + * connections should be accepted. + */ + void listen_on_endpoint( fc::ip::endpoint ep, bool wait_if_not_available ); + void accept_loop(); + + graphene::chain::database& _db; + + fc::tcp_server _tcp_server; + fc::ip::endpoint _actual_listening_endpoint; + fc::future _accept_loop_complete; + peer_connection_index _peers; + + }; + +} } /// graphene::p2p diff --git a/libraries/p2p/include/graphene/p2p/peer_connection.hpp b/libraries/p2p/include/graphene/p2p/peer_connection.hpp new file mode 100644 index 00000000..8f0ab594 --- /dev/null +++ b/libraries/p2p/include/graphene/p2p/peer_connection.hpp @@ -0,0 +1,179 @@ +/* + * Copyright (c) 2015, Cryptonomex, Inc. + * All rights reserved. + * + * This source code is provided for evaluation in private test networks only, until September 8, 2015. After this date, this license expires and + * the code may not be used, modified or distributed for any purpose. Redistribution and use in source and binary forms, with or without modification, + * are permitted until September 8, 2015, provided that the following conditions are met: + * + * 1. The code and/or derivative works are used only for private test networks consisting of no more than 10 P2P nodes. + * + * 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. + */ +#pragma once + +#include +#include +#include + +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +namespace graphene { namespace p2p { + + class peer_connection; + class peer_connection_delegate + { + public: + virtual void on_message(peer_connection* originating_peer, + const message& received_message) = 0; + virtual void on_connection_closed(peer_connection* originating_peer) = 0; + virtual message get_message_for_item(const item_id& item) = 0; + }; + + class peer_connection; + typedef std::shared_ptr peer_connection_ptr; + + + class peer_connection : public message_oriented_connection_delegate, + public std::enable_shared_from_this + { + public: + enum direction_type { inbound, outbound }; + enum connection_state { + connecting = 0, + syncing = 1, + synced = 2 + }; + + fc::time_point connection_initiation_time; + fc::time_point connection_closed_time; + fc::time_point connection_terminated_time; + direction_type direction = outbound; + connection_state state = connecting; + bool is_firewalled = true + + //connection_state state; + fc::microseconds clock_offset; + fc::microseconds round_trip_delay; + + /// data about the peer node + /// @{ + + /** the unique identifier we'll use to refer to the node with. zero-initialized before + * we receive the hello message, at which time it will be filled with either the "node_id" + * from the user_data field of the hello, or if none is present it will be filled with a + * copy of node_public_key */ + public_key_type node_id; + uint32_t core_protocol_version; + std::string user_agent; + + fc::optional graphene_git_revision_sha; + fc::optional graphene_git_revision_unix_timestamp; + fc::optional fc_git_revision_sha; + fc::optional fc_git_revision_unix_timestamp; + fc::optional platform; + fc::optional bitness; + + // for inbound connections, these fields record what the peer sent us in + // its hello message. For outbound, they record what we sent the peer + // in our hello message + fc::ip::address inbound_address; + uint16_t inbound_port; + uint16_t outbound_port; + /// @} + + void send( transaction_message_ptr msg ) + { + // if not in sent_or_received then insert into _pending_send + // if process_send_queue is invalid or complete then + // async process_send_queue + } + + void received_transaction( const transaction_id_type& id ) + { + _sent_or_received.insert(id); + } + + void process_send_queue() + { + // while _pending_send.size() || _pending_blocks.size() + // while there are pending blocks, then take the oldest + // for each transaction id, verify that it exists in _sent_or_received + // else find it in the _pending_send queue and send it + // send one from _pending_send + } + + + std::unordered_map _pending_send; + /// todo: make multi-index that tracks how long items have been cached and removes them + /// after a resasonable period of time (say 10 seconds) + std::unordered_set _sent_or_received; + std::map _pending_blocks; + + + fc::ip::endpoint get_remote_endpoint()const + { return get_socket().get_remote_endpoint(); } + + void on_message(message_oriented_connection* originating_connection, + const message& received_message) override + { + switch( core_message_type_enum( received_message.type ) ) + { + case hello_message_type: + _node->on_hello( shared_from_this(), + received_message.as() ); + break; + case transaction_message_type: + _node->on_transaction( shared_from_this(), + received_message.as() ); + break; + case block_message_type: + _node->on_block( shared_from_this(), + received_message.as() ); + break; + case peer_message_type: + _node->on_peers( shared_from_this(), + received_message.as() ); + break; + } + } + + void on_connection_closed(message_oriented_connection* originating_connection) override + { + _node->on_close( shared_from_this() ); + } + + fc::tcp_socket& get_socket() { return _message_connection.get_socket(); } + + private: + peer_connection_delegate* _node; + fc::optional _remote_endpoint; + message_oriented_connection _message_connection; + + }; + typedef std::shared_ptr peer_connection_ptr; + + + } } // end namespace graphene::p2p + +// not sent over the wire, just reflected for logging +FC_REFLECT_ENUM(graphene::p2p::peer_connection::connection_state, (connecting)(syncing)(synced) ) +FC_REFLECT_ENUM(graphene::p2p::peer_connection::direction_type, (inbound)(outbound) ) diff --git a/libraries/p2p/include/graphene/p2p/stcp_socket.hpp b/libraries/p2p/include/graphene/p2p/stcp_socket.hpp new file mode 100644 index 00000000..01e6df34 --- /dev/null +++ b/libraries/p2p/include/graphene/p2p/stcp_socket.hpp @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2015, Cryptonomex, Inc. All rights reserved. + */ +#pragma once +#include +#include +#include + +namespace graphene { namespace p2p { + +/** + * Uses ECDH to negotiate a aes key for communicating + * with other nodes on the network. + */ +class stcp_socket : public virtual fc::iostream +{ + public: + stcp_socket(); + ~stcp_socket(); + fc::tcp_socket& get_socket() { return _sock; } + void accept(); + + void connect_to( const fc::ip::endpoint& remote_endpoint ); + void bind( const fc::ip::endpoint& local_endpoint ); + + virtual size_t readsome( char* buffer, size_t max ); + virtual size_t readsome( const std::shared_ptr& buf, size_t len, size_t offset ); + virtual bool eof()const; + + virtual size_t writesome( const char* buffer, size_t len ); + virtual size_t writesome( const std::shared_ptr& buf, size_t len, size_t offset ); + + virtual void flush(); + virtual void close(); + + using istream::get; + void get( char& c ) { read( &c, 1 ); } + fc::sha512 get_shared_secret() const { return _shared_secret; } + private: + void do_key_exchange(); + + fc::sha512 _shared_secret; + fc::ecc::private_key _priv_key; + fc::array _buf; + //uint32_t _buf_len; + fc::tcp_socket _sock; + fc::aes_encoder _send_aes; + fc::aes_decoder _recv_aes; + std::shared_ptr _read_buffer; + std::shared_ptr _write_buffer; +#ifndef NDEBUG + bool _read_buffer_in_use; + bool _write_buffer_in_use; +#endif +}; + +typedef std::shared_ptr stcp_socket_ptr; + +} } // graphene::p2p diff --git a/libraries/p2p/message_oriented_connection.cpp b/libraries/p2p/message_oriented_connection.cpp new file mode 100644 index 00000000..a17ec541 --- /dev/null +++ b/libraries/p2p/message_oriented_connection.cpp @@ -0,0 +1,393 @@ +/* + * Copyright (c) 2015, Cryptonomex, Inc. + * All rights reserved. + */ +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#ifdef DEFAULT_LOGGER +# undef DEFAULT_LOGGER +#endif +#define DEFAULT_LOGGER "p2p" + +#ifndef NDEBUG +# define VERIFY_CORRECT_THREAD() assert(_thread->is_current()) +#else +# define VERIFY_CORRECT_THREAD() do {} while (0) +#endif + +namespace graphene { namespace p2p { + namespace detail + { + class message_oriented_connection_impl + { + private: + message_oriented_connection* _self; + message_oriented_connection_delegate *_delegate; + stcp_socket _sock; + fc::future _read_loop_done; + uint64_t _bytes_received; + uint64_t _bytes_sent; + + fc::time_point _connected_time; + fc::time_point _last_message_received_time; + fc::time_point _last_message_sent_time; + + bool _send_message_in_progress; + +#ifndef NDEBUG + fc::thread* _thread; +#endif + + void read_loop(); + void start_read_loop(); + public: + fc::tcp_socket& get_socket(); + void accept(); + void connect_to(const fc::ip::endpoint& remote_endpoint); + void bind(const fc::ip::endpoint& local_endpoint); + + message_oriented_connection_impl(message_oriented_connection* self, + message_oriented_connection_delegate* delegate = nullptr); + ~message_oriented_connection_impl(); + + void send_message(const message& message_to_send); + void close_connection(); + void destroy_connection(); + + uint64_t get_total_bytes_sent() const; + uint64_t get_total_bytes_received() const; + + fc::time_point get_last_message_sent_time() const; + fc::time_point get_last_message_received_time() const; + fc::time_point get_connection_time() const { return _connected_time; } + fc::sha512 get_shared_secret() const; + }; + + message_oriented_connection_impl::message_oriented_connection_impl(message_oriented_connection* self, + message_oriented_connection_delegate* delegate) + : _self(self), + _delegate(delegate), + _bytes_received(0), + _bytes_sent(0), + _send_message_in_progress(false) +#ifndef NDEBUG + ,_thread(&fc::thread::current()) +#endif + { + } + message_oriented_connection_impl::~message_oriented_connection_impl() + { + VERIFY_CORRECT_THREAD(); + destroy_connection(); + } + + fc::tcp_socket& message_oriented_connection_impl::get_socket() + { + VERIFY_CORRECT_THREAD(); + return _sock.get_socket(); + } + + void message_oriented_connection_impl::accept() + { + VERIFY_CORRECT_THREAD(); + _sock.accept(); + assert(!_read_loop_done.valid()); // check to be sure we never launch two read loops + _read_loop_done = fc::async([=](){ read_loop(); }, "message read_loop"); + } + + void message_oriented_connection_impl::connect_to(const fc::ip::endpoint& remote_endpoint) + { + VERIFY_CORRECT_THREAD(); + _sock.connect_to(remote_endpoint); + assert(!_read_loop_done.valid()); // check to be sure we never launch two read loops + _read_loop_done = fc::async([=](){ read_loop(); }, "message read_loop"); + } + + void message_oriented_connection_impl::bind(const fc::ip::endpoint& local_endpoint) + { + VERIFY_CORRECT_THREAD(); + _sock.bind(local_endpoint); + } + + + void message_oriented_connection_impl::read_loop() + { + VERIFY_CORRECT_THREAD(); + const int BUFFER_SIZE = 16; + const int LEFTOVER = BUFFER_SIZE - sizeof(message_header); + static_assert(BUFFER_SIZE >= sizeof(message_header), "insufficient buffer"); + + _connected_time = fc::time_point::now(); + + fc::oexception exception_to_rethrow; + bool call_on_connection_closed = false; + + try + { + message m; + while( true ) + { + char buffer[BUFFER_SIZE]; + _sock.read(buffer, BUFFER_SIZE); + _bytes_received += BUFFER_SIZE; + memcpy((char*)&m, buffer, sizeof(message_header)); + + FC_ASSERT( m.size <= MAX_MESSAGE_SIZE, "", ("m.size",m.size)("MAX_MESSAGE_SIZE",MAX_MESSAGE_SIZE) ); + + size_t remaining_bytes_with_padding = 16 * ((m.size - LEFTOVER + 15) / 16); + m.data.resize(LEFTOVER + remaining_bytes_with_padding); //give extra 16 bytes to allow for padding added in send call + std::copy(buffer + sizeof(message_header), buffer + sizeof(buffer), m.data.begin()); + if (remaining_bytes_with_padding) + { + _sock.read(&m.data[LEFTOVER], remaining_bytes_with_padding); + _bytes_received += remaining_bytes_with_padding; + } + m.data.resize(m.size); // truncate off the padding bytes + + _last_message_received_time = fc::time_point::now(); + + try + { + // message handling errors are warnings... + _delegate->on_message(_self, m); + } + /// Dedicated catches needed to distinguish from general fc::exception + catch ( const fc::canceled_exception& e ) { throw e; } + catch ( const fc::eof_exception& e ) { throw e; } + catch ( const fc::exception& e) + { + /// Here loop should be continued so exception should be just caught locally. + wlog( "message transmission failed ${er}", ("er", e.to_detail_string() ) ); + throw; + } + } + } + catch ( const fc::canceled_exception& e ) + { + wlog( "caught a canceled_exception in read_loop. this should mean we're in the process of deleting this object already, so there's no need to notify the delegate: ${e}", ("e", e.to_detail_string() ) ); + throw; + } + catch ( const fc::eof_exception& e ) + { + wlog( "disconnected ${e}", ("e", e.to_detail_string() ) ); + call_on_connection_closed = true; + } + catch ( const fc::exception& e ) + { + elog( "disconnected ${er}", ("er", e.to_detail_string() ) ); + call_on_connection_closed = true; + exception_to_rethrow = fc::unhandled_exception(FC_LOG_MESSAGE(warn, "disconnected: ${e}", ("e", e.to_detail_string()))); + } + catch ( const std::exception& e ) + { + elog( "disconnected ${er}", ("er", e.what() ) ); + call_on_connection_closed = true; + exception_to_rethrow = fc::unhandled_exception(FC_LOG_MESSAGE(warn, "disconnected: ${e}", ("e", e.what()))); + } + catch ( ... ) + { + elog( "unexpected exception" ); + call_on_connection_closed = true; + exception_to_rethrow = fc::unhandled_exception(FC_LOG_MESSAGE(warn, "disconnected: ${e}", ("e", fc::except_str()))); + } + + if (call_on_connection_closed) + _delegate->on_connection_closed(_self); + + if (exception_to_rethrow) + throw *exception_to_rethrow; + } + + void message_oriented_connection_impl::send_message(const message& message_to_send) + { + VERIFY_CORRECT_THREAD(); +#if 0 // this gets too verbose +#ifndef NDEBUG + fc::optional remote_endpoint; + if (_sock.get_socket().is_open()) + remote_endpoint = _sock.get_socket().remote_endpoint(); + struct scope_logger { + const fc::optional& endpoint; + scope_logger(const fc::optional& endpoint) : endpoint(endpoint) { dlog("entering message_oriented_connection::send_message() for peer ${endpoint}", ("endpoint", endpoint)); } + ~scope_logger() { dlog("leaving message_oriented_connection::send_message() for peer ${endpoint}", ("endpoint", endpoint)); } + } send_message_scope_logger(remote_endpoint); +#endif +#endif + struct verify_no_send_in_progress { + bool& var; + verify_no_send_in_progress(bool& var) : var(var) + { + if (var) + elog("Error: two tasks are calling message_oriented_connection::send_message() at the same time"); + assert(!var); + var = true; + } + ~verify_no_send_in_progress() { var = false; } + } _verify_no_send_in_progress(_send_message_in_progress); + + try + { + size_t size_of_message_and_header = sizeof(message_header) + message_to_send.size; + if( message_to_send.size > MAX_MESSAGE_SIZE ) + elog("Trying to send a message larger than MAX_MESSAGE_SIZE. This probably won't work..."); + //pad the message we send to a multiple of 16 bytes + size_t size_with_padding = 16 * ((size_of_message_and_header + 15) / 16); + std::unique_ptr padded_message(new char[size_with_padding]); + memcpy(padded_message.get(), (char*)&message_to_send, sizeof(message_header)); + memcpy(padded_message.get() + sizeof(message_header), message_to_send.data.data(), message_to_send.size ); + _sock.write(padded_message.get(), size_with_padding); + _sock.flush(); + _bytes_sent += size_with_padding; + _last_message_sent_time = fc::time_point::now(); + } FC_RETHROW_EXCEPTIONS( warn, "unable to send message" ); + } + + void message_oriented_connection_impl::close_connection() + { + VERIFY_CORRECT_THREAD(); + _sock.close(); + } + + void message_oriented_connection_impl::destroy_connection() + { + VERIFY_CORRECT_THREAD(); + + fc::optional remote_endpoint; + if (_sock.get_socket().is_open()) + remote_endpoint = _sock.get_socket().remote_endpoint(); + ilog( "in destroy_connection() for ${endpoint}", ("endpoint", remote_endpoint) ); + + if (_send_message_in_progress) + elog("Error: message_oriented_connection is being destroyed while a send_message is in progress. " + "The task calling send_message() should have been canceled already"); + assert(!_send_message_in_progress); + + try + { + _read_loop_done.cancel_and_wait(__FUNCTION__); + } + catch ( const fc::exception& e ) + { + wlog( "Exception thrown while canceling message_oriented_connection's read_loop, ignoring: ${e}", ("e",e) ); + } + catch (...) + { + wlog( "Exception thrown while canceling message_oriented_connection's read_loop, ignoring" ); + } + } + + uint64_t message_oriented_connection_impl::get_total_bytes_sent() const + { + VERIFY_CORRECT_THREAD(); + return _bytes_sent; + } + + uint64_t message_oriented_connection_impl::get_total_bytes_received() const + { + VERIFY_CORRECT_THREAD(); + return _bytes_received; + } + + fc::time_point message_oriented_connection_impl::get_last_message_sent_time() const + { + VERIFY_CORRECT_THREAD(); + return _last_message_sent_time; + } + + fc::time_point message_oriented_connection_impl::get_last_message_received_time() const + { + VERIFY_CORRECT_THREAD(); + return _last_message_received_time; + } + + fc::sha512 message_oriented_connection_impl::get_shared_secret() const + { + VERIFY_CORRECT_THREAD(); + return _sock.get_shared_secret(); + } + + } // end namespace graphene::p2p::detail + + + message_oriented_connection::message_oriented_connection(message_oriented_connection_delegate* delegate) : + my(new detail::message_oriented_connection_impl(this, delegate)) + { + } + + message_oriented_connection::~message_oriented_connection() + { + } + + fc::tcp_socket& message_oriented_connection::get_socket() + { + return my->get_socket(); + } + + void message_oriented_connection::accept() + { + my->accept(); + } + + void message_oriented_connection::connect_to(const fc::ip::endpoint& remote_endpoint) + { + my->connect_to(remote_endpoint); + } + + void message_oriented_connection::bind(const fc::ip::endpoint& local_endpoint) + { + my->bind(local_endpoint); + } + + void message_oriented_connection::send_message(const message& message_to_send) + { + my->send_message(message_to_send); + } + + void message_oriented_connection::close_connection() + { + my->close_connection(); + } + + void message_oriented_connection::destroy_connection() + { + my->destroy_connection(); + } + + uint64_t message_oriented_connection::get_total_bytes_sent() const + { + return my->get_total_bytes_sent(); + } + + uint64_t message_oriented_connection::get_total_bytes_received() const + { + return my->get_total_bytes_received(); + } + + fc::time_point message_oriented_connection::get_last_message_sent_time() const + { + return my->get_last_message_sent_time(); + } + + fc::time_point message_oriented_connection::get_last_message_received_time() const + { + return my->get_last_message_received_time(); + } + fc::time_point message_oriented_connection::get_connection_time() const + { + return my->get_connection_time(); + } + fc::sha512 message_oriented_connection::get_shared_secret() const + { + return my->get_shared_secret(); + } + +} } // end namespace graphene::p2p diff --git a/libraries/p2p/node.cpp b/libraries/p2p/node.cpp new file mode 100644 index 00000000..5a8da3a4 --- /dev/null +++ b/libraries/p2p/node.cpp @@ -0,0 +1,141 @@ +#include + +namespace graphene { namespace p2p { + + node::node( chain_database& db ) + :_db(db) + { + + } + + node::~node() + { + + } + + void node::add_peer( const fc::ip::endpoint& ep ) + { + + } + + void node::configure( const node_config& cfg ) + { + listen_on_endpoint( cfg.server_endpoint, wait_if_not_available ); + + /** don't allow node to go out of scope until accept loop exits */ + auto self = shared_from_this(); + _accept_loop_complete = fc::async( [self](){ self->accept_loop(); } ) + } + + void node::accept_loop() + { + auto self = shared_from_this(); + while( !_accept_loop_complete.canceled() ) + { + try { + auto new_peer = std::make_shared(self); + _tcp_server.accept( new_peer.get_socket() ); + + if( _accept_loop_complete.canceled() ) + return; + + _peers.insert( new_peer ); + + + + // limit the rate at which we accept connections to mitigate DOS attacks + fc::usleep( fc::milliseconds(10) ); + } FC_CAPTURE_AND_RETHROW() + } + } // accept_loop() + + + + void node::listen_on_endpoint( fc::ip::endpoint ep, bool wait_if_not_available ) + { + if( ep.port() != 0 ) + { + // if the user specified a port, we only want to bind to it if it's not already + // being used by another application. During normal operation, we set the + // SO_REUSEADDR/SO_REUSEPORT flags so that we can bind outbound sockets to the + // same local endpoint as we're listening on here. On some platforms, setting + // those flags will prevent us from detecting that other applications are + // listening on that port. We'd like to detect that, so we'll set up a temporary + // tcp server without that flag to see if we can listen on that port. + bool first = true; + for( ;; ) + { + bool listen_failed = false; + + try + { + fc::tcp_server temporary_server; + if( listen_endpoint.get_address() != fc::ip::address() ) + temporary_server.listen( ep ); + else + temporary_server.listen( ep.port() ); + break; + } + catch ( const fc::exception&) + { + listen_failed = true; + } + + if (listen_failed) + { + if( wait_if_endpoint_is_busy ) + { + std::ostringstream error_message_stream; + if( first ) + { + error_message_stream << "Unable to listen for connections on port " + << ep.port() + << ", retrying in a few seconds\n"; + error_message_stream << "You can wait for it to become available, or restart " + "this program using\n"; + error_message_stream << "the --p2p-port option to specify another port\n"; + first = false; + } + else + { + error_message_stream << "\nStill waiting for port " << listen_endpoint.port() << " to become available\n"; + } + + std::string error_message = error_message_stream.str(); + ulog(error_message); + fc::usleep( fc::seconds(5 ) ); + } + else // don't wait, just find a random port + { + wlog( "unable to bind on the requested endpoint ${endpoint}, " + "which probably means that endpoint is already in use", + ( "endpoint", ep ) ); + ep.set_port( 0 ); + } + } // if (listen_failed) + } // for(;;) + } // if (listen_endpoint.port() != 0) + + + _tcp_server.set_reuse_address(); + try + { + if( ep.get_address() != fc::ip::address() ) + _tcp_server.listen( ep ); + else + _tcp_server.listen( ep.port() ); + + _actual_listening_endpoint = _tcp_server.get_local_endpoint(); + ilog( "listening for connections on endpoint ${endpoint} (our first choice)", + ( "endpoint", _actual_listening_endpoint ) ); + } + catch ( fc::exception& e ) + { + FC_RETHROW_EXCEPTION( e, error, + "unable to listen on ${endpoint}", ("endpoint",listen_endpoint ) ); + } + } + + + +} } diff --git a/libraries/p2p/peer_connection.cpp b/libraries/p2p/peer_connection.cpp new file mode 100644 index 00000000..605113b1 --- /dev/null +++ b/libraries/p2p/peer_connection.cpp @@ -0,0 +1,7 @@ +#include + +namespace graphene { namespace p2p { + +} } //graphene::p2p + + diff --git a/libraries/p2p/stcp_socket.cpp b/libraries/p2p/stcp_socket.cpp new file mode 100644 index 00000000..7112cc34 --- /dev/null +++ b/libraries/p2p/stcp_socket.cpp @@ -0,0 +1,181 @@ +/* + * Copyright (c) 2015, Cryptonomex, Inc. + * All rights reserved. + * + * This source code is provided for evaluation in private test networks only, until September 8, 2015. After this date, this license expires and + * the code may not be used, modified or distributed for any purpose. Redistribution and use in source and binary forms, with or without modification, + * are permitted until September 8, 2015, provided that the following conditions are met: + * + * 1. The code and/or derivative works are used only for private test networks consisting of no more than 10 P2P nodes. + * + * 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 + +#include +#include +#include +#include +#include +#include + +#include + +namespace graphene { namespace p2p { + +stcp_socket::stcp_socket() +//:_buf_len(0) +#ifndef NDEBUG + : _read_buffer_in_use(false), + _write_buffer_in_use(false) +#endif +{ +} +stcp_socket::~stcp_socket() +{ +} + +void stcp_socket::do_key_exchange() +{ + _priv_key = fc::ecc::private_key::generate(); + fc::ecc::public_key pub = _priv_key.get_public_key(); + fc::ecc::public_key_data s = pub.serialize(); + std::shared_ptr serialized_key_buffer(new char[sizeof(fc::ecc::public_key_data)], [](char* p){ delete[] p; }); + memcpy(serialized_key_buffer.get(), (char*)&s, sizeof(fc::ecc::public_key_data)); + _sock.write( serialized_key_buffer, sizeof(fc::ecc::public_key_data) ); + _sock.read( serialized_key_buffer, sizeof(fc::ecc::public_key_data) ); + fc::ecc::public_key_data rpub; + memcpy((char*)&rpub, serialized_key_buffer.get(), sizeof(fc::ecc::public_key_data)); + + _shared_secret = _priv_key.get_shared_secret( rpub ); +// ilog("shared secret ${s}", ("s", shared_secret) ); + _send_aes.init( fc::sha256::hash( (char*)&_shared_secret, sizeof(_shared_secret) ), + fc::city_hash_crc_128((char*)&_shared_secret,sizeof(_shared_secret) ) ); + _recv_aes.init( fc::sha256::hash( (char*)&_shared_secret, sizeof(_shared_secret) ), + fc::city_hash_crc_128((char*)&_shared_secret,sizeof(_shared_secret) ) ); +} + + +void stcp_socket::connect_to( const fc::ip::endpoint& remote_endpoint ) +{ + _sock.connect_to( remote_endpoint ); + do_key_exchange(); +} + +void stcp_socket::bind( const fc::ip::endpoint& local_endpoint ) +{ + _sock.bind(local_endpoint); +} + +/** + * This method must read at least 16 bytes at a time from + * the underlying TCP socket so that it can decrypt them. It + * will buffer any left-over. + */ +size_t stcp_socket::readsome( char* buffer, size_t len ) +{ try { + assert( len > 0 && (len % 16) == 0 ); + +#ifndef NDEBUG + // This code was written with the assumption that you'd only be making one call to readsome + // at a time so it reuses _read_buffer. If you really need to make concurrent calls to + // readsome(), you'll need to prevent reusing _read_buffer here + struct check_buffer_in_use { + bool& _buffer_in_use; + check_buffer_in_use(bool& buffer_in_use) : _buffer_in_use(buffer_in_use) { assert(!_buffer_in_use); _buffer_in_use = true; } + ~check_buffer_in_use() { assert(_buffer_in_use); _buffer_in_use = false; } + } buffer_in_use_checker(_read_buffer_in_use); +#endif + + const size_t read_buffer_length = 4096; + if (!_read_buffer) + _read_buffer.reset(new char[read_buffer_length], [](char* p){ delete[] p; }); + + len = std::min(read_buffer_length, len); + + size_t s = _sock.readsome( _read_buffer, len, 0 ); + if( s % 16 ) + { + _sock.read(_read_buffer, 16 - (s%16), s); + s += 16-(s%16); + } + _recv_aes.decode( _read_buffer.get(), s, buffer ); + return s; +} FC_RETHROW_EXCEPTIONS( warn, "", ("len",len) ) } + +size_t stcp_socket::readsome( const std::shared_ptr& buf, size_t len, size_t offset ) +{ + return readsome(buf.get() + offset, len); +} + +bool stcp_socket::eof()const +{ + return _sock.eof(); +} + +size_t stcp_socket::writesome( const char* buffer, size_t len ) +{ try { + assert( len > 0 && (len % 16) == 0 ); + +#ifndef NDEBUG + // This code was written with the assumption that you'd only be making one call to writesome + // at a time so it reuses _write_buffer. If you really need to make concurrent calls to + // writesome(), you'll need to prevent reusing _write_buffer here + struct check_buffer_in_use { + bool& _buffer_in_use; + check_buffer_in_use(bool& buffer_in_use) : _buffer_in_use(buffer_in_use) { assert(!_buffer_in_use); _buffer_in_use = true; } + ~check_buffer_in_use() { assert(_buffer_in_use); _buffer_in_use = false; } + } buffer_in_use_checker(_write_buffer_in_use); +#endif + + const std::size_t write_buffer_length = 4096; + if (!_write_buffer) + _write_buffer.reset(new char[write_buffer_length], [](char* p){ delete[] p; }); + len = std::min(write_buffer_length, len); + memset(_write_buffer.get(), 0, len); // just in case aes.encode screws up + /** + * every sizeof(crypt_buf) bytes the aes channel + * has an error and doesn't decrypt properly... disable + * for now because we are going to upgrade to something + * better. + */ + uint32_t ciphertext_len = _send_aes.encode( buffer, len, _write_buffer.get() ); + assert(ciphertext_len == len); + _sock.write( _write_buffer, ciphertext_len ); + return ciphertext_len; +} FC_RETHROW_EXCEPTIONS( warn, "", ("len",len) ) } + +size_t stcp_socket::writesome( const std::shared_ptr& buf, size_t len, size_t offset ) +{ + return writesome(buf.get() + offset, len); +} + +void stcp_socket::flush() +{ + _sock.flush(); +} + + +void stcp_socket::close() +{ + try + { + _sock.close(); + }FC_RETHROW_EXCEPTIONS( warn, "error closing stcp socket" ); +} + +void stcp_socket::accept() +{ + do_key_exchange(); +} + + +}} // namespace graphene::p2p + From a5071f25680b31c7202ca69b515218a8a85739e0 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Thu, 3 Sep 2015 17:42:52 -0400 Subject: [PATCH 287/353] rollback on save --- libraries/app/api.cpp | 87 +++++++--------------- libraries/app/include/graphene/app/api.hpp | 10 ++- libraries/chain/block_database.cpp | 6 +- libraries/chain/db_block.cpp | 3 +- libraries/chain/db_management.cpp | 11 ++- 5 files changed, 51 insertions(+), 66 deletions(-) diff --git a/libraries/app/api.cpp b/libraries/app/api.cpp index 871f20bc..ed7809f8 100644 --- a/libraries/app/api.cpp +++ b/libraries/app/api.cpp @@ -228,6 +228,7 @@ namespace graphene { namespace app { std::map database_api::get_full_accounts( const vector& names_or_ids, bool subscribe) { + idump((names_or_ids)); std::map results; for (const std::string& account_name_or_id : names_or_ids) @@ -801,35 +802,27 @@ namespace graphene { namespace app { } // end get_relevant_accounts( obj ) + void database_api::broadcast_updates( const vector& updates ) + { + if( updates.size() ) { + auto capture_this = shared_from_this(); + fc::async([capture_this,updates](){ + capture_this->_subscribe_callback( fc::variant(updates) ); + }); + } + } + void database_api::on_objects_removed( const vector& objs ) { /// we need to ensure the database_api is not deleted for the life of the async operation - auto capture_this = shared_from_this(); - if( _subscribe_callback ) { - map > broadcast_queue; - for( const auto& obj : objs ) - { - auto relevant = get_relevant_accounts( obj ); - for( const auto& r : relevant ) - { - if( _subscribe_filter.contains(r) ) - { - broadcast_queue[r].emplace_back(obj->to_variant()); - break; - } - } - if( relevant.size() == 0 && _subscribe_filter.contains(obj->id) ) - broadcast_queue[account_id_type()].emplace_back(obj->to_variant()); - } + vector updates; + updates.reserve(objs.size()); - if( broadcast_queue.size() ) - { - fc::async([capture_this,broadcast_queue,this](){ - _subscribe_callback( fc::variant(broadcast_queue) ); - }); - } + for( auto obj : objs ) + updates.emplace_back( obj->id ); + broadcast_updates( updates ); } if( _market_subscriptions.size() ) @@ -847,6 +840,7 @@ namespace graphene { namespace app { } if( broadcast_queue.size() ) { + auto capture_this = shared_from_this(); fc::async([capture_this,this,broadcast_queue](){ for( const auto& item : broadcast_queue ) { @@ -864,7 +858,6 @@ namespace graphene { namespace app { vector updates; map< pair, vector > market_broadcast_queue; - idump((ids)); for(auto id : ids) { const object* obj = nullptr; @@ -873,47 +866,15 @@ namespace graphene { namespace app { obj = _db.find_object( id ); if( obj ) { - auto acnt = dynamic_cast(obj); - if( acnt ) - { - bool added_account = false; - for( const auto& key : acnt->owner.key_auths ) - if( is_subscribed_to_item( key.first ) ) - { - updates.emplace_back( obj->to_variant() ); - added_account = true; - break; - } - for( const auto& key : acnt->active.key_auths ) - if( is_subscribed_to_item( key.first ) ) - { - updates.emplace_back( obj->to_variant() ); - added_account = true; - break; - } - if( added_account ) - continue; - } - - vector relevant = get_relevant_accounts( obj ); - for( const auto& r : relevant ) - { - if( _subscribe_filter.contains(r) ) - { - updates.emplace_back(obj->to_variant()); - break; - } - } - if( relevant.size() == 0 && _subscribe_filter.contains(obj->id) ) - updates.emplace_back(obj->to_variant()); + updates.emplace_back( obj->to_variant() ); } else { - if( _subscribe_filter.contains(id) ) - updates.emplace_back(id); // send just the id to indicate removal + updates.emplace_back(id); // send just the id to indicate removal } } + /* if( _market_subscriptions.size() ) { if( !_subscribe_callback ) @@ -929,6 +890,7 @@ namespace graphene { namespace app { } } } + */ } auto capture_this = shared_from_this(); @@ -1223,14 +1185,18 @@ namespace graphene { namespace app { set database_api::get_required_signatures( const signed_transaction& trx, const flat_set& available_keys )const { - return trx.get_required_signatures( _db.get_chain_id(), + wdump((trx)(available_keys)); + auto result = trx.get_required_signatures( _db.get_chain_id(), available_keys, [&]( account_id_type id ){ return &id(_db).active; }, [&]( account_id_type id ){ return &id(_db).owner; }, _db.get_global_properties().parameters.max_authority_depth ); + wdump((result)); + return result; } set database_api::get_potential_signatures( const signed_transaction& trx )const { + wdump((trx)); set result; trx.get_required_signatures( _db.get_chain_id(), flat_set(), @@ -1247,6 +1213,7 @@ namespace graphene { namespace app { }, _db.get_global_properties().parameters.max_authority_depth ); + wdump((result)); return result; } diff --git a/libraries/app/include/graphene/app/api.hpp b/libraries/app/include/graphene/app/api.hpp index 5bb36f65..8b184d36 100644 --- a/libraries/app/include/graphene/app/api.hpp +++ b/libraries/app/include/graphene/app/api.hpp @@ -360,16 +360,24 @@ namespace graphene { namespace app { template void subscribe_to_item( const T& i )const { + auto vec = fc::raw::pack(i); if( !_subscribe_callback ) return; - _subscribe_filter.insert( (const char*)&i, sizeof(i) ); + + if( !is_subscribed_to_item(i) ) + { + idump((i)); + _subscribe_filter.insert( vec.data(), vec.size() );//(vecconst char*)&i, sizeof(i) ); + } } template bool is_subscribed_to_item( const T& i )const { if( !_subscribe_callback ) return false; + return true; return _subscribe_filter.contains( i ); } + void broadcast_updates( const vector& updates ); /** called every time a block is applied to report the objects that were changed */ void on_objects_changed(const vector& ids); diff --git a/libraries/chain/block_database.cpp b/libraries/chain/block_database.cpp index e197a469..6d962c4a 100644 --- a/libraries/chain/block_database.cpp +++ b/libraries/chain/block_database.cpp @@ -212,9 +212,11 @@ optional block_database::last()const _block_num_to_pos.seekg( -sizeof(index_entry), _block_num_to_pos.end ); _block_num_to_pos.read( (char*)&e, sizeof(e) ); - while( e.block_size == 0 && _blocks.tellg() > 0 ) + uint64_t pos = _block_num_to_pos.tellg(); + while( e.block_size == 0 && pos > 0 ) { - _block_num_to_pos.seekg( -sizeof(index_entry), _block_num_to_pos.cur ); + pos -= sizeof(index_entry); + _block_num_to_pos.seekg( pos ); _block_num_to_pos.read( (char*)&e, sizeof(e) ); } diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index c3e6408d..c40b7c29 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -331,8 +331,9 @@ signed_block database::_generate_block( void database::pop_block() { try { _pending_block_session.reset(); - _block_id_to_block.remove( _pending_block.previous ); + auto prev = _pending_block.previous; pop_undo(); + _block_id_to_block.remove( prev ); _pending_block.previous = head_block_id(); _pending_block.timestamp = head_block_time(); _fork_db.pop_block(); diff --git a/libraries/chain/db_management.cpp b/libraries/chain/db_management.cpp index 0a6c75ce..6b1bd815 100644 --- a/libraries/chain/db_management.cpp +++ b/libraries/chain/db_management.cpp @@ -45,12 +45,15 @@ void database::reindex(fc::path data_dir, const genesis_state_type& initial_allo auto start = fc::time_point::now(); auto last_block = _block_id_to_block.last(); - if( !last_block ) return; + if( !last_block ) { + elog( "!no last block" ); + edump((last_block)); + return; + } const auto last_block_num = last_block->block_num(); ilog( "Replaying blocks..." ); - // TODO: disable undo tracking during reindex, this currently causes crashes in the benchmark test _undo_db.disable(); for( uint32_t i = 1; i <= last_block_num; ++i ) { @@ -107,6 +110,10 @@ void database::close(uint32_t blocks_to_rewind) for(uint32_t i = 0; i < blocks_to_rewind && head_block_num() > 0; ++i) pop_block(); + // pop all of the blocks that we can given our undo history, this should + // throw when there is no more undo history to pop + try { while( true ) { elog("pop"); pop_block(); } } catch (...){} + object_database::flush(); object_database::close(); From a84e56c2aac6b4edfe9b36b50fbdfa11692e70c6 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Thu, 3 Sep 2015 17:43:26 -0400 Subject: [PATCH 288/353] fix market subscriptions --- libraries/app/api.cpp | 2 -- libraries/p2p/design.md | 8 +++++++- libraries/p2p/include/graphene/p2p/message.hpp | 12 +++++++++++- .../p2p/include/graphene/p2p/peer_connection.hpp | 16 +++++++++++++--- 4 files changed, 31 insertions(+), 7 deletions(-) diff --git a/libraries/app/api.cpp b/libraries/app/api.cpp index ed7809f8..798dc460 100644 --- a/libraries/app/api.cpp +++ b/libraries/app/api.cpp @@ -874,7 +874,6 @@ namespace graphene { namespace app { } } - /* if( _market_subscriptions.size() ) { if( !_subscribe_callback ) @@ -890,7 +889,6 @@ namespace graphene { namespace app { } } } - */ } auto capture_this = shared_from_this(); diff --git a/libraries/p2p/design.md b/libraries/p2p/design.md index d55c1411..96653d7e 100644 --- a/libraries/p2p/design.md +++ b/libraries/p2p/design.md @@ -61,7 +61,10 @@ Each node implements the following protocol: send( peer, block_summary ) - onConnect( new_peer, new_peer_head_block_num ) + onHello( new_peer, new_peer_head_block_num ) + + replyHello( new_peer ) // ack the hello message with our timestamp to measure latency + if( peers.size() >= max_peers ) send( new_peer, peers ) disconnect( new_peer ) @@ -73,6 +76,9 @@ Each node implements the following protocol: new_peer.synced = true for( peer : peers ) send( peer, new_peer ) + + onHelloReply( from_peer, hello_reply ) + update_latency_measure, disconnect if too slow onReceivePeers( from_peer, peers ) addToPotentialPeers( peers ) diff --git a/libraries/p2p/include/graphene/p2p/message.hpp b/libraries/p2p/include/graphene/p2p/message.hpp index 926180d1..2ffa456e 100644 --- a/libraries/p2p/include/graphene/p2p/message.hpp +++ b/libraries/p2p/include/graphene/p2p/message.hpp @@ -8,6 +8,7 @@ #include namespace graphene { namespace p2p { + using namespace graphene::chain; struct message_header { @@ -94,16 +95,25 @@ namespace graphene { namespace p2p { std::string user_agent; uint16_t version; + fc::time_point timestamp; fc::ip::address inbound_address; uint16_t inbound_port; uint16_t outbound_port; - node_id_t node_public_key; + public_key_type node_public_key; fc::sha256 chain_id; fc::variant_object user_data; block_id_type head_block; }; + struct hello_reply_message + { + static const core_message_type_enum type; + + fc::time_point hello_timestamp; + fc::time_point reply_timestamp; + }; + struct transaction_message { static const core_message_type_enum type; diff --git a/libraries/p2p/include/graphene/p2p/peer_connection.hpp b/libraries/p2p/include/graphene/p2p/peer_connection.hpp index 8f0ab594..759a7132 100644 --- a/libraries/p2p/include/graphene/p2p/peer_connection.hpp +++ b/libraries/p2p/include/graphene/p2p/peer_connection.hpp @@ -18,6 +18,7 @@ #pragma once #include +#include #include #include @@ -42,16 +43,25 @@ namespace graphene { namespace p2p { class peer_connection_delegate { public: - virtual void on_message(peer_connection* originating_peer, - const message& received_message) = 0; + virtual void on_message(peer_connection* originating_peer, const message& received_message) = 0; virtual void on_connection_closed(peer_connection* originating_peer) = 0; - virtual message get_message_for_item(const item_id& item) = 0; }; class peer_connection; typedef std::shared_ptr peer_connection_ptr; + /** + * Each connection maintains its own queue of messages to be sent, when an item + * is first pushed to the queue it starts an async fiber that will sequentially write + * all items until there is nothing left to be sent. + * + * If a particular connection is unable to keep up with the real-time stream of + * messages to be sent then it will be disconnected. The backlog will be measured in + * seconds. + * + * A multi-index container that tracks the + */ class peer_connection : public message_oriented_connection_delegate, public std::enable_shared_from_this { From 866c453f1a34a919a16b0ada505d79367c172567 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Thu, 3 Sep 2015 18:12:55 -0400 Subject: [PATCH 289/353] adding extra checks on startup --- libraries/chain/db_management.cpp | 4 ++++ libraries/chain/fork_database.cpp | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libraries/chain/db_management.cpp b/libraries/chain/db_management.cpp index 6b1bd815..375c92ff 100644 --- a/libraries/chain/db_management.cpp +++ b/libraries/chain/db_management.cpp @@ -82,6 +82,7 @@ void database::wipe(const fc::path& data_dir, bool include_blocks) void database::open( const fc::path& data_dir, std::function genesis_loader ) + elog( "Open Database" ); { try { @@ -98,6 +99,9 @@ void database::open( auto last_block = _block_id_to_block.last(); if( last_block.valid() ) _fork_db.start_block( *last_block ); + + idump((last_block->id())(last_block->block_num())(head_block_id())(head_block_num())); + FC_ASSERT( last_block->id() == head_block_id() ); } FC_CAPTURE_AND_RETHROW( (data_dir) ) } diff --git a/libraries/chain/fork_database.cpp b/libraries/chain/fork_database.cpp index 7910b417..5604d1c4 100644 --- a/libraries/chain/fork_database.cpp +++ b/libraries/chain/fork_database.cpp @@ -54,7 +54,8 @@ shared_ptr fork_database::push_block(const signed_block& b) } catch ( const unlinkable_block_exception& e ) { - wlog( "Pushing block to fork database that failed to link." ); + wlog( "Pushing block to fork database that failed to link: ${id}, ${num}", ("id",b.id())("num",b.block_num()) ); + wlog( "Head: ${num}, ${id}", ("num",_head->data.block_num())("id",_head->data.id()) ); _unlinked_index.insert( item ); } return _head; From 1e87ddff00feb595884df1b1f6dc15c016f2d750 Mon Sep 17 00:00:00 2001 From: Eric Frias Date: Thu, 3 Sep 2015 18:42:57 -0400 Subject: [PATCH 290/353] Fix build error --- libraries/chain/db_management.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/chain/db_management.cpp b/libraries/chain/db_management.cpp index 375c92ff..99fb0811 100644 --- a/libraries/chain/db_management.cpp +++ b/libraries/chain/db_management.cpp @@ -82,8 +82,8 @@ void database::wipe(const fc::path& data_dir, bool include_blocks) void database::open( const fc::path& data_dir, std::function genesis_loader ) - elog( "Open Database" ); { + elog( "Open Database" ); try { object_database::open(data_dir); From 3cf1eb5d5c914c500db67f575432932d1b958148 Mon Sep 17 00:00:00 2001 From: Eric Frias Date: Thu, 3 Sep 2015 18:54:10 -0400 Subject: [PATCH 291/353] Avoid dereferencing invalid optionals --- libraries/chain/db_management.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libraries/chain/db_management.cpp b/libraries/chain/db_management.cpp index 99fb0811..1db6b568 100644 --- a/libraries/chain/db_management.cpp +++ b/libraries/chain/db_management.cpp @@ -96,12 +96,14 @@ void database::open( _pending_block.previous = head_block_id(); _pending_block.timestamp = head_block_time(); - auto last_block = _block_id_to_block.last(); + fc::optional last_block = _block_id_to_block.last(); if( last_block.valid() ) + { _fork_db.start_block( *last_block ); - - idump((last_block->id())(last_block->block_num())(head_block_id())(head_block_num())); - FC_ASSERT( last_block->id() == head_block_id() ); + idump((last_block->id())(last_block->block_num())); + } + idump((head_block_id())(head_block_num())); + FC_ASSERT( !last_block || last_block->id() == head_block_id() ); } FC_CAPTURE_AND_RETHROW( (data_dir) ) } From a943de8b76c980fc782af58c3e1bfb7b3dabb389 Mon Sep 17 00:00:00 2001 From: Eric Frias Date: Fri, 4 Sep 2015 15:22:12 -0400 Subject: [PATCH 292/353] When rolling back on save, remove the rolled back blocks from our databases so when we restart and begin syncing, we re-download and push those rolled back blocks (fixes bug introduced in a5071f25680b31c7202ca69b515218a8a85739e0). Fix logging of incorrect block numbers in p2p log. --- libraries/chain/block_database.cpp | 2 +- libraries/chain/db_management.cpp | 32 +++++++++++++++++++++++++++++- libraries/net/node.cpp | 18 ++++++++++++++--- programs/cli_wallet/main.cpp | 9 +++++---- programs/delayed_node/main.cpp | 8 ++++---- programs/witness_node/main.cpp | 8 ++++---- 6 files changed, 60 insertions(+), 17 deletions(-) diff --git a/libraries/chain/block_database.cpp b/libraries/chain/block_database.cpp index 6d962c4a..c0005971 100644 --- a/libraries/chain/block_database.cpp +++ b/libraries/chain/block_database.cpp @@ -120,7 +120,7 @@ bool block_database::contains( const block_id_type& id )const _block_num_to_pos.seekg( index_pos ); _block_num_to_pos.read( (char*)&e, sizeof(e) ); - return e.block_id == id; + return e.block_id == id && e.block_size > 0; } block_id_type block_database::fetch_block_id( uint32_t block_num )const diff --git a/libraries/chain/db_management.cpp b/libraries/chain/db_management.cpp index 1db6b568..4a5cf899 100644 --- a/libraries/chain/db_management.cpp +++ b/libraries/chain/db_management.cpp @@ -114,11 +114,41 @@ void database::close(uint32_t blocks_to_rewind) _pending_block_session.reset(); for(uint32_t i = 0; i < blocks_to_rewind && head_block_num() > 0; ++i) + { + block_id_type popped_block_id = head_block_id(); pop_block(); + _fork_db.remove(popped_block_id); + try + { + _block_id_to_block.remove(popped_block_id); + } + catch (const fc::key_not_found_exception&) + { + } + } // pop all of the blocks that we can given our undo history, this should // throw when there is no more undo history to pop - try { while( true ) { elog("pop"); pop_block(); } } catch (...){} + try + { + while( true ) + { + elog("pop"); + block_id_type popped_block_id = head_block_id(); + pop_block(); + _fork_db.remove(popped_block_id); // doesn't throw on missing + try + { + _block_id_to_block.remove(popped_block_id); + } + catch (const fc::key_not_found_exception&) + { + } + } + } + catch (...) + { + } object_database::flush(); object_database::close(); diff --git a/libraries/net/node.cpp b/libraries/net/node.cpp index 55005b86..124e0e13 100644 --- a/libraries/net/node.cpp +++ b/libraries/net/node.cpp @@ -2375,16 +2375,28 @@ namespace graphene { namespace net { namespace detail { ("is_first", is_first_item_for_other_peer)("size", item_hashes_received.size())); if (!is_first_item_for_other_peer) { + bool first = true; while (!item_hashes_received.empty() && _delegate->has_item(item_id(blockchain_item_ids_inventory_message_received.item_type, item_hashes_received.front()))) { assert(item_hashes_received.front() != item_hash_t()); originating_peer->last_block_delegate_has_seen = item_hashes_received.front(); - ++originating_peer->last_block_number_delegate_has_seen; + if (first) + { + // we don't yet know the block number of the first block they sent, so look it up + originating_peer->last_block_number_delegate_has_seen = _delegate->get_block_number(item_hashes_received.front()); + first = false; + } + else + ++originating_peer->last_block_number_delegate_has_seen; // subsequent blocks will follow in immediate sequence originating_peer->last_block_time_delegate_has_seen = _delegate->get_block_time(item_hashes_received.front()); - dlog("popping item because delegate has already seen it. peer's last block the delegate has seen is now ${block_id} (${block_num})", - ("block_id", originating_peer->last_block_delegate_has_seen )("block_num", originating_peer->last_block_number_delegate_has_seen)); + dlog("popping item because delegate has already seen it. peer ${peer}'s last block the delegate has seen is now ${block_id} (actual block #${actual_block_num}, tracked block #${tracked_block_num})", + ("peer", originating_peer->get_remote_endpoint()) + ("block_id", originating_peer->last_block_delegate_has_seen) + ("actual_block_num", _delegate->get_block_number(item_hashes_received.front())) + ("tracked_block_num", originating_peer->last_block_number_delegate_has_seen)); + assert(originating_peer->last_block_number_delegate_has_seen == _delegate->get_block_number(originating_peer->last_block_delegate_has_seen)); item_hashes_received.pop_front(); } dlog("after removing all items we have already seen, item_hashes_received.size() = ${size}", ("size", item_hashes_received.size())); diff --git a/programs/cli_wallet/main.cpp b/programs/cli_wallet/main.cpp index ef3e4118..f7205b73 100644 --- a/programs/cli_wallet/main.cpp +++ b/programs/cli_wallet/main.cpp @@ -43,8 +43,11 @@ #include #include #include -#ifndef WIN32 -#include + +#ifdef WIN32 +# include +#else +# include #endif using namespace graphene::app; @@ -255,11 +258,9 @@ int main( int argc, char** argv ) else { fc::promise::ptr exit_promise = new fc::promise("UNIX Signal Handler"); -#ifdef __unix__ fc::set_signal_handler([&exit_promise](int signal) { exit_promise->set_value(signal); }, SIGINT); -#endif ilog( "Entering Daemon Mode, ^C to exit" ); exit_promise->wait(); diff --git a/programs/delayed_node/main.cpp b/programs/delayed_node/main.cpp index 97a8b4ed..62509b01 100644 --- a/programs/delayed_node/main.cpp +++ b/programs/delayed_node/main.cpp @@ -40,8 +40,10 @@ #include #include -#ifndef WIN32 -#include +#ifdef WIN32 +# include +#else +# include #endif using namespace graphene; @@ -159,11 +161,9 @@ int main(int argc, char** argv) { node.startup_plugins(); fc::promise::ptr exit_promise = new fc::promise("UNIX Signal Handler"); -#if defined __APPLE__ || defined __unix__ fc::set_signal_handler([&exit_promise](int signal) { exit_promise->set_value(signal); }, SIGINT); -#endif ilog("Started delayed node on a chain with ${h} blocks.", ("h", node.chain_database()->head_block_num())); ilog("Chain ID is ${id}", ("id", node.chain_database()->get_chain_id()) ); diff --git a/programs/witness_node/main.cpp b/programs/witness_node/main.cpp index d3dc7455..74126d39 100644 --- a/programs/witness_node/main.cpp +++ b/programs/witness_node/main.cpp @@ -40,8 +40,10 @@ #include #include -#ifndef WIN32 -#include +#ifdef WIN32 +# include +#else +# include #endif using namespace graphene; @@ -156,11 +158,9 @@ int main(int argc, char** argv) { node.startup_plugins(); fc::promise::ptr exit_promise = new fc::promise("UNIX Signal Handler"); -#if defined __APPLE__ || defined __unix__ fc::set_signal_handler([&exit_promise](int signal) { exit_promise->set_value(signal); }, SIGINT); -#endif ilog("Started witness node on a chain with ${h} blocks.", ("h", node.chain_database()->head_block_num())); ilog("Chain ID is ${id}", ("id", node.chain_database()->get_chain_id()) ); From a32075897f75725ab933b4c691e5cc658d1c735c Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Mon, 7 Sep 2015 10:19:51 -0400 Subject: [PATCH 293/353] adding verify_account_authority api --- libraries/app/api.cpp | 26 ++++++++++++++++++++++ libraries/app/include/graphene/app/api.hpp | 6 +++++ libraries/chain/db_block.cpp | 2 +- libraries/chain/db_management.cpp | 2 +- 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/libraries/app/api.cpp b/libraries/app/api.cpp index 798dc460..5fc139fe 100644 --- a/libraries/app/api.cpp +++ b/libraries/app/api.cpp @@ -1223,6 +1223,32 @@ namespace graphene { namespace app { _db.get_global_properties().parameters.max_authority_depth ); return true; } + + bool database_api::verify_account_authority( const string& name_or_id, const flat_set& keys )const + { + FC_ASSERT( name_or_id.size() > 0); + const account_object* account = nullptr; + if (std::isdigit(name_or_id[0])) + account = _db.find(fc::variant(name_or_id).as()); + else + { + const auto& idx = _db.get_index_type().indices().get(); + auto itr = idx.find(name_or_id); + if (itr != idx.end()) + account = &*itr; + } + FC_ASSERT( account, "no such account" ); + + + /// reuse trx.verify_authority by creating a dummy transfer + signed_transaction trx; + transfer_operation op; + op.from = account->id; + trx.operations.emplace_back(op); + + return verify_authority( trx ); + } + vector database_api::get_blinded_balances( const flat_set& commitments )const { vector result; result.reserve(commitments.size()); diff --git a/libraries/app/include/graphene/app/api.hpp b/libraries/app/include/graphene/app/api.hpp index 8b184d36..ed495010 100644 --- a/libraries/app/include/graphene/app/api.hpp +++ b/libraries/app/include/graphene/app/api.hpp @@ -342,6 +342,11 @@ namespace graphene { namespace app { */ bool verify_authority( const signed_transaction& trx )const; + /** + * @return true if the signers have enough authority to authorize an account + */ + bool verify_account_authority( const string& name_or_id, const flat_set& signers )const; + /** * @return the set of blinded balance objects by commitment ID @@ -586,6 +591,7 @@ FC_API(graphene::app::database_api, (get_required_signatures) (get_potential_signatures) (verify_authority) + (verify_account_authority) (get_blinded_balances) (get_required_fees) (set_subscribe_callback) diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index c40b7c29..fa93b8ed 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -83,7 +83,7 @@ const signed_transaction& database::get_recent_transaction(const transaction_id_ */ bool database::push_block(const signed_block& new_block, uint32_t skip) { - + idump((new_block.block_num())(new_block.id())); bool result; with_skip_flags(skip, [&]() { diff --git a/libraries/chain/db_management.cpp b/libraries/chain/db_management.cpp index 375c92ff..99fb0811 100644 --- a/libraries/chain/db_management.cpp +++ b/libraries/chain/db_management.cpp @@ -82,8 +82,8 @@ void database::wipe(const fc::path& data_dir, bool include_blocks) void database::open( const fc::path& data_dir, std::function genesis_loader ) - elog( "Open Database" ); { + elog( "Open Database" ); try { object_database::open(data_dir); From 9080800c5b61dbd0f374fe7ce3495e0e8e9cf657 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Mon, 7 Sep 2015 17:46:47 -0400 Subject: [PATCH 294/353] Updated APIs, fixed crash - update fc to fix crash in websocket message handling - added api to verify transactions without broadcasting them - added api to broadcast a block produced outside the P2P network or witness --- libraries/app/api.cpp | 13 +++++++++ libraries/app/application.cpp | 5 ++++ libraries/app/include/graphene/app/api.hpp | 9 ++++++ libraries/chain/db_block.cpp | 6 ++++ .../chain/include/graphene/chain/database.hpp | 7 +++++ libraries/fc | 2 +- programs/witness_node/main.cpp | 29 +++++++++++-------- 7 files changed, 58 insertions(+), 13 deletions(-) diff --git a/libraries/app/api.cpp b/libraries/app/api.cpp index 5fc139fe..306e678b 100644 --- a/libraries/app/api.cpp +++ b/libraries/app/api.cpp @@ -629,6 +629,12 @@ namespace graphene { namespace app { _app.p2p_node()->broadcast_transaction(trx); } + void network_broadcast_api::broadcast_block( const signed_block& b ) + { + _app.chain_database()->push_block(b); + _app.p2p_node()->broadcast( net::block_message( b )); + } + void network_broadcast_api::broadcast_transaction_with_callback(confirmation_callback cb, const signed_transaction& trx) { trx.validate(); @@ -1214,6 +1220,13 @@ namespace graphene { namespace app { wdump((result)); return result; } + /** + * Validates a transaction against the current state without broadcast it on the network. + */ + processed_transaction database_api::validate_transaction( const signed_transaction& trx )const + { + return _db.validate_transaction(trx); + } bool database_api::verify_authority( const signed_transaction& trx )const { diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp index 70b2899a..c9783d53 100644 --- a/libraries/app/application.cpp +++ b/libraries/app/application.cpp @@ -708,6 +708,11 @@ void application::shutdown_plugins() entry.second->plugin_shutdown(); return; } +void application::shutdown() +{ + if( my->_chain_db ) + my->_chain_db->close(); +} void application::initialize_plugins( const boost::program_options::variables_map& options ) { diff --git a/libraries/app/include/graphene/app/api.hpp b/libraries/app/include/graphene/app/api.hpp index ed495010..4100a62f 100644 --- a/libraries/app/include/graphene/app/api.hpp +++ b/libraries/app/include/graphene/app/api.hpp @@ -347,6 +347,11 @@ namespace graphene { namespace app { */ bool verify_account_authority( const string& name_or_id, const flat_set& signers )const; + /** + * Validates a transaction against the current state without broadcast it on the network. + */ + processed_transaction validate_transaction( const signed_transaction& trx )const; + /** * @return the set of blinded balance objects by commitment ID @@ -462,6 +467,8 @@ namespace graphene { namespace app { */ void broadcast_transaction_with_callback( confirmation_callback cb, const signed_transaction& trx); + void broadcast_block( const signed_block& block ); + /** * @brief Not reflected, thus not accessible to API clients. * @@ -595,6 +602,7 @@ FC_API(graphene::app::database_api, (get_blinded_balances) (get_required_fees) (set_subscribe_callback) + (validate_transaction) ) FC_API(graphene::app::history_api, (get_account_history) @@ -604,6 +612,7 @@ FC_API(graphene::app::history_api, FC_API(graphene::app::network_broadcast_api, (broadcast_transaction) (broadcast_transaction_with_callback) + (broadcast_block) ) FC_API(graphene::app::network_node_api, (add_node) diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index fa93b8ed..0181cfa0 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -213,6 +213,12 @@ processed_transaction database::_push_transaction( const signed_transaction& trx return processed_trx; } +processed_transaction database::validate_transaction( const signed_transaction& trx ) +{ + auto session = _undo_db.start_undo_session(); + return _apply_transaction( trx ); +} + processed_transaction database::push_proposal(const proposal_object& proposal) { transaction_evaluation_state eval_state(this); diff --git a/libraries/chain/include/graphene/chain/database.hpp b/libraries/chain/include/graphene/chain/database.hpp index 43056a73..c3fc26c8 100644 --- a/libraries/chain/include/graphene/chain/database.hpp +++ b/libraries/chain/include/graphene/chain/database.hpp @@ -404,7 +404,13 @@ namespace graphene { namespace chain { asset calculate_market_fee(const asset_object& recv_asset, const asset& trade_amount); asset pay_market_fees( const asset_object& recv_asset, const asset& receives ); + ///@} + /** + * This method validates transactions without adding it to the pending state. + * @return true if the transaction would validate + */ + processed_transaction validate_transaction( const signed_transaction& trx ); /** * @} @@ -429,6 +435,7 @@ namespace graphene { namespace chain { processed_transaction _apply_transaction( const signed_transaction& trx ); operation_result apply_operation( transaction_evaluation_state& eval_state, const operation& op ); + ///Steps involved in applying a new block ///@{ diff --git a/libraries/fc b/libraries/fc index c89a25a5..19e42ac4 160000 --- a/libraries/fc +++ b/libraries/fc @@ -1 +1 @@ -Subproject commit c89a25a55c333bd202185cebf3f87eeae2b54761 +Subproject commit 19e42ac4c41d0a2bbdc8094c2efeed5e28e0ed75 diff --git a/programs/witness_node/main.cpp b/programs/witness_node/main.cpp index 74126d39..97c7a4a9 100644 --- a/programs/witness_node/main.cpp +++ b/programs/witness_node/main.cpp @@ -53,8 +53,8 @@ void write_default_logging_config_to_stream(std::ostream& out); fc::optional load_logging_config_from_ini_file(const fc::path& config_ini_filename); int main(int argc, char** argv) { + app::application* node = new app::application(); try { - app::application node; bpo::options_description app_options("Graphene Witness Node"); bpo::options_description cfg_options("Graphene Witness Node"); app_options.add_options() @@ -64,14 +64,14 @@ int main(int argc, char** argv) { bpo::variables_map options; - auto witness_plug = node.register_plugin(); - auto history_plug = node.register_plugin(); - auto market_history_plug = node.register_plugin(); + auto witness_plug = node->register_plugin(); + auto history_plug = node->register_plugin(); + auto market_history_plug = node->register_plugin(); try { bpo::options_description cli, cfg; - node.set_program_options(cli, cfg); + node->set_program_options(cli, cfg); app_options.add(cli); cfg_options.add(cfg); bpo::store(bpo::parse_command_line(argc, argv, app_options), options); @@ -151,26 +151,31 @@ int main(int argc, char** argv) { } bpo::notify(options); - node.initialize(data_dir, options); - node.initialize_plugins( options ); + node->initialize(data_dir, options); + node->initialize_plugins( options ); - node.startup(); - node.startup_plugins(); + node->startup(); + node->startup_plugins(); fc::promise::ptr exit_promise = new fc::promise("UNIX Signal Handler"); fc::set_signal_handler([&exit_promise](int signal) { + elog( "Caught ^C attempting to exit cleanly" ); exit_promise->set_value(signal); }, SIGINT); - ilog("Started witness node on a chain with ${h} blocks.", ("h", node.chain_database()->head_block_num())); - ilog("Chain ID is ${id}", ("id", node.chain_database()->get_chain_id()) ); + ilog("Started witness node on a chain with ${h} blocks.", ("h", node->chain_database()->head_block_num())); + ilog("Chain ID is ${id}", ("id", node->chain_database()->get_chain_id()) ); int signal = exit_promise->wait(); ilog("Exiting from signal ${n}", ("n", signal)); - node.shutdown_plugins(); + node->shutdown_plugins(); + node->shutdown(); + delete node; return 0; } catch( const fc::exception& e ) { elog("Exiting with error:\n${e}", ("e", e.to_detail_string())); + node->shutdown(); + delete node; return 1; } } From a748883fed08a73afaec647e2e8827d07ca3c163 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Mon, 7 Sep 2015 18:05:43 -0400 Subject: [PATCH 295/353] adding API callback for observing pending transactions --- libraries/app/api.cpp | 4 ++++ libraries/app/include/graphene/app/api.hpp | 4 ++++ libraries/chain/db_block.cpp | 3 +++ libraries/chain/include/graphene/chain/database.hpp | 6 ++++++ 4 files changed, 17 insertions(+) diff --git a/libraries/app/api.cpp b/libraries/app/api.cpp index 306e678b..5b61bc61 100644 --- a/libraries/app/api.cpp +++ b/libraries/app/api.cpp @@ -45,6 +45,10 @@ namespace graphene { namespace app { on_objects_removed(objs); }); _applied_block_connection = _db.applied_block.connect([this](const signed_block&){ on_applied_block(); }); + + _pending_trx_connection = _db.on_pending_transaction.connect([this](const signed_transaction& trx ){ + if( _pending_trx_callback ) _pending_trx_callback( fc::variant(trx) ); + }); } database_api::~database_api() diff --git a/libraries/app/include/graphene/app/api.hpp b/libraries/app/include/graphene/app/api.hpp index 4100a62f..ca83accd 100644 --- a/libraries/app/include/graphene/app/api.hpp +++ b/libraries/app/include/graphene/app/api.hpp @@ -366,6 +366,7 @@ namespace graphene { namespace app { vector get_required_fees( const vector& ops, asset_id_type id = asset_id_type() )const; void set_subscribe_callback( std::function cb, bool clear_filter ); + void set_pending_transaction_callback( std::function cb ){ _pending_trx_callback = cb; } private: template void subscribe_to_item( const T& i )const @@ -396,10 +397,12 @@ namespace graphene { namespace app { mutable fc::bloom_filter _subscribe_filter; std::function _subscribe_callback; + std::function _pending_trx_callback; boost::signals2::scoped_connection _change_connection; boost::signals2::scoped_connection _removed_connection; boost::signals2::scoped_connection _applied_block_connection; + boost::signals2::scoped_connection _pending_trx_connection; map< pair, std::function > _market_subscriptions; graphene::chain::database& _db; }; @@ -602,6 +605,7 @@ FC_API(graphene::app::database_api, (get_blinded_balances) (get_required_fees) (set_subscribe_callback) + (set_pending_transaction_callback) (validate_transaction) ) FC_API(graphene::app::history_api, diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index 0181cfa0..5985e0fa 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -210,6 +210,9 @@ processed_transaction database::_push_transaction( const signed_transaction& trx notify_changed_objects(); // The transaction applied successfully. Merge its changes into the pending block session. session.merge(); + + // notify anyone listening to pending transactions + on_pending_transaction( trx ); return processed_trx; } diff --git a/libraries/chain/include/graphene/chain/database.hpp b/libraries/chain/include/graphene/chain/database.hpp index c3fc26c8..a601b49c 100644 --- a/libraries/chain/include/graphene/chain/database.hpp +++ b/libraries/chain/include/graphene/chain/database.hpp @@ -196,6 +196,12 @@ namespace graphene { namespace chain { */ fc::signal applied_block; + /** + * This signal is emitted any time a new transaction is added to the pending + * block state. + */ + fc::signal on_pending_transaction; + /** * Emitted After a block has been applied and committed. The callback * should not yield and should execute quickly. From 8ebc1cfc43e97060f19dae78fbaa3f361fd30aa8 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Mon, 7 Sep 2015 12:43:50 -0400 Subject: [PATCH 296/353] node.cpp: Don't dump empty iterators --- libraries/net/node.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/net/node.cpp b/libraries/net/node.cpp index 124e0e13..6a8ef753 100644 --- a/libraries/net/node.cpp +++ b/libraries/net/node.cpp @@ -1199,9 +1199,9 @@ namespace graphene { namespace net { namespace detail { wdump((inventory_to_advertise)); for (const item_id& item_to_advertise : inventory_to_advertise) { - if (peer->inventory_advertised_to_peer.find(item_to_advertise) == peer->inventory_advertised_to_peer.end() ) + if (peer->inventory_advertised_to_peer.find(item_to_advertise) != peer->inventory_advertised_to_peer.end() ) wdump((*peer->inventory_advertised_to_peer.find(item_to_advertise))); - if (peer->inventory_peer_advertised_to_us.find(item_to_advertise) == peer->inventory_peer_advertised_to_us.end() ) + if (peer->inventory_peer_advertised_to_us.find(item_to_advertise) != peer->inventory_peer_advertised_to_us.end() ) wdump((*peer->inventory_peer_advertised_to_us.find(item_to_advertise))); if (peer->inventory_advertised_to_peer.find(item_to_advertise) == peer->inventory_advertised_to_peer.end() && From b84154d6e7f758c9eff348417a2c3414fe48e9cf Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Mon, 7 Sep 2015 12:52:09 -0400 Subject: [PATCH 297/353] wallet.cpp: Call update_account() to sync all account states to the blockchain when loading a wallet --- libraries/wallet/wallet.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp index 09d7ee29..575db736 100644 --- a/libraries/wallet/wallet.cpp +++ b/libraries/wallet/wallet.cpp @@ -648,6 +648,17 @@ public: FC_THROW( "Wallet chain ID does not match", ("wallet.chain_id", _wallet.chain_id) ("chain_id", _chain_id) ); + + vector< account_id_type > my_account_ids; + my_account_ids.reserve( _wallet.my_accounts.size() ); + for( const account_object& acct : _wallet.my_accounts ) + my_account_ids.push_back( acct.id ); + // TODO: Batch requests using _remote_db->get_accounts() + // to reduce number of round-trips. Remember get_accounts() has + // a limit of 100 results per call! + for( const account_id_type& acct_id : my_account_ids ) + _wallet.update_account( get_account( acct_id ) ); + return true; } void save_wallet_file(string wallet_filename = "") From 6c730462815d2364088fe32ddaad5d2aa8b7e34e Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Tue, 8 Sep 2015 16:03:53 -0400 Subject: [PATCH 298/353] block_tests.cpp: Implement transaction_expires_in_cache test #264 #299 --- tests/tests/block_tests.cpp | 136 ++++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) diff --git a/tests/tests/block_tests.cpp b/tests/tests/block_tests.cpp index 2504e7ce..13c1b154 100644 --- a/tests/tests/block_tests.cpp +++ b/tests/tests/block_tests.cpp @@ -1018,4 +1018,140 @@ BOOST_FIXTURE_TEST_CASE( rsf_missed_blocks, database_fixture ) FC_LOG_AND_RETHROW() } +BOOST_FIXTURE_TEST_CASE( transaction_invalidated_in_cache, database_fixture ) +{ + try + { + ACTORS( (alice)(bob) ); + + auto generate_block = [&]( database& d ) -> signed_block + { + return d.generate_block(d.get_slot_time(1), d.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); + }; + + wdump( (db.fetch_block_by_number(1)) ); + wdump( (db.fetch_block_by_id( db.head_block_id() ) ) ); + + signed_block b1 = generate_block(db); + wdump( (db.fetch_block_by_number(1)) ); + wdump( (db.fetch_block_by_id( db.head_block_id() ) ) ); + + fc::temp_directory data_dir2( graphene::utilities::temp_directory_path() ); + + database db2; + db2.open(data_dir2.path(), make_genesis); + BOOST_CHECK( db.get_chain_id() == db2.get_chain_id() ); + + while( db2.head_block_num() < db.head_block_num() ) + { + wdump( (db.head_block_num()) (db2.head_block_num()) ); + optional< signed_block > b = db.fetch_block_by_number( db2.head_block_num()+1 ); + db2.push_block(*b, database::skip_witness_signature); + } + wlog("caught up db2 to db"); + BOOST_CHECK( db2.get( alice_id ).name == "alice" ); + BOOST_CHECK( db2.get( bob_id ).name == "bob" ); + + db2.push_block(generate_block(db)); + transfer( account_id_type(), alice_id, asset( 1000 ) ); + transfer( account_id_type(), bob_id, asset( 1000 ) ); + db2.push_block(generate_block(db)); + + BOOST_CHECK_EQUAL(db.get_balance(alice_id, asset_id_type()).amount.value, 1000); + BOOST_CHECK_EQUAL(db.get_balance( bob_id, asset_id_type()).amount.value, 1000); + BOOST_CHECK_EQUAL(db2.get_balance(alice_id, asset_id_type()).amount.value, 1000); + BOOST_CHECK_EQUAL(db2.get_balance( bob_id, asset_id_type()).amount.value, 1000); + + auto generate_and_send = [&]( int n ) + { + for( int i=0; i signed_transaction + { + signed_transaction tx; + transfer_operation xfer_op; + xfer_op.from = from; + xfer_op.to = to; + xfer_op.amount = asset( amount, asset_id_type() ); + xfer_op.fee = asset( 0, asset_id_type() ); + tx.operations.push_back( xfer_op ); + tx.set_expiration( db.head_block_time() + fc::seconds( 1000 ) ); + if( from == alice_id ) + sign( tx, alice_private_key ); + else + sign( tx, bob_private_key ); + return tx; + }; + + signed_transaction tx = generate_xfer_tx( alice_id, bob_id, 1000); + // put the tx in db tx cache + PUSH_TX( db, tx ); + // generate some blocks with db2, TODO: make tx expire in db's cache + generate_and_send(3); + + BOOST_CHECK_EQUAL(db.get_balance(alice_id, asset_id_type()).amount.value, 1000); + BOOST_CHECK_EQUAL(db.get_balance( bob_id, asset_id_type()).amount.value, 1000); + + // generate a block with db and ensure we don't somehow apply it + PUSH_BLOCK(db2, generate_block(db)); + BOOST_CHECK_EQUAL(db.get_balance(alice_id, asset_id_type()).amount.value, 1000); + BOOST_CHECK_EQUAL(db.get_balance( bob_id, asset_id_type()).amount.value, 1000); + + // now the tricky part... + // (A) Bob sends 1000 to Alice + // (B) Alice sends 2000 to Bob + // (C) Alice sends 500 to Bob + // + // We push AB, then receive a block containing C. + // we need to apply the block, then invalidate B in the cache. + // AB results in Alice having 0, Bob having 2000. + // C results in Alice having 500, Bob having 1500. + // + // This needs to occur while switching to a fork. + // + + signed_transaction tx_a = generate_xfer_tx( bob_id, alice_id, 1000 ); + signed_transaction tx_b = generate_xfer_tx( alice_id, bob_id, 2000 ); + signed_transaction tx_c = generate_xfer_tx( alice_id, bob_id, 500 ); + + generate_block( db ); + + PUSH_TX( db, tx_a ); + BOOST_CHECK_EQUAL(db.get_balance(alice_id, asset_id_type()).amount.value, 2000); + BOOST_CHECK_EQUAL(db.get_balance( bob_id, asset_id_type()).amount.value, 0); + + PUSH_TX( db, tx_b ); + PUSH_TX( db2, tx_c ); + + BOOST_CHECK_EQUAL(db.get_balance(alice_id, asset_id_type()).amount.value, 0); + BOOST_CHECK_EQUAL(db.get_balance( bob_id, asset_id_type()).amount.value, 2000); + + BOOST_CHECK_EQUAL(db2.get_balance(alice_id, asset_id_type()).amount.value, 500); + BOOST_CHECK_EQUAL(db2.get_balance( bob_id, asset_id_type()).amount.value, 1500); + + // generate enough blocks on db2 to cause db to switch forks + generate_and_send(2); + + // ensure both now reflect db2's view of the world + BOOST_CHECK_EQUAL(db.get_balance(alice_id, asset_id_type()).amount.value, 500); + BOOST_CHECK_EQUAL(db.get_balance( bob_id, asset_id_type()).amount.value, 1500); + + BOOST_CHECK_EQUAL(db2.get_balance(alice_id, asset_id_type()).amount.value, 500); + BOOST_CHECK_EQUAL(db2.get_balance( bob_id, asset_id_type()).amount.value, 1500); + + // make sure we can still send blocks + generate_and_send(1); + } + catch (fc::exception& e) + { + edump((e.to_detail_string())); + throw; + } +} + BOOST_AUTO_TEST_SUITE_END() From 73174656332e5107a70c366935df33163406aa78 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Tue, 8 Sep 2015 16:31:52 -0400 Subject: [PATCH 299/353] block_tests.cpp: Fix #300 by generating more blocks in generate_empty_blocks() --- tests/tests/block_tests.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/tests/block_tests.cpp b/tests/tests/block_tests.cpp index 13c1b154..68ee7fae 100644 --- a/tests/tests/block_tests.cpp +++ b/tests/tests/block_tests.cpp @@ -127,12 +127,14 @@ BOOST_AUTO_TEST_CASE( generate_empty_blocks ) // TODO: Don't generate this here auto init_account_priv_key = fc::ecc::private_key::regenerate(fc::sha256::hash(string("null_key")) ); + signed_block b200; { database db; db.open(data_dir.path(), make_genesis ); b = db.generate_block(db.get_slot_time(1), db.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); - for( uint32_t i = 1; i < 200; ++i ) + // n.b. we generate GRAPHENE_MIN_UNDO_HISTORY+1 extra blocks which will be discarded on save + for( uint32_t i = 1; i < 200+GRAPHENE_MIN_UNDO_HISTORY+1; ++i ) { BOOST_CHECK( db.head_block_id() == b.id() ); witness_id_type prev_witness = b.witness; @@ -140,6 +142,8 @@ BOOST_AUTO_TEST_CASE( generate_empty_blocks ) BOOST_CHECK( cur_witness != prev_witness ); b = db.generate_block(db.get_slot_time(1), cur_witness, init_account_priv_key, database::skip_nothing); BOOST_CHECK( b.witness == cur_witness ); + if( i == 199 ) + b200 = b; } db.close(); } @@ -147,6 +151,7 @@ BOOST_AUTO_TEST_CASE( generate_empty_blocks ) database db; db.open(data_dir.path(), []{return genesis_state_type();}); BOOST_CHECK_EQUAL( db.head_block_num(), 200 ); + b = b200; for( uint32_t i = 0; i < 200; ++i ) { BOOST_CHECK( db.head_block_id() == b.id() ); From 15ec55e52d76db9fc905e9d95c17df4876879f68 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 9 Sep 2015 10:46:13 -0400 Subject: [PATCH 300/353] block_tests.cpp: Fix transaction_invalidated_in_cache test, including transaction expiration --- tests/tests/block_tests.cpp | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/tests/tests/block_tests.cpp b/tests/tests/block_tests.cpp index 68ee7fae..4a904390 100644 --- a/tests/tests/block_tests.cpp +++ b/tests/tests/block_tests.cpp @@ -1076,7 +1076,7 @@ BOOST_FIXTURE_TEST_CASE( transaction_invalidated_in_cache, database_fixture ) } }; - auto generate_xfer_tx = [&]( account_id_type from, account_id_type to, share_type amount ) -> signed_transaction + auto generate_xfer_tx = [&]( account_id_type from, account_id_type to, share_type amount, int blocks_to_expire=10 ) -> signed_transaction { signed_transaction tx; transfer_operation xfer_op; @@ -1085,7 +1085,7 @@ BOOST_FIXTURE_TEST_CASE( transaction_invalidated_in_cache, database_fixture ) xfer_op.amount = asset( amount, asset_id_type() ); xfer_op.fee = asset( 0, asset_id_type() ); tx.operations.push_back( xfer_op ); - tx.set_expiration( db.head_block_time() + fc::seconds( 1000 ) ); + tx.set_expiration( db.head_block_time() + blocks_to_expire * db.get_global_properties().parameters.block_interval ); if( from == alice_id ) sign( tx, alice_private_key ); else @@ -1093,10 +1093,17 @@ BOOST_FIXTURE_TEST_CASE( transaction_invalidated_in_cache, database_fixture ) return tx; }; - signed_transaction tx = generate_xfer_tx( alice_id, bob_id, 1000); + signed_transaction tx = generate_xfer_tx( alice_id, bob_id, 1000, 2 ); + tx.set_expiration( db.head_block_time() + 2 * db.get_global_properties().parameters.block_interval ); + tx.signatures.clear(); + sign( tx, alice_private_key ); // put the tx in db tx cache PUSH_TX( db, tx ); - // generate some blocks with db2, TODO: make tx expire in db's cache + + BOOST_CHECK_EQUAL(db.get_balance(alice_id, asset_id_type()).amount.value, 0); + BOOST_CHECK_EQUAL(db.get_balance( bob_id, asset_id_type()).amount.value, 2000); + + // generate some blocks with db2, make tx expire in db's cache generate_and_send(3); BOOST_CHECK_EQUAL(db.get_balance(alice_id, asset_id_type()).amount.value, 1000); @@ -1120,7 +1127,7 @@ BOOST_FIXTURE_TEST_CASE( transaction_invalidated_in_cache, database_fixture ) // This needs to occur while switching to a fork. // - signed_transaction tx_a = generate_xfer_tx( bob_id, alice_id, 1000 ); + signed_transaction tx_a = generate_xfer_tx( bob_id, alice_id, 1000, 3 ); signed_transaction tx_b = generate_xfer_tx( alice_id, bob_id, 2000 ); signed_transaction tx_c = generate_xfer_tx( alice_id, bob_id, 500 ); @@ -1142,14 +1149,24 @@ BOOST_FIXTURE_TEST_CASE( transaction_invalidated_in_cache, database_fixture ) // generate enough blocks on db2 to cause db to switch forks generate_and_send(2); - // ensure both now reflect db2's view of the world + // db should invalidate B, but still be applying A, so the states don't agree + + BOOST_CHECK_EQUAL(db.get_balance(alice_id, asset_id_type()).amount.value, 1500); + BOOST_CHECK_EQUAL(db.get_balance( bob_id, asset_id_type()).amount.value, 500); + + BOOST_CHECK_EQUAL(db2.get_balance(alice_id, asset_id_type()).amount.value, 500); + BOOST_CHECK_EQUAL(db2.get_balance( bob_id, asset_id_type()).amount.value, 1500); + + // This will cause A to expire in db + generate_and_send(1); + BOOST_CHECK_EQUAL(db.get_balance(alice_id, asset_id_type()).amount.value, 500); BOOST_CHECK_EQUAL(db.get_balance( bob_id, asset_id_type()).amount.value, 1500); BOOST_CHECK_EQUAL(db2.get_balance(alice_id, asset_id_type()).amount.value, 500); BOOST_CHECK_EQUAL(db2.get_balance( bob_id, asset_id_type()).amount.value, 1500); - // make sure we can still send blocks + // Make sure we can generate and accept a plain old empty block on top of all this! generate_and_send(1); } catch (fc::exception& e) From ff2db08475908fad5e36df23d6c50256b9ab13f7 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 9 Sep 2015 11:11:58 -0400 Subject: [PATCH 301/353] database: Undo and re-apply pending_transactions before/after pushing a block. Fixes #299 --- libraries/chain/db_block.cpp | 22 +-- libraries/chain/db_update.cpp | 8 +- .../chain/include/graphene/chain/database.hpp | 42 ------ .../chain/include/graphene/chain/db_with.hpp | 126 ++++++++++++++++++ 4 files changed, 139 insertions(+), 59 deletions(-) create mode 100644 libraries/chain/include/graphene/chain/db_with.hpp diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index 5985e0fa..7bed189d 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -17,6 +17,7 @@ */ #include +#include #include #include @@ -85,9 +86,13 @@ bool database::push_block(const signed_block& new_block, uint32_t skip) { idump((new_block.block_num())(new_block.id())); bool result; - with_skip_flags(skip, [&]() + detail::with_skip_flags( *this, skip, [&]() { - result = _push_block(new_block); + detail::without_pending_transactions( *this, std::move(_pending_block.transactions), + [&]() + { + result = _push_block(new_block); + }); }); return result; } @@ -156,11 +161,6 @@ bool database::_push_block(const signed_block& new_block) } } - // If there is a pending block session, then the database state is dirty with pending transactions. - // Drop the pending session to reset the database to a clean head block state. - // TODO: Preserve pending transactions, and re-apply any which weren't included in the new block. - clear_pending(); - try { auto session = _undo_db.start_undo_session(); apply_block(new_block, skip); @@ -187,7 +187,7 @@ bool database::_push_block(const signed_block& new_block) processed_transaction database::push_transaction( const signed_transaction& trx, uint32_t skip ) { try { processed_transaction result; - with_skip_flags( skip, [&]() + detail::with_skip_flags( *this, skip, [&]() { result = _push_transaction( trx ); } ); @@ -249,7 +249,7 @@ signed_block database::generate_block( ) { signed_block result; - with_skip_flags( skip, [&]() + detail::with_skip_flags( *this, skip, [&]() { result = _generate_block( when, witness_id, block_signing_private_key, true ); } ); @@ -390,7 +390,7 @@ void database::apply_block( const signed_block& next_block, uint32_t skip ) skip = ~0;// WE CAN SKIP ALMOST EVERYTHING } - with_skip_flags( skip, [&]() + detail::with_skip_flags( *this, skip, [&]() { _apply_block( next_block ); } ); @@ -479,7 +479,7 @@ void database::notify_changed_objects() processed_transaction database::apply_transaction(const signed_transaction& trx, uint32_t skip) { processed_transaction result; - with_skip_flags(skip, [&]() + detail::with_skip_flags( *this, skip, [&]() { result = _apply_transaction(trx); }); diff --git a/libraries/chain/db_update.cpp b/libraries/chain/db_update.cpp index 11e5c0e0..cccc3bb2 100644 --- a/libraries/chain/db_update.cpp +++ b/libraries/chain/db_update.cpp @@ -17,6 +17,7 @@ */ #include +#include #include #include @@ -100,10 +101,6 @@ void database::update_pending_block(const signed_block& next_block, uint8_t curr { _pending_block.timestamp = next_block.timestamp + current_block_interval; _pending_block.previous = next_block.id(); - auto old_pending_trx = std::move(_pending_block.transactions); - _pending_block.transactions.clear(); - for( auto old_trx : old_pending_trx ) - push_transaction( old_trx ); } void database::clear_expired_transactions() @@ -142,7 +139,7 @@ void database::clear_expired_proposals() void database::clear_expired_orders() { - with_skip_flags( + detail::with_skip_flags( *this, get_node_properties().skip_flags | skip_authority_check, [&](){ transaction_evaluation_state cancel_context(this); @@ -158,7 +155,6 @@ void database::clear_expired_orders() } }); - //Process expired force settlement orders auto& settlement_index = get_index_type().indices().get(); if( !settlement_index.empty() ) diff --git a/libraries/chain/include/graphene/chain/database.hpp b/libraries/chain/include/graphene/chain/database.hpp index a601b49c..abfd1936 100644 --- a/libraries/chain/include/graphene/chain/database.hpp +++ b/libraries/chain/include/graphene/chain/database.hpp @@ -40,31 +40,6 @@ namespace graphene { namespace chain { using graphene::db::abstract_object; using graphene::db::object; - namespace detail - { - /** - * Class used to help the with_skip_flags implementation. - * It must be defined in this header because it must be - * available to the with_skip_flags implementation, - * which is a template and therefore must also be defined - * in this header. - */ - struct skip_flags_restorer - { - skip_flags_restorer( node_property_object& npo, uint32_t old_skip_flags ) - : _npo( npo ), _old_skip_flags( old_skip_flags ) - {} - - ~skip_flags_restorer() - { - _npo.skip_flags = _old_skip_flags; - } - - node_property_object& _npo; - uint32_t _old_skip_flags; - }; - } - /** * @class database * @brief tracks the blockchain state in an extensible manner @@ -270,23 +245,6 @@ namespace graphene { namespace chain { node_property_object& node_properties(); - /** - * Set the skip_flags to the given value, call callback, - * then reset skip_flags to their previous value after - * callback is done. - */ - template< typename Lambda > - void with_skip_flags( - uint32_t skip_flags, - Lambda callback ) - { - node_property_object& npo = node_properties(); - detail::skip_flags_restorer restorer( npo, npo.skip_flags ); - npo.skip_flags = skip_flags; - callback(); - return; - } - //////////////////// db_init.cpp //////////////////// void initialize_evaluators(); diff --git a/libraries/chain/include/graphene/chain/db_with.hpp b/libraries/chain/include/graphene/chain/db_with.hpp new file mode 100644 index 00000000..09781f0f --- /dev/null +++ b/libraries/chain/include/graphene/chain/db_with.hpp @@ -0,0 +1,126 @@ +/* + * Copyright (c) 2015, Cryptonomex, Inc. + * All rights reserved. + * + * This source code is provided for evaluation in private test networks only, until September 8, 2015. After this date, this license expires and + * the code may not be used, modified or distributed for any purpose. Redistribution and use in source and binary forms, with or without modification, + * are permitted until September 8, 2015, provided that the following conditions are met: + * + * 1. The code and/or derivative works are used only for private test networks consisting of no more than 10 P2P nodes. + * + * 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. + */ +#pragma once + +#include + +/* + * This file provides with() functions which modify the database + * temporarily, then restore it. These functions are mostly internal + * implementation detail of the database. + * + * Essentially, we want to be able to use "finally" to restore the + * database regardless of whether an exception is thrown or not, but there + * is no "finally" in C++. Instead, C++ requires us to create a struct + * and put the finally block in a destructor. Aagh! + */ + +namespace graphene { namespace chain { namespace detail { +/** + * Class used to help the with_skip_flags implementation. + * It must be defined in this header because it must be + * available to the with_skip_flags implementation, + * which is a template and therefore must also be defined + * in this header. + */ +struct skip_flags_restorer +{ + skip_flags_restorer( node_property_object& npo, uint32_t old_skip_flags ) + : _npo( npo ), _old_skip_flags( old_skip_flags ) + {} + + ~skip_flags_restorer() + { + _npo.skip_flags = _old_skip_flags; + } + + node_property_object& _npo; + uint32_t _old_skip_flags; +}; + +/** + * Class used to help the without_pending_transactions + * implementation. + */ +struct pending_transactions_restorer +{ + pending_transactions_restorer( database& db, std::vector&& pending_transactions ) + : _db(db), _pending_transactions( std::move(pending_transactions) ) + { + _db.clear_pending(); + } + + ~pending_transactions_restorer() + { + for( const processed_transaction& tx : _pending_transactions ) + { + try + { + // since push_transaction() takes a signed_transaction, + // the operation_results field will be ignored. + _db.push_transaction( tx ); + } + catch( const fc::exception& e ) + { + wlog( "Pending transaction became invalid after switching to block ${b}", ("b", _db.head_block_id()) ); + wlog( "The invalid pending transaction is ${t}", ("t", tx) ); + wlog( "The invalid pending transaction caused exception ${e}", ("e", e) ); + } + } + } + + database& _db; + std::vector< processed_transaction > _pending_transactions; +}; + +/** + * Set the skip_flags to the given value, call callback, + * then reset skip_flags to their previous value after + * callback is done. + */ +template< typename Lambda > +void with_skip_flags( + database& db, + uint32_t skip_flags, + Lambda callback ) +{ + node_property_object& npo = db.node_properties(); + skip_flags_restorer restorer( npo, npo.skip_flags ); + npo.skip_flags = skip_flags; + callback(); + return; +} + +/** + * Empty pending_transactions, call callback, + * then reset pending_transactions after callback is done. + * + * Pending transactions which no longer validate will be culled. + */ +template< typename Lambda > +void without_pending_transactions( + database& db, + std::vector&& pending_transactions, + Lambda callback ) +{ + pending_transactions_restorer restorer( db, std::move(pending_transactions) ); + callback(); + return; +} + +} } } // graphene::chain::detail From 59850cee986cbabcc8255a9ca987e5f73ccf71d5 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Wed, 9 Sep 2015 13:59:43 -0400 Subject: [PATCH 302/353] Fix #305 - replay blockchain works again --- libraries/chain/db_management.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libraries/chain/db_management.cpp b/libraries/chain/db_management.cpp index 4a5cf899..baf4548b 100644 --- a/libraries/chain/db_management.cpp +++ b/libraries/chain/db_management.cpp @@ -101,9 +101,12 @@ void database::open( { _fork_db.start_block( *last_block ); idump((last_block->id())(last_block->block_num())); + if( last_block->id() != head_block_id() ) + { + FC_ASSERT( head_block_num() == 0, "last block ID does not match current chain state" ); + } } idump((head_block_id())(head_block_num())); - FC_ASSERT( !last_block || last_block->id() == head_block_id() ); } FC_CAPTURE_AND_RETHROW( (data_dir) ) } From 70d3f36fba9ff6ac466f117f7fe241d3584029c3 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 9 Sep 2015 14:44:31 -0400 Subject: [PATCH 303/353] database: Handle gaps in block database when reindexing --- libraries/chain/block_database.cpp | 36 +++++++++++++++++++ libraries/chain/db_management.cpp | 32 +++++++++++++---- .../include/graphene/chain/block_database.hpp | 1 + 3 files changed, 63 insertions(+), 6 deletions(-) diff --git a/libraries/chain/block_database.cpp b/libraries/chain/block_database.cpp index c0005971..281dd387 100644 --- a/libraries/chain/block_database.cpp +++ b/libraries/chain/block_database.cpp @@ -237,4 +237,40 @@ optional block_database::last()const } return optional(); } + +optional block_database::last_id()const +{ + try + { + index_entry e; + _block_num_to_pos.seekg( 0, _block_num_to_pos.end ); + + if( _block_num_to_pos.tellp() < sizeof(index_entry) ) + return optional(); + + _block_num_to_pos.seekg( -sizeof(index_entry), _block_num_to_pos.end ); + _block_num_to_pos.read( (char*)&e, sizeof(e) ); + uint64_t pos = _block_num_to_pos.tellg(); + while( e.block_size == 0 && pos > 0 ) + { + pos -= sizeof(index_entry); + _block_num_to_pos.seekg( pos ); + _block_num_to_pos.read( (char*)&e, sizeof(e) ); + } + + if( e.block_size == 0 ) + return optional(); + + return e.block_id; + } + catch (const fc::exception&) + { + } + catch (const std::exception&) + { + } + return optional(); +} + + } } diff --git a/libraries/chain/db_management.cpp b/libraries/chain/db_management.cpp index baf4548b..c33b3ad1 100644 --- a/libraries/chain/db_management.cpp +++ b/libraries/chain/db_management.cpp @@ -58,12 +58,32 @@ void database::reindex(fc::path data_dir, const genesis_state_type& initial_allo for( uint32_t i = 1; i <= last_block_num; ++i ) { if( i % 2000 == 0 ) std::cerr << " " << double(i*100)/last_block_num << "% "< block = _block_id_to_block.fetch_by_number(i); + if( !block.valid() ) + { + wlog( "Reindexing terminated due to gap: Block ${i} does not exist!", ("i", i) ); + uint32_t dropped_count = 0; + while( true ) + { + fc::optional< block_id_type > last_id = _block_id_to_block.last_id(); + // this can trigger if we attempt to e.g. read a file that has block #2 but no block #1 + if( !last_id.valid() ) + break; + // we've caught up to the gap + if( block_header::num_from_id( *last_id ) <= i ) + break; + _block_id_to_block.remove( *last_id ); + dropped_count++; + } + wlog( "Dropped ${n} blocks from after the gap", ("n", dropped_count) ); + break; + } + apply_block(*block, skip_witness_signature | + skip_transaction_signatures | + skip_transaction_dupe_check | + skip_tapos_check | + skip_witness_schedule_check | + skip_authority_check); } _undo_db.enable(); auto end = fc::time_point::now(); diff --git a/libraries/chain/include/graphene/chain/block_database.hpp b/libraries/chain/include/graphene/chain/block_database.hpp index 1e8a97a6..816df798 100644 --- a/libraries/chain/include/graphene/chain/block_database.hpp +++ b/libraries/chain/include/graphene/chain/block_database.hpp @@ -36,6 +36,7 @@ namespace graphene { namespace chain { optional fetch_optional( const block_id_type& id )const; optional fetch_by_number( uint32_t block_num )const; optional last()const; + optional last_id()const; private: mutable std::fstream _blocks; mutable std::fstream _block_num_to_pos; From 09c623b3f929e1b8495e8adf2cdd1012be738919 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 9 Sep 2015 16:03:27 -0400 Subject: [PATCH 304/353] Remove maximum_expiration parameter #308 --- libraries/chain/db_update.cpp | 4 +--- libraries/chain/get_config.cpp | 1 - libraries/chain/include/graphene/chain/config.hpp | 1 - .../include/graphene/chain/protocol/chain_parameters.hpp | 2 +- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/libraries/chain/db_update.cpp b/libraries/chain/db_update.cpp index cccc3bb2..debb05a0 100644 --- a/libraries/chain/db_update.cpp +++ b/libraries/chain/db_update.cpp @@ -109,9 +109,7 @@ void database::clear_expired_transactions() //Transactions must have expired by at least two forking windows in order to be removed. auto& transaction_idx = static_cast(get_mutable_index(implementation_ids, impl_transaction_object_type)); const auto& dedupe_index = transaction_idx.indices().get(); - const auto& global_parameters = get_global_properties().parameters; - while( !dedupe_index.empty() - && head_block_time() - dedupe_index.rbegin()->trx.expiration >= fc::seconds(global_parameters.maximum_expiration) ) + while( (!dedupe_index.empty()) && (head_block_time() > dedupe_index.rbegin()->trx.expiration) ) transaction_idx.remove(*dedupe_index.rbegin()); } diff --git a/libraries/chain/get_config.cpp b/libraries/chain/get_config.cpp index 9f10ce78..1d81ecfb 100644 --- a/libraries/chain/get_config.cpp +++ b/libraries/chain/get_config.cpp @@ -45,7 +45,6 @@ fc::variant_object get_config() result[ "GRAPHENE_DEFAULT_MAX_TIME_UNTIL_EXPIRATION" ] = GRAPHENE_DEFAULT_MAX_TIME_UNTIL_EXPIRATION; result[ "GRAPHENE_DEFAULT_MAINTENANCE_INTERVAL" ] = GRAPHENE_DEFAULT_MAINTENANCE_INTERVAL; result[ "GRAPHENE_DEFAULT_MAINTENANCE_SKIP_SLOTS" ] = GRAPHENE_DEFAULT_MAINTENANCE_SKIP_SLOTS; - result[ "GRAPHENE_DEFAULT_MAX_EXPIRATION_SEC" ] = GRAPHENE_DEFAULT_MAX_EXPIRATION_SEC; result[ "GRAPHENE_MIN_UNDO_HISTORY" ] = GRAPHENE_MIN_UNDO_HISTORY; result[ "GRAPHENE_MAX_UNDO_HISTORY" ] = GRAPHENE_MAX_UNDO_HISTORY; result[ "GRAPHENE_MIN_BLOCK_SIZE_LIMIT" ] = GRAPHENE_MIN_BLOCK_SIZE_LIMIT; diff --git a/libraries/chain/include/graphene/chain/config.hpp b/libraries/chain/include/graphene/chain/config.hpp index 7256fbb2..3ad559ea 100644 --- a/libraries/chain/include/graphene/chain/config.hpp +++ b/libraries/chain/include/graphene/chain/config.hpp @@ -45,7 +45,6 @@ #define GRAPHENE_DEFAULT_MAX_TIME_UNTIL_EXPIRATION (60*60*24) // seconds, aka: 1 day #define GRAPHENE_DEFAULT_MAINTENANCE_INTERVAL (60*60*24) // seconds, aka: 1 day #define GRAPHENE_DEFAULT_MAINTENANCE_SKIP_SLOTS 3 // number of slots to skip for maintenance interval -#define GRAPHENE_DEFAULT_MAX_EXPIRATION_SEC (60*60) // 1 hour #define GRAPHENE_MIN_UNDO_HISTORY 10 #define GRAPHENE_MAX_UNDO_HISTORY 1000 diff --git a/libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp b/libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp index ac91d777..1f0e8d76 100644 --- a/libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp +++ b/libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp @@ -41,7 +41,7 @@ namespace graphene { namespace chain { uint32_t committee_proposal_review_period = GRAPHENE_DEFAULT_COMMITTEE_PROPOSAL_REVIEW_PERIOD_SEC; ///< minimum time in seconds that a proposed transaction requiring committee authority may not be signed, prior to expiration uint32_t maximum_transaction_size = GRAPHENE_DEFAULT_MAX_TRANSACTION_SIZE; ///< maximum allowable size in bytes for a transaction uint32_t maximum_block_size = GRAPHENE_DEFAULT_MAX_BLOCK_SIZE; ///< maximum allowable size in bytes for a block - uint32_t maximum_expiration = GRAPHENE_DEFAULT_MAX_EXPIRATION_SEC; ///< maximum number of seconds in the future a transaction may expire + uint32_t maximum_expiration = 0; ///< ignored, but included to ensure we don't hardfork; see #308 uint32_t maximum_time_until_expiration = GRAPHENE_DEFAULT_MAX_TIME_UNTIL_EXPIRATION; ///< maximum lifetime in seconds for transactions to be valid, before expiring uint32_t maximum_proposal_lifetime = GRAPHENE_DEFAULT_MAX_PROPOSAL_LIFETIME_SEC; ///< maximum lifetime in seconds for proposed transactions to be kept, before expiring uint8_t maximum_asset_whitelist_authorities = GRAPHENE_DEFAULT_MAX_ASSET_WHITELIST_AUTHORITIES; ///< maximum number of accounts which an asset may list as authorities for its whitelist OR blacklist From b8b2bcf97e51ee24fe15864259fc61be2244a9f0 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 9 Sep 2015 17:36:36 -0400 Subject: [PATCH 305/353] Implement --dbg-init-key command line option to take control of init witnesses for debugging #307 --- libraries/app/application.cpp | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp index c9783d53..a55db76e 100644 --- a/libraries/app/application.cpp +++ b/libraries/app/application.cpp @@ -219,6 +219,15 @@ namespace detail { fc::remove_all(_data_dir / "blockchain/dblock"); } + void set_dbg_init_key( genesis_state_type& genesis, const std::string& init_key ) + { + flat_set< std::string > initial_witness_names; + public_key_type init_pubkey( init_key ); + for( uint64_t i=0; icount("genesis-json") ) { genesis_state_type genesis = fc::json::from_file(_options->at("genesis-json").as()).as(); + bool modified_genesis = false; if( _options->count("genesis-timestamp") ) { genesis.initial_timestamp = fc::time_point_sec( graphene::time::now() ) + genesis.initial_parameters.block_interval + _options->at("genesis-timestamp").as(); genesis.initial_timestamp -= genesis.initial_timestamp.sec_since_epoch() % genesis.initial_parameters.block_interval; + modified_genesis = true; std::cerr << "Used genesis timestamp: " << genesis.initial_timestamp.to_iso_string() << " (PLEASE RECORD THIS)\n"; } + if( _options->count("dbg-init-key") ) + { + std::string init_key = _options->at( "dbg-init-key" ).as(); + FC_ASSERT( genesis.initial_witness_candidates.size() >= genesis.initial_active_witnesses ); + set_dbg_init_key( genesis, init_key ); + modified_genesis = true; + std::cerr << "Set init witness key to " << init_key << "\n"; + } + if( modified_genesis ) + { + std::cerr << "WARNING: GENESIS WAS MODIFIED, YOUR CHAIN ID MAY BE DIFFERENT\n"; + } return genesis; } else @@ -610,6 +633,7 @@ void application::set_program_options(boost::program_options::options_descriptio ("server-pem,p", bpo::value()->implicit_value("server.pem"), "The TLS certificate file for this server") ("server-pem-password,P", bpo::value()->implicit_value(""), "Password for this certificate") ("genesis-json", bpo::value(), "File to read Genesis State from") + ("dbg-init-key", bpo::value(), "Block signing key to use for init witnesses, overrides genesis file") ("api-access", bpo::value(), "JSON file specifying API permissions") ; command_line_options.add(configuration_file_options); From b6bba7430115589228fe5bdcfaf9a703ebcfd5ee Mon Sep 17 00:00:00 2001 From: Eric Frias Date: Thu, 10 Sep 2015 08:56:29 -0400 Subject: [PATCH 306/353] Restore much of the syncing code from BitShares 0.x, and add optimizations that prevent us from attempting to sync with peers those blockchain diverged from ours many blocks ago, which also reduces the size of sync messages. Add logging. --- libraries/app/application.cpp | 211 ++++++++++++++---- libraries/chain/db_block.cpp | 10 + libraries/chain/db_getter.cpp | 6 + .../chain/include/graphene/chain/database.hpp | 4 +- libraries/net/include/graphene/net/node.hpp | 18 +- .../include/graphene/net/peer_connection.hpp | 2 +- libraries/net/node.cpp | 121 ++++++---- 7 files changed, 278 insertions(+), 94 deletions(-) diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp index 70b2899a..ae2d5c94 100644 --- a/libraries/app/application.cpp +++ b/libraries/app/application.cpp @@ -47,6 +47,8 @@ #include #include +#include + namespace graphene { namespace app { using net::item_hash_t; using net::item_id; @@ -398,6 +400,13 @@ namespace detail { FC_THROW( "Invalid Message Type" ); } + bool is_included_block(const block_id_type& block_id) + { + uint32_t block_num = block_header::num_from_id(block_id); + block_id_type block_id_in_preferred_chain = _chain_db->get_block_id_for_num(block_num); + return block_id == block_id_in_preferred_chain; + } + /** * Assuming all data elements are ordered in some way, this method should * return up to limit ids that occur *after* the last ID in synopsis that @@ -407,12 +416,10 @@ namespace detail { * in our blockchain after the last item returned in the result, * or 0 if the result contains the last item in the blockchain */ - virtual std::vector get_item_ids(uint32_t item_type, - const std::vector& blockchain_synopsis, - uint32_t& remaining_item_count, - uint32_t limit) override + virtual std::vector get_block_ids(const std::vector& blockchain_synopsis, + uint32_t& remaining_item_count, + uint32_t limit) override { try { - FC_ASSERT( item_type == graphene::net::block_message_type ); vector result; remaining_item_count = 0; if( _chain_db->head_block_num() == 0 ) @@ -420,18 +427,16 @@ namespace detail { result.reserve(limit); block_id_type last_known_block_id; - auto itr = blockchain_synopsis.rbegin(); - while( itr != blockchain_synopsis.rend() ) - { - if( _chain_db->is_known_block(*itr) || *itr == block_id_type() ) - { - last_known_block_id = *itr; - break; - } - ++itr; - } - for( auto num = block_header::num_from_id(last_known_block_id); + for (const item_hash_t& block_id_in_synopsis : boost::adaptors::reverse(blockchain_synopsis)) + if (block_id_in_synopsis == block_id_type() || + (_chain_db->is_known_block(block_id_in_synopsis) && is_included_block(block_id_in_synopsis))) + { + last_known_block_id = block_id_in_synopsis; + break; + } + + for( uint32_t num = block_header::num_from_id(last_known_block_id); num <= _chain_db->head_block_num() && result.size() < limit; ++num ) if( num > 0 ) @@ -468,38 +473,156 @@ namespace detail { } /** - * Returns a synopsis of the blockchain used for syncing. - * This consists of a list of selected item hashes from our current preferred - * blockchain, exponentially falling off into the past. Horrible explanation. + * Returns a synopsis of the blockchain used for syncing. This consists of a list of + * block hashes at intervals exponentially increasing towards the genesis block. + * When syncing to a peer, the peer uses this data to determine if we're on the same + * fork as they are, and if not, what blocks they need to send us to get us on their + * fork. * - * If the blockchain is empty, it will return the empty list. - * If the blockchain has one block, it will return a list containing just that block. - * If it contains more than one block: - * the first element in the list will be the hash of the genesis block - * the second element will be the hash of an item at the half way point in the blockchain - * the third will be ~3/4 of the way through the block chain - * the fourth will be at ~7/8... - * &c. - * the last item in the list will be the hash of the most recent block on our preferred chain + * In the over-simplified case, this is a straighforward synopsis of our current + * preferred blockchain; when we first connect up to a peer, this is what we will be sending. + * It looks like this: + * If the blockchain is empty, it will return the empty list. + * If the blockchain has one block, it will return a list containing just that block. + * If it contains more than one block: + * the first element in the list will be the hash of the highest numbered block that + * we cannot undo + * the second element will be the hash of an item at the half way point in the undoable + * segment of the blockchain + * the third will be ~3/4 of the way through the undoable segment of the block chain + * the fourth will be at ~7/8... + * &c. + * the last item in the list will be the hash of the most recent block on our preferred chain + * so if the blockchain had 26 blocks labeled a - z, the synopsis would be: + * a n u x z + * the idea being that by sending a small (<30) number of block ids, we can summarize a huge + * blockchain. The block ids are more dense near the end of the chain where because we are + * more likely to be almost in sync when we first connect, and forks are likely to be short. + * If the peer we're syncing with in our example is on a fork that started at block 'v', + * then they will reply to our synopsis with a list of all blocks starting from block 'u', + * the last block they know that we had in common. + * + * In the real code, there are several complications. + * + * First, as an optimization, we don't usually send a synopsis of the entire blockchain, we + * send a synopsis of only the segment of the blockchain that we have undo data for. If their + * fork doesn't build off of something in our undo history, we would be unable to switch, so there's + * no reason to fetch the blocks. + * + * Second, when a peer replies to our initial synopsis and gives us a list of the blocks they think + * we are missing, they only send a chunk of a few thousand blocks at once. After we get those + * block ids, we need to request more blocks by sending another synopsis (we can't just say "send me + * the next 2000 ids" because they may have switched forks themselves and they don't track what + * they've sent us). For faster performance, we want to get a fairly long list of block ids first, + * then start downloading the blocks. + * The peer doesn't handle these follow-up block id requests any different from the initial request; + * it treats the synopsis we send as our blockchain and bases its response entirely off that. So to + * get the response we want (the next chunk of block ids following the last one they sent us, or, + * failing that, the shortest fork off of the last list of block ids they sent), we need to construct + * a synopsis as if our blockchain was made up of: + * 1. the blocks in our block chain up to the fork point (if there is a fork) or the head block (if no fork) + * 2. the blocks we've already pushed from their fork (if there's a fork) + * 3. the block ids they've previously sent us + * Segment 3 is handled in the p2p code, it just tells us the number of blocks it has (in + * number_of_blocks_after_reference_point) so we can leave space in the synopsis for them. + * We're responsible for constructing the synopsis of Segments 1 and 2 from our active blockchain and + * fork database. The reference_point parameter is the last block from that peer that has been + * successfully pushed to the blockchain, so that tells us whether the peer is on a fork or on + * the main chain. */ - virtual std::vector get_blockchain_synopsis(uint32_t item_type, - const graphene::net::item_hash_t& reference_point, + virtual std::vector get_blockchain_synopsis(const item_hash_t& reference_point, uint32_t number_of_blocks_after_reference_point) override { try { - std::vector result; - result.reserve(30); - uint32_t head_block_num = _chain_db->head_block_num(); - result.push_back(_chain_db->head_block_id()); - uint32_t current = 1; - while( current < head_block_num ) - { - result.push_back(_chain_db->get_block_id_for_num(head_block_num - current)); - current = current*2; - } - std::reverse( result.begin(), result.end() ); - idump((reference_point)(number_of_blocks_after_reference_point)(result)); - return result; - } FC_CAPTURE_AND_RETHROW( (reference_point)(number_of_blocks_after_reference_point) ) } + std::vector synopsis; + synopsis.reserve(30); + uint32_t high_block_num; + uint32_t non_fork_high_block_num; + uint32_t low_block_num = _chain_db->last_non_undoable_block_num(); + std::vector fork_history; + + if (reference_point != item_hash_t()) + { + // the node is asking for a summary of the block chain up to a specified + // block, which may or may not be on a fork + // for now, assume it's not on a fork + if (is_included_block(reference_point)) + { + // reference_point is a block we know about and is on the main chain + uint32_t reference_point_block_num = block_header::num_from_id(reference_point); + assert(reference_point_block_num > 0); + high_block_num = reference_point_block_num; + non_fork_high_block_num = high_block_num; + } + else + { + // block is a block we know about, but it is on a fork + try + { + std::vector fork_history = _chain_db->get_block_ids_on_fork(reference_point); + // returns a vector where the first element is the common ancestor with the preferred chain, + // and the last element is the reference point you passed in + assert(fork_history.size() >= 2); + assert(fork_history.back() == reference_point); + block_id_type last_non_fork_block = fork_history.front(); + fork_history.erase(fork_history.begin()); // remove the common ancestor + + if (last_non_fork_block == block_id_type()) // if the fork goes all the way back to genesis (does graphene's fork db allow this?) + non_fork_high_block_num = 0; + else + non_fork_high_block_num = block_header::num_from_id(last_non_fork_block); + + high_block_num = non_fork_high_block_num + fork_history.size(); + assert(high_block_num == block_header::num_from_id(fork_history.back())); + } + catch (const fc::exception& e) + { + // unable to get fork history for some reason. maybe not linked? + // we can't return a synopsis of its chain + elog("Unable to construct a blockchain synopsis for reference hash ${hash}: ${exception}", ("hash", reference_point)("exception", e)); + throw; + } + } + } + else + { + // no reference point specified, summarize the whole block chain + high_block_num = _chain_db->head_block_num(); + non_fork_high_block_num = high_block_num; + if (high_block_num == 0) + return synopsis; // we have no blocks + } + + // at this point: + // low_block_num is the block before the first block we can undo, + // non_fork_high_block_num is the block before the fork (if the peer is on a fork, or otherwise it is the same as high_block_num) + // high_block_num is the block number of the reference block, or the end of the chain if no reference provided + + if (non_fork_high_block_num <= low_block_num) + { + wlog("Unable to generate a usable synopsis because the peer we're generating it for forked too long ago " + "(our chains diverge after block #${non_fork_high_block_num} but only undoable to block #${low_block_num})", + ("low_block_num", low_block_num) + ("non_fork_high_block_num", non_fork_high_block_num)); + return synopsis; + } + + uint32_t true_high_block_num = high_block_num + number_of_blocks_after_reference_point; + do + { + // for each block in the synopsis, figure out where to pull the block id from. + // if it's <= non_fork_high_block_num, we grab it from the main blockchain; + // if it's not, we pull it from the fork history + if (low_block_num <= non_fork_high_block_num) + synopsis.push_back(_chain_db->get_block_id_for_num(low_block_num)); + else + synopsis.push_back(fork_history[low_block_num - non_fork_high_block_num - 1]); + low_block_num += (true_high_block_num - low_block_num + 2) / 2; + } + while (low_block_num <= high_block_num); + + idump((synopsis)); + return synopsis; + } FC_CAPTURE_AND_RETHROW() } /** * Call this after the call to handle_message succeeds. diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index fa93b8ed..6e7f4f52 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -75,6 +75,16 @@ const signed_transaction& database::get_recent_transaction(const transaction_id_ return itr->trx; } +std::vector database::get_block_ids_on_fork(block_id_type head_of_fork) const +{ + pair branches = _fork_db.fetch_branch_from(head_block_id(), head_of_fork); + assert(branches.first.back()->id == branches.second.back()->id); + std::vector result; + for (const item_ptr& fork_block : branches.second) + result.emplace_back(fork_block->id); + return result; +} + /** * Push block "may fail" in which case every partial change is unwound. After * push block is successful the block is appended to the chain database on disk. diff --git a/libraries/chain/db_getter.cpp b/libraries/chain/db_getter.cpp index d9a08105..4cd842dc 100644 --- a/libraries/chain/db_getter.cpp +++ b/libraries/chain/db_getter.cpp @@ -84,4 +84,10 @@ node_property_object& database::node_properties() return _node_property_object; } +uint32_t database::last_non_undoable_block_num() const +{ + return head_block_num() - _undo_db.size(); +} + + } } diff --git a/libraries/chain/include/graphene/chain/database.hpp b/libraries/chain/include/graphene/chain/database.hpp index 43056a73..e5687fd1 100644 --- a/libraries/chain/include/graphene/chain/database.hpp +++ b/libraries/chain/include/graphene/chain/database.hpp @@ -137,6 +137,7 @@ namespace graphene { namespace chain { optional fetch_block_by_id( const block_id_type& id )const; optional fetch_block_by_number( uint32_t num )const; const signed_transaction& get_recent_transaction( const transaction_id_type& trx_id )const; + std::vector get_block_ids_on_fork(block_id_type head_of_fork) const; /** * Calculate the percent of block production slots that were missed in the @@ -280,7 +281,8 @@ namespace graphene { namespace chain { callback(); return; } - + + uint32_t last_non_undoable_block_num() const; //////////////////// db_init.cpp //////////////////// void initialize_evaluators(); diff --git a/libraries/net/include/graphene/net/node.hpp b/libraries/net/include/graphene/net/node.hpp index c8e53f00..71ff0c55 100644 --- a/libraries/net/include/graphene/net/node.hpp +++ b/libraries/net/include/graphene/net/node.hpp @@ -99,10 +99,9 @@ namespace graphene { namespace net { * in our blockchain after the last item returned in the result, * or 0 if the result contains the last item in the blockchain */ - virtual std::vector get_item_ids(uint32_t item_type, - const std::vector& blockchain_synopsis, - uint32_t& remaining_item_count, - uint32_t limit = 2000) = 0; + virtual std::vector get_block_ids(const std::vector& blockchain_synopsis, + uint32_t& remaining_item_count, + uint32_t limit = 2000) = 0; /** * Given the hash of the requested data, fetch the body. @@ -119,14 +118,17 @@ namespace graphene { namespace net { * If the blockchain is empty, it will return the empty list. * If the blockchain has one block, it will return a list containing just that block. * If it contains more than one block: - * the first element in the list will be the hash of the genesis block - * the second element will be the hash of an item at the half way point in the blockchain - * the third will be ~3/4 of the way through the block chain + * the first element in the list will be the hash of the highest numbered block that + * we cannot undo + * the second element will be the hash of an item at the half way point in the undoable + * segment of the blockchain + * the third will be ~3/4 of the way through the undoable segment of the block chain * the fourth will be at ~7/8... * &c. * the last item in the list will be the hash of the most recent block on our preferred chain */ - virtual std::vector get_blockchain_synopsis(uint32_t item_type, const graphene::net::item_hash_t& reference_point = graphene::net::item_hash_t(), uint32_t number_of_blocks_after_reference_point = 0) = 0; + virtual std::vector get_blockchain_synopsis(const item_hash_t& reference_point, + uint32_t number_of_blocks_after_reference_point) = 0; /** * Call this after the call to handle_message succeeds. diff --git a/libraries/net/include/graphene/net/peer_connection.hpp b/libraries/net/include/graphene/net/peer_connection.hpp index ed706b8a..4e506026 100644 --- a/libraries/net/include/graphene/net/peer_connection.hpp +++ b/libraries/net/include/graphene/net/peer_connection.hpp @@ -219,7 +219,7 @@ namespace graphene { namespace net uint32_t number_of_unfetched_item_ids; /// number of items in the blockchain that follow ids_of_items_to_get but the peer hasn't yet told us their ids bool peer_needs_sync_items_from_us; bool we_need_sync_items_from_peer; - fc::optional > item_ids_requested_from_peer; /// we check this to detect a timed-out request and in busy() + fc::optional, fc::time_point> > item_ids_requested_from_peer; /// we check this to detect a timed-out request and in busy() item_to_time_map_type sync_items_requested_from_peer; /// ids of blocks we've requested from this peer during sync. fetch from another peer if this peer disconnects uint32_t last_block_number_delegate_has_seen; /// the number of the last block this peer has told us about that the delegate knows (ids_of_items_to_get[0] should be the id of block [this value + 1]) item_hash_t last_block_delegate_has_seen; /// the hash of the last block this peer has told us about that the peer knows diff --git a/libraries/net/node.cpp b/libraries/net/node.cpp index 124e0e13..b2ef745d 100644 --- a/libraries/net/node.cpp +++ b/libraries/net/node.cpp @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -279,7 +280,7 @@ namespace graphene { namespace net { namespace detail { (handle_message) \ (handle_block) \ (handle_transaction) \ - (get_item_ids) \ + (get_block_ids) \ (get_item) \ (get_chain_id) \ (get_blockchain_synopsis) \ @@ -375,15 +376,13 @@ namespace graphene { namespace net { namespace detail { void handle_message( const message& ) override; bool handle_block( const graphene::net::block_message& block_message, bool sync_mode, std::vector& contained_transaction_message_ids ) override; void handle_transaction( const graphene::net::trx_message& transaction_message ) override; - std::vector get_item_ids(uint32_t item_type, - const std::vector& blockchain_synopsis, - uint32_t& remaining_item_count, - uint32_t limit = 2000) override; + std::vector get_block_ids(const std::vector& blockchain_synopsis, + uint32_t& remaining_item_count, + uint32_t limit = 2000) override; message get_item( const item_id& id ) override; chain_id_type get_chain_id() const override; - std::vector get_blockchain_synopsis(uint32_t item_type, - const graphene::net::item_hash_t& reference_point = graphene::net::item_hash_t(), - uint32_t number_of_blocks_after_reference_point = 0) override; + std::vector get_blockchain_synopsis(const item_hash_t& reference_point, + uint32_t number_of_blocks_after_reference_point) override; void sync_status( uint32_t item_type, uint32_t item_count ) override; void connection_count_changed( uint32_t c ) override; uint32_t get_block_number(const item_hash_t& block_id) override; @@ -1324,7 +1323,7 @@ namespace graphene { namespace net { namespace detail { { wlog("Disconnecting peer ${peer} because they didn't respond to my request for sync item ids after ${id}", ("peer", active_peer->get_remote_endpoint()) - ("id", active_peer->item_ids_requested_from_peer->get<0>().item_hash)); + ("id", active_peer->item_ids_requested_from_peer->get<0>().back())); disconnect_due_to_request_timeout = true; } if (!disconnect_due_to_request_timeout) @@ -2155,9 +2154,8 @@ namespace graphene { namespace net { namespace detail { ( "synopsis", fetch_blockchain_item_ids_message_received.blockchain_synopsis ) ); blockchain_item_ids_inventory_message reply_message; - reply_message.item_hashes_available = _delegate->get_item_ids( fetch_blockchain_item_ids_message_received.item_type, - fetch_blockchain_item_ids_message_received.blockchain_synopsis, - reply_message.total_remaining_item_count ); + reply_message.item_hashes_available = _delegate->get_block_ids(fetch_blockchain_item_ids_message_received.blockchain_synopsis, + reply_message.total_remaining_item_count ); reply_message.item_type = fetch_blockchain_item_ids_message_received.item_type; bool disconnect_from_inhibited_peer = false; @@ -2170,8 +2168,7 @@ namespace graphene { namespace net { namespace detail { reply_message.item_hashes_available.size() == 1 && std::find(fetch_blockchain_item_ids_message_received.blockchain_synopsis.begin(), fetch_blockchain_item_ids_message_received.blockchain_synopsis.end(), - reply_message.item_hashes_available.back() ) != fetch_blockchain_item_ids_message_received.blockchain_synopsis.end() - ) + reply_message.item_hashes_available.back() ) != fetch_blockchain_item_ids_message_received.blockchain_synopsis.end() ) { /* the last item in the peer's list matches the last item in our list */ originating_peer->peer_needs_sync_items_from_us = false; @@ -2270,24 +2267,33 @@ namespace graphene { namespace net { namespace detail { // This is pretty expensive, we should find a better way to do this std::unique_ptr > original_ids_of_items_to_get(new std::vector(peer->ids_of_items_to_get.begin(), peer->ids_of_items_to_get.end())); - std::vector synopsis = _delegate->get_blockchain_synopsis(_sync_item_type, reference_point, number_of_blocks_after_reference_point); - assert(reference_point == item_hash_t() || !synopsis.empty()); + std::vector synopsis = _delegate->get_blockchain_synopsis(reference_point, number_of_blocks_after_reference_point); - // if we passed in a reference point, we believe it is one the client has already accepted and should - // be able to generate a synopsis based on it - if( reference_point != item_hash_t() && synopsis.empty() ) - synopsis = _delegate->get_blockchain_synopsis( _sync_item_type, reference_point, number_of_blocks_after_reference_point ); + // just for debugging, enable this and set a breakpoint to step through + if (synopsis.empty()) + synopsis = _delegate->get_blockchain_synopsis(reference_point, number_of_blocks_after_reference_point); + + // TODO: it's possible that the returned synopsis is empty if the blockchain is empty (that's fine) + // or if the reference point is now past our undo history (that's not). + // in the second case, we should mark this peer as one we're unable to sync with and + // disconnect them. + if (reference_point != item_hash_t() && synopsis.empty()) + FC_THROW_EXCEPTION(block_older_than_undo_history, "You are on a fork I'm unable to switch to"); if( number_of_blocks_after_reference_point ) { // then the synopsis is incomplete, add the missing elements from ids_of_items_to_get uint32_t true_high_block_num = reference_point_block_num + number_of_blocks_after_reference_point; - uint32_t low_block_num = 1; + + // in order to generate a seamless synopsis, we need to be using the same low_block_num as the + // backend code; the first block in the synopsis will be the low block number it used + uint32_t low_block_num = synopsis.empty() ? 1 : _delegate->get_block_number(synopsis.front()); + do { if( low_block_num > reference_point_block_num ) - synopsis.push_back( (*original_ids_of_items_to_get)[low_block_num - reference_point_block_num - 1] ); - low_block_num += ( (true_high_block_num - low_block_num + 2 ) / 2 ); + synopsis.push_back((*original_ids_of_items_to_get)[low_block_num - reference_point_block_num - 1]); + low_block_num += (true_high_block_num - low_block_num + 2 ) / 2; } while ( low_block_num <= true_high_block_num ); assert(synopsis.back() == original_ids_of_items_to_get->back()); @@ -2305,14 +2311,25 @@ namespace graphene { namespace net { namespace detail { peer->last_block_time_delegate_has_seen = _delegate->get_block_time(item_hash_t()); } - std::vector blockchain_synopsis = create_blockchain_synopsis_for_peer( peer ); - item_hash_t last_item_seen = blockchain_synopsis.empty() ? item_hash_t() : blockchain_synopsis.back(); - dlog( "sync: sending a request for the next items after ${last_item_seen} to peer ${peer}, (full request is ${blockchain_synopsis})", - ( "last_item_seen", last_item_seen ) - ( "peer", peer->get_remote_endpoint() ) - ( "blockchain_synopsis", blockchain_synopsis ) ); - peer->item_ids_requested_from_peer = boost::make_tuple( item_id(_sync_item_type, last_item_seen ), fc::time_point::now() ); - peer->send_message( fetch_blockchain_item_ids_message(_sync_item_type, blockchain_synopsis ) ); + fc::oexception synopsis_exception; + try + { + std::vector blockchain_synopsis = create_blockchain_synopsis_for_peer( peer ); + + item_hash_t last_item_seen = blockchain_synopsis.empty() ? item_hash_t() : blockchain_synopsis.back(); + dlog( "sync: sending a request for the next items after ${last_item_seen} to peer ${peer}, (full request is ${blockchain_synopsis})", + ( "last_item_seen", last_item_seen ) + ( "peer", peer->get_remote_endpoint() ) + ( "blockchain_synopsis", blockchain_synopsis ) ); + peer->item_ids_requested_from_peer = boost::make_tuple( blockchain_synopsis, fc::time_point::now() ); + peer->send_message( fetch_blockchain_item_ids_message(_sync_item_type, blockchain_synopsis ) ); + } + catch (const block_older_than_undo_history& e) + { + synopsis_exception = e; + } + if (synopsis_exception) + disconnect_from_peer(peer, "You are on a fork I'm unable to switch to"); } void node_impl::on_blockchain_item_ids_inventory_message(peer_connection* originating_peer, @@ -2322,6 +2339,33 @@ namespace graphene { namespace net { namespace detail { // ignore unless we asked for the data if( originating_peer->item_ids_requested_from_peer ) { + // verify that the peer's the block ids the peer sent is a valid response to our request; + // It should either be an empty list of blocks, or a list of blocks that builds off of one of + // the blocks in the synopsis we sent + if (!blockchain_item_ids_inventory_message_received.item_hashes_available.empty()) + { + const std::vector& synopsis_sent_in_request = originating_peer->item_ids_requested_from_peer->get<0>(); + const item_hash_t& first_item_hash = blockchain_item_ids_inventory_message_received.item_hashes_available.front(); + if (boost::range::find(synopsis_sent_in_request, first_item_hash) == synopsis_sent_in_request.end()) + { + wlog("Invalid response from peer ${peer_endpoint}. We requested a list of sync blocks based on the synopsis ${synopsis}, but they " + "provided a list of blocks starting with ${first_block}", + ("peer_endpoint", originating_peer->get_remote_endpoint()) + ("synopsis", synopsis_sent_in_request) + ("first_block", first_item_hash)); + // TODO: enable these once committed + //fc::exception error_for_peer(FC_LOG_MESSAGE(error, "You gave an invalid response for my request for sync blocks. I asked for blocks following something in " + // "${synopsis}, but you returned a list of blocks starting with ${first_block} which wasn't one of your choices", + // ("synopsis", synopsis_sent_in_request) + // ("first_block", first_item_hash))); + //disconnect_from_peer(originating_peer, + // "You gave an invalid response to my request for sync blocks", + // true, error_for_peer); + disconnect_from_peer(originating_peer, + "You gave an invalid response to my request for sync blocks"); + return; + } + } originating_peer->item_ids_requested_from_peer.reset(); dlog( "sync: received a list of ${count} available items from ${peer_endpoint}", @@ -5185,12 +5229,11 @@ namespace graphene { namespace net { namespace detail { INVOKE_AND_COLLECT_STATISTICS(handle_transaction, transaction_message); } - std::vector statistics_gathering_node_delegate_wrapper::get_item_ids(uint32_t item_type, - const std::vector& blockchain_synopsis, - uint32_t& remaining_item_count, - uint32_t limit /* = 2000 */) + std::vector statistics_gathering_node_delegate_wrapper::get_block_ids(const std::vector& blockchain_synopsis, + uint32_t& remaining_item_count, + uint32_t limit /* = 2000 */) { - INVOKE_AND_COLLECT_STATISTICS(get_item_ids, item_type, blockchain_synopsis, remaining_item_count, limit); + INVOKE_AND_COLLECT_STATISTICS(get_block_ids, blockchain_synopsis, remaining_item_count, limit); } message statistics_gathering_node_delegate_wrapper::get_item( const item_id& id ) @@ -5203,11 +5246,9 @@ namespace graphene { namespace net { namespace detail { INVOKE_AND_COLLECT_STATISTICS(get_chain_id); } - std::vector statistics_gathering_node_delegate_wrapper::get_blockchain_synopsis(uint32_t item_type, - const graphene::net::item_hash_t& reference_point /* = graphene::net::item_hash_t() */, - uint32_t number_of_blocks_after_reference_point /* = 0 */) + std::vector statistics_gathering_node_delegate_wrapper::get_blockchain_synopsis(const item_hash_t& reference_point, uint32_t number_of_blocks_after_reference_point) { - INVOKE_AND_COLLECT_STATISTICS(get_blockchain_synopsis, item_type, reference_point, number_of_blocks_after_reference_point); + INVOKE_AND_COLLECT_STATISTICS(get_blockchain_synopsis, reference_point, number_of_blocks_after_reference_point); } void statistics_gathering_node_delegate_wrapper::sync_status( uint32_t item_type, uint32_t item_count ) From af79de03c4ae7eeed35e1b1f83dc803a926e951e Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Thu, 10 Sep 2015 09:47:26 -0400 Subject: [PATCH 307/353] remove spam --- libraries/app/application.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp index c9783d53..9079e543 100644 --- a/libraries/app/application.cpp +++ b/libraries/app/application.cpp @@ -497,7 +497,7 @@ namespace detail { current = current*2; } std::reverse( result.begin(), result.end() ); - idump((reference_point)(number_of_blocks_after_reference_point)(result)); + //idump((reference_point)(number_of_blocks_after_reference_point)(result)); return result; } FC_CAPTURE_AND_RETHROW( (reference_point)(number_of_blocks_after_reference_point) ) } From 9991a4117fc4c2fc6109f5b552ec300c4e94fe76 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Thu, 10 Sep 2015 09:59:36 -0400 Subject: [PATCH 308/353] README.md: Update/move instructions for running private testnet --- README.md | 24 +----------------------- docs | 2 +- 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 0fa53eb2..50d9c1d3 100644 --- a/README.md +++ b/README.md @@ -165,29 +165,7 @@ it is fairly simple to write API methods to expose database methods. Running private testnet ----------------------- -Normally `witness_node` assumes it won't be producing blocks from -genesis, or against very old chain state. We need to get `witness_node` -to discard this assumption if we actually want to start a new chain, -so we will need to specify in `config.ini`: - - enable-stale-production = true - -We also need to specify which witnesses will produce blocks locally; -`witness_node` does not assume that it should produce blocks for a given -witness just because it has the correct private key to do so. There are -ten witnesses at genesis of the testnet, block production can be -enabled for all of them by specifying multiple times in `config.ini`: - - witness-id = "1.6.0" - witness-id = "1.6.1" - witness-id = "1.6.2" - witness-id = "1.6.3" - witness-id = "1.6.4" - witness-id = "1.6.5" - witness-id = "1.6.6" - witness-id = "1.6.7" - witness-id = "1.6.8" - witness-id = "1.6.9" +See the [documentation](docs/private-testnet.md) if you want to run a private testnet. Questions --------- diff --git a/docs b/docs index cdc8ea81..c004ae42 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit cdc8ea8133a999afef8051700a4ce8edb0988ec4 +Subproject commit c004ae42a72d86bbc6c7e8d065deed284fd093a5 From 65165c416fb8bbe2d6cc7d542047000e710cf279 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Thu, 10 Sep 2015 10:01:11 -0400 Subject: [PATCH 309/353] README.md: Fix URL in previous commit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 50d9c1d3..fa374b92 100644 --- a/README.md +++ b/README.md @@ -165,7 +165,7 @@ it is fairly simple to write API methods to expose database methods. Running private testnet ----------------------- -See the [documentation](docs/private-testnet.md) if you want to run a private testnet. +See the [documentation](https://github.com/cryptonomex/graphene/wiki/private-testnet) if you want to run a private testnet. Questions --------- From 0b6f7fe430ce1ff15e01d76ea4762dbf0700e952 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Thu, 10 Sep 2015 11:16:23 -0400 Subject: [PATCH 310/353] wallet.cpp: Ask remote DB for accounts on startup --- libraries/wallet/wallet.cpp | 52 ++++++++++++++++++++++++++++++------- 1 file changed, 43 insertions(+), 9 deletions(-) diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp index 575db736..7a0608b7 100644 --- a/libraries/wallet/wallet.cpp +++ b/libraries/wallet/wallet.cpp @@ -649,15 +649,49 @@ public: ("wallet.chain_id", _wallet.chain_id) ("chain_id", _chain_id) ); - vector< account_id_type > my_account_ids; - my_account_ids.reserve( _wallet.my_accounts.size() ); - for( const account_object& acct : _wallet.my_accounts ) - my_account_ids.push_back( acct.id ); - // TODO: Batch requests using _remote_db->get_accounts() - // to reduce number of round-trips. Remember get_accounts() has - // a limit of 100 results per call! - for( const account_id_type& acct_id : my_account_ids ) - _wallet.update_account( get_account( acct_id ) ); + size_t account_pagination = 100; + vector< account_id_type > account_ids_to_send; + size_t n = _wallet.my_accounts.size(); + account_ids_to_send.reserve( std::min( account_pagination, n ) ); + auto it = _wallet.my_accounts.begin(); + + for( size_t start=0; start start ); + account_ids_to_send.clear(); + std::vector< account_object > old_accounts; + for( size_t i=start; i > accounts = _remote_db->get_accounts(account_ids_to_send); + // server response should be same length as request + FC_ASSERT( accounts.size() == account_ids_to_send.size() ); + size_t i = 0; + for( const optional< account_object >& acct : accounts ) + { + account_object& old_acct = old_accounts[i]; + if( !acct.valid() ) + { + elog( "Could not find account ${id} : \"${name}\" does not exist on the chain!", ("id", old_acct.id)("name", old_acct.name) ); + i++; + continue; + } + // this check makes sure the server didn't send results + // in a different order, or accounts we didn't request + FC_ASSERT( acct->id == old_acct.id ); + if( fc::json::to_string(*acct) != fc::json::to_string(old_acct) ) + { + wlog( "Account ${id} : \"${name}\" updated on chain", ("id", acct->id)("name", acct->name) ); + } + _wallet.update_account( *acct ); + i++; + } + } return true; } From e1530709d973c092526977c09cd00574ebba2f9e Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Thu, 10 Sep 2015 12:08:01 -0400 Subject: [PATCH 311/353] witness.cpp: Set skip_undo_history_check when --enable-stale-production is specified --- .../witness/include/graphene/witness/witness.hpp | 1 + libraries/plugins/witness/witness.cpp | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libraries/plugins/witness/include/graphene/witness/witness.hpp b/libraries/plugins/witness/include/graphene/witness/witness.hpp index c82b83d8..df033094 100644 --- a/libraries/plugins/witness/include/graphene/witness/witness.hpp +++ b/libraries/plugins/witness/include/graphene/witness/witness.hpp @@ -75,6 +75,7 @@ private: bool _production_enabled = false; bool _consecutive_production_enabled = false; uint32_t _required_witness_participation = 33 * GRAPHENE_1_PERCENT; + uint32_t _production_skip_flags = graphene::chain::database::skip_nothing; std::map _private_keys; std::set _witnesses; diff --git a/libraries/plugins/witness/witness.cpp b/libraries/plugins/witness/witness.cpp index 24eb0309..db5154ec 100644 --- a/libraries/plugins/witness/witness.cpp +++ b/libraries/plugins/witness/witness.cpp @@ -123,8 +123,12 @@ void witness_plugin::plugin_startup() { ilog("Launching block production for ${n} witnesses.", ("n", _witnesses.size())); app().set_block_production(true); - if( _production_enabled && (d.head_block_num() == 0) ) - new_chain_banner(d); + if( _production_enabled ) + { + if( d.head_block_num() == 0 ) + new_chain_banner(d); + _production_skip_flags |= graphene::chain::database::skip_undo_history_check; + } schedule_production_loop(); } else elog("No witnesses configured! Please add witness IDs and private keys to configuration."); @@ -278,7 +282,7 @@ block_production_condition::block_production_condition_enum witness_plugin::mayb scheduled_time, scheduled_witness, private_key_itr->second, - graphene::chain::database::skip_nothing + _production_skip_flags ); capture("n", block.block_num())("t", block.timestamp)("c", now); p2p_node().broadcast(net::block_message(block)); From 77ac6eb689eeafad17aa1f59757977700614691e Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Thu, 10 Sep 2015 15:41:13 -0400 Subject: [PATCH 312/353] db_init.cpp: Don't allocate unnecessary asset_dynamic_data_object --- libraries/chain/db_init.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/chain/db_init.cpp b/libraries/chain/db_init.cpp index f3361bf1..55122d12 100644 --- a/libraries/chain/db_init.cpp +++ b/libraries/chain/db_init.cpp @@ -331,13 +331,13 @@ void database::init_genesis(const genesis_state_type& genesis_state) // Create more special assets while( true ) { + uint64_t id = get_index().get_next_id().instance(); + if( id >= genesis_state.immutable_parameters.num_special_assets ) + break; const asset_dynamic_data_object& dyn_asset = create([&](asset_dynamic_data_object& a) { a.current_supply = 0; }); - uint64_t id = get_index().get_next_id().instance(); - if( id >= genesis_state.immutable_parameters.num_special_assets ) - break; const asset_object& asset_obj = create( [&]( asset_object& a ) { a.symbol = "SPECIAL" + std::to_string( id ); a.options.max_supply = 0; From 358a88037c069b0b61ebdc0ac510e846b1fc9764 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Thu, 10 Sep 2015 15:41:49 -0400 Subject: [PATCH 313/353] wallet.cpp: Subscribe to block updates, fix #302 --- libraries/app/api.cpp | 10 +++++++++- libraries/app/include/graphene/app/api.hpp | 3 +++ libraries/wallet/wallet.cpp | 11 +++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/libraries/app/api.cpp b/libraries/app/api.cpp index 5b61bc61..e440854f 100644 --- a/libraries/app/api.cpp +++ b/libraries/app/api.cpp @@ -923,10 +923,18 @@ namespace graphene { namespace app { */ void database_api::on_applied_block() { + if (_block_applied_callback) + { + auto capture_this = shared_from_this(); + block_id_type block_id = _db.head_block_id(); + fc::async([this,capture_this,block_id](){ + _block_applied_callback(fc::variant(block_id)); + }); + } + if(_market_subscriptions.size() == 0) return; - const auto& ops = _db.get_applied_operations(); map< std::pair, vector> > subscribed_markets_ops; for(const auto& op : ops) diff --git a/libraries/app/include/graphene/app/api.hpp b/libraries/app/include/graphene/app/api.hpp index ca83accd..8a94706f 100644 --- a/libraries/app/include/graphene/app/api.hpp +++ b/libraries/app/include/graphene/app/api.hpp @@ -367,6 +367,7 @@ namespace graphene { namespace app { void set_subscribe_callback( std::function cb, bool clear_filter ); void set_pending_transaction_callback( std::function cb ){ _pending_trx_callback = cb; } + void set_block_applied_callback( std::function cb ){ _block_applied_callback = cb; } private: template void subscribe_to_item( const T& i )const @@ -398,6 +399,7 @@ namespace graphene { namespace app { mutable fc::bloom_filter _subscribe_filter; std::function _subscribe_callback; std::function _pending_trx_callback; + std::function _block_applied_callback; boost::signals2::scoped_connection _change_connection; boost::signals2::scoped_connection _removed_connection; @@ -606,6 +608,7 @@ FC_API(graphene::app::database_api, (get_required_fees) (set_subscribe_callback) (set_pending_transaction_callback) + (set_block_applied_callback) (validate_transaction) ) FC_API(graphene::app::history_api, diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp index 7a0608b7..7d5cef4b 100644 --- a/libraries/wallet/wallet.cpp +++ b/libraries/wallet/wallet.cpp @@ -375,6 +375,12 @@ public: ("chain_id", _chain_id) ); } init_prototype_ops(); + + _remote_db->set_block_applied_callback( [this](const variant& block_id ) + { + on_block_applied( block_id ); + } ); + _wallet.chain_id = _chain_id; _wallet.ws_server = initial_data.ws_server; _wallet.ws_user = initial_data.ws_user; @@ -408,6 +414,11 @@ public: } } + void on_block_applied( const variant& block_id ) + { + fc::async([this]{resync();}, "Resync after block"); + } + bool copy_wallet_file( string destination_filename ) { fc::path src_path = get_wallet_filename(); From 8e9bd890a8fc1af7a951e57042dc14be85133908 Mon Sep 17 00:00:00 2001 From: Eric Frias Date: Thu, 10 Sep 2015 19:15:41 -0400 Subject: [PATCH 314/353] Fix bugs, improve logging in p2p sync --- libraries/app/application.cpp | 20 +++++++++++--------- libraries/net/node.cpp | 8 +++++--- tests/tests/block_tests.cpp | 6 +++--- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp index 2f546492..1f83b3c7 100644 --- a/libraries/app/application.cpp +++ b/libraries/app/application.cpp @@ -27,6 +27,7 @@ #include #include +#include #include @@ -605,6 +606,14 @@ namespace detail { throw; } } + if (non_fork_high_block_num < low_block_num) + { + wlog("Unable to generate a usable synopsis because the peer we're generating it for forked too long ago " + "(our chains diverge after block #${non_fork_high_block_num} but only undoable to block #${low_block_num})", + ("low_block_num", low_block_num) + ("non_fork_high_block_num", non_fork_high_block_num)); + FC_THROW_EXCEPTION(graphene::net::block_older_than_undo_history, "Peer is are on a fork I'm unable to switch to"); + } } else { @@ -620,15 +629,8 @@ namespace detail { // non_fork_high_block_num is the block before the fork (if the peer is on a fork, or otherwise it is the same as high_block_num) // high_block_num is the block number of the reference block, or the end of the chain if no reference provided - if (non_fork_high_block_num <= low_block_num) - { - wlog("Unable to generate a usable synopsis because the peer we're generating it for forked too long ago " - "(our chains diverge after block #${non_fork_high_block_num} but only undoable to block #${low_block_num})", - ("low_block_num", low_block_num) - ("non_fork_high_block_num", non_fork_high_block_num)); - return synopsis; - } - + // true_high_block_num is the ending block number after the network code appends any item ids it + // knows about that we don't uint32_t true_high_block_num = high_block_num + number_of_blocks_after_reference_point; do { diff --git a/libraries/net/node.cpp b/libraries/net/node.cpp index e3f75360..f4cc31be 100644 --- a/libraries/net/node.cpp +++ b/libraries/net/node.cpp @@ -1321,9 +1321,9 @@ namespace graphene { namespace net { namespace detail { active_peer->item_ids_requested_from_peer && active_peer->item_ids_requested_from_peer->get<1>() < active_ignored_request_threshold) { - wlog("Disconnecting peer ${peer} because they didn't respond to my request for sync item ids after ${id}", + wlog("Disconnecting peer ${peer} because they didn't respond to my request for sync item ids after ${synopsis}", ("peer", active_peer->get_remote_endpoint()) - ("id", active_peer->item_ids_requested_from_peer->get<0>().back())); + ("synopsis", active_peer->item_ids_requested_from_peer->get<0>())); disconnect_due_to_request_timeout = true; } if (!disconnect_due_to_request_timeout) @@ -2269,6 +2269,7 @@ namespace graphene { namespace net { namespace detail { std::vector synopsis = _delegate->get_blockchain_synopsis(reference_point, number_of_blocks_after_reference_point); +#if 0 // just for debugging, enable this and set a breakpoint to step through if (synopsis.empty()) synopsis = _delegate->get_blockchain_synopsis(reference_point, number_of_blocks_after_reference_point); @@ -2277,8 +2278,9 @@ namespace graphene { namespace net { namespace detail { // or if the reference point is now past our undo history (that's not). // in the second case, we should mark this peer as one we're unable to sync with and // disconnect them. - if (reference_point != item_hash_t() && synopsis.empty()) + if (reference_point != item_hash_t() && synopsis.empty()) FC_THROW_EXCEPTION(block_older_than_undo_history, "You are on a fork I'm unable to switch to"); +#endif if( number_of_blocks_after_reference_point ) { diff --git a/tests/tests/block_tests.cpp b/tests/tests/block_tests.cpp index 4a904390..f0830d48 100644 --- a/tests/tests/block_tests.cpp +++ b/tests/tests/block_tests.cpp @@ -1076,7 +1076,7 @@ BOOST_FIXTURE_TEST_CASE( transaction_invalidated_in_cache, database_fixture ) } }; - auto generate_xfer_tx = [&]( account_id_type from, account_id_type to, share_type amount, int blocks_to_expire=10 ) -> signed_transaction + auto generate_xfer_tx = [&]( account_id_type from, account_id_type to, share_type amount, int blocks_to_expire ) -> signed_transaction { signed_transaction tx; transfer_operation xfer_op; @@ -1128,8 +1128,8 @@ BOOST_FIXTURE_TEST_CASE( transaction_invalidated_in_cache, database_fixture ) // signed_transaction tx_a = generate_xfer_tx( bob_id, alice_id, 1000, 3 ); - signed_transaction tx_b = generate_xfer_tx( alice_id, bob_id, 2000 ); - signed_transaction tx_c = generate_xfer_tx( alice_id, bob_id, 500 ); + signed_transaction tx_b = generate_xfer_tx( alice_id, bob_id, 2000, 10 ); + signed_transaction tx_c = generate_xfer_tx( alice_id, bob_id, 500, 10 ); generate_block( db ); From b3052dfcc19ad1955d752c03f4ff461609ca8682 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Fri, 11 Sep 2015 08:53:50 -0400 Subject: [PATCH 315/353] fix warnings --- docs | 2 +- libraries/chain/db_init.cpp | 2 +- libraries/chain/db_maint.cpp | 2 +- .../chain/include/graphene/chain/protocol/address.hpp | 7 ++++++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/docs b/docs index c004ae42..cdc8ea81 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit c004ae42a72d86bbc6c7e8d065deed284fd093a5 +Subproject commit cdc8ea8133a999afef8051700a4ce8edb0988ec4 diff --git a/libraries/chain/db_init.cpp b/libraries/chain/db_init.cpp index 55122d12..6f7a7623 100644 --- a/libraries/chain/db_init.cpp +++ b/libraries/chain/db_init.cpp @@ -588,7 +588,7 @@ void database::init_genesis(const genesis_state_type& genesis_state) // Set active witnesses modify(get_global_properties(), [&](global_property_object& p) { - for( int i = 1; i <= genesis_state.initial_active_witnesses; ++i ) + for( uint32_t i = 1; i <= genesis_state.initial_active_witnesses; ++i ) { p.active_witnesses.insert(i); p.witness_accounts.insert(get(witness_id_type(i)).witness_account); diff --git a/libraries/chain/db_maint.cpp b/libraries/chain/db_maint.cpp index 824e64ae..dd87a9b4 100644 --- a/libraries/chain/db_maint.cpp +++ b/libraries/chain/db_maint.cpp @@ -118,7 +118,7 @@ void database::pay_workers( share_type& budget ) return wa.id < wb.id; }); - for( int i = 0; i < active_workers.size() && budget > 0; ++i ) + for( uint32_t i = 0; i < active_workers.size() && budget > 0; ++i ) { const worker_object& active_worker = active_workers[i]; share_type requested_pay = active_worker.daily_pay; diff --git a/libraries/chain/include/graphene/chain/protocol/address.hpp b/libraries/chain/include/graphene/chain/protocol/address.hpp index 39f80800..ca264084 100644 --- a/libraries/chain/include/graphene/chain/protocol/address.hpp +++ b/libraries/chain/include/graphene/chain/protocol/address.hpp @@ -56,7 +56,12 @@ namespace graphene { namespace chain { explicit operator std::string()const; ///< converts to base58 + checksum - friend size_t hash_value( const address& v ) { return *((size_t*)&v.addr._hash[2]); } + friend size_t hash_value( const address& v ) { + const void* tmp = static_cast(v.addr._hash+2); + + const size_t* tmp2 = reinterpret_cast(tmp); + return *tmp2; + } fc::ripemd160 addr; }; inline bool operator == ( const address& a, const address& b ) { return a.addr == b.addr; } From 7803b9232400a08e2323f04ed4b9a3748c445055 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Fri, 11 Sep 2015 08:56:16 -0400 Subject: [PATCH 316/353] Updating fc link --- libraries/fc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/fc b/libraries/fc index 19e42ac4..483b3488 160000 --- a/libraries/fc +++ b/libraries/fc @@ -1 +1 @@ -Subproject commit 19e42ac4c41d0a2bbdc8094c2efeed5e28e0ed75 +Subproject commit 483b348878f284c474511db05e120466ffbfc132 From f9a27059e5474399540510997c1c2c86c084a671 Mon Sep 17 00:00:00 2001 From: Eric Frias Date: Fri, 11 Sep 2015 10:09:42 -0400 Subject: [PATCH 317/353] Fix incorrect error message generated when syncing with peer that has no blocks --- libraries/net/node.cpp | 84 +++++++++++++++++++++++++++++------------- 1 file changed, 58 insertions(+), 26 deletions(-) diff --git a/libraries/net/node.cpp b/libraries/net/node.cpp index f4cc31be..1e82dcd9 100644 --- a/libraries/net/node.cpp +++ b/libraries/net/node.cpp @@ -2144,14 +2144,22 @@ namespace graphene { namespace net { namespace detail { const fetch_blockchain_item_ids_message& fetch_blockchain_item_ids_message_received) { VERIFY_CORRECT_THREAD(); - item_id peers_last_item_seen; - if( !fetch_blockchain_item_ids_message_received.blockchain_synopsis.empty() ) - peers_last_item_seen = item_id( fetch_blockchain_item_ids_message_received.item_type, - fetch_blockchain_item_ids_message_received.blockchain_synopsis.back() ); - dlog( "sync: received a request for item ids after ${last_item_seen} from peer ${peer_endpoint} (full request: ${synopsis})", - ( "last_item_seen", peers_last_item_seen ) - ( "peer_endpoint", originating_peer->get_remote_endpoint() ) - ( "synopsis", fetch_blockchain_item_ids_message_received.blockchain_synopsis ) ); + item_id peers_last_item_seen = item_id(fetch_blockchain_item_ids_message_received.item_type, item_hash_t()); + if (fetch_blockchain_item_ids_message_received.blockchain_synopsis.empty()) + { + dlog("sync: received a request for item ids starting at the beginning of the chain from peer ${peer_endpoint} (full request: ${synopsis})", + ("peer_endpoint", originating_peer->get_remote_endpoint()) + ("synopsis", fetch_blockchain_item_ids_message_received.blockchain_synopsis)); + } + else + { + item_hash_t peers_last_item_hash_seen = fetch_blockchain_item_ids_message_received.blockchain_synopsis.back(); + dlog("sync: received a request for item ids after ${last_item_seen} from peer ${peer_endpoint} (full request: ${synopsis})", + ("last_item_seen", peers_last_item_hash_seen) + ("peer_endpoint", originating_peer->get_remote_endpoint()) + ("synopsis", fetch_blockchain_item_ids_message_received.blockchain_synopsis)); + peers_last_item_seen.item_hash = peers_last_item_hash_seen; + } blockchain_item_ids_inventory_message reply_message; reply_message.item_hashes_available = _delegate->get_block_ids(fetch_blockchain_item_ids_message_received.blockchain_synopsis, @@ -2194,7 +2202,6 @@ namespace graphene { namespace net { namespace detail { } else { - //dlog( "sync: peer is out of sync, sending peer ${count} items ids: ${item_ids}", ("count", reply_message.item_hashes_available.size() )("item_ids", reply_message.item_hashes_available ) ); dlog("sync: peer is out of sync, sending peer ${count} items ids: first: ${first_item_id}, last: ${last_item_id}", ("count", reply_message.item_hashes_available.size()) ("first_item_id", reply_message.item_hashes_available.front()) @@ -2348,24 +2355,49 @@ namespace graphene { namespace net { namespace detail { { const std::vector& synopsis_sent_in_request = originating_peer->item_ids_requested_from_peer->get<0>(); const item_hash_t& first_item_hash = blockchain_item_ids_inventory_message_received.item_hashes_available.front(); - if (boost::range::find(synopsis_sent_in_request, first_item_hash) == synopsis_sent_in_request.end()) + + if (synopsis_sent_in_request.empty()) { - wlog("Invalid response from peer ${peer_endpoint}. We requested a list of sync blocks based on the synopsis ${synopsis}, but they " - "provided a list of blocks starting with ${first_block}", - ("peer_endpoint", originating_peer->get_remote_endpoint()) - ("synopsis", synopsis_sent_in_request) - ("first_block", first_item_hash)); - // TODO: enable these once committed - //fc::exception error_for_peer(FC_LOG_MESSAGE(error, "You gave an invalid response for my request for sync blocks. I asked for blocks following something in " - // "${synopsis}, but you returned a list of blocks starting with ${first_block} which wasn't one of your choices", - // ("synopsis", synopsis_sent_in_request) - // ("first_block", first_item_hash))); - //disconnect_from_peer(originating_peer, - // "You gave an invalid response to my request for sync blocks", - // true, error_for_peer); - disconnect_from_peer(originating_peer, - "You gave an invalid response to my request for sync blocks"); - return; + // if we sent an empty synopsis, we were asking for all blocks, so the first block should be block 1 + if (_delegate->get_block_number(first_item_hash) != 1) + { + wlog("Invalid response from peer ${peer_endpoint}. We requested a list of sync blocks starting from the beginning of the chain, " + "but they provided a list of blocks starting with ${first_block}", + ("peer_endpoint", originating_peer->get_remote_endpoint()) + ("first_block", first_item_hash)); + // TODO: enable these once committed + //fc::exception error_for_peer(FC_LOG_MESSAGE(error, "You gave an invalid response for my request for sync blocks. I asked for blocks starting from the beginning of the chain, " + // "but you returned a list of blocks starting with ${first_block}", + // ("first_block", first_item_hash))); + //disconnect_from_peer(originating_peer, + // "You gave an invalid response to my request for sync blocks", + // true, error_for_peer); + disconnect_from_peer(originating_peer, + "You gave an invalid response to my request for sync blocks"); + return; + } + } + else // synopsis was not empty, we expect a response building off one of the blocks we sent + { + if (boost::range::find(synopsis_sent_in_request, first_item_hash) == synopsis_sent_in_request.end()) + { + wlog("Invalid response from peer ${peer_endpoint}. We requested a list of sync blocks based on the synopsis ${synopsis}, but they " + "provided a list of blocks starting with ${first_block}", + ("peer_endpoint", originating_peer->get_remote_endpoint()) + ("synopsis", synopsis_sent_in_request) + ("first_block", first_item_hash)); + // TODO: enable these once committed + //fc::exception error_for_peer(FC_LOG_MESSAGE(error, "You gave an invalid response for my request for sync blocks. I asked for blocks following something in " + // "${synopsis}, but you returned a list of blocks starting with ${first_block} which wasn't one of your choices", + // ("synopsis", synopsis_sent_in_request) + // ("first_block", first_item_hash))); + //disconnect_from_peer(originating_peer, + // "You gave an invalid response to my request for sync blocks", + // true, error_for_peer); + disconnect_from_peer(originating_peer, + "You gave an invalid response to my request for sync blocks"); + return; + } } } originating_peer->item_ids_requested_from_peer.reset(); From 1141d1ce89f31c0131400cc525b710d2b8941d37 Mon Sep 17 00:00:00 2001 From: Eric Frias Date: Fri, 11 Sep 2015 11:17:37 -0400 Subject: [PATCH 318/353] Disable log messages that logged every step in the process of queueing and sending messages to peers, they were seldom useful. --- libraries/net/peer_connection.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/libraries/net/peer_connection.cpp b/libraries/net/peer_connection.cpp index b912eeb2..b0df01b7 100644 --- a/libraries/net/peer_connection.cpp +++ b/libraries/net/peer_connection.cpp @@ -276,8 +276,8 @@ namespace graphene { namespace net #ifndef NDEBUG struct counter { unsigned& _send_message_queue_tasks_counter; - counter(unsigned& var) : _send_message_queue_tasks_counter(var) { dlog("entering peer_connection::send_queued_messages_task()"); assert(_send_message_queue_tasks_counter == 0); ++_send_message_queue_tasks_counter; } - ~counter() { assert(_send_message_queue_tasks_counter == 1); --_send_message_queue_tasks_counter; dlog("leaving peer_connection::send_queued_messages_task()"); } + counter(unsigned& var) : _send_message_queue_tasks_counter(var) { /* dlog("entering peer_connection::send_queued_messages_task()"); */ assert(_send_message_queue_tasks_counter == 0); ++_send_message_queue_tasks_counter; } + ~counter() { assert(_send_message_queue_tasks_counter == 1); --_send_message_queue_tasks_counter; /* dlog("leaving peer_connection::send_queued_messages_task()"); */ } } concurrent_invocation_counter(_send_message_queue_tasks_running); #endif while (!_queued_messages.empty()) @@ -286,12 +286,12 @@ namespace graphene { namespace net message message_to_send = _queued_messages.front()->get_message(_node); try { - dlog("peer_connection::send_queued_messages_task() calling message_oriented_connection::send_message() " - "to send message of type ${type} for peer ${endpoint}", - ("type", message_to_send.msg_type)("endpoint", get_remote_endpoint())); + //dlog("peer_connection::send_queued_messages_task() calling message_oriented_connection::send_message() " + // "to send message of type ${type} for peer ${endpoint}", + // ("type", message_to_send.msg_type)("endpoint", get_remote_endpoint())); _message_connection.send_message(message_to_send); - dlog("peer_connection::send_queued_messages_task()'s call to message_oriented_connection::send_message() completed normally for peer ${endpoint}", - ("endpoint", get_remote_endpoint())); + //dlog("peer_connection::send_queued_messages_task()'s call to message_oriented_connection::send_message() completed normally for peer ${endpoint}", + // ("endpoint", get_remote_endpoint())); } catch (const fc::canceled_exception&) { @@ -323,7 +323,7 @@ namespace graphene { namespace net _total_queued_messages_size -= _queued_messages.front()->get_size_in_queue(); _queued_messages.pop(); } - dlog("leaving peer_connection::send_queued_messages_task() due to queue exhaustion"); + //dlog("leaving peer_connection::send_queued_messages_task() due to queue exhaustion"); } void peer_connection::send_queueable_message(std::unique_ptr&& message_to_send) @@ -351,18 +351,18 @@ namespace graphene { namespace net if (!_send_queued_messages_done.valid() || _send_queued_messages_done.ready()) { - dlog("peer_connection::send_message() is firing up send_queued_message_task"); + //dlog("peer_connection::send_message() is firing up send_queued_message_task"); _send_queued_messages_done = fc::async([this](){ send_queued_messages_task(); }, "send_queued_messages_task"); } - else - dlog("peer_connection::send_message() doesn't need to fire up send_queued_message_task, it's already running"); + //else + // dlog("peer_connection::send_message() doesn't need to fire up send_queued_message_task, it's already running"); } void peer_connection::send_message(const message& message_to_send, size_t message_send_time_field_offset) { VERIFY_CORRECT_THREAD(); - dlog("peer_connection::send_message() enqueueing message of type ${type} for peer ${endpoint}", - ("type", message_to_send.msg_type)("endpoint", get_remote_endpoint())); + //dlog("peer_connection::send_message() enqueueing message of type ${type} for peer ${endpoint}", + // ("type", message_to_send.msg_type)("endpoint", get_remote_endpoint())); std::unique_ptr message_to_enqueue(new real_queued_message(message_to_send, message_send_time_field_offset)); send_queueable_message(std::move(message_to_enqueue)); } @@ -370,8 +370,8 @@ namespace graphene { namespace net void peer_connection::send_item(const item_id& item_to_send) { VERIFY_CORRECT_THREAD(); - dlog("peer_connection::send_item() enqueueing message of type ${type} for peer ${endpoint}", - ("type", item_to_send.item_type)("endpoint", get_remote_endpoint())); + //dlog("peer_connection::send_item() enqueueing message of type ${type} for peer ${endpoint}", + // ("type", item_to_send.item_type)("endpoint", get_remote_endpoint())); std::unique_ptr message_to_enqueue(new virtual_queued_message(item_to_send)); send_queueable_message(std::move(message_to_enqueue)); } From cf15aa1df199ba0432ae1c97b461011938894515 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Fri, 11 Sep 2015 10:16:30 -0400 Subject: [PATCH 319/353] Remove unused file --- .../chain/transaction_evaluation_state.cpp | 127 ------------------ 1 file changed, 127 deletions(-) delete mode 100644 libraries/chain/transaction_evaluation_state.cpp diff --git a/libraries/chain/transaction_evaluation_state.cpp b/libraries/chain/transaction_evaluation_state.cpp deleted file mode 100644 index f6b4fc70..00000000 --- a/libraries/chain/transaction_evaluation_state.cpp +++ /dev/null @@ -1,127 +0,0 @@ -/* - * Copyright (c) 2015, Cryptonomex, Inc. - * All rights reserved. - * - * This source code is provided for evaluation in private test networks only, until September 8, 2015. After this date, this license expires and - * the code may not be used, modified or distributed for any purpose. Redistribution and use in source and binary forms, with or without modification, - * are permitted until September 8, 2015, provided that the following conditions are met: - * - * 1. The code and/or derivative works are used only for private test networks consisting of no more than 10 P2P nodes. - * - * 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 -#include -#include -#include -#include - -namespace graphene { namespace chain { - /* - bool transaction_evaluation_state::check_authority( const account_object& account, authority::classification auth_class, int depth ) - { - if( (!_is_proposed_trx) && (_db->get_node_properties().skip_flags & database::skip_authority_check) ) - return true; - if( (!_is_proposed_trx) && (_db->get_node_properties().skip_flags & database::skip_transaction_signatures) ) - return true; - if( account.get_id() == GRAPHENE_TEMP_ACCOUNT || - approved_by.find(make_pair(account.id, auth_class)) != approved_by.end() ) - return true; - - FC_ASSERT( account.id.instance() != 0 || _is_proposed_trx, "", ("account",account)("is_proposed",_is_proposed_trx) ); - - bool valid = false; - switch( auth_class ) - { - case authority::owner: - valid = check_authority( account.owner, auth_class, depth ); - break; - case authority::active: - valid = check_authority( account.active, auth_class, depth ); - break; - default: - FC_ASSERT( false, "Invalid Account Auth Class" ); - }; - if( valid ) - approved_by.insert( std::make_pair(account.id, auth_class) ); - return valid; - } - - bool transaction_evaluation_state::check_authority( const authority& au, authority::classification auth_class, int depth ) - { try { - if( (!_is_proposed_trx) && (_db->get_node_properties().skip_flags & database::skip_authority_check) ) - return true; - if( (!_is_proposed_trx) && (_db->get_node_properties().skip_flags & database::skip_transaction_signatures) ) - return true; - - uint32_t total_weight = 0; - - for( const auto& key : au.key_auths ) - { - if( signed_by( key.first ) ) - { - total_weight += key.second; - if( total_weight >= au.weight_threshold ) - return true; - } - } - for( const auto& key : au.address_auths ) - { - if( signed_by( key.first ) ) - { - total_weight += key.second; - if( total_weight >= au.weight_threshold ) - return true; - } - } - - for( const auto& auth : au.account_auths ) - { - if( approved_by.find( std::make_pair(auth.first,auth_class) ) != approved_by.end() ) - { - total_weight += auth.second; - if( total_weight >= au.weight_threshold ) - return true; - } - else - { - if( depth == GRAPHENE_MAX_SIG_CHECK_DEPTH ) - { - //elog("Failing authority verification due to recursion depth."); - return false; - } - const account_object& acnt = auth.first(*_db); - if( check_authority( acnt, auth_class, depth + 1 ) ) - { - approved_by.insert( std::make_pair(acnt.id,auth_class) ); - total_weight += auth.second; - if( total_weight >= au.weight_threshold ) - return true; - } - } - } - - return total_weight >= au.weight_threshold; - } FC_CAPTURE_AND_RETHROW( (au)(auth_class)(depth) ) } - - bool transaction_evaluation_state::signed_by(const public_key_type& k) - { - auto itr = _sigs.find(k); - return itr != _sigs.end() && (itr->second = true); - } - - bool transaction_evaluation_state::signed_by(const address& k) - { - for( auto itr = _sigs.begin(); itr != _sigs.end(); ++itr ) - if( itr->first == k ) return itr->second = true; - return false; - } - */ - -} } // namespace graphene::chain From a083f7b955fbc023243ad76f90877df9863bb06c Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Fri, 11 Sep 2015 12:22:30 -0400 Subject: [PATCH 320/353] api: Split database_api off into own file, reorder methods by topic --- libraries/app/CMakeLists.txt | 1 + libraries/app/api.cpp | 956 ----------- libraries/app/database_api.cpp | 1495 +++++++++++++++++ libraries/app/include/graphene/app/api.hpp | 441 +---- .../app/include/graphene/app/database_api.hpp | 537 ++++++ 5 files changed, 2044 insertions(+), 1386 deletions(-) create mode 100644 libraries/app/database_api.cpp create mode 100644 libraries/app/include/graphene/app/database_api.hpp diff --git a/libraries/app/CMakeLists.txt b/libraries/app/CMakeLists.txt index 6a2531a1..32a416ea 100644 --- a/libraries/app/CMakeLists.txt +++ b/libraries/app/CMakeLists.txt @@ -4,6 +4,7 @@ file(GLOB EGENESIS_HEADERS "../egenesis/include/graphene/app/*.hpp") add_library( graphene_app api.cpp application.cpp + database_api.cpp impacted.cpp plugin.cpp ${HEADERS} diff --git a/libraries/app/api.cpp b/libraries/app/api.cpp index e440854f..3fad3833 100644 --- a/libraries/app/api.cpp +++ b/libraries/app/api.cpp @@ -35,519 +35,6 @@ namespace graphene { namespace app { - database_api::database_api(graphene::chain::database& db):_db(db) - { - wlog("creating database api ${x}", ("x",int64_t(this)) ); - _change_connection = _db.changed_objects.connect([this](const vector& ids) { - on_objects_changed(ids); - }); - _removed_connection = _db.removed_objects.connect([this](const vector& objs) { - on_objects_removed(objs); - }); - _applied_block_connection = _db.applied_block.connect([this](const signed_block&){ on_applied_block(); }); - - _pending_trx_connection = _db.on_pending_transaction.connect([this](const signed_transaction& trx ){ - if( _pending_trx_callback ) _pending_trx_callback( fc::variant(trx) ); - }); - } - - database_api::~database_api() - { - elog("freeing database api ${x}", ("x",int64_t(this)) ); - } - - void database_api::set_subscribe_callback( std::function cb, bool clear_filter ) - { - edump((clear_filter)); - _subscribe_callback = cb; - if( clear_filter || !cb ) - { - static fc::bloom_parameters param; - param.projected_element_count = 10000; - param.false_positive_probability = 1.0/10000; - param.maximum_size = 1024*8*8*2; - param.compute_optimal_parameters(); - _subscribe_filter = fc::bloom_filter(param); - } - } - - fc::variants database_api::get_objects(const vector& ids)const - { - if( _subscribe_callback ) { - for( auto id : ids ) - { - if( id.type() == operation_history_object_type && id.space() == protocol_ids ) continue; - if( id.type() == impl_account_transaction_history_object_type && id.space() == implementation_ids ) continue; - - this->subscribe_to_item( id ); - } - } - else - { - elog( "getObjects without subscribe callback??" ); - } - - fc::variants result; - result.reserve(ids.size()); - - std::transform(ids.begin(), ids.end(), std::back_inserter(result), - [this](object_id_type id) -> fc::variant { - if(auto obj = _db.find_object(id)) - return obj->to_variant(); - return {}; - }); - - return result; - } - - optional database_api::get_block_header(uint32_t block_num) const - { - auto result = _db.fetch_block_by_number(block_num); - if(result) - return *result; - return {}; - } - - optional database_api::get_block(uint32_t block_num)const - { - return _db.fetch_block_by_number(block_num); - } - processed_transaction database_api::get_transaction(uint32_t block_num, uint32_t trx_num)const - { - auto opt_block = _db.fetch_block_by_number(block_num); - FC_ASSERT( opt_block ); - FC_ASSERT( opt_block->transactions.size() > trx_num ); - return opt_block->transactions[trx_num]; - } - - vector> database_api::lookup_account_names(const vector& account_names)const - { - const auto& accounts_by_name = _db.get_index_type().indices().get(); - vector > result; - result.reserve(account_names.size()); - std::transform(account_names.begin(), account_names.end(), std::back_inserter(result), - [&accounts_by_name](const string& name) -> optional { - auto itr = accounts_by_name.find(name); - return itr == accounts_by_name.end()? optional() : *itr; - }); - return result; - } - - vector> database_api::lookup_asset_symbols(const vector& symbols_or_ids)const - { - const auto& assets_by_symbol = _db.get_index_type().indices().get(); - vector > result; - result.reserve(symbols_or_ids.size()); - std::transform(symbols_or_ids.begin(), symbols_or_ids.end(), std::back_inserter(result), - [this, &assets_by_symbol](const string& symbol_or_id) -> optional { - if( !symbol_or_id.empty() && std::isdigit(symbol_or_id[0]) ) - { - auto ptr = _db.find(variant(symbol_or_id).as()); - return ptr == nullptr? optional() : *ptr; - } - auto itr = assets_by_symbol.find(symbol_or_id); - return itr == assets_by_symbol.end()? optional() : *itr; - }); - return result; - } - - chain_property_object database_api::get_chain_properties()const - { - return _db.get(chain_property_id_type()); - } - - global_property_object database_api::get_global_properties()const - { - return _db.get(global_property_id_type()); - } - - fc::variant_object database_api::get_config()const - { - return get_config(); - } - - chain_id_type database_api::get_chain_id()const - { - return _db.get_chain_id(); - } - - dynamic_global_property_object database_api::get_dynamic_global_properties()const - { - return _db.get(dynamic_global_property_id_type()); - } - - - vector> database_api::get_accounts(const vector& account_ids)const - { - vector> result; result.reserve(account_ids.size()); - std::transform(account_ids.begin(), account_ids.end(), std::back_inserter(result), - [this](account_id_type id) -> optional { - if(auto o = _db.find(id)) - { - subscribe_to_item( id ); - return *o; - } - return {}; - }); - return result; - } - - vector> database_api::get_assets(const vector& asset_ids)const - { - vector> result; result.reserve(asset_ids.size()); - std::transform(asset_ids.begin(), asset_ids.end(), std::back_inserter(result), - [this](asset_id_type id) -> optional { - if(auto o = _db.find(id)) - { - subscribe_to_item( id ); - return *o; - } - return {}; - }); - return result; - } - - uint64_t database_api::get_account_count()const - { - return _db.get_index_type().indices().size(); - } - - map database_api::lookup_accounts(const string& lower_bound_name, uint32_t limit)const - { - FC_ASSERT( limit <= 1000 ); - const auto& accounts_by_name = _db.get_index_type().indices().get(); - map result; - - for( auto itr = accounts_by_name.lower_bound(lower_bound_name); - limit-- && itr != accounts_by_name.end(); - ++itr ) - { - result.insert(make_pair(itr->name, itr->get_id())); - if( limit == 1 ) - subscribe_to_item( itr->get_id() ); - } - - return result; - } - - std::map database_api::get_full_accounts( const vector& names_or_ids, bool subscribe) - { - idump((names_or_ids)); - std::map results; - - for (const std::string& account_name_or_id : names_or_ids) - { - const account_object* account = nullptr; - if (std::isdigit(account_name_or_id[0])) - account = _db.find(fc::variant(account_name_or_id).as()); - else - { - const auto& idx = _db.get_index_type().indices().get(); - auto itr = idx.find(account_name_or_id); - if (itr != idx.end()) - account = &*itr; - } - if (account == nullptr) - continue; - - if( subscribe ) - { - ilog( "subscribe to ${id}", ("id",account->name) ); - subscribe_to_item( account->id ); - } - - // fc::mutable_variant_object full_account; - full_account acnt; - acnt.account = *account; - acnt.statistics = account->statistics(_db); - acnt.registrar_name = account->registrar(_db).name; - acnt.referrer_name = account->referrer(_db).name; - acnt.lifetime_referrer_name = account->lifetime_referrer(_db).name; - acnt.votes = lookup_vote_ids( vector(account->options.votes.begin(),account->options.votes.end()) ); - - // Add the account itself, its statistics object, cashback balance, and referral account names - /* - full_account("account", *account)("statistics", account->statistics(_db)) - ("registrar_name", account->registrar(_db).name)("referrer_name", account->referrer(_db).name) - ("lifetime_referrer_name", account->lifetime_referrer(_db).name); - */ - if (account->cashback_vb) - { - acnt.cashback_balance = account->cashback_balance(_db); - } - // Add the account's proposals - const auto& proposal_idx = _db.get_index_type(); - const auto& pidx = dynamic_cast&>(proposal_idx); - const auto& proposals_by_account = pidx.get_secondary_index(); - auto required_approvals_itr = proposals_by_account._account_to_proposals.find( account->id ); - if( required_approvals_itr != proposals_by_account._account_to_proposals.end() ) - { - acnt.proposals.reserve( required_approvals_itr->second.size() ); - for( auto proposal_id : required_approvals_itr->second ) - acnt.proposals.push_back( proposal_id(_db) ); - } - - - // Add the account's balances - auto balance_range = _db.get_index_type().indices().get().equal_range(account->id); - //vector balances; - std::for_each(balance_range.first, balance_range.second, - [&acnt](const account_balance_object& balance) { - acnt.balances.emplace_back(balance); - }); - - // Add the account's vesting balances - auto vesting_range = _db.get_index_type().indices().get().equal_range(account->id); - std::for_each(vesting_range.first, vesting_range.second, - [&acnt](const vesting_balance_object& balance) { - acnt.vesting_balances.emplace_back(balance); - }); - - // Add the account's orders - auto order_range = _db.get_index_type().indices().get().equal_range(account->id); - std::for_each(order_range.first, order_range.second, - [&acnt] (const limit_order_object& order) { - acnt.limit_orders.emplace_back(order); - }); - auto call_range = _db.get_index_type().indices().get().equal_range(account->id); - std::for_each(call_range.first, call_range.second, - [&acnt] (const call_order_object& call) { - acnt.call_orders.emplace_back(call); - }); - results[account_name_or_id] = acnt; - } - return results; - } - - vector database_api::get_account_balances(account_id_type acnt, const flat_set& assets)const - { - vector result; - if (assets.empty()) - { - // if the caller passes in an empty list of assets, return balances for all assets the account owns - const account_balance_index& balance_index = _db.get_index_type(); - auto range = balance_index.indices().get().equal_range(acnt); - for (const account_balance_object& balance : boost::make_iterator_range(range.first, range.second)) - result.push_back(asset(balance.get_balance())); - } - else - { - result.reserve(assets.size()); - - std::transform(assets.begin(), assets.end(), std::back_inserter(result), - [this, acnt](asset_id_type id) { return _db.get_balance(acnt, id); }); - } - - return result; - } - - vector database_api::get_named_account_balances(const std::string& name, const flat_set& assets) const - { - const auto& accounts_by_name = _db.get_index_type().indices().get(); - auto itr = accounts_by_name.find(name); - FC_ASSERT( itr != accounts_by_name.end() ); - return get_account_balances(itr->get_id(), assets); - } - - /** - * @return the limit orders for both sides of the book for the two assets specified up to limit number on each side. - */ - vector database_api::get_limit_orders(asset_id_type a, asset_id_type b, uint32_t limit)const - { - const auto& limit_order_idx = _db.get_index_type(); - const auto& limit_price_idx = limit_order_idx.indices().get(); - - vector result; - - uint32_t count = 0; - auto limit_itr = limit_price_idx.lower_bound(price::max(a,b)); - auto limit_end = limit_price_idx.upper_bound(price::min(a,b)); - while(limit_itr != limit_end && count < limit) - { - result.push_back(*limit_itr); - ++limit_itr; - ++count; - } - count = 0; - limit_itr = limit_price_idx.lower_bound(price::max(b,a)); - limit_end = limit_price_idx.upper_bound(price::min(b,a)); - while(limit_itr != limit_end && count < limit) - { - result.push_back(*limit_itr); - ++limit_itr; - ++count; - } - - return result; - } - - vector database_api::get_call_orders(asset_id_type a, uint32_t limit)const - { - const auto& call_index = _db.get_index_type().indices().get(); - const asset_object& mia = _db.get(a); - price index_price = price::min(mia.bitasset_data(_db).options.short_backing_asset, mia.get_id()); - - return vector(call_index.lower_bound(index_price.min()), - call_index.lower_bound(index_price.max())); - } - - vector database_api::get_settle_orders(asset_id_type a, uint32_t limit)const - { - const auto& settle_index = _db.get_index_type().indices().get(); - const asset_object& mia = _db.get(a); - return vector(settle_index.lower_bound(mia.get_id()), - settle_index.upper_bound(mia.get_id())); - } - - vector database_api::list_assets(const string& lower_bound_symbol, uint32_t limit)const - { - FC_ASSERT( limit <= 100 ); - const auto& assets_by_symbol = _db.get_index_type().indices().get(); - vector result; - result.reserve(limit); - - auto itr = assets_by_symbol.lower_bound(lower_bound_symbol); - - if( lower_bound_symbol == "" ) - itr = assets_by_symbol.begin(); - - while(limit-- && itr != assets_by_symbol.end()) - result.emplace_back(*itr++); - - return result; - } - - fc::optional database_api::get_committee_member_by_account(account_id_type account) const - { - const auto& idx = _db.get_index_type().indices().get(); - auto itr = idx.find(account); - if( itr != idx.end() ) - return *itr; - return {}; - } - - fc::optional database_api::get_witness_by_account(account_id_type account) const - { - const auto& idx = _db.get_index_type().indices().get(); - auto itr = idx.find(account); - if( itr != idx.end() ) - return *itr; - return {}; - } - vector database_api::lookup_vote_ids( const vector& votes )const - { - FC_ASSERT( votes.size() < 100, "Only 100 votes can be queried at a time" ); - - const auto& witness_idx = _db.get_index_type().indices().get(); - const auto& committee_idx = _db.get_index_type().indices().get(); - - vector result; - result.reserve( votes.size() ); - for( auto id : votes ) - { - switch( id.type() ) - { - case vote_id_type::committee: - { - auto itr = committee_idx.find( id ); - if( itr != committee_idx.end() ) - result.emplace_back( variant( *itr ) ); - else - result.emplace_back( variant() ); - break; - } - case vote_id_type::witness: - { - auto itr = witness_idx.find( id ); - if( itr != witness_idx.end() ) - result.emplace_back( variant( *itr ) ); - else - result.emplace_back( variant() ); - break; - } - case vote_id_type::worker: - break; - case vote_id_type::VOTE_TYPE_COUNT: break; // supress unused enum value warnings - } - } - return result; - } - - uint64_t database_api::get_witness_count()const - { - return _db.get_index_type().indices().size(); - } - - map database_api::lookup_witness_accounts(const string& lower_bound_name, uint32_t limit)const - { - FC_ASSERT( limit <= 1000 ); - const auto& witnesses_by_id = _db.get_index_type().indices().get(); - - // we want to order witnesses by account name, but that name is in the account object - // so the witness_index doesn't have a quick way to access it. - // get all the names and look them all up, sort them, then figure out what - // records to return. This could be optimized, but we expect the - // number of witnesses to be few and the frequency of calls to be rare - std::map witnesses_by_account_name; - for (const witness_object& witness : witnesses_by_id) - if (auto account_iter = _db.find(witness.witness_account)) - if (account_iter->name >= lower_bound_name) // we can ignore anything below lower_bound_name - witnesses_by_account_name.insert(std::make_pair(account_iter->name, witness.id)); - - auto end_iter = witnesses_by_account_name.begin(); - while (end_iter != witnesses_by_account_name.end() && limit--) - ++end_iter; - witnesses_by_account_name.erase(end_iter, witnesses_by_account_name.end()); - return witnesses_by_account_name; - } - - map database_api::lookup_committee_member_accounts(const string& lower_bound_name, uint32_t limit)const - { - FC_ASSERT( limit <= 1000 ); - const auto& committee_members_by_id = _db.get_index_type().indices().get(); - - // we want to order committee_members by account name, but that name is in the account object - // so the committee_member_index doesn't have a quick way to access it. - // get all the names and look them all up, sort them, then figure out what - // records to return. This could be optimized, but we expect the - // number of committee_members to be few and the frequency of calls to be rare - std::map committee_members_by_account_name; - for (const committee_member_object& committee_member : committee_members_by_id) - if (auto account_iter = _db.find(committee_member.committee_member_account)) - if (account_iter->name >= lower_bound_name) // we can ignore anything below lower_bound_name - committee_members_by_account_name.insert(std::make_pair(account_iter->name, committee_member.id)); - - auto end_iter = committee_members_by_account_name.begin(); - while (end_iter != committee_members_by_account_name.end() && limit--) - ++end_iter; - committee_members_by_account_name.erase(end_iter, committee_members_by_account_name.end()); - return committee_members_by_account_name; - } - - vector> database_api::get_witnesses(const vector& witness_ids)const - { - vector> result; result.reserve(witness_ids.size()); - std::transform(witness_ids.begin(), witness_ids.end(), std::back_inserter(result), - [this](witness_id_type id) -> optional { - if(auto o = _db.find(id)) - return *o; - return {}; - }); - return result; - } - - vector> database_api::get_committee_members(const vector& committee_member_ids)const - { - vector> result; result.reserve(committee_member_ids.size()); - std::transform(committee_member_ids.begin(), committee_member_ids.end(), std::back_inserter(result), - [this](committee_member_id_type id) -> optional { - if(auto o = _db.find(id)) - return *o; - return {}; - }); - return result; - } - login_api::login_api(application& a) :_app(a) { @@ -811,184 +298,6 @@ namespace graphene { namespace app { return result; } // end get_relevant_accounts( obj ) - - void database_api::broadcast_updates( const vector& updates ) - { - if( updates.size() ) { - auto capture_this = shared_from_this(); - fc::async([capture_this,updates](){ - capture_this->_subscribe_callback( fc::variant(updates) ); - }); - } - } - - void database_api::on_objects_removed( const vector& objs ) - { - /// we need to ensure the database_api is not deleted for the life of the async operation - if( _subscribe_callback ) - { - vector updates; - updates.reserve(objs.size()); - - for( auto obj : objs ) - updates.emplace_back( obj->id ); - broadcast_updates( updates ); - } - - if( _market_subscriptions.size() ) - { - map< pair, vector > broadcast_queue; - for( const auto& obj : objs ) - { - const limit_order_object* order = dynamic_cast(obj); - if( order ) - { - auto sub = _market_subscriptions.find( order->get_market() ); - if( sub != _market_subscriptions.end() ) - broadcast_queue[order->get_market()].emplace_back( order->id ); - } - } - if( broadcast_queue.size() ) - { - auto capture_this = shared_from_this(); - fc::async([capture_this,this,broadcast_queue](){ - for( const auto& item : broadcast_queue ) - { - auto sub = _market_subscriptions.find(item.first); - if( sub != _market_subscriptions.end() ) - sub->second( fc::variant(item.second ) ); - } - }); - } - } - } - - void database_api::on_objects_changed(const vector& ids) - { - vector updates; - map< pair, vector > market_broadcast_queue; - - for(auto id : ids) - { - const object* obj = nullptr; - if( _subscribe_callback ) - { - obj = _db.find_object( id ); - if( obj ) - { - updates.emplace_back( obj->to_variant() ); - } - else - { - updates.emplace_back(id); // send just the id to indicate removal - } - } - - if( _market_subscriptions.size() ) - { - if( !_subscribe_callback ) - obj = _db.find_object( id ); - if( obj ) - { - const limit_order_object* order = dynamic_cast(obj); - if( order ) - { - auto sub = _market_subscriptions.find( order->get_market() ); - if( sub != _market_subscriptions.end() ) - market_broadcast_queue[order->get_market()].emplace_back( order->id ); - } - } - } - } - - auto capture_this = shared_from_this(); - - /// pushing the future back / popping the prior future if it is complete. - /// if a connection hangs then this could get backed up and result in - /// a failure to exit cleanly. - fc::async([capture_this,this,updates,market_broadcast_queue](){ - if( _subscribe_callback ) _subscribe_callback( updates ); - - for( const auto& item : market_broadcast_queue ) - { - auto sub = _market_subscriptions.find(item.first); - if( sub != _market_subscriptions.end() ) - sub->second( fc::variant(item.second ) ); - } - }); - } - - /** note: this method cannot yield because it is called in the middle of - * apply a block. - */ - void database_api::on_applied_block() - { - if (_block_applied_callback) - { - auto capture_this = shared_from_this(); - block_id_type block_id = _db.head_block_id(); - fc::async([this,capture_this,block_id](){ - _block_applied_callback(fc::variant(block_id)); - }); - } - - if(_market_subscriptions.size() == 0) - return; - - const auto& ops = _db.get_applied_operations(); - map< std::pair, vector> > subscribed_markets_ops; - for(const auto& op : ops) - { - std::pair market; - switch(op.op.which()) - { - /* This is sent via the object_changed callback - case operation::tag::value: - market = op.op.get().get_market(); - break; - */ - case operation::tag::value: - market = op.op.get().get_market(); - break; - /* - case operation::tag::value: - */ - default: break; - } - if(_market_subscriptions.count(market)) - subscribed_markets_ops[market].push_back(std::make_pair(op.op, op.result)); - } - /// we need to ensure the database_api is not deleted for the life of the async operation - auto capture_this = shared_from_this(); - fc::async([this,capture_this,subscribed_markets_ops](){ - for(auto item : subscribed_markets_ops) - { - auto itr = _market_subscriptions.find(item.first); - if(itr != _market_subscriptions.end()) - itr->second(fc::variant(item.second)); - } - }); - } - - void database_api::subscribe_to_market(std::function callback, asset_id_type a, asset_id_type b) - { - if(a > b) std::swap(a,b); - FC_ASSERT(a != b); - _market_subscriptions[ std::make_pair(a,b) ] = callback; - } - - void database_api::unsubscribe_from_market(asset_id_type a, asset_id_type b) - { - if(a > b) std::swap(a,b); - FC_ASSERT(a != b); - _market_subscriptions.erase(std::make_pair(a,b)); - } - - std::string database_api::get_transaction_hex(const signed_transaction& trx)const - { - return fc::to_hex(fc::raw::pack(trx)); - } - vector history_api::get_account_history(account_id_type account, operation_history_id_type stop, unsigned limit, operation_history_id_type start) const { FC_ASSERT(_app.chain_database()); @@ -1011,7 +320,6 @@ namespace graphene { namespace app { return result; } - flat_set history_api::get_market_history_buckets()const { auto hist = _app.get_plugin( "market_history" ); @@ -1043,268 +351,4 @@ namespace graphene { namespace app { return result; } FC_CAPTURE_AND_RETHROW( (a)(b)(bucket_seconds)(start)(end) ) } - /** - * @return all accounts that referr to the key or account id in their owner or active authorities. - */ - vector database_api::get_account_references( account_id_type account_id )const - { - const auto& idx = _db.get_index_type(); - const auto& aidx = dynamic_cast&>(idx); - const auto& refs = aidx.get_secondary_index(); - auto itr = refs.account_to_account_memberships.find(account_id); - vector result; - - if( itr != refs.account_to_account_memberships.end() ) - { - result.reserve( itr->second.size() ); - for( auto item : itr->second ) result.push_back(item); - } - return result; - } - /** - * @return all accounts that referr to the key or account id in their owner or active authorities. - */ - vector> database_api::get_key_references( vector keys )const - { - wdump( (keys) ); - vector< vector > final_result; - final_result.reserve(keys.size()); - - for( auto& key : keys ) - { - - address a1( pts_address(key, false, 56) ); - address a2( pts_address(key, true, 56) ); - address a3( pts_address(key, false, 0) ); - address a4( pts_address(key, true, 0) ); - address a5( key ); - - subscribe_to_item( key ); - subscribe_to_item( a1 ); - subscribe_to_item( a2 ); - subscribe_to_item( a3 ); - subscribe_to_item( a4 ); - subscribe_to_item( a5 ); - - const auto& idx = _db.get_index_type(); - const auto& aidx = dynamic_cast&>(idx); - const auto& refs = aidx.get_secondary_index(); - auto itr = refs.account_to_key_memberships.find(key); - vector result; - - for( auto& a : {a1,a2,a3,a4,a5} ) - { - auto itr = refs.account_to_address_memberships.find(a); - if( itr != refs.account_to_address_memberships.end() ) - { - result.reserve( itr->second.size() ); - for( auto item : itr->second ) - { - wdump((a)(item)(item(_db).name)); - result.push_back(item); - } - } - } - - if( itr != refs.account_to_key_memberships.end() ) - { - result.reserve( itr->second.size() ); - for( auto item : itr->second ) result.push_back(item); - } - final_result.emplace_back( std::move(result) ); - } - - for( auto i : final_result ) - subscribe_to_item(i); - - return final_result; - } - - /** TODO: add secondary index that will accelerate this process */ - vector database_api::get_proposed_transactions( account_id_type id )const - { - const auto& idx = _db.get_index_type(); - vector result; - - idx.inspect_all_objects( [&](const object& obj){ - const proposal_object& p = static_cast(obj); - if( p.required_active_approvals.find( id ) != p.required_active_approvals.end() ) - result.push_back(p); - else if ( p.required_owner_approvals.find( id ) != p.required_owner_approvals.end() ) - result.push_back(p); - else if ( p.available_active_approvals.find( id ) != p.available_active_approvals.end() ) - result.push_back(p); - }); - return result; - } - - vector database_api::get_margin_positions( const account_id_type& id )const - { try { - const auto& idx = _db.get_index_type(); - const auto& aidx = idx.indices().get(); - auto start = aidx.lower_bound( boost::make_tuple( id, 0 ) ); - auto end = aidx.lower_bound( boost::make_tuple( id+1, 0 ) ); - vector result; - while( start != end ) - { - result.push_back(*start); - ++start; - } - return result; - } FC_CAPTURE_AND_RETHROW( (id) ) } - - - vector database_api::get_vested_balances( const vector& objs )const - { try { - vector result; - result.reserve( objs.size() ); - auto now = _db.head_block_time(); - for( auto obj : objs ) - result.push_back( obj(_db).available( now ) ); - return result; - } FC_CAPTURE_AND_RETHROW( (objs) ) } - - vector database_api::get_vesting_balances( account_id_type account_id )const - { - try - { - vector result; - auto vesting_range = _db.get_index_type().indices().get().equal_range(account_id); - std::for_each(vesting_range.first, vesting_range.second, - [&result](const vesting_balance_object& balance) { - result.emplace_back(balance); - }); - return result; - } - FC_CAPTURE_AND_RETHROW( (account_id) ); - } - - vector database_api::get_balance_objects( const vector
& addrs )const - { try { - const auto& bal_idx = _db.get_index_type(); - const auto& by_owner_idx = bal_idx.indices().get(); - - vector result; - - for( const auto& owner : addrs ) - { - subscribe_to_item( owner ); - auto itr = by_owner_idx.lower_bound( boost::make_tuple( owner, asset_id_type(0) ) ); - while( itr != by_owner_idx.end() && itr->owner == owner ) - { - result.push_back( *itr ); - ++itr; - } - } - return result; - } FC_CAPTURE_AND_RETHROW( (addrs) ) } - - set database_api::get_required_signatures( const signed_transaction& trx, const flat_set& available_keys )const - { - wdump((trx)(available_keys)); - auto result = trx.get_required_signatures( _db.get_chain_id(), - available_keys, - [&]( account_id_type id ){ return &id(_db).active; }, - [&]( account_id_type id ){ return &id(_db).owner; }, - _db.get_global_properties().parameters.max_authority_depth ); - wdump((result)); - return result; - } - set database_api::get_potential_signatures( const signed_transaction& trx )const - { - wdump((trx)); - set result; - trx.get_required_signatures( _db.get_chain_id(), - flat_set(), - [&]( account_id_type id ){ - const auto& auth = id(_db).active; - for( const auto& k : auth.get_keys() ) - result.insert(k); - return &auth; }, - [&]( account_id_type id ){ - const auto& auth = id(_db).owner; - for( const auto& k : auth.get_keys() ) - result.insert(k); - return &auth; - }, - _db.get_global_properties().parameters.max_authority_depth ); - - wdump((result)); - return result; - } - /** - * Validates a transaction against the current state without broadcast it on the network. - */ - processed_transaction database_api::validate_transaction( const signed_transaction& trx )const - { - return _db.validate_transaction(trx); - } - - bool database_api::verify_authority( const signed_transaction& trx )const - { - trx.verify_authority( _db.get_chain_id(), - [&]( account_id_type id ){ return &id(_db).active; }, - [&]( account_id_type id ){ return &id(_db).owner; }, - _db.get_global_properties().parameters.max_authority_depth ); - return true; - } - - bool database_api::verify_account_authority( const string& name_or_id, const flat_set& keys )const - { - FC_ASSERT( name_or_id.size() > 0); - const account_object* account = nullptr; - if (std::isdigit(name_or_id[0])) - account = _db.find(fc::variant(name_or_id).as()); - else - { - const auto& idx = _db.get_index_type().indices().get(); - auto itr = idx.find(name_or_id); - if (itr != idx.end()) - account = &*itr; - } - FC_ASSERT( account, "no such account" ); - - - /// reuse trx.verify_authority by creating a dummy transfer - signed_transaction trx; - transfer_operation op; - op.from = account->id; - trx.operations.emplace_back(op); - - return verify_authority( trx ); - } - - vector database_api::get_blinded_balances( const flat_set& commitments )const - { - vector result; result.reserve(commitments.size()); - const auto& bal_idx = _db.get_index_type(); - const auto& by_commitment_idx = bal_idx.indices().get(); - for( const auto& c : commitments ) - { - auto itr = by_commitment_idx.find( c ); - if( itr != by_commitment_idx.end() ) - result.push_back( *itr ); - } - return result; - } - - vector database_api::get_required_fees( const vector& ops, asset_id_type id )const - { - vector result; - result.reserve(ops.size()); - const asset_object& a = id(_db); - for( const auto& op : ops ) - result.push_back( _db.current_fee_schedule().calculate_fee( op, a.options.core_exchange_rate ) ); - return result; - } - - optional database_api::get_account_by_name( string name )const - { - const auto& idx = _db.get_index_type().indices().get(); - auto itr = idx.find(name); - if (itr != idx.end()) - return *itr; - return optional(); - } - } } // graphene::app diff --git a/libraries/app/database_api.cpp b/libraries/app/database_api.cpp new file mode 100644 index 00000000..8b55561e --- /dev/null +++ b/libraries/app/database_api.cpp @@ -0,0 +1,1495 @@ + +#include + +#include + +#include + +#include + +namespace graphene { namespace app { + +class database_api_impl; + +class database_api_impl : public std::enable_shared_from_this +{ + public: + database_api_impl( graphene::chain::database& db ); + ~database_api_impl(); + + // Objects + fc::variants get_objects(const vector& ids)const; + + // Subscriptions + void set_subscribe_callback( std::function cb, bool clear_filter ); + void set_pending_transaction_callback( std::function cb ); + void set_block_applied_callback( std::function cb ); + void cancel_all_subscriptions(); + + // Blocks and transactions + optional get_block_header(uint32_t block_num)const; + optional get_block(uint32_t block_num)const; + processed_transaction get_transaction( uint32_t block_num, uint32_t trx_in_block )const; + + // Globals + chain_property_object get_chain_properties()const; + global_property_object get_global_properties()const; + fc::variant_object get_config()const; + chain_id_type get_chain_id()const; + dynamic_global_property_object get_dynamic_global_properties()const; + + // Keys + vector> get_key_references( vector key )const; + + // Accounts + vector> get_accounts(const vector& account_ids)const; + std::map get_full_accounts( const vector& names_or_ids, bool subscribe ); + optional get_account_by_name( string name )const; + vector get_account_references( account_id_type account_id )const; + vector> lookup_account_names(const vector& account_names)const; + map lookup_accounts(const string& lower_bound_name, uint32_t limit)const; + uint64_t get_account_count()const; + + // Balances + vector get_account_balances(account_id_type id, const flat_set& assets)const; + vector get_named_account_balances(const std::string& name, const flat_set& assets)const; + vector get_balance_objects( const vector
& addrs )const; + vector get_vested_balances( const vector& objs )const; + vector get_vesting_balances( account_id_type account_id )const; + + // Assets + vector> get_assets(const vector& asset_ids)const; + vector list_assets(const string& lower_bound_symbol, uint32_t limit)const; + vector> lookup_asset_symbols(const vector& symbols_or_ids)const; + + // Markets / feeds + vector get_limit_orders(asset_id_type a, asset_id_type b, uint32_t limit)const; + vector get_call_orders(asset_id_type a, uint32_t limit)const; + vector get_settle_orders(asset_id_type a, uint32_t limit)const; + vector get_margin_positions( const account_id_type& id )const; + void subscribe_to_market(std::function callback, asset_id_type a, asset_id_type b); + void unsubscribe_from_market(asset_id_type a, asset_id_type b); + + // Witnesses + vector> get_witnesses(const vector& witness_ids)const; + fc::optional get_witness_by_account(account_id_type account)const; + map lookup_witness_accounts(const string& lower_bound_name, uint32_t limit)const; + uint64_t get_witness_count()const; + + // Committee members + vector> get_committee_members(const vector& committee_member_ids)const; + fc::optional get_committee_member_by_account(account_id_type account)const; + map lookup_committee_member_accounts(const string& lower_bound_name, uint32_t limit)const; + + // Votes + vector lookup_vote_ids( const vector& votes )const; + + // Authority / validation + std::string get_transaction_hex(const signed_transaction& trx)const; + set get_required_signatures( const signed_transaction& trx, const flat_set& available_keys )const; + set get_potential_signatures( const signed_transaction& trx )const; + bool verify_authority( const signed_transaction& trx )const; + bool verify_account_authority( const string& name_or_id, const flat_set& signers )const; + processed_transaction validate_transaction( const signed_transaction& trx )const; + vector get_required_fees( const vector& ops, asset_id_type id )const; + + // Proposed transactions + vector get_proposed_transactions( account_id_type id )const; + + // Blinded balances + vector get_blinded_balances( const flat_set& commitments )const; + + private: + template + void subscribe_to_item( const T& i )const + { + auto vec = fc::raw::pack(i); + if( !_subscribe_callback ) + return; + + if( !is_subscribed_to_item(i) ) + { + idump((i)); + _subscribe_filter.insert( vec.data(), vec.size() );//(vecconst char*)&i, sizeof(i) ); + } + } + + template + bool is_subscribed_to_item( const T& i )const + { + if( !_subscribe_callback ) + return false; + return true; + return _subscribe_filter.contains( i ); + } + + void broadcast_updates( const vector& updates ); + + /** called every time a block is applied to report the objects that were changed */ + void on_objects_changed(const vector& ids); + void on_objects_removed(const vector& objs); + void on_applied_block(); + + mutable fc::bloom_filter _subscribe_filter; + std::function _subscribe_callback; + std::function _pending_trx_callback; + std::function _block_applied_callback; + + boost::signals2::scoped_connection _change_connection; + boost::signals2::scoped_connection _removed_connection; + boost::signals2::scoped_connection _applied_block_connection; + boost::signals2::scoped_connection _pending_trx_connection; + map< pair, std::function > _market_subscriptions; + graphene::chain::database& _db; +}; + +////////////////////////////////////////////////////////////////////// +// // +// Constructors // +// // +////////////////////////////////////////////////////////////////////// + +database_api::database_api( graphene::chain::database& db ) + : my( new database_api_impl( db ) ) {} + +database_api::~database_api() {} + +database_api_impl::database_api_impl( graphene::chain::database& db ):_db(db) +{ + wlog("creating database api ${x}", ("x",int64_t(this)) ); + _change_connection = _db.changed_objects.connect([this](const vector& ids) { + on_objects_changed(ids); + }); + _removed_connection = _db.removed_objects.connect([this](const vector& objs) { + on_objects_removed(objs); + }); + _applied_block_connection = _db.applied_block.connect([this](const signed_block&){ on_applied_block(); }); + + _pending_trx_connection = _db.on_pending_transaction.connect([this](const signed_transaction& trx ){ + if( _pending_trx_callback ) _pending_trx_callback( fc::variant(trx) ); + }); +} + +database_api_impl::~database_api_impl() +{ + elog("freeing database api ${x}", ("x",int64_t(this)) ); +} + +////////////////////////////////////////////////////////////////////// +// // +// Objects // +// // +////////////////////////////////////////////////////////////////////// + +fc::variants database_api::get_objects(const vector& ids)const +{ + return my->get_objects( ids ); +} + +fc::variants database_api_impl::get_objects(const vector& ids)const +{ + if( _subscribe_callback ) { + for( auto id : ids ) + { + if( id.type() == operation_history_object_type && id.space() == protocol_ids ) continue; + if( id.type() == impl_account_transaction_history_object_type && id.space() == implementation_ids ) continue; + + this->subscribe_to_item( id ); + } + } + else + { + elog( "getObjects without subscribe callback??" ); + } + + fc::variants result; + result.reserve(ids.size()); + + std::transform(ids.begin(), ids.end(), std::back_inserter(result), + [this](object_id_type id) -> fc::variant { + if(auto obj = _db.find_object(id)) + return obj->to_variant(); + return {}; + }); + + return result; +} + +////////////////////////////////////////////////////////////////////// +// // +// Subscriptions // +// // +////////////////////////////////////////////////////////////////////// + +void database_api::set_subscribe_callback( std::function cb, bool clear_filter ) +{ + my->set_subscribe_callback( cb, clear_filter ); +} + +void database_api_impl::set_subscribe_callback( std::function cb, bool clear_filter ) +{ + edump((clear_filter)); + _subscribe_callback = cb; + if( clear_filter || !cb ) + { + static fc::bloom_parameters param; + param.projected_element_count = 10000; + param.false_positive_probability = 1.0/10000; + param.maximum_size = 1024*8*8*2; + param.compute_optimal_parameters(); + _subscribe_filter = fc::bloom_filter(param); + } +} + +void database_api::set_pending_transaction_callback( std::function cb ) +{ + my->set_pending_transaction_callback( cb ); +} + +void database_api_impl::set_pending_transaction_callback( std::function cb ) +{ + _pending_trx_callback = cb; +} + +void database_api::set_block_applied_callback( std::function cb ) +{ + my->set_block_applied_callback( cb ); +} + +void database_api_impl::set_block_applied_callback( std::function cb ) +{ + _block_applied_callback = cb; +} + +void database_api::cancel_all_subscriptions() +{ + my->cancel_all_subscriptions(); +} + +void database_api_impl::cancel_all_subscriptions() +{ + set_subscribe_callback( std::function(), true); + _market_subscriptions.clear(); +} + +////////////////////////////////////////////////////////////////////// +// // +// Blocks and transactions // +// // +////////////////////////////////////////////////////////////////////// + +optional database_api::get_block_header(uint32_t block_num)const +{ + return my->get_block_header( block_num ); +} + +optional database_api_impl::get_block_header(uint32_t block_num) const +{ + auto result = _db.fetch_block_by_number(block_num); + if(result) + return *result; + return {}; +} + +optional database_api::get_block(uint32_t block_num)const +{ + return my->get_block( block_num ); +} + +optional database_api_impl::get_block(uint32_t block_num)const +{ + return _db.fetch_block_by_number(block_num); +} + +processed_transaction database_api::get_transaction( uint32_t block_num, uint32_t trx_in_block )const +{ + return my->get_transaction( block_num, trx_in_block ); +} + +processed_transaction database_api_impl::get_transaction(uint32_t block_num, uint32_t trx_num)const +{ + auto opt_block = _db.fetch_block_by_number(block_num); + FC_ASSERT( opt_block ); + FC_ASSERT( opt_block->transactions.size() > trx_num ); + return opt_block->transactions[trx_num]; +} + +////////////////////////////////////////////////////////////////////// +// // +// Globals // +// // +////////////////////////////////////////////////////////////////////// + +chain_property_object database_api::get_chain_properties()const +{ + return my->get_chain_properties(); +} + +chain_property_object database_api_impl::get_chain_properties()const +{ + return _db.get(chain_property_id_type()); +} + +global_property_object database_api::get_global_properties()const +{ + return my->get_global_properties(); +} + +global_property_object database_api_impl::get_global_properties()const +{ + return _db.get(global_property_id_type()); +} + +fc::variant_object database_api::get_config()const +{ + return my->get_config(); +} + +fc::variant_object database_api_impl::get_config()const +{ + return get_config(); +} + +chain_id_type database_api::get_chain_id()const +{ + return my->get_chain_id(); +} + +chain_id_type database_api_impl::get_chain_id()const +{ + return _db.get_chain_id(); +} + +dynamic_global_property_object database_api::get_dynamic_global_properties()const +{ + return my->get_dynamic_global_properties(); +} + +dynamic_global_property_object database_api_impl::get_dynamic_global_properties()const +{ + return _db.get(dynamic_global_property_id_type()); +} + +////////////////////////////////////////////////////////////////////// +// // +// Keys // +// // +////////////////////////////////////////////////////////////////////// + +vector> database_api::get_key_references( vector key )const +{ + return my->get_key_references( key ); +} + +/** + * @return all accounts that referr to the key or account id in their owner or active authorities. + */ +vector> database_api_impl::get_key_references( vector keys )const +{ + wdump( (keys) ); + vector< vector > final_result; + final_result.reserve(keys.size()); + + for( auto& key : keys ) + { + + address a1( pts_address(key, false, 56) ); + address a2( pts_address(key, true, 56) ); + address a3( pts_address(key, false, 0) ); + address a4( pts_address(key, true, 0) ); + address a5( key ); + + subscribe_to_item( key ); + subscribe_to_item( a1 ); + subscribe_to_item( a2 ); + subscribe_to_item( a3 ); + subscribe_to_item( a4 ); + subscribe_to_item( a5 ); + + const auto& idx = _db.get_index_type(); + const auto& aidx = dynamic_cast&>(idx); + const auto& refs = aidx.get_secondary_index(); + auto itr = refs.account_to_key_memberships.find(key); + vector result; + + for( auto& a : {a1,a2,a3,a4,a5} ) + { + auto itr = refs.account_to_address_memberships.find(a); + if( itr != refs.account_to_address_memberships.end() ) + { + result.reserve( itr->second.size() ); + for( auto item : itr->second ) + { + wdump((a)(item)(item(_db).name)); + result.push_back(item); + } + } + } + + if( itr != refs.account_to_key_memberships.end() ) + { + result.reserve( itr->second.size() ); + for( auto item : itr->second ) result.push_back(item); + } + final_result.emplace_back( std::move(result) ); + } + + for( auto i : final_result ) + subscribe_to_item(i); + + return final_result; +} + +////////////////////////////////////////////////////////////////////// +// // +// Accounts // +// // +////////////////////////////////////////////////////////////////////// + +vector> database_api::get_accounts(const vector& account_ids)const +{ + return my->get_accounts( account_ids ); +} + +vector> database_api_impl::get_accounts(const vector& account_ids)const +{ + vector> result; result.reserve(account_ids.size()); + std::transform(account_ids.begin(), account_ids.end(), std::back_inserter(result), + [this](account_id_type id) -> optional { + if(auto o = _db.find(id)) + { + subscribe_to_item( id ); + return *o; + } + return {}; + }); + return result; +} + +std::map database_api::get_full_accounts( const vector& names_or_ids, bool subscribe ) +{ + return my->get_full_accounts( names_or_ids, subscribe ); +} + +std::map database_api_impl::get_full_accounts( const vector& names_or_ids, bool subscribe) +{ + idump((names_or_ids)); + std::map results; + + for (const std::string& account_name_or_id : names_or_ids) + { + const account_object* account = nullptr; + if (std::isdigit(account_name_or_id[0])) + account = _db.find(fc::variant(account_name_or_id).as()); + else + { + const auto& idx = _db.get_index_type().indices().get(); + auto itr = idx.find(account_name_or_id); + if (itr != idx.end()) + account = &*itr; + } + if (account == nullptr) + continue; + + if( subscribe ) + { + ilog( "subscribe to ${id}", ("id",account->name) ); + subscribe_to_item( account->id ); + } + + // fc::mutable_variant_object full_account; + full_account acnt; + acnt.account = *account; + acnt.statistics = account->statistics(_db); + acnt.registrar_name = account->registrar(_db).name; + acnt.referrer_name = account->referrer(_db).name; + acnt.lifetime_referrer_name = account->lifetime_referrer(_db).name; + acnt.votes = lookup_vote_ids( vector(account->options.votes.begin(),account->options.votes.end()) ); + + // Add the account itself, its statistics object, cashback balance, and referral account names + /* + full_account("account", *account)("statistics", account->statistics(_db)) + ("registrar_name", account->registrar(_db).name)("referrer_name", account->referrer(_db).name) + ("lifetime_referrer_name", account->lifetime_referrer(_db).name); + */ + if (account->cashback_vb) + { + acnt.cashback_balance = account->cashback_balance(_db); + } + // Add the account's proposals + const auto& proposal_idx = _db.get_index_type(); + const auto& pidx = dynamic_cast&>(proposal_idx); + const auto& proposals_by_account = pidx.get_secondary_index(); + auto required_approvals_itr = proposals_by_account._account_to_proposals.find( account->id ); + if( required_approvals_itr != proposals_by_account._account_to_proposals.end() ) + { + acnt.proposals.reserve( required_approvals_itr->second.size() ); + for( auto proposal_id : required_approvals_itr->second ) + acnt.proposals.push_back( proposal_id(_db) ); + } + + + // Add the account's balances + auto balance_range = _db.get_index_type().indices().get().equal_range(account->id); + //vector balances; + std::for_each(balance_range.first, balance_range.second, + [&acnt](const account_balance_object& balance) { + acnt.balances.emplace_back(balance); + }); + + // Add the account's vesting balances + auto vesting_range = _db.get_index_type().indices().get().equal_range(account->id); + std::for_each(vesting_range.first, vesting_range.second, + [&acnt](const vesting_balance_object& balance) { + acnt.vesting_balances.emplace_back(balance); + }); + + // Add the account's orders + auto order_range = _db.get_index_type().indices().get().equal_range(account->id); + std::for_each(order_range.first, order_range.second, + [&acnt] (const limit_order_object& order) { + acnt.limit_orders.emplace_back(order); + }); + auto call_range = _db.get_index_type().indices().get().equal_range(account->id); + std::for_each(call_range.first, call_range.second, + [&acnt] (const call_order_object& call) { + acnt.call_orders.emplace_back(call); + }); + results[account_name_or_id] = acnt; + } + return results; +} + +optional database_api::get_account_by_name( string name )const +{ + return my->get_account_by_name( name ); +} + +optional database_api_impl::get_account_by_name( string name )const +{ + const auto& idx = _db.get_index_type().indices().get(); + auto itr = idx.find(name); + if (itr != idx.end()) + return *itr; + return optional(); +} + +vector database_api::get_account_references( account_id_type account_id )const +{ + return my->get_account_references( account_id ); +} + +vector database_api_impl::get_account_references( account_id_type account_id )const +{ + const auto& idx = _db.get_index_type(); + const auto& aidx = dynamic_cast&>(idx); + const auto& refs = aidx.get_secondary_index(); + auto itr = refs.account_to_account_memberships.find(account_id); + vector result; + + if( itr != refs.account_to_account_memberships.end() ) + { + result.reserve( itr->second.size() ); + for( auto item : itr->second ) result.push_back(item); + } + return result; +} + +vector> database_api::lookup_account_names(const vector& account_names)const +{ + return my->lookup_account_names( account_names ); +} + +vector> database_api_impl::lookup_account_names(const vector& account_names)const +{ + const auto& accounts_by_name = _db.get_index_type().indices().get(); + vector > result; + result.reserve(account_names.size()); + std::transform(account_names.begin(), account_names.end(), std::back_inserter(result), + [&accounts_by_name](const string& name) -> optional { + auto itr = accounts_by_name.find(name); + return itr == accounts_by_name.end()? optional() : *itr; + }); + return result; +} + +map database_api::lookup_accounts(const string& lower_bound_name, uint32_t limit)const +{ + return my->lookup_accounts( lower_bound_name, limit ); +} + +map database_api_impl::lookup_accounts(const string& lower_bound_name, uint32_t limit)const +{ + FC_ASSERT( limit <= 1000 ); + const auto& accounts_by_name = _db.get_index_type().indices().get(); + map result; + + for( auto itr = accounts_by_name.lower_bound(lower_bound_name); + limit-- && itr != accounts_by_name.end(); + ++itr ) + { + result.insert(make_pair(itr->name, itr->get_id())); + if( limit == 1 ) + subscribe_to_item( itr->get_id() ); + } + + return result; +} + +uint64_t database_api::get_account_count()const +{ + return my->get_account_count(); +} + +uint64_t database_api_impl::get_account_count()const +{ + return _db.get_index_type().indices().size(); +} + +////////////////////////////////////////////////////////////////////// +// // +// Balances // +// // +////////////////////////////////////////////////////////////////////// + +vector database_api::get_account_balances(account_id_type id, const flat_set& assets)const +{ + return my->get_account_balances( id, assets ); +} + +vector database_api_impl::get_account_balances(account_id_type acnt, const flat_set& assets)const +{ + vector result; + if (assets.empty()) + { + // if the caller passes in an empty list of assets, return balances for all assets the account owns + const account_balance_index& balance_index = _db.get_index_type(); + auto range = balance_index.indices().get().equal_range(acnt); + for (const account_balance_object& balance : boost::make_iterator_range(range.first, range.second)) + result.push_back(asset(balance.get_balance())); + } + else + { + result.reserve(assets.size()); + + std::transform(assets.begin(), assets.end(), std::back_inserter(result), + [this, acnt](asset_id_type id) { return _db.get_balance(acnt, id); }); + } + + return result; +} + +vector database_api::get_named_account_balances(const std::string& name, const flat_set& assets)const +{ + return my->get_named_account_balances( name, assets ); +} + +vector database_api_impl::get_named_account_balances(const std::string& name, const flat_set& assets) const +{ + const auto& accounts_by_name = _db.get_index_type().indices().get(); + auto itr = accounts_by_name.find(name); + FC_ASSERT( itr != accounts_by_name.end() ); + return get_account_balances(itr->get_id(), assets); +} + +vector database_api::get_balance_objects( const vector
& addrs )const +{ + return my->get_balance_objects( addrs ); +} + +vector database_api_impl::get_balance_objects( const vector
& addrs )const +{ + try + { + const auto& bal_idx = _db.get_index_type(); + const auto& by_owner_idx = bal_idx.indices().get(); + + vector result; + + for( const auto& owner : addrs ) + { + subscribe_to_item( owner ); + auto itr = by_owner_idx.lower_bound( boost::make_tuple( owner, asset_id_type(0) ) ); + while( itr != by_owner_idx.end() && itr->owner == owner ) + { + result.push_back( *itr ); + ++itr; + } + } + return result; + } + FC_CAPTURE_AND_RETHROW( (addrs) ) +} + +vector database_api::get_vested_balances( const vector& objs )const +{ + return my->get_vested_balances( objs ); +} + +vector database_api_impl::get_vested_balances( const vector& objs )const +{ + try + { + vector result; + result.reserve( objs.size() ); + auto now = _db.head_block_time(); + for( auto obj : objs ) + result.push_back( obj(_db).available( now ) ); + return result; + } FC_CAPTURE_AND_RETHROW( (objs) ) +} + +vector database_api::get_vesting_balances( account_id_type account_id )const +{ + return my->get_vesting_balances( account_id ); +} + +vector database_api_impl::get_vesting_balances( account_id_type account_id )const +{ + try + { + vector result; + auto vesting_range = _db.get_index_type().indices().get().equal_range(account_id); + std::for_each(vesting_range.first, vesting_range.second, + [&result](const vesting_balance_object& balance) { + result.emplace_back(balance); + }); + return result; + } + FC_CAPTURE_AND_RETHROW( (account_id) ); +} + +////////////////////////////////////////////////////////////////////// +// // +// Assets // +// // +////////////////////////////////////////////////////////////////////// + +vector> database_api::get_assets(const vector& asset_ids)const +{ + return my->get_assets( asset_ids ); +} + +vector> database_api_impl::get_assets(const vector& asset_ids)const +{ + vector> result; result.reserve(asset_ids.size()); + std::transform(asset_ids.begin(), asset_ids.end(), std::back_inserter(result), + [this](asset_id_type id) -> optional { + if(auto o = _db.find(id)) + { + subscribe_to_item( id ); + return *o; + } + return {}; + }); + return result; +} + +vector database_api::list_assets(const string& lower_bound_symbol, uint32_t limit)const +{ + return my->list_assets( lower_bound_symbol, limit ); +} + +vector database_api_impl::list_assets(const string& lower_bound_symbol, uint32_t limit)const +{ + FC_ASSERT( limit <= 100 ); + const auto& assets_by_symbol = _db.get_index_type().indices().get(); + vector result; + result.reserve(limit); + + auto itr = assets_by_symbol.lower_bound(lower_bound_symbol); + + if( lower_bound_symbol == "" ) + itr = assets_by_symbol.begin(); + + while(limit-- && itr != assets_by_symbol.end()) + result.emplace_back(*itr++); + + return result; +} + +vector> database_api::lookup_asset_symbols(const vector& symbols_or_ids)const +{ + return my->lookup_asset_symbols( symbols_or_ids ); +} + +vector> database_api_impl::lookup_asset_symbols(const vector& symbols_or_ids)const +{ + const auto& assets_by_symbol = _db.get_index_type().indices().get(); + vector > result; + result.reserve(symbols_or_ids.size()); + std::transform(symbols_or_ids.begin(), symbols_or_ids.end(), std::back_inserter(result), + [this, &assets_by_symbol](const string& symbol_or_id) -> optional { + if( !symbol_or_id.empty() && std::isdigit(symbol_or_id[0]) ) + { + auto ptr = _db.find(variant(symbol_or_id).as()); + return ptr == nullptr? optional() : *ptr; + } + auto itr = assets_by_symbol.find(symbol_or_id); + return itr == assets_by_symbol.end()? optional() : *itr; + }); + return result; +} + +////////////////////////////////////////////////////////////////////// +// // +// Markets / feeds // +// // +////////////////////////////////////////////////////////////////////// + +vector database_api::get_limit_orders(asset_id_type a, asset_id_type b, uint32_t limit)const +{ + return my->get_limit_orders( a, b, limit ); +} + +/** + * @return the limit orders for both sides of the book for the two assets specified up to limit number on each side. + */ +vector database_api_impl::get_limit_orders(asset_id_type a, asset_id_type b, uint32_t limit)const +{ + const auto& limit_order_idx = _db.get_index_type(); + const auto& limit_price_idx = limit_order_idx.indices().get(); + + vector result; + + uint32_t count = 0; + auto limit_itr = limit_price_idx.lower_bound(price::max(a,b)); + auto limit_end = limit_price_idx.upper_bound(price::min(a,b)); + while(limit_itr != limit_end && count < limit) + { + result.push_back(*limit_itr); + ++limit_itr; + ++count; + } + count = 0; + limit_itr = limit_price_idx.lower_bound(price::max(b,a)); + limit_end = limit_price_idx.upper_bound(price::min(b,a)); + while(limit_itr != limit_end && count < limit) + { + result.push_back(*limit_itr); + ++limit_itr; + ++count; + } + + return result; +} + +vector database_api::get_call_orders(asset_id_type a, uint32_t limit)const +{ + return my->get_call_orders( a, limit ); +} + +vector database_api_impl::get_call_orders(asset_id_type a, uint32_t limit)const +{ + const auto& call_index = _db.get_index_type().indices().get(); + const asset_object& mia = _db.get(a); + price index_price = price::min(mia.bitasset_data(_db).options.short_backing_asset, mia.get_id()); + + return vector(call_index.lower_bound(index_price.min()), + call_index.lower_bound(index_price.max())); +} + +vector database_api::get_settle_orders(asset_id_type a, uint32_t limit)const +{ + return my->get_settle_orders( a, limit ); +} + +vector database_api_impl::get_settle_orders(asset_id_type a, uint32_t limit)const +{ + const auto& settle_index = _db.get_index_type().indices().get(); + const asset_object& mia = _db.get(a); + return vector(settle_index.lower_bound(mia.get_id()), + settle_index.upper_bound(mia.get_id())); +} + +vector database_api::get_margin_positions( const account_id_type& id )const +{ + return my->get_margin_positions( id ); +} + +vector database_api_impl::get_margin_positions( const account_id_type& id )const +{ + try + { + const auto& idx = _db.get_index_type(); + const auto& aidx = idx.indices().get(); + auto start = aidx.lower_bound( boost::make_tuple( id, 0 ) ); + auto end = aidx.lower_bound( boost::make_tuple( id+1, 0 ) ); + vector result; + while( start != end ) + { + result.push_back(*start); + ++start; + } + return result; + } FC_CAPTURE_AND_RETHROW( (id) ) +} + +void database_api::subscribe_to_market(std::function callback, asset_id_type a, asset_id_type b) +{ + my->subscribe_to_market( callback, a, b ); +} + +void database_api_impl::subscribe_to_market(std::function callback, asset_id_type a, asset_id_type b) +{ + if(a > b) std::swap(a,b); + FC_ASSERT(a != b); + _market_subscriptions[ std::make_pair(a,b) ] = callback; +} + +void database_api::unsubscribe_from_market(asset_id_type a, asset_id_type b) +{ + my->unsubscribe_from_market( a, b ); +} + +void database_api_impl::unsubscribe_from_market(asset_id_type a, asset_id_type b) +{ + if(a > b) std::swap(a,b); + FC_ASSERT(a != b); + _market_subscriptions.erase(std::make_pair(a,b)); +} + +////////////////////////////////////////////////////////////////////// +// // +// Witnesses // +// // +////////////////////////////////////////////////////////////////////// + +vector> database_api::get_witnesses(const vector& witness_ids)const +{ + return my->get_witnesses( witness_ids ); +} + +vector> database_api_impl::get_witnesses(const vector& witness_ids)const +{ + vector> result; result.reserve(witness_ids.size()); + std::transform(witness_ids.begin(), witness_ids.end(), std::back_inserter(result), + [this](witness_id_type id) -> optional { + if(auto o = _db.find(id)) + return *o; + return {}; + }); + return result; +} + +fc::optional database_api::get_witness_by_account(account_id_type account)const +{ + return my->get_witness_by_account( account ); +} + +fc::optional database_api_impl::get_witness_by_account(account_id_type account) const +{ + const auto& idx = _db.get_index_type().indices().get(); + auto itr = idx.find(account); + if( itr != idx.end() ) + return *itr; + return {}; +} + +map database_api::lookup_witness_accounts(const string& lower_bound_name, uint32_t limit)const +{ + return my->lookup_witness_accounts( lower_bound_name, limit ); +} + +map database_api_impl::lookup_witness_accounts(const string& lower_bound_name, uint32_t limit)const +{ + FC_ASSERT( limit <= 1000 ); + const auto& witnesses_by_id = _db.get_index_type().indices().get(); + + // we want to order witnesses by account name, but that name is in the account object + // so the witness_index doesn't have a quick way to access it. + // get all the names and look them all up, sort them, then figure out what + // records to return. This could be optimized, but we expect the + // number of witnesses to be few and the frequency of calls to be rare + std::map witnesses_by_account_name; + for (const witness_object& witness : witnesses_by_id) + if (auto account_iter = _db.find(witness.witness_account)) + if (account_iter->name >= lower_bound_name) // we can ignore anything below lower_bound_name + witnesses_by_account_name.insert(std::make_pair(account_iter->name, witness.id)); + + auto end_iter = witnesses_by_account_name.begin(); + while (end_iter != witnesses_by_account_name.end() && limit--) + ++end_iter; + witnesses_by_account_name.erase(end_iter, witnesses_by_account_name.end()); + return witnesses_by_account_name; +} + +uint64_t database_api::get_witness_count()const +{ + return my->get_witness_count(); +} + +uint64_t database_api_impl::get_witness_count()const +{ + return _db.get_index_type().indices().size(); +} + +////////////////////////////////////////////////////////////////////// +// // +// Committee members // +// // +////////////////////////////////////////////////////////////////////// + +vector> database_api::get_committee_members(const vector& committee_member_ids)const +{ + return my->get_committee_members( committee_member_ids ); +} + +vector> database_api_impl::get_committee_members(const vector& committee_member_ids)const +{ + vector> result; result.reserve(committee_member_ids.size()); + std::transform(committee_member_ids.begin(), committee_member_ids.end(), std::back_inserter(result), + [this](committee_member_id_type id) -> optional { + if(auto o = _db.find(id)) + return *o; + return {}; + }); + return result; +} + +fc::optional database_api::get_committee_member_by_account(account_id_type account)const +{ + return my->get_committee_member_by_account( account ); +} + +fc::optional database_api_impl::get_committee_member_by_account(account_id_type account) const +{ + const auto& idx = _db.get_index_type().indices().get(); + auto itr = idx.find(account); + if( itr != idx.end() ) + return *itr; + return {}; +} + +map database_api::lookup_committee_member_accounts(const string& lower_bound_name, uint32_t limit)const +{ + return my->lookup_committee_member_accounts( lower_bound_name, limit ); +} + +map database_api_impl::lookup_committee_member_accounts(const string& lower_bound_name, uint32_t limit)const +{ + FC_ASSERT( limit <= 1000 ); + const auto& committee_members_by_id = _db.get_index_type().indices().get(); + + // we want to order committee_members by account name, but that name is in the account object + // so the committee_member_index doesn't have a quick way to access it. + // get all the names and look them all up, sort them, then figure out what + // records to return. This could be optimized, but we expect the + // number of committee_members to be few and the frequency of calls to be rare + std::map committee_members_by_account_name; + for (const committee_member_object& committee_member : committee_members_by_id) + if (auto account_iter = _db.find(committee_member.committee_member_account)) + if (account_iter->name >= lower_bound_name) // we can ignore anything below lower_bound_name + committee_members_by_account_name.insert(std::make_pair(account_iter->name, committee_member.id)); + + auto end_iter = committee_members_by_account_name.begin(); + while (end_iter != committee_members_by_account_name.end() && limit--) + ++end_iter; + committee_members_by_account_name.erase(end_iter, committee_members_by_account_name.end()); + return committee_members_by_account_name; +} + +////////////////////////////////////////////////////////////////////// +// // +// Votes // +// // +////////////////////////////////////////////////////////////////////// + +vector database_api::lookup_vote_ids( const vector& votes )const +{ + return my->lookup_vote_ids( votes ); +} + +vector database_api_impl::lookup_vote_ids( const vector& votes )const +{ + FC_ASSERT( votes.size() < 100, "Only 100 votes can be queried at a time" ); + + const auto& witness_idx = _db.get_index_type().indices().get(); + const auto& committee_idx = _db.get_index_type().indices().get(); + + vector result; + result.reserve( votes.size() ); + for( auto id : votes ) + { + switch( id.type() ) + { + case vote_id_type::committee: + { + auto itr = committee_idx.find( id ); + if( itr != committee_idx.end() ) + result.emplace_back( variant( *itr ) ); + else + result.emplace_back( variant() ); + break; + } + case vote_id_type::witness: + { + auto itr = witness_idx.find( id ); + if( itr != witness_idx.end() ) + result.emplace_back( variant( *itr ) ); + else + result.emplace_back( variant() ); + break; + } + case vote_id_type::worker: + break; + case vote_id_type::VOTE_TYPE_COUNT: break; // supress unused enum value warnings + } + } + return result; +} + +////////////////////////////////////////////////////////////////////// +// // +// Authority / validation // +// // +////////////////////////////////////////////////////////////////////// + +std::string database_api::get_transaction_hex(const signed_transaction& trx)const +{ + return my->get_transaction_hex( trx ); +} + +std::string database_api_impl::get_transaction_hex(const signed_transaction& trx)const +{ + return fc::to_hex(fc::raw::pack(trx)); +} + +set database_api::get_required_signatures( const signed_transaction& trx, const flat_set& available_keys )const +{ + return my->get_required_signatures( trx, available_keys ); +} + +set database_api_impl::get_required_signatures( const signed_transaction& trx, const flat_set& available_keys )const +{ + wdump((trx)(available_keys)); + auto result = trx.get_required_signatures( _db.get_chain_id(), + available_keys, + [&]( account_id_type id ){ return &id(_db).active; }, + [&]( account_id_type id ){ return &id(_db).owner; }, + _db.get_global_properties().parameters.max_authority_depth ); + wdump((result)); + return result; +} + +set database_api::get_potential_signatures( const signed_transaction& trx )const +{ + return my->get_potential_signatures( trx ); +} + +set database_api_impl::get_potential_signatures( const signed_transaction& trx )const +{ + wdump((trx)); + set result; + trx.get_required_signatures( + _db.get_chain_id(), + flat_set(), + [&]( account_id_type id ) + { + const auto& auth = id(_db).active; + for( const auto& k : auth.get_keys() ) + result.insert(k); + return &auth; + }, + [&]( account_id_type id ) + { + const auto& auth = id(_db).owner; + for( const auto& k : auth.get_keys() ) + result.insert(k); + return &auth; + }, + _db.get_global_properties().parameters.max_authority_depth + ); + + wdump((result)); + return result; +} + +bool database_api::verify_authority( const signed_transaction& trx )const +{ + return my->verify_authority( trx ); +} + +bool database_api_impl::verify_authority( const signed_transaction& trx )const +{ + trx.verify_authority( _db.get_chain_id(), + [&]( account_id_type id ){ return &id(_db).active; }, + [&]( account_id_type id ){ return &id(_db).owner; }, + _db.get_global_properties().parameters.max_authority_depth ); + return true; +} + +bool database_api::verify_account_authority( const string& name_or_id, const flat_set& signers )const +{ + return my->verify_account_authority( name_or_id, signers ); +} + +bool database_api_impl::verify_account_authority( const string& name_or_id, const flat_set& keys )const +{ + FC_ASSERT( name_or_id.size() > 0); + const account_object* account = nullptr; + if (std::isdigit(name_or_id[0])) + account = _db.find(fc::variant(name_or_id).as()); + else + { + const auto& idx = _db.get_index_type().indices().get(); + auto itr = idx.find(name_or_id); + if (itr != idx.end()) + account = &*itr; + } + FC_ASSERT( account, "no such account" ); + + + /// reuse trx.verify_authority by creating a dummy transfer + signed_transaction trx; + transfer_operation op; + op.from = account->id; + trx.operations.emplace_back(op); + + return verify_authority( trx ); +} + +processed_transaction database_api::validate_transaction( const signed_transaction& trx )const +{ + return my->validate_transaction( trx ); +} + +processed_transaction database_api_impl::validate_transaction( const signed_transaction& trx )const +{ + return _db.validate_transaction(trx); +} + +vector database_api::get_required_fees( const vector& ops, asset_id_type id )const +{ + return my->get_required_fees( ops, id ); +} + +vector database_api_impl::get_required_fees( const vector& ops, asset_id_type id )const +{ + vector result; + result.reserve(ops.size()); + const asset_object& a = id(_db); + for( const auto& op : ops ) + result.push_back( _db.current_fee_schedule().calculate_fee( op, a.options.core_exchange_rate ) ); + return result; +} + +////////////////////////////////////////////////////////////////////// +// // +// Proposed transactions // +// // +////////////////////////////////////////////////////////////////////// + +vector database_api::get_proposed_transactions( account_id_type id )const +{ + return my->get_proposed_transactions( id ); +} + +/** TODO: add secondary index that will accelerate this process */ +vector database_api_impl::get_proposed_transactions( account_id_type id )const +{ + const auto& idx = _db.get_index_type(); + vector result; + + idx.inspect_all_objects( [&](const object& obj){ + const proposal_object& p = static_cast(obj); + if( p.required_active_approvals.find( id ) != p.required_active_approvals.end() ) + result.push_back(p); + else if ( p.required_owner_approvals.find( id ) != p.required_owner_approvals.end() ) + result.push_back(p); + else if ( p.available_active_approvals.find( id ) != p.available_active_approvals.end() ) + result.push_back(p); + }); + return result; +} + +////////////////////////////////////////////////////////////////////// +// // +// Blinded balances // +// // +////////////////////////////////////////////////////////////////////// + +vector database_api::get_blinded_balances( const flat_set& commitments )const +{ + return my->get_blinded_balances( commitments ); +} + +vector database_api_impl::get_blinded_balances( const flat_set& commitments )const +{ + vector result; result.reserve(commitments.size()); + const auto& bal_idx = _db.get_index_type(); + const auto& by_commitment_idx = bal_idx.indices().get(); + for( const auto& c : commitments ) + { + auto itr = by_commitment_idx.find( c ); + if( itr != by_commitment_idx.end() ) + result.push_back( *itr ); + } + return result; +} + +////////////////////////////////////////////////////////////////////// +// // +// Private methods // +// // +////////////////////////////////////////////////////////////////////// + +void database_api_impl::broadcast_updates( const vector& updates ) +{ + if( updates.size() ) { + auto capture_this = shared_from_this(); + fc::async([capture_this,updates](){ + capture_this->_subscribe_callback( fc::variant(updates) ); + }); + } +} + +void database_api_impl::on_objects_removed( const vector& objs ) +{ + /// we need to ensure the database_api is not deleted for the life of the async operation + if( _subscribe_callback ) + { + vector updates; + updates.reserve(objs.size()); + + for( auto obj : objs ) + updates.emplace_back( obj->id ); + broadcast_updates( updates ); + } + + if( _market_subscriptions.size() ) + { + map< pair, vector > broadcast_queue; + for( const auto& obj : objs ) + { + const limit_order_object* order = dynamic_cast(obj); + if( order ) + { + auto sub = _market_subscriptions.find( order->get_market() ); + if( sub != _market_subscriptions.end() ) + broadcast_queue[order->get_market()].emplace_back( order->id ); + } + } + if( broadcast_queue.size() ) + { + auto capture_this = shared_from_this(); + fc::async([capture_this,this,broadcast_queue](){ + for( const auto& item : broadcast_queue ) + { + auto sub = _market_subscriptions.find(item.first); + if( sub != _market_subscriptions.end() ) + sub->second( fc::variant(item.second ) ); + } + }); + } + } +} + +void database_api_impl::on_objects_changed(const vector& ids) +{ + vector updates; + map< pair, vector > market_broadcast_queue; + + for(auto id : ids) + { + const object* obj = nullptr; + if( _subscribe_callback ) + { + obj = _db.find_object( id ); + if( obj ) + { + updates.emplace_back( obj->to_variant() ); + } + else + { + updates.emplace_back(id); // send just the id to indicate removal + } + } + + if( _market_subscriptions.size() ) + { + if( !_subscribe_callback ) + obj = _db.find_object( id ); + if( obj ) + { + const limit_order_object* order = dynamic_cast(obj); + if( order ) + { + auto sub = _market_subscriptions.find( order->get_market() ); + if( sub != _market_subscriptions.end() ) + market_broadcast_queue[order->get_market()].emplace_back( order->id ); + } + } + } + } + + auto capture_this = shared_from_this(); + + /// pushing the future back / popping the prior future if it is complete. + /// if a connection hangs then this could get backed up and result in + /// a failure to exit cleanly. + fc::async([capture_this,this,updates,market_broadcast_queue](){ + if( _subscribe_callback ) _subscribe_callback( updates ); + + for( const auto& item : market_broadcast_queue ) + { + auto sub = _market_subscriptions.find(item.first); + if( sub != _market_subscriptions.end() ) + sub->second( fc::variant(item.second ) ); + } + }); +} + +/** note: this method cannot yield because it is called in the middle of + * apply a block. + */ +void database_api_impl::on_applied_block() +{ + if (_block_applied_callback) + { + auto capture_this = shared_from_this(); + block_id_type block_id = _db.head_block_id(); + fc::async([this,capture_this,block_id](){ + _block_applied_callback(fc::variant(block_id)); + }); + } + + if(_market_subscriptions.size() == 0) + return; + + const auto& ops = _db.get_applied_operations(); + map< std::pair, vector> > subscribed_markets_ops; + for(const auto& op : ops) + { + std::pair market; + switch(op.op.which()) + { + /* This is sent via the object_changed callback + case operation::tag::value: + market = op.op.get().get_market(); + break; + */ + case operation::tag::value: + market = op.op.get().get_market(); + break; + /* + case operation::tag::value: + */ + default: break; + } + if(_market_subscriptions.count(market)) + subscribed_markets_ops[market].push_back(std::make_pair(op.op, op.result)); + } + /// we need to ensure the database_api is not deleted for the life of the async operation + auto capture_this = shared_from_this(); + fc::async([this,capture_this,subscribed_markets_ops](){ + for(auto item : subscribed_markets_ops) + { + auto itr = _market_subscriptions.find(item.first); + if(itr != _market_subscriptions.end()) + itr->second(fc::variant(item.second)); + } + }); +} + +} } // graphene::app diff --git a/libraries/app/include/graphene/app/api.hpp b/libraries/app/include/graphene/app/api.hpp index 8a94706f..c29be561 100644 --- a/libraries/app/include/graphene/app/api.hpp +++ b/libraries/app/include/graphene/app/api.hpp @@ -17,398 +17,32 @@ */ #pragma once -#include +#include #include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - #include #include #include -#include +#include +#include + +#include + +#include +#include +#include +#include namespace graphene { namespace app { using namespace graphene::chain; using namespace graphene::market_history; + using namespace std; class application; - /** - * @brief The database_api class implements the RPC API for the chain database. - * - * This API exposes accessors on the database which query state tracked by a blockchain validating node. This API is - * read-only; all modifications to the database must be performed via transactions. Transactions are broadcast via - * the @ref network_broadcast_api. - */ - class database_api : public std::enable_shared_from_this - { - public: - database_api(graphene::chain::database& db); - ~database_api(); - /** - * @brief Get the objects corresponding to the provided IDs - * @param ids IDs of the objects to retrieve - * @return The objects retrieved, in the order they are mentioned in ids - * - * If any of the provided IDs does not map to an object, a null variant is returned in its position. - */ - fc::variants get_objects(const vector& ids)const; - /** - * @brief Retrieve a block header - * @param block_num Height of the block whose header should be returned - * @return header of the referenced block, or null if no matching block was found - */ - optional get_block_header(uint32_t block_num)const; - /** - * @brief Retrieve a full, signed block - * @param block_num Height of the block to be returned - * @return the referenced block, or null if no matching block was found - */ - optional get_block(uint32_t block_num)const; - - /** - * @brief used to fetch an individual transaction. - */ - processed_transaction get_transaction( uint32_t block_num, uint32_t trx_in_block )const; - - /** - * @brief Retrieve the @ref chain_property_object associated with the chain - */ - chain_property_object get_chain_properties()const; - - /** - * @brief Retrieve the current @ref global_property_object - */ - global_property_object get_global_properties()const; - - /** - * @brief Retrieve compile-time constants - */ - fc::variant_object get_config()const; - - /** - * @brief Get the chain ID - */ - chain_id_type get_chain_id()const; - - /** - * @brief Retrieve the current @ref dynamic_global_property_object - */ - dynamic_global_property_object get_dynamic_global_properties()const; - /** - * @brief Get a list of accounts by ID - * @param account_ids IDs of the accounts to retrieve - * @return The accounts corresponding to the provided IDs - * - * This function has semantics identical to @ref get_objects - */ - vector> get_accounts(const vector& account_ids)const; - /** - * @brief Get a list of assets by ID - * @param asset_ids IDs of the assets to retrieve - * @return The assets corresponding to the provided IDs - * - * This function has semantics identical to @ref get_objects - */ - vector> get_assets(const vector& asset_ids)const; - /** - * @brief Get a list of accounts by name - * @param account_names Names of the accounts to retrieve - * @return The accounts holding the provided names - * - * This function has semantics identical to @ref get_objects - */ - vector> lookup_account_names(const vector& account_names)const; - optional get_account_by_name( string name )const; - - /** - * @brief Get a list of assets by symbol - * @param asset_symbols Symbols or stringified IDs of the assets to retrieve - * @return The assets corresponding to the provided symbols or IDs - * - * This function has semantics identical to @ref get_objects - */ - vector> lookup_asset_symbols(const vector& symbols_or_ids)const; - - /** - * @brief Get an account's balances in various assets - * @param id ID of the account to get balances for - * @param assets IDs of the assets to get balances of; if empty, get all assets account has a balance in - * @return Balances of the account - */ - vector get_account_balances(account_id_type id, const flat_set& assets)const; - /// Semantically equivalent to @ref get_account_balances, but takes a name instead of an ID. - vector get_named_account_balances(const std::string& name, const flat_set& assets)const; - /** - * @brief Get the total number of accounts registered with the blockchain - */ - uint64_t get_account_count()const; - /** - * @brief Get names and IDs for registered accounts - * @param lower_bound_name Lower bound of the first name to return - * @param limit Maximum number of results to return -- must not exceed 1000 - * @return Map of account names to corresponding IDs - */ - map lookup_accounts(const string& lower_bound_name, uint32_t limit)const; - - /** - * @brief Fetch all objects relevant to the specified accounts and subscribe to updates - * @param callback Function to call with updates - * @param names_or_ids Each item must be the name or ID of an account to retrieve - * @return Map of string from @ref names_or_ids to the corresponding account - * - * This function fetches all relevant objects for the given accounts, and subscribes to updates to the given - * accounts. If any of the strings in @ref names_or_ids cannot be tied to an account, that input will be - * ignored. All other accounts will be retrieved and subscribed. - * - */ - std::map get_full_accounts( const vector& names_or_ids, bool subscribe ); - - - /** - * @brief Get limit orders in a given market - * @param a ID of asset being sold - * @param b ID of asset being purchased - * @param limit Maximum number of orders to retrieve - * @return The limit orders, ordered from least price to greatest - */ - vector get_limit_orders(asset_id_type a, asset_id_type b, uint32_t limit)const; - /** - * @brief Get call orders in a given asset - * @param a ID of asset being called - * @param limit Maximum number of orders to retrieve - * @return The call orders, ordered from earliest to be called to latest - */ - vector get_call_orders(asset_id_type a, uint32_t limit)const; - /** - * @brief Get forced settlement orders in a given asset - * @param a ID of asset being settled - * @param limit Maximum number of orders to retrieve - * @return The settle orders, ordered from earliest settlement date to latest - */ - vector get_settle_orders(asset_id_type a, uint32_t limit)const; - - /** - * @brief Get assets alphabetically by symbol name - * @param lower_bound_symbol Lower bound of symbol names to retrieve - * @param limit Maximum number of assets to fetch (must not exceed 100) - * @return The assets found - */ - vector list_assets(const string& lower_bound_symbol, uint32_t limit)const; - - /** - * @brief Get the committee_member owned by a given account - * @param account The ID of the account whose committee_member should be retrieved - * @return The committee_member object, or null if the account does not have a committee_member - */ - fc::optional get_committee_member_by_account(account_id_type account)const; - /** - * @brief Get the witness owned by a given account - * @param account The ID of the account whose witness should be retrieved - * @return The witness object, or null if the account does not have a witness - */ - fc::optional get_witness_by_account(account_id_type account)const; - - /** - * @brief Given a set of votes, return the objects they are voting for. - * - * This will be a mixture of committee_member_object, witness_objects, and worker_objects - * - * The results will be in the same order as the votes. Null will be returned for - * any vote ids that are not found. - */ - vector lookup_vote_ids( const vector& votes )const; - - /** - * @brief Get the total number of witnesses registered with the blockchain - */ - uint64_t get_witness_count()const; - - /** - * @brief Get names and IDs for registered witnesses - * @param lower_bound_name Lower bound of the first name to return - * @param limit Maximum number of results to return -- must not exceed 1000 - * @return Map of witness names to corresponding IDs - */ - map lookup_witness_accounts(const string& lower_bound_name, uint32_t limit)const; - - /** - * @brief Get names and IDs for registered committee_members - * @param lower_bound_name Lower bound of the first name to return - * @param limit Maximum number of results to return -- must not exceed 1000 - * @return Map of committee_member names to corresponding IDs - */ - map lookup_committee_member_accounts(const string& lower_bound_name, uint32_t limit)const; - - /** - * @brief Get a list of witnesses by ID - * @param witness_ids IDs of the witnesses to retrieve - * @return The witnesses corresponding to the provided IDs - * - * This function has semantics identical to @ref get_objects - */ - vector> get_witnesses(const vector& witness_ids)const; - - /** - * @brief Get a list of committee_members by ID - * @param committee_member_ids IDs of the committee_members to retrieve - * @return The committee_members corresponding to the provided IDs - * - * This function has semantics identical to @ref get_objects - */ - vector> get_committee_members(const vector& committee_member_ids)const; - - /** - * @brief Request notification when the active orders in the market between two assets changes - * @param callback Callback method which is called when the market changes - * @param a First asset ID - * @param b Second asset ID - * - * Callback will be passed a variant containing a vector>. The vector will - * contain, in order, the operations which changed the market, and their results. - */ - void subscribe_to_market(std::function callback, - asset_id_type a, asset_id_type b); - /** - * @brief Unsubscribe from updates to a given market - * @param a First asset ID - * @param b Second asset ID - */ - void unsubscribe_from_market(asset_id_type a, asset_id_type b); - /** - * @brief Stop receiving any notifications - * - * This unsubscribes from all subscribed markets and objects. - */ - void cancel_all_subscriptions() - { set_subscribe_callback( std::function(), true); _market_subscriptions.clear(); } - - /// @brief Get a hexdump of the serialized binary form of a transaction - std::string get_transaction_hex(const signed_transaction& trx)const; - - /** - * @return the set of proposed transactions relevant to the specified account id. - */ - vector get_proposed_transactions( account_id_type id )const; - - /** - * @return all accounts that referr to the key or account id in their owner or active authorities. - */ - vector get_account_references( account_id_type account_id )const; - vector> get_key_references( vector key )const; - - /** - * @return all open margin positions for a given account id. - */ - vector get_margin_positions( const account_id_type& id )const; - - /** @return all unclaimed balance objects for a set of addresses */ - vector get_balance_objects( const vector
& addrs )const; - - vector get_vested_balances( const vector& objs )const; - - vector get_vesting_balances( account_id_type account_id )const; - - /** - * This API will take a partially signed transaction and a set of public keys that the owner has the ability to sign for - * and return the minimal subset of public keys that should add signatures to the transaction. - */ - set get_required_signatures( const signed_transaction& trx, const flat_set& available_keys )const; - - /** - * This method will return the set of all public keys that could possibly sign for a given transaction. This call can - * be used by wallets to filter their set of public keys to just the relevant subset prior to calling @ref get_required_signatures - * to get the minimum subset. - */ - set get_potential_signatures( const signed_transaction& trx )const; - - /** - * @return true of the @ref trx has all of the required signatures, otherwise throws an exception - */ - bool verify_authority( const signed_transaction& trx )const; - - /** - * @return true if the signers have enough authority to authorize an account - */ - bool verify_account_authority( const string& name_or_id, const flat_set& signers )const; - - /** - * Validates a transaction against the current state without broadcast it on the network. - */ - processed_transaction validate_transaction( const signed_transaction& trx )const; - - - /** - * @return the set of blinded balance objects by commitment ID - */ - vector get_blinded_balances( const flat_set& commitments )const; - - - /** - * For each operation calculate the required fee in the specified asset type. If the asset type does - * not have a valid core_exchange_rate - */ - vector get_required_fees( const vector& ops, asset_id_type id = asset_id_type() )const; - - void set_subscribe_callback( std::function cb, bool clear_filter ); - void set_pending_transaction_callback( std::function cb ){ _pending_trx_callback = cb; } - void set_block_applied_callback( std::function cb ){ _block_applied_callback = cb; } - private: - template - void subscribe_to_item( const T& i )const - { - auto vec = fc::raw::pack(i); - if( !_subscribe_callback ) return; - - if( !is_subscribed_to_item(i) ) - { - idump((i)); - _subscribe_filter.insert( vec.data(), vec.size() );//(vecconst char*)&i, sizeof(i) ); - } - } - - template - bool is_subscribed_to_item( const T& i )const - { - if( !_subscribe_callback ) return false; - return true; - return _subscribe_filter.contains( i ); - } - void broadcast_updates( const vector& updates ); - - /** called every time a block is applied to report the objects that were changed */ - void on_objects_changed(const vector& ids); - void on_objects_removed(const vector& objs); - void on_applied_block(); - - mutable fc::bloom_filter _subscribe_filter; - std::function _subscribe_callback; - std::function _pending_trx_callback; - std::function _block_applied_callback; - - boost::signals2::scoped_connection _change_connection; - boost::signals2::scoped_connection _removed_connection; - boost::signals2::scoped_connection _applied_block_connection; - boost::signals2::scoped_connection _pending_trx_connection; - map< pair, std::function > _market_subscriptions; - graphene::chain::database& _db; - }; - /** * @brief The history_api class implements the RPC API for account history * @@ -558,59 +192,6 @@ namespace graphene { namespace app { FC_REFLECT( graphene::app::network_broadcast_api::transaction_confirmation, (id)(block_num)(trx_num)(trx) ) -FC_API(graphene::app::database_api, - (get_objects) - (get_block_header) - (get_block) - (get_transaction) - (get_chain_properties) - (get_global_properties) - (get_chain_id) - (get_dynamic_global_properties) - (get_accounts) - (get_assets) - (lookup_account_names) - (get_account_by_name) - (get_account_count) - (lookup_accounts) - (get_full_accounts) - (get_account_balances) - (get_named_account_balances) - (lookup_asset_symbols) - (get_limit_orders) - (get_call_orders) - (get_settle_orders) - (list_assets) - (get_committee_member_by_account) - (get_witnesses) - (get_committee_members) - (get_witness_by_account) - (lookup_vote_ids) - (get_witness_count) - (lookup_witness_accounts) - (lookup_committee_member_accounts) - (subscribe_to_market) - (unsubscribe_from_market) - (cancel_all_subscriptions) - (get_transaction_hex) - (get_proposed_transactions) - (get_account_references) - (get_key_references) - (get_margin_positions) - (get_balance_objects) - (get_vested_balances) - (get_vesting_balances) - (get_required_signatures) - (get_potential_signatures) - (verify_authority) - (verify_account_authority) - (get_blinded_balances) - (get_required_fees) - (set_subscribe_callback) - (set_pending_transaction_callback) - (set_block_applied_callback) - (validate_transaction) - ) FC_API(graphene::app::history_api, (get_account_history) (get_market_history) diff --git a/libraries/app/include/graphene/app/database_api.hpp b/libraries/app/include/graphene/app/database_api.hpp new file mode 100644 index 00000000..8975fa1e --- /dev/null +++ b/libraries/app/include/graphene/app/database_api.hpp @@ -0,0 +1,537 @@ +/* + * Copyright (c) 2015, Cryptonomex, Inc. + * All rights reserved. + * + * This source code is provided for evaluation in private test networks only, until September 8, 2015. After this date, this license expires and + * the code may not be used, modified or distributed for any purpose. Redistribution and use in source and binary forms, with or without modification, + * are permitted until September 8, 2015, provided that the following conditions are met: + * + * 1. The code and/or derivative works are used only for private test networks consisting of no more than 10 P2P nodes. + * + * 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. + */ +#pragma once + +#include + +#include + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include + +#include + +#include +#include +#include +#include + +namespace graphene { namespace app { + +using namespace graphene::chain; +using namespace std; + +class database_api_impl; + +/** + * @brief The database_api class implements the RPC API for the chain database. + * + * This API exposes accessors on the database which query state tracked by a blockchain validating node. This API is + * read-only; all modifications to the database must be performed via transactions. Transactions are broadcast via + * the @ref network_broadcast_api. + */ +class database_api +{ + public: + database_api(graphene::chain::database& db); + ~database_api(); + + ///////////// + // Objects // + ///////////// + + /** + * @brief Get the objects corresponding to the provided IDs + * @param ids IDs of the objects to retrieve + * @return The objects retrieved, in the order they are mentioned in ids + * + * If any of the provided IDs does not map to an object, a null variant is returned in its position. + */ + fc::variants get_objects(const vector& ids)const; + + /////////////////// + // Subscriptions // + /////////////////// + + void set_subscribe_callback( std::function cb, bool clear_filter ); + void set_pending_transaction_callback( std::function cb ); + void set_block_applied_callback( std::function cb ); + /** + * @brief Stop receiving any notifications + * + * This unsubscribes from all subscribed markets and objects. + */ + void cancel_all_subscriptions(); + + ///////////////////////////// + // Blocks and transactions // + ///////////////////////////// + + /** + * @brief Retrieve a block header + * @param block_num Height of the block whose header should be returned + * @return header of the referenced block, or null if no matching block was found + */ + optional get_block_header(uint32_t block_num)const; + + /** + * @brief Retrieve a full, signed block + * @param block_num Height of the block to be returned + * @return the referenced block, or null if no matching block was found + */ + optional get_block(uint32_t block_num)const; + + /** + * @brief used to fetch an individual transaction. + */ + processed_transaction get_transaction( uint32_t block_num, uint32_t trx_in_block )const; + + ///////////// + // Globals // + ///////////// + + /** + * @brief Retrieve the @ref chain_property_object associated with the chain + */ + chain_property_object get_chain_properties()const; + + /** + * @brief Retrieve the current @ref global_property_object + */ + global_property_object get_global_properties()const; + + /** + * @brief Retrieve compile-time constants + */ + fc::variant_object get_config()const; + + /** + * @brief Get the chain ID + */ + chain_id_type get_chain_id()const; + + /** + * @brief Retrieve the current @ref dynamic_global_property_object + */ + dynamic_global_property_object get_dynamic_global_properties()const; + + ////////// + // Keys // + ////////// + + vector> get_key_references( vector key )const; + + ////////////// + // Accounts // + ////////////// + + /** + * @brief Get a list of accounts by ID + * @param account_ids IDs of the accounts to retrieve + * @return The accounts corresponding to the provided IDs + * + * This function has semantics identical to @ref get_objects + */ + vector> get_accounts(const vector& account_ids)const; + + /** + * @brief Fetch all objects relevant to the specified accounts and subscribe to updates + * @param callback Function to call with updates + * @param names_or_ids Each item must be the name or ID of an account to retrieve + * @return Map of string from @ref names_or_ids to the corresponding account + * + * This function fetches all relevant objects for the given accounts, and subscribes to updates to the given + * accounts. If any of the strings in @ref names_or_ids cannot be tied to an account, that input will be + * ignored. All other accounts will be retrieved and subscribed. + * + */ + std::map get_full_accounts( const vector& names_or_ids, bool subscribe ); + + optional get_account_by_name( string name )const; + + /** + * @return all accounts that referr to the key or account id in their owner or active authorities. + */ + vector get_account_references( account_id_type account_id )const; + + /** + * @brief Get a list of accounts by name + * @param account_names Names of the accounts to retrieve + * @return The accounts holding the provided names + * + * This function has semantics identical to @ref get_objects + */ + vector> lookup_account_names(const vector& account_names)const; + + /** + * @brief Get names and IDs for registered accounts + * @param lower_bound_name Lower bound of the first name to return + * @param limit Maximum number of results to return -- must not exceed 1000 + * @return Map of account names to corresponding IDs + */ + map lookup_accounts(const string& lower_bound_name, uint32_t limit)const; + + ////////////// + // Balances // + ////////////// + + /** + * @brief Get an account's balances in various assets + * @param id ID of the account to get balances for + * @param assets IDs of the assets to get balances of; if empty, get all assets account has a balance in + * @return Balances of the account + */ + vector get_account_balances(account_id_type id, const flat_set& assets)const; + + /// Semantically equivalent to @ref get_account_balances, but takes a name instead of an ID. + vector get_named_account_balances(const std::string& name, const flat_set& assets)const; + + /** @return all unclaimed balance objects for a set of addresses */ + vector get_balance_objects( const vector
& addrs )const; + + vector get_vested_balances( const vector& objs )const; + + vector get_vesting_balances( account_id_type account_id )const; + + /** + * @brief Get the total number of accounts registered with the blockchain + */ + uint64_t get_account_count()const; + + //////////// + // Assets // + //////////// + + /** + * @brief Get a list of assets by ID + * @param asset_ids IDs of the assets to retrieve + * @return The assets corresponding to the provided IDs + * + * This function has semantics identical to @ref get_objects + */ + vector> get_assets(const vector& asset_ids)const; + + /** + * @brief Get assets alphabetically by symbol name + * @param lower_bound_symbol Lower bound of symbol names to retrieve + * @param limit Maximum number of assets to fetch (must not exceed 100) + * @return The assets found + */ + vector list_assets(const string& lower_bound_symbol, uint32_t limit)const; + + /** + * @brief Get a list of assets by symbol + * @param asset_symbols Symbols or stringified IDs of the assets to retrieve + * @return The assets corresponding to the provided symbols or IDs + * + * This function has semantics identical to @ref get_objects + */ + vector> lookup_asset_symbols(const vector& symbols_or_ids)const; + + ///////////////////// + // Markets / feeds // + ///////////////////// + + /** + * @brief Get limit orders in a given market + * @param a ID of asset being sold + * @param b ID of asset being purchased + * @param limit Maximum number of orders to retrieve + * @return The limit orders, ordered from least price to greatest + */ + vector get_limit_orders(asset_id_type a, asset_id_type b, uint32_t limit)const; + + /** + * @brief Get call orders in a given asset + * @param a ID of asset being called + * @param limit Maximum number of orders to retrieve + * @return The call orders, ordered from earliest to be called to latest + */ + vector get_call_orders(asset_id_type a, uint32_t limit)const; + + /** + * @brief Get forced settlement orders in a given asset + * @param a ID of asset being settled + * @param limit Maximum number of orders to retrieve + * @return The settle orders, ordered from earliest settlement date to latest + */ + vector get_settle_orders(asset_id_type a, uint32_t limit)const; + + /** + * @return all open margin positions for a given account id. + */ + vector get_margin_positions( const account_id_type& id )const; + + /** + * @brief Request notification when the active orders in the market between two assets changes + * @param callback Callback method which is called when the market changes + * @param a First asset ID + * @param b Second asset ID + * + * Callback will be passed a variant containing a vector>. The vector will + * contain, in order, the operations which changed the market, and their results. + */ + void subscribe_to_market(std::function callback, + asset_id_type a, asset_id_type b); + + /** + * @brief Unsubscribe from updates to a given market + * @param a First asset ID + * @param b Second asset ID + */ + void unsubscribe_from_market(asset_id_type a, asset_id_type b); + + /////////////// + // Witnesses // + /////////////// + + /** + * @brief Get a list of witnesses by ID + * @param witness_ids IDs of the witnesses to retrieve + * @return The witnesses corresponding to the provided IDs + * + * This function has semantics identical to @ref get_objects + */ + vector> get_witnesses(const vector& witness_ids)const; + + /** + * @brief Get the witness owned by a given account + * @param account The ID of the account whose witness should be retrieved + * @return The witness object, or null if the account does not have a witness + */ + fc::optional get_witness_by_account(account_id_type account)const; + + /** + * @brief Get names and IDs for registered witnesses + * @param lower_bound_name Lower bound of the first name to return + * @param limit Maximum number of results to return -- must not exceed 1000 + * @return Map of witness names to corresponding IDs + */ + map lookup_witness_accounts(const string& lower_bound_name, uint32_t limit)const; + + /** + * @brief Get the total number of witnesses registered with the blockchain + */ + uint64_t get_witness_count()const; + + /////////////////////// + // Committee members // + /////////////////////// + + /** + * @brief Get a list of committee_members by ID + * @param committee_member_ids IDs of the committee_members to retrieve + * @return The committee_members corresponding to the provided IDs + * + * This function has semantics identical to @ref get_objects + */ + vector> get_committee_members(const vector& committee_member_ids)const; + + /** + * @brief Get the committee_member owned by a given account + * @param account The ID of the account whose committee_member should be retrieved + * @return The committee_member object, or null if the account does not have a committee_member + */ + fc::optional get_committee_member_by_account(account_id_type account)const; + + /** + * @brief Get names and IDs for registered committee_members + * @param lower_bound_name Lower bound of the first name to return + * @param limit Maximum number of results to return -- must not exceed 1000 + * @return Map of committee_member names to corresponding IDs + */ + map lookup_committee_member_accounts(const string& lower_bound_name, uint32_t limit)const; + + /////////// + // Votes // + /////////// + + /** + * @brief Given a set of votes, return the objects they are voting for. + * + * This will be a mixture of committee_member_object, witness_objects, and worker_objects + * + * The results will be in the same order as the votes. Null will be returned for + * any vote ids that are not found. + */ + vector lookup_vote_ids( const vector& votes )const; + + //////////////////////////// + // Authority / validation // + //////////////////////////// + + /// @brief Get a hexdump of the serialized binary form of a transaction + std::string get_transaction_hex(const signed_transaction& trx)const; + + /** + * This API will take a partially signed transaction and a set of public keys that the owner has the ability to sign for + * and return the minimal subset of public keys that should add signatures to the transaction. + */ + set get_required_signatures( const signed_transaction& trx, const flat_set& available_keys )const; + + /** + * This method will return the set of all public keys that could possibly sign for a given transaction. This call can + * be used by wallets to filter their set of public keys to just the relevant subset prior to calling @ref get_required_signatures + * to get the minimum subset. + */ + set get_potential_signatures( const signed_transaction& trx )const; + + /** + * @return true of the @ref trx has all of the required signatures, otherwise throws an exception + */ + bool verify_authority( const signed_transaction& trx )const; + + /** + * @return true if the signers have enough authority to authorize an account + */ + bool verify_account_authority( const string& name_or_id, const flat_set& signers )const; + + /** + * Validates a transaction against the current state without broadcasting it on the network. + */ + processed_transaction validate_transaction( const signed_transaction& trx )const; + + /** + * For each operation calculate the required fee in the specified asset type. If the asset type does + * not have a valid core_exchange_rate + */ + vector get_required_fees( const vector& ops, asset_id_type id )const; + + /////////////////////////// + // Proposed transactions // + /////////////////////////// + + /** + * @return the set of proposed transactions relevant to the specified account id. + */ + vector get_proposed_transactions( account_id_type id )const; + + ////////////////////// + // Blinded balances // + ////////////////////// + + /** + * @return the set of blinded balance objects by commitment ID + */ + vector get_blinded_balances( const flat_set& commitments )const; + + private: + std::shared_ptr< database_api_impl > my; +}; + +} } + +FC_API(graphene::app::database_api, + // Objects + (get_objects) + + // Subscriptions + (set_subscribe_callback) + (set_pending_transaction_callback) + (set_block_applied_callback) + (cancel_all_subscriptions) + + // Blocks and transactions + (get_block_header) + (get_block) + (get_transaction) + + // Globals + (get_chain_properties) + (get_global_properties) + (get_config) + (get_chain_id) + (get_dynamic_global_properties) + + // Keys + (get_key_references) + + // Accounts + (get_accounts) + (get_full_accounts) + (get_account_by_name) + (get_account_references) + (lookup_account_names) + (lookup_accounts) + (get_account_count) + + // Balances + (get_account_balances) + (get_named_account_balances) + (get_balance_objects) + (get_vested_balances) + (get_vesting_balances) + + // Assets + (get_assets) + (list_assets) + (lookup_asset_symbols) + + // Markets / feeds + (get_limit_orders) + (get_call_orders) + (get_settle_orders) + (get_margin_positions) + (subscribe_to_market) + (unsubscribe_from_market) + + // Witnesses + (get_witnesses) + (get_witness_by_account) + (lookup_witness_accounts) + (get_witness_count) + + // Committee members + (get_committee_members) + (get_committee_member_by_account) + (lookup_committee_member_accounts) + + // Votes + (lookup_vote_ids) + + // Authority / validation + (get_transaction_hex) + (get_required_signatures) + (get_potential_signatures) + (verify_authority) + (verify_account_authority) + (validate_transaction) + (get_required_fees) + + // Proposed transactions + (get_proposed_transactions) + + // Blinded balances + (get_blinded_balances) +) From 0046cc0698cb0ec3713d7fd8016d08ff7b767821 Mon Sep 17 00:00:00 2001 From: Eric Frias Date: Fri, 11 Sep 2015 15:26:55 -0400 Subject: [PATCH 321/353] Fix error messages generated when peer is syncing with empty blockchain --- libraries/app/application.cpp | 37 ++++++++++++++----- .../net/include/graphene/net/exceptions.hpp | 1 + libraries/net/node.cpp | 15 +++++++- 3 files changed, 42 insertions(+), 11 deletions(-) diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp index 1f83b3c7..e0cf6b61 100644 --- a/libraries/app/application.cpp +++ b/libraries/app/application.cpp @@ -382,6 +382,10 @@ namespace detail { ilog("Got block #${n} from network", ("n", blk_msg.block.block_num())); try { + // TODO: in the case where this block is valid but on a fork that's too old for us to switch to, + // you can help the network code out by throwing a block_older_than_undo_history exception. + // when the net code sees that, it will stop trying to push blocks from that chain, but + // leave that peer connected so that they can get sync blocks from us bool result = _chain_db->push_block(blk_msg.block, _is_block_producer ? database::skip_nothing : database::skip_transaction_signatures); // the block was accepted, so we now know all of the transactions contained in the block @@ -444,22 +448,37 @@ namespace detail { uint32_t& remaining_item_count, uint32_t limit) override { try { - vector result; + vector result; remaining_item_count = 0; if( _chain_db->head_block_num() == 0 ) return result; result.reserve(limit); block_id_type last_known_block_id; + + if (blockchain_synopsis.empty() || + (blockchain_synopsis.size() == 1 && blockchain_synopsis[0] == block_id_type())) + { + // peer has sent us an empty synopsis meaning they have no blocks. + // A bug in old versions would cause them to send a synopsis containing block 000000000 + // when they had an empty blockchain, so pretend they sent the right thing here. - for (const item_hash_t& block_id_in_synopsis : boost::adaptors::reverse(blockchain_synopsis)) - if (block_id_in_synopsis == block_id_type() || - (_chain_db->is_known_block(block_id_in_synopsis) && is_included_block(block_id_in_synopsis))) - { - last_known_block_id = block_id_in_synopsis; - break; - } - + // do nothing, leave last_known_block_id set to zero + } + else + { + bool found_a_block_in_synopsis = false; + for (const item_hash_t& block_id_in_synopsis : boost::adaptors::reverse(blockchain_synopsis)) + if (block_id_in_synopsis == block_id_type() || + (_chain_db->is_known_block(block_id_in_synopsis) && is_included_block(block_id_in_synopsis))) + { + last_known_block_id = block_id_in_synopsis; + found_a_block_in_synopsis = true; + break; + } + if (!found_a_block_in_synopsis) + FC_THROW_EXCEPTION(graphene::net::peer_is_on_an_unreachable_fork, "Unable to provide a list of blocks starting at any of the blocks in peer's synopsis"); + } for( uint32_t num = block_header::num_from_id(last_known_block_id); num <= _chain_db->head_block_num() && result.size() < limit; ++num ) diff --git a/libraries/net/include/graphene/net/exceptions.hpp b/libraries/net/include/graphene/net/exceptions.hpp index 7985ebc0..7750455d 100644 --- a/libraries/net/include/graphene/net/exceptions.hpp +++ b/libraries/net/include/graphene/net/exceptions.hpp @@ -26,5 +26,6 @@ namespace graphene { namespace net { FC_DECLARE_DERIVED_EXCEPTION( insufficient_relay_fee, graphene::net::net_exception, 90002, "insufficient relay fee" ); FC_DECLARE_DERIVED_EXCEPTION( already_connected_to_requested_peer, graphene::net::net_exception, 90003, "already connected to requested peer" ); FC_DECLARE_DERIVED_EXCEPTION( block_older_than_undo_history, graphene::net::net_exception, 90004, "block is older than our undo history allows us to process" ); + FC_DECLARE_DERIVED_EXCEPTION( peer_is_on_an_unreachable_fork, graphene::net::net_exception, 90005, "peer is on another fork" ); } } diff --git a/libraries/net/node.cpp b/libraries/net/node.cpp index 1e82dcd9..c109b434 100644 --- a/libraries/net/node.cpp +++ b/libraries/net/node.cpp @@ -2162,9 +2162,20 @@ namespace graphene { namespace net { namespace detail { } blockchain_item_ids_inventory_message reply_message; - reply_message.item_hashes_available = _delegate->get_block_ids(fetch_blockchain_item_ids_message_received.blockchain_synopsis, - reply_message.total_remaining_item_count ); reply_message.item_type = fetch_blockchain_item_ids_message_received.item_type; + reply_message.total_remaining_item_count = 0; + try + { + reply_message.item_hashes_available = _delegate->get_block_ids(fetch_blockchain_item_ids_message_received.blockchain_synopsis, + reply_message.total_remaining_item_count); + } + catch (const peer_is_on_an_unreachable_fork&) + { + dlog("Peer is on a fork and there's no set of blocks we can provide to switch them to our fork"); + // we reply with an empty list as if we had an empty blockchain; + // we don't want to disconnect because they may be able to provide + // us with blocks on their chain + } bool disconnect_from_inhibited_peer = false; // if our client doesn't have any items after the item the peer requested, it will send back From e9e3b0d679ee97c67caa9ea4a70c3aa5aae29893 Mon Sep 17 00:00:00 2001 From: Eric Frias Date: Fri, 11 Sep 2015 16:15:05 -0400 Subject: [PATCH 322/353] Fix an instance where we were reporting that the peer was on an unreachable blockchain when they really weren't --- libraries/app/application.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp index e0cf6b61..c1bdd2fa 100644 --- a/libraries/app/application.cpp +++ b/libraries/app/application.cpp @@ -624,14 +624,14 @@ namespace detail { elog("Unable to construct a blockchain synopsis for reference hash ${hash}: ${exception}", ("hash", reference_point)("exception", e)); throw; } - } - if (non_fork_high_block_num < low_block_num) - { - wlog("Unable to generate a usable synopsis because the peer we're generating it for forked too long ago " - "(our chains diverge after block #${non_fork_high_block_num} but only undoable to block #${low_block_num})", - ("low_block_num", low_block_num) - ("non_fork_high_block_num", non_fork_high_block_num)); - FC_THROW_EXCEPTION(graphene::net::block_older_than_undo_history, "Peer is are on a fork I'm unable to switch to"); + if (non_fork_high_block_num < low_block_num) + { + wlog("Unable to generate a usable synopsis because the peer we're generating it for forked too long ago " + "(our chains diverge after block #${non_fork_high_block_num} but only undoable to block #${low_block_num})", + ("low_block_num", low_block_num) + ("non_fork_high_block_num", non_fork_high_block_num)); + FC_THROW_EXCEPTION(graphene::net::block_older_than_undo_history, "Peer is are on a fork I'm unable to switch to"); + } } } else From 76a36a67acbc93ba1dd5cffa058c9faad03caaaf Mon Sep 17 00:00:00 2001 From: Eric Frias Date: Fri, 11 Sep 2015 17:33:20 -0400 Subject: [PATCH 323/353] Fix race condition that happens when we're pushing sync blocks faster than get_synopsis calls are getting through to the main thread --- libraries/app/application.cpp | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp index c1bdd2fa..bafc87af 100644 --- a/libraries/app/application.cpp +++ b/libraries/app/application.cpp @@ -595,6 +595,21 @@ namespace detail { assert(reference_point_block_num > 0); high_block_num = reference_point_block_num; non_fork_high_block_num = high_block_num; + + if (reference_point_block_num < low_block_num) + { + // we're on the same fork (at least as far as reference_point) but we've passed + // reference point and could no longer undo that far if we diverged after that + // block. This should probably only happen due to a race condition where + // the network thread calls this function, and then immediately pushes a bunch of blocks, + // then the main thread finally processes this function. + // with the current framework, there's not much we can do to tell the network + // thread what our current head block is, so we'll just pretend that + // our head is actually the reference point. + // this *may* enable us to fetch blocks that we're unable to push, but that should + // be a rare case (and correctly handled) + low_block_num = reference_point_block_num; + } } else { @@ -659,7 +674,15 @@ namespace detail { if (low_block_num <= non_fork_high_block_num) synopsis.push_back(_chain_db->get_block_id_for_num(low_block_num)); else + { + // for debugging + int index = low_block_num - non_fork_high_block_num - 1; + if (index < 0 || index > fork_history.size()) + { + int i = 0; + } synopsis.push_back(fork_history[low_block_num - non_fork_high_block_num - 1]); + } low_block_num += (true_high_block_num - low_block_num + 2) / 2; } while (low_block_num <= high_block_num); From 127ac7f3de0ab33f6d49a513f52a21badacebe05 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Fri, 11 Sep 2015 17:47:27 -0400 Subject: [PATCH 324/353] add api to query worker state --- libraries/app/application.cpp | 1 + libraries/app/database_api.cpp | 18 ++++++++++++++++- libraries/app/include/graphene/app/api.hpp | 1 + .../app/include/graphene/app/database_api.hpp | 12 +++++++++++ libraries/chain/db_maint.cpp | 6 +++--- .../graphene/chain/worker_evaluator.hpp | 20 +++++++++++++++++-- .../delayed_node/delayed_node_plugin.cpp | 2 ++ 7 files changed, 54 insertions(+), 6 deletions(-) diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp index 76caf599..e8a266c4 100644 --- a/libraries/app/application.cpp +++ b/libraries/app/application.cpp @@ -31,6 +31,7 @@ #include #include +#include #include diff --git a/libraries/app/database_api.cpp b/libraries/app/database_api.cpp index 8b55561e..63b11a21 100644 --- a/libraries/app/database_api.cpp +++ b/libraries/app/database_api.cpp @@ -99,7 +99,7 @@ class database_api_impl : public std::enable_shared_from_this // Blinded balances vector get_blinded_balances( const flat_set& commitments )const; - private: + //private: template void subscribe_to_item( const T& i )const { @@ -960,6 +960,22 @@ vector> database_api::get_witnesses(const vectorget_witnesses( witness_ids ); } +vector database_api::get_workers_by_account(account_id_type account)const +{ + const auto& idx = my->_db.get_index_type().indices().get(); + auto itr = idx.find(account); + vector result; + + if( itr != idx.end() && itr->worker_account == account ) + { + result.emplace_back( *itr ); + ++itr; + } + + return result; +} + + vector> database_api_impl::get_witnesses(const vector& witness_ids)const { vector> result; result.reserve(witness_ids.size()); diff --git a/libraries/app/include/graphene/app/api.hpp b/libraries/app/include/graphene/app/api.hpp index c29be561..67d0cfe2 100644 --- a/libraries/app/include/graphene/app/api.hpp +++ b/libraries/app/include/graphene/app/api.hpp @@ -43,6 +43,7 @@ namespace graphene { namespace app { class application; + /** * @brief The history_api class implements the RPC API for account history * diff --git a/libraries/app/include/graphene/app/database_api.hpp b/libraries/app/include/graphene/app/database_api.hpp index 8975fa1e..4aedd0ed 100644 --- a/libraries/app/include/graphene/app/database_api.hpp +++ b/libraries/app/include/graphene/app/database_api.hpp @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -373,6 +374,15 @@ class database_api */ map lookup_committee_member_accounts(const string& lower_bound_name, uint32_t limit)const; + + /// WORKERS + + /** + * Return the worker objects associated with this account. + */ + vector get_workers_by_account(account_id_type account)const; + + /////////// // Votes // /////////// @@ -517,6 +527,8 @@ FC_API(graphene::app::database_api, (get_committee_member_by_account) (lookup_committee_member_accounts) + // workers + (get_workers_by_account) // Votes (lookup_vote_ids) diff --git a/libraries/chain/db_maint.cpp b/libraries/chain/db_maint.cpp index dd87a9b4..cbe091ed 100644 --- a/libraries/chain/db_maint.cpp +++ b/libraries/chain/db_maint.cpp @@ -86,10 +86,10 @@ struct worker_pay_visitor void database::update_worker_votes() { auto& idx = get_index_type(); - auto itr = idx.begin(); - while( itr != idx.end() ) + auto itr = idx.indices().get().begin(); + while( itr != idx.indices().get().end() ) { - modify( **itr, [&]( worker_object& obj ){ + modify( *itr, [&]( worker_object& obj ){ obj.total_votes_for = _vote_tally_buffer[obj.vote_for]; obj.total_votes_against = _vote_tally_buffer[obj.vote_against]; }); diff --git a/libraries/chain/include/graphene/chain/worker_evaluator.hpp b/libraries/chain/include/graphene/chain/worker_evaluator.hpp index de32fa3a..5ea07106 100644 --- a/libraries/chain/include/graphene/chain/worker_evaluator.hpp +++ b/libraries/chain/include/graphene/chain/worker_evaluator.hpp @@ -127,13 +127,29 @@ namespace graphene { namespace chain { bool is_active(fc::time_point_sec now)const { return now >= work_begin_date && now <= work_end_date; } + + /// TODO: remove unused argument share_type approving_stake(const vector& stake_vote_tallies)const { - return int64_t( total_votes_for ) - int64_t( total_votes_against );// stake_vote_tallies[vote_for] - stake_vote_tallies[vote_against]; + return int64_t( total_votes_for ) - int64_t( total_votes_against ); } }; - typedef flat_index worker_index; + struct by_account; + struct by_vote_for; + struct by_vote_against; + typedef multi_index_container< + worker_object, + indexed_by< + ordered_unique< tag, member< object, object_id_type, &object::id > >, + ordered_non_unique< tag, member< worker_object, account_id_type, &worker_object::worker_account > >, + ordered_unique< tag, member< worker_object, vote_id_type, &worker_object::vote_for > >, + ordered_unique< tag, member< worker_object, vote_id_type, &worker_object::vote_against > > + > + > worker_object_multi_index_type; + + //typedef flat_index worker_index; + using worker_index = generic_index; class worker_create_evaluator : public evaluator { diff --git a/libraries/plugins/delayed_node/delayed_node_plugin.cpp b/libraries/plugins/delayed_node/delayed_node_plugin.cpp index be5cbe2a..208fa566 100644 --- a/libraries/plugins/delayed_node/delayed_node_plugin.cpp +++ b/libraries/plugins/delayed_node/delayed_node_plugin.cpp @@ -18,6 +18,7 @@ #include #include +#include #include #include @@ -25,6 +26,7 @@ #include #include + namespace graphene { namespace delayed_node { namespace bpo = boost::program_options; From 30ae8e4f3433d4ee500f0b98e30f05e1ebe806ea Mon Sep 17 00:00:00 2001 From: Eric Frias Date: Fri, 11 Sep 2015 19:27:31 -0400 Subject: [PATCH 325/353] Remove debugging code --- libraries/app/application.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp index f27e1c6c..62cec1c4 100644 --- a/libraries/app/application.cpp +++ b/libraries/app/application.cpp @@ -675,15 +675,7 @@ namespace detail { if (low_block_num <= non_fork_high_block_num) synopsis.push_back(_chain_db->get_block_id_for_num(low_block_num)); else - { - // for debugging - int index = low_block_num - non_fork_high_block_num - 1; - if (index < 0 || index > fork_history.size()) - { - int i = 0; - } synopsis.push_back(fork_history[low_block_num - non_fork_high_block_num - 1]); - } low_block_num += (true_high_block_num - low_block_num + 2) / 2; } while (low_block_num <= high_block_num); From 93c72b05951ad2fd0f1a07b702773e9a905d8adc Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Mon, 14 Sep 2015 11:33:18 -0400 Subject: [PATCH 326/353] wallet api now returns the memo and a human readable description --- libraries/fc | 2 +- .../wallet/include/graphene/wallet/wallet.hpp | 11 ++- libraries/wallet/wallet.cpp | 83 +++++++++++++------ 3 files changed, 69 insertions(+), 27 deletions(-) diff --git a/libraries/fc b/libraries/fc index 483b3488..d19f67d9 160000 --- a/libraries/fc +++ b/libraries/fc @@ -1 +1 @@ -Subproject commit 483b348878f284c474511db05e120466ffbfc132 +Subproject commit d19f67d94f2d0b8d4ab04fd29c9df324d053396f diff --git a/libraries/wallet/include/graphene/wallet/wallet.hpp b/libraries/wallet/include/graphene/wallet/wallet.hpp index f4288d34..160a2e81 100644 --- a/libraries/wallet/include/graphene/wallet/wallet.hpp +++ b/libraries/wallet/include/graphene/wallet/wallet.hpp @@ -242,6 +242,12 @@ namespace detail { class wallet_api_impl; } +struct operation_detail { + string memo; + string description; + operation_history_object op; +}; + /** * This wallet assumes it is connected to the database server with a high-bandwidth, low-latency connection and * performs minimal caching. This API could be provided locally to be used by a web interface. @@ -310,7 +316,7 @@ class wallet_api * @param limit the number of entries to return (starting from the most recent) (max 100) * @returns a list of \c operation_history_objects */ - vector get_account_history(string name, int limit)const; + vector get_account_history(string name, int limit)const; vector get_market_history(string symbol, string symbol2, uint32_t bucket)const; @@ -1370,6 +1376,9 @@ FC_REFLECT_DERIVED( graphene::wallet::signed_block_with_info, (graphene::chain:: FC_REFLECT_DERIVED( graphene::wallet::vesting_balance_object_with_info, (graphene::chain::vesting_balance_object), (allowed_withdraw)(allowed_withdraw_time) ) +FC_REFLECT( graphene::wallet::operation_detail, + (memo)(description)(op) ) + FC_API( graphene::wallet::wallet_api, (help) (gethelp) diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp index 7d5cef4b..d55c5edb 100644 --- a/libraries/wallet/wallet.cpp +++ b/libraries/wallet/wallet.cpp @@ -76,7 +76,7 @@ private: const wallet_api_impl& wallet; operation_result result; - void fee(const asset& a) const; + std::string fee(const asset& a) const; public: operation_printer( ostream& out, const wallet_api_impl& wallet, const operation_result& r = operation_result() ) @@ -84,17 +84,17 @@ public: wallet(wallet), result(r) {} - typedef void result_type; + typedef std::string result_type; template - void operator()(const T& op)const; + std::string operator()(const T& op)const; - void operator()(const transfer_operation& op)const; - void operator()(const transfer_from_blind_operation& op)const; - void operator()(const transfer_to_blind_operation& op)const; - void operator()(const account_create_operation& op)const; - void operator()(const account_update_operation& op)const; - void operator()(const asset_create_operation& op)const; + std::string operator()(const transfer_operation& op)const; + std::string operator()(const transfer_from_blind_operation& op)const; + std::string operator()(const transfer_to_blind_operation& op)const; + std::string operator()(const account_create_operation& op)const; + std::string operator()(const account_update_operation& op)const; + std::string operator()(const asset_create_operation& op)const; }; template @@ -1865,11 +1865,12 @@ public: m["get_account_history"] = [this](variant result, const fc::variants& a) { - auto r = result.as>(); + auto r = result.as>(); std::stringstream ss; - for( const operation_history_object& i : r ) + for( operation_detail& d : r ) { + operation_history_object& i = d.op; auto b = _remote_db->get_block_header(i.block_num); FC_ASSERT(b); ss << b->timestamp.to_iso_string() << " "; @@ -2175,12 +2176,13 @@ public: mutable map _asset_cache; }; -void operation_printer::fee(const asset& a)const { +std::string operation_printer::fee(const asset& a)const { out << " (Fee: " << wallet.get_asset(a.asset_id).amount_to_pretty_string(a) << ")"; + return ""; } template -void operation_printer::operator()(const T& op)const +std::string operation_printer::operator()(const T& op)const { //balance_accumulator acc; //op.get_balance_delta( acc, result ); @@ -2193,16 +2195,18 @@ void operation_printer::operator()(const T& op)const out << op_name <<" "; // out << "balance delta: " << fc::json::to_string(acc.balance) <<" "; out << payer.name << " fee: " << a.amount_to_pretty_string( op.fee ); + return ""; } -void operation_printer::operator()(const transfer_from_blind_operation& op)const +std::string operation_printer::operator()(const transfer_from_blind_operation& op)const { auto a = wallet.get_asset( op.fee.asset_id ); auto receiver = wallet.get_account( op.to ); out << receiver.name << " received " << a.amount_to_pretty_string( op.amount ) << " from blinded balance"; + return ""; } -void operation_printer::operator()(const transfer_to_blind_operation& op)const +std::string operation_printer::operator()(const transfer_to_blind_operation& op)const { auto fa = wallet.get_asset( op.fee.asset_id ); auto a = wallet.get_asset( op.amount.asset_id ); @@ -2211,11 +2215,13 @@ void operation_printer::operator()(const transfer_to_blind_operation& op)const out << sender.name << " sent " << a.amount_to_pretty_string( op.amount ) << " to " << op.outputs.size() << " blinded balance" << (op.outputs.size()>1?"s":"") << " fee: " << fa.amount_to_pretty_string( op.fee ); + return ""; } -void operation_printer::operator()(const transfer_operation& op) const +string operation_printer::operator()(const transfer_operation& op) const { out << "Transfer " << wallet.get_asset(op.amount.asset_id).amount_to_pretty_string(op.amount) << " from " << wallet.get_account(op.from).name << " to " << wallet.get_account(op.to).name; + std::string memo; if( op.memo ) { if( wallet.is_locked() ) @@ -2227,7 +2233,8 @@ void operation_printer::operator()(const transfer_operation& op) const ("k", op.memo->to)); auto my_key = wif_to_key(wallet._keys.at(op.memo->to)); FC_ASSERT(my_key, "Unable to recover private key to decrypt memo. Wallet may be corrupted."); - out << " -- Memo: " << op.memo->get_message(*my_key, op.memo->from); + memo = op.memo->get_message(*my_key, op.memo->from); + out << " -- Memo: " << memo; } catch (const fc::exception& e) { out << " -- could not decrypt memo"; elog("Error when decrypting memo: ${e}", ("e", e.to_detail_string())); @@ -2235,21 +2242,22 @@ void operation_printer::operator()(const transfer_operation& op) const } } fee(op.fee); + return memo; } -void operation_printer::operator()(const account_create_operation& op) const +std::string operation_printer::operator()(const account_create_operation& op) const { out << "Create Account '" << op.name << "'"; - fee(op.fee); + return fee(op.fee); } -void operation_printer::operator()(const account_update_operation& op) const +std::string operation_printer::operator()(const account_update_operation& op) const { out << "Update Account '" << wallet.get_account(op.account).name << "'"; - fee(op.fee); + return fee(op.fee); } -void operation_printer::operator()(const asset_create_operation& op) const +std::string operation_printer::operator()(const asset_create_operation& op) const { out << "Create "; if( op.bitasset_opts.valid() ) @@ -2257,7 +2265,7 @@ void operation_printer::operator()(const asset_create_operation& op) const else out << "User-Issue Asset "; out << "'" << op.symbol << "' with issuer " << wallet.get_account(op.issuer).name; - fee(op.fee); + return fee(op.fee); } }}} @@ -2312,11 +2320,36 @@ vector wallet_api::list_assets(const string& lowerbound, uint32_t return my->_remote_db->list_assets( lowerbound, limit ); } -vector wallet_api::get_account_history(string name, int limit)const +vector wallet_api::get_account_history(string name, int limit)const { - return my->_remote_hist->get_account_history(get_account(name).get_id(), operation_history_id_type(), limit, operation_history_id_type()); + vector result; + auto account_id = get_account(name).get_id(); + + while( limit > 0 ) + { + operation_history_id_type start; + if( result.size() ) + { + start = result.back().op.id; + start = start + 1; + } + + + vector current = my->_remote_hist->get_account_history(account_id, operation_history_id_type(), std::min(100,limit), start); + for( auto& o : current ) { + std::stringstream ss; + auto memo = o.op.visit(detail::operation_printer(ss, *my, o.result)); + result.push_back( operation_detail{ memo, ss.str(), o } ); + } + if( current.size() < std::min(100,limit) ) + break; + limit -= current.size(); + } + + return result; } + vector wallet_api::get_market_history( string symbol1, string symbol2, uint32_t bucket )const { return my->_remote_hist->get_market_history( get_asset_id(symbol1), get_asset_id(symbol2), bucket, fc::time_point_sec(), fc::time_point::now() ); From dd7d57c5ac89d8699f91eb6daee72b0854bfb860 Mon Sep 17 00:00:00 2001 From: Eric Frias Date: Mon, 14 Sep 2015 15:24:06 -0400 Subject: [PATCH 327/353] Fix invalid assertion about fork database results --- libraries/chain/db_block.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index 9014300e..518fccd0 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -79,10 +79,11 @@ const signed_transaction& database::get_recent_transaction(const transaction_id_ std::vector database::get_block_ids_on_fork(block_id_type head_of_fork) const { pair branches = _fork_db.fetch_branch_from(head_block_id(), head_of_fork); - assert(branches.first.back()->id == branches.second.back()->id); + assert(branches.first.back()->previous_id() == branches.second.back()->previous_id()); std::vector result; for (const item_ptr& fork_block : branches.second) result.emplace_back(fork_block->id); + result.emplace_back(branches.first.back()->previous_id()); return result; } From f0f12076fa5d80e07758ae5104854efd1dcb748d Mon Sep 17 00:00:00 2001 From: Eric Frias Date: Mon, 14 Sep 2015 16:05:32 -0400 Subject: [PATCH 328/353] Win32 compile fixes --- libraries/app/CMakeLists.txt | 2 +- libraries/app/database_api.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/app/CMakeLists.txt b/libraries/app/CMakeLists.txt index 32a416ea..caef157e 100644 --- a/libraries/app/CMakeLists.txt +++ b/libraries/app/CMakeLists.txt @@ -17,7 +17,7 @@ target_include_directories( graphene_app "${CMAKE_CURRENT_SOURCE_DIR}/../egenesis/include" ) if(MSVC) - set_source_files_properties( application.cpp api.cpp PROPERTIES COMPILE_FLAGS "/bigobj" ) + set_source_files_properties( application.cpp api.cpp database_api.cpp PROPERTIES COMPILE_FLAGS "/bigobj" ) endif(MSVC) INSTALL( TARGETS diff --git a/libraries/app/database_api.cpp b/libraries/app/database_api.cpp index 63b11a21..c3ed4ed5 100644 --- a/libraries/app/database_api.cpp +++ b/libraries/app/database_api.cpp @@ -7,6 +7,8 @@ #include +#include + namespace graphene { namespace app { class database_api_impl; From 225acfff25ff56f96bfbb59049290a5dc0e12f15 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Mon, 14 Sep 2015 18:07:07 -0400 Subject: [PATCH 329/353] fetch workers by vote_id --- libraries/app/database_api.cpp | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/libraries/app/database_api.cpp b/libraries/app/database_api.cpp index 63b11a21..097c611e 100644 --- a/libraries/app/database_api.cpp +++ b/libraries/app/database_api.cpp @@ -1118,10 +1118,12 @@ vector database_api::lookup_vote_ids( const vector& votes vector database_api_impl::lookup_vote_ids( const vector& votes )const { - FC_ASSERT( votes.size() < 100, "Only 100 votes can be queried at a time" ); + FC_ASSERT( votes.size() < 1000, "Only 1000 votes can be queried at a time" ); const auto& witness_idx = _db.get_index_type().indices().get(); const auto& committee_idx = _db.get_index_type().indices().get(); + const auto& for_worker_idx = _db.get_index_type().indices().get(); + const auto& against_worker_idx = _db.get_index_type().indices().get(); vector result; result.reserve( votes.size() ); @@ -1148,7 +1150,22 @@ vector database_api_impl::lookup_vote_ids( const vector& break; } case vote_id_type::worker: + { + auto itr = for_worker_idx.find( id ); + if( itr != for_worker_idx.end() ) { + result.emplace_back( variant( *itr ) ); + } + else { + auto itr = against_worker_idx.find( id ); + if( itr != against_worker_idx.end() ) { + result.emplace_back( variant( *itr ) ); + } + else { + result.emplace_back( variant() ); + } + } break; + } case vote_id_type::VOTE_TYPE_COUNT: break; // supress unused enum value warnings } } From f506c2b089c98c336eb0e8bf956131e556fea8ac Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Tue, 15 Sep 2015 08:38:27 -0400 Subject: [PATCH 330/353] better debugging messages around crashes --- libraries/app/application.cpp | 7 ++++++- libraries/chain/db_block.cpp | 9 ++++++++- libraries/plugins/witness/witness.cpp | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp index 62cec1c4..6cfcac80 100644 --- a/libraries/app/application.cpp +++ b/libraries/app/application.cpp @@ -621,7 +621,12 @@ namespace detail { // returns a vector where the first element is the common ancestor with the preferred chain, // and the last element is the reference point you passed in assert(fork_history.size() >= 2); - assert(fork_history.back() == reference_point); + if( fork_history.back() != reference_point ) + { + edump( (fork_history)(reference_point) ); + assert(fork_history.back() == reference_point); + } + block_id_type last_non_fork_block = fork_history.front(); fork_history.erase(fork_history.begin()); // remove the common ancestor diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index 518fccd0..4712cb38 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -79,7 +79,14 @@ const signed_transaction& database::get_recent_transaction(const transaction_id_ std::vector database::get_block_ids_on_fork(block_id_type head_of_fork) const { pair branches = _fork_db.fetch_branch_from(head_block_id(), head_of_fork); - assert(branches.first.back()->previous_id() == branches.second.back()->previous_id()); + if( !((branches.first.back()->previous_id() == branches.second.back()->previous_id())) ) + { + edump( (head_of_fork) + (head_block_id()) + (branches.first.size()) + (branches.second.size()) ); + assert(branches.first.back()->previous_id() == branches.second.back()->previous_id()); + } std::vector result; for (const item_ptr& fork_block : branches.second) result.emplace_back(fork_block->id); diff --git a/libraries/plugins/witness/witness.cpp b/libraries/plugins/witness/witness.cpp index db5154ec..8e3e9baf 100644 --- a/libraries/plugins/witness/witness.cpp +++ b/libraries/plugins/witness/witness.cpp @@ -285,7 +285,7 @@ block_production_condition::block_production_condition_enum witness_plugin::mayb _production_skip_flags ); capture("n", block.block_num())("t", block.timestamp)("c", now); - p2p_node().broadcast(net::block_message(block)); + fc::async( [this,block](){ p2p_node().broadcast(net::block_message(block)); } ); return block_production_condition::produced; } From 1177cfe0ed10026b6b5d112da53bfa6f206845ce Mon Sep 17 00:00:00 2001 From: Eric Frias Date: Tue, 15 Sep 2015 09:16:36 -0400 Subject: [PATCH 331/353] Reverse direction of fork history used in block syncing --- libraries/app/application.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp index 6cfcac80..b2243023 100644 --- a/libraries/app/application.cpp +++ b/libraries/app/application.cpp @@ -42,6 +42,7 @@ #include #include +#include #include @@ -617,18 +618,19 @@ namespace detail { // block is a block we know about, but it is on a fork try { - std::vector fork_history = _chain_db->get_block_ids_on_fork(reference_point); - // returns a vector where the first element is the common ancestor with the preferred chain, - // and the last element is the reference point you passed in + fork_history = _chain_db->get_block_ids_on_fork(reference_point); + // returns a vector where the last element is the common ancestor with the preferred chain, + // and the first element is the reference point you passed in assert(fork_history.size() >= 2); - if( fork_history.back() != reference_point ) + + if( fork_history.front() != reference_point ) { edump( (fork_history)(reference_point) ); - assert(fork_history.back() == reference_point); + assert(fork_history.front() == reference_point); } - - block_id_type last_non_fork_block = fork_history.front(); - fork_history.erase(fork_history.begin()); // remove the common ancestor + block_id_type last_non_fork_block = fork_history.back(); + fork_history.pop_back(); // remove the common ancestor + boost::reverse(fork_history); if (last_non_fork_block == block_id_type()) // if the fork goes all the way back to genesis (does graphene's fork db allow this?) non_fork_high_block_num = 0; From c57806bb85eaa58f95762dbbcfc077c8a083242a Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Tue, 15 Sep 2015 10:54:04 -0400 Subject: [PATCH 332/353] Always generate blocks linking to head_block_id() --- libraries/chain/db_block.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index 4712cb38..7b7933da 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -298,6 +298,12 @@ signed_block database::_generate_block( _pending_block.transaction_merkle_root = _pending_block.calculate_merkle_root(); _pending_block.witness = witness_id; + block_id_type head_id = head_block_id(); + if( _pending_block.previous != head_id ) + { + wlog( "_pending_block.previous was ${old}, setting to head_block_id ${new}", ("old", _pending_block.previous)("new", head_id) ); + _pending_block.previous = head_id; + } if( !(skip & skip_witness_signature) ) _pending_block.sign( block_signing_private_key ); FC_ASSERT( fc::raw::pack_size(_pending_block) <= get_global_properties().parameters.maximum_block_size ); From 422f5762d3a4facecdcd78d7f0f2ca68b71bb9d4 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 16 Sep 2015 09:44:35 -0400 Subject: [PATCH 333/353] Create unit test for genesis ID reservation #281 --- tests/tests/block_tests.cpp | 49 +++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/tests/tests/block_tests.cpp b/tests/tests/block_tests.cpp index f0830d48..dfa4cf0c 100644 --- a/tests/tests/block_tests.cpp +++ b/tests/tests/block_tests.cpp @@ -22,6 +22,7 @@ #include #include +#include #include #include #include @@ -1176,4 +1177,52 @@ BOOST_FIXTURE_TEST_CASE( transaction_invalidated_in_cache, database_fixture ) } } +BOOST_AUTO_TEST_CASE( genesis_reserve_ids ) +{ + try + { + fc::time_point_sec now( GRAPHENE_TESTING_GENESIS_TIMESTAMP ); + fc::temp_directory data_dir( graphene::utilities::temp_directory_path() ); + + uint32_t num_special_accounts = 100; + uint32_t num_special_assets = 30; + + database db; + db.open( data_dir.path(), [&]() -> genesis_state_type + { + genesis_state_type genesis_state = make_genesis(); + genesis_state_type::initial_asset_type usd; + + usd.symbol = "USD"; + usd.issuer_name = "init0"; + usd.description = "federally floated"; + usd.precision = 4; + usd.max_supply = GRAPHENE_MAX_SHARE_SUPPLY; + usd.accumulated_fees = 0; + usd.is_bitasset = true; + + genesis_state.immutable_parameters.num_special_accounts = num_special_accounts; + genesis_state.immutable_parameters.num_special_assets = num_special_assets; + genesis_state.initial_assets.push_back( usd ); + + return genesis_state; + } ); + + const auto& acct_idx = db.get_index_type().indices().get(); + auto acct_itr = acct_idx.find("init0"); + BOOST_REQUIRE( acct_itr != acct_idx.end() ); + BOOST_CHECK( acct_itr->id == account_id_type( num_special_accounts ) ); + + const auto& asset_idx = db.get_index_type().indices().get(); + auto asset_itr = asset_idx.find("USD"); + BOOST_REQUIRE( asset_itr != asset_idx.end() ); + BOOST_CHECK( asset_itr->id == asset_id_type( num_special_assets ) ); + } + catch (fc::exception& e) + { + edump((e.to_detail_string())); + throw; + } +} + BOOST_AUTO_TEST_SUITE_END() From e4a45de1954f50234cb7aaa9d0b6bc0da0509f2e Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 16 Sep 2015 09:56:57 -0400 Subject: [PATCH 334/353] Remove maximum_expiration for good, fix #308 [HARDFORK] --- .../chain/include/graphene/chain/protocol/chain_parameters.hpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp b/libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp index 1f0e8d76..3fb4720f 100644 --- a/libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp +++ b/libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp @@ -41,7 +41,6 @@ namespace graphene { namespace chain { uint32_t committee_proposal_review_period = GRAPHENE_DEFAULT_COMMITTEE_PROPOSAL_REVIEW_PERIOD_SEC; ///< minimum time in seconds that a proposed transaction requiring committee authority may not be signed, prior to expiration uint32_t maximum_transaction_size = GRAPHENE_DEFAULT_MAX_TRANSACTION_SIZE; ///< maximum allowable size in bytes for a transaction uint32_t maximum_block_size = GRAPHENE_DEFAULT_MAX_BLOCK_SIZE; ///< maximum allowable size in bytes for a block - uint32_t maximum_expiration = 0; ///< ignored, but included to ensure we don't hardfork; see #308 uint32_t maximum_time_until_expiration = GRAPHENE_DEFAULT_MAX_TIME_UNTIL_EXPIRATION; ///< maximum lifetime in seconds for transactions to be valid, before expiring uint32_t maximum_proposal_lifetime = GRAPHENE_DEFAULT_MAX_PROPOSAL_LIFETIME_SEC; ///< maximum lifetime in seconds for proposed transactions to be kept, before expiring uint8_t maximum_asset_whitelist_authorities = GRAPHENE_DEFAULT_MAX_ASSET_WHITELIST_AUTHORITIES; ///< maximum number of accounts which an asset may list as authorities for its whitelist OR blacklist @@ -80,7 +79,6 @@ FC_REFLECT( graphene::chain::chain_parameters, (committee_proposal_review_period) (maximum_transaction_size) (maximum_block_size) - (maximum_expiration) (maximum_time_until_expiration) (maximum_proposal_lifetime) (maximum_asset_whitelist_authorities) From 1451f67636165bac33247eadf8f4d1c26055beeb Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 16 Sep 2015 10:43:26 -0400 Subject: [PATCH 335/353] block_tests.cpp: Implement miss_many_blocks test #313 --- tests/tests/block_tests.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tests/tests/block_tests.cpp b/tests/tests/block_tests.cpp index dfa4cf0c..bc9722e3 100644 --- a/tests/tests/block_tests.cpp +++ b/tests/tests/block_tests.cpp @@ -1225,4 +1225,24 @@ BOOST_AUTO_TEST_CASE( genesis_reserve_ids ) } } +BOOST_FIXTURE_TEST_CASE( miss_many_blocks, database_fixture ) +{ + try + { + generate_block(); + generate_block(); + generate_block(); + // miss 10 maintenance intervals + generate_blocks( db.get_dynamic_global_properties().next_maintenance_time + db.get_global_properties().parameters.maintenance_interval * 10, true ); + generate_block(); + generate_block(); + generate_block(); + } + catch (fc::exception& e) + { + edump((e.to_detail_string())); + throw; + } +} + BOOST_AUTO_TEST_SUITE_END() From 81cc8e4d8175b3ba69866cf06fefcc8fed694b98 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 16 Sep 2015 11:07:36 -0400 Subject: [PATCH 336/353] Fix maintenance time computation #313 --- libraries/chain/db_maint.cpp | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/libraries/chain/db_maint.cpp b/libraries/chain/db_maint.cpp index cbe091ed..0001af71 100644 --- a/libraries/chain/db_maint.cpp +++ b/libraries/chain/db_maint.cpp @@ -521,10 +521,25 @@ void database::perform_chain_maintenance(const signed_block& next_block, const g next_maintenance_time = time_point_sec() + (((next_block.timestamp.sec_since_epoch() / maintenance_interval) + 1) * maintenance_interval); else - // It's possible we have missed blocks for at least a maintenance interval. - // In this case, we'll need to bump the next maintenance time more than once. - do next_maintenance_time += maintenance_interval; - while( next_maintenance_time < head_block_time() ); + { + // We want to find the smallest k such that next_maintenance_time + k * maintenance_interval > head_block_time() + // This implies k > ( head_block_time() - next_maintenance_time ) / maintenance_interval + // + // Let y be the right-hand side of this inequality, i.e. + // y = ( head_block_time() - next_maintenance_time ) / maintenance_interval + // + // and let the fractional part f be y-floor(y). Clearly 0 <= f < 1. + // We can rewrite f = y-floor(y) as floor(y) = y-f. + // + // Clearly k = floor(y)+1 has k > y as desired. Now we must + // show that this is the least such k, i.e. k-1 <= y. + // + // But k-1 = floor(y)+1-1 = floor(y) = y-f <= y. + // So this k suffices. + // + auto y = (head_block_time() - next_maintenance_time).to_seconds() / maintenance_interval; + next_maintenance_time += (y+1) * maintenance_interval; + } } modify(get_dynamic_global_properties(), [next_maintenance_time](dynamic_global_property_object& d) { From c6cb743588ccf60752ced80477661e5eff97f219 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 16 Sep 2015 11:09:53 -0400 Subject: [PATCH 337/353] db_management.cpp: Remove loop that does nothing --- libraries/chain/db_management.cpp | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/libraries/chain/db_management.cpp b/libraries/chain/db_management.cpp index c33b3ad1..2010bc1f 100644 --- a/libraries/chain/db_management.cpp +++ b/libraries/chain/db_management.cpp @@ -131,34 +131,19 @@ void database::open( FC_CAPTURE_AND_RETHROW( (data_dir) ) } - void database::close(uint32_t blocks_to_rewind) { _pending_block_session.reset(); - for(uint32_t i = 0; i < blocks_to_rewind && head_block_num() > 0; ++i) - { - block_id_type popped_block_id = head_block_id(); - pop_block(); - _fork_db.remove(popped_block_id); - try - { - _block_id_to_block.remove(popped_block_id); - } - catch (const fc::key_not_found_exception&) - { - } - } - // pop all of the blocks that we can given our undo history, this should // throw when there is no more undo history to pop - try + try { - while( true ) - { - elog("pop"); + while( true ) + { + elog("pop"); block_id_type popped_block_id = head_block_id(); - pop_block(); + pop_block(); _fork_db.remove(popped_block_id); // doesn't throw on missing try { @@ -167,8 +152,8 @@ void database::close(uint32_t blocks_to_rewind) catch (const fc::key_not_found_exception&) { } - } - } + } + } catch (...) { } From ec030ee46cffa4b1f7165cfa4a058c10d8ed37ae Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 16 Sep 2015 11:45:21 -0400 Subject: [PATCH 338/353] vesting_balance_evaluator.cpp: Add some logging #312 --- libraries/chain/vesting_balance_evaluator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/chain/vesting_balance_evaluator.cpp b/libraries/chain/vesting_balance_evaluator.cpp index 48bc8492..41780db9 100644 --- a/libraries/chain/vesting_balance_evaluator.cpp +++ b/libraries/chain/vesting_balance_evaluator.cpp @@ -100,7 +100,7 @@ void_result vesting_balance_withdraw_evaluator::do_evaluate( const vesting_balan const vesting_balance_object& vbo = op.vesting_balance( d ); FC_ASSERT( op.owner == vbo.owner ); - FC_ASSERT( vbo.is_withdraw_allowed( now, op.amount ) ); + FC_ASSERT( vbo.is_withdraw_allowed( now, op.amount ), "", ("now", now)("op", op)("vbo", vbo) ); assert( op.amount <= vbo.balance ); // is_withdraw_allowed should fail before this check is reached /* const account_object& owner_account = */ op.owner( d ); From e0414d390e684ae59a326dff5496f04813f215c3 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 16 Sep 2015 15:50:09 -0400 Subject: [PATCH 339/353] Fix pending_block and fork handling The pending_block member of database was a premature optimization and had an unfortunate tendency to get out of sync, especially when switching forks. This commit removes it, and substantially improves the handling of transactions when switching forks. Specifically, flooding or forking no longer causes nodes to discard valid transactions. --- libraries/chain/db_block.cpp | 169 ++++++++++-------- libraries/chain/db_maint.cpp | 21 +-- libraries/chain/db_management.cpp | 12 +- libraries/chain/db_update.cpp | 6 - libraries/chain/fork_database.cpp | 2 + .../chain/include/graphene/chain/database.hpp | 10 +- .../chain/include/graphene/chain/db_with.hpp | 23 ++- .../include/graphene/chain/exceptions.hpp | 2 + 8 files changed, 131 insertions(+), 114 deletions(-) diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index 7b7933da..edd19243 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -106,7 +106,7 @@ bool database::push_block(const signed_block& new_block, uint32_t skip) bool result; detail::with_skip_flags( *this, skip, [&]() { - detail::without_pending_transactions( *this, std::move(_pending_block.transactions), + detail::without_pending_transactions( *this, std::move(_pending_tx), [&]() { result = _push_block(new_block); @@ -131,7 +131,7 @@ bool database::_push_block(const signed_block& new_block) //Only switch forks if new_head is actually higher than head if( new_head->data.block_num() > head_block_num() ) { - auto branches = _fork_db.fetch_branch_from(new_head->data.id(), _pending_block.previous); + auto branches = _fork_db.fetch_branch_from(new_head->data.id(), head_block_id()); // pop blocks until we hit the forked block while( head_block_id() != branches.second.back()->data.previous ) @@ -214,20 +214,23 @@ processed_transaction database::push_transaction( const signed_transaction& trx, processed_transaction database::_push_transaction( const signed_transaction& trx ) { - uint32_t skip = get_node_properties().skip_flags; // If this is the first transaction pushed after applying a block, start a new undo session. // This allows us to quickly rewind to the clean state of the head block, in case a new block arrives. - if( !_pending_block_session ) _pending_block_session = _undo_db.start_undo_session(); - auto session = _undo_db.start_undo_session(); - auto processed_trx = _apply_transaction( trx ); - _pending_block.transactions.push_back(processed_trx); + if( !_pending_tx_session.valid() ) + _pending_tx_session = _undo_db.start_undo_session(); - FC_ASSERT( (skip & skip_block_size_check) || - fc::raw::pack_size(_pending_block) <= get_global_properties().parameters.maximum_block_size ); + // Create a temporary undo session as a child of _pending_tx_session. + // The temporary session will be discarded by the destructor if + // _apply_transaction fails. If we make it to merge(), we + // apply the changes. + + auto temp_session = _undo_db.start_undo_session(); + auto processed_trx = _apply_transaction( trx ); + _pending_tx.push_back(processed_trx); notify_changed_objects(); // The transaction applied successfully. Merge its changes into the pending block session. - session.merge(); + temp_session.merge(); // notify anyone listening to pending transactions on_pending_transaction( trx ); @@ -293,68 +296,77 @@ signed_block database::_generate_block( if( !(skip & skip_witness_signature) ) FC_ASSERT( witness_obj.signing_key == block_signing_private_key.get_public_key() ); - _pending_block.timestamp = when; + static const size_t max_block_header_size = fc::raw::pack_size( signed_block_header() ) + 4; + auto maximum_block_size = get_global_properties().parameters.maximum_block_size; + size_t total_block_size = max_block_header_size; - _pending_block.transaction_merkle_root = _pending_block.calculate_merkle_root(); + signed_block pending_block; - _pending_block.witness = witness_id; - block_id_type head_id = head_block_id(); - if( _pending_block.previous != head_id ) + // + // The following code throws away existing pending_tx_session and + // rebuilds it by re-applying pending transactions. + // + // This rebuild is necessary because pending transactions' validity + // and semantics may have changed since they were received, because + // time-based semantics are evaluated based on the current block + // time. These changes can only be reflected in the database when + // the value of the "when" variable is known, which means we need to + // re-apply pending transactions in this method. + // + _pending_tx_session.reset(); + _pending_tx_session = _undo_db.start_undo_session(); + + uint64_t postponed_tx_count = 0; + // pop pending state (reset to head block state) + for( const processed_transaction& tx : _pending_tx ) { - wlog( "_pending_block.previous was ${old}, setting to head_block_id ${new}", ("old", _pending_block.previous)("new", head_id) ); - _pending_block.previous = head_id; - } - if( !(skip & skip_witness_signature) ) _pending_block.sign( block_signing_private_key ); + size_t new_total_size = total_block_size + fc::raw::pack_size( tx ); - FC_ASSERT( fc::raw::pack_size(_pending_block) <= get_global_properties().parameters.maximum_block_size ); - signed_block tmp = _pending_block; - tmp.transaction_merkle_root = tmp.calculate_merkle_root(); - _pending_block.transactions.clear(); - - bool failed = false; - try { push_block( tmp, skip ); } - catch ( const undo_database_exception& e ) { throw; } - catch ( const fc::exception& e ) - { - if( !retry_on_failure ) + // postpone transaction if it would make block too big + if( new_total_size >= maximum_block_size ) { - failed = true; + postponed_tx_count++; + continue; } - else + + try { - wlog( "Reason for block production failure: ${e}", ("e",e) ); - throw; + auto temp_session = _undo_db.start_undo_session(); + processed_transaction ptx = _apply_transaction( tx ); + temp_session.merge(); + + // We have to recompute pack_size(ptx) because it may be different + // than pack_size(tx) (i.e. if one or more results increased + // their size) + total_block_size += fc::raw::pack_size( ptx ); + pending_block.transactions.push_back( ptx ); + } + catch ( const fc::exception& e ) + { + // Do nothing, transaction will not be re-applied + wlog( "Transaction was not processed while generating block due to ${e}", ("e", e) ); + wlog( "The transaction was ${t}", ("t", tx) ); } } - if( failed ) + if( postponed_tx_count > 0 ) { - uint32_t failed_tx_count = 0; - for( const auto& trx : tmp.transactions ) - { - try - { - push_transaction( trx, skip ); - } - catch ( const fc::exception& e ) - { - wlog( "Transaction is no longer valid: ${trx}", ("trx",trx) ); - failed_tx_count++; - } - } - if( failed_tx_count == 0 ) - { - // - // this is in generate_block() so this intensive logging - // (dumping a whole block) should be rate-limited - // to once per block production attempt - // - // TODO: Turn this off again once #261 is resolved. - // - wlog( "Block creation failed even though all tx's are still valid. Block: ${b}", ("b",tmp) ); - } - return _generate_block( when, witness_id, block_signing_private_key, false ); + wlog( "Postponed ${n} transactions due to block size limit", ("n", postponed_tx_count) ); } - return tmp; + _pending_tx_session.reset(); + + pending_block.previous = head_block_id(); + pending_block.timestamp = when; + pending_block.transaction_merkle_root = pending_block.calculate_merkle_root(); + pending_block.witness = witness_id; + + if( !(skip & skip_witness_signature) ) + pending_block.sign( block_signing_private_key ); + + FC_ASSERT( fc::raw::pack_size(pending_block) <= get_global_properties().parameters.maximum_block_size ); + + push_block( pending_block, skip ); + + return pending_block; } FC_CAPTURE_AND_RETHROW( (witness_id) ) } /** @@ -363,19 +375,23 @@ signed_block database::_generate_block( */ void database::pop_block() { try { - _pending_block_session.reset(); - auto prev = _pending_block.previous; + _pending_tx_session.reset(); + auto head_id = head_block_id(); + optional head_block = fetch_block_by_id( head_id ); + GRAPHENE_ASSERT( head_block.valid(), pop_empty_chain, "there are no blocks to pop" ); pop_undo(); - _block_id_to_block.remove( prev ); - _pending_block.previous = head_block_id(); - _pending_block.timestamp = head_block_time(); + _block_id_to_block.remove( head_id ); _fork_db.pop_block(); + + _popped_tx.insert( _popped_tx.begin(), head_block->transactions.begin(), head_block->transactions.end() ); + } FC_CAPTURE_AND_RETHROW() } void database::clear_pending() { try { - _pending_block.transactions.clear(); - _pending_block_session.reset(); + assert( (_pending_tx.size() == 0) || _pending_tx_session.valid() ); + _pending_tx.clear(); + _pending_tx_session.reset(); } FC_CAPTURE_AND_RETHROW() } uint32_t database::push_applied_operation( const operation& op ) @@ -451,11 +467,8 @@ void database::_apply_block( const signed_block& next_block ) update_global_dynamic_data(next_block); update_signing_witness(signing_witness, next_block); - auto current_block_interval = global_props.parameters.block_interval; - // Are we at the maintenance interval? if( maint_needed ) - // This will update _pending_block.timestamp if the block interval has changed perform_chain_maintenance(next_block, global_props); create_block_summary(next_block); @@ -477,8 +490,6 @@ void database::_apply_block( const signed_block& next_block ) _applied_ops.clear(); notify_changed_objects(); - - update_pending_block(next_block, current_block_interval); } FC_CAPTURE_AND_RETHROW( (next_block.block_num()) ) } void database::notify_changed_objects() @@ -542,9 +553,11 @@ processed_transaction database::_apply_transaction(const signed_transaction& trx FC_ASSERT( trx.ref_block_prefix == tapos_block_summary.block_id._hash[1] ); } - FC_ASSERT( trx.expiration <= _pending_block.timestamp + chain_parameters.maximum_time_until_expiration, "", - ("trx.expiration",trx.expiration)("_pending_block.timestamp",_pending_block.timestamp)("max_til_exp",chain_parameters.maximum_time_until_expiration)); - FC_ASSERT( _pending_block.timestamp <= trx.expiration, "", ("pending.timestamp",_pending_block.timestamp)("trx.exp",trx.expiration) ); + fc::time_point_sec now = head_block_time(); + + FC_ASSERT( trx.expiration <= now + chain_parameters.maximum_time_until_expiration, "", + ("trx.expiration",trx.expiration)("now",now)("max_til_exp",chain_parameters.maximum_time_until_expiration)); + FC_ASSERT( now <= trx.expiration, "", ("now",now)("trx.exp",trx.expiration) ); } //Insert transaction into unique transactions database. @@ -595,8 +608,8 @@ operation_result database::apply_operation(transaction_evaluation_state& eval_st const witness_object& database::validate_block_header( uint32_t skip, const signed_block& next_block )const { - FC_ASSERT( _pending_block.previous == next_block.previous, "", ("pending.prev",_pending_block.previous)("next.prev",next_block.previous) ); - FC_ASSERT( _pending_block.timestamp <= next_block.timestamp, "", ("_pending_block.timestamp",_pending_block.timestamp)("next",next_block.timestamp)("blocknum",next_block.block_num()) ); + FC_ASSERT( head_block_id() == next_block.previous, "", ("head_block_id",head_block_id())("next.prev",next_block.previous) ); + FC_ASSERT( head_block_time() < next_block.timestamp, "", ("head_block_time",head_block_time())("next",next_block.timestamp)("blocknum",next_block.block_num()) ); const witness_object& witness = next_block.witness(*this); if( !(skip&skip_witness_signature) ) diff --git a/libraries/chain/db_maint.cpp b/libraries/chain/db_maint.cpp index 0001af71..b6a4ae98 100644 --- a/libraries/chain/db_maint.cpp +++ b/libraries/chain/db_maint.cpp @@ -103,7 +103,7 @@ void database::pay_workers( share_type& budget ) vector> active_workers; get_index_type().inspect_all_objects([this, &active_workers](const object& o) { const worker_object& w = static_cast(o); - auto now = _pending_block.timestamp; + auto now = head_block_time(); if( w.is_active(now) && w.approving_stake(_vote_tally_buffer) > 0 ) active_workers.emplace_back(w); }); @@ -122,10 +122,10 @@ void database::pay_workers( share_type& budget ) { const worker_object& active_worker = active_workers[i]; share_type requested_pay = active_worker.daily_pay; - if( _pending_block.timestamp - get_dynamic_global_properties().last_budget_time != fc::days(1) ) + if( head_block_time() - get_dynamic_global_properties().last_budget_time != fc::days(1) ) { fc::uint128 pay(requested_pay.value); - pay *= (_pending_block.timestamp - get_dynamic_global_properties().last_budget_time).count(); + pay *= (head_block_time() - get_dynamic_global_properties().last_budget_time).count(); pay /= fc::days(1).count(); requested_pay = pay.to_uint64(); } @@ -322,7 +322,7 @@ void database::process_budget() const dynamic_global_property_object& dpo = get_dynamic_global_properties(); const asset_dynamic_data_object& core = asset_id_type(0)(*this).dynamic_asset_data_id(*this); - fc::time_point_sec now = _pending_block.timestamp; + fc::time_point_sec now = head_block_time(); int64_t time_to_maint = (dpo.next_maintenance_time - now).to_seconds(); // @@ -499,19 +499,6 @@ void database::perform_chain_maintenance(const signed_block& next_block, const g } }); - auto new_block_interval = global_props.parameters.block_interval; - - // if block interval CHANGED during this block *THEN* we cannot simply - // add the interval if we want to maintain the invariant that all timestamps are a multiple - // of the interval. - _pending_block.timestamp = next_block.timestamp + fc::seconds(new_block_interval); - uint32_t r = _pending_block.timestamp.sec_since_epoch()%new_block_interval; - if( !r ) - { - _pending_block.timestamp -= r; - assert( (_pending_block.timestamp.sec_since_epoch() % new_block_interval) == 0 ); - } - auto next_maintenance_time = get(dynamic_global_property_id_type()).next_maintenance_time; auto maintenance_interval = gpo.parameters.maintenance_interval; diff --git a/libraries/chain/db_management.cpp b/libraries/chain/db_management.cpp index 2010bc1f..47505942 100644 --- a/libraries/chain/db_management.cpp +++ b/libraries/chain/db_management.cpp @@ -32,9 +32,9 @@ database::database() initialize_evaluators(); } -database::~database(){ - if( _pending_block_session ) - _pending_block_session->commit(); +database::~database() +{ + clear_pending(); } void database::reindex(fc::path data_dir, const genesis_state_type& initial_allocation) @@ -113,9 +113,6 @@ void database::open( if( !find(global_property_id_type()) ) init_genesis(genesis_loader()); - _pending_block.previous = head_block_id(); - _pending_block.timestamp = head_block_time(); - fc::optional last_block = _block_id_to_block.last(); if( last_block.valid() ) { @@ -133,7 +130,8 @@ void database::open( void database::close(uint32_t blocks_to_rewind) { - _pending_block_session.reset(); + // TODO: Save pending tx's on close() + clear_pending(); // pop all of the blocks that we can given our undo history, this should // throw when there is no more undo history to pop diff --git a/libraries/chain/db_update.cpp b/libraries/chain/db_update.cpp index debb05a0..662c5743 100644 --- a/libraries/chain/db_update.cpp +++ b/libraries/chain/db_update.cpp @@ -97,12 +97,6 @@ void database::update_signing_witness(const witness_object& signing_witness, con } ); } -void database::update_pending_block(const signed_block& next_block, uint8_t current_block_interval) -{ - _pending_block.timestamp = next_block.timestamp + current_block_interval; - _pending_block.previous = next_block.id(); -} - void database::clear_expired_transactions() { //Look for expired transactions in the deduplication list, and remove them. diff --git a/libraries/chain/fork_database.cpp b/libraries/chain/fork_database.cpp index 5604d1c4..9d2d9420 100644 --- a/libraries/chain/fork_database.cpp +++ b/libraries/chain/fork_database.cpp @@ -186,6 +186,8 @@ vector fork_database::fetch_block_by_number(uint32_t num)const pair fork_database::fetch_branch_from(block_id_type first, block_id_type second)const { try { + // This function gets a branch (i.e. vector) leading + // back to the most recent common ancestor. pair result; auto first_branch_itr = _index.get().find(first); FC_ASSERT(first_branch_itr != _index.get().end()); diff --git a/libraries/chain/include/graphene/chain/database.hpp b/libraries/chain/include/graphene/chain/database.hpp index 4445654a..af417624 100644 --- a/libraries/chain/include/graphene/chain/database.hpp +++ b/libraries/chain/include/graphene/chain/database.hpp @@ -379,6 +379,11 @@ namespace graphene { namespace chain { */ processed_transaction validate_transaction( const signed_transaction& trx ); + + /** when popping a block, the transactions that were removed get cached here so they + * can be reapplied at the proper time */ + std::deque< signed_transaction > _popped_tx; + /** * @} */ @@ -388,7 +393,7 @@ namespace graphene { namespace chain { void notify_changed_objects(); private: - optional _pending_block_session; + optional _pending_tx_session; vector< unique_ptr > _operation_evaluators; template @@ -413,7 +418,6 @@ namespace graphene { namespace chain { //////////////////// db_update.cpp //////////////////// void update_global_dynamic_data( const signed_block& b ); void update_signing_witness(const witness_object& signing_witness, const signed_block& new_block); - void update_pending_block(const signed_block& next_block, uint8_t current_block_interval); void clear_expired_transactions(); void clear_expired_proposals(); void clear_expired_orders(); @@ -439,7 +443,7 @@ namespace graphene { namespace chain { ///@} ///@} - signed_block _pending_block; + vector< processed_transaction > _pending_tx; fork_database _fork_db; /** diff --git a/libraries/chain/include/graphene/chain/db_with.hpp b/libraries/chain/include/graphene/chain/db_with.hpp index 09781f0f..9a08cdd7 100644 --- a/libraries/chain/include/graphene/chain/db_with.hpp +++ b/libraries/chain/include/graphene/chain/db_with.hpp @@ -56,6 +56,9 @@ struct skip_flags_restorer /** * Class used to help the without_pending_transactions * implementation. + * + * TODO: Change the name of this class to better reflect the fact + * that it restores popped transactions as well as pending transactions. */ struct pending_transactions_restorer { @@ -67,13 +70,27 @@ struct pending_transactions_restorer ~pending_transactions_restorer() { + for( const auto& tx : _db._popped_tx ) + { + try { + if( !_db.is_known_transaction( tx.id() ) ) { + // since push_transaction() takes a signed_transaction, + // the operation_results field will be ignored. + _db._push_transaction( tx ); + } + } catch ( const fc::exception& ) { + } + } + _db._popped_tx.clear(); for( const processed_transaction& tx : _pending_transactions ) { try { - // since push_transaction() takes a signed_transaction, - // the operation_results field will be ignored. - _db.push_transaction( tx ); + if( !_db.is_known_transaction( tx.id() ) ) { + // since push_transaction() takes a signed_transaction, + // the operation_results field will be ignored. + _db._push_transaction( tx ); + } } catch( const fc::exception& e ) { diff --git a/libraries/chain/include/graphene/chain/exceptions.hpp b/libraries/chain/include/graphene/chain/exceptions.hpp index 3860e33b..7bdc7ca5 100644 --- a/libraries/chain/include/graphene/chain/exceptions.hpp +++ b/libraries/chain/include/graphene/chain/exceptions.hpp @@ -82,6 +82,8 @@ namespace graphene { namespace chain { FC_DECLARE_DERIVED_EXCEPTION( invalid_pts_address, graphene::chain::utility_exception, 3060001, "invalid pts address" ) FC_DECLARE_DERIVED_EXCEPTION( insufficient_feeds, graphene::chain::chain_exception, 37006, "insufficient feeds" ) + FC_DECLARE_DERIVED_EXCEPTION( pop_empty_chain, graphene::chain::undo_database_exception, 3070001, "there are no blocks to pop" ) + GRAPHENE_DECLARE_OP_BASE_EXCEPTIONS( transfer ); GRAPHENE_DECLARE_OP_EVALUATE_EXCEPTION( from_account_not_whitelisted, transfer, 1, "owner mismatch" ) GRAPHENE_DECLARE_OP_EVALUATE_EXCEPTION( to_account_not_whitelisted, transfer, 2, "owner mismatch" ) From 60f683379527ebccb6974bc3fa24f7f1ec2b62ec Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Wed, 16 Sep 2015 16:37:54 -0400 Subject: [PATCH 340/353] database_fixture.cpp: Fail assert instead of segfault if asset or account is not found --- tests/common/database_fixture.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/common/database_fixture.cpp b/tests/common/database_fixture.cpp index 9c86055d..00101b54 100644 --- a/tests/common/database_fixture.cpp +++ b/tests/common/database_fixture.cpp @@ -395,12 +395,18 @@ account_create_operation database_fixture::make_account( const asset_object& database_fixture::get_asset( const string& symbol )const { - return *db.get_index_type().indices().get().find(symbol); + const auto& idx = db.get_index_type().indices().get(); + const auto itr = idx.find(symbol); + assert( itr != idx.end() ); + return *itr; } const account_object& database_fixture::get_account( const string& name )const { - return *db.get_index_type().indices().get().find(name); + const auto& idx = db.get_index_type().indices().get(); + const auto itr = idx.find(name); + assert( itr != idx.end() ); + return *itr; } const asset_object& database_fixture::create_bitasset( From b9727e6e1c0b1b6acb020fdf17a49eb8ca93f213 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Thu, 17 Sep 2015 11:23:55 -0400 Subject: [PATCH 341/353] Increase logging, improve error messages --- libraries/chain/db_block.cpp | 3 ++- libraries/chain/db_management.cpp | 5 ++--- libraries/chain/include/graphene/chain/db_with.hpp | 7 ++++--- libraries/chain/proposal_evaluator.cpp | 2 +- tests/tests/authority_tests.cpp | 1 + 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index edd19243..52d144e9 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -102,7 +102,7 @@ std::vector database::get_block_ids_on_fork(block_id_type head_of */ bool database::push_block(const signed_block& new_block, uint32_t skip) { - idump((new_block.block_num())(new_block.id())); + //idump((new_block.block_num())(new_block.id())(new_block.timestamp)(new_block.previous)); bool result; detail::with_skip_flags( *this, skip, [&]() { @@ -131,6 +131,7 @@ bool database::_push_block(const signed_block& new_block) //Only switch forks if new_head is actually higher than head if( new_head->data.block_num() > head_block_num() ) { + wlog( "Switching to fork: ${id}", ("id",new_head->data.id()) ); auto branches = _fork_db.fetch_branch_from(new_head->data.id(), head_block_id()); // pop blocks until we hit the forked block diff --git a/libraries/chain/db_management.cpp b/libraries/chain/db_management.cpp index 47505942..5193eee5 100644 --- a/libraries/chain/db_management.cpp +++ b/libraries/chain/db_management.cpp @@ -103,7 +103,6 @@ void database::open( const fc::path& data_dir, std::function genesis_loader ) { - elog( "Open Database" ); try { object_database::open(data_dir); @@ -123,7 +122,7 @@ void database::open( FC_ASSERT( head_block_num() == 0, "last block ID does not match current chain state" ); } } - idump((head_block_id())(head_block_num())); + //idump((head_block_id())(head_block_num())); } FC_CAPTURE_AND_RETHROW( (data_dir) ) } @@ -139,7 +138,7 @@ void database::close(uint32_t blocks_to_rewind) { while( true ) { - elog("pop"); + // elog("pop"); block_id_type popped_block_id = head_block_id(); pop_block(); _fork_db.remove(popped_block_id); // doesn't throw on missing diff --git a/libraries/chain/include/graphene/chain/db_with.hpp b/libraries/chain/include/graphene/chain/db_with.hpp index 9a08cdd7..d8748ea9 100644 --- a/libraries/chain/include/graphene/chain/db_with.hpp +++ b/libraries/chain/include/graphene/chain/db_with.hpp @@ -94,9 +94,10 @@ struct pending_transactions_restorer } catch( const fc::exception& e ) { - wlog( "Pending transaction became invalid after switching to block ${b}", ("b", _db.head_block_id()) ); - wlog( "The invalid pending transaction is ${t}", ("t", tx) ); - wlog( "The invalid pending transaction caused exception ${e}", ("e", e) ); + /* + wlog( "Pending transaction became invalid after switching to block ${b} ${t}", ("b", _db.head_block_id())("t",_db.head_block_time()) ); + wlog( "The invalid pending transaction caused exception ${e}", ("e", e.to_detail_string() ) ); + */ } } } diff --git a/libraries/chain/proposal_evaluator.cpp b/libraries/chain/proposal_evaluator.cpp index 6512c244..f9c7448b 100644 --- a/libraries/chain/proposal_evaluator.cpp +++ b/libraries/chain/proposal_evaluator.cpp @@ -58,7 +58,7 @@ void_result proposal_create_evaluator::do_evaluate(const proposal_create_operati GRAPHENE_ASSERT( *o.review_period_seconds >= global_parameters.committee_proposal_review_period, proposal_create_review_period_insufficient, - "Review period of ${t} required, but at least ${min} required", + "Review period of ${t} specified, but at least ${min} required", ("t", *o.review_period_seconds) ("min", global_parameters.committee_proposal_review_period) ); diff --git a/tests/tests/authority_tests.cpp b/tests/tests/authority_tests.cpp index eeed0949..4c105672 100644 --- a/tests/tests/authority_tests.cpp +++ b/tests/tests/authority_tests.cpp @@ -557,6 +557,7 @@ BOOST_FIXTURE_TEST_CASE( fired_committee_members, database_fixture ) PUSH_TX( db, trx, ~0 ); trx.operations.clear(); } + idump((get_balance(*nathan, asset_id_type()(db)))); // still no money BOOST_CHECK_EQUAL(get_balance(*nathan, asset_id_type()(db)), 5000); From b5db094b3b96f63e67729704f16e815807d7586e Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Thu, 17 Sep 2015 11:29:26 -0400 Subject: [PATCH 342/353] Fix broken unit tests --- tests/common/database_fixture.cpp | 4 +++- tests/tests/authority_tests.cpp | 31 +++++++++++++++++-------------- tests/tests/block_tests.cpp | 8 +++++--- 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/tests/common/database_fixture.cpp b/tests/common/database_fixture.cpp index 00101b54..b7325a7f 100644 --- a/tests/common/database_fixture.cpp +++ b/tests/common/database_fixture.cpp @@ -296,9 +296,11 @@ signed_block database_fixture::generate_block(uint32_t skip, const fc::ecc::priv skip |= database::skip_undo_history_check; // skip == ~0 will skip checks specified in database::validation_steps - return db.generate_block(db.get_slot_time(miss_blocks + 1), + auto block = db.generate_block(db.get_slot_time(miss_blocks + 1), db.get_scheduled_witness(miss_blocks + 1), key, skip); + db.clear_pending(); + return block; } void database_fixture::generate_blocks( uint32_t block_count ) diff --git a/tests/tests/authority_tests.cpp b/tests/tests/authority_tests.cpp index 4c105672..917034d8 100644 --- a/tests/tests/authority_tests.cpp +++ b/tests/tests/authority_tests.cpp @@ -488,10 +488,12 @@ BOOST_FIXTURE_TEST_CASE( fired_committee_members, database_fixture ) nathan = &get_account("nathan"); flat_set committee_members; + /* db.modify(db.get_global_properties(), [](global_property_object& p) { // Turn the review period WAY down, so it doesn't take long to produce blocks to that point in simulated time. p.parameters.committee_proposal_review_period = fc::days(1).to_seconds(); }); + */ for( int i = 0; i < 15; ++i ) { @@ -499,11 +501,14 @@ BOOST_FIXTURE_TEST_CASE( fired_committee_members, database_fixture ) upgrade_to_lifetime_member(account); committee_members.insert(create_committee_member(account).vote_id); } + BOOST_REQUIRE_EQUAL(get_balance(*nathan, asset_id_type()(db)), 5000); //A proposal is created to give nathan lots more money. proposal_create_operation pop = proposal_create_operation::committee_proposal(db.get_global_properties().parameters, db.head_block_time()); pop.fee_paying_account = GRAPHENE_TEMP_ACCOUNT; - pop.expiration_time = db.head_block_time() + *pop.review_period_seconds * 3; + pop.expiration_time = db.head_block_time() + *pop.review_period_seconds + fc::days(1).to_seconds(); + ilog( "Creating proposal to give nathan money that expires: ${e}", ("e", pop.expiration_time ) ); + ilog( "The proposal has a review period of: ${r} sec", ("r",*pop.review_period_seconds) ); transfer_operation top; top.to = nathan->id; @@ -514,37 +519,35 @@ BOOST_FIXTURE_TEST_CASE( fired_committee_members, database_fixture ) proposal_id_type pid = prop.id; BOOST_CHECK(!pid(db).is_authorized_to_execute(db)); + ilog( "commitee member approves proposal" ); //committee key approves of the proposal. proposal_update_operation uop; uop.fee_paying_account = GRAPHENE_TEMP_ACCOUNT; uop.proposal = pid; uop.key_approvals_to_add.emplace(init_account_pub_key); - /* TODO: what should this really be? - uop.key_approvals_to_add.emplace(2); - uop.key_approvals_to_add.emplace(3); - uop.key_approvals_to_add.emplace(4); - uop.key_approvals_to_add.emplace(5); - uop.key_approvals_to_add.emplace(6); - uop.key_approvals_to_add.emplace(7); - uop.key_approvals_to_add.emplace(8); - uop.key_approvals_to_add.emplace(9); - */ trx.operations.back() = uop; sign( trx, committee_key ); PUSH_TX( db, trx ); BOOST_CHECK(pid(db).is_authorized_to_execute(db)); + ilog( "Generating blocks for 2 days" ); + generate_block(); + BOOST_REQUIRE_EQUAL(get_balance(*nathan, asset_id_type()(db)), 5000); + generate_block(); + BOOST_REQUIRE_EQUAL(get_balance(*nathan, asset_id_type()(db)), 5000); //Time passes... the proposal is now in its review period. - generate_blocks(*pid(db).review_period_time); + //generate_blocks(*pid(db).review_period_time); + generate_blocks(db.head_block_time() + fc::days(2) ); + ilog( "head block time: ${t}", ("t",db.head_block_time())); fc::time_point_sec maintenance_time = db.get_dynamic_global_properties().next_maintenance_time; BOOST_CHECK_LT(maintenance_time.sec_since_epoch(), pid(db).expiration_time.sec_since_epoch()); //Yay! The proposal to give nathan more money is authorized. - BOOST_CHECK(pid(db).is_authorized_to_execute(db)); + BOOST_REQUIRE(pid(db).is_authorized_to_execute(db)); nathan = &get_account("nathan"); // no money yet - BOOST_CHECK_EQUAL(get_balance(*nathan, asset_id_type()(db)), 5000); + BOOST_REQUIRE_EQUAL(get_balance(*nathan, asset_id_type()(db)), 5000); { //Oh noes! Nathan votes for a whole new slate of committee_members! diff --git a/tests/tests/block_tests.cpp b/tests/tests/block_tests.cpp index bc9722e3..e64b0c11 100644 --- a/tests/tests/block_tests.cpp +++ b/tests/tests/block_tests.cpp @@ -464,8 +464,10 @@ BOOST_AUTO_TEST_CASE( switch_forks_undo_create ) aw = db2.get_global_properties().active_witnesses; b = db2.generate_block(db2.get_slot_time(1), db2.get_scheduled_witness(1), init_account_priv_key, database::skip_nothing); db1.push_block(b); - - GRAPHENE_CHECK_THROW(nathan_id(db1), fc::exception); + GRAPHENE_REQUIRE_THROW(nathan_id(db2), fc::exception); + nathan_id(db1); /// it should be included in the pending state + db1.clear_pending(); // clear it so that we can verify it was properly removed from pending state. + GRAPHENE_REQUIRE_THROW(nathan_id(db1), fc::exception); PUSH_TX( db2, trx ); @@ -550,7 +552,7 @@ BOOST_AUTO_TEST_CASE( tapos ) signed_transaction trx; //This transaction must be in the next block after its reference, or it is invalid. - trx.set_expiration( db1.get_slot_time(1) ); + trx.set_expiration( db1.head_block_time() ); //db1.get_slot_time(1) ); trx.set_reference_block( db1.head_block_id() ); account_id_type nathan_id = account_idx.get_next_id(); From e008cbb70b52b859b2cf55373ab9ff257a133fdd Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Thu, 17 Sep 2015 13:45:12 -0400 Subject: [PATCH 343/353] database_api.cpp: Include smart_ref_impl, fix #321 --- libraries/app/database_api.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/app/database_api.cpp b/libraries/app/database_api.cpp index cebfdc89..67717855 100644 --- a/libraries/app/database_api.cpp +++ b/libraries/app/database_api.cpp @@ -2,6 +2,7 @@ #include #include +#include #include From f0502ee2f15bdbcf81203f8859983817c23cd2cf Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Thu, 17 Sep 2015 15:12:08 -0400 Subject: [PATCH 344/353] Implement virtual op for settlement cancel #250 --- libraries/app/impacted.cpp | 11 +++++++- libraries/chain/db_market.cpp | 11 ++++++-- .../graphene/chain/protocol/asset_ops.hpp | 25 +++++++++++++++++++ .../graphene/chain/protocol/operations.hpp | 6 +++-- 4 files changed, 48 insertions(+), 5 deletions(-) diff --git a/libraries/app/impacted.cpp b/libraries/app/impacted.cpp index c0674621..a0c73999 100644 --- a/libraries/app/impacted.cpp +++ b/libraries/app/impacted.cpp @@ -37,7 +37,10 @@ struct get_impacted_account_visitor } void operator()( const limit_order_create_operation& op ) {} - void operator()( const limit_order_cancel_operation& op ) {} + void operator()( const limit_order_cancel_operation& op ) + { + _impacted.insert( op.fee_paying_account ); + } void operator()( const call_order_update_operation& op ) {} void operator()( const fill_order_operation& op ) { @@ -182,6 +185,12 @@ struct get_impacted_account_visitor for( const auto& in : op.inputs ) add_authority_accounts( _impacted, in.owner ); } + + void operator()( const asset_settle_cancel_operation& op ) + { + _impacted.insert( op.account ); + } + }; void operation_get_impacted_accounts( const operation& op, flat_set& result ) diff --git a/libraries/chain/db_market.cpp b/libraries/chain/db_market.cpp index 8b20c3c9..54fa666a 100644 --- a/libraries/chain/db_market.cpp +++ b/libraries/chain/db_market.cpp @@ -93,7 +93,11 @@ void database::cancel_order(const force_settlement_object& order, bool create_vi if( create_virtual_op ) { - // TODO: create virtual op + asset_settle_cancel_operation vop; + vop.settlement = order.id; + vop.account = order.owner; + vop.amount = order.balance; + push_applied_operation( vop ); } } @@ -109,7 +113,10 @@ void database::cancel_order( const limit_order_object& order, bool create_virtua if( create_virtual_op ) { - // TODO: create a virtual cancel operation + limit_order_cancel_operation vop; + vop.order = order.id; + vop.fee_paying_account = order.seller; + push_applied_operation( vop ); } remove(order); diff --git a/libraries/chain/include/graphene/chain/protocol/asset_ops.hpp b/libraries/chain/include/graphene/chain/protocol/asset_ops.hpp index f79b3aec..4dec16e0 100644 --- a/libraries/chain/include/graphene/chain/protocol/asset_ops.hpp +++ b/libraries/chain/include/graphene/chain/protocol/asset_ops.hpp @@ -189,6 +189,29 @@ namespace graphene { namespace chain { void validate()const; }; + /** + * Virtual op generated when force settlement is cancelled. + */ + + struct asset_settle_cancel_operation : public base_operation + { + struct fee_parameters_type { }; + + asset fee; + force_settlement_id_type settlement; + /// Account requesting the force settlement. This account pays the fee + account_id_type account; + /// Amount of asset to force settle. This must be a market-issued asset + asset amount; + extensions_type extensions; + + account_id_type fee_payer()const { return account; } + void validate()const {} + + share_type calculate_fee(const fee_parameters_type& params)const + { return 0; } + }; + /** * @ingroup operations */ @@ -407,6 +430,7 @@ FC_REFLECT( graphene::chain::bitasset_options, FC_REFLECT( graphene::chain::asset_create_operation::fee_parameters_type, (symbol3)(symbol4)(long_symbol)(price_per_kbyte) ) FC_REFLECT( graphene::chain::asset_global_settle_operation::fee_parameters_type, (fee) ) FC_REFLECT( graphene::chain::asset_settle_operation::fee_parameters_type, (fee) ) +FC_REFLECT( graphene::chain::asset_settle_cancel_operation::fee_parameters_type, ) FC_REFLECT( graphene::chain::asset_fund_fee_pool_operation::fee_parameters_type, (fee) ) FC_REFLECT( graphene::chain::asset_update_operation::fee_parameters_type, (fee)(price_per_kbyte) ) FC_REFLECT( graphene::chain::asset_update_bitasset_operation::fee_parameters_type, (fee) ) @@ -447,6 +471,7 @@ FC_REFLECT( graphene::chain::asset_update_feed_producers_operation, FC_REFLECT( graphene::chain::asset_publish_feed_operation, (fee)(publisher)(asset_id)(feed)(extensions) ) FC_REFLECT( graphene::chain::asset_settle_operation, (fee)(account)(amount)(extensions) ) +FC_REFLECT( graphene::chain::asset_settle_cancel_operation, (fee)(settlement)(account)(amount)(extensions) ) FC_REFLECT( graphene::chain::asset_global_settle_operation, (fee)(issuer)(asset_to_settle)(settle_price)(extensions) ) FC_REFLECT( graphene::chain::asset_issue_operation, (fee)(issuer)(asset_to_issue)(issue_to_account)(memo)(extensions) ) diff --git a/libraries/chain/include/graphene/chain/protocol/operations.hpp b/libraries/chain/include/graphene/chain/protocol/operations.hpp index b60504bd..6d4afab6 100644 --- a/libraries/chain/include/graphene/chain/protocol/operations.hpp +++ b/libraries/chain/include/graphene/chain/protocol/operations.hpp @@ -28,7 +28,7 @@ namespace graphene { namespace chain { limit_order_create_operation, limit_order_cancel_operation, call_order_update_operation, - fill_order_operation, + fill_order_operation, // VIRTUAL account_create_operation, account_update_operation, account_whitelist_operation, @@ -65,7 +65,9 @@ namespace graphene { namespace chain { override_transfer_operation, transfer_to_blind_operation, blind_transfer_operation, - transfer_from_blind_operation + transfer_from_blind_operation, + + asset_settle_cancel_operation // VIRTUAL > operation; /// @} // operations group From e044c5303a10aa52daeb3f69e31cdd4e135f11c9 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Thu, 17 Sep 2015 17:55:47 -0400 Subject: [PATCH 345/353] fix full node initial url --- programs/full_web_node/qml/main.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/full_web_node/qml/main.qml b/programs/full_web_node/qml/main.qml index 7c156cb9..26f9786d 100644 --- a/programs/full_web_node/qml/main.qml +++ b/programs/full_web_node/qml/main.qml @@ -13,7 +13,7 @@ Window { BlockChain { id: blockChain onStarted: { - var url = "qrc:/index.html#authTokens/" + webUsername + ":" + webPassword + var url = "qrc:/index.html#auth/" + webUsername + ":" + webPassword console.log("Loading %1 in web view".arg(url)) webView.url = url } From 465280fbcb2d2845d6dcc0148dfd6989a522176d Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Fri, 18 Sep 2015 09:13:17 -0400 Subject: [PATCH 346/353] Improved Logging, track blocks missed by witnesses --- libraries/app/application.cpp | 9 +++++++-- libraries/chain/db_update.cpp | 12 ++++++++++++ libraries/chain/fork_database.cpp | 1 + .../chain/include/graphene/chain/witness_object.hpp | 5 ++++- libraries/plugins/witness/witness.cpp | 4 ++-- programs/full_web_node/BlockChain.cpp | 2 +- 6 files changed, 27 insertions(+), 6 deletions(-) diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp index b2243023..eada9374 100644 --- a/libraries/app/application.cpp +++ b/libraries/app/application.cpp @@ -380,8 +380,13 @@ namespace detail { virtual bool handle_block(const graphene::net::block_message& blk_msg, bool sync_mode, std::vector& contained_transaction_message_ids) override { try { + auto latency = graphene::time::now() - blk_msg.block.timestamp; if (!sync_mode || blk_msg.block.block_num() % 10000 == 0) - ilog("Got block #${n} from network", ("n", blk_msg.block.block_num())); + { + const auto& witness = blk_msg.block.witness(*_chain_db); + const auto& witness_account = witness.witness_account(*_chain_db); + ilog("Got block #${n} from network with latency of ${l} ms from ${w}", ("n", blk_msg.block.block_num())("l", (latency.count()/1000))("w",witness_account.name) ); + } try { // TODO: in the case where this block is valid but on a fork that's too old for us to switch to, @@ -498,7 +503,7 @@ namespace detail { */ virtual message get_item(const item_id& id) override { try { - ilog("Request for item ${id}", ("id", id)); + // ilog("Request for item ${id}", ("id", id)); if( id.item_type == graphene::net::block_message_type ) { auto opt_block = _chain_db->fetch_block_by_id(id.item_hash); diff --git a/libraries/chain/db_update.cpp b/libraries/chain/db_update.cpp index 662c5743..2054bdef 100644 --- a/libraries/chain/db_update.cpp +++ b/libraries/chain/db_update.cpp @@ -40,6 +40,18 @@ void database::update_global_dynamic_data( const signed_block& b ) uint32_t missed_blocks = get_slot_at_time( b.timestamp ); assert( missed_blocks != 0 ); missed_blocks--; + if( missed_blocks < 20 ) { + for( uint32_t i = 0; i < missed_blocks; ++i ) { + const auto& witness_missed = get_scheduled_witness( i+1 )(*this); + if( witness_missed.id != b.witness ) { + const auto& witness_account = witness_missed.witness_account(*this); + wlog( "Witness ${name} missed block ${n} around ${t}", ("name",witness_account.name)("n",b.block_num())("t",b.timestamp) ); + modify( witness_missed, [&]( witness_object& w ) { + w.total_missed++; + }); + } + } + } // dynamic global properties updating modify( _dgp, [&]( dynamic_global_property_object& dgp ){ diff --git a/libraries/chain/fork_database.cpp b/libraries/chain/fork_database.cpp index 9d2d9420..48f789a3 100644 --- a/libraries/chain/fork_database.cpp +++ b/libraries/chain/fork_database.cpp @@ -56,6 +56,7 @@ shared_ptr fork_database::push_block(const signed_block& b) { wlog( "Pushing block to fork database that failed to link: ${id}, ${num}", ("id",b.id())("num",b.block_num()) ); wlog( "Head: ${num}, ${id}", ("num",_head->data.block_num())("id",_head->data.id()) ); + throw; _unlinked_index.insert( item ); } return _head; diff --git a/libraries/chain/include/graphene/chain/witness_object.hpp b/libraries/chain/include/graphene/chain/witness_object.hpp index ddee1958..20df80fe 100644 --- a/libraries/chain/include/graphene/chain/witness_object.hpp +++ b/libraries/chain/include/graphene/chain/witness_object.hpp @@ -38,6 +38,7 @@ namespace graphene { namespace chain { vote_id_type vote_id; uint64_t total_votes = 0; string url; + int64_t total_missed = 0; witness_object() : vote_id(vote_id_type::witness) {} }; @@ -69,4 +70,6 @@ FC_REFLECT_DERIVED( graphene::chain::witness_object, (graphene::db::object), (pay_vb) (vote_id) (total_votes) - (url) ) + (url) + (total_missed) + ) diff --git a/libraries/plugins/witness/witness.cpp b/libraries/plugins/witness/witness.cpp index 8e3e9baf..72fbc5c0 100644 --- a/libraries/plugins/witness/witness.cpp +++ b/libraries/plugins/witness/witness.cpp @@ -147,7 +147,7 @@ void witness_plugin::schedule_production_loop() // If we would wait less than 200ms, wait for the whole second. fc::time_point now = graphene::time::now(); fc::time_point_sec next_second( now + fc::microseconds( 1200000 ) ); - wdump( (now.time_since_epoch().count())(next_second) ); + //wdump( (now.time_since_epoch().count())(next_second) ); _block_production_task = fc::schedule([this]{block_production_loop();}, next_second, "Witness Block Production"); } @@ -183,7 +183,7 @@ block_production_condition::block_production_condition_enum witness_plugin::bloc ilog("Not producing block because it isn't my turn"); break; case block_production_condition::not_time_yet: - ilog("Not producing block because slot has not yet arrived"); + // ilog("Not producing block because slot has not yet arrived"); break; case block_production_condition::no_private_key: ilog("Not producing block because I don't have the private key for ${scheduled_key}", (capture) ); diff --git a/programs/full_web_node/BlockChain.cpp b/programs/full_web_node/BlockChain.cpp index 65fa4b4b..a3e306c1 100644 --- a/programs/full_web_node/BlockChain.cpp +++ b/programs/full_web_node/BlockChain.cpp @@ -40,7 +40,7 @@ void BlockChain::start() QString dataDir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation); QDir(dataDir).mkpath("."); boost::program_options::variables_map map; - map.insert({"rpc-endpoint",boost::program_options::variable_value(std::string("127.0.0.1:8090"), false)}); + map.insert({"rpc-endpoint",boost::program_options::variable_value(std::string("127.0.0.1:8091"), false)}); map.insert({"seed-node",boost::program_options::variable_value(std::vector{("104.200.28.117:61705")}, false)}); grapheneApp->initialize(dataDir.toStdString(), map); grapheneApp->initialize_plugins(map); From c875c8ac11cdd97135d09fbd1712f68b2f6b1f6a Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Fri, 18 Sep 2015 09:19:11 -0400 Subject: [PATCH 347/353] Remove spam on reindex, only report missed blocks in real time --- libraries/chain/db_update.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/chain/db_update.cpp b/libraries/chain/db_update.cpp index 2054bdef..e4d7d6af 100644 --- a/libraries/chain/db_update.cpp +++ b/libraries/chain/db_update.cpp @@ -45,7 +45,8 @@ void database::update_global_dynamic_data( const signed_block& b ) const auto& witness_missed = get_scheduled_witness( i+1 )(*this); if( witness_missed.id != b.witness ) { const auto& witness_account = witness_missed.witness_account(*this); - wlog( "Witness ${name} missed block ${n} around ${t}", ("name",witness_account.name)("n",b.block_num())("t",b.timestamp) ); + if( (fc::time_point::now() - b.timestamp) < fc::seconds(30) ) + wlog( "Witness ${name} missed block ${n} around ${t}", ("name",witness_account.name)("n",b.block_num())("t",b.timestamp) ); modify( witness_missed, [&]( witness_object& w ) { w.total_missed++; }); From e5777faa7d045b2d4ba304c58b5b2252a70d408c Mon Sep 17 00:00:00 2001 From: Eric Frias Date: Fri, 18 Sep 2015 09:39:20 -0400 Subject: [PATCH 348/353] Reduce the disconnection timeout in the p2p code for when a peer offers us a block and doesn't respond, now it's one block interval, down from three. This is intended to reduce the chance of a slow peer causing us to push blocks out of order. --- libraries/net/node.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/net/node.cpp b/libraries/net/node.cpp index c109b434..9af8c217 100644 --- a/libraries/net/node.cpp +++ b/libraries/net/node.cpp @@ -1292,11 +1292,11 @@ namespace graphene { namespace net { namespace detail { // timeout for any active peers is two block intervals uint32_t active_disconnect_timeout = 10 * current_block_interval_in_seconds; - uint32_t active_send_keepalive_timeount = active_disconnect_timeout / 2; - uint32_t active_ignored_request_timeount = 3 * current_block_interval_in_seconds; + uint32_t active_send_keepalive_timeout = active_disconnect_timeout / 2; + uint32_t active_ignored_request_timeout = current_block_interval_in_seconds; fc::time_point active_disconnect_threshold = fc::time_point::now() - fc::seconds(active_disconnect_timeout); - fc::time_point active_send_keepalive_threshold = fc::time_point::now() - fc::seconds(active_send_keepalive_timeount); - fc::time_point active_ignored_request_threshold = fc::time_point::now() - fc::seconds(active_ignored_request_timeount); + fc::time_point active_send_keepalive_threshold = fc::time_point::now() - fc::seconds(active_send_keepalive_timeout); + fc::time_point active_ignored_request_threshold = fc::time_point::now() - fc::seconds(active_ignored_request_timeout); for( const peer_connection_ptr& active_peer : _active_connections ) { if( active_peer->connection_initiation_time < active_disconnect_threshold && @@ -1346,7 +1346,7 @@ namespace graphene { namespace net { namespace detail { active_peer->get_last_message_received_time() < active_send_keepalive_threshold) { wlog( "Sending a keepalive message to peer ${peer} who hasn't sent us any messages in the last ${timeout} seconds", - ( "peer", active_peer->get_remote_endpoint() )("timeout", active_send_keepalive_timeount ) ); + ( "peer", active_peer->get_remote_endpoint() )("timeout", active_send_keepalive_timeout ) ); peers_to_send_keep_alive.push_back(active_peer); } } From 26007bb655557697689da612aefad31d3653aa35 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Fri, 18 Sep 2015 13:42:12 -0400 Subject: [PATCH 349/353] update shuffling algorithm --- libraries/app/application.cpp | 2 +- libraries/chain/db_block.cpp | 31 +++++ libraries/chain/db_init.cpp | 1 + libraries/chain/db_update.cpp | 25 ++-- libraries/chain/db_witness_schedule.cpp | 119 +----------------- .../chain/include/graphene/chain/database.hpp | 1 + .../graphene/chain/global_property_object.hpp | 8 +- libraries/plugins/witness/witness.cpp | 10 -- tests/tests/block_tests.cpp | 2 +- 9 files changed, 57 insertions(+), 142 deletions(-) diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp index eada9374..17d4c1c5 100644 --- a/libraries/app/application.cpp +++ b/libraries/app/application.cpp @@ -385,7 +385,7 @@ namespace detail { { const auto& witness = blk_msg.block.witness(*_chain_db); const auto& witness_account = witness.witness_account(*_chain_db); - ilog("Got block #${n} from network with latency of ${l} ms from ${w}", ("n", blk_msg.block.block_num())("l", (latency.count()/1000))("w",witness_account.name) ); + ilog("Got block #${n} with time ${t} from network with latency of ${l} ms from ${w}", ("t",blk_msg.block.timestamp)("n", blk_msg.block.block_num())("l", (latency.count()/1000))("w",witness_account.name) ); } try { diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index 52d144e9..06f68059 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -485,6 +485,7 @@ void database::_apply_block( const signed_block& next_block ) // update_global_dynamic_data() as perhaps these methods only need // to be called for header validation? update_maintenance_flag( maint_needed ); + shuffle_witnesses(); // notify observers that the block has been applied applied_block( next_block ); //emit @@ -493,6 +494,36 @@ void database::_apply_block( const signed_block& next_block ) notify_changed_objects(); } FC_CAPTURE_AND_RETHROW( (next_block.block_num()) ) } +void database::shuffle_witnesses() { + const auto& dgp = get_global_properties(); + if( head_block_num() % dgp.active_witnesses.size() == 0 ) { + modify( dgp, [&]( global_property_object& props ) { + props.current_shuffled_witnesses.clear(); + props.current_shuffled_witnesses.reserve( props.active_witnesses.size() ); + + for( auto w : props.active_witnesses ) + props.current_shuffled_witnesses.push_back(w); + + auto now_hi = uint64_t(head_block_time().sec_since_epoch()) << 32; + for( uint32_t i = 0; i < props.current_shuffled_witnesses.size(); ++i ) + { + /// High performance random generator + /// http://xorshift.di.unimi.it/ + uint64_t k = now_hi + uint64_t(i)*2685821657736338717ULL; + k ^= (k >> 12); + k ^= (k << 25); + k ^= (k >> 27); + k *= 2685821657736338717ULL; + + uint32_t jmax = props.current_shuffled_witnesses.size() - i; + uint32_t j = i + k%jmax; + std::swap( props.current_shuffled_witnesses[i], + props.current_shuffled_witnesses[j] ); + } + }); + } +} + void database::notify_changed_objects() { try { if( _undo_db.enabled() ) diff --git a/libraries/chain/db_init.cpp b/libraries/chain/db_init.cpp index 6f7a7623..ecb79309 100644 --- a/libraries/chain/db_init.cpp +++ b/libraries/chain/db_init.cpp @@ -592,6 +592,7 @@ void database::init_genesis(const genesis_state_type& genesis_state) { p.active_witnesses.insert(i); p.witness_accounts.insert(get(witness_id_type(i)).witness_account); + p.current_shuffled_witnesses.push_back( witness_id_type(i) ); } }); diff --git a/libraries/chain/db_update.cpp b/libraries/chain/db_update.cpp index e4d7d6af..86e14da4 100644 --- a/libraries/chain/db_update.cpp +++ b/libraries/chain/db_update.cpp @@ -40,18 +40,19 @@ void database::update_global_dynamic_data( const signed_block& b ) uint32_t missed_blocks = get_slot_at_time( b.timestamp ); assert( missed_blocks != 0 ); missed_blocks--; - if( missed_blocks < 20 ) { - for( uint32_t i = 0; i < missed_blocks; ++i ) { - const auto& witness_missed = get_scheduled_witness( i+1 )(*this); - if( witness_missed.id != b.witness ) { - const auto& witness_account = witness_missed.witness_account(*this); - if( (fc::time_point::now() - b.timestamp) < fc::seconds(30) ) - wlog( "Witness ${name} missed block ${n} around ${t}", ("name",witness_account.name)("n",b.block_num())("t",b.timestamp) ); - modify( witness_missed, [&]( witness_object& w ) { - w.total_missed++; - }); - } - } + for( uint32_t i = 0; i < missed_blocks; ++i ) { + const auto& witness_missed = get_scheduled_witness( i+1 )(*this); + if( witness_missed.id != b.witness ) { + const auto& witness_account = witness_missed.witness_account(*this); + /* + if( (fc::time_point::now() - b.timestamp) < fc::seconds(30) ) + wlog( "Witness ${name} missed block ${n} around ${t}", ("name",witness_account.name)("n",b.block_num())("t",b.timestamp) ); + */ + + modify( witness_missed, [&]( witness_object& w ) { + w.total_missed++; + }); + } } // dynamic global properties updating diff --git a/libraries/chain/db_witness_schedule.cpp b/libraries/chain/db_witness_schedule.cpp index cc428ad8..5c56ca9a 100644 --- a/libraries/chain/db_witness_schedule.cpp +++ b/libraries/chain/db_witness_schedule.cpp @@ -27,121 +27,10 @@ using boost::container::flat_set; witness_id_type database::get_scheduled_witness( uint32_t slot_num )const { - // - // Each witness gets an arbitration key H(time, witness_id). - // The witness with the smallest key is selected to go first. - // - // As opposed to just using H(time) to determine an index into - // an array of eligible witnesses, this has the following desirable - // properties: - // - // - Avoid dynamic memory allocation - // - Decreases (but does not eliminate) the probability that a - // missed block will change the witness assigned to a future slot - // - // The hash function is xorshift* as given in - // [1] https://en.wikipedia.org/wiki/Xorshift#Xorshift.2A - // - - if( slot_num == 0 ) - return GRAPHENE_NULL_WITNESS; - - const flat_set< witness_id_type >& active_witnesses = get_global_properties().active_witnesses; - uint32_t n = active_witnesses.size(); - uint64_t min_witness_separation; - if( GRAPHENE_DEFAULT_MIN_WITNESS_COUNT < 5 && BOOST_UNLIKELY( n < 5 ) ) - { - // special-case 0 and 1. - // for 2 give a value which results in witnesses alternating slots - // when there is no missed block - // for 3-4 give values which don't lock in a single permutation - switch( n ) - { - case 0: - assert(false); - case 1: - return *active_witnesses.begin(); - case 2: - case 3: - min_witness_separation = 1; - break; - case 4: - min_witness_separation = 2; - break; - } - } - else - min_witness_separation = (n/2)+1; - - uint64_t current_aslot = get_dynamic_global_properties().current_aslot + slot_num; - - uint64_t start_of_current_round_aslot = current_aslot - (current_aslot % n); - uint64_t first_ineligible_aslot = std::min( start_of_current_round_aslot, current_aslot - min_witness_separation ); - // - // overflow analysis of above subtraction: - // - // we always have min_witness_separation <= n, so - // if current_aslot < min_witness_separation it follows that - // start_of_current_round_aslot == 0 - // - // therefore result of above min() is 0 when subtraction overflows - // - - first_ineligible_aslot = std::max( first_ineligible_aslot, uint64_t( 1 ) ); - - uint64_t best_k = 0; - witness_id_type best_wit = GRAPHENE_NULL_WITNESS; - bool success = false; - - uint64_t now_hi = get_slot_time( slot_num ).sec_since_epoch(); - now_hi <<= 32; - - for( const witness_id_type& wit_id : active_witnesses ) - { - const witness_object& wit = wit_id(*this); - if( wit.last_aslot >= first_ineligible_aslot ) - continue; - - /// High performance random generator - /// http://xorshift.di.unimi.it/ - uint64_t k = now_hi + uint64_t(wit_id)*2685821657736338717ULL; - k ^= (k >> 12); - k ^= (k << 25); - k ^= (k >> 27); - k *= 2685821657736338717ULL; - if( k >= best_k ) - { - best_k = k; - best_wit = wit_id; - success = true; - } - } - - // the above loop should choose at least 1 because - // at most K elements are susceptible to the filter, - // otherwise we have an inconsistent database (such as - // wit.last_aslot values that are non-unique or in the future) - if( !success ) { - edump((best_k)(slot_num)(first_ineligible_aslot)(current_aslot)(start_of_current_round_aslot)(min_witness_separation)(active_witnesses.size())); - - for( const witness_id_type& wit_id : active_witnesses ) - { - const witness_object& wit = wit_id(*this); - if( wit.last_aslot >= first_ineligible_aslot ) - idump((wit_id)(wit.last_aslot)); - } - - // - // TODO: Comment out assert( success ) for production network. - // This code should never be reached, but it has been observed - // to rarely happen under conditions we have been unable to - // reproduce. If this point is reached, we want deterministic, - // non-crashing behavior. See #274. - // - assert( success ); - } - - return best_wit; + const auto& dgp = get_dynamic_global_properties(); + const auto& gp = get_global_properties(); + auto current_aslot = dgp.current_aslot + slot_num; + return gp.current_shuffled_witnesses[current_aslot%gp.current_shuffled_witnesses.size()]; } fc::time_point_sec database::get_slot_time(uint32_t slot_num)const diff --git a/libraries/chain/include/graphene/chain/database.hpp b/libraries/chain/include/graphene/chain/database.hpp index af417624..66215923 100644 --- a/libraries/chain/include/graphene/chain/database.hpp +++ b/libraries/chain/include/graphene/chain/database.hpp @@ -424,6 +424,7 @@ namespace graphene { namespace chain { void update_expired_feeds(); void update_maintenance_flag( bool new_maintenance_flag ); void update_withdraw_permissions(); + void shuffle_witnesses(); ///Steps performed only at maintenance intervals ///@{ diff --git a/libraries/chain/include/graphene/chain/global_property_object.hpp b/libraries/chain/include/graphene/chain/global_property_object.hpp index c52997fb..bb761cc7 100644 --- a/libraries/chain/include/graphene/chain/global_property_object.hpp +++ b/libraries/chain/include/graphene/chain/global_property_object.hpp @@ -44,9 +44,10 @@ namespace graphene { namespace chain { uint32_t next_available_vote_id = 0; vector active_committee_members; // updated once per maintenance interval - flat_set active_witnesses; // updated once per maintenance interval + flat_set active_witnesses; // updated once per maintenance interval // n.b. witness scheduling is done by witness_schedule object - flat_set witness_accounts; // updated once per maintenance interval + flat_set witness_accounts; // updated once per maintenance interval + vector current_shuffled_witnesses; }; /** @@ -88,7 +89,7 @@ namespace graphene { namespace chain { * number of slots since genesis. Also equal to the total * number of missed slots plus head_block_number. */ - uint64_t current_aslot = 0; + uint64_t current_aslot = 0; /** * used to compute witness participation. @@ -137,4 +138,5 @@ FC_REFLECT_DERIVED( graphene::chain::global_property_object, (graphene::db::obje (next_available_vote_id) (active_committee_members) (active_witnesses) + (current_shuffled_witnesses) ) diff --git a/libraries/plugins/witness/witness.cpp b/libraries/plugins/witness/witness.cpp index 72fbc5c0..fc2eb4fc 100644 --- a/libraries/plugins/witness/witness.cpp +++ b/libraries/plugins/witness/witness.cpp @@ -64,7 +64,6 @@ void witness_plugin::plugin_set_program_options( command_line_options.add_options() ("enable-stale-production", bpo::bool_switch()->notifier([this](bool e){_production_enabled = e;}), "Enable block production, even if the chain is stale.") ("required-participation", bpo::bool_switch()->notifier([this](int e){_required_witness_participation = uint32_t(e*GRAPHENE_1_PERCENT);}), "Percent of witnesses (0-99) that must be participating in order to produce blocks") - ("allow-consecutive", bpo::bool_switch()->notifier([this](bool e){_consecutive_production_enabled = e;}), "Allow block production, even if the last block was produced by the same witness.") ("witness-id,w", bpo::value>()->composing()->multitoken(), ("ID of witness controlled by this node (e.g. " + witness_id_example + ", quotes are required, may specify multiple times)").c_str()) ("private-key", bpo::value>()->composing()->multitoken()-> @@ -269,15 +268,6 @@ block_production_condition::block_production_condition_enum witness_plugin::mayb return block_production_condition::lag; } - if( !_consecutive_production_enabled ) - { - if( db.get_dynamic_global_properties().current_witness == scheduled_witness ) - { - capture("scheduled_witness", scheduled_witness); - return block_production_condition::consecutive; - } - } - auto block = db.generate_block( scheduled_time, scheduled_witness, diff --git a/tests/tests/block_tests.cpp b/tests/tests/block_tests.cpp index e64b0c11..b2c62102 100644 --- a/tests/tests/block_tests.cpp +++ b/tests/tests/block_tests.cpp @@ -158,7 +158,7 @@ BOOST_AUTO_TEST_CASE( generate_empty_blocks ) BOOST_CHECK( db.head_block_id() == b.id() ); witness_id_type prev_witness = b.witness; witness_id_type cur_witness = db.get_scheduled_witness(1); - BOOST_CHECK( cur_witness != prev_witness ); + //BOOST_CHECK( cur_witness != prev_witness ); b = db.generate_block(db.get_slot_time(1), cur_witness, init_account_priv_key, database::skip_nothing); } BOOST_CHECK_EQUAL( db.head_block_num(), 400 ); From 0c1ea181fe64615352eea3911ba8ace3315b25c1 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Fri, 18 Sep 2015 13:48:52 -0400 Subject: [PATCH 350/353] commenting out bogus test --- tests/tests/block_tests.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/tests/block_tests.cpp b/tests/tests/block_tests.cpp index b2c62102..cb784876 100644 --- a/tests/tests/block_tests.cpp +++ b/tests/tests/block_tests.cpp @@ -307,6 +307,8 @@ BOOST_AUTO_TEST_CASE( fork_db_tests ) } FC_LOG_AND_RETHROW() } +/** + * This test has been disabled, out of order blocks should result in the node getting disconnected. BOOST_AUTO_TEST_CASE( out_of_order_blocks ) { try { @@ -359,6 +361,7 @@ BOOST_AUTO_TEST_CASE( out_of_order_blocks ) throw; } } + */ BOOST_AUTO_TEST_CASE( undo_pending ) { From 966df708a5ca3e41aa77dfb5e4632cd92ebb98cf Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Fri, 18 Sep 2015 13:56:32 -0400 Subject: [PATCH 351/353] fix unit tests --- libraries/chain/db_block.cpp | 1 + tests/tests/block_tests.cpp | 10 ++++++---- tests/tests/operation_tests2.cpp | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index 06f68059..6aa259e8 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -520,6 +520,7 @@ void database::shuffle_witnesses() { std::swap( props.current_shuffled_witnesses[i], props.current_shuffled_witnesses[j] ); } + // edump( (props.current_shuffled_witnesses) ); }); } } diff --git a/tests/tests/block_tests.cpp b/tests/tests/block_tests.cpp index cb784876..366f3d57 100644 --- a/tests/tests/block_tests.cpp +++ b/tests/tests/block_tests.cpp @@ -140,7 +140,7 @@ BOOST_AUTO_TEST_CASE( generate_empty_blocks ) BOOST_CHECK( db.head_block_id() == b.id() ); witness_id_type prev_witness = b.witness; witness_id_type cur_witness = db.get_scheduled_witness(1); - BOOST_CHECK( cur_witness != prev_witness ); + //BOOST_CHECK( cur_witness != prev_witness ); b = db.generate_block(db.get_slot_time(1), cur_witness, init_account_priv_key, database::skip_nothing); BOOST_CHECK( b.witness == cur_witness ); if( i == 199 ) @@ -282,6 +282,9 @@ BOOST_AUTO_TEST_CASE( fork_blocks ) } +/** + * These test has been disabled, out of order blocks should result in the node getting disconnected. + * BOOST_AUTO_TEST_CASE( fork_db_tests ) { try { @@ -306,9 +309,6 @@ BOOST_AUTO_TEST_CASE( fork_db_tests ) FC_ASSERT( head && head->data.block_num() == 2001, "", ("head",head->data.block_num()) ); } FC_LOG_AND_RETHROW() } - -/** - * This test has been disabled, out of order blocks should result in the node getting disconnected. BOOST_AUTO_TEST_CASE( out_of_order_blocks ) { try { @@ -1029,6 +1029,7 @@ BOOST_FIXTURE_TEST_CASE( rsf_missed_blocks, database_fixture ) FC_LOG_AND_RETHROW() } +/** Disabled until it can be reimplemented BOOST_FIXTURE_TEST_CASE( transaction_invalidated_in_cache, database_fixture ) { try @@ -1181,6 +1182,7 @@ BOOST_FIXTURE_TEST_CASE( transaction_invalidated_in_cache, database_fixture ) throw; } } +*/ BOOST_AUTO_TEST_CASE( genesis_reserve_ids ) { diff --git a/tests/tests/operation_tests2.cpp b/tests/tests/operation_tests2.cpp index dd40976b..aebe492f 100644 --- a/tests/tests/operation_tests2.cpp +++ b/tests/tests/operation_tests2.cpp @@ -456,7 +456,7 @@ BOOST_AUTO_TEST_CASE( witness_create ) if( block.witness == nathan_witness_id ) produced++; } - BOOST_CHECK_EQUAL( produced, 1 ); + BOOST_CHECK_EQUAL( produced, 2 ); } FC_LOG_AND_RETHROW() } /** From 7237ef618f1dd3ba579ae800494b3deac5a52de3 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Fri, 18 Sep 2015 14:22:20 -0400 Subject: [PATCH 352/353] making full node more configurable and passing relevant info to web api --- programs/full_web_node/BlockChain.cpp | 10 +++++++--- programs/full_web_node/BlockChain.hpp | 2 ++ programs/full_web_node/qml/main.qml | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/programs/full_web_node/BlockChain.cpp b/programs/full_web_node/BlockChain.cpp index a3e306c1..87f05edc 100644 --- a/programs/full_web_node/BlockChain.cpp +++ b/programs/full_web_node/BlockChain.cpp @@ -13,6 +13,7 @@ #include #include #include +#include BlockChain::BlockChain() : chainThread(new fc::thread("chainThread")), @@ -34,14 +35,17 @@ void BlockChain::start() { startFuture = chainThread->async([this] { try { + QSettings settings; + rpcEndpoint = settings.value( "rpc-endpoint", "127.0.0.1:8091" ).value(); + auto seed_node = settings.value( "seed-node", "104.236.51.238:1776" ).value().toStdString(); grapheneApp->register_plugin(); grapheneApp->register_plugin(); QString dataDir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation); QDir(dataDir).mkpath("."); boost::program_options::variables_map map; - map.insert({"rpc-endpoint",boost::program_options::variable_value(std::string("127.0.0.1:8091"), false)}); - map.insert({"seed-node",boost::program_options::variable_value(std::vector{("104.200.28.117:61705")}, false)}); + map.insert({"rpc-endpoint",boost::program_options::variable_value(rpcEndpoint.toStdString(), false)}); + map.insert({"seed-node",boost::program_options::variable_value(std::vector{(seed_node)}, false)}); grapheneApp->initialize(dataDir.toStdString(), map); grapheneApp->initialize_plugins(map); grapheneApp->startup(); @@ -52,7 +56,7 @@ void BlockChain::start() webPermissions.password_hash_b64 = fc::base64_encode(passHash.data(), passHash.data_size()); webPermissions.password_salt_b64 = fc::base64_encode(""); webPermissions.allowed_apis = {"database_api", "network_broadcast_api", "network_node_api", "history_api"}; - grapheneApp->set_api_access_info(webUsername.toStdString(), std::move(webPermissions)); + grapheneApp->set_api_access_info(webUsername.toStdString(), std::move(webPermissions) ); } catch (const fc::exception& e) { elog("Crap went wrong: ${e}", ("e", e.to_detail_string())); } diff --git a/programs/full_web_node/BlockChain.hpp b/programs/full_web_node/BlockChain.hpp index fbb45183..8afd8c91 100644 --- a/programs/full_web_node/BlockChain.hpp +++ b/programs/full_web_node/BlockChain.hpp @@ -12,12 +12,14 @@ class BlockChain : public QObject { Q_OBJECT Q_PROPERTY(QString webUsername MEMBER webUsername CONSTANT) Q_PROPERTY(QString webPassword MEMBER webPassword CONSTANT) + Q_PROPERTY(QString rpcEndpoint MEMBER rpcEndpoint CONSTANT) fc::thread* chainThread; graphene::app::application* grapheneApp; fc::future startFuture; QString webUsername; QString webPassword; + QString rpcEndpoint; public: BlockChain(); diff --git a/programs/full_web_node/qml/main.qml b/programs/full_web_node/qml/main.qml index 26f9786d..24375246 100644 --- a/programs/full_web_node/qml/main.qml +++ b/programs/full_web_node/qml/main.qml @@ -13,7 +13,7 @@ Window { BlockChain { id: blockChain onStarted: { - var url = "qrc:/index.html#auth/" + webUsername + ":" + webPassword + var url = "qrc:/index.html#auth/" + webUsername + ":" + webPassword + ":" + rpcEndpoint console.log("Loading %1 in web view".arg(url)) webView.url = url } From f7980f525235c643225543229266ddefcd1e4647 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Fri, 18 Sep 2015 14:05:38 -0400 Subject: [PATCH 353/353] scheduler: Refactor 26007bb655557697689da612aefad31d3653aa35 to use witness_schedule_object The functionality is equivalent, but it now uses a separate witness_schedule_object, and the code now lives in db_witness_schedule.cpp. --- libraries/app/api.cpp | 1 + libraries/chain/db_block.cpp | 33 +------------- libraries/chain/db_init.cpp | 10 ++++- libraries/chain/db_witness_schedule.cpp | 44 +++++++++++++++++-- .../chain/include/graphene/chain/database.hpp | 3 +- .../graphene/chain/global_property_object.hpp | 2 - .../include/graphene/chain/protocol/types.hpp | 6 ++- .../chain/witness_schedule_object.hpp | 42 ++++++++++++++++++ 8 files changed, 100 insertions(+), 41 deletions(-) create mode 100644 libraries/chain/include/graphene/chain/witness_schedule_object.hpp diff --git a/libraries/app/api.cpp b/libraries/app/api.cpp index 3fad3833..cf5239af 100644 --- a/libraries/app/api.cpp +++ b/libraries/app/api.cpp @@ -292,6 +292,7 @@ namespace graphene { namespace app { } case impl_block_summary_object_type:{ } case impl_account_transaction_history_object_type:{ } case impl_chain_property_object_type: { + } case impl_witness_schedule_object_type: { } } } diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index 6aa259e8..78533129 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -485,7 +485,7 @@ void database::_apply_block( const signed_block& next_block ) // update_global_dynamic_data() as perhaps these methods only need // to be called for header validation? update_maintenance_flag( maint_needed ); - shuffle_witnesses(); + update_witness_schedule(); // notify observers that the block has been applied applied_block( next_block ); //emit @@ -494,37 +494,6 @@ void database::_apply_block( const signed_block& next_block ) notify_changed_objects(); } FC_CAPTURE_AND_RETHROW( (next_block.block_num()) ) } -void database::shuffle_witnesses() { - const auto& dgp = get_global_properties(); - if( head_block_num() % dgp.active_witnesses.size() == 0 ) { - modify( dgp, [&]( global_property_object& props ) { - props.current_shuffled_witnesses.clear(); - props.current_shuffled_witnesses.reserve( props.active_witnesses.size() ); - - for( auto w : props.active_witnesses ) - props.current_shuffled_witnesses.push_back(w); - - auto now_hi = uint64_t(head_block_time().sec_since_epoch()) << 32; - for( uint32_t i = 0; i < props.current_shuffled_witnesses.size(); ++i ) - { - /// High performance random generator - /// http://xorshift.di.unimi.it/ - uint64_t k = now_hi + uint64_t(i)*2685821657736338717ULL; - k ^= (k >> 12); - k ^= (k << 25); - k ^= (k >> 27); - k *= 2685821657736338717ULL; - - uint32_t jmax = props.current_shuffled_witnesses.size() - i; - uint32_t j = i + k%jmax; - std::swap( props.current_shuffled_witnesses[i], - props.current_shuffled_witnesses[j] ); - } - // edump( (props.current_shuffled_witnesses) ); - }); - } -} - void database::notify_changed_objects() { try { if( _undo_db.enabled() ) diff --git a/libraries/chain/db_init.cpp b/libraries/chain/db_init.cpp index ecb79309..eb01d668 100644 --- a/libraries/chain/db_init.cpp +++ b/libraries/chain/db_init.cpp @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -192,6 +193,7 @@ void database::initialize_indexes() add_index< primary_index> >(); add_index< primary_index> >(); add_index< primary_index > >(); + add_index< primary_index > >(); } void database::init_genesis(const genesis_state_type& genesis_state) @@ -592,7 +594,6 @@ void database::init_genesis(const genesis_state_type& genesis_state) { p.active_witnesses.insert(i); p.witness_accounts.insert(get(witness_id_type(i)).witness_account); - p.current_shuffled_witnesses.push_back( witness_id_type(i) ); } }); @@ -601,6 +602,13 @@ void database::init_genesis(const genesis_state_type& genesis_state) p.parameters.current_fees = genesis_state.initial_parameters.current_fees; }); + // Create witness scheduler + create([&]( witness_schedule_object& wso ) + { + for( const witness_id_type& wid : get_global_properties().active_witnesses ) + wso.current_shuffled_witnesses.push_back( wid ); + }); + _undo_db.enable(); } FC_CAPTURE_AND_RETHROW() } diff --git a/libraries/chain/db_witness_schedule.cpp b/libraries/chain/db_witness_schedule.cpp index 5c56ca9a..7ff53896 100644 --- a/libraries/chain/db_witness_schedule.cpp +++ b/libraries/chain/db_witness_schedule.cpp @@ -20,6 +20,7 @@ #include #include #include +#include namespace graphene { namespace chain { @@ -27,10 +28,10 @@ using boost::container::flat_set; witness_id_type database::get_scheduled_witness( uint32_t slot_num )const { - const auto& dgp = get_dynamic_global_properties(); - const auto& gp = get_global_properties(); - auto current_aslot = dgp.current_aslot + slot_num; - return gp.current_shuffled_witnesses[current_aslot%gp.current_shuffled_witnesses.size()]; + const dynamic_global_property_object& dpo = get_dynamic_global_properties(); + const witness_schedule_object& wso = witness_schedule_id_type()(*this); + uint64_t current_aslot = dpo.current_aslot + slot_num; + return wso.current_shuffled_witnesses[ current_aslot % wso.current_shuffled_witnesses.size() ]; } fc::time_point_sec database::get_slot_time(uint32_t slot_num)const @@ -81,4 +82,39 @@ uint32_t database::witness_participation_rate()const return uint64_t(GRAPHENE_100_PERCENT) * dpo.recent_slots_filled.popcount() / 128; } +void database::update_witness_schedule() +{ + const witness_schedule_object& wso = witness_schedule_id_type()(*this); + const global_property_object& gpo = get_global_properties(); + + if( head_block_num() % gpo.active_witnesses.size() == 0 ) + { + modify( wso, [&]( witness_schedule_object& _wso ) + { + _wso.current_shuffled_witnesses.clear(); + _wso.current_shuffled_witnesses.reserve( gpo.active_witnesses.size() ); + + for( const witness_id_type& w : gpo.active_witnesses ) + _wso.current_shuffled_witnesses.push_back( w ); + + auto now_hi = uint64_t(head_block_time().sec_since_epoch()) << 32; + for( uint32_t i = 0; i < _wso.current_shuffled_witnesses.size(); ++i ) + { + /// High performance random generator + /// http://xorshift.di.unimi.it/ + uint64_t k = now_hi + uint64_t(i)*2685821657736338717ULL; + k ^= (k >> 12); + k ^= (k << 25); + k ^= (k >> 27); + k *= 2685821657736338717ULL; + + uint32_t jmax = _wso.current_shuffled_witnesses.size() - i; + uint32_t j = i + k%jmax; + std::swap( _wso.current_shuffled_witnesses[i], + _wso.current_shuffled_witnesses[j] ); + } + }); + } +} + } } diff --git a/libraries/chain/include/graphene/chain/database.hpp b/libraries/chain/include/graphene/chain/database.hpp index 66215923..59d3c4c5 100644 --- a/libraries/chain/include/graphene/chain/database.hpp +++ b/libraries/chain/include/graphene/chain/database.hpp @@ -227,6 +227,8 @@ namespace graphene { namespace chain { */ uint32_t get_slot_at_time(fc::time_point_sec when)const; + void update_witness_schedule(); + //////////////////// db_getter.cpp //////////////////// const chain_id_type& get_chain_id()const; @@ -424,7 +426,6 @@ namespace graphene { namespace chain { void update_expired_feeds(); void update_maintenance_flag( bool new_maintenance_flag ); void update_withdraw_permissions(); - void shuffle_witnesses(); ///Steps performed only at maintenance intervals ///@{ diff --git a/libraries/chain/include/graphene/chain/global_property_object.hpp b/libraries/chain/include/graphene/chain/global_property_object.hpp index bb761cc7..568ded67 100644 --- a/libraries/chain/include/graphene/chain/global_property_object.hpp +++ b/libraries/chain/include/graphene/chain/global_property_object.hpp @@ -47,7 +47,6 @@ namespace graphene { namespace chain { flat_set active_witnesses; // updated once per maintenance interval // n.b. witness scheduling is done by witness_schedule object flat_set witness_accounts; // updated once per maintenance interval - vector current_shuffled_witnesses; }; /** @@ -138,5 +137,4 @@ FC_REFLECT_DERIVED( graphene::chain::global_property_object, (graphene::db::obje (next_available_vote_id) (active_committee_members) (active_witnesses) - (current_shuffled_witnesses) ) diff --git a/libraries/chain/include/graphene/chain/protocol/types.hpp b/libraries/chain/include/graphene/chain/protocol/types.hpp index c34aa1b0..0030c1f1 100644 --- a/libraries/chain/include/graphene/chain/protocol/types.hpp +++ b/libraries/chain/include/graphene/chain/protocol/types.hpp @@ -141,7 +141,8 @@ namespace graphene { namespace chain { impl_block_summary_object_type, impl_account_transaction_history_object_type, impl_blinded_balance_object_type, - impl_chain_property_object_type + impl_chain_property_object_type, + impl_witness_schedule_object_type }; enum meta_info_object_type @@ -194,6 +195,7 @@ namespace graphene { namespace chain { class block_summary_object; class account_transaction_history_object; class chain_property_object; + class witness_schedule_object; typedef object_id< implementation_ids, impl_global_property_object_type, global_property_object> global_property_id_type; typedef object_id< implementation_ids, impl_dynamic_global_property_object_type, dynamic_global_property_object> dynamic_global_property_id_type; @@ -208,6 +210,7 @@ namespace graphene { namespace chain { impl_account_transaction_history_object_type, account_transaction_history_object> account_transaction_history_id_type; typedef object_id< implementation_ids, impl_chain_property_object_type, chain_property_object> chain_property_id_type; + typedef object_id< implementation_ids, impl_witness_schedule_object_type, witness_schedule_object> witness_schedule_id_type; typedef fc::array symbol_type; typedef fc::ripemd160 block_id_type; @@ -284,6 +287,7 @@ FC_REFLECT_ENUM( graphene::chain::impl_object_type, (impl_account_transaction_history_object_type) (impl_blinded_balance_object_type) (impl_chain_property_object_type) + (impl_witness_schedule_object_type) ) FC_REFLECT_ENUM( graphene::chain::meta_info_object_type, (meta_account_object_type)(meta_asset_object_type) ) diff --git a/libraries/chain/include/graphene/chain/witness_schedule_object.hpp b/libraries/chain/include/graphene/chain/witness_schedule_object.hpp new file mode 100644 index 00000000..384936f5 --- /dev/null +++ b/libraries/chain/include/graphene/chain/witness_schedule_object.hpp @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2015, Cryptonomex, Inc. + * All rights reserved. + * + * This source code is provided for evaluation in private test networks only, until September 8, 2015. After this date, this license expires and + * the code may not be used, modified or distributed for any purpose. Redistribution and use in source and binary forms, with or without modification, + * are permitted until September 8, 2015, provided that the following conditions are met: + * + * 1. The code and/or derivative works are used only for private test networks consisting of no more than 10 P2P nodes. + * + * 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. + */ +#pragma once +#include +#include +#include + +namespace graphene { namespace chain { + +class witness_schedule_object; + +class witness_schedule_object : public graphene::db::abstract_object +{ + public: + static const uint8_t space_id = implementation_ids; + static const uint8_t type_id = impl_witness_schedule_object_type; + + vector< witness_id_type > current_shuffled_witnesses; +}; + +} } + +FC_REFLECT_DERIVED( + graphene::chain::witness_schedule_object, + (graphene::db::object), + (current_shuffled_witnesses) +)