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

package/koni/background/utils.js

@@ -1,6 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { wait } from '@subwallet/extension-base/utils';
 import { metadataExpand } from '@subwallet/extension-chains/bundle';
 import { Metadata, TypeRegistry } from '@polkadot/types';
 export function getSuitableRegistry(registries, payload) {
@@ -23,41 +24,75 @@ export function getSuitableRegistry(registries, payload) {
   });
   return sortedRegistries[0].registry;
 }
-export function setupApiRegistry(chainInfo, koniState) {
+export 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
-  };
-}
-export 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([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 TypeRegistry();
-  const _metadata = new 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
-  };
 }
-export function setupDappRegistry(metadata, payload) {
-  if (!metadata || !metadata.genesisHash) {
+export 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 TypeRegistry();
+    const _metadata = new 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 = metadataExpand(metadata, false);
-  const registry = expanded.registry;
-  registry.setSignedExtensions(payload.signedExtensions, expanded.definition.userExtensions);
-  return {
-    registry,
-    specVersion: metadata.specVersion
-  };
+}
+export 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 = 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/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.34-0",
+  "version": "1.3.36-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1911,6 +1911,11 @@
       "require": "./cjs/services/swap-service/handler/hydradx-handler.js",
       "default": "./services/swap-service/handler/hydradx-handler.js"
     },
+    "./services/swap-service/handler/kyber-handler": {
+      "types": "./services/swap-service/handler/kyber-handler.d.ts",
+      "require": "./cjs/services/swap-service/handler/kyber-handler.js",
+      "default": "./services/swap-service/handler/kyber-handler.js"
+    },
     "./services/swap-service/handler/simpleswap-handler": {
       "types": "./services/swap-service/handler/simpleswap-handler.d.ts",
       "require": "./cjs/services/swap-service/handler/simpleswap-handler.js",
@@ -2705,12 +2710,12 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
     "@subwallet/chain-list": "0.2.104",
-    "@subwallet/extension-base": "^1.3.34-0",
-    "@subwallet/extension-chains": "^1.3.34-0",
-    "@subwallet/extension-dapp": "^1.3.34-0",
-    "@subwallet/extension-inject": "^1.3.34-0",
+    "@subwallet/extension-base": "^1.3.36-0",
+    "@subwallet/extension-chains": "^1.3.36-0",
+    "@subwallet/extension-dapp": "^1.3.36-0",
+    "@subwallet/extension-inject": "^1.3.36-0",
     "@subwallet/keyring": "^0.1.11",
-    "@subwallet/subwallet-api-sdk": "^1.3.34-0",
+    "@subwallet/subwallet-api-sdk": "^1.3.36-0",
     "@subwallet/ui-keyring": "^0.1.11",
     "@ton/core": "^0.56.3",
     "@ton/crypto": "^3.2.0",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.3.34-0'
+  version: '1.3.36-0'
 };

package/services/balance-service/helpers/process.d.ts

@@ -1,4 +1,4 @@
-import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
+import { _ChainAsset } from '@subwallet/chain-list/types';
 import { _Address } from '@subwallet/extension-base/background/KoniTypes';
 import { _EvmApi } from '@subwallet/extension-base/services/chain-service/types';
 import { CommonOptimalTransferPath } from '@subwallet/extension-base/types/service-base';
@@ -11,4 +11,4 @@ export interface RequestOptimalTransferProcess {
 }
 export declare function getDefaultTransferProcess(): CommonOptimalTransferPath;
 export declare function getSnowbridgeTransferProcessFromEvm(address: string, evmApi: _EvmApi, tokenInfo: _ChainAsset, amount: string): Promise<CommonOptimalTransferPath>;
-export declare function getAcrossbridgeTransferProcessFromEvm(originChainInfo: _ChainInfo): Promise<CommonOptimalTransferPath>;
+export declare function getAcrossbridgeTransferProcessFromEvm(SpokePoolAddress: string): Promise<CommonOptimalTransferPath>;

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

