fix: Only add synth action if INVALID_SOLIDITY_ADDRESS is due to invalid call target (#21439)

lukasz-hashgraph · web-flow · commit 799fceb6927e · 2025-10-23T15:08:44.000+02:00
Signed-off-by: Lukasz Gasior &lt;lukasz.gasior@swirldslabs.com&gt;
diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/operations/BasicCustomCallOperation.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/operations/BasicCustomCallOperation.java
@@ -9,6 +9,8 @@
 import com.hedera.node.app.service.contract.impl.exec.AddressChecks;
 import com.hedera.node.app.service.contract.impl.exec.FeatureFlags;
 import com.hedera.node.app.service.contract.impl.exec.processors.CustomMessageCallProcessor;
+import com.hedera.node.app.service.contract.impl.exec.utils.FrameUtils;
+import com.hedera.node.app.service.contract.impl.exec.utils.InvalidAddressContext;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.evm.EVM;
@@ -89,6 +91,8 @@ default Operation.OperationResult executeChecked(@NonNull final MessageFrame fra
             final var address = to(frame);
             if (contractRequired(frame, address, featureFlags())
                     && addressChecks().isNeitherSystemNorPresent(address, frame)) {
+                FrameUtils.invalidAddressContext(frame)
+                        .set(address, InvalidAddressContext.InvalidAddressType.InvalidCallTarget);
                 return new Operation.OperationResult(cost(frame), INVALID_SOLIDITY_ADDRESS);
             }
             return executeUnchecked(frame, evm);
diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/operations/CustomBalanceOperation.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/operations/CustomBalanceOperation.java
@@ -7,6 +7,8 @@
 
 import com.hedera.node.app.service.contract.impl.exec.AddressChecks;
 import com.hedera.node.app.service.contract.impl.exec.FeatureFlags;
+import com.hedera.node.app.service.contract.impl.exec.utils.FrameUtils;
+import com.hedera.node.app.service.contract.impl.exec.utils.InvalidAddressContext;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import org.apache.tuweni.units.bigints.UInt256;
 import org.hyperledger.besu.evm.EVM;
@@ -55,6 +57,8 @@ public OperationResult execute(@NonNull final MessageFrame frame, @NonNull final
             }
             // Otherwise continue to enforce existence checks for backward compatibility
             if (contractRequired(frame, address, featureFlags) && !addressChecks.isPresent(address, frame)) {
+                FrameUtils.invalidAddressContext(frame)
+                        .set(address, InvalidAddressContext.InvalidAddressType.NonCallTarget);
                 return new OperationResult(cost, INVALID_SOLIDITY_ADDRESS);
             }
             return super.execute(frame, evm);
diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/operations/CustomCallOperation.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/operations/CustomCallOperation.java
@@ -10,6 +10,8 @@
 import com.hedera.node.app.service.contract.impl.exec.FeatureFlags;
 import com.hedera.node.app.service.contract.impl.exec.scope.HandleHederaNativeOperations;
 import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategy;
+import com.hedera.node.app.service.contract.impl.exec.utils.FrameUtils;
+import com.hedera.node.app.service.contract.impl.exec.utils.InvalidAddressContext;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.util.Objects;
 import org.hyperledger.besu.datatypes.Address;
@@ -65,6 +67,8 @@ public OperationResult execute(@NonNull final MessageFrame frame, @NonNull final
             final var toAddress = to(frame);
             final var isMissing = mustBePresent(frame, toAddress) && !addressChecks.isPresent(toAddress, frame);
             if (isMissing) {
+                FrameUtils.invalidAddressContext(frame)
+                        .set(toAddress, InvalidAddressContext.InvalidAddressType.InvalidCallTarget);
                 return new OperationResult(cost, INVALID_SOLIDITY_ADDRESS);
             }
             return super.execute(frame, evm);
diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/operations/CustomExtCodeCopyOperation.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/operations/CustomExtCodeCopyOperation.java
@@ -8,6 +8,8 @@
 import com.hedera.node.app.service.contract.impl.exec.AddressChecks;
 import com.hedera.node.app.service.contract.impl.exec.FeatureFlags;
 import com.hedera.node.app.service.contract.impl.exec.failure.CustomExceptionalHaltReason;
+import com.hedera.node.app.service.contract.impl.exec.utils.FrameUtils;
+import com.hedera.node.app.service.contract.impl.exec.utils.InvalidAddressContext;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import org.apache.tuweni.bytes.Bytes;
 import org.hyperledger.besu.evm.EVM;
@@ -64,6 +66,8 @@ public OperationResult execute(@NonNull final MessageFrame frame, @NonNull final
             }
             // Otherwise the address must be present
             if (contractRequired(frame, address, featureFlags) && !addressChecks.isPresent(address, frame)) {
+                FrameUtils.invalidAddressContext(frame)
+                        .set(address, InvalidAddressContext.InvalidAddressType.NonCallTarget);
                 return new OperationResult(cost, CustomExceptionalHaltReason.INVALID_SOLIDITY_ADDRESS);
             }
             return super.execute(frame, evm);
diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/operations/CustomExtCodeHashOperation.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/operations/CustomExtCodeHashOperation.java
@@ -7,6 +7,8 @@
 import com.hedera.node.app.service.contract.impl.exec.AddressChecks;
 import com.hedera.node.app.service.contract.impl.exec.FeatureFlags;
 import com.hedera.node.app.service.contract.impl.exec.failure.CustomExceptionalHaltReason;
+import com.hedera.node.app.service.contract.impl.exec.utils.FrameUtils;
+import com.hedera.node.app.service.contract.impl.exec.utils.InvalidAddressContext;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.util.Objects;
 import org.apache.tuweni.units.bigints.UInt256;
@@ -60,6 +62,8 @@ public OperationResult execute(@NonNull final MessageFrame frame, @NonNull final
             }
             // Otherwise the address must be present
             if (contractRequired(frame, address, featureFlags) && !addressChecks.isPresent(address, frame)) {
+                FrameUtils.invalidAddressContext(frame)
+                        .set(address, InvalidAddressContext.InvalidAddressType.NonCallTarget);
                 return new OperationResult(cost, CustomExceptionalHaltReason.INVALID_SOLIDITY_ADDRESS);
             }
             return super.execute(frame, evm);
diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/operations/CustomExtCodeSizeOperation.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/operations/CustomExtCodeSizeOperation.java
@@ -7,6 +7,8 @@
 
 import com.hedera.node.app.service.contract.impl.exec.AddressChecks;
 import com.hedera.node.app.service.contract.impl.exec.FeatureFlags;
+import com.hedera.node.app.service.contract.impl.exec.utils.FrameUtils;
+import com.hedera.node.app.service.contract.impl.exec.utils.InvalidAddressContext;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.util.Objects;
 import org.apache.tuweni.units.bigints.UInt256;
@@ -57,6 +59,8 @@ public OperationResult execute(@NonNull final MessageFrame frame, @NonNull final
                 return new OperationResult(cost, null);
             }
             if (contractRequired(frame, address, featureFlags) && !addressChecks.isPresent(address, frame)) {
+                FrameUtils.invalidAddressContext(frame)
+                        .set(address, InvalidAddressContext.InvalidAddressType.NonCallTarget);
                 return new OperationResult(cost, INVALID_SOLIDITY_ADDRESS);
             }
             return super.execute(frame, evm);
diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/operations/CustomSelfDestructOperation.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/operations/CustomSelfDestructOperation.java
@@ -11,6 +11,8 @@
 import static org.hyperledger.besu.evm.frame.ExceptionalHaltReason.INSUFFICIENT_GAS;
 
 import com.hedera.node.app.service.contract.impl.exec.AddressChecks;
+import com.hedera.node.app.service.contract.impl.exec.utils.FrameUtils;
+import com.hedera.node.app.service.contract.impl.exec.utils.InvalidAddressContext;
 import com.hedera.node.app.service.contract.impl.state.AbstractProxyEvmAccount;
 import com.hedera.node.app.service.contract.impl.state.ProxyWorldUpdater;
 import com.hedera.node.app.service.contract.impl.state.ScheduleEvmAccount;
@@ -188,7 +190,11 @@ public OperationResult execute(@NonNull final MessageFrame frame, @NonNull final
                         beneficiaryAccount instanceof ScheduleEvmAccount)
                 .filter(Boolean.TRUE::equals)
                 .findFirst()
-                .flatMap(op -> Optional.of(INVALID_SOLIDITY_ADDRESS));
+                .flatMap(op -> {
+                    FrameUtils.invalidAddressContext(frame)
+                            .set(beneficiary, InvalidAddressContext.InvalidAddressType.NonCallTarget);
+                    return Optional.of(INVALID_SOLIDITY_ADDRESS);
+                });
     }
 
     protected @NonNull Optional<ExceptionalHaltReason> validateHederaRestrictionsOnContract(
diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/utils/ActionStack.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/utils/ActionStack.java
@@ -214,7 +214,13 @@ private ContractAction finalFormOf(@NonNull final ContractAction action, @NonNul
                     final var haltReason = maybeHaltReason.get();
                     builder.error(Bytes.wrap(haltReason.name().getBytes(UTF_8)));
                     if (CALL.equals(action.callType()) && haltReason == INVALID_SOLIDITY_ADDRESS) {
-                        allActions.add(new ActionWrapper(helper.createSynthActionForMissingAddressIn(frame)));
+                        final var invalidAddressContext = FrameUtils.invalidAddressContext(frame);
+                        // Only create the synth action if the invalid address was actually a call target
+                        if (InvalidAddressContext.InvalidAddressType.InvalidCallTarget.equals(
+                                invalidAddressContext.type())) {
+                            allActions.add(new ActionWrapper(helper.createSynthActionForMissingAddressIn(
+                                    frame, invalidAddressContext.culpritAddress())));
+                        }
                     }
                 } else {
                     builder.error(Bytes.EMPTY);
diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/utils/ActionsHelper.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/utils/ActionsHelper.java
@@ -16,6 +16,7 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.evm.frame.MessageFrame;
 
 /**
@@ -30,13 +31,14 @@ public class ActionsHelper {
      * @param frame the frame to represent
      * @return the {@link ContractAction} representing the frame as a call to a missing address
      */
-    public ContractAction createSynthActionForMissingAddressIn(@NonNull final MessageFrame frame) {
+    public ContractAction createSynthActionForMissingAddressIn(
+            @NonNull final MessageFrame frame, @NonNull final Address targetAddress) {
         return ContractAction.newBuilder()
                 .callType(ContractActionType.CALL)
                 .gas(frame.getRemainingGas())
                 .callDepth(frame.getDepth() + 1)
                 .callingContract(contractIdWith(frame, hederaIdNumOfContractIn(frame)))
-                .targetedAddress(tuweniToPbjBytes(frame.getStackItem(1)))
+                .targetedAddress(tuweniToPbjBytes(targetAddress))
                 .error(MISSING_ADDRESS_ERROR)
                 .callOperationType(
                         asCallOperationType(frame.getCurrentOperation().getOpcode()))
diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/utils/FrameBuilder.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/utils/FrameBuilder.java
@@ -11,6 +11,7 @@
 import static com.hedera.node.app.service.contract.impl.exec.utils.FrameUtils.BYTECODE_SIDECARS_VARIABLE;
 import static com.hedera.node.app.service.contract.impl.exec.utils.FrameUtils.CONFIG_CONTEXT_VARIABLE;
 import static com.hedera.node.app.service.contract.impl.exec.utils.FrameUtils.HAPI_RECORD_BUILDER_CONTEXT_VARIABLE;
+import static com.hedera.node.app.service.contract.impl.exec.utils.FrameUtils.INVALID_ADDRESS_CONTEXT_VARIABLE;
 import static com.hedera.node.app.service.contract.impl.exec.utils.FrameUtils.IS_HOOK_VARIABLE;
 import static com.hedera.node.app.service.contract.impl.exec.utils.FrameUtils.OPS_DURATION_COUNTER;
 import static com.hedera.node.app.service.contract.impl.exec.utils.FrameUtils.PENDING_CREATION_BUILDER_CONTEXT_VARIABLE;
@@ -159,6 +160,7 @@ private Map<String, Object> contextVariablesFrom(
         if (hookDispatch) {
             contextEntries.put(IS_HOOK_VARIABLE, true);
         }
+        contextEntries.put(INVALID_ADDRESS_CONTEXT_VARIABLE, new InvalidAddressContext());
         return contextEntries;
     }
 
diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/utils/FrameUtils.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/utils/FrameUtils.java
@@ -38,6 +38,7 @@ public class FrameUtils {
     public static final String PENDING_CREATION_BUILDER_CONTEXT_VARIABLE = "pendingCreationBuilder";
     public static final String OPS_DURATION_COUNTER = "opsDurationCounter";
     public static final String IS_HOOK_VARIABLE = "hook";
+    public static final String INVALID_ADDRESS_CONTEXT_VARIABLE = "invalidAddressContext";
 
     public enum EntityType {
         TOKEN,
@@ -380,6 +381,15 @@ public static boolean isHookExecution(@NonNull final MessageFrame frame) {
         return Boolean.TRUE.equals(initialFrameOf(frame).getContextVariable(IS_HOOK_VARIABLE));
     }
 
+    /**
+     * Returns the {@link InvalidAddressContext} associated with the initial parent frame of the given frame.
+     * @param frame the frame of interest
+     * @return InvalidAddressContext
+     */
+    public static InvalidAddressContext invalidAddressContext(@NonNull final MessageFrame frame) {
+        return initialFrameOf(frame).getContextVariable(INVALID_ADDRESS_CONTEXT_VARIABLE);
+    }
+
     /**
      * Returns the {@link EntityIdFactory}
      *
diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/utils/InvalidAddressContext.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/utils/InvalidAddressContext.java
@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: Apache-2.0
+package com.hedera.node.app.service.contract.impl.exec.utils;
+
+import static java.util.Objects.requireNonNull;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+import org.hyperledger.besu.datatypes.Address;
+
+/**
+ * A class holding additional context information necessary when handling
+ * {@link com.hedera.node.app.service.contract.impl.exec.failure.CustomExceptionalHaltReason} of type INVALID_SOLIDITY_ADDRESS.
+ */
+public final class InvalidAddressContext {
+    /** Represents a use-case-specific type of the address that was invalid.
+     * For the purpose of creating a synthetic ContractAction
+     * we need to know whether the address was the target address of a call,
+     * or something else (in which case we don't care about specifics).
+     * See: {@link ActionStack}.
+     */
+    public enum InvalidAddressType {
+        InvalidCallTarget,
+        NonCallTarget,
+    }
+
+    private Address culpritAddress = Address.ZERO;
+    private InvalidAddressType type = InvalidAddressType.NonCallTarget;
+
+    public void set(@NonNull final Address culpritAddress, @NonNull final InvalidAddressType type) {
+        this.culpritAddress = requireNonNull(culpritAddress);
+        this.type = requireNonNull(type);
+    }
+
+    public Address culpritAddress() {
+        return this.culpritAddress;
+    }
+
+    public InvalidAddressType type() {
+        return this.type;
+    }
+}
diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/operations/CustomBalanceOperationTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/operations/CustomBalanceOperationTest.java
@@ -12,6 +12,7 @@
 import com.hedera.node.app.service.contract.impl.exec.FeatureFlags;
 import com.hedera.node.app.service.contract.impl.exec.operations.CustomBalanceOperation;
 import com.hedera.node.app.service.contract.impl.exec.utils.FrameUtils;
+import com.hedera.node.app.service.contract.impl.exec.utils.InvalidAddressContext;
 import com.hedera.node.app.service.contract.impl.state.ProxyWorldUpdater;
 import org.apache.tuweni.units.bigints.UInt256;
 import org.hyperledger.besu.evm.EVM;
@@ -88,6 +89,7 @@ void rejectsMissingUserAddressIfAllowCallFeatureFlagOff() {
             setupWarmGasCost();
             given(frame.getRemainingGas()).willReturn(1L);
             given(frame.getStackItem(0)).willReturn(NON_SYSTEM_LONG_ZERO_ADDRESS);
+            frameUtils.when(() -> FrameUtils.invalidAddressContext(frame)).thenReturn(new InvalidAddressContext());
             frameUtils.when(() -> FrameUtils.proxyUpdaterFor(frame)).thenReturn(updater);
             frameUtils
                     .when(() -> FrameUtils.contractRequired(frame, NON_SYSTEM_LONG_ZERO_ADDRESS, featureFlags))
diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/operations/CustomCallCodeOperationTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/operations/CustomCallCodeOperationTest.java
@@ -13,6 +13,7 @@
 import com.hedera.node.app.service.contract.impl.exec.FeatureFlags;
 import com.hedera.node.app.service.contract.impl.exec.operations.CustomCallCodeOperation;
 import com.hedera.node.app.service.contract.impl.exec.utils.FrameUtils;
+import com.hedera.node.app.service.contract.impl.exec.utils.InvalidAddressContext;
 import com.hedera.node.app.service.contract.impl.state.ProxyWorldUpdater;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
@@ -76,6 +77,7 @@ void rejectsMissingNonSystemAddress() {
         try (MockedStatic<FrameUtils> frameUtils = Mockito.mockStatic(FrameUtils.class)) {
             doCallRealMethod().when(addressChecks).isNeitherSystemNorPresent(any(), any());
             givenWellKnownFrameWith(1L, NON_SYSTEM_LONG_ZERO_ADDRESS, 2L);
+            frameUtils.when(() -> FrameUtils.invalidAddressContext(frame)).thenReturn(new InvalidAddressContext());
             frameUtils.when(() -> FrameUtils.proxyUpdaterFor(frame)).thenReturn(updater);
             frameUtils
                     .when(() -> FrameUtils.contractRequired(frame, NON_SYSTEM_LONG_ZERO_ADDRESS, featureFlags))
diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/operations/CustomCallOperationTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/operations/CustomCallOperationTest.java
@@ -17,6 +17,7 @@
 import com.hedera.node.app.service.contract.impl.exec.FeatureFlags;
 import com.hedera.node.app.service.contract.impl.exec.operations.CustomCallOperation;
 import com.hedera.node.app.service.contract.impl.exec.utils.FrameUtils;
+import com.hedera.node.app.service.contract.impl.exec.utils.InvalidAddressContext;
 import com.hedera.node.app.service.contract.impl.state.ProxyWorldUpdater;
 import com.hedera.node.app.service.contract.impl.test.TestHelpers;
 import com.hedera.node.app.service.entityid.EntityIdFactory;
@@ -130,6 +131,7 @@ void withSystemAccountContinuesAsExpected() {
     void withNoValueRejectsMissingAddressIfAllowCallFeatureFlagOff() {
         try (MockedStatic<FrameUtils> frameUtils = Mockito.mockStatic(FrameUtils.class)) {
             givenWellKnownFrameWith(0L, TestHelpers.EIP_1014_ADDRESS, 2L);
+            frameUtils.when(() -> FrameUtils.invalidAddressContext(frame)).thenReturn(new InvalidAddressContext());
             frameUtils.when(() -> FrameUtils.proxyUpdaterFor(frame)).thenReturn(updater);
             frameUtils.when(() -> FrameUtils.entityIdFactory(frame)).thenReturn(entityIdFactory);
             frameUtils
@@ -162,6 +164,7 @@ void delegateToParentMissingAddressIfAllowCallFeatureFlagOn() {
     void withoutImplicitCreationEnabledRejectsMissingAddress() {
         try (MockedStatic<FrameUtils> frameUtils = Mockito.mockStatic(FrameUtils.class)) {
             givenWellKnownFrameWith(1L, TestHelpers.EIP_1014_ADDRESS, 2L);
+            frameUtils.when(() -> FrameUtils.invalidAddressContext(frame)).thenReturn(new InvalidAddressContext());
             frameUtils.when(() -> FrameUtils.proxyUpdaterFor(frame)).thenReturn(updater);
             frameUtils.when(() -> FrameUtils.entityIdFactory(frame)).thenReturn(entityIdFactory);
             frameUtils
diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/operations/CustomDelegateCallOperationTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/operations/CustomDelegateCallOperationTest.java
@@ -17,6 +17,7 @@
 import com.hedera.node.app.service.contract.impl.exec.FeatureFlags;
 import com.hedera.node.app.service.contract.impl.exec.operations.CustomDelegateCallOperation;
 import com.hedera.node.app.service.contract.impl.exec.utils.FrameUtils;
+import com.hedera.node.app.service.contract.impl.exec.utils.InvalidAddressContext;
 import com.hedera.node.app.service.contract.impl.state.ProxyWorldUpdater;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
@@ -79,6 +80,7 @@ void rejectsMissingNonSystemAddress() {
         try (MockedStatic<FrameUtils> frameUtils = Mockito.mockStatic(FrameUtils.class)) {
             doCallRealMethod().when(addressChecks).isNeitherSystemNorPresent(any(), any());
             givenWellKnownFrameWith(1L, NON_SYSTEM_LONG_ZERO_ADDRESS, 2L);
+            frameUtils.when(() -> FrameUtils.invalidAddressContext(frame)).thenReturn(new InvalidAddressContext());
             frameUtils.when(() -> FrameUtils.proxyUpdaterFor(frame)).thenReturn(updater);
             frameUtils
                     .when(() -> FrameUtils.contractRequired(frame, NON_SYSTEM_LONG_ZERO_ADDRESS, featureFlags))
diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/operations/CustomExtCodeCopyOperationTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/operations/CustomExtCodeCopyOperationTest.java
@@ -16,6 +16,7 @@
 import com.hedera.node.app.service.contract.impl.exec.FeatureFlags;
 import com.hedera.node.app.service.contract.impl.exec.operations.CustomExtCodeCopyOperation;
 import com.hedera.node.app.service.contract.impl.exec.utils.FrameUtils;
+import com.hedera.node.app.service.contract.impl.exec.utils.InvalidAddressContext;
 import com.hedera.node.app.service.contract.impl.state.ProxyWorldUpdater;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
@@ -79,6 +80,7 @@ void rejectsMissingUserAddressIfAllowCallFeatureFlagOff() {
             given(frame.getStackItem(3)).willReturn(Bytes32.leftPad(Bytes.ofUnsignedLong(3)));
             givenWellKnownFrameWith(Address.fromHexString(HEX_ADDRESS_STR));
             given(frame.getRemainingGas()).willReturn(GAS_LIMIT);
+            frameUtils.when(() -> FrameUtils.invalidAddressContext(frame)).thenReturn(new InvalidAddressContext());
             frameUtils.when(() -> FrameUtils.proxyUpdaterFor(frame)).thenReturn(updater);
             frameUtils
                     .when(() -> FrameUtils.contractRequired(any(), any(), any()))
diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/operations/CustomExtCodeHashOperationTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/operations/CustomExtCodeHashOperationTest.java
diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/operations/CustomExtCodeSizeOperationTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/operations/CustomExtCodeSizeOperationTest.java
diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/operations/CustomSelfDestructOperationTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/operations/CustomSelfDestructOperationTest.java
diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/operations/CustomStaticCallOperationTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/operations/CustomStaticCallOperationTest.java
diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/utils/ActionStackTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/utils/ActionStackTest.java
diff --git a/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/utils/ActionsHelperTest.java b/hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/utils/ActionsHelperTest.java
diff --git a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/suites/contract/opcodes/SelfDestructSuite.java b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/suites/contract/opcodes/SelfDestructSuite.java

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`import static com.hedera.node.app.service.contract.impl.exec.utils.FrameUtils.BYTECODE_SIDECARS_VARIABLE;`
`12`	`12`	`import static com.hedera.node.app.service.contract.impl.exec.utils.FrameUtils.CONFIG_CONTEXT_VARIABLE;`
`13`	`13`	`import static com.hedera.node.app.service.contract.impl.exec.utils.FrameUtils.HAPI_RECORD_BUILDER_CONTEXT_VARIABLE;`
	`14`	`+import static com.hedera.node.app.service.contract.impl.exec.utils.FrameUtils.INVALID_ADDRESS_CONTEXT_VARIABLE;`
`14`	`15`	`import static com.hedera.node.app.service.contract.impl.exec.utils.FrameUtils.IS_HOOK_VARIABLE;`
`15`	`16`	`import static com.hedera.node.app.service.contract.impl.exec.utils.FrameUtils.OPS_DURATION_COUNTER;`
`16`	`17`	`import static com.hedera.node.app.service.contract.impl.exec.utils.FrameUtils.PENDING_CREATION_BUILDER_CONTEXT_VARIABLE;`
`@@ -159,6 +160,7 @@ private Map<String, Object> contextVariablesFrom(`
`159`	`160`	`if (hookDispatch) {`
`160`	`161`	`contextEntries.put(IS_HOOK_VARIABLE, true);`
`161`	`162`	`}`
	`163`	`+ contextEntries.put(INVALID_ADDRESS_CONTEXT_VARIABLE, new InvalidAddressContext());`
`162`	`164`	`return contextEntries;`
`163`	`165`	`}`
`164`	`166`