Merge remote-tracking branch 'refs/remotes/origin/subwallet-dev' into webapp-dev

# Conflicts:
#	packages/extension-koni/public/locales/en/translation.json
#	packages/extension-koni/public/locales/ja/translation.json
#	packages/extension-koni/public/locales/ru/translation.json
#	packages/extension-koni/public/locales/vi/translation.json
#	packages/extension-koni/public/locales/zh/translation.json
#	packages/web-runner/public/locales/en/translation.json
#	packages/web-runner/public/locales/ja/translation.json
#	packages/web-runner/public/locales/ru/translation.json
#	packages/web-runner/public/locales/vi/translation.json
#	packages/web-runner/public/locales/zh/translation.json
#	packages/webapp/public/locales/en/translation.json
#	packages/webapp/public/locales/ja/translation.json
#	packages/webapp/public/locales/ru/translation.json
#	packages/webapp/public/locales/vi/translation.json
#	packages/webapp/public/locales/zh/translation.json

Author: saltict

.123trigger

@@ -136,4 +136,5 @@
 1.1.66
 1.1.67
 1.1.68
-1.2.2
+1.2.2
+1.2.3

CHANGELOG.md

@@ -1,5 +1,19 @@
 # CHANGELOG
 
+## 1.2.3
+Build date: Jun 03, 2024.
+
+Features & Update:
+- Update chain-list (#3094)
+  - Remove bit.country testnet, Ethereum Goerli
+  - Add support for Ink Whale token INW2
+  - Add support for Kreivo Network
+  - Add support Bitlayer
+  - Add support Bsquared network
+  - Add support BounceBit
+- Improve swap quote fetching speed (#3104)
+- Update transferable balance calculation formula (2118)
+
 ## 1.2.2
 Build date: May 30, 2024.
 

CONTRIBUTORS

@@ -1,13 +1,13 @@
-    2643	AnhMTV                        	Release version 1.2.2
-    2355	Nam Phạm                      	[Issue 3129] fix: force apply patch
-    2060	S2kael                        	[Issue-3121] Fix HTTP provider error when subscribe tx status
+    2657	AnhMTV                        	Release version 1.2.3
+    2390	Nam Phạm                      	[Issue 3094] fix bug validating transactions not using system pallet
+    2063	S2kael                        	[Issue-3094] Update stable version for chain-list
      815	lw-cdm                        	Fix eslint issues
      465	Jaco                          	0.42.5 (#969)
-     425	nguyentiendung                	
+     432	nguyentiendung                	
      185	quangdo                       	
-     150	bluezdot                      	[Issue-3088] Update logo earning option
+     155	bluezdot                      	fix eslint
      129	Thiendekaco                   	[Issue 3117] [fix] [mv3] Extension - Still show icon ZK mode on Export account screen in case upgrade version MV2 -> MV3
-     108	Automation Bot                	[CI Skip] Auto increase webapp build number
+     115	Automation Bot                	[CI Skip] Auto increase webapp build number
      106	dominhquang                   	[Issue-2649] Add send crash log feature
      104	khainh                        	predefine metadata for Polkadot & Kusama chains
      101	lw-cdm                        	

package.json

@@ -10,7 +10,7 @@
     "url": "https://github.com/Koniverse/Subwallet-V2.git"
   },
   "sideEffects": false,
-  "version": "1.2.2",
+  "version": "1.2.3",
   "workspaces": [
     "packages/*"
   ],
@@ -93,7 +93,7 @@
     "@polkadot/types-codec": "^11.0.3",
     "@polkadot/util": "^12.6.2",
     "@polkadot/util-crypto": "^12.6.2",
-    "@subwallet/chain-list": "0.2.65",
+    "@subwallet/chain-list": "0.2.66",
     "@subwallet/keyring": "^0.1.5",
     "@subwallet/react-ui": "5.1.2-b77",
     "@subwallet/ui-keyring": "^0.1.5",

packages/extension-base/package.json

@@ -17,7 +17,7 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "1.2.2-0",
+  "version": "1.2.3-1",
   "main": "index.js",
   "dependencies": {
     "@acala-network/api": "^5.0.2",
@@ -52,11 +52,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet/chain-list": "0.2.65",
-    "@subwallet/extension-base": "^1.2.2-0",
-    "@subwallet/extension-chains": "^1.2.2-0",
-    "@subwallet/extension-dapp": "^1.2.2-0",
-    "@subwallet/extension-inject": "^1.2.2-0",
+    "@subwallet/chain-list": "0.2.66",
+    "@subwallet/extension-base": "^1.2.3-1",
+    "@subwallet/extension-chains": "^1.2.3-1",
+    "@subwallet/extension-dapp": "^1.2.3-1",
+    "@subwallet/extension-inject": "^1.2.3-1",
     "@subwallet/keyring": "^0.1.5",
     "@subwallet/ui-keyring": "^0.1.5",
     "@walletconnect/keyvaluestorage": "^1.1.1",
@@ -96,7 +96,7 @@
     "web3-utils": "^1.10.0"
   },
   "devDependencies": {
-    "@subwallet/extension-mocks": "^1.2.2-0",
+    "@subwallet/extension-mocks": "^1.2.3-1",
     "@types/uuid": "^9.0.1"
   }
 }

packages/extension-base/src/background/KoniTypes.ts

@@ -640,6 +640,7 @@ export interface BasicTokenInfo {
 
 export interface AmountData extends BasicTokenInfo {
   value: string;
+  metadata?: unknown;
 }
 
 export interface FeeData extends AmountData {
@@ -1222,7 +1223,8 @@ export interface SupportTransferResponse {
 export interface RequestFreeBalance {
   address: string,
   networkKey: string,
-  token?: string
+  token?: string,
+  extrinsicType?: ExtrinsicType
 }
 
 export interface RequestMaxTransferable {
@@ -2225,6 +2227,10 @@ export interface ResponseSubscribeHistory {
 
 /* Campaign */
 
+/* Core types */
+export type _Address = string;
+export type _BalanceMetadata = unknown;
+
 // Use stringify to communicate, pure boolean value will error with case 'false' value
 export interface KoniRequestSignatures {
   // Bonding functions

packages/extension-base/src/core/logic-validation/earning.ts

@@ -0,0 +1,49 @@
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
+import BigN from 'bignumber.js';
+
+export function _handleDisplayForEarningError (error: TransactionError) {
+  if (
+    error.message.startsWith('UnknownError Connection to Indexed DataBase server lost') ||
+    error.message.startsWith('Provided address is invalid, the capitalization checksum test failed') ||
+    error.message.startsWith('connection not open on send()')) {
+    return {
+      title: 'Connection error',
+      message: 'Your selected network has lost connection. Update it by re-enabling it or changing network provider'
+    };
+  }
+
+  return undefined;
+}
+
+export const INSUFFICIENT_MESSAGES = ['残高不足', 'Недостаточный баланс', 'Insufficient balance'];
+
+export function _handleDisplayInsufficientEarningError (error: Error, availableBalance: string, amount: string, minJoinPool: string) {
+  if (!INSUFFICIENT_MESSAGES.some((v) => error.message.includes(v))) {
+    return undefined;
+  }
+
+  const bnAvailableBalance = new BigN(availableBalance);
+  const bnAmount = new BigN(amount);
+
+  if (bnAvailableBalance.gt(0) && bnAmount.gte(bnAvailableBalance)) {
+    return {
+      title: 'Insufficient balance',
+      message: 'Insufficient balance. Amount must be smaller than available balance'
+    };
+  }
+
+  if (bnAvailableBalance.lte(minJoinPool)) {
+    return {
+      title: 'Insufficient balance',
+      message: 'You don\'t have enough {{symbol}} ({{chain}}) to stake, make sure your available balance is higher than {{minJoinPool}} {{symbol}}'
+    };
+  }
+
+  return {
+    title: 'Insufficient balance',
+    message: 'You don\'t have enough {{symbol}} ({{chain}}) to pay gas fee. Lower your amount and try again'
+  };
+}

packages/extension-base/src/core/logic-validation/swap.ts

@@ -0,0 +1,104 @@
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
+import { SwapError } from '@subwallet/extension-base/background/errors/SwapError';
+import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
+import { BasicTxErrorType } from '@subwallet/extension-base/background/KoniTypes';
+import { _getAssetDecimals, _isChainEvmCompatible } from '@subwallet/extension-base/services/chain-service/utils';
+import { ChainflipPreValidationMetadata, HydradxPreValidationMetadata, SwapErrorType } from '@subwallet/extension-base/types/swap';
+import { formatNumber } from '@subwallet/extension-base/utils';
+import BigN from 'bignumber.js';
+
+import { isEthereumAddress } from '@polkadot/util-crypto';
+
+export function _validateBalanceToSwap (fromToken: _ChainAsset, feeToken: _ChainAsset, feeTokenChainInfo: _ChainInfo, feeAmount: string, fromTokenBalance: string, feeTokenBalance: string, swapAmount: string, isXcmOk: boolean, minSwap?: string): TransactionError | undefined {
+  if (new BigN(feeTokenBalance).lte(feeAmount)) {
+    return new TransactionError(BasicTxErrorType.NOT_ENOUGH_BALANCE, `You don't have enough ${feeToken.symbol} (${feeTokenChainInfo.name}) to pay transaction fee`);
+  }
+
+  if (fromToken.slug === feeToken.slug) {
+    if (new BigN(fromTokenBalance).lte(new BigN(feeAmount).plus(swapAmount))) {
+      return new TransactionError(BasicTxErrorType.NOT_ENOUGH_BALANCE, `Insufficient balance. Deposit ${fromToken.symbol} and try again.`);
+    }
+  }
+
+  if (isXcmOk) { // assume that the swap is valid if XCM is in the process and it was successful
+    return undefined;
+  }
+
+  if (minSwap) {
+    if (new BigN(fromTokenBalance).lte(minSwap)) {
+      const parsedMinSwapValue = formatNumber(minSwap, _getAssetDecimals(fromToken));
+
+      return new TransactionError(SwapErrorType.SWAP_NOT_ENOUGH_BALANCE, `Insufficient balance. You need more than ${parsedMinSwapValue} ${fromToken.symbol} to start swapping. Deposit ${fromToken.symbol} and try again.`); // todo: min swap or amount?
+    }
+  }
+
+  if (new BigN(swapAmount).gte(fromTokenBalance)) {
+    const parsedMaxBalanceSwap = formatNumber(fromTokenBalance, _getAssetDecimals(fromToken));
+
+    return new TransactionError(SwapErrorType.SWAP_EXCEED_ALLOWANCE,
+      `Amount too high. Lower your amount ${new BigN(fromTokenBalance).gt(0) ? `below ${parsedMaxBalanceSwap} ${fromToken.symbol}` : ''} and try again`);
+  }
+
+  return undefined;
+}
+
+export function _validateSwapRecipient (destChainInfo: _ChainInfo, recipient: string): TransactionError | undefined {
+  const isEvmAddress = isEthereumAddress(recipient);
+  const isEvmDestChain = _isChainEvmCompatible(destChainInfo);
+
+  if ((isEvmAddress && !isEvmDestChain) || (!isEvmAddress && isEvmDestChain)) {
+    return new TransactionError(SwapErrorType.INVALID_RECIPIENT);
+  }
+
+  return undefined;
+}
+
+export function _getChainflipEarlyValidationError (error: SwapErrorType, metadata: ChainflipPreValidationMetadata): SwapError { // todo: support more providers
+  switch (error) {
+    case SwapErrorType.NOT_MEET_MIN_SWAP: {
+      const parsedMinSwapValue = formatNumber(metadata.minSwap.value, metadata.minSwap.decimals);
+      const message = `Amount too low. Increase your amount above ${parsedMinSwapValue} ${metadata.minSwap.symbol} and try again`;
+
+      return new SwapError(error, message);
+    }
+
+    case SwapErrorType.SWAP_EXCEED_ALLOWANCE: {
+      if (metadata.maxSwap) {
+        const parsedMaxSwapValue = formatNumber(metadata.maxSwap.value, metadata.maxSwap.decimals);
+
+        return new SwapError(error, `Amount too high. Lower your amount below ${parsedMaxSwapValue} ${metadata.maxSwap.symbol} and try again`);
+      } else {
+        return new SwapError(error, 'Amount too high. Lower your amount and try again');
+      }
+    }
+
+    case SwapErrorType.ASSET_NOT_SUPPORTED:
+      return new SwapError(error, 'This swap pair is not supported');
+    case SwapErrorType.UNKNOWN:
+      return new SwapError(error, `Undefined error. Check your Internet and ${metadata.chain.slug} connection or contact support`);
+    case SwapErrorType.ERROR_FETCHING_QUOTE:
+      return new SwapError(error, 'No swap quote found. Adjust your amount or try again later.');
+    default:
+      return new SwapError(error);
+  }
+}
+
+export function _getEarlyHydradxValidationError (error: SwapErrorType, metadata: HydradxPreValidationMetadata): SwapError {
+  switch (error) {
+    case SwapErrorType.AMOUNT_CANNOT_BE_ZERO: {
+      return new SwapError(error, 'Amount too low. Increase your amount above 0 and try again');
+    }
+
+    case SwapErrorType.ASSET_NOT_SUPPORTED:
+      return new SwapError(error, 'This swap pair is not supported');
+    case SwapErrorType.UNKNOWN:
+      return new SwapError(error, `Undefined error. Check your Internet and ${metadata.chain.slug} connection or contact support`);
+    case SwapErrorType.ERROR_FETCHING_QUOTE:
+      return new SwapError(error, 'No swap quote found. Adjust your amount or try again later.');
+    default:
+      return new SwapError(error);
+  }
+}