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

… webapp-dev # Conflicts: # packages/webapp/package.json
Koniverse · Sep 5, 2024 · 8b17ee6 · 8b17ee6
2 parents f5a247f + 1d8903d
commit 8b17ee6
Show file tree

Hide file tree

Showing 89 changed files with 1,460 additions and 543 deletions.
diff --git a/.123trigger b/.123trigger
@@ -159,4 +159,7 @@
 1.2.22
 1.2.23
 1.2.24
-1.2.25
+1.2.25
+1.2.26
+1.2.27
+1.2.28
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 build/
+build-firefox/
 build-cjs/
 coverage/
 node_modules/

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,47 @@
 # CHANGELOG
 
-## 1.2.24
+## 1.2.28
+Build date: Sep 04, 2024.
+
+Features & Update:
+- Format error when connecting to dApp (#3445)
+- Update connector version (#3363)
+- Update substrate dApp connect interface to allow dApp connect with EVM account (#3401)
+- Improve Amount input field (#1905)
+- Improve fetching era stakers (#3467)
+- Add warning in case user earn for both nomination pool and direct (#3477)
+- Add Notice of need to unstake for users who are simultaneously staking for both Direct and Nomination Pool (#3484)
+- Improve condition for Marketing campaign (#3468)
+- Update chain-list (#3518)
+  - Add support for Polygon zkEVM
+  - Add support for Immutable zkEVM
+  - Add support for Story Public Testnet
+  - Add support for Soneium Testnet
+  - Update logo for some chains, tokens
+
+Bugs fixed:
+- Fix UI bug on the Transfer screen (#3452)
+- Fix bug XCM (#3519)
+
+
+## 1.2.27
+Build date: Aug 22, 2024.
+
+Features & Update:
+- Update balance calculation for DeepBrainChain (#3481)
+- Update chain-list (#3478)
+  - Add support for 5ireChain mainnet
+  - Update decimals for Litmus, Litentry
+  - Update ED for some token: USDT, USDC (PAH), LIT (Litmus), LIT (Litentry), WUD (Hydration)
+
+
+## 1.2.26
+Build date: Aug 19, 2024.
+
+Bugs fixed:
+- Update earning feature with cache from middleware service
+
+## 1.2.25
 Build date: Aug 17, 2024.
 
 Features & Update:

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -1,14 +1,14 @@
-    2796	AnhMTV                        	Update earning with middleware service
-    2532	Nam Phạm                      	[Issue 3450] fix: get era stakers overview
-    2180	S2kael                        	[Issue-3450] Update stable version for chain-list
+    2813	AnhMTV                        	Release version 1.2.28
+    2533	Nam Phạm                      	[Issue 3467] fix: refactor staking pallet handling logic
+    2184	S2kael                        	[Issue-3518] Update stable version for chain-list
      848	lw-cdm                        	[Issue-3407] WebApp - Support Avail Ledger app
-     561	nguyentiendung                	[Issue-2845] Fix UI bugs export accounts
+     563	nguyentiendung                	[Issue-2845] Fix UI bugs export accounts
      465	Jaco                          	0.42.5 (#969)
-     262	bluezdot                      	[Issue-3450] fix: bug rounding number
-     209	Thiendekaco                   	[Issue 2501] [update]  Extension - Update message error has been standardized #2
+     277	bluezdot                      	[Issue-3467] add todo
+     228	Thiendekaco                   	[Issue 3363] Extension - Update standard content #2
      185	quangdo                       	
      160	Automation Bot                	[CI Skip] Auto increase webapp build number
-     145	dominhquang                   	[Issue-3414] Fix bug re-open popup
+     146	dominhquang                   	[Issue-3468] Improve condition for Marketing campaign
      118	lw-cdm                        	
      104	khainh                        	predefine metadata for Polkadot & Kusama chains
       83	Hieu Dao                      	Update README.md
@@ -17,8 +17,9 @@
       67	bluedot                       	[Issue-2965] fix: Handle earning status for request redeem
       63	Roman                         	fix ui issues
       53	Dominhquangdev                	update Bridge code
-      32	Frenkie Nguyen                	[Issue 3413] WebApp - Do not show earning position for Bifrost liquid staking
+      49	Frenkie Nguyen                	[Issue-3477] fix condition show popup
       24	S2kael                        	
+      17	Thanh                         	[Issue-3518] Update chainlist
       10	Trang Trịnh                   	api get karura and acala nfts
        9	Minh Le                       	
        9	minhld1029                    	[#115] [ForgetAccount] catch exception refList undefined
@@ -28,7 +29,6 @@
        4	Amaury Martiny                	PostMessageProvider with on('connected' | 'disconnected') (#279)
        4	namph                         	update UI for nft
        4	Quangdm-cdm                   	
-       4	Thanh                         	[Issue-3450] Add Story Partner Testnet
        3	Antoine Estienne              	Add eth test for extension signature (#909)
        3	quangdm                       	Update style for Auth Transaction Screen, Export Screen, Derive Screen
        2	Axel Chalon                   	Add typings to messages (#130)

diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "url": "https://github.com/Koniverse/Subwallet-V2.git"
   },
   "sideEffects": false,
-  "version": "1.2.26-0",
+  "version": "1.2.28",
   "workspaces": [
     "packages/*"
   ],
@@ -32,12 +32,13 @@
     "build:release": "koni-ci-ghact-build",
     "build:rollup": "polkadot-exec-rollup --config",
     "build:ui": "cd packages/extension-koni && NODE_ENV=production yarn webpack --config webpack.extension.cjs --mode production",
-    "build:zip": "yarn build:zip:dst && yarn build:zip:src && yarn build:zip:ff",
+    "build:zip": "yarn build:zip:dst && yarn build:zip:dst-ff && yarn build:zip:src",
     "build:zip:dst": "rm -rf ./master-build.zip && cd packages/extension-koni/build && zip -r -FS ../../../master-build.zip .",
-    "build:zip:ff": "koni-ci-mv3-firefox && rm -rf ./master-build-firefox.zip && cd packages/extension-koni/build && zip -r -FS ../../../master-build-firefox.zip .",
-    "build:zip:src": "rm -rf ./master-src.zip && zip -r -x '*build/*' -x '*node_modules*' -FS ./master-src.zip packages .editorconfig .eslintignore .eslintrc.js babel.config.cjs CHANGELOG.md CONTRIBUTING.md i18next-scanner.config.js jest.config.cjs LICENSE package.json README.md tsconfig.json yarn.lock",
-    "clean": "polkadot-dev-clean-build",
+    "build:zip:dst-ff": "rm -rf ./master-build-firefox.zip && cd packages/extension-koni/build-firefox && zip -r -FS ../../../master-build-firefox.zip .",
+    "build:zip:src": "rm -rf ./master-src.zip && zip -r -x '*build/*' -x '*build-firefox/*' -x '*node_modules*' -FS ./master-src.zip packages .editorconfig .eslintignore .eslintrc.js babel.config.cjs CHANGELOG.md CONTRIBUTING.md i18next-scanner.config.js jest.config.cjs LICENSE package.json README.md tsconfig.json yarn.lock",
+    "clean": "polkadot-dev-clean-build && rm -rf packages/extension-koni/build-firefox",
     "dev": "yarn watch-dev",
+    "dev:firefox": "cd packages/extension-koni && yarn polkadot-exec-webpack --config webpack.config-firefox.cjs --mode development --watch -d inline-source-map",
     "lint": "polkadot-dev-run-lint",
     "lint:changes": "git diff --name-only | grep -E '.(js|ts|tsx)$' | xargs eslint --fix",
     "postinstall": "polkadot-dev-yarn-only && patch-package",
@@ -46,8 +47,8 @@
     "test:one": "polkadot-dev-run-test --detectOpenHandles",
     "update:polkadot-libs": "yarn up @polkadot/api @polkadot/rpc-provider @polkadot/api-contract @polkadot/networks @polkadot/types @polkadot/types-augment @polkadot/util @polkadot/util-crypto @polkadot/api-derive @polkadot/apps-config @polkadot/ui-settings @polkadot/hw-ledger @polkadot/phishing @polkadot/util @polkadot/util-crypto",
     "update:subwallet-libs": "yarn up @subwallet/chain-list @subwallet/keyring @subwallet/ui-keyring",
-    "watch": "cd packages/extension-koni && yarn polkadot-exec-webpack --config webpack.watch.cjs --mode development --watch",
-    "watch-dev": "cd packages/extension-koni && yarn polkadot-exec-webpack --config webpack.watch.cjs --mode development --watch -d inline-source-map",
+    "watch": "cd packages/extension-koni && yarn polkadot-exec-webpack --config webpack.config.cjs --mode development --watch",
+    "watch-dev": "cd packages/extension-koni && yarn polkadot-exec-webpack --config webpack.config.cjs --mode development --watch -d inline-source-map",
     "web-runner:build": "cd packages/web-runner && rm -rf ./build && yarn webpack --config webpack.config.cjs --mode production",
     "web-runner:build-zip": "yarn web-runner:build && cd packages/web-runner && zip -r -FS ./web-runner.zip ./build && mv ./web-runner.zip ./build",
     "web-runner:dev": "cd packages/web-runner && yarn webpack-dev-server --config webpack.config.cjs --mode development -d inline-source-map",
@@ -103,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.82",
-    "@subwallet/keyring": "^0.1.5",
+    "@subwallet/chain-list": "0.2.84",
+    "@subwallet/keyring": "^0.1.6",
     "@subwallet/react-ui": "5.1.2-b79",
-    "@subwallet/ui-keyring": "^0.1.5",
+    "@subwallet/ui-keyring": "^0.1.6",
     "@zondax/ledger-substrate": "0.44.2",
     "babel-core": "^7.0.0-bridge.0",
     "babel-jest": "^29.3.1",

diff --git a/packages/extension-base/package.json b/packages/extension-base/package.json
@@ -17,7 +17,7 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "1.2.26-0",
+  "version": "1.2.28-0",
   "main": "index.js",
   "dependencies": {
     "@acala-network/api": "^5.0.2",
@@ -31,6 +31,7 @@
     "@galacticcouncil/sdk": "^4.2.0",
     "@gear-js/api": "^0.38.1",
     "@json-rpc-tools/utils": "^1.7.6",
+    "@metamask/eth-sig-util": "^7.0.3",
     "@metamask/safe-event-emitter": "^2.0.0",
     "@metaverse-network-sdk/type-definitions": "^0.0.1-13",
     "@oak-foundation/types": "^0.0.23",
@@ -54,17 +55,17 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet/chain-list": "0.2.82",
-    "@subwallet/extension-base": "^1.2.26-0",
-    "@subwallet/extension-chains": "^1.2.26-0",
-    "@subwallet/extension-dapp": "^1.2.26-0",
-    "@subwallet/extension-inject": "^1.2.26-0",
-    "@subwallet/keyring": "^0.1.5",
-    "@subwallet/ui-keyring": "^0.1.5",
+    "@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/keyring": "^0.1.6",
+    "@subwallet/ui-keyring": "^0.1.6",
     "@walletconnect/keyvaluestorage": "^1.1.1",
-    "@walletconnect/sign-client": "^2.13.1",
-    "@walletconnect/types": "^2.13.1",
-    "@walletconnect/utils": "^2.13.1",
+    "@walletconnect/sign-client": "^2.14.0",
+    "@walletconnect/types": "^2.14.0",
+    "@walletconnect/utils": "^2.14.0",
     "avail-js-sdk": "^0.2.12",
     "axios": "^1.6.2",
     "bignumber.js": "^9.1.1",
@@ -82,6 +83,7 @@
     "graphql": "^16.8.1",
     "i18next": "^21.9.2",
     "is-buffer": "^2.0.5",
+    "joi": "^17.13.3",
     "json-rpc-engine": "^6.1.0",
     "manta-extension-sdk": "^1.1.0",
     "moment": "^2.29.4",
@@ -98,7 +100,7 @@
     "web3-utils": "^1.10.0"
   },
   "devDependencies": {
-    "@subwallet/extension-mocks": "^1.2.26-0",
+    "@subwallet/extension-mocks": "^1.2.28-0",
     "@types/uuid": "^9.0.1"
   }
 }
diff --git a/packages/extension-base/src/background/KoniTypes.ts b/packages/extension-base/src/background/KoniTypes.ts
@@ -1265,29 +1265,29 @@ export interface EvmSendTransactionParams {
   gas?: string | number;
 }
 
-export interface SwitchNetworkRequest {
-  networkKey: string;
-  address?: string;
-}
-
 export interface EvmSignRequest {
   account: AccountJson;
   hashPayload: string;
   canSign: boolean;
 }
 
+export interface ErrorValidation {
+  message: string;
+  name: string;
+}
+
 export interface EvmSignatureRequest extends EvmSignRequest {
   id: string;
   type: string;
   payload: unknown;
-  errors?: Error[]
+  errors?: ErrorValidation[]
 }
 
 export interface EvmSendTransactionRequest extends TransactionConfig, EvmSignRequest {
   estimateGas: string;
   parseData: EvmTransactionData;
   isToContract: boolean;
-  errors?: TransactionError[]
+  errors?: ErrorValidation[]
 }
 
 export type EvmWatchTransactionRequest = EvmSendTransactionRequest;
@@ -1338,13 +1338,12 @@ export interface AddTokenRequestExternal {
 export interface ErrorNetworkConnection {
   networkKey: string,
   address: string,
-  errors: Error[]
+  errors: ErrorValidation[]
 }
 
 export interface ConfirmationDefinitions {
   addNetworkRequest: [ConfirmationsQueueItem<_NetworkUpsertParams>, ConfirmationResult<null>],
   addTokenRequest: [ConfirmationsQueueItem<AddTokenRequestExternal>, ConfirmationResult<boolean>],
-  switchNetworkRequest: [ConfirmationsQueueItem<SwitchNetworkRequest>, ConfirmationResult<boolean>],
   evmSignatureRequest: [ConfirmationsQueueItem<EvmSignatureRequest>, ConfirmationResult<string>],
   evmSendTransactionRequest: [ConfirmationsQueueItem<EvmSendTransactionRequest>, ConfirmationResult<string>]
   evmWatchTransactionRequest: [ConfirmationsQueueItem<EvmWatchTransactionRequest>, ConfirmationResult<string>],

diff --git a/packages/extension-base/src/constants/index.ts b/packages/extension-base/src/constants/index.ts
@@ -38,5 +38,7 @@ export const NETWORK_MULTI_GAS_FEE = ['*'];
 export const ORDINAL_COLLECTION = '__Ordinal__';
 export const ORDINAL_METHODS = ['drc-20', 'pol-20'];
 
+export const PERMISSIONS_TO_REVOKE = ['eth_accounts'];
+
 export * from './staking';
 export * from './storage';
-Original file line number
+Diff line change
@@ Expand Up / @@ -159,4 +159,7 @@ @@
 .2.22
 .2.23
 .2.24
-.2.25
+.2.25
+.2.26
+.2.27
+.2.28