Merge branch 'release-3.6.0' into release-3.6.0

JimmyShi22 · Jan 22, 2024 · 3a15396 · 3a15396
2 parents 59c0bbf + f5748e9
commit 3a15396
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -144,7 +144,7 @@ install(
 )
 # copy pre-commit to git hook
 
-if(NOT EXISTS ${CMAKE_SOURCE_DIR}/.git/hooks/pre-commit)
+if(NOT EXISTS ${CMAKE_SOURCE_DIR}/.git/hooks/pre-commit AND EXISTS ${CMAKE_SOURCE_DIR}/.git/hooks)
     file(COPY ${CMAKE_SOURCE_DIR}/tools/.ci/pre-commit DESTINATION ${CMAKE_SOURCE_DIR}/.git/hooks
             FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 endif()
diff --git a/bcos-executor/src/executor/TransactionExecutor.cpp b/bcos-executor/src/executor/TransactionExecutor.cpp
@@ -2596,7 +2596,12 @@ std::unique_ptr<CallParameters> TransactionExecutor::createCallParameters(
     {
         // padding zero
         callParameters->origin = std::string(addressSize - input.origin().size(), '0');
-        callParameters->senderAddress = std::string(addressSize - input.from().size(), '0');
+        // NOTE: if wasm and use dmc static call external call, should not padding zero, because it
+        // is contract address
+        if (!(m_isWasm && input.origin() != input.from())) [[unlikely]]
+        {
+            callParameters->senderAddress = std::string(addressSize - input.from().size(), '0');
+        }
     }
     callParameters->origin += input.origin();
     callParameters->senderAddress += input.from();