Skip to content

Commit

Permalink
fix compile2
Browse files Browse the repository at this point in the history
  • Loading branch information
JimmyShi22 committed Nov 17, 2023
1 parent 9d58c8d commit 8dc2133
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
5 changes: 2 additions & 3 deletions bcos-executor/src/executive/CoroutineTransactionExecutive.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ CallParameters::UniquePtr CoroutineTransactionExecutive::externalCall(
if (output->delegateCall && output->type != CallParameters::FINISHED)
{
output->data = bytes();
if (m_blockContext.lock()->features().get(
if (m_blockContext.features().get(
ledger::Features::Flag::bugfix_delegatecall_noaddr_return))
{
// This is eth's bug, but we still need to compat with it :)
Expand All @@ -96,8 +96,7 @@ CallParameters::UniquePtr CoroutineTransactionExecutive::externalCall(
<< LOG_KV("evmStatus", output->evmStatus);
}

if (versionCompareTo(
m_blockContext.blockVersion(), protocol::BlockVersion::V3_3_VERSION) >= 0)
if (versionCompareTo(m_blockContext.blockVersion(), protocol::BlockVersion::V3_3_VERSION) >= 0)
{
if (output->type == CallParameters::REVERT)
{
Expand Down
5 changes: 3 additions & 2 deletions bcos-executor/src/executive/TransactionExecutive.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ CallParameters::UniquePtr TransactionExecutive::externalCall(CallParameters::Uni
<< LOG_KV("codeAddress", input->codeAddress);

output->data = bytes();
if (m_blockContext.lock()->features().get(
if (m_blockContext.features().get(
ledger::Features::Flag::bugfix_delegatecall_noaddr_return))
{
// This is eth's bug, but we still need to compat with it :)
Expand Down Expand Up @@ -198,7 +198,8 @@ CallParameters::UniquePtr TransactionExecutive::externalCall(CallParameters::Uni
}


auto executive = buildChildExecutive(input->codeAddress, m_contextID, newSeq, ExecutiveType::common);
auto executive =
buildChildExecutive(input->codeAddress, m_contextID, newSeq, ExecutiveType::common);

m_childExecutives.push_back(executive); // add child executive for revert() if needed

Expand Down

0 comments on commit 8dc2133

Please sign in to comment.