@keplr-wallet/stores-eth 0.12.312 → 0.13.0

package/build/account/base.d.ts

@@ -1,6 +1,7 @@
 import { ChainGetter } from "@keplr-wallet/stores";
 import { AppCurrency, ERC20Currency, EthTxReceipt, Keplr } from "@keplr-wallet/types";
 import { UnsignedTransaction } from "@ethersproject/transactions";
+import { SimulateGasWithPendingErc20ApprovalResult, StateOverride, UnsignedEVMTransactionWithErc20Approvals } from "../types";
 export declare class EthereumAccountBase {
     protected readonly chainGetter: ChainGetter;
     protected readonly chainId: string;
@@ -9,7 +10,7 @@ export declare class EthereumAccountBase {
     constructor(chainGetter: ChainGetter, chainId: string, getKeplr: () => Promise<Keplr | undefined>);
     setIsSendingTx(value: boolean): void;
     get isSendingTx(): boolean;
-    simulateGas(sender: string, unsignedTx: UnsignedTransaction): Promise<{
+    simulateGas(sender: string, unsignedTx: UnsignedTransaction, stateOverride?: StateOverride): Promise<{
         gasUsed: number;
     }>;
     simulateGasForSendTokenTx({ currency, amount, sender, recipient, }: {
@@ -20,7 +21,9 @@ export declare class EthereumAccountBase {
     }): Promise<{
         gasUsed: number;
     }>;
+    simulateGasWithPendingErc20Approval(sender: string, unsignedTx: UnsignedEVMTransactionWithErc20Approvals): Promise<SimulateGasWithPendingErc20ApprovalResult>;
     simulateOpStackL1Fee(unsignedTx: UnsignedTransaction): Promise<string>;
+    simulateOpStackL1FeeWithPendingErc20Approval(unsignedTx: UnsignedEVMTransactionWithErc20Approvals): Promise<string>;
     makeSendTokenTx({ currency, amount, to, gasLimit, maxFeePerGas, maxPriorityFeePerGas, gasPrice, }: {
         currency: AppCurrency;
         amount: string;
@@ -32,6 +35,17 @@ export declare class EthereumAccountBase {
     }): UnsignedTransaction;
     makeErc20ApprovalTx(currency: ERC20Currency, spender: string, amount: string): UnsignedTransaction;
     makeTx(to: string, value: string, data?: string): UnsignedTransaction;
+    /**
+     * Sign an Ethereum transaction.
+     * @param sender - The sender address.
+     * @param unsignedTx - The unsigned transaction to sign.
+     * @param options - The options for the transaction.
+     * @returns The signed transaction in serialized format.
+     */
+    signEthereumTx(sender: string, unsignedTx: UnsignedEVMTransactionWithErc20Approvals, options?: {
+        nonceMethod?: "pending" | "latest";
+        considerRequiredErc20ApprovalsForNonce?: boolean;
+    }): Promise<string>;
     sendEthereumTx(sender: string, unsignedTx: UnsignedTransaction, onTxEvents?: {
         onBroadcastFailed?: (e?: Error) => void;
         onBroadcasted?: (txHash: string) => void;

package/build/account/base.js

@@ -25,6 +25,7 @@ const transactions_1 = require("@ethersproject/transactions");
 const address_1 = require("@ethersproject/address");
 const mobx_1 = require("mobx");
 const abi_1 = require("@ethersproject/abi");
+const simple_fetch_1 = require("@keplr-wallet/simple-fetch");
 const opStackGasPriceOracleProxyAddress = "0x420000000000000000000000000000000000000F";
 const opStackGasPriceOracleABI = new abi_1.Interface([
     {
@@ -35,6 +36,63 @@ const opStackGasPriceOracleABI = new abi_1.Interface([
         type: "function",
     },
 ]);
+function traceCallWithDiff(rpcUrl, tx, blockTag = "latest") {
+    return __awaiter(this, void 0, void 0, function* () {
+        const response = yield (0, simple_fetch_1.simpleFetch)(rpcUrl, {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({
+                jsonrpc: "2.0",
+                method: "debug_traceCall",
+                params: [
+                    tx,
+                    blockTag,
+                    {
+                        tracer: "prestateTracer",
+                        tracerConfig: {
+                            diffMode: true,
+                        },
+                    },
+                ],
+                id: 1,
+            }),
+        });
+        const data = response.data;
+        if (data.error) {
+            throw new Error(data.error.message);
+        }
+        if (!data.result) {
+            throw new Error("Unknown error");
+        }
+        return data.result;
+    });
+}
+function diffResultToStateOverride(diffResult, allowedAddresses, useStateDiff = false) {
+    const override = {};
+    const allowed = new Set(allowedAddresses.map((addr) => addr.toLowerCase()));
+    for (const [address, state] of Object.entries(diffResult.post)) {
+        if (!allowed.has(address.toLowerCase())) {
+            continue;
+        }
+        if (state.storage && Object.keys(state.storage).length > 0) {
+            if (useStateDiff) {
+                // 개별 슬롯만 패치 (stateDiff)
+                override[address] = {
+                    stateDiff: state.storage,
+                };
+            }
+            else {
+                // 전체 스토리지 override (state)
+                // 시스템 컨트랙트의 전체 상태를 덮어쓰려고 하면 오류가 발생할 수 있다.
+                // 가능한 이 기능을 사용하지 않도록 하자.
+                override[address] = {
+                    state: state.storage,
+                };
+            }
+        }
+    }
+    return override;
+}
 class EthereumAccountBase {
     constructor(chainGetter, chainId, getKeplr) {
         this.chainGetter = chainGetter;
@@ -49,7 +107,7 @@ class EthereumAccountBase {
     get isSendingTx() {
         return this._isSendingTx;
     }
-    simulateGas(sender, unsignedTx) {
+    simulateGas(sender, unsignedTx, stateOverride) {
         return __awaiter(this, void 0, void 0, function* () {
             const chainInfo = this.chainGetter.getChain(this.chainId);
             const evmInfo = chainInfo.evm;
@@ -59,16 +117,20 @@ class EthereumAccountBase {
             const { to, value, data } = unsignedTx;
             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             const keplr = (yield this.getKeplr());
+            const params = [
+                {
+                    from: sender,
+                    to,
+                    value,
+                    data,
+                },
+            ];
+            if (stateOverride) {
+                params.push("latest", stateOverride);
+            }
             const gasEstimated = yield keplr.ethereum.request({
                 method: "eth_estimateGas",
-                params: [
-                    {
-                        from: sender,
-                        to,
-                        value,
-                        data,
-                    },
-                ],
+                params,
                 chainId: this.chainId,
             });
             if (!gasEstimated) {
@@ -108,6 +170,78 @@ class EthereumAccountBase {
             return this.simulateGas(sender, unsignedTx);
         });
     }
+    simulateGasWithPendingErc20Approval(sender, unsignedTx) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const chainInfo = this.chainGetter.getChain(this.chainId);
+            const evmInfo = chainInfo.evm;
+            if (!evmInfo) {
+                throw new Error("No EVM chain info provided");
+            }
+            const { to, value, data, requiredErc20Approvals } = unsignedTx;
+            const erc20ApprovalTxs = requiredErc20Approvals === null || requiredErc20Approvals === void 0 ? void 0 : requiredErc20Approvals.map((approval) => {
+                return {
+                    to: approval.tokenAddress,
+                    value: "0x0",
+                    data: constants_1.erc20ContractInterface.encodeFunctionData("approve", [
+                        approval.spender,
+                        (0, bytes_1.hexValue)(BigInt(approval.amount)),
+                    ]),
+                };
+            });
+            if (!erc20ApprovalTxs || (erc20ApprovalTxs === null || erc20ApprovalTxs === void 0 ? void 0 : erc20ApprovalTxs.length) === 0) {
+                const result = yield this.simulateGas(sender, unsignedTx);
+                return {
+                    outcome: types_1.EvmGasSimulationOutcome.TX_SIMULATED,
+                    gasUsed: result.gasUsed,
+                };
+            }
+            if (erc20ApprovalTxs.length > 1) {
+                throw new Error("Multiple ERC20 approvals are not supported");
+            }
+            const erc20Approval = requiredErc20Approvals === null || requiredErc20Approvals === void 0 ? void 0 : requiredErc20Approvals[0];
+            if (!erc20Approval) {
+                throw new Error("Invalid ERC20 approval");
+            }
+            const erc20ApprovalTx = erc20ApprovalTxs[0];
+            // First, estimate gas for the ERC20 approval tx itself.
+            // This result is reused whether the bundle simulation with state diff succeeds or falls back.
+            const erc20ApprovalSimResult = yield this.simulateGas(sender, erc20ApprovalTx);
+            try {
+                // State diff tracing for the ERC20 approval transaction
+                const approvalStateDiff = yield traceCallWithDiff(chainInfo.rpc, {
+                    from: sender,
+                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                    to: erc20ApprovalTx.to,
+                    value: erc20ApprovalTx.value,
+                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                    data: erc20ApprovalTx.data,
+                });
+                // estimate gas with state override with approval state diff
+                const result = yield this.simulateGas(sender, {
+                    to,
+                    value,
+                    data,
+                }, diffResultToStateOverride(approvalStateDiff, [
+                    sender,
+                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                    erc20ApprovalTx.to,
+                    erc20Approval.spender,
+                ], true));
+                return {
+                    outcome: types_1.EvmGasSimulationOutcome.TX_BUNDLE_SIMULATED,
+                    gasUsed: result.gasUsed,
+                    erc20ApprovalGasUsed: erc20ApprovalSimResult.gasUsed,
+                };
+            }
+            catch (e) {
+                console.error("Failed to simulate gas with pending ERC20 approval", e);
+                return {
+                    outcome: types_1.EvmGasSimulationOutcome.APPROVAL_ONLY_SIMULATED,
+                    erc20ApprovalGasUsed: erc20ApprovalSimResult.gasUsed,
+                };
+            }
+        });
+    }
     simulateOpStackL1Fee(unsignedTx) {
         return __awaiter(this, void 0, void 0, function* () {
             const chainInfo = this.chainGetter.getChain(this.chainId);
@@ -136,6 +270,69 @@ class EthereumAccountBase {
             return l1Fee;
         });
     }
+    simulateOpStackL1FeeWithPendingErc20Approval(unsignedTx) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const chainInfo = this.chainGetter.getChain(this.chainId);
+            if (!chainInfo.features.includes("op-stack-l1-data-fee")) {
+                throw new Error("The chain isn't built with OP Stack");
+            }
+            const evmInfo = chainInfo.evm;
+            if (!evmInfo) {
+                throw new Error("No EVM chain info provided");
+            }
+            const txsToSimulate = [
+                {
+                    to: unsignedTx.to,
+                    gasLimit: unsignedTx.gasLimit,
+                    value: unsignedTx.value,
+                    data: unsignedTx.data,
+                    chainId: unsignedTx.chainId,
+                },
+            ];
+            // If there's a pending ERC20 approval, add it to the batch
+            const erc20Approval = (_a = unsignedTx.requiredErc20Approvals) === null || _a === void 0 ? void 0 : _a[0];
+            if (erc20Approval != null) {
+                txsToSimulate.push({
+                    to: erc20Approval.tokenAddress,
+                    data: constants_1.erc20ContractInterface.encodeFunctionData("approve", [
+                        erc20Approval.spender,
+                        (0, bytes_1.hexValue)(BigInt(erc20Approval.amount)),
+                    ]),
+                    chainId: unsignedTx.chainId,
+                });
+            }
+            const batchRequests = txsToSimulate.map((tx, index) => ({
+                jsonrpc: "2.0",
+                method: "eth_call",
+                params: [
+                    {
+                        to: opStackGasPriceOracleProxyAddress,
+                        data: opStackGasPriceOracleABI.encodeFunctionData("getL1Fee", [
+                            (0, transactions_1.serialize)(tx),
+                        ]),
+                    },
+                    "latest",
+                ],
+                id: index + 1,
+            }));
+            const response = yield (0, simple_fetch_1.simpleFetch)(evmInfo.rpc, {
+                method: "POST",
+                headers: { "Content-Type": "application/json" },
+                body: JSON.stringify(batchRequests),
+            });
+            let totalL1Fee = BigInt(0);
+            for (const result of response.data) {
+                if (result.error) {
+                    throw new Error(result.error.message);
+                }
+                if (result.result) {
+                    totalL1Fee += BigInt(result.result);
+                }
+            }
+            return "0x" + totalL1Fee.toString(16);
+        });
+    }
     makeSendTokenTx({ currency, amount, to, gasLimit, maxFeePerGas, maxPriorityFeePerGas, gasPrice, }) {
         const parsedAmount = (0, units_1.parseUnits)(amount, currency.coinDecimals);
         const denomHelper = new common_1.DenomHelper(currency.coinMinimalDenom);
@@ -183,6 +380,41 @@ class EthereumAccountBase {
             data,
         };
     }
+    /**
+     * Sign an Ethereum transaction.
+     * @param sender - The sender address.
+     * @param unsignedTx - The unsigned transaction to sign.
+     * @param options - The options for the transaction.
+     * @returns The signed transaction in serialized format.
+     */
+    signEthereumTx(sender, unsignedTx, options) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function* () {
+            const chainInfo = this.chainGetter.getChain(this.chainId);
+            const evmInfo = chainInfo.evm;
+            if (!evmInfo) {
+                throw new Error("No EVM info provided");
+            }
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            const keplr = (yield this.getKeplr());
+            const transactionCount = yield keplr.ethereum.request({
+                method: "eth_getTransactionCount",
+                params: [sender, (options === null || options === void 0 ? void 0 : options.nonceMethod) || "pending"],
+                chainId: this.chainId,
+            });
+            unsignedTx = Object.assign(Object.assign({}, unsignedTx), { nonce: parseInt(transactionCount) +
+                    ((options === null || options === void 0 ? void 0 : options.considerRequiredErc20ApprovalsForNonce)
+                        ? (_b = (_a = unsignedTx.requiredErc20Approvals) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0
+                        : 0) });
+            const signEthereum = keplr.signEthereum.bind(keplr);
+            const signature = yield signEthereum(this.chainId, sender, JSON.stringify(unsignedTx), types_1.EthSignType.TRANSACTION);
+            const isEIP1559 = !!unsignedTx.maxFeePerGas || !!unsignedTx.maxPriorityFeePerGas;
+            if (isEIP1559) {
+                unsignedTx.type = transactions_1.TransactionTypes.eip1559;
+            }
+            return (0, transactions_1.serialize)(unsignedTx, signature);
+        });
+    }
     sendEthereumTx(sender, unsignedTx, onTxEvents, options) {
         return __awaiter(this, void 0, void 0, function* () {
             try {

package/build/account/base.js.map

@@ -1 +1 @@
-{"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/account/base.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/account/base.ts"],"names":[],"mappings":"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"}

package/build/queries/erc20-balances.d.ts

@@ -42,8 +42,9 @@ export declare class ObservableQueryThirdpartyERC20BalancesImpl implements IObse
 }
 export declare class ObservableQueryThirdpartyERC20BalanceRegistry implements BalanceRegistry {
     protected readonly sharedContext: QuerySharedContext;
+    protected readonly forceNativeERC20Query: (chainId: string, chainGetter: ChainGetter, address: string, minimalDenom: string) => boolean;
     protected parentMap: Map<string, ObservableQueryThirdpartyERC20BalancesImplParent>;
-    constructor(sharedContext: QuerySharedContext);
+    constructor(sharedContext: QuerySharedContext, forceNativeERC20Query: (chainId: string, chainGetter: ChainGetter, address: string, minimalDenom: string) => boolean);
     getBalanceImpl(chainId: string, chainGetter: ChainGetter, address: string, minimalDenom: string): ObservableQueryThirdpartyERC20BalancesImpl | undefined;
 }
 export {};

package/build/queries/erc20-balances.js

@@ -149,8 +149,9 @@ __decorate([
 ], ObservableQueryThirdpartyERC20BalancesImpl.prototype, "currency", null);
 exports.ObservableQueryThirdpartyERC20BalancesImpl = ObservableQueryThirdpartyERC20BalancesImpl;
 class ObservableQueryThirdpartyERC20BalanceRegistry {
-    constructor(sharedContext) {
+    constructor(sharedContext, forceNativeERC20Query) {
         this.sharedContext = sharedContext;
+        this.forceNativeERC20Query = forceNativeERC20Query;
         this.parentMap = new Map();
     }
     getBalanceImpl(chainId, chainGetter, address, minimalDenom) {
@@ -160,7 +161,8 @@ class ObservableQueryThirdpartyERC20BalanceRegistry {
         if (!Object.keys(thirdparySupportedChainIdMap).includes(chainId) ||
             denomHelper.type !== "erc20" ||
             !isHexAddress ||
-            !chainInfo.evm) {
+            !chainInfo.evm ||
+            this.forceNativeERC20Query(chainId, chainGetter, address, minimalDenom)) {
             return;
         }
         const key = `${chainId}/${address}`;

package/build/queries/erc20-balances.js.map

@@ -1 +1 @@
-{"version":3,"file":"erc20-balances.js","sourceRoot":"","sources":["../../src/queries/erc20-balances.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"erc20-balances.js","sourceRoot":"","sources":["../../src/queries/erc20-balances.ts"],"names":[],"mappings":"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"}

package/build/queries/index.d.ts

@@ -14,9 +14,11 @@ export declare const EthereumQueries: {
     use(options: {
         coingeckoAPIBaseURL: string;
         coingeckoAPIURI: string;
+        forceNativeERC20Query: (chainId: string, chainGetter: ChainGetter, address: string, minimalDenom: string) => boolean;
     }): (queriesSetBase: QueriesSetBase, sharedContext: QuerySharedContext, chainId: string, chainGetter: ChainGetter) => EthereumQueries;
 };
 export declare class EthereumQueriesImpl {
+    protected readonly forceNativeERC20Query: (chainId: string, chainGetter: ChainGetter, address: string, minimalDenom: string) => boolean;
     protected chainId: string;
     protected chainGetter: ChainGetter;
     protected coingeckoAPIBaseURL: string;
@@ -28,5 +30,5 @@ export declare class EthereumQueriesImpl {
     readonly queryEthereumMaxPriorityFee: DeepReadonly<ObservableQueryEthereumMaxPriorityFee>;
     readonly queryEthereumCoingeckoTokenInfo: DeepReadonly<ObservableQueryCoingeckoTokenInfo>;
     readonly queryEthereumGasPrice: DeepReadonly<ObservableQueryEthereumGasPrice>;
-    constructor(base: QueriesSetBase, sharedContext: QuerySharedContext, chainId: string, chainGetter: ChainGetter, coingeckoAPIBaseURL: string, coingeckoAPIURI: string);
+    constructor(base: QueriesSetBase, sharedContext: QuerySharedContext, forceNativeERC20Query: (chainId: string, chainGetter: ChainGetter, address: string, minimalDenom: string) => boolean, chainId: string, chainGetter: ChainGetter, coingeckoAPIBaseURL: string, coingeckoAPIURI: string);
 }

package/build/queries/index.js

@@ -15,19 +15,20 @@ exports.EthereumQueries = {
     use(options) {
         return (queriesSetBase, sharedContext, chainId, chainGetter) => {
             return {
-                ethereum: new EthereumQueriesImpl(queriesSetBase, sharedContext, chainId, chainGetter, options.coingeckoAPIBaseURL, options.coingeckoAPIURI),
+                ethereum: new EthereumQueriesImpl(queriesSetBase, sharedContext, options.forceNativeERC20Query, chainId, chainGetter, options.coingeckoAPIBaseURL, options.coingeckoAPIURI),
             };
         };
     },
 };
 class EthereumQueriesImpl {
-    constructor(base, sharedContext, chainId, chainGetter, coingeckoAPIBaseURL, coingeckoAPIURI) {
+    constructor(base, sharedContext, forceNativeERC20Query, chainId, chainGetter, coingeckoAPIBaseURL, coingeckoAPIURI) {
+        this.forceNativeERC20Query = forceNativeERC20Query;
         this.chainId = chainId;
         this.chainGetter = chainGetter;
         this.coingeckoAPIBaseURL = coingeckoAPIBaseURL;
         this.coingeckoAPIURI = coingeckoAPIURI;
         base.queryBalances.addBalanceRegistry(new erc20_balance_1.ObservableQueryEthereumERC20BalanceRegistry(sharedContext));
-        base.queryBalances.addBalanceRegistry(new erc20_balances_1.ObservableQueryThirdpartyERC20BalanceRegistry(sharedContext));
+        base.queryBalances.addBalanceRegistry(new erc20_balances_1.ObservableQueryThirdpartyERC20BalanceRegistry(sharedContext, forceNativeERC20Query));
         base.queryBalances.addBalanceRegistry(new balance_1.ObservableQueryEthAccountBalanceRegistry(sharedContext));
         this.queryEthereumBlock = new block_1.ObservableQueryEthereumBlock(sharedContext, chainId, chainGetter);
         this.queryEthereumFeeHistory = new fee_histroy_1.ObservableQueryEthereumFeeHistory(sharedContext, chainId, chainGetter);

package/build/queries/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/queries/index.ts"],"names":[],"mappings":";;;AAKA,uCAAqE;AAErE,mCAAuD;AACvD,+CAAkE;AAClE,qDAAwE;AACxE,+DAAyE;AACzE,yDAA2E;AAC3E,qDAAiF;AACjF,iEAA2E;AAC3E,mDAA8E;AAC9E,2CAA8D;AAMjD,QAAA,eAAe,GAAG;IAC7B,GAAG,CAAC,OAGH;QAMC,OAAO,CACL,cAA8B,EAC9B,aAAiC,EACjC,OAAe,EACf,WAAwB,EACxB,EAAE;YACF,OAAO;gBACL,QAAQ,EAAE,IAAI,mBAAmB,CAC/B,cAAc,EACd,aAAa,EACb,OAAO,EACP,WAAW,EACX,OAAO,CAAC,mBAAmB,EAC3B,OAAO,CAAC,eAAe,CACxB;aACF,CAAC;QACJ,CAAC,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,MAAa,mBAAmB;IAS9B,YACE,IAAoB,EACpB,aAAiC,EACvB,OAAe,EACf,WAAwB,EACxB,mBAA2B,EAC3B,eAAuB;QAHvB,YAAO,GAAP,OAAO,CAAQ;QACf,gBAAW,GAAX,WAAW,CAAa;QACxB,wBAAmB,GAAnB,mBAAmB,CAAQ;QAC3B,oBAAe,GAAf,eAAe,CAAQ;QAEjC,IAAI,CAAC,aAAa,CAAC,kBAAkB,CACnC,IAAI,2DAA2C,CAAC,aAAa,CAAC,CAC/D,CAAC;QACF,IAAI,CAAC,aAAa,CAAC,kBAAkB,CACnC,IAAI,8DAA6C,CAAC,aAAa,CAAC,CACjE,CAAC;QACF,IAAI,CAAC,aAAa,CAAC,kBAAkB,CACnC,IAAI,kDAAwC,CAAC,aAAa,CAAC,CAC5D,CAAC;QAEF,IAAI,CAAC,kBAAkB,GAAG,IAAI,oCAA4B,CACxD,aAAa,EACb,OAAO,EACP,WAAW,CACZ,CAAC;QAEF,IAAI,CAAC,uBAAuB,GAAG,IAAI,+CAAiC,CAClE,aAAa,EACb,OAAO,EACP,WAAW,CACZ,CAAC;QAEF,IAAI,CAAC,0BAA0B,GAAG,IAAI,qDAAoC,CACxE,aAAa,EACb,OAAO,EACP,WAAW,CACZ,CAAC;QAEF,IAAI,CAAC,8BAA8B,GAAG,IAAI,sDAAgC,CACxE,aAAa,EACb,OAAO,EACP,WAAW,CACZ,CAAC;QAEF,IAAI,CAAC,2BAA2B;YAC9B,IAAI,wDAAqC,CACvC,aAAa,EACb,OAAO,EACP,WAAW,CACZ,CAAC;QAEJ,IAAI,CAAC,+BAA+B;YAClC,IAAI,wDAAiC,CACnC,aAAa,EACb,OAAO,EACP,WAAW,EACX,mBAAmB,EACnB,eAAe,CAChB,CAAC;QAEJ,IAAI,CAAC,qBAAqB,GAAG,IAAI,2CAA+B,CAC9D,aAAa,EACb,OAAO,EACP,WAAW,CACZ,CAAC;IACJ,CAAC;CACF;AAzED,kDAyEC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/queries/index.ts"],"names":[],"mappings":";;;AAKA,uCAAqE;AAErE,mCAAuD;AACvD,+CAAkE;AAClE,qDAAwE;AACxE,+DAAyE;AACzE,yDAA2E;AAC3E,qDAAiF;AACjF,iEAA2E;AAC3E,mDAA8E;AAC9E,2CAA8D;AAMjD,QAAA,eAAe,GAAG;IAC7B,GAAG,CAAC,OASH;QAMC,OAAO,CACL,cAA8B,EAC9B,aAAiC,EACjC,OAAe,EACf,WAAwB,EACxB,EAAE;YACF,OAAO;gBACL,QAAQ,EAAE,IAAI,mBAAmB,CAC/B,cAAc,EACd,aAAa,EACb,OAAO,CAAC,qBAAqB,EAC7B,OAAO,EACP,WAAW,EACX,OAAO,CAAC,mBAAmB,EAC3B,OAAO,CAAC,eAAe,CACxB;aACF,CAAC;QACJ,CAAC,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,MAAa,mBAAmB;IAS9B,YACE,IAAoB,EACpB,aAAiC,EACd,qBAKP,EACF,OAAe,EACf,WAAwB,EACxB,mBAA2B,EAC3B,eAAuB;QATd,0BAAqB,GAArB,qBAAqB,CAK5B;QACF,YAAO,GAAP,OAAO,CAAQ;QACf,gBAAW,GAAX,WAAW,CAAa;QACxB,wBAAmB,GAAnB,mBAAmB,CAAQ;QAC3B,oBAAe,GAAf,eAAe,CAAQ;QAEjC,IAAI,CAAC,aAAa,CAAC,kBAAkB,CACnC,IAAI,2DAA2C,CAAC,aAAa,CAAC,CAC/D,CAAC;QACF,IAAI,CAAC,aAAa,CAAC,kBAAkB,CACnC,IAAI,8DAA6C,CAC/C,aAAa,EACb,qBAAqB,CACtB,CACF,CAAC;QACF,IAAI,CAAC,aAAa,CAAC,kBAAkB,CACnC,IAAI,kDAAwC,CAAC,aAAa,CAAC,CAC5D,CAAC;QAEF,IAAI,CAAC,kBAAkB,GAAG,IAAI,oCAA4B,CACxD,aAAa,EACb,OAAO,EACP,WAAW,CACZ,CAAC;QAEF,IAAI,CAAC,uBAAuB,GAAG,IAAI,+CAAiC,CAClE,aAAa,EACb,OAAO,EACP,WAAW,CACZ,CAAC;QAEF,IAAI,CAAC,0BAA0B,GAAG,IAAI,qDAAoC,CACxE,aAAa,EACb,OAAO,EACP,WAAW,CACZ,CAAC;QAEF,IAAI,CAAC,8BAA8B,GAAG,IAAI,sDAAgC,CACxE,aAAa,EACb,OAAO,EACP,WAAW,CACZ,CAAC;QAEF,IAAI,CAAC,2BAA2B;YAC9B,IAAI,wDAAqC,CACvC,aAAa,EACb,OAAO,EACP,WAAW,CACZ,CAAC;QAEJ,IAAI,CAAC,+BAA+B;YAClC,IAAI,wDAAiC,CACnC,aAAa,EACb,OAAO,EACP,WAAW,EACX,mBAAmB,EACnB,eAAe,CAChB,CAAC;QAEJ,IAAI,CAAC,qBAAqB,GAAG,IAAI,2CAA+B,CAC9D,aAAa,EACb,OAAO,EACP,WAAW,CACZ,CAAC;IACJ,CAAC;CACF;AAlFD,kDAkFC"}

package/build/types.d.ts

@@ -1,4 +1,5 @@
 import { UnsignedTransaction } from "@ethersproject/transactions";
+import { EvmGasSimulationOutcome } from "@keplr-wallet/types";
 export type UnsignedEVMTransaction = UnsignedTransaction;
 export type UnsignedEVMTransactionWithErc20Approvals = UnsignedEVMTransaction & {
     requiredErc20Approvals?: {
@@ -7,3 +8,27 @@ export type UnsignedEVMTransactionWithErc20Approvals = UnsignedEVMTransaction &
         tokenAddress: string;
     }[];
 };
+export interface AccountState {
+    balance?: string;
+    code?: string;
+    nonce?: string;
+    storage?: Record<string, string>;
+}
+export interface AccountStateDiffTracerResult {
+    pre: Record<string, AccountState>;
+    post: Record<string, AccountState>;
+}
+export interface SimulateGasWithPendingErc20ApprovalResult {
+    outcome: EvmGasSimulationOutcome;
+    gasUsed?: number;
+    erc20ApprovalGasUsed?: number;
+}
+export interface StateOverrideAccountState {
+    balance?: string;
+    nonce?: string;
+    code?: string;
+    storage?: Record<string, string>;
+    state?: Record<string, string>;
+    stateDiff?: Record<string, string>;
+}
+export type StateOverride = Record<string, StateOverrideAccountState>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@keplr-wallet/stores-eth",
-  "version": "0.12.312",
+  "version": "0.13.0",
   "main": "build/index.js",
   "author": "chainapsis",
   "license": "Apache-2.0",
@@ -26,12 +26,12 @@
     "@ethersproject/strings": "^5.7.0",
     "@ethersproject/transactions": "^5.7.0",
     "@ethersproject/units": "^5.7.0",
-    "@keplr-wallet/common": "0.12.312",
-    "@keplr-wallet/simple-fetch": "0.12.312",
-    "@keplr-wallet/stores": "0.12.312",
-    "@keplr-wallet/stores-etc": "0.12.312",
-    "@keplr-wallet/types": "0.12.312",
-    "@keplr-wallet/unit": "0.12.312",
+    "@keplr-wallet/common": "0.13.0",
+    "@keplr-wallet/simple-fetch": "0.13.0",
+    "@keplr-wallet/stores": "0.13.0",
+    "@keplr-wallet/stores-etc": "0.13.0",
+    "@keplr-wallet/types": "0.13.0",
+    "@keplr-wallet/unit": "0.13.0",
     "big-integer": "^1.6.48",
     "lodash.debounce": "^4.0.8",
     "utility-types": "^3.10.0"
@@ -43,5 +43,5 @@
   "devDependencies": {
     "@types/lodash.debounce": "^4"
   },
-  "gitHead": "8c05fe9b01213025e42a2b38eae58de1839e1b64"
+  "gitHead": "83c23d58e9ee42ed3b67c27033d1af11a7c575d7"
 }

package/src/account/base.ts

@@ -2,8 +2,10 @@ import { ChainGetter } from "@keplr-wallet/stores";
 import {
   AppCurrency,
   ERC20Currency,
+  EvmGasSimulationOutcome,
   EthSignType,
   EthTxReceipt,
+  JsonRpcResponse,
   Keplr,
 } from "@keplr-wallet/types";
 import { DenomHelper, retry } from "@keplr-wallet/common";
@@ -18,6 +20,13 @@ import {
 import { getAddress as getEthAddress } from "@ethersproject/address";
 import { action, makeObservable, observable } from "mobx";
 import { Interface } from "@ethersproject/abi";
+import {
+  AccountStateDiffTracerResult,
+  SimulateGasWithPendingErc20ApprovalResult,
+  StateOverride,
+  UnsignedEVMTransactionWithErc20Approvals,
+} from "../types";
+import { simpleFetch } from "@keplr-wallet/simple-fetch";
 
 const opStackGasPriceOracleProxyAddress =
   "0x420000000000000000000000000000000000000F";
@@ -32,6 +41,80 @@ const opStackGasPriceOracleABI = new Interface([
   },
 ]);
 
+async function traceCallWithDiff(
+  rpcUrl: string,
+  tx: { from: string; to: string; data: string; value?: string },
+  blockTag: string = "latest"
+): Promise<AccountStateDiffTracerResult> {
+  const response = await simpleFetch<
+    JsonRpcResponse<AccountStateDiffTracerResult>
+  >(rpcUrl, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({
+      jsonrpc: "2.0",
+      method: "debug_traceCall",
+      params: [
+        tx,
+        blockTag,
+        {
+          tracer: "prestateTracer",
+          tracerConfig: {
+            diffMode: true,
+          },
+        },
+      ],
+      id: 1,
+    }),
+  });
+
+  const data = response.data;
+
+  if (data.error) {
+    throw new Error(data.error.message);
+  }
+
+  if (!data.result) {
+    throw new Error("Unknown error");
+  }
+
+  return data.result;
+}
+
+function diffResultToStateOverride(
+  diffResult: AccountStateDiffTracerResult,
+  allowedAddresses: string[],
+  useStateDiff: boolean = false
+): StateOverride {
+  const override: StateOverride = {};
+
+  const allowed = new Set(allowedAddresses.map((addr) => addr.toLowerCase()));
+
+  for (const [address, state] of Object.entries(diffResult.post)) {
+    if (!allowed.has(address.toLowerCase())) {
+      continue;
+    }
+
+    if (state.storage && Object.keys(state.storage).length > 0) {
+      if (useStateDiff) {
+        // 개별 슬롯만 패치 (stateDiff)
+        override[address] = {
+          stateDiff: state.storage,
+        };
+      } else {
+        // 전체 스토리지 override (state)
+        // 시스템 컨트랙트의 전체 상태를 덮어쓰려고 하면 오류가 발생할 수 있다.
+        // 가능한 이 기능을 사용하지 않도록 하자.
+        override[address] = {
+          state: state.storage,
+        };
+      }
+    }
+  }
+
+  return override;
+}
+
 export class EthereumAccountBase {
   @observable
   protected _isSendingTx: boolean = false;
@@ -53,7 +136,11 @@ export class EthereumAccountBase {
     return this._isSendingTx;
   }
 
-  async simulateGas(sender: string, unsignedTx: UnsignedTransaction) {
+  async simulateGas(
+    sender: string,
+    unsignedTx: UnsignedTransaction,
+    stateOverride?: StateOverride
+  ) {
     const chainInfo = this.chainGetter.getChain(this.chainId);
     const evmInfo = chainInfo.evm;
     if (!evmInfo) {
@@ -64,16 +151,23 @@ export class EthereumAccountBase {
 
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     const keplr = (await this.getKeplr())!;
+
+    const params: unknown[] = [
+      {
+        from: sender,
+        to,
+        value,
+        data,
+      },
+    ];
+
+    if (stateOverride) {
+      params.push("latest", stateOverride);
+    }
+
     const gasEstimated = await keplr.ethereum.request<string | undefined>({
       method: "eth_estimateGas",
-      params: [
-        {
-          from: sender,
-          to,
-          value,
-          data,
-        },
-      ],
+      params,
       chainId: this.chainId,
     });
 
@@ -129,6 +223,101 @@ export class EthereumAccountBase {
     return this.simulateGas(sender, unsignedTx);
   }
 
+  async simulateGasWithPendingErc20Approval(
+    sender: string,
+    unsignedTx: UnsignedEVMTransactionWithErc20Approvals
+  ): Promise<SimulateGasWithPendingErc20ApprovalResult> {
+    const chainInfo = this.chainGetter.getChain(this.chainId);
+    const evmInfo = chainInfo.evm;
+    if (!evmInfo) {
+      throw new Error("No EVM chain info provided");
+    }
+
+    const { to, value, data, requiredErc20Approvals } = unsignedTx;
+
+    const erc20ApprovalTxs = requiredErc20Approvals?.map((approval) => {
+      return {
+        to: approval.tokenAddress,
+        value: "0x0",
+        data: erc20ContractInterface.encodeFunctionData("approve", [
+          approval.spender,
+          hexValue(BigInt(approval.amount)),
+        ]),
+      };
+    });
+
+    if (!erc20ApprovalTxs || erc20ApprovalTxs?.length === 0) {
+      const result = await this.simulateGas(sender, unsignedTx);
+      return {
+        outcome: EvmGasSimulationOutcome.TX_SIMULATED,
+        gasUsed: result.gasUsed,
+      };
+    }
+
+    if (erc20ApprovalTxs.length > 1) {
+      throw new Error("Multiple ERC20 approvals are not supported");
+    }
+
+    const erc20Approval = requiredErc20Approvals?.[0];
+    if (!erc20Approval) {
+      throw new Error("Invalid ERC20 approval");
+    }
+
+    const erc20ApprovalTx = erc20ApprovalTxs[0];
+
+    // First, estimate gas for the ERC20 approval tx itself.
+    // This result is reused whether the bundle simulation with state diff succeeds or falls back.
+    const erc20ApprovalSimResult = await this.simulateGas(
+      sender,
+      erc20ApprovalTx
+    );
+
+    try {
+      // State diff tracing for the ERC20 approval transaction
+      const approvalStateDiff = await traceCallWithDiff(chainInfo.rpc, {
+        from: sender,
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        to: erc20ApprovalTx.to!,
+        value: erc20ApprovalTx.value,
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        data: erc20ApprovalTx.data!,
+      });
+
+      // estimate gas with state override with approval state diff
+      const result = await this.simulateGas(
+        sender,
+        {
+          to,
+          value,
+          data,
+        },
+        diffResultToStateOverride(
+          approvalStateDiff,
+          [
+            sender,
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            erc20ApprovalTx.to!,
+            erc20Approval.spender,
+          ],
+          true
+        )
+      );
+
+      return {
+        outcome: EvmGasSimulationOutcome.TX_BUNDLE_SIMULATED,
+        gasUsed: result.gasUsed,
+        erc20ApprovalGasUsed: erc20ApprovalSimResult.gasUsed,
+      };
+    } catch (e) {
+      console.error("Failed to simulate gas with pending ERC20 approval", e);
+
+      return {
+        outcome: EvmGasSimulationOutcome.APPROVAL_ONLY_SIMULATED,
+        erc20ApprovalGasUsed: erc20ApprovalSimResult.gasUsed,
+      };
+    }
+  }
+
   async simulateOpStackL1Fee(unsignedTx: UnsignedTransaction): Promise<string> {
     const chainInfo = this.chainGetter.getChain(this.chainId);
     if (!chainInfo.features.includes("op-stack-l1-data-fee")) {
@@ -160,6 +349,76 @@ export class EthereumAccountBase {
     return l1Fee;
   }
 
+  async simulateOpStackL1FeeWithPendingErc20Approval(
+    unsignedTx: UnsignedEVMTransactionWithErc20Approvals
+  ): Promise<string> {
+    const chainInfo = this.chainGetter.getChain(this.chainId);
+    if (!chainInfo.features.includes("op-stack-l1-data-fee")) {
+      throw new Error("The chain isn't built with OP Stack");
+    }
+
+    const evmInfo = chainInfo.evm;
+    if (!evmInfo) {
+      throw new Error("No EVM chain info provided");
+    }
+
+    const txsToSimulate: UnsignedTransaction[] = [
+      {
+        to: unsignedTx.to,
+        gasLimit: unsignedTx.gasLimit,
+        value: unsignedTx.value,
+        data: unsignedTx.data,
+        chainId: unsignedTx.chainId,
+      },
+    ];
+
+    // If there's a pending ERC20 approval, add it to the batch
+    const erc20Approval = unsignedTx.requiredErc20Approvals?.[0];
+    if (erc20Approval != null) {
+      txsToSimulate.push({
+        to: erc20Approval.tokenAddress,
+        data: erc20ContractInterface.encodeFunctionData("approve", [
+          erc20Approval.spender,
+          hexValue(BigInt(erc20Approval.amount)),
+        ]),
+        chainId: unsignedTx.chainId,
+      });
+    }
+
+    const batchRequests = txsToSimulate.map((tx, index) => ({
+      jsonrpc: "2.0" as const,
+      method: "eth_call",
+      params: [
+        {
+          to: opStackGasPriceOracleProxyAddress,
+          data: opStackGasPriceOracleABI.encodeFunctionData("getL1Fee", [
+            serialize(tx),
+          ]),
+        },
+        "latest",
+      ],
+      id: index + 1,
+    }));
+
+    const response = await simpleFetch<JsonRpcResponse<string>[]>(evmInfo.rpc, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify(batchRequests),
+    });
+
+    let totalL1Fee = BigInt(0);
+    for (const result of response.data) {
+      if (result.error) {
+        throw new Error(result.error.message);
+      }
+      if (result.result) {
+        totalL1Fee += BigInt(result.result);
+      }
+    }
+
+    return "0x" + totalL1Fee.toString(16);
+  }
+
   makeSendTokenTx({
     currency,
     amount,
@@ -249,6 +508,64 @@ export class EthereumAccountBase {
     };
   }
 
+  /**
+   * Sign an Ethereum transaction.
+   * @param sender - The sender address.
+   * @param unsignedTx - The unsigned transaction to sign.
+   * @param options - The options for the transaction.
+   * @returns The signed transaction in serialized format.
+   */
+  async signEthereumTx(
+    sender: string,
+    unsignedTx: UnsignedEVMTransactionWithErc20Approvals,
+    options?: {
+      nonceMethod?: "pending" | "latest";
+      // Whether to offset nonce by the number of required ERC20 approvals
+      considerRequiredErc20ApprovalsForNonce?: boolean;
+    }
+  ) {
+    const chainInfo = this.chainGetter.getChain(this.chainId);
+    const evmInfo = chainInfo.evm;
+    if (!evmInfo) {
+      throw new Error("No EVM info provided");
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const keplr = (await this.getKeplr())!;
+
+    const transactionCount = await keplr.ethereum.request<string>({
+      method: "eth_getTransactionCount",
+      params: [sender, options?.nonceMethod || "pending"],
+      chainId: this.chainId,
+    });
+
+    unsignedTx = {
+      ...unsignedTx,
+      nonce:
+        parseInt(transactionCount) +
+        (options?.considerRequiredErc20ApprovalsForNonce
+          ? unsignedTx.requiredErc20Approvals?.length ?? 0
+          : 0),
+    };
+
+    const signEthereum = keplr.signEthereum.bind(keplr);
+
+    const signature = await signEthereum(
+      this.chainId,
+      sender,
+      JSON.stringify(unsignedTx),
+      EthSignType.TRANSACTION
+    );
+
+    const isEIP1559 =
+      !!unsignedTx.maxFeePerGas || !!unsignedTx.maxPriorityFeePerGas;
+    if (isEIP1559) {
+      unsignedTx.type = TransactionTypes.eip1559;
+    }
+
+    return serialize(unsignedTx, signature);
+  }
+
   async sendEthereumTx(
     sender: string,
     unsignedTx: UnsignedTransaction,

package/src/queries/erc20-balances.ts

@@ -199,7 +199,15 @@ export class ObservableQueryThirdpartyERC20BalanceRegistry
     ObservableQueryThirdpartyERC20BalancesImplParent
   > = new Map();
 
-  constructor(protected readonly sharedContext: QuerySharedContext) {}
+  constructor(
+    protected readonly sharedContext: QuerySharedContext,
+    protected readonly forceNativeERC20Query: (
+      chainId: string,
+      chainGetter: ChainGetter,
+      address: string,
+      minimalDenom: string
+    ) => boolean
+  ) {}
 
   getBalanceImpl(
     chainId: string,
@@ -215,7 +223,8 @@ export class ObservableQueryThirdpartyERC20BalanceRegistry
       !Object.keys(thirdparySupportedChainIdMap).includes(chainId) ||
       denomHelper.type !== "erc20" ||
       !isHexAddress ||
-      !chainInfo.evm
+      !chainInfo.evm ||
+      this.forceNativeERC20Query(chainId, chainGetter, address, minimalDenom)
     ) {
       return;
     }

package/src/queries/index.ts

@@ -23,6 +23,12 @@ export const EthereumQueries = {
   use(options: {
     coingeckoAPIBaseURL: string;
     coingeckoAPIURI: string;
+    forceNativeERC20Query: (
+      chainId: string,
+      chainGetter: ChainGetter,
+      address: string,
+      minimalDenom: string
+    ) => boolean;
   }): (
     queriesSetBase: QueriesSetBase,
     sharedContext: QuerySharedContext,
@@ -39,6 +45,7 @@ export const EthereumQueries = {
         ethereum: new EthereumQueriesImpl(
           queriesSetBase,
           sharedContext,
+          options.forceNativeERC20Query,
           chainId,
           chainGetter,
           options.coingeckoAPIBaseURL,
@@ -61,6 +68,12 @@ export class EthereumQueriesImpl {
   constructor(
     base: QueriesSetBase,
     sharedContext: QuerySharedContext,
+    protected readonly forceNativeERC20Query: (
+      chainId: string,
+      chainGetter: ChainGetter,
+      address: string,
+      minimalDenom: string
+    ) => boolean,
     protected chainId: string,
     protected chainGetter: ChainGetter,
     protected coingeckoAPIBaseURL: string,
@@ -70,7 +83,10 @@ export class EthereumQueriesImpl {
       new ObservableQueryEthereumERC20BalanceRegistry(sharedContext)
     );
     base.queryBalances.addBalanceRegistry(
-      new ObservableQueryThirdpartyERC20BalanceRegistry(sharedContext)
+      new ObservableQueryThirdpartyERC20BalanceRegistry(
+        sharedContext,
+        forceNativeERC20Query
+      )
     );
     base.queryBalances.addBalanceRegistry(
       new ObservableQueryEthAccountBalanceRegistry(sharedContext)

package/src/types.ts

@@ -1,4 +1,5 @@
 import { UnsignedTransaction } from "@ethersproject/transactions";
+import { EvmGasSimulationOutcome } from "@keplr-wallet/types";
 
 export type UnsignedEVMTransaction = UnsignedTransaction;
 
@@ -10,3 +11,32 @@ export type UnsignedEVMTransactionWithErc20Approvals =
       tokenAddress: string;
     }[];
   };
+
+export interface AccountState {
+  balance?: string;
+  code?: string;
+  nonce?: string;
+  storage?: Record<string, string>;
+}
+
+export interface AccountStateDiffTracerResult {
+  pre: Record<string, AccountState>;
+  post: Record<string, AccountState>;
+}
+
+export interface SimulateGasWithPendingErc20ApprovalResult {
+  outcome: EvmGasSimulationOutcome;
+  gasUsed?: number;
+  erc20ApprovalGasUsed?: number;
+}
+
+export interface StateOverrideAccountState {
+  balance?: string;
+  nonce?: string; // hex string for stateOverride
+  code?: string;
+  storage?: Record<string, string>;
+  state?: Record<string, string>;
+  stateDiff?: Record<string, string>;
+}
+
+export type StateOverride = Record<string, StateOverrideAccountState>;