@subwallet/extension-base 1.3.8-0 → 1.3.10-0

package/services/balance-service/index.js

@@ -13,6 +13,7 @@ import { addLazy, createPromiseHandler, isAccountAll, waitTimeout } from '@subwa
 import { getKeypairTypeByAddress } from '@subwallet/keyring';
 import { EthereumKeypairTypes, SubstrateKeypairTypes } from '@subwallet/keyring/types';
 import keyring from '@subwallet/ui-keyring';
+import BigN from 'bignumber.js';
 import { t } from 'i18next';
 import { BehaviorSubject } from 'rxjs';
 import { noop } from '@polkadot/util';
@@ -164,7 +165,7 @@ export class BalanceService {
   }
 
   /** Subscribe token free balance of an address on chain */
-  async subscribeTransferableBalance(address, chain, tokenSlug, extrinsicType, callback) {
+  async subscribeBalance(address, chain, tokenSlug, balanceType = 'transferable', extrinsicType, callback) {
     const chainInfo = this.state.chainService.getChainInfoByKey(chain);
     const chainState = this.state.chainService.getChainStateByKey(chain);
     if (!chainInfo || !chainState || !chainState.active) {
@@ -193,10 +194,18 @@ export class BalanceService {
       let unsub = noop;
       unsub = subscribeBalance([address], [chain], [tSlug], assetMap, chainInfoMap, substrateApiMap, evmApiMap, tonApiMap, result => {
         const rs = result[0];
+        let value;
+        switch (balanceType) {
+          case 'total':
+            value = new BigN(rs.free).plus(new BigN(rs.locked)).toFixed();
+            break;
+          default:
+            value = rs.free;
+        }
         if (rs.tokenSlug === tSlug && rs.state !== APIItemState.PENDING) {
           hasError = false;
           const balance = {
-            value: rs.free,
+            value,
             decimals: tokenInfo.decimals || 0,
             symbol: tokenInfo.symbol,
             metadata: rs.metadata
@@ -220,6 +229,12 @@ export class BalanceService {
       }, 9999);
     });
   }
+  async subscribeTransferableBalance(address, chain, tokenSlug, extrinsicType, callback) {
+    return this.subscribeBalance(address, chain, tokenSlug, 'transferable', extrinsicType, callback);
+  }
+  async subscribeTotalBalance(address, chain, tokenSlug, extrinsicType, callback) {
+    return this.subscribeBalance(address, chain, tokenSlug, 'total', extrinsicType, callback);
+  }
 
   /**
    * @public
@@ -236,6 +251,10 @@ export class BalanceService {
     const [, balance] = await this.subscribeTransferableBalance(address, chain, tokenSlug, extrinsicType);
     return balance;
   }
+  async getTotalBalance(address, chain, tokenSlug, extrinsicType) {
+    const [, balance] = await this.subscribeTotalBalance(address, chain, tokenSlug, extrinsicType);
+    return balance;
+  }
 
   /** Remove balance from the subject object by addresses */
   removeBalanceByAddresses(addresses) {

package/services/balance-service/transfer/smart-contract.js

@@ -8,6 +8,7 @@ import { getWasmContractGasLimit } from '@subwallet/extension-base/koni/api/cont
 import { EVM_REFORMAT_DECIMALS } from '@subwallet/extension-base/services/chain-service/constants';
 import { calculateGasFeeParams } from '@subwallet/extension-base/services/fee-service/utils';
 import BigN from 'bignumber.js';
+import { t } from 'i18next';
 export async function getEVMTransactionObject(chainInfo, from, to, value, transferAll, web3Api) {
   var _priority$maxFeePerGa, _priority$maxPriority;
   const networkKey = chainInfo.slug;
@@ -78,11 +79,21 @@ export async function getERC721Transaction(web3Api, chain, contractAddress, send
   var _priority$maxFeePerGa3, _priority$maxPriority3;
   // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
   const contract = new web3Api.api.eth.Contract(_ERC721_ABI, contractAddress);
-  const [gasLimit, priority] = await Promise.all([
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
-  contract.methods.safeTransferFrom(senderAddress, recipientAddress, tokenId).estimateGas({
-    from: senderAddress
-  }), calculateGasFeeParams(web3Api, chain)]);
+  let gasLimit;
+  let priority;
+  try {
+    [gasLimit, priority] = await Promise.all([
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
+    contract.methods.safeTransferFrom(senderAddress, recipientAddress, tokenId).estimateGas({
+      from: senderAddress
+    }), calculateGasFeeParams(web3Api, chain)]);
+  } catch (e) {
+    const error = e;
+    if (error.message.includes('transfer to non ERC721Receiver implementer')) {
+      error.message = t('Unable to send. NFT not supported on recipient address');
+    }
+    throw error;
+  }
   return {
     from: senderAddress,
     gasPrice: priority.gasPrice,

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

@@ -82,6 +82,7 @@ export declare const _XCM_CHAIN_GROUP: {
     polkadotXcmSpecialCases: string[];
     xcmPallet: string[];
 };
+export declare const SUFFICIENT_CHAIN: string[];
 export declare const _XCM_TYPE: {
     RP: string;
     PP: string;

package/services/chain-service/constants.js

@@ -245,12 +245,12 @@ export const _TRANSFER_CHAIN_GROUP = {
   kintsugi: ['kintsugi', 'kintsugi_test', 'interlay', 'mangatax_para'],
   genshiro: ['genshiro_testnet', 'genshiro', 'equilibrium_parachain'],
   // crab: ['crab', 'pangolin'],
-  bitcountry: ['pioneer', 'bitcountry', 'bifrost', 'bifrost_dot'],
+  bitcountry: ['pioneer', 'bitcountry'],
   statemine: ['statemint', 'statemine', 'darwinia2', 'astar', 'shiden', 'shibuya', 'parallel', 'liberland', 'liberlandTest', 'dentnet', 'dbcchain'],
   riochain: ['riochain'],
   sora_substrate: ['sora_substrate'],
   avail: ['kate', 'goldberg_testnet'],
-  pendulum: ['pendulum', 'amplitude', 'amplitude_test', 'hydradx_main'],
+  pendulum: ['pendulum', 'amplitude', 'amplitude_test', 'hydradx_main', 'bifrost', 'bifrost_dot'],
   centrifuge: ['centrifuge'],
   disable_transfer: ['invarch', 'crab', 'pangolin']
 };
@@ -270,6 +270,7 @@ export const _XCM_CHAIN_GROUP = {
   // default is xTokens pallet
 };
 
+export const SUFFICIENT_CHAIN = ['astar', 'calamari', 'parallel', 'darwinia2', 'crabParachain', 'pangolin', 'statemint', 'moonriver', 'shiden', 'moonbeam', 'statemine', 'liberland', 'dentnet', 'phala', 'crust', 'dbcchain', 'rococo_assethub'];
 export const _XCM_TYPE = {
   RP: `${_SubstrateChainType.RELAYCHAIN}-${_SubstrateChainType.PARACHAIN}`,
   // DMP

package/services/chain-service/health-check/utils/new-utils/asset-asset-validate.js

@@ -66,7 +66,7 @@ export function validateNativeLocalTransferMetadata(chainAsset) {
     throw new Error(`Asset ${chainAsset.slug} is lack of metadata`);
   }
   const moonbeamGroup = ['moonbeam, moonbase, moonriver'];
-  const onChainInfoLocalGroup = [_TRANSFER_CHAIN_GROUP.centrifuge, ..._TRANSFER_CHAIN_GROUP.bitcountry, ..._TRANSFER_CHAIN_GROUP.acala, ..._TRANSFER_CHAIN_GROUP.kintsugi, 'pendulum', 'amplitude'];
+  const onChainInfoLocalGroup = [_TRANSFER_CHAIN_GROUP.centrifuge, ..._TRANSFER_CHAIN_GROUP.bitcountry, ..._TRANSFER_CHAIN_GROUP.acala, ..._TRANSFER_CHAIN_GROUP.kintsugi, 'pendulum', 'amplitude', 'bifrost', 'bifrost_dot'];
   const onChainInfoNativeGroup = [_TRANSFER_CHAIN_GROUP.centrifuge, ..._TRANSFER_CHAIN_GROUP.acala, ..._TRANSFER_CHAIN_GROUP.kintsugi];
   const assetIdLocalGroup = [..._TRANSFER_CHAIN_GROUP.statemine, ..._TRANSFER_CHAIN_GROUP.genshiro, ...moonbeamGroup, 'hydradx'];
   const assetIdNativeGroup = [..._TRANSFER_CHAIN_GROUP.sora_substrate, 'hydradx'];

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

@@ -1,3 +1,4 @@
+/// <reference types="bn.js" />
 import { _ChainInfo } from '@subwallet/chain-list/types';
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { ExtrinsicType, NominationInfo, UnstakingInfo } from '@subwallet/extension-base/background/KoniTypes';

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

@@ -1,3 +1,4 @@
+/// <reference types="bn.js" />
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import KoniState from '@subwallet/extension-base/koni/background/handlers/State';

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

@@ -1,3 +1,4 @@
+/// <reference types="bn.js" />
 import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import { LendingYieldPoolInfo, LiquidYieldPoolInfo, NativeYieldPoolInfo, NominationYieldPoolInfo, YieldAssetExpectedEarning, YieldCompoundingPeriod, YieldPoolInfo, YieldPoolType } from '@subwallet/extension-base/types';
 import { BN } from '@polkadot/util';

package/services/swap-service/handler/asset-hub/utils.js

@@ -7,6 +7,7 @@ import BigN from 'bignumber.js';
 export const _getPoolInfo = async (api, asset1, asset2) => {
   const assetLocation1 = _getXcmAssetMultilocation(asset1);
   const assetLocation2 = _getXcmAssetMultilocation(asset2);
+  // @ts-ignore - Type auto detect incorrect
   const rs = await api.call.assetConversionApi.getReserves(assetLocation1, assetLocation2);
   if (!rs) {
     return ['0', '0'];

package/types/balance/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="bn.js" />
 import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
 import { _BalanceMetadata, APIItemState, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { _EvmApi, _SubstrateApi, _TonApi } from '@subwallet/extension-base/services/chain-service/types';

package/types/transaction/error.d.ts

@@ -34,6 +34,7 @@ export declare enum TransferTxErrorType {
     NOT_ENOUGH_FEE = "NOT_ENOUGH_FEE",
     INVALID_TOKEN = "INVALID_TOKEN",
     TRANSFER_ERROR = "TRANSFER_ERROR",
-    RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT = "RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT"
+    RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT = "RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT",
+    RECEIVER_ACCOUNT_INACTIVE = "RECEIVER_ACCOUNT_INACTIVE"
 }
 export declare type TransactionErrorType = BasicTxErrorType | TransferTxErrorType | StakingTxErrorType | YieldValidationStatus | SwapErrorType;

package/types/transaction/error.js

@@ -41,4 +41,5 @@ export let TransferTxErrorType;
   TransferTxErrorType["INVALID_TOKEN"] = "INVALID_TOKEN";
   TransferTxErrorType["TRANSFER_ERROR"] = "TRANSFER_ERROR";
   TransferTxErrorType["RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT"] = "RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT";
+  TransferTxErrorType["RECEIVER_ACCOUNT_INACTIVE"] = "RECEIVER_ACCOUNT_INACTIVE";
 })(TransferTxErrorType || (TransferTxErrorType = {}));

package/types/yield/info/pallet.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="bn.js" />
 import { BN } from '@polkadot/util';
 export interface PalletStakingExposureItem {
     who: string;

package/utils/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="bn.js" />
 import { _ChainInfo } from '@subwallet/chain-list/types';
 import { CrowdloanParaState, NetworkJson } from '@subwallet/extension-base/background/KoniTypes';
 import { AccountAuthType } from '@subwallet/extension-base/background/types';