@subwallet/extension-base 1.3.34-0 → 1.3.35-0

package/background/KoniTypes.d.ts

@@ -142,6 +142,7 @@ export interface PriceJson {
     exchangeRateMap: Record<string, ExchangeRateJSON>;
     priceMap: Record<string, number>;
     price24hMap: Record<string, number>;
+    priceCoinGeckoSupported: string[];
     lastUpdatedMap: Record<string, Date>;
 }
 export interface HistoryTokenPriceJSON {
@@ -1674,6 +1675,7 @@ export interface KoniRequestSignatures {
     'pri(price.getPrice)': [RequestPrice, PriceJson];
     'pri(price.getSubscription)': [RequestSubscribePrice, PriceJson, PriceJson];
     'pri(price.getHistory)': [RequestGetHistoryTokenPriceData, HistoryTokenPriceJSON];
+    'pri(price.checkCoinGeckoPriceSupport)': [string, boolean];
     'pri(price.subscribeCurrentTokenPrice)': [string, ResponseSubscribeCurrentTokenPrice, CurrentTokenPrice];
     'pri(balance.getBalance)': [RequestBalance, BalanceJson];
     'pri(balance.getSubscription)': [RequestSubscribeBalance, BalanceJson, BalanceJson];

package/cjs/core/logic-validation/request.js

@@ -371,7 +371,7 @@ async function validationEvmDataTransactionMiddleware(koni, url, payload) {
             transaction.maxPriorityFeePerGas = feeCombine.maxPriorityFeePerGas;
           } else if (feeCombine.gasPrice) {
             estimateGas = new _bignumber.default(feeCombine.gasPrice || 0).multipliedBy(gasLimit).toFixed(0);
-            transaction.maxPriorityFeePerGas = feeCombine.gasPrice;
+            transaction.gasPrice = feeCombine.gasPrice;
           }
         }
       } catch (e) {

package/cjs/koni/background/handlers/Extension.js

@@ -925,6 +925,9 @@ class KoniExtension {
     } = _ref29;
     return this.#koniState.priceService.getHistoryTokenPriceData(priceId, timeframe);
   }
