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

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

@@ -22,6 +22,7 @@ var _utils3 = require("@subwallet/extension-base/utils");
 var _eth = require("@subwallet/extension-base/utils/eth");
 var _mergeTransactionAndSignature = require("@subwallet/extension-base/utils/eth/mergeTransactionAndSignature");
 var _parseTransaction = require("@subwallet/extension-base/utils/eth/parseTransaction");
+var _number = require("@subwallet/extension-base/utils/number");
 var _uiKeyring = _interopRequireDefault(require("@subwallet/ui-keyring"));
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _ethereumjsUtil = require("ethereumjs-util");
@@ -100,7 +101,8 @@ class TransactionService {
     const estimateFee = {
       symbol: '',
       decimals: 0,
-      value: ''
+      value: '',
+      tooHigh: false
     };
     const chainInfo = this.state.chainService.getChainInfoByKey(chain);
     if (!chainInfo) {
@@ -121,10 +123,16 @@ class TransactionService {
             if (!web3) {
               validationResponse.errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.CHAIN_DISCONNECTED, undefined));
             } else {
-              const _price = await web3.api.eth.getGasPrice();
-              const gasPrice = (0, _eth.recalculateGasPrice)(_price, chainInfo.slug);
               const gasLimit = await web3.api.eth.estimateGas(transaction);
-              estimateFee.value = (gasLimit * parseInt(gasPrice)).toString();
+              const priority = await (0, _eth.calculateGasFeeParams)(web3, chainInfo.slug);
+              if (priority.baseGasFee) {
+                const priorityFee = priority.baseGasFee.plus(priority.maxPriorityFeePerGas);
+                const maxFee = priority.maxFeePerGas.lte(priorityFee) ? priority.maxFeePerGas : priorityFee;
+                estimateFee.value = maxFee.multipliedBy(gasLimit).toFixed(0);
+              } else {
+                estimateFee.value = new _bignumber.default(priority.gasPrice).multipliedBy(gasLimit).toFixed(0);
+              }
+              estimateFee.tooHigh = priority.busyNetwork;
             }
           }
         } catch (e) {
@@ -529,6 +537,7 @@ class TransactionService {
       case _KoniTypes.ExtrinsicType.MINT_QDOT:
       case _KoniTypes.ExtrinsicType.MINT_LDOT:
       case _KoniTypes.ExtrinsicType.MINT_SDOT:
+      case _KoniTypes.ExtrinsicType.MINT_VMANTA:
 
       // eslint-disable-next-line no-fallthrough
       case _KoniTypes.ExtrinsicType.MINT_VDOT:
@@ -582,12 +591,14 @@ class TransactionService {
           break;
         }
       case _KoniTypes.ExtrinsicType.UNSTAKE_VDOT:
+      case _KoniTypes.ExtrinsicType.UNSTAKE_VMANTA:
       case _KoniTypes.ExtrinsicType.UNSTAKE_LDOT:
       case _KoniTypes.ExtrinsicType.UNSTAKE_SDOT:
       case _KoniTypes.ExtrinsicType.UNSTAKE_STDOT:
       case _KoniTypes.ExtrinsicType.REDEEM_STDOT:
       case _KoniTypes.ExtrinsicType.REDEEM_LDOT:
       case _KoniTypes.ExtrinsicType.REDEEM_SDOT:
+      case _KoniTypes.ExtrinsicType.REDEEM_VMANTA:
 
       // eslint-disable-next-line no-fallthrough
       case _KoniTypes.ExtrinsicType.REDEEM_VDOT:
@@ -703,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);
     }
   }
