feat: Create and use contract service interface

hapi/hedera-protobuf-java-api/src/main/proto/services/crypto_create.proto

@@ -204,4 +204,11 @@ message CryptoCreateTransactionBody {
      * Details of hooks to add immediately after creating this account.
      */
     repeated com.hedera.hapi.node.hooks.HookCreationDetails hook_creation_details = 19;
+
+    /**
+     * The delegation contract address for the account.
+     * If this field is set, a call to the account's address within a smart contract will
+     * result in the code of the authorized contract being executed.
+     */
+    bytes delegation_address = 20;
 }

hapi/hedera-protobuf-java-api/src/main/proto/services/crypto_update.proto

@@ -226,4 +226,11 @@ message CryptoUpdateTransactionBody {
      * The hooks to create for the account.
      */
     repeated com.hedera.hapi.node.hooks.HookCreationDetails hook_creation_details = 20;
+
+    /**
+     * The delegated contract address for the account.
+     * If this field is set, a call to the account's address within a smart contract will
+     * result in the code of the authorized contract being executed.
+     */
+    bytes delegation_address = 21;
 }

hedera-node/hedera-app/src/main/java/com/hedera/node/app/services/ServicesInjectionModule.java

@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0
 package com.hedera.node.app.services;
 
+import com.hedera.node.app.service.contract.ContractService;
+import com.hedera.node.app.service.contract.impl.ContractServiceImpl;
 import com.hedera.node.app.service.file.impl.FileServiceInjectionModule;
 import com.hedera.node.app.service.schedule.ScheduleService;
 import com.hedera.node.app.service.schedule.impl.ScheduleServiceImpl;
@@ -19,4 +21,7 @@
 public interface ServicesInjectionModule {
     @Binds
     ScheduleService bindScheduleService(ScheduleServiceImpl impl);
+
+    @Binds
+    ContractService bindContractService(ContractServiceImpl impl);
 }

hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/FacilityInitModule.java

@@ -22,6 +22,8 @@
 import com.hedera.node.app.fees.ExchangeRateManager;
 import com.hedera.node.app.fees.FeeManager;
 import com.hedera.node.app.records.BlockRecordService;
+import com.hedera.node.app.service.contract.ContractService;
+import com.hedera.node.app.service.contract.ContractServiceApi;
 import com.hedera.node.app.service.file.ReadableFileStore;
 import com.hedera.node.app.service.file.impl.FileServiceImpl;
 import com.hedera.node.app.service.schedule.ScheduleService;
