@keplr-wallet/background 0.13.13 → 0.13.15-rc.0

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

@@ -127,8 +127,8 @@ class RecentSendHistoryService {
                         (0, mobx_1.runInAction)(() => {
                             history.notified = true;
                         });
-                        const chainInfo = this.chainsService.getChainInfo(history.destinationChainId);
-                        if (chainInfo) {
+                        const modularChainInfo = this.chainsService.getModularChainInfo(history.destinationChainId);
+                        if (modularChainInfo) {
                             if ("swapType" in history) {
                                 if (history.resAmount.length > 0) {
                                     const amount = history.resAmount[history.resAmount.length - 1];
@@ -151,7 +151,7 @@ class RecentSendHistoryService {
                                         this.notification.create({
                                             iconRelativeUrl: "assets/logo-256.png",
                                             title: "IBC Swap Succeeded",
-                                            message: `${assetsText.join(", ")} received on ${chainInfo.chainName}`,
+                                            message: `${assetsText.join(", ")} received on ${modularChainInfo.chainName}`,
                                         });
                                     }
                                 }
@@ -176,7 +176,7 @@ class RecentSendHistoryService {
                                     this.notification.create({
                                         iconRelativeUrl: "assets/logo-256.png",
                                         title: "IBC Transfer Succeeded",
-                                        message: `${assetsText.join(", ")} sent to ${chainInfo.chainName}`,
+                                        message: `${assetsText.join(", ")} sent to ${modularChainInfo.chainName}`,
                                     });
                                 }
                             }
@@ -205,12 +205,12 @@ class RecentSendHistoryService {
         };
         this.checkAndTrackSwapTxFulfilledRecursive = (params) => {
             const { chainId, txHash, onSuccess, onPending, onFailed, onError } = params;
-            const chainInfo = this.chainsService.getChainInfo(chainId);
-            if (!chainInfo) {
+            const modularChainInfo = this.chainsService.getModularChainInfo(chainId);
+            if (!modularChainInfo) {
                 onFailed();
                 return;
             }
-            this.resolveTxExecutionStatus(chainInfo, chainId, txHash)
+            this.resolveTxExecutionStatus(modularChainInfo, chainId, txHash)
                 .then((status) => {
                 switch (status) {
                     case "success":
@@ -526,8 +526,8 @@ class RecentSendHistoryService {
         // ============================================================================
         // Chain removed handler
         // ============================================================================
-        this.onChainRemoved = (chainInfo) => {
-            const chainIdentifier = cosmos_1.ChainIdHelper.parse(chainInfo.chainId).identifier;
+        this.onChainRemoved = (chainId) => {
+            const chainIdentifier = cosmos_1.ChainIdHelper.parse(chainId).identifier;
             try {
                 this.removeIBCHistoriesByChainIdentifier(chainIdentifier);
                 this.removeSkipHistoriesByChainIdentifier(chainIdentifier);
@@ -698,16 +698,24 @@ class RecentSendHistoryService {
     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* () {
-            const sourceChainInfo = this.chainsService.getChainInfoOrThrow(sourceChainId);
-            cosmos_1.Bech32Address.validate(sender, (_a = sourceChainInfo.bech32Config) === null || _a === void 0 ? void 0 : _a.bech32PrefixAccAddr);
-            const destinationChainInfo = this.chainsService.getChainInfoOrThrow(destinationChainId);
+            const sourceModularChainInfo = this.chainsService.getModularChainInfoOrThrow(sourceChainId);
+            const sourceBech32Prefix = sourceModularChainInfo.type === "cosmos" ||
+                sourceModularChainInfo.type === "ethermint"
+                ? (_a = sourceModularChainInfo.cosmos.bech32Config) === null || _a === void 0 ? void 0 : _a.bech32PrefixAccAddr
+                : undefined;
+            cosmos_1.Bech32Address.validate(sender, sourceBech32Prefix);
+            const destModularChainInfo = this.chainsService.getModularChainInfoOrThrow(destinationChainId);
             if (recipient.startsWith("0x")) {
                 if (!recipient.match(/^0x[0-9A-Fa-f]*$/) || recipient.length !== 42) {
                     throw new Error("Recipient address is not valid hex address");
                 }
             }
             else {
-                cosmos_1.Bech32Address.validate(recipient, (_b = destinationChainInfo.bech32Config) === null || _b === void 0 ? void 0 : _b.bech32PrefixAccAddr);
+                const destBech32Prefix = destModularChainInfo.type === "cosmos" ||
+                    destModularChainInfo.type === "ethermint"
+                    ? (_b = destModularChainInfo.cosmos.bech32Config) === null || _b === void 0 ? void 0 : _b.bech32PrefixAccAddr
+                    : undefined;
+                cosmos_1.Bech32Address.validate(recipient, destBech32Prefix);
             }
             const txHash = yield this.txService.sendTx(sourceChainId, tx, mode, {
                 silent,
@@ -769,9 +777,13 @@ class RecentSendHistoryService {
     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* () {
-            const sourceChainInfo = this.chainsService.getChainInfoOrThrow(sourceChainId);
-            cosmos_1.Bech32Address.validate(sender, (_a = sourceChainInfo.bech32Config) === null || _a === void 0 ? void 0 : _a.bech32PrefixAccAddr);
-            this.chainsService.getChainInfoOrThrow(destinationChainId);
+            const sourceModularChainInfo = this.chainsService.getModularChainInfoOrThrow(sourceChainId);
+            const sourceBech32Prefix = sourceModularChainInfo.type === "cosmos" ||
+                sourceModularChainInfo.type === "ethermint"
+                ? (_a = sourceModularChainInfo.cosmos.bech32Config) === null || _a === void 0 ? void 0 : _a.bech32PrefixAccAddr
+                : undefined;
+            cosmos_1.Bech32Address.validate(sender, sourceBech32Prefix);
+            this.chainsService.getModularChainInfoOrThrow(destinationChainId);
             const txHash = yield this.txService.sendTx(sourceChainId, tx, mode, {
                 silent,
                 onFulfill: (tx) => {
@@ -865,14 +877,14 @@ class RecentSendHistoryService {
     }
     getRecentIBCHistories() {
         return Array.from(this.recentIBCHistoryMap.values()).filter((history) => {
-            if (!this.chainsService.hasChainInfo(history.chainId)) {
+            if (!this.chainsService.hasModularChainInfo(history.chainId)) {
                 return false;
             }
-            if (!this.chainsService.hasChainInfo(history.destinationChainId)) {
+            if (!this.chainsService.hasModularChainInfo(history.destinationChainId)) {
                 return false;
             }
             if (history.ibcHistory.some((history) => {
-                return !this.chainsService.hasChainInfo(history.counterpartyChainId);
+                return !this.chainsService.hasModularChainInfo(history.counterpartyChainId);
             })) {
                 return false;
             }
@@ -913,15 +925,15 @@ class RecentSendHistoryService {
             maxWaitMsAfterError: 5 * 60 * 1000, // 5min
         });
     }
-    resolveTxExecutionStatus(chainInfo, chainId, txHash) {
+    resolveTxExecutionStatus(modularChainInfo, chainId, txHash) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.chainsService.isEvmChain(chainId)) {
-                const evmInfo = chainInfo.evm;
-                if (!evmInfo) {
+                if (modularChainInfo.type !== "evm" &&
+                    modularChainInfo.type !== "ethermint") {
                     return Promise.resolve("error");
                 }
                 const res = yield (0, api_1.requestEthTxReceipt)({
-                    rpc: evmInfo.rpc,
+                    rpc: modularChainInfo.evm.rpc,
                     txHash,
                     origin,
                 });
@@ -937,7 +949,11 @@ class RecentSendHistoryService {
                 }
                 return "failed";
             }
-            const txTracer = new cosmos_1.TendermintTxTracer(chainInfo.rpc, "/websocket");
+            if (modularChainInfo.type !== "cosmos" &&
+                modularChainInfo.type !== "ethermint") {
+                return Promise.resolve("error");
+            }
+            const txTracer = new cosmos_1.TendermintTxTracer(modularChainInfo.cosmos.rpc, "/websocket");
             txTracer.addEventListener("error", () => {
                 txTracer.close();
             });
@@ -966,8 +982,8 @@ class RecentSendHistoryService {
     }
     trackDestinationAssetAmount(params) {
         const { chainId, txHash, recipient, targetDenom, onResult, onRefund, onFulfill, } = params;
-        const chainInfo = this.chainsService.getChainInfo(chainId);
-        if (!chainInfo) {
+        const modularChainInfo = this.chainsService.getModularChainInfo(chainId);
+        if (!modularChainInfo) {
             onFulfill();
             return;
         }
@@ -989,8 +1005,13 @@ class RecentSendHistoryService {
             });
             return;
         }
+        if (modularChainInfo.type !== "cosmos" &&
+            modularChainInfo.type !== "ethermint") {
+            onFulfill();
+            return;
+        }
         this.traceCosmosTransactionResult({
-            chainInfo,
+            rpc: modularChainInfo.cosmos.rpc,
             txHash,
             recipient,
             onResult,
@@ -998,8 +1019,8 @@ class RecentSendHistoryService {
         });
     }
     traceCosmosTransactionResult(params) {
-        const { chainInfo, txHash, recipient, onResult, onFulfill } = params;
-        const txTracer = new cosmos_1.TendermintTxTracer(chainInfo.rpc, "/websocket");
+        const { rpc, txHash, recipient, onResult, onFulfill } = params;
+        const txTracer = new cosmos_1.TendermintTxTracer(rpc, "/websocket");
         txTracer.addEventListener("error", () => onFulfill());
         txTracer
             .queryTx({
@@ -1026,25 +1047,20 @@ class RecentSendHistoryService {
     // 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) {
+        const modularChainInfo = this.chainsService.getModularChainInfo(chainId);
+        if (!modularChainInfo) {
             onResult({ success: false });
             onFulfill();
             return;
         }
-        if (!this.chainsService.isEvmChain(chainId)) {
+        if (modularChainInfo.type !== "evm" &&
+            modularChainInfo.type !== "ethermint") {
             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,
+            rpc: modularChainInfo.evm.rpc,
             txHash,
             origin,
         })
@@ -1055,7 +1071,7 @@ class RecentSendHistoryService {
                 return;
             }
             (0, api_1.requestEthTxTrace)({
-                rpc: evmInfo.rpc,
+                rpc: modularChainInfo.evm.rpc,
                 txHash,
                 origin,
             }).then((traceRes) => {
@@ -1214,14 +1230,14 @@ class RecentSendHistoryService {
     }
     getRecentSkipHistories() {
         return Array.from(this.recentSkipHistoryMap.values()).filter((history) => {
-            if (!this.chainsService.hasChainInfo(history.chainId)) {
+            if (!this.chainsService.hasModularChainInfo(history.chainId)) {
                 return false;
             }
-            if (!this.chainsService.hasChainInfo(history.destinationChainId)) {
+            if (!this.chainsService.hasModularChainInfo(history.destinationChainId)) {
                 return false;
             }
             if (history.simpleRoute.some((route) => {
-                return !this.chainsService.hasChainInfo(route.chainId);
+                return !this.chainsService.hasModularChainInfo(route.chainId);
             })) {
                 return false;
             }
@@ -1305,8 +1321,8 @@ class RecentSendHistoryService {
             onFulfill();
             return;
         }
-        const chainInfo = this.chainsService.getChainInfo(history.destinationChainId);
-        if (!chainInfo) {
+        const modularChainInfo = this.chainsService.getModularChainInfo(history.destinationChainId);
+        if (!modularChainInfo) {
             onFulfill();
             return;
         }
@@ -1711,8 +1727,8 @@ class RecentSendHistoryService {
             onFulfill();
             return;
         }
-        const chainInfo = this.chainsService.getChainInfo(targetChainId);
-        if (!chainInfo) {
+        const modularChainInfo = this.chainsService.getModularChainInfo(targetChainId);
+        if (!modularChainInfo) {
             onFulfill();
             return;
         }
@@ -1748,14 +1764,14 @@ class RecentSendHistoryService {
     }
     getRecentSwapV2Histories() {
         return Array.from(this.recentSwapV2HistoryMap.values()).filter((history) => {
-            if (!this.chainsService.hasChainInfo(history.fromChainId)) {
+            if (!this.chainsService.hasModularChainInfo(history.fromChainId)) {
                 return false;
             }
-            if (!this.chainsService.hasChainInfo(history.toChainId)) {
+            if (!this.chainsService.hasModularChainInfo(history.toChainId)) {
                 return false;
             }
             if (history.simpleRoute.some((route) => {
-                return !this.chainsService.hasChainInfo(route.chainId);
+                return !this.chainsService.hasModularChainInfo(route.chainId);
             })) {
                 return false;
             }
@@ -1799,8 +1815,8 @@ class RecentSendHistoryService {
         if (!latestResAmount || latestResAmount.length === 0) {
             return;
         }
-        const chainInfo = this.chainsService.getChainInfo(history.toChainId);
-        if (!chainInfo) {
+        const modularChainInfo = this.chainsService.getModularChainInfo(history.toChainId);
+        if (!modularChainInfo) {
             return;
         }
         const assetsText = latestResAmount
@@ -1827,7 +1843,7 @@ class RecentSendHistoryService {
         this.notification.create({
             iconRelativeUrl: "assets/logo-256.png",
             title: "Swap Succeeded",
-            message: `${assetsText.join(", ")} received on ${chainInfo.chainName}`,
+            message: `${assetsText.join(", ")} received on ${modularChainInfo.chainName}`,
         });
     }
     hideSwapV2History(id) {
@@ -2105,12 +2121,14 @@ class RecentSendHistoryService {
      */
     trackIBCTxFulfillment(params) {
         const { chainId, txHash, ibcHistory, swapReceiver, onTxFulfilled, onTxError, onFulfill, onClose, onError, } = params;
-        const chainInfo = this.chainsService.getChainInfo(chainId);
-        if (!chainInfo) {
+        const modularChainInfo = this.chainsService.getModularChainInfo(chainId);
+        if (!modularChainInfo ||
+            (modularChainInfo.type !== "cosmos" &&
+                modularChainInfo.type !== "ethermint")) {
             onFulfill();
             return;
         }
-        const txTracer = new cosmos_1.TendermintTxTracer(chainInfo.rpc, "/websocket");
+        const txTracer = new cosmos_1.TendermintTxTracer(modularChainInfo.cosmos.rpc, "/websocket");
         txTracer.addEventListener("close", onClose);
         txTracer.addEventListener("error", onError);
         txTracer.traceTx(buffer_1.Buffer.from(txHash, "hex")).then((tx) => {
@@ -2169,18 +2187,22 @@ class RecentSendHistoryService {
             ibcHistory.indexOf(targetChannel) === swapContext.swapChannelIndex + 1);
         if (targetChannel !== undefined && targetChannel.sequence !== undefined) {
             const targetSequence = targetChannel.sequence;
-            const prevChainInfo = (() => {
+            const prevChain = (() => {
                 const targetChannelIndex = ibcHistory.findIndex((h) => h === targetChannel);
                 if (targetChannelIndex < 0) {
                     return undefined;
                 }
-                if (targetChannelIndex === 0) {
-                    return this.chainsService.getChainInfo(sourceChainId);
+                const prevChainId = targetChannelIndex === 0
+                    ? sourceChainId
+                    : ibcHistory[targetChannelIndex - 1].counterpartyChainId;
+                const m = this.chainsService.getModularChainInfo(prevChainId);
+                if (m && (m.type === "cosmos" || m.type === "ethermint")) {
+                    return { chainId: m.chainId, rpc: m.cosmos.rpc };
                 }
-                return this.chainsService.getChainInfo(ibcHistory[targetChannelIndex - 1].counterpartyChainId);
+                return undefined;
             })();
-            if (prevChainInfo) {
-                const txTracer = new cosmos_1.TendermintTxTracer(prevChainInfo.rpc, "/websocket");
+            if (prevChain) {
+                const txTracer = new cosmos_1.TendermintTxTracer(prevChain.rpc, "/websocket");
                 txTracer.addEventListener("close", onClose);
                 txTracer.addEventListener("error", onError);
                 txTracer
@@ -2223,7 +2245,7 @@ class RecentSendHistoryService {
                                             })(), 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,
+                                            chainId: prevChain.chainId,
                                             amount: refunded,
                                         });
                                         targetChannel.rewoundButNextRewindingBlocked = true;
@@ -2387,8 +2409,10 @@ class RecentSendHistoryService {
             prevChainId = sourceChainId;
         }
         if (prevChainId) {
-            const prevChainInfo = this.chainsService.getChainInfo(prevChainId);
-            if (prevChainInfo) {
+            const prevModularChainInfo = this.chainsService.getModularChainInfo(prevChainId);
+            if (prevModularChainInfo &&
+                (prevModularChainInfo.type === "cosmos" ||
+                    prevModularChainInfo.type === "ethermint")) {
                 const queryEvents = {
                     // acknowledge_packet과는 다르게 timeout_packet은 이전의 체인의 이벤트로부터만 알 수 있다.
                     // 방법이 없기 때문에 여기서 이전의 체인으로부터 subscribe를 해서 이벤트를 받아야 한다.
@@ -2398,7 +2422,7 @@ class RecentSendHistoryService {
                     "timeout_packet.packet_src_channel": targetChannel.channelId,
                     "timeout_packet.packet_sequence": targetChannel.sequence,
                 };
-                const txTracer = new cosmos_1.TendermintTxTracer(prevChainInfo.rpc, "/websocket");
+                const txTracer = new cosmos_1.TendermintTxTracer(prevModularChainInfo.cosmos.rpc, "/websocket");
                 registerClosable(txTracer);
                 txTracer.addEventListener("close", onCloseOnce);
                 txTracer.addEventListener("error", onErrorOnce);
@@ -2429,8 +2453,10 @@ class RecentSendHistoryService {
             return;
         }
         const sequence = targetChannel.sequence;
-        const counterpartyChainInfo = this.chainsService.getChainInfo(targetChannel.counterpartyChainId);
-        if (!counterpartyChainInfo) {
+        const counterpartyModularChainInfo = this.chainsService.getModularChainInfo(targetChannel.counterpartyChainId);
+        if (!counterpartyModularChainInfo ||
+            (counterpartyModularChainInfo.type !== "cosmos" &&
+                counterpartyModularChainInfo.type !== "ethermint")) {
             onFulfill();
             return;
         }
@@ -2439,7 +2465,7 @@ class RecentSendHistoryService {
             "recv_packet.packet_dst_channel": targetChannel.dstChannelId,
             "recv_packet.packet_sequence": targetChannel.sequence,
         };
-        const txTracer = new cosmos_1.TendermintTxTracer(counterpartyChainInfo.rpc, "/websocket");
+        const txTracer = new cosmos_1.TendermintTxTracer(counterpartyModularChainInfo.cosmos.rpc, "/websocket");
         txTracer.addEventListener("close", onClose);
         txTracer.addEventListener("error", onError);
         txTracer.traceTx(queryEvents).then((res) => {
@@ -2456,7 +2482,9 @@ class RecentSendHistoryService {
                 return idx >= 0;
             });
             const tx = matchedTx || txs[0];
-            targetChannel.completed = true;
+            (0, mobx_1.runInAction)(() => {
+                targetChannel.completed = true;
+            });
             let resAmount;
             const receiverIndex = targetChannelIndex + 1;
             if (tx && swapReceiver && receiverIndex < swapReceiver.length) {
@@ -2489,12 +2517,12 @@ class RecentSendHistoryService {
                         // 예를 들어, 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) {
+                        const destinationModularChainInfo = this.chainsService.getModularChainInfo(destinationAsset.chainId);
+                        if (destinationModularChainInfo) {
                             onDynamicHopDetected({
                                 portId: "transfer",
                                 channelId: lastSendPacket.srcChannel,
-                                counterpartyChainId: destinationChainInfo.chainId,
+                                counterpartyChainId: destinationModularChainInfo.chainId,
                                 sequence: lastSendPacket.sequence,
                                 dstChannelId: lastSendPacket.dstChannel,
                                 packetData: lastSendPacket.packetData,