@subwallet/extension-base 1.0.2-2 → 1.0.2-3

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

@@ -31,7 +31,6 @@ var _AccountRef = _interopRequireDefault(require("@subwallet/extension-base/stor
 var _parseTransaction = require("@subwallet/extension-base/utils/eth/parseTransaction");
 var _decode = require("@subwallet/keyring/pair/decode");
 var _uiKeyring = require("@subwallet/ui-keyring");
-var _accounts = require("@subwallet/ui-keyring/observable/accounts");
 var _ethSimpleKeyring = _interopRequireDefault(require("eth-simple-keyring"));
 var _rxjs = require("rxjs");
 var _util = require("@polkadot/util");
@@ -67,7 +66,6 @@ class KoniState {
   unsubscriptionMap = {};
   accountRefStore = new _AccountRef.default();
   externalRequest = {};
-  serviceInfoSubject = new _rxjs.Subject();
   balanceMap = {};
   balanceSubject = new _rxjs.Subject();
   crowdloanMap = generateDefaultCrowdloanMap();
@@ -94,10 +92,10 @@ class KoniState {
     this.notificationService = new _NotificationService.default();
     this.chainService = new _chainService.ChainService(this.dbService, this.eventService);
     this.settingService = new _SettingService.default();
-    this.requestService = new _requestService.default(this.chainService, this.settingService);
+    this.requestService = new _requestService.default(this.chainService, this.settingService, this.keyringService);
     this.priceService = new _priceService.PriceService(this.dbService, this.eventService, this.chainService);
     this.balanceService = new _balanceService.BalanceService(this.chainService);
-    this.historyService = new _historyService.HistoryService(this.dbService, this.chainService, this.eventService);
+    this.historyService = new _historyService.HistoryService(this.dbService, this.chainService, this.eventService, this.keyringService);
     this.transactionService = new _transactionService.default(this.chainService, this.eventService, this.requestService, this.balanceService, this.historyService, this.notificationService, this.dbService);
     this.migrationService = new _migrationService.default(this);
     this.subscription = new _subscription.KoniSubscription(this, this.dbService);
@@ -266,7 +264,7 @@ class KoniState {
   }
   getAddressList() {
     let value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-    const addressList = Object.keys(_accounts.accounts.subject.value);
+    const addressList = Object.keys(this.keyringService.accounts);
     return addressList.reduce((addressList, v) => ({
       ...addressList,
       [v]: value
@@ -309,7 +307,7 @@ class KoniState {
     return addresses;
   }
   async getPooledStakingRecordsByAddress(addresses) {
-    return await this.dbService.getPooledStakings(addresses, this.activeChainSlugs);
+    return this.dbService.getPooledStakings(addresses, this.activeChainSlugs);
   }
 
   // TODO: delete later
@@ -367,12 +365,12 @@ class KoniState {
     this.dbService.addNft(address, nftData).catch(e => this.logger.warn(e));
     callback && callback(nftData);
   }
-  removeNfts(chain, address, collectionId, nftIds) {
-    return this.dbService.removeNfts(chain, address, collectionId, nftIds);
-  }
   deleteNftCollection(chain, collectionId) {
     return this.dbService.deleteNftCollection(chain, collectionId);
   }
+  cleanUpNfts(chain, owner, collectionId, nftIds, ownNothing) {
+    this.dbService.cleanUpNft(chain, owner, collectionId, nftIds, ownNothing).catch(e => this.logger.warn(e));
+  }
   async getNft() {
     const addresses = this.getDecodedAddresses();
     if (!addresses.length) {
@@ -459,7 +457,7 @@ class KoniState {
     if (address === _constants.ALL_ACCOUNT_KEY) {
       const pairs = _uiKeyring.keyring.getAccounts();
       const pair = pairs[0];
-      const pairGenesisHash = pair.meta.genesisHash;
+      const pairGenesisHash = (pair === null || pair === void 0 ? void 0 : pair.meta.genesisHash) || '';
       if (pairs.length > 1 || !pair) {
         result.allGenesisHash = currentGenesisHash || undefined;
       } else {
@@ -546,7 +544,11 @@ class KoniState {
         isApproved
       } = _ref4;
       if (isApproved) {
-        await this.upsertChainInfo(networkData);
+        if (networkData.mode === 'insert') {
+          await this.upsertChainInfo(networkData);
+        } else {
+          // TODO: update existed network (need more discussion)
+        }
         return null;
       } else {
         throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.USER_REJECTED_REQUEST);
@@ -673,7 +675,7 @@ class KoniState {
     const items = await this.dbService.stores.balance.getBalanceMapByAddress(address);
     return items || {};
   }
-  async switchAccount(newAddress) {
+  async handleSwitchAccount(newAddress) {
     await Promise.all([this.resetBalanceMap(newAddress), this.resetCrowdloanMap(newAddress)]);
   }
   async resetBalanceMap(newAddress) {
@@ -754,9 +756,6 @@ class KoniState {
   subscribeCrowdloan() {
     return this.crowdloanSubject;
   }
-  getAllPriceIds() {
-    return this.chainService.getAllPriceIds();
-  }
   getSmartContractNfts() {
     return this.chainService.getSmartContractNfts();
   }
@@ -814,7 +813,9 @@ class KoniState {
       await this.chainService.updateAssetSetting(tokenSlug, {
         visible: true
       });
-      this.eventService.emit('asset.update', tokenSlug);
+      this.eventService.emit('asset.updateState', tokenSlug);
+    } else {
+      this.eventService.emit('asset.updateState', tokenSlug);
     }
   }
   deleteCustomAssets(targetTokens) {
@@ -841,6 +842,7 @@ class KoniState {
       await this.chainService.updateAssetSetting(newNativeTokenSlug, {
         visible: true
       });
+      this.eventService.emit('asset.updateState', newNativeTokenSlug);
     }
     return true;
   }
@@ -884,13 +886,6 @@ class KoniState {
     const defaultChains = this.getDefaultNetworkKeys();
     return this.chainService.resetChainInfoMap(defaultChains);
   }
-  updateNetworkStatus(networkKey, status) {
-    const chainState = this.chainService.getChainStateByKey(networkKey);
-    if (chainState.connectionStatus === status) {
-      return;
-    }
-    this.chainService.setChainConnectionStatus(networkKey, status);
-  }
   getSubstrateApiMap() {
     return this.chainService.getSubstrateApiMap();
   }
@@ -916,9 +911,6 @@ class KoniState {
   refreshWeb3Api(key) {
     this.chainService.refreshEvmApi(key);
   }
-  subscribeServiceInfo() {
-    return this.serviceInfoSubject;
-  }
   getServiceInfo() {
     return {
       chainInfoMap: this.chainService.getChainInfoMap(),
@@ -1020,8 +1012,9 @@ class KoniState {
       return [undefined, undefined];
     }
     const rs = Object.entries(this.chainService.getChainInfoMap()).find(_ref8 => {
+      var _chainInfo$evmInfo;
       let [networkKey, chainInfo] = _ref8;
-      return (0, _utils._getEvmChainId)(chainInfo) === chainId;
+      return (chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$evmInfo = chainInfo.evmInfo) === null || _chainInfo$evmInfo === void 0 ? void 0 : _chainInfo$evmInfo.evmChainId) === chainId;
     });
     if (rs) {
       return rs;
@@ -1259,17 +1252,23 @@ class KoniState {
       account: account,
       canSign: true
     };
+    const eType = transaction.value ? _KoniTypes.ExtrinsicType.TRANSFER_BALANCE : _KoniTypes.ExtrinsicType.EVM_EXECUTE;
+    const transactionData = {
+      ...transaction
+    };
+    if (eType === _KoniTypes.ExtrinsicType.TRANSFER_BALANCE) {
+      // @ts-ignore
+      transactionData.tokenSlug = this.chainService.getNativeTokenInfo(networkKey).slug;
+    }
 
-    // Todo: Convert this to handle transaction
+    // Custom handle this instead of general handler transaction
     const transactionEmitter = await this.transactionService.addTransaction({
       transaction: requestPayload,
       address: requestPayload.from,
       chain: networkKey,
       url,
-      data: {
-        ...transaction
-      },
-      extrinsicType: transaction.value ? _KoniTypes.ExtrinsicType.TRANSFER_BALANCE : _KoniTypes.ExtrinsicType.EVM_EXECUTE,
+      data: transactionData,
+      extrinsicType: eType,
       chainType: _KoniTypes.ChainType.EVM
     });
 
@@ -1368,6 +1367,9 @@ class KoniState {
   createUnsubscriptionHandle(id, unsubscribe) {
     this.unsubscriptionMap[id] = unsubscribe;
   }
+  updateChainConnectionStatus(chain, status) {
+    this.chainService.setChainConnectionStatus(chain, status);
+  }
   async autoEnableChains(addresses) {
     const assetMap = this.chainService.getAssetRegistry();
     const promiseList = addresses.map(address => {
@@ -1394,7 +1396,7 @@ class KoniState {
         } = _ref14;
         const chain = _subscanChainMap.SUBSCAN_CHAIN_MAP_REVERSE[network];
         const chainInfo = chain ? chainMap[chain] : null;
-        const balanceIsEmpty = (!balance || balance === '0') && !locked && locked === '0' && (!bonded || bonded === '0');
+        const balanceIsEmpty = (!balance || balance === '0') && (!locked || locked === '0') && (!bonded || bonded === '0');
 
         // Cancel if chain is not supported or is testnet or balance is 0
         if (!chainInfo || chainInfo.isTestnet || balanceIsEmpty) {
@@ -1439,5 +1441,11 @@ class KoniState {
       stores.staking.removeAllByAddress(address).catch(console.error);
     });
   }
+  async reloadNft() {
+    return await this.cron.reloadNft();
+  }
+  async reloadStaking() {
+    return await this.cron.reloadStaking();
+  }
 }
 exports.default = KoniState;

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

@@ -17,7 +17,6 @@ var _defaults = require("@subwallet/extension-base/defaults");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _utils2 = require("@subwallet/extension-base/utils");
 var _uiKeyring = _interopRequireDefault(require("@subwallet/ui-keyring"));
-var _accounts = require("@subwallet/ui-keyring/observable/accounts");
 var _web = _interopRequireDefault(require("web3"));
 var _phishing = require("@polkadot/phishing");
 var _util = require("@polkadot/util");
@@ -220,14 +219,14 @@ class KoniTabs {
       anyType
     } = _ref10;
     const authInfo = await this.getAuthInfo(url);
-    return transformAccountsV2(_accounts.accounts.subject.getValue(), anyType, authInfo, accountAuthType);
+    return transformAccountsV2(this.#koniState.keyringService.accounts, anyType, authInfo, accountAuthType);
   }
   accountsSubscribeV2(url, _ref11, id, port) {
     let {
       accountAuthType
     } = _ref11;
     const cb = (0, _subscriptions.createSubscription)(id, port);
-    const subscription = _accounts.accounts.subject.subscribe(accounts => {
+    const subscription = this.#koniState.keyringService.accountSubject.subscribe(accounts => {
       this.getAuthInfo(url).then(authInfo => {
         cb(transformAccountsV2(accounts, false, authInfo, accountAuthType));
       }).catch(console.error);
@@ -253,7 +252,7 @@ class KoniTabs {
     let getAll = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     return await new Promise(resolve => {
       this.getAuthInfo(url).then(authInfo => {
-        const allAccounts = _accounts.accounts.subject.getValue();
+        const allAccounts = this.#koniState.keyringService.accounts;
         const accountList = transformAccountsV2(allAccounts, false, authInfo, 'evm').map(a => a.address);
         let accounts = [];
         const address = this.#koniState.keyringService.currentAccount.address;
@@ -290,18 +289,25 @@ class KoniTabs {
         slug
       } = currentEvmNetwork;
       const evmApi = this.#koniState.getEvmApi(slug);
-      const web3 = evmApi.api;
-      if (web3.currentProvider instanceof _web.default.providers.WebsocketProvider) {
+      const web3 = evmApi === null || evmApi === void 0 ? void 0 : evmApi.api;
+      if ((web3 === null || web3 === void 0 ? void 0 : web3.currentProvider) instanceof _web.default.providers.WebsocketProvider) {
         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);
@@ -371,12 +377,16 @@ class KoniTabs {
       contractAddress: input.options.address,
       originChain: chain
     });
-    if (validate.isExist) {
-      throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INTERNAL_ERROR, 'Current token is existed');
-    } else if (validate.contractError) {
+
+    // Below code is comment because we will handle exited token in the ui-view
+    // if (validate.isExist) {
+    //   throw new EvmProviderError(EvmProviderErrorType.INTERNAL_ERROR, 'Current token is existed');
+    // } else
+    if (validate.contractError) {
       throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, 'Contract address is invalid');
     }
     const tokenInfo = {
+      slug: validate === null || validate === void 0 ? void 0 : validate.existedSlug,
       type: tokenType,
       name: validate.name,
       contractAddress: input.options.address,
@@ -400,16 +410,38 @@ class KoniTabs {
       } = input[0];
       if (chainId) {
         const chainIdNum = parseInt(chainId, 16);
-        const [networkKey] = this.#koniState.findNetworkKeyByChainId(chainIdNum);
-        if (networkKey) {
+        const [existedNetworkSlug, existedChainInfo] = this.#koniState.findNetworkKeyByChainId(chainIdNum);
+        if (existedNetworkSlug && existedChainInfo && existedChainInfo !== null && existedChainInfo !== void 0 && existedChainInfo.evmInfo) {
+          const evmInfo = existedChainInfo.evmInfo;
+          const substrateInfo = existedChainInfo.substrateInfo;
+          const chainState = this.#koniState.getChainStateByKey(existedNetworkSlug);
+          await this.#koniState.addNetworkConfirm(id, url, {
+            mode: 'update',
+            chainSpec: {
+              evmChainId: evmInfo.evmChainId,
+              decimals: evmInfo.decimals,
+              existentialDeposit: evmInfo.existentialDeposit,
+              genesisHash: (substrateInfo === null || substrateInfo === void 0 ? void 0 : substrateInfo.genesisHash) || '',
+              paraId: (substrateInfo === null || substrateInfo === void 0 ? void 0 : substrateInfo.paraId) || null,
+              addressPrefix: (substrateInfo === null || substrateInfo === void 0 ? void 0 : substrateInfo.addressPrefix) || 0
+            },
+            chainEditInfo: {
+              blockExplorer: blockExplorerUrls === null || blockExplorerUrls === void 0 ? void 0 : blockExplorerUrls[0],
+              slug: existedNetworkSlug,
+              currentProvider: chainState.currentProvider,
+              providers: existedChainInfo.providers,
+              symbol: evmInfo.symbol,
+              chainType: 'EVM',
+              name: existedChainInfo.name
+            }
+          });
           return await this.switchEvmChain(id, url, {
             method: 'wallet_switchEthereumChain',
             params: [{
               chainId
             }]
           });
-        }
-        if (rpcUrls && chainName) {
+        } else if (rpcUrls && chainName) {
           const filteredUrls = rpcUrls.filter(targetString => {
             let url;
             try {
@@ -450,6 +482,8 @@ class KoniTabs {
               name: chainInfo.name
             }
           });
+        } else {
+          throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, 'Invalid provider');
         }
       }
     }
@@ -710,9 +744,8 @@ class KoniTabs {
       if (e.code) {
         throw e;
       } else {
-        // @ts-ignore
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-        throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INTERNAL_ERROR, e.message);
+        console.error(e);
+        throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INTERNAL_ERROR, e === null || e === void 0 ? void 0 : e.toString());
       }
     }
   }

package/cjs/koni/background/subscription.js

@@ -14,6 +14,7 @@ var _paraChain = require("@subwallet/extension-base/koni/api/staking/paraChain")
 var _handlers = require("@subwallet/extension-base/koni/background/handlers");
 var _constants2 = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
+var _types = require("@subwallet/extension-base/services/event-service/types");
 var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
@@ -64,30 +65,28 @@ class KoniSubscription {
       this.subscribeBalancesAndCrowdloans(currentAddress, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap(), this.state.getEvmApiMap());
       this.subscribeStakingOnChain(currentAddress, this.state.getSubstrateApiMap());
     }
-    if (!this.eventHandler) {
-      const reloadEvents = ['account.add', 'account.remove', 'account.updateCurrent', 'chain.add', 'chain.update', 'chain.enable', 'asset.update', 'asset.enable', 'transaction.done', 'transaction.failed'];
-      this.eventHandler = (events, eventTypes) => {
-        var _serviceInfo$currentA;
-        const serviceInfo = this.state.getServiceInfo();
-        const needReload = eventTypes.some(eT => reloadEvents.includes(eT));
-        if (!needReload) {
-          return;
-        }
-        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);
-    }
+    this.eventHandler = (events, eventTypes) => {
+      var _serviceInfo$currentA;
+      const serviceInfo = this.state.getServiceInfo();
+      const needReload = eventTypes.some(eventType => _types.COMMON_RELOAD_EVENTS.includes(eventType));
+      if (!needReload) {
+        return;
+      }
+      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.eventHandler) {
       this.state.eventService.offLazy(this.eventHandler);
+      this.eventHandler = undefined;
     }
     this.stopAllSubscription();
   }
@@ -113,7 +112,7 @@ class KoniSubscription {
     });
   }
   subscribeBalancesAndCrowdloans(address, chainInfoMap, chainStateMap, substrateApiMap, web3ApiMap, onlyRunOnFirstTime) {
-    this.state.switchAccount(address).then(() => {
+    this.state.handleSwitchAccount(address).then(() => {
       const addresses = this.state.getDecodedAddresses(address);
       if (!addresses.length) {
         return;
@@ -189,8 +188,8 @@ class KoniSubscription {
       return _this.state.updateNftData(...arguments);
     }, function () {
       return _this.state.setNftCollection(...arguments);
-    }).then(() => {
-      this.logger.log('nft state updated');
+    }, function () {
+      return _this.state.cleanUpNfts(...arguments);
     }).catch(this.logger.log);
   }
   async subscribeStakingReward(address) {
@@ -209,7 +208,6 @@ class KoniSubscription {
     });
     const result = await (0, _staking.getNominationStakingRewardData)(addresses, targetNetworkMap);
     this.state.updateStakingReward(result, 'slowInterval');
-    this.logger.log('Set staking reward state done', result);
   }
   async subscribeStakingRewardFastInterval(address) {
     const addresses = this.state.getDecodedAddresses(address);
@@ -239,15 +237,21 @@ class KoniSubscription {
     const [poolingStakingRewards, amplitudeUnclaimedStakingRewards] = await Promise.all([(0, _staking.getPoolingStakingRewardData)(pooledAddresses, targetChainMap, this.state.getSubstrateApiMap()), (0, _paraChain.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 && (0, _utils._isChainSupportSubstrateStaking)(chainInfo)) {
-        const chainStakingMetadata = await (0, _bonding.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 (0, _bonding.getChainStakingMetadata)(chainInfo, substrateApiMap[chainInfo.slug]);
+      this.state.updateChainStakingMetadata(chainStakingMetadata);
     }));
   }
   async fetchNominatorMetadata(currentAddress, chainInfoMap, chainStateMap, substrateApiMap) {
@@ -262,8 +266,7 @@ class KoniSubscription {
     if (currentAddress === _constants.ALL_ACCOUNT_KEY) {
       addresses = await this.state.getStakingOwnersByChains(Object.keys(filteredChainInfoMap));
     }
-    const validAddresses = addresses.filter(address => !(0, _utilCrypto.isEthereumAddress)(address));
-    await Promise.all(validAddresses.map(async address => {
+    await Promise.all(addresses.map(async address => {
       const isEvmAddress = (0, _utilCrypto.isEthereumAddress)(address);
       await Promise.all(Object.values(filteredChainInfoMap).map(async chainInfo => {
         if (isEvmAddress && !(0, _utils._isChainEvmCompatible)(chainInfo)) {

package/cjs/packageInfo.js

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

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

@@ -7,6 +7,7 @@ exports.SubstrateChainHandler = exports.DEFAULT_AUX = void 0;
 var _api = require("@acala-network/api");
 var _types = require("@oak-foundation/types");
 var _types2 = require("@subwallet/chain-list/types");
+var _utils = require("@subwallet/extension-base/koni/api/tokens/wasm/utils");
 var _lightClient = require("@subwallet/extension-base/services/chain-service/handler/light-client");
 var _api2 = require("@polkadot/api");
 var _apiContract = require("@polkadot/api-contract");
@@ -94,13 +95,13 @@ class SubstrateChainHandler {
       if (tokenType === _types2._AssetType.PSP22) {
         tokenContract = new _apiContract.ContractPromise(substrateApi.api, _helper._PSP22_ABI, contractAddress);
         const [nameResp, symbolResp, decimalsResp] = await Promise.all([tokenContract.query['psp22Metadata::tokenName'](contractCaller || contractAddress, {
-          gasLimit: -1
+          gasLimit: (0, _utils.getDefaultWeightV2)(substrateApi.api)
         }),
         // read-only operation so no gas limit
         tokenContract.query['psp22Metadata::tokenSymbol'](contractCaller || contractAddress, {
-          gasLimit: -1
+          gasLimit: (0, _utils.getDefaultWeightV2)(substrateApi.api)
         }), tokenContract.query['psp22Metadata::tokenDecimals'](contractCaller || contractAddress, {
-          gasLimit: -1
+          gasLimit: (0, _utils.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');
@@ -111,18 +112,22 @@ 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 _util.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 _apiContract.ContractPromise(substrateApi.api, _helper._PSP34_ABI, contractAddress);
         const collectionIdResp = await tokenContract.query['psp34::collectionId'](contractCaller || contractAddress, {
-          gasLimit: -1
+          gasLimit: (0, _utils.getDefaultWeightV2)(substrateApi.api)
         }); // read-only operation so no gas limit
 
         if (!collectionIdResp.result.isOk || !collectionIdResp.output) {