@@ -75,13 +77,17 @@ static Supplier<FeeCharging> provideBaseFeeCharging(@NonNull final AppContext ap
 
     @Provides
     @Singleton
-    static Map<Class<?>, ServiceApiProvider<?>> provideApiProviders(@NonNull final ScheduleService scheduleService) {
+    static Map<Class<?>, ServiceApiProvider<?>> provideApiProviders(
+            @NonNull final ScheduleService scheduleService, @NonNull final ContractService contractService) {
         requireNonNull(scheduleService);
+        requireNonNull(contractService);
         return Map.of(
                 TokenServiceApi.class,
                 TOKEN_SERVICE_API_PROVIDER,
                 ScheduleServiceApi.class,
-                scheduleService.apiProvider());
+                scheduleService.apiProvider(),
+                ContractServiceApi.class,
+                contractService.apiProvider());
     }
 
     @Binds

hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/standalone/impl/StandaloneDispatchFactory.java

@@ -22,6 +22,8 @@
 import com.hedera.node.app.fees.ResourcePriceCalculatorImpl;
 import com.hedera.node.app.info.NodeInfoImpl;
 import com.hedera.node.app.records.impl.BlockRecordInfoImpl;
+import com.hedera.node.app.service.contract.ContractServiceApi;
+import com.hedera.node.app.service.contract.impl.ContractServiceImpl;
 import com.hedera.node.app.service.entityid.EntityIdService;
 import com.hedera.node.app.service.entityid.impl.EntityNumGeneratorImpl;
 import com.hedera.node.app.service.entityid.impl.WritableEntityIdStoreImpl;
@@ -107,7 +109,8 @@ public StandaloneDispatchFactory(
             @NonNull final TransactionDispatcher transactionDispatcher,
             @NonNull final NetworkUtilizationManager networkUtilizationManager,
             @NonNull final TransactionChecker transactionChecker,
-            @NonNull final ScheduleServiceImpl scheduleService) {
+            @NonNull final ScheduleServiceImpl scheduleService,
+            @NonNull final ContractServiceImpl contractService) {
         this.feeManager = requireNonNull(feeManager);
         this.appFeeCharging = requireNonNull(appFeeCharging);
         this.authorizer = requireNonNull(authorizer);
@@ -127,7 +130,9 @@ public StandaloneDispatchFactory(
                 TokenServiceApi.class,
                 TOKEN_SERVICE_API_PROVIDER,
                 ScheduleServiceApi.class,
-                scheduleService.apiProvider());
+                scheduleService.apiProvider(),
+                ContractServiceApi.class,
+                contractService.apiProvider());
     }
 
     /**

hedera-node/hedera-app/src/main/java/module-info.java

@@ -6,6 +6,7 @@
     requires transitive com.hedera.node.app.service.addressbook.impl;
     requires transitive com.hedera.node.app.service.consensus.impl;
     requires transitive com.hedera.node.app.service.contract.impl;
+    requires transitive com.hedera.node.app.service.contract;
     requires transitive com.hedera.node.app.service.entityid;
     requires transitive com.hedera.node.app.service.file.impl;
     requires transitive com.hedera.node.app.service.network.admin.impl;
@@ -44,7 +45,6 @@
     requires com.hedera.node.app.hapi.fees;
     requires com.hedera.node.app.service.addressbook;
     requires com.hedera.node.app.service.consensus;
-    requires com.hedera.node.app.service.contract;
     requires com.hedera.node.app.service.entityid.impl;
     requires com.hedera.node.app.service.file;
     requires com.hedera.node.app.service.network.admin;

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

@@ -0,0 +1,68 @@
+// SPDX-License-Identifier: Apache-2.0
+package com.hedera.node.app.service.contract.impl;
+
+import static java.util.Objects.requireNonNull;
+import static org.hyperledger.besu.evm.worldstate.CodeDelegationHelper.CODE_DELEGATION_PREFIX;
+
+import com.hedera.hapi.node.base.AccountID;
+import com.hedera.hapi.node.base.ContractID;
+import com.hedera.node.app.service.contract.ContractService;
+import com.hedera.node.app.service.contract.ContractServiceApi;
+import com.hedera.node.app.service.contract.impl.state.WritableContractStateStore;
+import com.hedera.node.app.service.entityid.WritableEntityCounters;
+import com.hedera.node.app.spi.api.ServiceApiProvider;
+import com.hedera.pbj.runtime.io.buffer.Bytes;
+import com.swirlds.config.api.Configuration;
+import com.swirlds.state.spi.WritableStates;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import javax.inject.Singleton;
+
+@Singleton
+public class ContractServiceApiProvider implements ServiceApiProvider<ContractServiceApi> {
+
+    @Override
+    public String serviceName() {
+        return ContractService.NAME;
+    }
+
+    @Override
+    public ContractServiceApi newInstance(
+            @NonNull final Configuration configuration,
+            @NonNull final WritableStates writableStates,
+            @NonNull final WritableEntityCounters entityCounters) {
+        requireNonNull(configuration);
+        requireNonNull(writableStates);
+        requireNonNull(entityCounters);
+        return new ContractServiceApiImpl(new WritableContractStateStore(writableStates, entityCounters));
+    }
+
+    /**
+     * Default implementation of the {@link ContractServiceApi} interface.
+     */
+    public class ContractServiceApiImpl implements ContractServiceApi {
+        private final WritableContractStateStore contractStateStore;
+
+        public ContractServiceApiImpl(@NonNull final WritableContractStateStore contractStateStore) {
+            this.contractStateStore = requireNonNull(contractStateStore);
+        }
+
+        @Override
+        public void setAccountDelegationTarget(@NonNull final AccountID accountID, @NonNull final Bytes bytecode) {
+            requireNonNull(accountID);
+            requireNonNull(bytecode);
+            final var contractID = ContractID.newBuilder()
+                    .shardNum(accountID.shardNum())
+                    .realmNum(accountID.realmNum())
+                    .contractNum(accountID.accountNumOrThrow())
+                    .build();
+            if (bytecode.equals(Bytes.EMPTY)) {
+                // Remove the delegation if the bytecode is empty
+                contractStateStore.removeBytecode(contractID);
+            } else {
+                final var delegationIndicator = Bytes.merge(Bytes.wrap(CODE_DELEGATION_PREFIX.toArray()), bytecode);
+                contractStateStore.putBytecode(
+                        contractID, new com.hedera.hapi.node.state.contract.Bytecode(delegationIndicator));
+            }
+        }
+    }
+}

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

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package com.hedera.node.app.service.contract.impl;
 
