move compute max fee back onto the account

argentlabs · Jun 6, 2024 · 96769e4 · 96769e4
1 parent 853df7a
commit 96769e4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/src/contracts/claim_account.cairo b/src/contracts/claim_account.cairo
@@ -13,8 +13,7 @@ mod ClaimAccount {
     use starknet_gifting::contracts::claim_utils::calculate_claim_account_address;
     use starknet_gifting::contracts::interface::{IAccount, IGiftAccount, ClaimData, AccountConstructorArguments};
     use starknet_gifting::contracts::utils::{
-        full_deserialize, STRK_ADDRESS, ETH_ADDRESS, TX_V1_ESTIMATE, TX_V1, TX_V3, TX_V3_ESTIMATE, compute_max_fee_v3,
-        execute_multicall
+        full_deserialize, STRK_ADDRESS, ETH_ADDRESS, TX_V1_ESTIMATE, TX_V1, TX_V3, TX_V3_ESTIMATE, execute_multicall
     };
     #[storage]
     struct Storage {}
@@ -97,4 +96,19 @@ mod ClaimAccount {
             assert(calculated_address == get_contract_address(), 'gift-acc/invalid-claim-address');
         }
     }
+
+
+    fn compute_max_fee_v3(mut resource_bounds: Span<ResourceBounds>, tip: u128) -> u128 {
+        let mut max_fee: u128 = 0;
+        let mut max_tip: u128 = 0;
+        while let Option::Some(r) = resource_bounds
+            .pop_front() {
+                let max_resource_amount: u128 = (*r.max_amount).into();
+                max_fee += *r.max_price_per_unit * max_resource_amount;
+                if *r.resource == 'L2_GAS' {
+                    max_tip += tip * max_resource_amount;
+                }
+            };
+        max_fee + max_tip
+    }
 }
diff --git a/src/contracts/utils.cairo b/src/contracts/utils.cairo
@@ -37,21 +37,6 @@ fn serialize<E, impl ESerde: Serde<E>>(value: @E) -> Array<felt252> {
     output
 }
 
-
-fn compute_max_fee_v3(mut resource_bounds: Span<ResourceBounds>, tip: u128) -> u128 {
-    let mut max_fee: u128 = 0;
-    let mut max_tip: u128 = 0;
-    while let Option::Some(r) = resource_bounds
-        .pop_front() {
-            let max_resource_amount: u128 = (*r.max_amount).into();
-            max_fee += *r.max_price_per_unit * max_resource_amount;
-            if *r.resource == 'L2_GAS' {
-                max_tip += tip * max_resource_amount;
-            }
-        };
-    max_fee + max_tip
-}
-
 fn execute_multicall(mut calls: Span<Call>) -> Array<Span<felt252>> {
     let mut result = array![];
     let mut index = 0;