@subwallet/extension-base 1.3.54-1 → 1.3.55-0

package/cjs/koni/background/handlers/Extension.js

@@ -151,7 +151,7 @@ class KoniExtension {
       id
     } = _ref2;
     const queued = this.#koniState.getMetaRequest(id);
-    (0, _util.assert)(queued, (0, _i18next.t)('Unable to proceed. Please try again'));
+    (0, _util.assert)(queued, (0, _i18next.t)('bg.koni.handler.Extension.unableToProceed'));
     const {
       request,
       resolve
@@ -171,7 +171,7 @@ class KoniExtension {
       id
     } = _ref3;
     const queued = this.#koniState.getMetaRequest(id);
-    (0, _util.assert)(queued, (0, _i18next.t)('Unable to proceed. Please try again'));
+    (0, _util.assert)(queued, (0, _i18next.t)('bg.koni.handler.Extension.unableToProceed'));
     const {
       reject
     } = queued;
@@ -196,7 +196,7 @@ class KoniExtension {
       signedTransaction
     } = _ref4;
     const queued = this.#koniState.getSignRequest(id);
-    (0, _util.assert)(queued, (0, _i18next.t)('Unable to proceed. Please try again'));
+    (0, _util.assert)(queued, (0, _i18next.t)('bg.koni.handler.Extension.unableToProceed'));
     const {
       resolve
     } = queued;
@@ -214,7 +214,7 @@ class KoniExtension {
       id
     } = _ref5;
     const queued = this.#koniState.getSignRequest(id);
-    (0, _util.assert)(queued, (0, _i18next.t)('Unable to proceed. Please try again'));
+    (0, _util.assert)(queued, (0, _i18next.t)('bg.koni.handler.Extension.unableToProceed'));
     const {
       reject
     } = queued;
@@ -446,7 +446,7 @@ class KoniExtension {
         };
       }
     } else {
-      throw Error((0, _i18next.t)('This is not an address'));
+      throw Error((0, _i18next.t)('bg.koni.handler.Extension.thisIsNotAnAddress'));
     }
   }
 
@@ -463,7 +463,7 @@ class KoniExtension {
       _uiKeyring.keyring.saveAddress(_address, meta);
       return true;
     } else {
-      throw Error((0, _i18next.t)('This is not an address'));
+      throw Error((0, _i18next.t)('bg.koni.handler.Extension.thisIsNotAnAddress'));
     }
   }
 