@@ -850,17 +861,33 @@ class TransactionService {
     this.eventService.emit('transaction.timeout', transaction);
   }
   generateHashPayload(chain, transaction) {
-    var _transaction$nonce;
     const chainInfo = this.state.chainService.getChainInfoByKey(chain);
-    const txObject = {
-      nonce: (_transaction$nonce = transaction.nonce) !== null && _transaction$nonce !== void 0 ? _transaction$nonce : 0,
-      gasPrice: (0, _ethereumjsUtil.addHexPrefix)((0, _eth.anyNumberToBN)(transaction.gasPrice).toString(16)),
-      gasLimit: (0, _ethereumjsUtil.addHexPrefix)((0, _eth.anyNumberToBN)(transaction.gas).toString(16)),
-      to: transaction.to !== undefined ? transaction.to : '',
-      value: (0, _ethereumjsUtil.addHexPrefix)((0, _eth.anyNumberToBN)(transaction.value).toString(16)),
-      data: transaction.data,
-      chainId: (0, _utils._getEvmChainId)(chainInfo)
-    };
+    let txObject;
+    const max = (0, _eth.anyNumberToBN)(transaction.maxFeePerGas);
+    if (max.gt(_number.BN_ZERO)) {
+      var _transaction$nonce;
+      txObject = {
+        nonce: (_transaction$nonce = transaction.nonce) !== null && _transaction$nonce !== void 0 ? _transaction$nonce : 0,
+        maxFeePerGas: (0, _ethereumjsUtil.addHexPrefix)((0, _eth.anyNumberToBN)(transaction.maxFeePerGas).toString(16)),
+        maxPriorityFeePerGas: (0, _ethereumjsUtil.addHexPrefix)((0, _eth.anyNumberToBN)(transaction.maxPriorityFeePerGas).toString(16)),
+        gasLimit: (0, _ethereumjsUtil.addHexPrefix)((0, _eth.anyNumberToBN)(transaction.gas).toString(16)),
+        to: transaction.to !== undefined ? transaction.to : '',
+        value: (0, _ethereumjsUtil.addHexPrefix)((0, _eth.anyNumberToBN)(transaction.value).toString(16)),
+        data: transaction.data,
+        chainId: (0, _utils._getEvmChainId)(chainInfo)
+      };
+    } else {
+      var _transaction$nonce2;
+      txObject = {
+        nonce: (_transaction$nonce2 = transaction.nonce) !== null && _transaction$nonce2 !== void 0 ? _transaction$nonce2 : 0,
+        gasPrice: (0, _ethereumjsUtil.addHexPrefix)((0, _eth.anyNumberToBN)(transaction.gasPrice).toString(16)),
+        gasLimit: (0, _ethereumjsUtil.addHexPrefix)((0, _eth.anyNumberToBN)(transaction.gas).toString(16)),
+        to: transaction.to !== undefined ? transaction.to : '',
+        value: (0, _ethereumjsUtil.addHexPrefix)((0, _eth.anyNumberToBN)(transaction.value).toString(16)),
+        data: transaction.data,
+        chainId: (0, _utils._getEvmChainId)(chainInfo)
+      };
+    }
     return _ethers.ethers.Transaction.from(txObject).unsignedSerialized;
   }
   async signAndSendEvmTransaction(_ref7) {
@@ -926,6 +953,8 @@ class TransactionService {
       nonce: (_payload$nonce = payload.nonce) !== null && _payload$nonce !== void 0 ? _payload$nonce : 0,
       from: payload.from,
       gasPrice: (0, _eth.anyNumberToBN)(payload.gasPrice).toNumber(),
+      maxFeePerGas: (0, _eth.anyNumberToBN)(payload.maxFeePerGas).toNumber(),
+      maxPriorityFeePerGas: (0, _eth.anyNumberToBN)(payload.maxPriorityFeePerGas).toNumber(),
       gasLimit: (0, _eth.anyNumberToBN)(payload.gas).toNumber(),
       to: payload.to !== undefined ? payload.to : '',
       value: (0, _eth.anyNumberToBN)(payload.value).toNumber(),

package/cjs/signers/web3/QrSigner.js

@@ -33,6 +33,8 @@ class QrSigner {
       const txObject = {
         nonce: (_tx$nonce = tx.nonce) !== null && _tx$nonce !== void 0 ? _tx$nonce : 0,
         gasPrice: (0, _ethereumjsUtil.addHexPrefix)(tx.gasPrice.toString(16)),
+        maxPriorityFeePerGas: (0, _ethereumjsUtil.addHexPrefix)(tx.maxPriorityFeePerGas.toString(16)),
+        maxFeePerGas: (0, _ethereumjsUtil.addHexPrefix)(tx.maxFeePerGas.toString(16)),
         gasLimit: (0, _ethereumjsUtil.addHexPrefix)(tx.gasLimit.toString(16)),
         to: tx.to !== undefined ? tx.to : '',
         value: (0, _ethereumjsUtil.addHexPrefix)(tx.value.toString(16)),

package/cjs/types/yield/actions/join/step.js

@@ -39,6 +39,7 @@ exports.YieldStepType = YieldStepType;
   YieldStepType["NOMINATE"] = "NOMINATE";
   YieldStepType["JOIN_NOMINATION_POOL"] = "JOIN_NOMINATION_POOL";
   YieldStepType["MINT_VDOT"] = "MINT_VDOT";
+  YieldStepType["MINT_VMANTA"] = "MINT_VMANTA";
   YieldStepType["MINT_LDOT"] = "MINT_LDOT";
   YieldStepType["MINT_QDOT"] = "MINT_QDOT";
   YieldStepType["MINT_SDOT"] = "MINT_SDOT";

package/cjs/utils/eth/mergeTransactionAndSignature.js

@@ -16,16 +16,31 @@ const mergeTransactionAndSignature = (tx, _rawSignature) => {
     s: `0x${_signature.substring(64, 128)}`,
     v: parseInt(`0x${_signature.substring(128)}`)
   };
-  const transaction = {
-    nonce: tx.nonce,
-    gasPrice: (0, _ethereumjsUtil.addHexPrefix)(tx.gasPrice.toString(16)),
-    gasLimit: (0, _ethereumjsUtil.addHexPrefix)(tx.gasLimit.toString(16)),
-    to: tx.to,
-    value: (0, _ethereumjsUtil.addHexPrefix)(tx.value.toString(16)),
-    data: tx.data,
-    chainId: tx.chainId,
-    signature: signature
-  };
+  let transaction;
+  if (tx.maxFeePerGas) {
+    transaction = {
+      nonce: tx.nonce,
+      maxFeePerGas: (0, _ethereumjsUtil.addHexPrefix)(tx.maxFeePerGas.toString(16)),
+      maxPriorityFeePerGas: (0, _ethereumjsUtil.addHexPrefix)(tx.maxPriorityFeePerGas.toString(16)),
+      gasLimit: (0, _ethereumjsUtil.addHexPrefix)(tx.gasLimit.toString(16)),
+      to: tx.to,
+      value: (0, _ethereumjsUtil.addHexPrefix)(tx.value.toString(16)),
+      data: tx.data,
+      chainId: tx.chainId,
+      signature: signature
+    };
+  } else {
+    transaction = {
+      nonce: tx.nonce,
+      gasPrice: (0, _ethereumjsUtil.addHexPrefix)(tx.gasPrice.toString(16)),
+      gasLimit: (0, _ethereumjsUtil.addHexPrefix)(tx.gasLimit.toString(16)),
+      to: tx.to,
+      value: (0, _ethereumjsUtil.addHexPrefix)(tx.value.toString(16)),
+      data: tx.data,
+      chainId: tx.chainId,
+      signature: signature
+    };
+  }
   return _ethers.ethers.Transaction.from(transaction).serialized;
 };
 exports.mergeTransactionAndSignature = mergeTransactionAndSignature;

package/cjs/utils/eth.js

@@ -4,11 +4,12 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.signatureToHex = exports.recalculateGasPrice = exports.createTransactionFromRLP = exports.anyNumberToBN = exports.Transaction = void 0;
+exports.signatureToHex = exports.recalculateGasPrice = exports.createTransactionFromRLP = exports.calculateGasFeeParams = exports.anyNumberToBN = exports.Transaction = void 0;
 var _constants = require("@subwallet/extension-base/constants");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _ethers = require("ethers");
 var _util = require("@polkadot/util");
+var _number = require("./number");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -75,4 +76,61 @@ const recalculateGasPrice = (_price, chain) => {
   const needMulti = _constants.NETWORK_MULTI_GAS_FEE.includes(chain) || _constants.NETWORK_MULTI_GAS_FEE.includes('*');
   return needMulti ? new _bignumber.default(_price).multipliedBy(_constants.GAS_PRICE_RATIO).toFixed(0) : _price;
 };
-exports.recalculateGasPrice = recalculateGasPrice;
+exports.recalculateGasPrice = recalculateGasPrice;
+const calculateGasFeeParams = async (web3, networkKey) => {
+  try {
+    const numBlock = 20;
+    const history = await web3.api.eth.getFeeHistory(numBlock, 'latest', [0, 25, 50, 75, 100]);
+    const baseGasFee = new _bignumber.default(history.baseFeePerGas[history.baseFeePerGas.length - 1]); // Last element is latest
+
+    const blocksBusy = history.reward.reduce((previous, rewards, currentIndex) => {
+      const [priority] = rewards;
+      const base = history.baseFeePerGas[currentIndex];
+      const priorityBN = new _bignumber.default(priority);
+      const baseBN = new _bignumber.default(base);
+      const blockIsBusy = priorityBN.dividedBy(baseBN).gte(0.3) ? 1 : 0; // True if priority >= 0.5 * base
+
+      return previous + blockIsBusy;
+    }, 0);
+    const busyNetwork = blocksBusy >= numBlock / 2; // True if half of block is busy
+
+    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
+
+        return current.gte(previous) ? current : previous; // get max priority
+      } else {
+        const current = firstBN;
+        return current.lte(previous) ? current : previous; // get min priority
+      }
+    }, _number.BN_ZERO);
+    const maxFeePerGas = baseGasFee.plus(maxPriorityFeePerGas).multipliedBy(busyNetwork ? 2 : 1.5).decimalPlaces(0); // Max gas =(base + priority) * 1.5(if not busy or 2 when busy);
+
+    return {
+      maxFeePerGas,
+      maxPriorityFeePerGas,
+      baseGasFee,
+      busyNetwork
+    };
+  } catch (e) {
+    const _price = await web3.api.eth.getGasPrice();
+    const gasPrice = recalculateGasPrice(_price, networkKey);
+    return {
+      gasPrice,
+      busyNetwork: false
+    };
+  }
+};
+exports.calculateGasFeeParams = calculateGasFeeParams;

