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

# Conflicts:
#	packages/extension-base/src/utils/staticData/index.ts
#	packages/webapp/package.json

Author: lw-cdm

.123trigger

@@ -164,4 +164,6 @@
 1.2.27
 1.2.28
 1.2.29
-1.2.30
+1.2.30
+1.2.31
+1.2.32

CHANGELOG.md

@@ -1,5 +1,28 @@
 # CHANGELOG
 
+## 1.2.32
+Build date: Oct 01, 2024.
+
+Features & Update:
+- Improve marketing campaign (#3461, #2807)
+
+Bugs fixed:
+- Hot fix handle API status (#3711)
+
+## 1.2.31
+Build date: Sep 28, 2024.
+
+Features & Update:
+- Block action online (#3635)
+- Update chain-list (#3680)
+  - Add XCM support for KSM between Bifrost KSM <> Kusama
+  - Update RPC for Cess Network
+- Add swap pairs for Hydration and ChainFlip (#3633, #3651)
+
+Bugs fixed:
+- Fix bug Do not show earning position for StellaSwap (#3647)
+- Fix bug Can't import JSON file containing Unified account (#3643)
+
 ## 1.2.30
 Build date: Sep 20, 2024.
 

CONTRIBUTORS

@@ -1,14 +1,14 @@
-    2831	AnhMTV                        	Release version 1.2.30
-    2533	Nam Phạm                      	[Issue 3467] fix: refactor staking pallet handling logic
-    2186	S2kael                        	[Issue-3637] Update stable version for chain-list
+    2842	AnhMTV                        	Release version 1.2.32
+    2541	Nam Phạm                      	[Issue 3680] chore: update chainlist
+    2192	S2kael                        	[Issue-3711] Rollback handle pending state for balance item
      848	lw-cdm                        	[Issue-3407] WebApp - Support Avail Ledger app
      565	nguyentiendung                	[Issue-2845] Fix UI bugs export accounts
      465	Jaco                          	0.42.5 (#969)
-     314	bluezdot                      	[Issue-3635] fix: fix do not show balance
-     232	Thiendekaco                   	[Issue 3458] [fix]  Extension - Support XCM for Ledger Polkadot generic app #3
+     327	bluezdot                      	[Issue-3635] feat: update content
+     241	Thiendekaco                   	
      185	quangdo                       	
      160	Automation Bot                	[CI Skip] Auto increase webapp build number
-     146	dominhquang                   	[Issue-3468] Improve condition for Marketing campaign
+     157	dominhquang                   	
      118	lw-cdm                        	
      104	khainh                        	predefine metadata for Polkadot & Kusama chains
       83	Hieu Dao                      	Update README.md
@@ -18,8 +18,8 @@
       66	Frenkie Nguyen                	[Issue 2352] fix eslint
       63	Roman                         	fix ui issues
       53	Dominhquangdev                	update Bridge code
+      28	PDTnhah                       	[Issue-3680] Update chainlist
       24	S2kael                        	
-      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
@@ -60,5 +60,6 @@
        1	Stéphane P                    	README Fix typo (#700)
        1	Tore19                        	Add Stafi network (#454)
        1	trieunhu                      	Load transfer history polkadot and kusama by subquid
+       1	tunghp2002                    	[Fixed] Extension - Fix do not show earning position for StellaSwap
        1	Vlad Proshchavaiev            	Update extension with Subsocial SS58 included (#416)
        1	雪霁                            	Batch export (#666)

package.json

@@ -10,7 +10,7 @@
     "url": "https://github.com/Koniverse/Subwallet-V2.git"
   },
   "sideEffects": false,
-  "version": "1.2.30",
+  "version": "1.2.32",
   "workspaces": [
     "packages/*"
   ],
@@ -104,10 +104,10 @@
     "@polkadot/types-support": "^12.0.2",
     "@polkadot/util": "^12.6.2",
     "@polkadot/util-crypto": "^12.6.2",
-    "@subwallet/chain-list": "0.2.87",
-    "@subwallet/keyring": "^0.1.6",
+    "@subwallet/chain-list": "0.2.88",
+    "@subwallet/keyring": "^0.1.7",
     "@subwallet/react-ui": "5.1.2-b79",
-    "@subwallet/ui-keyring": "^0.1.6",
+    "@subwallet/ui-keyring": "^0.1.7",
     "@zondax/ledger-substrate": "0.44.2",
     "babel-core": "^7.0.0-bridge.0",
     "babel-jest": "^29.3.1",

packages/extension-base/package.json

@@ -17,18 +17,18 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "1.2.30-0",
+  "version": "1.2.32-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.5.2",
+    "@chainflip/sdk": "^1.6.0",
     "@equilab/api": "~1.14.25",
     "@ethereumjs/common": "^4.1.0",
     "@ethereumjs/tx": "^5.1.0",
     "@ethersproject/abi": "^5.7.0",
-    "@galacticcouncil/sdk": "^4.2.0",
+    "@galacticcouncil/sdk": "^4.2.1",
     "@gear-js/api": "^0.38.1",
     "@json-rpc-tools/utils": "^1.7.6",
     "@metamask/eth-sig-util": "^7.0.3",
@@ -55,13 +55,13 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@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",
+    "@subwallet/chain-list": "0.2.88",
+    "@subwallet/extension-base": "^1.2.32-0",
+    "@subwallet/extension-chains": "^1.2.32-0",
+    "@subwallet/extension-dapp": "^1.2.32-0",
+    "@subwallet/extension-inject": "^1.2.32-0",
+    "@subwallet/keyring": "^0.1.7",
+    "@subwallet/ui-keyring": "^0.1.7",
     "@walletconnect/keyvaluestorage": "^1.1.1",
     "@walletconnect/sign-client": "^2.14.0",
     "@walletconnect/types": "^2.14.0",
@@ -100,7 +100,7 @@
     "web3-utils": "^1.10.0"
   },
   "devDependencies": {
-    "@subwallet/extension-mocks": "^1.2.30-0",
+    "@subwallet/extension-mocks": "^1.2.32-0",
     "@types/uuid": "^9.0.1"
   }
 }

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

@@ -491,15 +491,16 @@ export enum ExtrinsicType {
   SEND_NFT = 'send_nft',
   CROWDLOAN = 'crowdloan',
 
-  STAKING_JOIN_POOL = 'staking.join_pool',
-  STAKING_LEAVE_POOL = 'staking.leave_pool',
-  STAKING_POOL_WITHDRAW = 'staking.pool_withdraw',
+  STAKING_JOIN_POOL = 'staking.join_pool', // todo: merge to JOIN_YIELD_POOL
+  STAKING_LEAVE_POOL = 'staking.leave_pool', // todo: deprecated, STAKING_LEAVE_POOL + STAKING_UNBOND
+  STAKING_POOL_WITHDRAW = 'staking.pool_withdraw', // todo: deprecated, STAKING_POOL_WITHDRAW + STAKING_WITHDRAW
+
   STAKING_BOND = 'staking.bond',
-  STAKING_UNBOND = 'staking.unbond',
+  STAKING_UNBOND = 'staking.unbond', // todo: STAKING_LEAVE_POOL + STAKING_UNBOND
   STAKING_CLAIM_REWARD = 'staking.claim_reward',
-  STAKING_WITHDRAW = 'staking.withdraw',
-  STAKING_COMPOUNDING = 'staking.compounding',
-  STAKING_CANCEL_COMPOUNDING = 'staking.cancel_compounding',
+  STAKING_WITHDRAW = 'staking.withdraw', // todo: STAKING_POOL_WITHDRAW + STAKING_WITHDRAW
+  STAKING_COMPOUNDING = 'staking.compounding', // deprecated
+  STAKING_CANCEL_COMPOUNDING = 'staking.cancel_compounding', // deprecated
   STAKING_CANCEL_UNSTAKE = 'staking.cancel_unstake',
 
   JOIN_YIELD_POOL = 'earn.join_pool', // TODO: review this
@@ -2194,8 +2195,8 @@ export interface KoniRequestSignatures {
   'pri(derivation.createV2)': [RequestDeriveCreateV2, boolean]; // Substrate
 
   // Restore by json
-  'pri(json.restoreV2)': [RequestJsonRestoreV2, void];
-  'pri(json.batchRestoreV2)': [RequestBatchRestoreV2, void];
+  'pri(json.restoreV2)': [RequestJsonRestoreV2, string[]];
+  'pri(json.batchRestoreV2)': [RequestBatchRestoreV2, string[]];
 
   // Export account
   'pri(accounts.batchExportV2)': [RequestAccountBatchExportV2, ResponseAccountBatchExportV2];

packages/extension-base/src/constants/blocked-actions-list.ts

@@ -0,0 +1,16 @@
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
+import { fetchStaticData } from '@subwallet/extension-base/utils';
+
+interface BlockedActionsFeaturesMap {
+  blockedActionsMap: Record<ExtrinsicType, string[]>
+  blockedFeaturesList: string[],
+}
+
+const BLOCKED_ACTIONS_AND_FEATURES_PROMISE = fetchStaticData<BlockedActionsFeaturesMap>('blocked-actions-features');
+
+export const fetchLastestBlockedActionsAndFeatures = async () => {
+  return await BLOCKED_ACTIONS_AND_FEATURES_PROMISE;
+};

packages/extension-base/src/constants/index.ts

@@ -42,3 +42,4 @@ export const PERMISSIONS_TO_REVOKE = ['eth_accounts'];
 
 export * from './staking';
 export * from './storage';
+export * from './blocked-actions-list';