@@ -3,8 +3,6 @@
 
 import { COMMON_CHAIN_SLUGS } from '@subwallet/chain-list';
 import { CommonStepType, DEFAULT_FIRST_STEP, MOCK_STEP_FEE } from '@subwallet/extension-base/types/service-base';
-import { _getEvmChainId } from "../../chain-service/utils/index.js";
-import { SpokePoolMapping } from "../transfer/xcm/acrossBridge/index.js";
 export function getDefaultTransferProcess() {
   return {
     totalFee: [MOCK_STEP_FEE, MOCK_STEP_FEE],
@@ -44,9 +42,7 @@ export async function getSnowbridgeTransferProcessFromEvm(address, evmApi, token
   result.totalFee.push(MOCK_STEP_FEE);
   return Promise.resolve(result);
 }
-export async function getAcrossbridgeTransferProcessFromEvm(originChainInfo) {
-  const chainId = _getEvmChainId(originChainInfo);
-  const SpokePoolAddress = SpokePoolMapping[chainId].SpokePool.address;
+export async function getAcrossbridgeTransferProcessFromEvm(SpokePoolAddress) {
   const result = {
     totalFee: [MOCK_STEP_FEE],
     steps: [DEFAULT_FIRST_STEP]

package/services/balance-service/index.js

@@ -18,7 +18,7 @@ import BigN from 'bignumber.js';
 import { t } from 'i18next';
 import { BehaviorSubject } from 'rxjs';
 import { noop } from '@polkadot/util';
-import { _isAcrossChainBridge } from "./transfer/xcm/acrossBridge/index.js";
+import { _isAcrossChainBridge, getAcrossQuote } from "./transfer/xcm/acrossBridge/index.js";
 import { BalanceMapImpl } from "./BalanceMapImpl.js";
 import { subscribeBalance } from "./helpers/index.js";
 
@@ -577,7 +577,26 @@ export class BalanceService {
     if (_isAcrossChainBridge(originChainInfo.slug, destChainInfo.slug)) {
       const tokenInfo = this.state.chainService.getAssetBySlug(params.tokenSlug);
       if (!_isNativeToken(tokenInfo)) {
-        return 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 getAcrossQuote(inputData);
+        if (!data) {
+          throw new Error('Failed to fetch Across Bridge Data. Please try again later');
+        }
+        return getAcrossbridgeTransferProcessFromEvm(data.to);
       }
     }
     return getDefaultTransferProcess();

package/services/balance-service/transfer/xcm/acrossBridge/index.d.ts

@@ -1,19 +1,20 @@
 import { CreateXcmExtrinsicProps } from '..';
 export declare function _isAcrossChainBridge(srcChain: string, destChain: string): boolean;
 export declare function _isAcrossTestnetBridge(srcChain: string): boolean;
-export declare const SpokePoolMapping: Record<number, {
-    SpokePool: {
-        address: string;
-        blockNumber: number;
-    };
-}>;
 export declare const AcrossErrorMsg: {
     AMOUNT_TOO_LOW: string;
     AMOUNT_TOO_HIGH: string;
 };
-interface AcrossQuote {
+export interface AcrossQuote {
     outputAmount: string;
     rate: string;
 }
-export declare const getAcrossQuote: ({ destinationChain, destinationTokenInfo, originChain, originTokenInfo, recipient, sender, sendingValue }: CreateXcmExtrinsicProps) => Promise<AcrossQuote>;
+interface XcmApiResponse {
+    sender: string;
+    to: string;
+    transferEncodedCall: string;
+    value: string;
+    metadata?: any;
+}
+export declare const getAcrossQuote: ({ destinationChain, destinationTokenInfo, originChain, originTokenInfo, recipient, sender, sendingValue }: CreateXcmExtrinsicProps) => Promise<XcmApiResponse>;
 export {};

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

@@ -15,176 +15,6 @@ export function _isAcrossChainBridge(srcChain, destChain) {
 export function _isAcrossTestnetBridge(srcChain) {
   return srcChain === 'base_sepolia' || srcChain === 'arbitrum_sepolia' || srcChain === COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA;
 }
-export 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
-    }
-  }
-};
 export const AcrossErrorMsg = {
   AMOUNT_TOO_LOW: 'amount too low',
   AMOUNT_TOO_HIGH: 'amount too high'
@@ -209,11 +39,98 @@ export const getAcrossQuote = async ({
   try {
     var _subwalletApiSdk$xcmA;
     const data = await ((_subwalletApiSdk$xcmA = subwalletApiSdk.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 }
+//   }
+// };

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

@@ -182,13 +182,14 @@ export const createAcrossBridgeExtrinsic = async ({
     const data = await ((_subwalletApiSdk$xcmA = subwalletApiSdk.xcmApi) === null || _subwalletApiSdk$xcmA === void 0 ? void 0 : _subwalletApiSdk$xcmA.fetchXcmData(sender, originTokenInfo.slug, destinationTokenInfo.slug, recipient, sendingValue));
     const _feeCustom = feeCustom;
     const feeCombine = 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/services/event-service/types.d.ts

@@ -1,4 +1,4 @@
-import { SWTransaction } from '@subwallet/extension-base/services/transaction-service/types';
+import { SWTransactionBase } from '@subwallet/extension-base/services/transaction-service/types';
 import { CurrentAccountInfo } from '@subwallet/extension-base/types';
 export interface EventRegistry {
     'general.sleep': [boolean];
@@ -27,13 +27,13 @@ export interface EventRegistry {
     'asset.ready': [boolean];
     'asset.online.ready': [boolean];
     'asset.updateState': [string];
-    'transaction.done': [SWTransaction];
-    'transaction.failed': [SWTransaction | undefined];
-    'transaction.timeout': [SWTransaction | undefined];
+    'transaction.done': [SWTransactionBase];
+    'transaction.failed': [SWTransactionBase | undefined];
+    'transaction.timeout': [SWTransactionBase | undefined];
     'transaction.submitStaking': [string];
-    'transaction.transferNft': [SWTransaction | undefined];
+    'transaction.transferNft': [SWTransactionBase | undefined];
     'mantaPay.initSync': [string | undefined];
-    'mantaPay.submitTransaction': [SWTransaction | undefined];
+    'mantaPay.submitTransaction': [SWTransactionBase | undefined];
     'mantaPay.enable': [string];
     'migration.done': [boolean];
     'campaign.ready': [boolean];

package/services/price-service/coingecko.d.ts

@@ -1,4 +1,4 @@
 import { CurrencyType, ExchangeRateJSON, HistoryTokenPriceJSON, PriceChartTimeframe, PriceJson } from '@subwallet/extension-base/background/KoniTypes';
 export declare const getExchangeRateMap: () => Promise<Record<CurrencyType, ExchangeRateJSON>>;
-export declare const getPriceMap: (priceIds: Set<string>, currency?: CurrencyType) => Promise<Omit<PriceJson, 'exchangeRateMap'>>;
+export declare const getPriceMap: (priceIds: Set<string>, currency?: CurrencyType, skipDerivativePrice?: boolean) => Promise<Omit<PriceJson, 'exchangeRateMap'>>;
 export declare const getHistoryPrice: (priceId: string, type: PriceChartTimeframe) => Promise<HistoryTokenPriceJSON>;

package/services/price-service/coingecko.js

@@ -51,29 +51,33 @@ const fetchDerivativeTokenSlugs = async () => {
     return new Set(DERIVATIVE_TOKEN_SLUG_LIST);
   }
 };
-export const getPriceMap = async (priceIds, currency = 'USD') => {
+export const getPriceMap = async (priceIds, currency = 'USD', skipDerivativePrice) => {
   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 {
@@ -102,10 +106,11 @@ export const getPriceMap = async (priceIds, currency = 'USD') => {
     const currencyData = 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());
@@ -127,6 +132,7 @@ export const getPriceMap = async (priceIds, currency = 'USD') => {
       currencyData,
       priceMap,
       price24hMap,
+      priceCoinGeckoSupported,
       lastUpdatedMap
     };
   } catch (e) {