@subwallet/extension-base 1.3.70-2 → 1.3.71-0

package/cjs/services/swap-service/handler/optimex-handler.js

@@ -20,8 +20,7 @@ var _uiKeyring = _interopRequireDefault(require("@subwallet/ui-keyring"));
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var bitcoin = _interopRequireWildcard(require("bitcoinjs-lib"));
 var _util = require("@polkadot/util");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 

package/cjs/services/swap-service/handler/simpleswap-handler.js

@@ -16,8 +16,7 @@ var _bignumber = _interopRequireWildcard(require("bignumber.js"));
 var _smartContract = require("../../balance-service/transfer/smart-contract");
 var _token = require("../../balance-service/transfer/token");
 var _baseHandler = require("./base-handler");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -293,7 +292,6 @@ class SimpleSwapHandler {
     if (swap) {
       return this.swapBaseHandler.validateSwapOnlyProcess(params, swapIndex); // todo: create interface for input request
     }
-
     if (swapXcm) {
       return [new _TransactionError.TransactionError(_types.BasicTxErrorType.INTERNAL_ERROR)];
     }

package/cjs/services/swap-service/handler/uniswap-handler.js

@@ -46,7 +46,6 @@ async function fetchCheckApproval(request) {
     if (!output) {
       return undefined; // todo: recheck
     }
-
     chainId = dutchQuote.orderInfo.chainId;
     tokenIn = dutchQuote.orderInfo.input.token;
     tokenOut = output.token;
@@ -67,7 +66,6 @@ async function fetchCheckApproval(request) {
       tokenOutChainId: chainId // swap in-chain
     })
   });
