From 7bf8c135c9ba11eb5517366e3ebfcc1e87eb797c Mon Sep 17 00:00:00 2001 From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com> Date: Fri, 5 Aug 2022 14:35:58 -0400 Subject: [PATCH 1/2] bump version to 3.1.0-rc3 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 968e98d9e8..8f59b28131 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ set( CXX_STANDARD_REQUIRED ON) set(VERSION_MAJOR 3) set(VERSION_MINOR 1) set(VERSION_PATCH 0) -set(VERSION_SUFFIX rc2) +set(VERSION_SUFFIX rc3) if(VERSION_SUFFIX) set(VERSION_FULL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-${VERSION_SUFFIX}") From efba1a953f47800c388e50584fc46ea9f20c353f Mon Sep 17 00:00:00 2001 From: Kevin Heifner Date: Fri, 5 Aug 2022 15:28:36 -0500 Subject: [PATCH 2/2] GH-755 Attempt connection retries for duplicate connections to handle corner case of one side disconnecting as a duplicate simply because it had not yet closed its end of the connection. --- plugins/net_plugin/net_plugin.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp index 24e98de7dc..2dd082a538 100644 --- a/plugins/net_plugin/net_plugin.cpp +++ b/plugins/net_plugin/net_plugin.cpp @@ -2280,6 +2280,7 @@ namespace eosio { case no_reason: case wrong_version: case benign_other: + case duplicate: // attempt reconnect in case connection has been dropped, should quickly disconnect if duplicate break; default: fc_dlog( logger, "Skipping connect due to go_away reason ${r}",("r", reason_str( no_retry )));