feat: Add v0.67 module and enable ops duration throttle; minor tweaks (#21384)

Signed-off-by: Lukasz Gasior <[email protected]>

Author: lukasz-hashgraph

hedera-node/configuration/dev/application.properties

@@ -25,7 +25,7 @@ grpc.nodeOperatorPortEnabled=true
 # For CI tests we want to override roster weights from override-network.json
 networkAdmin.preserveStateWeightsDuringOverride=false
 contracts.systemContract.hts.addresses=359,364
-contracts.evm.version=v0.66
+contracts.evm.version=v0.67
 #Enforce native lib verification to not halt node on dev env
 contracts.evm.nativeLibVerification.halt.enabled=false
 # Disable TSS for PR checks by default because of the time overhead

hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/ContractsConfig.java

@@ -19,8 +19,8 @@ public record ContractsConfig(
                 boolean noncesExternalizationEnabled,
         @ConfigProperty(defaultValue = "false") @NetworkProperty boolean enforceCreationThrottle,
         @ConfigProperty(defaultValue = "15000000") @NetworkProperty long maxGasPerTransaction,
-        @ConfigProperty(defaultValue = "15000000") @NetworkProperty long maxGasPerSec,
-        @ConfigProperty(defaultValue = "15000000") @NetworkProperty long maxGasPerSecBackend,
+        @ConfigProperty(defaultValue = "1500000000") @NetworkProperty long maxGasPerSec,
+        @ConfigProperty(defaultValue = "1500000000") @NetworkProperty long maxGasPerSecBackend,
         @ConfigProperty(defaultValue = "500000000") @NetworkProperty long opsDurationThrottleCapacity,
         @ConfigProperty(defaultValue = "500000000") @NetworkProperty long opsDurationThrottleUnitsFreedPerSecond,
         @ConfigProperty(value = "maxKvPairs.aggregate", defaultValue = "500000000") @NetworkProperty
@@ -34,11 +34,11 @@ public record ContractsConfig(
         @ConfigProperty(defaultValue = "CONTRACT_STATE_CHANGE,CONTRACT_BYTECODE,CONTRACT_ACTION") @NetworkProperty
                 Set<SidecarType> sidecars,
         @ConfigProperty(defaultValue = "false") @NetworkProperty boolean sidecarValidationEnabled,
-        @ConfigProperty(value = "throttle.throttleByGas", defaultValue = "true") @NetworkProperty
+        @ConfigProperty(value = "throttle.throttleByGas", defaultValue = "false") @NetworkProperty
                 boolean throttleThrottleByGas,
-        @ConfigProperty(value = "throttle.throttleByOpsDuration", defaultValue = "false") @NetworkProperty
+        @ConfigProperty(value = "throttle.throttleByOpsDuration", defaultValue = "true") @NetworkProperty
                 boolean throttleThrottleByOpsDuration,
-        @ConfigProperty(defaultValue = "20") @NetworkProperty int maxRefundPercentOfGasLimit,
+        @ConfigProperty(defaultValue = "100") @NetworkProperty int maxRefundPercentOfGasLimit,
         @ConfigProperty(value = "precompile.exchangeRateGasCost", defaultValue = "100") @NetworkProperty
                 long precompileExchangeRateGasCost,
         @ConfigProperty(value = "precompile.htsDefaultGasCost", defaultValue = "10000") @NetworkProperty

hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/OpsDurationConfig.java

@@ -2,32 +2,17 @@
 package com.hedera.node.config.data;
 
 import com.hedera.node.config.NetworkProperty;
-import com.hedera.node.config.types.LongPair;
 import com.swirlds.config.api.ConfigData;
 import com.swirlds.config.api.ConfigProperty;
 import java.util.List;
 
 @ConfigData("contracts.ops.duration")
 public record OpsDurationConfig(
-        // The duration of the operations in microseconds. The key is the operation number and the value is the
-        // duration. The op codes are broken into sets of 64 values.
         @ConfigProperty(
                         defaultValue =
-                                "1-123,2-105,3-93,4-100,5-116,6-212,7-208,8-290,9-262,10-307,11-106,16-55,17-56,18-77,19-77,20-63,21-35,22-91,23-92,24-92,25-85,26-63,27-136,28-149,29-131,32-693,48-23,49-270,50-23,51-23,52-23,53-69,54-28,55-161,56-29,57-243,58-23,59-271,60-349,61-30,62-106,63-279,64-49")
+                                "0,123,105,93,100,116,212,208,290,262,307,106,0,0,0,0,55,56,77,77,63,35,91,92,92,85,63,136,149,131,0,0,693,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23,270,23,23,23,69,28,161,29,243,23,271,349,30,106,279,49,23,30,29,23,30,23,32,0,0,0,0,0,0,0,0,20,77,102,78,260,713,143,155,29,30,29,5,0,0,0,0,21,20,20,21,20,20,21,21,21,21,27,21,21,21,21,23,21,21,22,23,22,22,22,22,22,22,23,23,22,22,23,23,17,17,17,17,17,17,17,17,17,18,18,18,18,18,18,18,27,27,28,27,28,28,28,28,28,29,28,29,29,29,29,29,109,677,734,808,959,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,26552,98859,2011,0,1596,11291,0,0,0,0,2091,0,0,0,0,0")
                 @NetworkProperty
-                List<LongPair> opsDurations1_to_64,
-        @ConfigProperty(
-                        defaultValue =
-                                "65-23,66-30,67-29,68-23,69-30,70-23,71-32,80-20,81-77,82-102,83-78,84-260,85-713,86-143,87-155,88-29,89-30,90-29,91-5,96-21,97-20,98-20,99-21,100-20,101-20,102-21,103-21,104-21,105-21,106-27,107-21,108-21,109-21,110-21,111-23,112-21,113-21,114-22,115-23,116-22,117-22,118-22,119-22,120-22,121-22,122-23,123-23,124-22,125-22,126-23,127-23,128-17")
-                @NetworkProperty
-                List<LongPair> opsDurations65_to_128,
-        @ConfigProperty(
-                        defaultValue =
-                                "144-27,129-17,145-27,130-17,146-28,131-17,147-27,132-17,148-28,133-17,149-28,134-17,150-28,135-17,151-28,136-17,152-28,137-18,153-29,138-18,154-28,139-18,155-29,140-18,156-29,141-18,157-29,142-18,158-29,143-18,159-29,160-109,161-677,162-734,163-808,164-959")
-                @NetworkProperty
-                List<LongPair> opsDurations129_to_192,
-        @ConfigProperty(defaultValue = "240-26552,241-98859,242-2011,244-1596,245-11291,250-2091") @NetworkProperty
-                List<LongPair> opsDurations193_to_256,
+                List<Long> opsDurationByOpCode,
         @ConfigProperty(defaultValue = "3332") @NetworkProperty long accountLazyCreationOpsDurationMultiplier,
         @ConfigProperty(defaultValue = "1575") @NetworkProperty long opsGasBasedDurationMultiplier,
         @ConfigProperty(defaultValue = "1575") @NetworkProperty long precompileGasBasedDurationMultiplier,

hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/ContractServiceModule.java

@@ -1,25 +1,10 @@
 // SPDX-License-Identifier: Apache-2.0
 package com.hedera.node.app.service.contract.impl;
 
-import static com.hedera.node.app.service.contract.impl.hevm.HederaEvmVersion.VERSION_030;
-import static com.hedera.node.app.service.contract.impl.hevm.HederaEvmVersion.VERSION_034;
-import static com.hedera.node.app.service.contract.impl.hevm.HederaEvmVersion.VERSION_038;
-import static com.hedera.node.app.service.contract.impl.hevm.HederaEvmVersion.VERSION_046;
-import static com.hedera.node.app.service.contract.impl.hevm.HederaEvmVersion.VERSION_050;
-import static com.hedera.node.app.service.contract.impl.hevm.HederaEvmVersion.VERSION_051;
-import static com.hedera.node.app.service.contract.impl.hevm.HederaEvmVersion.VERSION_065;
-import static com.hedera.node.app.service.contract.impl.hevm.HederaEvmVersion.VERSION_066;
+import static com.hedera.node.app.service.contract.impl.hevm.HederaEvmVersion.*;
 import static org.hyperledger.besu.evm.internal.EvmConfiguration.WorldUpdaterMode.JOURNALED;
 
-import com.hedera.node.app.service.contract.impl.annotations.ServicesV030;
-import com.hedera.node.app.service.contract.impl.annotations.ServicesV034;
-import com.hedera.node.app.service.contract.impl.annotations.ServicesV038;
-import com.hedera.node.app.service.contract.impl.annotations.ServicesV046;
-import com.hedera.node.app.service.contract.impl.annotations.ServicesV050;
-import com.hedera.node.app.service.contract.impl.annotations.ServicesV051;
-import com.hedera.node.app.service.contract.impl.annotations.ServicesV065;
-import com.hedera.node.app.service.contract.impl.annotations.ServicesV066;
-import com.hedera.node.app.service.contract.impl.annotations.ServicesVersionKey;
+import com.hedera.node.app.service.contract.impl.annotations.*;
 import com.hedera.node.app.service.contract.impl.exec.QueryComponent;
 import com.hedera.node.app.service.contract.impl.exec.TransactionComponent;
 import com.hedera.node.app.service.contract.impl.exec.TransactionProcessor;
@@ -33,6 +18,7 @@
 import com.hedera.node.app.service.contract.impl.exec.v051.V051Module;
 import com.hedera.node.app.service.contract.impl.exec.v065.V065Module;
 import com.hedera.node.app.service.contract.impl.exec.v066.V066Module;
+import com.hedera.node.app.service.contract.impl.exec.v067.V067Module;
 import com.hedera.node.app.service.contract.impl.handlers.ContractCallHandler;
 import com.hedera.node.app.service.contract.impl.handlers.ContractCallLocalHandler;
 import com.hedera.node.app.service.contract.impl.handlers.ContractCreateHandler;
@@ -74,6 +60,7 @@
             V051Module.class,
             V065Module.class,
             V066Module.class,
+            V067Module.class,
             ProcessorModule.class
         },
         subcomponents = {TransactionComponent.class, QueryComponent.class})
@@ -210,4 +197,14 @@ static EvmConfiguration provideEvmConfiguration() {
     @Singleton
     @ServicesVersionKey(VERSION_066)
     TransactionProcessor bindV066Processor(@ServicesV066 @NonNull final TransactionProcessor processor);
+
+    /**
+     * @param processor the transaction processor
+     * @return the bound transaction processor for version 0.67
+     */
+    @Binds
+    @IntoMap
+    @Singleton
+    @ServicesVersionKey(VERSION_067)
+    TransactionProcessor bindV067Processor(@ServicesV067 @NonNull final TransactionProcessor processor);
 }

hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/annotations/ServicesV065.java

@@ -12,7 +12,7 @@
 import javax.inject.Qualifier;
 
 /**
- * Qualifies a binding for use with the {@code v0.64} (Cancun) Services EVM.  Adds support for the
+ * Qualifies a binding for use with the {@code v0.65} (Cancun) Services EVM. Adds support for the
  * Hedera EVM class for calculating and alternate ops duration and throttling system.
  */
 @Target({METHOD, PARAMETER, TYPE})

hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/annotations/ServicesV066.java

@@ -12,8 +12,9 @@
 import javax.inject.Qualifier;
 
 /**
- * Qualifies a binding for use with the {@code v0.66} (Cancun/Pectra) Services EVM.  Adds support for the
- * Hedera Account Service system contract.
+ * Qualifies a binding for use with the {@code v0.66} (Cancun/Pectra) Services EVM.
+ * Adds besu native library check and temporarily removes support for the
+ * Hedera EVM class for calculating and alternate ops duration and throttling system (due to release process).
  */
 @Target({METHOD, PARAMETER, TYPE})
 @Retention(RUNTIME)

hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/annotations/ServicesV067.java

@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: Apache-2.0
+package com.hedera.node.app.service.contract.impl.annotations;
+
+import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import javax.inject.Qualifier;
+
+/**
+ * Qualifies a binding for use with the {@code v0.67} (Cancun/Pectra) Services EVM.
+ * Re-adds support for the
+ * Hedera EVM class for calculating and alternate ops duration and throttling system.
+ */
+@Target({METHOD, PARAMETER, TYPE})
+@Retention(RUNTIME)
+@Documented
+@Qualifier
+public @interface ServicesV067 {}

hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/utils/OpsDurationCounter.java

@@ -9,15 +9,12 @@
  * throughout the execution of a single EVM transaction.
  */
 public final class OpsDurationCounter {
-
-    private static final OpsDurationCounter DISABLED = new OpsDurationCounter(OpsDurationSchedule.empty());
-
     private final OpsDurationSchedule schedule;
 
     private long opsDurationUnitsConsumed;
 
     public static OpsDurationCounter disabled() {
-        return DISABLED;
+        return new OpsDurationCounter(OpsDurationSchedule.empty());
     }
 
     public static OpsDurationCounter withSchedule(final OpsDurationSchedule schedule) {

hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/v066/V066Module.java

@@ -63,8 +63,9 @@
 import org.hyperledger.besu.evm.processor.ContractCreationProcessor;
 
 /**
- * Provides the Services 0.65 EVM implementation, which consists of update to the 25.3 version of the Besu EVM
- * and a new native library verification strategy
+ * Provides the Services 0.66 EVM implementation, which consists of update to the 25.3 version of the Besu EVM
+ * and a new native library verification strategy. It also temporarily removes the support for HederaEVM (for ops duration
+ * gas tracking) - to be re-added in the following version.
  */
 @Module
 public interface V066Module {

hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/v066/Version066FeatureFlags.java

@@ -1,12 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package com.hedera.node.app.service.contract.impl.exec.v066;
 
-import static java.util.Objects.requireNonNull;
-
 import com.hedera.node.app.service.contract.impl.exec.v065.Version065FeatureFlags;
-import com.hedera.node.config.data.ContractsConfig;
-import com.swirlds.config.api.Configuration;
-import edu.umd.cs.findbugs.annotations.NonNull;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
@@ -17,9 +12,4 @@ public class Version066FeatureFlags extends Version065FeatureFlags {
     public Version066FeatureFlags() {
         // Dagger2
     }
-
-    public boolean isNativeLibVerificationEnabled(@NonNull Configuration config) {
-        requireNonNull(config);
-        return config.getConfigData(ContractsConfig.class).nativeLibVerificationHaltEnabled();
-    }
 }