@subwallet/extension-base 1.0.1 → 1.0.2-1b

package/koni/background/handlers/Tabs.js

@@ -216,31 +216,34 @@ export default class KoniTabs {
         const allAccounts = accountsObservable.subject.getValue();
         const accountList = transformAccountsV2(allAccounts, false, authInfo, 'evm').map(a => a.address);
         let accounts = [];
-        this.#koniState.getCurrentAccount(({
-          address
-        }) => {
-          if (address === ALL_ACCOUNT_KEY || !accountList.includes(address) || getAll) {
-            accounts = accountList;
-          } else if (address && accountList.includes(address)) {
-            accounts = [address];
-          }
-          resolve(accounts);
-        });
+        const address = this.#koniState.keyringService.currentAccount.address;
+        if (address === ALL_ACCOUNT_KEY || !accountList.includes(address) || getAll) {
+          accounts = accountList;
+        } else if (address && accountList.includes(address)) {
+          accounts = [address];
+        }
+        resolve(accounts);
       }).catch(console.error);
     });
   }
   async getEvmState(url) {
-    let currentEvmNetworkKey;
+    let currentChain;
+    let autoActiveChain = false;
     if (url) {
       const authInfo = await this.getAuthInfo(url);
-      currentEvmNetworkKey = authInfo === null || authInfo === void 0 ? void 0 : authInfo.currentEvmNetworkKey;
-    }
-    let currentEvmNetwork = currentEvmNetworkKey ? this.#koniState.getChainInfo(currentEvmNetworkKey) : undefined;
-    if (currentEvmNetworkKey && !this.#koniState.getChainStateByKey(currentEvmNetworkKey).active) {
-      currentEvmNetwork = Object.values(this.#koniState.getChainInfoMap()).find(network => {
-        return network.evmInfo !== null && this.#koniState.getChainStateByKey(network.slug).active;
-      });
+      if (authInfo !== null && authInfo !== void 0 && authInfo.currentEvmNetworkKey) {
+        currentChain = authInfo === null || authInfo === void 0 ? void 0 : authInfo.currentEvmNetworkKey;
+      }
+      if (authInfo !== null && authInfo !== void 0 && authInfo.isAllowed) {
+        autoActiveChain = true;
+      }
     }
