@subwallet/extension-base 1.1.35-beta.3 → 1.1.36-0

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.W3S_IPFS = exports.VARA_SCAN_ENDPOINT = exports.UNIQUE_SCAN_ENDPOINT = exports.UNIQUE_IPFS_GATEWAY = exports.TRANSFER_CHAIN_ID = exports.SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME = exports.SUPPORTED_TRANSFER_EVM_CHAIN_NAME = exports.SUPPORTED_TRANSFER_EVM_CHAIN = exports.SUPPORTED_NFT_NETWORKS = exports.SUBWALLET_IPFS = exports.SINGULAR_V2_ENDPOINT = exports.SINGULAR_V2_COLLECTION_ENDPOINT = exports.SINGULAR_V1_ENDPOINT = exports.SINGULAR_V1_COLLECTION_ENDPOINT = exports.RMRK_PINATA_SERVER = exports.QUARTZ_SCAN_ENDPOINT = exports.PINATA_IPFS_GATEWAY = exports.NFT_STORAGE_GATEWAY = exports.KANARIA_EXTERNAL_SERVER = exports.KANARIA_ENDPOINT = exports.IPFS_W3S_LINK = exports.IPFS_IO = exports.IPFS_GATEWAY_4EVERLAND = exports.IPFS_FLEEK = exports.IPFS_ETH_ARAGON = exports.IPFS2_RMRK = exports.GATEWAY_IPFS_IO = exports.DWEB_LINK = exports.CLOUDFLARE_PINATA_SERVER = exports.CF_IPFS_GATEWAY = exports.BIT_COUNTRY_THUMBNAIL_RESOLVER = exports.BIT_COUNTRY_LAND_ESTATE_METADATA_API = exports.BIT_COUNTRY_IPFS_SERVER = void 0;
+exports.W3S_IPFS = exports.VARA_SCAN_ENDPOINT = exports.UNIQUE_SCAN_ENDPOINT = exports.UNIQUE_IPFS_GATEWAY = exports.TRANSFER_CHAIN_ID = exports.SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME = exports.SUPPORTED_TRANSFER_EVM_CHAIN_NAME = exports.SUPPORTED_TRANSFER_EVM_CHAIN = exports.SUPPORTED_NFT_NETWORKS = exports.SUBWALLET_IPFS = exports.SINGULAR_V2_ENDPOINT = exports.SINGULAR_V2_COLLECTION_ENDPOINT = exports.SINGULAR_V1_ENDPOINT = exports.SINGULAR_V1_COLLECTION_ENDPOINT = exports.RMRK_PINATA_SERVER = exports.QUARTZ_SCAN_ENDPOINT = exports.PINATA_IPFS_GATEWAY = exports.OPAL_SCAN_ENDPOINT = exports.NFT_STORAGE_GATEWAY = exports.KANARIA_EXTERNAL_SERVER = exports.KANARIA_ENDPOINT = exports.IPFS_W3S_LINK = exports.IPFS_IO = exports.IPFS_GATEWAY_4EVERLAND = exports.IPFS_FLEEK = exports.IPFS_ETH_ARAGON = exports.IPFS2_RMRK = exports.GATEWAY_IPFS_IO = exports.DWEB_LINK = exports.CLOUDFLARE_PINATA_SERVER = exports.CF_IPFS_GATEWAY = exports.BIT_COUNTRY_THUMBNAIL_RESOLVER = exports.BIT_COUNTRY_LAND_ESTATE_METADATA_API = exports.BIT_COUNTRY_IPFS_SERVER = void 0;
 exports.getRandomIpfsGateway = getRandomIpfsGateway;
 var _storage = require("@subwallet/extension-base/storage");
 var _utils = require("@subwallet/extension-base/utils");
@@ -41,15 +41,20 @@ const CF_IPFS_GATEWAY = 'https://cf-ipfs.com/ipfs/';
 // XOrigin
 exports.CF_IPFS_GATEWAY = CF_IPFS_GATEWAY;
 const PINATA_IPFS_GATEWAY = 'https://gateway.pinata.cloud/ipfs/';
+
+// deprecated
+// export const UNIQUE_SCAN_ENDPOINT = 'https://explorer-api.unique.network/v1/graphql';
+// export const QUARTZ_SCAN_ENDPOINT = 'https://hasura-quartz.unique.network/v1/graphql';
 exports.PINATA_IPFS_GATEWAY = PINATA_IPFS_GATEWAY;
-const UNIQUE_SCAN_ENDPOINT = 'https://explorer-api.unique.network/v1/graphql';
+const VARA_SCAN_ENDPOINT = 'https://nft-explorer.vara-network.io/graphql';
+exports.VARA_SCAN_ENDPOINT = VARA_SCAN_ENDPOINT;
+const UNIQUE_SCAN_ENDPOINT = 'https://api-unique.uniquescan.io/v1/graphql';
 exports.UNIQUE_SCAN_ENDPOINT = UNIQUE_SCAN_ENDPOINT;
-const QUARTZ_SCAN_ENDPOINT = 'https://hasura-quartz.unique.network/v1/graphql';
+const QUARTZ_SCAN_ENDPOINT = 'https://api-quartz.uniquescan.io/v1/graphql';
 exports.QUARTZ_SCAN_ENDPOINT = QUARTZ_SCAN_ENDPOINT;
-const VARA_SCAN_ENDPOINT = 'https://nft-explorer.vara-network.io/graphql';
-
+const OPAL_SCAN_ENDPOINT = 'https://api-opal.uniquescan.io/v1/graphql';
 // GATEWAY
-exports.VARA_SCAN_ENDPOINT = VARA_SCAN_ENDPOINT;
+exports.OPAL_SCAN_ENDPOINT = OPAL_SCAN_ENDPOINT;
 const UNIQUE_IPFS_GATEWAY = 'https://ipfs.unique.network/ipfs/';
 
 // XOrigin

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

@@ -12,7 +12,7 @@ var _karura_nft = require("@subwallet/extension-base/koni/api/nft/karura_nft");
 var _ordinal_nft = _interopRequireDefault(require("@subwallet/extension-base/koni/api/nft/ordinal_nft"));
 var _rmrk_nft = require("@subwallet/extension-base/koni/api/nft/rmrk_nft");
 var _statemine_nft = _interopRequireDefault(require("@subwallet/extension-base/koni/api/nft/statemine_nft"));
