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

package/koni/background/handlers/Extension.js

@@ -139,7 +139,7 @@ export default class KoniExtension {
     id
   }) {
     const queued = this.#koniState.getMetaRequest(id);
-    assert(queued, t('Unable to proceed. Please try again'));
+    assert(queued, t('bg.koni.handler.Extension.unableToProceed'));
     const {
       request,
       resolve
@@ -158,7 +158,7 @@ export default class KoniExtension {
     id
   }) {
     const queued = this.#koniState.getMetaRequest(id);
-    assert(queued, t('Unable to proceed. Please try again'));
+    assert(queued, t('bg.koni.handler.Extension.unableToProceed'));
     const {
       reject
     } = queued;
@@ -182,7 +182,7 @@ export default class KoniExtension {
     signedTransaction
   }) {
     const queued = this.#koniState.getSignRequest(id);
-    assert(queued, t('Unable to proceed. Please try again'));
+    assert(queued, t('bg.koni.handler.Extension.unableToProceed'));
     const {
       resolve
     } = queued;
@@ -199,7 +199,7 @@ export default class KoniExtension {
     id
   }) {
     const queued = this.#koniState.getSignRequest(id);
-    assert(queued, t('Unable to proceed. Please try again'));
+    assert(queued, t('bg.koni.handler.Extension.unableToProceed'));
     const {
       reject
     } = queued;
@@ -427,7 +427,7 @@ export default class KoniExtension {
         };
       }
     } else {
-      throw Error(t('This is not an address'));
+      throw Error(t('bg.koni.handler.Extension.thisIsNotAnAddress'));
     }
   }
 
@@ -443,7 +443,7 @@ export default class KoniExtension {
       keyring.saveAddress(_address, meta);
       return true;
     } else {
-      throw Error(t('This is not an address'));
+      throw Error(t('bg.koni.handler.Extension.thisIsNotAnAddress'));
     }
   }
 
