From da4954c686f5283f790d8dc3b09a7c21c307085c Mon Sep 17 00:00:00 2001 From: pbattu123 Date: Thu, 5 Mar 2020 16:20:24 -0400 Subject: [PATCH] resolved compilation issues and other conflicts --- libraries/chain/db_getter.cpp | 2 + libraries/chain/proposal_evaluator.cpp | 1 + libraries/fc | 2 +- .../wallet/include/graphene/wallet/wallet.hpp | 15 - libraries/wallet/wallet.cpp | 51 +- programs/witness_node/main.cpp | 7 - tests/CMakeLists.txt | 4 +- tests/cli/cli_fixture.cpp | 2 +- tests/cli/main.cpp | 641 +----------------- tests/common/genesis_file_util.hpp | 2 +- 10 files changed, 31 insertions(+), 696 deletions(-) diff --git a/libraries/chain/db_getter.cpp b/libraries/chain/db_getter.cpp index 30fd776f..bf5cc2dc 100644 --- a/libraries/chain/db_getter.cpp +++ b/libraries/chain/db_getter.cpp @@ -250,6 +250,8 @@ bool database::is_son_dereg_valid( son_id_type son_id ) bool ret = ( son->status == son_status::in_maintenance && (head_block_time() - son->statistics(*this).last_down_timestamp >= fc::seconds(get_global_properties().parameters.son_deregister_time()))); return ret; +} + const account_statistics_object& database::get_account_stats_by_owner( account_id_type owner )const { auto& idx = get_index_type().indices().get(); diff --git a/libraries/chain/proposal_evaluator.cpp b/libraries/chain/proposal_evaluator.cpp index f1eef69f..6664476f 100644 --- a/libraries/chain/proposal_evaluator.cpp +++ b/libraries/chain/proposal_evaluator.cpp @@ -150,6 +150,7 @@ struct proposal_operation_hardfork_visitor void operator()(const son_maintenance_operation &v) const { FC_ASSERT( block_time >= HARDFORK_SON_TIME, "son_maintenance_operation not allowed yet!" ); + } void operator()(const vesting_balance_create_operation &vbco) const { if(block_time < HARDFORK_GPOS_TIME) diff --git a/libraries/fc b/libraries/fc index 6096e94e..a76b9ff8 160000 --- a/libraries/fc +++ b/libraries/fc @@ -1 +1 @@ -Subproject commit 6096e94e1b4c48a393c9335580365df144f2758f +Subproject commit a76b9ff81c6887ebe1dc9fa03ef15e1433029c65 diff --git a/libraries/wallet/include/graphene/wallet/wallet.hpp b/libraries/wallet/include/graphene/wallet/wallet.hpp index 91eb8dbd..61342530 100644 --- a/libraries/wallet/include/graphene/wallet/wallet.hpp +++ b/libraries/wallet/include/graphene/wallet/wallet.hpp @@ -2139,20 +2139,6 @@ class wallet_api rock_paper_scissors_gesture gesture, bool broadcast); - /** Create a vesting balance including gpos vesting balance after HARDFORK_GPOS_TIME - * @param owner vesting balance owner and creator - * @param amount amount to vest - * @param asset_symbol the symbol of the asset to vest - * @param is_gpos True if the balance is of gpos type - * @param broadcast true if you wish to broadcast the transaction - * @return the signed version of the transaction - */ - signed_transaction create_vesting_balance(string owner, - string amount, - string asset_symbol, - bool is_gpos, - bool broadcast); - void dbg_make_uia(string creator, string symbol); void dbg_make_mia(string creator, string symbol); void dbg_push_blocks( std::string src_filename, uint32_t count ); @@ -2333,7 +2319,6 @@ FC_API( graphene::wallet::wallet_api, (update_witness) (create_worker) (update_worker_votes) - (create_vesting_balance) (get_vesting_balances) (withdraw_vesting) (withdraw_GPOS_vesting_balance) diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp index a7ce3b87..fb9d242d 100644 --- a/libraries/wallet/wallet.cpp +++ b/libraries/wallet/wallet.cpp @@ -2094,13 +2094,16 @@ public: return swi.son_id; }); std::vector> son_objects = _remote_db->get_sons(son_ids); - vector owners; + vector owners; for(auto obj: son_objects) { if (obj) - owners.push_back(obj->son_account); + { + std::string acc_id = account_id_to_string(obj->son_account); + owners.push_back(acc_id); + } } - vector> accs = _remote_db->get_accounts(owners); + vector< optional< account_object> > accs = _remote_db->get_accounts(owners); std::remove_if(son_objects.begin(), son_objects.end(), [](const fc::optional& obj) -> bool { return obj.valid(); }); map result; @@ -2383,13 +2386,14 @@ public: vesting_balance_type vesting_type, bool broadcast /* = false */) { try { - account_object son_account = get_account(owner_account); + FC_ASSERT( !is_locked() ); + account_object user_account = get_account(owner_account); fc::optional asset_obj = get_asset(asset_symbol); FC_ASSERT(asset_obj, "Invalid asset symbol {asst}", ("asst", asset_symbol)); vesting_balance_create_operation op; - op.creator = son_account.get_id(); - op.owner = son_account.get_id(); + op.creator = user_account.get_id(); + op.owner = user_account.get_id(); op.amount = asset_obj->amount_from_string(amount); op.balance_type = vesting_type; if (op.balance_type == vesting_balance_type::son) @@ -6670,41 +6674,6 @@ signed_transaction wallet_api::rps_throw(game_id_type game_id, return my->sign_transaction( tx, broadcast ); } -signed_transaction wallet_api::create_vesting_balance(string owner, - string amount, - string asset_symbol, - bool is_gpos, - bool broadcast) -{ - FC_ASSERT( !is_locked() ); - //Can be deleted after GPOS hardfork time - time_point_sec now = time_point::now(); - if(is_gpos && now < HARDFORK_GPOS_TIME) - FC_THROW("GPOS related functionality is not avaiable until next Spring"); - - account_object owner_account = get_account(owner); - account_id_type owner_id = owner_account.id; - - fc::optional asset_obj = get_asset(asset_symbol); - - auto type = vesting_balance_type::normal; - if(is_gpos) - type = vesting_balance_type::gpos; - - vesting_balance_create_operation op; - op.creator = owner_id; - op.owner = owner_id; - op.amount = asset_obj->amount_from_string(amount); - op.balance_type = type; - - signed_transaction trx; - trx.operations.push_back(op); - my->set_operation_fees( trx, my->_remote_db->get_global_properties().parameters.current_fees ); - trx.validate(); - - return my->sign_transaction( trx, broadcast ); -} - // default ctor necessary for FC_REFLECT signed_block_with_info::signed_block_with_info() { diff --git a/programs/witness_node/main.cpp b/programs/witness_node/main.cpp index 19b1460d..7823fed3 100644 --- a/programs/witness_node/main.cpp +++ b/programs/witness_node/main.cpp @@ -44,11 +44,8 @@ #include #include -<<<<<<< HEAD #include #include -======= ->>>>>>> 24e7610bceb97ab361fe003622c80a79bdecf730 #include #include @@ -199,10 +196,6 @@ int main(int argc, char** argv) { elog("Exiting with error:\n${e}", ("e", unhandled_exception->to_detail_string())); node->shutdown(); delete node; -<<<<<<< HEAD return EXIT_FAILURE; -======= - return 1; ->>>>>>> 24e7610bceb97ab361fe003622c80a79bdecf730 } } diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 3cb14768..5162f692 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -35,7 +35,7 @@ target_link_libraries( betting_test graphene_chain graphene_app graphene_account file(GLOB PEERPLAYS_SIDECHAIN_TESTS "peerplays_sidechain/*.cpp") add_executable( peerplays_sidechain_test ${PEERPLAYS_SIDECHAIN_TESTS} ${COMMON_SOURCES} ) -target_link_libraries( peerplays_sidechain_test graphene_chain graphene_app graphene_account_history graphene_bookie graphene_egenesis_none fc graphene_wallet ${PLATFORM_SPECIFIC_LIBS} ) +target_link_libraries( peerplays_sidechain_test graphene_chain graphene_app graphene_account_history graphene_bookie graphene_elasticsearch graphene_es_objects graphene_egenesis_none fc graphene_wallet ${PLATFORM_SPECIFIC_LIBS} ) file(GLOB TOURNAMENT_TESTS "tournament/*.cpp") add_executable( tournament_test ${TOURNAMENT_TESTS} ${COMMON_SOURCES} ) @@ -50,7 +50,7 @@ add_executable( cli_test ${CLI_SOURCES} ) if(WIN32) list(APPEND PLATFORM_SPECIFIC_LIBS ws2_32) endif() -target_link_libraries( cli_test graphene_chain graphene_app graphene_witness graphene_wallet graphene_egenesis_none fc ${PLATFORM_SPECIFIC_LIBS} ) +target_link_libraries( cli_test graphene_chain graphene_app graphene_witness graphene_wallet graphene_elasticsearch graphene_es_objects graphene_egenesis_none fc ${PLATFORM_SPECIFIC_LIBS} ) if(MSVC) set_source_files_properties( cli/main.cpp PROPERTIES COMPILE_FLAGS "/bigobj" ) endif(MSVC) diff --git a/tests/cli/cli_fixture.cpp b/tests/cli/cli_fixture.cpp index 5b5fd7ad..8a382e0b 100644 --- a/tests/cli/cli_fixture.cpp +++ b/tests/cli/cli_fixture.cpp @@ -129,7 +129,7 @@ client_connection::client_connection( wallet_data.ws_password = ""; websocket_connection = websocket_client.connect( wallet_data.ws_server ); - api_connection = std::make_shared(websocket_connection, GRAPHENE_MAX_NESTED_OBJECTS); + api_connection = std::make_shared(*websocket_connection, GRAPHENE_MAX_NESTED_OBJECTS); remote_login_api = api_connection->get_remote_api< graphene::app::login_api >(1); BOOST_CHECK(remote_login_api->login( wallet_data.ws_user, wallet_data.ws_password ) ); diff --git a/tests/cli/main.cpp b/tests/cli/main.cpp index 505178c0..d300005b 100644 --- a/tests/cli/main.cpp +++ b/tests/cli/main.cpp @@ -23,291 +23,11 @@ */ #include "cli_fixture.hpp" -#include -#include -#include -#include -#include - -#include -#include -#include - -#include -#include -#include -#include -#include - -#include #include #define BOOST_TEST_MODULE Test Application #include -/***** - * Global Initialization for Windows - * ( sets up Winsock stuf ) - */ -#ifdef _WIN32 -int sockInit(void) -{ - WSADATA wsa_data; - return WSAStartup(MAKEWORD(1,1), &wsa_data); -} -int sockQuit(void) -{ - return WSACleanup(); -} -#endif - -/********************* - * Helper Methods - *********************/ - -#include "../common/genesis_file_util.hpp" - -using std::exception; -using std::cerr; - -#define INVOKE(test) ((struct test*)this)->test_method(); - -////// -/// @brief attempt to find an available port on localhost -/// @returns an available port number, or -1 on error -///// -int get_available_port() -{ - struct sockaddr_in sin; - int socket_fd = socket(AF_INET, SOCK_STREAM, 0); - if (socket_fd == -1) - return -1; - sin.sin_family = AF_INET; - sin.sin_port = 0; - sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - if (::bind(socket_fd, (struct sockaddr*)&sin, sizeof(struct sockaddr_in)) == -1) - return -1; - socklen_t len = sizeof(sin); - if (getsockname(socket_fd, (struct sockaddr *)&sin, &len) == -1) - return -1; -#ifdef _WIN32 - closesocket(socket_fd); -#else - close(socket_fd); -#endif - return ntohs(sin.sin_port); -} - -/////////// -/// @brief Start the application -/// @param app_dir the temporary directory to use -/// @param server_port_number to be filled with the rpc endpoint port number -/// @returns the application object -////////// -std::shared_ptr start_application(fc::temp_directory& app_dir, int& server_port_number) { - std::shared_ptr app1(new graphene::app::application{}); - - app1->register_plugin< graphene::bookie::bookie_plugin>(); - app1->register_plugin(); - app1->register_plugin< graphene::market_history::market_history_plugin >(); - app1->register_plugin< graphene::witness_plugin::witness_plugin >(); - app1->startup_plugins(); - boost::program_options::variables_map cfg; -#ifdef _WIN32 - sockInit(); -#endif - server_port_number = get_available_port(); - cfg.emplace( - "rpc-endpoint", - boost::program_options::variable_value(string("127.0.0.1:" + std::to_string(server_port_number)), false) - ); - cfg.emplace("genesis-json", boost::program_options::variable_value(create_genesis_file(app_dir), false)); - cfg.emplace("seed-nodes", boost::program_options::variable_value(string("[]"), false)); - - app1->initialize(app_dir.path(), cfg); - - app1->initialize_plugins(cfg); - app1->startup_plugins(); - - app1->startup(); - fc::usleep(fc::milliseconds(500)); - return app1; -} - -/////////// -/// Send a block to the db -/// @param app the application -/// @param returned_block the signed block -/// @returns true on success -/////////// -bool generate_block(std::shared_ptr app, graphene::chain::signed_block& returned_block) -{ - try { - fc::ecc::private_key committee_key = fc::ecc::private_key::regenerate(fc::sha256::hash(string("nathan"))); - auto db = app->chain_database(); - returned_block = db->generate_block( db->get_slot_time(1), - db->get_scheduled_witness(1), - committee_key, - database::skip_nothing ); - return true; - } catch (exception &e) { - return false; - } -} - -bool generate_block(std::shared_ptr app) -{ - graphene::chain::signed_block returned_block; - return generate_block(app, returned_block); -} - -/////////// -/// @brief Skip intermediate blocks, and generate a maintenance block -/// @param app the application -/// @returns true on success -/////////// -bool generate_maintenance_block(std::shared_ptr app) { - try { - fc::ecc::private_key committee_key = fc::ecc::private_key::regenerate(fc::sha256::hash(string("nathan"))); - uint32_t skip = ~0; - auto db = app->chain_database(); - auto maint_time = db->get_dynamic_global_properties().next_maintenance_time; - auto slots_to_miss = db->get_slot_at_time(maint_time); - db->generate_block(db->get_slot_time(slots_to_miss), - db->get_scheduled_witness(slots_to_miss), - committee_key, - skip); - return true; - } catch (exception& e) - { - return false; - } -} - -/////////// -/// @brief a class to make connecting to the application server easier -/////////// -class client_connection -{ -public: - ///////// - // constructor - ///////// - client_connection( - std::shared_ptr app, - const fc::temp_directory& data_dir, - const int server_port_number - ) - { - wallet_data.chain_id = app->chain_database()->get_chain_id(); - wallet_data.ws_server = "ws://127.0.0.1:" + std::to_string(server_port_number); - wallet_data.ws_user = ""; - wallet_data.ws_password = ""; - websocket_connection = websocket_client.connect( wallet_data.ws_server ); - - api_connection = std::make_shared(*websocket_connection, GRAPHENE_MAX_NESTED_OBJECTS); - - remote_login_api = api_connection->get_remote_api< graphene::app::login_api >(1); - BOOST_CHECK(remote_login_api->login( wallet_data.ws_user, wallet_data.ws_password ) ); - - wallet_api_ptr = std::make_shared(wallet_data, remote_login_api); - wallet_filename = data_dir.path().generic_string() + "/wallet.json"; - wallet_api_ptr->set_wallet_filename(wallet_filename); - - wallet_api = fc::api(wallet_api_ptr); - - wallet_cli = std::make_shared(GRAPHENE_MAX_NESTED_OBJECTS); - for( auto& name_formatter : wallet_api_ptr->get_result_formatters() ) - wallet_cli->format_result( name_formatter.first, name_formatter.second ); - - boost::signals2::scoped_connection closed_connection(websocket_connection->closed.connect([=]{ - cerr << "Server has disconnected us.\n"; - wallet_cli->stop(); - })); - (void)(closed_connection); - } - ~client_connection() - { - // wait for everything to finish up - fc::usleep(fc::milliseconds(500)); - } -public: - fc::http::websocket_client websocket_client; - graphene::wallet::wallet_data wallet_data; - fc::http::websocket_connection_ptr websocket_connection; - std::shared_ptr api_connection; - fc::api remote_login_api; - std::shared_ptr wallet_api_ptr; - fc::api wallet_api; - std::shared_ptr wallet_cli; - std::string wallet_filename; -}; - - -/////////////////////////////// -// Cli Wallet Fixture -/////////////////////////////// - -struct cli_fixture -{ - class dummy - { - public: - ~dummy() - { - // wait for everything to finish up - fc::usleep(fc::milliseconds(500)); - } - }; - dummy dmy; - int server_port_number; - fc::temp_directory app_dir; - std::shared_ptr app1; - client_connection con; - std::vector nathan_keys; - - cli_fixture() : - server_port_number(0), - app_dir( graphene::utilities::temp_directory_path() ), - app1( start_application(app_dir, server_port_number) ), - con( app1, app_dir, server_port_number ), - nathan_keys( {"5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3"} ) - { - BOOST_TEST_MESSAGE("Setup cli_wallet::boost_fixture_test_case"); - - using namespace graphene::chain; - using namespace graphene::app; - - try - { - BOOST_TEST_MESSAGE("Setting wallet password"); - con.wallet_api_ptr->set_password("supersecret"); - con.wallet_api_ptr->unlock("supersecret"); - - // import Nathan account - BOOST_TEST_MESSAGE("Importing nathan key"); - BOOST_CHECK_EQUAL(nathan_keys[0], "5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3"); - BOOST_CHECK(con.wallet_api_ptr->import_key("nathan", nathan_keys[0])); - } catch( fc::exception& e ) { - edump((e.to_detail_string())); - throw; - } - } - - ~cli_fixture() - { - BOOST_TEST_MESSAGE("Cleanup cli_wallet::boost_fixture_test_case"); - - // wait for everything to finish up - fc::usleep(fc::seconds(1)); - - app1->shutdown(); -#ifdef _WIN32 - sockQuit(); -#endif - } -}; - /////////////////////////////// // Tests /////////////////////////////// @@ -319,17 +39,7 @@ BOOST_AUTO_TEST_CASE( cli_connect ) BOOST_TEST_MESSAGE("Testing wallet connection."); } -//////////////// -// Start a server and connect using the same calls as the CLI -// Quit wallet and be sure that file was saved correctly -//////////////// -BOOST_FIXTURE_TEST_CASE( cli_quit, cli_fixture ) -{ - BOOST_TEST_MESSAGE("Testing wallet connection and quit command."); - BOOST_CHECK_THROW( con.wallet_api_ptr->quit(), fc::canceled_exception ); -} - -BOOST_FIXTURE_TEST_CASE( upgrade_nathan_account, cli_fixture ) +BOOST_AUTO_TEST_CASE( upgrade_nathan_account ) { init_nathan(); } @@ -350,11 +60,8 @@ BOOST_AUTO_TEST_CASE( create_new_account ) BOOST_CHECK(con.wallet_api_ptr->import_key("jmjatlanta", bki.wif_priv_key)); con.wallet_api_ptr->save_wallet_file(con.wallet_filename); - BOOST_CHECK(generate_block(app1)); - fc::usleep( fc::seconds(1) ); - - // attempt to give jmjatlanta some peerplays - BOOST_TEST_MESSAGE("Transferring peerplays from Nathan to jmjatlanta"); + // attempt to give jmjatlanta some CORE + BOOST_TEST_MESSAGE("Transferring CORE from Nathan to jmjatlanta"); signed_transaction transfer_tx = con.wallet_api_ptr->transfer( "nathan", "jmjatlanta", "10000", "1.3.0", "Here are some CORE token for your new account", true ); @@ -369,22 +76,19 @@ BOOST_AUTO_TEST_CASE( create_new_account ) // Vote for two witnesses, and make sure they both stay there // after a maintenance block /////////////////////// - -// Todo: Removed by GPOS, refactor test. -/* -BOOST_FIXTURE_TEST_CASE( cli_vote_for_2_witnesses, cli_fixture ) +BOOST_AUTO_TEST_CASE( cli_vote_for_2_witnesses ) { try { BOOST_TEST_MESSAGE("Cli Vote Test for 2 Witnesses"); - - INVOKE(create_new_account); + + init_nathan(); // get the details for init1 witness_object init1_obj = con.wallet_api_ptr->get_witness("init1"); int init1_start_votes = init1_obj.total_votes; // Vote for a witness - signed_transaction vote_witness1_tx = con.wallet_api_ptr->vote_for_witness("jmjatlanta", "init1", true, true); + signed_transaction vote_witness1_tx = con.wallet_api_ptr->vote_for_witness("nathan", "init1", true, true); // generate a block to get things started BOOST_CHECK(generate_block()); @@ -399,7 +103,7 @@ BOOST_FIXTURE_TEST_CASE( cli_vote_for_2_witnesses, cli_fixture ) // Vote for a 2nd witness int init2_start_votes = init2_obj.total_votes; - signed_transaction vote_witness2_tx = con.wallet_api_ptr->vote_for_witness("jmjatlanta", "init2", true, true); + signed_transaction vote_witness2_tx = con.wallet_api_ptr->vote_for_witness("nathan", "init2", true, true); // send another block to trigger maintenance interval BOOST_CHECK(generate_maintenance_block()); @@ -417,43 +121,6 @@ BOOST_FIXTURE_TEST_CASE( cli_vote_for_2_witnesses, cli_fixture ) throw; } } -*/ - -BOOST_FIXTURE_TEST_CASE( cli_get_signed_transaction_signers, cli_fixture ) -{ - try - { - INVOKE(upgrade_nathan_account); - - // register account and transfer funds - const auto test_bki = con.wallet_api_ptr->suggest_brain_key(); - con.wallet_api_ptr->register_account( - "test", test_bki.pub_key, test_bki.pub_key, "nathan", "nathan", 0, true - ); - con.wallet_api_ptr->transfer("nathan", "test", "1000", "1.3.0", "", true); - - // import key and save wallet - BOOST_CHECK(con.wallet_api_ptr->import_key("test", test_bki.wif_priv_key)); - con.wallet_api_ptr->save_wallet_file(con.wallet_filename); - - // create transaction and check expected result - auto signed_trx = con.wallet_api_ptr->transfer("test", "nathan", "10", "1.3.0", "", true); - - const auto &test_acc = con.wallet_api_ptr->get_account("test"); - flat_set expected_signers = {test_bki.pub_key}; - vector > expected_key_refs{{test_acc.id, test_acc.id}}; - - auto signers = con.wallet_api_ptr->get_transaction_signers(signed_trx); - BOOST_CHECK(signers == expected_signers); - - auto key_refs = con.wallet_api_ptr->get_key_references({test_bki.pub_key}); - BOOST_CHECK(key_refs == expected_key_refs); - - } catch( fc::exception& e ) { - edump((e.to_detail_string())); - throw; - } -} /////////////////////// // Check account history pagination @@ -464,7 +131,7 @@ BOOST_AUTO_TEST_CASE( account_history_pagination ) { INVOKE(create_new_account); - // attempt to give jmjatlanta some peerplay + // attempt to give jmjatlanta some peerplay BOOST_TEST_MESSAGE("Transferring peerplay from Nathan to jmjatlanta"); for(int i = 1; i <= 199; i++) { @@ -474,13 +141,13 @@ BOOST_AUTO_TEST_CASE( account_history_pagination ) BOOST_CHECK(generate_block()); - // now get account history and make sure everything is there (and no duplicates) + // now get account history and make sure everything is there (and no duplicates) std::vector history = con.wallet_api_ptr->get_account_history("jmjatlanta", 300); BOOST_CHECK_EQUAL(201u, history.size() ); - std::set operation_ids; + std::set operation_ids; - for(auto& op : history) + for(auto& op : history) { if( operation_ids.find(op.op.id) != operation_ids.end() ) { @@ -494,286 +161,4 @@ BOOST_AUTO_TEST_CASE( account_history_pagination ) } } -BOOST_FIXTURE_TEST_CASE( cli_get_available_transaction_signers, cli_fixture ) -{ - try - { - INVOKE(upgrade_nathan_account); - - // register account - const auto test_bki = con.wallet_api_ptr->suggest_brain_key(); - con.wallet_api_ptr->register_account( - "test", test_bki.pub_key, test_bki.pub_key, "nathan", "nathan", 0, true - ); - const auto &test_acc = con.wallet_api_ptr->get_account("test"); - - // create and sign transaction - signed_transaction trx; - trx.operations = {transfer_operation()}; - - // sign with test key - const auto test_privkey = wif_to_key( test_bki.wif_priv_key ); - BOOST_REQUIRE( test_privkey ); - trx.sign( *test_privkey, con.wallet_data.chain_id ); - - // sign with other keys - const auto privkey_1 = fc::ecc::private_key::generate(); - trx.sign( privkey_1, con.wallet_data.chain_id ); - - const auto privkey_2 = fc::ecc::private_key::generate(); - trx.sign( privkey_2, con.wallet_data.chain_id ); - - // verify expected result - flat_set expected_signers = {test_bki.pub_key, - privkey_1.get_public_key(), - privkey_2.get_public_key()}; - - auto signers = con.wallet_api_ptr->get_transaction_signers(trx); - BOOST_CHECK(signers == expected_signers); - - // blockchain has no references to unknown accounts (privkey_1, privkey_2) - // only test account available - vector > expected_key_refs; - expected_key_refs.push_back(vector()); - expected_key_refs.push_back(vector()); - expected_key_refs.push_back({test_acc.id, test_acc.id}); - - auto key_refs = con.wallet_api_ptr->get_key_references({expected_signers.begin(), expected_signers.end()}); - std::sort(key_refs.begin(), key_refs.end()); - - BOOST_CHECK(key_refs == expected_key_refs); - - } catch( fc::exception& e ) { - edump((e.to_detail_string())); - throw; - } -} - -BOOST_FIXTURE_TEST_CASE( cli_cant_get_signers_from_modified_transaction, cli_fixture ) -{ - try - { - INVOKE(upgrade_nathan_account); - - // register account - const auto test_bki = con.wallet_api_ptr->suggest_brain_key(); - con.wallet_api_ptr->register_account( - "test", test_bki.pub_key, test_bki.pub_key, "nathan", "nathan", 0, true - ); - - // create and sign transaction - signed_transaction trx; - trx.operations = {transfer_operation()}; - - // sign with test key - const auto test_privkey = wif_to_key( test_bki.wif_priv_key ); - BOOST_REQUIRE( test_privkey ); - trx.sign( *test_privkey, con.wallet_data.chain_id ); - - // modify transaction (MITM-attack) - trx.operations.clear(); - - // verify if transaction has no valid signature of test account - flat_set expected_signers_of_valid_transaction = {test_bki.pub_key}; - auto signers = con.wallet_api_ptr->get_transaction_signers(trx); - BOOST_CHECK(signers != expected_signers_of_valid_transaction); - - } catch( fc::exception& e ) { - edump((e.to_detail_string())); - throw; - } -} - -/////////////////// -// Start a server and connect using the same calls as the CLI -// Set a voting proxy and be assured that it sticks -/////////////////// -BOOST_FIXTURE_TEST_CASE( cli_set_voting_proxy, cli_fixture ) -{ - try { - INVOKE(create_new_account); - - // grab account for comparison - account_object prior_voting_account = con.wallet_api_ptr->get_account("jmjatlanta"); - // set the voting proxy to nathan - BOOST_TEST_MESSAGE("About to set voting proxy."); - signed_transaction voting_tx = con.wallet_api_ptr->set_voting_proxy("jmjatlanta", "nathan", true); - account_object after_voting_account = con.wallet_api_ptr->get_account("jmjatlanta"); - // see if it changed - BOOST_CHECK(prior_voting_account.options.voting_account != after_voting_account.options.voting_account); - } catch( fc::exception& e ) { - edump((e.to_detail_string())); - throw; - } -} - - -/////////////////////// -// Create a multi-sig account and verify that only when all signatures are -// signed, the transaction could be broadcast -/////////////////////// -BOOST_AUTO_TEST_CASE( cli_multisig_transaction ) -{ - using namespace graphene::chain; - using namespace graphene::app; - std::shared_ptr app1; - try { - fc::temp_directory app_dir( graphene::utilities::temp_directory_path() ); - - int server_port_number = 0; - app1 = start_application(app_dir, server_port_number); - - // connect to the server - client_connection con(app1, app_dir, server_port_number); - - BOOST_TEST_MESSAGE("Setting wallet password"); - con.wallet_api_ptr->set_password("supersecret"); - con.wallet_api_ptr->unlock("supersecret"); - - // import Nathan account - BOOST_TEST_MESSAGE("Importing nathan key"); - std::vector nathan_keys{"5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3"}; - BOOST_CHECK_EQUAL(nathan_keys[0], "5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3"); - BOOST_CHECK(con.wallet_api_ptr->import_key("nathan", nathan_keys[0])); - - BOOST_TEST_MESSAGE("Importing nathan's balance"); - std::vector import_txs = con.wallet_api_ptr->import_balance("nathan", nathan_keys, true); - account_object nathan_acct_before_upgrade = con.wallet_api_ptr->get_account("nathan"); - - // upgrade nathan - BOOST_TEST_MESSAGE("Upgrading Nathan to LTM"); - signed_transaction upgrade_tx = con.wallet_api_ptr->upgrade_account("nathan", true); - account_object nathan_acct_after_upgrade = con.wallet_api_ptr->get_account("nathan"); - - // verify that the upgrade was successful - BOOST_CHECK_PREDICATE( std::not_equal_to(), (nathan_acct_before_upgrade.membership_expiration_date.sec_since_epoch())(nathan_acct_after_upgrade.membership_expiration_date.sec_since_epoch()) ); - BOOST_CHECK(nathan_acct_after_upgrade.is_lifetime_member()); - - // create a new multisig account - graphene::wallet::brain_key_info bki1 = con.wallet_api_ptr->suggest_brain_key(); - graphene::wallet::brain_key_info bki2 = con.wallet_api_ptr->suggest_brain_key(); - graphene::wallet::brain_key_info bki3 = con.wallet_api_ptr->suggest_brain_key(); - graphene::wallet::brain_key_info bki4 = con.wallet_api_ptr->suggest_brain_key(); - BOOST_CHECK(!bki1.brain_priv_key.empty()); - BOOST_CHECK(!bki2.brain_priv_key.empty()); - BOOST_CHECK(!bki3.brain_priv_key.empty()); - BOOST_CHECK(!bki4.brain_priv_key.empty()); - - signed_transaction create_multisig_acct_tx; - account_create_operation account_create_op; - - account_create_op.referrer = nathan_acct_after_upgrade.id; - account_create_op.referrer_percent = nathan_acct_after_upgrade.referrer_rewards_percentage; - account_create_op.registrar = nathan_acct_after_upgrade.id; - account_create_op.name = "cifer.test"; - account_create_op.owner = authority(1, bki1.pub_key, 1); - account_create_op.active = authority(2, bki2.pub_key, 1, bki3.pub_key, 1); - account_create_op.options.memo_key = bki4.pub_key; - account_create_op.fee = asset(1000000); // should be enough for creating account - - create_multisig_acct_tx.operations.push_back(account_create_op); - con.wallet_api_ptr->sign_transaction(create_multisig_acct_tx, true); - - // attempt to give cifer.test some peerplays - BOOST_TEST_MESSAGE("Transferring peerplays from Nathan to cifer.test"); - signed_transaction transfer_tx1 = con.wallet_api_ptr->transfer("nathan", "cifer.test", "10000", "1.3.0", "Here are some BTS for your new account", true); - - // transfer bts from cifer.test to nathan - BOOST_TEST_MESSAGE("Transferring peerplays from cifer.test to nathan"); - auto dyn_props = app1->chain_database()->get_dynamic_global_properties(); - account_object cifer_test = con.wallet_api_ptr->get_account("cifer.test"); - - // construct a transfer transaction - signed_transaction transfer_tx2; - transfer_operation xfer_op; - xfer_op.from = cifer_test.id; - xfer_op.to = nathan_acct_after_upgrade.id; - xfer_op.amount = asset(100000000); - xfer_op.fee = asset(3000000); // should be enough for transfer - transfer_tx2.operations.push_back(xfer_op); - - // case1: sign a transaction without TaPoS and expiration fields - // expect: return a transaction with TaPoS and expiration filled - transfer_tx2 = - con.wallet_api_ptr->add_transaction_signature( transfer_tx2, false ); - BOOST_CHECK( ( transfer_tx2.ref_block_num != 0 && - transfer_tx2.ref_block_prefix != 0 ) || - ( transfer_tx2.expiration != fc::time_point_sec() ) ); - - // case2: broadcast without signature - // expect: exception with missing active authority - BOOST_CHECK_THROW(con.wallet_api_ptr->broadcast_transaction(transfer_tx2), fc::exception); - - // case3: - // import one of the private keys for this new account in the wallet file, - // sign and broadcast with partial signatures - // - // expect: exception with missing active authority - BOOST_CHECK(con.wallet_api_ptr->import_key("cifer.test", bki2.wif_priv_key)); - BOOST_CHECK_THROW(con.wallet_api_ptr->add_transaction_signature(transfer_tx2, true), fc::exception); - - // case4: sign again as signature exists - // expect: num of signatures not increase - // transfer_tx2 = con.wallet_api_ptr->add_transaction_signature(transfer_tx2, false); - // BOOST_CHECK_EQUAL(transfer_tx2.signatures.size(), 1); - - // case5: - // import another private key, sign and broadcast without full signatures - // - // expect: transaction broadcast successfully - BOOST_CHECK(con.wallet_api_ptr->import_key("cifer.test", bki3.wif_priv_key)); - con.wallet_api_ptr->add_transaction_signature(transfer_tx2, true); - auto balances = con.wallet_api_ptr->list_account_balances( "cifer.test" ); - for (auto b : balances) { - if (b.asset_id == asset_id_type()) { - BOOST_ASSERT(b == asset(900000000 - 3000000)); - } - } - - // wait for everything to finish up - fc::usleep(fc::seconds(1)); - } catch( fc::exception& e ) { - edump((e.to_detail_string())); - throw; - } - app1->shutdown(); -} - -graphene::wallet::plain_keys decrypt_keys( const std::string& password, const vector& cipher_keys ) -{ - auto pw = fc::sha512::hash( password.c_str(), password.size() ); - vector decrypted = fc::aes_decrypt( pw, cipher_keys ); - return fc::raw::unpack( decrypted ); -} - -BOOST_AUTO_TEST_CASE( saving_keys_wallet_test ) -{ - cli_fixture cli; - - cli.con.wallet_api_ptr->import_balance( "nathan", cli.nathan_keys, true ); - cli.con.wallet_api_ptr->upgrade_account( "nathan", true ); - std::string brain_key( "FICTIVE WEARY MINIBUS LENS HAWKIE MAIDISH MINTY GLYPH GYTE KNOT COCKSHY LENTIGO PROPS BIFORM KHUTBAH BRAZIL" ); - cli.con.wallet_api_ptr->create_account_with_brain_key( brain_key, "account1", "nathan", "nathan", true ); - - BOOST_CHECK_NO_THROW( cli.con.wallet_api_ptr->transfer( "nathan", "account1", "9000", "1.3.0", "", true ) ); - - std::string path( cli.app_dir.path().generic_string() + "/wallet.json" ); - graphene::wallet::wallet_data wallet = fc::json::from_file( path ).as( 2 * GRAPHENE_MAX_NESTED_OBJECTS ); - BOOST_CHECK( wallet.extra_keys.size() == 1 ); // nathan - BOOST_CHECK( wallet.pending_account_registrations.size() == 1 ); // account1 - BOOST_CHECK( wallet.pending_account_registrations["account1"].size() == 2 ); // account1 active key + account1 memo key - - graphene::wallet::plain_keys pk = decrypt_keys( "supersecret", wallet.cipher_keys ); - BOOST_CHECK( pk.keys.size() == 1 ); // nathan key - - BOOST_CHECK( generate_block( cli.app1 ) ); - fc::usleep( fc::seconds(1) ); - - wallet = fc::json::from_file( path ).as( 2 * GRAPHENE_MAX_NESTED_OBJECTS ); - BOOST_CHECK( wallet.extra_keys.size() == 2 ); // nathan + account1 - BOOST_CHECK( wallet.pending_account_registrations.empty() ); - BOOST_CHECK_NO_THROW( cli.con.wallet_api_ptr->transfer( "account1", "nathan", "1000", "1.3.0", "", true ) ); - - pk = decrypt_keys( "supersecret", wallet.cipher_keys ); - BOOST_CHECK( pk.keys.size() == 3 ); // nathan key + account1 active key + account1 memo key -} +BOOST_AUTO_TEST_SUITE_END() \ No newline at end of file diff --git a/tests/common/genesis_file_util.hpp b/tests/common/genesis_file_util.hpp index e058df02..27a2080f 100644 --- a/tests/common/genesis_file_util.hpp +++ b/tests/common/genesis_file_util.hpp @@ -1,5 +1,5 @@ #pragma once - +#include ///////// /// @brief forward declaration, using as a hack to generate a genesis.json file /// for testing