chore: update Lambda names (#2603)

Signed-off-by: emiliyank <e.kadiyski@gmail.com>

Author: emiliyank

.github/workflows/build.yml

@@ -180,7 +180,7 @@ jobs:
         with:
           installMirrorNode: true
           mirrorNodeVersion: v0.145.2
-          hieroVersion: v0.69.0
+          hieroVersion: v0.70.0-rc.2
 
       - name: Build SDK
         run: ./gradlew assemble
@@ -310,7 +310,7 @@ jobs:
         with:
           installMirrorNode: true
           mirrorNodeVersion: v0.145.2
-          hieroVersion: v0.69.0
+          hieroVersion: v0.70.0-rc.2
 
       - name: Build SDK
         run: ./gradlew assemble

sdk/src/main/java/com/hedera/hashgraph/sdk/HookStoreTransaction.java

@@ -129,7 +129,7 @@ void validateChecksums(Client client) throws BadEntityIdException {
 
     @Override
     MethodDescriptor<com.hedera.hashgraph.sdk.proto.Transaction, TransactionResponse> getMethodDescriptor() {
-        return SmartContractServiceGrpc.getLambdaSStoreMethod();
+        return SmartContractServiceGrpc.getHookStoreMethod();
     }
 
     @Override

sdk/src/main/java/com/hedera/hashgraph/sdk/RequestType.java

@@ -508,9 +508,17 @@ public enum RequestType {
 
     /**
      * Update one or more storage slots in an lambda EVM hook.
+     *
+     * @deprecated Use {@link #HOOK_STORE} instead.
      */
+    @Deprecated
     LAMBDA_S_STORE(HederaFunctionality.LambdaSStore),
 
+    /**
+     * Update one or more storage slots in an EVM hook.
+     */
+    HOOK_STORE(HederaFunctionality.HookStore),
+
     /**
      * (Internal-only) Dispatch a hook action.
      */
@@ -616,6 +624,7 @@ static RequestType valueOf(HederaFunctionality code) {
             case CrsPublication -> CRS_PUBLICATION;
             case AtomicBatch -> ATOMIC_BATCH;
             case LambdaSStore -> LAMBDA_S_STORE;
+            case HookStore -> HOOK_STORE;
             case HookDispatch -> HOOK_DISPATCH;
             default -> throw new IllegalStateException("(BUG) unhandled HederaFunctionality");
         };
@@ -716,6 +725,7 @@ public String toString() {
             case CRS_PUBLICATION -> "CRS_PUBLICATION";
             case ATOMIC_BATCH -> "ATOMIC_BATCH";
             case LAMBDA_S_STORE -> "LAMBDA_S_STORE";
+            case HOOK_STORE -> "HOOK_STORE";
             case HOOK_DISPATCH -> "HOOK_DISPATCH";
         };
     }

sdk/src/main/java/com/hedera/hashgraph/sdk/Status.java

@@ -1948,26 +1948,26 @@ public enum Status {
     HOOK_NOT_FOUND(ResponseCodeEnum.HOOK_NOT_FOUND),
 
     /**
-     * A lambda mapping slot, storage key, or storage value exceeded 32 bytes.
+     * An EVM hook mapping slot, storage key, or storage value exceeded 32 bytes.
      */
-    LAMBDA_STORAGE_UPDATE_BYTES_TOO_LONG(ResponseCodeEnum.LAMBDA_STORAGE_UPDATE_BYTES_TOO_LONG),
+    EVM_HOOK_STORAGE_UPDATE_BYTES_TOO_LONG(ResponseCodeEnum.EVM_HOOK_STORAGE_UPDATE_BYTES_TOO_LONG),
 
     /**
-     * A lambda mapping slot, storage key, or storage value failed to use the
+     * An EVM hook's mapping slot, storage key, or storage value failed to use the
      * minimal representation (i.e., no leading zeros).
      */
-    LAMBDA_STORAGE_UPDATE_BYTES_MUST_USE_MINIMAL_REPRESENTATION(
-            ResponseCodeEnum.LAMBDA_STORAGE_UPDATE_BYTES_MUST_USE_MINIMAL_REPRESENTATION),
+    EVM_HOOK_STORAGE_UPDATE_BYTES_MUST_USE_MINIMAL_REPRESENTATION(
+            ResponseCodeEnum.EVM_HOOK_STORAGE_UPDATE_BYTES_MUST_USE_MINIMAL_REPRESENTATION),
 
     /**
      * A hook id was invalid.
      */
     INVALID_HOOK_ID(ResponseCodeEnum.INVALID_HOOK_ID),
 
     /**
-     * A lambda storage update had no contents.
+     * An EVM hook storage update had no contents.
      */
-    EMPTY_LAMBDA_STORAGE_UPDATE(ResponseCodeEnum.EMPTY_LAMBDA_STORAGE_UPDATE),
+    EMPTY_EVM_HOOK_STORAGE_UPDATE(ResponseCodeEnum.EMPTY_EVM_HOOK_STORAGE_UPDATE),
 
     /**
      * A user repeated the same hook id in a creation details list.
@@ -1980,29 +1980,29 @@ public enum Status {
     HOOKS_NOT_ENABLED(ResponseCodeEnum.HOOKS_NOT_ENABLED),
 
     /**
-     * The target hook is not a lambda.
+     * The target hook is not an EVM hook.
      */
-    HOOK_IS_NOT_A_LAMBDA(ResponseCodeEnum.HOOK_IS_NOT_A_LAMBDA),
+    HOOK_IS_NOT_AN_EVM_HOOK(ResponseCodeEnum.HOOK_IS_NOT_AN_EVM_HOOK),
 
     /**
      * A hook was deleted.
      */
     HOOK_DELETED(ResponseCodeEnum.HOOK_DELETED),
 
     /**
-     * The LambdaSStore tried to update too many storage slots in a single transaction.
+     * The HookStore tried to update too many storage slots in a single transaction.
      */
     TOO_MANY_LAMBDA_STORAGE_UPDATES(ResponseCodeEnum.TOO_MANY_LAMBDA_STORAGE_UPDATES),
 
     /**
-     * A lambda mapping slot, storage key, or storage value failed to use the
+     * An EVM hook mapping slot, storage key, or storage value failed to use the
      * minimal representation (i.e., no leading zeros).
      */
     HOOK_CREATION_BYTES_MUST_USE_MINIMAL_REPRESENTATION(
             ResponseCodeEnum.HOOK_CREATION_BYTES_MUST_USE_MINIMAL_REPRESENTATION),
 
     /**
-     * A lambda mapping slot, storage key, or storage value exceeded 32 bytes.
+     * A EVM hook mapping slot, storage key, or storage value exceeded 32 bytes.
      */
     HOOK_CREATION_BYTES_TOO_LONG(ResponseCodeEnum.HOOK_CREATION_BYTES_TOO_LONG),
 
@@ -2434,14 +2434,14 @@ static Status valueOf(ResponseCodeEnum code) {
             case BAD_HOOK_REQUEST -> BAD_HOOK_REQUEST;
             case REJECTED_BY_ACCOUNT_ALLOWANCE_HOOK -> REJECTED_BY_ACCOUNT_ALLOWANCE_HOOK;
             case HOOK_NOT_FOUND -> HOOK_NOT_FOUND;
-            case LAMBDA_STORAGE_UPDATE_BYTES_TOO_LONG -> LAMBDA_STORAGE_UPDATE_BYTES_TOO_LONG;
-            case LAMBDA_STORAGE_UPDATE_BYTES_MUST_USE_MINIMAL_REPRESENTATION ->
-                LAMBDA_STORAGE_UPDATE_BYTES_MUST_USE_MINIMAL_REPRESENTATION;
+            case EVM_HOOK_STORAGE_UPDATE_BYTES_TOO_LONG -> EVM_HOOK_STORAGE_UPDATE_BYTES_TOO_LONG;
+            case EVM_HOOK_STORAGE_UPDATE_BYTES_MUST_USE_MINIMAL_REPRESENTATION ->
+                EVM_HOOK_STORAGE_UPDATE_BYTES_MUST_USE_MINIMAL_REPRESENTATION;
             case INVALID_HOOK_ID -> INVALID_HOOK_ID;
-            case EMPTY_LAMBDA_STORAGE_UPDATE -> EMPTY_LAMBDA_STORAGE_UPDATE;
+            case EMPTY_EVM_HOOK_STORAGE_UPDATE -> EMPTY_EVM_HOOK_STORAGE_UPDATE;
             case HOOK_ID_REPEATED_IN_CREATION_DETAILS -> HOOK_ID_REPEATED_IN_CREATION_DETAILS;
             case HOOKS_NOT_ENABLED -> HOOKS_NOT_ENABLED;
-            case HOOK_IS_NOT_A_LAMBDA -> HOOK_IS_NOT_A_LAMBDA;
+            case HOOK_IS_NOT_AN_EVM_HOOK -> HOOK_IS_NOT_AN_EVM_HOOK;
             case HOOK_DELETED -> HOOK_DELETED;
             case TOO_MANY_LAMBDA_STORAGE_UPDATES -> TOO_MANY_LAMBDA_STORAGE_UPDATES;
             case HOOK_CREATION_BYTES_MUST_USE_MINIMAL_REPRESENTATION ->

sdk/src/main/proto/account.proto

@@ -478,9 +478,9 @@ message Account {
     int64 first_hook_id = 37;
 
     /**
-     * The number of storage slots in use by this account's lambdas.
+     * The number of storage slots in use by this account's EVM hooks.
      */
-    uint64 number_lambda_storage_slots = 38;
+    uint64 number_evm_hook_storage_slots = 38;
 }
 
 /**

sdk/src/main/proto/basic_types.proto

@@ -1836,13 +1836,19 @@ enum HederaFunctionality {
 
     /**
      * Update one or more storage slots in an lambda EVM hook.
+     * (DEPRECATED) Remove once no production throttle assets reference it.
      */
     LambdaSStore = 109;
 
     /**
      * (Internal-only) Dispatch a hook action.
      */
     HookDispatch = 110;
+
+    /**
+     * Update one or more storage slots in an EVM hook.
+     */
+    HookStore = 111;
 }
 
 /**

sdk/src/main/proto/entity_counts.proto

@@ -76,7 +76,7 @@ message EntityCounts {
    */
   uint64 num_hooks = 14;
   /**
-   * The number of lambda hook storage slots in the network.
+   * The number of EVM hook storage slots in the network.
    */
-  uint64 num_lambda_storage_slots = 15;
+  uint64 num_evm_hook_storage_slots = 15;
 }

sdk/src/main/proto/evm_hook_state.proto

@@ -31,9 +31,9 @@ message EvmHookState {
   proto.HookId hook_id = 1;
 
   /**
-   * The type of the EVM hook.
+   * The type of the hook.
    */
-  EvmHookType type = 2;
+  HookType type = 2;
 
   /**
    * The type of the extension point the hook implements.
@@ -47,15 +47,15 @@ message EvmHookState {
 
   /**
    * If set, a key that that can be used to remove or replace the hook; or (if
-   * applicable, as with a lambda EVM hook) perform transactions that customize
+   * applicable, as with an EVM hook) perform transactions that customize
    * the hook.
    */
   proto.Key admin_key = 5;
 
   /**
-   * For a lambda, its first storage key. Must be the minimal
-   * bytes representation (no leading zeros). A lambda with
-   * no storage slots and a lambda whose last-written storage
+   * For an EVM hook, its first storage key. Must be the minimal
+   * bytes representation (no leading zeros). An EVM hook with
+   * no storage slots and an EVM hook whose last-written storage
    * slot was at the zero key can be differentiated by checking
    * the `num_storage_slots` field.
    */
@@ -74,30 +74,29 @@ message EvmHookState {
   google.protobuf.Int64Value next_hook_id = 8;
 
   /**
-   * The number of storage slots a lambda is using.
+   * The number of storage slots an EVM hook is using.
    */
   uint32 num_storage_slots = 9;
 }
 
 /**
- * The type of an EVM hook.
+ * The type of a hook.
  */
-enum EvmHookType {
+enum HookType {
   /**
-   * A lambda EVM hook.
+   * A general-purpose EVM hook.
    */
-  LAMBDA = 0;
+  EVM_HOOK = 0;
 }
 
 /**
- * The key of a lambda's storage slot.
- *
- * For each lambda, its EVM storage is a mapping of 256-bit keys (or "words")
+ * The key of an EVM hook's storage slot.
+ * For each EVM hook, its storage is a mapping of 256-bit keys (or "words")
  * to 256-bit values.
  */
-message LambdaSlotKey {
+message EvmHookSlotKey {
   /**
-   * The id of the lambda EVM hook that owns this slot.
+   * The id of the EVM hook that owns this slot.
    */
   proto.HookId hook_id = 1;
 

sdk/src/main/proto/lambda_sstore.proto sdk/src/main/proto/hook_store.protosdk/src/main/proto/lambda_sstore.proto renamed to sdk/src/main/proto/hook_store.proto

@@ -11,7 +11,8 @@ import "basic_types.proto";
 import "hook_types.proto";
 
 /**
- * Adds or removes key/value pairs in the storage of an EVM hook. The EVM hook's owning key must sign the transaction.
+ * Adds or removes key/value pairs in the storage of an EVM hook.
+ * Either the hook owner's key, or its admin key, must sign the transaction.
  */
 message HookStoreTransactionBody {
   /**

sdk/src/main/proto/hook_types.proto

@@ -59,10 +59,10 @@ message HookCreationDetails {
    * The hook implementation.
    */
   oneof hook {
-    /**
-     * A hook programmed in EVM bytecode that may access state or interact with
-     * external contracts.
-     */
+  /**
+   * A general-purpose hook programmed in EVM bytecode that may access state
+   * or interact with external contracts.
+   */
     EvmHook evm_hook = 3;
   }
 
@@ -75,7 +75,7 @@ message HookCreationDetails {
 }
 
 /**
- * Definition of an EVM hook.
+ * Definition of a general-purpose EVM hook.
  */
 message EvmHook {
   /**
@@ -84,7 +84,7 @@ message EvmHook {
   EvmHookSpec spec = 1;
 
   /**
-   * Initial storage updates for the EVM hook, if any.
+   * Initial storage updates for the hook, if any.
    */
   repeated EvmHookStorageUpdate storage_updates = 2;
 }
@@ -108,6 +108,8 @@ message EvmHookSpec {
  * Specifies a key/value pair in the storage of an EVM hook, either by the explicit storage
  * slot contents; or by a combination of a Solidity mapping's slot key and the key into
  * that mapping.
+ * <p>
+ * Either the hook owner's key, or its admin key, must sign the transaction.
  */
 message EvmHookStorageUpdate {
   oneof update {
@@ -150,7 +152,7 @@ message EvmHookMappingEntries {
 /**
  * An entry in a Solidity mapping. Very helpful for protocols that apply
  * `HookStore` to manage the entries of a hook contract's mapping instead
- * its raw storage slots.
+ * of its raw storage slots.
  * <p>
  * This is especially attractive when the mapping value itself fits in a single
  * word; for more complicated value storage layouts it becomes necessary to