-
   return await response.json();
 }
 class UniswapHandler {
@@ -809,7 +807,6 @@ class UniswapHandler {
     if (swap) {
       return this.swapBaseHandler.validateSwapOnlyProcess(params, swapIndex); // todo: create interface for input request
     }
-
     if (swapXcm) {
       return this.swapBaseHandler.validateSwapXcmProcess(params, swapIndex, bridgeIndex);
     }

package/cjs/services/transaction-service/event-parser/index.js

@@ -96,10 +96,10 @@ function parseLiquidStakingEvents(historyItem, eventLogs, inputTokenInfo, chainI
       if (record.event.section === section && record.event.method.toLowerCase() === eventMethod) {
         var _record$event$data$9;
         if ((_record$event$data$9 = record.event.data[2]) !== null && _record$event$data$9 !== void 0 && _record$event$data$9.toString()) {
-          var _record$event$data$10;
+          var _record$event$data$0;
           // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
           historyItem.fee = {
-            value: ((_record$event$data$10 = record.event.data[2]) === null || _record$event$data$10 === void 0 ? void 0 : _record$event$data$10.toString()) || '0',
+            value: ((_record$event$data$0 = record.event.data[2]) === null || _record$event$data$0 === void 0 ? void 0 : _record$event$data$0.toString()) || '0',
             symbol: nativeSymbol,
             decimals: nativeDecimals
           };
@@ -118,12 +118,12 @@ function parseLiquidStakingFastUnstakeEvents(historyItem, eventLogs, chainInfo,
     const section = extrinsicType === _KoniTypes.ExtrinsicType.REDEEM_QDOT ? 'tokens' : 'balances';
     const eventMethod = extrinsicType === _KoniTypes.ExtrinsicType.REDEEM_QDOT ? 'withdrawn' : 'withdraw';
     if (record.event.section === section && record.event.method.toLowerCase() === eventMethod) {
-      var _record$event$data$11;
-      if ((_record$event$data$11 = record.event.data[2]) !== null && _record$event$data$11 !== void 0 && _record$event$data$11.toString()) {
-        var _record$event$data$12;
+      var _record$event$data$1;
+      if ((_record$event$data$1 = record.event.data[2]) !== null && _record$event$data$1 !== void 0 && _record$event$data$1.toString()) {
+        var _record$event$data$10;
         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         historyItem.fee = {
-          value: ((_record$event$data$12 = record.event.data[2]) === null || _record$event$data$12 === void 0 ? void 0 : _record$event$data$12.toString()) || '0',
+          value: ((_record$event$data$10 = record.event.data[2]) === null || _record$event$data$10 === void 0 ? void 0 : _record$event$data$10.toString()) || '0',
           symbol: nativeSymbol,
           decimals: nativeDecimals
         };

package/cjs/services/transaction-service/index.js

@@ -1612,7 +1612,7 @@ class TransactionService {
     }
     return emitter;
   }
-  signAndSendEvmPermitTransaction(_ref10) {
+  signAndSendEvmPermitTransaction(_ref0) {
     let {
       address,
       id,
@@ -1620,7 +1620,7 @@ class TransactionService {
       step,
       transaction,
       url
-    } = _ref10;
+    } = _ref0;
     // Allow sign transaction
     const canSign = true;
     const emitter = new _eventemitter.default();
@@ -1642,11 +1642,11 @@ class TransactionService {
     };
     this.state.requestService.addConfirmation(id, url || _constants2.EXTENSION_REQUEST_URL, 'evmSignatureRequest', evmSignaturePayload, {
       isPassConfirmation
-    }).then(_ref11 => {
+    }).then(_ref1 => {
       let {
         isApproved,
         payload: signature
-      } = _ref11;
+      } = _ref1;
       if (isApproved) {
         // Emit signed event
         emitter.emit('signed', eventData);
@@ -1669,7 +1669,7 @@ class TransactionService {
     });
     return emitter;
   }
-  signAndSendEvmDutchTransaction(_ref12) {
+  signAndSendEvmDutchTransaction(_ref10) {
     let {
       address,
       id,
@@ -1677,7 +1677,7 @@ class TransactionService {
       step,
       transaction,
       url
-    } = _ref12;
+    } = _ref10;
     const emitter = new _eventemitter.default();
     const eventData = {
       id,
@@ -1699,11 +1699,11 @@ class TransactionService {
     };
     this.state.requestService.addConfirmation(id, url || _constants2.EXTENSION_REQUEST_URL, 'submitApiRequest', evmSignaturePayload, {
       isPassConfirmation
-    }).then(_ref13 => {
+    }).then(_ref11 => {
       let {
         isApproved,
         payload: signature
-      } = _ref13;
+      } = _ref11;
       if (isApproved) {
         emitter.emit('signed', eventData);
         emitter.emit('send', eventData);
@@ -1741,7 +1741,7 @@ class TransactionService {
     });
     return emitter;
   }
-  signAndSendSubstrateTransaction(_ref14) {
+  signAndSendSubstrateTransaction(_ref12) {
     var _this$state$chainServ;
     let {
       address,
@@ -1753,7 +1753,7 @@ class TransactionService {
       tokenPayFeeSlug,
       transaction,
       url
-    } = _ref14;
+    } = _ref12;
     const tip = (feeCustom === null || feeCustom === void 0 ? void 0 : feeCustom.tip) || '0';
     const feeAssetId = tokenPayFeeSlug && !(0, _utils2._isNativeTokenBySlug)(tokenPayFeeSlug) && _constants._SUPPORT_TOKEN_PAY_FEE_GROUP.assetHub.includes(chain) ? (_this$state$chainServ = this.state.chainService.getAssetBySlug(tokenPayFeeSlug).metadata) === null || _this$state$chainServ === void 0 ? void 0 : _this$state$chainServ.multilocation : undefined;
     const emitter = new _eventemitter.default();
@@ -1842,20 +1842,20 @@ class TransactionService {
             if (!eventData.extrinsicHash) {
               eventData.extrinsicHash = txState.txHash.toHex();
             }
-            txState.events.filter(_ref15 => {
+            txState.events.filter(_ref13 => {
               let {
                 event: {
                   section
                 }
-              } = _ref15;
+              } = _ref13;
               return section === 'system';
-            }).forEach(_ref16 => {
+            }).forEach(_ref14 => {
               let {
                 event: {
                   data: [error],
                   method
                 }
-              } = _ref16;
+              } = _ref14;
               if (method === 'ExtrinsicFailed') {
                 eventData.errors.push(new _TransactionError.TransactionError(_types.BasicTxErrorType.SEND_TRANSACTION_FAILED, error.toString()));
                 emitter.emit('error', eventData);
@@ -1878,7 +1878,7 @@ class TransactionService {
     });
     return emitter;
   }
-  signAndSendTonTransaction(_ref17) {
+  signAndSendTonTransaction(_ref15) {
     let {
       address,
       chain,
@@ -1887,7 +1887,7 @@ class TransactionService {
       step,
       transaction,
       url
-    } = _ref17;
+    } = _ref15;
     const walletContract = _uiKeyring.default.getPair(address).ton.currentContract;
     const emitter = new _eventemitter.default();
     const eventData = {
@@ -1904,11 +1904,11 @@ class TransactionService {
           ...payload,
           messagePayload: (0, _utils.cellToBase64Str)(message),
           messages: []
-        }, {}).then(_ref18 => {
+        }, {}).then(_ref16 => {
           let {
             isApproved,
             payload
-          } = _ref18;
+          } = _ref16;
           if (!isApproved) {
             this.removeTransaction(id);
             eventData.errors.push(new _TransactionError.TransactionError(_types.BasicTxErrorType.USER_REJECT_REQUEST));
@@ -1943,8 +1943,8 @@ class TransactionService {
         if (!externalMsgHash) {
           return;
         }
-        tonApi.getStatusByExtMsgHash(externalMsgHash, extrinsicType).then(_ref19 => {
-          let [status, hex] = _ref19;
+        tonApi.getStatusByExtMsgHash(externalMsgHash, extrinsicType).then(_ref17 => {
+          let [status, hex] = _ref17;
           if (status && hex) {
             eventData.extrinsicHash = hex;
             emitter.emit('extrinsicHash', eventData);
@@ -1973,13 +1973,13 @@ class TransactionService {
     });
     return emitter;
   }
-  signAndSendCardanoTransaction(_ref20) {
+  signAndSendCardanoTransaction(_ref18) {
     let {
       chain,
       id,
       transaction,
       url
-    } = _ref20;
+    } = _ref18;
     const emitter = new _eventemitter.default();
     const eventData = {
       id,
@@ -1989,11 +1989,11 @@ class TransactionService {
     };
     const transactionConfig = transaction;
     const cardanoApi = this.state.chainService.getCardanoApi(chain);
-    this.state.requestService.addConfirmationCardano(id, url || _constants2.EXTENSION_REQUEST_URL, 'cardanoSendTransactionRequest', transactionConfig, {}).then(_ref21 => {
+    this.state.requestService.addConfirmationCardano(id, url || _constants2.EXTENSION_REQUEST_URL, 'cardanoSendTransactionRequest', transactionConfig, {}).then(_ref19 => {
       let {
         isApproved,
         payload
-      } = _ref21;
+      } = _ref19;
       if (!isApproved) {
         this.removeTransaction(id);
         eventData.errors.push(new _TransactionError.TransactionError(_types.BasicTxErrorType.USER_REJECT_REQUEST));
@@ -2064,14 +2064,14 @@ class TransactionService {
       emitter.emit('error', eventData);
     });
   };
-  signAndSendBitcoinTransaction(_ref22) {
+  signAndSendBitcoinTransaction(_ref20) {
     let {
       address,
       chain,
       id,
       transaction,
       url
-    } = _ref22;
+    } = _ref20;
     const tx = transaction;
     // const bitcoinApi = this.state.chainService.getBitcoinApi(chain);
     // const chainInfo = this.state.chainService.getChainInfoByKey(chain);
@@ -2099,11 +2099,11 @@ class TransactionService {
     if (isInjected) {
       throw new _TransactionError.TransactionError(_types.BasicTxErrorType.UNSUPPORTED);
     } else {
-      this.state.requestService.addConfirmationBitcoin(id, url || _constants2.EXTENSION_REQUEST_URL, 'bitcoinSendTransactionRequest', payload, {}).then(_ref23 => {
+      this.state.requestService.addConfirmationBitcoin(id, url || _constants2.EXTENSION_REQUEST_URL, 'bitcoinSendTransactionRequest', payload, {}).then(_ref21 => {
         let {
           isApproved,
           payload
-        } = _ref23;
+        } = _ref21;
         if (isApproved) {
           if (!payload) {
             throw new Error('Bad signature');

package/cjs/services/wallet-connect-service/index.js

@@ -152,6 +152,9 @@ class WalletConnectService {
     var _classPrivateFieldLoo;
     return ((_classPrivateFieldLoo = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo === void 0 ? void 0 : _classPrivateFieldLoo.session.values) || [];
   }
+
+  // Remove old listener
+
   getSession(topic) {
     var _classPrivateFieldLoo2;
     const session = (_classPrivateFieldLoo2 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo2 === void 0 ? void 0 : _classPrivateFieldLoo2.session.get(topic);
@@ -206,7 +209,7 @@ class WalletConnectService {
     await ((_classPrivateFieldLoo7 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo7 === void 0 ? void 0 : _classPrivateFieldLoo7.respond(response));
   }
   async resetWallet(resetAll) {
-    var _classPrivateFieldLoo8, _classPrivateFieldLoo10, _classPrivateFieldLoo12;
+    var _classPrivateFieldLoo8, _classPrivateFieldLoo0, _classPrivateFieldLoo10;
     (0, _classPrivateFieldLooseBase2.default)(this, _removeListener)[_removeListener]();
 
     // Disconnect session
@@ -224,11 +227,11 @@ class WalletConnectService {
     }
 
     // Disconnect pair
-    const pairs = ((_classPrivateFieldLoo10 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo10 === void 0 ? void 0 : _classPrivateFieldLoo10.pairing.values) || [];
+    const pairs = ((_classPrivateFieldLoo0 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo0 === void 0 ? void 0 : _classPrivateFieldLoo0.pairing.values) || [];
     for (const pair of pairs) {
       try {
-        var _classPrivateFieldLoo11;
-        await ((_classPrivateFieldLoo11 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo11 === void 0 ? void 0 : _classPrivateFieldLoo11.disconnect({
+        var _classPrivateFieldLoo1;
+        await ((_classPrivateFieldLoo1 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo1 === void 0 ? void 0 : _classPrivateFieldLoo1.disconnect({
           topic: pair.topic,
           reason: (0, _utils3.getSdkError)('USER_DISCONNECTED')
         }));
@@ -236,12 +239,12 @@ class WalletConnectService {
         console.error(e);
       }
     }
-    const keys = (await ((_classPrivateFieldLoo12 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo12 === void 0 ? void 0 : _classPrivateFieldLoo12.core.storage.getKeys())) || [];
+    const keys = (await ((_classPrivateFieldLoo10 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo10 === void 0 ? void 0 : _classPrivateFieldLoo10.core.storage.getKeys())) || [];
     const deleteKeys = resetAll ? keys : keys.filter(key => key.startsWith('wc@'));
     for (const key of deleteKeys) {
       try {
-        var _classPrivateFieldLoo13;
-        await ((_classPrivateFieldLoo13 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo13 === void 0 ? void 0 : _classPrivateFieldLoo13.core.storage.removeItem(key));
+        var _classPrivateFieldLoo11;
+        await ((_classPrivateFieldLoo11 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo11 === void 0 ? void 0 : _classPrivateFieldLoo11.core.storage.removeItem(key));
       } catch (e) {
         console.error(e);
       }
@@ -250,8 +253,8 @@ class WalletConnectService {
     (0, _classPrivateFieldLooseBase2.default)(this, _updateSessions)[_updateSessions]();
   }
   async disconnect(topic) {
-    var _classPrivateFieldLoo14;
-    await ((_classPrivateFieldLoo14 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo14 === void 0 ? void 0 : _classPrivateFieldLoo14.disconnect({
+    var _classPrivateFieldLoo12;
+    await ((_classPrivateFieldLoo12 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo12 === void 0 ? void 0 : _classPrivateFieldLoo12.disconnect({
       topic: topic,
       reason: (0, _utils3.getSdkError)('USER_DISCONNECTED')
     }));
@@ -360,18 +363,18 @@ async function _onPingReply2(_ref4) {
   }
 }
 function _createListener2() {
-  var _classPrivateFieldLoo15, _classPrivateFieldLoo16, _classPrivateFieldLoo17, _classPrivateFieldLoo18, _classPrivateFieldLoo19, _classPrivateFieldLoo20;
-  (_classPrivateFieldLoo15 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo15 === void 0 ? void 0 : _classPrivateFieldLoo15.on('session_proposal', (0, _classPrivateFieldLooseBase2.default)(this, _onSessionProposal)[_onSessionProposal].bind(this));
-  (_classPrivateFieldLoo16 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo16 === void 0 ? void 0 : _classPrivateFieldLoo16.on('session_request', (0, _classPrivateFieldLooseBase2.default)(this, _onSessionRequest)[_onSessionRequest].bind(this));
-  (_classPrivateFieldLoo17 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo17 === void 0 ? void 0 : _classPrivateFieldLoo17.on('session_ping', (0, _classPrivateFieldLooseBase2.default)(this, _onPingReply)[_onPingReply].bind(this));
-  (_classPrivateFieldLoo18 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo18 === void 0 ? void 0 : _classPrivateFieldLoo18.on('session_event', data => console.log('event', data));
-  (_classPrivateFieldLoo19 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo19 === void 0 ? void 0 : _classPrivateFieldLoo19.on('session_update', data => console.log('update', data));
-  (_classPrivateFieldLoo20 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo20 === void 0 ? void 0 : _classPrivateFieldLoo20.on('session_delete', (0, _classPrivateFieldLooseBase2.default)(this, _updateSessions)[_updateSessions].bind(this));
+  var _classPrivateFieldLoo13, _classPrivateFieldLoo14, _classPrivateFieldLoo15, _classPrivateFieldLoo16, _classPrivateFieldLoo17, _classPrivateFieldLoo18;
+  (_classPrivateFieldLoo13 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo13 === void 0 ? void 0 : _classPrivateFieldLoo13.on('session_proposal', (0, _classPrivateFieldLooseBase2.default)(this, _onSessionProposal)[_onSessionProposal].bind(this));
+  (_classPrivateFieldLoo14 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo14 === void 0 ? void 0 : _classPrivateFieldLoo14.on('session_request', (0, _classPrivateFieldLooseBase2.default)(this, _onSessionRequest)[_onSessionRequest].bind(this));
+  (_classPrivateFieldLoo15 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo15 === void 0 ? void 0 : _classPrivateFieldLoo15.on('session_ping', (0, _classPrivateFieldLooseBase2.default)(this, _onPingReply)[_onPingReply].bind(this));
+  (_classPrivateFieldLoo16 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo16 === void 0 ? void 0 : _classPrivateFieldLoo16.on('session_event', data => console.log('event', data));
+  (_classPrivateFieldLoo17 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo17 === void 0 ? void 0 : _classPrivateFieldLoo17.on('session_update', data => console.log('update', data));
+  (_classPrivateFieldLoo18 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo18 === void 0 ? void 0 : _classPrivateFieldLoo18.on('session_delete', (0, _classPrivateFieldLooseBase2.default)(this, _updateSessions)[_updateSessions].bind(this));
 }
 function _removeListener2() {
   _constants.ALL_WALLET_CONNECT_EVENT.forEach(event => {
-    var _classPrivateFieldLoo21;
-    (_classPrivateFieldLoo21 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo21 === void 0 ? void 0 : _classPrivateFieldLoo21.removeAllListeners(event);
+    var _classPrivateFieldLoo19;
+    (_classPrivateFieldLoo19 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo19 === void 0 ? void 0 : _classPrivateFieldLoo19.removeAllListeners(event);
   });
 }
 function _checkClient2() {

package/cjs/services/wallet-connect-service/types.js

@@ -24,4 +24,4 @@ exports.POLKADOT_SIGNING_METHODS = POLKADOT_SIGNING_METHODS;
 (function (POLKADOT_SIGNING_METHODS) {
   POLKADOT_SIGNING_METHODS["POLKADOT_SIGN_TRANSACTION"] = "polkadot_signTransaction";
   POLKADOT_SIGNING_METHODS["POLKADOT_SIGN_MESSAGE"] = "polkadot_signMessage";
-})(POLKADOT_SIGNING_METHODS || (exports.POLKADOT_SIGNING_METHODS = POLKADOT_SIGNING_METHODS = {}));
+})(POLKADOT_SIGNING_METHODS || (exports.POLKADOT_SIGNING_METHODS = POLKADOT_SIGNING_METHODS = {})); // payload and address

package/cjs/types/account/info/keyring.js

@@ -99,4 +99,12 @@ exports.AccountActions = AccountActions;
   AccountActions["EXPORT_JSON"] = "EXPORT_JSON";
   AccountActions["EXPORT_QR"] = "EXPORT_QR";
   AccountActions["TON_CHANGE_WALLET_CONTRACT_VERSION"] = "TON_CHANGE_WALLET_CONTRACT_VERSION";
-})(AccountActions || (exports.AccountActions = AccountActions = {}));
+})(AccountActions || (exports.AccountActions = AccountActions = {}));
+/**
+ * @interface AccountJson
+ * @extends AbstractAddressJson
+ * @extends AccountMetadataData
+ * @extends AccountActionData
+ * @prop {boolean} [isSubWallet] - Import from SubWallet
+ * @prop {boolean} [pendingMigrate] - Pending migrate password
+ * */

package/cjs/types/balance/index.js

@@ -23,4 +23,8 @@ exports.BalanceType = BalanceType;
   BalanceType["TOTAL"] = "total";
   BalanceType["TOTAL_MINUS_RESERVED"] = "totalMinusReserved";
   BalanceType["KEEP_ALIVE"] = "keepAlive";
-})(BalanceType || (exports.BalanceType = BalanceType = {}));
+})(BalanceType || (exports.BalanceType = BalanceType = {}));
+/** Balance info of all tokens on an address */
+// Key is tokenSlug
+/** Balance info of all addresses */
+// Key is address

package/cjs/types/swap/index.js

@@ -55,7 +55,8 @@ exports.SwapFeeType = SwapFeeType;
   SwapFeeType["PLATFORM_FEE"] = "PLATFORM_FEE";
   SwapFeeType["NETWORK_FEE"] = "NETWORK_FEE";
   SwapFeeType["WALLET_FEE"] = "WALLET_FEE";
-})(SwapFeeType || (exports.SwapFeeType = SwapFeeType = {}));
+})(SwapFeeType || (exports.SwapFeeType = SwapFeeType = {})); // todo: will be more
+// parameters & responses
 let DynamicSwapType;
 exports.DynamicSwapType = DynamicSwapType;
 (function (DynamicSwapType) {

package/cjs/types/transaction/process.js

@@ -25,4 +25,6 @@ exports.StepStatus = StepStatus;
   StepStatus["TIMEOUT"] = "TIMEOUT";
 })(StepStatus || (exports.StepStatus = StepStatus = {}));
 const PROCESSING_STEP_STATUS = [StepStatus.PREPARE, StepStatus.SUBMITTING, StepStatus.PROCESSING];
+
+// temp for avoid conflict // todo: recheck to refactor BriefXcmStepV2 and BriefSwapStepV2 later;
 exports.PROCESSING_STEP_STATUS = PROCESSING_STEP_STATUS;

package/cjs/types/yield/actions/join/step.js

@@ -45,4 +45,20 @@ exports.YieldStepType = YieldStepType;
   YieldStepType["MINT_SDOT"] = "MINT_SDOT";
   YieldStepType["MINT_STDOT"] = "MINT_STDOT";
   YieldStepType["TOKEN_APPROVAL"] = "TOKEN_APPROVAL";
-})(YieldStepType || (exports.YieldStepType = YieldStepType = {}));
+})(YieldStepType || (exports.YieldStepType = YieldStepType = {}));
+/**
+ * @interface YieldStepDetail
+ * @extends BaseYieldStepDetail
+ * @description Detail of a step
+ * @prop {number} id - Step's id
+ * */
+/**
+ * @interface YieldTokenBaseInfo
+ * @prop {string} slug - Token's slug
+ * @prop {string} [amount] - Token's amount
+ * */
+/** Base info and fee of a step */
+/**
+ * @interface OptimalYieldPath
+ * @description Result after generate steps
+ * */

package/cjs/utils/account/common.js

@@ -7,7 +7,6 @@ exports.getAccountJsonByAddress = exports.getAccountChainTypeForAddress = export
 exports.getAddressesByChainType = getAddressesByChainType;
 exports.getAddressesByChainTypeMap = getAddressesByChainTypeMap;
 exports.isAccountAll = isAccountAll;
-exports.modifyAccountName = void 0;
 exports.quickFormatAddressToCompare = quickFormatAddressToCompare;
 exports.reformatAddress = reformatAddress;
 var _constants = require("@subwallet/extension-base/constants");
@@ -80,7 +79,6 @@ function getAddressesByChainType(addresses, chainTypes, chainInfo) {
     return addressByChainTypeMap[chainType];
   }).flat(); // todo: recheck
 }
-
 function getAddressesByChainTypeMap(addresses, chainInfo) {
   const addressByChainType = {
     substrate: [],
@@ -120,29 +118,6 @@ function quickFormatAddressToCompare(address) {
   return reformatAddress(address, 42).toLowerCase();
 }
 
-/** @deprecated */
-const modifyAccountName = (type, name, modify) => {
-  if (!modify) {
-    return name;
-  }
-  let network = '';
-  switch (type) {
-    case 'sr25519':
-    case 'ed25519':
-    case 'ecdsa':
-      network = 'Substrate';
-      break;
-    case 'ethereum':
-      network = 'EVM';
-      break;
-    case 'ton':
-    case 'ton-native':
-      network = 'Ton';
-      break;
-  }
-  return network ? [name, network].join(' - ') : name;
-};
-
 /**
  * @function getAccountJsonByAddress
  * @desc Get account info by address
@@ -152,7 +127,6 @@ const modifyAccountName = (type, name, modify) => {
  * @param {string} address - Address
  * @returns {AccountJson|null}  - Account info or null if not found
  */
-exports.modifyAccountName = modifyAccountName;
 const getAccountJsonByAddress = address => {
   try {
     const pair = _uiKeyring.keyring.getPair(address);

package/cjs/utils/account/derive/info/solo.js

@@ -59,7 +59,7 @@ const parseUnifiedSuriToDerivationPath = (suri, type) => {
         return path.replace('{firstIndex}', firstIndex);
       }
     }
-    if (_types.SubstrateKeypairTypes.includes(type)) {
+    if (_types.DefaultSubstrateKeypairTypes.includes(type)) {
       return suri;
     }
   }
@@ -120,7 +120,7 @@ const getSoloDerivationInfo = function (type) {
         };
       }
     } else {
-      if (_types.SubstrateKeypairTypes.includes(type)) {
+      if (_types.DefaultSubstrateKeypairTypes.includes(type)) {
         const _type = type;
         const validateTypeFunc = _type === 'sr25519' ? _validate.validateSr25519DerivationPath : raw => (0, _validate.validateOtherSubstrateDerivationPath)(raw, _type);
         const validateTypeRs = validateTypeFunc(suri);
@@ -256,7 +256,7 @@ const findSoloNextDerive = parentAddress => {
       break;
     }
   }
-  const isSubstrate = _types.SubstrateKeypairTypes.includes(parentPair.type);
+  const isSubstrate = _types.DefaultSubstrateKeypairTypes.includes(parentPair.type);
   const indexes = currentDepth > 0 ? deriveInfo.autoIndexes || [] : [];
   indexes.push(index);
   const suri = isSubstrate ? [deriveInfo.suri || '', index].join('//') : '//'.concat(indexes.join('//'));
@@ -296,7 +296,10 @@ const derivePair = (parentPair, name, suri, derivationPath) => {
 };
 exports.derivePair = derivePair;
 const getSuri = (seed, type) => {
-  const extraPath = type ? (0, _keyring.getDerivePath)(type)(0) : '';
+  if (!type) {
+    return seed;
+  }
+  const extraPath = (0, _keyring.getDerivePath)(type)(0);
   return seed + (extraPath ? '/' + extraPath : '');
 };
 exports.getSuri = getSuri;

package/cjs/utils/account/derive/validate.js

@@ -259,7 +259,7 @@ const validateDerivationPath = (raw, type) => {
       return validateTonDerivationPath(raw);
     } else if (type === 'sr25519') {
       return validateSr25519DerivationPath(raw);
-    } else if (type === 'ed25519' || type === 'ecdsa') {
+    } else if (type === 'ed25519' || type === 'ed25519-tw' || type === 'ecdsa') {
       return validateOtherSubstrateDerivationPath(raw, type);
     } else if (type === 'cardano') {
       return validateCardanoDerivationPath(raw);

package/cjs/utils/account/transform.js

@@ -115,7 +115,10 @@ const getAccountActions = (signMode, networkType, type, _meta, parentAccount) =>
   // QR
   if (signMode === _types2.AccountSignMode.PASSWORD) {
     if (networkType === _types2.AccountChainType.ETHEREUM || networkType === _types2.AccountChainType.SUBSTRATE) {
-      result.push(_types2.AccountActions.EXPORT_QR);
+      if (type !== 'ed25519-tw') {
+        // todo: recheck if can export this account type
+        result.push(_types2.AccountActions.EXPORT_QR);
+      }
     }
   }
 
@@ -259,6 +262,7 @@ const getAccountTokenTypes = type => {
       return [_types._AssetType.NATIVE, _types._AssetType.LOCAL, _types._AssetType.ERC20, _types._AssetType.ERC721];
     case 'sr25519':
     case 'ed25519':
+    case 'ed25519-tw':
     case 'ecdsa':
       return [_types._AssetType.NATIVE, _types._AssetType.LOCAL, _types._AssetType.PSP22, _types._AssetType.PSP34, _types._AssetType.GRC20, _types._AssetType.ERC721, _types._AssetType.VFT];
     case 'ton':

package/cjs/utils/auth.js

@@ -13,7 +13,7 @@ const isAddressValidWithAuthType = (address, accountAuthTypes) => {
   const keypairType = (0, _keyring.getKeypairTypeByAddress)(address);
   const validTypes = {
     evm: _types.EthereumKeypairTypes,
-    substrate: _types.SubstrateKeypairTypes,
+    substrate: _types.AllSubstrateKeypairTypes,
     ton: _types.TonKeypairTypes,
     cardano: _types.CardanoKeypairTypes,
     bitcoin: _types.BitcoinKeypairTypes

package/cjs/utils/bitcoin/utxo-management.js

@@ -249,7 +249,6 @@ async function getRuneUtxos(bitcoinApi, address) {
         status: {
           confirmed: true // not use in filter out rune utxos
         },
-
         value: utxoValue
       };
       runeUtxos.push(item);

package/cjs/utils/environment.js

@@ -11,7 +11,8 @@ var _mv = require("@subwallet/extension-base/utils/mv3");
 var _bowser = _interopRequireDefault(require("bowser"));
 var _KoniTypes = require("../background/KoniTypes");
 var _constants = require("../constants");
-var _navigator3;
+var _navigator3; // Copyright 2019-2022 @polkadot/extension authors & contributors
+// SPDX-License-Identifier: Apache-2.0
 function detectRuntimeEnvironment() {
   if (_mv.isSupportWindow && typeof document !== 'undefined') {
     var _navigator, _window$location, _window$location2;

package/cjs/utils/fee/transfer.js

@@ -31,8 +31,7 @@ var bitcoin = _interopRequireWildcard(require("bitcoinjs-lib"));
 var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
 var _combine = require("./combine");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0