feat: contract and account related hooks (#1155)

Signed-off-by: Ivaylo Nikolov <[email protected]>

Author: ivaylonikolov7

protobufs/build.rs

@@ -14,6 +14,37 @@ use regex::RegexBuilder;
 const DERIVE_EQ_HASH: &str = "#[derive(Eq, Hash)]";
 const SERVICES_FOLDER: &str = "./services/hapi/hedera-protobuf-java-api/src/main/proto/services";
 
+// Recursively find all .proto files, excluding state/ and auxiliary/ subdirectories
+fn find_proto_files(dir: &Path) -> anyhow::Result<Vec<std::path::PathBuf>> {
+    let mut files = Vec::new();
+    for entry in read_dir(dir)? {
+        let entry = entry?;
+        let path = entry.path();
+
+        // Skip state/ directory (internal node state, not for SDK)
+        // Include auxiliary/tss/ but skip other auxiliary/ subdirectories
+        if path.is_dir() {
+            let dir_name = path.file_name().and_then(|n| n.to_str()).unwrap_or("");
+
+            if dir_name == "state" {
+                continue; // Skip state directory entirely
+            } else if dir_name == "auxiliary" {
+                // Only include auxiliary/tss files
+                let tss_path = path.join("tss");
+                if tss_path.is_dir() {
+                    files.extend(find_proto_files(&tss_path)?);
+                }
+                continue;
+            }
+
+            files.extend(find_proto_files(&path)?);
+        } else if path.extension().and_then(|s| s.to_str()) == Some("proto") {
+            files.push(path);
+        }
+    }
+    Ok(files)
+}
+
 fn main() -> anyhow::Result<()> {
     // services is the "base" module for the hedera protobufs
     // in the beginning, there was only services and it was named "protos"
@@ -46,14 +77,7 @@ fn main() -> anyhow::Result<()> {
     )?;
     fs::rename(out_path.join("services"), &services_tmp_path)?;
 
-    let services: Vec<_> = read_dir(&services_tmp_path)?
-        .chain(read_dir(&services_tmp_path.join("auxiliary").join("tss"))?)
-        .filter_map(|entry| {
-            let entry = entry.ok()?;
-
-            entry.file_type().ok()?.is_file().then(|| entry.path())
-        })
-        .collect();
+    let services = find_proto_files(&services_tmp_path)?;
 
     // iterate through each file
     let re_package = RegexBuilder::new(r"^package (.*);$").multi_line(true).build()?;
@@ -67,6 +91,7 @@ fn main() -> anyhow::Result<()> {
         let contents = contents.replace("com.hedera.hapi.services.auxiliary.history.", "");
         let contents = contents.replace("com.hedera.hapi.services.auxiliary.tss.", "");
         let contents = contents.replace("com.hedera.hapi.platform.event.", "");
+        let contents = contents.replace("com.hedera.hapi.node.hooks.", "");
 
         let contents = remove_unused_types(&contents);
 
@@ -93,7 +118,6 @@ fn main() -> anyhow::Result<()> {
         .type_attribute("proto.ContractID.contract", DERIVE_EQ_HASH)
         .type_attribute("proto.TransactionID", DERIVE_EQ_HASH)
         .type_attribute("proto.Timestamp", DERIVE_EQ_HASH)
-        .type_attribute("proto.NftTransfer", DERIVE_EQ_HASH)
         .type_attribute("proto.Fraction", DERIVE_EQ_HASH)
         .type_attribute("proto.TopicID", DERIVE_EQ_HASH)
         .type_attribute("proto.TokenID", DERIVE_EQ_HASH)
@@ -112,7 +136,14 @@ fn main() -> anyhow::Result<()> {
         .type_attribute("proto.TokenAllowance", DERIVE_EQ_HASH)
         .type_attribute("proto.GrantedCryptoAllowance", DERIVE_EQ_HASH)
         .type_attribute("proto.GrantedTokenAllowance", DERIVE_EQ_HASH)
-        .type_attribute("proto.Duration", DERIVE_EQ_HASH);
+        .type_attribute("proto.Duration", DERIVE_EQ_HASH)
+        .type_attribute("proto.HookCall", DERIVE_EQ_HASH)
+        .type_attribute("proto.HookCall.call_spec", DERIVE_EQ_HASH)
+        .type_attribute("proto.HookCall.id", DERIVE_EQ_HASH)
+        .type_attribute("proto.HookId", DERIVE_EQ_HASH)
+        .type_attribute("proto.HookEntityId", DERIVE_EQ_HASH)
+        .type_attribute("proto.HookEntityId.entity_id", DERIVE_EQ_HASH)
+        .type_attribute("proto.EvmHookCall", DERIVE_EQ_HASH);
 
     // the ResponseCodeEnum should be marked as #[non_exhaustive] so
     // adding variants does not trigger a breaking change

protobufs/services

@@ -5,6 +5,10 @@ use hedera_proto::services::crypto_service_client::CryptoServiceClient;
 use time::Duration;
 use tonic::transport::Channel;
 
+use crate::hooks::{
+    HookCreationDetails,
+    LambdaEvmHook,
+};
 use crate::ledger_id::RefLedgerId;
 use crate::protobuf::{
     FromProtobuf,
@@ -76,6 +80,9 @@ pub struct AccountCreateTransactionData {
 
     /// If true, the account declines receiving a staking reward. The default value is false.
     decline_staking_reward: bool,
+
+    /// Hooks to add immediately after creating this account.
+    hooks: Vec<HookCreationDetails>,
 }
 
 impl Default for AccountCreateTransactionData {
@@ -91,6 +98,7 @@ impl Default for AccountCreateTransactionData {
             alias: None,
             staked_id: None,
             decline_staking_reward: false,
+            hooks: Vec::new(),
         }
     }
 }
@@ -293,6 +301,29 @@ impl AccountCreateTransaction {
         self.data_mut().decline_staking_reward = decline;
         self
     }
+
+    pub fn add_hook(&mut self, hook: HookCreationDetails) -> &mut Self {
+        self.data_mut().hooks.push(hook);
+        self
+    }
+
+    pub fn add_lambda_evm_hook(&mut self, hook: LambdaEvmHook) -> &mut Self {
+        // Helper to add a Lambda EVM hook with default extension point and hook ID
+        use crate::hooks::HookExtensionPoint;
+        let details =
+            HookCreationDetails::new(HookExtensionPoint::AccountAllowanceHook, 1, Some(hook));
+        self.data_mut().hooks.push(details);
+        self
+    }
+
+    pub fn set_hooks(&mut self, hooks: Vec<HookCreationDetails>) -> &mut Self {
+        self.data_mut().hooks = hooks;
+        self
+    }
+
+    pub fn get_hooks(&self) -> &[HookCreationDetails] {
+        &self.data().hooks
+    }
 }
 
 impl TransactionData for AccountCreateTransactionData {}
@@ -353,6 +384,11 @@ impl FromProtobuf<services::CryptoCreateTransactionBody> for AccountCreateTransa
             alias,
             staked_id: Option::from_protobuf(pb.staked_id)?,
             decline_staking_reward: pb.decline_reward,
+            hooks: pb
+                .hook_creation_details
+                .into_iter()
+                .map(HookCreationDetails::from_protobuf)
+                .collect::<Result<Vec<_>, _>>()?,
         })
     }
 }
