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

# Conflicts:
#	.github/workflows/push-web-runner.yml
#	packages/extension-base/src/services/migration-service/scripts/index.ts
#	packages/webapp/package.json

Author: lw-cdm

.123trigger

@@ -162,4 +162,6 @@
 1.2.25
 1.2.26
 1.2.27
-1.2.28
+1.2.28
+1.2.29
+1.2.30

.env.example

@@ -1,4 +1,5 @@
 TRANSAK_API_KEY=4b767e2c-2e01-45c9-978e-d32c6f0c8900
 COINBASE_PAY_ID=1dbd2a0b94
 NFT_MINTING_HOST=http://...
+CHAINFLIP_BROKER_API=93c2bff017e243f29ffb14e42dccbec8
 BRANCH_NAME=master

.github/workflows/push-koni-dev.yml

@@ -40,6 +40,7 @@ jobs:
         GH_PAT: ${{ secrets.GH_PAT }}
         TRANSAK_API_KEY: ${{ secrets.TRANSAK_API_KEY }}
         COINBASE_PAY_ID: ${{ secrets.COINBASE_PAY_ID }}
+        CHAINFLIP_BROKER_API: ${{ secrets.CHAINFLIP_BROKER_API }}
         GH_RELEASE_FILES: master-build.zip,master-src.zip
         COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
         REF_NAME: ${{ github.ref_name }}

.github/workflows/push-master.yml

@@ -24,6 +24,7 @@ jobs:
         DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
         TRANSAK_API_KEY: ${{ secrets.TRANSAK_API_KEY }}
         COINBASE_PAY_ID: ${{ secrets.COINBASE_PAY_ID }}
+        CHAINFLIP_BROKER_API: ${{ secrets.CHAINFLIP_BROKER_API }}
         BRANCH_NAME: ${{ github.ref_name }}
       run: |
         yarn install --immutable | grep -v 'YN0013'

.github/workflows/push-webapp.yml

@@ -30,6 +30,7 @@ jobs:
         TRANSAK_API_KEY: ${{ secrets.TRANSAK_API_KEY }}
         COINBASE_PAY_ID: ${{ secrets.COINBASE_PAY_ID }}
         NFT_MINTING_HOST: ${{ secrets.NFT_MINTING_HOST }}
+        CHAINFLIP_BROKER_API: ${{ secrets.CHAINFLIP_BROKER_API }}
         BRANCH_NAME: ${{ github.ref_name }}
       run: |
         yarn install --immutable | grep -v 'YN0013'

CHANGELOG.md

@@ -1,5 +1,50 @@
 # CHANGELOG
 
