From 89356d9a33e81bd4cab9ea86f1917721b55267ea Mon Sep 17 00:00:00 2001 From: "crypro.zoidberg" Date: Fri, 19 Apr 2019 20:19:59 +0200 Subject: [PATCH 01/11] changed progpow --- contrib/ethereum/libethash/progpow.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/contrib/ethereum/libethash/progpow.cpp b/contrib/ethereum/libethash/progpow.cpp index a7b85c0e..d74c8747 100644 --- a/contrib/ethereum/libethash/progpow.cpp +++ b/contrib/ethereum/libethash/progpow.cpp @@ -116,27 +116,27 @@ inline uint32_t random_math(uint32_t a, uint32_t b, uint32_t selector) noexcept switch (selector % 11) { default: - case 0: - return a * b; - case 1: - return a + b; case 2: - return mul_hi32(a, b); + return a + b; case 3: - return std::min(a, b); + return a * b; case 4: - return rotl32(a, b); + return mul_hi32(a, b); case 5: - return rotr32(a, b); + return std::min(a, b); case 6: - return a & b; + return rotl32(a, b); case 7: - return a | b; + return rotr32(a, b); case 8: - return a ^ b; + return a & b; case 9: - return clz32(a) + clz32(b); + return a | b; case 10: + return a ^ b; + case 0: + return clz32(a) + clz32(b); + case 1: return popcount32(a) + popcount32(b); } } From d69f4b90954704f11c60b2e634ed91ceced0ffeb Mon Sep 17 00:00:00 2001 From: "crypro.zoidberg" Date: Fri, 19 Apr 2019 21:46:22 +0200 Subject: [PATCH 02/11] testnet3 --- src/currency_core/currency_config.h | 4 ++-- src/currency_core/currency_format_utils.cpp | 2 +- tests/core_tests/checkpoints_tests.cpp | 2 +- tests/core_tests/multisig_wallet_tests.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/currency_core/currency_config.h b/src/currency_core/currency_config.h index 3adfb5c6..2a30e8ab 100644 --- a/src/currency_core/currency_config.h +++ b/src/currency_core/currency_config.h @@ -7,7 +7,7 @@ #pragma once -#define CURRENCY_FORMATION_VERSION 79 +#define CURRENCY_FORMATION_VERSION 80 #define CURRENCY_MAX_BLOCK_NUMBER 500000000 @@ -53,7 +53,7 @@ // #define CURRENCY_FIXED_REWARD_ZONE_REWARD_AMOUNT ((uint64_t)100000000) // should be TX_MINIMUM_FEE * CURRENCY_FIXED_REWARD_ZONE_FEE_MULTIPLIER // #define CURRENCY_FIXED_REWARD_ZONE_FEE_MULTIPLIER 1000 // reward in minimum fees for a block in the zone -#define CURRENCY_TESTNET_CONST_REWARD 100000000000000 +#define CURRENCY_BLOCK_REWARD 1000000000000 // 1.0 coin #define WALLET_MAX_ALLOWED_OUTPUT_AMOUNT ((uint64_t)0xffffffffffffffffLL) diff --git a/src/currency_core/currency_format_utils.cpp b/src/currency_core/currency_format_utils.cpp index 8dff4880..cc73db4c 100644 --- a/src/currency_core/currency_format_utils.cpp +++ b/src/currency_core/currency_format_utils.cpp @@ -2377,7 +2377,7 @@ namespace currency if (!height) return PREMINE_AMOUNT; - return CURRENCY_TESTNET_CONST_REWARD; + return CURRENCY_BLOCK_REWARD; } //----------------------------------------------------------------------------------------------- bool get_block_reward(bool is_pos, size_t median_size, size_t current_block_size, const boost::multiprecision::uint128_t& already_generated_coins, uint64_t &reward, uint64_t height) diff --git a/tests/core_tests/checkpoints_tests.cpp b/tests/core_tests/checkpoints_tests.cpp index a7405288..bb4cffa4 100644 --- a/tests/core_tests/checkpoints_tests.cpp +++ b/tests/core_tests/checkpoints_tests.cpp @@ -628,7 +628,7 @@ bool gen_no_attchments_in_coinbase::init_config_set_cp(currency::core& c, size_t crc.pos_minimum_heigh = 1; c.get_blockchain_storage().set_core_runtime_config(crc); - m_checkpoints.add_checkpoint(12, "446b25ca3816e36df92745ea91c3c54a8745db565bafd4d2aa7df9da49220a19"); + m_checkpoints.add_checkpoint(12, "ea03a5c99aeedc2050ca5dae011a6c411b31f8b7fb9d0b82735c403b5c608b7b"); c.set_checkpoints(currency::checkpoints(m_checkpoints)); return true; diff --git a/tests/core_tests/multisig_wallet_tests.cpp b/tests/core_tests/multisig_wallet_tests.cpp index b37b2498..743bb671 100644 --- a/tests/core_tests/multisig_wallet_tests.cpp +++ b/tests/core_tests/multisig_wallet_tests.cpp @@ -1625,7 +1625,7 @@ multisig_and_checkpoints::multisig_and_checkpoints() bool multisig_and_checkpoints::set_cp(currency::core& c, size_t ev_index, const std::vector& events) { currency::checkpoints checkpoints; - checkpoints.add_checkpoint(15, "37da2a30fd8cf1daa05ba11cb2ac5f7a3cc998bce56e4b575fbbea58f0592f5b"); + checkpoints.add_checkpoint(15, "46f45b849160be33937c60fa564e820792b0aaa6cf4a080e6002b6f25d84d688"); c.set_checkpoints(std::move(checkpoints)); return true; From 4d498a6d0ebf51e29c97c2e302a4283b37c06377 Mon Sep 17 00:00:00 2001 From: "crypro.zoidberg" Date: Fri, 19 Apr 2019 22:10:37 +0200 Subject: [PATCH 03/11] changed difficulty type to string(to avoid uint64 overflow) --- src/rpc/core_rpc_server.cpp | 2 +- src/rpc/core_rpc_server_commands_defs.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp index 70e2436e..7c50fecf 100644 --- a/src/rpc/core_rpc_server.cpp +++ b/src/rpc/core_rpc_server.cpp @@ -804,7 +804,7 @@ namespace currency LOG_ERROR("Failed to create block template"); return false; } - res.difficulty = dt.convert_to(); + res.difficulty = dt.convert_to(); blobdata block_blob = t_serializable_object_to_blob(b); res.blocktemplate_blob = string_tools::buff_to_hex_nodelimer(block_blob); diff --git a/src/rpc/core_rpc_server_commands_defs.h b/src/rpc/core_rpc_server_commands_defs.h index 6c3959d8..fe143042 100644 --- a/src/rpc/core_rpc_server_commands_defs.h +++ b/src/rpc/core_rpc_server_commands_defs.h @@ -791,7 +791,7 @@ namespace currency struct response { - uint64_t difficulty; + std::string difficulty; uint64_t height; crypto::hash seed; blobdata blocktemplate_blob; From de4e22c8355edfd0741ed8a0707adee64a278fd4 Mon Sep 17 00:00:00 2001 From: "crypro.zoidberg" Date: Fri, 19 Apr 2019 22:14:07 +0200 Subject: [PATCH 04/11] fixed broken compilation --- src/rpc/core_rpc_server.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp index 7c50fecf..d28de566 100644 --- a/src/rpc/core_rpc_server.cpp +++ b/src/rpc/core_rpc_server.cpp @@ -1112,7 +1112,7 @@ namespace currency set_session_blob(job_id, b); job.blob = string_tools::buff_to_hex_nodelimer(currency::get_block_hashing_blob(b)); //TODO: set up share difficulty here! - job.difficulty = std::to_string(bt_res.difficulty); //difficulty leaved as string field since it will be refactored into 128 bit format + job.difficulty = bt_res.difficulty; //difficulty leaved as string field since it will be refactored into 128 bit format job.job_id = "SOME_JOB_ID"; get_current_hi(job.prev_hi); return true; From edc6b99227dccb8a2e6a25adea304734f6663670 Mon Sep 17 00:00:00 2001 From: sowle Date: Sat, 20 Apr 2019 00:51:31 +0300 Subject: [PATCH 05/11] === build number: 14 -> 15 === --- src/version.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.h.in b/src/version.h.in index 3678d223..7af90388 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -2,6 +2,6 @@ #define BUILD_COMMIT_ID "@VERSION@" #define PROJECT_VERSION "1.0" -#define PROJECT_VERSION_BUILD_NO 14 +#define PROJECT_VERSION_BUILD_NO 15 #define PROJECT_VERSION_BUILD_NO_STR STRINGIFY_EXPAND(PROJECT_VERSION_BUILD_NO) #define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO_STR "[" BUILD_COMMIT_ID "]" From f7645670feff7611d59c05141d19b0e2ca27b08f Mon Sep 17 00:00:00 2001 From: "crypro.zoidberg" Date: Sat, 20 Apr 2019 17:36:41 +0200 Subject: [PATCH 06/11] fixed genesis and changed network --- src/currency_core/currency_config.h | 2 +- src/currency_core/genesis.cpp | 4 ++-- src/currency_core/genesis.h | 5 +++-- src/currency_core/genesis_acc.cpp | 15 ++++++++++++--- src/currency_core/genesis_acc.h | 2 +- 5 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/currency_core/currency_config.h b/src/currency_core/currency_config.h index 2a30e8ab..0eea1ebb 100644 --- a/src/currency_core/currency_config.h +++ b/src/currency_core/currency_config.h @@ -7,7 +7,7 @@ #pragma once -#define CURRENCY_FORMATION_VERSION 80 +#define CURRENCY_FORMATION_VERSION 81 #define CURRENCY_MAX_BLOCK_NUMBER 500000000 diff --git a/src/currency_core/genesis.cpp b/src/currency_core/genesis.cpp index fba792a8..ac01759d 100644 --- a/src/currency_core/genesis.cpp +++ b/src/currency_core/genesis.cpp @@ -8,7 +8,7 @@ namespace currency { const genesis_tx_raw_data ggenesis_tx_raw = { { - 0xa080800e00000101,0x800326b0b4a0f2fd,0x46f236cb0efcd16c,0x547fbb0ff9468d85,0x1da1229cbceeeddf,0x00509f1127de5f6d,0xb0b4a0f2fda08080,0x19fbc70d41860326,0xb0afa73cfe1209ca,0x0d299d4e62aa2f1f,0x7071d8e322c2ebfc,0xf2fda0808000ed15,0x9e5a660326b0b4a0,0x2928590bf14c0f33,0x3dfd3f48e046a8c2,0xfa969b2fa09ad0ed,0x808000acfcbb24be,0x0326b0b4a0f2fda0,0x682ecad7a79177d8,0xc9e501939827d6ec,0x7f55e8f25beacf76,0xc3a22fd82ddcb367,0xb4f89aecdce08000,0x6aeaf9b0de0326b0,0x631393eedf0fc04d,0x8ed9b961192f541a,0x5088f34df1470474,0x93dc80800011241e,0x30b80307d0ffc2e0,0xdcf3a14a0ac108e5,0xd508a0ec648f342d,0x0c1ac8310dcce994,0x8000346b43733822,0x05c6c5bc97b1a080,0x44663811c2802f03,0x5456a1cc803e5b0c,0x9a7c995f82c5bb18,0xe95939d19b769901,0xbc97b1a0808000e9,0xb0624da20305c6c5,0xe7921e8df615d26f,0x27abce5d4d975bc6,0xecb92e6224ce0952,0xa080800085eb1099,0xb10305c6c5bc97b1,0xea6de475ef2cdaaf,0xa47b3fe828343c89,0x8ec5057c0bf7dd44,0x000f2403abe0ade8,0xc6c5bc97b1a08080,0x60e1a72d445b0305,0x8bb2fc2bfd63e41b,0x7772ae843713073b,0xe1c2db8d00c414ff,0x97b1a0808000b5c2,0xd69ad60305c6c5bc,0x8b0b54a7a541d22c,0x312a3c33f20800c1,0xe401b39ce755f512,0x808000d176bfb84a,0x0305c6c5bc97b1a0,0x7711834fbded84b6,0x1d4dca20946a1b23,0x80bfed89b730469e,0x641a20bd14e5d7cf,0xc5bc97b1a0808000,0xca32ddfd2c0305c6,0xf662200d93c916ca,0x0ca700521b6ece14,0x1a14d2365bb10a8e,0xbd88808000fd386e,0xc6e40304dbfb86ad,0xaba7f00aede6da7a,0xc5a36eac7d327196,0x5237aa32dafc085e,0x11003545013f1ed3,0xbd65d3fbab8aa616,0xb8c69175919e298e,0xe4fe3762fd534801,0xba7de375298d061d,0xf917cbb4170015e4,0x1747ce171e061770,0x05d7177e6b170d69,0x69170e891774ff17,0x17882e17c3621765,0x000a0ec1de17d7e4 }, - { 0x00 } }; + 0xa080801700000101,0xf30326b0b4a0f2fd,0x46fe96860beb01ea,0x01323293f642c7c6,0x80e8a7730e20c142,0x00cb08b2016bbccc,0xb0b4a0f2fda08080,0xb67d52cae50e0326,0x71bb6e75bf256319,0x76dd703cec5e8f40,0xfca18c41540510b9,0xf2fda080800070f3,0xeea9320326b0b4a0,0xb5d90ea5fe49c4cb,0x3f1e5ca079fe6ebb,0x2f73ac1012e243d0,0x808000887086f29b,0x0326b0b4a0f2fda0,0x44f1a1dfe16379f9,0x50d93954cca94108,0x9ac47bb379e6f074,0xb44bdb69a986211e,0xb4f89aecdce08000,0x88b82d0dc60326b0,0x4e995861a27c03ae,0xdf48c9c97c449f1d,0xdd2ea49c4ecdcbdf,0x93dc80800046f5dc,0xedff0307d0ffc2e0,0x4a8442409d3719b1,0x2e385d03544c8122,0x0c592cfad6e8e900,0x8000ed0b32aa07c6,0x05c6c5bc97b1a080,0xa5d7620e38d8ef03,0x1c68e9cfd35cc1e5,0xbdba8ea5fb49f375,0x7fb77cff80f31c9e,0xbc97b1a080800040,0xd15b16b60305c6c5,0x7af40193ad86f123,0x5ba33fd12279af67,0x0db572d11ea1ad96,0xa080800024fc1fde,0x460305c6c5bc97b1,0x444d02aa28a539b9,0x9846386a58c71f35,0x27fd9af12bd3710a,0x0004b2acf589ce8d,0xc6c5bc97b1a08080,0x610c62c125e80305,0x44217ee86d4ed16f,0x5f27600912875c5f,0x51f2fbfd2b30ff54,0x97b1a08080002698,0x8180fc0305c6c5bc,0xaeb4bfd37d282432,0x10a11a1c799b6165,0x9c69b9b6aac75596,0x8080009c5a6d5e15,0x0305c6c5bc97b1a0,0xbf9f36e03f56393a,0x0a74acb0775f0e02,0x97665a42cb477844,0xff01a0c03c43df12,0xc5bc97b1a0808000,0xd5066341560305c6,0x5aa8c1962a148222,0xf83737ab96d43653,0x4b5007cf8fd4a1e2,0xd2dc808000565d84,0xa6a8030398c7f980,0x32c08d3989aa7f91,0xe4b5de74db34eb45,0xf2bd313bdefdfcba,0x80007e3bb1b21fd2,0x018e8df2b7f0a080,0xb2fe8efdeb17a903,0xe7f89d45d4b05be9,0x96f5300e672fd804,0xbd82737c2ce8c3cf,0xef93bf82808000c2,0x816c799a1f0308f0,0x98bd1487b0e05122,0x044d8ffd583693ba,0x1c954a13f5425015,0xfe848080007c6407,0xcde2510311e1dea6,0x3c62da3d50c8a8ee,0xa3acc1ed75d470b1,0xa479c78eecc2f96c,0x8080005f7388cbcb,0xbd0308f0ef93bf82,0xb5a5cca060105de4,0x92cf66a16d3b4d6b,0x5ca92a654f5a8400,0x00df465ad6e8d895,0x08f0ef93bf828080,0x2ce3338452319303,0xecc7b1c056651998,0xc3696cf2fb2fe9b9,0x69b4edf21f2bdaae,0xafeaa69a808000b8,0x1052e2e6de0301e3,0xa06855ba0d7eaab2,0x344998a33e968f15,0xa8a00006653f7005,0xa69a808000a95440,0x58e0580301e3afea,0xc0524c1a0a1d4b5f,0xad37550b686c838b,0x0eb1ef4a20771a79,0x80800080516862ab,0xa30301e3afeaa69a,0xda2b32dbac7f88cc,0x965536648651d1a2,0xbbe22f6bdc320069,0x00a8ea3fddccf16d,0x03c6dfd4ccb48080,0x9921a91a97490603,0x57ceadcb0611b6de,0xa53cee6b71e61ecb,0x0e56262c5e13302f,0x04ee9ff0161a000a,0xa43f85172baeb3d9,0x782309f5ee0a02f0,0x5d187fedafdfae4f,0x971700150f26e04b,0x17482917b0a717cb,0x1fe617c89e1725b4,0x4017c6e317a97217,0x17a7ca178e6117c1,0xd24717fd3917aa53,0xd217b83c178b9b17,0x17d92517d51c17d4,0xda9d17154f17f6fc }, + { 0x17,0x41,0x0a,0x0e,0x0a,0x00,0x00 } }; } diff --git a/src/currency_core/genesis.h b/src/currency_core/genesis.h index 73f8f942..848c6120 100644 --- a/src/currency_core/genesis.h +++ b/src/currency_core/genesis.h @@ -8,11 +8,12 @@ #include namespace currency { +#pragma pack(push, 1) #pragma pack(push, 1) struct genesis_tx_raw_data { - uint64_t const v[86]; - uint8_t const r[1]; + uint64_t const v[136]; + uint8_t const r[7]; }; #pragma pack(pop) extern const genesis_tx_raw_data ggenesis_tx_raw; diff --git a/src/currency_core/genesis_acc.cpp b/src/currency_core/genesis_acc.cpp index aac46ed6..0fc1c289 100644 --- a/src/currency_core/genesis_acc.cpp +++ b/src/currency_core/genesis_acc.cpp @@ -9,25 +9,34 @@ namespace currency { - const std::string ggenesis_tx_pub_key_str = "a68aabfbd365bd8e299e917591c6b8014853fd6237fee41d068d2975e37dbae4"; + const std::string ggenesis_tx_pub_key_str = "f09fee04d9b3ae2b17853fa4f0020aeef50923784faedfafed7f185d4be0260f"; const crypto::public_key ggenesis_tx_pub_key = epee::string_tools::parse_tpod_from_hex_string(ggenesis_tx_pub_key_str); - const genesis_tx_dictionary_entry ggenesis_dict[14] = { + + const genesis_tx_dictionary_entry ggenesis_dict[23] = { { 898363347618325980ULL,7 }, { 1234271292339965434ULL,1 }, { 2785329203593578547ULL,12 }, + { 2912579291078040461ULL,18 }, + { 3515932779881697835ULL,17 }, { 4955366495399988463ULL,11 }, { 5233257582118330150ULL,5 }, + { 5511617689742669301ULL,22 }, + { 6436517662239927298ULL,19 }, { 6604452700210763953ULL,13 }, + { 7200550178847042641ULL,15 }, { 8712326356392296687ULL,9 }, { 8863158309745010598ULL,4 }, + { 9048445805125559105ULL,16 }, { 9527474759752332295ULL,2 }, + { 9647541513390373765ULL,20 }, { 9921730437908704447ULL,8 }, { 11109691972771859220ULL,0 }, { 14297297752337562678ULL,3 }, + { 15636081871140663679ULL,21 }, { 15951161519112687845ULL,6 }, + { 17146058209502212345ULL,14 }, { 17472133472787764818ULL,10 } }; - } diff --git a/src/currency_core/genesis_acc.h b/src/currency_core/genesis_acc.h index 628c7256..3ea05c94 100644 --- a/src/currency_core/genesis_acc.h +++ b/src/currency_core/genesis_acc.h @@ -24,7 +24,7 @@ namespace currency } }; #pragma pack(pop) - extern const genesis_tx_dictionary_entry ggenesis_dict[14]; + extern const genesis_tx_dictionary_entry ggenesis_dict[23]; extern const crypto::public_key ggenesis_tx_pub_key; From a3bf95770912e29fbf3b9efd72d266af51ec363e Mon Sep 17 00:00:00 2001 From: sowle Date: Sat, 20 Apr 2019 19:31:56 +0300 Subject: [PATCH 07/11] === build number: 15 -> 16 === --- src/version.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.h.in b/src/version.h.in index 7af90388..714d9c7f 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -2,6 +2,6 @@ #define BUILD_COMMIT_ID "@VERSION@" #define PROJECT_VERSION "1.0" -#define PROJECT_VERSION_BUILD_NO 15 +#define PROJECT_VERSION_BUILD_NO 16 #define PROJECT_VERSION_BUILD_NO_STR STRINGIFY_EXPAND(PROJECT_VERSION_BUILD_NO) #define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO_STR "[" BUILD_COMMIT_ID "]" From e2584ea520e8073b21eb700a37b56d0ecb1c13c7 Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Sun, 21 Apr 2019 21:16:00 +0200 Subject: [PATCH 08/11] cut offers from stress tests --- tests/functional_tests/transactions_flow_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/functional_tests/transactions_flow_test.cpp b/tests/functional_tests/transactions_flow_test.cpp index 4e12b6c3..67a48e01 100644 --- a/tests/functional_tests/transactions_flow_test.cpp +++ b/tests/functional_tests/transactions_flow_test.cpp @@ -589,7 +589,7 @@ bool transactions_flow_test( if (action == TRANSACTIONS_FLOW_TESTACTION_MIXED) { current_action++; - if (current_action > TRANSACTIONS_FLOW_TESTACTION_OFFERS) + if (current_action >= TRANSACTIONS_FLOW_TESTACTION_OFFERS) current_action = TRANSACTIONS_FLOW_TESTACTION_DEFAULT; } } From 9d48b189a00acef847350804df3df72644412b97 Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Mon, 22 Apr 2019 15:17:16 +0200 Subject: [PATCH 09/11] Increased timeout for (stress tests) --- utils/munin_plugins/tx_daily_volume | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/munin_plugins/tx_daily_volume b/utils/munin_plugins/tx_daily_volume index 4f69878a..04a7a5c9 100755 --- a/utils/munin_plugins/tx_daily_volume +++ b/utils/munin_plugins/tx_daily_volume @@ -12,4 +12,4 @@ EOM esac printf "tx_daily_volume.value " -connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --rpc-get-daemon-info --getinfo-flags-hex="0x0000000000000080" | grep transactions_volume_per_day | cut -d ' ' -f2 +connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=10000 --rpc-get-daemon-info --getinfo-flags-hex="0x0000000000000080" | grep transactions_volume_per_day | cut -d ' ' -f2 From 8c6bff263ef447468811198b56415bc7be8b9c52 Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Mon, 22 Apr 2019 15:18:13 +0200 Subject: [PATCH 10/11] increased timeout(for stress tests) --- utils/munin_plugins/tx_daily_count | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/munin_plugins/tx_daily_count b/utils/munin_plugins/tx_daily_count index 97b79bfa..bae0a363 100755 --- a/utils/munin_plugins/tx_daily_count +++ b/utils/munin_plugins/tx_daily_count @@ -12,4 +12,4 @@ EOM esac printf "tx_daily_count.value " -connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --rpc-get-daemon-info --getinfo-flags-hex="0x0000000000000080" | grep transactions_cnt_per_day | cut -d ' ' -f2 +connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=10000 --rpc-get-daemon-info --getinfo-flags-hex="0x0000000000000080" | grep transactions_cnt_per_day | cut -d ' ' -f2 From f408f93344334d6e04f783da50eb501a3401bec9 Mon Sep 17 00:00:00 2001 From: "crypro.zoidberg" Date: Mon, 22 Apr 2019 18:43:39 +0200 Subject: [PATCH 11/11] be sure that connection is closed on sentque overflow --- contrib/epee/include/net/abstract_tcp_server2.inl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/epee/include/net/abstract_tcp_server2.inl b/contrib/epee/include/net/abstract_tcp_server2.inl index 15ce8441..c59c60e0 100644 --- a/contrib/epee/include/net/abstract_tcp_server2.inl +++ b/contrib/epee/include/net/abstract_tcp_server2.inl @@ -316,6 +316,7 @@ DISABLE_VS_WARNINGS(4355) send_guard.unlock();//manual unlock LOG_ERROR("send to [" << print_connection_context_short(context) << ", (" << (void*)this << ")] que size is more than ABSTRACT_SERVER_SEND_QUE_MAX_COUNT(" << ABSTRACT_SERVER_SEND_QUE_MAX_COUNT << "), shutting down connection"); close(); + shutdown(); return false; } @@ -351,6 +352,8 @@ DISABLE_VS_WARNINGS(4355) template bool connection::shutdown() { + if (m_was_shutdown) + return true; // Initiate graceful connection closure. boost::system::error_code ignored_ec; socket_.shutdown(boost::asio::ip::tcp::socket::shutdown_both, ignored_ec);