From dfdd0911cbadc0ec364994dcba18934c1a6fa3a3 Mon Sep 17 00:00:00 2001 From: Lin Huang Date: Thu, 5 Oct 2023 22:01:48 -0400 Subject: [PATCH 1/4] merge 5.0.0-rc-1 and correct Leap version --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ac5693df9..29cc78775f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,9 +14,9 @@ set( CMAKE_CXX_EXTENSIONS ON ) set( CXX_STANDARD_REQUIRED ON) set(VERSION_MAJOR 5) -set(VERSION_MINOR 0) +set(VERSION_MINOR 1) set(VERSION_PATCH 0) -set(VERSION_SUFFIX rc1) +set(VERSION_SUFFIX dev) if(VERSION_SUFFIX) set(VERSION_FULL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-${VERSION_SUFFIX}") From 23bda8ec1256a86897a3b5507a8dbcea7a958b50 Mon Sep 17 00:00:00 2001 From: YaroShkvorets Date: Tue, 10 Oct 2023 17:33:06 -0400 Subject: [PATCH 2/4] add action context to exception ref #1743 --- libraries/chain/apply_context.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/chain/apply_context.cpp b/libraries/chain/apply_context.cpp index 576c01c8a7..7cea2e189c 100644 --- a/libraries/chain/apply_context.cpp +++ b/libraries/chain/apply_context.cpp @@ -131,7 +131,7 @@ void apply_context::exec_one() } } } - } FC_RETHROW_EXCEPTIONS( warn, "pending console output: ${console}", ("console", _pending_console_output) ) + } FC_RETHROW_EXCEPTIONS( warn, "${account}::${action} @ ${receiver} pending console output: ${console}", ("console", _pending_console_output)("account", act->account)("action", act->name)("receiver", receiver) ) if( control.is_builtin_activated( builtin_protocol_feature_t::action_return_value ) ) { act_digest = generate_action_digest( From e6dc6da8d2f5691aa66e196769bfbb8737cd7cd1 Mon Sep 17 00:00:00 2001 From: YaroShkvorets Date: Tue, 10 Oct 2023 23:24:30 -0400 Subject: [PATCH 3/4] change error message format --- libraries/chain/apply_context.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/chain/apply_context.cpp b/libraries/chain/apply_context.cpp index 7cea2e189c..75d42dbe35 100644 --- a/libraries/chain/apply_context.cpp +++ b/libraries/chain/apply_context.cpp @@ -131,7 +131,7 @@ void apply_context::exec_one() } } } - } FC_RETHROW_EXCEPTIONS( warn, "${account}::${action} @ ${receiver} pending console output: ${console}", ("console", _pending_console_output)("account", act->account)("action", act->name)("receiver", receiver) ) + } FC_RETHROW_EXCEPTIONS( warn, "${receiver} <= ${account}::${action} pending console output: ${console}", ("console", _pending_console_output)("account", act->account)("action", act->name)("receiver", receiver) ) if( control.is_builtin_activated( builtin_protocol_feature_t::action_return_value ) ) { act_digest = generate_action_digest( From a046bd593812ab9c9fb4ef2b0ccfe8747e6d33f5 Mon Sep 17 00:00:00 2001 From: Yaro Shkvorets Date: Tue, 14 Nov 2023 16:35:43 -0500 Subject: [PATCH 4/4] update version --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 29cc78775f..3ac5693df9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,9 +14,9 @@ set( CMAKE_CXX_EXTENSIONS ON ) set( CXX_STANDARD_REQUIRED ON) set(VERSION_MAJOR 5) -set(VERSION_MINOR 1) +set(VERSION_MINOR 0) set(VERSION_PATCH 0) -set(VERSION_SUFFIX dev) +set(VERSION_SUFFIX rc1) if(VERSION_SUFFIX) set(VERSION_FULL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-${VERSION_SUFFIX}")