[🧠 Smart Account] EIP-5792 atomic batch TX assembly + store-based fee estimation

apps/extension/src/pages/wallet/smart-account/confirm/confirm.tsx

@@ -69,7 +69,7 @@ export const SmartAccountConfirmPage: FunctionComponent = observer(() => {
     insufficientBalance,
     balanceLoaded,
     retry,
-  } = useSmartAccountFee(chainId, vaultId, hexAddress, isValid);
+  } = useSmartAccountFee(chainId, hexAddress, isValid);
 
   const [isLoading, setIsLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);

apps/extension/src/pages/wallet/smart-account/confirm/hooks/use-smart-account-fee.ts

@@ -1,23 +1,25 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
-import { EstimateSmartAccountFeeMsg } from "@keplr-wallet/background";
-import { InExtensionMessageRequester } from "@keplr-wallet/router-extension";
-import { BACKGROUND_PORT } from "@keplr-wallet/router";
-import { CoinPretty, Int } from "@keplr-wallet/unit";
+import {
+  ALLOWED_DELEGATORS,
+  buildDummyAuthorizationList,
+} from "@keplr-wallet/background";
+import { computeEIP1559TxFees } from "@keplr-wallet/hooks-evm";
+import { CoinPretty, Dec, Int } from "@keplr-wallet/unit";
 import { useStore } from "../../../../../stores";
 import { formatFee } from "../../utils";
 
 type FeeState =
   | { status: "loading" }
-  | { status: "success"; estimatedFeeWei: string }
+  | { status: "success"; gasUsed: number }
   | { status: "error" };
 
 export function useSmartAccountFee(
   chainId: string,
-  vaultId: string,
   hexAddress: string,
   isValid: boolean
 ) {
-  const { chainStore, queriesStore, priceStore } = useStore();
+  const { chainStore, queriesStore, priceStore, ethereumAccountStore } =
+    useStore();
 
   const nativeCurrency = useMemo(() => {
     try {
@@ -30,46 +32,81 @@ export function useSmartAccountFee(
     }
   }, [chainStore, chainId]);
 
+  const evmChainId = useMemo(() => {
+    try {
+      const unwrapped = chainStore.getModularChain(chainId).unwrapped;
+      if (unwrapped.type === "evm") return unwrapped.evm.chainId;
+      if (unwrapped.type === "ethermint") return unwrapped.evm.chainId;
+      return 0;
+    } catch {
+      return 0;
+    }
+  }, [chainStore, chainId]);
+
   const nativeSymbol = nativeCurrency?.coinDenom ?? "ETH";
 
   const [feeState, setFeeState] = useState<FeeState>({ status: "loading" });
   const [retryCount, setRetryCount] = useState(0);
 
   useEffect(() => {
-    if (!isValid) return;
+    if (!isValid || !hexAddress || !evmChainId) return;
     let cancelled = false;
     setFeeState({ status: "loading" });
-    new InExtensionMessageRequester()
-      .sendMessage(
-        BACKGROUND_PORT,
-        new EstimateSmartAccountFeeMsg(chainId, vaultId)
-      )
+
+    const ethereumAccount = ethereumAccountStore.getAccount(chainId);
+
+    ethereumAccount
+      .simulateGas(hexAddress, {
+        to: hexAddress,
+        value: "0x0",
+        data: "0x",
+        authorizationList: buildDummyAuthorizationList(
+          ALLOWED_DELEGATORS[0],
+          evmChainId
+        ),
+      })
       .then((result) => {
-        if (!cancelled)
-          setFeeState({
-            status: "success",
-            estimatedFeeWei: result.estimatedFeeWei,
-          });
+        if (!cancelled) {
+          setFeeState({ status: "success", gasUsed: result.gasUsed });
+        }
       })
       .catch(() => {
         if (!cancelled) setFeeState({ status: "error" });
       });
+
     return () => {
       cancelled = true;
     };
-  }, [chainId, vaultId, isValid, retryCount]);
+  }, [
+    chainId,
+    hexAddress,
+    evmChainId,
+    isValid,
+    retryCount,
+    ethereumAccountStore,
+  ]);
+
+  // Fee from reactive queries (feeHistory percentile + baseFee margin, fillUnsignedEVMTx와 동일 로직)
+  const ethereumQueries = queriesStore.get(chainId).ethereum;
+  const txFees = ethereumQueries
+    ? computeEIP1559TxFees(ethereumQueries, "average", chainId)
+    : undefined;
+
+  const estimatedFeeWei = useMemo(() => {
+    if (feeState.status !== "success") return null;
+    const feePerGas = txFees?.maxFeePerGas ?? txFees?.gasPrice;
+    if (!feePerGas || feePerGas.isZero()) return null;
+    const gasLimit = Math.ceil(feeState.gasUsed * 1.3);
+    const fee = feePerGas.mul(new Dec(gasLimit)).truncate();
+    return "0x" + BigInt(fee.toString()).toString(16);
+  }, [feeState, txFees]);
 