package/cjs/utils/number.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.toBNString = exports.formatNumber = exports.balanceFormatter = exports.PREDEFINED_FORMATTER = exports.BN_ZERO = exports.BN_TEN = void 0;
+exports.toBNString = exports.formatNumber = exports.balanceFormatter = exports.PREDEFINED_FORMATTER = exports.BN_ZERO = exports.BN_WEI = exports.BN_TEN = exports.BN_ONE = void 0;
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -13,6 +13,10 @@ const BN_ZERO = new _bignumber.default(0);
 exports.BN_ZERO = BN_ZERO;
 const BN_TEN = new _bignumber.default(10);
 exports.BN_TEN = BN_TEN;
+const BN_ONE = new _bignumber.default(1);
+exports.BN_ONE = BN_ONE;
+const BN_WEI = BN_TEN.pow(9);
+exports.BN_WEI = BN_WEI;
 // Clear zero from end, use with decimal only
 const clearZero = result => {
   let index = result.length - 1;

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/koni/api/staking/bonding/utils.d.ts

@@ -3,7 +3,9 @@ import { _ChainInfo } from '@subwallet/chain-list/types';
 import { NominationInfo, NominatorMetadata, StakingType, UnstakingInfo } from '@subwallet/extension-base/background/KoniTypes';
 import { _SubstrateInflationParams } from '@subwallet/extension-base/services/chain-service/constants';
 import { EarningStatus, YieldPoolInfo, YieldPositionInfo } from '@subwallet/extension-base/types';
+import BigNumber from 'bignumber.js';
 import { ApiPromise } from '@polkadot/api';
+import { Codec } from '@polkadot/types/types';
 import { BN } from '@polkadot/util';
 export interface PalletDappsStakingDappInfo {
     address: string;
@@ -97,6 +99,7 @@ export declare function calcInflationUniformEraPayout(totalIssuance: BN, yearlyI
 export declare function calcInflationRewardCurve(minInflation: number, stakedFraction: number, idealStake: number, idealInterest: number, falloff: number): number;
 export declare function calculateInflation(totalEraStake: BN, totalIssuance: BN, numAuctions: number, networkKey: string): number;
 export declare function calculateChainStakedReturn(inflation: number, totalEraStake: BN, totalIssuance: BN, networkKey: string): number;
+export declare function calculateChainStakedReturnV2(chainInfo: _ChainInfo, totalIssuance: string, erasPerDay: number, lastTotalStaked: string, validatorEraReward: BigNumber, isCompound?: boolean): number;
 export declare function calculateAlephZeroValidatorReturn(chainStakedReturn: number, commission: number): number;
 export declare function calculateTernoaValidatorReturn(rewardPerValidator: number, validatorStake: number, commission: number): number;
 export declare function calculateValidatorStakedReturn(chainStakedReturn: number, totalValidatorStake: BN, avgStake: BN, commission: number): number;
@@ -154,6 +157,8 @@ export declare function isActionFromValidator(stakingType: StakingType, chain: s
 export declare function getWithdrawalInfo(nominatorMetadata: NominatorMetadata): UnstakingInfo | undefined;
 export declare function getEarningStatusByNominations(bnTotalActiveStake: BN, nominationList: NominationInfo[]): EarningStatus;
 export declare function getValidatorLabel(chain: string): "dApp" | "Validator" | "Collator";
+export declare function getAvgValidatorEraReward(supportedDays: number, eraRewardHistory: Codec[]): BigNumber;
+export declare function getSupportedDaysByHistoryDepth(erasPerDay: number, maxSupportedEras: number): 15 | 30;
 export declare const getMinStakeErrorMessage: (chainInfo: _ChainInfo, bnMinStake: BN) => string;
 export declare const getMaxValidatorErrorMessage: (chainInfo: _ChainInfo, max: number) => string;
 export declare const getExistUnstakeErrorMessage: (chain: string, type?: StakingType, isStakeMore?: boolean) => string;

package/koni/api/staking/bonding/utils.js

@@ -9,6 +9,7 @@ import { _STAKING_CHAIN_GROUP } from '@subwallet/extension-base/services/earning
 import { EarningStatus, UnstakingStatus, YieldPoolType } from '@subwallet/extension-base/types';
 import { detectTranslate, parseRawNumber, reformatAddress } from '@subwallet/extension-base/utils';
 import { balanceFormatter, formatNumber } from '@subwallet/extension-base/utils/number';
+import BigNumber from 'bignumber.js';
 import { t } from 'i18next';
 import { BN, BN_BILLION, BN_HUNDRED, BN_MILLION, BN_THOUSAND, BN_ZERO, bnToU8a, stringToU8a, u8aConcat } from '@polkadot/util';
 export let PalletParachainStakingRequestType;
@@ -71,6 +72,24 @@ export function calculateChainStakedReturn(inflation, totalEraStake, totalIssuan
 
   return stakedReturn;
 }
+export function calculateChainStakedReturnV2(chainInfo, totalIssuance, erasPerDay, lastTotalStaked, validatorEraReward, isCompound) {
+  const DAYS_PER_YEAR = 365;
+  // @ts-ignore
+  const DECIMAL = chainInfo.substrateInfo.decimals;
+  const lastTotalStakedUnit = new BigNumber(lastTotalStaked).dividedBy(new BigNumber(10 ** DECIMAL));
+  const totalIssuanceUnit = new BigNumber(totalIssuance).dividedBy(new BigNumber(10 ** DECIMAL));
+  const supplyStaked = lastTotalStakedUnit.dividedBy(totalIssuanceUnit);
+  const dayRewardRate = validatorEraReward.multipliedBy(erasPerDay).dividedBy(totalIssuance).multipliedBy(100);
+  let inflationToStakers = new BigNumber(0);
+  if (!isCompound) {
+    inflationToStakers = dayRewardRate.multipliedBy(DAYS_PER_YEAR);
+  } else {
+    const multiplier = dayRewardRate.dividedBy(100).plus(1).exponentiatedBy(365);
+    inflationToStakers = new BigNumber(100).multipliedBy(multiplier).minus(100);
+  }
+  const averageRewardRate = inflationToStakers.dividedBy(supplyStaked);
+  return averageRewardRate.toNumber();
+}
 export function calculateAlephZeroValidatorReturn(chainStakedReturn, commission) {
   return chainStakedReturn * (100 - commission) / 100;
 }
@@ -310,6 +329,27 @@ export function getValidatorLabel(chain) {
   }
   return 'Collator';
 }
+export function getAvgValidatorEraReward(supportedDays, eraRewardHistory) {
+  let sumEraReward = new BigNumber(0);
+  let failEra = 0;
+  for (const _item of eraRewardHistory) {
+    const item = _item.toString();
+    if (!item) {
+      failEra += 1;
+    } else {
+      const eraReward = new BigNumber(item);
+      sumEraReward = sumEraReward.plus(eraReward);
+    }
+  }
+  return sumEraReward.dividedBy(new BigNumber(supportedDays - failEra));
+}
+export function getSupportedDaysByHistoryDepth(erasPerDay, maxSupportedEras) {
+  if (maxSupportedEras / erasPerDay > 30) {
+    return 30;
+  } else {
+    return 15;
+  }
+}
 export const getMinStakeErrorMessage = (chainInfo, bnMinStake) => {
   const tokenInfo = _getChainNativeTokenBasicInfo(chainInfo);
   const number = formatNumber(bnMinStake.toString(), tokenInfo.decimals || 0, balanceFormatter);