@subwallet/extension-base 1.3.4-0 → 1.3.5-0

package/background/KoniTypes.d.ts

@@ -1428,7 +1428,7 @@ export interface KoniRequestSignatures {
     'pri(bonding.subscribeNominatorMetadata)': [null, NominatorMetadata[], NominatorMetadata[]];
     'pri(bonding.getBondingOptions)': [BondingOptionParams, ValidatorInfo[]];
     'pri(bonding.getNominationPoolOptions)': [string, NominationPoolInfo[]];
-    'pri(bonding.nominationPool.submitBonding)': [RequestStakePoolingBonding, SWTransactionResponse];
+    'pri(bonding.nominationPool.submitBonding)': [RequestYieldStepSubmit, SWTransactionResponse];
     'pri(bonding.nominationPool.submitUnbonding)': [RequestStakePoolingUnbonding, SWTransactionResponse];
     'pri(chainService.subscribeChainInfoMap)': [null, Record<string, any>, Record<string, any>];
     'pri(chainService.subscribeChainStateMap)': [null, Record<string, any>, Record<string, any>];

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

@@ -124,7 +124,7 @@ exports.SUPPORTED_TRANSFER_EVM_CHAIN_NAME = SUPPORTED_TRANSFER_EVM_CHAIN_NAME;
 })(SUPPORTED_TRANSFER_EVM_CHAIN_NAME || (exports.SUPPORTED_TRANSFER_EVM_CHAIN_NAME = SUPPORTED_TRANSFER_EVM_CHAIN_NAME = {}));
 const SUPPORTED_TRANSFER_EVM_CHAIN = [SUPPORTED_TRANSFER_EVM_CHAIN_NAME.moonbase, SUPPORTED_TRANSFER_EVM_CHAIN_NAME.moonbeam, SUPPORTED_TRANSFER_EVM_CHAIN_NAME.moonriver, SUPPORTED_TRANSFER_EVM_CHAIN_NAME.astarEvm, SUPPORTED_TRANSFER_EVM_CHAIN_NAME.shiden, SUPPORTED_TRANSFER_EVM_CHAIN_NAME.shibuya];
 exports.SUPPORTED_TRANSFER_EVM_CHAIN = SUPPORTED_TRANSFER_EVM_CHAIN;
-const UNSUPPORTED_TRANSFER_EVM_CHAIN_NAME = ['unique_evm'];
+const UNSUPPORTED_TRANSFER_EVM_CHAIN_NAME = ['unique_evm', 'rari'];
 exports.UNSUPPORTED_TRANSFER_EVM_CHAIN_NAME = UNSUPPORTED_TRANSFER_EVM_CHAIN_NAME;
 const TRANSFER_CHAIN_ID = {
   [SUPPORTED_TRANSFER_EVM_CHAIN_NAME.moonbase]: 1287,

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

@@ -20,6 +20,7 @@ var _constants = require("@subwallet/extension-base/services/chain-service/const
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _utils2 = require("@subwallet/extension-base/utils");
 var _assethub_nft = _interopRequireDefault(require("./assethub_nft"));
+var _rari = require("./rari");
 var _ternoa_nft = require("./ternoa_nft");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -53,6 +54,8 @@ function createSubstrateNftApi(chain, substrateApi, addresses) {
     return [new _blobinscription.BlobInscriptionApi(chain, substrateAddresses)];
   } else if (_constants._NFT_CHAIN_GROUP.ternoa.includes(chain)) {
     return [new _ternoa_nft.TernoaNftApi(substrateApi, substrateAddresses, chain)];
+  } else if (_constants._NFT_CHAIN_GROUP.rari.includes(chain)) {
+    return [new _rari.RariNftApi(chain, evmAddresses)];
   }
   return null;
 }
@@ -151,6 +154,12 @@ class NftHandler {
               this.handlers.push(...handlers);
             }
           }
+          if (chain === 'rari') {
+            const handlers = createSubstrateNftApi(chain, null, evmAddresses);
+            if (handlers && !!handlers.length) {
+              this.handlers.push(...handlers);
+            }
+          }
           if (chain === 'ternoa') {
             const handlers = createSubstrateNftApi(chain, this.substrateApiMap[chain], substrateAddresses);
             if (handlers && !!handlers.length) {

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

@@ -0,0 +1,87 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.RariNftApi = void 0;
+var _nft = require("../nft");
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+const options = {
+  method: 'GET',
+  headers: {
+    accept: 'application/json',
+    'X-API-KEY': 'ed9df6bf-7eba-4ca2-8a42-9006706be064'
+  }
+};
+class RariNftApi extends _nft.BaseNftApi {
+  constructor(chain, addresses) {
+    super(chain, undefined, addresses);
+  }
+  wait(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+  }
+  async handleNfts(params) {
+    const collectionMap = new Map();
+    const size = 4;
+    const waitTime = 1000;
+    for (let i = 0; i < this.addresses.length; i += size) {
+      const group = this.addresses.slice(i, i + size);
+      await Promise.all(group.map(async address => {
+        const nftResponse = await fetch(`https://api.rarible.org/v0.1/items/byOwner?blockchains=RARI&owner=ETHEREUM%3A${address}&size=5000`, options).then(response => response.json()).catch(err => {
+          console.error(err);
+          return null;
+        });
+        if (!nftResponse || !nftResponse.items) {
+          return;
+        }
+        const nftItems = nftResponse.items;
+
+        // eslint-disable-next-line @typescript-eslint/require-await
+        await Promise.all(nftItems.map(async nft => {
+          var _NftMetadata$content$;
+          const collectionId = nft.collection;
+          const collectionName = nft.itemCollection.name;
+          const NftMetadata = nft.meta;
+          const NFTimageUrl = ((_NftMetadata$content$ = NftMetadata.content[0]) === null || _NftMetadata$content$ === void 0 ? void 0 : _NftMetadata$content$.url) || '';
+          const formatCollectionId = collectionId.replace(/^RARI:/, '');
+          const parsedNft = {
+            id: nft.tokenId,
+            name: NftMetadata.name,
+            description: NftMetadata.description || '',
+            image: NFTimageUrl,
+            collectionId: formatCollectionId,
+            chain: this.chain,
+            owner: address
+          };
+          params.updateItem(this.chain, parsedNft, address);
+          if (!collectionMap.has(formatCollectionId)) {
+            collectionMap.set(formatCollectionId, collectionName);
+          }
+        }));
+      }));
+      if (i + size < this.addresses.length) {
+        await this.wait(waitTime);
+      }
+    }
+    for (const [formatCollectionId, collectionName] of collectionMap.entries()) {
+      const parsedCollection = {
+        collectionId: formatCollectionId,
+        chain: this.chain,
+        collectionName,
+        image: ''
+      };
+      params.updateCollection(this.chain, parsedCollection);
+    }
+  }
+  async fetchNfts(params) {
+    try {
+      await this.handleNfts(params);
+    } catch (e) {
+      return 0;
+    }
+    return 1;
+  }
+}
+exports.RariNftApi = RariNftApi;

package/cjs/koni/api/yield/helper/utils.js

@@ -13,7 +13,7 @@ var _bignumber = _interopRequireDefault(require("bignumber.js"));
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-const YIELD_EXTRINSIC_TYPES = [_KoniTypes.ExtrinsicType.MINT_VDOT, _KoniTypes.ExtrinsicType.MINT_LDOT, _KoniTypes.ExtrinsicType.MINT_SDOT, _KoniTypes.ExtrinsicType.MINT_QDOT, _KoniTypes.ExtrinsicType.MINT_STDOT, _KoniTypes.ExtrinsicType.REDEEM_QDOT, _KoniTypes.ExtrinsicType.REDEEM_SDOT, _KoniTypes.ExtrinsicType.REDEEM_VDOT, _KoniTypes.ExtrinsicType.REDEEM_LDOT, _KoniTypes.ExtrinsicType.REDEEM_STDOT, _KoniTypes.ExtrinsicType.STAKING_JOIN_POOL, _KoniTypes.ExtrinsicType.STAKING_CLAIM_REWARD, _KoniTypes.ExtrinsicType.STAKING_LEAVE_POOL, _KoniTypes.ExtrinsicType.STAKING_POOL_WITHDRAW];
+const YIELD_EXTRINSIC_TYPES = [_KoniTypes.ExtrinsicType.MINT_VDOT, _KoniTypes.ExtrinsicType.MINT_LDOT, _KoniTypes.ExtrinsicType.MINT_SDOT, _KoniTypes.ExtrinsicType.MINT_QDOT, _KoniTypes.ExtrinsicType.MINT_STDOT, _KoniTypes.ExtrinsicType.REDEEM_QDOT, _KoniTypes.ExtrinsicType.REDEEM_SDOT, _KoniTypes.ExtrinsicType.REDEEM_VDOT, _KoniTypes.ExtrinsicType.REDEEM_LDOT, _KoniTypes.ExtrinsicType.REDEEM_STDOT, _KoniTypes.ExtrinsicType.JOIN_YIELD_POOL, _KoniTypes.ExtrinsicType.STAKING_CLAIM_REWARD, _KoniTypes.ExtrinsicType.STAKING_LEAVE_POOL];
 exports.YIELD_EXTRINSIC_TYPES = YIELD_EXTRINSIC_TYPES;
 const YIELD_POOL_STAT_REFRESH_INTERVAL = 90000;
 exports.YIELD_POOL_STAT_REFRESH_INTERVAL = YIELD_POOL_STAT_REFRESH_INTERVAL;

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.4-0'
+  version: '1.3.5-0'
 };
 exports.packageInfo = packageInfo;

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

@@ -138,6 +138,11 @@ function subscribeBalance(addresses, chains, tokens, _chainAssetMap, _chainInfoM
         tonApi
       });
     }