-  const estimatedFeeWei =
-    feeState.status === "success" ? feeState.estimatedFeeWei : null;
   const isEstimating = feeState.status === "loading";
   const isFailed = feeState.status === "error";
 
   const feeDisplay = useMemo(
-    () =>
-      feeState.status === "success"
-        ? formatFee(feeState.estimatedFeeWei, nativeSymbol)
-        : null,
-    [feeState, nativeSymbol]
+    () => (estimatedFeeWei ? formatFee(estimatedFeeWei, nativeSymbol) : null),
+    [estimatedFeeWei, nativeSymbol]
   );
 
   const feeUsd = useMemo(() => {

packages/background/src/keyring-ethereum/handler.ts

@@ -12,7 +12,6 @@ import {
   CheckNeedEnableAccessForEVMMsg,
   UpgradeSmartAccountMsg,
   DowngradeSmartAccountMsg,
-  EstimateSmartAccountFeeMsg,
   GetEthereumAddressForVaultMsg,
 } from "./messages";
 import { KeyRingEthereumService } from "./service";
@@ -59,12 +58,6 @@ export const getHandler: (
           (msg as DowngradeSmartAccountMsg).chainId,
           (msg as DowngradeSmartAccountMsg).vaultId
         );
-      case EstimateSmartAccountFeeMsg:
-        return service.estimateSmartAccountFee(
-          env,
-          (msg as EstimateSmartAccountFeeMsg).chainId,
-          (msg as EstimateSmartAccountFeeMsg).vaultId
-        );
       case GetEthereumAddressForVaultMsg:
         return service.getEthAddressForVault(
           (msg as GetEthereumAddressForVaultMsg).chainId,

packages/background/src/keyring-ethereum/helper.ts

@@ -7,10 +7,12 @@ import {
   WalletSendCallsRequest,
 } from "@keplr-wallet/types";
 import { Address, Hex } from "ox";
+import { Execute } from "ox/erc7821";
 import { Buffer } from "buffer/";
 import { Authorization } from "ox";
 
 import {
+  ALLOWED_DELEGATORS,
   EIP5792_ERROR_UNSUPPORTED_CAPABILITY,
   RPC_ERROR_INVALID_PARAMS,
   RPC_ERROR_UNRECOGNIZED_CHAIN,
@@ -124,6 +126,66 @@ export function buildDummyAuthorizationList(
   ];
 }
 
+// ── Atomic Batch TX Assembly ──────────────────────────────
+
+/**
+ * EIP-5792 calls 배열을 StatelessDeleGator의 execute(bytes32,bytes) calldata로 변환.
+ * ox/erc7821 Execute.encodeData를 사용하여 ERC-7579 표준 준수를 보장.
+ * nonce/gas/fee는 포함하지 않음 — fillUnsignedEVMTx가 담당.
+ */
+export function createAtomicBatchTransaction(
+  calls: EIP5792Call[],
+  selectedAddress: string,
+  delegationStatus: DelegationStatus,
+  evmChainId: number
+): UnsignedEVMTransaction {
+  const data = Execute.encodeData(
+    calls.map((call, i) => {
+      if (!call.to) {
+        throw new Error(
+          `Call at index ${i}: contract deployment is not supported in batch execution`
+        );
+      }
+      return {
+        to: call.to as `0x${string}`,
+        value: BigInt(call.value ?? "0x0"),
+        data: (call.data ?? "0x") as `0x${string}`,
+      };
+    })
+  );
+
+  const tx: UnsignedEVMTransaction = {
+    to: selectedAddress,
+    data,
+    value: "0x0",
+    chainId: evmChainId,
+  };
+
+  if (delegationStatus === "ready") {
+    tx.authorizationList = buildDummyAuthorizationList(
+      ALLOWED_DELEGATORS[0],
+      evmChainId
+    );
+  }
+
+  return tx;
+}
+
+/**
+ * 미업그레이드 계정의 가스 추정을 위한 stateOverride 생성.
+ * eth_estimateGas 3번째 파라미터로 전달하여 delegation 코드를 주입.
+ */
+export function buildDelegationStateOverride(
+  address: string,
+  delegatorAddress: string
+): Record<string, { code: string }> {
+  return {
+    [address]: {
+      code: EIP7702_DELEGATION_PREFIX + delegatorAddress.toLowerCase().slice(2),
+    },
+  };
+}
+
 // ── Types ──
 
 export interface EVMTransactionParam {

packages/background/src/keyring-ethereum/index.ts

@@ -1,3 +1,8 @@
 export * from "./messages";
 export * from "./service";
 export { ALLOWED_DELEGATORS } from "./constants";
+export {
+  buildDummyAuthorizationList,
+  createAtomicBatchTransaction,
+  buildDelegationStateOverride,
+} from "./helper";

packages/background/src/keyring-ethereum/init.ts

@@ -7,7 +7,6 @@ import {
   CheckNeedEnableAccessForEVMMsg,
   UpgradeSmartAccountMsg,
   DowngradeSmartAccountMsg,
-  EstimateSmartAccountFeeMsg,
   GetEthereumAddressForVaultMsg,
 } from "./messages";
 import { ROUTE } from "./constants";
@@ -25,7 +24,6 @@ export function init(
   router.registerMessage(CheckNeedEnableAccessForEVMMsg);
   router.registerMessage(UpgradeSmartAccountMsg);
   router.registerMessage(DowngradeSmartAccountMsg);
-  router.registerMessage(EstimateSmartAccountFeeMsg);
   router.registerMessage(GetEthereumAddressForVaultMsg);
 
   router.addHandler(ROUTE, getHandler(service, permissionInteractionService));

packages/background/src/keyring-ethereum/messages.ts

@@ -179,45 +179,6 @@ export class DowngradeSmartAccountMsg extends Message<string> {
   }
 }
 
-export class EstimateSmartAccountFeeMsg extends Message<{
-  gasLimit: string;
-  maxFeePerGas: string;
-  maxPriorityFeePerGas: string;
-  estimatedFeeWei: string;
-}> {
-  public static type() {
-    return "estimate-smart-account-fee";
-  }
-
-  constructor(
-    public readonly chainId: string,
-    public readonly vaultId: string
-  ) {
-    super();
-  }
-
-  validateBasic(): void {
-    if (!this.chainId) {
-      throw new Error("chain id not set");
-    }
-    if (!this.vaultId) {
-      throw new Error("vault id not set");
-    }
-  }
-
-  override approveExternal(): boolean {
-    return false;
-  }
-
-  route(): string {
-    return ROUTE;
-  }
-
-  type(): string {
-    return EstimateSmartAccountFeeMsg.type();
-  }
-}
-
 export class GetEthereumAddressForVaultMsg extends Message<string> {
   public static type() {
     return "get-ethereum-address-for-vault";