@keplr-wallet/background 0.12.313 → 0.13.0

package/build/recent-send-history/service.js

@@ -16,22 +16,26 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RecentSendHistoryService = void 0;
+exports.RecentSendHistoryService = exports.UNKNOWN_TX_STATUS_TIMEOUT_MS = void 0;
 const cosmos_1 = require("@keplr-wallet/cosmos");
 const mobx_1 = require("mobx");
 const common_1 = require("@keplr-wallet/common");
+const types_1 = require("./types");
 const buffer_1 = require("buffer/");
-const types_1 = require("@keplr-wallet/types");
+const types_2 = require("@keplr-wallet/types");
 const unit_1 = require("@keplr-wallet/unit");
-const simple_fetch_1 = require("@keplr-wallet/simple-fetch");
 const hash_1 = require("@ethersproject/hash");
+const api_1 = require("./api");
+exports.UNKNOWN_TX_STATUS_TIMEOUT_MS = 5 * 60 * 1000; // 5분
 const SWAP_API_ENDPOINT = (_a = process.env["KEPLR_API_ENDPOINT"]) !== null && _a !== void 0 ? _a : "";
 class RecentSendHistoryService {
-    constructor(kvStore, chainsService, txService, notification) {
+    constructor(kvStore, chainsService, txService, analyticsService, notification, publisher) {
         this.kvStore = kvStore;
         this.chainsService = chainsService;
         this.txService = txService;
+        this.analyticsService = analyticsService;
         this.notification = notification;
+        this.publisher = publisher;
         // Key: {chain_identifier}/{type}
         this.recentSendHistoryMap = new Map();
         this.recentIBCHistorySeq = 0;
@@ -40,6 +44,9 @@ class RecentSendHistoryService {
         this.recentSkipHistorySeq = 0;
         // Key: id (sequence, it should be increased by 1 for each)
         this.recentSkipHistoryMap = new Map();
+        this.recentSwapV2HistorySeq = 0;
+        // Key: id (sequence, it should be increased by 1 for each)
+        this.recentSwapV2HistoryMap = new Map();
         // ibc packet forwarding을 위한 recursive function이면서
         // 실패시 retry를 수행하기 위해서 분리되어 있음
         // trackIBCPacketForwardingRecursive도 참고
@@ -51,505 +58,178 @@ class RecentSendHistoryService {
                 onFulfill();
                 return;
             }
-            const needRewind = (() => {
-                if (!history.txFulfilled) {
-                    return false;
-                }
-                if (history.ibcHistory.length === 0) {
-                    return false;
-                }
-                return history.ibcHistory.find((h) => h.error != null) != null;
-            })();
-            if (needRewind) {
-                if (history.ibcHistory.find((h) => h.rewoundButNextRewindingBlocked)) {
-                    onFulfill();
-                    return;
-                }
-                const isTimeoutPacket = history.packetTimeout || false;
-                const lastRewoundChannelIndex = history.ibcHistory.findIndex((h) => {
-                    if (h.rewound) {
-                        return true;
-                    }
-                });
-                const targetChannel = (() => {
-                    if (lastRewoundChannelIndex >= 0) {
-                        if (lastRewoundChannelIndex === 0) {
-                            return undefined;
-                        }
-                        return history.ibcHistory[lastRewoundChannelIndex - 1];
-                    }
-                    return history.ibcHistory.find((h) => h.error != null);
-                })();
-                const isSwapTargetChannel = targetChannel &&
-                    "swapChannelIndex" in history &&
-                    history.ibcHistory.indexOf(targetChannel) ===
-                        history.swapChannelIndex + 1;
-                if (targetChannel && targetChannel.sequence) {
-                    const prevChainInfo = (() => {
-                        const targetChannelIndex = history.ibcHistory.findIndex((h) => h === targetChannel);
-                        if (targetChannelIndex < 0) {
-                            return undefined;
-                        }
-                        if (targetChannelIndex === 0) {
-                            return this.chainsService.getChainInfo(history.chainId);
-                        }
-                        return this.chainsService.getChainInfo(history.ibcHistory[targetChannelIndex - 1].counterpartyChainId);
-                    })();
-                    if (prevChainInfo) {
-                        const txTracer = new cosmos_1.TendermintTxTracer(prevChainInfo.rpc, "/websocket");
-                        txTracer.addEventListener("close", onClose);
-                        txTracer.addEventListener("error", onError);
-                        txTracer
-                            .traceTx(isTimeoutPacket
-                            ? {
-                                // "timeout_packet.packet_src_port": targetChannel.portId,
-                                "timeout_packet.packet_src_channel": targetChannel.channelId,
-                                "timeout_packet.packet_sequence": targetChannel.sequence,
-                            }
-                            : {
-                                // "acknowledge_packet.packet_src_port": targetChannel.portId,
-                                "acknowledge_packet.packet_src_channel": targetChannel.channelId,
-                                "acknowledge_packet.packet_sequence": targetChannel.sequence,
-                            })
-                            .then((res) => {
-                            txTracer.close();
-                            if (!res) {
-                                return;
-                            }
-                            (0, mobx_1.runInAction)(() => {
-                                if (isSwapTargetChannel) {
-                                    const txs = res.txs
-                                        ? res.txs.map((res) => res.tx_result || res)
-                                        : [res.tx_result || res];
-                                    if (txs && Array.isArray(txs)) {
-                                        for (const tx of txs) {
-                                            if (targetChannel.sequence && "swapReceiver" in history) {
-                                                const index = isTimeoutPacket
-                                                    ? this.getIBCTimeoutPacketIndexFromTx(tx, targetChannel.portId, targetChannel.channelId, targetChannel.sequence)
-                                                    : this.getIBCAcknowledgementPacketIndexFromTx(tx, targetChannel.portId, targetChannel.channelId, targetChannel.sequence);
-                                                if (index >= 0) {
-                                                    // 좀 빡치게 timeout packet은 refund 로직이 실행되고 나서 "timeout_packet" event가 발생한다.
-                                                    const refunded = isTimeoutPacket
-                                                        ? this.getIBCSwapResAmountFromTx(tx, history.swapReceiver[history.swapChannelIndex + 1], (() => {
-                                                            const i = this.getLastIBCTimeoutPacketBeforeIndexFromTx(tx, index);
-                                                            if (i < 0) {
-                                                                return 0;
-                                                            }
-                                                            return i;
-                                                        })(), index)
-                                                        : this.getIBCSwapResAmountFromTx(tx, history.swapReceiver[history.swapChannelIndex + 1], index);
-                                                    history.swapRefundInfo = {
-                                                        chainId: prevChainInfo.chainId,
-                                                        amount: refunded,
-                                                    };
-                                                    targetChannel.rewoundButNextRewindingBlocked = true;
-                                                    break;
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                                targetChannel.rewound = true;
-                            });
-                            onFulfill();
-                            this.trackIBCPacketForwardingRecursive(id);
-                        });
-                    }
-                }
-            }
-            else if (!history.txFulfilled) {
-                const chainId = history.chainId;
-                const chainInfo = this.chainsService.getChainInfo(chainId);
-                const txHash = buffer_1.Buffer.from(history.txHash, "hex");
-                if (chainInfo) {
-                    const txTracer = new cosmos_1.TendermintTxTracer(chainInfo.rpc, "/websocket");
-                    txTracer.addEventListener("close", onClose);
-                    txTracer.addEventListener("error", onError);
-                    txTracer.traceTx(txHash).then((tx) => {
-                        txTracer.close();
+            if (!history.txFulfilled) {
+                this.trackIBCTxFulfillment({
+                    chainId: history.chainId,
+                    txHash: history.txHash,
+                    ibcHistory: history.ibcHistory,
+                    swapReceiver: "swapReceiver" in history ? history.swapReceiver : undefined,
+                    onTxFulfilled: (_tx, firstHopResAmount) => {
                         (0, mobx_1.runInAction)(() => {
                             history.txFulfilled = true;
-                            if (tx.code != null && tx.code !== 0) {
-                                history.txError = tx.log || tx.raw_log || "Unknown error";
-                                // TODO: In this case, it is not currently displayed in the UI. So, delete it for now.
-                                //       어차피 tx 자체의 실패는 notification으로 알 수 있기 때문에 여기서 지우더라도 유저는 실패를 인지할 수 있다.
-                                this.removeRecentIBCHistory(id);
-                            }
-                            else {
-                                if ("swapReceiver" in history) {
-                                    const resAmount = this.getIBCSwapResAmountFromTx(tx, history.swapReceiver[0]);
-                                    history.resAmount.push(resAmount);
-                                }
-                                if (history.ibcHistory.length > 0) {
-                                    const firstChannel = history.ibcHistory[0];
-                                    firstChannel.sequence = this.getIBCPacketSequenceFromTx(tx, firstChannel.portId, firstChannel.channelId);
-                                    firstChannel.dstChannelId = this.getDstChannelIdFromTx(tx, firstChannel.portId, firstChannel.channelId);
-                                    onFulfill();
-                                    this.trackIBCPacketForwardingRecursive(id);
-                                }
+                            if ("swapReceiver" in history && firstHopResAmount) {
+                                history.resAmount.push(firstHopResAmount);
                             }
                         });
-                    });
-                }
-            }
-            else if (history.ibcHistory.length > 0) {
-                const targetChannelIndex = history.ibcHistory.findIndex((history) => {
-                    return !history.completed;
+                        this.trackIBCPacketForwardingRecursive((onFulfill, onClose, onError) => {
+                            this.trackIBCPacketForwardingRecursiveInternal(id, onFulfill, onClose, onError);
+                        });
+                    },
+                    onTxError: () => {
+                        this.removeRecentIBCHistory(id);
+                    },
+                    onFulfill: onFulfill,
+                    onClose: onClose,
+                    onError: onError,
                 });
-                const targetChannel = targetChannelIndex >= 0
-                    ? history.ibcHistory[targetChannelIndex]
-                    : undefined;
-                const nextChannel = targetChannelIndex >= 0 &&
-                    targetChannelIndex + 1 < history.ibcHistory.length
-                    ? history.ibcHistory[targetChannelIndex + 1]
-                    : undefined;
-                if (targetChannel && targetChannel.sequence) {
-                    const closables = [];
-                    let _onFulfillOnce = false;
-                    const onFulfillOnce = () => {
-                        if (!_onFulfillOnce) {
-                            _onFulfillOnce = true;
-                            closables.forEach((closable) => {
-                                if (closable.readyState === cosmos_1.WsReadyState.OPEN ||
-                                    closable.readyState === cosmos_1.WsReadyState.CONNECTING) {
-                                    closable.close();
-                                }
-                            });
-                            onFulfill();
-                        }
-                    };
-                    let _onCloseOnce = false;
-                    const onCloseOnce = () => {
-                        if (!_onCloseOnce) {
-                            _onCloseOnce = true;
-                            closables.forEach((closable) => {
-                                if (closable.readyState === cosmos_1.WsReadyState.OPEN ||
-                                    closable.readyState === cosmos_1.WsReadyState.CONNECTING) {
-                                    closable.close();
-                                }
-                            });
-                            onClose();
-                        }
-                    };
-                    let _onErrorOnce = false;
-                    const onErrorOnce = () => {
-                        if (!_onErrorOnce) {
-                            _onErrorOnce = true;
-                            closables.forEach((closable) => {
-                                if (closable.readyState === cosmos_1.WsReadyState.OPEN ||
-                                    closable.readyState === cosmos_1.WsReadyState.CONNECTING) {
-                                    closable.close();
-                                }
+                return;
+            }
+            if (this.handleIbcRewindIfNeeded({
+                sourceChainId: history.chainId,
+                ibcHistory: history.ibcHistory,
+                packetTimeout: history.packetTimeout,
+                swapContext: "swapReceiver" in history && "swapChannelIndex" in history
+                    ? {
+                        swapReceiver: history.swapReceiver,
+                        swapChannelIndex: history.swapChannelIndex,
+                        setSwapRefundInfo: (refundInfo) => {
+                            (0, mobx_1.runInAction)(() => {
+                                history.swapRefundInfo = refundInfo;
                             });
-                            onError();
+                        },
+                    }
+                    : undefined,
+                onFulfill,
+                onClose,
+                onError,
+                onRewindComplete: () => {
+                    this.trackIBCPacketForwardingRecursive((onFulfill, onClose, onError) => {
+                        this.trackIBCPacketForwardingRecursiveInternal(id, onFulfill, onClose, onError);
+                    });
+                },
+            })) {
+                return;
+            }
+            this.trackIbcHopFlowWithTimeout({
+                ibcHistory: history.ibcHistory,
+                sourceChainId: history.chainId,
+                swapReceiver: "swapReceiver" in history ? history.swapReceiver : undefined,
+                onHopCompleted: (resAmount) => {
+                    (0, mobx_1.runInAction)(() => {
+                        if (resAmount && "resAmount" in history) {
+                            history.resAmount.push(resAmount);
                         }
-                    };
-                    const chainInfo = this.chainsService.getChainInfo(targetChannel.counterpartyChainId);
-                    if (chainInfo) {
-                        const queryEvents = {
-                            // "recv_packet.packet_src_port": targetChannel.portId,
-                            "recv_packet.packet_dst_channel": targetChannel.dstChannelId,
-                            "recv_packet.packet_sequence": targetChannel.sequence,
-                        };
-                        const txTracer = new cosmos_1.TendermintTxTracer(chainInfo.rpc, "/websocket");
-                        closables.push(txTracer);
-                        txTracer.addEventListener("close", onCloseOnce);
-                        txTracer.addEventListener("error", onErrorOnce);
-                        txTracer.traceTx(queryEvents).then((res) => {
-                            txTracer.close();
-                            if (!res) {
-                                return;
-                            }
-                            const txs = res.txs
-                                ? res.txs.map((res) => res.tx_result || res)
-                                : [res.tx_result || res];
-                            if (txs && Array.isArray(txs)) {
-                                (0, mobx_1.runInAction)(() => {
-                                    targetChannel.completed = true;
-                                    for (const tx of txs) {
-                                        try {
-                                            const ack = this.getIBCWriteAcknowledgementAckFromTx(tx, targetChannel.portId, targetChannel.channelId, targetChannel.sequence);
-                                            if (ack && ack.length > 0) {
-                                                const str = buffer_1.Buffer.from(ack);
-                                                try {
-                                                    const decoded = JSON.parse(str.toString());
-                                                    if (decoded.error) {
-                                                        // XXX: {key: 'packet_ack', value: '{"error":"ABCI code: 6: error handling packet: see events for details"}'}
-                                                        //      오류가 있을 경우 이딴식으로 오류가 나오기 때문에 뭐 유저에게 보여줄 방법이 없다...
-                                                        targetChannel.error = "Packet processing failed";
-                                                        onFulfillOnce();
-                                                        this.trackIBCPacketForwardingRecursive(id);
-                                                        break;
-                                                    }
-                                                }
-                                                catch (e) {
-                                                    // decode가 실패한 경우 사실 방법이 없다.
-                                                    // 일단 packet이 성공했다고 치고 진행한다.
-                                                    console.log(e);
-                                                }
-                                            }
-                                            // Because a tx can contain multiple messages, it's hard to know exactly which event we want.
-                                            // But logically, the events closest to the recv_packet event is the events we want.
-                                            const index = this.getIBCRecvPacketIndexFromTx(tx, targetChannel.portId, targetChannel.channelId, targetChannel.sequence);
-                                            if (index >= 0) {
-                                                if ("swapReceiver" in history) {
-                                                    const res = this.getIBCSwapResAmountFromTx(tx, history.swapReceiver[targetChannelIndex + 1], index);
-                                                    history.resAmount.push(res);
-                                                }
-                                                if (nextChannel) {
-                                                    nextChannel.sequence = this.getIBCPacketSequenceFromTx(tx, nextChannel.portId, nextChannel.channelId, index);
-                                                    nextChannel.dstChannelId = this.getDstChannelIdFromTx(tx, nextChannel.portId, nextChannel.channelId, index);
-                                                    onFulfillOnce();
-                                                    this.trackIBCPacketForwardingRecursive(id);
-                                                    break;
-                                                }
-                                                else {
-                                                    // Packet received to destination chain.
-                                                    if (history.notificationInfo && !history.notified) {
-                                                        (0, mobx_1.runInAction)(() => {
-                                                            history.notified = true;
-                                                        });
-                                                        const chainInfo = this.chainsService.getChainInfo(history.destinationChainId);
-                                                        if (chainInfo) {
-                                                            if ("swapType" in history) {
-                                                                if (history.resAmount.length > 0) {
-                                                                    const amount = history.resAmount[history.resAmount.length - 1];
-                                                                    const assetsText = amount
-                                                                        .filter((amt) => history.notificationInfo.currencies.find((cur) => cur.coinMinimalDenom === amt.denom))
-                                                                        .map((amt) => {
-                                                                        const currency = history.notificationInfo.currencies.find((cur) => cur.coinMinimalDenom === amt.denom);
-                                                                        return new unit_1.CoinPretty(currency, amt.amount)
-                                                                            .hideIBCMetadata(true)
-                                                                            .shrink(true)
-                                                                            .maxDecimals(6)
-                                                                            .inequalitySymbol(true)
-                                                                            .trim(true)
-                                                                            .toString();
-                                                                    });
-                                                                    if (assetsText.length > 0) {
-                                                                        // Notify user
-                                                                        this.notification.create({
-                                                                            iconRelativeUrl: "assets/logo-256.png",
-                                                                            title: "IBC Swap Succeeded",
-                                                                            message: `${assetsText.join(", ")} received on ${chainInfo.chainName}`,
-                                                                        });
-                                                                    }
-                                                                }
-                                                            }
-                                                            else {
-                                                                const assetsText = history.amount
-                                                                    .filter((amt) => history.notificationInfo.currencies.find((cur) => cur.coinMinimalDenom === amt.denom))
-                                                                    .map((amt) => {
-                                                                    const currency = history.notificationInfo.currencies.find((cur) => cur.coinMinimalDenom === amt.denom);
-                                                                    return new unit_1.CoinPretty(currency, amt.amount)
-                                                                        .hideIBCMetadata(true)
-                                                                        .shrink(true)
-                                                                        .maxDecimals(6)
-                                                                        .inequalitySymbol(true)
-                                                                        .trim(true)
-                                                                        .toString();
-                                                                });
-                                                                if (assetsText.length > 0) {
-                                                                    // Notify user
-                                                                    this.notification.create({
-                                                                        iconRelativeUrl: "assets/logo-256.png",
-                                                                        title: "IBC Transfer Succeeded",
-                                                                        message: `${assetsText.join(", ")} sent to ${chainInfo.chainName}`,
-                                                                    });
-                                                                }
-                                                            }
-                                                        }
-                                                    }
-                                                    onFulfillOnce();
-                                                    break;
-                                                }
-                                            }
-                                        }
-                                        catch (_a) {
-                                            // noop
+                    });
+                },
+                onAllCompleted: () => {
+                    const notificationInfo = history.notificationInfo;
+                    if (notificationInfo && !history.notified) {
+                        (0, mobx_1.runInAction)(() => {
+                            history.notified = true;
+                        });
+                        const chainInfo = this.chainsService.getChainInfo(history.destinationChainId);
+                        if (chainInfo) {
+                            if ("swapType" in history) {
+                                if (history.resAmount.length > 0) {
+                                    const amount = history.resAmount[history.resAmount.length - 1];
+                                    const assetsText = amount
+                                        .map((amt) => {
+                                        const currency = notificationInfo.currencies.find((cur) => cur.coinMinimalDenom === amt.denom);
+                                        if (!currency) {
+                                            return undefined;
                                         }
+                                        return new unit_1.CoinPretty(currency, amt.amount)
+                                            .hideIBCMetadata(true)
+                                            .shrink(true)
+                                            .maxDecimals(6)
+                                            .inequalitySymbol(true)
+                                            .trim(true)
+                                            .toString();
+                                    })
+                                        .filter((text) => Boolean(text));
+                                    if (assetsText.length > 0) {
+                                        this.notification.create({
+                                            iconRelativeUrl: "assets/logo-256.png",
+                                            title: "IBC Swap Succeeded",
+                                            message: `${assetsText.join(", ")} received on ${chainInfo.chainName}`,
+                                        });
                                     }
-                                });
+                                }
                             }
-                        });
-                    }
-                    let prevChainId = "";
-                    if (targetChannelIndex > 0) {
-                        prevChainId =
-                            history.ibcHistory[targetChannelIndex - 1].counterpartyChainId;
-                    }
-                    else {
-                        prevChainId = history.chainId;
-                    }
-                    if (prevChainId) {
-                        const prevChainInfo = this.chainsService.getChainInfo(prevChainId);
-                        if (prevChainInfo) {
-                            const queryEvents = {
-                                // acknowledge_packet과는 다르게 timeout_packet은 이전의 체인의 이벤트로부터만 알 수 있다.
-                                // 방법이 없기 때문에 여기서 이전의 체인으로부터 subscribe를 해서 이벤트를 받아야 한다.
-                                // 하지만 이 경우 ibc error tracking 로직에서 이것과 똑같은 subscription을 한번 더 하게 된다.
-                                // 이미 로직이 많이 복잡하기 때문에 로직을 덜 복잡하게 하기 위해서 이러한 비효율성(?)을 감수한다.
-                                // "timeout_packet.packet_src_port": targetChannel.portId,
-                                "timeout_packet.packet_src_channel": targetChannel.channelId,
-                                "timeout_packet.packet_sequence": targetChannel.sequence,
-                            };
-                            const txTracer = new cosmos_1.TendermintTxTracer(prevChainInfo.rpc, "/websocket");
-                            closables.push(txTracer);
-                            txTracer.addEventListener("close", onCloseOnce);
-                            txTracer.addEventListener("error", onErrorOnce);
-                            txTracer.traceTx(queryEvents).then((res) => {
-                                txTracer.close();
-                                if (!res) {
-                                    return;
+                            else {
+                                const assetsText = history.amount
+                                    .map((amt) => {
+                                    const currency = notificationInfo.currencies.find((cur) => cur.coinMinimalDenom === amt.denom);
+                                    if (!currency) {
+                                        return undefined;
+                                    }
+                                    return new unit_1.CoinPretty(currency, amt.amount)
+                                        .hideIBCMetadata(true)
+                                        .shrink(true)
+                                        .maxDecimals(6)
+                                        .inequalitySymbol(true)
+                                        .trim(true)
+                                        .toString();
+                                })
+                                    .filter((text) => Boolean(text));
+                                if (assetsText.length > 0) {
+                                    this.notification.create({
+                                        iconRelativeUrl: "assets/logo-256.png",
+                                        title: "IBC Transfer Succeeded",
+                                        message: `${assetsText.join(", ")} sent to ${chainInfo.chainName}`,
+                                    });
                                 }
-                                // 이 event가 발생한 시점에서 이미 timeout packet은 받은 상태이고
-                                // 이 경우 따로 정보를 얻을 필요는 없으므로 이후에 res를 쓰지는 않는다.
-                                // 위에 res null check는 사실 필요 없지만 혹시나 해서 넣어둔다.
-                                (0, mobx_1.runInAction)(() => {
-                                    targetChannel.error = "Packet timeout";
-                                    history.packetTimeout = true;
-                                    onFulfillOnce();
-                                    this.trackIBCPacketForwardingRecursive(id);
-                                });
-                            });
+                            }
                         }
                     }
-                }
-            }
+                },
+                onContinue: () => {
+                    this.trackIBCPacketForwardingRecursive((onFulfill, onClose, onError) => {
+                        this.trackIBCPacketForwardingRecursiveInternal(id, onFulfill, onClose, onError);
+                    });
+                },
+                onRetry: () => {
+                    this.trackIBCPacketForwardingRecursive((onFulfill, onClose, onError) => {
+                        this.trackIBCPacketForwardingRecursiveInternal(id, onFulfill, onClose, onError);
+                    });
+                },
+                onPacketTimeout: () => {
+                    (0, mobx_1.runInAction)(() => {
+                        history.packetTimeout = true;
+                    });
+                },
+                onFulfill,
+                onClose,
+                onError,
+            });
         };
-        this.checkAndTrackSkipSwapTxFulfilledRecursive = (history, onFulfill, onError) => {
-            const chainInfo = this.chainsService.getChainInfo(history.chainId);
+        this.checkAndTrackSwapTxFulfilledRecursive = (params) => {
+            const { chainId, txHash, onSuccess, onPending, onFailed, onError } = params;
+            const chainInfo = this.chainsService.getChainInfo(chainId);
             if (!chainInfo) {
-                onFulfill(false);
+                onFailed();
                 return;
             }
-            if (this.chainsService.isEvmChain(history.chainId)) {
-                const evmInfo = chainInfo.evm;
-                if (!evmInfo) {
-                    onFulfill(false);
-                    return;
-                }
-                (0, simple_fetch_1.simpleFetch)(evmInfo.rpc, {
-                    method: "POST",
-                    headers: {
-                        "content-type": "application/json",
-                        "request-source": origin,
-                    },
-                    body: JSON.stringify({
-                        jsonrpc: "2.0",
-                        method: "eth_getTransactionReceipt",
-                        params: [history.txHash],
-                        id: 1,
-                    }),
-                })
-                    .then((res) => {
-                    const txReceipt = res.data.result;
-                    if (txReceipt) {
-                        if (txReceipt.status === types_1.EthTxStatus.Success) {
-                            setTimeout(() => {
-                                (0, simple_fetch_1.simpleFetch)(SWAP_API_ENDPOINT, "/v1/swap/tx", {
-                                    method: "POST",
-                                    headers: Object.assign({ "content-type": "application/json" }, (() => {
-                                        const res = {};
-                                        if (process.env["SKIP_API_KEY"]) {
-                                            res.authorization = process.env["SKIP_API_KEY"];
-                                        }
-                                        return res;
-                                    })()),
-                                    body: JSON.stringify({
-                                        tx_hash: history.txHash,
-                                        chain_id: history.chainId.replace("eip155:", ""),
-                                    }),
-                                })
-                                    .then((result) => {
-                                    console.log(`Skip tx track result: ${JSON.stringify(result)}`);
-                                    onFulfill(true);
-                                })
-                                    .catch((e) => {
-                                    console.log(e);
-                                    this.removeRecentSkipHistory(history.id);
-                                    onFulfill(false);
-                                });
-                            }, 2000);
-                        }
-                        else {
-                            // tx가 실패한거면 종료
-                            this.removeRecentSkipHistory(history.id);
-                            onFulfill(false);
-                        }
-                    }
-                    else {
-                        onError();
-                    }
-                })
-                    .catch(() => {
-                    // 오류가 발생하면 종료
-                    onFulfill(false);
-                });
-            }
-            else {
-                const txTracer = new cosmos_1.TendermintTxTracer(chainInfo.rpc, "/websocket");
-                txTracer.addEventListener("error", () => onFulfill(false));
-                txTracer
-                    .traceTx(buffer_1.Buffer.from(history.txHash.replace("0x", ""), "hex"))
-                    .then((res) => {
-                    txTracer.close();
-                    let txResult;
-                    if (Array.isArray(res.txs)) {
-                        if (res.txs && res.txs.length > 0) {
-                            txResult = res.txs[0].tx_result;
-                        }
-                        else {
-                            // In case tx is not confirmed, just wait for next check
-                            onError();
-                            return;
-                        }
-                    }
-                    else {
-                        txResult = res;
-                    }
-                    if (!txResult || typeof txResult.code !== "number") {
+            this.resolveTxExecutionStatus(chainInfo, chainId, txHash)
+                .then((status) => {
+                switch (status) {
+                    case "success":
+                        onSuccess();
+                        break;
+                    case "pending":
+                        onPending();
+                        break;
+                    case "failed":
+                        onFailed();
+                        break;
+                    default:
                         onError();
-                        return;
-                    }
-                    if (txResult.code === 0) {
-                        setTimeout(() => {
-                            (0, simple_fetch_1.simpleFetch)(SWAP_API_ENDPOINT, "/v1/swap/tx", {
-                                method: "POST",
-                                headers: Object.assign({ "content-type": "application/json" }, (() => {
-                                    const res = {};
-                                    if (process.env["SKIP_API_KEY"]) {
-                                        res.authorization = process.env["SKIP_API_KEY"];
-                                    }
-                                    return res;
-                                })()),
-                                body: JSON.stringify({
-                                    tx_hash: history.txHash,
-                                    chain_id: history.chainId,
-                                }),
-                            })
-                                .then((result) => {
-                                console.log(`Skip tx track result: ${JSON.stringify(result)}`);
-                                onFulfill(true);
-                            })
-                                .catch((e) => {
-                                console.log(e);
-                                this.removeRecentSkipHistory(history.id);
-                                onFulfill(false);
-                            });
-                        }, 2000);
-                    }
-                    else {
-                        // tx가 실패한거면 종료
-                        this.removeRecentSkipHistory(history.id);
-                        onFulfill(false);
-                    }
-                })
-                    .catch(() => {
-                    // 오류가 발생하면 종료
-                    onFulfill(false);
-                });
-            }
+                        break;
+                }
+            })
+                .catch(() => {
+                onError();
+            });
         };
         this.checkAndUpdateSkipSwapHistoryRecursive = (id, onFulfill, onError) => {
             const history = this.getRecentSkipHistory(id);
@@ -576,21 +256,10 @@ class RecentSendHistoryService {
                 onFulfill();
                 return;
             }
-            // Skip API에 보낼 request 정보
-            const request = {
-                tx_hash: txHash,
-                chain_id: chainId.replace("eip155:", ""),
-            };
-            const requestParams = new URLSearchParams(request).toString();
-            (0, simple_fetch_1.simpleFetch)(SWAP_API_ENDPOINT, `/v1/swap/tx?${requestParams}`, {
-                method: "GET",
-                headers: Object.assign({ "content-type": "application/json" }, (() => {
-                    const res = {};
-                    if (process.env["SKIP_API_KEY"]) {
-                        res.authorization = process.env["SKIP_API_KEY"];
-                    }
-                    return res;
-                })()),
+            (0, api_1.requestSkipTxStatus)({
+                endpoint: SWAP_API_ENDPOINT,
+                chainId: chainId.replace("eip155:", ""),
+                txHash,
             })
                 .then((res) => {
                 var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
@@ -835,7 +504,7 @@ class RecentSendHistoryService {
                             history.routeIndex = simpleRoute.length - 1;
                         }
                         if (receiveTxHash) {
-                            this.trackDestinationAssetAmount(id, receiveTxHash, onFulfill);
+                            this.trackSkipDestinationAssetAmount(id, receiveTxHash, onFulfill);
                         }
                         else {
                             history.trackDone = true;
@@ -854,36 +523,35 @@ class RecentSendHistoryService {
                 onError();
             });
         };
+        // ============================================================================
+        // Chain removed handler
+        // ============================================================================
         this.onChainRemoved = (chainInfo) => {
             const chainIdentifier = cosmos_1.ChainIdHelper.parse(chainInfo.chainId).identifier;
-            (0, mobx_1.runInAction)(() => {
-                const removingIds = [];
-                for (const history of this.recentIBCHistoryMap.values()) {
-                    if (cosmos_1.ChainIdHelper.parse(history.chainId).identifier === chainIdentifier) {
-                        removingIds.push(history.id);
-                        continue;
-                    }
-                    if (cosmos_1.ChainIdHelper.parse(history.destinationChainId).identifier ===
-                        chainIdentifier) {
-                        removingIds.push(history.id);
-                        continue;
-                    }
-                    if (history.ibcHistory.some((history) => {
-                        return (cosmos_1.ChainIdHelper.parse(history.counterpartyChainId).identifier ===
-                            chainIdentifier);
-                    })) {
-                        removingIds.push(history.id);
-                        continue;
-                    }
-                }
-                for (const id of removingIds) {
-                    this.recentIBCHistoryMap.delete(id);
-                }
-            });
+            try {
+                this.removeIBCHistoriesByChainIdentifier(chainIdentifier);
+                this.removeSkipHistoriesByChainIdentifier(chainIdentifier);
+                this.removeSwapV2HistoriesByChainIdentifier(chainIdentifier);
+            }
+            catch (e) {
+                console.error(e);
+            }
         };
         (0, mobx_1.makeObservable)(this);
     }
+    // ============================================================================
+    // Init – load & persist histories
+    // ============================================================================
     init() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.initRecentSendHistory();
+            yield this.initRecentIBCHistory();
+            yield this.initRecentSkipHistory();
+            yield this.initRecentSwapV2History();
+            this.chainsService.addChainRemovedHandler(this.onChainRemoved);
+        });
+    }
+    initRecentSendHistory() {
         return __awaiter(this, void 0, void 0, function* () {
             const recentSendHistoryMapSaved = yield this.kvStore.get("recentSendHistoryMap");
             if (recentSendHistoryMapSaved) {
@@ -898,6 +566,10 @@ class RecentSendHistoryService {
                 const obj = Object.fromEntries(js);
                 this.kvStore.set("recentSendHistoryMap", obj);
             });
+        });
+    }
+    initRecentIBCHistory() {
+        return __awaiter(this, void 0, void 0, function* () {
             // 밑의 storage의 key들이 ibc transfer를 포함하는데
             // 이 이유는 이전에 transfer history만 지원되었을때
             // key를 그렇게 정했었기 때문이다
@@ -934,8 +606,14 @@ class RecentSendHistoryService {
                 this.kvStore.set("recentIBCTransferHistoryMap", obj);
             });
             for (const history of this.getRecentIBCHistories()) {
-                this.trackIBCPacketForwardingRecursive(history.id);
+                this.trackIBCPacketForwardingRecursive((onFulfill, onClose, onError) => {
+                    this.trackIBCPacketForwardingRecursiveInternal(history.id, onFulfill, onClose, onError);
+                });
             }
+        });
+    }
+    initRecentSkipHistory() {
+        return __awaiter(this, void 0, void 0, function* () {
             // Load skip history sequence from the storage
             const recentSkipHistorySeqSaved = yield this.kvStore.get("recentSkipHistorySeq");
             if (recentSkipHistorySeqSaved) {
@@ -972,9 +650,51 @@ class RecentSendHistoryService {
             for (const history of this.getRecentSkipHistories()) {
                 this.trackSkipSwapRecursive(history.id);
             }
-            this.chainsService.addChainRemovedHandler(this.onChainRemoved);
         });
     }
+    initRecentSwapV2History() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const recentSwapV2HistorySeqSaved = yield this.kvStore.get("recentSwapV2HistorySeq");
+            if (recentSwapV2HistorySeqSaved) {
+                (0, mobx_1.runInAction)(() => {
+                    this.recentSwapV2HistorySeq = recentSwapV2HistorySeqSaved;
+                });
+            }
+            // Save the swap v2 history sequence to the storage when the swap v2 history sequence is changed
+            (0, mobx_1.autorun)(() => {
+                const js = (0, mobx_1.toJS)(this.recentSwapV2HistorySeq);
+                this.kvStore.set("recentSwapV2HistorySeq", js);
+            });
+            // Load swap v2 history from the storage
+            const recentSwapV2HistoryMapSaved = yield this.kvStore.get("recentSwapV2HistoryMap");
+            if (recentSwapV2HistoryMapSaved) {
+                (0, mobx_1.runInAction)(() => {
+                    let entries = Object.entries(recentSwapV2HistoryMapSaved);
+                    entries = entries.sort(([, a], [, b]) => {
+                        return parseInt(a.id) - parseInt(b.id);
+                    });
+                    for (const [key, value] of entries) {
+                        this.recentSwapV2HistoryMap.set(key, value);
+                    }
+                });
+            }
+            // Save the swap v2 history to the storage when the swap v2 history is changed
+            (0, mobx_1.autorun)(() => {
+                const js = (0, mobx_1.toJS)(this.recentSwapV2HistoryMap);
+                const obj = Object.fromEntries(js);
+                this.kvStore.set("recentSwapV2HistoryMap", obj);
+            });
+            for (const history of this.getRecentSwapV2Histories()) {
+                this.trackSwapV2Recursive(history.id);
+                if (history.additionalTrackingData && !history.additionalTrackDone) {
+                    this.trackSwapV2AdditionalRecursive(history.id);
+                }
+            }
+        });
+    }
+    // ============================================================================
+    // Send tx and record
+    // ============================================================================
     sendTxAndRecord(type, sourceChainId, destinationChainId, tx, mode, silent, sender, recipient, amount, memo, ibcChannels, notificationInfo, shouldLegacyTrack = false) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
@@ -1004,19 +724,10 @@ class RecentSendHistoryService {
                             if (shouldLegacyTrack) {
                                 // no wait
                                 setTimeout(() => {
-                                    (0, simple_fetch_1.simpleFetch)(SWAP_API_ENDPOINT, "/v1/swap/tx", {
-                                        method: "POST",
-                                        headers: Object.assign({ "content-type": "application/json" }, (() => {
-                                            const res = {};
-                                            if (process.env["SKIP_API_KEY"]) {
-                                                res.authorization = process.env["SKIP_API_KEY"];
-                                            }
-                                            return res;
-                                        })()),
-                                        body: JSON.stringify({
-                                            tx_hash: buffer_1.Buffer.from(tx.hash).toString("hex"),
-                                            chain_id: sourceChainId,
-                                        }),
+                                    (0, api_1.requestSkipTxTrack)({
+                                        endpoint: SWAP_API_ENDPOINT,
+                                        chainId: sourceChainId,
+                                        txHash: buffer_1.Buffer.from(tx.hash).toString("hex"),
                                     })
                                         .then((result) => {
                                         console.log(`Skip tx track result: ${JSON.stringify(result)}`);
@@ -1032,11 +743,29 @@ class RecentSendHistoryService {
             });
             if (ibcChannels && ibcChannels.length > 0) {
                 const id = this.addRecentIBCTransferHistory(sourceChainId, destinationChainId, sender, recipient, amount, memo, ibcChannels, notificationInfo, txHash);
-                this.trackIBCPacketForwardingRecursive(id);
+                this.trackIBCPacketForwardingRecursive((onFulfill, onClose, onError) => {
+                    this.trackIBCPacketForwardingRecursiveInternal(id, onFulfill, onClose, onError);
+                });
             }
             return txHash;
         });
     }
+    getRecentSendHistories(chainId, type) {
+        var _a;
+        const key = `${cosmos_1.ChainIdHelper.parse(chainId).identifier}/${type}`;
+        return ((_a = this.recentSendHistoryMap.get(key)) !== null && _a !== void 0 ? _a : []).slice(0, 20);
+    }
+    addRecentSendHistory(chainId, type, history) {
+        var _a;
+        const key = `${cosmos_1.ChainIdHelper.parse(chainId).identifier}/${type}`;
+        let histories = (_a = this.recentSendHistoryMap.get(key)) !== null && _a !== void 0 ? _a : [];
+        histories.unshift(Object.assign({ timestamp: Date.now() }, history));
+        histories = histories.slice(0, 20);
+        this.recentSendHistoryMap.set(key, histories);
+    }
+    // ============================================================================
+    // Send tx and record IBC swap/transfer
+    // ============================================================================
     sendTxAndRecordIBCSwap(swapType, sourceChainId, destinationChainId, tx, mode, silent, sender, amount, memo, ibcChannels, destinationAsset, swapChannelIndex, swapReceiver, notificationInfo, shouldLegacyTrack = false) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
@@ -1051,19 +780,10 @@ class RecentSendHistoryService {
                             if (shouldLegacyTrack) {
                                 setTimeout(() => {
                                     // no wait
-                                    (0, simple_fetch_1.simpleFetch)(SWAP_API_ENDPOINT, "/v1/swap/tx", {
-                                        method: "POST",
-                                        headers: Object.assign({ "content-type": "application/json" }, (() => {
-                                            const res = {};
-                                            if (process.env["SKIP_API_KEY"]) {
-                                                res.authorization = process.env["SKIP_API_KEY"];
-                                            }
-                                            return res;
-                                        })()),
-                                        body: JSON.stringify({
-                                            tx_hash: buffer_1.Buffer.from(tx.hash).toString("hex"),
-                                            chain_id: sourceChainId,
-                                        }),
+                                    (0, api_1.requestSkipTxTrack)({
+                                        endpoint: SWAP_API_ENDPOINT,
+                                        chainId: sourceChainId,
+                                        txHash: buffer_1.Buffer.from(tx.hash).toString("hex"),
                                     })
                                         .then((result) => {
                                         console.log(`Skip tx track result: ${JSON.stringify(result)}`);
@@ -1079,49 +799,13 @@ class RecentSendHistoryService {
             });
             if (shouldLegacyTrack) {
                 const id = this.addRecentIBCSwapHistory(swapType, sourceChainId, destinationChainId, sender, amount, memo, ibcChannels, destinationAsset, swapChannelIndex, swapReceiver, notificationInfo, txHash);
-                this.trackIBCPacketForwardingRecursive(id);
+                this.trackIBCPacketForwardingRecursive((onFulfill, onClose, onError) => {
+                    this.trackIBCPacketForwardingRecursiveInternal(id, onFulfill, onClose, onError);
+                });
             }
             return txHash;
         });
     }
-    trackIBCPacketForwardingRecursive(id) {
-        (0, common_1.retry)(() => {
-            return new Promise((resolve, reject) => {
-                this.trackIBCPacketForwardingRecursiveInternal(id, () => {
-                    resolve();
-                }, () => {
-                    // reject if ws closed before fulfilled
-                    // 하지만 로직상 fulfill 되기 전에 ws가 닫히는게 되기 때문에
-                    // delay를 좀 준다.
-                    // 현재 trackIBCPacketForwardingRecursiveInternal에 ws close 이후에는 동기적인 로직밖에 없으므로
-                    // 문제될게 없다.
-                    setTimeout(() => {
-                        reject();
-                    }, 500);
-                }, () => {
-                    // reject if ws error occurred before fulfilled
-                    reject();
-                });
-            });
-        }, {
-            maxRetries: 10,
-            waitMsAfterError: 10 * 1000,
-            maxWaitMsAfterError: 5 * 60 * 1000, // 5min
-        });
-    }
-    getRecentSendHistories(chainId, type) {
-        var _a;
-        const key = `${cosmos_1.ChainIdHelper.parse(chainId).identifier}/${type}`;
-        return ((_a = this.recentSendHistoryMap.get(key)) !== null && _a !== void 0 ? _a : []).slice(0, 20);
-    }
-    addRecentSendHistory(chainId, type, history) {
-        var _a;
-        const key = `${cosmos_1.ChainIdHelper.parse(chainId).identifier}/${type}`;
-        let histories = (_a = this.recentSendHistoryMap.get(key)) !== null && _a !== void 0 ? _a : [];
-        histories.unshift(Object.assign({ timestamp: Date.now() }, history));
-        histories = histories.slice(0, 20);
-        this.recentSendHistoryMap.set(key, histories);
-    }
     addRecentIBCTransferHistory(chainId, destinationChainId, sender, recipient, amount, memo, ibcChannels, notificationInfo, txHash) {
         const id = (this.recentIBCHistorySeq++).toString();
         const history = {
@@ -1201,16 +885,311 @@ class RecentSendHistoryService {
     clearAllRecentIBCHistory() {
         this.recentIBCHistoryMap.clear();
     }
-    // skip related methods
-    recordTxWithSkipSwap(sourceChainId, destinationChainId, destinationAsset, simpleRoute, sender, recipient, amount, notificationInfo, routeDurationSeconds = 0, txHash, isOnlyUseBridge) {
-        const id = (this.recentIBCHistorySeq++).toString();
-        const history = {
-            id,
-            chainId: sourceChainId,
-            destinationChainId: destinationChainId,
-            destinationAsset,
-            simpleRoute,
-            sender,
+    // ============================================================================
+    // Common functions for history tracking (IBC, Skip, Swap V2)
+    // ============================================================================
+    trackIBCPacketForwardingRecursive(trackHandler) {
+        (0, common_1.retry)(() => {
+            return new Promise((resolve, reject) => {
+                trackHandler(() => {
+                    resolve();
+                }, () => {
+                    // reject if ws closed before fulfilled
+                    // 하지만 로직상 fulfill 되기 전에 ws가 닫히는게 되기 때문에
+                    // delay를 좀 준다.
+                    // 현재 trackIBCPacketForwardingRecursiveInternal에 ws close 이후에는 동기적인 로직밖에 없으므로
+                    // 문제될게 없다.
+                    setTimeout(() => {
+                        reject();
+                    }, 500);
+                }, () => {
+                    // reject if ws error occurred before fulfilled
+                    reject();
+                });
+            });
+        }, {
+            maxRetries: 10,
+            waitMsAfterError: 10 * 1000,
+            maxWaitMsAfterError: 5 * 60 * 1000, // 5min
+        });
+    }
+    resolveTxExecutionStatus(chainInfo, chainId, txHash) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.chainsService.isEvmChain(chainId)) {
+                const evmInfo = chainInfo.evm;
+                if (!evmInfo) {
+                    return Promise.resolve("error");
+                }
+                const res = yield (0, api_1.requestEthTxReceipt)({
+                    rpc: evmInfo.rpc,
+                    txHash,
+                    origin,
+                });
+                if (res.data.error) {
+                    return "error";
+                }
+                const txReceipt = res.data.result;
+                if (!txReceipt) {
+                    return "pending";
+                }
+                if (txReceipt.status === types_2.EthTxStatus.Success) {
+                    return "success";
+                }
+                return "failed";
+            }
+            const txTracer = new cosmos_1.TendermintTxTracer(chainInfo.rpc, "/websocket");
+            txTracer.addEventListener("error", () => {
+                txTracer.close();
+            });
+            return txTracer
+                .traceTx(buffer_1.Buffer.from(txHash.replace("0x", ""), "hex"))
+                .then((res) => {
+                txTracer.close();
+                const txResult = Array.isArray(res.txs)
+                    ? res.txs && res.txs.length > 0
+                        ? res.txs[0].tx_result
+                        : undefined
+                    : res;
+                if (!txResult) {
+                    return "pending";
+                }
+                if (typeof txResult.code !== "number") {
+                    return "error";
+                }
+                return txResult.code === 0 ? "success" : "failed";
+            })
+                .catch(() => {
+                txTracer.close();
+                return "error";
+            });
+        });
+    }
+    trackDestinationAssetAmount(params) {
+        const { chainId, txHash, recipient, targetDenom, onResult, onRefund, onFulfill, } = params;
+        const chainInfo = this.chainsService.getChainInfo(chainId);
+        if (!chainInfo) {
+            onFulfill();
+            return;
+        }
+        if (this.chainsService.isEvmChain(chainId)) {
+            this.traceEVMTransactionResult({
+                chainId,
+                txHash,
+                recipient,
+                targetDenom,
+                onResult: (result) => {
+                    if (result.resAmount) {
+                        onResult(result.resAmount);
+                    }
+                    if (result.refundInfo && onRefund) {
+                        onRefund(result.refundInfo, result.error);
+                    }
+                },
+                onFulfill,
+            });
+            return;
+        }
+        this.traceCosmosTransactionResult({
+            chainInfo,
+            txHash,
+            recipient,
+            onResult,
+            onFulfill,
+        });
+    }
+    traceCosmosTransactionResult(params) {
+        const { chainInfo, txHash, recipient, onResult, onFulfill } = params;
+        const txTracer = new cosmos_1.TendermintTxTracer(chainInfo.rpc, "/websocket");
+        txTracer.addEventListener("error", () => onFulfill());
+        txTracer
+            .queryTx({
+            "tx.hash": txHash,
+        })
+            .then((res) => {
+            txTracer.close();
+            if (!res) {
+                return;
+            }
+            const txs = res.txs
+                ? res.txs.map((r) => r.tx_result || r)
+                : [res.tx_result || res];
+            for (const tx of txs) {
+                const resAmount = this.getIBCSwapResAmountFromTx(tx, recipient);
+                onResult(resAmount);
+                return;
+            }
+        })
+            .finally(() => {
+            onFulfill();
+        });
+    }
+    // CHECK: move tracing logic (requestEthTxReceipt, requestEthTxTrace, parseEVMTxReceiptLogs) to tx-ethereum service
+    traceEVMTransactionResult(params) {
+        const { chainId, txHash, recipient, targetDenom, onResult, onFulfill } = params;
+        const chainInfo = this.chainsService.getChainInfo(chainId);
+        if (!chainInfo) {
+            onResult({ success: false });
+            onFulfill();
+            return;
+        }
+        if (!this.chainsService.isEvmChain(chainId)) {
+            onResult({ success: false, error: "Not an EVM chain" });
+            onFulfill();
+            return;
+        }
+        const evmInfo = chainInfo.evm;
+        if (!evmInfo) {
+            onResult({ success: false });
+            onFulfill();
+            return;
+        }
+        (0, api_1.requestEthTxReceipt)({
+            rpc: evmInfo.rpc,
+            txHash,
+            origin,
+        })
+            .then((res) => {
+            const txReceipt = res.data.result;
+            if (!txReceipt) {
+                onResult({ success: false });
+                return;
+            }
+            (0, api_1.requestEthTxTrace)({
+                rpc: evmInfo.rpc,
+                txHash,
+                origin,
+            }).then((traceRes) => {
+                let isFoundFromCall = false;
+                const foundResAmount = [];
+                if (traceRes.data.result) {
+                    const searchForTransfers = (calls) => {
+                        var _a, _b;
+                        for (const call of calls) {
+                            if (call.type === "CALL" &&
+                                ((_a = call.to) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === recipient.toLowerCase()) {
+                                const isERC20Transfer = (_b = call.input) === null || _b === void 0 ? void 0 : _b.startsWith("0xa9059cbb");
+                                const value = BigInt(isERC20Transfer
+                                    ? `0x${call.input.substring(74)}`
+                                    : call.value || "0x0");
+                                foundResAmount.push({
+                                    amount: value.toString(10),
+                                    denom: targetDenom,
+                                });
+                                isFoundFromCall = true;
+                            }
+                            if (call.calls && call.calls.length > 0) {
+                                searchForTransfers(call.calls);
+                            }
+                        }
+                    };
+                    searchForTransfers(traceRes.data.result.calls || []);
+                }
+                if (isFoundFromCall) {
+                    onResult({ success: true, resAmount: foundResAmount });
+                    return;
+                }
+                // fallback to logs if debug_traceTransaction fails
+                this.parseEVMTxReceiptLogs({
+                    txReceipt,
+                    recipient,
+                    targetChainId: chainId,
+                    targetDenom,
+                    onResult,
+                });
+            });
+        })
+            .finally(() => {
+            onFulfill();
+        });
+    }
+    parseEVMTxReceiptLogs(params) {
+        var _a;
+        const { txReceipt, recipient, targetChainId, targetDenom, onResult } = params;
+        const logs = txReceipt.logs;
+        const transferTopic = (0, hash_1.id)("Transfer(address,address,uint256)");
+        const withdrawTopic = (0, hash_1.id)("Withdrawal(address,uint256)");
+        const hyperlaneReceiveTopic = (0, hash_1.id)("ReceivedTransferRemote(uint32,bytes32,uint256)");
+        for (const log of logs) {
+            if (log.topics[0] === transferTopic) {
+                const to = "0x" + log.topics[2].slice(26);
+                if (to.toLowerCase() === recipient.toLowerCase()) {
+                    const expectedAssetDenom = targetDenom.replace("erc20:", "");
+                    const amount = BigInt(log.data).toString(10);
+                    if (log.address.toLowerCase() === expectedAssetDenom.toLowerCase()) {
+                        onResult({
+                            success: true,
+                            resAmount: [{ amount, denom: targetDenom }],
+                        });
+                    }
+                    else {
+                        console.log("refunded", log.address);
+                        // Transfer 토픽인 경우엔 ERC20의 tranfer 호출일텐데
+                        // 받을 토큰의 컨트랙트가 아닌 다른 컨트랙트에서 호출된 경우는 Swap을 실패한 것으로 추측
+                        // 고로 실제로 받은 토큰의 컨트랙트 주소로 환불 정보에 저장한다.
+                        onResult({
+                            success: false,
+                            error: "Swap failed",
+                            refundInfo: {
+                                chainId: targetChainId,
+                                amount: [
+                                    {
+                                        amount,
+                                        denom: `erc20:${log.address.toLowerCase()}`,
+                                    },
+                                ],
+                            },
+                        });
+                    }
+                    return;
+                }
+            }
+            else if (log.topics[0] === withdrawTopic) {
+                const to = "0x" + log.topics[1].slice(26);
+                if (to.toLowerCase() === ((_a = txReceipt.to) === null || _a === void 0 ? void 0 : _a.toLowerCase())) {
+                    const amount = BigInt(log.data).toString(10);
+                    onResult({
+                        success: true,
+                        resAmount: [{ amount, denom: targetDenom }],
+                    });
+                    return;
+                }
+            }
+            else if (log.topics[0] === hyperlaneReceiveTopic) {
+                const to = "0x" + log.topics[2].slice(26);
+                if (to.toLowerCase() === recipient.toLowerCase()) {
+                    const amount = BigInt(log.data).toString(10);
+                    // Hyperlane을 통해 Forma로 TIA를 받는 경우 토큰 수량이 decimal 6으로 기록되는데,
+                    // Forma에서는 decimal 18이기 때문에 12자리 만큼 0을 붙여준다.
+                    onResult({
+                        success: true,
+                        resAmount: [
+                            {
+                                amount: targetDenom === "forma-native"
+                                    ? `${amount}000000000000`
+                                    : amount,
+                                denom: targetDenom,
+                            },
+                        ],
+                    });
+                    return;
+                }
+            }
+        }
+        // 결과를 찾지 못한 경우
+        onResult({ success: false });
+    }
+    // ============================================================================
+    // Skip swap history
+    // ============================================================================
+    recordTxWithSkipSwap(sourceChainId, destinationChainId, destinationAsset, simpleRoute, sender, recipient, amount, notificationInfo, routeDurationSeconds = 0, txHash, isOnlyUseBridge) {
+        const id = (this.recentIBCHistorySeq++).toString();
+        const history = {
+            id,
+            chainId: sourceChainId,
+            destinationChainId: destinationChainId,
+            destinationAsset,
+            simpleRoute,
+            sender,
             recipient,
             amount,
             notificationInfo,
@@ -1228,241 +1207,1302 @@ class RecentSendHistoryService {
     getRecentSkipHistory(id) {
         return this.recentSkipHistoryMap.get(id);
     }
-    getRecentSkipHistories() {
-        return Array.from(this.recentSkipHistoryMap.values()).filter((history) => {
-            if (!this.chainsService.hasChainInfo(history.chainId)) {
-                return false;
+    getRecentSkipHistories() {
+        return Array.from(this.recentSkipHistoryMap.values()).filter((history) => {
+            if (!this.chainsService.hasChainInfo(history.chainId)) {
+                return false;
+            }
+            if (!this.chainsService.hasChainInfo(history.destinationChainId)) {
+                return false;
+            }
+            if (history.simpleRoute.some((route) => {
+                return !this.chainsService.hasChainInfo(route.chainId);
+            })) {
+                return false;
+            }
+            return true;
+        });
+    }
+    trackSkipSwapRecursive(id) {
+        const history = this.getRecentSkipHistory(id);
+        if (!history) {
+            return;
+        }
+        // check tx fulfilled and update history
+        (0, common_1.retry)(() => {
+            return new Promise((txFulfilledResolve, txFulfilledReject) => {
+                this.checkAndTrackSwapTxFulfilledRecursive({
+                    chainId: history.chainId,
+                    txHash: history.txHash,
+                    onSuccess: () => {
+                        this.requestSkipTxTrackInternal({
+                            chainId: history.chainId,
+                            txHash: history.txHash,
+                            onRemoveHistory: () => this.removeRecentSkipHistory(id),
+                            onFulfill: (keepTracking) => {
+                                txFulfilledResolve();
+                                if (!keepTracking) {
+                                    return;
+                                }
+                                (0, common_1.retry)(() => {
+                                    return new Promise((resolve, reject) => {
+                                        this.checkAndUpdateSkipSwapHistoryRecursive(id, resolve, reject);
+                                    });
+                                }, {
+                                    maxRetries: 50,
+                                    waitMsAfterError: 500,
+                                    maxWaitMsAfterError: 15000,
+                                });
+                            },
+                        });
+                    },
+                    onPending: txFulfilledReject,
+                    onFailed: () => {
+                        this.removeRecentSkipHistory(id);
+                        txFulfilledResolve();
+                    },
+                    onError: () => {
+                        txFulfilledResolve();
+                    },
+                });
+            });
+        }, {
+            maxRetries: 50,
+            waitMsAfterError: 500,
+            maxWaitMsAfterError: 15000,
+        });
+    }
+    requestSkipTxTrackInternal(params) {
+        const { chainId, txHash, onFulfill, onRemoveHistory } = params;
+        const chainIdForApi = this.chainsService.isEvmChain(chainId)
+            ? chainId.replace("eip155:", "")
+            : chainId;
+        setTimeout(() => {
+            (0, api_1.requestSkipTxTrack)({
+                endpoint: SWAP_API_ENDPOINT,
+                chainId: chainIdForApi,
+                txHash,
+            })
+                .then((result) => {
+                console.log(`Skip tx track result: ${JSON.stringify(result)}`);
+                onFulfill(true);
+            })
+                .catch((e) => {
+                console.log(e);
+                onRemoveHistory();
+                onFulfill(false);
+            });
+        }, 2000);
+    }
+    trackSkipDestinationAssetAmount(historyId, txHash, onFulfill) {
+        const history = this.getRecentSkipHistory(historyId);
+        if (!history) {
+            onFulfill();
+            return;
+        }
+        const chainInfo = this.chainsService.getChainInfo(history.destinationChainId);
+        if (!chainInfo) {
+            onFulfill();
+            return;
+        }
+        this.trackDestinationAssetAmount({
+            chainId: history.destinationChainId,
+            txHash,
+            recipient: history.recipient,
+            targetDenom: history.destinationAsset.denom,
+            onResult: (resAmount) => {
+                (0, mobx_1.runInAction)(() => {
+                    history.resAmount.push(resAmount);
+                    history.trackDone = true;
+                });
+            },
+            onRefund: (refundInfo, error) => {
+                (0, mobx_1.runInAction)(() => {
+                    history.trackError = error;
+                    history.swapRefundInfo = refundInfo;
+                    history.trackDone = true;
+                });
+            },
+            onFulfill: () => {
+                // ensure completion even if no result parsed
+                (0, mobx_1.runInAction)(() => {
+                    history.trackDone = true;
+                });
+                onFulfill();
+            },
+        });
+    }
+    removeRecentSkipHistory(id) {
+        return this.recentSkipHistoryMap.delete(id);
+    }
+    clearAllRecentSkipHistory() {
+        this.recentSkipHistoryMap.clear();
+    }
+    // ============================================================================
+    // Swap V2 history
+    // ============================================================================
+    recordTxWithSwapV2(fromChainId, toChainId, provider, destinationAsset, simpleRoute, sender, recipient, amount, notificationInfo, routeDurationSeconds = 0, txHash, isOnlyUseBridge, backgroundExecutionId) {
+        const id = (this.recentSwapV2HistorySeq++).toString();
+        const history = {
+            id,
+            fromChainId,
+            toChainId,
+            provider,
+            timestamp: Date.now(),
+            sender,
+            recipient,
+            amount,
+            notificationInfo,
+            routeDurationSeconds,
+            txHash,
+            isOnlyUseBridge,
+            status: types_1.SwapV2TxStatus.IN_PROGRESS,
+            simpleRoute,
+            routeIndex: -1,
+            destinationAsset,
+            resAmount: [],
+            assetLocationInfo: undefined,
+            notified: undefined,
+            backgroundExecutionId,
+        };
+        this.recentSwapV2HistoryMap.set(id, history);
+        this.trackSwapV2Recursive(id);
+        return id;
+    }
+    trackSwapV2Recursive(id) {
+        const history = this.getRecentSwapV2History(id);
+        if (!history) {
+            return;
+        }
+        (0, common_1.retry)(() => {
+            return new Promise((txFulfilledResolve, txFulfilledReject) => {
+                this.checkAndTrackSwapTxFulfilledRecursive({
+                    chainId: history.fromChainId,
+                    txHash: history.txHash,
+                    onSuccess: () => {
+                        txFulfilledResolve();
+                        (0, common_1.retry)(() => {
+                            return new Promise((resolve, reject) => {
+                                this.checkAndUpdateSwapV2HistoryRecursive(id, resolve, reject);
+                            });
+                        }, {
+                            maxRetries: 60,
+                            waitMsAfterError: 1000,
+                            maxWaitMsAfterError: 45000,
+                        });
+                    },
+                    onPending: txFulfilledReject,
+                    onFailed: () => {
+                        this.removeRecentSwapV2History(id);
+                        txFulfilledResolve();
+                    },
+                    onError: txFulfilledResolve,
+                });
+            });
+        }, {
+            maxRetries: 60,
+            waitMsAfterError: 1000,
+            maxWaitMsAfterError: 45000,
+        });
+    }
+    checkAndUpdateSwapV2HistoryRecursive(id, onFulfill, onError) {
+        const history = this.getRecentSwapV2History(id);
+        if (!history) {
+            onFulfill();
+            return;
+        }
+        // if already tracked, fulfill
+        if (history.trackDone) {
+            onFulfill();
+            return;
+        }
+        const { txHash, fromChainId, toChainId, provider } = history;
+        const normalizeChainId = (chainId) => {
+            return chainId.replace("eip155:", "");
+        };
+        (0, api_1.requestSwapV2TxStatus)({
+            endpoint: SWAP_API_ENDPOINT,
+            fromChainId: normalizeChainId(fromChainId),
+            toChainId: normalizeChainId(toChainId),
+            provider,
+            txHash,
+        })
+            .then((res) => {
+            this.processSwapV2StatusResponse(id, res.data, onFulfill, onError);
+        })
+            .catch((e) => {
+            console.error("SwapV2 status tracking error:", e);
+            onError();
+        });
+    }
+    processSwapV2StatusResponse(id, response, onFulfill, onError) {
+        var _a, _b, _c;
+        const history = this.getRecentSwapV2History(id);
+        if (!history) {
+            onFulfill();
+            return;
+        }
+        const { status, steps, asset_location } = response;
+        const { simpleRoute } = history;
+        const prevRouteIndex = history.routeIndex;
+        // 모든 상태 즉시 업데이트 (UNKNOWN 포함)
+        history.status = status;
+        history.trackError = undefined;
+        // This might be the state where tracking has just started,
+        // so handle the error and retry
+        if (!steps || steps.length === 0) {
+            if (status === types_1.SwapV2TxStatus.IN_PROGRESS ||
+                status === types_1.SwapV2TxStatus.UNKNOWN) {
+                onError();
+            }
+            else {
+                // swap on single evm chain might not have steps
+                history.trackDone = true;
+                onFulfill();
+            }
+            return;
+        }
+        // find current step (not success first, otherwise last step)
+        const currentStep = (_a = steps.find((s) => s.status !== types_1.SwapV2RouteStepStatus.SUCCESS)) !== null && _a !== void 0 ? _a : steps[steps.length - 1];
+        const normalizeChainId = (chainId) => {
+            return chainId.replace("eip155:", "").toLowerCase();
+        };
+        // Find the LAST step that matches the actual destination chain (history.toChainId)
+        // Use reverse + find to handle routes that visit the destination chain multiple times
+        // This handles cases where intermediate steps fail but the final destination is reached
+        const destinationStep = [...steps].reverse().find((s) => {
+            if (!s.chain_id) {
+                return false;
+            }
+            return (normalizeChainId(s.chain_id) === normalizeChainId(history.toChainId));
+        });
+        const isDestinationStepSuccessful = destinationStep &&
+            destinationStep.status === types_1.SwapV2RouteStepStatus.SUCCESS &&
+            !!destinationStep.tx_hash;
+        const findSimpleRouteIndex = (chainId) => {
+            const normalizedChainId = normalizeChainId(chainId);
+            for (let i = 0; i < simpleRoute.length; i++) {
+                const routeChainId = normalizeChainId(simpleRoute[i].chainId);
+                if (routeChainId === normalizedChainId) {
+                    return i;
+                }
+            }
+            return -1;
+        };
+        // NOTE: The lengths of simpleRoute and steps may differ.
+        let updatedRouteIndex = Math.max(0, history.routeIndex);
+        // 1. Find highest completed simpleRoute index from all SUCCESS steps
+        let highestCompletedIndex = -1;
+        for (const step of steps) {
+            if (step.status === types_1.SwapV2RouteStepStatus.SUCCESS && step.chain_id) {
+                const routeIdx = findSimpleRouteIndex(step.chain_id);
+                if (routeIdx > highestCompletedIndex) {
+                    highestCompletedIndex = routeIdx;
+                }
+            }
+        }
+        // 2. Also check if currentStep is in simpleRoute
+        let currentStepIndex = -1;
+        if (currentStep.chain_id) {
+            currentStepIndex = findSimpleRouteIndex(currentStep.chain_id);
+        }
+        // 3. Use the higher value as updatedRouteIndex
+        const candidateIndex = Math.max(highestCompletedIndex, currentStepIndex);
+        if (candidateIndex >= 0) {
+            updatedRouteIndex = candidateIndex;
+        }
+        const publishExecutableChains = (chainIds) => {
+            if (!history.backgroundExecutionId) {
+                return;
+            }
+            const executableChainIds = chainIds !== null && chainIds !== void 0 ? chainIds : this.getExecutableChainIdsFromSwapV2History(history);
+            this.publisher.publish({
+                type: "executable",
+                executionId: history.backgroundExecutionId,
+                executableChainIds,
+            });
+        };
+        const isUnknownStatus = status === types_1.SwapV2TxStatus.UNKNOWN ||
+            steps.some((s) => s.status === types_1.SwapV2RouteStepStatus.UNKNOWN);
+        if (isUnknownStatus) {
+            if (!history.unknownStatusFirstSeenAt) {
+                // UNKNOWN 상태 처음 발견 - 타임스탬프 기록
+                history.unknownStatusFirstSeenAt = Date.now();
+            }
+            else {
+                const elapsedMs = Date.now() - history.unknownStatusFirstSeenAt;
+                if (elapsedMs >= exports.UNKNOWN_TX_STATUS_TIMEOUT_MS) {
+                    this.analyticsService.logEventIgnoreError("swapV2UnknownTxStatusWithTimeout", {
+                        provider: history.provider,
+                        fromChainId: history.fromChainId,
+                        toChainId: history.toChainId,
+                        txHash: history.txHash,
+                        executedAt: history.timestamp,
+                    });
+                    history.trackDone = true;
+                    onFulfill();
+                    return;
+                }
+            }
+        }
+        else {
+            // UNKNOWN 상태가 아니면 타임스탬프 초기화
+            if (history.unknownStatusFirstSeenAt !== undefined) {
+                history.unknownStatusFirstSeenAt = undefined;
+            }
+        }
+        switch (status) {
+            case types_1.SwapV2TxStatus.IN_PROGRESS:
+            case types_1.SwapV2TxStatus.UNKNOWN:
+                // publish executable chains if routeIndex increased
+                if (updatedRouteIndex > prevRouteIndex) {
+                    history.routeIndex = updatedRouteIndex;
+                    publishExecutableChains();
+                }
+                // Continue polling
+                onError();
+                break;
+            case types_1.SwapV2TxStatus.SUCCESS:
+            case types_1.SwapV2TxStatus.PARTIAL_SUCCESS:
+            case types_1.SwapV2TxStatus.FAILED:
+                // If current step is still in progress, retry a few more times before finalizing
+                if (currentStep.status === types_1.SwapV2RouteStepStatus.IN_PROGRESS) {
+                    const maxRetries = 3;
+                    const retryCount = (_b = history.finalizationRetryCount) !== null && _b !== void 0 ? _b : 0;
+                    if (retryCount < maxRetries) {
+                        history.finalizationRetryCount = retryCount + 1;
+                        onError();
+                        break;
+                    }
+                    // Max retries reached, fall through to finalize
+                }
+                let executableChainIdsToPublish;
+                // NOTE: 현재 asset_location은 skip의 multichain operation인 경우에만 주어지는 값이다.
+                if (asset_location) {
+                    const chainId = asset_location.chain_id;
+                    const evmLikeChainId = Number(chainId);
+                    const isEVMChainId = !Number.isNaN(evmLikeChainId) && evmLikeChainId > 0;
+                    const chainIdInKeplr = isEVMChainId ? `eip155:${chainId}` : chainId;
+                    const denomInKeplr = isEVMChainId
+                        ? `erc20:${asset_location.denom}`
+                        : asset_location.denom;
+                    // destination chain에 destination denom으로 도착했으면 완전 성공이므로
+                    // assetLocationInfo를 설정하지 않음
+                    const isDestinationReached = chainIdInKeplr === history.toChainId &&
+                        denomInKeplr.toLowerCase() ===
+                            history.destinationAsset.denom.toLowerCase();
+                    if (isDestinationReached) {
+                        history.routeIndex = simpleRoute.length - 1;
+                        executableChainIdsToPublish =
+                            this.getExecutableChainIdsFromSwapV2History(history, true);
+                        history.resAmount.push([
+                            {
+                                amount: asset_location.amount,
+                                denom: denomInKeplr,
+                            },
+                        ]);
+                        this.notifySwapV2Success(history);
+                    }
+                    else {
+                        /*
+                          Determine the type of asset location:
+                            - "intermediate": SUCCESS 상태이지만 asset_location이 최종 목적지가 아닌 경우
+                              (예: base USDC -> osmosis OSMO 스왑 시, noble USDC가 먼저 도착하고
+                              이후 noble USDC -> osmosis OSMO로 ibc swap하는 transaction이 필요한 경우)
+                              이 경우 추가 transaction을 실행하거나 현재 받은 자산을 그대로 둘 수 있음
+                            - "refund": 중간에서 또는 destination에서 스왑 실패 등으로 destination asset이 아닌 자산이 릴리즈된 경우
+                              backgroundExecutionId가 있으면 멀티 transaction 케이스이므로 다음 transaction을 실행할 수 있도록 'intermediate'로 설정
+                        */
+                        const assetLocationType = status === types_1.SwapV2TxStatus.SUCCESS && history.backgroundExecutionId
+                            ? "intermediate"
+                            : "refund";
+                        history.assetLocationInfo = {
+                            chainId: chainIdInKeplr,
+                            amount: [
+                                {
+                                    amount: asset_location.amount,
+                                    denom: denomInKeplr,
+                                },
+                            ],
+                            type: assetLocationType,
+                        };
+                        // refund 타입인 경우 status도 FAILED로 변경하여 UI에서 refund 상황을 표시할 수 있도록 함
+                        if (assetLocationType === "refund") {
+                            history.status = types_1.SwapV2TxStatus.FAILED;
+                        }
+                        // asset location chain까지 routeIndex가 이동해야 하는지 확인
+                        const assetLocationChainIndex = simpleRoute.findIndex((route) => route.chainId === chainIdInKeplr);
+                        if (assetLocationChainIndex !== -1 &&
+                            assetLocationChainIndex > updatedRouteIndex) {
+                            history.routeIndex = assetLocationChainIndex;
+                        }
+                        executableChainIdsToPublish =
+                            this.getExecutableChainIdsFromSwapV2History(history);
+                    }
+                }
+                else if (status === types_1.SwapV2TxStatus.SUCCESS) {
+                    // For SUCCESS without asset_location, move routeIndex to end
+                    history.routeIndex = simpleRoute.length - 1;
+                    executableChainIdsToPublish =
+                        this.getExecutableChainIdsFromSwapV2History(history, true);
+                    this.notifySwapV2Success(history);
+                }
+                // Publish executable chains
+                publishExecutableChains(executableChainIdsToPublish);
+                // destination 체인/denom 기준으로만 추가 추적을 시도한다.
+                const targetChainId = history.toChainId;
+                const targetDenom = history.destinationAsset.denom;
+                // 해당 위치의 tx_hash를 찾아서 자산 추적, 없을 수도 있다.
+                const targetTxHash = (_c = destinationStep === null || destinationStep === void 0 ? void 0 : destinationStep.tx_hash) !== null && _c !== void 0 ? _c : currentStep.tx_hash;
+                const isAtDestinationChain = (() => {
+                    // Top-level SUCCESS + destination step successful → check against destination step
+                    if (status === types_1.SwapV2TxStatus.SUCCESS &&
+                        isDestinationStepSuccessful &&
+                        (destinationStep === null || destinationStep === void 0 ? void 0 : destinationStep.chain_id)) {
+                        return (normalizeChainId(destinationStep.chain_id) ===
+                            normalizeChainId(targetChainId));
+                    }
+                    // Default logic (other cases)
+                    if (!currentStep.chain_id) {
+                        return false;
+                    }
+                    return (normalizeChainId(currentStep.chain_id) ===
+                        normalizeChainId(targetChainId));
+                })();
+                const skipAssetTracking = history.resAmount.length > 0 || history.assetLocationInfo != null;
+                // resAmount 또는 assetLocationInfo가 없으면 추가적으로 자산 추적을 해야 한다.
+                if (targetTxHash && !skipAssetTracking && isAtDestinationChain) {
+                    console.log("trackSwapV2ReleasedAssetAmount", id, targetTxHash);
+                    this.trackSwapV2ReleasedAssetAmount(id, targetTxHash, targetChainId, targetDenom, onFulfill);
+                }
+                else if (status === types_1.SwapV2TxStatus.SUCCESS &&
+                    !skipAssetTracking &&
+                    !isAtDestinationChain) {
+                    // response status는 SUCCESS인데 destination chain에 도달하지 않음 → 실패 처리
+                    (0, mobx_1.runInAction)(() => {
+                        history.status = types_1.SwapV2TxStatus.FAILED;
+                        history.trackDone = true;
+                    });
+                    // TODO: additional tracking for failed case...
+                    onFulfill();
+                }
+                else {
+                    history.trackDone = true;
+                    onFulfill();
+                }
+                break;
+        }
+    }
+    /**
+     * Track released asset amount from tx receipt.
+     * - SUCCESS: destination asset 추적
+     * - FAILED/PARTIAL_SUCCESS + assetLocationInfo: refund된 자산 추적
+     */
+    trackSwapV2ReleasedAssetAmount(historyId, txHash, targetChainId, targetDenom, onFulfill) {
+        const history = this.getRecentSwapV2History(historyId);
+        if (!history) {
+            onFulfill();
+            return;
+        }
+        const chainInfo = this.chainsService.getChainInfo(targetChainId);
+        if (!chainInfo) {
+            onFulfill();
+            return;
+        }
+        this.trackDestinationAssetAmount({
+            chainId: targetChainId,
+            txHash,
+            recipient: history.recipient,
+            targetDenom,
+            onResult: (resAmount) => {
+                (0, mobx_1.runInAction)(() => {
+                    history.resAmount.push(resAmount);
+                    history.trackDone = true;
+                    this.notifySwapV2Success(history);
+                });
+            },
+            onRefund: (refundInfo, error) => {
+                (0, mobx_1.runInAction)(() => {
+                    history.trackError = error;
+                    history.assetLocationInfo = Object.assign(Object.assign({}, refundInfo), { type: "refund" });
+                    history.trackDone = true;
+                });
+            },
+            onFulfill: () => {
+                (0, mobx_1.runInAction)(() => {
+                    history.trackDone = true;
+                });
+                onFulfill();
+            },
+        });
+    }
+    getRecentSwapV2History(id) {
+        return this.recentSwapV2HistoryMap.get(id);
+    }
+    getRecentSwapV2Histories() {
+        return Array.from(this.recentSwapV2HistoryMap.values()).filter((history) => {
+            if (!this.chainsService.hasChainInfo(history.fromChainId)) {
+                return false;
+            }
+            if (!this.chainsService.hasChainInfo(history.toChainId)) {
+                return false;
+            }
+            if (history.simpleRoute.some((route) => {
+                return !this.chainsService.hasChainInfo(route.chainId);
+            })) {
+                return false;
+            }
+            return true;
+        });
+    }
+    removeRecentSwapV2History(id) {
+        const history = this.getRecentSwapV2History(id);
+        const removed = this.recentSwapV2HistoryMap.delete(id);
+        if (removed && (history === null || history === void 0 ? void 0 : history.backgroundExecutionId)) {
+            this.publisher.publish({
+                type: "remove",
+                executionId: history.backgroundExecutionId,
+            });
+        }
+        return removed;
+    }
+    clearAllRecentSwapV2History() {
+        const executionIds = [];
+        for (const history of this.recentSwapV2HistoryMap.values()) {
+            if (history.backgroundExecutionId) {
+                executionIds.push(history.backgroundExecutionId);
+            }
+        }
+        this.recentSwapV2HistoryMap.clear();
+        for (const executionId of executionIds) {
+            this.publisher.publish({
+                type: "remove",
+                executionId,
+            });
+        }
+    }
+    notifySwapV2Success(history) {
+        const notificationInfo = history.notificationInfo;
+        if (!notificationInfo || history.notified) {
+            return;
+        }
+        const latestResAmount = history.resAmount.length > 0
+            ? history.resAmount[history.resAmount.length - 1]
+            : undefined;
+        if (!latestResAmount || latestResAmount.length === 0) {
+            return;
+        }
+        const chainInfo = this.chainsService.getChainInfo(history.toChainId);
+        if (!chainInfo) {
+            return;
+        }
+        const assetsText = latestResAmount
+            .map((amt) => {
+            const currency = notificationInfo.currencies.find((cur) => cur.coinMinimalDenom === amt.denom);
+            if (!currency) {
+                return undefined;
+            }
+            return new unit_1.CoinPretty(currency, amt.amount)
+                .hideIBCMetadata(true)
+                .shrink(true)
+                .maxDecimals(6)
+                .inequalitySymbol(true)
+                .trim(true)
+                .toString();
+        })
+            .filter((text) => Boolean(text));
+        if (assetsText.length === 0) {
+            return;
+        }
+        (0, mobx_1.runInAction)(() => {
+            history.notified = true;
+        });
+        this.notification.create({
+            iconRelativeUrl: "assets/logo-256.png",
+            title: "Swap Succeeded",
+            message: `${assetsText.join(", ")} received on ${chainInfo.chainName}`,
+        });
+    }
+    hideSwapV2History(id) {
+        const history = this.getRecentSwapV2History(id);
+        if (!history) {
+            return false;
+        }
+        if (!history.backgroundExecutionId) {
+            return false;
+        }
+        // only hide if multi tx case
+        history.hidden = true;
+        return true;
+    }
+    showSwapV2History(id) {
+        const history = this.getRecentSwapV2History(id);
+        if (!history) {
+            return false;
+        }
+        history.hidden = false;
+        return true;
+    }
+    setSwapV2HistoryError(id, error) {
+        const history = this.getRecentSwapV2History(id);
+        if (!history) {
+            return false;
+        }
+        history.trackError = error;
+        history.trackDone = true;
+        return true;
+    }
+    clearSwapV2HistoryBackgroundExecutionId(id) {
+        const history = this.getRecentSwapV2History(id);
+        if (!history) {
+            return false;
+        }
+        history.backgroundExecutionId = undefined;
+        return true;
+    }
+    setSwapV2AdditionalTrackingData(id, data) {
+        const history = this.getRecentSwapV2History(id);
+        if (!history) {
+            return false;
+        }
+        if (data.type === "cosmos-ibc") {
+            history.additionalTrackingData = {
+                type: "cosmos-ibc",
+                chainId: data.ibcSwapData.chainId,
+                swapReceiver: data.ibcSwapData.swapReceiver,
+                swapChannelIndex: data.ibcSwapData.swapChannelIndex,
+                txHash: data.txHash,
+                txFulfilled: false,
+                packetTimeout: false,
+                ibcHistory: data.ibcSwapData.ibcChannels.map((ch) => ({
+                    portId: ch.portId,
+                    channelId: ch.channelId,
+                    counterpartyChainId: ch.counterpartyChainId,
+                    completed: false,
+                })),
+            };
+        }
+        else {
+            history.additionalTrackingData = data;
+        }
+        history.additionalTrackDone = false;
+        history.additionalTrackError = undefined;
+        this.trackSwapV2AdditionalRecursive(id);
+        return true;
+    }
+    trackSwapV2AdditionalRecursive(id) {
+        const history = this.getRecentSwapV2History(id);
+        if (!history) {
+            return;
+        }
+        // no additional tracking data
+        if (!history.additionalTrackingData) {
+            return;
+        }
+        // already done
+        if (history.additionalTrackDone) {
+            return;
+        }
+        if (history.additionalTrackingData.type === "evm") {
+            this.trackSwapV2AdditionalEVM(id);
+        }
+        else if (history.additionalTrackingData.type === "cosmos-ibc") {
+            this.trackIBCPacketForwardingRecursive((onFulfill, onClose, onError) => {
+                this.trackSwapV2AdditionalCosmosIBCInternal(id, onFulfill, onClose, onError);
+            });
+        }
+    }
+    trackSwapV2AdditionalEVM(id) {
+        var _a;
+        const history = this.getRecentSwapV2History(id);
+        if (!history) {
+            return;
+        }
+        if (((_a = history.additionalTrackingData) === null || _a === void 0 ? void 0 : _a.type) !== "evm") {
+            return;
+        }
+        const txHash = history.additionalTrackingData.txHash;
+        this.traceEVMTransactionResult({
+            chainId: history.toChainId,
+            txHash,
+            recipient: history.recipient,
+            targetDenom: history.destinationAsset.denom,
+            onResult: (result) => {
+                (0, mobx_1.runInAction)(() => {
+                    if (result.success && result.resAmount) {
+                        history.resAmount.push(result.resAmount);
+                        history.assetLocationInfo = undefined;
+                        this.notifySwapV2Success(history);
+                    }
+                    else if (result.refundInfo) {
+                        history.additionalTrackError = result.error;
+                        history.assetLocationInfo = Object.assign(Object.assign({}, result.refundInfo), { type: "refund" });
+                    }
+                    history.additionalTrackDone = true;
+                });
+            },
+            onFulfill: () => {
+                (0, mobx_1.runInAction)(() => {
+                    history.additionalTrackDone = true;
+                });
+            },
+        });
+    }
+    trackSwapV2AdditionalCosmosIBCInternal(id, onFulfill, onClose, onError) {
+        var _a;
+        const history = this.getRecentSwapV2History(id);
+        if (!history) {
+            onFulfill();
+            return;
+        }
+        if (history.additionalTrackDone) {
+            onFulfill();
+            return;
+        }
+        const existingTrackingData = history.additionalTrackingData;
+        if (!existingTrackingData || existingTrackingData.type !== "cosmos-ibc") {
+            onFulfill();
+            return;
+        }
+        const trackingData = existingTrackingData;
+        const { chainId, txHash, ibcHistory, swapReceiver, txFulfilled } = trackingData;
+        if (!txFulfilled) {
+            this.trackIBCTxFulfillment({
+                chainId,
+                txHash,
+                ibcHistory,
+                swapReceiver,
+                onTxFulfilled: (_tx, firstHopResAmount) => {
+                    (0, mobx_1.runInAction)(() => {
+                        trackingData.txFulfilled = true;
+                        if (firstHopResAmount) {
+                            history.resAmount.push(firstHopResAmount);
+                            for (let i = history.routeIndex; i < history.simpleRoute.length; i++) {
+                                const route = history.simpleRoute[i];
+                                if (route.chainId === chainId) {
+                                    history.routeIndex = i + 1; // move to next route
+                                    break;
+                                }
+                            }
+                        }
+                    });
+                    this.trackIBCPacketForwardingRecursive((onFulfill, onClose, onError) => {
+                        this.trackSwapV2AdditionalCosmosIBCInternal(id, onFulfill, onClose, onError);
+                    });
+                },
+                onTxError: (error) => {
+                    (0, mobx_1.runInAction)(() => {
+                        history.additionalTrackError = error;
+                        history.additionalTrackDone = true;
+                    });
+                },
+                onFulfill,
+                onClose,
+                onError,
+            });
+            return;
+        }
+        if (this.handleIbcRewindIfNeeded({
+            sourceChainId: chainId,
+            ibcHistory,
+            packetTimeout: trackingData.packetTimeout,
+            swapContext: ((_a = history.additionalTrackingData) === null || _a === void 0 ? void 0 : _a.type) === "cosmos-ibc"
+                ? {
+                    swapReceiver,
+                    swapChannelIndex: history.additionalTrackingData.swapChannelIndex,
+                    setSwapRefundInfo: (refundInfo) => {
+                        (0, mobx_1.runInAction)(() => {
+                            history.assetLocationInfo = Object.assign(Object.assign({}, refundInfo), { type: "refund" });
+                        });
+                    },
+                }
+                : undefined,
+            onFulfill,
+            onClose,
+            onError,
+            onRewindComplete: () => {
+                // rewound되었다면 실패 처리하는 것이 맞겠지...
+                (0, mobx_1.runInAction)(() => {
+                    var _a;
+                    history.status = types_1.SwapV2TxStatus.FAILED;
+                    history.additionalTrackDone = true;
+                    const rewoundChainId = (_a = ibcHistory.find((h) => h.rewound)) === null || _a === void 0 ? void 0 : _a.counterpartyChainId;
+                    if (rewoundChainId) {
+                        for (let i = history.simpleRoute.length - 1; i >= 0; i--) {
+                            const route = history.simpleRoute[i];
+                            if (route.chainId === rewoundChainId) {
+                                history.routeIndex = i; // 실패한 채널 인덱스로 이동
+                                break;
+                            }
+                        }
+                    }
+                });
+                this.trackIBCPacketForwardingRecursive((onFulfill, onClose, onError) => {
+                    this.trackSwapV2AdditionalCosmosIBCInternal(id, onFulfill, onClose, onError);
+                });
+            },
+        })) {
+            return;
+        }
+        this.trackIbcHopFlowWithTimeout({
+            ibcHistory,
+            sourceChainId: chainId,
+            swapReceiver,
+            destinationAsset: history.destinationAsset,
+            onHopCompleted: (resAmount) => {
+                (0, mobx_1.runInAction)(() => {
+                    if (resAmount) {
+                        history.resAmount.push(resAmount);
+                    }
+                });
+            },
+            onAllCompleted: () => {
+                (0, mobx_1.runInAction)(() => {
+                    history.additionalTrackDone = true;
+                    history.assetLocationInfo = undefined;
+                    // Update routeIndex to the last index to show completion state in UI
+                    history.routeIndex = history.simpleRoute.length;
+                    this.notifySwapV2Success(history);
+                });
+            },
+            onContinue: () => {
+                this.trackIBCPacketForwardingRecursive((onFulfill, onClose, onError) => {
+                    this.trackSwapV2AdditionalCosmosIBCInternal(id, onFulfill, onClose, onError);
+                });
+            },
+            onRetry: () => {
+                this.trackIBCPacketForwardingRecursive((onFulfill, onClose, onError) => {
+                    this.trackSwapV2AdditionalCosmosIBCInternal(id, onFulfill, onClose, onError);
+                });
+            },
+            onPacketTimeout: () => {
+                (0, mobx_1.runInAction)(() => {
+                    trackingData.packetTimeout = true;
+                });
+            },
+            onDynamicHopDetected: () => {
+                (0, mobx_1.runInAction)(() => {
+                    trackingData.dynamicHopDetected = true;
+                });
+            },
+            onFulfill,
+            onClose,
+            onError,
+        });
+    }
+    // ============================================================================
+    // IBC Packet Tracking Core Functions
+    // ============================================================================
+    /**
+     * IBC tx 완료 대기 및 첫 번째 hop res amount 추출
+     */
+    trackIBCTxFulfillment(params) {
+        const { chainId, txHash, ibcHistory, swapReceiver, onTxFulfilled, onTxError, onFulfill, onClose, onError, } = params;
+        const chainInfo = this.chainsService.getChainInfo(chainId);
+        if (!chainInfo) {
+            onFulfill();
+            return;
+        }
+        const txTracer = new cosmos_1.TendermintTxTracer(chainInfo.rpc, "/websocket");
+        txTracer.addEventListener("close", onClose);
+        txTracer.addEventListener("error", onError);
+        txTracer.traceTx(buffer_1.Buffer.from(txHash, "hex")).then((tx) => {
+            txTracer.close();
+            if (tx.code != null && tx.code !== 0) {
+                onTxError(tx.log || tx.raw_log || "Tx failed");
+                onFulfill();
+                return;
             }
-            if (!this.chainsService.hasChainInfo(history.destinationChainId)) {
-                return false;
+            let resAmount;
+            if (swapReceiver && swapReceiver.length > 0) {
+                resAmount = this.getIBCSwapResAmountFromTx(tx, swapReceiver[0]);
             }
-            if (history.simpleRoute.some((route) => {
-                return !this.chainsService.hasChainInfo(route.chainId);
-            })) {
-                return false;
+            if (ibcHistory.length > 0) {
+                const firstChannel = ibcHistory[0];
+                firstChannel.sequence = this.getIBCPacketSequenceFromTx(tx, firstChannel.portId, firstChannel.channelId);
+                firstChannel.dstChannelId = this.getDstChannelIdFromTx(tx, firstChannel.portId, firstChannel.channelId);
             }
-            return true;
+            onTxFulfilled(tx, resAmount);
+            onFulfill();
         });
     }
-    trackSkipSwapRecursive(id) {
-        const history = this.getRecentSkipHistory(id);
-        if (!history) {
-            return;
+    /**
+     * IBC rewind 필요 여부 확인 및 rewind 처리
+     */
+    handleIbcRewindIfNeeded(params) {
+        const { sourceChainId, ibcHistory, packetTimeout, swapContext, onFulfill, onClose, onError, onRewindComplete, } = params;
+        if (ibcHistory.length === 0) {
+            return false;
         }
-        // check tx fulfilled and update history
-        (0, common_1.retry)(() => {
-            return new Promise((txFulfilledResolve, txFulfilledReject) => {
-                this.checkAndTrackSkipSwapTxFulfilledRecursive(history, (keepTracking) => {
-                    txFulfilledResolve();
-                    if (!keepTracking) {
+        const needRewind = ibcHistory.find((h) => h.error != null) != null;
+        if (!needRewind) {
+            return false;
+        }
+        if (ibcHistory.find((h) => h.rewoundButNextRewindingBlocked)) {
+            onFulfill();
+            return true;
+        }
+        const isTimeoutPacket = packetTimeout !== null && packetTimeout !== void 0 ? packetTimeout : false;
+        const lastRewoundChannelIndex = ibcHistory.findIndex((h) => {
+            if (h.rewound) {
+                return true;
+            }
+        });
+        const targetChannel = (() => {
+            if (lastRewoundChannelIndex >= 0) {
+                if (lastRewoundChannelIndex === 0) {
+                    return undefined;
+                }
+                return ibcHistory[lastRewoundChannelIndex - 1];
+            }
+            return ibcHistory.find((h) => h.error != null);
+        })();
+        const isSwapTargetChannel = !!(targetChannel &&
+            swapContext &&
+            ibcHistory.indexOf(targetChannel) === swapContext.swapChannelIndex + 1);
+        if (targetChannel !== undefined && targetChannel.sequence !== undefined) {
+            const targetSequence = targetChannel.sequence;
+            const prevChainInfo = (() => {
+                const targetChannelIndex = ibcHistory.findIndex((h) => h === targetChannel);
+                if (targetChannelIndex < 0) {
+                    return undefined;
+                }
+                if (targetChannelIndex === 0) {
+                    return this.chainsService.getChainInfo(sourceChainId);
+                }
+                return this.chainsService.getChainInfo(ibcHistory[targetChannelIndex - 1].counterpartyChainId);
+            })();
+            if (prevChainInfo) {
+                const txTracer = new cosmos_1.TendermintTxTracer(prevChainInfo.rpc, "/websocket");
+                txTracer.addEventListener("close", onClose);
+                txTracer.addEventListener("error", onError);
+                txTracer
+                    .traceTx(isTimeoutPacket
+                    ? {
+                        // "timeout_packet.packet_src_port": targetChannel.portId,
+                        "timeout_packet.packet_src_channel": targetChannel.channelId,
+                        "timeout_packet.packet_sequence": targetChannel.sequence,
+                    }
+                    : {
+                        // "acknowledge_packet.packet_src_port": targetChannel.portId,
+                        "acknowledge_packet.packet_src_channel": targetChannel.channelId,
+                        "acknowledge_packet.packet_sequence": targetChannel.sequence,
+                    })
+                    .then((res) => {
+                    txTracer.close();
+                    if (!res) {
                         return;
                     }
-                    (0, common_1.retry)(() => {
-                        return new Promise((resolve, reject) => {
-                            this.checkAndUpdateSkipSwapHistoryRecursive(id, resolve, reject);
-                        });
-                    }, {
-                        maxRetries: 50,
-                        waitMsAfterError: 500,
-                        maxWaitMsAfterError: 15000,
+                    (0, mobx_1.runInAction)(() => {
+                        var _a;
+                        if (isSwapTargetChannel) {
+                            const txs = res.txs
+                                ? res.txs.map((res) => res.tx_result || res)
+                                : [res.tx_result || res];
+                            if (txs && Array.isArray(txs)) {
+                                for (const tx of txs) {
+                                    const index = isTimeoutPacket
+                                        ? this.getIBCTimeoutPacketIndexFromTx(tx, targetChannel.portId, targetChannel.channelId, targetSequence)
+                                        : this.getIBCAcknowledgementPacketIndexFromTx(tx, targetChannel.portId, targetChannel.channelId, targetSequence);
+                                    if (index >= 0) {
+                                        // 좀 빡치게 timeout packet은 refund 로직이 실행되고 나서 "timeout_packet" event가 발생한다.
+                                        const refunded = isTimeoutPacket
+                                            ? this.getIBCSwapResAmountFromTx(tx, swapContext.swapReceiver[swapContext.swapChannelIndex + 1], (() => {
+                                                const i = this.getLastIBCTimeoutPacketBeforeIndexFromTx(tx, index);
+                                                if (i < 0) {
+                                                    return 0;
+                                                }
+                                                return i;
+                                            })(), index)
+                                            : this.getIBCSwapResAmountFromTx(tx, swapContext.swapReceiver[swapContext.swapChannelIndex + 1], index);
+                                        (_a = swapContext.setSwapRefundInfo) === null || _a === void 0 ? void 0 : _a.call(swapContext, {
+                                            chainId: prevChainInfo.chainId,
+                                            amount: refunded,
+                                        });
+                                        targetChannel.rewoundButNextRewindingBlocked = true;
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                        targetChannel.rewound = true;
                     });
-                }, txFulfilledReject);
-            });
-        }, {
-            maxRetries: 50,
-            waitMsAfterError: 500,
-            maxWaitMsAfterError: 15000,
-        });
-    }
-    trackDestinationAssetAmount(historyId, txHash, onFulfill) {
-        const history = this.getRecentSkipHistory(historyId);
-        if (!history) {
-            onFulfill();
-            return;
+                    onFulfill();
+                    onRewindComplete();
+                });
+            }
         }
-        const chainInfo = this.chainsService.getChainInfo(history.destinationChainId);
-        if (!chainInfo) {
+        return true;
+    }
+    trackIbcHopFlowWithTimeout(params) {
+        const { ibcHistory, sourceChainId, swapReceiver, destinationAsset, onHopCompleted, onAllCompleted, onContinue, onRetry, onPacketTimeout, onDynamicHopDetected, onFulfill, onClose, onError, } = params;
+        const targetChannelIndex = ibcHistory.findIndex((history) => {
+            return !history.completed;
+        });
+        const targetChannel = ibcHistory[targetChannelIndex];
+        if (!targetChannel || !targetChannel.sequence) {
             onFulfill();
             return;
         }
-        if (this.chainsService.isEvmChain(history.destinationChainId)) {
-            const evmInfo = chainInfo.evm;
-            if (!evmInfo) {
+        const closables = [];
+        const closeClosables = () => {
+            closables.forEach((closable) => {
+                if (closable.readyState === cosmos_1.WsReadyState.OPEN ||
+                    closable.readyState === cosmos_1.WsReadyState.CONNECTING) {
+                    closable.close();
+                }
+            });
+        };
+        let _onFulfillOnce = false;
+        const onFulfillOnce = () => {
+            if (!_onFulfillOnce) {
+                _onFulfillOnce = true;
+                closeClosables();
                 onFulfill();
-                return;
             }
-            (0, simple_fetch_1.simpleFetch)(evmInfo.rpc, {
-                method: "POST",
-                headers: {
-                    "content-type": "application/json",
-                    "request-source": origin,
-                },
-                body: JSON.stringify({
-                    jsonrpc: "2.0",
-                    method: "eth_getTransactionReceipt",
-                    params: [txHash],
-                    id: 1,
-                }),
-            })
-                .then((res) => {
-                const txReceipt = res.data.result;
-                if (txReceipt) {
-                    (0, simple_fetch_1.simpleFetch)(evmInfo.rpc, {
-                        method: "POST",
-                        headers: {
-                            "content-type": "application/json",
-                            "request-source": origin,
-                        },
-                        body: JSON.stringify({
-                            jsonrpc: "2.0",
-                            method: "debug_traceTransaction",
-                            params: [txHash, { tracer: "callTracer" }],
-                            id: 1,
-                        }),
-                    }).then((res) => {
-                        (0, mobx_1.runInAction)(() => {
-                            let isFoundFromCall = false;
-                            if (res.data.result) {
-                                const searchForTransfers = (calls) => {
-                                    for (const call of calls) {
-                                        if (call.type === "CALL" &&
-                                            call.to.toLowerCase() ===
-                                                history.recipient.toLowerCase()) {
-                                            const isERC20Transfer = call.input.startsWith("0xa9059cbb");
-                                            const value = BigInt(isERC20Transfer
-                                                ? `0x${call.input.substring(74)}`
-                                                : call.value);
-                                            history.resAmount.push([
-                                                {
-                                                    amount: value.toString(10),
-                                                    denom: history.destinationAsset.denom,
-                                                },
-                                            ]);
-                                            isFoundFromCall = true;
-                                        }
-                                        if (call.calls && call.calls.length > 0) {
-                                            searchForTransfers(call.calls);
-                                        }
-                                    }
-                                };
-                                searchForTransfers(res.data.result.calls || []);
-                            }
-                            if (isFoundFromCall) {
-                                history.trackDone = true;
-                                return;
-                            }
-                            const logs = txReceipt.logs;
-                            const transferTopic = (0, hash_1.id)("Transfer(address,address,uint256)");
-                            const withdrawTopic = (0, hash_1.id)("Withdrawal(address,uint256)");
-                            const hyperlaneReceiveTopic = (0, hash_1.id)("ReceivedTransferRemote(uint32,bytes32,uint256)");
-                            for (const log of logs) {
-                                if (log.topics[0] === transferTopic) {
-                                    const to = "0x" + log.topics[2].slice(26);
-                                    if (to.toLowerCase() === history.recipient.toLowerCase()) {
-                                        const destinationAssetDenom = history.destinationAsset.denom.replace("erc20:", "");
-                                        const amount = BigInt(log.data).toString(10);
-                                        if (log.address === destinationAssetDenom) {
-                                            history.resAmount.push([
-                                                {
-                                                    amount,
-                                                    denom: history.destinationAsset.denom,
-                                                },
-                                            ]);
-                                        }
-                                        else {
-                                            console.log("refunded", log.address);
-                                            // Transfer 토픽인 경우엔 ERC20의 tranfer 호출일텐데
-                                            // 받을 토큰의 컨트랙트가 아닌 다른 컨트랙트에서 호출된 경우는 Swap을 실패한 것으로 추측
-                                            // 고로 실제로 받은 토큰의 컨트랙트 주소로 환불 정보에 저장한다.
-                                            history.trackError = "Swap failed";
-                                            history.swapRefundInfo = {
-                                                chainId: history.destinationChainId,
-                                                amount: [
-                                                    {
-                                                        amount,
-                                                        denom: `erc20:${log.address.toLowerCase()}`,
-                                                    },
-                                                ],
-                                            };
-                                        }
-                                        history.trackDone = true;
-                                        return;
-                                    }
-                                }
-                                else if (log.topics[0] === withdrawTopic) {
-                                    const to = "0x" + log.topics[1].slice(26);
-                                    if (to.toLowerCase() === txReceipt.to.toLowerCase()) {
-                                        const amount = BigInt(log.data).toString(10);
-                                        history.resAmount.push([
-                                            { amount, denom: history.destinationAsset.denom },
-                                        ]);
-                                        history.trackDone = true;
-                                        return;
-                                    }
-                                }
-                                else if (log.topics[0] === hyperlaneReceiveTopic) {
-                                    const to = "0x" + log.topics[2].slice(26);
-                                    if (to.toLowerCase() === history.recipient.toLowerCase()) {
-                                        const amount = BigInt(log.data).toString(10);
-                                        // Hyperlane을 통해 Forma로 TIA를 받는 경우 토큰 수량이 decimal 6으로 기록되는데,
-                                        // Forma에서는 decimal 18이기 때문에 12자리 만큼 0을 붙여준다.
-                                        history.resAmount.push([
-                                            {
-                                                amount: history.destinationAsset.denom === "forma-native"
-                                                    ? `${amount}000000000000`
-                                                    : amount,
-                                                denom: history.destinationAsset.denom,
-                                            },
-                                        ]);
-                                        history.trackDone = true;
-                                        return;
-                                    }
+        };
+        let _onCloseOnce = false;
+        const onCloseOnce = () => {
+            if (!_onCloseOnce) {
+                _onCloseOnce = true;
+                closeClosables();
+                onClose();
+            }
+        };
+        let _onErrorOnce = false;
+        const onErrorOnce = () => {
+            if (!_onErrorOnce) {
+                _onErrorOnce = true;
+                closeClosables();
+                onError();
+            }
+        };
+        const registerClosable = (closable) => closables.push(closable);
+        let hopFailed = false;
+        const hopTracer = this.trackIBCHopRecvPacket({
+            ibcHistory,
+            targetChannelIndex,
+            swapReceiver,
+            destinationAsset,
+            onHopCompleted: (resAmount, tx) => {
+                onHopCompleted === null || onHopCompleted === void 0 ? void 0 : onHopCompleted(resAmount, tx);
+                const sequence = targetChannel.sequence;
+                if (!sequence) {
+                    hopFailed = true;
+                    onFulfillOnce();
+                    return;
+                }
+                if (!tx) {
+                    return;
+                }
+                const txs = tx.txs
+                    ? tx.txs.map((res) => res.tx_result || res)
+                    : [tx.tx_result || tx];
+                for (const txItem of txs) {
+                    try {
+                        const ack = this.getIBCWriteAcknowledgementAckFromTx(txItem, targetChannel.portId, targetChannel.channelId, sequence);
+                        if (ack && ack.length > 0) {
+                            const str = buffer_1.Buffer.from(ack);
+                            try {
+                                const decoded = JSON.parse(str.toString());
+                                if (decoded.error) {
+                                    (0, mobx_1.runInAction)(() => {
+                                        targetChannel.error = "Packet processing failed";
+                                    });
+                                    hopFailed = true;
+                                    onFulfillOnce();
+                                    onRetry();
+                                    return;
                                 }
                             }
-                        });
-                    });
+                            catch (e) {
+                                console.log(e);
+                            }
+                        }
+                    }
+                    catch (_a) {
+                        // noop
+                    }
+                    const index = this.getIBCRecvPacketIndexFromTx(txItem, targetChannel.portId, targetChannel.channelId, sequence);
+                    if (index >= 0) {
+                        break;
+                    }
                 }
-            })
-                .finally(() => {
-                history.trackDone = true;
-                onFulfill();
-            });
-        }
-        else {
-            const txTracer = new cosmos_1.TendermintTxTracer(chainInfo.rpc, "/websocket");
-            txTracer.addEventListener("error", () => onFulfill());
-            txTracer
-                .queryTx({
-                "tx.hash": txHash,
-            })
-                .then((res) => {
-                txTracer.close();
-                if (!res) {
+            },
+            onAllCompleted: () => {
+                if (hopFailed) {
+                    return;
+                }
+                onAllCompleted();
+                onFulfillOnce();
+            },
+            onContinue: () => {
+                if (hopFailed) {
+                    return;
+                }
+                onContinue();
+                onFulfillOnce();
+            },
+            onFulfill: onFulfillOnce,
+            onClose: onCloseOnce,
+            onError: onErrorOnce,
+            onDynamicHopDetected: (hopInfo) => {
+                if (hopFailed) {
                     return;
                 }
+                // 동적으로 감지된 새 홉을 ibcHistory에 추가한다.
                 (0, mobx_1.runInAction)(() => {
-                    const txs = res.txs
-                        ? res.txs.map((res) => res.tx_result || res)
-                        : [res.tx_result || res];
-                    for (const tx of txs) {
-                        const resAmount = this.getIBCSwapResAmountFromTx(tx, history.recipient);
-                        history.resAmount.push(resAmount);
-                        history.trackDone = true;
+                    ibcHistory.push({
+                        portId: hopInfo.portId,
+                        channelId: hopInfo.channelId,
+                        counterpartyChainId: hopInfo.counterpartyChainId,
+                        sequence: hopInfo.sequence,
+                        dstChannelId: hopInfo.dstChannelId,
+                        completed: false,
+                    });
+                    if (swapReceiver && hopInfo.packetData.receiver) {
+                        swapReceiver.push(hopInfo.packetData.receiver);
+                    }
+                });
+                onDynamicHopDetected === null || onDynamicHopDetected === void 0 ? void 0 : onDynamicHopDetected();
+                onContinue();
+                onFulfillOnce();
+            },
+        });
+        if (hopTracer) {
+            registerClosable(hopTracer);
+        }
+        let prevChainId;
+        if (targetChannelIndex > 0) {
+            prevChainId = ibcHistory[targetChannelIndex - 1].counterpartyChainId;
+        }
+        else {
+            prevChainId = sourceChainId;
+        }
+        if (prevChainId) {
+            const prevChainInfo = this.chainsService.getChainInfo(prevChainId);
+            if (prevChainInfo) {
+                const queryEvents = {
+                    // acknowledge_packet과는 다르게 timeout_packet은 이전의 체인의 이벤트로부터만 알 수 있다.
+                    // 방법이 없기 때문에 여기서 이전의 체인으로부터 subscribe를 해서 이벤트를 받아야 한다.
+                    // 하지만 이 경우 ibc error tracking 로직에서 이것과 똑같은 subscription을 한번 더 하게 된다.
+                    // 이미 로직이 많이 복잡하기 때문에 로직을 덜 복잡하게 하기 위해서 이러한 비효율성(?)을 감수한다.
+                    // "timeout_packet.packet_src_port": targetChannel.portId,
+                    "timeout_packet.packet_src_channel": targetChannel.channelId,
+                    "timeout_packet.packet_sequence": targetChannel.sequence,
+                };
+                const txTracer = new cosmos_1.TendermintTxTracer(prevChainInfo.rpc, "/websocket");
+                registerClosable(txTracer);
+                txTracer.addEventListener("close", onCloseOnce);
+                txTracer.addEventListener("error", onErrorOnce);
+                txTracer.traceTx(queryEvents).then((res) => {
+                    txTracer.close();
+                    if (!res) {
                         return;
                     }
+                    (0, mobx_1.runInAction)(() => {
+                        targetChannel.error = "Packet timeout";
+                        onPacketTimeout === null || onPacketTimeout === void 0 ? void 0 : onPacketTimeout();
+                        hopFailed = true;
+                        onFulfillOnce();
+                        onRetry();
+                    });
                 });
-            })
-                .finally(() => {
-                history.trackDone = true;
-                onFulfill();
-            });
+            }
         }
     }
-    removeRecentSkipHistory(id) {
-        return this.recentSkipHistoryMap.delete(id);
-    }
-    clearAllRecentSkipHistory() {
-        this.recentSkipHistoryMap.clear();
+    trackIBCHopRecvPacket(params) {
+        const { ibcHistory, targetChannelIndex, swapReceiver, destinationAsset, onHopCompleted, onAllCompleted, onContinue, onFulfill, onClose, onError, onDynamicHopDetected, } = params;
+        const targetChannel = ibcHistory[targetChannelIndex];
+        const nextChannel = targetChannelIndex + 1 < ibcHistory.length
+            ? ibcHistory[targetChannelIndex + 1]
+            : undefined;
+        if (!targetChannel || !targetChannel.sequence) {
+            onAllCompleted();
+            return;
+        }
+        const sequence = targetChannel.sequence;
+        const counterpartyChainInfo = this.chainsService.getChainInfo(targetChannel.counterpartyChainId);
+        if (!counterpartyChainInfo) {
+            onFulfill();
+            return;
+        }
+        const queryEvents = {
+            // "recv_packet.packet_src_port": targetChannel.portId,
+            "recv_packet.packet_dst_channel": targetChannel.dstChannelId,
+            "recv_packet.packet_sequence": targetChannel.sequence,
+        };
+        const txTracer = new cosmos_1.TendermintTxTracer(counterpartyChainInfo.rpc, "/websocket");
+        txTracer.addEventListener("close", onClose);
+        txTracer.addEventListener("error", onError);
+        txTracer.traceTx(queryEvents).then((res) => {
+            txTracer.close();
+            if (!res) {
+                onError();
+                return;
+            }
+            const txs = res.txs
+                ? res.txs.map((t) => t.tx_result || t)
+                : [res.tx_result || res];
+            const matchedTx = txs.find((tx) => {
+                const idx = this.getIBCRecvPacketIndexFromTx(tx, targetChannel.portId, targetChannel.channelId, sequence);
+                return idx >= 0;
+            });
+            const tx = matchedTx || txs[0];
+            targetChannel.completed = true;
+            let resAmount;
+            const receiverIndex = targetChannelIndex + 1;
+            if (tx && swapReceiver && receiverIndex < swapReceiver.length) {
+                const index = this.getIBCRecvPacketIndexFromTx(tx, targetChannel.portId, targetChannel.channelId, sequence);
+                if (index >= 0) {
+                    resAmount = this.getIBCSwapResAmountFromTx(tx, swapReceiver[receiverIndex], index, undefined);
+                }
+            }
+            onHopCompleted(resAmount, tx);
+            // 1. 다음 채널이 있고, tx가 있는 경우 => 다음 채널로 이동
+            // 2. 마지막 채널이면서, destinationAsset가 있고, onDynamicHopDetected가 있는 경우 => 동적 홉 감지
+            // 3. 그 외의 경우 => 종료(allCompleted)
+            if (nextChannel && tx) {
+                const index = this.getIBCRecvPacketIndexFromTx(tx, targetChannel.portId, targetChannel.channelId, sequence);
+                if (index >= 0) {
+                    nextChannel.sequence = this.getIBCPacketSequenceFromTx(tx, nextChannel.portId, nextChannel.channelId, index);
+                    nextChannel.dstChannelId = this.getDstChannelIdFromTx(tx, nextChannel.portId, nextChannel.channelId, index);
+                }
+                onContinue();
+            }
+            else if (tx && destinationAsset && onDynamicHopDetected) {
+                // 마지막 채널에서 recv_packet 이후 새로운 send_packet이 있는 경우를 감지
+                const index = this.getIBCRecvPacketIndexFromTx(tx, targetChannel.portId, targetChannel.channelId, sequence);
+                if (index >= 0) {
+                    const sendPackets = this.getSendPacketInfoFromTx(tx, index);
+                    if (sendPackets.length > 0) {
+                        // 마지막 send_packet을 확인
+                        const lastSendPacket = sendPackets[sendPackets.length - 1];
+                        // destination chain에서 IBC wrapped token을 unwrap하는 경우를 가정한다.
+                        // 예를 들어, source chain -> osmosis (swap) -> destination chain으로 이동하는 경우,
+                        // osmosis에서 IBC wrapped token이 destination chain으로 전송되고,
+                        // destination chain에서 IBC wrapped token을 unwrap하는 케이스가 있을 수 있다.
+                        const destinationChainInfo = this.chainsService.getChainInfo(destinationAsset.chainId);
+                        if (destinationChainInfo) {
+                            onDynamicHopDetected({
+                                portId: "transfer",
+                                channelId: lastSendPacket.srcChannel,
+                                counterpartyChainId: destinationChainInfo.chainId,
+                                sequence: lastSendPacket.sequence,
+                                dstChannelId: lastSendPacket.dstChannel,
+                                packetData: lastSendPacket.packetData,
+                            });
+                            return;
+                        }
+                    }
+                }
+                onAllCompleted();
+            }
+            else {
+                onAllCompleted();
+            }
+        });
+        return txTracer;
     }
     getIBCWriteAcknowledgementAckFromTx(tx, sourcePortId, sourceChannelId, sequence) {
         const events = tx.events;
@@ -1597,6 +2637,92 @@ class RecentSendHistoryService {
         }
         return [];
     }
+    /**
+     * TX에서 send_packet 이벤트 정보를 추출하여 추가 IBC 홉을 감지하기 위해 사용됩니다.
+     *
+     * 예를 들어, 마지막 목적지 체인에서 IBC wrapped token을 unwrap하는 경우,
+     * send_packet 이벤트를 통해 추가 IBC 홉을 감지할 수 있습니다.
+     */
+    getSendPacketInfoFromTx(tx, startEventsIndex = 0) {
+        var _a, _b, _c, _d;
+        const events = tx.events;
+        if (!events || !Array.isArray(events)) {
+            return [];
+        }
+        const compareStringWithBase64OrPlain = (target, value) => {
+            if (target === value) {
+                return [true, false];
+            }
+            if (target === buffer_1.Buffer.from(value).toString("base64")) {
+                return [true, true];
+            }
+            return [false, false];
+        };
+        const results = [];
+        const slicedEvents = events.slice(startEventsIndex);
+        for (const event of slicedEvents) {
+            if (event.type !== "send_packet") {
+                continue;
+            }
+            let isBase64 = false;
+            const srcChannelAttr = (_a = event.attributes) === null || _a === void 0 ? void 0 : _a.find((attr) => {
+                const c = compareStringWithBase64OrPlain(attr.key, "packet_src_channel");
+                isBase64 = c[1];
+                return c[0];
+            });
+            if (!srcChannelAttr) {
+                continue;
+            }
+            const dstChannelAttr = (_b = event.attributes) === null || _b === void 0 ? void 0 : _b.find((attr) => {
+                return compareStringWithBase64OrPlain(attr.key, "packet_dst_channel")[0];
+            });
+            if (!dstChannelAttr)
+                continue;
+            const sequenceAttr = (_c = event.attributes) === null || _c === void 0 ? void 0 : _c.find((attr) => {
+                return compareStringWithBase64OrPlain(attr.key, "packet_sequence")[0];
+            });
+            if (!sequenceAttr)
+                continue;
+            const packetDataAttr = (_d = event.attributes) === null || _d === void 0 ? void 0 : _d.find((attr) => {
+                return compareStringWithBase64OrPlain(attr.key, "packet_data")[0];
+            });
+            if (!packetDataAttr)
+                continue;
+            try {
+                const srcChannel = isBase64
+                    ? buffer_1.Buffer.from(srcChannelAttr.value, "base64").toString()
+                    : srcChannelAttr.value;
+                const dstChannel = isBase64
+                    ? buffer_1.Buffer.from(dstChannelAttr.value, "base64").toString()
+                    : dstChannelAttr.value;
+                const sequence = isBase64
+                    ? buffer_1.Buffer.from(sequenceAttr.value, "base64").toString()
+                    : sequenceAttr.value;
+                const packetDataValue = isBase64
+                    ? buffer_1.Buffer.from(packetDataAttr.value, "base64").toString()
+                    : packetDataAttr.value.startsWith("{")
+                        ? packetDataAttr.value
+                        : buffer_1.Buffer.from(packetDataAttr.value, "base64").toString();
+                const packetData = JSON.parse(packetDataValue);
+                if (packetData.denom && packetData.amount && packetData.receiver) {
+                    results.push({
+                        srcChannel,
+                        dstChannel,
+                        sequence,
+                        packetData: {
+                            denom: packetData.denom,
+                            amount: packetData.amount,
+                            receiver: packetData.receiver,
+                        },
+                    });
+                }
+            }
+            catch (_e) {
+                // noop
+            }
+        }
+        return results;
+    }
     getIBCAcknowledgementPacketIndexFromTx(tx, sourcePortId, sourceChannelId, sequence) {
         const events = tx.events;
         if (!events) {
@@ -1942,6 +3068,129 @@ class RecentSendHistoryService {
         }
         throw new Error("Invalid tx");
     }
+    removeIBCHistoriesByChainIdentifier(chainIdentifier) {
+        const removingIds = [];
+        for (const history of this.recentIBCHistoryMap.values()) {
+            if (cosmos_1.ChainIdHelper.parse(history.chainId).identifier === chainIdentifier) {
+                removingIds.push(history.id);
+                continue;
+            }
+            if (cosmos_1.ChainIdHelper.parse(history.destinationChainId).identifier ===
+                chainIdentifier) {
+                removingIds.push(history.id);
+                continue;
+            }
+            if (history.ibcHistory.some((history) => {
+                return (cosmos_1.ChainIdHelper.parse(history.counterpartyChainId).identifier ===
+                    chainIdentifier);
+            })) {
+                removingIds.push(history.id);
+                continue;
+            }
+        }
+        for (const id of removingIds) {
+            this.recentIBCHistoryMap.delete(id);
+        }
+    }
+    removeSkipHistoriesByChainIdentifier(chainIdentifier) {
+        const removingIds = [];
+        for (const history of this.recentSkipHistoryMap.values()) {
+            if (cosmos_1.ChainIdHelper.parse(history.chainId).identifier === chainIdentifier) {
+                removingIds.push(history.id);
+                continue;
+            }
+            if (cosmos_1.ChainIdHelper.parse(history.destinationChainId).identifier ===
+                chainIdentifier) {
+                removingIds.push(history.id);
+                continue;
+            }
+            if (cosmos_1.ChainIdHelper.parse(history.destinationAsset.chainId).identifier ===
+                chainIdentifier) {
+                removingIds.push(history.id);
+                continue;
+            }
+            if (history.simpleRoute.some((route) => cosmos_1.ChainIdHelper.parse(route.chainId).identifier === chainIdentifier)) {
+                removingIds.push(history.id);
+                continue;
+            }
+            if (history.swapRefundInfo &&
+                cosmos_1.ChainIdHelper.parse(history.swapRefundInfo.chainId).identifier ===
+                    chainIdentifier) {
+                removingIds.push(history.id);
+                continue;
+            }
+            if (history.transferAssetRelease) {
+                const chainId = history.transferAssetRelease.chain_id;
+                const isOnlyEvm = parseInt(chainId) > 0;
+                const chainIdInKeplr = isOnlyEvm ? `eip155:${chainId}` : chainId;
+                if (cosmos_1.ChainIdHelper.parse(chainIdInKeplr).identifier === chainIdentifier) {
+                    removingIds.push(history.id);
+                    continue;
+                }
+            }
+        }
+        for (const id of removingIds) {
+            this.recentSkipHistoryMap.delete(id);
+        }
+    }
+    removeSwapV2HistoriesByChainIdentifier(chainIdentifier) {
+        const removingIds = [];
+        for (const history of this.recentSwapV2HistoryMap.values()) {
+            if (cosmos_1.ChainIdHelper.parse(history.fromChainId).identifier === chainIdentifier) {
+                removingIds.push(history.id);
+                continue;
+            }
+            if (cosmos_1.ChainIdHelper.parse(history.toChainId).identifier === chainIdentifier) {
+                removingIds.push(history.id);
+                continue;
+            }
+            if (history.simpleRoute.some((route) => cosmos_1.ChainIdHelper.parse(route.chainId).identifier === chainIdentifier)) {
+                removingIds.push(history.id);
+                continue;
+            }
+            if (history.assetLocationInfo &&
+                cosmos_1.ChainIdHelper.parse(history.assetLocationInfo.chainId).identifier ===
+                    chainIdentifier) {
+                removingIds.push(history.id);
+                continue;
+            }
+            if (history.additionalTrackingData) {
+                if (cosmos_1.ChainIdHelper.parse(history.additionalTrackingData.chainId)
+                    .identifier === chainIdentifier) {
+                    removingIds.push(history.id);
+                    continue;
+                }
+                if (history.additionalTrackingData.type === "cosmos-ibc" &&
+                    history.additionalTrackingData.ibcHistory.some((h) => {
+                        return (cosmos_1.ChainIdHelper.parse(h.counterpartyChainId).identifier ===
+                            chainIdentifier);
+                    })) {
+                    removingIds.push(history.id);
+                    continue;
+                }
+            }
+        }
+        for (const id of removingIds) {
+            this.recentSwapV2HistoryMap.delete(id);
+        }
+    }
+    // ============================================================================
+    // Helper Functions
+    // ============================================================================
+    getExecutableChainIdsFromSwapV2History(history, includeAllChainIds = false) {
+        const chainIds = [];
+        const endIndex = includeAllChainIds
+            ? history.simpleRoute.length
+            : Math.max(0, history.routeIndex + 1);
+        for (let i = 0; i < endIndex; i++) {
+            chainIds.push(history.simpleRoute[i].chainId);
+        }
+        if (history.assetLocationInfo &&
+            history.assetLocationInfo.type === "intermediate") {
+            chainIds.push(history.assetLocationInfo.chainId);
+        }
+        return chainIds;
+    }
 }
 __decorate([
     mobx_1.observable
@@ -1958,6 +3207,12 @@ __decorate([
 __decorate([
     mobx_1.observable
 ], RecentSendHistoryService.prototype, "recentSkipHistoryMap", void 0);
+__decorate([
+    mobx_1.observable
+], RecentSendHistoryService.prototype, "recentSwapV2HistorySeq", void 0);
+__decorate([
+    mobx_1.observable
+], RecentSendHistoryService.prototype, "recentSwapV2HistoryMap", void 0);
 __decorate([
     mobx_1.action
 ], RecentSendHistoryService.prototype, "addRecentSendHistory", null);
@@ -1982,5 +3237,41 @@ __decorate([
 __decorate([
     mobx_1.action
 ], RecentSendHistoryService.prototype, "clearAllRecentSkipHistory", null);
+__decorate([
+    mobx_1.action
+], RecentSendHistoryService.prototype, "recordTxWithSwapV2", null);
+__decorate([
+    mobx_1.action
+], RecentSendHistoryService.prototype, "processSwapV2StatusResponse", null);
+__decorate([
+    mobx_1.action
+], RecentSendHistoryService.prototype, "removeRecentSwapV2History", null);
+__decorate([
+    mobx_1.action
+], RecentSendHistoryService.prototype, "clearAllRecentSwapV2History", null);
+__decorate([
+    mobx_1.action
+], RecentSendHistoryService.prototype, "hideSwapV2History", null);
+__decorate([
+    mobx_1.action
+], RecentSendHistoryService.prototype, "showSwapV2History", null);
+__decorate([
+    mobx_1.action
+], RecentSendHistoryService.prototype, "setSwapV2HistoryError", null);
+__decorate([
+    mobx_1.action
+], RecentSendHistoryService.prototype, "clearSwapV2HistoryBackgroundExecutionId", null);
+__decorate([
+    mobx_1.action
+], RecentSendHistoryService.prototype, "setSwapV2AdditionalTrackingData", null);
+__decorate([
+    mobx_1.action
+], RecentSendHistoryService.prototype, "removeIBCHistoriesByChainIdentifier", null);
+__decorate([
+    mobx_1.action
+], RecentSendHistoryService.prototype, "removeSkipHistoriesByChainIdentifier", null);
+__decorate([
+    mobx_1.action
+], RecentSendHistoryService.prototype, "removeSwapV2HistoriesByChainIdentifier", null);
 exports.RecentSendHistoryService = RecentSendHistoryService;
 //# sourceMappingURL=service.js.map