-var _unique_nft = _interopRequireDefault(require("@subwallet/extension-base/koni/api/nft/unique_nft"));
+var _unique_network_nft = require("@subwallet/extension-base/koni/api/nft/unique_network_nft");
 var _vara_nft = require("@subwallet/extension-base/koni/api/nft/vara_nft");
 var _wasm_nft = require("@subwallet/extension-base/koni/api/nft/wasm_nft");
 var _constants = require("@subwallet/extension-base/services/chain-service/constants");
@@ -22,6 +22,8 @@ var _statemint_nft = _interopRequireDefault(require("./statemint_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 [substrateAddresses] = (0, _utils2.categoryAddresses)(addresses);
   if (_constants._NFT_CHAIN_GROUP.acala.includes(chain)) {
@@ -35,7 +37,7 @@ function createSubstrateNftApi(chain, substrateApi, addresses) {
   } else if (_constants._NFT_CHAIN_GROUP.statemint.includes(chain)) {
     return new _statemint_nft.default(substrateApi, substrateAddresses, chain);
   } else if (_constants._NFT_CHAIN_GROUP.unique_network.includes(chain)) {
-    return new _unique_nft.default(substrateApi, substrateAddresses, chain);
+    return new _unique_network_nft.UniqueNftApi(chain, substrateAddresses);
   } else if (_constants._NFT_CHAIN_GROUP.bitcountry.includes(chain)) {
     return new _bit.BitCountryNftApi(substrateApi, substrateAddresses, chain);
   } else if (_constants._NFT_CHAIN_GROUP.vara.includes(chain)) {

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

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.acalaGetExtrinsic = acalaGetExtrinsic;
 exports.getNftTransferExtrinsic = getNftTransferExtrinsic;
 exports.isRecipientSelf = isRecipientSelf;
-exports.quartzGetExtrinsic = quartzGetExtrinsic;
 exports.rmrkGetExtrinsic = rmrkGetExtrinsic;
 exports.statemineGetExtrinsic = statemineGetExtrinsic;
 exports.statemintGetExtrinsic = statemintGetExtrinsic;
@@ -43,18 +42,6 @@ function rmrkGetExtrinsic(substrateApi, senderAddress, recipientAddress, params)
   }
 }
 function uniqueGetExtrinsic(substrateApi, senderAddress, recipientAddress, params) {
-  try {
-    const itemId = params.itemId;
-    const collectionId = params.collectionId;
-    return substrateApi.api.tx.nft.transfer({
-      Substrate: recipientAddress
-    }, collectionId, itemId, 1);
-  } catch (e) {
-    console.error(e);
-    return null;
-  }
-}
-function quartzGetExtrinsic(substrateApi, senderAddress, recipientAddress, params) {
   try {
     const itemId = params.itemId;
     const collectionId = params.collectionId;
@@ -94,12 +81,13 @@ function getNftTransferExtrinsic(networkKey, substrateApi, senderAddress, recipi
       return acalaGetExtrinsic(substrateApi, senderAddress, recipientAddress, params);
     case _config.SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME.kusama:
       return rmrkGetExtrinsic(substrateApi, senderAddress, recipientAddress, params);
-    case _config.SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME.uniqueNft:
-      return uniqueGetExtrinsic(substrateApi, senderAddress, recipientAddress, params);
-    case _config.SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME.quartz:
-      return quartzGetExtrinsic(substrateApi, senderAddress, recipientAddress, params);
-    case _config.SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME.opal:
-      return quartzGetExtrinsic(substrateApi, senderAddress, recipientAddress, params);
+    // temporary prevent send nfts on Unique network-based chains
+    // case SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME.uniqueNft:
+    //   return uniqueGetExtrinsic(substrateApi, senderAddress, recipientAddress, params);
+    // case SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME.quartz:
+    //   return uniqueGetExtrinsic(substrateApi, senderAddress, recipientAddress, params);
+    // case SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME.opal:
+    //   return uniqueGetExtrinsic(substrateApi, senderAddress, recipientAddress, params);
     case _config.SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME.statemine:
       return statemineGetExtrinsic(substrateApi, senderAddress, recipientAddress, params);
     case _config.SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME.statemint:

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

@@ -0,0 +1,154 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.UniqueNftApi = void 0;
+var _config = require("@subwallet/extension-base/koni/api/nft/config");
+var _nft = require("@subwallet/extension-base/koni/api/nft/nft");
+var _crossFetch = _interopRequireDefault(require("cross-fetch"));
+var _utilCrypto = require("@polkadot/util-crypto");
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class UniqueNftApi extends _nft.BaseNftApi {
+  constructor(chain, addresses) {
+    super(chain, undefined, addresses);
+  }
+  handleProperties(nft) {
+    const propertiesMap = {};
+    const attRecord = nft.attributes;
+    if (attRecord) {
+      for (const item in attRecord) {
+        if (attRecord[item].name._.toLowerCase() === 'traits') {
+          const traits = [];
+          const traitValues = attRecord[item].value;
+          for (const trait in traitValues) {
+            traits.push(traitValues[trait]._);
+          }
+          propertiesMap.traits = {
+            value: traits
+          };
+        } else {
+          propertiesMap[attRecord[item].name._] = {
+            value: attRecord[item].value._
+          };
+        }
+      }
+    }
+    return propertiesMap;
+  }
+  static parseNftRequest(uniqueAddress) {
+    return {
+      query: `
+        query {
+            tokens(
+                limit: 99999
+                offset: 0
+                where: { owner: { _eq: "${uniqueAddress}" }, burned: { _eq: "false" }})
+            {
+                data {
+                    collection_id
+                    collection_name
+                    collection_description
+                    collection_cover
+                    token_id
+                    token_name
+                    image
+                    attributes
+                }
+            }
+        }
+      `
+    };
+  }
+  async getNftByAccount(address) {
+    var _result$data, _result$data$tokens;
+    let endpoint = '';
+    let uniqueAddress = '';
+
+    // Use exactly endpoint for each network
+    if (['unique_network'].includes(this.chain)) {
+      endpoint = _config.UNIQUE_SCAN_ENDPOINT;
+      uniqueAddress = (0, _utilCrypto.encodeAddress)((0, _utilCrypto.decodeAddress)(address), 7391);
+      // Unique network prefix: 7391
+    } else if (['quartz'].includes(this.chain)) {
+      endpoint = _config.QUARTZ_SCAN_ENDPOINT;
+      uniqueAddress = (0, _utilCrypto.encodeAddress)((0, _utilCrypto.decodeAddress)(address), 255);
+      // Quartz prefix: 255
+    } else if (['opal'].includes(this.chain)) {
+      endpoint = _config.OPAL_SCAN_ENDPOINT;
+      uniqueAddress = address;
+      // Opal address: Normal address
+    }
+
+    const resp = await (0, _crossFetch.default)(endpoint, {
+      method: 'post',
+      headers: {
+        'Content-Type': 'application/json'
+      },
+      body: JSON.stringify(UniqueNftApi.parseNftRequest(uniqueAddress))
+    });
+    const result = await resp.json();
+
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+    return result === null || result === void 0 ? void 0 : (_result$data = result.data) === null || _result$data === void 0 ? void 0 : (_result$data$tokens = _result$data.tokens) === null || _result$data$tokens === void 0 ? void 0 : _result$data$tokens.data;
+  }
+  async handleNfts(params) {
+    try {
+      await Promise.all(this.addresses.map(async address => {
+        const nfts = await this.getNftByAccount(address);
+        if (nfts) {
+          const collectionMap = {};
+          for (const nft of nfts) {
+            var _nft$image;
+            // Handle case rendering image on Quartz Network (Temporary solution)
+            if (this.chain === 'quartz' && nft.collection_id.toString() === '141') {
+              continue;
+            }
+
+            // Handle properties
+            const propertiesMap = this.handleProperties(nft);
+
+            // Update Nft information
+            const parsedNft = {
+              id: nft.token_id.toString(),
+              chain: this.chain,
+              owner: address,
+              name: nft.token_name,
+              image: this.parseUrl((_nft$image = nft.image) === null || _nft$image === void 0 ? void 0 : _nft$image.fullUrl),
+              description: nft.collection_description,
+              collectionId: nft.collection_id.toString(),
+              properties: propertiesMap
+            };
+            params.updateItem(this.chain, parsedNft, address);
+
+            // Update Collection information
+            if (!collectionMap[nft.collection_id.toString()]) {
+              const parsedCollection = {
+                collectionId: nft.collection_id.toString(),
+                chain: this.chain,
+                collectionName: nft.collection_name,
+                image: this.parseUrl(nft.collection_cover)
+              };
+              collectionMap[nft.collection_id.toString()] = parsedCollection;
+              params.updateCollection(this.chain, parsedCollection);
+            }
+          }
+        }
+      }));
+    } catch (e) {
+      console.error(`Failed to fetch ${this.chain} nft`, e);
+    }
+  }
+  async fetchNfts(params) {
+    try {
+      await this.handleNfts(params);
+    } catch (e) {
+      return 0;
+    }
+    return 1;
+  }
+}
+exports.UniqueNftApi = UniqueNftApi;

package/cjs/packageInfo.js

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

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

@@ -44,7 +44,7 @@ class BalanceService {
     if (!chainInfo || !chainState || !chainState.active) {
       return Promise.reject(new _BalanceError.BalanceError(_KoniTypes.BalanceErrorType.NETWORK_ERROR, (0, _i18next.t)('{{chain}} is inactive. Please enable network', {
         replace: {
-          chain
+          chain: chainInfo.name
         }
       })));
     }

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

@@ -58,7 +58,7 @@ const _NFT_CHAIN_GROUP = {
   rmrk: ['kusama'],
   statemine: ['statemine'],
   statemint: ['statemint'],
-  unique_network: ['unique_network'],
+  unique_network: ['unique_network', 'quartz', 'opal'],
   bitcountry: ['bitcountry', 'pioneer'],
   vara: ['vara_network']
 };

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

@@ -417,7 +417,6 @@ class ChainService {
 
     await this.initChains();
     this.chainInfoMapSubject.next(this.getChainInfoMap());
-    this.updateChainStateMapSubscription();
     this.assetRegistrySubject.next(this.getAssetRegistry());
     this.xcmRefMapSubject.next(this.dataMap.assetRefMap);
     await this.initApis();
@@ -929,7 +928,9 @@ class ChainService {
     }
   }
   updateChainStateMapSubscription() {
-    this.chainStateMapSubject.next(this.getChainStateMap());
+    (0, _utils2.addLazy)('updateChainStateMapSubscription', () => {
+      this.chainStateMapSubject.next(this.getChainStateMap());
+    }, 300, 900);
   }
   updateChainInfoMapSubscription() {
     this.chainInfoMapSubject.next(this.getChainInfoMap());

package/cjs/services/earning-service/service.js

@@ -411,12 +411,10 @@ class EarningService {
     return Promise.resolve(this.yieldPositionListSubject.getValue());
   }
   yieldPositionPersistQueue = [];
-  resetYieldPositionQueue() {
-    this.yieldPositionPersistQueue = [];
-  }
   async resetYieldPosition() {
     this.yieldPositionSubject.next({});
     this.yieldPositionPersistQueue = [];
+    (0, _utils2.removeLazy)('persistYieldPositionInfo');
     await this.dbService.stores.yieldPosition.clear();
   }
   _getYieldPositionKey(slug, address) {
@@ -463,6 +461,7 @@ class EarningService {
   runUnsubscribePoolsPosition() {
     var _this$yieldPositionUn;
     (_this$yieldPositionUn = this.yieldPositionUnsub) === null || _this$yieldPositionUn === void 0 ? void 0 : _this$yieldPositionUn.call(this);
+    (0, _utils2.removeLazy)('persistYieldPositionInfo');
     this.yieldPositionPersistQueue = [];
   }
 
@@ -470,12 +469,19 @@ class EarningService {
 
   /* Get pools' reward */
 
+  earningsRewardQueue = [];
   updateEarningReward(stakingRewardData) {
-    const stakingRewardState = this.earningRewardSubject.getValue();
-    stakingRewardState.ready = true;
-    const key = `${stakingRewardData.slug}---${stakingRewardData.address}`;
-    stakingRewardState.data[key] = stakingRewardData;
-    this.earningRewardSubject.next(stakingRewardState);
+    this.earningsRewardQueue.push(stakingRewardData);
+    (0, _utils2.addLazy)('updateEarningReward', () => {
+      const stakingRewardState = this.earningRewardSubject.getValue();
+      this.earningsRewardQueue.forEach(item => {
+        const key = `${item.slug}---${item.address}`;
+        stakingRewardState.data[key] = item;
+      });
+      stakingRewardState.ready = true;
+      this.earningRewardSubject.next(stakingRewardState);
+      this.earningsRewardQueue = [];
+    });
   }
   async getPoolReward(addresses, callback) {
     let cancel = false;
@@ -524,6 +530,8 @@ class EarningService {
     }, _constants.CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
   }
   runUnsubscribeStakingRewardInterval() {
+    (0, _utils2.removeLazy)('updateEarningReward');
+    this.earningsRewardQueue = [];
     this.earningsRewardInterval && clearInterval(this.earningsRewardInterval);
   }
   async fetchPoolRewardHistory(addresses, callback) {
@@ -552,11 +560,18 @@ class EarningService {
       });
     };
   }
+  earningRewardHistoryQueue = [];
   updateEarningRewardHistory(earningRewardHistory) {
-    const earningRewardHistoryState = this.earningRewardHistorySubject.getValue();
-    const key = `${earningRewardHistory.slug}---${earningRewardHistory.address}---${earningRewardHistory.eventIndex}`;
-    earningRewardHistoryState[key] = earningRewardHistory;
-    this.earningRewardHistorySubject.next(earningRewardHistoryState);
+    this.earningRewardHistoryQueue.push(earningRewardHistory);
+    (0, _utils2.addLazy)('updateEarningRewardHistory', () => {
+      const earningRewardHistoryState = this.earningRewardHistorySubject.getValue();
+      this.earningRewardHistoryQueue.forEach(item => {
+        const key = `${item.slug}---${item.address}---${item.eventIndex}`;
+        earningRewardHistoryState[key] = item;
+      });
+      this.earningRewardHistorySubject.next(earningRewardHistoryState);
+      this.earningRewardHistoryQueue = [];
+    }, 300, 1800);
   }
   subscribeEarningRewardHistory() {
     return this.earningRewardHistorySubject;
@@ -580,6 +595,8 @@ class EarningService {
     }, _constants.CRON_REFRESH_EARNING_REWARD_HISTORY_INTERVAL);
   }
   runUnsubscribeEarningRewardHistoryInterval() {
+    (0, _utils2.removeLazy)('updateEarningRewardHistory');
+    this.earningRewardHistoryQueue = [];
     this.earningsRewardHistoryInterval && clearInterval(this.earningsRewardHistoryInterval);
   }
 

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

@@ -7,5 +7,5 @@ exports.TRANSACTION_TIMEOUT = void 0;
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-const TRANSACTION_TIMEOUT = 2 * 60 * 1000;
+const TRANSACTION_TIMEOUT = 5 * 60 * 1000;
 exports.TRANSACTION_TIMEOUT = TRANSACTION_TIMEOUT;

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

@@ -714,7 +714,7 @@ class TransactionService {
     this.state.historyService.updateHistoryByExtrinsicHash(id, updateData).catch(console.error);
     console.debug(`Transaction "${id}" is submitted with hash ${extrinsicHash || ''}`);
     const transaction = this.getTransaction(id);
-    if ([_KoniTypes.ExtrinsicType.STAKING_JOIN_POOL, _KoniTypes.ExtrinsicType.JOIN_YIELD_POOL, _KoniTypes.ExtrinsicType.MINT_LDOT, _KoniTypes.ExtrinsicType.MINT_QDOT, _KoniTypes.ExtrinsicType.MINT_SDOT, _KoniTypes.ExtrinsicType.MINT_VDOT].includes(transaction.extrinsicType)) {
+    if ([_KoniTypes.ExtrinsicType.STAKING_JOIN_POOL, _KoniTypes.ExtrinsicType.STAKING_BOND, _KoniTypes.ExtrinsicType.JOIN_YIELD_POOL, _KoniTypes.ExtrinsicType.MINT_LDOT, _KoniTypes.ExtrinsicType.MINT_QDOT, _KoniTypes.ExtrinsicType.MINT_SDOT, _KoniTypes.ExtrinsicType.MINT_STDOT, _KoniTypes.ExtrinsicType.MINT_VDOT, _KoniTypes.ExtrinsicType.MINT_VMANTA].includes(transaction.extrinsicType)) {
       this.handlePostEarningTransaction(id);
     }
   }

package/cjs/utils/eth.js

@@ -94,10 +94,19 @@ const calculateGasFeeParams = async (web3, networkKey) => {
     }, 0);
     const busyNetwork = blocksBusy >= numBlock / 2; // True if half of block is busy
 
-    const maxPriorityFeePerGas = history.reward.reduce((previous, rewards) => {
+    const maxPriorityFeePerGas = history.reward.reduce((previous, rewards, currentIndex) => {
       const [first, second] = rewards;
+      const base = history.baseFeePerGas[currentIndex];
       const firstBN = new _bignumber.default(first);
       const secondBN = new _bignumber.default(second);
+      const baseBN = new _bignumber.default(base);
+
+      // Special for bsc, base and first always 0
+      if (baseBN.eq(_number.BN_ZERO) && firstBN.eq(_number.BN_ZERO)) {
+        const current = secondBN;
+        return current.gte(previous) ? current : previous; // get min priority
+      }
+
       if (busyNetwork) {
         const current = secondBN.dividedBy(2).gte(firstBN) ? firstBN : secondBN; // second too larger than first (> 2 times), use first else use second
 

package/koni/api/nft/config.d.ts

@@ -11,9 +11,10 @@ export declare const BIT_COUNTRY_LAND_ESTATE_METADATA_API = "https://pioneer-api
 export declare const BIT_COUNTRY_THUMBNAIL_RESOLVER = "https://res.cloudinary.com/ddftctzph/image/upload/c_scale,q_100,w_250/production-ipfs/asset/";
 export declare const CF_IPFS_GATEWAY = "https://cf-ipfs.com/ipfs/";
 export declare const PINATA_IPFS_GATEWAY = "https://gateway.pinata.cloud/ipfs/";
-export declare const UNIQUE_SCAN_ENDPOINT = "https://explorer-api.unique.network/v1/graphql";
-export declare const QUARTZ_SCAN_ENDPOINT = "https://hasura-quartz.unique.network/v1/graphql";
 export declare const VARA_SCAN_ENDPOINT = "https://nft-explorer.vara-network.io/graphql";
+export declare const UNIQUE_SCAN_ENDPOINT = "https://api-unique.uniquescan.io/v1/graphql";
+export declare const QUARTZ_SCAN_ENDPOINT = "https://api-quartz.uniquescan.io/v1/graphql";
+export declare const OPAL_SCAN_ENDPOINT = "https://api-opal.uniquescan.io/v1/graphql";
 export declare const UNIQUE_IPFS_GATEWAY = "https://ipfs.unique.network/ipfs/";
 export declare const NFT_STORAGE_GATEWAY = "https://nftstorage.link/ipfs/";
 export declare const IPFS_W3S_LINK = "https://w3s.link/ipfs/";

package/koni/api/nft/config.js

@@ -21,10 +21,15 @@ export const CF_IPFS_GATEWAY = 'https://cf-ipfs.com/ipfs/';
 
 // XOrigin
 export const PINATA_IPFS_GATEWAY = 'https://gateway.pinata.cloud/ipfs/';
-export const UNIQUE_SCAN_ENDPOINT = 'https://explorer-api.unique.network/v1/graphql';
-export const QUARTZ_SCAN_ENDPOINT = 'https://hasura-quartz.unique.network/v1/graphql';
-export const VARA_SCAN_ENDPOINT = 'https://nft-explorer.vara-network.io/graphql';
 
+// deprecated
+// export const UNIQUE_SCAN_ENDPOINT = 'https://explorer-api.unique.network/v1/graphql';
+// export const QUARTZ_SCAN_ENDPOINT = 'https://hasura-quartz.unique.network/v1/graphql';
+
+export const VARA_SCAN_ENDPOINT = 'https://nft-explorer.vara-network.io/graphql';
+export const UNIQUE_SCAN_ENDPOINT = 'https://api-unique.uniquescan.io/v1/graphql';
+export const QUARTZ_SCAN_ENDPOINT = 'https://api-quartz.uniquescan.io/v1/graphql';
+export const OPAL_SCAN_ENDPOINT = 'https://api-opal.uniquescan.io/v1/graphql';
 // GATEWAY
 
 export const UNIQUE_IPFS_GATEWAY = 'https://ipfs.unique.network/ipfs/';

package/koni/api/nft/index.js

@@ -8,7 +8,8 @@ import { KaruraNftApi } from '@subwallet/extension-base/koni/api/nft/karura_nft'
 import OrdinalNftApi from '@subwallet/extension-base/koni/api/nft/ordinal_nft';
 import { RmrkNftApi } from '@subwallet/extension-base/koni/api/nft/rmrk_nft';
 import StatemineNftApi from '@subwallet/extension-base/koni/api/nft/statemine_nft';
-import UniqueNftApi from '@subwallet/extension-base/koni/api/nft/unique_nft';
+import { UniqueNftApi } from '@subwallet/extension-base/koni/api/nft/unique_network_nft';
+// import UniqueNftApi from '@subwallet/extension-base/koni/api/nft/unique_nft';
 import { VaraNftApi } from '@subwallet/extension-base/koni/api/nft/vara_nft';
 import { WasmNftApi } from '@subwallet/extension-base/koni/api/nft/wasm_nft';
 import { _NFT_CHAIN_GROUP } from '@subwallet/extension-base/services/chain-service/constants';
@@ -28,7 +29,7 @@ function createSubstrateNftApi(chain, substrateApi, addresses) {
   } else if (_NFT_CHAIN_GROUP.statemint.includes(chain)) {
     return new StatemintNftApi(substrateApi, substrateAddresses, chain);
   } else if (_NFT_CHAIN_GROUP.unique_network.includes(chain)) {
-    return new UniqueNftApi(substrateApi, substrateAddresses, chain);
+    return new UniqueNftApi(chain, substrateAddresses);
   } else if (_NFT_CHAIN_GROUP.bitcountry.includes(chain)) {
     return new BitCountryNftApi(substrateApi, substrateAddresses, chain);
   } else if (_NFT_CHAIN_GROUP.vara.includes(chain)) {

package/koni/api/nft/transfer.d.ts

@@ -3,7 +3,6 @@ export declare function isRecipientSelf(currentAddress: string, recipientAddress
 export declare function acalaGetExtrinsic(substrateApi: _SubstrateApi, senderAddress: string, recipientAddress: string, params: Record<string, any>): import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult> | null;
 export declare function rmrkGetExtrinsic(substrateApi: _SubstrateApi, senderAddress: string, recipientAddress: string, params: Record<string, any>): import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult> | null;
 export declare function uniqueGetExtrinsic(substrateApi: _SubstrateApi, senderAddress: string, recipientAddress: string, params: Record<string, any>): import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult> | null;
-export declare function quartzGetExtrinsic(substrateApi: _SubstrateApi, senderAddress: string, recipientAddress: string, params: Record<string, any>): import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult> | null;
 export declare function statemineGetExtrinsic(substrateApi: _SubstrateApi, senderAddress: string, recipientAddress: string, params: Record<string, any>): import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult> | null;
 export declare function statemintGetExtrinsic(substrateApi: _SubstrateApi, senderAddress: string, recipientAddress: string, params: Record<string, any>): import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult> | null;
 export declare function getNftTransferExtrinsic(networkKey: string, substrateApi: _SubstrateApi, senderAddress: string, recipientAddress: string, params: Record<string, any>): import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult> | null;

package/koni/api/nft/transfer.js

@@ -30,18 +30,6 @@ export function rmrkGetExtrinsic(substrateApi, senderAddress, recipientAddress,
   }
 }
 export function uniqueGetExtrinsic(substrateApi, senderAddress, recipientAddress, params) {
-  try {
-    const itemId = params.itemId;
-    const collectionId = params.collectionId;
-    return substrateApi.api.tx.nft.transfer({
-      Substrate: recipientAddress
-    }, collectionId, itemId, 1);
-  } catch (e) {
-    console.error(e);
-    return null;
-  }
-}
-export function quartzGetExtrinsic(substrateApi, senderAddress, recipientAddress, params) {
   try {
     const itemId = params.itemId;
     const collectionId = params.collectionId;
@@ -81,12 +69,13 @@ export function getNftTransferExtrinsic(networkKey, substrateApi, senderAddress,
       return acalaGetExtrinsic(substrateApi, senderAddress, recipientAddress, params);
     case SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME.kusama:
       return rmrkGetExtrinsic(substrateApi, senderAddress, recipientAddress, params);
-    case SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME.uniqueNft:
-      return uniqueGetExtrinsic(substrateApi, senderAddress, recipientAddress, params);
-    case SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME.quartz:
-      return quartzGetExtrinsic(substrateApi, senderAddress, recipientAddress, params);
-    case SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME.opal:
-      return quartzGetExtrinsic(substrateApi, senderAddress, recipientAddress, params);
+    // temporary prevent send nfts on Unique network-based chains
+    // case SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME.uniqueNft:
+    //   return uniqueGetExtrinsic(substrateApi, senderAddress, recipientAddress, params);
+    // case SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME.quartz:
+    //   return uniqueGetExtrinsic(substrateApi, senderAddress, recipientAddress, params);
+    // case SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME.opal:
+    //   return uniqueGetExtrinsic(substrateApi, senderAddress, recipientAddress, params);
     case SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME.statemine:
       return statemineGetExtrinsic(substrateApi, senderAddress, recipientAddress, params);
     case SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME.statemint:

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

@@ -0,0 +1,9 @@
+import { BaseNftApi, HandleNftParams } from '@subwallet/extension-base/koni/api/nft/nft';
+export declare class UniqueNftApi extends BaseNftApi {
+    constructor(chain: string, addresses: string[]);
+    private handleProperties;
+    private static parseNftRequest;
+    private getNftByAccount;
+    handleNfts(params: HandleNftParams): Promise<void>;
+    fetchNfts(params: HandleNftParams): Promise<number>;
+}

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

@@ -0,0 +1,146 @@
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { OPAL_SCAN_ENDPOINT, QUARTZ_SCAN_ENDPOINT, UNIQUE_SCAN_ENDPOINT } from '@subwallet/extension-base/koni/api/nft/config';
+import { BaseNftApi } from '@subwallet/extension-base/koni/api/nft/nft';
+import fetch from 'cross-fetch';
+import { decodeAddress, encodeAddress } from '@polkadot/util-crypto';
+export class UniqueNftApi extends BaseNftApi {
+  constructor(chain, addresses) {
+    super(chain, undefined, addresses);
+  }
+  handleProperties(nft) {
+    const propertiesMap = {};
+    const attRecord = nft.attributes;
+    if (attRecord) {
+      for (const item in attRecord) {
+        if (attRecord[item].name._.toLowerCase() === 'traits') {
+          const traits = [];
+          const traitValues = attRecord[item].value;
+          for (const trait in traitValues) {
+            traits.push(traitValues[trait]._);
+          }
+          propertiesMap.traits = {
+            value: traits
+          };
+        } else {
+          propertiesMap[attRecord[item].name._] = {
+            value: attRecord[item].value._
+          };
+        }
+      }
+    }
+    return propertiesMap;
+  }
+  static parseNftRequest(uniqueAddress) {
+    return {
+      query: `
+        query {
+            tokens(
+                limit: 99999
+                offset: 0
+                where: { owner: { _eq: "${uniqueAddress}" }, burned: { _eq: "false" }})
+            {
+                data {
+                    collection_id
+                    collection_name
+                    collection_description
+                    collection_cover
+                    token_id
+                    token_name
+                    image
+                    attributes
+                }
+            }
+        }
+      `
+    };
+  }
+  async getNftByAccount(address) {
+    var _result$data, _result$data$tokens;
+    let endpoint = '';
+    let uniqueAddress = '';
+
+    // Use exactly endpoint for each network
+    if (['unique_network'].includes(this.chain)) {
+      endpoint = UNIQUE_SCAN_ENDPOINT;
+      uniqueAddress = encodeAddress(decodeAddress(address), 7391);
+      // Unique network prefix: 7391
+    } else if (['quartz'].includes(this.chain)) {
+      endpoint = QUARTZ_SCAN_ENDPOINT;
+      uniqueAddress = encodeAddress(decodeAddress(address), 255);
+      // Quartz prefix: 255
+    } else if (['opal'].includes(this.chain)) {
+      endpoint = OPAL_SCAN_ENDPOINT;
+      uniqueAddress = address;
+      // Opal address: Normal address
+    }
+
+    const resp = await fetch(endpoint, {
+      method: 'post',
+      headers: {
+        'Content-Type': 'application/json'
+      },
+      body: JSON.stringify(UniqueNftApi.parseNftRequest(uniqueAddress))
+    });
+    const result = await resp.json();
+
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+    return result === null || result === void 0 ? void 0 : (_result$data = result.data) === null || _result$data === void 0 ? void 0 : (_result$data$tokens = _result$data.tokens) === null || _result$data$tokens === void 0 ? void 0 : _result$data$tokens.data;
+  }
+  async handleNfts(params) {
+    try {
+      await Promise.all(this.addresses.map(async address => {
+        const nfts = await this.getNftByAccount(address);
+        if (nfts) {
+          const collectionMap = {};
+          for (const nft of nfts) {
+            var _nft$image;
+            // Handle case rendering image on Quartz Network (Temporary solution)
+            if (this.chain === 'quartz' && nft.collection_id.toString() === '141') {
+              continue;
+            }
+
+            // Handle properties
+            const propertiesMap = this.handleProperties(nft);
+
+            // Update Nft information
+            const parsedNft = {
+              id: nft.token_id.toString(),
+              chain: this.chain,
+              owner: address,
+              name: nft.token_name,
+              image: this.parseUrl((_nft$image = nft.image) === null || _nft$image === void 0 ? void 0 : _nft$image.fullUrl),
+              description: nft.collection_description,
+              collectionId: nft.collection_id.toString(),
+              properties: propertiesMap
+            };
+            params.updateItem(this.chain, parsedNft, address);
+
+            // Update Collection information
+            if (!collectionMap[nft.collection_id.toString()]) {
+              const parsedCollection = {
+                collectionId: nft.collection_id.toString(),
+                chain: this.chain,
+                collectionName: nft.collection_name,
+                image: this.parseUrl(nft.collection_cover)
+              };
+              collectionMap[nft.collection_id.toString()] = parsedCollection;
+              params.updateCollection(this.chain, parsedCollection);
+            }
+          }
+        }
+      }));
+    } catch (e) {
+      console.error(`Failed to fetch ${this.chain} nft`, e);
+    }
+  }
+  async fetchNfts(params) {
+    try {
+      await this.handleNfts(params);
+    } catch (e) {
+      return 0;
+    }
+    return 1;
+  }
+}

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.35-beta.3",
+  "version": "1.1.36-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -269,6 +269,11 @@
       "require": "./cjs/koni/api/nft/transfer.js",
       "default": "./koni/api/nft/transfer.js"
     },
+    "./koni/api/nft/unique_network_nft": {
+      "types": "./koni/api/nft/unique_network_nft/index.d.ts",
+      "require": "./cjs/koni/api/nft/unique_network_nft/index.js",
+      "default": "./koni/api/nft/unique_network_nft/index.js"
+    },
     "./koni/api/nft/unique_nft": {
       "types": "./koni/api/nft/unique_nft/index.d.ts",
       "require": "./cjs/koni/api/nft/unique_nft/index.js",
@@ -1731,11 +1736,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
-    "@subwallet/chain-list": "0.2.40-beta.2",
-    "@subwallet/extension-base": "^1.1.35-0",
-    "@subwallet/extension-chains": "^1.1.35-0",
-    "@subwallet/extension-dapp": "^1.1.35-0",
-    "@subwallet/extension-inject": "^1.1.35-0",
+    "@subwallet/chain-list": "0.2.40",
+    "@subwallet/extension-base": "^1.1.36-0",
+    "@subwallet/extension-chains": "^1.1.36-0",
+    "@subwallet/extension-dapp": "^1.1.36-0",
+    "@subwallet/extension-inject": "^1.1.36-0",
     "@subwallet/keyring": "^0.1.3",
     "@subwallet/ui-keyring": "^0.1.3",
     "@walletconnect/sign-client": "^2.8.4",
@@ -1772,4 +1777,4 @@
     "web3-eth-contract": "^1.10.0",
     "web3-utils": "^1.10.0"
   }
-}
+}

package/packageInfo.js

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

package/services/balance-service/index.js

@@ -39,7 +39,7 @@ export class BalanceService {
     if (!chainInfo || !chainState || !chainState.active) {
       return Promise.reject(new BalanceError(BalanceErrorType.NETWORK_ERROR, t('{{chain}} is inactive. Please enable network', {
         replace: {
-          chain
+          chain: chainInfo.name
         }
       })));
     }

package/services/chain-service/constants.js

@@ -45,7 +45,7 @@ export const _NFT_CHAIN_GROUP = {
   rmrk: ['kusama'],
   statemine: ['statemine'],
   statemint: ['statemint'],
-  unique_network: ['unique_network'],
+  unique_network: ['unique_network', 'quartz', 'opal'],
   bitcountry: ['bitcountry', 'pioneer'],
   vara: ['vara_network']
 };

package/services/chain-service/index.js

@@ -11,7 +11,7 @@ import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chai
 import { _ChainConnectionStatus, _CUSTOM_PREFIX, _NFT_CONTRACT_STANDARDS, _SMART_CONTRACT_STANDARDS } from '@subwallet/extension-base/services/chain-service/types';
 import { _isAssetFungibleToken, _isChainEnabled, _isCustomAsset, _isCustomChain, _isCustomProvider, _isEqualContractAddress, _isEqualSmartContractAsset, _isMantaZkAsset, _isPureEvmChain, _isPureSubstrateChain, _parseAssetRefKey, randomizeProvider, updateLatestChainInfo } from '@subwallet/extension-base/services/chain-service/utils';
 import AssetSettingStore from '@subwallet/extension-base/stores/AssetSetting';
-import { fetchStaticData, MODULE_SUPPORT } from '@subwallet/extension-base/utils';
+import { addLazy, fetchStaticData, MODULE_SUPPORT } from '@subwallet/extension-base/utils';
 import { BehaviorSubject, Subject } from 'rxjs';
 import Web3 from 'web3';
 import { logger as createLogger } from '@polkadot/util/logger';
@@ -403,7 +403,6 @@ export class ChainService {
 
     await this.initChains();
     this.chainInfoMapSubject.next(this.getChainInfoMap());
-    this.updateChainStateMapSubscription();
     this.assetRegistrySubject.next(this.getAssetRegistry());
     this.xcmRefMapSubject.next(this.dataMap.assetRefMap);
     await this.initApis();
@@ -911,7 +910,9 @@ export class ChainService {
     }
   }
   updateChainStateMapSubscription() {
-    this.chainStateMapSubject.next(this.getChainStateMap());
+    addLazy('updateChainStateMapSubscription', () => {
+      this.chainStateMapSubject.next(this.getChainStateMap());
+    }, 300, 900);
   }
   updateChainInfoMapSubscription() {
     this.chainInfoMapSubject.next(this.getChainInfoMap());

package/services/earning-service/service.d.ts

@@ -53,7 +53,6 @@ export default class EarningService implements StoppableServiceInterface, Persis
     subscribeYieldPosition(): BehaviorSubject<YieldPositionInfo[]>;
     getYieldPositionInfo(): Promise<YieldPositionInfo[]>;
     yieldPositionPersistQueue: YieldPositionInfo[];
-    resetYieldPositionQueue(): void;
     resetYieldPosition(): Promise<void>;
     private _getYieldPositionKey;
     updateYieldPosition(data: YieldPositionInfo): void;
@@ -61,6 +60,7 @@ export default class EarningService implements StoppableServiceInterface, Persis
     private yieldPositionUnsub;
     runSubscribePoolsPosition(): Promise<void>;
     runUnsubscribePoolsPosition(): void;
+    earningsRewardQueue: EarningRewardItem[];
     updateEarningReward(stakingRewardData: EarningRewardItem): void;
     getPoolReward(addresses: string[], callback: (result: EarningRewardItem) => void): Promise<VoidFunction>;
     subscribeEarningReward(): BehaviorSubject<EarningRewardJson>;
@@ -69,6 +69,7 @@ export default class EarningService implements StoppableServiceInterface, Persis
     runSubscribeStakingRewardInterval(): void;
     runUnsubscribeStakingRewardInterval(): void;
     fetchPoolRewardHistory(addresses: string[], callback: (result: EarningRewardHistoryItem) => void): Promise<VoidFunction>;
+    private earningRewardHistoryQueue;
     updateEarningRewardHistory(earningRewardHistory: EarningRewardHistoryItem): void;
     subscribeEarningRewardHistory(): BehaviorSubject<Record<string, EarningRewardHistoryItem>>;
     getEarningRewardHistory(): Record<string, EarningRewardHistoryItem>;

package/services/earning-service/service.js

@@ -9,7 +9,7 @@ import { _isChainEvmCompatible } from '@subwallet/extension-base/services/chain-
 import { _STAKING_CHAIN_GROUP } from '@subwallet/extension-base/services/earning-service/constants';
 import BaseLiquidStakingPoolHandler from '@subwallet/extension-base/services/earning-service/handlers/liquid-staking/base';
 import { YieldPoolType } from '@subwallet/extension-base/types';
-import { addLazy, categoryAddresses, createPromiseHandler } from '@subwallet/extension-base/utils';
+import { addLazy, categoryAddresses, createPromiseHandler, removeLazy } from '@subwallet/extension-base/utils';
 import { fetchStaticCache } from '@subwallet/extension-base/utils/fetchStaticCache';
 import { BehaviorSubject } from 'rxjs';
 import { AcalaLiquidStakingPoolHandler, AmplitudeNativeStakingPoolHandler, AstarNativeStakingPoolHandler, BifrostLiquidStakingPoolHandler, BifrostMantaLiquidStakingPoolHandler, InterlayLendingPoolHandler, NominationPoolHandler, ParallelLiquidStakingPoolHandler, ParaNativeStakingPoolHandler, RelayNativeStakingPoolHandler, StellaSwapLiquidStakingPoolHandler } from "./handlers/index.js";
@@ -402,12 +402,10 @@ export default class EarningService {
     return Promise.resolve(this.yieldPositionListSubject.getValue());
   }
   yieldPositionPersistQueue = [];
-  resetYieldPositionQueue() {
-    this.yieldPositionPersistQueue = [];
-  }
   async resetYieldPosition() {
     this.yieldPositionSubject.next({});
     this.yieldPositionPersistQueue = [];
+    removeLazy('persistYieldPositionInfo');
     await this.dbService.stores.yieldPosition.clear();
   }
   _getYieldPositionKey(slug, address) {
@@ -453,6 +451,7 @@ export default class EarningService {
   runUnsubscribePoolsPosition() {
     var _this$yieldPositionUn;
     (_this$yieldPositionUn = this.yieldPositionUnsub) === null || _this$yieldPositionUn === void 0 ? void 0 : _this$yieldPositionUn.call(this);
+    removeLazy('persistYieldPositionInfo');
     this.yieldPositionPersistQueue = [];
   }
 
@@ -460,12 +459,19 @@ export default class EarningService {
 
   /* Get pools' reward */
 
+  earningsRewardQueue = [];
   updateEarningReward(stakingRewardData) {
-    const stakingRewardState = this.earningRewardSubject.getValue();
-    stakingRewardState.ready = true;
-    const key = `${stakingRewardData.slug}---${stakingRewardData.address}`;
-    stakingRewardState.data[key] = stakingRewardData;
-    this.earningRewardSubject.next(stakingRewardState);
+    this.earningsRewardQueue.push(stakingRewardData);
+    addLazy('updateEarningReward', () => {
+      const stakingRewardState = this.earningRewardSubject.getValue();
+      this.earningsRewardQueue.forEach(item => {
+        const key = `${item.slug}---${item.address}`;
+        stakingRewardState.data[key] = item;
+      });
+      stakingRewardState.ready = true;
+      this.earningRewardSubject.next(stakingRewardState);
+      this.earningsRewardQueue = [];
+    });
   }
   async getPoolReward(addresses, callback) {
     let cancel = false;
@@ -514,6 +520,8 @@ export default class EarningService {
     }, CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
   }
   runUnsubscribeStakingRewardInterval() {
+    removeLazy('updateEarningReward');
+    this.earningsRewardQueue = [];
     this.earningsRewardInterval && clearInterval(this.earningsRewardInterval);
   }
   async fetchPoolRewardHistory(addresses, callback) {
@@ -542,11 +550,18 @@ export default class EarningService {
       });
     };
   }
+  earningRewardHistoryQueue = [];
   updateEarningRewardHistory(earningRewardHistory) {
-    const earningRewardHistoryState = this.earningRewardHistorySubject.getValue();
-    const key = `${earningRewardHistory.slug}---${earningRewardHistory.address}---${earningRewardHistory.eventIndex}`;
-    earningRewardHistoryState[key] = earningRewardHistory;
-    this.earningRewardHistorySubject.next(earningRewardHistoryState);
+    this.earningRewardHistoryQueue.push(earningRewardHistory);
+    addLazy('updateEarningRewardHistory', () => {
+      const earningRewardHistoryState = this.earningRewardHistorySubject.getValue();
+      this.earningRewardHistoryQueue.forEach(item => {
+        const key = `${item.slug}---${item.address}---${item.eventIndex}`;
+        earningRewardHistoryState[key] = item;
+      });
+      this.earningRewardHistorySubject.next(earningRewardHistoryState);
+      this.earningRewardHistoryQueue = [];
+    }, 300, 1800);
   }
   subscribeEarningRewardHistory() {
     return this.earningRewardHistorySubject;
@@ -570,6 +585,8 @@ export default class EarningService {
     }, CRON_REFRESH_EARNING_REWARD_HISTORY_INTERVAL);
   }
   runUnsubscribeEarningRewardHistoryInterval() {
+    removeLazy('updateEarningRewardHistory');
+    this.earningRewardHistoryQueue = [];
     this.earningsRewardHistoryInterval && clearInterval(this.earningsRewardHistoryInterval);
   }
 

package/services/transaction-service/constants.js

@@ -1,4 +1,4 @@
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-export const TRANSACTION_TIMEOUT = 2 * 60 * 1000;
+export const TRANSACTION_TIMEOUT = 5 * 60 * 1000;

package/services/transaction-service/index.js

@@ -704,7 +704,7 @@ export default class TransactionService {
     this.state.historyService.updateHistoryByExtrinsicHash(id, updateData).catch(console.error);
     console.debug(`Transaction "${id}" is submitted with hash ${extrinsicHash || ''}`);
     const transaction = this.getTransaction(id);
-    if ([ExtrinsicType.STAKING_JOIN_POOL, ExtrinsicType.JOIN_YIELD_POOL, ExtrinsicType.MINT_LDOT, ExtrinsicType.MINT_QDOT, ExtrinsicType.MINT_SDOT, ExtrinsicType.MINT_VDOT].includes(transaction.extrinsicType)) {
+    if ([ExtrinsicType.STAKING_JOIN_POOL, ExtrinsicType.STAKING_BOND, ExtrinsicType.JOIN_YIELD_POOL, ExtrinsicType.MINT_LDOT, ExtrinsicType.MINT_QDOT, ExtrinsicType.MINT_SDOT, ExtrinsicType.MINT_STDOT, ExtrinsicType.MINT_VDOT, ExtrinsicType.MINT_VMANTA].includes(transaction.extrinsicType)) {
       this.handlePostEarningTransaction(id);
     }
   }

package/utils/eth.js

@@ -82,10 +82,19 @@ export const calculateGasFeeParams = async (web3, networkKey) => {
     }, 0);
     const busyNetwork = blocksBusy >= numBlock / 2; // True if half of block is busy
 
-    const maxPriorityFeePerGas = history.reward.reduce((previous, rewards) => {
+    const maxPriorityFeePerGas = history.reward.reduce((previous, rewards, currentIndex) => {
       const [first, second] = rewards;
+      const base = history.baseFeePerGas[currentIndex];
       const firstBN = new BigN(first);
       const secondBN = new BigN(second);
+      const baseBN = new BigN(base);
+
+      // Special for bsc, base and first always 0
+      if (baseBN.eq(BN_ZERO) && firstBN.eq(BN_ZERO)) {
+        const current = secondBN;
+        return current.gte(previous) ? current : previous; // get min priority
+      }
+
       if (busyNetwork) {
         const current = secondBN.dividedBy(2).gte(firstBN) ? firstBN : secondBN; // second too larger than first (> 2 times), use first else use second
 

package/cjs/utils/yield/index.js

@@ -1,3 +0,0 @@
-// Copyright 2019-2022 @subwallet/extension-base
-// SPDX-License-Identifier: Apache-2.0
-"use strict";