use fee type

Author: piatoss3612

packages/background/src/tx-executor/service.ts

@@ -405,6 +405,7 @@ export class BackgroundTxExecutorService {
         const { signedTx } = await this.signTx(
           execution.vaultId,
           currentTx,
+          execution.feeType,
           options?.env
         );
 
@@ -465,6 +466,7 @@ export class BackgroundTxExecutorService {
   protected async signTx(
     vaultId: string,
     tx: BackgroundTx,
+    feeType: ExecutionFeeType,
     env?: Env
   ): Promise<{
     signedTx: string;
@@ -476,15 +478,16 @@ export class BackgroundTxExecutorService {
     }
 
     if (tx.type === BackgroundTxType.EVM) {
-      return this.signEvmTx(vaultId, tx, env);
+      return this.signEvmTx(vaultId, tx, feeType, env);
     }
 
-    return this.signCosmosTx(vaultId, tx, env);
+    return this.signCosmosTx(vaultId, tx, feeType, env);
   }
 
   private async signEvmTx(
     vaultId: string,
     tx: EVMBackgroundTx,
+    feeType: ExecutionFeeType,
     env?: Env
   ): Promise<{
     signedTx: string;
@@ -528,7 +531,8 @@ export class BackgroundTxExecutorService {
         origin,
         evmInfo,
         signer,
-        tx.txData
+        tx.txData,
+        feeType
       );
 
       result = await this.keyRingEthereumService.signEthereumPreAuthorized(
@@ -561,6 +565,7 @@ export class BackgroundTxExecutorService {
   private async signCosmosTx(
     vaultId: string,
     tx: CosmosBackgroundTx,
+    feeType: ExecutionFeeType,
     env?: Env
   ): Promise<{
     signedTx: string;
@@ -711,7 +716,7 @@ export class BackgroundTxExecutorService {
       );
 
       // TODO: fee token을 사용자가 설정한 것을 사용해야 함
-      const { gasPrice } = await getCosmosGasPrice(chainInfo);
+      const { gasPrice } = await getCosmosGasPrice(chainInfo, feeType);
       const fee = calculateCosmosStdFee(
         chainInfo.currencies[0],
         gasUsed,
@@ -1088,13 +1093,5 @@ export class BackgroundTxExecutorService {
         this.recentTxExecutionMap.delete(id);
       }
     }
-
-    const entries = Array.from(this.recentTxExecutionMap.entries())
-      .filter(([, e]) => completedStatuses.includes(e.status))
-      .sort(([, a], [, b]) => a.timestamp - b.timestamp);
-
-    for (let i = 0; i < entries.length; i++) {
-      this.recentTxExecutionMap.delete(entries[i][0]);
-    }
   }
 }

packages/background/src/tx-executor/utils/evm.ts

@@ -2,14 +2,20 @@ import { EVMInfo } from "@keplr-wallet/types";
 import { simpleFetch } from "@keplr-wallet/simple-fetch";
 import { UnsignedTransaction } from "@ethersproject/transactions";
 import { Dec } from "@keplr-wallet/unit";
+import { ExecutionFeeType } from "../types";
 
-const DEFAULT_MULTIPLIER = 1.25;
+const FEE_MULTIPLIERS: Record<ExecutionFeeType, number> = {
+  low: 1.1,
+  average: 1.25,
+  high: 1.5,
+};
 
 export async function fillUnsignedEVMTx(
   origin: string,
   evmInfo: EVMInfo,
   signer: string,
-  tx: UnsignedTransaction
+  tx: UnsignedTransaction,
+  feeType: ExecutionFeeType = "average"
 ): Promise<UnsignedTransaction> {
   const getTransactionCountRequest = {
     jsonrpc: "2.0",
@@ -162,7 +168,7 @@ export async function fillUnsignedEVMTx(
     throw new Error("Failed to get baseFeePerGas to fill unsigned transaction");
   }
 
-  const multiplier = new Dec(DEFAULT_MULTIPLIER);
+  const multiplier = new Dec(FEE_MULTIPLIERS[feeType]);
 
   // Calculate maxFeePerGas = baseFeePerGas + maxPriorityFeePerGas
   const baseFeePerGasDec = new Dec(BigInt(latestBlock.baseFeePerGas));