From 1b6fff2bf39c436d43687b801c402382f9cd5da9 Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Fri, 11 Oct 2019 19:52:04 +0200 Subject: [PATCH] fixed resync market issue --- src/daemon/daemon.cpp | 9 ++++-- ...MARKETPLACE_GLOBAL_GET_OFFERS_request.json | 28 +++++++++++++++++++ ...MAND_MARKETPLACE_PUSH_OFFER_request_2.json | 2 +- 3 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 utils/test_api_files/COMMAND_MARKETPLACE_GLOBAL_GET_OFFERS_request.json diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp index eccdec13..31ea716c 100644 --- a/src/daemon/daemon.cpp +++ b/src/daemon/daemon.cpp @@ -106,7 +106,7 @@ int main(int argc, char* argv[]) //_CrtSetAllocHook(alloc_hook); #endif - log_space::get_set_log_detalisation_level(true, LOG_LEVEL_2); + log_space::get_set_log_detalisation_level(true, LOG_LEVEL_0); log_space::log_singletone::add_logger(LOGGER_CONSOLE, NULL, NULL); log_space::log_singletone::enable_channels("core,currency_protocol,tx_pool,wallet"); LOG_PRINT_L0("Starting..."); @@ -220,7 +220,7 @@ int main(int argc, char* argv[]) //create objects and link them bc_services::bc_offers_service offers_service(nullptr); - offers_service.set_disabled(true); + offers_service.set_disabled(true); //disable by default currency::core ccore(NULL); currency::t_currency_protocol_handler cprotocol(ccore, NULL ); p2psrv_t p2psrv(cprotocol); @@ -237,8 +237,10 @@ int main(int argc, char* argv[]) if (command_line::get_arg(vm, command_line::arg_enable_offers_service)) { + offers_service.set_disabled(false); ccore.get_blockchain_storage().get_attachment_services_manager().add_service(&offers_service); } + std::shared_ptr stratum_server_ptr; @@ -270,9 +272,10 @@ int main(int argc, char* argv[]) CHECK_AND_ASSERT_MES(res, 1, "Failed to initialize p2p server."); LOG_PRINT_L0("P2p server initialized OK on port: " << p2psrv.get_this_peer_port()); + tools::miniupnp_helper upnp_helper; + if (!command_line::get_arg(vm, command_line::arg_disable_upnp)) { - tools::miniupnp_helper upnp_helper; LOG_PRINT_L0("Starting UPnP"); upnp_helper.start_regular_mapping(p2psrv.get_this_peer_port(), p2psrv.get_this_peer_port(), 20*60*1000); } diff --git a/utils/test_api_files/COMMAND_MARKETPLACE_GLOBAL_GET_OFFERS_request.json b/utils/test_api_files/COMMAND_MARKETPLACE_GLOBAL_GET_OFFERS_request.json new file mode 100644 index 00000000..9bd27c31 --- /dev/null +++ b/utils/test_api_files/COMMAND_MARKETPLACE_GLOBAL_GET_OFFERS_request.json @@ -0,0 +1,28 @@ +{ + "jsonrpc": "2.0", + "id": 0, + "method": "marketplace_global_get_offers_ex", + "params": { + "filter": { + "amount_low_limit": 0, + "amount_up_limit": 0, + "bonus": false, + "category": "", + "fake": false, + "keyword": "", + "limit": 100, + "location_city": "", + "location_country": "", + "offer_type_mask": 0, + "offset": 0, + "order_by": 0, + "primary": "", + "rate_low_limit": "0.000000", + "rate_up_limit": "0.000000", + "reverse": false, + "target": "", + "timestamp_start": 0, + "timestamp_stop": 0 + } + } +} \ No newline at end of file diff --git a/utils/test_api_files/COMMAND_MARKETPLACE_PUSH_OFFER_request_2.json b/utils/test_api_files/COMMAND_MARKETPLACE_PUSH_OFFER_request_2.json index 8a17821d..3c4e7d17 100644 --- a/utils/test_api_files/COMMAND_MARKETPLACE_PUSH_OFFER_request_2.json +++ b/utils/test_api_files/COMMAND_MARKETPLACE_PUSH_OFFER_request_2.json @@ -17,7 +17,7 @@ "ot": 1, "p": "USD", "pt": "Credit cards, BTC, ZANO, ETH", - "t": "Mining farm built by Gigabyted" + "t": "Mining farm built by Gigabyted[2]" } } } \ No newline at end of file