+  checkCoinGeckoPriceSupport(priceId) {
+    return this.#koniState.priceService.checkCoinGeckoPriceSupport(priceId);
+  }
   subscribeCurrentTokenPrice(priceId, id, port) {
     const cb = (0, _subscriptions.createSubscription)(id, port);
     const {
@@ -1490,7 +1493,8 @@ class KoniExtension {
         xcmFeeDryRun = dryRunInfo.fee;
       }
       if (isAcrossBridgeTransfer) {
-        const metadata = await (0, _acrossBridge.getAcrossQuote)(params);
+        const data = await (0, _acrossBridge.getAcrossQuote)(params);
+        const metadata = data.metadata;
         inputData.metadata = {
           amountOut: metadata.outputAmount,
           rate: metadata.rate,
@@ -2648,11 +2652,12 @@ class KoniExtension {
     let registry = new _types5.TypeRegistry();
     if (isJsonPayload(payload)) {
       const [, chainInfo] = this.#koniState.findNetworkKeyByGenesisHash(payload.genesisHash);
-      const allRegistry = [(0, _utils9.setupApiRegistry)(chainInfo, this.#koniState), (0, _utils9.setupDatabaseRegistry)(await this.#koniState.chainService.getMetadataByHash(payload.genesisHash), chainInfo, payload), (0, _utils9.setupDappRegistry)(this.#koniState.knownMetadata.find(meta => meta.genesisHash === payload.genesisHash), payload)].filter(item => item !== null && item.registry !== undefined);
-      if (allRegistry.length === 0) {
+      const registries = await Promise.all([(0, _utils9.setupApiRegistry)(chainInfo, this.#koniState), (0, _utils9.setupDatabaseRegistry)(chainInfo, payload, this.#koniState), (0, _utils9.setupDappRegistry)(payload, this.#koniState)]);
+      const validRegistries = registries.filter(item => !!(item !== null && item !== void 0 && item.registry));
+      if (validRegistries.length === 0) {
         registry.setSignedExtensions(payload.signedExtensions);
       } else {
-        registry = (0, _utils9.getSuitableRegistry)(allRegistry, payload);
+        registry = (0, _utils9.getSuitableRegistry)(validRegistries, payload);
       }
     }
     const result = request.sign(registry, pair);
@@ -4360,6 +4365,8 @@ class KoniExtension {
         return await this.subscribePrice(id, port);
       case 'pri(price.getHistory)':
         return await this.getHistoryTokenPrice(request);
+      case 'pri(price.checkCoinGeckoPriceSupport)':
+        return this.checkCoinGeckoPriceSupport(request);
       case 'pri(price.subscribeCurrentTokenPrice)':
         return this.subscribeCurrentTokenPrice(request, id, port);
       case 'pri(settings.savePriceCurrency)':

package/cjs/koni/background/utils.js

@@ -7,6 +7,7 @@ exports.getSuitableRegistry = getSuitableRegistry;
 exports.setupApiRegistry = setupApiRegistry;
 exports.setupDappRegistry = setupDappRegistry;
 exports.setupDatabaseRegistry = setupDatabaseRegistry;
+var _utils = require("@subwallet/extension-base/utils");
 var _bundle = require("@subwallet/extension-chains/bundle");
 var _types = require("@polkadot/types");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
@@ -32,41 +33,75 @@ function getSuitableRegistry(registries, payload) {
   });
   return sortedRegistries[0].registry;
 }
-function setupApiRegistry(chainInfo, koniState) {
+async function setupApiRegistry(chainInfo, koniState) {
   if (!chainInfo) {
     return null;
   }
-  const api = koniState.getSubstrateApi(chainInfo.slug).api;
-  const apiSpecVersion = api === null || api === void 0 ? void 0 : api.runtimeVersion.specVersion.toString();
-  const registry = api === null || api === void 0 ? void 0 : api.registry;
-  return {
-    registry,
-    specVersion: apiSpecVersion
-  };
-}
-function setupDatabaseRegistry(metadata, chainInfo, payload) {
-  if (!metadata || !metadata.genesisHash || !chainInfo) {
+  try {
+    const api = koniState.getSubstrateApi(chainInfo.slug).api;
+    if (!api) {
+      return null;
+    }
+
+    // Wait for the API to be ready or timeout after 1 second
+    await Promise.race([(0, _utils.wait)(1000).then(() => {
+      throw new Error('Timeout waiting for API to be ready');
+    }), api.isReady]);
+
+    // Extract the spec version and registry
+    const apiSpecVersion = api.runtimeVersion.specVersion.toString();
+    const registry = api.registry;
+    return {
+      registry,
+      specVersion: apiSpecVersion
+    };
+  } catch (e) {
+    console.error('Error in setupApiRegistry:', e);
     return null;
   }
-  const registry = new _types.TypeRegistry();
-  const _metadata = new _types.Metadata(registry, metadata.hexValue);
-  registry.register(metadata.types);
-  registry.setChainProperties(registry.createType('ChainProperties', metadata.tokenInfo));
-  registry.setMetadata(_metadata, payload.signedExtensions, metadata.userExtensions);
-  return {
-    registry,
-    specVersion: metadata.specVersion
-  };
 }
-function setupDappRegistry(metadata, payload) {
-  if (!metadata || !metadata.genesisHash) {
+async function setupDatabaseRegistry(chainInfo, payload, koniState) {
+  if (!chainInfo) {
+    console.warn('setupDatabaseRegistry: Missing chainInfo');
+    return null;
+  }
+  try {
+    const metadata = await koniState.chainService.getMetadataByHash(payload.genesisHash);
+    if (!(metadata !== null && metadata !== void 0 && metadata.genesisHash)) {
+      console.warn('setupDatabaseRegistry: Metadata not found or invalid for genesisHash:', payload.genesisHash);
+      return null;
+    }
+    const registry = new _types.TypeRegistry();
+    const _metadata = new _types.Metadata(registry, metadata.hexValue);
+    registry.register(metadata.types);
+    registry.setChainProperties(registry.createType('ChainProperties', metadata.tokenInfo));
+    registry.setMetadata(_metadata, payload.signedExtensions, metadata.userExtensions);
+    return {
+      registry,
+      specVersion: metadata.specVersion
+    };
+  } catch (e) {
+    console.error('setupDatabaseRegistry: Error setting up database registry:', e);
     return null;
   }
-  const expanded = (0, _bundle.metadataExpand)(metadata, false);
-  const registry = expanded.registry;
-  registry.setSignedExtensions(payload.signedExtensions, expanded.definition.userExtensions);
-  return {
-    registry,
-    specVersion: metadata.specVersion
-  };
+}
+function setupDappRegistry(payload, koniState) {
+  return new Promise(resolve => {
+    const metadata = koniState.knownMetadata.find(meta => meta.genesisHash === payload.genesisHash);
+    if (!(metadata !== null && metadata !== void 0 && metadata.genesisHash)) {
+      return resolve(null);
+    }
+    try {
+      const expanded = (0, _bundle.metadataExpand)(metadata, false);
+      const registry = expanded.registry;
+      registry.setSignedExtensions(payload.signedExtensions, expanded.definition.userExtensions);
+      resolve({
+        registry,
+        specVersion: metadata.specVersion
+      });
+    } catch (e) {
+      console.error('setupDappRegistry: Error setting up DApp registry:', e);
+      resolve(null);
+    }
+  });
 }

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.3.34-0'
+  version: '1.3.35-0'
 };
 exports.packageInfo = packageInfo;

package/cjs/services/balance-service/helpers/process.js

@@ -8,8 +8,6 @@ exports.getDefaultTransferProcess = getDefaultTransferProcess;
 exports.getSnowbridgeTransferProcessFromEvm = getSnowbridgeTransferProcessFromEvm;
 var _chainList = require("@subwallet/chain-list");
 var _serviceBase = require("@subwallet/extension-base/types/service-base");
-var _utils = require("../../chain-service/utils");
-var _acrossBridge = require("../transfer/xcm/acrossBridge");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -52,9 +50,7 @@ async function getSnowbridgeTransferProcessFromEvm(address, evmApi, tokenInfo, a
   result.totalFee.push(_serviceBase.MOCK_STEP_FEE);
   return Promise.resolve(result);
 }
-async function getAcrossbridgeTransferProcessFromEvm(originChainInfo) {
-  const chainId = (0, _utils._getEvmChainId)(originChainInfo);
-  const SpokePoolAddress = _acrossBridge.SpokePoolMapping[chainId].SpokePool.address;
+async function getAcrossbridgeTransferProcessFromEvm(SpokePoolAddress) {
   const result = {
     totalFee: [_serviceBase.MOCK_STEP_FEE],
     steps: [_serviceBase.DEFAULT_FIRST_STEP]

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

@@ -586,7 +586,26 @@ class BalanceService {
     if ((0, _acrossBridge._isAcrossChainBridge)(originChainInfo.slug, destChainInfo.slug)) {
       const tokenInfo = this.state.chainService.getAssetBySlug(params.tokenSlug);
       if (!(0, _utils._isNativeToken)(tokenInfo)) {
-        return (0, _process.getAcrossbridgeTransferProcessFromEvm)(originChainInfo);
+        const chainInfoMap = this.state.getChainInfoMap();
+        const originTokenInfo = this.state.getAssetBySlug(params.tokenSlug);
+        const destinationTokenInfo = this.state.getXcmEqualAssetByChain(params.destChain, params.tokenSlug);
+        if (!destinationTokenInfo) {
+          throw new Error('Destination token info not found');
+        }
+        const inputData = {
+          destinationTokenInfo,
+          originTokenInfo,
+          sendingValue: params.amount,
+          sender: params.address,
+          recipient: params.address,
+          destinationChain: chainInfoMap[destinationTokenInfo.originChain],
+          originChain: chainInfoMap[originTokenInfo.originChain]
+        };
+        const data = await (0, _acrossBridge.getAcrossQuote)(inputData);
+        if (!data) {
+          throw new Error('Failed to fetch Across Bridge Data. Please try again later');
+        }
+        return (0, _process.getAcrossbridgeTransferProcessFromEvm)(data.to);
       }
     }
     return (0, _process.getDefaultTransferProcess)();

package/cjs/services/balance-service/transfer/xcm/acrossBridge/index.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SpokePoolMapping = exports.AcrossErrorMsg = void 0;
+exports.AcrossErrorMsg = void 0;
 exports._isAcrossChainBridge = _isAcrossChainBridge;
 exports._isAcrossTestnetBridge = _isAcrossTestnetBridge;
 exports.getAcrossQuote = void 0;
@@ -25,177 +25,6 @@ function _isAcrossChainBridge(srcChain, destChain) {
 function _isAcrossTestnetBridge(srcChain) {
   return srcChain === 'base_sepolia' || srcChain === 'arbitrum_sepolia' || srcChain === _chainList.COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA;
 }
-const SpokePoolMapping = {
-  1: {
-    SpokePool: {
-      address: '0x5c7BCd6E7De5423a257D81B442095A1a6ced35C5',
-      blockNumber: 17117454
-    }
-  },
-  10: {
-    SpokePool: {
-      address: '0x6f26Bf09B1C792e3228e5467807a900A503c0281',
-      blockNumber: 93903076
-    }
-  },
-  11155111: {
-    SpokePool: {
-      address: '0x5ef6C01E11889d86803e0B23e3cB3F9E9d97B662',
-      blockNumber: 5288470
-    }
-  },
-  11155420: {
-    SpokePool: {
-      address: '0x4e8E101924eDE233C13e2D8622DC8aED2872d505',
-      blockNumber: 7762656
-    }
-  },
-  1135: {
-    SpokePool: {
-      address: '0x9552a0a6624A23B848060AE5901659CDDa1f83f8',
-      blockNumber: 2602337
-    }
-  },
-  130: {
-    SpokePool: {
-      address: '0x09aea4b2242abC8bb4BB78D537A67a245A7bEC64',
-      blockNumber: 7915488
-    }
-  },
-  137: {
-    SpokePool: {
-      address: '0x9295ee1d8C5b022Be115A2AD3c30C72E34e7F096',
-      blockNumber: 41908657
-    }
-  },
-  168587773: {
-    SpokePool: {
-      address: '0x5545092553Cf5Bf786e87a87192E902D50D8f022',
-      blockNumber: 7634204
-    }
-  },
-  1868: {
-    SpokePool: {
-      address: '0x3baD7AD0728f9917d1Bf08af5782dCbD516cDd96',
-      blockNumber: 1709997
-    }
-  },
-  288: {
-    SpokePool: {
-      address: '0xBbc6009fEfFc27ce705322832Cb2068F8C1e0A58',
-      blockNumber: 619993
-    }
-  },
-  324: {
-    SpokePool: {
-      address: '0xE0B015E54d54fc84a6cB9B666099c46adE9335FF',
-      blockNumber: 10352565
-    }
-  },
-  34443: {
-    SpokePool: {
-      address: '0x3baD7AD0728f9917d1Bf08af5782dCbD516cDd96',
-      blockNumber: 8043187
-    }
-  },
-  37111: {
-    SpokePool: {
-      address: '0x6A0a7f39530923911832Dd60667CE5da5449967B',
-      blockNumber: 156275
-    }
-  },
-  41455: {
-    SpokePool: {
-      address: '0x13fDac9F9b4777705db45291bbFF3c972c6d1d97',
-      blockNumber: 4240318
-    }
-  },
-  4202: {
-    SpokePool: {
-      address: '0xeF684C38F94F48775959ECf2012D7E864ffb9dd4',
-      blockNumber: 7267988
-    }
-  },
-  42161: {
-    SpokePool: {
-      address: '0xe35e9842fceaCA96570B734083f4a58e8F7C5f2A',
-      blockNumber: 83868041
-    }
-  },
-  421614: {
-    SpokePool: {
-      address: '0x7E63A5f1a8F0B4d0934B2f2327DAED3F6bb2ee75',
-      blockNumber: 12411026
-    }
-  },
-  480: {
-    SpokePool: {
-      address: '0x09aea4b2242abC8bb4BB78D537A67a245A7bEC64',
-      blockNumber: 4524742
-    }
-  },
-  534352: {
-    SpokePool: {
-      address: '0x3baD7AD0728f9917d1Bf08af5782dCbD516cDd96',
-      blockNumber: 7489705
-    }
-  },
-  57073: {
-    SpokePool: {
-      address: '0xeF684C38F94F48775959ECf2012D7E864ffb9dd4',
-      blockNumber: 1139240
-    }
-  },
-  59144: {
-    SpokePool: {
-      address: '0x7E63A5f1a8F0B4d0934B2f2327DAED3F6bb2ee75',
-      blockNumber: 2721169
-    }
-  },
-  690: {
-    SpokePool: {
-      address: '0x13fDac9F9b4777705db45291bbFF3c972c6d1d97',
-      blockNumber: 5512122
-    }
-  },
-  7777777: {
-    SpokePool: {
-      address: '0x13fDac9F9b4777705db45291bbFF3c972c6d1d97',
-      blockNumber: 18382867
-    }
-  },
-  80002: {
-    SpokePool: {
-      address: '0xd08baaE74D6d2eAb1F3320B2E1a53eeb391ce8e5',
-      blockNumber: 7529960
-    }
-  },
-  81457: {
-    SpokePool: {
-      address: '0x2D509190Ed0172ba588407D4c2df918F955Cc6E1',
-      blockNumber: 5574280
-    }
-  },
-  8453: {
-    SpokePool: {
-      address: '0x09aea4b2242abC8bb4BB78D537A67a245A7bEC64',
-      blockNumber: 2164878
-    }
-  },
-  84532: {
-    SpokePool: {
-      address: '0x82B564983aE7274c86695917BBf8C99ECb6F0F8F',
-      blockNumber: 6082004
-    }
-  },
-  919: {
-    SpokePool: {
-      address: '0xbd886FC0725Cc459b55BbFEb3E4278610331f83b',
-      blockNumber: 13999465
-    }
-  }
-};
-exports.SpokePoolMapping = SpokePoolMapping;
 const AcrossErrorMsg = {
   AMOUNT_TOO_LOW: 'amount too low',
   AMOUNT_TOO_HIGH: 'amount too high'
@@ -222,12 +51,99 @@ const getAcrossQuote = async _ref => {
   try {
     var _subwalletApiSdk$xcmA;
     const data = await ((_subwalletApiSdk$xcmA = _subwalletApiSdk.default.xcmApi) === null || _subwalletApiSdk$xcmA === void 0 ? void 0 : _subwalletApiSdk$xcmA.fetchXcmData(sender, originTokenInfo.slug, destinationTokenInfo.slug, recipient, sendingValue));
-    if (!data || !data.metadata) {
-      throw new Error('Failed to get AcrossBridge quote');
+    if (!data) {
+      throw new Error('Failed to fetch Across Bridge Data. Please try again later');
     }
-    return data.metadata;
+    return data;
   } catch (error) {
     return Promise.reject(error);
   }
 };
+
+// export const SpokePoolMapping: Record<number, { SpokePool: { address: string; blockNumber: number } }> = {
+//   1: {
+//     SpokePool: { address: '0x5c7BCd6E7De5423a257D81B442095A1a6ced35C5', blockNumber: 17117454 }
+//   },
+//   10: {
+//     SpokePool: { address: '0x6f26Bf09B1C792e3228e5467807a900A503c0281', blockNumber: 93903076 }
+//   },
+//   11155111: {
+//     SpokePool: { address: '0x5ef6C01E11889d86803e0B23e3cB3F9E9d97B662', blockNumber: 5288470 }
+//   },
+//   11155420: {
+//     SpokePool: { address: '0x4e8E101924eDE233C13e2D8622DC8aED2872d505', blockNumber: 7762656 }
+//   },
+//   1135: {
+//     SpokePool: { address: '0x9552a0a6624A23B848060AE5901659CDDa1f83f8', blockNumber: 2602337 }
+//   },
+//   130: {
+//     SpokePool: { address: '0x09aea4b2242abC8bb4BB78D537A67a245A7bEC64', blockNumber: 7915488 }
+//   },
+//   137: {
+//     SpokePool: { address: '0x9295ee1d8C5b022Be115A2AD3c30C72E34e7F096', blockNumber: 41908657 }
+//   },
+//   168587773: {
+//     SpokePool: { address: '0x5545092553Cf5Bf786e87a87192E902D50D8f022', blockNumber: 7634204 }
+//   },
+//   1868: {
+//     SpokePool: { address: '0x3baD7AD0728f9917d1Bf08af5782dCbD516cDd96', blockNumber: 1709997 }
+//   },
+//   288: {
+//     SpokePool: { address: '0xBbc6009fEfFc27ce705322832Cb2068F8C1e0A58', blockNumber: 619993 }
+//   },
+//   324: {
+//     SpokePool: { address: '0xE0B015E54d54fc84a6cB9B666099c46adE9335FF', blockNumber: 10352565 }
+//   },
+//   34443: {
+//     SpokePool: { address: '0x3baD7AD0728f9917d1Bf08af5782dCbD516cDd96', blockNumber: 8043187 }
+//   },
+//   37111: {
+//     SpokePool: { address: '0x6A0a7f39530923911832Dd60667CE5da5449967B', blockNumber: 156275 }
+//   },
+//   41455: {
+//     SpokePool: { address: '0x13fDac9F9b4777705db45291bbFF3c972c6d1d97', blockNumber: 4240318 }
+//   },
+//   4202: {
+//     SpokePool: { address: '0xeF684C38F94F48775959ECf2012D7E864ffb9dd4', blockNumber: 7267988 }
+//   },
+//   42161: {
+//     SpokePool: { address: '0xe35e9842fceaCA96570B734083f4a58e8F7C5f2A', blockNumber: 83868041 }
+//   },
+//   421614: {
+//     SpokePool: { address: '0x7E63A5f1a8F0B4d0934B2f2327DAED3F6bb2ee75', blockNumber: 12411026 }
+//   },
+//   480: {
+//     SpokePool: { address: '0x09aea4b2242abC8bb4BB78D537A67a245A7bEC64', blockNumber: 4524742 }
+//   },
+//   534352: {
+//     SpokePool: { address: '0x3baD7AD0728f9917d1Bf08af5782dCbD516cDd96', blockNumber: 7489705 }
+//   },
+//   57073: {
+//     SpokePool: { address: '0xeF684C38F94F48775959ECf2012D7E864ffb9dd4', blockNumber: 1139240 }
+//   },
+//   59144: {
+//     SpokePool: { address: '0x7E63A5f1a8F0B4d0934B2f2327DAED3F6bb2ee75', blockNumber: 2721169 }
+//   },
+//   690: {
+//     SpokePool: { address: '0x13fDac9F9b4777705db45291bbFF3c972c6d1d97', blockNumber: 5512122 }
+//   },
+//   7777777: {
+//     SpokePool: { address: '0x13fDac9F9b4777705db45291bbFF3c972c6d1d97', blockNumber: 18382867 }
+//   },
+//   80002: {
+//     SpokePool: { address: '0xd08baaE74D6d2eAb1F3320B2E1a53eeb391ce8e5', blockNumber: 7529960 }
+//   },
+//   81457: {
+//     SpokePool: { address: '0x2D509190Ed0172ba588407D4c2df918F955Cc6E1', blockNumber: 5574280 }
+//   },
+//   8453: {
+//     SpokePool: { address: '0x09aea4b2242abC8bb4BB78D537A67a245A7bEC64', blockNumber: 2164878 }
+//   },
+//   84532: {
+//     SpokePool: { address: '0x82B564983aE7274c86695917BBf8C99ECb6F0F8F', blockNumber: 6082004 }
+//   },
+//   919: {
+//     SpokePool: { address: '0xbd886FC0725Cc459b55BbFEb3E4278610331f83b', blockNumber: 13999465 }
+//   }
+// };
 exports.getAcrossQuote = getAcrossQuote;

package/cjs/services/balance-service/transfer/xcm/index.js

@@ -202,13 +202,14 @@ const createAcrossBridgeExtrinsic = async _ref6 => {
     const data = await ((_subwalletApiSdk$xcmA = _subwalletApiSdk.default.xcmApi) === null || _subwalletApiSdk$xcmA === void 0 ? void 0 : _subwalletApiSdk$xcmA.fetchXcmData(sender, originTokenInfo.slug, destinationTokenInfo.slug, recipient, sendingValue));
     const _feeCustom = feeCustom;
     const feeCombine = (0, _utils3.combineEthFee)(feeInfo, feeOption, _feeCustom);
-
-    // todo: validate data before sending
+    if (!data) {
+      throw new Error('Failed to fetch Across Bridge Data. Please try again later');
+    }
     const transactionConfig = {
-      from: data === null || data === void 0 ? void 0 : data.sender,
-      to: data === null || data === void 0 ? void 0 : data.to,
-      value: data === null || data === void 0 ? void 0 : data.value,
-      data: data === null || data === void 0 ? void 0 : data.transferEncodedCall,
+      from: data.sender,
+      to: data.to,
+      value: data.value,
+      data: data.transferEncodedCall,
       ...feeCombine
     };
     const gasLimit = await evmApi.api.eth.estimateGas(transactionConfig).catch(() => 200000);

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

@@ -60,28 +60,33 @@ const fetchDerivativeTokenSlugs = async () => {
 };
 const getPriceMap = async function (priceIds) {
   let currency = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'USD';
+  let skipDerivativePrice = arguments.length > 2 ? arguments[2] : undefined;
   const idStr = Array.from(priceIds).join(',');
   let response;
   try {
     var _response3, _response5;
     const derivativePriceMap = {};
+    const lastUpdatedMap = {};
     let derivativeApiError = false;
-    try {
-      const responseDerivativeTokens = await fetch(`${apiCacheDomain}/api/price/derivative-get`);
-      const generateDerivativePriceRaw = (await (responseDerivativeTokens === null || responseDerivativeTokens === void 0 ? void 0 : responseDerivativeTokens.json())) || [];
-      if (Array.isArray(generateDerivativePriceRaw)) {
-        generateDerivativePriceRaw.forEach(token => {
-          if (token.id) {
-            derivativePriceMap[token.id] = token.derived_price;
-          }
-        });
-      } else {
-        console.warn('Invalid data from derivative API:', generateDerivativePriceRaw);
+    if (!skipDerivativePrice) {
+      try {
+        const responseDerivativeTokens = await fetch(`${apiCacheDomain}/api/price/derivative-get`);
+        const generateDerivativePriceRaw = (await (responseDerivativeTokens === null || responseDerivativeTokens === void 0 ? void 0 : responseDerivativeTokens.json())) || [];
+        if (Array.isArray(generateDerivativePriceRaw)) {
+          generateDerivativePriceRaw.forEach(token => {
+            if (token.id) {
+              derivativePriceMap[token.id] = token.derived_price;
+              lastUpdatedMap[token.id] = new Date(token.cached_at || Date.now());
+            }
+          });
+        } else {
+          console.warn('Invalid data from derivative API:', generateDerivativePriceRaw);
+          derivativeApiError = true;
+        }
+      } catch (error) {
+        console.error('Error fetching derivative API:', error);
         derivativeApiError = true;
       }
-    } catch (error) {
-      console.error('Error fetching derivative API:', error);
-      derivativeApiError = true;
     }
     if (!useBackupApi) {
       try {
@@ -113,10 +118,11 @@ const getPriceMap = async function (priceIds) {
     const currencyData = _staticData.staticData[_staticData.StaticKey.CURRENCY_SYMBOL][currency || DEFAULT_CURRENCY];
     const priceMap = {};
     const price24hMap = {};
-    const lastUpdatedMap = {};
+    const priceCoinGeckoSupported = [];
     responseDataPrice.forEach(val => {
       const currentPrice = val.current_price || 0;
       const price24h = currentPrice - (val.price_change_24h || 0);
+      priceCoinGeckoSupported.push(val.id);
       priceMap[val.id] = currentPrice;
       price24hMap[val.id] = price24h;
       lastUpdatedMap[val.id] = new Date(val.last_updated || val.last_updated_at || Date.now());
@@ -139,6 +145,7 @@ const getPriceMap = async function (priceIds) {
       currencyData,
       priceMap,
       price24hMap,
+      priceCoinGeckoSupported,
       lastUpdatedMap
     };
   } catch (e) {

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

@@ -26,6 +26,7 @@ const DEFAULT_PRICE_SUBJECT = {
     isPrefix: true
   },
   priceMap: {},
+  priceCoinGeckoSupported: [],
   price24hMap: {},
   exchangeRateMap: {},
   lastUpdatedMap: {}
@@ -103,6 +104,7 @@ class PriceService {
     let {
       lastUpdatedMap,
       price24hMap,
+      priceCoinGeckoSupported,
       priceMap
     } = this.rawPriceSubject.value;
     let exchangeRateData = this.rawExchangeRateMap.value;
@@ -132,6 +134,7 @@ class PriceService {
       },
       currency: currencyKey,
       exchangeRateMap: exchangeRateData,
+      priceCoinGeckoSupported,
       currencyData: _staticData.staticData[_staticData.StaticKey.CURRENCY_SYMBOL][currencyKey || DEFAULT_CURRENCY],
       lastUpdatedMap: {
         ...lastUpdatedMap
@@ -268,6 +271,15 @@ class PriceService {
     this.status = _types.ServiceStatus.INITIALIZED;
     this.eventService.on('asset.updateState', eventHandler);
   }
+  checkCoinGeckoPriceSupport(priceId) {
+    const {
+      priceCoinGeckoSupported
+    } = this.priceSubject.value;
+    if (!priceCoinGeckoSupported) {
+      return false;
+    }
+    return priceCoinGeckoSupported.includes(priceId);
+  }
   async loadData() {
     const data = await this.dbService.getPriceStore(this.priceSubject.value.currency);
     this.priceSubject.next(data || DEFAULT_PRICE_SUBJECT);