Merge pull request #1752 from AntelopeIO/get_sender_pf

[2.0.0-dev1.1] Introduce get_sender_fix protocol feature to enable get_sender() fix

Author: linh2931

CMakeLists.txt

@@ -16,7 +16,7 @@ set( CXX_STANDARD_REQUIRED ON)
 set(VERSION_MAJOR 2)
 set(VERSION_MINOR 0)
 set(VERSION_PATCH 0)
-set(VERSION_SUFFIX dev1)
+set(VERSION_SUFFIX dev1.1)
 
 if(VERSION_SUFFIX)
     set(VERSION_FULL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-${VERSION_SUFFIX}")

libraries/chain/include/eosio/chain/protocol_feature_manager.hpp

@@ -40,6 +40,7 @@ enum class builtin_protocol_feature_t : uint32_t {
    disable_deferred_trxs_stage_2 = 23,
    savanna = 24,
    sync_call = 25,
+   get_sender_fix = 26,
    reserved_private_fork_protocol_features = 500000,
 };
 

libraries/chain/protocol_feature_manager.cpp

@@ -374,6 +374,17 @@ Enables synchronous calls to functions in other and own contracts.
 */
             {builtin_protocol_feature_t::savanna}
          } )
+         (  builtin_protocol_feature_t::get_sender_fix, builtin_protocol_feature_spec{
+            "GET_SENDER_FIX",
+            fc::variant("0b464eee7952bf848ff8e3d33b8800b6aae22ad4e08e9195bc0a9528532ca4a4").as<digest_type>(),
+            // SHA256 hash of the raw message below within the comment delimiters (exclude newline after /*) (do not modify message below).
+/*
+Builtin protocol feature: GET_SENDER_FIX
+
+Enables get_sender() fix only for dev-testnet1 during 2.0.0-dev1 testing phase. This will never be merged back to 2.0.
+*/
+            {builtin_protocol_feature_t::sync_call}
+         } )
    ;
 
 

libraries/chain/sync_call_context.cpp

@@ -49,9 +49,13 @@ void sync_call_context::set_call_return_value(std::span<const char> rv) {
 
 // Returns the sender of any sync call initiated by this apply_context or sync_call_ctx
 action_name sync_call_context::get_sender() const {
-   // The sync call is initiated by this apply_context or its sync_call_ctx.
-   // That's why the context's receiver is the sender of the sync call.
-   return receiver;
+   // This is only a temporary fix for dev-testnet1.
+   // It will never be merged back to any release branches.
+   if (control.is_builtin_activated(builtin_protocol_feature_t::get_sender_fix)) {
+      return sender;
+   } else {
+      return receiver;
+   }
 }
 
 void sync_call_context::console_append(std::string_view val) {