@@ -458,7 +458,7 @@ export default class KoniExtension {
       keyring.forgetAddress(_address);
       return true;
     } else {
-      throw Error(t('This is not an address'));
+      throw Error(t('bg.koni.handler.Extension.thisIsNotAnAddress'));
     }
   }
   _getAuthListV2() {
@@ -506,7 +506,7 @@ export default class KoniExtension {
     id
   }) {
     const queued = this.#koniState.getAuthRequestV2(id);
-    assert(queued, t('Unable to proceed. Please try again'));
+    assert(queued, t('bg.koni.handler.Extension.unableToProceed'));
     const {
       resolve
     } = queued;
@@ -520,7 +520,7 @@ export default class KoniExtension {
     id
   }) {
     const queued = this.#koniState.getAuthRequestV2(id);
-    assert(queued, t('Unable to proceed. Please try again'));
+    assert(queued, t('bg.koni.handler.Extension.unableToProceed'));
     const {
       reject
     } = queued;
@@ -531,7 +531,7 @@ export default class KoniExtension {
     id
   }) {
     const queued = this.#koniState.getAuthRequestV2(id);
-    assert(queued, t('Unable to proceed. Please try again'));
+    assert(queued, t('bg.koni.handler.Extension.unableToProceed'));
     const {
       reject
     } = queued;
@@ -696,7 +696,7 @@ export default class KoniExtension {
     };
     const typeInfoKey = typeInfoMap[authSwitchNetworkType];
     if (!typeInfoKey || !chainInfo[typeInfoKey]) {
-      throw new Error(t('Network {{networkKey}} is not {{authSwitchNetworkType}}', {
+      throw new Error(t('bg.koni.handler.Extension.networkNotAuthType', {
         replace: {
           networkKey,
           authSwitchNetworkType
@@ -705,7 +705,7 @@ export default class KoniExtension {
     }
     const authUrl = authUrls[url];
     if (!authUrl) {
-      throw new Error(t('Not found {{url}} in auth list', {
+      throw new Error(t('bg.koni.handler.Extension.urlNotFoundInAuthList', {
         replace: {
           url
         }
@@ -718,7 +718,7 @@ export default class KoniExtension {
       });
     }
     if (!authUrl.accountAuthTypes.includes(authSwitchNetworkType)) {
-      throw new Error(t('Network {{networkKey}} is not supported by {{authSwitchNetworkType}}', {
+      throw new Error(t('bg.koni.handler.Extension.networkNotSupportedByAuthType', {
         replace: {
           networkKey,
           authSwitchNetworkType
@@ -1400,7 +1400,7 @@ export default class KoniExtension {
     } catch (e) {
       const error = e;
       if (error.message.includes('transfer amount exceeds balance')) {
-        error.message = t('Insufficient balance');
+        error.message = t('bg.koni.handler.Extension.insufficientBalance');
       }
       throw error;
     }
@@ -1756,7 +1756,7 @@ export default class KoniExtension {
     } catch (e) {
       const error = e;
       if (error.message.includes('transfer amount exceeds balance')) {
-        error.message = t('Insufficient balance');
+        error.message = t('bg.koni.handler.Extension.insufficientBalance');
       }
       throw error;
     }
@@ -1852,7 +1852,7 @@ export default class KoniExtension {
       token: tokenSlug
     });
     if (new BigN(freeBalance.value).lt(inputAmount)) {
-      throw new Error(t('Insufficient balance'));
+      throw new Error(t('bg.koni.handler.Extension.insufficientBalance'));
     }
     const transferNativeAmount = isTransferNativeToken ? transferAmount.value : '0';
     return this.#koniState.transactionService.handleTransactionAfterConfirmation({
@@ -2115,6 +2115,7 @@ export default class KoniExtension {
       to,
       token,
       tokenPayFeeSlug,
+      transferAll,
       value
     } = request;
     const cb = createSubscription(id, port);
@@ -2151,7 +2152,8 @@ export default class KoniExtension {
       bitcoinApi: this.#koniState.chainService.getBitcoinApi(chain),
       isTransferLocalTokenAndPayThatTokenAsFee,
       isTransferNativeTokenAndPayLocalTokenAsFee,
-      nativeToken
+      nativeToken,
+      transferAll: transferAll
     };
     const subscription = combineLatest({
       freeBalance: freeBalanceSubject,
@@ -2548,7 +2550,7 @@ export default class KoniExtension {
     networkKey
   }) {
     const pair = keyring.getPair(address);
-    assert(pair, t('Unable to find account'));
+    assert(pair, t('bg.koni.handler.Extension.unableToFindAccount'));
     if (pair.isLocked) {
       keyring.unlockPair(pair.address);
     }
@@ -2572,11 +2574,11 @@ export default class KoniExtension {
     let signed;
     const network = this.getNetworkJsonByChainId(chainId);
     if (!network) {
-      throw new Error(t('Cannot find network'));
+      throw new Error(t('bg.koni.handler.Extension.cannotFindNetwork'));
     }
     const pair = keyring.getPair(address);
     if (!pair) {
-      throw Error(t('Unable to find account'));
+      throw Error(t('bg.koni.handler.Extension.unableToFindAccount'));
     }
     if (pair.isLocked) {
       keyring.unlockPair(pair.address);
@@ -2593,7 +2595,7 @@ export default class KoniExtension {
       var _signedTranaction$r, _signedTranaction$s, _signedTranaction$v;
       const tx = createTransactionFromRLP(message);
       if (!tx) {
-        throw new Error(t('Failed to decode data. Please use a valid QR code'));
+        throw new Error(t('bg.koni.handler.Extension.failedToDecodeQr'));
       }
       const txObject = {
         gasPrice: new BigN(tx.gasPrice).toNumber(),
@@ -2682,7 +2684,7 @@ export default class KoniExtension {
     const chainInfo = this.#koniState.getChainInfo(chain);
     const chainStakingMetadata = await this.#koniState.getStakingMetadataByChain(chain, StakingType.NOMINATED);
     if (!chainStakingMetadata) {
-      const errMessage = t('Unable to fetch staking data. Re-enable "{{chainName}}" and try again.', {
+      const errMessage = t('bg.koni.handler.Extension.unableToFetchStakingDataReEnable', {
         replace: {
           chainName: chainInfo.name
         }
@@ -2789,7 +2791,7 @@ export default class KoniExtension {
     const chainInfo = this.#koniState.getChainInfo(chain);
     const chainStakingMetadata = await this.#koniState.getStakingMetadataByChain(chain, StakingType.NOMINATED);
     if (!chainStakingMetadata) {
-      const errMessage = t('Unable to fetch staking data. Re-enable "{{chainName}}" and try again.', {
+      const errMessage = t('bg.koni.handler.Extension.unableToFetchStakingDataReEnable', {
         replace: {
           chainName: chainInfo.name
         }
@@ -2821,7 +2823,7 @@ export default class KoniExtension {
     const chainStakingMetadata = await this.#koniState.getStakingMetadataByChain(chain, StakingType.NOMINATED);
     if (!chainStakingMetadata || !nominatorMetadata) {
       const chainInfo = this.#koniState.getChainInfo(chain);
-      const errMessage = t('Unable to fetch staking data. Re-enable "{{chainName}}" and try again.', {
+      const errMessage = t('bg.koni.handler.Extension.unableToFetchStakingDataReEnable', {
         replace: {
           chainName: chainInfo === null || chainInfo === void 0 ? void 0 : chainInfo.name
         }
@@ -3017,7 +3019,7 @@ export default class KoniExtension {
     id
   }) {
     const queued = this.#koniState.getSignRequest(id);
-    assert(queued, t('Unable to proceed. Please try again'));
+    assert(queued, t('bg.koni.handler.Extension.unableToProceed'));
     const {
       reject,
       request,
@@ -3032,7 +3034,7 @@ export default class KoniExtension {
       address
     } = pair;
     if (!pair) {
-      reject(new Error(t('Unable to find account')));
+      reject(new Error(t('bg.koni.handler.Extension.unableToFindAccount')));
       return false;
     }
     if (pair.isLocked) {

package/koni/background/handlers/State.d.ts

@@ -143,6 +143,7 @@ export default class KoniState {
     subscribeStakingReward(): Subject<StakingRewardJson>;
     switchEvmNetworkByUrl(shortenUrl: string, networkKey: string): Promise<void>;
     addNetworkConfirm(id: string, url: string, networkData: _NetworkUpsertParams): Promise<null>;
+    showUnsupportedNetworkSwitchConfirm(id: string, url: string, networkData: _NetworkUpsertParams): Promise<never>;
     addTokenConfirm(id: string, url: string, tokenInfo: AddTokenRequestExternal): Promise<true>;
     get metaSubject(): BehaviorSubject<import("@subwallet/extension-base/background/types").MetadataRequest[]>;
     get signSubject(): BehaviorSubject<import("@subwallet/extension-base/background/types").SigningRequest[]>;

package/koni/background/handlers/State.js

@@ -444,7 +444,7 @@ export default class KoniState {
       authUrls[shortenUrl].currentNetworkMap.evm = networkKey;
       this.setAuthorize(authUrls);
     } else {
-      throw new EvmProviderError(EvmProviderErrorType.INTERNAL_ERROR, t('Not found {{shortenUrl}} in auth list', {
+      throw new EvmProviderError(EvmProviderErrorType.INTERNAL_ERROR, t('bg.koni.handler.State.shortUrlNotFoundInAuthList', {
         replace: {
           shortenUrl
         }
@@ -467,6 +467,11 @@ export default class KoniState {
       }
     });
   }
+  async showUnsupportedNetworkSwitchConfirm(id, url, networkData) {
+    return this.requestService.addConfirmation(id, url, 'addNetworkRequest', networkData).then(() => {
+      throw new EvmProviderError(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 ({
       isApproved
@@ -913,7 +918,7 @@ export default class KoniState {
         if (payload) {
           return payload;
         } else {
-          throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, t('Not found signature'));
+          throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, t('bg.koni.handler.State.notFoundSignature'));
         }
       } else {
         throw new EvmProviderError(EvmProviderErrorType.USER_REJECTED_REQUEST);
@@ -1072,7 +1077,7 @@ export default class KoniState {
         if (payload) {
           return payload;
         } else {
-          throw new CardanoProviderError(CardanoProviderErrorType.INVALID_REQUEST, t('Not found signature'));
+          throw new CardanoProviderError(CardanoProviderErrorType.INVALID_REQUEST, t('bg.koni.handler.State.notFoundSignature'));
         }
       } else {
         throw new CardanoProviderError(CardanoProviderErrorType.SIGN_DATA_DECLINED);
@@ -1093,7 +1098,7 @@ export default class KoniState {
     const authInfoMap = await this.getAuthList();
     const authInfo = authInfoMap[stripUrl(url)];
     if (!authInfo) {
-      throw new CardanoProviderError(CardanoProviderErrorType.REFUSED_REQUEST, t('Not found auth info'));
+      throw new CardanoProviderError(CardanoProviderErrorType.REFUSED_REQUEST, t('bg.koni.handler.State.notFoundAuthInfo'));
     }
     let requireKeyHashes = [];
     let networkKey = authInfo === null || authInfo === void 0 ? void 0 : authInfo.currentNetworkMap.cardano;
@@ -1145,7 +1150,7 @@ export default class KoniState {
       };
       if (isSameAddress(currentAddress, address)) {
         if (!validateAddressNetwork(address, currentCardanoNetwork)) {
-          throw new CardanoProviderError(CardanoProviderErrorType.ACCOUNT_CHANGED, t('Current network is changed'));
+          throw new CardanoProviderError(CardanoProviderErrorType.ACCOUNT_CHANGED, t('bg.koni.handler.State.currentNetworkIsChanged'));
         }
         transactionValue = transactionValue.checked_add(amount);
         addressInputAmountMap[address].isOwner = true;
@@ -1154,12 +1159,12 @@ export default class KoniState {
 
       // Check if address is valid with current network
       if (!validateAddressNetwork(address, currentCardanoNetwork)) {
-        throw new CardanoProviderError(CardanoProviderErrorType.INVALID_REQUEST, t('Current network is not match with input address'));
+        throw new CardanoProviderError(CardanoProviderErrorType.INVALID_REQUEST, t('bg.koni.handler.State.networkNotMatchInputAddress'));
       }
     }
     for (const address in addressOutputMap) {
       if (!validateAddressNetwork(address, currentCardanoNetwork)) {
-        throw new CardanoProviderError(CardanoProviderErrorType.INVALID_REQUEST, t('Current network is not match with output address'));
+        throw new CardanoProviderError(CardanoProviderErrorType.INVALID_REQUEST, t('bg.koni.handler.State.networkNotMatchOutputAddress'));
       }
       if (!addressInputAmountMap[address] && !addressOutputMap[address].is_zero()) {
         addressOutputAmountMap[address] = {
@@ -1204,7 +1209,7 @@ export default class KoniState {
       return false;
     });
     if (!needOwnerKeyHash) {
-      throw new CardanoProviderError(CardanoProviderErrorType.PROOF_GENERATION_FAILED, t('Not found owner key hash'));
+      throw new CardanoProviderError(CardanoProviderErrorType.PROOF_GENERATION_FAILED, t('bg.koni.handler.State.notFoundOwnerKeyHash'));
     }
     if (needForeignKeyHash && !partialSign) {
       throw new CardanoProviderError(CardanoProviderErrorType.INVALID_REQUEST, 'Not support foreign key hash yet');
@@ -1228,7 +1233,7 @@ export default class KoniState {
         if (payload) {
           return payload;
         } else {
-          throw new CardanoProviderError(CardanoProviderErrorType.INVALID_REQUEST, t('Not found signature'));
+          throw new CardanoProviderError(CardanoProviderErrorType.INVALID_REQUEST, t('bg.koni.handler.State.notFoundSignature'));
         }
       } else {
         throw new CardanoProviderError(CardanoProviderErrorType.SIGN_TRANSACTION_DECLINED);
@@ -1275,7 +1280,7 @@ export default class KoniState {
         if (payload) {
           return payload;
         } else {
-          throw new BitcoinProviderError(BitcoinProviderErrorType.INVALID_PARAMS, t('Not found signature'));
+          throw new BitcoinProviderError(BitcoinProviderErrorType.INVALID_PARAMS, t('bg.koni.handler.State.notFoundSignature'));
         }
       } else {
         throw new BitcoinProviderError(BitcoinProviderErrorType.USER_REJECTED_REQUEST);
@@ -1342,8 +1347,8 @@ export default class KoniState {
     }, []);
     if (new BigN(totalBalance.value).lt(inputAmount)) {
       payloadAfterValidated.errors = [{
-        message: t('Insufficient balance'),
-        name: t('Unable to sign transaction')
+        message: t('bg.koni.handler.State.insufficientBalance'),
+        name: t('bg.koni.handler.State.unableToSignTransaction')
       }];
     }
     const psbtOutputData = psbtGenerate.txOutputs.map(output => {
@@ -1383,7 +1388,7 @@ export default class KoniState {
         if (payload) {
           return payload;
         } else {
-          throw new BitcoinProviderError(BitcoinProviderErrorType.INVALID_PARAMS, t('Not found signature'));
+          throw new BitcoinProviderError(BitcoinProviderErrorType.INVALID_PARAMS, t('bg.koni.handler.State.notFoundSignature'));
         }
       } else {
         throw new BitcoinProviderError(BitcoinProviderErrorType.USER_REJECTED_REQUEST);
@@ -1418,7 +1423,7 @@ export default class KoniState {
         if (payload) {
           return payload;
         } else {
-          throw new BitcoinProviderError(BitcoinProviderErrorType.INVALID_PARAMS, t('Not found signature'));
+          throw new BitcoinProviderError(BitcoinProviderErrorType.INVALID_PARAMS, t('bg.koni.handler.State.notFoundSignature'));
         }
       } else {
         throw new BitcoinProviderError(BitcoinProviderErrorType.USER_REJECTED_REQUEST);

package/koni/background/handlers/Tabs.js

@@ -556,8 +556,30 @@ export default class KoniTabs {
           method: 'wallet_addEthereumChain',
           params: [chainData]
         });
+        const [networkKey] = this.#koniState.findNetworkKeyByChainId(chainIdDec);
+        if (networkKey) {
+          await this.#koniState.switchEvmNetworkByUrl(stripUrl(url), networkKey);
+        }
       } else {
-        throw new EvmProviderError(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: _CHAIN_VALIDATION_ERROR.UNSUPPORTED_CHAIN_CANNOT_ADD
+        });
       }
     }
     return null;

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.54-0",
+  "version": "1.3.55-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -2873,11 +2873,11 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
     "@subwallet-monorepos/subwallet-services-sdk": "^0.1.8",
-    "@subwallet/chain-list": "0.2.112-beta.9",
-    "@subwallet/extension-base": "^1.3.54-0",
-    "@subwallet/extension-chains": "^1.3.54-0",
-    "@subwallet/extension-dapp": "^1.3.54-0",
-    "@subwallet/extension-inject": "^1.3.54-0",
+    "@subwallet/chain-list": "0.2.113-beta.12",
+    "@subwallet/extension-base": "^1.3.55-0",
+    "@subwallet/extension-chains": "^1.3.55-0",
+    "@subwallet/extension-dapp": "^1.3.55-0",
+    "@subwallet/extension-inject": "^1.3.55-0",
     "@subwallet/keyring": "^0.1.13",
     "@subwallet/ui-keyring": "^0.1.13",
     "@ton/core": "^0.56.3",

package/packageInfo.js

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

package/services/balance-service/index.js

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

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

@@ -125,7 +125,7 @@ export async function getERC721Transaction(web3Api, chain, contractAddress, send
   } 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');
+      error.message = t('bg.BALANCE.services.service.balance.transfer.smartContract.nftNotSupportedOnRecipient');
     }
     throw error;
   }

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

@@ -133,8 +133,14 @@ export 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/services/balance-service/transfer/xcm/utils.d.ts

@@ -11,11 +11,17 @@ export declare type DryRunNodeSuccess = {
     forwardedXcms: any;
 };
 export declare type DryRunNodeResult = DryRunNodeSuccess | DryRunNodeFailure;
+export declare type THopInfo = {
+    result: DryRunNodeResult & {
+        currency?: string;
+    };
+};
 export declare type DryRunResult = {
     origin: DryRunNodeResult;
     destination?: DryRunNodeResult;
     assetHub?: DryRunNodeResult;
     bridgeHub?: DryRunNodeResult;
+    hops: THopInfo[];
 };
 interface GetXcmFeeRequest {
     sender: string;

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

@@ -5,7 +5,7 @@ import { fetchParaSpellChainMap } from '@subwallet/extension-base/constants/para
 import { ProxyServiceRoute } from '@subwallet/extension-base/types/environment';
 import { fetchFromProxyService } from '@subwallet/extension-base/utils';
 import { assert, compactToU8a, isHex, u8aConcat, u8aEq } from '@polkadot/util';
-const version = '/v3';
+const version = '/v4';
 const paraSpellApi = {
   buildXcm: `${version}/x-transfer`,
   dryRunXcm: `${version}/dry-run`,
@@ -63,7 +63,7 @@ function txHexToSubmittableExtrinsic(api, hex) {
   }
 }
 export async function buildXcm(request) {
-  var _originTokenInfo$meta, _originTokenInfo$meta2;
+  var _originTokenInfo$meta;
   const {
     destinationChain,
     originChain,
@@ -75,9 +75,8 @@ export 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 fetchParaSpellChainMap();
@@ -85,7 +84,10 @@ export 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 fetchFromProxyService(ProxyServiceRoute.PARASPELL, paraSpellApi.buildXcm, {
     method: 'POST',
@@ -104,7 +106,7 @@ export async function buildXcm(request) {
   return txHexToSubmittableExtrinsic(chainApi.api, extrinsicHex);
 }
 export async function dryRunXcm(request) {
-  var _originTokenInfo$meta3, _originTokenInfo$meta4;
+  var _originTokenInfo$meta2;
   const {
     destinationChain,
     originChain,
@@ -114,9 +116,8 @@ export async function dryRunXcm(request) {
     sendingValue
   } = request;
   const paraSpellChainMap = await 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 = {
@@ -124,7 +125,10 @@ export 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 fetchFromProxyService(ProxyServiceRoute.PARASPELL, paraSpellApi.dryRunXcm, {
     method: 'POST',
@@ -146,7 +150,7 @@ export async function dryRunXcm(request) {
   return await response.json();
 }
 export async function estimateXcmFee(request) {
-  var _fromTokenInfo$metada, _fromTokenInfo$metada2;
+  var _fromTokenInfo$metada;
   const {
     fromChainInfo,
     fromTokenInfo,
@@ -156,9 +160,8 @@ export async function estimateXcmFee(request) {
     value
   } = request;
   const paraSpellChainMap = await 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;
   }
@@ -167,7 +170,10 @@ export 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 fetchFromProxyService(ProxyServiceRoute.PARASPELL, paraSpellApi.feeXcm, {
     method: 'POST',
@@ -183,11 +189,11 @@ export 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/services/chain-service/constants.js

@@ -30,7 +30,7 @@ export 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'],
@@ -255,7 +255,7 @@ export 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/services/chain-service/handler/types.d.ts

@@ -32,5 +32,6 @@ export declare enum _CHAIN_VALIDATION_ERROR {
     INVALID_PROVIDER = "invalidProvider",
     NONE = "none",
     CONNECTION_FAILURE = "connectionFailure",
-    PROVIDER_NOT_SAME_CHAIN = "providerNotSameChain"
+    PROVIDER_NOT_SAME_CHAIN = "providerNotSameChain",
+    UNSUPPORTED_CHAIN_CANNOT_ADD = "unsupportedChainCannotAdd"
 }