@@ -479,7 +479,7 @@ class KoniExtension {
       _uiKeyring.keyring.forgetAddress(_address);
       return true;
     } else {
-      throw Error((0, _i18next.t)('This is not an address'));
+      throw Error((0, _i18next.t)('bg.koni.handler.Extension.thisIsNotAnAddress'));
     }
   }
   _getAuthListV2() {
@@ -528,7 +528,7 @@ class KoniExtension {
       id
     } = _ref12;
     const queued = this.#koniState.getAuthRequestV2(id);
-    (0, _util.assert)(queued, (0, _i18next.t)('Unable to proceed. Please try again'));
+    (0, _util.assert)(queued, (0, _i18next.t)('bg.koni.handler.Extension.unableToProceed'));
     const {
       resolve
     } = queued;
@@ -543,7 +543,7 @@ class KoniExtension {
       id
     } = _ref13;
     const queued = this.#koniState.getAuthRequestV2(id);
-    (0, _util.assert)(queued, (0, _i18next.t)('Unable to proceed. Please try again'));
+    (0, _util.assert)(queued, (0, _i18next.t)('bg.koni.handler.Extension.unableToProceed'));
     const {
       reject
     } = queued;
@@ -555,7 +555,7 @@ class KoniExtension {
       id
     } = _ref14;
     const queued = this.#koniState.getAuthRequestV2(id);
-    (0, _util.assert)(queued, (0, _i18next.t)('Unable to proceed. Please try again'));
+    (0, _util.assert)(queued, (0, _i18next.t)('bg.koni.handler.Extension.unableToProceed'));
     const {
       reject
     } = queued;
@@ -733,7 +733,7 @@ class KoniExtension {
     };
     const typeInfoKey = typeInfoMap[authSwitchNetworkType];
     if (!typeInfoKey || !chainInfo[typeInfoKey]) {
-      throw new Error((0, _i18next.t)('Network {{networkKey}} is not {{authSwitchNetworkType}}', {
+      throw new Error((0, _i18next.t)('bg.koni.handler.Extension.networkNotAuthType', {
         replace: {
           networkKey,
           authSwitchNetworkType
@@ -742,7 +742,7 @@ class KoniExtension {
     }
     const authUrl = authUrls[url];
     if (!authUrl) {
-      throw new Error((0, _i18next.t)('Not found {{url}} in auth list', {
+      throw new Error((0, _i18next.t)('bg.koni.handler.Extension.urlNotFoundInAuthList', {
         replace: {
           url
         }
@@ -755,7 +755,7 @@ class KoniExtension {
       });
     }
     if (!authUrl.accountAuthTypes.includes(authSwitchNetworkType)) {
-      throw new Error((0, _i18next.t)('Network {{networkKey}} is not supported by {{authSwitchNetworkType}}', {
+      throw new Error((0, _i18next.t)('bg.koni.handler.Extension.networkNotSupportedByAuthType', {
         replace: {
           networkKey,
           authSwitchNetworkType
@@ -1450,7 +1450,7 @@ class KoniExtension {
     } catch (e) {
       const error = e;
       if (error.message.includes('transfer amount exceeds balance')) {
-        error.message = (0, _i18next.t)('Insufficient balance');
+        error.message = (0, _i18next.t)('bg.koni.handler.Extension.insufficientBalance');
       }
       throw error;
     }
@@ -1806,7 +1806,7 @@ class KoniExtension {
     } catch (e) {
       const error = e;
       if (error.message.includes('transfer amount exceeds balance')) {
-        error.message = (0, _i18next.t)('Insufficient balance');
+        error.message = (0, _i18next.t)('bg.koni.handler.Extension.insufficientBalance');
       }
       throw error;
     }
@@ -1904,7 +1904,7 @@ class KoniExtension {
       token: tokenSlug
     });
     if (new _bignumber.default(freeBalance.value).lt(inputAmount)) {
-      throw new Error((0, _i18next.t)('Insufficient balance'));
+      throw new Error((0, _i18next.t)('bg.koni.handler.Extension.insufficientBalance'));
     }
     const transferNativeAmount = isTransferNativeToken ? transferAmount.value : '0';
     return this.#koniState.transactionService.handleTransactionAfterConfirmation({
@@ -2172,6 +2172,7 @@ class KoniExtension {
       to,
       token,
       tokenPayFeeSlug,
+      transferAll,
       value
     } = request;
     const cb = (0, _subscriptions.createSubscription)(id, port);
@@ -2208,7 +2209,8 @@ class KoniExtension {
       bitcoinApi: this.#koniState.chainService.getBitcoinApi(chain),
       isTransferLocalTokenAndPayThatTokenAsFee,
       isTransferNativeTokenAndPayLocalTokenAsFee,
-      nativeToken
+      nativeToken,
+      transferAll: transferAll
     };
     const subscription = (0, _rxjs.combineLatest)({
       freeBalance: freeBalanceSubject,
@@ -2613,7 +2615,7 @@ class KoniExtension {
       networkKey
     } = _ref47;
     const pair = _uiKeyring.keyring.getPair(address);
-    (0, _util.assert)(pair, (0, _i18next.t)('Unable to find account'));
+    (0, _util.assert)(pair, (0, _i18next.t)('bg.koni.handler.Extension.unableToFindAccount'));
     if (pair.isLocked) {
       _uiKeyring.keyring.unlockPair(pair.address);
     }
@@ -2638,11 +2640,11 @@ class KoniExtension {
     let signed;
     const network = this.getNetworkJsonByChainId(chainId);
     if (!network) {
-      throw new Error((0, _i18next.t)('Cannot find network'));
+      throw new Error((0, _i18next.t)('bg.koni.handler.Extension.cannotFindNetwork'));
     }
     const pair = _uiKeyring.keyring.getPair(address);
     if (!pair) {
-      throw Error((0, _i18next.t)('Unable to find account'));
+      throw Error((0, _i18next.t)('bg.koni.handler.Extension.unableToFindAccount'));
     }
     if (pair.isLocked) {
       _uiKeyring.keyring.unlockPair(pair.address);
@@ -2659,7 +2661,7 @@ class KoniExtension {
       var _signedTranaction$r, _signedTranaction$s, _signedTranaction$v;
       const tx = (0, _utils8.createTransactionFromRLP)(message);
       if (!tx) {
-        throw new Error((0, _i18next.t)('Failed to decode data. Please use a valid QR code'));
+        throw new Error((0, _i18next.t)('bg.koni.handler.Extension.failedToDecodeQr'));
       }
       const txObject = {
         gasPrice: new _bignumber.default(tx.gasPrice).toNumber(),
@@ -2749,7 +2751,7 @@ class KoniExtension {
     const chainInfo = this.#koniState.getChainInfo(chain);
     const chainStakingMetadata = await this.#koniState.getStakingMetadataByChain(chain, _KoniTypes.StakingType.NOMINATED);
     if (!chainStakingMetadata) {
-      const errMessage = (0, _i18next.t)('Unable to fetch staking data. Re-enable "{{chainName}}" and try again.', {
+      const errMessage = (0, _i18next.t)('bg.koni.handler.Extension.unableToFetchStakingDataReEnable', {
         replace: {
           chainName: chainInfo.name
         }
@@ -2856,7 +2858,7 @@ class KoniExtension {
     const chainInfo = this.#koniState.getChainInfo(chain);
     const chainStakingMetadata = await this.#koniState.getStakingMetadataByChain(chain, _KoniTypes.StakingType.NOMINATED);
     if (!chainStakingMetadata) {
-      const errMessage = (0, _i18next.t)('Unable to fetch staking data. Re-enable "{{chainName}}" and try again.', {
+      const errMessage = (0, _i18next.t)('bg.koni.handler.Extension.unableToFetchStakingDataReEnable', {
         replace: {
           chainName: chainInfo.name
         }
@@ -2888,7 +2890,7 @@ class KoniExtension {
     const chainStakingMetadata = await this.#koniState.getStakingMetadataByChain(chain, _KoniTypes.StakingType.NOMINATED);
     if (!chainStakingMetadata || !nominatorMetadata) {
       const chainInfo = this.#koniState.getChainInfo(chain);
-      const errMessage = (0, _i18next.t)('Unable to fetch staking data. Re-enable "{{chainName}}" and try again.', {
+      const errMessage = (0, _i18next.t)('bg.koni.handler.Extension.unableToFetchStakingDataReEnable', {
         replace: {
           chainName: chainInfo === null || chainInfo === void 0 ? void 0 : chainInfo.name
         }
@@ -3089,7 +3091,7 @@ class KoniExtension {
       id
     } = _ref54;
     const queued = this.#koniState.getSignRequest(id);
-    (0, _util.assert)(queued, (0, _i18next.t)('Unable to proceed. Please try again'));
+    (0, _util.assert)(queued, (0, _i18next.t)('bg.koni.handler.Extension.unableToProceed'));
     const {
       reject,
       request,
@@ -3104,7 +3106,7 @@ class KoniExtension {
       address
     } = pair;
     if (!pair) {
-      reject(new Error((0, _i18next.t)('Unable to find account')));
+      reject(new Error((0, _i18next.t)('bg.koni.handler.Extension.unableToFindAccount')));
       return false;
     }
     if (pair.isLocked) {

package/cjs/koni/background/handlers/State.js

@@ -456,7 +456,7 @@ class KoniState {
       authUrls[shortenUrl].currentNetworkMap.evm = networkKey;
       this.setAuthorize(authUrls);
     } else {
-      throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INTERNAL_ERROR, (0, _i18next.t)('Not found {{shortenUrl}} in auth list', {
+      throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INTERNAL_ERROR, (0, _i18next.t)('bg.koni.handler.State.shortUrlNotFoundInAuthList', {
         replace: {
           shortenUrl
         }
@@ -480,6 +480,11 @@ class KoniState {
       }
     });
   }
+  async showUnsupportedNetworkSwitchConfirm(id, url, networkData) {
+    return this.requestService.addConfirmation(id, url, 'addNetworkRequest', networkData).then(() => {
+      throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.NETWORK_NOT_SUPPORTED, 'This network is currently not supported');
+    });
+  }
   async addTokenConfirm(id, url, tokenInfo) {
     return this.requestService.addConfirmation(id, url, 'addTokenRequest', tokenInfo).then(async _ref3 => {
       let {
@@ -934,7 +939,7 @@ class KoniState {
         if (payload) {
           return payload;
         } else {
-          throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, (0, _i18next.t)('Not found signature'));
+          throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, (0, _i18next.t)('bg.koni.handler.State.notFoundSignature'));
         }
       } else {
         throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.USER_REJECTED_REQUEST);
@@ -1095,7 +1100,7 @@ class KoniState {
         if (payload) {
           return payload;
         } else {
-          throw new _CardanoProviderError.CardanoProviderError(_KoniTypes.CardanoProviderErrorType.INVALID_REQUEST, (0, _i18next.t)('Not found signature'));
+          throw new _CardanoProviderError.CardanoProviderError(_KoniTypes.CardanoProviderErrorType.INVALID_REQUEST, (0, _i18next.t)('bg.koni.handler.State.notFoundSignature'));
         }
       } else {
         throw new _CardanoProviderError.CardanoProviderError(_KoniTypes.CardanoProviderErrorType.SIGN_DATA_DECLINED);
@@ -1116,7 +1121,7 @@ class KoniState {
     const authInfoMap = await this.getAuthList();
     const authInfo = authInfoMap[(0, _utils3.stripUrl)(url)];
     if (!authInfo) {
-      throw new _CardanoProviderError.CardanoProviderError(_KoniTypes.CardanoProviderErrorType.REFUSED_REQUEST, (0, _i18next.t)('Not found auth info'));
+      throw new _CardanoProviderError.CardanoProviderError(_KoniTypes.CardanoProviderErrorType.REFUSED_REQUEST, (0, _i18next.t)('bg.koni.handler.State.notFoundAuthInfo'));
     }
     let requireKeyHashes = [];
     let networkKey = authInfo === null || authInfo === void 0 ? void 0 : authInfo.currentNetworkMap.cardano;
@@ -1168,7 +1173,7 @@ class KoniState {
       };
       if ((0, _utils3.isSameAddress)(currentAddress, address)) {
         if (!(0, _cardano.validateAddressNetwork)(address, currentCardanoNetwork)) {
-          throw new _CardanoProviderError.CardanoProviderError(_KoniTypes.CardanoProviderErrorType.ACCOUNT_CHANGED, (0, _i18next.t)('Current network is changed'));
+          throw new _CardanoProviderError.CardanoProviderError(_KoniTypes.CardanoProviderErrorType.ACCOUNT_CHANGED, (0, _i18next.t)('bg.koni.handler.State.currentNetworkIsChanged'));
         }
         transactionValue = transactionValue.checked_add(amount);
         addressInputAmountMap[address].isOwner = true;
@@ -1177,12 +1182,12 @@ class KoniState {
 
       // Check if address is valid with current network
       if (!(0, _cardano.validateAddressNetwork)(address, currentCardanoNetwork)) {
-        throw new _CardanoProviderError.CardanoProviderError(_KoniTypes.CardanoProviderErrorType.INVALID_REQUEST, (0, _i18next.t)('Current network is not match with input address'));
+        throw new _CardanoProviderError.CardanoProviderError(_KoniTypes.CardanoProviderErrorType.INVALID_REQUEST, (0, _i18next.t)('bg.koni.handler.State.networkNotMatchInputAddress'));
       }
     }
     for (const address in addressOutputMap) {
       if (!(0, _cardano.validateAddressNetwork)(address, currentCardanoNetwork)) {
-        throw new _CardanoProviderError.CardanoProviderError(_KoniTypes.CardanoProviderErrorType.INVALID_REQUEST, (0, _i18next.t)('Current network is not match with output address'));
+        throw new _CardanoProviderError.CardanoProviderError(_KoniTypes.CardanoProviderErrorType.INVALID_REQUEST, (0, _i18next.t)('bg.koni.handler.State.networkNotMatchOutputAddress'));
       }
       if (!addressInputAmountMap[address] && !addressOutputMap[address].is_zero()) {
         addressOutputAmountMap[address] = {
@@ -1227,7 +1232,7 @@ class KoniState {
       return false;
     });
     if (!needOwnerKeyHash) {
-      throw new _CardanoProviderError.CardanoProviderError(_KoniTypes.CardanoProviderErrorType.PROOF_GENERATION_FAILED, (0, _i18next.t)('Not found owner key hash'));
+      throw new _CardanoProviderError.CardanoProviderError(_KoniTypes.CardanoProviderErrorType.PROOF_GENERATION_FAILED, (0, _i18next.t)('bg.koni.handler.State.notFoundOwnerKeyHash'));
     }
     if (needForeignKeyHash && !partialSign) {
       throw new _CardanoProviderError.CardanoProviderError(_KoniTypes.CardanoProviderErrorType.INVALID_REQUEST, 'Not support foreign key hash yet');
@@ -1252,7 +1257,7 @@ class KoniState {
         if (payload) {
           return payload;
         } else {
-          throw new _CardanoProviderError.CardanoProviderError(_KoniTypes.CardanoProviderErrorType.INVALID_REQUEST, (0, _i18next.t)('Not found signature'));
+          throw new _CardanoProviderError.CardanoProviderError(_KoniTypes.CardanoProviderErrorType.INVALID_REQUEST, (0, _i18next.t)('bg.koni.handler.State.notFoundSignature'));
         }
       } else {
         throw new _CardanoProviderError.CardanoProviderError(_KoniTypes.CardanoProviderErrorType.SIGN_TRANSACTION_DECLINED);
@@ -1300,7 +1305,7 @@ class KoniState {
         if (payload) {
           return payload;
         } else {
-          throw new _BitcoinProviderError.BitcoinProviderError(_KoniTypes.BitcoinProviderErrorType.INVALID_PARAMS, (0, _i18next.t)('Not found signature'));
+          throw new _BitcoinProviderError.BitcoinProviderError(_KoniTypes.BitcoinProviderErrorType.INVALID_PARAMS, (0, _i18next.t)('bg.koni.handler.State.notFoundSignature'));
         }
       } else {
         throw new _BitcoinProviderError.BitcoinProviderError(_KoniTypes.BitcoinProviderErrorType.USER_REJECTED_REQUEST);
@@ -1371,8 +1376,8 @@ class KoniState {
     }, []);
     if (new _bignumber.default(totalBalance.value).lt(inputAmount)) {
       payloadAfterValidated.errors = [{
-        message: (0, _i18next.t)('Insufficient balance'),
-        name: (0, _i18next.t)('Unable to sign transaction')
+        message: (0, _i18next.t)('bg.koni.handler.State.insufficientBalance'),
+        name: (0, _i18next.t)('bg.koni.handler.State.unableToSignTransaction')
       }];
     }
     const psbtOutputData = psbtGenerate.txOutputs.map(output => {
@@ -1413,7 +1418,7 @@ class KoniState {
         if (payload) {
           return payload;
         } else {
-          throw new _BitcoinProviderError.BitcoinProviderError(_KoniTypes.BitcoinProviderErrorType.INVALID_PARAMS, (0, _i18next.t)('Not found signature'));
+          throw new _BitcoinProviderError.BitcoinProviderError(_KoniTypes.BitcoinProviderErrorType.INVALID_PARAMS, (0, _i18next.t)('bg.koni.handler.State.notFoundSignature'));
         }
       } else {
         throw new _BitcoinProviderError.BitcoinProviderError(_KoniTypes.BitcoinProviderErrorType.USER_REJECTED_REQUEST);
@@ -1449,7 +1454,7 @@ class KoniState {
         if (payload) {
           return payload;
         } else {
-          throw new _BitcoinProviderError.BitcoinProviderError(_KoniTypes.BitcoinProviderErrorType.INVALID_PARAMS, (0, _i18next.t)('Not found signature'));
+          throw new _BitcoinProviderError.BitcoinProviderError(_KoniTypes.BitcoinProviderErrorType.INVALID_PARAMS, (0, _i18next.t)('bg.koni.handler.State.notFoundSignature'));
         }
       } else {
         throw new _BitcoinProviderError.BitcoinProviderError(_KoniTypes.BitcoinProviderErrorType.USER_REJECTED_REQUEST);

package/cjs/koni/background/handlers/Tabs.js

@@ -592,8 +592,30 @@ class KoniTabs {
           method: 'wallet_addEthereumChain',
           params: [chainData]
         });
+        const [networkKey] = this.#koniState.findNetworkKeyByChainId(chainIdDec);
+        if (networkKey) {
+          await this.#koniState.switchEvmNetworkByUrl((0, _utils2.stripUrl)(url), networkKey);
+        }
       } else {
-        throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.NETWORK_NOT_SUPPORTED, 'This network is currently not supported');
+        await this.#koniState.showUnsupportedNetworkSwitchConfirm(id, url, {
+          mode: 'insert',
+          chainSpec: {
+            genesisHash: '',
+            paraId: null,
+            addressPrefix: 0,
+            evmChainId: chainIdDec,
+            existentialDeposit: '',
+            decimals: 0
+          },
+          chainEditInfo: {
+            chainType: 'EVM',
+            currentProvider: '',
+            providers: {},
+            slug: ''
+          },
+          unconfirmed: true,
+          providerError: _types2._CHAIN_VALIDATION_ERROR.UNSUPPORTED_CHAIN_CANNOT_ADD
+        });
       }
     }
     return null;

package/cjs/packageInfo.js

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

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

@@ -183,7 +183,7 @@ class BalanceService {
     const chainInfo = this.state.chainService.getChainInfoByKey(chain);
     const chainState = this.state.chainService.getChainStateByKey(chain);
     if (!chainInfo || !chainState || !chainState.active) {
-      return Promise.reject(new _BalanceError.BalanceError(_KoniTypes.BalanceErrorType.NETWORK_ERROR, (0, _i18next.t)('{{chain}} is inactive. Please enable network', {
+      return Promise.reject(new _BalanceError.BalanceError(_KoniTypes.BalanceErrorType.NETWORK_ERROR, (0, _i18next.t)('bg.BALANCE.services.service.balance.chainInactiveEnableNetwork', {
         replace: {
           chain: chainInfo.name
         }
@@ -192,7 +192,7 @@ class BalanceService {
     const tSlug = tokenSlug || (0, _utils._getChainNativeTokenSlug)(chainInfo);
     const tokenInfo = this.state.chainService.getAssetBySlug(tSlug);
     if (!tokenInfo) {
-      return Promise.reject(new _BalanceError.BalanceError(_KoniTypes.BalanceErrorType.TOKEN_ERROR, (0, _i18next.t)('Transfer is currently not available for this token: {{tSlug}}', {
+      return Promise.reject(new _BalanceError.BalanceError(_KoniTypes.BalanceErrorType.TOKEN_ERROR, (0, _i18next.t)('bg.BALANCE.services.service.balance.transferNotAvailableForToken', {
         replace: {
           slug: tSlug
         }
@@ -240,7 +240,7 @@ class BalanceService {
         if (hasError) {
           var _unsub2;
           (_unsub2 = unsub) === null || _unsub2 === void 0 ? void 0 : _unsub2();
-          reject(new Error((0, _i18next.t)('Failed to get balance. Please check your internet connection or change your network endpoint')));
+          reject(new Error((0, _i18next.t)('bg.BALANCE.services.service.balance.failedToGetBalance')));
         }
       }, 9999);
     });

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

@@ -137,7 +137,7 @@ async function getERC721Transaction(web3Api, chain, contractAddress, senderAddre
   } catch (e) {
     const error = e;
     if (error.message.includes('transfer to non ERC721Receiver implementer')) {
-      error.message = (0, _i18next.t)('Unable to send. NFT not supported on recipient address');
+      error.message = (0, _i18next.t)('bg.BALANCE.services.service.balance.transfer.smartContract.nftNotSupportedOnRecipient');
     }
     throw error;
   }

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

@@ -151,8 +151,14 @@ const dryRunXcmExtrinsicV2 = async request => {
       const {
         assetHub,
         bridgeHub,
-        destination
+        destination,
+        hops
       } = dryRunResult;
+      for (const hop of hops) {
+        if (!hop.result.success) {
+          return false;
+        }
+      }
       if ((assetHub === null || assetHub === void 0 ? void 0 : assetHub.success) === false || (bridgeHub === null || bridgeHub === void 0 ? void 0 : bridgeHub.success) === false || (destination === null || destination === void 0 ? void 0 : destination.success) === false) {
         if ((destination === null || destination === void 0 ? void 0 : destination.success) === false) {
           // pass dry-run in these cases

package/cjs/services/balance-service/transfer/xcm/utils.js

@@ -17,7 +17,7 @@ var _util = require("@polkadot/util");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-const version = '/v3';
+const version = '/v4';
 const paraSpellApi = {
   buildXcm: `${version}/x-transfer`,
   dryRunXcm: `${version}/dry-run`,
@@ -75,7 +75,7 @@ function txHexToSubmittableExtrinsic(api, hex) {
   }
 }
 async function buildXcm(request) {
-  var _originTokenInfo$meta, _originTokenInfo$meta2;
+  var _originTokenInfo$meta;
   const {
     destinationChain,
     originChain,
@@ -87,9 +87,8 @@ async function buildXcm(request) {
   if (!substrateApi) {
     throw new Error('Substrate API is not available');
   }
-  const psAssetType = (_originTokenInfo$meta = originTokenInfo.metadata) === null || _originTokenInfo$meta === void 0 ? void 0 : _originTokenInfo$meta.paraSpellAssetType;
-  const psAssetValue = (_originTokenInfo$meta2 = originTokenInfo.metadata) === null || _originTokenInfo$meta2 === void 0 ? void 0 : _originTokenInfo$meta2.paraSpellValue;
-  if (!psAssetType || !psAssetValue) {
+  const paraSpellIdentifyV4 = (_originTokenInfo$meta = originTokenInfo.metadata) === null || _originTokenInfo$meta === void 0 ? void 0 : _originTokenInfo$meta.paraSpellIdentifyV4;
+  if (!paraSpellIdentifyV4) {
     throw new Error('Token is not support XCM at this time');
   }
   const paraSpellChainMap = await (0, _paraspellChainMap.fetchParaSpellChainMap)();
@@ -97,7 +96,10 @@ async function buildXcm(request) {
     address: recipient,
     from: paraSpellChainMap[originChain.slug],
     to: paraSpellChainMap[destinationChain.slug],
-    currency: createParaSpellCurrency(psAssetType, psAssetValue, sendingValue)
+    currency: createParaSpellCurrency(paraSpellIdentifyV4, sendingValue),
+    options: {
+      abstractDecimals: false
+    }
   };
   const response = await (0, _utils.fetchFromProxyService)(_environment.ProxyServiceRoute.PARASPELL, paraSpellApi.buildXcm, {
     method: 'POST',
@@ -116,7 +118,7 @@ async function buildXcm(request) {
   return txHexToSubmittableExtrinsic(chainApi.api, extrinsicHex);
 }
 async function dryRunXcm(request) {
-  var _originTokenInfo$meta3, _originTokenInfo$meta4;
+  var _originTokenInfo$meta2;
   const {
     destinationChain,
     originChain,
@@ -126,9 +128,8 @@ async function dryRunXcm(request) {
     sendingValue
   } = request;
   const paraSpellChainMap = await (0, _paraspellChainMap.fetchParaSpellChainMap)();
-  const psAssetType = (_originTokenInfo$meta3 = originTokenInfo.metadata) === null || _originTokenInfo$meta3 === void 0 ? void 0 : _originTokenInfo$meta3.paraSpellAssetType;
-  const psAssetValue = (_originTokenInfo$meta4 = originTokenInfo.metadata) === null || _originTokenInfo$meta4 === void 0 ? void 0 : _originTokenInfo$meta4.paraSpellValue;
-  if (!psAssetType || !psAssetValue) {
+  const paraSpellIdentifyV4 = (_originTokenInfo$meta2 = originTokenInfo.metadata) === null || _originTokenInfo$meta2 === void 0 ? void 0 : _originTokenInfo$meta2.paraSpellIdentifyV4;
+  if (!paraSpellIdentifyV4) {
     throw new Error('Token is not support XCM at this time');
   }
   const bodyData = {
@@ -136,7 +137,10 @@ async function dryRunXcm(request) {
     address: recipient,
     from: paraSpellChainMap[originChain.slug],
     to: paraSpellChainMap[destinationChain.slug],
-    currency: createParaSpellCurrency(psAssetType, psAssetValue, sendingValue)
+    currency: createParaSpellCurrency(paraSpellIdentifyV4, sendingValue),
+    options: {
+      abstractDecimals: false
+    }
   };
   const response = await (0, _utils.fetchFromProxyService)(_environment.ProxyServiceRoute.PARASPELL, paraSpellApi.dryRunXcm, {
     method: 'POST',
@@ -158,7 +162,7 @@ async function dryRunXcm(request) {
   return await response.json();
 }
 async function estimateXcmFee(request) {
-  var _fromTokenInfo$metada, _fromTokenInfo$metada2;
+  var _fromTokenInfo$metada;
   const {
     fromChainInfo,
     fromTokenInfo,
@@ -168,9 +172,8 @@ async function estimateXcmFee(request) {
     value
   } = request;
   const paraSpellChainMap = await (0, _paraspellChainMap.fetchParaSpellChainMap)();
-  const psAssetType = (_fromTokenInfo$metada = fromTokenInfo.metadata) === null || _fromTokenInfo$metada === void 0 ? void 0 : _fromTokenInfo$metada.paraSpellAssetType;
-  const psAssetValue = (_fromTokenInfo$metada2 = fromTokenInfo.metadata) === null || _fromTokenInfo$metada2 === void 0 ? void 0 : _fromTokenInfo$metada2.paraSpellValue;
-  if (!psAssetType || !psAssetValue) {
+  const paraSpellIdentifyV4 = (_fromTokenInfo$metada = fromTokenInfo.metadata) === null || _fromTokenInfo$metada === void 0 ? void 0 : _fromTokenInfo$metada.paraSpellIdentifyV4;
+  if (!paraSpellIdentifyV4) {
     console.error('Lack of paraspell metadata');
     return undefined;
   }
@@ -179,7 +182,10 @@ async function estimateXcmFee(request) {
     address: recipient,
     from: paraSpellChainMap[fromChainInfo.slug],
     to: paraSpellChainMap[toChainInfo.slug],
-    currency: createParaSpellCurrency(psAssetType, psAssetValue, value)
+    currency: createParaSpellCurrency(paraSpellIdentifyV4, value),
+    options: {
+      abstractDecimals: false
+    }
   };
   const response = await (0, _utils.fetchFromProxyService)(_environment.ProxyServiceRoute.PARASPELL, paraSpellApi.feeXcm, {
     method: 'POST',
@@ -195,11 +201,11 @@ async function estimateXcmFee(request) {
   }
   return await response.json();
 }
-function createParaSpellCurrency(assetType, assetValue, amount) {
+function createParaSpellCurrency(paraSpellIdentifyV4, amount) {
   // todo: handle complex conditions for asset has same symbol in a chain: Id, Multi-location, ...
   // todo: or update all asset to use multi-location
   return {
-    [assetType]: assetValue,
+    ...paraSpellIdentifyV4,
     amount
   };
 }

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

@@ -41,7 +41,7 @@ const _BALANCE_CHAIN_GROUP = {
   genshiro: ['genshiro_testnet', 'genshiro'],
   equilibrium_parachain: ['equilibrium_parachain'],
   bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main', 'hydradx_rococo', 'pendulum', 'amplitude', 'continuum_network', 'truth_network', 'jamton'],
-  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'crabParachain', 'darwinia2', 'parallel', 'calamari', 'manta_network', 'rococo_assethub', 'liberlandTest', 'liberland', 'dentnet', 'pangolin', 'crust', 'phala', 'shibuya', 'dbcchain', 'westend_assethub', 'chainflip_assethub'],
+  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'crabParachain', 'darwinia2', 'parallel', 'calamari', 'manta_network', 'rococo_assethub', 'liberlandTest', 'liberland', 'dentnet', 'pangolin', 'crust', 'phala', 'shibuya', 'dbcchain', 'westend_assethub', 'chainflip_assethub', 'origintrail'],
   kusama: ['kusama', 'kintsugi', 'kintsugi_test', 'interlay', 'acala', 'statemint', 'karura', 'bifrost'],
   // perhaps there are some runtime updates
   centrifuge: ['centrifuge'],
@@ -273,7 +273,7 @@ const _TRANSFER_CHAIN_GROUP = {
   genshiro: ['genshiro_testnet', 'genshiro', 'equilibrium_parachain'],
   // crab: ['crab', 'pangolin'],
   bitcountry: ['pioneer', 'bitcountry'],
-  statemine: ['statemint', 'statemine', 'darwinia2', 'astar', 'shiden', 'shibuya', 'parallel', 'liberland', 'liberlandTest', 'dentnet', 'dbcchain', 'westend_assethub', 'chainflip_assethub'],
+  statemine: ['statemint', 'statemine', 'darwinia2', 'astar', 'shiden', 'shibuya', 'parallel', 'liberland', 'liberlandTest', 'dentnet', 'dbcchain', 'westend_assethub', 'chainflip_assethub', 'origintrail'],
   riochain: ['riochain'],
   sora_substrate: ['sora_substrate'],
   avail: ['kate', 'goldberg_testnet'],

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

@@ -17,4 +17,5 @@ exports._CHAIN_VALIDATION_ERROR = _CHAIN_VALIDATION_ERROR;
   _CHAIN_VALIDATION_ERROR["NONE"] = "none";
   _CHAIN_VALIDATION_ERROR["CONNECTION_FAILURE"] = "connectionFailure";
   _CHAIN_VALIDATION_ERROR["PROVIDER_NOT_SAME_CHAIN"] = "providerNotSameChain";
+  _CHAIN_VALIDATION_ERROR["UNSUPPORTED_CHAIN_CANNOT_ADD"] = "unsupportedChainCannotAdd";
 })(_CHAIN_VALIDATION_ERROR || (exports._CHAIN_VALIDATION_ERROR = _CHAIN_VALIDATION_ERROR = {}));

package/cjs/services/chain-service/utils/patch.js

@@ -12,7 +12,7 @@ const PRODUCTION_BRANCHES = ['master', 'webapp', 'webapp-dev'];
 const branchName = process.env.BRANCH_NAME || 'subwallet-dev';
 const fetchDomain = process.env.PATCH_CHAIN_LIST_URL || (PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'https://chain-list-assets.subwallet.app' : 'https://dev.sw-chain-list-assets.pages.dev');
 const fetchFile = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'list.json' : 'preview.json';
-const ChainListVersion = '0.2.112'; // update this when build chain-list
+const ChainListVersion = '0.2.113'; // update this when build chain-list
 
 // todo: move this interface to chainlist
 exports.ChainListVersion = ChainListVersion;

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

@@ -12,9 +12,8 @@ const _STAKING_CHAIN_GROUP = {
   assetHub: ['statemine', 'statemint', 'westend_assethub'],
   para: ['moonbeam', 'moonriver', 'moonbase', 'turing', 'turingStaging', 'bifrost', 'bifrost_testnet', 'calamari_test', 'calamari', 'manta_network', 'polimec'],
   astar: ['astar', 'shiden', 'shibuya'],
-  amplitude: ['amplitude', 'amplitude_test', 'kilt', 'kilt_peregrine', 'pendulum', 'krest_network'],
+  amplitude: ['amplitude', 'amplitude_test', 'pendulum', 'krest_network'],
   // amplitude and kilt only share some common logic
-  kilt: ['kilt', 'kilt_peregrine'],
   nominationPool: ['polkadot', 'kusama', 'westend', 'alephTest', 'aleph', 'kate', 'vara_network', 'goldberg_testnet', 'availTuringTest', 'avail_mainnet', 'vara_testnet', 'cere', 'analog_timechain'],
   bifrost: ['bifrost', 'bifrost_testnet'],
   aleph: ['aleph', 'alephTest'],

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

@@ -161,7 +161,8 @@ class BasePoolHandler {
       };
     }
     const nativeTokenInfo = this.state.chainService.getNativeTokenInfo(this.chain);
-    const nativeTokenBalance = await this.state.balanceService.getTransferableBalance(request.address, this.chain);
+    // Use TRANSFER_BALANCE extrinsic in order to get transferable balanace without minus ED
+    const nativeTokenBalance = await this.state.balanceService.getTransferableBalance(request.address, this.chain, undefined, _KoniTypes.ExtrinsicType.TRANSFER_BALANCE);
     const bnNativeTokenBalance = new _util.BN(nativeTokenBalance.value);
     const bnMinBalanceToJoin = new _util.BN(((_poolInfo$statistic2 = poolInfo.statistic) === null || _poolInfo$statistic2 === void 0 ? void 0 : (_poolInfo$statistic2$ = _poolInfo$statistic2.earningThreshold) === null || _poolInfo$statistic2$ === void 0 ? void 0 : _poolInfo$statistic2$.join) || '0').add(new _util.BN(poolInfo.metadata.maintainBalance));
     if (bnNativeTokenBalance.lte(bnMinBalanceToJoin)) {