@subwallet/extension-base 1.3.31-1 → 1.3.33-0

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

@@ -27,7 +27,8 @@ const DEFAULT_PRICE_SUBJECT = {
   },
   priceMap: {},
   price24hMap: {},
-  exchangeRateMap: {}
+  exchangeRateMap: {},
+  lastUpdatedMap: {}
 };
 const checkFetchSuccess = (obj1, obj2) => {
   return Object.keys(obj1).length > 0 && Object.keys(obj2).length > 0;
@@ -41,6 +42,7 @@ class PriceService {
     });
     this.rawPriceSubject = new _rxjs.BehaviorSubject({});
     this.rawExchangeRateMap = new _rxjs.BehaviorSubject({});
+    this.historyTokenPriceSubject = new _rxjs.BehaviorSubject({});
     this.status = _types.ServiceStatus.NOT_INITIALIZED;
     this.dbService = dbService;
     this.eventService = eventService;
@@ -99,6 +101,7 @@ class PriceService {
   }
   async calculatePriceMap(currency) {
     let {
+      lastUpdatedMap,
       price24hMap,
       priceMap
     } = this.rawPriceSubject.value;
@@ -129,7 +132,10 @@ class PriceService {
       },
       currency: currencyKey,
       exchangeRateMap: exchangeRateData,
-      currencyData: _staticData.staticData[_staticData.StaticKey.CURRENCY_SYMBOL][currencyKey || DEFAULT_CURRENCY]
+      currencyData: _staticData.staticData[_staticData.StaticKey.CURRENCY_SYMBOL][currencyKey || DEFAULT_CURRENCY],
+      lastUpdatedMap: {
+        ...lastUpdatedMap
+      }
     };
     if (currencyKey === DEFAULT_CURRENCY) {
       return finalPriceMap;
@@ -171,6 +177,73 @@ class PriceService {
     });
     this.refreshTimeout = setTimeout(this.refreshPriceData.bind(this), _constants.CRON_REFRESH_PRICE_INTERVAL);
   }
+  async getHistoryTokenPriceData(priceId, timeframe) {
+    var _this$rawExchangeRate;
+    const id = (0, _utils.getTokenPriceHistoryId)(priceId, timeframe);
+    const currentData = this.historyTokenPriceSubject.value[id];
+    const now = Date.now();
+    const timeInterval = _utils.TIME_INTERVAL[timeframe];
+    let history = currentData ? structuredClone(currentData) : undefined;
+    const needsRefresh = !history || history.length === 0 || now - history[history.length - 1].time > timeInterval;
+    if (needsRefresh) {
+      const {
+        history: newHistory
+      } = await (0, _coingecko.getHistoryPrice)(priceId, timeframe);
+      if (newHistory.length > 0) {
+        history = newHistory;
+
+        // Update internal cache
+        this.historyTokenPriceSubject.next({
+          ...this.historyTokenPriceSubject.value,
+          [id]: structuredClone(history)
+        });
+      }
+    }
+    if (!history) {
+      return {
+        history: []
+      };
+    }
+
+    // Resolve current currency
+    const {
+      promise,
+      resolve
+    } = (0, _promise.createPromiseHandler)();
+    this.getCurrentCurrency(resolve);
+    const currencyKey = await promise;
+    const exchangeRate = (_this$rawExchangeRate = this.rawExchangeRateMap.value[currencyKey || DEFAULT_CURRENCY]) === null || _this$rawExchangeRate === void 0 ? void 0 : _this$rawExchangeRate.exchange;
+
+    // Convert value if needed
+    if (exchangeRate && currencyKey !== DEFAULT_CURRENCY) {
+      history = history.map(point => ({
+        ...point,
+        value: point.value * exchangeRate
+      }));
+    }
+    return {
+      history
+    };
+  }
+  subscribeCurrentTokenPrice(priceId, callback) {
+    const priceData = this.priceSubject.value;
+    const currentPrice = {
+      value: priceData.priceMap[priceId],
+      value24h: priceData.price24hMap[priceId],
+      time: priceData.lastUpdatedMap[priceId].getTime()
+    };
+    const unsubscribe = this.priceSubject.pipe((0, _rxjs.map)(valueSubject => ({
+      value: valueSubject.priceMap[priceId],
+      value24h: valueSubject.price24hMap[priceId],
+      time: valueSubject.lastUpdatedMap[priceId].getTime()
+    })), (0, _rxjs.distinctUntilChanged)()).subscribe(callback);
+    return {
+      unsubscribe: () => {
+        unsubscribe.unsubscribe();
+      },
+      currentPrice
+    };
+  }
   async init() {
     this.status = _types.ServiceStatus.INITIALIZING;
     // Fetch data from storage

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

@@ -12,7 +12,9 @@ exports.EXTENSION_REQUEST_URL = EXTENSION_REQUEST_URL;
 const PREDEFINED_CHAIN_DAPP_CHAIN_MAP = {
   'portal.astar.network': ['astar', 'astarEvm'],
   'apps.moonbeam.network': ['moonbeam', 'moonriver'],
-  'app.stellaswap.com': ['moonbeam']
+  'app.stellaswap.com': ['moonbeam'],
+  'testnet-preprod.minswap.org': ['cardano_preproduction'],
+  'localhost:7777': ['cardano_preproduction']
 };
 exports.PREDEFINED_CHAIN_DAPP_CHAIN_MAP = PREDEFINED_CHAIN_DAPP_CHAIN_MAP;
 const WEB_APP_URL = [

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

@@ -45,6 +45,13 @@ class AuthRequestHandler {
         value.accountAuthTypes = ['evm', 'substrate'];
         needUpdateAuthList = true;
       }
+      const existKeyEvmNetworkConnect = value.currentEvmNetworkKey;
+      if (existKeyEvmNetworkConnect) {
+        value.currentNetworkMap = {
+          evm: existKeyEvmNetworkConnect
+        };
+        needUpdateAuthList = true;
+      }
       acc[key] = {
         ...value
       };
@@ -158,6 +165,18 @@ class AuthRequestHandler {
         }
       }
     }