+import com.hedera.node.app.service.contract.ContractServiceApi;
 import com.hedera.node.app.service.contract.impl.annotations.CustomOps;
 import com.hedera.node.app.service.contract.impl.exec.metrics.ContractMetrics;
 import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategies;
@@ -12,6 +13,7 @@
 import com.hedera.node.app.service.contract.impl.handlers.ContractHandlers;
 import com.hedera.node.app.service.contract.impl.nativelibverification.NativeLibVerifier;
 import com.hedera.node.app.service.entityid.EntityIdFactory;
+import com.hedera.node.app.spi.api.ServiceApiProvider;
 import com.hedera.node.app.spi.signatures.SignatureVerifier;
 import dagger.BindsInstance;
 import dagger.Component;
@@ -46,6 +48,7 @@ interface Factory {
          * @param systemContractMethodRegistry registry of all system contract methods
          * @param customOps any additional custom operations to use when constructing the EVM
          * @param entityIdFactory a factory for creating entity IDs
+         * @param nativeLibVerifier the native library verifier
          * @return the contract service component
          */
         ContractServiceComponent create(
@@ -57,7 +60,8 @@ ContractServiceComponent create(
                 @BindsInstance SystemContractMethodRegistry systemContractMethodRegistry,
                 @BindsInstance @CustomOps Set<Operation> customOps,
                 @BindsInstance EntityIdFactory entityIdFactory,
-                @BindsInstance NativeLibVerifier nativeLibVerifier);
+                @BindsInstance NativeLibVerifier nativeLibVerifier,
+                @BindsInstance ServiceApiProvider<ContractServiceApi> contractServiceApiProvider);
     }
 
     /**
@@ -80,6 +84,11 @@ ContractServiceComponent create(
      */
     SystemContractMethodRegistry systemContractMethodRegistry();
 
+    /**
+     * Provides the {@link ContractServiceApi} provider.
+     */
+    ServiceApiProvider<ContractServiceApi> contractServiceApiProvider();
+
     @Named("HasTranslators")
     Provider<List<CallTranslator<HasCallAttempt>>> hasCallTranslators();
 

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

@@ -4,6 +4,7 @@
 import static java.util.Objects.requireNonNull;
 
 import com.hedera.node.app.service.contract.ContractService;
+import com.hedera.node.app.service.contract.ContractServiceApi;
 import com.hedera.node.app.service.contract.impl.exec.metrics.ContractMetrics;
 import com.hedera.node.app.service.contract.impl.exec.scope.DefaultVerificationStrategies;
 import com.hedera.node.app.service.contract.impl.exec.scope.VerificationStrategies;
