@subwallet/extension-base 1.3.22-0 → 1.3.24-0

package/cjs/services/request-service/handler/CardanoRequestHandler.js

@@ -0,0 +1,172 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _request = require("@subwallet/extension-base/utils/request");
+var _uiKeyring = require("@subwallet/ui-keyring");
+var _i18next = require("i18next");
+var _rxjs = require("rxjs");
+var _logger = require("@polkadot/util/logger");
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class CardanoRequestHandler {
+  #requestService;
+  #logger;
+  confirmationsQueueSubjectCardano = new _rxjs.BehaviorSubject({
+    cardanoSignatureRequest: {},
+    cardanoSendTransactionRequest: {},
+    cardanoWatchTransactionRequest: {}
+  });
+  confirmationsPromiseMap = {};
+  constructor(requestService) {
+    this.#requestService = requestService;
+    this.#logger = (0, _logger.logger)('CardanoRequestHandler');
+  }
+  get numCardanoRequests() {
+    let count = 0;
+    Object.values(this.confirmationsQueueSubjectCardano.getValue()).forEach(x => {
+      count += Object.keys(x).length;
+    });
+    return count;
+  }
+  getConfirmationsQueueSubjectCardano() {
+    return this.confirmationsQueueSubjectCardano;
+  }
+  async addConfirmationCardano(id, url, type, payload) {
+    let options = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
+    let validator = arguments.length > 5 ? arguments[5] : undefined;
+    const confirmations = this.confirmationsQueueSubjectCardano.getValue();
+    const confirmationType = confirmations[type];
+    const payloadJson = JSON.stringify({});
+    const isInternal = (0, _request.isInternalRequest)(url);
+    if (['cardanoSendTransactionRequest', 'cardanoSignatureRequest'].includes(type)) {
+      const isAlwaysRequired = await this.#requestService.settingService.isAlwaysRequired;
+      if (isAlwaysRequired) {
+        this.#requestService.keyringService.lock();
+      }
+    }
+
+    // Check duplicate request
+    const duplicated = Object.values(confirmationType).find(c => c.url === url && c.payloadJson === payloadJson);
+    if (duplicated) {
+      throw new Error('Cardano duplicate request'); // update this message.
+    }
+
+    confirmationType[id] = {
+      id,
+      url,
+      isInternal,
+      payload,
+      payloadJson,
+      ...options
+    };
+    const promise = new Promise((resolve, reject) => {
+      this.confirmationsPromiseMap[id] = {
+        validator: validator,
+        resolver: {
+          resolve: resolve,
+          reject: reject
+        }
+      };
+    });
+    this.confirmationsQueueSubjectCardano.next(confirmations);
+    if (!isInternal) {
+      this.#requestService.popupOpen();
+    }
+    this.#requestService.updateIconV2();
+    return promise;
+  }
+  async completeConfirmationCardano(request) {
+    const confirmations = this.confirmationsQueueSubjectCardano.getValue();
+    for (const ct in request) {
+      const type = ct;
+      const result = request[type];
+      const {
+        id
+      } = result;
+      const {
+        resolver,
+        validator
+      } = this.confirmationsPromiseMap[id];
+      const confirmation = confirmations[type][id];
+      if (!resolver || !confirmation) {
+        this.#logger.error((0, _i18next.t)('Unable to proceed. Please try again'), type, id);
+        throw new Error((0, _i18next.t)('Unable to proceed. Please try again'));
+      }
+
+      // Fill signature for some special type
+      await this.decorateResult(type, confirmation, result);
+
+      // Validate response from confirmation popup some info like password, response format....
+      const error = validator && validator(result);
+      if (error) {
+        resolver.reject(error);
+      }
+
+      // Delete confirmations from queue
+      delete this.confirmationsPromiseMap[id];
+      delete confirmations[type][id];
+      this.confirmationsQueueSubjectCardano.next(confirmations);
+
+      // Update icon, and close queue
+      this.#requestService.updateIconV2(this.#requestService.numAllRequests === 0);
+      resolver.resolve(result);
+    }
+
+    // TODO: Review later
+    return true;
+  }
+  async decorateResult(t, request, result) {
+    if (result.payload === '') {
+      if (t === 'cardanoSignatureRequest') {
+        // result.payload = await this.signMessage(request as ConfirmationDefinitions['evmSignatureRequest'][0]);
+      } else if (t === 'cardanoSendTransactionRequest') {
+        result.payload = this.signTransactionCardano(request);
+      }
+      if (t === 'cardanoSignatureRequest' || t === 'cardanoSendTransactionRequest') {
+        const isAlwaysRequired = await this.#requestService.settingService.isAlwaysRequired;
+        if (isAlwaysRequired) {
+          this.#requestService.keyringService.lock();
+        }
+      }
+    }
+  }
+  signTransactionCardano(confirmation) {
+    // alibaba
+    const transaction = confirmation.payload;
+    const {
+      cardanoPayload,
+      from
+    } = transaction;
+    const pair = _uiKeyring.keyring.getPair(from);
+    if (pair.isLocked) {
+      _uiKeyring.keyring.unlockPair(pair.address);
+    }
+    return pair.cardano.sign(cardanoPayload);
+  }
+  resetWallet() {
+    const confirmations = this.confirmationsQueueSubjectCardano.getValue();
+    for (const [type, requests] of Object.entries(confirmations)) {
+      for (const confirmation of Object.values(requests)) {
+        const {
+          id
+        } = confirmation;
+        const {
+          resolver
+        } = this.confirmationsPromiseMap[id];
+        if (!resolver || !confirmation) {
+          console.error('Not found confirmation', type, id);
+        } else {
+          resolver.reject(new Error('Reset wallet'));
+        }
+        delete this.confirmationsPromiseMap[id];
+        delete confirmations[type][id];
+      }
+    }
+    this.confirmationsQueueSubjectCardano.next(confirmations);
+  }
+}
+exports.default = CardanoRequestHandler;

