HIP-801: Implement integration tests covering new services

build.gradle.kts

@@ -80,13 +80,15 @@ dependencies {
         api("io.swagger:swagger-annotations:1.6.14")
         api("io.vertx:vertx-pg-client:$vertxVersion")
         api("io.vertx:vertx-codegen:$vertxVersion")
+        api("io.vertx:vertx-core:$vertxVersion")
         api("jakarta.inject:jakarta.inject-api:2.0.1")
         api("net.devh:grpc-spring-boot-starter:3.1.0.RELEASE")
         api("net.java.dev.jna:jna:5.14.0")
         api("org.apache.commons:commons-collections4:4.4")
         api("org.apache.commons:commons-compress:1.26.1")
         api("org.apache.commons:commons-math3:3.6.1")
         api("org.apache.tuweni:tuweni-bytes:2.3.1")
+        api("org.apache.tuweni:tuweni-units:2.3.1")
         api("org.apache.velocity:velocity-engine-core:2.3")
         api("org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2")
         api("org.gaul:s3proxy:2.2.0")

hedera-mirror-common/build.gradle.kts

@@ -30,6 +30,7 @@ dependencies {
     api("commons-codec:commons-codec")
     api("org.apache.commons:commons-lang3")
     api("org.apache.tuweni:tuweni-bytes")
+    api("org.apache.tuweni:tuweni-units")
     api("org.jetbrains:annotations")
     api("org.springframework.boot:spring-boot-starter-data-jpa")
     testImplementation("org.hyperledger.besu:evm")

hedera-mirror-common/src/main/java/com/hedera/mirror/common/domain/contract/ContractAction.java

@@ -16,6 +16,8 @@
 
 package com.hedera.mirror.common.domain.contract;
 
+import static com.hedera.services.stream.proto.ContractAction.ResultDataCase.REVERT_REASON;
+
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.hedera.mirror.common.domain.entity.EntityId;
 import com.hedera.mirror.common.domain.entity.EntityType;
@@ -98,6 +100,11 @@ public boolean isNew() {
         return true; // Since we never update and use a natural ID, avoid Hibernate querying before insert
     }
 
+    @JsonIgnore
+    public boolean hasRevertReason() {
+        return resultDataType == REVERT_REASON.getNumber();
+    }
+
     @Data
     @AllArgsConstructor
     @NoArgsConstructor

hedera-mirror-web3/build.gradle.kts

@@ -42,6 +42,7 @@ dependencies {
     implementation("org.springframework.cloud:spring-cloud-starter-kubernetes-fabric8-config")
     runtimeOnly("org.postgresql:postgresql")
     testImplementation(project(path = ":common", configuration = "testClasses"))
+    testImplementation("io.vertx:vertx-core")
     testImplementation("org.flywaydb:flyway-database-postgresql")
     testImplementation("org.mockito:mockito-inline")
     testImplementation("org.springframework.boot:spring-boot-testcontainers")

hedera-mirror-web3/src/main/java/com/hedera/mirror/web3/common/ContractCallContext.java

@@ -16,10 +16,14 @@
 
 package com.hedera.mirror.web3.common;
 
+import com.hedera.mirror.common.domain.contract.ContractAction;
 import com.hedera.mirror.common.domain.transaction.RecordFile;
+import com.hedera.mirror.web3.evm.contracts.execution.traceability.Opcode;
+import com.hedera.mirror.web3.evm.contracts.execution.traceability.OpcodeTracerOptions;
 import com.hedera.mirror.web3.evm.store.CachingStateFrame;
 import com.hedera.mirror.web3.evm.store.StackedStateFrames;
 import java.util.EmptyStackException;
+import java.util.List;
 import java.util.Optional;
 import java.util.function.Function;
 import lombok.Getter;
@@ -45,6 +49,15 @@ public class ContractCallContext {
     /** Fixed "base" of stack: a R/O cache frame on top of the DB-backed cache frame */
     private CachingStateFrame<Object> stackBase;
 
+    @Setter
+    private OpcodeTracerOptions opcodeTracerOptions;
+
+    @Setter
+    private List<Opcode> opcodes = List.of();
+
+    @Setter
+    private List<ContractAction> contractActions = List.of();
+
     private ContractCallContext() {}
 
     public static ContractCallContext get() {

hedera-mirror-web3/src/main/java/com/hedera/mirror/web3/controller/ContractController.java

@@ -22,8 +22,8 @@
 import com.hedera.mirror.web3.evm.properties.MirrorNodeEvmProperties;
 import com.hedera.mirror.web3.exception.InvalidParametersException;
 import com.hedera.mirror.web3.exception.RateLimitException;
-import com.hedera.mirror.web3.service.ContractCallService;
-import com.hedera.mirror.web3.service.model.CallServiceParameters;
+import com.hedera.mirror.web3.service.ContractExecutionService;
+import com.hedera.mirror.web3.service.model.ContractExecutionParameters;
 import com.hedera.mirror.web3.viewmodel.ContractCallRequest;
 import com.hedera.mirror.web3.viewmodel.ContractCallResponse;
 import com.hedera.node.app.service.evm.store.models.HederaEvmAccount;
@@ -44,7 +44,7 @@
 @RequiredArgsConstructor
 @RestController
 class ContractController {
-    private final ContractCallService contractCallService;
+    private final ContractExecutionService contractExecutionService;
     private final Bucket rateLimitBucket;
     private final Bucket gasLimitBucket;
     private final MirrorNodeEvmProperties evmProperties;
@@ -61,7 +61,7 @@ ContractCallResponse call(@RequestBody @Valid ContractCallRequest request) {
             validateContractMaxGasLimit(request);
 
             final var params = constructServiceParameters(request);
-            final var result = contractCallService.processCall(params);
+            final var result = contractExecutionService.processCall(params);
             return new ContractCallResponse(result);
         } catch (QueryTimeoutException e) {
             log.error("Query timed out: {} request: {}", e.getMessage(), request);
@@ -73,7 +73,7 @@ ContractCallResponse call(@RequestBody @Valid ContractCallRequest request) {
         }
     }
 
-    private CallServiceParameters constructServiceParameters(ContractCallRequest request) {
+    private ContractExecutionParameters constructServiceParameters(ContractCallRequest request) {
         final var fromAddress = request.getFrom() != null ? Address.fromHexString(request.getFrom()) : Address.ZERO;
         final var sender = new HederaEvmAccount(fromAddress);
 
@@ -97,16 +97,16 @@ private CallServiceParameters constructServiceParameters(ContractCallRequest req
         final var callType = request.isEstimate() ? ETH_ESTIMATE_GAS : ETH_CALL;
         final var block = request.getBlock();
 
-        return CallServiceParameters.builder()
-                .sender(sender)
-                .receiver(receiver)
+        return ContractExecutionParameters.builder()
+                .block(block)
                 .callData(data)
-                .gas(request.getGas())
-                .value(request.getValue())
-                .isStatic(isStaticCall)
                 .callType(callType)
+                .gas(request.getGas())
                 .isEstimate(request.isEstimate())
-                .block(block)
+                .isStatic(isStaticCall)
+                .receiver(receiver)
+                .sender(sender)
+                .value(request.getValue())
                 .build();
     }
 

hedera-mirror-web3/src/main/java/com/hedera/mirror/web3/evm/config/EvmConfiguration.java

@@ -21,10 +21,14 @@
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.hedera.mirror.web3.evm.contracts.execution.MirrorEvmMessageCallProcessor;
 import com.hedera.mirror.web3.evm.contracts.execution.MirrorEvmMessageCallProcessorV30;
+import com.hedera.mirror.web3.evm.contracts.execution.traceability.MirrorOperationTracer;
+import com.hedera.mirror.web3.evm.contracts.execution.traceability.OpcodeTracer;
+import com.hedera.mirror.web3.evm.contracts.execution.traceability.TracerType;
 import com.hedera.mirror.web3.evm.contracts.operations.HederaBlockHashOperation;
 import com.hedera.mirror.web3.evm.properties.MirrorNodeEvmProperties;
 import com.hedera.mirror.web3.evm.store.contract.EntityAddressSequencer;
 import com.hedera.mirror.web3.repository.properties.CacheProperties;
+import com.hedera.node.app.service.evm.contracts.execution.traceability.HederaEvmOperationTracer;
 import com.hedera.node.app.service.evm.contracts.operations.CreateOperationExternalizer;
 import com.hedera.node.app.service.evm.contracts.operations.HederaBalanceOperation;
 import com.hedera.node.app.service.evm.contracts.operations.HederaBalanceOperationV038;
@@ -45,6 +49,7 @@
 import com.hedera.services.txns.crypto.AbstractAutoCreationLogic;
 import com.hedera.services.txns.util.PrngLogic;
 import com.swirlds.common.utility.SemanticVersion;
+import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -211,6 +216,16 @@ CacheManager cacheManagerRecordFileEarliest() {
         return caffeineCacheManager;
     }
 
+    @Bean
+    Map<TracerType, Provider<HederaEvmOperationTracer>> tracerProvider(
+            final MirrorOperationTracer mirrorOperationTracer,
+            final OpcodeTracer opcodeTracer) {
+        Map<TracerType, Provider<HederaEvmOperationTracer>> tracerMap = new EnumMap<>(TracerType.class);
+        tracerMap.put(TracerType.OPCODE, () -> opcodeTracer);
+        tracerMap.put(TracerType.OPERATION, () -> mirrorOperationTracer);
+        return tracerMap;
+    }
+
     @Bean
     Map<SemanticVersion, Provider<ContractCreationProcessor>> contractCreationProcessorProvider(
             final ContractCreationProcessor contractCreationProcessor30,

hedera-mirror-web3/src/main/java/com/hedera/mirror/web3/evm/contracts/execution/MirrorEvmTxProcessor.java

@@ -16,10 +16,13 @@
 
 package com.hedera.mirror.web3.evm.contracts.execution;
 
+import com.hedera.mirror.web3.common.ContractCallContext;
 import com.hedera.mirror.web3.service.model.CallServiceParameters;
 import com.hedera.node.app.service.evm.contracts.execution.HederaEvmTransactionProcessingResult;
 
 public interface MirrorEvmTxProcessor {
 
-    HederaEvmTransactionProcessingResult execute(CallServiceParameters params, long estimatedGas);
+    HederaEvmTransactionProcessingResult execute(final CallServiceParameters params,
+                                                 final long estimatedGas,
+                                                 final ContractCallContext context);
 }

hedera-mirror-web3/src/main/java/com/hedera/mirror/web3/evm/contracts/execution/MirrorEvmTxProcessorImpl.java

@@ -16,8 +16,9 @@
 
 package com.hedera.mirror.web3.evm.contracts.execution;
 
+import com.hedera.mirror.web3.common.ContractCallContext;
 import com.hedera.mirror.web3.evm.account.MirrorEvmContractAliases;
-import com.hedera.mirror.web3.evm.contracts.execution.traceability.MirrorOperationTracer;
+import com.hedera.mirror.web3.evm.contracts.execution.traceability.TracerType;
 import com.hedera.mirror.web3.evm.store.Store;
 import com.hedera.mirror.web3.evm.store.Store.OnMissing;
 import com.hedera.mirror.web3.evm.store.contract.EntityAddressSequencer;
@@ -28,6 +29,7 @@
 import com.hedera.node.app.service.evm.contracts.execution.HederaEvmTransactionProcessingResult;
 import com.hedera.node.app.service.evm.contracts.execution.HederaEvmTxProcessor;
 import com.hedera.node.app.service.evm.contracts.execution.PricesAndFeesProvider;
+import com.hedera.node.app.service.evm.contracts.execution.traceability.HederaEvmOperationTracer;
 import com.hedera.node.app.service.evm.store.contracts.AbstractCodeCache;
 import com.hedera.node.app.service.evm.store.contracts.HederaEvmMutableWorldState;
 import com.hedera.node.app.service.evm.store.tokens.TokenAccessor;
@@ -69,10 +71,10 @@ public MirrorEvmTxProcessorImpl(
             final BlockMetaSource blockMetaSource,
             final MirrorEvmContractAliases aliasManager,
             final AbstractCodeCache codeCache,
-            final MirrorOperationTracer operationTracer,
+            final Map<TracerType, Provider<HederaEvmOperationTracer>> tracerMap,
             final Store store,
             final EntityAddressSequencer entityAddressSequencer,
-            TokenAccessor tokenAccessor) {
+            final TokenAccessor tokenAccessor) {
         super(
                 worldState,
                 pricesAndFeesProvider,
@@ -81,7 +83,7 @@ public MirrorEvmTxProcessorImpl(
                 mcps,
                 ccps,
                 blockMetaSource,
-                operationTracer);
+                tracerMap);
 
         this.aliasManager = aliasManager;
         this.codeCache = codeCache;
@@ -90,7 +92,9 @@ public MirrorEvmTxProcessorImpl(
         this.tokenAccessor = tokenAccessor;
     }
 
-    public HederaEvmTransactionProcessingResult execute(CallServiceParameters params, long estimatedGas) {
+    public HederaEvmTransactionProcessingResult execute(final CallServiceParameters params,
+                                                        final long estimatedGas,
+                                                        final ContractCallContext ctx) {
         final long gasPrice = gasPriceTinyBarsGiven(Instant.now());
 
         store.wrap();
@@ -112,7 +116,9 @@ public HederaEvmTransactionProcessingResult execute(CallServiceParameters params
                 params.getCallData(),
                 params.isStatic(),
                 aliasManager.resolveForEvm(params.getReceiver()),
-                params.getReceiver().equals(Address.ZERO));
+                params.getReceiver().equals(Address.ZERO),
+                params.getTracerType(),
+                ctx);
     }
 
     @Override

hedera-mirror-web3/src/main/java/com/hedera/mirror/web3/evm/contracts/execution/OpcodesProcessingResult.java

@@ -22,6 +22,4 @@
 import java.util.List;
 
 public record OpcodesProcessingResult(
-        @NotNull HederaEvmTransactionProcessingResult transactionProcessingResult,
-        @NotNull List<Opcode> opcodes) {
-}
+        @NotNull HederaEvmTransactionProcessingResult transactionProcessingResult, @NotNull List<Opcode> opcodes) {}