Mailbox: Zero address handling for custom_hook alongside Option::None

astraly-labs · Feb 14, 2025 · 83a814a · 83a814a
1 parent 29fd5f1
commit 83a814a
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/cairo/crates/contracts/src/mailbox.cairo b/cairo/crates/contracts/src/mailbox.cairo
@@ -251,7 +251,13 @@ pub mod mailbox {
             _custom_hook: Option<ContractAddress>
         ) -> u256 {
             let hook = match _custom_hook {
-                Option::Some(hook) => hook,
+                Option::Some(hook) => {
+                    if hook != contract_address_const::<0>() {
+                        hook
+                    } else {
+                        self.default_hook.read()
+                    }
+                },
                 Option::None(()) => self.default_hook.read(),
             };
             let hook_metadata = match _custom_hook_metadata {