fix: incorrect v3 max gas amount calculation

When using JSON-RPC v0.7.0, the fee estimate returned contains data gas info. Naively using `gas_consumed` as max gas amount results in insufficient fees. The correct way to do it is to calculate a pseudo gas amount by dividing the overall fee by the gas price.
xJonathanLEI · May 1, 2024 · 01f9cf1 · 01f9cf1
1 parent 4fa0a73
commit 01f9cf1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/starknet-accounts/src/account/declaration.rs b/starknet-accounts/src/account/declaration.rs
@@ -402,8 +402,11 @@ where
                 let gas = match self.gas {
                     Some(gas) => gas,
                     None => {
-                        (((TryInto::<u64>::try_into(fee_estimate.gas_consumed)
-                            .map_err(|_| AccountError::FeeOutOfRange)?)
+                        (((TryInto::<u64>::try_into(
+                            (fee_estimate.overall_fee + fee_estimate.gas_price - FieldElement::ONE)
+                                .floor_div(fee_estimate.gas_price),
+                        )
+                        .map_err(|_| AccountError::FeeOutOfRange)?)
                             as f64)
                             * self.gas_estimate_multiplier) as u64
                     }

diff --git a/starknet-accounts/src/account/execution.rs b/starknet-accounts/src/account/execution.rs
@@ -382,8 +382,11 @@ where
                 let gas = match self.gas {
                     Some(gas) => gas,
                     None => {
-                        (((TryInto::<u64>::try_into(fee_estimate.gas_consumed)
-                            .map_err(|_| AccountError::FeeOutOfRange)?)
+                        (((TryInto::<u64>::try_into(
+                            (fee_estimate.overall_fee + fee_estimate.gas_price - FieldElement::ONE)
+                                .floor_div(fee_estimate.gas_price),
+                        )
+                        .map_err(|_| AccountError::FeeOutOfRange)?)
                             as f64)
                             * self.gas_estimate_multiplier) as u64
                     }

diff --git a/starknet-accounts/src/factory/mod.rs b/starknet-accounts/src/factory/mod.rs
@@ -562,8 +562,11 @@ where
                 let gas = match self.gas {
                     Some(gas) => gas,
                     None => {
-                        (((TryInto::<u64>::try_into(fee_estimate.gas_consumed)
-                            .map_err(|_| AccountFactoryError::FeeOutOfRange)?)
+                        (((TryInto::<u64>::try_into(
+                            (fee_estimate.overall_fee + fee_estimate.gas_price - FieldElement::ONE)
+                                .floor_div(fee_estimate.gas_price),
+                        )
+                        .map_err(|_| AccountFactoryError::FeeOutOfRange)?)
                             as f64)
                             * self.gas_estimate_multiplier) as u64
                     }