nit: resolve PR comments

Signed-off-by: Ivan Kavaldzhiev <[email protected]>

Author: IvanKavaldzhiev

.github/workflows/releases-comparator.yml

@@ -91,6 +91,8 @@ jobs:
             "com/hedera/hapi/node/state/schedule/Schedule.java"
             "com/swirlds/state/spi/ReadableKVStateBase.java"
             "com/swirlds/state/spi/WritableKVStateBase.java"
+            "com/hedera/node/app/service/contract/impl/exec/processors/CustomMessageCallProcessor.java"
+            "com/hedera/node/app/service/contract/impl/state/DispatchingEvmFrameState.java"
           )
 
           # Temp directories to store cloned repos

web3/src/main/java/com/hedera/node/app/service/contract/impl/exec/processors/CustomMessageCallProcessor.java

@@ -145,8 +145,7 @@ public void start(@NonNull final MessageFrame frame, @NonNull final OperationTra
                 }
             }
 
-            if (tracer instanceof final OpcodeActionTracer opcodeActionTracer
-                    && opcodeActionTracer.getSystemContracts().isEmpty()) {
+            if (tracer instanceof final OpcodeActionTracer opcodeActionTracer) {
                 opcodeActionTracer.setSystemContracts(systemContracts);
             }
             doExecuteSystemContract(systemContracts.get(codeAddress), codeAddress, frame, tracer);

web3/src/main/java/org/hiero/mirror/web3/evm/contracts/execution/traceability/AbstractOpcodeTracer.java

@@ -2,34 +2,21 @@
 
 package org.hiero.mirror.web3.evm.contracts.execution.traceability;
 
-import com.hedera.node.app.service.contract.impl.exec.systemcontracts.HederaSystemContract;
 import com.hederahashgraph.api.proto.java.ResponseCodeEnum;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
-import lombok.Getter;
-import lombok.Setter;
 import org.apache.tuweni.bytes.Bytes;
 import org.hiero.mirror.common.domain.contract.ContractAction;
 import org.hiero.mirror.web3.common.ContractCallContext;
 import org.hiero.mirror.web3.convert.BytesDecoder;
-import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.evm.frame.MessageFrame;
-import org.hyperledger.besu.evm.precompile.PrecompiledContract;
 import org.springframework.util.CollectionUtils;
 
 public abstract class AbstractOpcodeTracer {
 
-    @Getter
-    @Setter
-    protected Map<Address, HederaSystemContract> systemContracts = new HashMap<>();
-
-    protected Map<Address, PrecompiledContract> hederaPrecompiles = new HashMap<>();
-
-    protected List<Bytes> captureMemory(final MessageFrame frame, final OpcodeTracerOptions options) {
+    protected final List<Bytes> captureMemory(final MessageFrame frame, final OpcodeTracerOptions options) {
         if (!options.isMemory()) {
             return Collections.emptyList();
         }
@@ -43,7 +30,7 @@ protected List<Bytes> captureMemory(final MessageFrame frame, final OpcodeTracer
         return memory;
     }
 
-    protected List<Bytes> captureStack(final MessageFrame frame, final OpcodeTracerOptions options) {
+    protected final List<Bytes> captureStack(final MessageFrame frame, final OpcodeTracerOptions options) {
         if (!options.isStack()) {
             return Collections.emptyList();
         }
@@ -57,7 +44,7 @@ protected List<Bytes> captureStack(final MessageFrame frame, final OpcodeTracerO
         return stack;
     }
 
-    protected Optional<Bytes> getRevertReasonFromContractActions(final ContractCallContext context) {
+    protected final Optional<Bytes> getRevertReasonFromContractActions(final ContractCallContext context) {
         final var contractActions = context.getContractActions();
 
         if (CollectionUtils.isEmpty(contractActions)) {
@@ -71,18 +58,6 @@ protected Optional<Bytes> getRevertReasonFromContractActions(final ContractCallC
                 .findFirst();
     }
 
-    protected boolean isCallToHederaPrecompile(
-            final MessageFrame frame, final Map<Address, PrecompiledContract> hederaPrecompiles) {
-        final var recipientAddress = frame.getRecipientAddress();
-        return hederaPrecompiles.containsKey(recipientAddress);
-    }
-
-    protected boolean isCallToSystemContracts(
-            final MessageFrame frame, final Map<Address, HederaSystemContract> systemContracts) {
-        final var recipientAddress = frame.getRecipientAddress();
-        return systemContracts.containsKey(recipientAddress);
-    }
-
     /**
      * Formats the revert reason to be consistent with the revert reason format in the EVM. <a
      * href="https://besu.hyperledger.org/23.10.2/private-networks/how-to/send-transactions/revert-reason#revert-reason-format">...</a>

web3/src/main/java/org/hiero/mirror/web3/evm/contracts/execution/traceability/OpcodeActionTracer.java

@@ -5,18 +5,22 @@
 import com.hedera.hapi.streams.ContractActionType;
 import com.hedera.hapi.streams.ContractActions;
 import com.hedera.node.app.service.contract.impl.exec.ActionSidecarContentTracer;
+import com.hedera.node.app.service.contract.impl.exec.systemcontracts.HederaSystemContract;
 import com.hedera.node.app.service.contract.impl.state.ProxyWorldUpdater;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import jakarta.inject.Named;
 import java.util.Collections;
 import java.util.Map;
 import java.util.TreeMap;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 import lombok.CustomLog;
+import lombok.Getter;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.tuweni.bytes.Bytes;
 import org.hiero.mirror.web3.common.ContractCallContext;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.evm.ModificationNotAllowedException;
 import org.hyperledger.besu.evm.frame.MessageFrame;
 import org.hyperledger.besu.evm.operation.Operation.OperationResult;
@@ -25,6 +29,9 @@
 @CustomLog
 public class OpcodeActionTracer extends AbstractOpcodeTracer implements ActionSidecarContentTracer {
 
+    @Getter
+    private final Map<Address, HederaSystemContract> systemContracts = new ConcurrentHashMap<>();
+
     @Override
     public void tracePostExecution(@NonNull final MessageFrame frame, @NonNull final OperationResult operationResult) {
         final var context = ContractCallContext.get();
@@ -114,4 +121,16 @@ public void tracePrecompileResult(@NonNull MessageFrame frame, @NonNull Contract
     public ContractActions contractActions() {
         return null;
     }
+
+    public void setSystemContracts(final Map<Address, HederaSystemContract> systemContracts) {
+        if (systemContracts != null) {
+            this.systemContracts.putAll(systemContracts);
+        }
+    }
+
+    private boolean isCallToSystemContracts(
+            final MessageFrame frame, final Map<Address, HederaSystemContract> systemContracts) {
+        final var recipientAddress = frame.getRecipientAddress();
+        return systemContracts.containsKey(recipientAddress);
+    }
 }

web3/src/main/java/org/hiero/mirror/web3/evm/contracts/execution/traceability/OpcodeTracer.java

@@ -22,12 +22,15 @@
 import org.hyperledger.besu.evm.account.MutableAccount;
 import org.hyperledger.besu.evm.frame.MessageFrame;
 import org.hyperledger.besu.evm.operation.Operation;
+import org.hyperledger.besu.evm.precompile.PrecompiledContract;
 
 @Named
 @CustomLog
 @Getter
 public class OpcodeTracer extends AbstractOpcodeTracer implements HederaOperationTracer {
 
+    private final Map<Address, PrecompiledContract> hederaPrecompiles;
+
     public OpcodeTracer(final PrecompiledContractProvider precompiledContractProvider) {
         this.hederaPrecompiles = precompiledContractProvider.getHederaPrecompiles().entrySet().stream()
                 .collect(Collectors.toMap(e -> Address.fromHexString(e.getKey()), Map.Entry::getValue));
@@ -105,4 +108,10 @@ private Map<Bytes, Bytes> captureStorage(final MessageFrame frame, OpcodeTracerO
     public void tracePrecompileResult(final MessageFrame frame, final ContractActionType type) {
         // Empty body
     }
+
+    private boolean isCallToHederaPrecompile(
+            final MessageFrame frame, final Map<Address, PrecompiledContract> hederaPrecompiles) {
+        final var recipientAddress = frame.getRecipientAddress();
+        return hederaPrecompiles.containsKey(recipientAddress);
+    }
 }