+
+    // If the chain is not ready, return pending state
+    if (!substrateApiMap[chainSlug].isApiReady) {
+      handleUnsupportedOrPendingAddresses(useAddresses, chainSlug, chainAssetMap, _KoniTypes.APIItemState.PENDING, callback);
+    }
     const substrateApi = await substrateApiMap[chainSlug].isReady;
     return (0, _substrate.subscribeSubstrateBalance)(useAddresses, chainInfo, chainAssetMap, substrateApi, evmApi, callback, extrinsicType);
   });

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

@@ -199,7 +199,7 @@ class BalanceService {
       let unsub = _util.noop;
       unsub = (0, _helpers.subscribeBalance)([address], [chain], [tSlug], assetMap, chainInfoMap, substrateApiMap, evmApiMap, tonApiMap, result => {
         const rs = result[0];
-        if (rs.tokenSlug === tSlug) {
+        if (rs.tokenSlug === tSlug && rs.state !== _KoniTypes.APIItemState.PENDING) {
           hasError = false;
           const balance = {
             value: rs.free,

package/cjs/services/chain-service/constants.js

@@ -65,7 +65,8 @@ const _NFT_CHAIN_GROUP = {
   bitcountry: ['bitcountry', 'pioneer', 'continuum_network'],
   vara: ['vara_network'],
   avail: ['avail_mainnet'],
-  ternoa: ['ternoa', 'ternoa_alphanet']
+  ternoa: ['ternoa', 'ternoa_alphanet'],
+  rari: ['rari']
 };
 
 // Staking--------------------------------------------------------------------------------------------------------------

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

@@ -118,7 +118,6 @@ class EvmChainHandler extends _AbstractChainHandler.AbstractChainHandler {
     const evmApi = this.getEvmApiByChain(originChain);
     try {
       if (tokenType === _types._AssetType.ERC721) {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument,@typescript-eslint/no-unsafe-member-access
         tokenContract = new evmApi.api.eth.Contract(_utils._ERC721_ABI, contractAddress);
         const [_name, _symbol] = await Promise.all([
         // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
@@ -128,7 +127,6 @@ class EvmChainHandler extends _AbstractChainHandler.AbstractChainHandler {
         name = _name;
         symbol = _symbol;
       } else {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument,@typescript-eslint/no-unsafe-member-access
         tokenContract = new evmApi.api.eth.Contract(_utils._ERC20_ABI, contractAddress);
         const [_decimals, _symbol, _name] = await Promise.all([
         // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access

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

@@ -114,6 +114,12 @@ class SubstrateChainHandler extends _AbstractChainHandler.AbstractChainHandler {
   }
   async getPsp22TokenInfo(apiPromise, contractAddress, contractCaller) {
     const tokenContract = new _apiContract.ContractPromise(apiPromise, _utils3._PSP22_ABI, contractAddress);
+    const tokenSmartContract = {
+      name: '',
+      decimals: -1,
+      symbol: '',
+      contractError: false
+    };
     const [nameResp, symbolResp, decimalsResp] = await Promise.all([tokenContract.query['psp22Metadata::tokenName'](contractCaller || contractAddress, {
       gasLimit: (0, _utils.getDefaultWeightV2)(apiPromise)
     }),
@@ -124,67 +130,72 @@ class SubstrateChainHandler extends _AbstractChainHandler.AbstractChainHandler {
       gasLimit: (0, _utils.getDefaultWeightV2)(apiPromise)
     })]);
     if (!(nameResp.result.isOk && symbolResp.result.isOk && decimalsResp.result.isOk) || !nameResp.output || !decimalsResp.output || !symbolResp.output) {
-      return ['', 1, '', true];
+      tokenSmartContract.contractError = true;
+      return tokenSmartContract;
     } else {
       var _symbolResp$output, _decimalsResp$output, _nameResp$output;
-      let contractError = false;
       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();
-      const name = nameResp.output ? nameObj.Ok || nameObj.ok : '';
-      const decimals = decimalsResp.output ? new _util.BN(decimalsObj.Ok || decimalsObj.ok).toNumber() : 0;
-      const symbol = decimalsResp.output ? symbolObj.Ok || symbolObj.ok : '';
-      if (!name || !symbol || typeof name === 'object' || typeof symbol === 'object') {
-        contractError = true;
+      tokenSmartContract.name = nameResp.output ? nameObj.Ok || nameObj.ok : '';
+      tokenSmartContract.decimals = decimalsResp.output ? new _util.BN(decimalsObj.Ok || decimalsObj.ok).toNumber() : 0;
+      tokenSmartContract.symbol = decimalsResp.output ? symbolObj.Ok || symbolObj.ok : '';
+      if (!tokenSmartContract.name || !tokenSmartContract.symbol || typeof tokenSmartContract.name === 'object' || typeof tokenSmartContract.symbol === 'object') {
+        tokenSmartContract.contractError = true;
       }
-      return [name, decimals, symbol, contractError];
+      return tokenSmartContract;
     }
   }
   async getPsp34TokenInfo(apiPromise, contractAddress, contractCaller) {
     const tokenContract = new _apiContract.ContractPromise(apiPromise, _utils3._PSP34_ABI, contractAddress);
+    const tokenSmartContract = {
+      name: '',
+      decimals: -1,
+      symbol: '',
+      contractError: false
+    };
     const collectionIdResp = await tokenContract.query['psp34::collectionId'](contractCaller || contractAddress, {
       gasLimit: (0, _utils.getDefaultWeightV2)(apiPromise)
     }); // read-only operation so no gas limit
 
     if (!collectionIdResp.result.isOk || !collectionIdResp.output) {
-      return ['', -1, '', true];
+      tokenSmartContract.contractError = true;
+      return tokenSmartContract;
     } else {
       var _collectionIdResp$out;
-      let contractError = false;
       const collectionIdDict = (_collectionIdResp$out = collectionIdResp.output) === null || _collectionIdResp$out === void 0 ? void 0 : _collectionIdResp$out.toHuman();
       if (collectionIdDict.Bytes === '') {
-        contractError = true;
+        tokenSmartContract.contractError = true;
       }
-      return ['', -1, '', contractError];
-    }
-  }
-  async getGrc20TokenInfo(apiPromise, contractAddress) {
-    if (!(apiPromise instanceof _api.GearApi)) {
-      console.warn('Cannot subscribe GRC20 balance without GearApi instance');
-      return ['', -1, '', true];
-    }
-    let contractError = false;
-    const tokenContract = (0, _utils2.getGRC20ContractPromise)(apiPromise, contractAddress);
-    const [nameRes, symbolRes, decimalsRes] = await Promise.all([tokenContract.service.name(_utils2.GEAR_DEFAULT_ADDRESS), tokenContract.service.symbol(_utils2.GEAR_DEFAULT_ADDRESS), tokenContract.service.decimals(_utils2.GEAR_DEFAULT_ADDRESS)]);
-    const decimals = typeof decimalsRes === 'string' ? parseInt(decimalsRes) : decimalsRes;
-    if (!nameRes || !symbolRes) {
-      contractError = true;
+      return tokenSmartContract;
     }
-    return [nameRes, decimals, symbolRes, contractError];
   }
-  async getVftTokenInfo(apiPromise, contractAddress) {
+  async getVaraFungibleTokenInfo(apiPromise, contractAddress, tokenType) {
+    const tokenSmartContract = {
+      name: '',
+      decimals: -1,
+      symbol: '',
+      contractError: false
+    };
     if (!(apiPromise instanceof _api.GearApi)) {
-      console.warn('Cannot subscribe VFT balance without GearApi instance');
-      return ['', -1, '', true];
+      if (tokenType === _types._AssetType.GRC20) {
+        console.warn('Cannot subscribe GRC20 balance without GearApi instance');
+      } else if (tokenType === _types._AssetType.VFT) {
+        console.warn('Cannot subscribe VFT balance without GearApi instance');
+      }
+      tokenSmartContract.contractError = true;
+      return tokenSmartContract;
     }
-    let contractError = false;
-    const tokenContract = (0, _utils2.getVFTContractPromise)(apiPromise, contractAddress);
+    const tokenContract = tokenType === _types._AssetType.GRC20 ? (0, _utils2.getGRC20ContractPromise)(apiPromise, contractAddress) : (0, _utils2.getVFTContractPromise)(apiPromise, contractAddress);
     const [nameRes, symbolRes, decimalsRes] = await Promise.all([tokenContract.service.name(_utils2.GEAR_DEFAULT_ADDRESS), tokenContract.service.symbol(_utils2.GEAR_DEFAULT_ADDRESS), tokenContract.service.decimals(_utils2.GEAR_DEFAULT_ADDRESS)]);
-    const decimals = typeof decimalsRes === 'string' ? parseInt(decimalsRes) : decimalsRes;
+    const decimals = parseInt(decimalsRes.toString());
+    tokenSmartContract.name = nameRes;
+    tokenSmartContract.decimals = decimals;
+    tokenSmartContract.symbol = symbolRes;
     if (!nameRes || !symbolRes) {
-      contractError = true;
+      tokenSmartContract.contractError = true;
     }
-    return [nameRes, decimals, symbolRes, contractError];
+    return tokenSmartContract;
   }
   async getLocalTokenInfo(apiPromise, assetId) {
     const _metadata = await apiPromise.query.assets.metadata(assetId);
@@ -198,40 +209,33 @@ class SubstrateChainHandler extends _AbstractChainHandler.AbstractChainHandler {
   async getSubstrateContractTokenInfo(contractAddress, tokenType, originChain, contractCaller) {
     // todo: improve this funtion later
 
-    let name = '';
-    let decimals = -1;
-    let symbol = '';
-    let contractError = false;
+    let tokenSmartContract = {
+      name: '',
+      decimals: -1,
+      symbol: '',
+      contractError: false
+    };
     const apiPromise = this.getSubstrateApiByChain(originChain).api;
     try {
       switch (tokenType) {
         case _types._AssetType.PSP22:
-          [name, decimals, symbol, contractError] = await this.getPsp22TokenInfo(apiPromise, contractAddress, contractCaller);
+          tokenSmartContract = await this.getPsp22TokenInfo(apiPromise, contractAddress, contractCaller);
           break;
         case _types._AssetType.PSP34:
-          [name, decimals, symbol, contractError] = await this.getPsp34TokenInfo(apiPromise, contractAddress, contractCaller);
+          tokenSmartContract = await this.getPsp34TokenInfo(apiPromise, contractAddress, contractCaller);
           break;
         case _types._AssetType.GRC20:
-          [name, decimals, symbol, contractError] = await this.getGrc20TokenInfo(apiPromise, contractAddress);
+          tokenSmartContract = await this.getVaraFungibleTokenInfo(apiPromise, contractAddress, tokenType);
           break;
         case _types._AssetType.VFT:
-          [name, decimals, symbol, contractError] = await this.getVftTokenInfo(apiPromise, contractAddress);
+          tokenSmartContract = await this.getVaraFungibleTokenInfo(apiPromise, contractAddress, tokenType);
           break;
       }
-      return {
-        name,
-        decimals,
-        symbol,
-        contractError
-      };
+      return tokenSmartContract;
     } catch (e) {
       this.logger.error(e);
-      return {
-        name: '',
-        decimals: -1,
-        symbol: '',
-        contractError: true
-      };
+      tokenSmartContract.contractError = true;
+      return tokenSmartContract;
     }
   }
   async getSubstrateAssetIdTokenInfo(assetId, originChain) {

package/cjs/services/earning-service/handlers/native-staking/amplitude.js

@@ -456,7 +456,7 @@ class AmplitudeNativeStakingPoolHandler extends _basePara.default {
     } else {
       extrinsic = chainApi.api.tx.parachainStaking.leaveDelegators();
     }
-    return [_KoniTypes.ExtrinsicType.STAKING_LEAVE_POOL, extrinsic];
+    return [_KoniTypes.ExtrinsicType.STAKING_UNBOND, extrinsic];
   }
 
   /* Leave pool action */

package/cjs/services/earning-service/handlers/native-staking/astar.js

@@ -408,7 +408,7 @@ class AstarNativeStakingPoolHandler extends _basePara.default {
       Wasm: selectedTarget
     };
     const extrinsic = chainApi.api.tx.dappsStaking.unbondAndUnstake(dappParam, binaryAmount);
-    return [_KoniTypes.ExtrinsicType.STAKING_LEAVE_POOL, extrinsic];
+    return [_KoniTypes.ExtrinsicType.STAKING_UNBOND, extrinsic];
   }
 
   /* Leave pool action */

package/cjs/services/earning-service/handlers/native-staking/para-chain.js

@@ -479,7 +479,7 @@ class ParaNativeStakingPoolHandler extends _basePara.default {
     } else {
       extrinsic = apiPromise.api.tx.parachainStaking.scheduleRevokeDelegation(selectedTarget);
     }
-    return [_KoniTypes.ExtrinsicType.STAKING_LEAVE_POOL, extrinsic];
+    return [_KoniTypes.ExtrinsicType.STAKING_UNBOND, extrinsic];
   }
 
   /* Leave pool action */

package/cjs/services/earning-service/handlers/native-staking/relay-chain.js

@@ -642,7 +642,7 @@ class RelayNativeStakingPoolHandler extends _base.default {
     } else {
       extrinsic = chainApi.api.tx.staking.unbond(binaryAmount);
     }
-    return [_KoniTypes.ExtrinsicType.STAKING_LEAVE_POOL, extrinsic];
+    return [_KoniTypes.ExtrinsicType.STAKING_UNBOND, extrinsic];
   }
 
   /* Leave pool action */

package/cjs/services/earning-service/handlers/native-staking/tao.js

@@ -394,7 +394,7 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
       return Promise.reject(new _TransactionError.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS));
     }
     const extrinsic = apiPromise.api.tx.subtensorModule.removeStake(selectedTarget, binaryAmount);
-    return [_KoniTypes.ExtrinsicType.STAKING_LEAVE_POOL, extrinsic];
+    return [_KoniTypes.ExtrinsicType.STAKING_UNBOND, extrinsic];
   }
 
   /* Leave pool action */

package/cjs/services/earning-service/handlers/nomination-pool/index.js

@@ -481,21 +481,18 @@ class NominationPoolHandler extends _base.default {
     const data = _data;
     const {
       address,
-      amount,
-      selectedPool
+      amount
     } = data;
     const positionInfo = await this.getPoolPosition(address);
     const [extrinsic] = await this.createJoinExtrinsic(data, positionInfo);
     const joinPoolData = {
-      poolPosition: positionInfo,
-      slug: this.slug,
-      selectedPool,
-      amount,
-      address
+      path,
+      data: data,
+      currentStep
     };
     return {
       txChain: this.chain,
-      extrinsicType: _KoniTypes.ExtrinsicType.STAKING_JOIN_POOL,
+      extrinsicType: _KoniTypes.ExtrinsicType.JOIN_YIELD_POOL,
       extrinsic,
       txData: joinPoolData,
       transferNativeAmount: amount,

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

@@ -371,14 +371,15 @@ class TransactionService {
           };
         }
         break;
-      case _KoniTypes.ExtrinsicType.STAKING_JOIN_POOL:
+      case _KoniTypes.ExtrinsicType.JOIN_YIELD_POOL:
         {
           const data = (0, _utils3.parseTransactionData)(transaction.data);
+          const poolData = data.data;
           historyItem.amount = {
             ...baseNativeAmount,
-            value: data.amount || '0'
+            value: poolData.amount || '0'
           };
-          historyItem.to = data.selectedPool.name || data.selectedPool.id.toString();
+          historyItem.to = poolData.selectedPool.name || poolData.selectedPool.id.toString();
         }
         break;
       case _KoniTypes.ExtrinsicType.STAKING_UNBOND:
@@ -692,7 +693,7 @@ class TransactionService {
       } catch (e) {
         console.error(e);
       }
-    } else if ([_KoniTypes.ExtrinsicType.STAKING_BOND, _KoniTypes.ExtrinsicType.STAKING_UNBOND, _KoniTypes.ExtrinsicType.STAKING_WITHDRAW, _KoniTypes.ExtrinsicType.STAKING_CANCEL_UNSTAKE, _KoniTypes.ExtrinsicType.STAKING_CLAIM_REWARD, _KoniTypes.ExtrinsicType.STAKING_JOIN_POOL, _KoniTypes.ExtrinsicType.STAKING_POOL_WITHDRAW, _KoniTypes.ExtrinsicType.STAKING_LEAVE_POOL].includes(transaction.extrinsicType)) {
+    } else if ([_KoniTypes.ExtrinsicType.STAKING_BOND, _KoniTypes.ExtrinsicType.STAKING_UNBOND, _KoniTypes.ExtrinsicType.STAKING_WITHDRAW, _KoniTypes.ExtrinsicType.STAKING_CANCEL_UNSTAKE, _KoniTypes.ExtrinsicType.STAKING_CLAIM_REWARD, _KoniTypes.ExtrinsicType.JOIN_YIELD_POOL, _KoniTypes.ExtrinsicType.STAKING_LEAVE_POOL].includes(transaction.extrinsicType)) {
       this.state.eventService.emit('transaction.submitStaking', transaction.chain);
     } else if (transaction.extrinsicType === _KoniTypes.ExtrinsicType.SWAP) {
       const inputData = (0, _utils3.parseTransactionData)(transaction.data);

package/koni/api/contract-handler/utils/index.d.ts

@@ -1,6 +1,7 @@
 import { _Address } from '@subwallet/extension-base/background/KoniTypes';
-export declare const _ERC20_ABI: any;
-export declare const _ERC721_ABI: any;
+import { AbiItem } from 'web3-utils';
+export declare const _ERC20_ABI: AbiItem[] | AbiItem;
+export declare const _ERC721_ABI: AbiItem[] | AbiItem;
 export declare const _TEST_ERC721_ABI: any;
 export declare const _PSP22_ABI: Record<string, any>;
 export declare const _PSP34_ABI: Record<string, any>;

package/koni/api/nft/config.js

@@ -82,7 +82,7 @@ export let SUPPORTED_TRANSFER_EVM_CHAIN_NAME;
   SUPPORTED_TRANSFER_EVM_CHAIN_NAME["shibuya"] = "shibuya";
 })(SUPPORTED_TRANSFER_EVM_CHAIN_NAME || (SUPPORTED_TRANSFER_EVM_CHAIN_NAME = {}));
 export const SUPPORTED_TRANSFER_EVM_CHAIN = [SUPPORTED_TRANSFER_EVM_CHAIN_NAME.moonbase, SUPPORTED_TRANSFER_EVM_CHAIN_NAME.moonbeam, SUPPORTED_TRANSFER_EVM_CHAIN_NAME.moonriver, SUPPORTED_TRANSFER_EVM_CHAIN_NAME.astarEvm, SUPPORTED_TRANSFER_EVM_CHAIN_NAME.shiden, SUPPORTED_TRANSFER_EVM_CHAIN_NAME.shibuya];
-export const UNSUPPORTED_TRANSFER_EVM_CHAIN_NAME = ['unique_evm'];
+export const UNSUPPORTED_TRANSFER_EVM_CHAIN_NAME = ['unique_evm', 'rari'];
 export const TRANSFER_CHAIN_ID = {
   [SUPPORTED_TRANSFER_EVM_CHAIN_NAME.moonbase]: 1287,
   [SUPPORTED_TRANSFER_EVM_CHAIN_NAME.moonbeam]: 1284,

package/koni/api/nft/index.js

@@ -17,6 +17,7 @@ import { _NFT_CHAIN_GROUP } from '@subwallet/extension-base/services/chain-servi
 import { _isChainSupportEvmNft, _isChainSupportNativeNft, _isChainSupportWasmNft, _isSupportOrdinal } from '@subwallet/extension-base/services/chain-service/utils';
 import { categoryAddresses, targetIsWeb } from '@subwallet/extension-base/utils';
 import AssetHubNftsPalletApi from "./assethub_nft/index.js";
+import { RariNftApi } from "./rari/index.js";
 import { TernoaNftApi } from "./ternoa_nft/index.js";
 function createSubstrateNftApi(chain, substrateApi, addresses) {
   const {
@@ -45,6 +46,8 @@ function createSubstrateNftApi(chain, substrateApi, addresses) {
     return [new BlobInscriptionApi(chain, substrateAddresses)];
   } else if (_NFT_CHAIN_GROUP.ternoa.includes(chain)) {
     return [new TernoaNftApi(substrateApi, substrateAddresses, chain)];
+  } else if (_NFT_CHAIN_GROUP.rari.includes(chain)) {
+    return [new RariNftApi(chain, evmAddresses)];
   }
   return null;
 }
@@ -142,6 +145,12 @@ export class NftHandler {
               this.handlers.push(...handlers);
             }
           }
+          if (chain === 'rari') {
+            const handlers = createSubstrateNftApi(chain, null, evmAddresses);
+            if (handlers && !!handlers.length) {
+              this.handlers.push(...handlers);
+            }
+          }
           if (chain === 'ternoa') {
             const handlers = createSubstrateNftApi(chain, this.substrateApiMap[chain], substrateAddresses);
             if (handlers && !!handlers.length) {

package/koni/api/nft/rari/index.d.ts

@@ -0,0 +1,7 @@
+import { BaseNftApi, HandleNftParams } from '../nft';
+export declare class RariNftApi extends BaseNftApi {
+    constructor(chain: string, addresses: string[]);
+    private wait;
+    handleNfts(params: HandleNftParams): Promise<void>;
+    fetchNfts(params: HandleNftParams): Promise<number>;
+}

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

@@ -0,0 +1,80 @@
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { BaseNftApi } from "../nft.js";
+const options = {
+  method: 'GET',
+  headers: {
+    accept: 'application/json',
+    'X-API-KEY': 'ed9df6bf-7eba-4ca2-8a42-9006706be064'
+  }
+};
+export class RariNftApi extends BaseNftApi {
+  constructor(chain, addresses) {
+    super(chain, undefined, addresses);
+  }
+  wait(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+  }
+  async handleNfts(params) {
+    const collectionMap = new Map();
+    const size = 4;
+    const waitTime = 1000;
+    for (let i = 0; i < this.addresses.length; i += size) {
+      const group = this.addresses.slice(i, i + size);
+      await Promise.all(group.map(async address => {
+        const nftResponse = await fetch(`https://api.rarible.org/v0.1/items/byOwner?blockchains=RARI&owner=ETHEREUM%3A${address}&size=5000`, options).then(response => response.json()).catch(err => {
+          console.error(err);
+          return null;
+        });
+        if (!nftResponse || !nftResponse.items) {
+          return;
+        }
+        const nftItems = nftResponse.items;
+
+        // eslint-disable-next-line @typescript-eslint/require-await
+        await Promise.all(nftItems.map(async nft => {
+          var _NftMetadata$content$;
+          const collectionId = nft.collection;
+          const collectionName = nft.itemCollection.name;
+          const NftMetadata = nft.meta;
+          const NFTimageUrl = ((_NftMetadata$content$ = NftMetadata.content[0]) === null || _NftMetadata$content$ === void 0 ? void 0 : _NftMetadata$content$.url) || '';
+          const formatCollectionId = collectionId.replace(/^RARI:/, '');
+          const parsedNft = {
+            id: nft.tokenId,
+            name: NftMetadata.name,
+            description: NftMetadata.description || '',
+            image: NFTimageUrl,
+            collectionId: formatCollectionId,
+            chain: this.chain,
+            owner: address
+          };
+          params.updateItem(this.chain, parsedNft, address);
+          if (!collectionMap.has(formatCollectionId)) {
+            collectionMap.set(formatCollectionId, collectionName);
+          }
+        }));
+      }));
+      if (i + size < this.addresses.length) {
+        await this.wait(waitTime);
+      }
+    }
+    for (const [formatCollectionId, collectionName] of collectionMap.entries()) {
+      const parsedCollection = {
+        collectionId: formatCollectionId,
+        chain: this.chain,
+        collectionName,
+        image: ''
+      };
+      params.updateCollection(this.chain, parsedCollection);
+    }
+  }
+  async fetchNfts(params) {
+    try {
+      await this.handleNfts(params);
+    } catch (e) {
+      return 0;
+    }
+    return 1;
+  }
+}

package/koni/api/yield/helper/utils.js

@@ -5,7 +5,7 @@ import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { _getAssetDecimals } from '@subwallet/extension-base/services/chain-service/utils';
 import { BN_TEN } from '@subwallet/extension-base/utils';
 import BigN from 'bignumber.js';
-export const YIELD_EXTRINSIC_TYPES = [ExtrinsicType.MINT_VDOT, ExtrinsicType.MINT_LDOT, ExtrinsicType.MINT_SDOT, ExtrinsicType.MINT_QDOT, ExtrinsicType.MINT_STDOT, ExtrinsicType.REDEEM_QDOT, ExtrinsicType.REDEEM_SDOT, ExtrinsicType.REDEEM_VDOT, ExtrinsicType.REDEEM_LDOT, ExtrinsicType.REDEEM_STDOT, ExtrinsicType.STAKING_JOIN_POOL, ExtrinsicType.STAKING_CLAIM_REWARD, ExtrinsicType.STAKING_LEAVE_POOL, ExtrinsicType.STAKING_POOL_WITHDRAW];
+export const YIELD_EXTRINSIC_TYPES = [ExtrinsicType.MINT_VDOT, ExtrinsicType.MINT_LDOT, ExtrinsicType.MINT_SDOT, ExtrinsicType.MINT_QDOT, ExtrinsicType.MINT_STDOT, ExtrinsicType.REDEEM_QDOT, ExtrinsicType.REDEEM_SDOT, ExtrinsicType.REDEEM_VDOT, ExtrinsicType.REDEEM_LDOT, ExtrinsicType.REDEEM_STDOT, ExtrinsicType.JOIN_YIELD_POOL, ExtrinsicType.STAKING_CLAIM_REWARD, ExtrinsicType.STAKING_LEAVE_POOL];
 export const YIELD_POOL_STAT_REFRESH_INTERVAL = 90000;
 export function convertDerivativeToOriginToken(amount, poolInfo, derivativeTokenInfo, originTokenInfo) {
   var _poolInfo$statistic, _poolInfo$statistic$a;

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.4-0",
+  "version": "1.3.5-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -390,6 +390,11 @@
       "require": "./cjs/koni/api/nft/quartz_nft/protobuf.js",
       "default": "./koni/api/nft/quartz_nft/protobuf.js"
     },
+    "./koni/api/nft/rari": {
+      "types": "./koni/api/nft/rari/index.d.ts",
+      "require": "./cjs/koni/api/nft/rari/index.js",
+      "default": "./koni/api/nft/rari/index.js"
+    },
     "./koni/api/nft/rmrk_nft": {
       "types": "./koni/api/nft/rmrk_nft/index.d.ts",
       "require": "./cjs/koni/api/nft/rmrk_nft/index.js",
@@ -2429,11 +2434,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet/chain-list": "0.2.91",
-    "@subwallet/extension-base": "^1.3.4-0",
-    "@subwallet/extension-chains": "^1.3.4-0",
-    "@subwallet/extension-dapp": "^1.3.4-0",
-    "@subwallet/extension-inject": "^1.3.4-0",
+    "@subwallet/chain-list": "0.2.92",
+    "@subwallet/extension-base": "^1.3.5-0",
+    "@subwallet/extension-chains": "^1.3.5-0",
+    "@subwallet/extension-dapp": "^1.3.5-0",
+    "@subwallet/extension-inject": "^1.3.5-0",
     "@subwallet/keyring": "^0.1.8-beta.0",
     "@subwallet/ui-keyring": "^0.1.8-beta.0",
     "@ton/core": "^0.56.3",

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.4-0'
+  version: '1.3.5-0'
 };

package/services/balance-service/helpers/subscribe/index.js

@@ -124,6 +124,11 @@ export function subscribeBalance(addresses, chains, tokens, _chainAssetMap, _cha
         tonApi
       });
     }
+
+    // If the chain is not ready, return pending state
+    if (!substrateApiMap[chainSlug].isApiReady) {
+      handleUnsupportedOrPendingAddresses(useAddresses, chainSlug, chainAssetMap, APIItemState.PENDING, callback);
+    }
     const substrateApi = await substrateApiMap[chainSlug].isReady;
     return subscribeSubstrateBalance(useAddresses, chainInfo, chainAssetMap, substrateApi, evmApi, callback, extrinsicType);
   });

package/services/balance-service/index.js

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { BalanceError } from '@subwallet/extension-base/background/errors/BalanceError';
-import { BalanceErrorType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
+import { APIItemState, BalanceErrorType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { ALL_ACCOUNT_KEY } from '@subwallet/extension-base/constants';
 import { _isXcmWithinSameConsensus } from '@subwallet/extension-base/core/substrate/xcm-parser';
 import { getDefaultTransferProcess, getSnowbridgeTransferProcessFromEvm } from '@subwallet/extension-base/services/balance-service/helpers/process';
@@ -193,7 +193,7 @@ export class BalanceService {
       let unsub = noop;
       unsub = subscribeBalance([address], [chain], [tSlug], assetMap, chainInfoMap, substrateApiMap, evmApiMap, tonApiMap, result => {
         const rs = result[0];
-        if (rs.tokenSlug === tSlug) {
+        if (rs.tokenSlug === tSlug && rs.state !== APIItemState.PENDING) {
           hasError = false;
           const balance = {
             value: rs.free,

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

@@ -37,6 +37,7 @@ export declare const _NFT_CHAIN_GROUP: {
     vara: string[];
     avail: string[];
     ternoa: string[];
+    rari: string[];
 };
 export declare const _STAKING_ERA_LENGTH_MAP: Record<string, number>;
 export declare const _EXPECTED_BLOCK_TIME: Record<string, number>;

package/services/chain-service/constants.js

@@ -52,7 +52,8 @@ export const _NFT_CHAIN_GROUP = {
   bitcountry: ['bitcountry', 'pioneer', 'continuum_network'],
   vara: ['vara_network'],
   avail: ['avail_mainnet'],
-  ternoa: ['ternoa', 'ternoa_alphanet']
+  ternoa: ['ternoa', 'ternoa_alphanet'],
+  rari: ['rari']
 };
 
 // Staking--------------------------------------------------------------------------------------------------------------

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

@@ -110,7 +110,6 @@ export class EvmChainHandler extends AbstractChainHandler {
     const evmApi = this.getEvmApiByChain(originChain);
     try {
       if (tokenType === _AssetType.ERC721) {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument,@typescript-eslint/no-unsafe-member-access
         tokenContract = new evmApi.api.eth.Contract(_ERC721_ABI, contractAddress);
         const [_name, _symbol] = await Promise.all([
         // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
@@ -120,7 +119,6 @@ export class EvmChainHandler extends AbstractChainHandler {
         name = _name;
         symbol = _symbol;
       } else {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument,@typescript-eslint/no-unsafe-member-access
         tokenContract = new evmApi.api.eth.Contract(_ERC20_ABI, contractAddress);
         const [_decimals, _symbol, _name] = await Promise.all([
         // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access

package/services/chain-service/handler/SubstrateChainHandler.d.ts

@@ -17,8 +17,7 @@ export declare class SubstrateChainHandler extends AbstractChainHandler {
     getChainSpec(substrateApi: _SubstrateApi): Promise<_SubstrateChainSpec>;
     private getPsp22TokenInfo;
     private getPsp34TokenInfo;
-    private getGrc20TokenInfo;
-    private getVftTokenInfo;
+    private getVaraFungibleTokenInfo;
     private getLocalTokenInfo;
     getSubstrateContractTokenInfo(contractAddress: string, tokenType: _AssetType, originChain: string, contractCaller?: string): Promise<_SmartContractTokenInfo>;
     getSubstrateAssetIdTokenInfo(assetId: string, originChain: string): Promise<_SmartContractTokenInfo>;

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

@@ -107,6 +107,12 @@ export class SubstrateChainHandler extends AbstractChainHandler {
   }
   async getPsp22TokenInfo(apiPromise, contractAddress, contractCaller) {
     const tokenContract = new ContractPromise(apiPromise, _PSP22_ABI, contractAddress);
+    const tokenSmartContract = {
+      name: '',
+      decimals: -1,
+      symbol: '',
+      contractError: false
+    };
     const [nameResp, symbolResp, decimalsResp] = await Promise.all([tokenContract.query['psp22Metadata::tokenName'](contractCaller || contractAddress, {
       gasLimit: getDefaultWeightV2(apiPromise)
     }),
@@ -117,67 +123,72 @@ export class SubstrateChainHandler extends AbstractChainHandler {
       gasLimit: getDefaultWeightV2(apiPromise)
     })]);
     if (!(nameResp.result.isOk && symbolResp.result.isOk && decimalsResp.result.isOk) || !nameResp.output || !decimalsResp.output || !symbolResp.output) {
-      return ['', 1, '', true];
+      tokenSmartContract.contractError = true;
+      return tokenSmartContract;
     } else {
       var _symbolResp$output, _decimalsResp$output, _nameResp$output;
-      let contractError = false;
       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();
-      const name = nameResp.output ? nameObj.Ok || nameObj.ok : '';
-      const decimals = decimalsResp.output ? new BN(decimalsObj.Ok || decimalsObj.ok).toNumber() : 0;
-      const symbol = decimalsResp.output ? symbolObj.Ok || symbolObj.ok : '';
-      if (!name || !symbol || typeof name === 'object' || typeof symbol === 'object') {
-        contractError = true;
+      tokenSmartContract.name = nameResp.output ? nameObj.Ok || nameObj.ok : '';
+      tokenSmartContract.decimals = decimalsResp.output ? new BN(decimalsObj.Ok || decimalsObj.ok).toNumber() : 0;
+      tokenSmartContract.symbol = decimalsResp.output ? symbolObj.Ok || symbolObj.ok : '';
+      if (!tokenSmartContract.name || !tokenSmartContract.symbol || typeof tokenSmartContract.name === 'object' || typeof tokenSmartContract.symbol === 'object') {
+        tokenSmartContract.contractError = true;
       }
-      return [name, decimals, symbol, contractError];
+      return tokenSmartContract;
     }
   }
   async getPsp34TokenInfo(apiPromise, contractAddress, contractCaller) {
     const tokenContract = new ContractPromise(apiPromise, _PSP34_ABI, contractAddress);
+    const tokenSmartContract = {
+      name: '',
+      decimals: -1,
+      symbol: '',
+      contractError: false
+    };
     const collectionIdResp = await tokenContract.query['psp34::collectionId'](contractCaller || contractAddress, {
       gasLimit: getDefaultWeightV2(apiPromise)
     }); // read-only operation so no gas limit
 
     if (!collectionIdResp.result.isOk || !collectionIdResp.output) {
-      return ['', -1, '', true];
+      tokenSmartContract.contractError = true;
+      return tokenSmartContract;
     } else {
       var _collectionIdResp$out;
-      let contractError = false;
       const collectionIdDict = (_collectionIdResp$out = collectionIdResp.output) === null || _collectionIdResp$out === void 0 ? void 0 : _collectionIdResp$out.toHuman();
       if (collectionIdDict.Bytes === '') {
-        contractError = true;
+        tokenSmartContract.contractError = true;
       }
-      return ['', -1, '', contractError];
-    }
-  }
-  async getGrc20TokenInfo(apiPromise, contractAddress) {
-    if (!(apiPromise instanceof GearApi)) {
-      console.warn('Cannot subscribe GRC20 balance without GearApi instance');
-      return ['', -1, '', true];
-    }
-    let contractError = false;
-    const tokenContract = getGRC20ContractPromise(apiPromise, contractAddress);
-    const [nameRes, symbolRes, decimalsRes] = await Promise.all([tokenContract.service.name(GEAR_DEFAULT_ADDRESS), tokenContract.service.symbol(GEAR_DEFAULT_ADDRESS), tokenContract.service.decimals(GEAR_DEFAULT_ADDRESS)]);
-    const decimals = typeof decimalsRes === 'string' ? parseInt(decimalsRes) : decimalsRes;
-    if (!nameRes || !symbolRes) {
-      contractError = true;
+      return tokenSmartContract;
     }
-    return [nameRes, decimals, symbolRes, contractError];
   }
-  async getVftTokenInfo(apiPromise, contractAddress) {
+  async getVaraFungibleTokenInfo(apiPromise, contractAddress, tokenType) {
+    const tokenSmartContract = {
+      name: '',
+      decimals: -1,
+      symbol: '',
+      contractError: false
+    };
     if (!(apiPromise instanceof GearApi)) {
-      console.warn('Cannot subscribe VFT balance without GearApi instance');
-      return ['', -1, '', true];
+      if (tokenType === _AssetType.GRC20) {
+        console.warn('Cannot subscribe GRC20 balance without GearApi instance');
+      } else if (tokenType === _AssetType.VFT) {
+        console.warn('Cannot subscribe VFT balance without GearApi instance');
+      }
+      tokenSmartContract.contractError = true;
+      return tokenSmartContract;
     }
-    let contractError = false;
-    const tokenContract = getVFTContractPromise(apiPromise, contractAddress);
+    const tokenContract = tokenType === _AssetType.GRC20 ? getGRC20ContractPromise(apiPromise, contractAddress) : getVFTContractPromise(apiPromise, contractAddress);
     const [nameRes, symbolRes, decimalsRes] = await Promise.all([tokenContract.service.name(GEAR_DEFAULT_ADDRESS), tokenContract.service.symbol(GEAR_DEFAULT_ADDRESS), tokenContract.service.decimals(GEAR_DEFAULT_ADDRESS)]);
-    const decimals = typeof decimalsRes === 'string' ? parseInt(decimalsRes) : decimalsRes;
+    const decimals = parseInt(decimalsRes.toString());
+    tokenSmartContract.name = nameRes;
+    tokenSmartContract.decimals = decimals;
+    tokenSmartContract.symbol = symbolRes;
     if (!nameRes || !symbolRes) {
-      contractError = true;
+      tokenSmartContract.contractError = true;
     }
-    return [nameRes, decimals, symbolRes, contractError];
+    return tokenSmartContract;
   }
   async getLocalTokenInfo(apiPromise, assetId) {
     const _metadata = await apiPromise.query.assets.metadata(assetId);
@@ -191,40 +202,33 @@ export class SubstrateChainHandler extends AbstractChainHandler {
   async getSubstrateContractTokenInfo(contractAddress, tokenType, originChain, contractCaller) {
     // todo: improve this funtion later
 
-    let name = '';
-    let decimals = -1;
-    let symbol = '';
-    let contractError = false;
+    let tokenSmartContract = {
+      name: '',
+      decimals: -1,
+      symbol: '',
+      contractError: false
+    };
     const apiPromise = this.getSubstrateApiByChain(originChain).api;
     try {
       switch (tokenType) {
         case _AssetType.PSP22:
-          [name, decimals, symbol, contractError] = await this.getPsp22TokenInfo(apiPromise, contractAddress, contractCaller);
+          tokenSmartContract = await this.getPsp22TokenInfo(apiPromise, contractAddress, contractCaller);
           break;
         case _AssetType.PSP34:
-          [name, decimals, symbol, contractError] = await this.getPsp34TokenInfo(apiPromise, contractAddress, contractCaller);
+          tokenSmartContract = await this.getPsp34TokenInfo(apiPromise, contractAddress, contractCaller);
           break;
         case _AssetType.GRC20:
-          [name, decimals, symbol, contractError] = await this.getGrc20TokenInfo(apiPromise, contractAddress);
+          tokenSmartContract = await this.getVaraFungibleTokenInfo(apiPromise, contractAddress, tokenType);
           break;
         case _AssetType.VFT:
-          [name, decimals, symbol, contractError] = await this.getVftTokenInfo(apiPromise, contractAddress);
+          tokenSmartContract = await this.getVaraFungibleTokenInfo(apiPromise, contractAddress, tokenType);
           break;
       }
-      return {
-        name,
-        decimals,
-        symbol,
-        contractError
-      };
+      return tokenSmartContract;
     } catch (e) {
       this.logger.error(e);
-      return {
-        name: '',
-        decimals: -1,
-        symbol: '',
-        contractError: true
-      };
+      tokenSmartContract.contractError = true;
+      return tokenSmartContract;
     }
   }
   async getSubstrateAssetIdTokenInfo(assetId, originChain) {

package/services/earning-service/handlers/native-staking/amplitude.js

@@ -448,7 +448,7 @@ export default class AmplitudeNativeStakingPoolHandler extends BaseParaNativeSta
     } else {
       extrinsic = chainApi.api.tx.parachainStaking.leaveDelegators();
     }
-    return [ExtrinsicType.STAKING_LEAVE_POOL, extrinsic];
+    return [ExtrinsicType.STAKING_UNBOND, extrinsic];
   }
 
   /* Leave pool action */

package/services/earning-service/handlers/native-staking/astar.js

@@ -399,7 +399,7 @@ export default class AstarNativeStakingPoolHandler extends BaseParaNativeStaking
       Wasm: selectedTarget
     };
     const extrinsic = chainApi.api.tx.dappsStaking.unbondAndUnstake(dappParam, binaryAmount);
-    return [ExtrinsicType.STAKING_LEAVE_POOL, extrinsic];
+    return [ExtrinsicType.STAKING_UNBOND, extrinsic];
   }
 
   /* Leave pool action */

package/services/earning-service/handlers/native-staking/para-chain.js

@@ -472,7 +472,7 @@ export default class ParaNativeStakingPoolHandler extends BaseParaNativeStakingP
     } else {
       extrinsic = apiPromise.api.tx.parachainStaking.scheduleRevokeDelegation(selectedTarget);
     }
-    return [ExtrinsicType.STAKING_LEAVE_POOL, extrinsic];
+    return [ExtrinsicType.STAKING_UNBOND, extrinsic];
   }
 
   /* Leave pool action */

package/services/earning-service/handlers/native-staking/relay-chain.js

@@ -634,7 +634,7 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
     } else {
       extrinsic = chainApi.api.tx.staking.unbond(binaryAmount);
     }
-    return [ExtrinsicType.STAKING_LEAVE_POOL, extrinsic];
+    return [ExtrinsicType.STAKING_UNBOND, extrinsic];
   }
 
   /* Leave pool action */

package/services/earning-service/handlers/native-staking/tao.js

@@ -375,7 +375,7 @@ export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHand
       return Promise.reject(new TransactionError(BasicTxErrorType.INVALID_PARAMS));
     }
     const extrinsic = apiPromise.api.tx.subtensorModule.removeStake(selectedTarget, binaryAmount);
-    return [ExtrinsicType.STAKING_LEAVE_POOL, extrinsic];
+    return [ExtrinsicType.STAKING_UNBOND, extrinsic];
   }
 
   /* Leave pool action */

package/services/earning-service/handlers/nomination-pool/index.js

@@ -472,21 +472,18 @@ export default class NominationPoolHandler extends BasePoolHandler {
     const data = _data;
     const {
       address,
-      amount,
-      selectedPool
+      amount
     } = data;
     const positionInfo = await this.getPoolPosition(address);
     const [extrinsic] = await this.createJoinExtrinsic(data, positionInfo);
     const joinPoolData = {
-      poolPosition: positionInfo,
-      slug: this.slug,
-      selectedPool,
-      amount,
-      address
+      path,
+      data: data,
+      currentStep
     };
     return {
       txChain: this.chain,
-      extrinsicType: ExtrinsicType.STAKING_JOIN_POOL,
+      extrinsicType: ExtrinsicType.JOIN_YIELD_POOL,
       extrinsic,
       txData: joinPoolData,
       transferNativeAmount: amount,

package/services/transaction-service/index.js

@@ -364,14 +364,15 @@ export default class TransactionService {
           };
         }
         break;
-      case ExtrinsicType.STAKING_JOIN_POOL:
+      case ExtrinsicType.JOIN_YIELD_POOL:
         {
           const data = parseTransactionData(transaction.data);
+          const poolData = data.data;
           historyItem.amount = {
             ...baseNativeAmount,
-            value: data.amount || '0'
+            value: poolData.amount || '0'
           };
-          historyItem.to = data.selectedPool.name || data.selectedPool.id.toString();
+          historyItem.to = poolData.selectedPool.name || poolData.selectedPool.id.toString();
         }
         break;
       case ExtrinsicType.STAKING_UNBOND:
@@ -682,7 +683,7 @@ export default class TransactionService {
       } catch (e) {
         console.error(e);
       }
-    } else if ([ExtrinsicType.STAKING_BOND, ExtrinsicType.STAKING_UNBOND, ExtrinsicType.STAKING_WITHDRAW, ExtrinsicType.STAKING_CANCEL_UNSTAKE, ExtrinsicType.STAKING_CLAIM_REWARD, ExtrinsicType.STAKING_JOIN_POOL, ExtrinsicType.STAKING_POOL_WITHDRAW, ExtrinsicType.STAKING_LEAVE_POOL].includes(transaction.extrinsicType)) {
+    } else if ([ExtrinsicType.STAKING_BOND, ExtrinsicType.STAKING_UNBOND, ExtrinsicType.STAKING_WITHDRAW, ExtrinsicType.STAKING_CANCEL_UNSTAKE, ExtrinsicType.STAKING_CLAIM_REWARD, ExtrinsicType.JOIN_YIELD_POOL, ExtrinsicType.STAKING_LEAVE_POOL].includes(transaction.extrinsicType)) {
       this.state.eventService.emit('transaction.submitStaking', transaction.chain);
     } else if (transaction.extrinsicType === ExtrinsicType.SWAP) {
       const inputData = parseTransactionData(transaction.data);