@subwallet/extension-base 1.3.22-0 → 1.3.24-0

package/cjs/koni/api/nft/index.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.NftHandler = void 0;
+var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _acala_nft = require("@subwallet/extension-base/koni/api/nft/acala_nft");
 var _assethub_unique = _interopRequireDefault(require("@subwallet/extension-base/koni/api/nft/assethub_unique"));
 var _bit = require("@subwallet/extension-base/koni/api/nft/bit.country");
@@ -26,13 +27,9 @@ var _ternoa_nft = require("./ternoa_nft");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-// import UniqueNftApi from '@subwallet/extension-base/koni/api/nft/unique_nft';
-
 function createSubstrateNftApi(chain, substrateApi, addresses) {
-  const {
-    evm: evmAddresses,
-    substrate: substrateAddresses
-  } = (0, _utils2.categoryAddresses)(addresses);
+  const evmAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.EVM]);
+  const substrateAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.SUBSTRATE]);
   if (_constants._NFT_CHAIN_GROUP.acala.includes(chain)) {
     return [new _acala_nft.AcalaNftApi(substrateApi, substrateAddresses, chain)];
   } else if (_constants._NFT_CHAIN_GROUP.karura.includes(chain)) {
@@ -63,11 +60,11 @@ function createSubstrateNftApi(chain, substrateApi, addresses) {
   return null;
 }
 function createWasmNftApi(chain, apiProps, addresses) {
-  const substrateAddresses = (0, _utils2.categoryAddresses)(addresses).substrate;
+  const substrateAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.SUBSTRATE]);
   return new _wasm_nft.WasmNftApi(apiProps, substrateAddresses, chain);
 }
 function createWeb3NftApi(chain, evmApi, addresses) {
-  const evmAddresses = (0, _utils2.categoryAddresses)(addresses).evm;
+  const evmAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.EVM]);
   return new _evm_nft.EvmNftApi(evmApi, evmAddresses, chain);
 }
 const createOrdinalApi = (chain, subscanChain, addresses) => {
@@ -101,10 +98,8 @@ class NftHandler {
   }
   setAddresses(addresses) {
     this.addresses = addresses;
-    const {
-      evm: evmAddresses,
-      substrate: substrateAddresses
-    } = (0, _utils2.categoryAddresses)(addresses);
+    const evmAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.EVM]);
+    const substrateAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.SUBSTRATE]);
     for (const handler of this.handlers) {
       const useAddresses = handler.isEthereum ? evmAddresses : substrateAddresses;
       handler.setAddresses(useAddresses);
@@ -129,10 +124,8 @@ class NftHandler {
       if (this.needSetupApi) {
         // setup connections for first time use
         this.handlers = [];
-        const {
-          evm: evmAddresses,
-          substrate: substrateAddresses
-        } = (0, _utils2.categoryAddresses)(this.addresses);
+        const evmAddresses = (0, _utils2.getAddressesByChainType)(this.addresses, [_KoniTypes.ChainType.EVM]);
+        const substrateAddresses = (0, _utils2.getAddressesByChainType)(this.addresses, [_KoniTypes.ChainType.SUBSTRATE]);
         Object.entries(this.chainInfoMap).forEach(_ref => {
           let [chain, chainInfo] = _ref;
           if ((0, _utils._isChainSupportNativeNft)(chainInfo)) {

package/cjs/koni/api/staking/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.getNominationStakingRewardData = getNominationStakingRewardData;
 exports.getPoolingStakingRewardData = getPoolingStakingRewardData;
 exports.stakingOnChainApi = stakingOnChainApi;
+var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _paraChain = require("@subwallet/extension-base/koni/api/staking/paraChain");
 var _relayChain = require("@subwallet/extension-base/koni/api/staking/relayChain");
 var _subsquidStaking = require("@subwallet/extension-base/koni/api/staking/subsquidStaking");
@@ -18,10 +19,8 @@ var _utils2 = require("@subwallet/extension-base/utils");
 
 function stakingOnChainApi(addresses, substrateApiMap, chainInfoMap, stakingCallback, nominatorStateCallback) {
   const filteredApiMap = [];
-  const {
-    evm: evmAddresses,
-    substrate: substrateAddresses
-  } = (0, _utils2.categoryAddresses)(addresses);
+  const evmAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.EVM]);
+  const substrateAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.SUBSTRATE]);
   Object.entries(chainInfoMap).forEach(_ref => {
     let [networkKey, chainInfo] = _ref;
     if (_constants._PURE_EVM_CHAINS.indexOf(networkKey) < 0 && (0, _utils._isChainSupportSubstrateStaking)(chainInfo)) {