+    if (options.accessType === 'cardano') {
+      const cardanoChains = Object.values(chainInfoMaps).filter(_utils._isChainCardanoCompatible);
+      chainInfo = (defaultChain ? chainInfoMaps[defaultChain] : chainInfoMaps.cardano) || cardanoChains[0]; // auto active cardano mainnet chain, because dont support switch network yet
+
+      if (options.autoActive) {
+        var _chainInfo3;
+        if (!needEnableChains.includes((_chainInfo3 = chainInfo) === null || _chainInfo3 === void 0 ? void 0 : _chainInfo3.slug)) {
+          var _chainInfo4;
+          needEnableChains.push((_chainInfo4 = chainInfo) === null || _chainInfo4 === void 0 ? void 0 : _chainInfo4.slug);
+        }
+      }
+    }
     needEnableChains = needEnableChains.filter(slug => {
       var _chainStateMap$slug;
       return !((_chainStateMap$slug = chainStateMap[slug]) !== null && _chainStateMap$slug !== void 0 && _chainStateMap$slug.active);
@@ -206,20 +225,31 @@ class AuthRequestHandler {
           if ((0, _keyring.isTonAddress)(a) && !accountAuthTypes.includes('ton')) {
             return true;
           }
+          if ((0, _keyring.isCardanoAddress)(a) && !accountAuthTypes.includes('cardano')) {
+            return true;
+          }
           return false;
         });
         backupAllowed.forEach(acc => {
           isAllowedMap[acc] = true;
         });
       }
