feat(suite): standard priority fees in trading

trezor · Feb 26, 2025 · 56841db · 56841db
1 parent bea7345
commit 56841db
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/packages/suite/src/hooks/wallet/useTradingRecomposeAndSign.ts b/packages/suite/src/hooks/wallet/useTradingRecomposeAndSign.ts
@@ -70,6 +70,8 @@ export const useTradingRecomposeAndSign = () => {
                 setMaxOutputId: !composed.token?.contract ? setMaxOutputId : undefined,
                 selectedFee,
                 feePerUnit: composed.feePerByte,
+                maxFeePerGas: composed.maxFeePerGas,
+                maxPriorityFeePerGas: composed.maxPriorityFeePerGas,
                 feeLimit: composed.feeLimit || '',
                 estimatedFeeLimit: composed.estimatedFeeLimit,
                 options,
@@ -124,6 +126,7 @@ export const useTradingRecomposeAndSign = () => {
 
                     return;
                 }
+                //TODO priority
                 formState.feeLimit = normalLevels.normal.feeLimit;
             }
 

diff --git a/packages/suite/src/reducers/wallet/tradingReducer.ts b/packages/suite/src/reducers/wallet/tradingReducer.ts
@@ -36,7 +36,13 @@ import { Action } from 'src/types/suite';
 export interface ComposedTransactionInfo {
     composed?: Pick<
         PrecomposedTransactionFinal,
-        'feePerByte' | 'estimatedFeeLimit' | 'feeLimit' | 'token' | 'fee'
+        | 'feePerByte'
+        | 'estimatedFeeLimit'
+        | 'feeLimit'
+        | 'token'
+        | 'fee'
+        | 'maxFeePerGas'
+        | 'maxPriorityFeePerGas'
     >;
     selectedFee?: FeeLevel['label'];
 }

diff --git a/suite-common/wallet-utils/src/sendFormUtils.ts b/suite-common/wallet-utils/src/sendFormUtils.ts
@@ -205,7 +205,20 @@ const getFeeLevels = ({ feeInfo, networkType }: GetFeeInfoProps) => {
         blocks: -1,
     });
 
-    if (networkType === 'ethereum') {
+    const isEthereum = networkType === 'ethereum';
+    const isEip1559 = feeInfo.levels.some(level => level.maxPriorityFeePerGas);
+
+    if (isEthereum) {
+        if (isEip1559) {
+            return levels.map(level => ({
+                ...level,
+                feePerUnit: level.feePerUnit,
+                maxFeePerGas: level.maxFeePerGas,
+                maxPriorityFeePerGas: level.maxPriorityFeePerGas,
+                feeLimit: level.feeLimit,
+            }));
+        }
+
         // convert wei to gwei
         return levels.map(level => {
             const gwei = new BigNumber(fromWei(level.feePerUnit || '0', 'gwei'));