+## 1.2.30
+Build date: Sep 20, 2024.
+
+Features & Update:
+- Add Chainflip broker (#3483)
+- Re-calculate max transferable for XCM native token (#3617)
+- Update chain-list (#3637)
+  - Add support for Tether's XAUt token
+  - Add support for BUNS token for PAH, Hydration
+  - Add support for Ternoa zkEVM + Testnet
+  - Update information for some chains (https://github.com/Koniverse/SubWallet-ChainList/issues/302)
+    - DOT <-> CFG
+    - CFG <-> USDT
+    - DOT <-> BNC
+    - BNC <-> USDT
+    - BNC <-> HDX
+  - Add support for new swap pairs on Hydration
+  - Hidden XCM on Pioneer
+
+Bugs fixed:
+- Fix bug not showing balance of VFT tokens (#3612)
+- Fix bug do not show balance (#3653)
+
+## 1.2.29
+Build date: Sep 13, 2024.
+
+Features & Update:
+- Support XCM for Ledger Polkadot generic app (#3458)
+- Adjust showing/validating address on Earning actions (#2703)
+- Update chain-list (#3558)
+  - Add support for Creditcoin CC3 Mainnet
+  - Add support for vASTR on Hydration
+  - Add support for Cypress tokens on Hydration, PAH
+  - Update some network and token information
+  - Add support for new swap pairs on Hydration
+- Support XCM channels (#3453)
+  - MYTH: Hydration --> Mythos
+  - MYTH: PAH --> Mythos
+
+Bugs fixed:
+- Fixed bug Do not show token when standing on All accounts mode in case token does not get balance (#2352)
+- Fix bug do not show lock balance in case account have Kusama nomination pool (#3579)
+- Fix bug XCM for channel: DOT: KAH -> PAH (#3561)
+- Fix bug display wrong APY for Polkadot staking option (#3601)
+
 ## 1.2.28
 Build date: Sep 04, 2024.
 

CONTRIBUTORS

@@ -1,11 +1,11 @@
-    2813	AnhMTV                        	Release version 1.2.28
+    2831	AnhMTV                        	Release version 1.2.30
     2533	Nam Phạm                      	[Issue 3467] fix: refactor staking pallet handling logic
-    2184	S2kael                        	[Issue-3518] Update stable version for chain-list
+    2186	S2kael                        	[Issue-3637] Update stable version for chain-list
      848	lw-cdm                        	[Issue-3407] WebApp - Support Avail Ledger app
-     563	nguyentiendung                	[Issue-2845] Fix UI bugs export accounts
+     565	nguyentiendung                	[Issue-2845] Fix UI bugs export accounts
      465	Jaco                          	0.42.5 (#969)
-     277	bluezdot                      	[Issue-3467] add todo
-     228	Thiendekaco                   	[Issue 3363] Extension - Update standard content #2
+     314	bluezdot                      	[Issue-3635] fix: fix do not show balance
+     232	Thiendekaco                   	[Issue 3458] [fix]  Extension - Support XCM for Ledger Polkadot generic app #3
      185	quangdo                       	
      160	Automation Bot                	[CI Skip] Auto increase webapp build number
      146	dominhquang                   	[Issue-3468] Improve condition for Marketing campaign
@@ -14,12 +14,12 @@
       83	Hieu Dao                      	Update README.md
       82	Thibaut Sardan                	Add account filtering feature (#832)
       81	leewong                       	Swap - Change idle time to 300s
-      67	bluedot                       	[Issue-2965] fix: Handle earning status for request redeem
+      70	bluedot                       	[Issue-3579] fix: update check fully migrate
+      66	Frenkie Nguyen                	[Issue 2352] fix eslint
       63	Roman                         	fix ui issues
       53	Dominhquangdev                	update Bridge code
-      49	Frenkie Nguyen                	[Issue-3477] fix condition show popup
       24	S2kael                        	
-      17	Thanh                         	[Issue-3518] Update chainlist
+      24	Thanh                         	[Issue-3637] Update chainlist
       10	Trang Trịnh                   	api get karura and acala nfts
        9	Minh Le                       	
        9	minhld1029                    	[#115] [ForgetAccount] catch exception refList undefined

package.json

@@ -10,7 +10,7 @@
     "url": "https://github.com/Koniverse/Subwallet-V2.git"
   },
   "sideEffects": false,
-  "version": "1.2.28",
+  "version": "1.2.30",
   "workspaces": [
     "packages/*"
   ],
@@ -104,7 +104,7 @@
     "@polkadot/types-support": "^12.0.2",
     "@polkadot/util": "^12.6.2",
     "@polkadot/util-crypto": "^12.6.2",
-    "@subwallet/chain-list": "0.2.84",
+    "@subwallet/chain-list": "0.2.87",
     "@subwallet/keyring": "^0.1.6",
     "@subwallet/react-ui": "5.1.2-b79",
     "@subwallet/ui-keyring": "^0.1.6",

packages/extension-base/package.json

@@ -17,13 +17,13 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "1.2.28-0",
+  "version": "1.2.30-0",
   "main": "index.js",
   "dependencies": {
     "@acala-network/api": "^5.0.2",
     "@apollo/client": "^3.7.14",
     "@azns/resolver-core": "^1.4.0",
-    "@chainflip/sdk": "^1.3.0",
+    "@chainflip/sdk": "^1.5.2",
     "@equilab/api": "~1.14.25",
     "@ethereumjs/common": "^4.1.0",
     "@ethereumjs/tx": "^5.1.0",
@@ -55,11 +55,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet/chain-list": "0.2.84",
-    "@subwallet/extension-base": "^1.2.28-0",
-    "@subwallet/extension-chains": "^1.2.28-0",
-    "@subwallet/extension-dapp": "^1.2.28-0",
-    "@subwallet/extension-inject": "^1.2.28-0",
+    "@subwallet/chain-list": "0.2.87",
+    "@subwallet/extension-base": "^1.2.30-0",
+    "@subwallet/extension-chains": "^1.2.30-0",
+    "@subwallet/extension-dapp": "^1.2.30-0",
+    "@subwallet/extension-inject": "^1.2.30-0",
     "@subwallet/keyring": "^0.1.6",
     "@subwallet/ui-keyring": "^0.1.6",
     "@walletconnect/keyvaluestorage": "^1.1.1",
@@ -100,7 +100,7 @@
     "web3-utils": "^1.10.0"
   },
   "devDependencies": {
-    "@subwallet/extension-mocks": "^1.2.28-0",
+    "@subwallet/extension-mocks": "^1.2.30-0",
     "@types/uuid": "^9.0.1"
   }
 }

packages/extension-base/src/core/substrate/xcm-parser.ts

@@ -60,8 +60,8 @@ export function _getXcmMultiLocation (originChainInfo: _ChainInfo, destChainInfo
   };
 }
 
-export function _isXcmTransferUnstable (originChainInfo: _ChainInfo, destChainInfo: _ChainInfo): boolean {
-  return !_isXcmWithinSameConsensus(originChainInfo, destChainInfo);
+export function _isXcmTransferUnstable (originChainInfo: _ChainInfo, destChainInfo: _ChainInfo, assetSlug: string): boolean {
+  return !_isXcmWithinSameConsensus(originChainInfo, destChainInfo) || _isMythosFromHydrationToMythos(originChainInfo, destChainInfo, assetSlug);
 }
 
 function getAssetHubBridgeUnstableWarning (originChainInfo: _ChainInfo): string {
@@ -78,17 +78,23 @@ function getAssetHubBridgeUnstableWarning (originChainInfo: _ChainInfo): string
 function getSnowBridgeUnstableWarning (originChainInfo: _ChainInfo): string {
   switch (originChainInfo.slug) {
     case COMMON_CHAIN_SLUGS.POLKADOT_ASSET_HUB:
-      return 'Cross-chain transfer of this token is not recommended as it is in beta, incurs a fee of 70$ and takes up to 1 hour to complete. Continue at your own risk';
+      return 'Cross-chain transfer of this token is not recommended as it is in beta, incurs a fee of $70 and takes up to 1 hour to complete. Continue at your own risk';
     case COMMON_CHAIN_SLUGS.ETHEREUM:
-      return 'Cross-chain transfer of this token is not recommended as it is in beta, incurs a fee of 5$ and takes up to 1 hour to complete. Continue at your own risk';
+      return 'Cross-chain transfer of this token is not recommended as it is in beta, incurs a fee of $5 and takes up to 1 hour to complete. Continue at your own risk';
     default:
       return 'Cross-chain transfer of this token is not recommended as it is in beta, incurs a high fee and takes up to 1 hour to complete. Continue at your own risk';
   }
 }
 
-export function _getXcmUnstableWarning (originChainInfo: _ChainInfo, destChainInfo: _ChainInfo): string {
+function getMythosFromHydrationToMythosWarning (): string {
+  return 'Cross-chain transfer of this token requires a high transaction fee. Do you want to continue?';
+}
+
+export function _getXcmUnstableWarning (originChainInfo: _ChainInfo, destChainInfo: _ChainInfo, assetSlug: string): string {
   if (_isSnowBridgeXcm(originChainInfo, destChainInfo)) {
     return getSnowBridgeUnstableWarning(originChainInfo);
+  } else if (_isMythosFromHydrationToMythos(originChainInfo, destChainInfo, assetSlug)) {
+    return getMythosFromHydrationToMythosWarning();
   } else {
     return getAssetHubBridgeUnstableWarning(originChainInfo);
   }
@@ -102,6 +108,10 @@ export function _isSnowBridgeXcm (originChainInfo: _ChainInfo, destChainInfo: _C
   return !_isXcmWithinSameConsensus(originChainInfo, destChainInfo) && (_isPureEvmChain(originChainInfo) || _isPureEvmChain(destChainInfo));
 }
 
+export function _isMythosFromHydrationToMythos (originChainInfo: _ChainInfo, destChainInfo: _ChainInfo, assetSlug: string): boolean {
+  return originChainInfo.slug === 'hydradx_main' && destChainInfo.slug === 'mythos' && assetSlug === 'hydradx_main-LOCAL-MYTH';
+}
+
 // ---------------------------------------------------------------------------------------------------------------------
 
 function _getMultiLocationParent (originChainInfo: _ChainInfo, isWithinSameConsensus: boolean): number {
@@ -215,7 +225,7 @@ function _getAssetIdentifier (tokenInfo: _ChainAsset, version: number) {
     throw new Error('Asset must have multilocation');
   }
 
-  const assetIdentifier = ['statemint-LOCAL-KSM'].includes(tokenInfo.slug) // todo: hotfix for ksm statemint recheck all chain
+  const assetIdentifier = ['statemint-LOCAL-KSM', 'statemine-LOCAL-DOT'].includes(tokenInfo.slug) // todo: hotfix for ksm statemint recheck all chain
     ? _assetIdentifier
     : _adaptX1Interior(structuredClone(_assetIdentifier), version);
 

packages/extension-base/src/koni/background/handlers/Extension.ts

@@ -1854,13 +1854,13 @@ export default class KoniExtension {
     }
 
     const chainInfoMap = this.#koniState.getChainInfoMap();
-    const isFromSnowBridgeXcm = _isPureEvmChain(chainInfoMap[originNetworkKey]) && _isSnowBridgeXcm(chainInfoMap[originNetworkKey], chainInfoMap[destinationNetworkKey]);
+    const isSnowBridgeEvmTransfer = _isPureEvmChain(chainInfoMap[originNetworkKey]) && _isSnowBridgeXcm(chainInfoMap[originNetworkKey], chainInfoMap[destinationNetworkKey]);
 
     let additionalValidator: undefined | ((inputTransaction: SWTransactionResponse) => Promise<void>);
     let eventsHandler: undefined | ((eventEmitter: TransactionEmitter) => void);
 
     if (fromKeyPair && destinationTokenInfo) {
-      if (isFromSnowBridgeXcm) {
+      if (isSnowBridgeEvmTransfer) {
         const evmApi = this.#koniState.getEvmApi(originNetworkKey);
 
         extrinsic = await createSnowBridgeExtrinsic({
@@ -1927,7 +1927,7 @@ export default class KoniExtension {
       transaction: extrinsic,
       data: inputData,
       extrinsicType: ExtrinsicType.TRANSFER_XCM,
-      chainType: !isFromSnowBridgeXcm ? ChainType.SUBSTRATE : ChainType.EVM,
+      chainType: !isSnowBridgeEvmTransfer ? ChainType.SUBSTRATE : ChainType.EVM,
       transferNativeAmount: _isNativeToken(originTokenInfo) ? value : '0',
       ignoreWarnings: inputData.transferAll,
       isTransferAll: inputData.transferAll,
@@ -2090,15 +2090,16 @@ export default class KoniExtension {
     const substrateApi = this.#koniState.chainService.getSubstrateApi(originTokenInfo.originChain);
     const chainInfoMap = this.#koniState.chainService.getChainInfoMap();
     const destinationTokenInfo = this.#koniState.getXcmEqualAssetByChain(destChain, originTokenInfo.slug);
+    const existentialDeposit = originTokenInfo.minAmount || '0';
 
     if (destinationTokenInfo) {
-      const [bnMockFee, { value }] = await Promise.all([
+      const [bnMockExecutionFee, { value }] = await Promise.all([
         getXcmMockTxFee(substrateApi, chainInfoMap, originTokenInfo, destinationTokenInfo),
         this.getAddressTransferableBalance({ extrinsicType: ExtrinsicType.TRANSFER_XCM, address, networkKey: originTokenInfo.originChain, token: originTokenInfo.slug })
       ]);
 
       const bnMaxTransferable = new BigN(value);
-      const estimatedFee = bnMockFee.multipliedBy(XCM_FEE_RATIO); // multiply by weight to account for destination chain fee
+      const estimatedFee = bnMockExecutionFee.multipliedBy(XCM_FEE_RATIO).plus(new BigN(existentialDeposit));
 
       return bnMaxTransferable.minus(estimatedFee);
     }

packages/extension-base/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@subwallet/extension-base', path: 'auto', type: 'auto', version: '1.2.28-0' };
+export const packageInfo = { name: '@subwallet/extension-base', path: 'auto', type: 'auto', version: '1.2.30-0' };

packages/extension-base/src/services/balance-service/helpers/subscribe/index.ts

@@ -82,6 +82,38 @@ const filterAddress = (addresses: string[], chainInfo: _ChainInfo): [string[], s
   }
 };
 
+const handleUnsupportedOrPendingAddresses = (
+  addresses: string[],
+  chainSlug: string,
+  chainAssetMap: Record<string, _ChainAsset>,
+  state: APIItemState,
+  callback: (rs: BalanceItem[]) => void
+) => {
+  const tokens = filterAssetsByChainAndType(chainAssetMap, chainSlug, [
+    _AssetType.NATIVE,
+    _AssetType.ERC20,
+    _AssetType.PSP22,
+    _AssetType.LOCAL,
+    _AssetType.GRC20,
+    _AssetType.VFT
+  ]);
+
+  const now = new Date().getTime();
+
+  Object.values(tokens).forEach((token) => {
+    const items: BalanceItem[] = addresses.map((address): BalanceItem => ({
+      address,
+      tokenSlug: token.slug,
+      free: '0',
+      locked: '0',
+      state,
+      timestamp: now
+    }));
+
+    callback(items);
+  });
+};
+
 // main subscription, use for multiple chains, multiple addresses and multiple tokens
 export function subscribeBalance (
   addresses: string[],
@@ -104,22 +136,13 @@ export function subscribeBalance (
     const [useAddresses, notSupportAddresses] = filterAddress(addresses, chainInfo);
 
     if (notSupportAddresses.length) {
-      const tokens = filterAssetsByChainAndType(chainAssetMap, chainSlug, [_AssetType.NATIVE, _AssetType.ERC20, _AssetType.PSP22, _AssetType.LOCAL, _AssetType.GRC20, _AssetType.VFT]);
-
-      const now = new Date().getTime();
-
-      Object.values(tokens).forEach((token) => {
-        const items: BalanceItem[] = notSupportAddresses.map((address): BalanceItem => ({
-          address,
-          tokenSlug: token.slug,
-          free: '0',
-          locked: '0',
-          state: APIItemState.NOT_SUPPORT,
-          timestamp: now
-        }));
-
-        callback(items);
-      });
+      handleUnsupportedOrPendingAddresses(
+        notSupportAddresses,
+        chainSlug,
+        chainAssetMap,
+        APIItemState.NOT_SUPPORT,
+        callback
+      );
     }
 
     const evmApi = evmApiMap[chainSlug];
@@ -136,6 +159,16 @@ export function subscribeBalance (
 
     const substrateApi = await substrateApiMap[chainSlug].isReady;
 
+    if (!substrateApi.isApiReady) {
+      handleUnsupportedOrPendingAddresses(
+        useAddresses,
+        chainSlug,
+        chainAssetMap,
+        APIItemState.PENDING,
+        callback
+      );
+    }
+
     return subscribeSubstrateBalance(useAddresses, chainInfo, chainAssetMap, substrateApi, evmApi, callback, extrinsicType);
   });