-      let defaultEvmNetworkKey;
+      const defaultNetworkMap = {};
       if (accountAuthTypes.includes('evm')) {
         const chainInfo = this.getDAppChainInfo({
           accessType: 'evm',
           autoActive: true,
           url
         });
-        defaultEvmNetworkKey = chainInfo === null || chainInfo === void 0 ? void 0 : chainInfo.slug;
+        defaultNetworkMap.evm = chainInfo === null || chainInfo === void 0 ? void 0 : chainInfo.slug;
+      }
+      if (accountAuthTypes.includes('cardano')) {
+        const chainInfo = this.getDAppChainInfo({
+          accessType: 'cardano',
+          autoActive: true,
+          url
+        });
+        defaultNetworkMap.cardano = chainInfo === null || chainInfo === void 0 ? void 0 : chainInfo.slug;
       }
       this.getAuthorize(value => {
         let authorizeList = {};
@@ -243,7 +273,7 @@ class AuthRequestHandler {
           origin,
           url,
           accountAuthTypes: [...new Set([...accountAuthTypes, ...((existed === null || existed === void 0 ? void 0 : existed.accountAuthTypes) || [])])],
-          currentEvmNetworkKey: existed ? existed.currentEvmNetworkKey : defaultEvmNetworkKey
+          currentNetworkMap: existed ? existed.currentNetworkMap : defaultNetworkMap
         };
         this.setAuthorize(authorizeList, () => {
           cb();
@@ -347,12 +377,14 @@ class AuthRequestHandler {
           list.push(...allowedListByRequestType.filter(a => (0, _keyring.isSubstrateAddress)(a)));
         } else if (accountAuthType === 'ton') {
           list.push(...allowedListByRequestType.filter(a => (0, _keyring.isTonAddress)(a)));
+        } else if (accountAuthType === 'cardano') {
+          list.push(...allowedListByRequestType.filter(a => (0, _keyring.isCardanoAddress)(a)));
         }
         return list;
       }, []);
       if (!confirmAnotherType && !request.reConfirm && allowedListByRequestType.length !== 0) {
         // Prevent appear confirmation popup
-        return false;
+        return true;
       }
     } else {
       // Auto auth for web app
@@ -368,7 +400,8 @@ class AuthRequestHandler {
           isAllowedMap,
           origin,
           url,
-          accountAuthTypes: _constants.ALL_ACCOUNT_AUTH_TYPES
+          accountAuthTypes: _constants.ALL_ACCOUNT_AUTH_TYPES,
+          currentNetworkMap: {}
         };
         this.setAuthorize(authList);
         return true;

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

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _cardanoSerializationLibNodejs = require("@emurgo/cardano-serialization-lib-nodejs");
 var _request = require("@subwallet/extension-base/utils/request");
 var _uiKeyring = require("@subwallet/ui-keyring");
 var _i18next = require("i18next");
@@ -18,7 +19,8 @@ class CardanoRequestHandler {
   confirmationsQueueSubjectCardano = new _rxjs.BehaviorSubject({
     cardanoSignatureRequest: {},
     cardanoSendTransactionRequest: {},
-    cardanoWatchTransactionRequest: {}
+    cardanoWatchTransactionRequest: {},
+    cardanoSignTransactionRequest: {}
   });
   confirmationsPromiseMap = {};
   constructor(requestService) {
@@ -122,9 +124,11 @@ class CardanoRequestHandler {
   async decorateResult(t, request, result) {
     if (result.payload === '') {
       if (t === 'cardanoSignatureRequest') {
-        // result.payload = await this.signMessage(request as ConfirmationDefinitions['evmSignatureRequest'][0]);
+        result.payload = this.signMessage(request);
       } else if (t === 'cardanoSendTransactionRequest') {
         result.payload = this.signTransactionCardano(request);
+      } else if (t === 'cardanoSignTransactionRequest') {
+        result.payload = this.signDappTransactionCardano(request);
       }
       if (t === 'cardanoSignatureRequest' || t === 'cardanoSendTransactionRequest') {
         const isAlwaysRequired = await this.#requestService.settingService.isAlwaysRequired;
@@ -134,6 +138,17 @@ class CardanoRequestHandler {
       }
     }
   }
+  signMessage(confirmation) {
+    const {
+      address,
+      payload
+    } = confirmation.payload;
+    const pair = _uiKeyring.keyring.getPair(address);
+    if (pair.isLocked) {
+      _uiKeyring.keyring.unlockPair(pair.address);
+    }
+    return pair.cardano.signMessage(payload, true);
+  }
   signTransactionCardano(confirmation) {
     // alibaba
     const transaction = confirmation.payload;
@@ -145,7 +160,34 @@ class CardanoRequestHandler {
     if (pair.isLocked) {
       _uiKeyring.keyring.unlockPair(pair.address);
     }
-    return pair.cardano.sign(cardanoPayload);
+    return pair.cardano.signTransaction(cardanoPayload);
+  }
+  signDappTransactionCardano(confirmation) {
+    var _FixedTransaction$fro;
+    // alibaba
+    const transaction = confirmation.payload;
+    const {
+      addressRequireKeyTypes,
+      cardanoPayload,
+      from
+    } = transaction;
+    const vkeyWitnessesFinal = _cardanoSerializationLibNodejs.Vkeywitnesses.new();
+    const txWitnessSet = (_FixedTransaction$fro = _cardanoSerializationLibNodejs.FixedTransaction.from_hex(cardanoPayload).witness_set()) !== null && _FixedTransaction$fro !== void 0 ? _FixedTransaction$fro : _cardanoSerializationLibNodejs.TransactionWitnessSet.new();
+    const pair = _uiKeyring.keyring.getPair(from);
+    if (pair.isLocked) {
+      _uiKeyring.keyring.unlockPair(pair.address);
+    }
+    const keyTypes = [...new Set(addressRequireKeyTypes)];
+    const vKeyWitnessesHex = pair.cardano.signTransaction(cardanoPayload, {
+      needVkeywitness: true,
+      keyTypes
+    });
+    const vKeyWitnesses = _cardanoSerializationLibNodejs.Vkeywitnesses.from_hex(vKeyWitnessesHex);
+    for (let i = 0; i < vKeyWitnesses.len(); i++) {
+      vkeyWitnessesFinal.add(vKeyWitnesses.get(i));
+    }
+    txWitnessSet.set_vkeys(vkeyWitnessesFinal);
+    return txWitnessSet.to_hex();
   }
   resetWallet() {
     const confirmations = this.confirmationsQueueSubjectCardano.getValue();