From 9bc2127d8b7c4f733e68e9af2e53f1d762a4bb69 Mon Sep 17 00:00:00 2001 From: Oleh Nikolaiev Date: Fri, 29 Nov 2024 10:46:37 +0000 Subject: [PATCH 1/6] IS 945 catchup timeout --- libconsensus | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libconsensus b/libconsensus index fda7a2ff8..420b267f4 160000 --- a/libconsensus +++ b/libconsensus @@ -1 +1 @@ -Subproject commit fda7a2ff89e34e924920a5b3682d93757cc4b0e3 +Subproject commit 420b267f44a5d655d939fd35341dd87f0e2d0773 From 939796437a9880be3ebfcf0282121caba1729532 Mon Sep 17 00:00:00 2001 From: Oleh Nikolaiev Date: Thu, 26 Dec 2024 13:45:39 +0000 Subject: [PATCH 2/6] IS 495 update consensus --- libconsensus | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libconsensus b/libconsensus index 420b267f4..1eeea96e2 160000 --- a/libconsensus +++ b/libconsensus @@ -1 +1 @@ -Subproject commit 420b267f44a5d655d939fd35341dd87f0e2d0773 +Subproject commit 1eeea96e2e1cf91e44240f01c824549dfd020598 From 1387269fec4e85eec54d6ed694f1eddca9b85b7a Mon Sep 17 00:00:00 2001 From: Oleh Nikolaiev Date: Thu, 26 Dec 2024 13:56:42 +0000 Subject: [PATCH 3/6] IS 495 update consensus --- libconsensus | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libconsensus b/libconsensus index 1eeea96e2..8e5f6f201 160000 --- a/libconsensus +++ b/libconsensus @@ -1 +1 @@ -Subproject commit 1eeea96e2e1cf91e44240f01c824549dfd020598 +Subproject commit 8e5f6f2013f1228c0ef31dfc68a25c2ca146c28b From f2dc460b902ab59c6d54b1e9adc2522e0279d310 Mon Sep 17 00:00:00 2001 From: Oleh Date: Thu, 2 Jan 2025 20:48:05 +0000 Subject: [PATCH 4/6] IS 495 update consensus --- libconsensus | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libconsensus b/libconsensus index 8e5f6f201..532e8879e 160000 --- a/libconsensus +++ b/libconsensus @@ -1 +1 @@ -Subproject commit 8e5f6f2013f1228c0ef31dfc68a25c2ca146c28b +Subproject commit 532e8879e4c97f544cd6a7d46fa0d30bbeab9f40 From 1ca58b19023934daf3e367270860a04100cab09d Mon Sep 17 00:00:00 2001 From: Oleh Nikolaiev Date: Fri, 3 Jan 2025 16:25:23 +0000 Subject: [PATCH 5/6] IS 495 update consensus --- libconsensus | 2 +- libethereum/ValidationSchemes.cpp | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libconsensus b/libconsensus index 532e8879e..5033d9f12 160000 --- a/libconsensus +++ b/libconsensus @@ -1 +1 @@ -Subproject commit 532e8879e4c97f544cd6a7d46fa0d30bbeab9f40 +Subproject commit 5033d9f12637f7e559b4f466c96a3938bdb2da44 diff --git a/libethereum/ValidationSchemes.cpp b/libethereum/ValidationSchemes.cpp index e6b493e7e..06dbac1a3 100644 --- a/libethereum/ValidationSchemes.cpp +++ b/libethereum/ValidationSchemes.cpp @@ -223,7 +223,11 @@ void validateConfigJson( js::mObject const& _obj ) { { "archiveMode", { { js::bool_type }, JsonFieldPresence::Optional } }, { "syncFromCatchup", { { js::bool_type }, JsonFieldPresence::Optional } }, { "testSignatures", { { js::bool_type }, JsonFieldPresence::Optional } }, - { "wallets", { { js::obj_type }, JsonFieldPresence::Optional } } } ); + { "wallets", { { js::obj_type }, JsonFieldPresence::Optional } }, + { "catchupTimeoutSec", { { js::int_type }, JsonFieldPresence::Optional } }, + { "syncNodeCatchupTimeoutSec", { { js::int_type }, JsonFieldPresence::Optional } }, + { "readJsonHeaderTimeoutSec", { { js::int_type }, JsonFieldPresence::Optional } }, + { "syncNodeReadJsonHeaderTimeoutSec", { { js::int_type }, JsonFieldPresence::Optional } } } ); std::string keyShareName = ""; try { From b5a13d349dae4d7dff28885ab12f4111772da544 Mon Sep 17 00:00:00 2001 From: Oleh Nikolaiev Date: Fri, 3 Jan 2025 16:29:13 +0000 Subject: [PATCH 6/6] IS 495 format --- libethereum/ValidationSchemes.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libethereum/ValidationSchemes.cpp b/libethereum/ValidationSchemes.cpp index 06dbac1a3..b5c3bb815 100644 --- a/libethereum/ValidationSchemes.cpp +++ b/libethereum/ValidationSchemes.cpp @@ -227,7 +227,8 @@ void validateConfigJson( js::mObject const& _obj ) { { "catchupTimeoutSec", { { js::int_type }, JsonFieldPresence::Optional } }, { "syncNodeCatchupTimeoutSec", { { js::int_type }, JsonFieldPresence::Optional } }, { "readJsonHeaderTimeoutSec", { { js::int_type }, JsonFieldPresence::Optional } }, - { "syncNodeReadJsonHeaderTimeoutSec", { { js::int_type }, JsonFieldPresence::Optional } } } ); + { "syncNodeReadJsonHeaderTimeoutSec", + { { js::int_type }, JsonFieldPresence::Optional } } } ); std::string keyShareName = ""; try {