Merge branch 'main' into pr/133

astraly-labs · Feb 27, 2025 · c0d74f6 · c0d74f6
2 parents 8e79a55 + d674cf1
commit c0d74f6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 16 deletions.
diff --git a/cairo/crates/contracts/src/client/router_component.cairo b/cairo/crates/contracts/src/client/router_component.cairo
@@ -251,28 +251,27 @@ pub mod RouterComponent {
         ) -> u256 {
             let router = self._must_have_remote_router(destination_domain);
             let mut mailbox_comp = get_dep_component!(self, MailBoxClient);
-
-            let mut fee_token_dispatcher = IERC20Dispatcher { contract_address: ETH_ADDRESS() };
-            if !fee_token_dispatcher
-                .transfer_from(
-                    starknet::get_caller_address(), starknet::get_contract_address(), value
-                ) {
-                Err::fee_transfer_failed();
-            }
-
             let mailbox_dispatcher = mailbox_comp.mailbox.read();
-            fee_token_dispatcher.approve(mailbox_dispatcher.contract_address, value);
+            if value > 0 {
+                let mut fee_token_dispatcher = IERC20Dispatcher { contract_address: ETH_ADDRESS() };
+                if !fee_token_dispatcher
+                    .transfer_from(
+                        starknet::get_caller_address(), starknet::get_contract_address(), value
+                    ) {
+                    Err::fee_transfer_failed();
+                }
+                fee_token_dispatcher.approve(mailbox_dispatcher.contract_address, value);
+            }
 
-            let value = mailbox_dispatcher
+            mailbox_dispatcher
                 .dispatch(
                     destination_domain,
                     router,
                     message_body,
                     value,
                     Option::Some(hook_metadata),
                     Option::Some(hook),
-                );
-            value
+                )
         }
 
         fn _Router_quote_dispatch(

diff --git a/cairo/crates/contracts/src/mailbox.cairo b/cairo/crates/contracts/src/mailbox.cairo
@@ -325,12 +325,12 @@ pub mod mailbox {
             );
 
             if (required_fee > 0) {
-                token_dispatcher.transferFrom(caller_address, required_hook_address, required_fee);
+                token_dispatcher.transfer_from(caller_address, required_hook_address, required_fee);
             }
             required_hook.post_dispatch(hook_metadata.clone(), message.clone(), required_fee);
 
             if (default_fee > 0) {
-                token_dispatcher.transferFrom(caller_address, hook, default_fee);
+                token_dispatcher.transfer_from(caller_address, hook, default_fee);
             }
             hook_dispatcher.post_dispatch(hook_metadata, message, default_fee);
 

diff --git a/cairo/crates/token/src/extensions/hyp_erc20_vault.cairo b/cairo/crates/token/src/extensions/hyp_erc20_vault.cairo
@@ -404,7 +404,7 @@ mod HypErc20Vault {
             recipient: ContractAddress,
             amount: u256
         ) -> bool {
-            self.erc20.transferFrom(sender, recipient, amount)
+            self.erc20.transfer_from(sender, recipient, amount)
         }
     }
 }