@@ -391,6 +427,7 @@ impl ToProtobuf for AccountCreateTransactionData {
             alias: self.alias.map_or(vec![], |it| it.to_bytes().to_vec()),
             decline_reward: self.decline_staking_reward,
             staked_id,
+            hook_creation_details: self.hooks.iter().map(|h| h.to_protobuf()).collect(),
         }
     }
 }
@@ -417,8 +454,13 @@ mod tests {
         AccountCreateTransaction,
         AccountId,
         AnyTransaction,
+        ContractId,
         EvmAddress,
+        EvmHookSpec,
         Hbar,
+        HookCreationDetails,
+        HookExtensionPoint,
+        LambdaEvmHook,
         PublicKey,
     };
 
@@ -560,6 +602,7 @@ mod tests {
                         20,
                         23,
                     ],
+                    hook_creation_details: [],
                     staked_id: Some(
                         StakedAccountId(
                             AccountId {
@@ -683,6 +726,7 @@ mod tests {
                         20,
                         23,
                     ],
+                    hook_creation_details: [],
                     staked_id: Some(
                         StakedNodeId(
                             4,
@@ -710,6 +754,13 @@ mod tests {
     #[test]
     fn from_proto_body() {
         #[allow(deprecated)]
+        let contract_id = ContractId::new(0, 0, 1);
+        let hooks = vec![HookCreationDetails::new(
+            HookExtensionPoint::AccountAllowanceHook,
+            0,
+            Some(LambdaEvmHook::new(EvmHookSpec::new(Some(contract_id)), vec![])),
+        )];
+
         let tx = services::CryptoCreateTransactionBody {
             key: Some(key().to_protobuf()),
             initial_balance: INITIAL_BALANCE.to_tinybars() as u64,
@@ -728,6 +779,7 @@ mod tests {
             staked_id: Some(services::crypto_create_transaction_body::StakedId::StakedAccountId(
                 STAKED_ACCOUNT_ID.to_protobuf(),
             )),
+            hook_creation_details: hooks.iter().map(|h| h.to_protobuf()).collect(),
         };
 
         let tx = AccountCreateTransactionData::from_protobuf(tx).unwrap();

src/account/account_create_transaction.rs

@@ -8,6 +8,7 @@ use time::{
 };
 use tonic::transport::Channel;
 
+use crate::hooks::HookCreationDetails;
 use crate::ledger_id::RefLedgerId;
 use crate::protobuf::{
     FromProtobuf,
@@ -89,6 +90,10 @@ pub struct AccountUpdateTransactionData {
 
     /// If true, the account declines receiving a staking reward. The default value is false.
     decline_staking_reward: Option<bool>,
+
+    /// Hooks to add immediately after updating this account.
+    hooks: Vec<HookCreationDetails>,
+    hook_ids_to_delete: Vec<i64>,
 }
 
 impl AccountUpdateTransaction {
@@ -271,6 +276,42 @@ impl AccountUpdateTransaction {
         self.data_mut().decline_staking_reward = Some(decline);
         self
     }
+
+    /// Returns the hooks to be created.
+    #[must_use]
+    pub fn get_hooks_to_create(&self) -> &[HookCreationDetails] {
+        &self.data().hooks
+    }
+
+    /// Adds a hook to be created.
+    pub fn add_hook(&mut self, hook: HookCreationDetails) -> &mut Self {
+        self.data_mut().hooks.push(hook);
+        self
+    }
+
+    /// Sets the hooks to be created.
+    pub fn set_hooks(&mut self, hooks: Vec<HookCreationDetails>) -> &mut Self {
+        self.data_mut().hooks = hooks;
+        self
+    }
+
+    /// Returns the hook IDs to be deleted.
+    #[must_use]
+    pub fn get_hooks_to_delete(&self) -> &[i64] {
+        &self.data().hook_ids_to_delete
+    }
+
+    /// Adds a hook ID to be deleted.
+    pub fn delete_hook(&mut self, hook_id: i64) -> &mut Self {
+        self.data_mut().hook_ids_to_delete.push(hook_id);
+        self
+    }
+
+    /// Sets the hook IDs to be deleted.
+    pub fn delete_hooks(&mut self, hook_ids: Vec<i64>) -> &mut Self {
+        self.data_mut().hook_ids_to_delete = hook_ids;
+        self
+    }
 }
 
 impl TransactionData for AccountUpdateTransactionData {}
@@ -339,6 +380,12 @@ impl FromProtobuf<services::CryptoUpdateTransactionBody> for AccountUpdateTransa
             max_automatic_token_associations: pb.max_automatic_token_associations,
             staked_id: Option::from_protobuf(pb.staked_id)?,
             decline_staking_reward: pb.decline_reward,
+            hooks: pb
+                .hook_creation_details
+                .into_iter()
+                .map(HookCreationDetails::from_protobuf)
+                .collect::<Result<Vec<_>, _>>()?,
+            hook_ids_to_delete: pb.hook_ids_to_delete,
         })
     }
 }
@@ -382,6 +429,8 @@ impl ToProtobuf for AccountUpdateTransactionData {
             receive_record_threshold_field: None,
             receiver_sig_required_field: receiver_signature_required,
             staked_id,
+            hook_creation_details: self.hooks.iter().map(|hook| hook.to_protobuf()).collect(),
+            hook_ids_to_delete: self.hook_ids_to_delete.clone(),
         }
     }
 }
@@ -410,6 +459,11 @@ mod tests {
         AccountId,
         AccountUpdateTransaction,
         AnyTransaction,
+        ContractId,
+        EvmHookSpec,
+        HookCreationDetails,
+        HookExtensionPoint,
+        LambdaEvmHook,
         PublicKey,
     };
 
@@ -563,6 +617,8 @@ mod tests {
                         100,
                     ),
                     decline_reward: None,
+                    hook_ids_to_delete: [],
+                    hook_creation_details: [],
                     send_record_threshold_field: None,
                     receive_record_threshold_field: None,
                     receiver_sig_required_field: Some(
@@ -696,6 +752,8 @@ mod tests {
                         100,
                     ),
                     decline_reward: None,
+                    hook_ids_to_delete: [],
+                    hook_creation_details: [],
                     send_record_threshold_field: None,
                     receive_record_threshold_field: None,
                     receiver_sig_required_field: Some(
@@ -730,6 +788,14 @@ mod tests {
     #[test]
     fn from_proto_body() {
         #[allow(deprecated)]
+        let contract_id = ContractId::new(0, 0, 1);
+        let hooks = vec![HookCreationDetails::new(
+            HookExtensionPoint::AccountAllowanceHook,
+            0,
+            Some(LambdaEvmHook::new(EvmHookSpec::new(Some(contract_id)), vec![])),
+        )];
+        let hook_ids_to_delete = vec![1, 2, 3];
+
         let tx = services::CryptoUpdateTransactionBody {
             account_id_to_update: Some(ACCOUNT_ID.to_protobuf()),
             key: Some(key().to_protobuf()),
@@ -746,6 +812,8 @@ mod tests {
             )),
             proxy_fraction: 0,
             expiration_time: Some(EXPIRATION_TIME.to_protobuf()),
+            hook_creation_details: hooks.iter().map(|h| h.to_protobuf()).collect(),
+            hook_ids_to_delete,
         };
 
         let tx = AccountUpdateTransactionData::from_protobuf(tx).unwrap();