@@ -15,6 +16,7 @@
 import com.hedera.node.app.service.contract.impl.schemas.V0490ContractSchema;
 import com.hedera.node.app.service.contract.impl.schemas.V065ContractSchema;
 import com.hedera.node.app.spi.AppContext;
+import com.hedera.node.app.spi.api.ServiceApiProvider;
 import com.hedera.node.config.data.ContractsConfig;
 import com.swirlds.metrics.api.Metrics;
 import com.swirlds.state.lifecycle.SchemaRegistry;
@@ -67,6 +69,7 @@ public ContractServiceImpl(
         final var systemContractMethodRegistry = new SystemContractMethodRegistry();
         final var contractMetrics = new ContractMetrics(metrics, contractsConfigSupplier, systemContractMethodRegistry);
         final var nativeLibVerifier = new NativeLibVerifier(contractsConfigSupplier);
+        final var contractServiceApiProvider = new ContractServiceApiProvider();
 
         this.component = DaggerContractServiceComponent.factory()
                 .create(
@@ -80,7 +83,8 @@ public ContractServiceImpl(
                         systemContractMethodRegistry,
                         customOps,
                         appContext.idFactory(),
-                        nativeLibVerifier);
+                        nativeLibVerifier,
+                        contractServiceApiProvider);
     }
 
     @Override
@@ -123,4 +127,9 @@ public NativeLibVerifier nativeLibVerifier() {
         allCallTranslators.addAll(component.htsCallTranslators().get());
         return allCallTranslators;
     }
+
+    @Override
+    public ServiceApiProvider<ContractServiceApi> apiProvider() {
+        return component.contractServiceApiProvider();
+    }
 }

hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/delegation/CodeDelegationProcessor.java

@@ -6,6 +6,7 @@
 import com.hedera.node.app.hapi.utils.ethereum.CodeDelegation;
 import com.hedera.node.app.hapi.utils.ethereum.EthTxSigs;
 import com.hedera.node.app.service.contract.impl.hevm.HederaEvmTransaction;
+import com.hedera.node.app.service.contract.impl.state.ProxyWorldUpdater;
 import java.math.BigInteger;
 import java.util.Optional;
 import org.apache.tuweni.bytes.Bytes;
@@ -111,6 +112,7 @@
             if (codeDelegation.nonce() != 0) {
                 return;
             }
+            ((ProxyWorldUpdater) worldUpdater).setupTopLevelLazyCreate(authorizerAddress);
             authority = worldUpdater.createAccount(authorizerAddress);
         } else {
             authority = maybeAuthorityAccount.get();

hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/delegation/CodeDelegationResult.java

@@ -17,10 +17,14 @@
     }
 
     public void incrementAlreadyExistingDelegators() {
-        alreadyExistingDelegators += 1;
+        this.alreadyExistingDelegators += 1;
     }
 
     public Set<Address> accessedDelegatorAddresses() {
         return accessedDelegatorAddresses;
     }
+
+    public long alreadyExistingDelegators() {
+        return alreadyExistingDelegators;
+    }
 }

hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/gas/HederaGasCalculator.java

@@ -21,4 +21,23 @@ public interface HederaGasCalculator extends GasCalculator {
      */
     GasCharges transactionGasRequirements(
             @NonNull final Bytes payload, final boolean isContractCreate, final long baselineCost);
+
+    /**
+     * Calculate gas requirements of the transaction.
+     * This method mirrors {{@link GasCalculator#transactionIntrinsicGasCost(Transaction, long)},
+     * but does not require a full Transaction object and uses
+     * {@link GasCalculator#transactionFloorCost(Bytes, long)} for `minimumGasUsed` calculation.
+     * This overloaded also takes into account the size of the authorization list for type 4 transactions.
+     *
+     * @param payload          the payload of the transaction
+     * @param isContractCreate is this call a 'contract creation'
+     * @param baselineCost     the gas used by access lists and code delegation authorizations
+     * @param authorizationListSize the number of entries in the authorization list for type 4 transactions
+     * @return The gas requirements of the transaction
+     */
+    GasCharges transactionGasRequirements(
+            @NonNull final Bytes payload,
+            final boolean isContractCreate,
+            final long baselineCost,
+            final long authorizationListSize);
 }

hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/gas/HederaGasCalculatorImpl.java

@@ -29,6 +29,7 @@ public class HederaGasCalculatorImpl extends PragueGasCalculator implements Hede
     private static final int LOG_CONTRACT_ID_SIZE = 24;
     private static final int LOG_TOPIC_SIZE = 32;
     private static final int LOG_BLOOM_SIZE = 256;
+    public static final long INTRINSIC_DELEGATION_GAS_COST = 25_000L;
 
     /**
      * Default constructor for injection.
@@ -41,8 +42,18 @@ public HederaGasCalculatorImpl() {
     @Override
     public GasCharges transactionGasRequirements(
             @NonNull final Bytes payload, final boolean isContractCreate, final long baselineCost) {
+        return transactionGasRequirements(payload, isContractCreate, baselineCost, 0L);
+    }
+
+    @Override
+    public GasCharges transactionGasRequirements(
+            @NonNull final Bytes payload,
+            final boolean isContractCreate,
+            final long baselineCost,
+            final long authorizationListSize) {
         int zeros = payloadZeroBytes(payload);
-        final long intrinsicGas = transactionIntrinsicGas(payload, zeros, isContractCreate, baselineCost);
+        final long intrinsicGas =
+                transactionIntrinsicGas(payload, zeros, isContractCreate, baselineCost, authorizationListSize);
         // gasUsed described at https://eips.ethereum.org/EIPS/eip-7623
         final long floorGas = transactionFloorCost(payload, zeros);
         return new GasCharges(intrinsicGas, Math.max(intrinsicGas, floorGas), 0L);
@@ -60,9 +71,16 @@ protected int payloadZeroBytes(@NonNull final Bytes payload) {
 
     // TODO We won't use the baseline cost for now, should revisit with the Pectra support epic
     protected long transactionIntrinsicGas(
-            @NonNull final Bytes payload, final int zeros, final boolean isContractCreate, final long baselineCost) {
+            @NonNull final Bytes payload,
+            final int zeros,
+            final boolean isContractCreate,
+            final long baselineCost,
+            final long authorizationListSize) {
         final int nonZeros = payload.size() - zeros;
-        long cost = TX_BASE_COST + TX_DATA_ZERO_COST * zeros + ISTANBUL_TX_DATA_NON_ZERO_COST * nonZeros;
+        long cost = TX_BASE_COST
+                + TX_DATA_ZERO_COST * zeros
+                + ISTANBUL_TX_DATA_NON_ZERO_COST * nonZeros
+                + INTRINSIC_DELEGATION_GAS_COST * authorizationListSize;
         return isContractCreate ? (cost + contractCreationCost(payload.size())) : cost;
     }
 

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

@@ -115,8 +115,10 @@ public void pureChecks(@NonNull final PureChecksContext context) throws PreCheck
             final byte[] callData = ethTxData.hasCallData() ? ethTxData.callData() : new byte[0];
             final var isContractCreate = !ethTxData.hasToAddress();
             // TODO: Revisit baselineGas with Pectra support epic
+            final var authorizationListSize =
+                    ethTxData.authorizationList() == null ? 0L : ethTxData.authorizationList().length;
             final var gasRequirements = gasCalculator.transactionGasRequirements(
-                    org.apache.tuweni.bytes.Bytes.wrap(callData), isContractCreate, 0L);
+                    org.apache.tuweni.bytes.Bytes.wrap(callData), isContractCreate, 0L, authorizationListSize);
             validateTruePreCheck(ethTxData.gasLimit() >= gasRequirements.minimumGasUsed(), INSUFFICIENT_GAS);
         } catch (@NonNull final Exception e) {
             bumpExceptionMetrics(ETHEREUM_TRANSACTION, e);