package/cjs/services/request-service/handler/EvmRequestHandler.js

@@ -88,7 +88,7 @@ class EvmRequestHandler {
     }
     if (options.isPassConfirmation) {
       await this.completeConfirmation({
-        evmSendTransactionRequest: {
+        [type]: {
           id,
           url,
           isApproved: true,

package/cjs/services/request-service/handler/MetadataRequestHandler.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _helper = require("@subwallet/extension-base/services/request-service/helper");
 var _stores = require("@subwallet/extension-base/stores");
-var _getId = require("@subwallet/extension-base/utils/getId");
 var _extensionChains = require("@subwallet/extension-chains");
 var _rxjs = require("rxjs");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
@@ -52,6 +51,8 @@ class MetadataRequestHandler {
     this.metaSubject.next(this.allMetaRequests);
     this.#requestService.updateIconV2(shouldClose);
   }
+
+  // @ts-ignore
   metaComplete = (id, resolve, reject) => {
     const complete = () => {
       delete this.#metaRequests[id];
@@ -68,18 +69,9 @@ class MetadataRequestHandler {
       }
     };
   };
-  injectMetadata(url, request) {
-    return new Promise((resolve, reject) => {
-      const id = (0, _getId.getId)();
-      this.#metaRequests[id] = {
-        ...this.metaComplete(id, resolve, reject),
-        id,
-        request,
-        url
-      };
-      this.updateIconMeta();
-      this.#requestService.popupOpen();
-    });
+  injectMetadata(request) {
+    this.saveMetadata(request);
+    return true;
   }
   resetWallet() {
     for (const request of Object.values(this.#metaRequests)) {

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _CardanoRequestHandler = _interopRequireDefault(require("@subwallet/extension-base/services/request-service/handler/CardanoRequestHandler"));
 var _TonRequestHandler = _interopRequireDefault(require("./handler/TonRequestHandler"));
 var _handler = require("./handler");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
@@ -19,6 +20,7 @@ class RequestService {
   #substrateRequestHandler;
   #evmRequestHandler;
   #tonRequestHandler;
+  #cardanoRequestHandler;
   #connectWCRequestHandler;
   #notSupportWCRequestHandler;
 
@@ -33,6 +35,7 @@ class RequestService {
     this.#substrateRequestHandler = new _handler.SubstrateRequestHandler(this);
     this.#evmRequestHandler = new _handler.EvmRequestHandler(this);
     this.#tonRequestHandler = new _TonRequestHandler.default(this);
+    this.#cardanoRequestHandler = new _CardanoRequestHandler.default(this);
     this.#connectWCRequestHandler = new _handler.ConnectWCRequestHandler(this);
     this.#notSupportWCRequestHandler = new _handler.NotSupportWCRequestHandler(this);
 
@@ -40,7 +43,7 @@ class RequestService {
     this.updateIconV2();
   }
   get numAllRequests() {
-    return this.allSubstrateRequests.length + this.numEvmRequests + this.numTonRequests;
+    return this.allSubstrateRequests.length + this.numEvmRequests + this.numTonRequests + this.numCardanoRequests;
   }
   updateIconV2(shouldClose) {
     this.#popupHandler.updateIconV2(shouldClose);
@@ -84,8 +87,8 @@ class RequestService {
   get numMetaRequests() {
     return this.#metadataRequestHandler.numMetaRequests;
   }
-  injectMetadata(url, request) {
-    return this.#metadataRequestHandler.injectMetadata(url, request);
+  injectMetadata(request) {
+    return this.#metadataRequestHandler.injectMetadata(request);
   }
   getMetaRequest(id) {
     return this.#metadataRequestHandler.getMetaRequest(id);
@@ -150,12 +153,18 @@ class RequestService {
   get numTonRequests() {
     return this.#tonRequestHandler.numTonRequests;
   }
+  get numCardanoRequests() {
+    return this.#cardanoRequestHandler.numCardanoRequests;
+  }
   get confirmationsQueueSubject() {
     return this.#evmRequestHandler.getConfirmationsQueueSubject();
   }
   get confirmationsQueueSubjectTon() {
     return this.#tonRequestHandler.getConfirmationsQueueSubjectTon();
   }
+  get confirmationsQueueSubjectCardano() {
+    return this.#cardanoRequestHandler.getConfirmationsQueueSubjectCardano();
+  }
   getSignRequest(id) {
     return this.#substrateRequestHandler.getSignRequest(id);
   }
@@ -172,12 +181,20 @@ class RequestService {
     let validator = arguments.length > 5 ? arguments[5] : undefined;
     return this.#tonRequestHandler.addConfirmationTon(id, url, type, payload, options, validator);
   }
+  addConfirmationCardano(id, url, type, payload) {
+    let options = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
+    let validator = arguments.length > 5 ? arguments[5] : undefined;
+    return this.#cardanoRequestHandler.addConfirmationCardano(id, url, type, payload, options, validator);
+  }
   async completeConfirmation(request) {
     return await this.#evmRequestHandler.completeConfirmation(request);
   }
   async completeConfirmationTon(request) {
     return await this.#tonRequestHandler.completeConfirmationTon(request);
   }
+  async completeConfirmationCardano(request) {
+    return await this.#cardanoRequestHandler.completeConfirmationCardano(request);
+  }
   updateConfirmation(id, type, payload) {
     let options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
     let validator = arguments.length > 4 ? arguments[4] : undefined;
@@ -220,13 +237,14 @@ class RequestService {
 
   // General methods
   get numRequests() {
-    return this.numMetaRequests + this.numAuthRequests + this.numSubstrateRequests + this.numEvmRequests + this.numConnectWCRequests + this.numNotSupportWCRequests + this.numTonRequests;
+    return this.numMetaRequests + this.numAuthRequests + this.numSubstrateRequests + this.numEvmRequests + this.numConnectWCRequests + this.numNotSupportWCRequests + this.numTonRequests + this.numCardanoRequests;
   }
   resetWallet() {
     this.#authRequestHandler.resetWallet();
     this.#substrateRequestHandler.resetWallet();
     this.#evmRequestHandler.resetWallet();
     this.#tonRequestHandler.resetWallet();
+    this.#cardanoRequestHandler.resetWallet();
     this.#metadataRequestHandler.resetWallet();
     this.#connectWCRequestHandler.resetWallet();
     this.#notSupportWCRequestHandler.resetWallet();

package/cjs/services/setting-service/constants.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DEFAULT_UNLOCK_TYPE = exports.DEFAULT_THEME = exports.DEFAULT_SHOW_ZERO_BALANCE = exports.DEFAULT_SHOW_BALANCE = exports.DEFAULT_SETTING = exports.DEFAULT_NOTIFICATION_TYPE = exports.DEFAULT_NOTIFICATION_SETUP = exports.DEFAULT_LANGUAGE = exports.DEFAULT_CURRENCY = exports.DEFAULT_CHAIN_PATROL_ENABLE = exports.DEFAULT_CAMERA_ENABLE = exports.DEFAULT_AUTO_LOCK_TIME = exports.DEFAULT_ALL_LOGO = exports.DEFAULT_ALLOW_ONE_SIGN = void 0;
+exports.DEFAULT_UNLOCK_TYPE = exports.DEFAULT_UNIFIED_ACCOUNT_MIGRATION_IN_PROGRESS = exports.DEFAULT_UNIFIED_ACCOUNT_MIGRATION_IN_DONE = exports.DEFAULT_THEME = exports.DEFAULT_SHOW_ZERO_BALANCE = exports.DEFAULT_SHOW_BALANCE = exports.DEFAULT_SETTING = exports.DEFAULT_NOTIFICATION_TYPE = exports.DEFAULT_NOTIFICATION_SETUP = exports.DEFAULT_LANGUAGE = exports.DEFAULT_CURRENCY = exports.DEFAULT_CHAIN_PATROL_ENABLE = exports.DEFAULT_CAMERA_ENABLE = exports.DEFAULT_AUTO_LOCK_TIME = exports.DEFAULT_ALL_LOGO = exports.DEFAULT_ALLOW_ONE_SIGN = exports.DEFAULT_ACKNOWLEDGED_MIGRATION_STATUS = void 0;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _utils = require("@subwallet/extension-base/utils");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
@@ -48,6 +48,12 @@ const DEFAULT_NOTIFICATION_SETUP = {
   }
 };
 exports.DEFAULT_NOTIFICATION_SETUP = DEFAULT_NOTIFICATION_SETUP;
+const DEFAULT_ACKNOWLEDGED_MIGRATION_STATUS = false;
+exports.DEFAULT_ACKNOWLEDGED_MIGRATION_STATUS = DEFAULT_ACKNOWLEDGED_MIGRATION_STATUS;
+const DEFAULT_UNIFIED_ACCOUNT_MIGRATION_IN_PROGRESS = false;
+exports.DEFAULT_UNIFIED_ACCOUNT_MIGRATION_IN_PROGRESS = DEFAULT_UNIFIED_ACCOUNT_MIGRATION_IN_PROGRESS;
+const DEFAULT_UNIFIED_ACCOUNT_MIGRATION_IN_DONE = false;
+exports.DEFAULT_UNIFIED_ACCOUNT_MIGRATION_IN_DONE = DEFAULT_UNIFIED_ACCOUNT_MIGRATION_IN_DONE;
 const DEFAULT_SETTING = {
   language: DEFAULT_LANGUAGE,
   currency: DEFAULT_CURRENCY,
@@ -61,6 +67,9 @@ const DEFAULT_SETTING = {
   timeAutoLock: DEFAULT_AUTO_LOCK_TIME,
   enableChainPatrol: DEFAULT_CHAIN_PATROL_ENABLE,
   notificationSetup: DEFAULT_NOTIFICATION_SETUP,
+  isAcknowledgedUnifiedAccountMigration: DEFAULT_ACKNOWLEDGED_MIGRATION_STATUS,
+  isUnifiedAccountMigrationInProgress: DEFAULT_UNIFIED_ACCOUNT_MIGRATION_IN_PROGRESS,
+  isUnifiedAccountMigrationDone: DEFAULT_UNIFIED_ACCOUNT_MIGRATION_IN_DONE,
   walletReference: '',
   allowOneSign: DEFAULT_ALLOW_ONE_SIGN
 };

package/cjs/services/storage-service/DatabaseService.js

@@ -607,6 +607,9 @@ class DatabaseService {
   removeAccountNotifications(proxyId) {
     return this.stores.inappNotification.removeAccountNotifications(proxyId);
   }
+  updateNotificationProxyId(proxyIds, newProxyId, newName) {
+    return this.stores.inappNotification.updateNotificationProxyId(proxyIds, newProxyId, newName);
+  }
   async exportDB() {
     const blob = await (0, _dexieExportImport.exportDB)(this._db, {
       filter: (table, value, key) => {

package/cjs/services/storage-service/db-stores/InappNotification.js

@@ -43,6 +43,12 @@ class InappNotificationStore extends _BaseStore.default {
     });
     return filteredTable.toArray();
   }
+  updateNotificationProxyId(proxyIds, newProxyId, newName) {
+    this.table.where('proxyId').anyOfIgnoreCase(proxyIds).modify(item => {
+      item.proxyId = newProxyId;
+      item.title = item.title.replace(/\[.*?\]/, `[${newName}]`);
+    }).catch(console.error);
+  }
   async cleanUpOldNotifications(overdueTime) {
     const currentTimestamp = Date.now();
     return this.table.filter(item => item.time <= currentTimestamp - overdueTime).delete();

package/cjs/services/swap-service/handler/asset-hub/handler.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.AssetHubSwapHandler = void 0;
-var _SwapError = require("@subwallet/extension-base/background/errors/SwapError");
 var _TransactionError = require("@subwallet/extension-base/background/errors/TransactionError");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _constants = require("@subwallet/extension-base/constants");
@@ -23,7 +22,6 @@ var _router = require("./router");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-const PAH_LOW_LIQUIDITY_THRESHOLD = 0.15;
 class AssetHubSwapHandler {
   isReady = false;
   constructor(chainService, balanceService, feeService, chain) {
@@ -157,57 +155,6 @@ class AssetHubSwapHandler {
   generateOptimalProcess(params) {
     return this.swapBaseHandler.generateOptimalProcess(params, [this.getXcmStep.bind(this), this.getSubmitStep.bind(this)]);
   }
-  async getSwapQuote(request) {
-    const fromAsset = this.chainService.getAssetBySlug(request.pair.from);
-    const toAsset = this.chainService.getAssetBySlug(request.pair.to);
-    const fromChain = this.chainService.getChainInfoByKey(fromAsset.originChain);
-    const fromChainNativeTokenSlug = (0, _utils._getChainNativeTokenSlug)(fromChain);
-    if (!this.isReady || !this.router) {
-      return new _SwapError.SwapError(_swap2.SwapErrorType.UNKNOWN);
-    }
-    const earlyValidation = await this.validateSwapRequest(request);
-    if (earlyValidation.error) {
-      const metadata = earlyValidation.metadata;
-      return (0, _swap._getEarlyAssetHubValidationError)(earlyValidation.error, metadata);
-    }
-    try {
-      const paths = this.router.buildPath(request.pair);
-      const amountOut = earlyValidation.metadata.toAmount;
-      const toAmount = new _bignumber.default(amountOut);
-      const minReceive = toAmount.times(1 - request.slippage).integerValue(_bignumber.default.ROUND_DOWN);
-      const extrinsic = await this.router.buildSwapExtrinsic(paths, request.address, request.fromAmount, minReceive.toString());
-      const paymentInfo = await extrinsic.paymentInfo(request.address);
-      const networkFee = {
-        tokenSlug: fromChainNativeTokenSlug,
-        amount: paymentInfo.partialFee.toString(),
-        feeType: _swap2.SwapFeeType.NETWORK_FEE
-      };
-      const feeTokenOptions = [fromChainNativeTokenSlug];
-      const selectedFeeToken = fromChainNativeTokenSlug;
-      const priceImpactPct = earlyValidation.metadata.priceImpactPct || '0';
-      return {
-        pair: request.pair,
-        fromAmount: request.fromAmount,
-        toAmount: toAmount.toString(),
-        rate: (0, _utils2.convertSwapRate)(earlyValidation.metadata.quoteRate, fromAsset, toAsset),
-        provider: this.providerInfo,
-        aliveUntil: +Date.now() + (_utils2.SWAP_QUOTE_TIMEOUT_MAP[this.slug] || _utils2.SWAP_QUOTE_TIMEOUT_MAP.default),
-        feeInfo: {
-          feeComponent: [networkFee],
-          defaultFeeToken: fromChainNativeTokenSlug,
-          feeOptions: feeTokenOptions,
-          // TODO: enable fee options
-          selectedFeeToken
-        },
-        isLowLiquidity: Math.abs(parseFloat(priceImpactPct)) >= PAH_LOW_LIQUIDITY_THRESHOLD,
-        route: {
-          path: paths.map(asset => asset.slug)
-        }
-      };
-    } catch (e) {
-      return new _SwapError.SwapError(_swap2.SwapErrorType.ERROR_FETCHING_QUOTE);
-    }
-  }
   async handleXcmStep(params) {
     const pair = params.quote.pair;
     const alternativeAssetSlug = (0, _utils2.getSwapAlternativeAsset)(pair);
@@ -369,11 +316,5 @@ class AssetHubSwapHandler {
     }
     return [];
   }
-  validateSwapRequest(request) {
-    if (!this.isReady || !this.router) {
-      throw new _SwapError.SwapError(_swap2.SwapErrorType.ERROR_FETCHING_QUOTE);
-    }
-    return this.router.earlyValidateSwapValidation(request);
-  }
 }
 exports.AssetHubSwapHandler = AssetHubSwapHandler;