+    const currentEvmNetwork = this.#koniState.requestService.getDAppChainInfo({
+      autoActive: autoActiveChain,
+      accessType: 'evm',
+      defaultChain: currentChain,
+      url
+    });
     if (currentEvmNetwork) {
       const {
         evmInfo,
@@ -252,13 +255,20 @@ export default class KoniTabs {
         if (!web3.currentProvider.connected) {
           console.log(`[Web3] ${slug} is disconnected, trying to connect...`);
           this.#koniState.refreshWeb3Api(slug);
+          let checkingNum = 0;
           const poll = resolve => {
+            checkingNum += 1;
             if (web3.currentProvider.connected) {
               console.log(`Network [${slug}] is connected.`);
               resolve(true);
             } else {
               console.log(`Connecting to network [${slug}]`);
-              setTimeout(() => poll(resolve), 400);
+              if (checkingNum < 10) {
+                setTimeout(() => poll(resolve), 900);
+              } else {
+                console.log(`Max retry, stop checking [${slug}]`);
+                resolve(false);
+              }
             }
           };
           await new Promise(poll);
@@ -437,7 +447,7 @@ export default class KoniTabs {
         currentAccountList = newAccountList;
       }
     };
-    const accountListSubscription = this.#koniState.subscribeCurrentAccount().subscribe(() => {
+    const accountListSubscription = this.#koniState.keyringService.currentAccountSubject.subscribe(() => {
       onCurrentAccountChanged().catch(console.error);
     });
 

package/koni/background/subscription.d.ts

@@ -4,7 +4,7 @@ import DatabaseService from '@subwallet/extension-base/services/storage-service/
 import KoniState from './handlers/State';
 declare type SubscriptionName = 'balance' | 'crowdloan' | 'stakingOnChain';
 export declare class KoniSubscription {
-    private serviceSubscription;
+    private eventHandler?;
     private subscriptionMap;
     dbService: DatabaseService;
     private state;

package/koni/background/subscription.js

@@ -10,8 +10,10 @@ import { getRelayChainPoolMemberMetadata } from '@subwallet/extension-base/koni/
 import { getAmplitudeUnclaimedStakingReward } from '@subwallet/extension-base/koni/api/staking/paraChain';
 import { nftHandler } from '@subwallet/extension-base/koni/background/handlers';
 import { _STAKING_CHAIN_GROUP } from '@subwallet/extension-base/services/chain-service/constants';
-import { _isChainEnabled, _isChainSupportSubstrateStaking, _isSubstrateRelayChain } from '@subwallet/extension-base/services/chain-service/utils';
+import { _isChainEnabled, _isChainEvmCompatible, _isChainSupportSubstrateStaking, _isSubstrateRelayChain } from '@subwallet/extension-base/services/chain-service/utils';
+import { COMMON_RELOAD_EVENTS } from '@subwallet/extension-base/services/event-service/types';
 import { logger as createLogger } from '@polkadot/util';
+import { isEthereumAddress } from '@polkadot/util-crypto';
 export class KoniSubscription {
   subscriptionMap = {
     crowdloan: undefined,
@@ -50,34 +52,35 @@ export class KoniSubscription {
     }
   }
   start() {
+    var _this$state$keyringSe;
     this.logger.log('Starting subscription');
-    this.state.getCurrentAccount(currentAccountInfo => {
-      if (currentAccountInfo) {
-        const {
-          address
-        } = currentAccountInfo;
-        this.subscribeBalancesAndCrowdloans(address, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap(), this.state.getEvmApiMap());
-        this.subscribeStakingOnChain(address, this.state.getSubstrateApiMap());
+    const currentAddress = (_this$state$keyringSe = this.state.keyringService.currentAccount) === null || _this$state$keyringSe === void 0 ? void 0 : _this$state$keyringSe.address;
+    if (currentAddress) {
+      this.subscribeBalancesAndCrowdloans(currentAddress, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap(), this.state.getEvmApiMap());
+      this.subscribeStakingOnChain(currentAddress, this.state.getSubstrateApiMap());
+    }
+    this.eventHandler = (events, eventTypes) => {
+      var _serviceInfo$currentA;
+      const serviceInfo = this.state.getServiceInfo();
+      const needReload = eventTypes.some(eventType => COMMON_RELOAD_EVENTS.includes(eventType));
+      if (!needReload) {
+        return;
       }
-    });
-    !this.serviceSubscription && (this.serviceSubscription = this.state.subscribeServiceInfo().subscribe({
-      next: serviceInfo => {
-        var _serviceInfo$currentA;
-        this.logger.log('ServiceInfo updated, restarting...');
-        const address = (_serviceInfo$currentA = serviceInfo.currentAccountInfo) === null || _serviceInfo$currentA === void 0 ? void 0 : _serviceInfo$currentA.address;
-        if (!address) {
-          return;
-        }
-        this.subscribeBalancesAndCrowdloans(address, serviceInfo.chainInfoMap, serviceInfo.chainStateMap, serviceInfo.chainApiMap.substrate, serviceInfo.chainApiMap.evm);
-        this.subscribeStakingOnChain(address, serviceInfo.chainApiMap.substrate);
+      this.logger.log('ServiceInfo updated, restarting...');
+      const address = (_serviceInfo$currentA = serviceInfo.currentAccountInfo) === null || _serviceInfo$currentA === void 0 ? void 0 : _serviceInfo$currentA.address;
+      if (!address) {
+        return;
       }
-    }));
+      this.subscribeBalancesAndCrowdloans(address, serviceInfo.chainInfoMap, serviceInfo.chainStateMap, serviceInfo.chainApiMap.substrate, serviceInfo.chainApiMap.evm);
+      this.subscribeStakingOnChain(address, serviceInfo.chainApiMap.substrate);
+    };
+    this.state.eventService.onLazy(this.eventHandler);
   }
   stop() {
     this.logger.log('Stopping subscription');
-    if (this.serviceSubscription) {
-      this.serviceSubscription.unsubscribe();
-      this.serviceSubscription = undefined;
+    if (this.eventHandler) {
+      this.state.eventService.offLazy(this.eventHandler);
+      this.eventHandler = undefined;
     }
     this.stopAllSubscription();
   }
@@ -103,25 +106,22 @@ export class KoniSubscription {
     });
   }
   subscribeBalancesAndCrowdloans(address, chainInfoMap, chainStateMap, substrateApiMap, web3ApiMap, onlyRunOnFirstTime) {
-    this.state.switchAccount(address).then(() => {
-      this.state.getDecodedAddresses(address).then(addresses => {
-        if (!addresses.length) {
-          return;
-        }
-        this.updateSubscription('balance', this.initBalanceSubscription(addresses, chainInfoMap, chainStateMap, substrateApiMap, web3ApiMap, onlyRunOnFirstTime));
-        this.updateSubscription('crowdloan', this.initCrowdloanSubscription(addresses, substrateApiMap, onlyRunOnFirstTime));
-      }).catch(this.logger.error);
+    this.state.handleSwitchAccount(address).then(() => {
+      const addresses = this.state.getDecodedAddresses(address);
+      if (!addresses.length) {
+        return;
+      }
+      this.updateSubscription('balance', this.initBalanceSubscription(addresses, chainInfoMap, chainStateMap, substrateApiMap, web3ApiMap, onlyRunOnFirstTime));
+      this.updateSubscription('crowdloan', this.initCrowdloanSubscription(addresses, substrateApiMap, onlyRunOnFirstTime));
     }).catch(err => this.logger.warn(err));
   }
   subscribeStakingOnChain(address, substrateApiMap, onlyRunOnFirstTime) {
-    this.state.resetStaking(address).then(() => {
-      this.state.getDecodedAddresses(address).then(addresses => {
-        if (!addresses.length) {
-          return;
-        }
-        this.updateSubscription('stakingOnChain', this.initStakingOnChainSubscription(addresses, substrateApiMap, onlyRunOnFirstTime));
-      }).catch(this.logger.error);
-    }).catch(err => this.logger.warn(err));
+    this.state.resetStaking(address);
+    const addresses = this.state.getDecodedAddresses(address);
+    if (!addresses.length) {
+      return;
+    }
+    this.updateSubscription('stakingOnChain', this.initStakingOnChainSubscription(addresses, substrateApiMap, onlyRunOnFirstTime));
   }
   initStakingOnChainSubscription(addresses, substrateApiMap, onlyRunOnFirstTime) {
     const unsub = stakingOnChainApi(addresses, substrateApiMap, (networkKey, rs) => {
@@ -137,9 +137,9 @@ export class KoniSubscription {
   }
   initBalanceSubscription(addresses, chainInfoMap, chainStateMap, substrateApiMap, evmApiMap, onlyRunOnFirstTime) {
     const filteredChainInfoMap = {};
-    Object.values(chainInfoMap).forEach(chainInfo => {
-      if (chainStateMap[chainInfo.slug].active) {
-        filteredChainInfoMap[chainInfo.slug] = chainInfo;
+    Object.values(chainStateMap).forEach(chainState => {
+      if (chainState.active) {
+        filteredChainInfoMap[chainState.slug] = chainInfoMap[chainState.slug];
       }
     });
     const unsub = subscribeBalance(addresses, filteredChainInfoMap, substrateApiMap, evmApiMap, result => {
@@ -166,24 +166,21 @@ export class KoniSubscription {
     };
   }
   subscribeNft(address, substrateApiMap, evmApiMap, smartContractNfts, chainInfoMap) {
-    this.state.getDecodedAddresses(address).then(addresses => {
-      if (!addresses.length) {
-        return;
-      }
-      this.initNftSubscription(addresses, substrateApiMap, evmApiMap, smartContractNfts, chainInfoMap);
-    }).catch(this.logger.error);
+    const addresses = this.state.getDecodedAddresses(address);
+    if (!addresses.length) {
+      return;
+    }
+    this.initNftSubscription(addresses, substrateApiMap, evmApiMap, smartContractNfts, chainInfoMap);
   }
   initNftSubscription(addresses, substrateApiMap, evmApiMap, smartContractNfts, chainInfoMap) {
     nftHandler.setChainInfoMap(chainInfoMap);
     nftHandler.setDotSamaApiMap(substrateApiMap);
     nftHandler.setWeb3ApiMap(evmApiMap);
     nftHandler.setAddresses(addresses);
-    nftHandler.handleNfts(smartContractNfts, (...args) => this.state.updateNftData(...args), (...args) => this.state.setNftCollection(...args)).then(() => {
-      this.logger.log('nft state updated');
-    }).catch(this.logger.log);
+    nftHandler.handleNfts(smartContractNfts, (...args) => this.state.updateNftData(...args), (...args) => this.state.setNftCollection(...args), (...args) => this.state.cleanUpNfts(...args)).catch(this.logger.log);
   }
   async subscribeStakingReward(address) {
-    const addresses = await this.state.getDecodedAddresses(address);
+    const addresses = this.state.getDecodedAddresses(address);
     if (!addresses.length) {
       return;
     }
@@ -197,10 +194,9 @@ export class KoniSubscription {
     });
     const result = await getNominationStakingRewardData(addresses, targetNetworkMap);
     this.state.updateStakingReward(result, 'slowInterval');
-    this.logger.log('Set staking reward state done', result);
   }
   async subscribeStakingRewardFastInterval(address) {
-    const addresses = await this.state.getDecodedAddresses(address);
+    const addresses = this.state.getDecodedAddresses(address);
     if (!addresses.length) {
       return;
     }
@@ -226,15 +222,21 @@ export class KoniSubscription {
     const [poolingStakingRewards, amplitudeUnclaimedStakingRewards] = await Promise.all([getPoolingStakingRewardData(pooledAddresses, targetChainMap, this.state.getSubstrateApiMap()), getAmplitudeUnclaimedStakingReward(this.state.getSubstrateApiMap(), addresses, chainInfoMap, activeNetworks)]);
     const result = [...poolingStakingRewards, ...amplitudeUnclaimedStakingRewards];
     this.state.updateStakingReward(result, 'fastInterval');
-    this.logger.log('Set staking reward state with fast interval done', result);
   }
   async fetchChainStakingMetadata(chainInfoMap, chainStateMap, substrateApiMap) {
-    await Promise.all(Object.values(chainInfoMap).map(async chainInfo => {
+    const filteredChainInfoMap = {};
+    Object.values(chainInfoMap).forEach(chainInfo => {
       const chainState = chainStateMap[chainInfo.slug];
       if (chainState !== null && chainState !== void 0 && chainState.active && _isChainSupportSubstrateStaking(chainInfo)) {
-        const chainStakingMetadata = await getChainStakingMetadata(chainInfo.slug, substrateApiMap[chainInfo.slug]);
-        this.state.updateChainStakingMetadata(chainStakingMetadata);
+        filteredChainInfoMap[chainInfo.slug] = chainInfo;
       }
+    });
+    if (Object.values(filteredChainInfoMap).length === 0) {
+      return;
+    }
+    await Promise.all(Object.values(filteredChainInfoMap).map(async chainInfo => {
+      const chainStakingMetadata = await getChainStakingMetadata(chainInfo, substrateApiMap[chainInfo.slug]);
+      this.state.updateChainStakingMetadata(chainStakingMetadata);
     }));
   }
   async fetchNominatorMetadata(currentAddress, chainInfoMap, chainStateMap, substrateApiMap) {
@@ -250,7 +252,11 @@ export class KoniSubscription {
       addresses = await this.state.getStakingOwnersByChains(Object.keys(filteredChainInfoMap));
     }
     await Promise.all(addresses.map(async address => {
+      const isEvmAddress = isEthereumAddress(address);
       await Promise.all(Object.values(filteredChainInfoMap).map(async chainInfo => {
+        if (isEvmAddress && !_isChainEvmCompatible(chainInfo)) {
+          return;
+        }
         if (_isSubstrateRelayChain(chainInfo) && _STAKING_CHAIN_GROUP.nominationPool.includes(chainInfo.slug)) {
           const poolMemberMetadata = await getRelayChainPoolMemberMetadata(chainInfo, address, substrateApiMap[chainInfo.slug]);
           if (poolMemberMetadata) {

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.0.1",
+  "version": "1.0.2-1b",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -369,6 +369,11 @@
       "require": "./cjs/koni/api/tokens/wasm/index.js",
       "default": "./koni/api/tokens/wasm/index.js"
     },
+    "./koni/api/tokens/wasm/utils": {
+      "types": "./koni/api/tokens/wasm/utils.d.ts",
+      "require": "./cjs/koni/api/tokens/wasm/utils.js",
+      "default": "./koni/api/tokens/wasm/utils.js"
+    },
     "./koni/api/xcm": {
       "types": "./koni/api/xcm/index.d.ts",
       "require": "./cjs/koni/api/xcm/index.js",
@@ -434,16 +439,6 @@
       "require": "./cjs/koni/background/subscription.js",
       "default": "./koni/background/subscription.js"
     },
-    "./koni/page": {
-      "types": "./koni/page/index.d.ts",
-      "require": "./cjs/koni/page/index.js",
-      "default": "./koni/page/index.js"
-    },
-    "./koni/page/SubWalleEvmProvider": {
-      "types": "./koni/page/SubWalleEvmProvider.d.ts",
-      "require": "./cjs/koni/page/SubWalleEvmProvider.js",
-      "default": "./koni/page/SubWalleEvmProvider.js"
-    },
     "./package.json": "./package.json",
     "./packageInfo.js": {
       "types": "./packageInfo.d.ts",
@@ -485,6 +480,11 @@
       "require": "./cjs/page/Signer.js",
       "default": "./page/Signer.js"
     },
+    "./page/SubWalleEvmProvider": {
+      "types": "./page/SubWalleEvmProvider.d.ts",
+      "require": "./cjs/page/SubWalleEvmProvider.js",
+      "default": "./page/SubWalleEvmProvider.js"
+    },
     "./page/types": {
       "types": "./page/types.d.ts",
       "require": "./cjs/page/types.js",
@@ -1170,6 +1170,16 @@
       "require": "./cjs/services/chain-service/utils.js",
       "default": "./services/chain-service/utils.js"
     },
+    "./services/event-service": {
+      "types": "./services/event-service/index.d.ts",
+      "require": "./cjs/services/event-service/index.js",
+      "default": "./services/event-service/index.js"
+    },
+    "./services/event-service/types": {
+      "types": "./services/event-service/types.d.ts",
+      "require": "./cjs/services/event-service/types.js",
+      "default": "./services/event-service/types.js"
+    },
     "./services/history-service": {
       "types": "./services/history-service/index.d.ts",
       "require": "./cjs/services/history-service/index.js",
@@ -1180,6 +1190,11 @@
       "require": "./cjs/services/history-service/subsquid-multi-chain-history.js",
       "default": "./services/history-service/subsquid-multi-chain-history.js"
     },
+    "./services/keyring-service": {
+      "types": "./services/keyring-service/index.d.ts",
+      "require": "./cjs/services/keyring-service/index.js",
+      "default": "./services/keyring-service/index.js"
+    },
     "./services/migration-service": {
       "types": "./services/migration-service/index.d.ts",
       "require": "./cjs/services/migration-service/index.js",
@@ -1195,6 +1210,11 @@
       "require": "./cjs/services/migration-service/scripts/index.js",
       "default": "./services/migration-service/scripts/index.js"
     },
+    "./services/migration-service/scripts/AutoEnableChainsTokens": {
+      "types": "./services/migration-service/scripts/AutoEnableChainsTokens.d.ts",
+      "require": "./cjs/services/migration-service/scripts/AutoEnableChainsTokens.js",
+      "default": "./services/migration-service/scripts/AutoEnableChainsTokens.js"
+    },
     "./services/migration-service/scripts/ClearOldStorage": {
       "types": "./services/migration-service/scripts/ClearOldStorage.d.ts",
       "require": "./cjs/services/migration-service/scripts/ClearOldStorage.js",
@@ -1210,6 +1230,16 @@
       "require": "./cjs/services/migration-service/scripts/MigrateNetworkSettings.js",
       "default": "./services/migration-service/scripts/MigrateNetworkSettings.js"
     },
+    "./services/migration-service/scripts/MigrateSettings": {
+      "types": "./services/migration-service/scripts/MigrateSettings.d.ts",
+      "require": "./cjs/services/migration-service/scripts/MigrateSettings.js",
+      "default": "./services/migration-service/scripts/MigrateSettings.js"
+    },
+    "./services/migration-service/scripts/MigrateTransactionHistory": {
+      "types": "./services/migration-service/scripts/MigrateTransactionHistory.d.ts",
+      "require": "./cjs/services/migration-service/scripts/MigrateTransactionHistory.js",
+      "default": "./services/migration-service/scripts/MigrateTransactionHistory.js"
+    },
     "./services/notification-service/NotificationService": {
       "types": "./services/notification-service/NotificationService.d.ts",
       "require": "./cjs/services/notification-service/NotificationService.js",
@@ -1375,6 +1405,21 @@
       "require": "./cjs/services/storage-service/db-stores/Transaction.js",
       "default": "./services/storage-service/db-stores/Transaction.js"
     },
+    "./services/subscan-service": {
+      "types": "./services/subscan-service/index.d.ts",
+      "require": "./cjs/services/subscan-service/index.js",
+      "default": "./services/subscan-service/index.js"
+    },
+    "./services/subscan-service/subscan-chain-map": {
+      "types": "./services/subscan-service/subscan-chain-map.d.ts",
+      "require": "./cjs/services/subscan-service/subscan-chain-map.js",
+      "default": "./services/subscan-service/subscan-chain-map.js"
+    },
+    "./services/subscan-service/types": {
+      "types": "./services/subscan-service/types.d.ts",
+      "require": "./cjs/services/subscan-service/types.js",
+      "default": "./services/subscan-service/types.js"
+    },
     "./services/transaction-service": {
       "types": "./services/transaction-service/index.d.ts",
       "require": "./cjs/services/transaction-service/index.js",
@@ -1611,12 +1656,12 @@
     "@sora-substrate/type-definitions": "^1.12.4",
     "@subsocial/types": "^0.6.8",
     "@substrate/connect": "^0.7.18",
-    "@subwallet/chain-list": "^0.0.21",
-    "@subwallet/extension-base": "^1.0.1",
-    "@subwallet/extension-chains": "^1.0.1",
-    "@subwallet/extension-dapp": "^1.0.1",
-    "@subwallet/extension-inject": "^1.0.1",
-    "@subwallet/keyring": "^0.0.4",
+    "@subwallet/chain-list": "^0.0.30",
+    "@subwallet/extension-base": "^1.0.2-1",
+    "@subwallet/extension-chains": "^1.0.2-1",
+    "@subwallet/extension-dapp": "^1.0.2-1",
+    "@subwallet/extension-inject": "^1.0.2-1",
+    "@subwallet/keyring": "^0.0.5",
     "@subwallet/ui-keyring": "^0.0.3",
     "@unique-nft/types": "^0.6.0-4",
     "@zeitgeistpm/type-defs": "^0.10.0",
@@ -1653,4 +1698,4 @@
     "web3-eth-contract": "^1.8.1",
     "web3-utils": "^1.8.1"
   }
-}
+}

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.0.1'
+  version: '1.0.2-1'
 };

package/page/index.d.ts

@@ -1,4 +1,5 @@
 import type { MessageTypes, MessageTypesWithNoSubscriptions, MessageTypesWithNullRequest, MessageTypesWithSubscriptions, RequestTypes, ResponseTypes, SubscriptionMessageTypes, TransportResponseMessage } from '../background/types';
+import { EvmProvider } from '@subwallet/extension-inject/types';
 import Injected from './Injected';
 export interface Handler {
     resolve: (data?: any) => void;
@@ -13,3 +14,4 @@ export declare function enable(origin: string): Promise<Injected>;
 export declare function handleResponse<TMessageType extends MessageTypes>(data: TransportResponseMessage<TMessageType> & {
     subscription?: string;
 }): void;
+export declare function initEvmProvider(version: string): EvmProvider;

package/page/index.js

@@ -3,6 +3,7 @@
 
 import { ProviderError } from '@subwallet/extension-base/background/errors/ProviderError';
 import { ProviderErrorType } from '@subwallet/extension-base/background/KoniTypes';
+import { SubWalletEvmProvider } from '@subwallet/extension-base/page/SubWalleEvmProvider';
 import { MESSAGE_ORIGIN_PAGE } from "../defaults.js";
 import { getId } from "../utils/getId.js";
 import Injected from "./Injected.js";
@@ -60,4 +61,7 @@ export function handleResponse(data) {
   } else {
     handler.resolve(data.response);
   }
+}
+export function initEvmProvider(version) {
+  return new SubWalletEvmProvider(sendMessage, version);
 }

package/services/chain-service/constants.d.ts

@@ -69,7 +69,6 @@ export declare const _XCM_CHAIN_GROUP: {
     polkadotXcm: string[];
     xcmPallet: string[];
 };
-export declare const _XCM_CHAIN_USE_LIMITED_WEIGHT: string[];
 export declare const _XCM_TYPE: {
     RP: string;
     PP: string;

package/services/chain-service/constants.js

@@ -191,17 +191,8 @@ export const _XCM_CHAIN_GROUP = {
   polkadotXcm: ['astar', 'shiden', 'statemine', 'statemint'],
   xcmPallet: ['polkadot', 'kusama']
   // default is xTokens pallet
-  // moonbeam: ['moonbeam', 'moonriver', 'moonbase'],
-  // astar: ['astar', 'shiden'],
-  // statemine: ['statemint', 'statemine'],
-  // bifrost: ['bifrost'],
-  // genshiro: ['genshiro_testnet', 'genshiro', 'equilibrium_parachain'],
-  // kintsugi: ['kintsugi', 'kintsugi_test', 'interlay'],
-  // acala: ['karura', 'acala', 'acala_testnet'],
-  // astarEvm: ['astarEvm', 'shidenEvm']
 };
 
-export const _XCM_CHAIN_USE_LIMITED_WEIGHT = ['acala', 'karura', 'statemint'];
 export const _XCM_TYPE = {
   RP: `${_SubstrateChainType.RELAYCHAIN}-${_SubstrateChainType.PARACHAIN}`,
   // DMP

package/services/chain-service/handler/SubstrateChainHandler.js

@@ -4,11 +4,12 @@
 import { options as acalaOptions } from '@acala-network/api';
 import { rpc as oakRpc, types as oakTypes } from '@oak-foundation/types';
 import { _AssetType } from '@subwallet/chain-list/types';
+import { getDefaultWeightV2 } from '@subwallet/extension-base/koni/api/tokens/wasm/utils';
 import { getSubstrateConnectProvider } from '@subwallet/extension-base/services/chain-service/handler/light-client';
 import { ApiPromise, WsProvider } from '@polkadot/api';
 import { ContractPromise } from '@polkadot/api-contract';
 import { TypeRegistry } from '@polkadot/types/create';
-import { formatBalance, isTestChain, objectSpread, stringify } from '@polkadot/util';
+import { BN, formatBalance, isTestChain, objectSpread, stringify } from '@polkadot/util';
 import { logger as createLogger } from '@polkadot/util/logger';
 import { defaults as addressDefaults } from '@polkadot/util-crypto/address/defaults';
 import { _API_OPTIONS_CHAIN_GROUP, API_AUTO_CONNECT_MS, API_MAX_RETRY } from "../constants.js";
@@ -87,13 +88,13 @@ export class SubstrateChainHandler {
       if (tokenType === _AssetType.PSP22) {
         tokenContract = new ContractPromise(substrateApi.api, _PSP22_ABI, contractAddress);
         const [nameResp, symbolResp, decimalsResp] = await Promise.all([tokenContract.query['psp22Metadata::tokenName'](contractCaller || contractAddress, {
-          gasLimit: -1
+          gasLimit: getDefaultWeightV2(substrateApi.api)
         }),
         // read-only operation so no gas limit
         tokenContract.query['psp22Metadata::tokenSymbol'](contractCaller || contractAddress, {
-          gasLimit: -1
+          gasLimit: getDefaultWeightV2(substrateApi.api)
         }), tokenContract.query['psp22Metadata::tokenDecimals'](contractCaller || contractAddress, {
-          gasLimit: -1
+          gasLimit: getDefaultWeightV2(substrateApi.api)
         })]);
         if (!(nameResp.result.isOk && symbolResp.result.isOk && decimalsResp.result.isOk) || !nameResp.output || !decimalsResp.output || !symbolResp.output) {
           this.logger.error('Error response while validating WASM contract');
@@ -104,18 +105,22 @@ export class SubstrateChainHandler {
             contractError: true
           };
         } else {
-          var _symbolResp$output, _decimalsResp$output, _symbolResp$output2;
-          name = (_symbolResp$output = symbolResp.output) === null || _symbolResp$output === void 0 ? void 0 : _symbolResp$output.toHuman();
-          decimals = parseInt((_decimalsResp$output = decimalsResp.output) === null || _decimalsResp$output === void 0 ? void 0 : _decimalsResp$output.toHuman());
-          symbol = (_symbolResp$output2 = symbolResp.output) === null || _symbolResp$output2 === void 0 ? void 0 : _symbolResp$output2.toHuman();
+          var _symbolResp$output, _decimalsResp$output, _nameResp$output;
+          const symbolObj = (_symbolResp$output = symbolResp.output) === null || _symbolResp$output === void 0 ? void 0 : _symbolResp$output.toHuman();
+          const decimalsObj = (_decimalsResp$output = decimalsResp.output) === null || _decimalsResp$output === void 0 ? void 0 : _decimalsResp$output.toHuman();
+          const nameObj = (_nameResp$output = nameResp.output) === null || _nameResp$output === void 0 ? void 0 : _nameResp$output.toHuman();
+          name = nameResp.output ? nameObj.Ok || nameObj.ok : '';
+          decimals = decimalsResp.output ? new BN(decimalsObj.Ok || decimalsObj.ok).toNumber() : 0;
+          symbol = decimalsResp.output ? symbolObj.Ok || symbolObj.ok : '';
           if (name === '' || symbol === '') {
             contractError = true;
           }
+          console.log('validate PSP22', name, symbol, decimals);
         }
       } else {
         tokenContract = new ContractPromise(substrateApi.api, _PSP34_ABI, contractAddress);
         const collectionIdResp = await tokenContract.query['psp34::collectionId'](contractCaller || contractAddress, {
-          gasLimit: -1
+          gasLimit: getDefaultWeightV2(substrateApi.api)
         }); // read-only operation so no gas limit
 
         if (!collectionIdResp.result.isOk || !collectionIdResp.output) {

package/services/chain-service/handler/light-client/index.d.ts

@@ -1,4 +1,20 @@
-import { ProviderInterface } from '@polkadot/rpc-provider/types';
+import { ScProvider } from '@polkadot/rpc-provider';
+import { ProviderInterface, ProviderInterfaceCallback, ProviderInterfaceEmitCb, ProviderInterfaceEmitted } from '@polkadot/rpc-provider/types';
 export declare const relayChainSpecs: Record<string, string>;
 export declare const paraChainSpecs: Record<string, string>;
+export declare class ProviderPlaceholder implements ProviderInterface {
+    private readonly providerPromise;
+    private provider?;
+    constructor(providerPromise: Promise<ScProvider>);
+    get hasSubscriptions(): boolean;
+    get isClonable(): boolean;
+    get isConnected(): boolean;
+    clone(): ProviderInterface;
+    connect(): Promise<void>;
+    disconnect(): Promise<void>;
+    on(type: ProviderInterfaceEmitted, sub: ProviderInterfaceEmitCb): () => void;
+    send<T = any>(method: string, params: unknown[], isCacheable?: boolean): Promise<T>;
+    subscribe(type: string, method: string, params: unknown[], cb: ProviderInterfaceCallback): Promise<number | string>;
+    unsubscribe(type: string, method: string, id: number | string): Promise<boolean>;
+}
 export declare function getSubstrateConnectProvider(specLink: string): ProviderInterface;

package/services/chain-service/handler/light-client/index.js

@@ -16,7 +16,7 @@ export const paraChainSpecs = {
   'kusama/tinkernet': `${sourceFolderUrl}kusama/tinkernet.json`,
   'polkadot/astar': `${sourceFolderUrl}polkadot/astar.json`
 };
-class ProviderPlaceholder {
+export class ProviderPlaceholder {
   constructor(providerPromise) {
     this.providerPromise = providerPromise;
     providerPromise.then(provider => {